Skip to content

Sync upstream changes through 2026-06-29 - #82

Merged
earayu merged 297 commits into
mainfrom
chore/sync-upstream-2026-06-29
Jun 29, 2026
Merged

Sync upstream changes through 2026-06-29#82
earayu merged 297 commits into
mainfrom
chore/sync-upstream-2026-06-29

Conversation

@earayu

@earayu earayu commented Jun 29, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Closes 每日上游同步 2026-06-29 #81.
  • Sync upstream block/goose from 887845278 to ec0ae7e12.
  • Includes upstream ACP permission manager updates, new Desktop locales, CLI /edit history persistence, and hooks payload docs update.

Upstream commits

Conflict handling

  • Preserved ApeMind Agent identity in the system prompt.
  • Preserved ApeMind Desktop branding and app settings copy while accepting upstream locale expansion.
  • Merged ACP tool permission handling so ACP permission manager updates are used, while the existing global permission manager remains updated for Desktop REST compatibility.
  • Accepted upstream CLI /edit history behavior and hooks docs wording.
  • Regenerated and validated i18n message files; removed stale keys from non-English locale files.

Validation

  • git diff --check
  • git diff --cached --check
  • git grep -n "^<<<<<<< HEAD$" (no matches)
  • corepack pnpm@10.30.0 --dir ui/desktop run i18n:extract
  • corepack pnpm@10.30.0 --dir ui/desktop run i18n:check
  • corepack pnpm@10.30.0 --filter @aaif/goose-sdk run build
  • corepack pnpm@10.30.0 --dir ui/desktop run lint:check
  • corepack pnpm@10.30.0 --dir ui/desktop run test:run (49 files / 461 tests)
  • PATH="$PWD/bin:$PATH" cargo fmt --all --check
  • PATH="$PWD/bin:$PATH" cargo test -p goose --features "rustls-tls,code-mode" acp::server --lib (92 tests)
  • PATH="$PWD/bin:$PATH" cargo test -p goose --features "rustls-tls,code-mode" agents::prompt_manager::tests --lib (11 tests)
  • PATH="$PWD/bin:$PATH" cargo test -p goose-cli --features "rustls-tls,code-mode" session --lib (149 tests)

Product decision

No new ApeMind product tradeoff found. This is an upstream sync preserving the established branding/package behavior.

DOsinga and others added 30 commits June 2, 2026 20:13
Signed-off-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…-goose#9575)

Signed-off-by: Angie Jones <jones.angie@gmail.com>
Co-authored-by: Angie Jones <jones.angie@gmail.com>
Signed-off-by: jh-block <jhugo@block.xyz>
…with 10 updates (aaif-goose#9587)

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>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…20 (aaif-goose#9498)

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

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>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
DOsinga and others added 28 commits June 25, 2026 14:06
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
)

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
@earayu
earayu merged commit 5b0e667 into main Jun 29, 2026
21 of 24 checks passed
@earayu
earayu deleted the chore/sync-upstream-2026-06-29 branch June 29, 2026 04:47
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-29