Skip to content

Merge main into feature/qdev-signup-block-delay - #2842

Open
aws-toolkit-automation wants to merge 2 commits into
feature/qdev-signup-block-delayfrom
autoMerge/feature/qdev-signup-block-delay
Open

Merge main into feature/qdev-signup-block-delay#2842
aws-toolkit-automation wants to merge 2 commits into
feature/qdev-signup-block-delayfrom
autoMerge/feature/qdev-signup-block-delay

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/qdev-signup-block-delay
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/qdev-signup-block-delay

…em silently (#2841)

When a tool-use content block is streamed but the response ends before its terminating
`stop` event (e.g. the output-token limit is reached mid tool-input), the tool-use input
is never JSON-parsed and no error is recorded, so the parser reports success. The agentic
loop keeps only stopped tool uses as pending, so the unterminated one is filtered out, the
turn is reported as Succeeded, and the loop breaks -- the tool never runs and the user sees
no error or retry.

Add AgenticChatEventParser.finalize(), called once the response stream is fully consumed:
any tool use still lacking a stop is marked stopped and given an incomplete-input error
(reusing the malformed-JSON prefix) so it survives the pending-tool-use filter and is routed
into the existing recovery path, which re-prompts the model to split the work into smaller
tool uses. User cancellation is unaffected (aborts throw before finalize runs).
@aws-toolkit-automation
aws-toolkit-automation requested a review from a team as a code owner August 18, 2026 20:45
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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