feat(diff): Add custom diff tool support for fs_write via Q_DIFF_TOOL #3353
+104
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add support for configuring external diff tools to view file changes in preferred editor/IDE instead of terminal. Features: - Q_DIFF_TOOL environment variable for tool configuration - Support for file write approval diffs only - Automatic fallback to inline diff when not configured Usage: export Q_DIFF_TOOL="code --diff" # VSCode export Q_DIFF_TOOL="idea diff" # JetBrains Integration points: - File write tool: approval flow diffs Implementation: - New diff_tool module with launch and content handling 🤖 Assisted by Amazon Q Developer https://issues.amazon.com/issues/P129406383
```bash > export Q_DIFF_TOOL="delta --color-only" > q chat ```
evanliu048
reviewed
Nov 5, 2025
There was a problem hiding this comment.
Hey @avinashsivaraman ! I really like this feature — it makes using the CLI with the IDE super convenient while coding.
One quick question: if a user accidentally closes the diff file, how can they view it again?
Should we also consider printing the diff in the terminal?
Curious to hear your thoughts!
I can think of two options here
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Add support for configuring external diff tools to view file changes in preferred editor/IDE instead of terminal.
Features:
Usage:
export Q_DIFF_TOOL="code --diff" # VSCode
export Q_DIFF_TOOL="vimdiff" # vimdiff
Integration points:
Implementation:
🤖 Assisted by Amazon Q Developer
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.