chore: sync upstream aaif-goose/goose@main (2026-06-03 daily sync, 1.36→1.37)#37
Merged
Conversation
…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>
aaif-goose#9422) Signed-off-by: Michael Neale <micn@block.xyz>
…se#9408) Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
aaif-goose#9443) Signed-off-by: Jeremy Dawes <jeremy@jezweb.net>
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>
Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
…se#9455) Signed-off-by: Matt Toohey <contact@matttoohey.com>
Signed-off-by: Bradley Axen <baxen@squareup.com> Signed-off-by: Matt Toohey <contact@matttoohey.com> Co-authored-by: Matt Toohey <contact@matttoohey.com>
Signed-off-by: Kalvin Chau <kalvin@block.xyz>
…goose#9420) Signed-off-by: Michael Neale <michael.neale@gmail.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
Signed-off-by: John Tennant <jtennant@squareup.com>
…hread panic (aaif-goose#9512) Co-authored-by: Joah's AI agent <noreply@blockxyz.com> Co-authored-by: Amp <amp@ampcode.com>
Signed-off-by: Angie Jones <jones.angie@gmail.com>
…path (aaif-goose#9388) Signed-off-by: Cameron Yick <cameron.yick@datadoghq.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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>
…6-03 daily sync) Daily 12:00 sync. 8 new upstream commits since baseline 586bb15, incl version bump 1.36.0 → 1.37.0 and a revert of the ACP+ extension refactor: - 9626b4c Replace review subprocess timeout with turn limits (aaif-goose#9571) - 003252f Import sessions (aaif-goose#9474) - cd12199 Bench marking (aaif-goose#9465) - 502ee50 / fdc1994 chore(release): 1.37.0 (aaif-goose#9565 / aaif-goose#9557) - 030dbb0 feat(security): directionality to egress logging (aaif-goose#9546) - 7982086 Pick the last canonical model (aaif-goose#9568) - 942a456 Revert "convert desktop v1 + goose-server extensions to ACP+ (aaif-goose#9448)" (aaif-goose#9564) Conflict resolution: - package.json / Cargo.toml: keep ApeMind Agent brand, take 1.37.0 version - BaseChat.tsx: keep our merged form (RECIPE_TRUST_WARNINGS_ENABLED flag + upstream scheduled-session bypass) + ApeCloud watermark - ParameterInputModal.tsx: keep navigate('/pair') - useNavigationItems.ts: keep "Workflows" recipes label - i18n en/zh-CN: keep "ApeMind Agent finished the task" + "Workflows"/"工作流" - api/index.ts, api/sdk.gen.ts, openapi.json, agent.rs, canonical data json, Cargo.lock: take upstream wholesale — these are autogenerated or the ACP+ revert restoring add_extension routes; no fork-specific content synced_upstream_commit advances 586bb15 → 9626b4c. Closes #36 Signed-off-by: earayu <earayu@163.com>
This was referenced Jun 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
现状
每日 12:00 上游同步（reminder #68dc5971）。基线 synced_upstream_commit =
586bb15d4（PR #35）。现象 / 影响
上游新增 8 个 commit（含 1.37.0 版本 bump + ACP+ 重构 revert）：
9626b4c3cReplace review subprocess timeout with turn limits (Replace review subprocess timeout with turn limits aaif-goose/goose#9571)003252fb5Import sessions (Import sesssions aaif-goose/goose#9474)cd1219960Bench marking (Bench marking aaif-goose/goose#9465)502ee508d/fdc1994bcrelease 1.37.0 (chore(release): release version 1.37.0 aaif-goose/goose#9565 / chore(release): bump version to 1.37.0 (minor) aaif-goose/goose#9557)030dbb0c5feat(security): directionality to egress logging (feat(security): Add directionality to egress logging aaif-goose/goose#9546)798208689Pick the last canonical model (Pick the last canonical model aaif-goose/goose#9568)942a4564eRevert ACP+ refactor (refactor: convert desktop v1 and goose-server extensions to ACP+ aaif-goose/goose#9448) (Revert "refactor: convert desktop v1 and goose-server extensions to ACP+ (#9448)" aaif-goose/goose#9564) ← 恢复了 add_extension 路由 + 相关 APIgit merge撞较多冲突（品牌 6 处 + ACP+ revert 引入的 api/agent/canonical 数据/Cargo 文件）。期望结果
冲突全解，等 earayu2 1 次明确合并授权后并入 main。版本 1.36.0 → 1.37.0。synced_upstream_commit 推进到
9626b4c3c。冲突解决：
验收
git grep 无冲突标记残留；品牌 productName=ApeMind Agent + version 1.37.0；bundled-recipes 配置保留；CI 绿（Cloudflare Pages 文档预览 fail 属基础设施不阻塞）。@冯诺伊曼 3F 重包验证品牌/UX/recipe 行为。
不解决什么
不增删 fork-specific 改动；不修上游 wedge / Keychain bug。
关联