Sync upstream changes for 2026-06-11 - #49
Merged
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>
…apability in the initialization request (aaif-goose#9596)
Co-authored-by: Douwe Osinga <douwe@squareup.com>
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)
Signed-off-by: morgmart <98432065+morgmart@users.noreply.github.com> Co-authored-by: Lifei Zhou <lifei@squareup.com>
Signed-off-by: shenzhengyang <shenzhengyang@soundws.com> Co-authored-by: shenzhengyang <shenzhengyang@soundws.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Michael Neale <michael.neale@gmail.com>
…#9724) Signed-off-by: Kalvin Chau <kalvin@block.xyz>
…nt (aaif-goose#9726) Signed-off-by: Kalvin Chau <kalvin@block.xyz>
…f-goose#9727) Signed-off-by: Michael Neale <michael.neale@gmail.com>
…-2026-06-11 # Conflicts: # crates/goose-sdk-types/src/custom_requests.rs # crates/goose-server/Cargo.toml # crates/goose-server/src/openapi.rs # crates/goose-server/src/routes/session.rs # crates/goose/Cargo.toml # crates/goose/acp-meta.json # crates/goose/acp-schema.json # crates/goose/src/acp/response_builder.rs # crates/goose/src/acp/server.rs # crates/goose/src/acp/server/custom_dispatch.rs # crates/goose/src/acp/server/new_session.rs # crates/goose/src/agents/agent.rs # crates/goose/src/providers/databricks_v2.rs # crates/goose/src/providers/formats/anthropic.rs # crates/goose/src/session/session_manager.rs # crates/goose/tests/acp_custom_requests_test.rs # ui/desktop/package.json # ui/desktop/src/acp/sessions.ts # ui/desktop/src/api/index.ts # ui/desktop/src/api/sdk.gen.ts # ui/desktop/src/components/BaseChat.tsx # ui/desktop/src/components/ParameterInputModal.tsx # ui/desktop/src/components/sessions/SessionListView.tsx # ui/desktop/src/hooks/useNavigationItems.ts # ui/desktop/src/i18n/messages/en.json # ui/desktop/src/i18n/messages/zh-CN.json # ui/sdk/src/generated/client.gen.ts # ui/sdk/src/generated/index.ts # ui/sdk/src/generated/types.gen.ts # ui/sdk/src/generated/zod.gen.ts
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.
Closes #48
Summary
Sync upstream aaif-goose/goose main from
390dfb8c7to4207b7e08.Upstream commits included:
10e665a9b/ expose ACP thinking effort config option aaif-goose/goose#9711: expose ACP thinking effort config option.d2ab78604/ feat: acp list session with keyword and type filter aaif-goose/goose#9695: add keyword and type filters to ACP list sessions.9455f8a56/ docs: fix typo in MCP blog post aaif-goose/goose#9641: fix typo in MCP blog post.fde407c9d/ Update analyze extension instructions aaif-goose/goose#9585: update analyze extension instructions.40315b5ac/ feat: steering messages with ACP aaif-goose/goose#9560: add steering messages with ACP.be91189af/ feat: use acp search session in Desktop aaif-goose/goose#9717: use ACP search session in Desktop.58185fe4a/ pin goose-sdk package in tui aaif-goose/goose#9712: pin goose-sdk package in TUI.32722e6ef/ feat: surface Anthropic stream refusals as visible errors aaif-goose/goose#9724: surface Anthropic stream refusals as visible errors.e8d562263/ feat(acp): support GOOSE_SERVER__SECRET_KEY at goose serve acp endpoint aaif-goose/goose#9726: supportGOOSE_SERVER__SECRET_KEYat thegoose serve acpendpoint.523aaee24/ feat: custom acp method to get session info aaif-goose/goose#9729: add custom ACP method to get session info.4207b7e08/ docs: fix stale session navigation/delete docs (Session History) aaif-goose/goose#9727: fix stale Session History navigation/delete docs.Conflict handling
productName, Desktop description, task-complete notification, watermark, Workflows label, and Chinese工作流label.RECIPE_TRUST_WARNINGS_ENABLEDstill disables recipe trust warnings and auto-submit blocking./pair.git diff --checkpasses.Verification
git grep -n "^<<<<<<< HEAD$": no conflict markers.git diff --cached --check: passed before merge commit.source ../../bin/activate-hermit && pnpm run lint:checkinui/desktop: passed.source ../../bin/activate-hermit && pnpm run test:run -- src/__tests__/sessions.test.ts src/components/settings/chat/ChatSettingsSection.test.tsx src/components/settings/SettingsView.test.tsxinui/desktop: passed (30 files / 354 tests).Rust/full generated-schema validation is left to GitHub Actions for this PR.