Skip to content

Merge main into feature/pinnedContext #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: feature/pinnedContext
Choose a base branch
from

Conversation

aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/pinnedContext
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/pinnedContext

shruti0085 added 13 commits July 9, 2025 09:18
Currently, we pass the modelSelection flag in createChat, but we need to pass it to server so that server knows if client has the ability or not. With this change we pass the modelSelection in awsCapabilities in lsp initilization.
This PR implements pinned context functionality for Amazon Q Eclipse plugin, allowing users to pin files
to their chat conversations for persistent context. This feature improves the relevance of Amazon Q
responses by maintaining important context throughout the conversation.
* Adds the ability to pin/unpin files in Amazon Q chat conversations
* Implements automatic active editor tracking with 100ms debouncing
* Enables the @pin Context feature visible in the chat UI
* Provides LSP server integration for pinned context operations
* Handles UTF8 rendering on Windows devices
This change also remove the isUriInWorkspace check for when lsp sends showDocument notification to client. This check would gate the ability to open documents not present in the workspace which is required for paths associated with prompts/rules that are stored on disk and require opening it in the IDE for editing.
This change overrides/hides the pinned context hint text which is incorrectly shown for Eclipse as the shortcut key already exists. In a future change, an appropriate shortcut key and hint text will be configured
Bump version to 2.3.0
This change improves the proxy support story for the extension. With this, we honor customer CA cert if specified in the preferences UI. If it is not supplied, instead of leaving it blank, we now detect system certificates and send it over to the node based language server. This allows us to address some issues where users are on corporate proxies/firewalls that have a proxy url but not an explicitly defined cert and expects applications to honor system certs.
We currently do the same system cert detection when downloading artifacts for lsp.

Follows a similar approach as JB: aws/aws-toolkit-jetbrains#5553
There is not sufficient logging around the developer profile fetching logic in the login flow. This change adds more logging. In addition, unnecessary restrictive validation checks on the stored and returned Q developer profiles has been removed as we want to rely on the backend to give us valid results. Only validation to check the shape of the stored value is now used, if it is incorrect, we expect further calls to the backend to fail with an appropriate message.
Bumps version to 2.3.2.
Adds support to dynamically retrieve available models for a region(e.g., Claude 4, Claude 3.7, Claude 3.5) from the backend. Wires up the aws/chat/listAvailableModels protocol handler to support model selection in AmazonQ chat.
Merges feature branch containing improvements for ADT ABAP support into main.
Relevant PRs

* adt support #487
* Support updating remote when ABAP files are edited #495
* handle the null case for contentType in adt plugin environment #496
* Fix: Handle removing paint listeners with ADT viewer and allow multiline text in inline chat #500
This change simplifies and improves the release process. Instead of manually doing an update across necessary files to update the plugin version(PR #502), this adds a script that would make the version updates necessary. A corresponding entry has been added in the Contributing guide.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants