merge: upstream kilocode v7.3.0#3
Merged
Merged
Conversation
- Resolved 231 files with conflict markers - Preserved all czcode_change and kilocode_change markers - Incorporated upstream v7.3.0 changes: - Schema.Number → Schema.Finite for agent fields - InstanceBootstrap → getBootstrapRunEffect() - Instance.disposeAll() → InstanceStore.disposeAllInstances() - Various import path refactors Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>
- Fix editor.ts and event.ts corrupted by conflict resolution - Fix app-runtime.ts missing imports - Fix WorkspaceAdaptor → WorkspaceAdapter rename - Fix duplicate declarations in kilocode/config/config.ts - Fix duplicate property in kilocode/agent/index.ts - Remove obsolete httpapi files superseded by handlers/ directory - Fix test assertions for new EditorSelection type Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>
- Fix trailing comma and duplicate key in root package.json (invalid JSON) - Fix duplicate @czcode/lakehouse key in packages/opencode/package.json - Restore stream-chat@9.38.0.patch lost during bun.lock conflict resolution - Regenerate bun.lock (was corrupted with conflict markers) - Fix build.ts to resolve catalog: version references for @opentui/core and @parcel/watcher - Fix URL type mismatch in packages/core/src/npm-config.ts - Stub out typecheck for packages (app/desktop/desktop-electron) whose sources were removed in v7.3.0 - Restore worktree-diff-client.ts and review-utils.ts lost during merge - Fix implicit any types in test/mcp/oauth-browser.test.ts - Resolve remaining conflict markers in packages/extensions/zed/extension.toml Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>
…moval clickzetta-ai-vector-search skill was archived in clickzetta-skills dev branch. Vector search (HNSW, RAG, semantic search) is now covered by clickzetta-index-manager. - lh-engineer: remove stale ai-vector-search row (index-manager already covers 向量 on line 146) - lh-data-scientist: reroute ZettaPark 向量检索/AI 函数 → clickzetta-index-manager Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>
…de-version to v7.3.0 - Add PR title check in annotation workflow: upstream merge PRs (title starts with "merge:") are exempt since all upstream-new code would falsely trigger the checker - Update .opencode-version from v1.14.33 to v7.3.0 so fix-kilocode-markers uses the correct upstream baseline going forward - Apply czcode_change markers to files modified by fix-kilocode-markers Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>
- Add release.yml (new in v7.3.0, replaces watch-opencode-releases.yml) - Remove watch-opencode-releases.yml (deleted in v7.3.0) Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges upstream kilocode v7.3.0 into czcode main.
Key upstream changes in v7.3.0
Schema.Number→Schema.Finitefor agent fields (topP, temperature, steps)InstanceBootstrap→getBootstrapRunEffect()APIInstance.disposeAll()→InstanceStore.disposeAllInstances()WorkspaceAdaptor→WorkspaceAdapterrenamehandlers/directoryczcode-specific changes preserved
What was tested
bun run typecheck)bun run script/check-opencode-annotations.ts --base main)Rollback