Files
Garry TanandClaude Opus 4.8 da80f91f0b Merge remote-tracking branch 'origin/master' into garrytan/cathedral-1
Catch up to master: 526 commits (up to v0.42.73.2 — CI PR-usefulness gate,
OAuth slug-prefix write fence, GitHub-release publishing, community fix waves,
dep CVE-pin overrides, Windows path fixes, silent-failure doctor batch, and more).

Conflicts resolved (9):
- VERSION / package.json: kept 0.43.0.0 (Cathedral 1 — higher semver); merged in
  master's new CVE-pin `overrides` block.
- CHANGELOG.md / TODOS.md: kept both sides (ours on top, master's below).
- src/cli.ts: CLI_ONLY = master's superset (now `export`) + our `protocol`;
  CLI_ONLY_SELF_HELP keeps both (`protocol` + master's `init`/`migrate`/`retrieval-upgrade`).
- src/commands/serve-http.ts: ServeHttpOptions keeps both new fields
  (`surface` ours, `printAdminToken` master).
- src/commands/serve.ts: runServeHttp call keeps both options + master's new
  finishHttpServe teardown; stdio path keeps master's boot-readiness deadline
  (#3273) while preserving our `start(engine, { surface })`.
- src/core/config.ts: config allowlist keeps both (`mcp_surface`/`protocol_installed_at`
  + `provider_chat_options`).
- src/core/think/index.ts: both sides added the same token-`usage` feature; unified
  to one nullable `usage` (interface field, local var, return) and kept master's
  additive `cost_usd?`. (Duplicate-identifier build break caught by typecheck and fixed.)

Verified: 3-line version audit agrees on 0.43.0.0; bun install reconciled bun.lock
against master's overrides; bun run typecheck clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-08-07 12:30:40 -07:00
..