Skip to content

Sync upstream changes through 2026-06-15 - #55

Merged
earayu merged 102 commits into
mainfrom
chore/sync-upstream-2026-06-15
Jun 15, 2026
Merged

Sync upstream changes through 2026-06-15#55
earayu merged 102 commits into
mainfrom
chore/sync-upstream-2026-06-15

Conversation

@earayu

@earayu earayu commented Jun 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

Closes #54.

Sync upstream changes from aaif-goose/goose@9d166ecee to aaif-goose/goose@3063de758.

Upstream commits included:

Conflict handling

  • Preserved ApeMind branding and workflow customizations; final diff does not touch the fixed branding files.
  • Took upstream provider/canonical changes.
  • During merge, recurring Desktop/i18n conflict files were inspected and restored to the ApeMind side where no current upstream change was needed.

Validation

  • git grep -n "^<<<<<<< HEAD$": no conflict markers.
  • git diff --cached --check: passed before commit.
  • corepack pnpm@10.30.0 run lint:check in ui/desktop: passed.
  • cargo check -p goose --lib: passed.

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 28 commits June 9, 2026 21:48
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>
Signed-off-by: Kunall Banerjee <hey@kimchiii.space>
…se#9735)

Signed-off-by: Michael Neale <michael.neale@gmail.com>
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>
…-2026-06-15

# Conflicts:
#	documentation/blog/2025-04-22-mcp-is-rewriting-the-rules-of-api-integration/index.md
#	ui/desktop/package.json
#	ui/desktop/src/components/BaseChat.tsx
#	ui/desktop/src/components/ParameterInputModal.tsx
#	ui/desktop/src/hooks/useNavigationItems.ts
#	ui/desktop/src/i18n/messages/en.json
#	ui/desktop/src/i18n/messages/hi.json
#	ui/desktop/src/i18n/messages/ja.json
#	ui/desktop/src/i18n/messages/ru.json
#	ui/desktop/src/i18n/messages/tr.json
#	ui/desktop/src/i18n/messages/zh-CN.json
@earayu
earayu merged commit 326814e into main Jun 15, 2026
23 checks passed
@earayu
earayu deleted the chore/sync-upstream-2026-06-15 branch June 15, 2026 07:12
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-15