Skip to content

merge: upstream v7.2.33#1

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

merge: upstream v7.2.33#1
yunqiqiliang merged 3 commits into
mainfrom
yunqiqiliang/kilo-opencode-v7.2.33

Conversation

@yunqiqiliang
Copy link
Copy Markdown
Collaborator

Summary

Merge upstream kilocode v7.2.33 (from v7.2.31).

Upstream changes included

  • JetBrains session panel refactor and new tests
  • VS Code: permission editor, agent manager tool start, reasoning block expansion
  • CLI: GPT-5.5 prompt scoping, command permission persistence
  • Docs: BYOK providers update, codebase indexing, KiloClaw tools
  • Telemetry: removed ai./gen_ai. span emission
  • Various bug fixes (Windows config paths, lock file handling)

Conflicts resolved

  • packages/opencode/src/kilocode/config/config.ts: merged new ALL_CONFIG_DIR_SUFFIXES with czcode .czcode paths
  • script/upstream/transforms/package-names.ts: kept upstream Opencode to Kilo transform patterns
  • packages/opencode/package.json: removed duplicate @czcode/lakehouse entry
  • bun.lock: regenerated cleanly

Bug fix included

  • fix(upstream): added @czcode/lakehouse to KILO_DEPENDENCIES in transform-package-json.ts to prevent duplicate dependency entries in future merges

- packages/opencode/src/kilocode/config/config.ts: merge new ALL_CONFIG_DIR_SUFFIXES with czcode .czcode paths
- script/upstream/transforms/package-names.ts: keep upstream Opencode→Kilo patterns (pre-merge transform)
- packages/opencode/package.json: remove duplicate @czcode/lakehouse entry
- bun.lock: regenerated cleanly
@yunqiqiliang yunqiqiliang merged commit bfff7dc into main May 2, 2026
12 of 19 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