Skip to content
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

Merge master into feature/agentic-chat #6914

Merged
merged 22 commits into from
Apr 7, 2025

Conversation

aws-toolkit-automation
Copy link
Collaborator

@aws-toolkit-automation aws-toolkit-automation commented Apr 2, 2025

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/agentic-chat
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/agentic-chat

Testing

  • Verified agentic chat features manually
  • Ran unit tests

atonaamz and others added 3 commits April 1, 2025 16:31

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Problem
Users lose all chats when they close VSCode, and there's no way to
browse through chat history. Users also cant export their conversations
to an easily shareable format.

## Solution
Automatically persist conversations to JSON files in
`~/.aws/amazonq/history`, one for each workspace where Amazon Q chats
occur. Add chat history and chat export buttons to top of Amazon Q
toolbar. Clicking on the chat history button allows users to browse and
search through chat history. Users click on an old conversation to open
it back up (currently open conversations are in bold). Clicking on chat
export button allows users to save chat transcript as a markdown or
html.

Note: persistence + history is only for Q Chat Tabs (not /dev, /doc,
/transform, etc.)
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners April 2, 2025 16:37
Copy link

github-actions bot commented Apr 2, 2025

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
feat(amazonq): automatically generate fix without clicking Generate Fix button
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner April 2, 2025 17:00
zelzhou and others added 17 commits April 2, 2025 14:23

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…ateMachine in CDK Applications (#6874)

## Problem
As we added support for WorkflowStudio in Toolkit for editing ASL
language files, we want to upgrade the render StateMachine Graph in CDK
applications experience with the a readonly mode of WorkflowStudio which
has better visualization, a code pane for view ASL definition, an export
mechanism for exporting ASL definition in JSON/YAML or PNG/SVG.

## Solution
Removed the old visualization classes that links to the legacy renderer
CDN. From the `renderStateMachineGraphCDK` wizard, upon finding the
`template.json` file for a specific stateMachine, we send the file uri
to WorkflowStudioEditorProvider to open a readonly WFS to render the
StateMachine Graph.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Problem
Users currently cannot access logs generated by the Agent when it
executes user commands during code generation.

## Solution
The output generated by the Agent during user command execution will be
captured and written to the user's `logs`. This ensures that:

- Command execution logs are persisted locally
- Users can access the logs directly from their repository for
troubleshooting.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Problem
unreliable test
fix #6913

## Solution
Move the spy instantiation closer to reduce side effects. Add delay
before start running command so additional for clean up to reduce chance
of flakiness. Change assertion from true/false to count comparison to
give more info for debugging in case the flakiness persists into the
future.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Problem
clicking the Export button on a fresh conversation doesn't include
answers from Q in the exported markdown/html. Answers are included if
Export is clicked after closing/reopening IDE

## Solution
hide export chat from tab bar

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Problem
/review test is flaky, but I was not able to reproduce.

## Solution
skip this test for this week to unblock

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Problem
fix #6921

## Solution
Refactor the tests for cleaner creating and deletion template.yaml file.
- Scope and group tests cases based on required starting template. 
- Update assertion and error message.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Problem
Need to add additional fields to the chat history schema to support
agentic chat

## Solution
 - Create new Message type to store all history fields
 - Add messageToChatMessage converter
 - Replace use of ChatItem type with Message type
 - Use messageToChatMessage converter to create triggerPayload history
Problem:

    SSH Agent
      can start the agent on windows:
      Error: Test length exceeded max duration: 30 seconds
    [No Pending UI Elements Found]
      at Timeout._onTimeout (D:\a\aws-toolkit-vscode\aws-toolkit-vscode\packages\core\src\test\setupUtil.ts:46:32)

Solution:
- retry 2 times.
Problem:
Unhandled promise rejection results in mysterious CI log message:

    rejected promise not handled within 1 second:
    Error: Command exited with non-zero code: 1

Solution:
Include the command name+args in the rejection message.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
@zixlin7 zixlin7 merged commit 1ca2650 into feature/agentic-chat Apr 7, 2025
27 of 31 checks passed
@zixlin7 zixlin7 deleted the autoMerge/feature/agentic-chat branch April 7, 2025 18:27
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.

None yet

10 participants