Skip to content

Sync upstream changes through 2026-06-23 - #65

Merged
earayu merged 244 commits into
mainfrom
chore/sync-upstream-2026-06-23
Jun 23, 2026
Merged

earayu merged 244 commits into
mainfrom
chore/sync-upstream-2026-06-23

Conversation

@earayu

@earayu earayu commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Sync upstream aaif-goose/goose from 659257316 through d58f84134.
  • Carry forward ApeMind Agent fork branding, updater defaults, workflow terminology, and /pair cancel behavior.
  • Regenerate ACP/OpenAPI SDK artifacts and Desktop i18n catalogs after upstream ACP/session-extension changes.

Upstream commits

Conflict handling

  • Kept fork-side branding/product behavior: ApeMind Agent app metadata, BaseChat watermark/logo and disabled workflow warning modal, /pair cancel path, Workflows/工作流 navigation and EN/ZH i18n, updater defaults for apecloud/apemind-agent, release artifact globs for ApeMind Agent*.zip.
  • Took upstream internal/provider/ACP changes for the OpenAI provider move into goose-providers, ACP recipe/session-extension request handling, Windows Job Object cleanup, slash command and provider/dependency changes.
  • Regenerated Desktop i18n catalogs and ui/sdk generated client after resolving the source text and schema changes.

Validation

  • git grep -n '^<<<<<<< HEAD$' (no conflict markers)
  • git diff --cached --check
  • git diff --check
  • corepack pnpm@10.30.0 --filter @aaif/goose-sdk run build
  • ui/desktop: corepack pnpm@10.30.0 run lint:check
  • ui/desktop: corepack pnpm@10.30.0 run test:run (44 files / 417 tests)

Rust local checks were not run on this machine because cargo is not available on PATH.

Closes #64

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 28 commits June 20, 2026 22:41
Signed-off-by: Douwe Osinga <douwe@sidewalklabs.com>
Co-authored-by: Crazyop757 <83007860+Crazyop757@users.noreply.github.com>
Co-authored-by: Douwe Osinga <douwe@sidewalklabs.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#9896)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ose#9893)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Joseph Malone <jlmalone@users.noreply.github.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
…goose#9835)

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>
…de (aaif-goose#9482)

Signed-off-by: Pluviobyte <Pluviobyte@users.noreply.github.com>
Co-authored-by: Pluviobyte <Pluviobyte@users.noreply.github.com>
@earayu
earayu merged commit 526434f into main Jun 23, 2026
20 of 23 checks passed
@earayu
earayu deleted the chore/sync-upstream-2026-06-23 branch June 23, 2026 16:14
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-23