chore: sync upstream aaif-goose/goose@main (2026-06-02 daily sync)#35
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>
Signed-off-by: Kalvin Chau <kalvin@block.xyz>
…goose#9420) Signed-off-by: Michael Neale <michael.neale@gmail.com>
Signed-off-by: Bradley Axen <baxen@squareup.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>
…6-02 daily sync) Daily 12:00 sync. 5 new upstream commits since baseline 8af2f76: - 586bb15 fix(extension-manager): forward custom headers through OAuth connect path (aaif-goose#9388) - cd8f718 Fix scheduled recipe session params (aaif-goose#9553) - f69a178 fix(otel): skip OTLP signals when protocol=grpc (aaif-goose#9512) - 5e160e5 Honor blocking Stop hook decisions (aaif-goose#9468) - 5508079 chore: update canonical model registry (aaif-goose#9551) Conflict resolution (6): - package.json: keep ApeMind Agent productName/description, 1.36.0 - BaseChat.tsx: MERGE both sides — keep our RECIPE_TRUST_WARNINGS_ENABLED feature-flag AND upstream's scheduled-session bypass (aaif-goose#9553). canAutoSubmit now also short-circuits on session_type==='scheduled'; warning useEffect early-returns on scheduled too; RecipeWarningModal render gated on both flag-enabled AND not-scheduled. - 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 8af2f76 → 586bb15. Closes #34 Signed-off-by: earayu <earayu@163.com>
This was referenced Jun 3, 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 =
8af2f7609（PR #33）。现象 / 影响
上游新增 5 个 commit：
586bb15d4fix(extension-manager): forward custom headers through OAuth connect path (fix(extension-manager): forward custom headers through OAuth connect path aaif-goose/goose#9388)cd8f718bbFix scheduled recipe session params (Fix scheduled recipe session params aaif-goose/goose#9553)f69a1780dfix(otel): skip OTLP signals when protocol=grpc (fix(otel): skip OTLP signals when protocol=grpc to avoid background-thread panic aaif-goose/goose#9512)5e160e51eHonor blocking Stop hook decisions (Honor blocking Stop hook decisions aaif-goose/goose#9468)5508079bbchore: update canonical model registry (chore: update canonical model registry aaif-goose/goose#9551)git merge撞 6 个冲突。其中 BaseChat.tsx 是新冲突变体：上游 aaif-goose#9553 给canAutoSubmit/ warning useEffect / RecipeWarningModal 渲染加了session_type==='scheduled'bypass，与我们的RECIPE_TRUST_WARNINGS_ENABLEDfeature-flag 重叠。期望结果
冲突全解，等 earayu2 1 次明确合并授权后并入 main。synced_upstream_commit 推进
8af2f7609→586bb15d4。冲突解决：
验收
grep 无冲突标记残留；品牌 + bundled-recipes 保留；scheduled recipe 场景按上游 aaif-goose#9553 行为不弹警告；CI 绿（Cloudflare Pages 文档预览 fail 属基础设施不阻塞）。
不解决什么
不增删 fork-specific 改动；不修上游 wedge / Keychain bug。
关联