Skip to content

Sync upstream changes for 2026-06-13#53

Open
earayu wants to merge 95 commits into
mainfrom
chore/sync-upstream-2026-06-13
Open

Sync upstream changes for 2026-06-13#53
earayu wants to merge 95 commits into
mainfrom
chore/sync-upstream-2026-06-13

Conversation

@earayu

@earayu earayu commented Jun 13, 2026

Copy link
Copy Markdown
Collaborator

Closes #52

Summary

Sync aaif-goose/goose@main from f23347fc3 to 8b5a7b8f8.

Upstream commit:

Conflict Resolution

  • Preserved ApeMind Desktop branding where fixed conflicts recurred: productName, description, watermark, RECIPE_TRUST_WARNINGS_ENABLED, /pair cancel routing, Workflows navigation label, and en/zh i18n overrides.
  • Accepted upstream for Rust security / OTLP / session / tool inspection internals and dependency lock changes.
  • Fixed the recurring upstream blog trailing whitespace line while resolving the merge.

No product decision from ApeMind side is needed in this sync.

Verification

  • git grep -n "^<<<<<<< HEAD$": no conflict markers.
  • git diff --cached --check: passed before commit.
  • source ../../bin/activate-hermit && pnpm run lint:check in ui/desktop: passed.
  • source ./bin/activate-hermit && cargo check -p goose --lib: passed after temporarily adding vendor/v8 to sparse checkout.

Merge requires GitHub Actions green plus explicit @earayu2 authorization before squash merge.

dependabot Bot and others added 30 commits May 23, 2026 18:40
…oose#9381)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…CP init (aaif-goose#9357)

Signed-off-by: fresh3nough <anonwurcod@proton.me>
Signed-off-by: Angie Jones <jones.angie@gmail.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…cp-harness (aaif-goose#9395)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dejavu <dejavu@Mac.home>
Co-authored-by: dejavu <dejavu@Mac.home>
Signed-off-by: jh-block <jhugo@block.xyz>
…if-goose#9409)

Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
…2.28+ compat (aaif-goose#9415)

Signed-off-by: Andrew Mello <andrew@88plug.com>
Co-authored-by: Alex Hancock <alex@alexhancock.com>
Co-authored-by: jh-block <255854896+jh-block@users.noreply.github.com>
…if-goose#8747)

Signed-off-by: Bradley Axen <baxen@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…alling support, fixed thinking output parsing (aaif-goose#9442)

Signed-off-by: jh-block <jhugo@block.xyz>
Signed-off-by: Angie Jones <jones.angie@gmail.com>
…9285)

Signed-off-by: UGBOMEH OGOCHUKWU WILLIAMS <williamsugbomeh@gmail.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…PONSE_SIZE (aaif-goose#9256)

Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…se#9408)

Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Co-authored-by: Quentin Champenois <qchampenois@scaleway.com>
lifeizhou-ap and others added 30 commits June 4, 2026 22:39
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
Signed-off-by: morgmart <98432065+morgmart@users.noreply.github.com>
Co-authored-by: Lifei Zhou <lifei@squareup.com>
Signed-off-by: shenzhengyang <shenzhengyang@soundws.com>
Co-authored-by: shenzhengyang <shenzhengyang@soundws.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Michael Neale <michael.neale@gmail.com>
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Signed-off-by: jh-block <jhugo@block.xyz>
… models (aaif-goose#9753)

Signed-off-by: Kalvin Chau <kalvin@block.xyz>
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.

每日上游同步 2026-06-13