Skip to content

Sync upstream changes through 2026-06-24 - #67

Merged
earayu merged 12 commits into
mainfrom
chore/sync-upstream-2026-06-24
Jun 25, 2026
Merged

Sync upstream changes through 2026-06-24#67
earayu merged 12 commits into
mainfrom
chore/sync-upstream-2026-06-24

Conversation

@earayu

@earayu earayu commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Sync upstream aaif-goose/goose from d58f84134 to e4f8b61b5.
  • Bring in 10 upstream commits covering mac updater metadata, ACP recipe/skills APIs, v1.39.0, streamable HTTP deeplinks, Databricks cost reporting, provider refactor, MCP elicitation streams, and diagnostics JSON reports.
  • Preserve ApeMind Agent fork branding/defaults while adopting upstream internals.

Upstream commits

Conflict handling

  • Kept ApeMind Agent productName / description while taking upstream desktop version 1.39.0.
  • Kept ApeMind workflow terminology and saved-workflow trust recording while adopting upstream ACP recipe save/encode/scan/parse APIs.
  • Kept ApeMind-branded auto-update UI copy and mac update manifest artifact names for ApeMind Agent*.zip.
  • Took upstream generated OpenAPI/SDK/schema changes, provider refactor, canonical model data, MCP elicitation flow, diagnostics JSON report changes, and dependency lock updates.

Validation

  • git diff --check origin/main..HEAD
  • no conflict markers via rg -n "^<<<<<<<|^=======|^>>>>>>>" .
  • corepack pnpm@10.30.0 --filter @aaif/goose-sdk run build
  • corepack pnpm@10.30.0 run lint:check in ui/desktop
  • corepack pnpm@10.30.0 run test:run in ui/desktop (first run had one 5s timeout in RecipeFormFields; focused retry passed, full retry passed 45 files / 423 tests)
  • PATH="$PWD/bin:$PATH" cargo test -p goose --features "rustls-tls,code-mode" agents::prompt_manager::tests --lib (11 passed)

Closes #66

DOsinga and others added 12 commits June 24, 2026 12:02
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…#9960)

Signed-off-by: Varun Nuthalapati <nuthalapativarun@gmail.com>
)

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Co-authored-by: goose <goose@block.xyz>
… usage update (aaif-goose#9925)

Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
…aif-goose#9953)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
@earayu
earayu merged commit f26d44e into main Jun 25, 2026
21 of 24 checks passed
@earayu
earayu deleted the chore/sync-upstream-2026-06-24 branch June 25, 2026 03:13
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-24

7 participants