Update upstream merge scripts to use a generic x-opencode- → x-kilo- regex
that catches all current and future headers automatically. Apply the same
replacement to all source files so the codebase is ready for the next
upstream merge.
* feat(vscode): track session status for busy-session warnings
* feat(vscode): warn before saving settings when sessions are running
* feat(vscode): add draft state and save/discard to config context
* feat(vscode): Save button on Settings panel
* fix(vscode): pass remove permission commands correctly to backend
* feat(vscode): handle permission removals
* fix(vscode): detect other sessions in settings panel
* feat(vscode): translations
* feat(vscode): refresh config state on auto-approve tab
* fix(vscode): formatting and unit tests
* fix: reset Config.state cache on no-dispose config write
* fix(vscode): Detect sessions opened before Settings tab is opened
* fix(vscode): Removed previous fix changes
* fix: renamed pattern arrays used for permission rules
* fix: rename savePatternRules to saveAlwaysRules
* feat: generate hierarchical always patterns in bash tool
* feat: validate saveAlwaysRules against always array only
* feat: pass always field through extension bridge to webview
* feat: show hierarchical always patterns in PermissionDock dropdown
* fix: rename pattern to rule in PermissionDock translations, styles, and data-slots
* fix(vscode): correct auto-run comment in PermissionDock
* feat(kilo-vscode): strip trailing wildcard from permission rule labels
* fix: deduplicate permission rules and strip wildcards from display labels
* refactor: move hierarchy to metadata.rules, restore always to arity prefix
* feat: pass always field to permission dock for non-bash tool rules
* fix: correct bash test assertion to check metadata.rules and fix indentation
* fix: hide permission rules dropdown for non-bash tools
* fix: align always-rules route descriptions, whitespace, and restore multi-command tests
readMcpSettings() called JSON.parse() without try/catch. In migrate(),
if .kilocode/mcp.json existed but contained malformed JSON, the uncaught
exception propagated out of the dual-read loop, preventing .kilo/mcp.json
from ever being read. The outer loadMcpConfig() catch returned {} instead
of the valid config — silently losing MCP server configuration.
Wrap the file read + parse in try/catch, log a warning, and return null
so the loop continues to the next config directory.
Regression tests added for both readMcpSettings (unit) and migrate
(integration) to prove the bug and verify the fix.
Refs: #6881
Co-authored-by: marius-kiloclaw <marius-kiloclaw@users.noreply.github.com>
The upstream merge (v1.1.54) overwrote Kilo-specific URL handling with
the opencode ShareNext flow, breaking import for app.kilo.ai/s/ URLs.
Restore parsing of https://app.kilo.ai/s/<id> and fetching from
ingest.kilosessions.ai instead of the opncd.ai share API.
* fix: use .kilo instead of .kilocode for config directories
* fix: keep global ~/.kilocode untouched for legacy CLI compat
Only rename project-level .kilocode/ to .kilo/. The global ~/.kilocode
directory must stay because legacy CLI instances and legacy-migration.ts
in kilo-gateway still read from it.
* test: update VS Code extension tests to use .kilo directory paths
* fix: correct paths.ts comment and use specific git exclude entries
- Fix comment referencing ~/.kilo when globalDir() returns ~/.kilocode
- Revert to specific .kilo/ git exclude entries instead of blanket .kilo/
to avoid hiding user-authored rules/workflows/config from git status
* fix: handle legacy per-worktree metadata and stale paths in state
- readMetadata() falls back to .kilocode/ inside worktrees since the
per-worktree metadata dirs aren't renamed by the top-level migration
- Rewrite stale .kilocode/ paths in agent-manager.json on load
* fix: run .kilocode migration at extension activation, not just Agent Manager
Move migration call to the top of activate() so it runs for all users
on every extension startup, before kilo serve is spawned or any code
reads from the .kilo directory.
* fix: update git worktree refs after .kilocode → .kilo rename
After renaming the directory, git's internal .git/worktrees/*/gitdir
files still reference the old .kilocode path. This causes git to lose
track of worktrees, leading to crashes. Both the CLI and extension
migration now rewrite these gitdir files after a successful rename.
* fix: read from both .kilo and .kilocode, write to .kilo
Replace the one-time directory rename migration with a dual-read strategy:
- CLI config (rules, workflows, skills, MCP, project-id): read from both
.kilo/ and .kilocode/ directories, with .kilo taking precedence
- Agent Manager data (worktrees, state, setup scripts): migrate from
.kilocode/ to .kilo/ at startup since the extension exclusively owns these
- Config discovery (paths.ts, config.ts): include .kilocode in directory
and agent/command pattern matching
Key decisions:
- .kilo/ is the new canonical write location for all new data
- .kilocode/ is read as a legacy fallback (no data loss for existing users)
- No directory rename: both dirs can coexist safely
- Agent Manager migration is item-level (moves individual files), not a
full directory rename, so it handles both-dirs-exist gracefully
- Windows path rewrite in WorktreeStateManager handles both / and \ separators
- Workflow/MCP load order: .kilocode first, .kilo second (last wins)
- Rules dedup via seen-set with .kilo checked first (first wins)
- Delete migrate-kilo-dir.ts (no longer needed)
* fix: resolve .git file when fixing worktree refs during migration
When the project root is itself a worktree, .git is a file pointing
at the shared git dir, not a directory. Follow the gitdir pointer to
find the actual .git/worktrees/ location.
* fix: recover partial .kilo migrations and global dirs
Always repair stale git worktree refs when .kilo worktrees already exist so partially migrated repos recover on startup. Also dual-read global skills, rules, and workflows from both legacy and new home directories.
* fix: keep .kilo ahead of legacy config dirs
* fix: narrow legacy agent manager excludes
* chore: link migration cleanup follow-up
Instant effort is not suitable for tool calling scenarios. Removed from
@ai-sdk/openai-compatible (direct inception) and updated kilo gateway
test to reflect server no longer providing instant variant. OpenRouter
keeps all OPENAI_EFFORTS unchanged.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Add Mercury-2 reasoning effort variants for OpenRouter and Inception
direct API providers. OpenRouter gets OPENAI_EFFORTS (none through
xhigh), Inception gets instant + WIDELY_SUPPORTED_EFFORTS. Kilo
Gateway already works via server-provided variants.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The test now validates that the database file is named according to the current installation channel (latest/beta get 'opencode.db', others get sanitized names). This ensures users' data is stored in the correct location based on their update channel.
Imanol Maiztegui