Sync upstream changes through 2026-06-27 by earayu · Pull Request #73 · apecloud/apemind-agent

earayu · 2026-06-27T04:30:49Z

Closes #72

上游范围

基线：59b28e455
目标：98a13fff4
上游提交：8 个

逐条变更：

22883e370 / feat(acp): migrate upsertPermissions to setToolPermissions ACP method aaif-goose/goose#9999：ACP 权限接口从 upsertPermissions 迁移到 setToolPermissions。
ec450a630 / fix: removed fallback rest api call in ACP mode for edit in place aaif-goose/goose#10034：ACP 模式 edit-in-place 移除 fallback REST 调用。
d9cf38371 / chore: ignore Zed settings aaif-goose/goose#10043：忽略 Zed settings。
f0a3ed3a5 / refactor: replace getTunnelStatus with GOOSE_DISABLE_NOSTR_SHARING config flag aaif-goose/goose#10044：用 GOOSE_DISABLE_NOSTR_SHARING 配置替代 tunnel status 查询。
35999d49f / add ACP+ handlers for prompt editing aaif-goose/goose#10031：新增 ACP+ prompt editing handlers。
d1d216619 / Support streamed tool calls without indexes aaif-goose/goose#10023：支持无 index 的 streamed tool calls。
2fda76064 / feat(acp+): models/providers in desktop on ACP+ aaif-goose/goose#9987：ACP+ 下桌面端 models/providers 配置能力。
98a13fff4 / feat(acp+): config in desktop on ACP+ aaif-goose/goose#10057：ACP+ 下桌面端 config 能力。

冲突处理

保留 ApeMind 品牌与分发面：productName/description、BaseChat ApeCloud 水印、RECIPE_TRUST_WARNINGS_ENABLED=false、参数输入取消回 /pair、Workflows/工作流文案、EN/ZH 品牌文案、updater/release artifact apecloud/apemind-agent 和 ApeMind Agent*.zip、system prompt ApeMind 身份、onboarding ApeCloud logo/copy、隐藏 project hints / prompt injection settings。
上游内部整体接入：ACP permissions/config/providers/prompts、streamed tool calls、OpenAPI/SDK/schema/meta、provider secrets、Nostr sharing 配置替换与 tunnel REST/UI 删除。
依赖与生成物：Cargo/pnpm 相关锁文件、i18n 生成结果、prompt-manager snapshots 按本次上游 prompt 结构更新。
Desktop full Vitest 首轮暴露 onboarding copy 回退到 Goose；已恢复 ApeMind copy，并给 full suite 增加 testTimeout: 10000，避免全量运行时 user-event 重测偶发 5s 超时。

本地验证

git diff --check
git diff --cached --check
rg -n "^(<<<<<<<|=======|>>>>>>>)" -S .
corepack pnpm@10.30.0 --filter @aaif/goose-sdk run build
PATH="$PWD/bin:$PATH" cargo fmt --all --check
ui/desktop corepack pnpm@10.30.0 run i18n:extract
ui/desktop corepack pnpm@10.30.0 run i18n:check
ui/desktop corepack pnpm@10.30.0 run lint:check
ui/desktop corepack pnpm@10.30.0 exec vitest run src/components/__tests__/ParameterInputModal.test.tsx src/components/settings/chat/ChatSettingsSection.test.tsx src/components/settings/extensions/modal/ExtensionModal.test.tsx
ui/desktop corepack pnpm@10.30.0 run test:run（49 files / 460 tests）
PATH="$PWD/bin:$PATH" cargo test -p goose --features "rustls-tls,code-mode" acp::server --lib（90 passed）
PATH="$PWD/bin:$PATH" cargo test -p goose --features "rustls-tls,code-mode" agents::prompt_manager::tests --lib（11 passed）

未执行本地 Docker build，按鹅岛规则交给 CI/CD 覆盖。

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>

…CP+ (aaif-goose#9448)" (aaif-goose#9564)

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>

…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>

) 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)

…if-goose#9603)

…on ui (aaif-goose#9975)

Co-authored-by: Lifei Zhou <lifei@squareup.com>

…if-goose#9895) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>

…oose#10003)

aaif-goose#10013)

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>

…aif-goose#9996)

…aaif-goose#9999)

…if-goose#10034)

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>

…nfig flag (aaif-goose#10044)

johnmatthewtennant and others added 30 commits June 1, 2026 18:59

Honor blocking Stop hook decisions (aaif-goose#9468)

5e160e5

Signed-off-by: John Tennant <jtennant@squareup.com>

fix(otel): skip OTLP signals when protocol=grpc to avoid background-t…

f69a178

…hread panic (aaif-goose#9512) Co-authored-by: Joah's AI agent <noreply@blockxyz.com> Co-authored-by: Amp <amp@ampcode.com>

Fix scheduled recipe session params (aaif-goose#9553)

cd8f718

Signed-off-by: Angie Jones <jones.angie@gmail.com>

fix(extension-manager): forward custom headers through OAuth connect …

586bb15

…path (aaif-goose#9388) Signed-off-by: Cameron Yick <cameron.yick@datadoghq.com>

Revert "refactor: convert desktop v1 and goose-server extensions to A…

942a456

…CP+ (aaif-goose#9448)" (aaif-goose#9564)

chore(release): bump version to 1.37.0 (minor) (aaif-goose#9557)

fdc1994

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Pick the last canonical model (aaif-goose#9568)

7982086

Co-authored-by: Douwe Osinga <douwe@squareup.com>

feat(security): Add directionality to egress logging (aaif-goose#9546)

030dbb0

chore(release): release version 1.37.0 (aaif-goose#9565)

502ee50

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Bench marking (aaif-goose#9465)

cd12199

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>

Import sesssions (aaif-goose#9474)

003252f

Co-authored-by: Douwe Osinga <douwe@squareup.com>

Replace review subprocess timeout with turn limits (aaif-goose#9571)

9626b4c

Co-authored-by: Cursor <cursoragent@cursor.com>

Add Hugging Face OAuth support, add auth tab to settings (aaif-goose#…

30034b9

…9552) Signed-off-by: jh-block <jhugo@block.xyz>

Fixed intermittent missing extension override on ui and cleanup (aaif…

f6caaa0

…-goose#9575) Signed-off-by: Angie Jones <jones.angie@gmail.com> Co-authored-by: Angie Jones <jones.angie@gmail.com>

Use LRU cache for token counting (aaif-goose#9586)

08e7480

Signed-off-by: jh-block <jhugo@block.xyz>

fix: quote release PR search phrase in pre-release.sh (aaif-goose#9573)

83a4abf

chore(deps): bump mockall from 0.13.1 to 0.14.0 (aaif-goose#9511)

302dafc

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump pkcs8 from 0.10.2 to 0.11.0 (aaif-goose#9510)

1ab48f5

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump strum from 0.27.2 to 0.28.0 (aaif-goose#9509)

dc3a63a

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump clap_mangen from 0.2.33 to 0.3.0 (aaif-goose#9508)

1205a4a

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump tokenizers from 0.21.4 to 0.22.2 (aaif-goose#9503)

1a52f21

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump EmbarkStudios/cargo-deny-action from 2.0.19 to 2.0.…

34f33fc

…20 (aaif-goose#9498) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump ossf/scorecard-action from 2.4.1 to 2.4.3 (aaif-goo…

9646f70

…se#9501) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump pnpm/action-setup from 6.0.5 to 6.0.8 (aaif-goose#9500

1cc5aa6

) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Lifei/acp session setup refactor (aaif-goose#9488)

dc59e41

feat(sdk): minimal uniffi setup for cross language sdk (aaif-goose#9593)

6251e56

feat: Only send custom notifications when ACP client specifies this c…

ec519ee

…apability in the initialization request (aaif-goose#9596)

refactor: remove dead component and useNavigationSessions cleanup (aa…

65b72b2

…if-goose#9603)

feat: acp methods for config extensions (aaif-goose#9581)

2f99664

lifeizhou-ap and others added 27 commits June 24, 2026 20:52

chore: removed mesh on ui (aaif-goose#9982)

274e952

chore: clean up ui as we don't have session based permission setting …

d97d07f

…on ui (aaif-goose#9975)

chore: removed the too many tools warning (aaif-goose#9974)

09998b1

feat (acp): custom methods for managing scheduler (aaif-goose#9972)

eea6989

chore: remove gateway REST API and UI (aaif-goose#9989)

416aad8

Co-authored-by: Lifei Zhou <lifei@squareup.com>

suppress telemetry event on ui (aaif-goose#9991)

db26fb7

chore: Remove share session via base url (aaif-goose#9994)

24166fc

chore(deps): bump docker/setup-buildx-action from 3.12.0 to 4.1.0 (aa…

f1bf611

…if-goose#9895) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

ACP Migration: MCP/Goose Apps (aaif-goose#9988)

dc8aedf

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>

removed unnecessary call setRecipeParams for acp enabled path (aaif-g…

bb4a9a7

…oose#10003)

Revert "mcp(win): full Windows Job Object cleanup wiring (patch draft… (

8ab0320

aaif-goose#10013)

ignore unused on windows (aaif-goose#10009)

9c96bd7

Add GLM-5.2 support (aaif-goose#9967)

37d93ce

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>

run all builds on the release branch, before tagging (aaif-goose#10017)

789717b

Migrate Nostr session sharing to ACP (aaif-goose#10022)

d1af10c

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>

move anthropic provider into goose-providers (aaif-goose#9985)

854fed5

feat: used acp agent capabilities for local Inference support check (a…

3c62892

…aif-goose#9996)

Apply ACP recipe state during session load and fork (aaif-goose#9998)

59b28e4

feat(acp): migrate upsertPermissions to setToolPermissions ACP method (…

22883e3

…aaif-goose#9999)

fix: removed fallback rest api call in ACP mode for edit in place (aa…

ec450a6

…if-goose#10034)

chore: ignore Zed settings (aaif-goose#10043)

d9cf383

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>

refactor: replace getTunnelStatus with GOOSE_DISABLE_NOSTR_SHARING co…

f0a3ed3

…nfig flag (aaif-goose#10044)

add ACP+ handlers for prompt editing (aaif-goose#10031)

35999d4

Support streamed tool calls without indexes (aaif-goose#10023)

d1d2166

feat(acp+): models/providers in desktop on ACP+ (aaif-goose#9987)

2fda760

feat(acp+): config in desktop on ACP+ (aaif-goose#10057)

98a13ff

chore: sync upstream changes through 2026-06-27

5bc74cf

earayu added the MonaRudo Work involving MonaRudo label Jun 27, 2026

earayu merged commit 8b18ff3 into main Jun 27, 2026
20 of 23 checks passed

earayu deleted the chore/sync-upstream-2026-06-27 branch June 27, 2026 04:52

Navigation Menu

Uh oh!

Sync upstream changes through 2026-06-27 - #73

Sync upstream changes through 2026-06-27#73
earayu merged 288 commits into
mainfrom
chore/sync-upstream-2026-06-27

earayu commented Jun 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

earayu commented Jun 27, 2026

上游范围

冲突处理

本地验证

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants