chore: sync upstream aaif-goose/goose@main (2026-06-04 daily sync)#39
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: 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>
…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>
…6-04 daily sync) Daily 12:00 sync. 14 new upstream commits since baseline 9626b4c (mostly dependency bumps + ACP session refactor + HF OAuth): - dc59e41 acp session setup refactor (aaif-goose#9488) - 30034b9 Add Hugging Face OAuth support + auth tab (aaif-goose#9552) - 08e7480 LRU cache for token counting (aaif-goose#9586) - f6caaa0 fix intermittent missing extension override on ui (aaif-goose#9575) - 83a4abf fix: quote release PR search phrase (aaif-goose#9573) - 9 dependency bumps (pnpm-action, scorecard, cargo-deny, tokenizers, clap_mangen, strum, pkcs8, mockall, cargo-minor-patch group) 24 conflict files, 3 categories: - Brand-preservation (6, kept ours): package.json productName + version 1.37.0 / BaseChat watermark + RECIPE_TRUST_WARNINGS_ENABLED+scheduled merged form / ParameterInputModal navigate('/pair') / useNavigationItems Workflows label / i18n en+zh Workflows/工作流 + "ApeMind Agent finished the task" - Rust/Cargo/autogen/ACP-refactor (18, took upstream wholesale, no fork content): Cargo.lock, Cargo.toml, crates/goose-cli/Cargo.toml + cli.rs, config_management.rs, crates/goose/Cargo.toml, acp/server.rs, execution/manager.rs, providers/init.rs, hf_models.rs, 2 acp tests, api/index.ts, api/sdk.gen.ts, BottomMenuExtensionSelection.tsx, SettingsView.tsx, ui/sdk generated index.ts + types.gen.ts synced_upstream_commit advances 9626b4c → dc59e41. Closes #38 Signed-off-by: earayu <earayu@163.com>
This was referenced Jun 5, 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 =
9626b4c3c（PR #37）。现象 / 影响
上游新增 14 个 commit（多数依赖 bump + ACP session 重构 + HF OAuth）：
dc59e4194acp session setup refactor (Lifei/acp session setup refactor aaif-goose/goose#9488)30034b9b3Hugging Face OAuth support + auth tab (Add Hugging Face OAuth support, add auth tab to settings aaif-goose/goose#9552)08e748051LRU cache for token counting (Use LRU cache for token counting aaif-goose/goose#9586)f6caaa03bfix intermittent missing extension override on ui (Fixed intermittent missing extension override on ui and cleanup aaif-goose/goose#9575)83a4abf3efix: quote release PR search phrase (fix: quote release PR search phrase in pre-release.sh aaif-goose/goose#9573)git merge撞 24 个冲突（绝大多数是依赖 bump + ACP 重构波及的 Rust/自动生成文件）。期望结果
冲突全解，等 earayu2 1 次明确合并授权后并入 main。synced_upstream_commit 推进到
dc59e4194。冲突点（3 类，无需 earayu2 裁决）：
验收
git grep 无冲突标记残留；productName=ApeMind Agent + version 1.37.0；bundled-recipes 保留；CI 绿（Cloudflare Pages 文档预览 fail 属基础设施不阻塞）。
不解决什么
不增删 fork-specific 改动；不修上游 wedge / Keychain bug。
关联