Skip to content

Sync upstream changes through 2026-06-22 - #63

Merged
earayu merged 3 commits into
mainfrom
chore/sync-upstream-2026-06-22
Jun 22, 2026
Merged

Sync upstream changes through 2026-06-22#63
earayu merged 3 commits into
mainfrom
chore/sync-upstream-2026-06-22

Conversation

@earayu

@earayu earayu commented Jun 22, 2026

Copy link
Copy Markdown
Collaborator

Closes #62

Summary

  • Sync upstream aaif-goose/goose from d2a921a75 through 659257316.
  • Bring in typed ACP add/get session extension requests and generated schema/client updates.
  • Remove upstream's "create recipe from session" Desktop modal/API surface; in this fork that removes the corresponding "Create Workflow from Session" entry point.
  • Use ACP newSession for non-recipe Desktop sessions.

Upstream commits

Conflict handling

  • Preserved ApeMind branding in BaseChat: logo/watermark remains ApeMind Agent, and RECIPE_TRUST_WARNINGS_ENABLED = false remains unchanged.
  • Preserved ParameterInputModal cancel/close navigation back to /pair.
  • Preserved en/zh ApeMind Agent task notification strings and Workflows/工作流 wording.
  • Accepted upstream removal of the create-recipe-from-session modal, REST API, generated API methods, tests, and i18n keys because that feature was removed upstream.
  • Took upstream ACP/OpenAPI/generated SDK/schema updates for the typed request/session changes.

Validation

  • git grep -n "^<<<<<<< HEAD$" found no conflict markers.
  • git diff --check origin/main...HEAD
  • corepack pnpm@10.30.0 --filter @aaif/goose-sdk run build
  • corepack pnpm@10.30.0 run lint:check in ui/desktop (passes; existing FormatJS duplicate-id warning for task-complete notification remains).
  • corepack pnpm@10.30.0 run test:run in ui/desktop (43 files / 411 tests passed).

Rust local check was not run on this machine because cargo/rustup are not present in PATH.

@earayu
earayu merged commit f6e6699 into main Jun 22, 2026
19 of 22 checks passed
@earayu
earayu deleted the chore/sync-upstream-2026-06-22 branch June 22, 2026 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

每日上游同步 2026-06-22

2 participants