Sync upstream changes for 2026-06-10 by earayu · Pull Request #47 · apecloud/apemind-agent

earayu · 2026-06-10T04:06:43Z

Closes #46

Summary

Sync upstream aaif-goose/goose main from 8eb6cd60d to 390dfb8c7.

Upstream commits included:

0ab4b8410 / chore: pause tui release aaif-goose/goose#9685: pause TUI release.
e3090836e / fix: goose-sdk release compat check with new schema aaif-goose/goose#9697: adapt goose-sdk release compatibility check for the new schema.
f4ecdaefc / feat: use acp list sessions and manage sessions in Desktop aaif-goose/goose#9687: use ACP list sessions and manage sessions in Desktop.
d396767be / chore: refresh canonical model registry aaif-goose/goose#9709: refresh canonical model registry.
f52d717dc / feat(security): enable prompt injection mitigation by default for internal users via non-overridable env vars aaif-goose/goose#9612: enable prompt injection mitigation by default for internal users via non-overridable env vars.
390dfb8c7 / feat(security): Re-adjust pattern-based detection for prompt injection detection confidence scores aaif-goose/goose#9690: adjust pattern-based detection confidence scores for prompt injection detection.

Conflict handling

Preserved ApeMind Agent branding: productName, Desktop description, task-complete notification, watermark, Workflows label, and Chinese 工作流 label.
Preserved ApeMind recipe warning behavior: RECIPE_TRUST_WARNINGS_ENABLED still disables recipe trust warnings and auto-submit blocking.
Preserved cancel-to-new-chat route behavior: recipe parameter cancel still navigates to /pair.
Took upstream for canonical model/provider data, ACP server internals, and the new Desktop ACP session management path.
Verified Chat Settings still hides project hints and prompt injection settings in ApeCloud builds; upstream security default changes are kept at backend/config level.

Verification

git grep -n "^<<<<<<< HEAD$": no conflict markers.
git diff --cached --check: passed before merge commit.
source ../../bin/activate-hermit && pnpm run lint:check in ui/desktop: passed.
source ../../bin/activate-hermit && pnpm run test:run -- src/__tests__/sessions.test.ts src/components/settings/chat/ChatSettingsSection.test.tsx in ui/desktop: passed (30 files / 354 tests).

Rust/full generated-schema validation is left to GitHub Actions for this PR.

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

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

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

…ovider (aaif-goose#9324)

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>

…f-goose#9448)

Co-authored-by: Quentin Champenois <qchampenois@scaleway.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)

…other types (aaif-goose#9588)

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

… dependencies (aaif-goose#9633)

…e#9687)

Signed-off-by: Bradley Axen <baxen@squareup.com>

…ernal users via non-overridable env vars (aaif-goose#9612)

…n detection confidence scores (aaif-goose#9690)

…-2026-06-10 # Conflicts: # crates/goose-providers/src/canonical/data/canonical_models.json # crates/goose-providers/src/canonical/data/provider_metadata.json # crates/goose/src/acp/server.rs # ui/desktop/package.json # ui/desktop/src/__tests__/sessions.test.ts # ui/desktop/src/components/BaseChat.tsx # ui/desktop/src/components/Layout/NavigationPanel.tsx # ui/desktop/src/components/ParameterInputModal.tsx # ui/desktop/src/components/sessions/SessionListView.tsx # ui/desktop/src/hooks/useNavigationItems.ts # ui/desktop/src/hooks/useNavigationSessions.ts # ui/desktop/src/i18n/messages/en.json # ui/desktop/src/i18n/messages/zh-CN.json

dependabot Bot and others added 30 commits May 23, 2026 18:40

chore(deps): bump image from 0.24.9 to 0.25.10 (aaif-goose#9383)

8689fdf

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

fix(agents): serialize per-session agent creation to stop duplicate M…

ce004f7

…CP init (aaif-goose#9357) Signed-off-by: fresh3nough <anonwurcod@proton.me>

Fix desktop chat search session limiting (aaif-goose#9366)

c4d64d1

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

Build summon instructions per turn (aaif-goose#9329)

e1cc44f

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

docs: stats update (aaif-goose#9410)

ba16de9

Simplify UI customization (aaif-goose#9353)

a11843a

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

chore(deps): bump qs from 6.14.2 to 6.15.2 in /evals/open-model-gym/m…

6d544e7

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

Add Turkish desktop locale (aaif-goose#9392)

bf0da95

Signed-off-by: dejavu <dejavu@Mac.home> Co-authored-by: dejavu <dejavu@Mac.home>

Improve dependency hygiene (aaif-goose#9360)

27dc0d5

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

fix(desktop): stop the main window growing taller on every launch (aa…

dcdc7f6

…if-goose#9409) Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>

Russian language support (aaif-goose#9406)

b332f50

Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>

chore(release): bump version to 1.36.0 (minor) (aaif-goose#9417)

b0cd61a

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

add databricks ai gateway provider (aaif-goose#9274)

7dc904e

Signed-off-by: Bradley Axen <baxen@squareup.com>

Prefer goose aliases for Databricks v2 inventory (aaif-goose#9430)

1749354

Signed-off-by: Bradley Axen <baxen@squareup.com>

feat: add /model slash command to CLI for session model switching (aa…

d90b349

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

local inference: stricter GGUF requirements, auto detection of tool c…

27b41d9

…alling support, fixed thinking output parsing (aaif-goose#9442) Signed-off-by: jh-block <jhugo@block.xyz>

fix: tolerate missing responses output (aaif-goose#9449)

d017295

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

fix(ui): preserve pending env vars in Add Extension form (aaif-goose#…

4f43ae4

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

feat: make tool output size limit configurable via GOOSE_MAX_TOOL_RES…

10ac6b1

…PONSE_SIZE (aaif-goose#9256) Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>

fix: make azure api-version query param optional (aaif-goose#9221)

1125e8d

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

fix(desktop): start new chat in current window from recipe param modal (

35d1fc7

aaif-goose#9422) Signed-off-by: Michael Neale <micn@block.xyz>

fix(desktop): refresh provider list in Switch Models picker (aaif-goo…

a18b92e

…se#9408) Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>

feat(providers): add Alibaba (Qwen via DashScope) declarative provider (

4c88f4b

aaif-goose#9443) Signed-off-by: Jeremy Dawes <jeremy@jezweb.net>

feat(providers): add Perplexity as a declarative OpenAI-compatible pr…

e9b0d92

…ovider (aaif-goose#9324)

refactor: convert desktop v1 and goose-server extensions to ACP+ (aai…

9c403b1

…f-goose#9448)

doc: Add Scaleway provider (aaif-goose#9423)

27d68ba

Co-authored-by: Quentin Champenois <qchampenois@scaleway.com>

CLI to list skills with token counts (aaif-goose#9326)

d10d009

jh-block and others added 27 commits June 3, 2026 16:04

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

create goose-providers crate with canonical models, conversation and …

826f13f

…other types (aaif-goose#9588)

Image read tool (aaif-goose#9607)

4904e3c

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

move formats/openai.rs into goose-providers crate, along with several…

e5fd568

… dependencies (aaif-goose#9633)

fix: compatibility of config extension acp call in TUI (aaif-goose#9683)

8eb6cd6

chore: pause tui release (aaif-goose#9685)

0ab4b84

fix: goose-sdk release compat check with new schema (aaif-goose#9697)

e309083

feat: use acp list sessions and manage sessions in Desktop (aaif-goos…

f4ecdae

…e#9687)

chore: refresh canonical model registry (aaif-goose#9709)

d396767

Signed-off-by: Bradley Axen <baxen@squareup.com>

feat(security): enable prompt injection mitigation by default for int…

f52d717

…ernal users via non-overridable env vars (aaif-goose#9612)

feat(security): Re-adjust pattern-based detection for prompt injectio…

390dfb8

…n detection confidence scores (aaif-goose#9690)

earayu merged commit 818d1e4 into main Jun 10, 2026
23 checks passed

earayu deleted the chore/sync-upstream-2026-06-10 branch June 10, 2026 04:39

earayu mentioned this pull request Jun 11, 2026

每日上游同步 2026-06-11 #48

Closed

Navigation Menu

Uh oh!

Sync upstream changes for 2026-06-10 - #47

Sync upstream changes for 2026-06-10#47
earayu merged 79 commits into
mainfrom
chore/sync-upstream-2026-06-10

earayu commented Jun 10, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

earayu commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Conflict handling

Verification

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

earayu commented Jun 10, 2026 •

edited

Loading