Sync upstream changes through 2026-06-22 - #63
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #62
Summary
aaif-goose/goosefromd2a921a75through659257316.newSessionfor non-recipe Desktop sessions.Upstream commits
2712c066b/ feat (acp): used typed request and response for add, get session extensions aaif-goose/goose#9890:feat (acp): used typed request and response for add, get session extensions.b893b5f2/ chore: removed create recipe from session modal and rest api aaif-goose/goose#9916:chore: removed create recipe from session modal and rest api.659257316/ feat(ui): use acp new session on desktop (only for non recipe session) aaif-goose/goose#9914:feat(ui): use acp new session on desktop (only for non recipe session).Conflict handling
BaseChat: logo/watermark remainsApeMind Agent, andRECIPE_TRUST_WARNINGS_ENABLED = falseremains unchanged.ParameterInputModalcancel/close navigation back to/pair.ApeMind Agenttask notification strings and Workflows/工作流 wording.Validation
git grep -n "^<<<<<<< HEAD$"found no conflict markers.git diff --check origin/main...HEADcorepack pnpm@10.30.0 --filter @aaif/goose-sdk run buildcorepack pnpm@10.30.0 run lint:checkinui/desktop(passes; existing FormatJS duplicate-id warning for task-complete notification remains).corepack pnpm@10.30.0 run test:runinui/desktop(43 files / 411 tests passed).Rust local check was not run on this machine because
cargo/rustupare not present in PATH.