chore: sync upstream aaif-goose/goose@main (2026-05-29 second sync)#29
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>
…5-29 second sync) Second daily sync. 3 new upstream commits since first sync (PR #28): - Expose raw provider supported models over ACP (aaif-goose#9475) - fix(acp): forward ACP server context window size to clients (aaif-goose#9455) - Add ACP session system prompt setter (aaif-goose#9478) Conflict resolution (6, all same brand-preservation pattern as first sync): - package.json: keep ApeMind Agent productName/description, 1.36.0 - BaseChat.tsx: keep ApeCloud "Product watermark" comment - ParameterInputModal.tsx: keep navigate('/pair') (our PR #27) over upstream onClose() - useNavigationItems.ts: keep "Workflows" label for recipes nav - i18n en/zh-CN: keep "ApeMind Agent finished the task" + "Workflows"/"工作流" 5-cat compliance: standard upstream-tracking sync per HRBP rule; earayu2 authorized "再合并一波上游代码". Signed-off-by: earayu <earayu@163.com>
This was referenced May 30, 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.
现状
第二次每日上游同步（reminder #68dc5971 触发节奏 + earayu2 手动追加"再合并一波上游代码"）。距首次同步 PR #28 后上游新增 3 个 commit。
现象
git merge upstream/main撞 6 个内容冲突，全部是与首次同步同类的品牌保留冲突（上次 squash-merge 让 git 重新呈现上游 vs 我们品牌的差异）。影响
期望结果
按 (B) feature branch 流程解决全部冲突，等 earayu2 一次明确合并授权后并入 main。
冲突解决（6，全部品牌保留同模式）：
package.json：留 ApeMind Agent productName / description，版本 1.36.0BaseChat.tsx：留 ApeCloud "Product watermark" 注释 + logoParameterInputModal.tsx：留navigate('/pair')（我们 PR fix(desktop): keep workflow cancel in current window #27），丢上游onClose()useNavigationItems.ts：recipes 导航项保留 "Workflows" labeli18n en/zh-CN：保留 "ApeMind Agent finished the task" + "Workflows" / "工作流"验收
<<<<<<<残留冲突标记不解决什么
关联