Skip to content

Sync upstream changes through 2026-06-19 - #57

Merged
earayu merged 213 commits into
mainfrom
chore/sync-upstream-2026-06-16
Jun 19, 2026
Merged

Sync upstream changes through 2026-06-19#57
earayu merged 213 commits into
mainfrom
chore/sync-upstream-2026-06-16

Conversation

@earayu

@earayu earayu commented Jun 16, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Extend the existing upstream sync PR from upstream 802dd3916 through 5dcd3ff34 after the 2026-06-19 daily reminder.
  • Overall PR Sync upstream changes through 2026-06-19 #57 now syncs upstream aaif-goose/goose main from 3063de758 through 5dcd3ff34 (109 upstream commits total: original 25, plus 66 from 2026-06-18, plus 18 from 2026-06-19).
  • New 2026-06-19 upstream changes include provider trait / ModelConfig / ApiClient migration into goose-providers, request logging refactor, ACP chat/session UI state, Korean locale support, Bedrock OpenAI GPT via mantle endpoint, GCP token refresh retry, Moim updates, Ophis MCP registry entry, AAIF migration docs, and embeddings support removal.
  • Preserve ApeMind Agent fork customizations for product name/description, Workflows naming, task notification branding, product watermark, recipe warning disable gate, /pair cancel behavior, and system prompt branding.

Closes #56
Closes #58

Conflict handling

  • Resolved crates/goose/src/prompts/system.md by keeping ApeMind Agent product identity while adding upstream moim_system_prompt_block.
  • Kept prior 2026-06-18 conflict resolutions for App.tsx, BaseChat.tsx, fixed ApeMind en/zh branding, Workflows wording, and /pair behavior.
  • Took upstream for generated/internal files: Cargo.lock, OpenAPI/types, ACP/server/session internals, provider refactors, provider inventory/local inference, workflows/dependencies, docs/evals, and generated SDK artifacts.
  • Added upstream Korean locale, then removed three extra keys flagged by local i18n parity validation.
  • Refreshed local @aaif/goose-sdk build artifacts for typechecking, then kept only source/generated SDK files in the commit.
  • Increased two slow ExtensionModal test timeouts to 10s after full-suite Vitest repeatedly exceeded the default 5s while the file passed in isolation.

Validation

  • rg -n '^(<<<<<<<|=======|>>>>>>>)' (no conflict markers)
  • git diff --cached --check
  • git diff --check
  • corepack pnpm@10.30.0 --filter @aaif/goose-sdk run build
  • corepack pnpm@10.30.0 run lint:check (Desktop typecheck, eslint, i18n validation; passed with existing FormatJS duplicate-id warnings)
  • corepack pnpm@10.30.0 exec vitest run src/components/__tests__/ParameterInputModal.test.tsx src/i18n/i18n.test.ts (2 files / 32 tests)
  • corepack pnpm@10.30.0 exec vitest run src/components/settings/extensions/modal/ExtensionModal.test.tsx (7 tests)
  • corepack pnpm@10.30.0 exec vitest run (40 files / 420 tests)

Not run

  • cargo check -p goose --lib: current machine PATH has no cargo/rustup/mise available, so Rust validation is left to GitHub Actions.

Merge note

  • The previous 2026-06-16 approval covered the e4329c7b6 sync only. This PR now contains additional 2026-06-18 and 2026-06-19 upstream commits, so it needs fresh merge authorization after CI is green or explicitly waived.

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>
michaelneale and others added 5 commits June 17, 2026 20:44
Signed-off-by: Michael Neale <michael.neale@gmail.com>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
…e#9802)

Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
@earayu earayu changed the title Sync upstream changes through 2026-06-16 Sync upstream changes through 2026-06-18 Jun 18, 2026
lifeizhou-ap and others added 18 commits June 18, 2026 08:06
Signed-off-by: lhs <lhs@lhsui-Macmini.local>
Signed-off-by: soolmuk <72430756+soolmuk@users.noreply.github.com>
Co-authored-by: lhs <lhs@lhsui-Macmini.local>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Signed-off-by: Michael Neale <michael.neale@gmail.com>
…int (aaif-goose#9707)

Signed-off-by: Hugues Clouâtre <hugues@linux.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
… 401/403) (aaif-goose#9849)

Signed-off-by: Michael Neale <michael.neale@gmail.com>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Michael Neale <michael.neale@gmail.com>
@earayu earayu changed the title Sync upstream changes through 2026-06-18 Sync upstream changes through 2026-06-19 Jun 19, 2026
@earayu
earayu merged commit 82460bc into main Jun 19, 2026
22 of 25 checks passed
@earayu
earayu deleted the chore/sync-upstream-2026-06-16 branch June 19, 2026 04:51
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-19 每日上游同步 2026-06-16/18