Sync upstream changes for 2026-06-09#45
Open
earayu wants to merge 75 commits into
Open
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>
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>
…-2026-06-09 # Conflicts: # Cargo.lock # crates/goose-cli/Cargo.toml # crates/goose-cli/src/session/mod.rs # crates/goose-providers/Cargo.toml # crates/goose-providers/src/canonical.rs # crates/goose-providers/src/canonical/mod.rs # crates/goose-providers/src/conversation.rs # crates/goose-providers/src/conversation/mod.rs # crates/goose-providers/src/lib.rs # crates/goose-server/Cargo.toml # crates/goose/src/agents/agent.rs # crates/goose/src/conversation/mod.rs # crates/goose/src/execution/manager.rs # crates/goose/src/providers/base.rs # crates/goose/src/providers/canonical/mod.rs # crates/goose/src/providers/databricks.rs # crates/goose/src/providers/databricks_v2.rs # crates/goose/src/providers/huggingface.rs # crates/goose/src/providers/local_inference/llamacpp/inference_emulated_tools.rs # crates/goose/src/providers/local_inference/llamacpp/inference_engine.rs # crates/goose/src/providers/local_inference/llamacpp/inference_native_tools.rs # crates/goose/src/providers/openai_compatible.rs # crates/goose/src/providers/xai_oauth.rs # crates/goose/src/recipe/manifest.rs # 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/zh-CN.json
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 上游同步检查发现
aaif-goose/goose@main自当前同步基线4904e3c85之后新增 2 个提交，本 PR 同步到8eb6cd60d。Closes #44
上游新增提交
e5fd568e0/ move formats/openai.rs into goose-providers crate, along with several dependencies aaif-goose/goose#9633：把formats/openai.rs及相关 provider 依赖继续迁移到goose-providerscrate。8eb6cd60d/ fix: compatibility of config extension acp call in TUI aaif-goose/goose#9683：修复 TUI 中 config extension ACP 调用兼容性。冲突处理
A. 品牌保留点
ui/desktop/package.json：保留productName: ApeMind Agent与description: ApeMind Agent Desktop，版本跟随上游仍为1.37.0。ui/desktop/src/components/BaseChat.tsx：保留右上角 ApeCloud logo +ApeMind Agent水印；保留RECIPE_TRUST_WARNINGS_ENABLED = false逻辑。ui/desktop/src/components/ParameterInputModal.tsx：保留取消 workflow 参数输入后跳转/pair。ui/desktop/src/hooks/useNavigationItems.ts：保留侧边栏Workflows文案。ui/desktop/src/i18n/messages/en.json/zh-CN.json：保留Workflows/工作流和ApeMind Agent finished the task.。B. 上游内部迁移整体取上游
conversation/canonical的mod.rs到单文件 rename 按上游结构处理。Cargo.lock与相关Cargo.toml跟随上游。C. 依赖锁
Cargo.lock按上游结果更新。验证
git grep -n "^<<<<<<< HEAD$"：无冲突标记残留。git diff --cached --check：无空白错误。cargo check：当前机器没有 Rust 工具链，cargo不在 PATH；编译验证以 GitHub Actions 为准。合并要求
等待 @earayu2 一次明确合并授权后再合并。