Skip to content

Merge main into feature/pinnedContext#478

Open
aws-toolkit-automation wants to merge 40 commits intofeature/pinnedContextfrom
autoMerge/feature/pinnedContext
Open

Merge main into feature/pinnedContext#478
aws-toolkit-automation wants to merge 40 commits intofeature/pinnedContextfrom
autoMerge/feature/pinnedContext

Conversation

@aws-toolkit-automation
Copy link
Copy Markdown
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 and others added 30 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.
This change is being made in correspondence to a mynah change aws/mynah-ui#429
Certain icons were problematic when rendered by Webkit used by Eclipse on Mac which led to errors. Error was caused due to hitting transparency limits: WebCore::GraphicsContextCG::endTransparencyLayer().

* To mitigate it in addition to upstream change, eclipse client will now inject a flag to the backing UI JS to allow it to skip styling that handles transparency layers in particular within chat-item-cards.
* In addition the progress.svg icon shown when a chat response is in progress is a complex animation that overloads Webkit. To mitigate it, a simple static spinner icon now overrides that problematic icon on the Eclipse side.
* The text rate limiting to avoid flooding the Webview has been reduced to prevent delays and the lastProcessingTime computation has been fixed. This was accidentally delaying (additionalMessage)button state changes as well that are not rate limited.
Bump version to 2.5.0 similar to #502. Created using the update-version script
Adds ability to override manifest urls when local testing with the env variable Q_MANIFEST. When set, this url will be used to fetch and launch the language server from.
Fixes test failures when run locally on Windows due to incorrect unix hardcoded path.
* Bump version to 2.6.3

* patch
The chat-client's onContextCommandFilter callback sends
filterContextCommands via postMessage/ideCommand, but the Java backend
had no Command enum value or handler for it. The message was silently
dropped, so the @ picker could only search within the initial capped
set of context commands.

Add FILTER_CONTEXT_COMMANDS to Command enum, AmazonQLspServer interface,
action handler routing, and ChatCommunicationManager to forward the
request to the LSP and send the response back to the webview.
chungjac and others added 10 commits April 21, 2026 14:01
* feat(auth): add maintenance-mode UI to Amazon Q login webview

Mirrors the JetBrains sign-in redesign so Eclipse matches the same
look/feel.

- qOptions.vue: add centered "Welcome to Amazon Q" header, yellow
  maintenance warning banner with Learn more link, disabled "Create
  New Account" button with lock icon, and "existing users" divider.
  Update Builder ID / Identity Center titles and descriptions and
  change the primary button label to "Sign in with existing account".
- common.scss: tighten shared login sizing to align with the VSCode
  sign-in view. Base font 15→13px, title 15→14px, section gap 20→12px,
  login-flow-button 55→30px tall, border-radius 3→4px, bottom margin
  100→12px, container max-width 300→260px.
- selectableItem.vue: shrink the option card — icons 20→16px, padding
  15→10/12px, switch fixed 38px height to min-height 50px, title 13px
  bold, description 12px with wrapping so the longer Identity Center
  text doesn't get clipped.
- logo.vue: shrink the AMAZONQ logo 100→56px (Toolkit 100→72px), drop
  wrapper padding-top 75→65px, and center the login-stage logo so it
  matches the JetBrains/VSCode presentation.

* feat(auth): route maintenance banner Learn more through IDE openUrl

Add OPEN_URL command so the webview can delegate external link opens
to the host, which surfaces the standard Amazon Q confirm dialog before
launching the system browser instead of navigating inside JCEF.

* fix(auth): show maintenance banner for returning users too

Move the Welcome header, maintenance banner, disabled Create New Account
button, and existing-users divider above the existing connections list
so they always render — not just for new users. Returning users with
saved SSO URLs now see the same maintenance messaging.

Also rename 'Connect with an existing account' → 'Connect with an
account' since the section now appears below the banner context.

* fix(auth): flatten login flow and remember last IdC input

- Remove separate 'Connect with an account' section from qOptions.vue.
  Existing connections now appear inline under the 'existing users'
  divider alongside Builder ID and Identity Center, matching VS Code
  and JetBrains.

- Persist last-used Identity Center startUrl and region to Eclipse
  preferences after successful IdC login. Pre-populate the SSO form
  with these values on next load so returning users don't have to
  re-enter their organization's start URL and region.

* fix(auth): use string concatenation for JS object to avoid format issues

Replace String.format with concatenation to prevent potential issues
if the regions JSON contains percent characters that would be
misinterpreted as format specifiers.

* fix(auth): force-populate SSO Start URL via $nextTick fallback

Vue 3's mounted() hook does not fire reliably for ssoLoginForm inside
the SWT Browser, so v-model's initial DOM sync for the Start URL input
was being skipped and the persisted IdC URL never appeared in the field
on the first visit to the SSO form.

Switch the computed get/set pattern to local data() fields synced back
to Vuex via watch, and schedule a $nextTick callback from created()
that writes the persisted Start URL directly into the input once Vue
flushes its render. The callback bails if the user has already typed
(el.value non-empty) so it never overwrites user input.

* chore: update maintenance banner to end-of-support wording

Update banner message from 'maintenance mode' to 'end of support on
April 30, 2027' across all login surfaces.

* chore: update banner wording — new accounts unavailable starting 5/15
* feat(notifications): add one-time Kiro sunset toast on startup

Shows a sticky Mylyn notification popup once on plugin startup with
Dismiss and Learn more actions. Learn more opens https://kiro.dev in
the external browser. Dismissal is persisted in the plugin store so
the toast does not reappear on subsequent launches.

* chore: update sunset toast to end-of-support wording

- Title: 'Amazon Q Developer end of support'
- Body: end-of-support April 30 2027, new accounts unavailable 5/15
- Learn more URL: https://aws.amazon.com/q/developer/
Add upload-artifact steps to the Maven build workflow so the plugin
JAR and p2 update site ZIP are downloadable from the Actions tab on
every PR and main push. Retained for 30 days.
…lipping (#549)

* ci: upload plugin JAR and update site as build artifacts

Add upload-artifact steps to the Maven build workflow so the plugin
JAR and p2 update site ZIP are downloadable from the Actions tab on
every PR and main push. Retained for 30 days.

* fix(notifications): prevent Learn More from suppressing sunset toast and fix popup clipping

- Learn More now opens the URL and closes the popup without persisting
  the dismissed key, so the notification reappears on next launch
- Only the explicit Dismiss button suppresses future appearances
- Fix notification popup height calculation to use width-constrained
  computeSize so wrapped text and button row are not clipped
* chore: bump version to 2.7.1

* doc: patch #550
* chore: bump version to 2.7.1

* doc: patch #550

* chore: bump version to 2.7.2
* doc: update message in toast notification

* chore: bump version to 2.7.3
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.

7 participants