chore: merge upstream kilocode v7.4.18 - #5
Merged
Conversation
fix(cli): exclude gpt-5.6 from ChatGPT subscriptions
…pprove mode (#12444) * feat(tui): register `/auto-approve` slash command for toggling auto-approve mode The TUI already exposed auto-approve mode toggling through the command palette (Ctrl+P -> "Enable/Disable auto-approve mode" backed by `Permission.allowEverything`), but there was no slash command for it. Promote the existing `permission.allow_everything` palette entry to a slash command by adding `slashName: "auto-approve"` plus a few common aliases (`autoapprove`, `approve-all`, `approveall`) and a `desc` for autocomplete. The slash command dispatches the same palette entry, so behavior, gating, and toasts stay identical to the Ctrl+P path. - packages/opencode/src/kilocode/cli/cmd/tui/app.tsx * fix(tui): clarify /auto-approve desc reads from global config
…andoff A prompt sent while a session is running queues behind the active turn, which breaks out of its loop after the current LLM step drains. That handoff was recorded with close reason "interrupted", so the webview rendered the yellow "Turn interrupted." card during the brief idle window before the queued turn started. The handoff now closes with a dedicated "superseded" reason instead. Clients extend their close-reason unions and the webview suppresses the terminal warning card for superseded turns; memory digests still treat the cut-short turn as interrupted, and real user interruptions are unchanged.
* feat(i18n): mention @ file references in chat input placeholder * style: run prettier on i18n placeholder translations * fix(i18n): move @ before ellipsis in Turkish placeholder for consistency --------- Co-authored-by: Sylwester Liljegren <sylwester.liljegren@softronic.se>
…icker fix(vscode): stop flashing interruption warning on queued follow-up handoff
feat(telemetry): include host OS properties
* refactor(vscode): deduplicate config snapshots * test(vscode): stabilize config snapshot settings
* feat(vscode): add Persian (Farsi) UI language
Add Farsi (fa) as a first-class UI locale for the VS Code extension, with
automatic right-to-left layout (the extension already supports RTL via Arabic).
- Register fa in language-utils (Locale union, LOCALES, RTL_LOCALES),
language.tsx (label + merged dict layers), kiloclaw, the extension-host and
cli-backend translation bundles, and both package.json language enums.
- Add complete fa.ts dictionaries for all kilo-vscode i18n namespaces
(sidebar, agent manager, kiloclaw, extension host, autocomplete, cli-backend).
- Extend i18n tests to enforce fa key completeness and placeholder alignment.
Persian language contributed by Babak Safabahar.
* fix(vscode): translate remaining Persian UI strings
* fix(vscode): make question dock and suggestions RTL-aware
The interactive question dock pinned option labels/descriptions to the left
via a hardcoded text-align: left, so they rendered left-aligned even under an
RTL locale (Persian/Arabic). Use logical text-align: start and logical padding
on the header, and add dir=auto to question text, option label/description,
collapsed preview, review rows and the suggestion text so mixed-script content
renders with correct bidi.
Contributed by Babak Safabahar.
* fix(i18n): sync Persian translations with latest en.ts
Resync fa.ts after rebasing on main:
- Translate the 27 newly added English keys into Persian.
- Remove the 23 obsolete memory.* keys that no longer exist in en.ts.
- Translate error.chain.configDirectoryTypo and other single-quoted values
that were previously left in English.
All {{placeholder}} tokens are preserved; brand/technical terms (MCP, VS Code,
Vercel, Kilo Code, TerminalBench) intentionally stay untranslated. The i18n
key-completeness and placeholder-alignment tests pass.
Contributed by Babak Safabahar.
* fix(i18n): sync Persian translations with latest main
Translate the 45 newly added keys after rebasing on upstream main, including
the four session.prompts.* keys requested by the reviewer:
- session.prompts.navLabel -> ناوبر پرامپت
- session.prompts.tick -> پرامپت {{index}} از {{total}}: {{prompt}}
- session.prompts.noAnswer -> هنوز پاسخی وجود ندارد
- session.prompts.queued -> در صف انتظار
All {{placeholder}} tokens preserved; brand terms stay untranslated.
i18n tests pass (32/32). Contributed by Babak Safabahar.
* fix(i18n): improve contextual accuracy of 8 Persian translations
Revise the 8 keys flagged by the reviewer as too literal:
- migration.whatsNew.features.agentManager.title: was 'مدیر عامل'; now 'Agent Manager' (product name, not translated)
- agentManager.dialog.createWorktree: was 'ایجاد درختکاری'; now 'ایجاد Worktree' (git technical term)
- agentManager.dialog.versionHint: 'worktree' kept in English
- sidebar.session.configureWorktree.tooltip: 'worktree'/'Agent Manager' kept in English
- sidebar.session.showChanges.tooltip.empty: 'working tree' kept in English
- diffViewer.source.unstaged.tooltip: 'working tree'/'stage' kept in English
- settings.language.description: phrasing improved
- prompt.placeholder.default: already natural; minor polish
Also sync fa.ts with any additional new keys added since the last commit.
i18n tests pass (32/32). Contributed by Babak Safabahar.
* Update packages/kilo-vscode/webview-ui/src/i18n/fa.ts
Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
---------
Co-authored-by: Johnny Eric Amancio <johnnyeric@gmail.com>
Co-authored-by: kilo-code-bot[bot] <240665456+kilo-code-bot[bot]@users.noreply.github.com>
…tation-deprecation docs(cli): deprecate Kilo Console
fix(indexing): improvements to semantic_search tool description
Follow-up review on the permission queue: - Decide the skill-shell "needs a human" case synchronously on the EDT in approve() and enqueue there, so back-to-back auto-approve asks keep arrival (FIFO) order instead of racing two independent coroutines. Only the replyPermission RPC stays in a coroutine. - Route permission enqueue/promote through a show() helper wrapped in updateModel, so cards added from approve()/abort() preserve the transcript's bottom-follow like the drain and child-recovery paths. - Queue the auto-approve error card too, so pending stays the single source of truth and Stop / TurnClose / idle purge can clear it rather than stranding a card that can only fail with NotFoundError. Add coverage for the purged auto-approve error card.
…ntext-vscode feat(vscode): show verbatim skill commands and skill name in permission prompt
…ntext-jetbrains feat(jetbrains): show verbatim skill commands and skill name in permission prompt
Toggling auto-approve on while a skill-shell permission card is visible stranded the card: approve() synchronously re-enqueues it via show(), but the trailing pending.clear() dropped that entry, leaving a ghost card not in pending that Stop/idle purge could not clear (answering it later failed with NotFoundError). Clear the queue before re-surfacing the card so show() is the last writer. Also guard drainAutoApprove so it never flips a card that was handled synchronously (in skip) to Busy, which otherwise hid a preserved skill-shell card with no reply path left.
fix(vscode): make cache hit rate write-aware
AI SDK 6 logs a console.warn when system messages appear in the messages array. OpenCode prepends trusted system prompts to messages in session/llm/request.ts, so the warning fires on every turn and bleeds into the TUI frame. Set allowSystemInMessages: true on the streamText call to acknowledge the trusted internal system messages and prevent the warning from corrupting terminal output. This also future-proofs against AI SDK 7, which rejects system messages by default.
feat(jetbrains): improve session changes and diff review
release(jetbrains): v7.0.12-rc.3
docs: add icon-jetbrains skill for authoring JetBrains plugin icons
chore(vscode): add isolated extension dev launches
…tle sync, cancel proof (#12704)
* feat(opencode): remote create_session fields, rename adoption, title sync
Extend create_session wire with optional agent/model/orgId (strict v1,
old-CLI degrade via client retry); claim org via session metadata
(metadata > KILO_ORG_ID > auth); adopt system session.renamed via
setTitle with consume-on-failure adoption marks; POST generation-aware
title changes through readiness (auto-titles marked by ensureTitle,
same-title Updated consumes pending adoptions).
* test(opencode): prove cancel→reprompt reaches idle; lock exit survivor
Item 14 CLI prove-it at SessionPrompt level: cancel-when-idle,
mid-stream, mid-tool, queued follow-up (deterministic queue wait), and
abortIntakes all settle to idle and reprompt completes — no production
hang found, no src change. Item 8: lock survivor session send_message
after sibling exit_cli.
* test(opencode): drop AppRuntime spy from create_session default test
Satisfies check-opencode-promise-facades while still proving the
production default forwards {agent, model, metadata} into
Session.Service.create.
* fix(opencode): bound rename marks, wire title report path, harden title tests
Kilobot review on #12704: adoption/auto-title maps now carry timestamps,
prune on write (60s TTL), and clear on Session.Event.Deleted (exported
clear/clearAll); the Updated watcher calls the interface
reportSessionTitle and fullSync passes preloaded info into meta();
ensureTitle's Kilo logic lives in kilocode/session/prompt.ts behind one
kilocode_change call site; title tests poll instead of sleeping and lock
mark-before-write plus clear-on-failure for real; meta() get-failure
org fallback covered via the _metaForTests seam.
* fix(kilo-sessions): mark bookkeeping before ingest sync, AppRuntime, test cleanup
Kilobot round 2 on #12704: consume rename/auto-title marks before the
ingest.sync network hop so the 60s TTL spans only the in-process hop;
call reportSessionTitle via AppRuntime.runPromise; auth cleanup back
under Effect.ensuring; restore the upstream blank line in prompt.ts so
the fork diff is only the kilocode_change call site.
* fix(kilo-sessions): keep title report self-healing if ingest.sync fails
Advance knownTitles only after successful sync; restore consumed rename/
auto-title marks on failure so the next Updated can re-POST. IIFE keeps
const-style outcome derivation.
* fix(kilo-sessions): optimistic knownTitles with full title-path rollback
Advance knownTitles before the network hop so concurrent Updated handlers
see sameTitle and cannot POST the same title with a wrong generated flag.
Restore prev + consumed marks when ingest.sync throws or reportSessionTitle
returns not-ok, so the next Updated retries the full self-healing path.
* style(kilo-sessions): prettier title Updated handler
* fix(kilo-sessions): preserve newer title state
* refactor(kilo-sessions): simplify title reporting tests
* fix(kilo-sessions): report unseeded title updates
* fix(kilo-sessions): consume unseeded title marks
* test(kilo-sessions): cover unseeded title marks
* test(kilo-sessions): unique ids for unseeded title tests
Thread a distinct session id through unseededMockSessionLayer so
session_share Storage records do not couple the three unseeded cases.
- Replace generic 'multi-model API gateway' opening with punchier differentiators: native Claude protocol, verifiable routing, one-key access - Reviewer feedback: opening sentence didn't differentiate from other gateways Co-Authored-By: Claude <noreply@anthropic.com>
docs: add DaoXE provider guide
Complete upstream merge of kilocode v7.4.18. Resolves conflicts across the TUI restructure (standalone packages/tui), httpapi groups/handlers refactor, and config/session/agent API drift. All 23 JS packages pass typecheck (jetbrains excluded — needs Java 21). Key fixes: - Re-took upstream versions (per CLAUDE.md rule) for files the merge had wrongly kept at pre-merge state, then re-applied czcode blocks: KiloProvider.ts, installation/index.ts, kilocode/session/prompt.ts, kilocode/config/config.ts, kilocode/cli/cmd/tui/app.tsx, agent/index.ts, tool-error-card.tsx, ExperimentalTab.tsx, and the kilo-gateway/kilocode httpapi handlers. - core/instance-layer.ts: Catalog/PluginBoot defaultLayer -> locationLayer. - Deleted 8 orphaned flat httpapi files replaced by groups/+handlers/. - Migrated czcode plugin imports to packages/tui paths (useLocal, clipboard, border); added @kilocode/kilo-telemetry dep to packages/tui. - telemetry: add flushInBackground, keep_refining plan-followup choice. - Fixed 138 test typecheck errors from renamed/moved APIs (LLMEvent, ProviderV2/ModelV2 IDs, core/ripgrep, FSUtil, WorkspaceV2, EventV2). Smoke tested via bun dev: TUI boots, Lakehouse connection status shows, cz_ commands and skills load, /cz_role picker works. Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
The v7.4.18 test-typecheck fixes reached through the global AppRuntime facade, which check-opencode-promise-facades.ts forbids. Refactor session.test.ts and platform-attribution.test.ts onto the scoped testEffect/it.instance harness (yield services in-scope, Deferred-based event capture) matching the upstream test/session/session.test.ts, and drop the now-zero allowlist entries. 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
16 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
Merges upstream kilocode v7.4.18 into czcode. This is a large merge covering the upstream TUI restructure (standalone
packages/tui), the httpapigroups/+handlers/refactor, and config/session/agent API drift.What / Why
Upstream v7.4.18 extracted the TUI into a standalone
packages/tuipackage with a newfeature-plugins/architecture, sankfile/ripgrepandptymodules intopackages/core, and restructured the flat httpapi files intogroups/+handlers/+middleware/. czcode's TUI fork layer and 10cz_plugins had to be migrated onto the new structure.Conflict resolution
Followed the CLAUDE.md rule (start from upstream, re-apply czcode blocks) throughout. Several shared files had been wrongly kept at their pre-merge state by the initial merge — re-took the upstream version and re-applied czcode customizations:
KiloProvider.ts(had lost ~1300 lines of upstream methods),installation/index.ts(lost the newnodeLayerNode export),kilocode/session/prompt.ts,kilocode/config/config.ts,kilocode/cli/cmd/tui/app.tsx,agent/index.ts(887L three-way merge preserving 5 Lakehouse agents), the kilo-gateway/kilocode httpapi handlers, andExperimentalTab.tsx.core/instance-layer.ts:Catalog/PluginBootdefaultLayer→locationLayer.groups/+handlers/.packages/tuipaths (useLocal, clipboard, border); added@kilocode/kilo-telemetrydep topackages/tui.flushInBackground,keep_refiningplan-followup choice.Testing
bun turbo typecheck --filter='!@kilocode/kilo-jetbrains'). jetbrains excluded locally (needs Java 21); CI validates it.bun dev): TUI boots with ClickZetta welcome screen, Lakehouse connection status shows in status bar (ClickZetta [aliyun_shanghai_prod] ws:quick_start),cz_commands and ClickZetta skills load in the command palette,/cz_rolepicker works.LLMEvent,ProviderV2/ModelV2IDs,core/ripgrep,FSUtil,WorkspaceV2,EventV2).Notes
--no-verifylocally because the pre-push hook runs the jetbrains gradle typecheck, which needs Java 21 (unavailable locally). CI runs the full typecheck.Co-Authored-By: Claude Opus 4 noreply@anthropic.com