Skip to content

merge: upstream kilocode v7.2.36#2

Merged
yunqiqiliang merged 2 commits into
mainfrom
yunqiqiliang/kilo-opencode-v7.2.36
May 5, 2026
Merged

merge: upstream kilocode v7.2.36#2
yunqiqiliang merged 2 commits into
mainfrom
yunqiqiliang/kilo-opencode-v7.2.36

Conversation

@yunqiqiliang
Copy link
Copy Markdown
Collaborator

Merge upstream kilocode v7.2.36 into czcode.

Changes from upstream

  • New packages/core package (extracted from packages/shared and packages/opencode)
  • HTTP API route refactoring (split into modular httpapi files)
  • MCP OAuth callback support
  • Snapshot tracking feature
  • Session path migration
  • Various bug fixes and improvements

Conflict resolution

  • packages/core/src/global.ts: Applied app = "czcode" and CZCODE_TEST_HOME env var
  • packages/opencode/src/config/config.ts: Kept czcode builtin commands import + upstream's new options param on update()
  • packages/opencode/src/kilocode/config/config.ts: Updated imports to new @opencode-ai/core paths, kept .czcode dir suffixes
  • packages/opencode/src/session/system.ts: Adopted upstream's nested prompt() function pattern, kept gpt55 case
  • packages/opencode/src/cli/cmd/tui/routes/home.tsx: Updated TuiPluginRuntime import path
  • packages/sdk/js/src/v2/gen/types.gen.ts: Removed duplicate type definitions
  • packages/opencode/src/kilocode/singclaw/hooks.ts: Updated Log import to new path
  • All package.json files: Took upstream versions
  • bun.lock: Regenerated (removed stale ghostty-web private repo reference)

Verification

  • All 14 packages typecheck successfully
  • No conflict markers remaining

@yunqiqiliang yunqiqiliang merged commit 49636db into main May 5, 2026
8 of 13 checks passed
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.

1 participant