chore: merge upstream kilocode v7.6.2 - #6
Merged
Merged
Conversation
fix(cli): remove nonfunctional interactive terminal tool
…ilure-notification fix(agent-manager): explain empty repository worktree failures
feat: add continuous session goals
* feat(agent-manager): enable multiple projects by default * chore: update kilo-vscode visual regression baselines * fix(agent-manager): preserve project state across switching --------- Co-authored-by: kilo-maintainer[bot] <kilo-maintainer[bot]@users.noreply.github.com>
fix(jetbrains): stop auto-expanding worktree session list on new/forked sessions
fix(jetbrains): make Agent Manager worktree deletion non-blocking and fault tolerant
…scope fix(jetbrains): scope config warnings to the workspace directory
fix(release): include CLI notes in GitHub releases
Resolve the attention service conflict by keeping both sides: upstream's goal-session suppression and this branch's session-scoped notify.
release(jetbrains): v7.1.6-rc.3
fix(vscode): add PR sidebar review margins
…ject-bar-agent-manager # Conflicts: # packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx # packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/fa.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts # packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
The task card showed a neutral placeholder glyph and the internal tool name
("task Agent") while the subagent started. The avatar slot now renders a
neutral frame shimmer until the child session id is known, then resolves into
the hashed identity glyph in place. The title falls back to the localized
default ("Agent") until subagent_type streams in, so the card never exposes
the tool name.
…tency-reduction fix(vscode): render streamed text at frame cadence
…keybindings fix(tui): submit and cancel custom answers in the question dialog
The task-avatar descendant rule set transition: filter, and the shorthand reset transition-property, so the color fade never ran on the task card. The base avatar rule applied it to every other AgentAvatar instead. Move both transitions onto the task-avatar selector and clear them under prefers-reduced-motion.
fix(vscode): animate subagent avatar from loading shimmer to identity
Add a Model entry to the @ mention menu that opens the shared model selector and inserts an @provider/model reference. The token is inline text, never a file attachment, so an orchestrator can pass an exact model to Agent Manager or the subagent tool.
BasicTool read the children getter several times per render, and the Kilo wrapper rebuilt its details subtree on every read. One bash card therefore constructed three BashHighlightedOutput instances. Memoize the subtree so repeated reads reuse a single instance.
createMemo evaluates eagerly, which built the body of a collapsed deferred tool and broke the board tool transcript deferred-body contract. Only memoize eager tools; deferred tools keep the lazy accessor so Base still gates the body on ready().
Classify a restored @-mention against the live model catalog when syncing and when parsing attachments, not only at seed time. A draft restored before the catalog loads can no longer turn a model reference into a bogus file attachment.
fix(vscode): speed up bash tool card rendering
perf(ui): render read-only todo checkbox without Kobalte
feat(vscode): reference a model inline in the prompt with @
…-notification-navigation feat(agent-manager): open notification Show in Agent Manager for its sessions
perf(ui): defer diff parsing until tool cards expand
…uration fix(vscode,jetbrains): pause working timer while waiting for permission or question
Kilo Swarm was gated only by the experimental.shared_agent_board config key. Add the KILO_EXPERIMENTAL_SHARED_AGENT_BOARD runtime flag, and the KILO_EXPERIMENTAL umbrella, as an additional enable path. Introduce a BoardEnabled.resolve helper so every gate site shares one rule: config true or flag true. An explicit config false does not disable the board when the flag is set.
…ng-performance perf(ui): avoid building collapsed tool card content on mount
feat(cli): enable shared agent board via experimental env flag
Prevents D/F conflict during overlayCompatTree when packages/czcode-lakehouse and packages/clickzetta-js linger in working tree after transform branch checkout. Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
Resolved conflicts: - packages/opencode/src/config/index.ts: kept czcode defaults (qwen3.5-plus, lh-analyst) - packages/opencode/src/effect/app-runtime.ts: upstream refactored to LayerNode, InstanceBootstrap now auto-handled - packages/opencode/src/installation/index.ts: customized kilocode/installation/latest.ts to check GitHub releases - packages/opencode/script/build.ts: trivial comment conflict - script/upstream/merge.ts: always skip rerere training for czcode Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
- Remove files deleted in upstream v7.6.2: - packages/core/src/instance-layer.ts - packages/opencode/src/server/routes/instance/httpapi/groups/v2/instance.ts - packages/opencode/test/kilocode/session/session.test.ts - Update platform-attribution.test.ts to match upstream test infrastructure refactor - Update dependencies: @aws-sdk/client-s3 3.933.0 → 3.1025.0, add @morphllm/morphsdk - Add upstream-analysis-7.7.3.md for future reference Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
The upstream v7.6.2 refactored global config loading from Effect.fnUntraced to Layer.effect, which removed the czcode seed defaults block (skills URL, builtin commands, default agent/model). This commit re-applies the czcode_change block in the new location with proper czcode_change markers. Changes: - Import BUILTIN_COMMANDS and build builtinCommandMap - Seed default skills URL (yunqiqiliang.github.io/clickzetta-skills) - Seed bundled skills path (offline fallback) - Set default_agent: lh-analyst - Set default model: alibaba-cn/qwen3.5-plus - Add merge analysis doc for future reference Verified with bun dev: TUI starts with correct defaults. Co-Authored-By: Claude Opus 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
6 participants
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
Merge upstream kilocode from v7.4.18 to v7.6.2, spanning:
Total: ~22 releases, 4184 commits.
Merge Strategy
Used
script/upstream/merge.ts v7.6.2with brand transforms (kilo→czcode) applied during merge.LFS Handling
git lfs fetch upstream --all, 1986 objects)packages/kilo-docs/public/img/now properly trackedNext Steps
bun run typecheckto verify no upstream integration breaksscript/upstream/fix-kilocode-markers.ts)Related
Previous upstream merge: v7.4.18 (#5) — TUI restructure, took 2-4 days