chore: sync upstream aaif-goose/goose@main (2026-05-30 daily sync)#30
Open
earayu wants to merge 37 commits into
Open
chore: sync upstream aaif-goose/goose@main (2026-05-30 daily sync)#30earayu wants to merge 37 commits into
earayu wants to merge 37 commits into
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>
…5-30 daily sync) Daily 12:00 sync. 1 new upstream commit since baseline 25ff547: - feat: replay acp images on session load (aaif-goose#9496) → 13f7be2 Conflict resolution (6, same brand-preservation pattern): - package.json: keep ApeMind Agent productName/description, 1.36.0 - BaseChat.tsx: keep "Product watermark" comment + ApeCloud logo - ParameterInputModal.tsx: keep navigate('/pair') (our PR #27) - useNavigationItems.ts: keep "Workflows" recipes label - i18n en/zh-CN: keep "ApeMind Agent finished the task" + "Workflows"/"工作流" synced_upstream_commit advances 25ff547 → 13f7be2. 5-cat compliance: standard upstream-tracking sync; earayu2 set up daily 12:00 sync task (reminder #68dc5971). 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 =
25ff54748（PR #29），上游新增 1 个 commit。现象 / 影响
git merge upstream/main撞 6 个同类品牌保留冲突。新增内容：feat: replay acp images on session load (#9496)→13f7be2ed。期望结果
冲突全解，等 earayu2 1 次明确合并授权后并入 main。
冲突解决（6，品牌保留同模式）：
package.json：ApeMind Agent productName / 1.36.0BaseChat.tsx：Product watermark + ApeCloud logoParameterInputModal.tsx：navigate('/pair')（PR fix(desktop): keep workflow cancel in current window #27）useNavigationItems.ts：recipes "Workflows" labeli18n en/zh-CN：ApeMind Agent finished the task + Workflows / 工作流synced_upstream_commit 推进
25ff54748→13f7be2ed。验收
不解决什么
关联
Closes #31