chore: sync upstream aaif-goose/goose@main (2026-06-06 daily sync)#43
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>
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>
…9552) Signed-off-by: jh-block <jhugo@block.xyz>
…-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>
…apability in the initialization request (aaif-goose#9596)
Co-authored-by: Douwe Osinga <douwe@squareup.com>
…6-06 daily sync) Daily 12:00 sync. 4 new upstream commits since baseline ec519ee: - 4904e3c Image read tool (aaif-goose#9607) - 826f13f create goose-providers crate with canonical models (aaif-goose#9588) - 2f99664 feat: acp methods for config extensions (aaif-goose#9581) - 65b72b2 refactor: remove dead component + useNavigationSessions cleanup (aaif-goose#9603) 17 conflict files, 2 categories: - Brand-preservation (6, kept ours): package.json productName + 1.37.0 / BaseChat watermark + RECIPE_TRUST_WARNINGS_ENABLED+scheduled merged form / ParameterInputModal navigate('/pair') / useNavigationItems Workflows label / i18n en+zh - Rust/Cargo/SDK/autogen + new locales (11, took upstream wholesale, no fork content): Cargo.lock, goose/Cargo.toml, goose-providers canonical/catalog.rs, acp/server/extensions.rs, acp_custom_requests_test, ui acp/extensions.ts, ui/sdk generated index+types+client.gen.ts, new upstream ru.json + tr.json locales synced_upstream_commit advances ec519ee → 4904e3c. Closes #42 Signed-off-by: earayu <earayu@163.com>
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 =
ec519eeaa（PR #41）。现象 / 影响
上游新增 4 个 commit：
4904e3c85Image read tool (Image read tool aaif-goose/goose#9607)826f13f34新建 goose-providers crate（canonical models / conversation 类型）(create goose-providers crate with canonical models, conversation and other types aaif-goose/goose#9588)2f9966422feat: config extensions 的 acp methods (feat: acp methods for config extensions aaif-goose/goose#9581)65b72b298refactor: 删除 dead component + useNavigationSessions 清理 (refactor: remove dead component and useNavigationSessions cleanup aaif-goose/goose#9603)git merge撞 17 个冲突。期望结果
冲突全解，等 earayu2 1 次明确合并授权后并入 main。synced_upstream_commit 推进到
4904e3c85。冲突点（2 类，无需裁决）：
注：ru/tr 是上游新增的俄/土语翻译，非我们主语言（en+zh），取上游可接受。
验收
git grep 无冲突标记残留；productName=ApeMind Agent + 1.37.0；CI 绿（Cloudflare Pages 文档预览 fail 属基础设施不阻塞）。
不解决什么
不增删 fork-specific 改动；不修上游 wedge / Keychain bug。
关联