diff --git a/.changeset/agent-manager-stop-session.md b/.changeset/agent-manager-stop-session.md
deleted file mode 100644
index d892ae27db..0000000000
--- a/.changeset/agent-manager-stop-session.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": minor
-"kilo-code": minor
----
-
-Allow agents to stop and remove a targeted Agent Manager session.
diff --git a/.changeset/align-cli-usage.md b/.changeset/align-cli-usage.md
deleted file mode 100644
index 4cfc10fe32..0000000000
--- a/.changeset/align-cli-usage.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": patch
----
-
-Improve CLI sidebar usage sections with cent-formatted costs, collapsible details, and aligned model totals.
diff --git a/.changeset/background-process-display.md b/.changeset/background-process-display.md
deleted file mode 100644
index e43a4e9878..0000000000
--- a/.changeset/background-process-display.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Respect the Terminal Command Blocks display setting for background process tool cards.
diff --git a/.changeset/calm-heredocs-explain.md b/.changeset/calm-heredocs-explain.md
deleted file mode 100644
index 179aa51222..0000000000
--- a/.changeset/calm-heredocs-explain.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"kilo-code": patch
----
-
-Display here-document content as plain text in terminal approval prompts.
diff --git a/.changeset/chat-bidi-text.md b/.changeset/chat-bidi-text.md
deleted file mode 100644
index 7f984c6eea..0000000000
--- a/.changeset/chat-bidi-text.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Support bidirectional text in chat messages so right-to-left and mixed-language conversations render in the correct direction.
diff --git a/.changeset/cloud-session-import.md b/.changeset/cloud-session-import.md
deleted file mode 100644
index 4d32b07923..0000000000
--- a/.changeset/cloud-session-import.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@kilocode/cli": patch
-"@kilocode/kilo-gateway": patch
----
-
-Fix Cloud Agent session imports in installed CLI builds and prevent malformed exports or write failures from leaving partial imports.
diff --git a/.changeset/default-worktree-dialog.md b/.changeset/default-worktree-dialog.md
deleted file mode 100644
index 0fd935c7e7..0000000000
--- a/.changeset/default-worktree-dialog.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Open the Agent Manager new-worktree dialog from primary actions and keyboard shortcuts, with an explicit quick-create action in its dropdown.
diff --git a/.changeset/finish-deprecated-review-command.md b/.changeset/finish-deprecated-review-command.md
deleted file mode 100644
index e4bf8725a6..0000000000
--- a/.changeset/finish-deprecated-review-command.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kilo-code": patch
----
-
-Keep sessions usable after deprecated local review commands complete without a session status transition.
diff --git a/.changeset/indexing-file-extensions.md b/.changeset/indexing-file-extensions.md
deleted file mode 100644
index c464e7a19a..0000000000
--- a/.changeset/indexing-file-extensions.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@kilocode/cli": minor
-"@kilocode/kilo-indexing": minor
-"kilo-code": minor
----
-
-Configure a custom file extension allowlist for codebase indexing to limit scans to relevant project files and support additional text formats.
diff --git a/.changeset/jetbrains-skills-settings.md b/.changeset/jetbrains-skills-settings.md
new file mode 100644
index 0000000000..128e35207d
--- /dev/null
+++ b/.changeset/jetbrains-skills-settings.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": minor
+---
+
+Support viewing, opening, editing, deleting, and configuring JetBrains skill sources.
diff --git a/.changeset/refine-memory-controls.md b/.changeset/refine-memory-controls.md
new file mode 100644
index 0000000000..97d452f7c2
--- /dev/null
+++ b/.changeset/refine-memory-controls.md
@@ -0,0 +1,8 @@
+---
+"@kilocode/cli": patch
+"@kilocode/kilo-memory": patch
+"@kilocode/kilo-ui": patch
+"kilo-code": patch
+---
+
+Simplify project memory settings and activity visibility, replace direct editing with folder inspection, add nested memory slash-command completion and status views, improve empty-project handling, compact native tool-call summaries, and remove legacy memory audit logs.
diff --git a/.changeset/remote-embedders-retry-timeouts.md b/.changeset/remote-embedders-retry-timeouts.md
deleted file mode 100644
index ab0db53a16..0000000000
--- a/.changeset/remote-embedders-retry-timeouts.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/kilo-indexing": patch
----
-
-Allow remote embedder validation timeouts to retry before indexing reports a connection failure.
diff --git a/.changeset/remote-session-slash-commands.md b/.changeset/remote-session-slash-commands.md
deleted file mode 100644
index eb48e0c938..0000000000
--- a/.changeset/remote-session-slash-commands.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@kilocode/cli": minor
----
-
-Remote CLI: expose slash command discovery, execution, and `/new` session creation over the relay. `list_commands` and `send_command` (including the built-in `compact` flow) are scoped to the current session's directory. `create_session` creates a root session in that directory, attaches it to the relay heartbeat set, and returns the new session id only after the heartbeat completes so the mobile client can navigate immediately. Failures are sanitized; the command is not auto-retried and the user may retry manually after a transient relay failure.
diff --git a/.changeset/reset-diff-scroll.md b/.changeset/reset-diff-scroll.md
new file mode 100644
index 0000000000..c5efe834f8
--- /dev/null
+++ b/.changeset/reset-diff-scroll.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix scroll position not resetting when switching between diff files in the chat and virtual diff viewer
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4f07f6b4cf..1575f61ab5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -160,7 +160,7 @@ jobs:
         if: matrix.settings.run
         run: bun turbo test:ci --output-logs=errors-only --log-order=grouped --log-prefix=task --filter='@kilocode/cli'
         env:
-          KILO_EXPERIMENTAL_DISABLE_FILEWATCHER: ${{ runner.os == 'Windows' && 'true' || 'false' }}
+          KILO_EXPERIMENTAL_DISABLE_FILEWATCHER: "true" # kilocode_change - was Windows-only; the CLI now starts a watcher per instance, too heavy/racy for unit tests. Watcher tests opt back in.
           KILO_TEST_PROFILE: ${{ matrix.settings.os == 'macos' && 'darwin' || '' }}
           KILO_TEST_SHARD: ${{ format('{0}/{1}', matrix.settings.index, matrix.settings.total) }}
       # kilocode_change end
diff --git a/.kilo/plans/jetbrains-context-settings-page.md b/.kilo/plans/jetbrains-context-settings-page.md
new file mode 100644
index 0000000000..1b76e7b6ce
--- /dev/null
+++ b/.kilo/plans/jetbrains-context-settings-page.md
@@ -0,0 +1,423 @@
+# JetBrains Context Settings Page
+
+Implement the Tier 1 Context settings from `docs/jetbrains-vscode-settings-parity.md` in the JetBrains plugin. This is a pure `kilo.json` settings UI: no CLI feature work, no SDK regen, and no session-rendering changes.
+
+## Goal
+
+Add a new JetBrains settings page under `Settings -> Tools -> Kilo Code -> Context` for:
+
+| Setting | Config key | Type |
+|---|---|---|
+| Auto-compaction | `compaction.auto` | boolean |
+| Compaction threshold percent | `compaction.threshold_percent` | number or null |
+| Prune on compaction | `compaction.prune` | boolean |
+| Watcher ignore patterns | `watcher.ignore` | string array |
+
+Do not include VS Code Context-tab memory/indexing controls in this first pass. JetBrains does not have the equivalent memory/indexing settings service yet, and the parity doc excludes indexing from easy wins.
+
+Do not put `snapshot` on this page unless product explicitly decides to combine Context and Checkpoints. The parity doc suggests `snapshot` belongs on a new Checkpoints page.
+
+## Context Verified
+
+- Source parity doc: `docs/jetbrains-vscode-settings-parity.md`.
+- JetBrains settings guidance: `packages/kilo-jetbrains/AGENTS.md`, especially `Settings UI`.
+- Existing settings pages are registered in `packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml`.
+- Existing page pattern to mirror:
+  - `packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/models/ModelsConfigurable.kt`
+  - `packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/models/ModelsSettingsUi.kt`
+  - `packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/models/ModelsSettingsState.kt`
+- Existing global config write path is sufficient once DTO/parser support is added:
+  - Frontend: `KiloAppService.updateConfigAsync(...)`
+  - RPC: `KiloAppRpcApi.updateConfig(patch: ConfigPatchDto)`
+  - Backend: `KiloBackendAppService.updateConfig(...)`
+  - HTTP: `PATCH /global/config`, then `GET /global/config`
+- Existing backend parser currently only serializes selected string keys from `ConfigPatchDto.values`; Context needs typed booleans, numbers, explicit null, and string arrays.
+
+## Decisions
+
+- Use global config for the first implementation, matching the existing app-level settings write path.
+- Add typed DTO fields instead of overloading `ConfigPatchDto.values` for non-string values.
+- Use an explicit `clear` list for nullable compaction fields, because `Double?` cannot distinguish absent from explicit `null`.
+- Reuse `BaseSettingsUi`, `DraftReadyConfigurable`, `SettingsDraftState`, `SettingsRows`, `SettingsRow`, and `SettingsToggle`.
+- Use the shared settings list primitives for `watcher.ignore`; do not build a bespoke add/remove list if `SettingsListPanel` or adjacent list primitives fit.
+- Keep all UI strings in `KiloBundle.properties`. Let other locale bundles fall back unless the repo's resource-bundle checks require duplicated English keys.
+
+## Part A - Shared DTOs
+
+File: `packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt`
+
+Add config read DTOs:
+
+```kotlin
+@Serializable
+data class WatcherConfigDto(
+    val ignore: List<String> = emptyList(),
+)
+
+@Serializable
+data class CompactionConfigDto(
+    val auto: Boolean? = null,
+    val threshold_percent: Double? = null,
+    val prune: Boolean? = null,
+)
+```
+
+Extend `ConfigDto`:
+
+```kotlin
+val watcher: WatcherConfigDto? = null,
+val compaction: CompactionConfigDto? = null,
+```
+
+Add patch DTOs:
+
+```kotlin
+@Serializable
+data class WatcherPatchDto(
+    val ignore: List<String>? = null,
+)
+
+@Serializable
+data class CompactionPatchDto(
+    val clear: List<String> = emptyList(),
+    val auto: Boolean? = null,
+    val threshold_percent: Double? = null,
+    val prune: Boolean? = null,
+)
+```
+
+Extend `ConfigPatchDto`:
+
+```kotlin
+val watcher: WatcherPatchDto? = null,
+val compaction: CompactionPatchDto? = null,
+```
+
+Notes:
+
+- `watcher.ignore = null` means no change.
+- `watcher.ignore = emptyList()` means explicitly save an empty list.
+- `compaction.threshold_percent = null` alone means no change.
+- `compaction.clear = listOf("threshold_percent")` means emit JSON `"threshold_percent": null`.
+- `false` boolean values must be serialized; do not treat `false` as absent.
+
+## Part B - Backend Config Parser And Serializer
+
+File: `packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt`
+
+### Parse
+
+Extend `parseConfig(raw)` to read:
+
+- `watcher.ignore`
+- `compaction.auto`
+- `compaction.threshold_percent`
+- `compaction.prune`
+
+Add private helpers near `parseSkillsConfig` / `parseMcpConfig`:
+
+```kotlin
+private fun parseWatcherConfig(obj: JsonObject?): WatcherConfigDto?
+private fun parseCompactionConfig(obj: JsonObject?): CompactionConfigDto?
+```
+
+Use existing helper style:
+
+- strings: `str(...)`
+- booleans: `flagOrNull(...)`
+- numbers: `num(...)`
+- arrays: `arr()?.mapNotNull { it.jsonPrimitive.contentOrNull }`
+
+### Serialize
+
+Extend `buildConfigPatch(patch)` to emit typed context patches:
+
+```json
+{
+  "watcher": {
+    "ignore": ["**/node_modules/**"]
+  },
+  "compaction": {
+    "auto": true,
+    "threshold_percent": 80,
+    "prune": false
+  }
+}
+```
+
+For explicit threshold clearing:
+
+```json
+{
+  "compaction": {
+    "threshold_percent": null
+  }
+}
+```
+
+Keep the existing `values` allowlist for string model keys. Do not pass Context values through `values`.
+
+## Part C - Frontend State Model
+
+Add package: `packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/`
+
+New file: `ContextSettingsState.kt`
+
+Define:
+
+```kotlin
+internal data class ContextDraft(
+    val auto: Boolean? = null,
+    val threshold: String = "",
+    val prune: Boolean? = null,
+    val ignore: List<String> = emptyList(),
+)
+```
+
+Use a string for the threshold draft so the UI can represent blank/invalid intermediate input without losing user text. Convert only when building a patch.
+
+Functions to add:
+
+- `contextDraft(config: ConfigDto?): ContextDraft`
+- `patch(from: ContextDraft, to: ContextDraft): ConfigPatchDto`
+- `savedMatches(base: ContextDraft, draft: ContextDraft): Boolean`
+- `threshold(value: String): Double?` or equivalent parsing helper
+- validation helper for threshold range if desired
+
+Patch behavior:
+
+- Only emit changed fields.
+- Emit `CompactionPatchDto(auto = false)` when the user turns auto-compaction off.
+- Emit `CompactionPatchDto(prune = false)` when the user turns pruning off.
+- Emit `CompactionPatchDto(threshold_percent = 80.0)` for a non-blank valid number.
+- Emit `CompactionPatchDto(clear = listOf("threshold_percent"))` when an existing threshold is cleared.
+- Emit `WatcherPatchDto(ignore = emptyList())` when the last ignore pattern is removed.
+- Return no change from the page when all fields match the baseline.
+
+## Part D - Frontend UI Page
+
+New file: `ContextConfigurable.kt`
+
+Mirror `ModelsConfigurable`:
+
+- Extend `DraftReadyConfigurable<JComponent>`.
+- `ID = "ai.kilocode.jetbrains.settings.context"`.
+- `getDisplayName()` returns `KiloBundle.message("settings.context.displayName")`.
+- `create(cs)` returns `ContextSettingsUi(cs)`.
+
+New file: `ContextSettingsUi.kt`
+
+Mirror the simple parts of `ModelsSettingsUi`:
+
+- Extend `BaseSettingsUi<ContextSettingsContent, ContextDraft, ConfigPatchDto, KiloAppStateDto, Unit>`.
+- Initial draft is `ContextDraft()`.
+- `save(change, done)` calls `app.updateConfigAsync(change, done)`.
+- `base(result)` and `draft(state)` call `contextDraft(state.config)`.
+- `saved(base, draft)` calls `savedMatches(base, draft)`.
+- `pendingText()` uses `settings.context.save.pending`.
+- `failedText()` uses `settings.context.save.failed`.
+- `loadWorkspace(root)` returns `Unit`; `applyWorkspace(result)` is `Unit`.
+- `models(state)` is `Unit`.
+- `syncContent()` updates enabled states, field values, save/progress overlay, and validation messaging.
+
+New content class: `ContextSettingsContent`
+
+Suggested layout:
+
+- Section `settings.context.compaction.title`
+  - Toggle row `settings.context.compaction.auto.title`
+  - Numeric row `settings.context.compaction.threshold.title`
+  - Toggle row `settings.context.compaction.prune.title`
+- Section `settings.context.watcher.title`
+  - List editor row/panel for ignore patterns
+
+Controls:
+
+- Use `SettingsToggle` for booleans.
+- Use `JBTextField` or a small reusable numeric field pattern based on `AgentEditDialog` for threshold.
+- Use shared list primitives (`SettingsListPanel` / `SettingsListView` / `SettingsListItem` / `SettingsListCell`) for `watcher.ignore` where practical.
+- Keep the page editable while app status is ready and no save is pending.
+- Disable controls while saving.
+
+Validation:
+
+- Blank threshold is valid and means clear/reset the config value if it differs from baseline.
+- Non-numeric threshold is invalid and should prevent `apply()` from sending a patch.
+- Suggested accepted range is `0..100`; if existing CLI allows a broader range, follow CLI behavior.
+- Show validation through existing settings messaging rather than custom ad hoc labels.
+
+## Part E - Settings Registration And Root Navigation
+
+File: `packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml`
+
+Add a child configurable:
+
+```xml
+<applicationConfigurable
+        parentId="ai.kilocode.jetbrains.settings"
+        id="ai.kilocode.jetbrains.settings.context"
+        groupWeight="3"
+        instance="ai.kilocode.client.settings.context.ContextConfigurable"
+        bundle="messages.KiloBundle"
+        key="settings.context.displayName"/>
+```
+
+Adjust weights so the desired order is stable. Recommended order:
+
+| Page | Weight |
+|---|---|
+| User Profile | 5 |
+| Models | 4 |
+| Context | 3 |
+| Providers | 2 |
+| Agent Behavior | 1 |
+
+File: `packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurable.kt`
+
+Add a root-page `ActionLink` for Context between Models and Providers:
+
+- Import `ContextConfigurable`.
+- Link text: `settings.context.displayName`.
+- Link target: `ContextConfigurable.ID`.
+
+`KiloSettingsSelection.kt` probably needs no code changes because child IDs already share the root prefix.
+
+## Part F - Strings
+
+File: `packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties`
+
+Add base strings near the other settings strings:
+
+```properties
+settings.context.displayName=Context
+settings.context.description=Configure compaction and file-watcher context behavior.
+settings.context.save.pending=Saving context settings...
+settings.context.save.failed=Failed to save context settings
+settings.context.compaction.title=Compaction
+settings.context.compaction.description=Control when Kilo summarizes long sessions to reduce context usage.
+settings.context.compaction.auto.title=Auto-compaction
+settings.context.compaction.auto.description=Automatically compact long conversations before they exceed the model context window.
+settings.context.compaction.threshold.title=Compaction threshold
+settings.context.compaction.threshold.description=Percent of the context window to use before auto-compaction starts. Leave blank to use the default.
+settings.context.compaction.threshold.invalid=Enter a number from 0 to 100, or leave the field blank.
+settings.context.compaction.prune.title=Prune on compaction
+settings.context.compaction.prune.description=Drop older raw conversation details after compaction to keep the session context smaller.
+settings.context.watcher.title=Watcher ignore patterns
+settings.context.watcher.description=Glob patterns Kilo should ignore when watching repository file changes.
+settings.context.watcher.add=Add pattern
+settings.context.watcher.empty=No ignore patterns configured.
+settings.context.watcher.placeholder=e.g. **/dist/**
+settings.context.watcher.remove=Remove {0}
+```
+
+If resource-bundle tests require every key in every locale bundle, copy English values into the localized bundles and leave translation work for a later i18n pass.
+
+## Part G - Test Updates
+
+### Frontend state tests
+
+Add: `packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsStateTest.kt`
+
+Cover:
+
+- Draft reads `ConfigDto.watcher` and `ConfigDto.compaction`.
+- Unchanged draft emits no patch.
+- Boolean changes emit `false` and `true` correctly.
+- Threshold set emits `threshold_percent`.
+- Threshold clear emits `clear = listOf("threshold_percent")`.
+- Watcher list add/remove emits the whole new `ignore` list, including empty list.
+- Invalid threshold is rejected before save if validation lives in state helpers.
+
+### Frontend UI tests
+
+Add: `packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsUiTest.kt`
+
+Use `ModelsSettingsUiTest` as the main pattern:
+
+- `BasePlatformTestCase`.
+- Real EDT.
+- `FakeAppRpcApi`.
+- `KiloAppService`.
+- `flushUntil` helpers.
+- Assert `rpc.configPatches` after user interaction.
+- Assert controls disable during pending save.
+- Assert failed save leaves page modified and shows `settings.context.save.failed`.
+
+Update `FakeAppRpcApi`:
+
+- File: `packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt`
+- Apply `patch.watcher` and `patch.compaction` to fake config state.
+- Preserve explicit empty lists.
+- Preserve boolean `false`.
+- Honor `compaction.clear` by setting cleared fields to `null`.
+
+### Backend parser tests
+
+Update: `packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt`
+
+Add exact JSON tests for:
+
+- `parseConfig` reads watcher and compaction fields.
+- `buildConfigPatch` emits watcher ignore arrays.
+- `buildConfigPatch` emits `auto=false` and `prune=false`.
+- `buildConfigPatch` emits numeric `threshold_percent`.
+- `buildConfigPatch` emits explicit `threshold_percent:null` when `clear` includes the field.
+
+### Backend app service tests
+
+Update: `packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt`
+
+Add a test similar to the existing model config update test:
+
+- Call `updateConfig(ConfigPatchDto(watcher = ..., compaction = ...))`.
+- Assert `MockCliServer.lastConfigPatchBody` exactly matches the expected nested JSON.
+- Assert the returned/reloaded `ConfigDto` includes the saved Context values.
+
+### Root settings tests
+
+Update: `packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurableTest.kt`
+
+Add:
+
+- `ContextConfigurable.ID == "ai.kilocode.jetbrains.settings.context"`.
+- Root page includes a Context link.
+- Link order matches XML order.
+
+## Validation
+
+Run from `packages/kilo-jetbrains/`:
+
+```bash
+./gradlew typecheck
+./gradlew test
+```
+
+Focused checks while iterating:
+
+```bash
+./gradlew :shared:test --tests '*ContextSettingsStateTest'
+./gradlew :frontend:test --tests '*ContextSettingsUiTest'
+./gradlew :backend:test --tests '*KiloCliDataParserTest'
+./gradlew :backend:test --tests '*KiloBackendAppServiceTest'
+```
+
+If the exact Gradle module test selectors differ, run the package-level `./gradlew test` before marking the implementation ready.
+
+Manual verification:
+
+1. Run `./gradlew runIde` from `packages/kilo-jetbrains/`.
+2. Open `Settings -> Tools -> Kilo Code -> Context`.
+3. Toggle auto-compaction and prune.
+4. Set threshold to a number, apply, reopen settings, and verify it persists.
+5. Clear threshold, apply, reopen settings, and verify it resets.
+6. Add and remove watcher ignore patterns, apply, reopen settings, and verify the list persists.
+7. Inspect the global Kilo config file through the existing `Open: global ...` action if needed.
+
+## Risks And Follow-ups
+
+- Global vs project-local config: this plan uses the existing global config write path. Project-local Context settings would need new workspace config RPC plumbing.
+- Threshold null semantics: implement explicit clear handling; otherwise clearing the field will silently do nothing.
+- String-array UI: reuse list primitives even if it takes a small adapter type; avoid one-off list widgets.
+- VS Code memory/indexing parity: defer because it is not pure config and is excluded by the easy-win criteria.
+- Checkpoints page: implement `snapshot` separately unless product asks to combine it with Context.
+- Changeset: when implementing this user-facing JetBrains settings feature, add a patch changeset for `kilo-code`/JetBrains according to repo release guidance.
diff --git a/bun.lock b/bun.lock
index 932d1ada0b..d87df9a65a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -32,7 +32,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -127,7 +127,7 @@
     },
     "packages/effect-drizzle-sqlite": {
       "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -141,7 +141,7 @@
     },
     "packages/effect-sqlite-node": {
       "name": "@opencode-ai/effect-sqlite-node",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -153,7 +153,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@effect/platform-node": "4.0.0-beta.74",
         "@effect/platform-node-shared": "4.0.0-beta.74",
@@ -174,7 +174,7 @@
     },
     "packages/kilo-console": {
       "name": "@kilocode/kilo-console",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/kilo-indexing": "workspace:*",
         "@kilocode/kilo-web-ui": "workspace:*",
@@ -197,7 +197,7 @@
     },
     "packages/kilo-docs": {
       "name": "@kilocode/kilo-docs",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@docsearch/css": "^4",
         "@docsearch/js": "^4",
@@ -227,7 +227,7 @@
     },
     "packages/kilo-gateway": {
       "name": "@kilocode/kilo-gateway",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@ai-sdk/alibaba": "1.0.17",
         "@ai-sdk/anthropic": "3.0.71",
@@ -263,7 +263,7 @@
     },
     "packages/kilo-i18n": {
       "name": "@kilocode/kilo-i18n",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "devDependencies": {
         "@tsconfig/node22": "catalog:",
         "@types/bun": "catalog:",
@@ -273,7 +273,7 @@
     },
     "packages/kilo-indexing": {
       "name": "@kilocode/kilo-indexing",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@aws-sdk/client-bedrock-runtime": "3.1005.0",
         "@aws-sdk/credential-provider-ini": "3.972.31",
@@ -309,7 +309,7 @@
     },
     "packages/kilo-memory": {
       "name": "@kilocode/kilo-memory",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "effect": "catalog:",
         "zod": "catalog:",
@@ -323,7 +323,7 @@
     },
     "packages/kilo-sandbox": {
       "name": "@kilocode/sandbox",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@anthropic-ai/sandbox-runtime": "catalog:",
         "effect": "catalog:",
@@ -338,7 +338,7 @@
     },
     "packages/kilo-telemetry": {
       "name": "@kilocode/kilo-telemetry",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/kilo-gateway": "workspace:*",
         "posthog-node": "4.4.0",
@@ -352,7 +352,7 @@
     },
     "packages/kilo-ui": {
       "name": "@kilocode/kilo-ui",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "0.13.11",
@@ -389,7 +389,7 @@
     },
     "packages/kilo-vscode": {
       "name": "kilo-code",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.39.0",
         "@kilocode/kilo-gateway": "workspace:*",
@@ -458,7 +458,7 @@
     },
     "packages/kilo-web-ui": {
       "name": "@kilocode/kilo-web-ui",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/kilo-ui": "workspace:*",
         "@kobalte/core": "catalog:",
@@ -475,7 +475,7 @@
     },
     "packages/llm": {
       "name": "@opencode-ai/llm",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@smithy/eventstream-codec": "4.2.14",
         "@smithy/util-utf8": "4.2.2",
@@ -493,7 +493,7 @@
     },
     "packages/opencode": {
       "name": "@kilocode/cli",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "bin": {
         "kilo": "./bin/kilo",
         "kilocode": "./bin/kilo",
@@ -660,7 +660,7 @@
     },
     "packages/plugin": {
       "name": "@kilocode/plugin",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "effect": "catalog:",
@@ -688,7 +688,7 @@
     },
     "packages/plugin-atomic-chat": {
       "name": "@kilocode/plugin-atomic-chat",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/plugin": "workspace:*",
       },
@@ -702,7 +702,7 @@
     },
     "packages/script": {
       "name": "@opencode-ai/script",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "semver": "^7.6.3",
       },
@@ -713,7 +713,7 @@
     },
     "packages/sdk/js": {
       "name": "@kilocode/sdk",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -728,7 +728,7 @@
     },
     "packages/server": {
       "name": "@opencode-ai/server",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "drizzle-orm": "catalog:",
@@ -742,7 +742,7 @@
     },
     "packages/storybook": {
       "name": "@opencode-ai/storybook",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "devDependencies": {
         "@opencode-ai/ui": "workspace:*",
         "@solidjs/meta": "catalog:",
@@ -765,7 +765,7 @@
     },
     "packages/tui": {
       "name": "@opencode-ai/tui",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/plugin": "workspace:*",
         "@kilocode/sdk": "workspace:*",
@@ -792,7 +792,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "7.4.11",
+      "version": "7.4.13",
       "dependencies": {
         "@kilocode/sdk": "workspace:*",
         "@kobalte/core": "catalog:",
@@ -844,23 +844,21 @@
     },
   },
   "trustedDependencies": [
-    "tree-sitter-powershell",
-    "web-tree-sitter",
-    "tree-sitter-bash",
     "esbuild",
     "protobufjs",
+    "web-tree-sitter",
+    "tree-sitter-bash",
   ],
   "patchedDependencies": {
-    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
-    "virtua@0.49.1": "patches/virtua@0.49.1.patch",
     "mammoth@1.12.0": "patches/mammoth@1.12.0.patch",
     "@ai-sdk/xai@3.0.92": "patches/@ai-sdk%2Fxai@3.0.92.patch",
-    "@ff-labs/fff-bun@0.9.4": "patches/@ff-labs%2Ffff-bun@0.9.4.patch",
-    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
-    "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
-    "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
+    "virtua@0.49.1": "patches/virtua@0.49.1.patch",
     "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
+    "@ff-labs/fff-bun@0.9.4": "patches/@ff-labs%2Ffff-bun@0.9.4.patch",
     "pacote@21.5.1": "patches/pacote@21.5.1.patch",
+    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
+    "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
+    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
   },
   "overrides": {
     "@effect/platform-node-shared": "4.0.0-beta.74",
diff --git a/docs/jetbrains-vscode-settings-parity.md b/docs/jetbrains-vscode-settings-parity.md
new file mode 100644
index 0000000000..fe55973eed
--- /dev/null
+++ b/docs/jetbrains-vscode-settings-parity.md
@@ -0,0 +1,87 @@
+# JetBrains ↔ VS Code Settings Parity: Easy Wins
+
+## How parity works here
+
+Both clients edit the **same shared `kilo.json`** through the CLI. So any setting whose
+behavior lives entirely in the CLI is an "easy win" for JetBrains: the CLI already does the
+work, JetBrains just needs a UI row that writes the config key. No CLI changes, no new feature.
+
+Structural gap: today JetBrains only has **Models / Providers / Agent Behavior / Profile**
+settings pages. There is **no General / Display / Experimental / Context / Checkpoints** page.
+The lift for most easy wins is:
+
+1. Add a new `Configurable` page (using existing `settings/base/` primitives —
+   `BaseSettingsUi`, `SettingsRow`, `SettingsToggle`, `SettingsListPanel`), register it in
+   `kilo.jetbrains.frontend.xml`.
+2. Extend the `buildConfigPatch` allowlist in `KiloCliDataParser.kt` (currently only
+   `model`, `small_model`, `subagent_model`, `subagent_variant`, `default_agent`) and add
+   boolean/number JSON serialization — it currently only emits strings.
+3. Add localized labels to `KiloBundle.properties`.
+
+No CLI/SDK change and no new runtime feature.
+
+## Excluded from "easy"
+
+| Excluded | Reason |
+|---|---|
+| Agent Behavior, Auto-Approve | Skipped by request |
+| Indexing, Sandboxing | Imply enabling new features |
+| Browser Automation | Playwright feature not present in JetBrains |
+| Autocomplete (provider/model/toggles) | No autocomplete feature (flags exist only as migration stubs) |
+| Agent Manager (auto-branch, prefix) | VS Code-only feature |
+| Notification/attention sounds | Client must implement sound playback |
+| `maxCost` alert | Client must render the alert UI |
+| Commit message (`commit_message.prompt`, `languageCommitMessage`) | No commit-message generation feature in JetBrains |
+| `language`, `fontSize`, `diff.renderMarkdown`, `agentWorkStyle` | VS Code-webview/onboarding-specific |
+
+## Tier 1 — Genuinely easy (CLI does all the work; just add UI + config key)
+
+| Setting | Config key | Type | Suggested page |
+|---|---|---|---|
+| Hide prompt-training models | `hide_prompt_training_models` | bool | Models |
+| Enable checkpoints | `snapshot` | bool | new "Checkpoints" |
+| Auto-compaction | `compaction.auto` | bool | new "Context" |
+| Compaction threshold % | `compaction.threshold_percent` | number | Context |
+| Prune on compaction | `compaction.prune` | bool | Context |
+| Watcher ignore patterns | `watcher.ignore` | string[] | Context (list editor) |
+| Display username | `username` | string | new "Display/General" |
+| Share mode | `share` | enum (manual/auto/disabled) | new "Experimental" |
+| Remote control on startup | `remote_control` | bool | Experimental |
+| Formatter integration | `formatter` | bool | Experimental |
+| LSP integration | `lsp` | bool | Experimental |
+| Batch tool | `experimental.batch_tool` | bool | Experimental |
+| Native notebook tools | `experimental.native_notebook_tools` | bool | Experimental |
+| Continue loop on deny | `experimental.continue_loop_on_deny` | bool | Experimental |
+| SWE pruner (+ model) | `experimental.swe_pruner`, `..._model` | bool + string | Experimental |
+| MCP timeout | `experimental.mcp_timeout` | number | Experimental |
+| Per-tool toggles | `tools.<name>` | bool | Experimental |
+
+**Claude Code compatibility**: lives under "Agent Behavior" in VS Code, but in JetBrains the
+entire backend (`KiloClaudeCompatSettings` + RPC getter/setter + spawn-env wiring) already
+exists with no UI. Exposing it is the single lowest-effort item — just a checkbox bound to the
+existing RPC, no config plumbing.
+
+⚠️ Hold back `experimental.codebase_search` (leans on indexing) and
+`experimental.image_generation` (adds a tool) — arguably "enabling a feature."
+
+## Tier 2 — Config is easy, but honoring it needs JetBrains rendering work
+
+| Setting | Config key | Extra work |
+|---|---|---|
+| Auto-collapse reasoning | `auto_collapse_reasoning` | Reasoning-card default collapse |
+| Terminal command display | `terminal_command_display` (expanded/collapsed) | Tool-card default state |
+| Code edit display | `code_edit_display` (expanded/collapsed) | Edit-card default state |
+
+## Recommendation
+
+Add a new **"General/Display" page + "Experimental" page** driven entirely by CLI config,
+seeded with Tier 1 behavioral settings, plus wire the already-built **Claude Code compat**
+toggle. This closes most of the non-feature gap with:
+
+- zero CLI/SDK changes,
+- one allowlist extension in `KiloCliDataParser.buildConfigPatch` (add keys + boolean/number serialization),
+- reuse of existing `settings/base/` UI primitives and test patterns (`FakeAppRpcApi`
+  frontend test + `MockCliServer` backend body assertion).
+
+Do Tier 2 (reasoning/terminal/edit display defaults) after Tier 1, since it touches the
+session-rendering layer rather than being pure config.
diff --git a/package.json b/package.json
index 634b06aa4a..e489015ad5 100644
--- a/package.json
+++ b/package.json
@@ -165,6 +165,6 @@
     "pacote@21.5.1": "patches/pacote@21.5.1.patch",
     "mammoth@1.12.0": "patches/mammoth@1.12.0.patch"
   },
-  "version": "7.4.11",
+  "version": "7.4.13",
   "peerDependencies": {}
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index bcf809158b..d098834e43 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",
diff --git a/packages/core/src/v1/session.ts b/packages/core/src/v1/session.ts
index b951eea34d..68af4065ac 100644
--- a/packages/core/src/v1/session.ts
+++ b/packages/core/src/v1/session.ts
@@ -555,6 +555,7 @@ const SessionRevert = Schema.Struct({
   partID: optionalOmitUndefined(PartID),
   snapshot: optionalOmitUndefined(Schema.String),
   diff: optionalOmitUndefined(Schema.String),
+  workspace: optionalOmitUndefined(Schema.Literals(["restored", "snapshots-disabled", "unavailable"])), // kilocode_change
 })
 
 const SessionModel = Schema.Struct({
diff --git a/packages/effect-drizzle-sqlite/package.json b/packages/effect-drizzle-sqlite/package.json
index 344ea15818..f86239c9a7 100644
--- a/packages/effect-drizzle-sqlite/package.json
+++ b/packages/effect-drizzle-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "name": "@opencode-ai/effect-drizzle-sqlite",
   "type": "module",
   "license": "MIT",
diff --git a/packages/effect-sqlite-node/package.json b/packages/effect-sqlite-node/package.json
index 8e3e2fecc7..feeceb9b70 100644
--- a/packages/effect-sqlite-node/package.json
+++ b/packages/effect-sqlite-node/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "name": "@opencode-ai/effect-sqlite-node",
   "type": "module",
   "license": "MIT",
diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml
index 7f85174b31..60064f526e 100644
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "kilo"
 name = "Kilo"
 description = "The open source coding agent."
-version = "7.4.11"
+version = "7.4.13"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/Kilo-Org/kilocode"
@@ -11,26 +11,26 @@ name = "Kilo"
 icon = "./icons/opencode.svg"
 
 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.11/opencode-darwin-arm64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.13/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.11/opencode-darwin-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.13/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.11/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.13/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.11/opencode-linux-x64.tar.gz"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.13/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.11/opencode-windows-x64.zip"
+archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.13/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index 0cbdb4bcce..840ef84bc5 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "name": "@opencode-ai/http-recorder",
   "description": "Record and replay Effect HTTP client traffic with deterministic cassettes",
   "type": "module",
diff --git a/packages/kilo-console/package.json b/packages/kilo-console/package.json
index e74bb203fa..8b1acff374 100755
--- a/packages/kilo-console/package.json
+++ b/packages/kilo-console/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-console",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/kilo-docs/package.json b/packages/kilo-docs/package.json
index 8af9d791d0..22005b3436 100644
--- a/packages/kilo-docs/package.json
+++ b/packages/kilo-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-docs",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "private": true,
   "scripts": {
     "dev": "next dev --webpack --port 3002",
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-200-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-200-chromium-linux.png
deleted file mode 100644
index f7283e81eb..0000000000
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-200-chromium-linux.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a89d1a9a31f7de1780d772b7caf71d96f0b4b895df954c77dcd508a7febe7c9
-size 1950
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-chromium-linux.png
deleted file mode 100644
index ca5db9f648..0000000000
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/chat/task-header-with-memory-chromium-linux.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:431a0c12cb844b5d4e535cc4c7bf5546fd9e66a178b8023b00978d07c291a531
-size 3919
diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/labs-tool-call-lab/search-previews-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/labs-tool-call-lab/search-previews-chromium-linux.png
index cd9e5cc0ec..c64a23bfc5 100644
--- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/labs-tool-call-lab/search-previews-chromium-linux.png
+++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/labs-tool-call-lab/search-previews-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42c43e9ba12bc73da98c915dafca274beee1d0c893c168d8af4e3e3f41edd367
-size 630896
+oid sha256:3b1eb6cf15d5c2dc66c769a91fcf09bcf25bc2e8d17696ad0e9ab4181ed3038c
+size 658647
diff --git a/packages/kilo-gateway/package.json b/packages/kilo-gateway/package.json
index be62870f8c..9dabb917b0 100644
--- a/packages/kilo-gateway/package.json
+++ b/packages/kilo-gateway/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-gateway",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration",
diff --git a/packages/kilo-gateway/src/api/models.ts b/packages/kilo-gateway/src/api/models.ts
index 5c1d4b24f9..eccf90afe9 100644
--- a/packages/kilo-gateway/src/api/models.ts
+++ b/packages/kilo-gateway/src/api/models.ts
@@ -97,11 +97,6 @@ export async function fetchKiloModels(options?: {
   const models: Record<string, any> = {}
 
   for (const model of raw.data) {
-    // Skip image generation models
-    if (model.architecture?.output_modalities?.includes("image")) {
-      continue
-    }
-
     // Skip models that don't support tools — Kilo requires tool calling
     if (!model.supported_parameters?.includes("tools")) {
       continue
diff --git a/packages/kilo-gateway/test/api/models.test.ts b/packages/kilo-gateway/test/api/models.test.ts
index 9bf34793b1..656d27eaf0 100644
--- a/packages/kilo-gateway/test/api/models.test.ts
+++ b/packages/kilo-gateway/test/api/models.test.ts
@@ -248,3 +248,85 @@ test("returns error with kind=schema when response body is invalid JSON", async
   expect(result.models).toEqual({})
   expect(result.error?.kind).toBe("schema")
 })
+
+const MIXED_MODALITY_RESPONSE = JSON.stringify({
+  data: [
+    {
+      id: "openrouter/auto",
+      name: "Auto Router",
+      context_length: 2000000,
+      max_completion_tokens: 16384,
+      architecture: {
+        input_modalities: ["text", "image"],
+        output_modalities: ["text", "image"],
+      },
+      supported_parameters: ["tools", "temperature"],
+    },
+    {
+      id: "openrouter/auto-beta",
+      name: "Auto Router (Beta)",
+      context_length: 2000000,
+      max_completion_tokens: 16384,
+      architecture: {
+        input_modalities: ["text", "image"],
+        output_modalities: ["text", "image"],
+      },
+      supported_parameters: ["tools", "temperature"],
+    },
+    {
+      id: "black-forest-labs/flux-1.1-pro",
+      name: "FLUX 1.1 Pro",
+      context_length: 4096,
+      max_completion_tokens: 4096,
+      architecture: {
+        input_modalities: ["text", "image"],
+        output_modalities: ["image"],
+      },
+      supported_parameters: ["tools"],
+    },
+    {
+      id: "test/no-tools",
+      name: "No Tools Model",
+      context_length: 128000,
+      max_completion_tokens: 16384,
+      architecture: {
+        input_modalities: ["text"],
+        output_modalities: ["text"],
+      },
+      supported_parameters: ["temperature"],
+    },
+    {
+      id: "test/model-a",
+      name: "Test Model A",
+      context_length: 128000,
+      max_completion_tokens: 16384,
+      architecture: {
+        input_modalities: ["text"],
+        output_modalities: ["text"],
+      },
+      supported_parameters: ["tools", "temperature"],
+    },
+  ],
+})
+
+test("keeps image-output models with tools and drops models without tools", async () => {
+  const orig = globalThis.fetch
+  stubFetch(
+    async () =>
+      new Response(MIXED_MODALITY_RESPONSE, {
+        status: 200,
+        headers: { "content-type": "application/json" },
+      }),
+  )
+
+  const result = await fetchKiloModels({})
+
+  ;(globalThis as any).fetch = orig
+
+  expect(result.error).toBeUndefined()
+  expect(result.models["openrouter/auto"]).toBeDefined()
+  expect(result.models["openrouter/auto-beta"]).toBeDefined()
+  expect(result.models["black-forest-labs/flux-1.1-pro"]).toBeDefined()
+  expect(result.models["test/model-a"]).toBeDefined()
+  expect(result.models["test/no-tools"]).toBeUndefined()
+})
diff --git a/packages/kilo-i18n/package.json b/packages/kilo-i18n/package.json
index 59bbc97467..1e948a37f1 100644
--- a/packages/kilo-i18n/package.json
+++ b/packages/kilo-i18n/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-i18n",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "description": "Kilo-specific i18n translations and overrides",
diff --git a/packages/kilo-indexing/package.json b/packages/kilo-indexing/package.json
index 2a48d919ca..fc5d092bb1 100644
--- a/packages/kilo-indexing/package.json
+++ b/packages/kilo-indexing/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-indexing",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "description": "Standalone indexing engine and host helpers for Kilo Code",
diff --git a/packages/kilo-jetbrains/CHANGELOG.md b/packages/kilo-jetbrains/CHANGELOG.md
index ab9bd7ff27..404f18168b 100644
--- a/packages/kilo-jetbrains/CHANGELOG.md
+++ b/packages/kilo-jetbrains/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.4.12
+
+### Patch Changes
+
+- [#12191](https://github.com/Kilo-Org/kilocode/pull/12191) [`4d676b6`](https://github.com/Kilo-Org/kilocode/commit/4d676b68d2d0dd025c7d1a6684f49f3d03e9d12d) - Use Kilo Core for JetBrains @ file completion.
+
 ## 7.4.10
 
 ### Patch Changes
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
index 5bbfae2186..0318e49d11 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendAppService.kt
@@ -820,11 +820,13 @@ class KiloBackendAppService private constructor(
                             }
                         }
                         "global.disposed" -> {
+                            logSessionDisposalRisk("global.disposed")
                             log.info("SSE global.disposed — triggering full application reload")
                             val current = _appState.value
                             if (current is KiloAppState.Ready) load()
                         }
                         "server.instance.disposed" -> {
+                            logSessionDisposalRisk("server.instance.disposed")
                             log.info("SSE server.instance.disposed — triggering full application reload")
                             val current = _appState.value
                             if (current is KiloAppState.Ready) load()
@@ -835,6 +837,12 @@ class KiloBackendAppService private constructor(
         }
     }
 
+    private fun logSessionDisposalRisk(event: String) {
+        val active = sessions.statuses.value.filterValues { it.type != "idle" }
+        if (active.isEmpty()) return
+        log.warn("SSE $event while sessions are active; sessions may be cancelled count=${active.size} statuses=${active.values.map { it.type }.distinct()}")
+    }
+
     private suspend fun clear() {
         synchronized(loadLock) {
             val jobs = listOfNotNull(loader, eventWatcher)
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
index f5b9fc4f71..f48dbf9038 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/app/KiloBackendSessionManager.kt
@@ -86,6 +86,10 @@ class KiloBackendSessionManager(
     }
 
     fun stop() {
+        val active = _statuses.value.filterValues { it.type != "idle" }
+        if (active.isNotEmpty()) {
+            log.warn("Session manager stopping with active sessions count=${active.size} statuses=${active.values.map { it.type }.distinct()}")
+        }
         watcher?.cancel()
         watcher = null
         client = null
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt
index fee794849b..63f15c05ec 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/cli/KiloCliDataParser.kt
@@ -20,6 +20,7 @@ import ai.kilocode.rpc.dto.CommandDto
 import ai.kilocode.rpc.dto.ConfigDto
 import ai.kilocode.rpc.dto.ConfigPatchDto
 import ai.kilocode.rpc.dto.ConfigUpdateDto
+import ai.kilocode.rpc.dto.CompactionConfigDto
 import ai.kilocode.rpc.dto.CustomModelDto
 import ai.kilocode.rpc.dto.CustomProviderConfigDto
 import ai.kilocode.rpc.dto.CustomProviderSaveDto
@@ -73,6 +74,7 @@ import ai.kilocode.rpc.dto.TodoDto
 import ai.kilocode.rpc.dto.TodoViewDto
 import ai.kilocode.rpc.dto.TokensDto
 import ai.kilocode.rpc.dto.ToolRefDto
+import ai.kilocode.rpc.dto.WatcherConfigDto
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
@@ -521,6 +523,8 @@ object KiloCliDataParser {
             subagentModel = obj.str("subagent_model"),
             subagentVariant = obj.str("subagent_variant"),
             defaultAgent = obj.str("default_agent"),
+            watcher = parseWatcherConfig(obj["watcher"].obj()),
+            compaction = parseCompactionConfig(obj["compaction"].obj()),
             instructions = obj["instructions"].arr()
                 ?.mapNotNull { runCatching { it.jsonPrimitive.contentOrNull }.getOrNull() }
                 ?: emptyList(),
@@ -530,6 +534,24 @@ object KiloCliDataParser {
         )
     }.getOrDefault(ConfigDto())
 
+    private fun parseWatcherConfig(obj: JsonObject?): WatcherConfigDto? {
+        if (obj == null) return null
+        return WatcherConfigDto(
+            ignore = obj["ignore"].arr()
+                ?.mapNotNull { runCatching { it.jsonPrimitive.contentOrNull }.getOrNull() }
+                ?: emptyList(),
+        )
+    }
+
+    private fun parseCompactionConfig(obj: JsonObject?): CompactionConfigDto? {
+        if (obj == null) return null
+        return CompactionConfigDto(
+            auto = runCatching { obj.flagOrNull("auto") }.getOrNull(),
+            threshold_percent = runCatching { obj.num("threshold_percent") }.getOrNull(),
+            prune = runCatching { obj.flagOrNull("prune") }.getOrNull(),
+        )
+    }
+
     private fun parseSkillsConfig(obj: JsonObject?): SkillsConfigDto? {
         if (obj == null) return null
         return SkillsConfigDto(
@@ -625,7 +647,12 @@ object KiloCliDataParser {
             val obj = item.obj() ?: return@mapNotNull null
             val name = obj.str("name") ?: return@mapNotNull null
             val location = obj.str("location") ?: return@mapNotNull null
-            SkillDto(name = name, description = obj.str("description"), location = location)
+            SkillDto(
+                name = name,
+                description = obj.str("description"),
+                location = location,
+                content = obj.str("content"),
+            )
         }
 
     fun parseAgentBehaviorCommands(raw: String): List<CommandDto> =
@@ -838,6 +865,24 @@ object KiloCliDataParser {
             val instructions = patch.instructions
             if (instructions != null) put("instructions", JsonArray(instructions.map(::JsonPrimitive)))
 
+            val watcher = patch.watcher
+            if (watcher != null) {
+                put("watcher", buildJsonObject {
+                    val ignore = watcher.ignore
+                    if (ignore != null) put("ignore", JsonArray(ignore.map(::JsonPrimitive)))
+                })
+            }
+
+            val compaction = patch.compaction
+            if (compaction != null) {
+                put("compaction", buildJsonObject {
+                    for (field in compaction.clear) put(field, JsonNull)
+                    if (compaction.auto != null) put("auto", compaction.auto)
+                    if (compaction.threshold_percent != null) put("threshold_percent", compaction.threshold_percent)
+                    if (compaction.prune != null) put("prune", compaction.prune)
+                })
+            }
+
             val skills = patch.skills
             if (skills != null) {
                 put("skills", buildJsonObject {
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImpl.kt
index d728a6b6aa..95185f2f20 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImpl.kt
@@ -14,6 +14,7 @@ import ai.kilocode.rpc.dto.ConfigPatchDto
 import ai.kilocode.rpc.dto.McpConfigDto
 import ai.kilocode.rpc.dto.McpServerConfigDto
 import ai.kilocode.rpc.dto.PermissionRuleItemDto
+import ai.kilocode.rpc.dto.SkillDto
 import com.intellij.openapi.components.service
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -22,7 +23,11 @@ import kotlinx.serialization.json.JsonPrimitive
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
+import com.intellij.openapi.util.SystemInfo
 import java.net.URLEncoder
+import java.nio.file.Files
+import java.nio.file.InvalidPathException
+import java.nio.file.Path
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
@@ -33,6 +38,7 @@ class KiloAgentBehaviorRpcApiImpl(private val backend: KiloBackendAppService? =
         private val JSON = "application/json".toMediaType()
         private val saved = ConcurrentHashMap<String, SavedMcp>()
         private val port = AtomicInteger(-1)
+        private val extensions = setOf("md", "markdown", "txt", "text", "html", "htm")
     }
 
     private val app: KiloBackendAppService get() = backend ?: service()
@@ -56,11 +62,59 @@ class KiloAgentBehaviorRpcApiImpl(private val backend: KiloBackendAppService? =
         }
     }
 
-    override suspend fun skills(directory: String) = KiloCliDataParser.parseAgentBehaviorSkills(request(directory, "/skill", null))
+    override suspend fun skills(directory: String): List<SkillDto> {
+        val items = KiloCliDataParser.parseAgentBehaviorSkills(request(directory, "/skill", null))
+        return items.map { item ->
+            val editable = editable(item)
+            item.copy(content = skillContent(item) ?: item.content, editable = editable)
+        }
+    }
 
     override suspend fun removeSkill(directory: String, location: String): Boolean =
         post(directory, "/kilocode/skill/remove", JsonObject(mapOf("location" to JsonPrimitive(location))))
 
+    override suspend fun reloadSkills(directory: String): Boolean {
+        LOG.info("Skills reload requested dir=$directory")
+        if (hasActiveSession(directory)) {
+            LOG.warn("Skills reload blocked by active session dir=$directory")
+            return false
+        }
+        runCatching { post(directory, "/instance/reload") }.onFailure { err ->
+            LOG.warn("Skills reload failed dir=$directory", err)
+        }.getOrThrow()
+        LOG.info("Skills reload succeeded dir=$directory")
+        return true
+    }
+
+    override suspend fun saveSkill(directory: String, location: String, content: String): Boolean {
+        LOG.info("Skill save requested dir=$directory location=$location")
+        app.requireReady()
+        val paths = knownSkills(directory)
+        val path = writablePath(directory, location, paths) ?: return false
+        withContext(Dispatchers.IO) {
+            Files.writeString(path, content, StandardCharsets.UTF_8)
+        }
+        LOG.info("Skill file saved dir=$directory path=$path bytes=${content.toByteArray(StandardCharsets.UTF_8).size}")
+        LOG.info("Skill save reload deferred dir=$directory path=$path")
+        return true
+    }
+
+    override suspend fun saveSkills(directory: String, edits: Map<String, String>): Boolean {
+        LOG.info("Skills save requested dir=$directory count=${edits.size}")
+        app.requireReady()
+        val known = knownSkills(directory)
+        val paths = edits.mapNotNull { (location, content) ->
+            val path = writablePath(directory, location, known) ?: return false
+            path to content
+        }
+        withContext(Dispatchers.IO) {
+            for ((path, content) in paths) Files.writeString(path, content, StandardCharsets.UTF_8)
+        }
+        LOG.info("Skill files saved dir=$directory count=${paths.size}")
+        LOG.info("Skills save reload deferred dir=$directory count=${paths.size}")
+        return true
+    }
+
     override suspend fun removeAgent(directory: String, name: String): Boolean =
         post(directory, "/kilocode/agent/remove", JsonObject(mapOf("name" to JsonPrimitive(name))))
 
@@ -139,6 +193,104 @@ class KiloAgentBehaviorRpcApiImpl(private val backend: KiloBackendAppService? =
         return true
     }
 
+    private fun hasActiveSession(directory: String): Boolean {
+        val active = app.sessions.statuses.value.filterValues { it.type != "idle" }
+        if (active.isNotEmpty()) {
+            LOG.info("Skills reload active statuses dir=$directory count=${active.size} types=${active.values.map { it.type }.distinct()}")
+            return true
+        }
+        val permissions = runCatching { app.chat.pendingPermissions(directory) }.onFailure { err ->
+            LOG.warn("Skills reload pending permission check failed dir=$directory", err)
+        }.getOrDefault(emptyList())
+        if (permissions.isNotEmpty()) {
+            LOG.info("Skills reload pending permissions dir=$directory count=${permissions.size}")
+            return true
+        }
+        val questions = runCatching { app.chat.pendingQuestions(directory) }.onFailure { err ->
+            LOG.warn("Skills reload pending question check failed dir=$directory", err)
+        }.getOrDefault(emptyList())
+        if (questions.isNotEmpty()) {
+            LOG.info("Skills reload pending questions dir=$directory count=${questions.size}")
+            return true
+        }
+        return false
+    }
+
+    private suspend fun skillContent(skill: SkillDto): String? {
+        val path = resolveSkillPath(skill.location) ?: return null
+        return runCatching {
+            withContext(Dispatchers.IO) {
+                if (!Files.isRegularFile(path)) null else Files.readString(path, StandardCharsets.UTF_8)
+            }
+        }.onFailure { err ->
+            LOG.warn("Skill content read failed: $path", err)
+        }.getOrNull()
+    }
+
+    private fun editable(skill: SkillDto): Boolean {
+        val path = resolveSkillPath(skill.location) ?: return false
+        if (urlCached(path)) return false
+        return true
+    }
+
+    private suspend fun knownSkills(directory: String): Set<Path> {
+        val items = KiloCliDataParser.parseAgentBehaviorSkills(request(directory, "/skill", null))
+        return items.mapNotNull { item -> resolveEditablePath(item) }.toSet()
+    }
+
+    private fun writablePath(directory: String, location: String, known: Set<Path>): Path? {
+        val path = resolveSkillPath(location)
+        if (path == null) {
+            LOG.warn("Skill save rejected: invalid location dir=$directory location=$location")
+            return null
+        }
+        if (path !in known) {
+            LOG.warn("Skill save rejected: unknown skill dir=$directory path=$path")
+            return null
+        }
+        return path
+    }
+
+    private fun resolveEditablePath(skill: SkillDto): Path? {
+        val path = resolveSkillPath(skill.location) ?: return null
+        if (urlCached(path)) return null
+        return path
+    }
+
+    private fun resolveSkillPath(location: String): Path? {
+        val raw = normalizeWorkspacePath(location) ?: return null
+        val path = try {
+            Path.of(raw).normalize()
+        } catch (_: InvalidPathException) {
+            return null
+        }
+        if (!path.isAbsolute || !isSkillFile(path)) return null
+        return path
+    }
+
+    private fun urlCached(path: Path): Boolean {
+        return cacheRoots().any { root -> path.startsWith(root.resolve("kilo").resolve("skills").normalize()) }
+    }
+
+    private fun cacheRoots(): Set<Path> = buildSet {
+        val home = System.getProperty("user.home")
+        add(Path.of(cacheRoot()).normalize())
+        add(Path.of(home, ".cache").normalize())
+        add(Path.of(home, "Library", "Caches").normalize())
+        System.getenv("LOCALAPPDATA")?.takeIf { it.isNotBlank() }?.let { add(Path.of(it).normalize()) }
+        add(Path.of(home, "AppData", "Local").normalize())
+    }
+
+    private fun cacheRoot(): String {
+        val xdg = System.getenv("XDG_CACHE_HOME")?.takeIf { it.isNotBlank() }
+        if (xdg != null) return xdg
+        val home = System.getProperty("user.home")
+        if (SystemInfo.isMac) return Path.of(home, "Library", "Caches").toString()
+        if (SystemInfo.isWindows) return System.getenv("LOCALAPPDATA")?.takeIf { it.isNotBlank() }
+            ?: Path.of(home, "AppData", "Local").toString()
+        return Path.of(home, ".cache").toString()
+    }
+
     private suspend fun patchConfig(path: String, body: String): Unit = withContext(Dispatchers.IO) {
         val http = app.http ?: throw IllegalStateException("Kilo HTTP client is unavailable")
         val url = "http://127.0.0.1:${app.port}$path"
@@ -234,6 +386,12 @@ class KiloAgentBehaviorRpcApiImpl(private val backend: KiloBackendAppService? =
 
     private fun encodePath(value: String): String = encode(value).replace("+", "%20")
 
+    private fun isSkillFile(path: Path): Boolean {
+        val name = path.fileName?.toString() ?: return false
+        if (name == "SKILL.md") return true
+        return name.substringAfterLast('.', "").lowercase() in extensions
+    }
+
     private data class SavedMcp(
         val directory: String,
         val name: String,
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceDtoMapper.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceDtoMapper.kt
index 8c61e1e4db..981ea1ad28 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceDtoMapper.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceDtoMapper.kt
@@ -64,6 +64,8 @@ internal object KiloWorkspaceDtoMapper {
         name = s.name,
         description = s.description,
         location = s.location,
+        content = s.content,
+        editable = false,
     )
 
     private fun provider(p: ProviderInfo) = ProviderDto(
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceRpcApiImpl.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceRpcApiImpl.kt
index 7d0311b6c6..04125f33f3 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceRpcApiImpl.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceRpcApiImpl.kt
@@ -22,33 +22,22 @@ import ai.kilocode.rpc.dto.ModelsWorkspaceDto
 import ai.kilocode.rpc.dto.WorkspaceFileDto
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.process.CapturingProcessHandler
-import com.intellij.ide.actions.searcheverywhere.FoundItemDescriptor
-import com.intellij.ide.util.gotoByName.ChooseByNameInScopeItemProvider
-import com.intellij.ide.util.gotoByName.ChooseByNamePopup
-import com.intellij.ide.util.gotoByName.ChooseByNameViewModel
-import com.intellij.ide.util.gotoByName.GotoFileModel
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
-import com.intellij.openapi.application.readAction
 import com.intellij.openapi.components.service
-import com.intellij.openapi.progress.EmptyProgressIndicator
-import com.intellij.openapi.project.DumbService
-import com.intellij.openapi.project.IndexNotReadyException
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
-import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.platform.project.ProjectId
 import com.intellij.platform.project.findProjectOrNull
-import com.intellij.navigation.NavigationItem
-import com.intellij.psi.PsiFileSystemItem
-import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.util.indexing.FindSymbolParameters
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
@@ -56,6 +45,8 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import okhttp3.Request
 import java.net.URI
 import java.net.URLDecoder
@@ -74,7 +65,9 @@ import kotlin.coroutines.resume
  * for the given directory. Project lookup is only used to resolve the
  * calling frontend project to the correct backend directory.
  */
-class KiloWorkspaceRpcApiImpl : KiloWorkspaceRpcApi {
+class KiloWorkspaceRpcApiImpl internal constructor(
+    private val svc: KiloBackendAppService? = null,
+) : KiloWorkspaceRpcApi {
     companion object {
         private val LOG = KiloLog.create(KiloWorkspaceRpcApiImpl::class.java)
         private const val SCHEMA = "https://app.kilo.ai/config.json"
@@ -82,15 +75,15 @@ class KiloWorkspaceRpcApiImpl : KiloWorkspaceRpcApi {
         private val LEGACY = listOf("opencode.jsonc", "opencode.json")
         private val GLOBAL = MODERN + LEGACY + "config.json"
         private val LOCAL_DIRS = listOf(".kilo", ".kilocode", ".opencode")
-        private const val SEARCH_CAP = 2_000
         private const val DIFF_CAP = 200_000
+        private val JSON = Json { ignoreUnknownKeys = true }
         private val CONFIG = """{
   "${'$'}schema": "$SCHEMA"
 }
 """
     }
 
-    private val app: KiloBackendAppService get() = service()
+    private val app: KiloBackendAppService get() = svc ?: service()
 
     private val gitCache = ConcurrentHashMap<String, Boolean>()
 
@@ -196,19 +189,56 @@ class KiloWorkspaceRpcApiImpl : KiloWorkspaceRpcApi {
     override suspend fun searchFiles(directory: String, query: String, limit: Int): FileSearchResultDto {
         val base = file(clean(directory) ?: directory) ?: return FileSearchResultDto()
         val git = withContext(Dispatchers.IO) { gitAvailable(base) }
-        val project = project(base) ?: return FileSearchResultDto(git = git)
-        if (DumbService.getInstance(project).isDumb) return FileSearchResultDto(indexing = true, git = git)
+        LOG.debug { "workspace file search directory=$directory query=$query limit=$limit" }
+        return searchKilo(directory, query, limit, git)
+    }
+
+    private suspend fun searchKilo(directory: String, query: String, limit: Int, git: Boolean): FileSearchResultDto {
         return try {
-            val files = readAction { search(project, base, query, limit.coerceIn(1, 200)) }
-            FileSearchResultDto(files = files, git = git)
-        } catch (e: IndexNotReadyException) {
-            FileSearchResultDto(indexing = true, git = git)
-        } catch (e: LinkageError) {
-            LOG.warn("file search API unavailable; returning no suggestions", e)
+            val cap = limit.coerceIn(1, 200)
+            val (files, dirs) = coroutineScope {
+                val files = async { kiloResults(directory, query, "file", cap, false) }
+                val dirs = async { kiloResults(directory, query, "directory", cap, true) }
+                files.await() to dirs.await()
+            }
+            val found = linkedMapOf<String, WorkspaceFileDto>()
+            (dirs + files).forEach { file -> found.putIfAbsent(file.path, file) }
+            FileSearchResultDto(files = found.values.take(cap), git = git)
+        } catch (e: CancellationException) {
+            throw e
+        } catch (e: Exception) {
+            LOG.warn("Kilo Core file search failed for directory=$directory query=$query", e)
             FileSearchResultDto(git = git)
         }
     }
 
+    private suspend fun kiloResults(
+        directory: String,
+        query: String,
+        type: String,
+        limit: Int,
+        dir: Boolean,
+    ): List<WorkspaceFileDto> {
+        val http = app.http ?: throw IllegalStateException("Kilo HTTP client is unavailable")
+        val raw = withContext(Dispatchers.IO) {
+            val request = Request.Builder()
+                .url("http://127.0.0.1:${app.port}/find/file?directory=${encode(directory)}&query=${encode(query)}&type=$type&limit=$limit")
+                .get()
+                .build()
+            http.newCall(request).execute().use { response ->
+                val body = response.body?.string().orEmpty()
+                if (!response.isSuccessful) throw RuntimeException("HTTP ${response.code}: $body")
+                body
+            }
+        }
+        return JSON.decodeFromString<List<String>>(raw)
+            .asSequence()
+            .map { it.trimEnd('/') }
+            .filter { it.isNotBlank() && !isManagedWorktreeStorage(it) }
+            .map { WorkspaceFileDto(it, it.substringAfterLast('/'), dir) }
+            .toList()
+    }
+
     override suspend fun gitChanges(directory: String): String? = withContext(Dispatchers.IO) {
         val base = file(clean(directory) ?: directory) ?: return@withContext null
         if (!gitAvailable(base)) return@withContext null
@@ -311,10 +341,11 @@ class KiloWorkspaceRpcApiImpl : KiloWorkspaceRpcApi {
             }
             descriptor.navigate(true)
             if (cont.isActive) cont.resume(Unit)
-        }, ModalityState.any())
+        }, ModalityState.nonModal())
     }
 
     private fun project(path: Path): Project? {
+        if (ApplicationManager.getApplication() == null) return null
         val projects = ProjectManager.getInstance().openProjects.filter { !it.isDefault }
         return projects.firstOrNull { item ->
             val base = item.basePath?.let(::file) ?: return@firstOrNull false
@@ -322,83 +353,6 @@ class KiloWorkspaceRpcApiImpl : KiloWorkspaceRpcApi {
         } ?: projects.firstOrNull()
     }
 
-    // Uses the IDE Go-to-File engine (com.intellij.ide.util.gotoByName.*). These are public but
-    // unstable lang-impl classes (not @ApiStatus.Internal) -- the same engine behind Search Everywhere,
-    // chosen for proven large-repo performance. searchFiles() degrades gracefully on LinkageError.
-    @Suppress("UnstableApiUsage")
-    private fun search(project: Project, base: Path, query: String, limit: Int): List<WorkspaceFileDto> {
-        val text = query.trim()
-        if (text.isBlank()) return roots(project, base, limit)
-        val scope = GlobalSearchScope.projectScope(project)
-        val model = object : GotoFileModel(project) {
-            override fun acceptItem(item: NavigationItem): Boolean {
-                val psi = item as? PsiFileSystemItem ?: return false
-                val path = file(psi.virtualFile.path) ?: return false
-                return relativeWithinWorkspace(base, path) != null && super.acceptItem(item)
-            }
-
-            override fun loadInitialCheckBoxState(): Boolean = false
-
-            override fun saveInitialCheckBoxState(state: Boolean) {}
-        }
-        val view = object : ChooseByNameViewModel {
-            override fun getProject(): Project = project
-
-            override fun getModel() = model
-
-            override fun isSearchInAnyPlace(): Boolean = model.useMiddleMatching()
-
-            override fun transformPattern(pattern: String): String = ChooseByNamePopup.getTransformedPattern(pattern, model)
-
-            override fun canShowListForEmptyPattern(): Boolean = false
-
-            override fun getMaximumListSizeLimit(): Int = limit
-        }
-        val provider = model.getItemProvider(null)
-        val params = FindSymbolParameters.wrap(text, scope)
-        val found = mutableListOf<FoundItemDescriptor<*>>()
-        val indicator = EmptyProgressIndicator()
-        if (provider is ChooseByNameInScopeItemProvider) {
-            provider.filterElementsWithWeights(view, params, indicator) { item ->
-                found += item
-                found.size < SEARCH_CAP
-            }
-        } else {
-            provider.filterElements(view, text, false, indicator) { item ->
-                found += FoundItemDescriptor(item, 0)
-                found.size < SEARCH_CAP
-            }
-        }
-        return found.asSequence()
-            .sortedByDescending { it.weight }
-            .mapNotNull { item -> (item.item as? PsiFileSystemItem)?.virtualFile }
-            .mapNotNull { vf -> fileDto(base, vf) }
-            .distinctBy { it.path }
-            .take(limit)
-            .toList()
-    }
-
-    private fun roots(project: Project, base: Path, limit: Int): List<WorkspaceFileDto> {
-        val root = LocalFileSystem.getInstance().refreshAndFindFileByNioFile(base) ?: return emptyList()
-        val index = ProjectFileIndex.getInstance(project)
-        return root.children.asSequence()
-            .filter { it.name != ".git" }
-            .filterNot { index.isExcluded(it) }
-            .mapNotNull { fileDto(base, it) }
-            .sortedWith(
-                compareByDescending<WorkspaceFileDto> { it.directory }
-                    .thenBy(String.CASE_INSENSITIVE_ORDER) { it.name },
-            )
-            .take(limit)
-            .toList()
-    }
-
-    private fun fileDto(base: Path, vf: VirtualFile): WorkspaceFileDto? {
-        val path = file(vf.path) ?: return null
-        val rel = relativeWithinWorkspace(base, path) ?: return null
-        return WorkspaceFileDto(rel, vf.name, vf.isDirectory)
-    }
-
     private fun gitAvailable(base: Path): Boolean {
         return workspaceGitAvailable(base, gitCache)
     }
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt
index b948b4822d..27e19d1f06 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloBackendWorkspace.kt
@@ -254,6 +254,7 @@ class KiloBackendWorkspace(
                     name = s.name,
                     description = s.description,
                     location = s.location,
+                    content = s.content,
                 )
             })
         } catch (e: CancellationException) {
diff --git a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloWorkspaceState.kt b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloWorkspaceState.kt
index 0308089c27..37c58d853d 100644
--- a/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloWorkspaceState.kt
+++ b/packages/kilo-jetbrains/backend/src/main/kotlin/ai/kilocode/backend/workspace/KiloWorkspaceState.kt
@@ -143,4 +143,5 @@ data class SkillInfo(
     val name: String,
     val description: String?,
     val location: String,
+    val content: String?,
 )
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
index f5d613cecb..f059fa8e0c 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloBackendAppServiceTest.kt
@@ -9,7 +9,9 @@ import ai.kilocode.backend.testing.FakeCliServer
 import ai.kilocode.backend.testing.MockCliServer
 import ai.kilocode.backend.testing.TestLog
 import ai.kilocode.rpc.dto.AgentConfigPatchDto
+import ai.kilocode.rpc.dto.CompactionPatchDto
 import ai.kilocode.rpc.dto.ConfigPatchDto
+import ai.kilocode.rpc.dto.WatcherPatchDto
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -222,6 +224,28 @@ class KiloBackendAppServiceTest {
         assertEquals("fast", svc.config?.agent?.get("code")?.variant)
     }
 
+    @Test
+    fun `update config patches context settings and reloads`() = runBlocking {
+        val svc = create()
+        svc.connect()
+        ready(svc)
+
+        val state = svc.updateConfig(ConfigPatchDto(
+            watcher = WatcherPatchDto(ignore = listOf("**/dist/**", "tmp/**")),
+            compaction = CompactionPatchDto(auto = false, threshold_percent = 75.5, prune = false),
+        ))
+
+        assertEquals(
+            "{\"watcher\":{\"ignore\":[\"**/dist/**\",\"tmp/**\"]},\"compaction\":{\"auto\":false,\"threshold_percent\":75.5,\"prune\":false}}",
+            mock.lastConfigPatchBody,
+        )
+        val cfg = appStateDto(state).config
+        assertEquals(listOf("**/dist/**", "tmp/**"), cfg?.watcher?.ignore)
+        assertEquals(false, cfg?.compaction?.auto)
+        assertEquals(75.5, cfg?.compaction?.threshold_percent)
+        assertEquals(false, svc.config?.compaction?.prune)
+    }
+
     @Test
     fun `ready dto maps model config`() = runBlocking {
         mock.config = """{"model":"openai/gpt","agent":{"plan":{"model":"anthropic/claude","variant":"high"}}}"""
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt
index 853b77f25b..254417db09 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/app/KiloConnectionServiceTest.kt
@@ -21,6 +21,7 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.withTimeoutOrNull
 import okhttp3.Request
 import okhttp3.sse.EventSource
 import okhttp3.sse.EventSourceListener
@@ -36,6 +37,10 @@ import kotlin.test.assertTrue
 
 class KiloConnectionServiceTest {
 
+    private companion object {
+        const val WAIT_MS = 15_000L
+    }
+
     private val mock = MockCliServer()
     private val fake = FakeCliServer(mock)
     private val log = TestLog()
@@ -101,20 +106,23 @@ class KiloConnectionServiceTest {
         val svc = KiloConnectionService(scope, server, {}, log)
         val job = scope.launch { svc.connect() }
 
-        val downloading = withTimeout(5_000) {
+        val downloading = withTimeout(WAIT_MS) {
             svc.state.first { it is ConnectionState.Downloading }
         }
         assertEquals(ConnectionState.Downloading(42, "1.2.3", "darwin-arm64"), downloading)
 
         resolved.complete(Unit)
-        withTimeout(5_000) {
+        withTimeout(WAIT_MS) {
             svc.state.first { it == ConnectionState.Connecting }
         }
 
         ready.complete(Unit)
-        withTimeout(5_000) {
+        val connected = withTimeoutOrNull(WAIT_MS) {
             svc.state.first { it is ConnectionState.Connected }
         }
+        if (connected == null) {
+            error("Timed out waiting for Connected after CLI ready; state=${svc.state.value}; logs=${log.messages.joinToString("\n")}")
+        }
         job.join()
     }
 
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt
index 74479094e7..59b6467140 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/cli/KiloCliDataParserTest.kt
@@ -4,6 +4,7 @@ import ai.kilocode.backend.workspace.CommandInfo
 import ai.kilocode.backend.workspace.ProviderData
 import ai.kilocode.rpc.dto.ChatEventDto
 import ai.kilocode.rpc.dto.AgentConfigPatchDto
+import ai.kilocode.rpc.dto.CompactionPatchDto
 import ai.kilocode.rpc.dto.ConfigDto
 import ai.kilocode.rpc.dto.ConfigPatchDto
 import ai.kilocode.rpc.dto.ConfigUpdateDto
@@ -19,6 +20,7 @@ import ai.kilocode.rpc.dto.PromptDto
 import ai.kilocode.rpc.dto.PromptPartDto
 import ai.kilocode.rpc.dto.QuestionReplyDto
 import ai.kilocode.rpc.dto.SkillsPatchDto
+import ai.kilocode.rpc.dto.WatcherPatchDto
 import org.junit.jupiter.api.Nested
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -1173,6 +1175,38 @@ class KiloCliDataParserTest {
             assertEquals(listOf("https://example.test/skill.md"), cfg.skills?.urls)
         }
 
+        @Test
+        fun `parseConfig - context settings`() {
+            val cfg = KiloCliDataParser.parseConfig(
+                """{
+                    "watcher":{"ignore":["**/dist/**","tmp/**"]},
+                    "compaction":{"auto":true,"threshold_percent":75.5,"prune":false}
+                }"""
+            )
+
+            assertEquals(listOf("**/dist/**", "tmp/**"), cfg.watcher?.ignore)
+            assertEquals(true, cfg.compaction?.auto)
+            assertEquals(75.5, cfg.compaction?.threshold_percent)
+            assertEquals(false, cfg.compaction?.prune)
+        }
+
+        @Test
+        fun `parseConfig - malformed compaction fields do not discard config`() {
+            val cfg = KiloCliDataParser.parseConfig(
+                """{
+                    "model":"openai/gpt",
+                    "watcher":{"ignore":["tmp/**"]},
+                    "compaction":{"auto":{},"threshold_percent":[],"prune":false}
+                }"""
+            )
+
+            assertEquals("openai/gpt", cfg.model)
+            assertEquals(listOf("tmp/**"), cfg.watcher?.ignore)
+            assertNull(cfg.compaction?.auto)
+            assertNull(cfg.compaction?.threshold_percent)
+            assertEquals(false, cfg.compaction?.prune)
+        }
+
         @Test
         fun `parseConfig - agent overrides and permissions`() {
             val cfg = KiloCliDataParser.parseConfig(
@@ -2123,6 +2157,29 @@ class KiloCliDataParserTest {
             )
         }
 
+        @Test
+        fun `buildConfigPatch - context watcher and compaction fields`() {
+            val patch = ConfigPatchDto(
+                watcher = WatcherPatchDto(ignore = listOf("**/dist/**", "tmp/**")),
+                compaction = CompactionPatchDto(auto = false, threshold_percent = 75.5, prune = false),
+            )
+
+            assertEquals(
+                "{\"watcher\":{\"ignore\":[\"**/dist/**\",\"tmp/**\"]},\"compaction\":{\"auto\":false,\"threshold_percent\":75.5,\"prune\":false}}",
+                KiloCliDataParser.buildConfigPatch(patch),
+            )
+        }
+
+        @Test
+        fun `buildConfigPatch - context threshold clear emits null`() {
+            val patch = ConfigPatchDto(compaction = CompactionPatchDto(clear = listOf("threshold_percent")))
+
+            assertEquals(
+                "{\"compaction\":{\"threshold_percent\":null}}",
+                KiloCliDataParser.buildConfigPatch(patch),
+            )
+        }
+
         @Test
         fun `buildConfigPatch - mcp upsert and delete`() {
             val patch = ConfigPatchDto(mcp = linkedMapOf(
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImplTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImplTest.kt
index 4050343723..880e6cba4c 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImplTest.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/rpc/KiloAgentBehaviorRpcApiImplTest.kt
@@ -14,6 +14,8 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
+import java.nio.file.Files
+import java.nio.file.Path
 import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.test.assertContains
@@ -78,6 +80,156 @@ class KiloAgentBehaviorRpcApiImplTest {
         assertContains(err.message.orEmpty(), "HTTP 400")
     }
 
+    @Test
+    fun `skills and remove skill call CLI endpoints`() = runBlocking {
+        val dir = Files.createTempDirectory("kilo-skill-test")
+        val file = Files.createDirectories(dir.resolve("plan")).resolve("SKILL.md")
+        val content = """---
+            |name: plan
+            |description: Plan work
+            |---
+            |
+            |# Fresh Plan
+        """.trimMargin()
+        Files.writeString(file, content)
+        mock.skills = """[
+            {"name":"plan","description":"Plan work","location":"$file","content":"# Stale Plan"},
+            {"name":"builtin","location":"builtin"}
+        ]""".trimIndent()
+        val rpc = rpc()
+
+        val skills = rpc.skills("/test project")
+        assertEquals(listOf("plan", "builtin"), skills.map { it.name })
+        assertEquals("Plan work", skills.single { it.name == "plan" }.description)
+        assertEquals(content, skills.single { it.name == "plan" }.content)
+        assertEquals(true, skills.single { it.name == "plan" }.editable)
+        assertEquals(false, skills.single { it.name == "builtin" }.editable)
+
+        assertTrue(rpc.removeSkill("/test project", file.toString()))
+        assertEquals("{\"location\":\"$file\"}", mock.lastSkillRemoveBody)
+        assertEquals(1, mock.requestCount("/kilocode/skill/remove"))
+
+        mock.skillRemoveStatus = 400
+        val err = assertFailsWith<RuntimeException> {
+            rpc.removeSkill("/test", "/tmp/missing/SKILL.md")
+        }
+        assertContains(err.message.orEmpty(), "HTTP 400")
+
+        assertTrue(rpc.reloadSkills("/test project"))
+        assertEquals(1, mock.requestCount("/instance/reload"))
+    }
+
+    @Test
+    fun `url cached skills are read only`() = runBlocking {
+        val cache = Path.of(System.getProperty("user.home"), ".cache", "kilo", "skills", "remote")
+        val file = Files.createDirectories(cache).resolve("SKILL.md")
+        Files.writeString(file, "# Remote")
+        mock.skills = """[
+            {"name":"remote","description":"Remote","location":"$file","content":"# Remote"}
+        ]""".trimIndent()
+
+        val skill = rpc().skills("/test project").single()
+
+        assertEquals(false, skill.editable)
+        assertEquals("# Remote", skill.content)
+    }
+
+    @Test
+    fun `custom skills under non cache paths remain editable`() = runBlocking {
+        val dir = Files.createTempDirectory("kilo-skill-test")
+        val file = Files.createDirectories(dir.resolve("cache/kilo/skills/custom")).resolve("SKILL.md")
+        Files.writeString(file, "# Custom")
+        mock.skills = """[
+            {"name":"custom","description":"Custom","location":"$file","content":"# Custom"}
+        ]""".trimIndent()
+
+        val skill = rpc().skills("/test project").single()
+
+        assertEquals(true, skill.editable)
+    }
+
+    @Test
+    fun `save skill supports configured markdown text and html files without reload`() = runBlocking {
+        val dir = Files.createTempDirectory("kilo-skill-test")
+        val file = dir.resolve("test.md")
+        Files.writeString(file, "old")
+        mock.skills = """[
+            {"name":"test","description":"Test","location":"$file","content":"old"}
+        ]""".trimIndent()
+        val rpc = rpc()
+
+        assertTrue(rpc.saveSkill("/test project", file.toString(), "new content"))
+        assertEquals("new content", Files.readString(file))
+        assertEquals(0, mock.requestCount("/instance/reload"))
+    }
+
+    @Test
+    fun `save skill writes content without reloading instance`() = runBlocking {
+        val dir = Files.createTempDirectory("kilo-skill-test")
+        val file = Files.createDirectories(dir.resolve("plan")).resolve("SKILL.md")
+        Files.writeString(file, "old")
+        mock.skills = """[
+            {"name":"plan","description":"Plan work","location":"$file","content":"old"}
+        ]""".trimIndent()
+        val rpc = rpc()
+
+        assertTrue(rpc.saveSkill("/test project", file.toString(), "new content"))
+
+        assertEquals("new content", Files.readString(file))
+        assertEquals(0, mock.requestCount("/instance/reload"))
+        assertFalse(rpc.saveSkill("/test project", "builtin", "nope"))
+    }
+
+    @Test
+    fun `save skills validates known paths once for multiple edits`() = runBlocking {
+        val dir = Files.createTempDirectory("kilo-skill-test")
+        val plan = Files.createDirectories(dir.resolve("plan")).resolve("SKILL.md")
+        val review = Files.createDirectories(dir.resolve("review")).resolve("SKILL.md")
+        Files.writeString(plan, "old plan")
+        Files.writeString(review, "old review")
+        mock.skills = """[
+            {"name":"plan","description":"Plan work","location":"$plan","content":"old plan"},
+            {"name":"review","description":"Review work","location":"$review","content":"old review"}
+        ]""".trimIndent()
+        val rpc = rpc()
+        mock.resetCounts()
+
+        assertTrue(rpc.saveSkills("/test project", mapOf(plan.toString() to "new plan", review.toString() to "new review")))
+
+        assertEquals("new plan", Files.readString(plan))
+        assertEquals("new review", Files.readString(review))
+        assertEquals(1, mock.requestCount("/skill"))
+    }
+
+    @Test
+    fun `save skill rejects unknown absolute skill files`() = runBlocking {
+        val dir = Files.createTempDirectory("kilo-skill-test")
+        val known = Files.createDirectories(dir.resolve("known")).resolve("SKILL.md")
+        val other = Files.createDirectories(dir.resolve("other")).resolve("SKILL.md")
+        Files.writeString(known, "known")
+        Files.writeString(other, "old")
+        mock.skills = """[
+            {"name":"known","description":"Known","location":"$known","content":"known"}
+        ]""".trimIndent()
+
+        assertFalse(rpc().saveSkill("/test project", other.toString(), "new content"))
+
+        assertEquals("old", Files.readString(other))
+    }
+
+    @Test
+    fun `reload skills is blocked by pending permissions`() = runBlocking {
+        mock.pendingPermissions = """[
+            {"id":"per_test","sessionID":"ses_test","permission":"bash","patterns":["*"],"metadata":{}}
+        ]""".trimIndent()
+        val rpc = rpc()
+
+        assertFalse(rpc.reloadSkills("/test project"))
+
+        assertEquals(1, mock.requestCount("/permission"))
+        assertEquals(0, mock.requestCount("/instance/reload"))
+    }
+
     @Test
     fun `mcp config writes global and workspace patches`() = runBlocking {
         mock.config = """{"mcp":{"global":{"type":"local","command":["node","g.js"]}}}"""
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceRpcApiImplTest.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceRpcApiImplTest.kt
new file mode 100644
index 0000000000..c6e4f94fcf
--- /dev/null
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/rpc/KiloWorkspaceRpcApiImplTest.kt
@@ -0,0 +1,84 @@
+package ai.kilocode.backend.rpc
+
+import ai.kilocode.backend.app.KiloAppState
+import ai.kilocode.backend.app.KiloBackendAppService
+import ai.kilocode.backend.testing.FakeCliServer
+import ai.kilocode.backend.testing.MockCliServer
+import ai.kilocode.backend.testing.TestLog
+import ai.kilocode.rpc.dto.WorkspaceFileDto
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeoutOrNull
+import java.nio.file.Files
+import kotlin.test.AfterTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+class KiloWorkspaceRpcApiImplTest {
+    private val mock = MockCliServer()
+    private val log = TestLog()
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    private val apps = mutableListOf<KiloBackendAppService>()
+
+    @AfterTest
+    fun tearDown() = runBlocking {
+        apps.forEach { it.dispose() }
+        apps.clear()
+        scope.cancel()
+        mock.close()
+    }
+
+    @Test
+    fun `searches files and directories through core`() = runBlocking {
+        mock.findFiles = """["src/Main.kt",".kilo/worktrees/hidden.kt"]"""
+        mock.findDirectories = """["src/","docs/"]"""
+        val dir = Files.createTempDirectory("kilo-search")
+        try {
+            val app = app()
+
+            val result = KiloWorkspaceRpcApiImpl(app).searchFiles(dir.toString(), "src", 3)
+
+            assertEquals(
+                listOf(
+                    WorkspaceFileDto("src", "src", directory = true),
+                    WorkspaceFileDto("docs", "docs", directory = true),
+                    WorkspaceFileDto("src/Main.kt", "Main.kt"),
+                ),
+                result.files,
+            )
+            assertEquals(2, mock.requestCount("/find/file"))
+            assertTrue(mock.findFilePaths.any { it.contains("type=file") && it.contains("query=src") })
+            assertTrue(mock.findFilePaths.any { it.contains("type=directory") && it.contains("query=src") })
+        } finally {
+            delete(dir)
+        }
+    }
+
+    private suspend fun app(): KiloBackendAppService {
+        val app = KiloBackendAppService.create(scope, FakeCliServer(mock), log).also { apps.add(it) }
+        app.connect()
+        val state = assertNotNull(
+            withTimeoutOrNull(35_000) {
+                app.appState.first {
+                    it is KiloAppState.Ready || it is KiloAppState.Error || it is KiloAppState.MigrationRequired
+                }
+            },
+            "App startup timed out in ${app.appState.value}; logs=${log.messages}",
+        )
+        assertIs<KiloAppState.Ready>(state, "App startup failed; logs=${log.messages}")
+        return app
+    }
+
+    private fun delete(dir: java.nio.file.Path) {
+        Files.walk(dir).use { paths ->
+            paths.sorted(Comparator.reverseOrder()).forEach { Files.deleteIfExists(it) }
+        }
+    }
+}
diff --git a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt
index 888b07e113..5e05d25573 100644
--- a/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt
+++ b/packages/kilo-jetbrains/backend/src/test/kotlin/ai/kilocode/backend/testing/MockCliServer.kt
@@ -11,6 +11,7 @@ import java.net.ServerSocket
 import java.net.Socket
 import java.net.SocketException
 import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
@@ -67,9 +68,11 @@ class MockCliServer : AutoCloseable {
     @Volatile var mcpStatus = 200
     @Volatile var mcpActionStatus = 200
     @Volatile var agentRemoveStatus = 200
+    @Volatile var skillRemoveStatus = 200
     @Volatile var agentBuilderStatus = 200
     @Volatile var lastMcpActionPath: String? = null
     @Volatile var lastAgentRemoveBody: String? = null
+    @Volatile var lastSkillRemoveBody: String? = null
     @Volatile var lastAgentBuilderPath: String? = null
     @Volatile var lastAgentBuilderBody: String? = null
     @Volatile var lastAgentBuilderMethod: String? = null
@@ -87,6 +90,12 @@ class MockCliServer : AutoCloseable {
     @Volatile var commandsStatus = 200
     @Volatile var skillsStatus = 200
 
+    // File search responses
+    @Volatile var findFiles = "[]"
+    @Volatile var findDirectories = "[]"
+    @Volatile var findFileStatus = 200
+    val findFilePaths = CopyOnWriteArrayList<String>()
+
     // Session REST responses
     @Volatile var sessions = "[]"
     @Volatile var recentSessions = "[]"
@@ -128,6 +137,8 @@ class MockCliServer : AutoCloseable {
     @Volatile var lastSessionRenamePath: String? = null
     @Volatile var lastSessionRenameBody: String? = null
     @Volatile var lastSessionRenameMethod: String? = null
+    @Volatile var pendingPermissions = "[]"
+    @Volatile var pendingQuestions = "[]"
 
     /** Configurable delay for all endpoint responses (ms). 0 = no delay. */
     @Volatile var responseDelay: Long = 0
@@ -368,8 +379,18 @@ class MockCliServer : AutoCloseable {
                     lastAgentRemoveBody = body
                     respond(output, agentRemoveStatus, if (agentRemoveStatus == 200) "true" else """{"error":"Agent not found"}""")
                 }
+                bare == "/kilocode/skill/remove" && method == "POST" -> {
+                    lastSkillRemoveBody = body
+                    respond(output, skillRemoveStatus, if (skillRemoveStatus == 200) "true" else """{"error":"Skill not found"}""")
+                }
+                bare == "/instance/reload" && method == "POST" -> respond(output, 200, "true")
                 bare == "/command" -> respond(output, commandsStatus, commands)
                 bare == "/skill" -> respond(output, skillsStatus, skills)
+                bare == "/find/file" -> {
+                    findFilePaths.add(path)
+                    val body = if (path.contains("type=directory")) findDirectories else findFiles
+                    respond(output, findFileStatus, body)
+                }
                 bare == "/mcp" -> respond(output, mcpStatus, mcp)
                 bare.matches(Regex("/mcp/[^/]+/(connect|disconnect)")) && method == "POST" -> {
                     lastMcpActionPath = path
@@ -393,6 +414,8 @@ class MockCliServer : AutoCloseable {
                     respond(output, cloudSessionImportStatus, cloudSessionImport)
                 }
                 bare == "/session/status" -> respond(output, sessionStatusesStatus, sessionStatuses)
+                bare == "/permission" && method == "GET" -> respond(output, 200, pendingPermissions)
+                bare == "/question" && method == "GET" -> respond(output, 200, pendingQuestions)
                 bare == "/session" && method == "GET" -> respond(output, sessionsStatus, sessions)
                 bare == "/session" && method == "POST" -> respond(output, sessionCreateStatus, sessionCreate)
                 bare.matches(Regex("/session/ses_[^/]+")) && method == "GET" ->
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/KiloNotifications.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/KiloNotifications.kt
index d2bc692d61..570c73363f 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/KiloNotifications.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/KiloNotifications.kt
@@ -21,4 +21,13 @@ object KiloNotifications {
             ?: Notification(GROUP, title, content ?: "", NotificationType.ERROR)
         notification.notify(project)
     }
+
+    fun info(title: String, content: String? = null) {
+        val project = ProjectManager.getInstance().openProjects.firstOrNull { !it.isDefault }
+        val notification = NotificationGroupManager.getInstance()
+            .getNotificationGroup(GROUP)
+            ?.createNotification(title, content ?: "", NotificationType.INFORMATION)
+            ?: Notification(GROUP, title, content ?: "", NotificationType.INFORMATION)
+        notification.notify(project)
+    }
 }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAgentBehaviorService.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAgentBehaviorService.kt
index 63f55818d3..2171cb1094 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAgentBehaviorService.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAgentBehaviorService.kt
@@ -33,7 +33,9 @@ class KiloAgentBehaviorService internal constructor(
 
     suspend fun agents(directory: String): List<AgentDetailDto> = safe(emptyList()) { call { agents(directory) } }
 
-    suspend fun skills(directory: String): List<SkillDto> = safe(emptyList()) { call { skills(directory) } }
+    suspend fun loadSkills(directory: String): List<SkillDto> = call { skills(directory) }
+
+    suspend fun refreshSkills(directory: String, fallback: List<SkillDto>): List<SkillDto> = safe(fallback) { call { skills(directory) } }
 
     suspend fun commands(directory: String): List<CommandDto> = safe(emptyList()) { call { commands(directory) } }
 
@@ -52,6 +54,11 @@ class KiloAgentBehaviorService internal constructor(
 
     suspend fun removeSkill(directory: String, location: String): Boolean = safe(false) { call { removeSkill(directory, location) } }
 
+    suspend fun reloadSkills(directory: String): Boolean = safe(false) { call { reloadSkills(directory) } }
+
+    suspend fun saveSkills(directory: String, edits: Map<String, String>): Boolean =
+        safe(false) { call { saveSkills(directory, edits) } }
+
     suspend fun removeAgent(directory: String, name: String): Boolean = safe(false) { call { removeAgent(directory, name) } }
 
     suspend fun createAgent(directory: String, input: AgentCreateDto): Boolean = safe(false) { call { createAgent(directory, input) } }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloWorkspaceService.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloWorkspaceService.kt
index 5836ae0cea..b9ffb09054 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloWorkspaceService.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloWorkspaceService.kt
@@ -139,6 +139,7 @@ class KiloWorkspaceService internal constructor(
     }
 
     suspend fun searchFiles(directory: String, query: String, limit: Int = 50): FileSearchResultDto {
+        LOG.debug { "workspace file search directory=$directory query=$query limit=$limit" }
         return try {
             call { searchFiles(directory, query, limit) }
         } catch (e: CancellationException) {
@@ -168,6 +169,15 @@ class KiloWorkspaceService internal constructor(
         }
     }
 
+    suspend fun openFile(path: String, line: Int? = null, column: Int? = null): Boolean {
+        return try {
+            call { openFile(path, line, column) }
+        } catch (e: Exception) {
+            LOG.warn("workspace file open failed for path=$path", e)
+            false
+        }
+    }
+
     suspend fun localConfigTarget(directory: String): ConfigTargetDto? {
         return try {
             val target = call { this.localConfigTarget(directory) }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/editor/SessionEditorTextField.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/editor/SessionEditorTextField.kt
index 7847bade60..6bc480645e 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/editor/SessionEditorTextField.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/editor/SessionEditorTextField.kt
@@ -10,7 +10,6 @@ import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataSink
 import com.intellij.openapi.actionSystem.IdeActions
-import com.intellij.openapi.actionSystem.PlatformCoreDataKeys
 import com.intellij.openapi.command.undo.UndoManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.ex.EditorEx
@@ -74,11 +73,11 @@ internal open class SessionEditorTextField(
         super.uiDataSnapshot(sink)
         selection?.provideCopy(sink) { text }
         ctx?.let { sink.set(PromptDataKeys.SEND, it) }
-        file()?.let { sink.set(PlatformCoreDataKeys.FILE_EDITOR, it) }
     }
 
     private fun install(editor: Editor) {
         (editor as? EditorEx)?.setEmbeddedIntoDialogWrapper(true)
+        editor.putUserData(EditorTextField.SUPPLEMENTARY_KEY, true)
         // EditorImpl lazily creates EditorFloatingToolbar with the same first-show hook.
         // Settings providers run later, so this callback runs immediately after toolbar creation.
         UiNotifyConnector.doWhenFirstShown(editor.component) { hide(editor.component) }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/KiloPromptCompletionProvider.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/KiloPromptCompletionProvider.kt
index 5e40551cd0..a2b6331bbb 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/KiloPromptCompletionProvider.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/ui/prompt/KiloPromptCompletionProvider.kt
@@ -73,8 +73,8 @@ class KiloPromptCompletionProvider(
     }
 
     fun prewarm() {
-        if (cache.containsKey("")) return
         scope.launch {
+            if (cache.containsKey("")) return@launch
             val result = service.searchFiles(workspace.directory, "", 50)
             if (result.files.isNotEmpty() || result.git) cache.putIfAbsent("", result)
         }
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurable.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurable.kt
index 954d62a685..e94db1b366 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurable.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurable.kt
@@ -2,6 +2,7 @@ package ai.kilocode.client.settings
 
 import ai.kilocode.client.plugin.KiloBundle
 import ai.kilocode.client.settings.agents.AgentBehaviorConfigurable
+import ai.kilocode.client.settings.context.ContextConfigurable
 import ai.kilocode.client.settings.models.ModelsConfigurable
 import ai.kilocode.client.settings.providers.ProvidersConfigurable
 import ai.kilocode.client.settings.profile.UserProfileConfigurable
@@ -73,6 +74,14 @@ class KiloSettingsConfigurable : SearchableConfigurable {
         behavior.border = JBUI.Borders.emptyBottom(UiStyle.Gap.sm())
         panel.next(behavior)
 
+        val context = ActionLink(KiloBundle.message("settings.context.displayName")) { e ->
+            val src = e.source as? JComponent ?: return@ActionLink
+            val settings = Settings.KEY.getData(DataManager.getInstance().getDataContext(src)) ?: return@ActionLink
+            open(settings, ContextConfigurable.ID)
+        }
+        context.border = JBUI.Borders.emptyBottom(UiStyle.Gap.sm())
+        panel.next(context)
+
         return panel
     }
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurable.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurable.kt
index 800f9e26a8..e127e610da 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurable.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurable.kt
@@ -25,6 +25,7 @@ class AgentBehaviorConfigurable : SearchableConfigurable {
         listOf(
             KiloBundle.message("settings.agentBehavior.agents.displayName") to AgentsConfigurable.ID,
             KiloBundle.message("settings.agentBehavior.mcp.displayName") to McpConfigurable.ID,
+            KiloBundle.message("settings.agentBehavior.skills.displayName") to SkillsConfigurable.ID,
         ).forEach { (label, id) ->
             panel.next(ActionLink(label) { e ->
                 val src = e.source as? JComponent ?: return@ActionLink
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/SkillsConfigurable.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/SkillsConfigurable.kt
new file mode 100644
index 0000000000..03ce991d73
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/SkillsConfigurable.kt
@@ -0,0 +1,586 @@
+package ai.kilocode.client.settings.agents
+
+import ai.kilocode.client.app.KiloAgentBehaviorService
+import ai.kilocode.client.app.KiloAppService
+import ai.kilocode.client.app.KiloWorkspaceService
+import ai.kilocode.client.KiloNotifications
+import ai.kilocode.client.plugin.KiloBundle
+import ai.kilocode.client.session.ui.style.SessionUiStyle
+import ai.kilocode.client.settings.base.SettingsBadge
+import ai.kilocode.client.settings.base.SettingsDraftPage
+import ai.kilocode.client.settings.base.SettingsDraftState
+import ai.kilocode.client.settings.base.SettingsListCell
+import ai.kilocode.client.settings.base.SettingsListConfig
+import ai.kilocode.client.settings.base.SettingsListItem
+import ai.kilocode.client.settings.base.SettingsListPanel
+import ai.kilocode.client.settings.base.SettingsListSelection
+import ai.kilocode.client.settings.base.SettingsListView
+import ai.kilocode.client.settings.base.SettingsMessageException
+import ai.kilocode.client.ui.UiStyle
+import ai.kilocode.client.ui.layout.Stack
+import ai.kilocode.log.KiloLog
+import ai.kilocode.rpc.dto.ConfigPatchDto
+import ai.kilocode.rpc.dto.SkillsConfigDto
+import ai.kilocode.rpc.dto.SkillsPatchDto
+import ai.kilocode.rpc.dto.SkillDto
+import com.intellij.CommonBundle
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.DefaultActionGroup
+import com.intellij.openapi.application.EDT
+import com.intellij.openapi.application.ModalityState
+import com.intellij.openapi.application.asContextElement
+import com.intellij.openapi.components.service
+import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.editor.event.DocumentEvent
+import com.intellij.openapi.editor.event.DocumentListener
+import com.intellij.openapi.fileChooser.FileChooser
+import com.intellij.openapi.fileChooser.FileChooserDescriptor
+import com.intellij.openapi.fileTypes.FileType
+import com.intellij.openapi.fileTypes.FileTypeManager
+import com.intellij.openapi.fileTypes.PlainTextFileType
+import com.intellij.openapi.fileTypes.UnknownFileType
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.openapi.project.ProjectManager
+import com.intellij.openapi.ui.DialogWrapper
+import com.intellij.openapi.ui.Messages
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.ui.EditorTextField
+import com.intellij.ui.TitledSeparator
+import com.intellij.ui.components.JBScrollPane
+import com.intellij.ui.components.JBTextField
+import com.intellij.util.ui.JBUI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
+import java.awt.BorderLayout
+import javax.swing.JButton
+import javax.swing.JComponent
+import javax.swing.JPanel
+import javax.swing.ScrollPaneConstants
+import javax.swing.ListSelectionModel
+
+private val edt = Dispatchers.EDT + ModalityState.any().asContextElement()
+
+class SkillsConfigurable : AgentBehaviorConfigurableBase<JComponent>() {
+    override fun getId(): String = ID
+    override fun getDisplayName(): String = KiloBundle.message("settings.agentBehavior.skills.displayName")
+    override fun create(cs: CoroutineScope, dir: String): JComponent = SkillsSettingsUi(cs, dir)
+    override fun update(ui: JComponent, dir: String) {
+        (ui as? SkillsSettingsUi)?.setDirectory(dir)
+    }
+    override fun scrollReadyShell() = false
+
+    companion object { const val ID = "ai.kilocode.jetbrains.settings.agentBehavior.skills" }
+}
+
+internal class SkillsSettingsUi(
+    scope: CoroutineScope,
+    dir: String,
+    private val choose: (JComponent) -> String? = ::chooseSkillPath,
+    private val input: (String, String) -> String? = ::inputSkillUrl,
+    private val edit: (SkillDto, Boolean) -> SkillEditDialogHandle = ::SkillEditDialog,
+) : SettingsListPanel(scope, SettingsListConfig.Equal.copy(tooltip = false)), SettingsDraftPage {
+    private val cs = scope
+    private var dir = dir
+    private var skills = emptyMap<String, SkillDto>()
+    private val app get() = service<KiloAppService>()
+    private val state = SettingsDraftState(skillsDraft(app.state.value.config?.skills ?: SkillsConfigDto()), ::saved)
+    private var draft: SkillsDraft
+        get() = state.draft
+        set(value) {
+            state.draft = value
+        }
+    internal val sources = SkillSourcesView(this, choose, input)
+
+    init {
+        start()
+        setCenter(skillScroll())
+        content.add(sources, BorderLayout.SOUTH)
+    }
+
+    fun setDirectory(value: String) {
+        if (value == dir) return
+        dir = value
+        reload()
+    }
+
+    override suspend fun fetch(): List<SettingsListItem> {
+        val items = withTimeoutOrNull(SKILL_LOAD_TIMEOUT_MS) {
+            service<KiloAgentBehaviorService>().loadSkills(dir)
+        } ?: throw SettingsMessageException(KiloBundle.message("settings.agentBehavior.skills.load.timeout"))
+        withContext(edt) {
+            val dirty = state.modified()
+            val edit = draft
+            state.accept(skillsDraft(config()))
+            if (dirty) draft = state.draft.copy(edited = edit.edited, deleted = edit.deleted)
+            skills = items.associateBy { key(it) }
+            sources.refresh(draft.sources)
+        }
+        LOG.info("skills settings fetch dir=$dir total=${items.size}")
+        return rows(items)
+    }
+
+    override fun afterApply() {
+        sources.refresh(draft.sources)
+    }
+
+    override fun onCell(key: String, cellId: String) {
+        val skill = skills[key] ?: return
+        when (cellId) {
+            OPEN_CELL -> open(skill)
+            EDIT_CELL -> edit(skill)
+            DELETE_CELL -> remove(skill)
+        }
+    }
+
+    override fun searchPlaceholder() = KiloBundle.message("settings.agentBehavior.skills.search")
+
+    override fun emptyText() = KiloBundle.message("settings.agentBehavior.skills.empty")
+
+    internal fun updateSources(paths: List<String>, urls: List<String>) {
+        state.update { copy(sources = SkillsConfigDto(paths = paths, urls = urls)) }
+        sources.refresh(draft.sources)
+    }
+
+    override fun modified(): Boolean = state.modified()
+
+    override fun resetDraft() {
+        state.reset()
+        sources.refresh(draft.sources)
+        view.update(rows())
+        clearProgress()
+    }
+
+    override fun applyDraft() {
+        val token = state.start() ?: return
+        val fallback = skillFallback(token.target)
+        if (!launch("apply") { id ->
+            val target = token.target
+            var failed: String? = null
+            val behavior = service<KiloAgentBehaviorService>()
+            LOG.info("skills settings apply start dir=$dir edited=${target.edited.size} deleted=${target.deleted.size} paths=${target.sources.paths.size} urls=${target.sources.urls.size}")
+            if (target.edited.isNotEmpty() && !behavior.saveSkills(dir, target.edited)) {
+                failed = KiloBundle.message("settings.agentBehavior.save.failed")
+            }
+            if (failed == null) {
+                for (location in target.deleted) {
+                    if (!behavior.removeSkill(dir, location)) {
+                        failed = KiloBundle.message("settings.agentBehavior.skills.delete.failed")
+                        break
+                    }
+                }
+            }
+            if (failed == null && target.sources != token.previous.sources) {
+                val patch = ConfigPatchDto(skills = SkillsPatchDto(paths = target.sources.paths, urls = target.sources.urls))
+                if (app.updateConfig(patch) == null) failed = KiloBundle.message("settings.agentBehavior.save.failed")
+            }
+            val reloaded = if (failed == null) behavior.reloadSkills(dir) else true
+            val items = behavior.refreshSkills(dir, fallback)
+            withContext(edt) {
+                if (!active(id)) {
+                    if (failed == null) KiloNotifications.info(KiloBundle.message("settings.agentBehavior.skills.saved.notification"))
+                    else KiloNotifications.error(failed)
+                    return@withContext
+                }
+                if (failed == null) {
+                    skills = items.associateBy { key(it) }
+                    val next = skillsDraft(config())
+                    state.complete(token, next)
+                    sources.refresh(draft.sources)
+                    view.update(rows(items))
+                    if (reloaded) clearProgress() else showProgress(KiloBundle.message("settings.agentBehavior.skills.reload.blocked"))
+                    LOG.info("skills settings apply succeeded dir=$dir")
+                } else {
+                    state.fail(token, failed)
+                    sources.refresh(draft.sources)
+                    view.update(rows(items))
+                    showError(failed)
+                    LOG.warn("skills settings apply failed dir=$dir message=$failed")
+                }
+                setBusy(false)
+            }
+        }) return
+        showProgress(KiloBundle.message("settings.agentBehavior.saving"))
+    }
+
+    private fun skillScroll() = JBScrollPane(view).apply {
+        border = null
+        horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+        verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
+    }
+
+    private fun rows(items: List<SkillDto> = skills.values.toList()): List<SettingsListItem> = items.mapNotNull { skill ->
+        if (skill.location in draft.deleted) return@mapNotNull null
+        item(skill)
+    }
+
+    private fun skillFallback(target: SkillsDraft): List<SkillDto> = skills.values.mapNotNull { skill ->
+        if (skill.location in target.deleted) return@mapNotNull null
+        target.edited[skill.location]?.let { skill.copy(content = it) } ?: skill
+    }
+
+    private fun item(skill: SkillDto) = object : SettingsListItem {
+        override val key = key(skill)
+        override val title = skill.name
+        override val note = skill.location.takeUnless { builtin(it) }
+        override val description = skill.description
+        override val doubleClick = EDIT_CELL
+        override val badges = listOf(
+            SettingsBadge(KiloBundle.message("settings.agentBehavior.badge.builtin"), UiStyle.Badge.Secondary),
+        ).takeIf { builtin(skill.location) } ?: emptyList()
+        override val cells = listOfNotNull(
+            SettingsListCell(
+                OPEN_CELL,
+                KiloBundle.message("settings.agentBehavior.skills.openInEditor"),
+                primary = true,
+            ).takeIf { skill.editable },
+            SettingsListCell(
+                EDIT_CELL,
+                KiloBundle.message(if (skill.editable) "settings.agentBehavior.edit" else "common.open"),
+                primary = !skill.editable,
+            ),
+            SettingsListCell(
+                DELETE_CELL,
+                KiloBundle.message("common.delete"),
+                icon = AllIcons.Actions.GC,
+                iconOnly = true,
+            ).takeIf { skill.editable },
+        )
+    }
+
+    private fun edit(skill: SkillDto) {
+        val current = skill.copy(content = content(skill))
+        val dialog = edit(current, skill.editable)
+        if (!skill.editable) {
+            dialog.showAndGet()
+            return
+        }
+        if (!dialog.showAndGet()) return
+        state.update { copy(edited = edited + (skill.location to dialog.content())) }
+        view.update(rows(), SettingsListSelection.Key(key(skill)))
+    }
+
+    private fun open(skill: SkillDto) {
+        if (!skill.editable) return
+        showProgress(KiloBundle.message("settings.agentBehavior.skills.openInEditor.pending"))
+        cs.launch {
+            val opened = service<KiloWorkspaceService>().openFile(skill.location)
+            if (opened) return@launch
+            withContext(edt) { KiloNotifications.error(KiloBundle.message("settings.agentBehavior.skills.openInEditor.failed")) }
+        }
+    }
+
+    private fun remove(skill: SkillDto) {
+        val result = Messages.showYesNoDialog(
+            KiloBundle.message("settings.agentBehavior.skills.delete.message", skill.name),
+            KiloBundle.message("settings.agentBehavior.skills.delete.title"),
+            KiloBundle.message("common.delete"),
+            Messages.getCancelButton(),
+            Messages.getQuestionIcon(),
+        )
+        if (result != Messages.YES) return
+        state.update { copy(deleted = deleted + skill.location, edited = edited - skill.location) }
+        view.update(rows(), selectionIndex())
+    }
+
+    private fun content(skill: SkillDto) = draft.edited[skill.location] ?: skill.content
+
+    private fun config() = app.state.value.config?.skills ?: SkillsConfigDto()
+
+    private companion object {
+        const val EDIT_CELL = "edit"
+        const val OPEN_CELL = "open"
+        const val DELETE_CELL = "delete"
+        const val BUILTIN = "builtin"
+        const val LEGACY_BUILTIN = "<built-in>"
+        val LOG = KiloLog.create(SkillsSettingsUi::class.java)
+
+        fun key(skill: SkillDto) = skill.location.ifBlank { skill.name }
+        fun builtin(location: String) = location == BUILTIN || location == LEGACY_BUILTIN
+    }
+}
+
+internal interface SkillEditDialogHandle {
+    fun showAndGet(): Boolean
+    fun content(): String
+}
+
+private data class SkillsDraft(
+    val sources: SkillsConfigDto,
+    val edited: Map<String, String> = emptyMap(),
+    val deleted: Set<String> = emptySet(),
+)
+
+private fun skillsDraft(sources: SkillsConfigDto) = SkillsDraft(sources)
+
+private fun saved(base: SkillsDraft, draft: SkillsDraft): Boolean = base == draft
+
+internal class SkillEditDialog(private val skill: SkillDto, private val savable: Boolean) : DialogWrapper(true), SkillEditDialogHandle {
+    private val base = initial()
+    private val editor = SkillEditor(base, skill.location, savable)
+
+    init {
+        title = skill.name
+        setOKButtonText(CommonBundle.getOkButtonText())
+        setCancelButtonText(CommonBundle.getCloseButtonText())
+        init()
+        isOKActionEnabled = false
+        editor.document.addDocumentListener(object : DocumentListener {
+            override fun documentChanged(event: DocumentEvent) {
+                isOKActionEnabled = savable && editor.text != base
+            }
+        })
+    }
+
+    override fun createCenterPanel(): JComponent = JBScrollPane(editor).apply {
+        viewportBorder = editorPad()
+        horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+        verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
+        preferredSize = JBUI.size(720, 520)
+    }
+
+    override fun createActions() = if (savable) arrayOf(okAction, cancelAction) else arrayOf(cancelAction)
+
+    override fun content() = editor.text
+
+    private fun initial() = skill.content?.takeIf { it.isNotBlank() }
+        ?: skill.description?.takeIf { it.isNotBlank() }
+        ?: KiloBundle.message("settings.agentBehavior.skills.content.empty")
+
+    private class SkillEditor(value: String, location: String, editable: Boolean) : EditorTextField(
+        EditorFactory.getInstance().createDocument(value),
+        ProjectManager.getInstance().defaultProject,
+        skillFileType(location, value),
+        false,
+        !editable,
+    ) {
+        init {
+            border = JBUI.Borders.empty()
+            setOneLineMode(false)
+            addSettingsProvider { ed ->
+                ed.setBorder(JBUI.Borders.empty())
+                ed.scrollPane.border = JBUI.Borders.empty()
+                ed.scrollPane.viewportBorder = JBUI.Borders.empty()
+                ed.settings.isUseSoftWraps = true
+                ed.settings.isPaintSoftWraps = false
+                ed.settings.isAdditionalPageAtBottom = false
+                ed.scrollPane.horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+                ed.scrollPane.verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
+            }
+        }
+    }
+}
+
+internal class SkillSourcesView(
+    private val parent: SkillsSettingsUi,
+    private val choose: (JComponent) -> String?,
+    private val input: (String, String) -> String?,
+) : Stack(ai.kilocode.client.ui.layout.StackAxis.VERTICAL, UiStyle.Gap.sm()) {
+    private val view = SettingsListView(
+        KiloBundle.message("settings.agentBehavior.skills.sources.empty"),
+        SettingsListConfig.Preferred.copy(description = false, selection = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION),
+    ) { key, id ->
+        if (id == EDIT_CELL) edit(key)
+    }
+    private var cfg = SkillsConfigDto()
+
+    internal fun sourceList() = view.list
+
+    init {
+        border = JBUI.Borders.empty(UiStyle.Gap.pad(), 0, 0, 0)
+        next(TitledSeparator(KiloBundle.message("settings.agentBehavior.skills.sources.title")))
+        next(toolbar())
+        next(JBScrollPane(view).apply {
+            border = null
+            horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+            preferredSize = JBUI.size(0, JBUI.scale(160))
+            maximumSize = JBUI.size(Int.MAX_VALUE, JBUI.scale(160))
+        })
+    }
+
+    fun refresh(config: SkillsConfigDto) {
+        cfg = config
+        view.update(rows(config))
+    }
+
+    private fun toolbar(): JComponent {
+        val add = DefaultActionGroup(KiloBundle.message("settings.agentBehavior.skills.sources.add"), true).apply {
+            templatePresentation.icon = AllIcons.General.Add
+            add(AddPathAction())
+            add(AddUrlAction())
+        }
+        val group = DefaultActionGroup(add, RemoveAction())
+        val toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.TOOLBAR, group, true)
+        toolbar.targetComponent = this
+        toolbar.updateActionsImmediately()
+        return toolbar.component
+    }
+
+    internal fun addPath() {
+        val path = choose(parent)?.trim()?.takeIf { it.isNotBlank() } ?: return
+        if (path in cfg.paths) return
+        parent.updateSources(cfg.paths + path, cfg.urls)
+    }
+
+    internal fun addUrl() {
+        val url = input(
+            KiloBundle.message("settings.agentBehavior.skills.sources.addUrl.title"),
+            KiloBundle.message("settings.agentBehavior.skills.sources.addUrl.prompt"),
+        )?.trim()?.takeIf { it.isNotBlank() } ?: return
+        if (url in cfg.urls) return
+        parent.updateSources(cfg.paths, cfg.urls + url)
+    }
+
+    private fun rows(config: SkillsConfigDto): List<SettingsListItem> {
+        val paths = config.paths.map { source(PATH_PREFIX, it) }
+        val urls = config.urls.map { source(URL_PREFIX, it) }
+        return paths + urls
+    }
+
+    private fun source(prefix: String, value: String) = object : SettingsListItem {
+        override val key = prefix + value
+        override val title = value
+        override val doubleClick = EDIT_CELL
+    }
+
+    internal fun removeSelected() {
+        val keys = view.selectedItems().map { it.key }.toSet()
+        if (keys.isEmpty()) return
+        val paths = cfg.paths.filterNot { PATH_PREFIX + it in keys }
+        val urls = cfg.urls.filterNot { URL_PREFIX + it in keys }
+        parent.updateSources(paths, urls)
+    }
+
+    private fun edit(key: String) {
+        val path = key.startsWith(PATH_PREFIX)
+        val old = key.removePrefix(if (path) PATH_PREFIX else URL_PREFIX)
+        val dialog = SkillSourceDialog(old, path, choose)
+        if (!dialog.showAndGet()) return
+        val next = dialog.value().trim().takeIf { it.isNotBlank() } ?: return
+        if (path) {
+            parent.updateSources(cfg.paths.map { if (it == old) next else it }.distinct(), cfg.urls)
+            return
+        }
+        parent.updateSources(cfg.paths, cfg.urls.map { if (it == old) next else it }.distinct())
+    }
+
+    private inner class AddPathAction : DumbAwareAction(
+        KiloBundle.message("settings.agentBehavior.skills.sources.addPath"),
+        null,
+        null,
+    ) {
+        override fun getActionUpdateThread() = ActionUpdateThread.EDT
+        override fun actionPerformed(e: AnActionEvent) = addPath()
+    }
+
+    private inner class AddUrlAction : DumbAwareAction(
+        KiloBundle.message("settings.agentBehavior.skills.sources.addUrl"),
+        null,
+        null,
+    ) {
+        override fun getActionUpdateThread() = ActionUpdateThread.EDT
+        override fun actionPerformed(e: AnActionEvent) = addUrl()
+    }
+
+    private inner class RemoveAction : DumbAwareAction(
+        KiloBundle.message("common.delete"),
+        null,
+        AllIcons.General.Remove,
+    ) {
+        override fun getActionUpdateThread() = ActionUpdateThread.EDT
+        override fun update(e: AnActionEvent) {
+            e.presentation.isEnabled = view.selectedItems().isNotEmpty()
+        }
+        override fun actionPerformed(e: AnActionEvent) = removeSelected()
+    }
+
+    private companion object {
+        const val EDIT_CELL = "edit"
+        const val PATH_PREFIX = "path:"
+        const val URL_PREFIX = "url:"
+    }
+}
+
+private class SkillSourceDialog(
+    value: String,
+    private val path: Boolean,
+    private val choose: (JComponent) -> String?,
+) : DialogWrapper(true) {
+    private val field = JBTextField(value)
+
+    init {
+        title = if (path) KiloBundle.message("settings.agentBehavior.skills.sources.editPath.title")
+        else KiloBundle.message("settings.agentBehavior.skills.sources.editUrl.title")
+        setOKButtonText(KiloBundle.message("common.save"))
+        init()
+    }
+
+    override fun createCenterPanel(): JComponent {
+        if (!path) return field.apply { columns = SOURCE_COLUMNS }
+        return JPanel(BorderLayout(UiStyle.Gap.sm(), 0)).apply {
+            add(field.apply { columns = SOURCE_COLUMNS }, BorderLayout.CENTER)
+            add(JButton("...").apply {
+                addActionListener {
+                    choose(this)?.let { field.text = it }
+                }
+            }, BorderLayout.EAST)
+        }
+    }
+
+    fun value() = field.text
+}
+
+private fun chooseSkillPath(parent: JComponent): String? {
+    return FileChooser.chooseFile(skillPathDescriptor(), parent, null, null as VirtualFile?)?.path
+}
+
+internal fun skillPathDescriptor() = FileChooserDescriptor(false, true, false, false, false, false).apply {
+    title = KiloBundle.message("settings.agentBehavior.skills.sources.addPath.title")
+    description = KiloBundle.message("settings.agentBehavior.skills.sources.addPath.prompt")
+}
+
+internal fun skillFileType(location: String, content: String? = null): FileType {
+    val syntax = content?.syntaxName()
+    val name = syntax ?: location.substringAfterLast('/').substringAfterLast('\\').ifBlank { SKILL_FILE }
+    val type = FileTypeManager.getInstance().getFileTypeByFileName(name)
+    if (type == UnknownFileType.INSTANCE) return PlainTextFileType.INSTANCE
+    return type
+}
+
+private fun String.syntaxName(): String? {
+    val text = trimStart()
+    if (text.isBlank()) return null
+    if (text.looksHtml()) return "index.html"
+    if (text.looksMarkdown()) return SKILL_FILE
+    return null
+}
+
+private fun String.looksHtml() = contains(Regex("^\\s*(<!doctype\\s+html|<html\\b|<body\\b|</?(h[1-6]|p|pre|code|ul|ol|li|blockquote|br)\\b)", RegexOption.IGNORE_CASE))
+
+private fun String.looksMarkdown() = lineSequence().any { line ->
+    line.matches(Regex("\\s{0,3}(#{1,6}\\s+.+|[-*+]\\s+.+|\\d+\\.\\s+.+|```.*|>\\s+.+)")) ||
+        line.contains(Regex("(`[^`]+`|\\[[^]]+][(][^)]+[)])"))
+}
+
+private fun inputSkillUrl(title: String, prompt: String): String? = Messages.showInputDialog(
+    prompt,
+    title,
+    Messages.getQuestionIcon(),
+)
+
+private fun editorPad() = JBUI.Borders.empty(
+    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_HORIZONTAL_PADDING),
+    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_HORIZONTAL_PADDING),
+)
+
+private const val SOURCE_COLUMNS = 60
+private const val SKILL_FILE = "SKILL.md"
+private const val SKILL_LOAD_TIMEOUT_MS = 10_000L
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsDraftState.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsDraftState.kt
index ca8424f65b..335df8d50f 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsDraftState.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsDraftState.kt
@@ -11,6 +11,8 @@ internal class SettingsDraftState<D>(
 
     private var base = initial
     private var pending: D? = null
+    private var stale: List<D> = emptyList()
+    private var applied: D? = null
     private var save = false
     private var err: String? = null
 
@@ -29,6 +31,10 @@ internal class SettingsDraftState<D>(
     fun accept(next: D) {
         val target = pending
         if (target == null) {
+            val done = applied
+            if (done != null && saved(base, done) && stale.any { saved(next, it) }) return
+            stale = emptyList()
+            applied = null
             val prev = base
             val edit = draft
             base = next
@@ -51,12 +57,15 @@ internal class SettingsDraftState<D>(
 
     fun complete(token: SettingsDraftSave<D>, returned: D) {
         val edit = draft
-        val next = if (saved(returned, token.target)) returned else token.target
+        val fresh = saved(returned, token.target)
+        val next = if (fresh) returned else token.target
         base = next
         draft = if (saved(edit, token.target)) next else edit
         pending = null
         save = false
         err = null
+        stale += token.previous
+        applied = token.target
     }
 
     fun fail(token: SettingsDraftSave<D>, message: String) {
@@ -66,6 +75,8 @@ internal class SettingsDraftState<D>(
         pending = null
         save = false
         err = message
+        stale = emptyList()
+        applied = null
     }
 }
 
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListModel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListModel.kt
index 81cac63adc..0246af99dd 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListModel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListModel.kt
@@ -8,6 +8,7 @@ import java.awt.Point
 import java.awt.Rectangle
 import javax.swing.Icon
 import javax.swing.JList
+import javax.swing.ListSelectionModel
 import javax.swing.ListCellRenderer
 import javax.swing.SwingUtilities
 
@@ -21,6 +22,8 @@ internal data class SettingsListConfig(
     val height: SettingsListRowHeight,
     val description: Boolean = true,
     val descriptionIndent: Boolean = true,
+    val tooltip: Boolean = true,
+    val selection: Int = ListSelectionModel.SINGLE_SELECTION,
 ) {
     companion object {
         val Equal = SettingsListConfig(SettingsListRowHeight.EQUAL)
@@ -41,7 +44,9 @@ internal data class SettingsListCell(
 internal interface SettingsListItem {
     val key: String
     val title: String
+    val note: String? get() = null
     val description: String? get() = null
+    val doubleClick: String? get() = null
     val icon: Icon? get() = null
     val section: String? get() = null
     val badges: List<SettingsBadge> get() = emptyList()
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListRenderer.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListRenderer.kt
index 314e2c64b7..074ea866be 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListRenderer.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListRenderer.kt
@@ -83,6 +83,9 @@ internal class SettingsListRenderer(
 
         title.clear()
         title.append(value.title, SimpleTextAttributes(SimpleTextAttributes.STYLE_BOLD, fg))
+        value.note?.takeIf { it.isNotBlank() }?.let {
+            title.append("  $it", SimpleTextAttributes.GRAYED_ATTRIBUTES)
+        }
         syncBadges(value)
         icon.icon = value.icon
         mark.isVisible = value.icon != null
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListView.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListView.kt
index 661ac90103..183a86a9df 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListView.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListView.kt
@@ -1,6 +1,7 @@
 package ai.kilocode.client.settings.base
 
 import ai.kilocode.client.session.ui.model.ModelSearch
+import ai.kilocode.client.ui.UiStyle
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.ui.CollectionListModel
 import com.intellij.ui.ScrollingUtil
@@ -8,23 +9,27 @@ import com.intellij.ui.components.JBList
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import com.intellij.xml.util.XmlStringUtil
 import com.intellij.util.ui.UIUtil
+import java.awt.Dimension
+import java.awt.Rectangle
 import java.awt.event.KeyEvent
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
 import javax.swing.JComponent
 import javax.swing.KeyStroke
 import javax.swing.ListSelectionModel
+import javax.swing.Scrollable
+import javax.swing.SwingConstants
 import javax.swing.event.ListSelectionEvent
 
 internal class SettingsListView(
     empty: String,
     private val cfg: SettingsListConfig = SettingsListConfig.Equal,
     private val onCell: (String, String) -> Unit,
-) : BaseContentPanel() {
+) : BaseContentPanel(), Scrollable {
     private val model = CollectionListModel<SettingsListItem>()
     internal val list = object : JBList<SettingsListItem>(model) {
         override fun getToolTipText(event: MouseEvent): String? {
-            if (!cfg.description) return null
+            if (!cfg.description || !cfg.tooltip) return null
             val idx = locationToIndex(event.point)
             if (idx < 0) return null
             val bounds = getCellBounds(idx, idx) ?: return null
@@ -34,7 +39,7 @@ internal class SettingsListView(
             return XmlStringUtil.wrapInHtml(text)
         }
     }.apply {
-        selectionMode = ListSelectionModel.SINGLE_SELECTION
+        selectionMode = cfg.selection
         setExpandableItemsEnabled(false)
         emptyText.text = empty
     }
@@ -67,6 +72,11 @@ internal class SettingsListView(
                 val hit = hit(e, enabled = false) ?: return
                 if (hit.id != null) return
                 val item = hit.item
+                item.doubleClick?.let { id ->
+                    onCell(item.key, id)
+                    e.consume()
+                    return
+                }
                 primary(item)
                 e.consume()
             }
@@ -94,6 +104,12 @@ internal class SettingsListView(
         return list.selectedValue
     }
 
+    @RequiresEdt
+    fun selectedItems(): List<SettingsListItem> {
+        checkEdt()
+        return list.selectedValuesList
+    }
+
     @RequiresEdt
     fun selectedIndex(): Int {
         checkEdt()
@@ -121,6 +137,7 @@ internal class SettingsListView(
     @RequiresEdt
     fun setBusy(value: Boolean) {
         checkEdt()
+        list.setPaintBusy(value)
         if (list.isEnabled == !value) return
         list.isEnabled = !value
         list.repaint()
@@ -191,9 +208,15 @@ internal class SettingsListView(
     private fun primary(item: SettingsListItem) {
         val cells = settingsListVisibleCells(item, true)
         val cell = cells.firstOrNull { it.enabled && it.primary }
-            ?: cells.firstOrNull { it.enabled }
-            ?: return
-        onCell(item.key, cell.id)
+        if (cell != null) {
+            onCell(item.key, cell.id)
+            return
+        }
+        item.doubleClick?.let { id ->
+            onCell(item.key, id)
+            return
+        }
+        cells.firstOrNull { it.enabled }?.let { onCell(item.key, it.id) }
     }
 
     private fun hit(e: MouseEvent, enabled: Boolean = true): Hit? {
@@ -201,7 +224,7 @@ internal class SettingsListView(
         val bounds = idx.takeIf { it >= 0 }?.let { list.getCellBounds(it, it) } ?: return null
         if (!bounds.contains(e.point)) return null
         val item = model.getElementAt(idx)
-        val selected = idx == list.selectedIndex
+        val selected = list.isSelectedIndex(idx)
         val id = if (enabled) {
             settingsListCellAt(list, idx, e.point, selected)
         } else {
@@ -217,6 +240,27 @@ internal class SettingsListView(
         check(ApplicationManager.getApplication().isDispatchThread) { "Settings list updates must run on EDT" }
     }
 
+    override fun getScrollableTracksViewportWidth() = true
+
+    override fun getScrollableTracksViewportHeight() = false
+
+    override fun getPreferredScrollableViewportSize(): Dimension = preferredSize
+
+    override fun getScrollableUnitIncrement(
+        visibleRect: Rectangle,
+        orientation: Int,
+        direction: Int,
+    ): Int {
+        if (orientation != SwingConstants.VERTICAL) return UiStyle.Gap.pad()
+        return list.fixedCellHeight.takeIf { it > 0 } ?: UiStyle.Gap.xl()
+    }
+
+    override fun getScrollableBlockIncrement(
+        visibleRect: Rectangle,
+        orientation: Int,
+        direction: Int,
+    ) = if (orientation == SwingConstants.VERTICAL) visibleRect.height else visibleRect.width
+
     private data class Hit(val item: SettingsListItem, val id: String?)
 
     private data class Press(val key: String, val id: String)
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsPanel.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsPanel.kt
index cf87dd58ff..240c2c0212 100644
--- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsPanel.kt
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsPanel.kt
@@ -33,6 +33,14 @@ internal open class SettingsPanel : SettingsOverlayPanel() {
         repaint()
     }
 
+    protected fun setCenter(component: JComponent) {
+        val layout = content.layout as? BorderLayout
+        layout?.getLayoutComponent(BorderLayout.CENTER)?.let { content.remove(it) }
+        content.add(component, BorderLayout.CENTER)
+        revalidate()
+        repaint()
+    }
+
 }
 
 private class SettingsBody : Stack(StackAxis.VERTICAL), Scrollable {
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextConfigurable.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextConfigurable.kt
new file mode 100644
index 0000000000..2a5c92916e
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextConfigurable.kt
@@ -0,0 +1,18 @@
+package ai.kilocode.client.settings.context
+
+import ai.kilocode.client.plugin.KiloBundle
+import ai.kilocode.client.settings.base.DraftReadyConfigurable
+import kotlinx.coroutines.CoroutineScope
+import javax.swing.JComponent
+
+class ContextConfigurable : DraftReadyConfigurable<JComponent>() {
+    override fun getId(): String = ID
+
+    override fun getDisplayName(): String = KiloBundle.message("settings.context.displayName")
+
+    override fun create(cs: CoroutineScope): JComponent = ContextSettingsUi(cs)
+
+    companion object {
+        const val ID = "ai.kilocode.jetbrains.settings.context"
+    }
+}
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextSettingsState.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextSettingsState.kt
new file mode 100644
index 0000000000..3a5989a332
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextSettingsState.kt
@@ -0,0 +1,77 @@
+package ai.kilocode.client.settings.context
+
+import ai.kilocode.rpc.dto.CompactionPatchDto
+import ai.kilocode.rpc.dto.ConfigDto
+import ai.kilocode.rpc.dto.ConfigPatchDto
+import ai.kilocode.rpc.dto.WatcherPatchDto
+
+internal data class ContextDraft(
+    val auto: Boolean = false,
+    val threshold: String = "",
+    val prune: Boolean = false,
+    val ignore: List<String> = emptyList(),
+)
+
+internal enum class ThresholdStatus {
+    VALID,
+    INVALID,
+}
+
+internal fun contextDraft(config: ConfigDto?): ContextDraft = ContextDraft(
+    auto = config?.compaction?.auto ?: false,
+    threshold = config?.compaction?.threshold_percent?.let(::formatThreshold).orEmpty(),
+    prune = config?.compaction?.prune ?: false,
+    ignore = config?.watcher?.ignore ?: emptyList(),
+)
+
+internal fun patch(from: ContextDraft, to: ContextDraft): ConfigPatchDto? {
+    if (thresholdStatus(to.threshold) == ThresholdStatus.INVALID) return null
+
+    val compaction = compactionPatch(from, to)
+    val watcher = if (from.ignore != to.ignore) WatcherPatchDto(ignore = to.ignore) else null
+    return ConfigPatchDto(watcher = watcher, compaction = compaction)
+}
+
+internal fun changed(patch: ConfigPatchDto): Boolean = patch.watcher != null || patch.compaction != null
+
+internal fun savedMatches(base: ContextDraft, draft: ContextDraft): Boolean =
+    base.auto == draft.auto &&
+        normalizeThreshold(base.threshold) == normalizeThreshold(draft.threshold) &&
+        base.prune == draft.prune &&
+        base.ignore == draft.ignore
+
+internal fun thresholdStatus(value: String): ThresholdStatus {
+    val text = value.trim()
+    if (text.isBlank()) return ThresholdStatus.VALID
+    val num = text.toDoubleOrNull()
+    if (num == null || !num.isFinite() || num < 0.0 || num > 100.0) return ThresholdStatus.INVALID
+    return ThresholdStatus.VALID
+}
+
+private fun compactionPatch(from: ContextDraft, to: ContextDraft): CompactionPatchDto? {
+    val threshold = parseThreshold(to.threshold)
+    val fromThreshold = parseThreshold(from.threshold)
+    val clear = if (fromThreshold != threshold && threshold == null) listOf("threshold_percent") else emptyList()
+    val patch = CompactionPatchDto(
+        clear = clear,
+        auto = to.auto.takeIf { from.auto != to.auto },
+        threshold_percent = threshold.takeIf { fromThreshold != threshold && threshold != null },
+        prune = to.prune.takeIf { from.prune != to.prune },
+    )
+    if (patch.clear.isEmpty() && patch.auto == null && patch.threshold_percent == null && patch.prune == null) return null
+    return patch
+}
+
+private fun parseThreshold(value: String): Double? {
+    val text = value.trim()
+    if (text.isBlank()) return null
+    return text.toDoubleOrNull()?.takeIf { it.isFinite() && it >= 0.0 && it <= 100.0 }
+}
+
+private fun normalizeThreshold(value: String): String = parseThreshold(value)?.let(::formatThreshold).orEmpty()
+
+private fun formatThreshold(value: Double): String {
+    val whole = value.toLong()
+    if (value == whole.toDouble()) return whole.toString()
+    return value.toString()
+}
diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextSettingsUi.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextSettingsUi.kt
new file mode 100644
index 0000000000..7a66f2ac59
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/context/ContextSettingsUi.kt
@@ -0,0 +1,388 @@
+package ai.kilocode.client.settings.context
+
+import ai.kilocode.client.app.KiloAppService
+import ai.kilocode.client.app.KiloWorkspaceService
+import ai.kilocode.client.plugin.KiloBundle
+import ai.kilocode.client.settings.base.BaseContentPanel
+import ai.kilocode.client.settings.base.BaseSettingsUi
+import ai.kilocode.client.settings.base.SettingsBannerKind
+import ai.kilocode.client.settings.base.SettingsRow
+import ai.kilocode.client.settings.base.SettingsToggle
+import ai.kilocode.client.ui.HoverIcon
+import ai.kilocode.client.ui.UiStyle
+import ai.kilocode.client.ui.layout.HAlign
+import ai.kilocode.client.ui.layout.Stack
+import ai.kilocode.client.ui.layout.StackAxis
+import ai.kilocode.client.ui.layout.VAlign
+import ai.kilocode.client.ui.layout.align
+import ai.kilocode.log.KiloLog
+import ai.kilocode.rpc.dto.ConfigPatchDto
+import ai.kilocode.rpc.dto.KiloAppStateDto
+import ai.kilocode.rpc.dto.KiloAppStatusDto
+import ai.kilocode.rpc.dto.ModelStateDto
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.components.service
+import com.intellij.openapi.ui.Messages
+import com.intellij.ui.CollectionListModel
+import com.intellij.ui.DocumentAdapter
+import com.intellij.ui.ScrollingUtil
+import com.intellij.ui.components.JBList
+import com.intellij.ui.components.JBLabel
+import com.intellij.ui.components.JBScrollPane
+import com.intellij.ui.components.JBTextField
+import com.intellij.util.concurrency.annotations.RequiresEdt
+import com.intellij.util.ui.JBUI
+import com.intellij.util.ui.UIUtil
+import kotlinx.coroutines.CoroutineScope
+import java.awt.event.KeyEvent
+import java.awt.event.MouseAdapter
+import java.awt.event.MouseEvent
+import javax.swing.JComponent
+import javax.swing.DefaultListCellRenderer
+import javax.swing.JList
+import javax.swing.ListSelectionModel
+import javax.swing.ScrollPaneConstants
+import javax.swing.event.DocumentEvent
+import javax.swing.text.AbstractDocument
+import javax.swing.text.AttributeSet
+import javax.swing.text.DocumentFilter
+
+internal class ContextSettingsUi(
+    cs: CoroutineScope,
+    private val app: KiloAppService = service(),
+    workspaces: KiloWorkspaceService = service(),
+) : BaseSettingsUi<ContextSettingsContent, ContextDraft, ConfigPatchDto, KiloAppStateDto, Unit>(
+    cs,
+    ContextDraft(),
+    app,
+    workspaces,
+    loginBanner = false,
+) {
+    init {
+        startSettings(ContextSettingsContent { updateDraft(it) })
+    }
+
+    override fun change(from: ContextDraft, to: ContextDraft): ConfigPatchDto? = patch(from, to)?.takeIf(::changed)
+
+    override fun save(change: ConfigPatchDto, done: (KiloAppStateDto?) -> Unit) {
+        app.updateConfigAsync(change, done)
+    }
+
+    override fun base(result: KiloAppStateDto): ContextDraft = contextDraft(result.config)
+
+    override fun draft(state: KiloAppStateDto): ContextDraft = contextDraft(state.config)
+
+    override fun saved(base: ContextDraft, draft: ContextDraft): Boolean = savedMatches(base, draft)
+
+    override fun pendingText(): String = KiloBundle.message("settings.context.save.pending")
+
+    override fun failedText(): String = KiloBundle.message("settings.context.save.failed")
+
+    override suspend fun loadWorkspace(root: String) = Unit
+
+    override fun applyWorkspace(result: Unit) = Unit
+
+    override fun models(state: ModelStateDto) = Unit
+
+    override fun logSaveStarted(change: ConfigPatchDto) = LOG.info("context settings save: started ${summary(change)}")
+
+    override fun logSaveCompleted(change: ConfigPatchDto) = LOG.info("context settings save: completed ${summary(change)}")
+
+    override fun logSaveFailed(change: ConfigPatchDto) = LOG.warn("context settings save: failed ${summary(change)}")
+
+    override fun logSaveFailedAfterDispose(change: ConfigPatchDto) = LOG.warn("context settings save: failed after dispose ${summary(change)}")
+
+    override fun logSaveCompletedAfterDispose(change: ConfigPatchDto) = LOG.info("context settings save: completed after dispose ${summary(change)}")
+
+    @RequiresEdt
+    override fun syncContent() {
+        val ready = appState.status == KiloAppStatusDto.READY
+        val editable = ready && !saving
+        form.sync(draft, editable)
+        top.hideBanner()
+        val err = saveError
+        if (saving) {
+            showProgress(KiloBundle.message("settings.context.save.pending"))
+            return
+        }
+        if (err != null) {
+            showError(err)
+            return
+        }
+        if (!ready) {
+            showProgress(KiloBundle.message("settings.cli.unavailable.message"))
+            return
+        }
+        if (thresholdStatus(draft.threshold) == ThresholdStatus.INVALID) {
+            top.showBanner(
+                KiloBundle.message("settings.context.compaction.threshold.invalid"),
+                emptyList(),
+                SettingsBannerKind.ERROR,
+            )
+            clearProgress()
+            return
+        }
+        clearProgress()
+    }
+
+    private companion object {
+        val LOG = KiloLog.create(ContextSettingsUi::class.java)
+    }
+}
+
+internal class ContextSettingsContent(
+    private val update: (ContextDraft.() -> ContextDraft) -> Unit,
+) : BaseContentPanel() {
+    private val auto = SettingsToggle { value -> update { copy(auto = value) } }
+    private val prune = SettingsToggle { value -> update { copy(prune = value) } }
+    private val threshold = ThresholdField(
+        KiloBundle.message("settings.context.compaction.threshold.placeholder"),
+    ) { value -> update { copy(threshold = value) } }
+    private val patterns = PatternList { value -> update { copy(ignore = value) } }
+
+    init {
+        section(
+            KiloBundle.message("settings.context.compaction.title"),
+        ).apply {
+            row(SettingsRow(
+                KiloBundle.message("settings.context.compaction.auto.title"),
+                KiloBundle.message("settings.context.compaction.auto.description"),
+                auto,
+            ))
+            row(SettingsRow(
+                KiloBundle.message("settings.context.compaction.threshold.title"),
+                KiloBundle.message("settings.context.compaction.threshold.description"),
+                Stack.horizontal(UiStyle.Gap.xs())
+                    .next(threshold)
+                    .next(JBLabel(KiloBundle.message("settings.context.compaction.threshold.suffix")))
+                    .align(HAlign.RIGHT, VAlign.CENTER),
+            ))
+            row(SettingsRow(
+                KiloBundle.message("settings.context.compaction.prune.title"),
+                KiloBundle.message("settings.context.compaction.prune.description"),
+                prune,
+            ))
+        }
+        section(
+            KiloBundle.message("settings.context.watcher.title"),
+            KiloBundle.message("settings.context.watcher.description"),
+        ).row(patterns)
+    }
+
+    @RequiresEdt
+    fun sync(draft: ContextDraft, enabled: Boolean) {
+        auto.isSelected = draft.auto
+        prune.isSelected = draft.prune
+        threshold.sync(draft.threshold)
+        patterns.sync(draft.ignore)
+        listOf(auto, prune, threshold, patterns).forEach { it.isEnabled = enabled }
+    }
+}
+
+private class ThresholdField(
+    placeholder: String,
+    private val change: (String) -> Unit,
+) : JBTextField() {
+    private var syncing = false
+
+    init {
+        columns = THRESHOLD_COLUMNS
+        emptyText.text = placeholder
+        (document as AbstractDocument).documentFilter = NumberFilter()
+        document.addDocumentListener(object : DocumentAdapter() {
+            override fun textChanged(e: DocumentEvent) {
+                if (!syncing) change(text)
+            }
+        })
+    }
+
+    fun sync(value: String) {
+        if (text == value) return
+        syncing = true
+        text = value
+        syncing = false
+    }
+}
+
+private class NumberFilter : DocumentFilter() {
+    override fun insertString(fb: FilterBypass, offset: Int, string: String?, attr: AttributeSet?) {
+        replace(fb, offset, 0, string, attr)
+    }
+
+    override fun replace(fb: FilterBypass, offset: Int, length: Int, text: String?, attrs: AttributeSet?) {
+        val value = text ?: ""
+        val next = StringBuilder(fb.document.getText(0, fb.document.length))
+            .replace(offset, offset + length, value)
+            .toString()
+        if (next.isEmpty() || valid(next)) super.replace(fb, offset, length, value, attrs)
+    }
+
+    private fun valid(value: String): Boolean {
+        if (value.count { it == '.' } > 1) return false
+        if (!value.all { it.isDigit() || it == '.' }) return false
+        val num = value.toDoubleOrNull() ?: return false
+        return num >= 0.0 && num <= 100.0
+    }
+}
+
+internal class PatternList(
+    private val change: (List<String>) -> Unit,
+) : Stack(StackAxis.VERTICAL, UiStyle.Gap.sm()) {
+    private val model = CollectionListModel<String>()
+    internal var input: () -> String? = {
+        Messages.showInputDialog(
+            this,
+            KiloBundle.message("settings.context.watcher.input.prompt"),
+            KiloBundle.message("settings.context.watcher.input.title"),
+            null,
+        )
+    }
+    internal var editor: (String) -> String? = { value ->
+        Messages.showInputDialog(
+            this,
+            KiloBundle.message("settings.context.watcher.input.prompt"),
+            KiloBundle.message("settings.context.watcher.title"),
+            null,
+            value,
+            null,
+        )
+    }
+    private val add = HoverIcon().apply {
+        icon = AllIcons.General.Add
+        toolTipText = KiloBundle.message("settings.context.watcher.add")
+        addActionListener { add() }
+    }
+    private val remove = HoverIcon().apply {
+        icon = AllIcons.General.Remove
+        toolTipText = KiloBundle.message("settings.context.watcher.remove")
+        addActionListener { remove() }
+    }
+    private val list = JBList(model).apply {
+        selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION
+        isFocusable = true
+        emptyText.text = KiloBundle.message("settings.context.watcher.empty")
+        cellRenderer = PatternRenderer()
+    }
+    private val toolbar = Stack.horizontal().next(add).next(remove)
+    private val scroll = JBScrollPane(list).apply {
+        border = null
+        viewportBorder = null
+        horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+    }
+
+    init {
+        border = JBUI.Borders.empty(UiStyle.Gap.pad(), 0, UiStyle.Gap.pad(), 0)
+        list.addListSelectionListener { if (!it.valueIsAdjusting) syncActions() }
+        list.addMouseListener(object : MouseAdapter() {
+            override fun mouseClicked(e: MouseEvent) {
+                if (e.clickCount != 2 || !UIUtil.isActionClick(e, MouseEvent.MOUSE_CLICKED, true)) return
+                val idx = list.locationToIndex(e.point)
+                if (idx < 0 || list.getCellBounds(idx, idx)?.contains(e.point) != true) return
+                edit(idx)
+            }
+        })
+        list.registerKeyboardAction(
+            { remove() },
+            javax.swing.KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),
+            JComponent.WHEN_FOCUSED,
+        )
+        ScrollingUtil.installActions(list)
+        next(toolbar.align(HAlign.LEFT, VAlign.CENTER))
+        gap(UiStyle.Gap.sm())
+        next(scroll)
+        syncActions()
+    }
+
+    @RequiresEdt
+    fun sync(values: List<String>) {
+        if (model.items != values) model.replaceAll(values)
+        syncActions()
+    }
+
+    override fun setEnabled(enabled: Boolean) {
+        super.setEnabled(enabled)
+        add.isEnabled = enabled
+        remove.isEnabled = enabled && list.selectedIndices.isNotEmpty()
+        list.isEnabled = enabled
+        scroll.isEnabled = enabled
+        toolbar.isEnabled = enabled
+        syncActions()
+    }
+
+    private fun add() {
+        if (!isEnabled) return
+        val value = input()?.trim().orEmpty()
+        if (value.isBlank()) return
+        val values = model.items.toMutableList()
+        val idx = values.indexOf(value).takeIf { it >= 0 } ?: run {
+            values += value
+            model.replaceAll(values)
+            change(values)
+            values.lastIndex
+        }
+        list.selectedIndex = idx
+        ScrollingUtil.ensureIndexIsVisible(list, idx, 0)
+        syncActions()
+    }
+
+    private fun edit(idx: Int) {
+        if (!isEnabled || idx < 0 || idx >= model.size) return
+        val value = editor(model.getElementAt(idx))?.trim().orEmpty()
+        if (value.isBlank()) return
+        val values = model.items.toMutableList()
+        val found = values.indexOf(value)
+        val next = if (found >= 0 && found != idx) {
+            values.removeAt(idx)
+            if (found > idx) found - 1 else found
+        } else {
+            values[idx] = value
+            idx
+        }
+        model.replaceAll(values)
+        change(values)
+        list.selectedIndex = next
+        ScrollingUtil.ensureIndexIsVisible(list, next, 0)
+        syncActions()
+    }
+
+    private fun remove() {
+        val indices = list.selectedIndices.filter { it >= 0 && it < model.size }
+        if (!isEnabled || indices.isEmpty()) return
+        val values = model.items.toMutableList()
+        indices.sortedDescending().forEach(values::removeAt)
+        model.replaceAll(values)
+        val next = indices.minOrNull()?.coerceAtMost(values.lastIndex) ?: -1
+        if (next >= 0) list.selectedIndex = next else list.clearSelection()
+        change(values)
+        syncActions()
+    }
+
+    private fun syncActions() {
+        add.isEnabled = isEnabled
+        remove.isEnabled = isEnabled && list.selectedIndices.isNotEmpty()
+    }
+
+    private class PatternRenderer : DefaultListCellRenderer() {
+        override fun getListCellRendererComponent(
+            list: JList<*>?,
+            value: Any?,
+            index: Int,
+            selected: Boolean,
+            focus: Boolean,
+        ): java.awt.Component {
+            val comp = super.getListCellRendererComponent(list, value, index, selected, focus) as JComponent
+            comp.border = JBUI.Borders.emptyLeft(JBUI.CurrentTheme.ActionsList.elementIconGap())
+            return comp
+        }
+    }
+}
+
+private fun summary(patch: ConfigPatchDto): String {
+    val parts = listOfNotNull(
+        "watcher".takeIf { patch.watcher != null },
+        "compaction".takeIf { patch.compaction != null },
+    )
+    return parts.joinToString(",").ifEmpty { "none" }
+}
+
+private const val THRESHOLD_COLUMNS = 8
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml b/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml
index d08df1f9f9..a9a427aef4 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/kilo.jetbrains.frontend.xml
@@ -33,7 +33,7 @@
         <applicationConfigurable
                 parentId="ai.kilocode.jetbrains.settings"
                 id="ai.kilocode.jetbrains.settings.profile"
-                groupWeight="4"
+                groupWeight="5"
                 instance="ai.kilocode.client.settings.profile.UserProfileConfigurable"
                 bundle="messages.KiloBundle"
                 key="settings.profile.displayName"/>
@@ -41,7 +41,7 @@
         <applicationConfigurable
                 parentId="ai.kilocode.jetbrains.settings"
                 id="ai.kilocode.jetbrains.settings.models"
-                groupWeight="3"
+                groupWeight="4"
                 instance="ai.kilocode.client.settings.models.ModelsConfigurable"
                 bundle="messages.KiloBundle"
                 key="settings.models.displayName"/>
@@ -62,6 +62,14 @@
                 bundle="messages.KiloBundle"
                 key="settings.agentBehavior.displayName"/>
 
+        <applicationConfigurable
+                parentId="ai.kilocode.jetbrains.settings"
+                id="ai.kilocode.jetbrains.settings.context"
+                groupWeight="0"
+                instance="ai.kilocode.client.settings.context.ContextConfigurable"
+                bundle="messages.KiloBundle"
+                key="settings.context.displayName"/>
+
         <applicationConfigurable
                 parentId="ai.kilocode.jetbrains.settings.agentBehavior"
                 id="ai.kilocode.jetbrains.settings.agentBehavior.agents"
@@ -76,6 +84,13 @@
                 bundle="messages.KiloBundle"
                 key="settings.agentBehavior.mcp.displayName"/>
 
+        <applicationConfigurable
+                parentId="ai.kilocode.jetbrains.settings.agentBehavior"
+                id="ai.kilocode.jetbrains.settings.agentBehavior.skills"
+                instance="ai.kilocode.client.settings.agents.SkillsConfigurable"
+                bundle="messages.KiloBundle"
+                key="settings.agentBehavior.skills.displayName"/>
+
         <registryKey key="kilo.session.condense"
                      description="Enable event condensing in the session update queue (merges redundant snapshots before model delivery)."
                      defaultValue="true"
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
index 07867f4f1f..8725536d49 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle.properties
@@ -1,4 +1,6 @@
 common.delete=Delete
+common.open=Open
+common.save=Save
 session.action.cancel=Cancel
 
 session.connection.connecting=Loading...
@@ -303,6 +305,27 @@ settings.kilo.description=Configure Kilo Code AI coding assistant features and a
 settings.cli.unavailable.title=Kilo Code is not connected
 settings.cli.unavailable.message=Settings are available after Kilo Code connects to Core. If this does not resolve, restart the IDE or Kilo Core and try again.
 settings.models.displayName=Models
+settings.context.displayName=Context
+settings.context.description=Configure context behavior.
+settings.context.save.pending=Saving context settings...
+settings.context.save.failed=Failed to save context settings
+settings.context.compaction.title=Compaction
+settings.context.compaction.auto.title=Auto Compaction
+settings.context.compaction.auto.description=Automatically compact context before it reaches the limit
+settings.context.compaction.threshold.title=Auto Compaction Limit
+settings.context.compaction.threshold.description=Compact when context reaches this percentage of the model window. Leave blank to use the safety buffer only.
+settings.context.compaction.threshold.placeholder=Default
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Enter a number from 0 to 100, or leave the field blank.
+settings.context.compaction.prune.title=Prune Old Outputs
+settings.context.compaction.prune.description=Remove old tool outputs during compaction
+settings.context.watcher.title=File Watcher Ignore Patterns
+settings.context.watcher.description=Glob patterns for files the watcher should ignore
+settings.context.watcher.add=Add pattern
+settings.context.watcher.remove=Remove selected patterns
+settings.context.watcher.empty=No ignore patterns configured.
+settings.context.watcher.input.title=Add ignore pattern
+settings.context.watcher.input.prompt=Enter a glob pattern to ignore:
 settings.providers.displayName=Providers
 settings.agentBehavior.displayName=Agent Behavior
 settings.agentBehavior.description=Configure agents, MCP servers, rules, workflows, and skills.
@@ -436,6 +459,31 @@ settings.agentBehavior.mcp.status.failed=failed
 settings.agentBehavior.mcp.status.needsAuth=needs auth
 settings.agentBehavior.mcp.status.needsRegistration=needs registration
 settings.agentBehavior.mcp.status.disabled=disabled
+settings.agentBehavior.skills.displayName=Skills
+settings.agentBehavior.skills.search=Filter skills
+settings.agentBehavior.skills.empty=No skills found.
+settings.agentBehavior.skills.content.empty=No skill content available.
+settings.agentBehavior.skills.load.timeout=Skill loading timed out. Existing skills were kept; remove slow or unreachable URLs and refresh.
+settings.agentBehavior.skills.reload.deferred=Skills source saved. Reload the core after active sessions finish to apply new skills.
+settings.agentBehavior.skills.reload.blocked=Skills settings saved, but active sessions are present. Reload the core after those sessions finish to apply the new skills.
+settings.agentBehavior.skills.saved.notification=Skills settings saved
+settings.agentBehavior.skills.delete.title=Delete Skill
+settings.agentBehavior.skills.delete.message=Delete skill {0}? This removes the skill file and cannot be undone.
+settings.agentBehavior.skills.delete.failed=Could not delete the skill.
+settings.agentBehavior.skills.openInEditor=Open in Editor
+settings.agentBehavior.skills.openInEditor.pending=The skill file will open after you close Settings.
+settings.agentBehavior.skills.openInEditor.failed=Could not open the skill file in the editor.
+settings.agentBehavior.skills.sources.empty=No skill sources configured.
+settings.agentBehavior.skills.sources.title=Additional Skill Sources
+settings.agentBehavior.skills.sources.add=Add
+settings.agentBehavior.skills.sources.addPath=Add path
+settings.agentBehavior.skills.sources.addPath.title=Add Skill Path
+settings.agentBehavior.skills.sources.addPath.prompt=Choose a folder containing Kilo skills.
+settings.agentBehavior.skills.sources.addUrl=Add URL
+settings.agentBehavior.skills.sources.addUrl.title=Add Skill URL
+settings.agentBehavior.skills.sources.addUrl.prompt=Enter a skill source URL.
+settings.agentBehavior.skills.sources.editPath.title=Edit Skill Path
+settings.agentBehavior.skills.sources.editUrl.title=Edit Skill URL
 settings.providers.loading=Loading providers...
 settings.providers.connected=Connected providers
 settings.providers.available=Available providers
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties
index b2dcd3e748..2601f5bc45 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ar.properties
@@ -1,4 +1,6 @@
 common.delete=حذف
+common.open=فتح
+common.save=حفظ
 session.action.cancel=إلغاء
 session.connection.connecting=جاري التحميل…
 session.connection.error.app=فشل الاتصال
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=لإضافة خادم MCP، اطلب من الوكيل إضافته.
+settings.agentBehavior.skills.displayName=المهارات
+settings.agentBehavior.skills.search=تصفية المهارات
+settings.agentBehavior.skills.empty=لم يتم العثور على مهارات.
+settings.agentBehavior.skills.content.empty=لا يوجد محتوى مهارة متاح.
+settings.agentBehavior.skills.load.timeout=انتهت مهلة تحميل المهارات. تم الاحتفاظ بالمهارات الحالية؛ أزل عناوين URL البطيئة أو غير المتاحة ثم حدّث.
+settings.agentBehavior.skills.reload.deferred=تم حفظ مصدر المهارات. أعد تحميل Core بعد انتهاء الجلسات النشطة لتطبيق المهارات الجديدة.
+settings.agentBehavior.skills.reload.blocked=تم حفظ إعدادات المهارات، لكن توجد جلسات نشطة. أعد تحميل Core بعد انتهاء تلك الجلسات لتطبيق المهارات الجديدة.
+settings.agentBehavior.skills.saved.notification=تم حفظ إعدادات المهارات
+settings.agentBehavior.skills.delete.title=حذف المهارة
+settings.agentBehavior.skills.delete.message=هل تريد حذف المهارة {0}؟ سيؤدي ذلك إلى إزالة ملف المهارة ولا يمكن التراجع عنه.
+settings.agentBehavior.skills.delete.failed=تعذر حذف المهارة.
+settings.agentBehavior.skills.openInEditor=فتح في المحرر
+settings.agentBehavior.skills.openInEditor.pending=سيتم فتح ملف المهارة بعد إغلاق الإعدادات.
+settings.agentBehavior.skills.openInEditor.failed=تعذر فتح ملف المهارة في المحرر.
+settings.agentBehavior.skills.sources.empty=لم يتم تكوين مصادر مهارات.
+settings.agentBehavior.skills.sources.title=مصادر مهارات إضافية
+settings.agentBehavior.skills.sources.add=إضافة
+settings.agentBehavior.skills.sources.addPath=إضافة مسار
+settings.agentBehavior.skills.sources.addPath.title=إضافة مسار مهارات
+settings.agentBehavior.skills.sources.addPath.prompt=اختر مجلداً يحتوي على مهارات Kilo.
+settings.agentBehavior.skills.sources.addUrl=إضافة URL
+settings.agentBehavior.skills.sources.addUrl.title=إضافة URL لمصدر مهارات
+settings.agentBehavior.skills.sources.addUrl.prompt=أدخل URL لمصدر مهارات.
+settings.agentBehavior.skills.sources.editPath.title=تعديل مسار المهارات
+settings.agentBehavior.skills.sources.editUrl.title=تعديل URL المهارات
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one=تم التراجع عن رسالة واحدة
@@ -376,3 +403,26 @@ revert.banner.redo=إعادة
 revert.banner.redo.all=إعادة الكل
 revert.banner.hint=يمكنك إعادة هذه التغييرات حتى ترسل رسالة جديدة
 revert.message.rollback=العودة إلى هذه الرسالة
+
+# Context settings
+settings.context.displayName=السياق
+settings.context.description=تكوين سلوك السياق.
+settings.context.save.pending=جارٍ حفظ إعدادات السياق...
+settings.context.save.failed=فشل حفظ إعدادات السياق
+settings.context.compaction.title=الضغط
+settings.context.compaction.auto.title=ضغط تلقائي
+settings.context.compaction.auto.description=ضغط السياق تلقائياً قبل أن يصل إلى الحد
+settings.context.compaction.threshold.title=حد الضغط التلقائي
+settings.context.compaction.threshold.description=اضغط عندما يصل السياق إلى هذه النسبة المئوية من نافذة النموذج. اتركه فارغاً لاستخدام هامش الأمان فقط.
+settings.context.compaction.threshold.placeholder=افتراضي
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=أدخل رقماً من 0 إلى 100، أو اترك الحقل فارغاً.
+settings.context.compaction.prune.title=تقليم المخرجات القديمة
+settings.context.compaction.prune.description=إزالة مخرجات الأدوات القديمة أثناء الضغط
+settings.context.watcher.title=أنماط تجاهل مراقب الملفات
+settings.context.watcher.description=أنماط glob للملفات التي يجب على المراقب تجاهلها
+settings.context.watcher.add=إضافة نمط
+settings.context.watcher.remove=إزالة الأنماط المحددة
+settings.context.watcher.empty=لم يتم تكوين أنماط تجاهل.
+settings.context.watcher.input.title=إضافة نمط تجاهل
+settings.context.watcher.input.prompt=أدخل نمط glob لتجاهله:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties
index 85a36ca7b9..c2a3fb0f99 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_bs.properties
@@ -1,4 +1,6 @@
 common.delete=Obriši
+common.open=Otvori
+common.save=Sačuvaj
 session.action.cancel=Otkaži
 session.connection.connecting=Učitavanje…
 session.connection.error.app=Greška pri spajanju
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Da dodate MCP server, zamolite agenta da ga doda.
+settings.agentBehavior.skills.displayName=Vještine
+settings.agentBehavior.skills.search=Filtriraj vještine
+settings.agentBehavior.skills.empty=Nema pronađenih vještina.
+settings.agentBehavior.skills.content.empty=Nema dostupnog sadržaja vještine.
+settings.agentBehavior.skills.load.timeout=Učitavanje vještina je isteklo. Postojeće vještine su zadržane; uklonite spore ili nedostupne URL-ove i osvježite.
+settings.agentBehavior.skills.reload.deferred=Izvor vještina je sačuvan. Ponovo učitajte Core nakon što aktivne sesije završe da primijenite nove vještine.
+settings.agentBehavior.skills.reload.blocked=Postavke vještina su sačuvane, ali postoje aktivne sesije. Ponovo učitajte Core nakon što te sesije završe da primijenite nove vještine.
+settings.agentBehavior.skills.saved.notification=Postavke vještina su sačuvane
+settings.agentBehavior.skills.delete.title=Izbriši vještinu
+settings.agentBehavior.skills.delete.message=Izbrisati vještinu {0}? Ovo uklanja datoteku vještine i ne može se poništiti.
+settings.agentBehavior.skills.delete.failed=Nije moguće izbrisati vještinu.
+settings.agentBehavior.skills.openInEditor=Otvori u editoru
+settings.agentBehavior.skills.openInEditor.pending=Datoteka vještine će se otvoriti nakon što zatvorite Postavke.
+settings.agentBehavior.skills.openInEditor.failed=Nije moguće otvoriti datoteku vještine u editoru.
+settings.agentBehavior.skills.sources.empty=Nema konfigurisanih izvora vještina.
+settings.agentBehavior.skills.sources.title=Dodatni izvori vještina
+settings.agentBehavior.skills.sources.add=Dodaj
+settings.agentBehavior.skills.sources.addPath=Dodaj putanju
+settings.agentBehavior.skills.sources.addPath.title=Dodaj putanju vještina
+settings.agentBehavior.skills.sources.addPath.prompt=Odaberite folder koji sadrži Kilo vještine.
+settings.agentBehavior.skills.sources.addUrl=Dodaj URL
+settings.agentBehavior.skills.sources.addUrl.title=Dodaj URL izvora vještina
+settings.agentBehavior.skills.sources.addUrl.prompt=Unesite URL izvora vještina.
+settings.agentBehavior.skills.sources.editPath.title=Uredi putanju vještina
+settings.agentBehavior.skills.sources.editUrl.title=Uredi URL vještina
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} poruka vraćena
@@ -376,3 +403,26 @@ revert.banner.redo=Ponovi
 revert.banner.redo.all=Ponovi sve
 revert.banner.hint=Možete ponoviti ove promjene dok ne pošaljete novu poruku
 revert.message.rollback=Vrati na ovu poruku
+
+# Context settings
+settings.context.displayName=Kontekst
+settings.context.description=Konfigurišite ponašanje konteksta.
+settings.context.save.pending=Spremanje postavki konteksta...
+settings.context.save.failed=Spremanje postavki konteksta nije uspjelo
+settings.context.compaction.title=Kompresija
+settings.context.compaction.auto.title=Automatska kompresija
+settings.context.compaction.auto.description=Automatski komprimiraj kontekst prije nego dostigne limit
+settings.context.compaction.threshold.title=Limit automatske kompresije
+settings.context.compaction.threshold.description=Komprimiraj kada kontekst dostigne ovaj procenat prozora modela. Ostavite prazno da koristite samo sigurnosnu rezervu.
+settings.context.compaction.threshold.placeholder=Zadano
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Unesite broj od 0 do 100 ili ostavite polje prazno.
+settings.context.compaction.prune.title=Očisti stare izlaze
+settings.context.compaction.prune.description=Ukloni stare izlaze alata tokom kompresije
+settings.context.watcher.title=Uzorci ignoriranja za promatrač datoteka
+settings.context.watcher.description=Glob uzorci za datoteke koje promatrač treba ignorirati
+settings.context.watcher.add=Dodaj uzorak
+settings.context.watcher.remove=Ukloni odabrane uzorke
+settings.context.watcher.empty=Nema konfigurisanih uzoraka za ignoriranje.
+settings.context.watcher.input.title=Dodaj uzorak za ignoriranje
+settings.context.watcher.input.prompt=Unesite glob uzorak za ignoriranje:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties
index 5247615f46..1f3bef7a96 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_da.properties
@@ -1,4 +1,6 @@
 common.delete=Slet
+common.open=Åbn
+common.save=Gem
 session.action.cancel=Annuller
 session.connection.connecting=Indlæser…
 session.connection.error.app=Forbindelsesfejl
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=For at tilføje en MCP-server skal du bede agenten om at gøre det.
+settings.agentBehavior.skills.displayName=Færdigheder
+settings.agentBehavior.skills.search=Filtrer færdigheder
+settings.agentBehavior.skills.empty=Ingen færdigheder fundet.
+settings.agentBehavior.skills.content.empty=Intet færdighedsindhold tilgængeligt.
+settings.agentBehavior.skills.load.timeout=Indlæsning af færdigheder fik timeout. Eksisterende færdigheder blev bevaret; fjern langsomme eller utilgængelige URL'er og opdater.
+settings.agentBehavior.skills.reload.deferred=Færdighedskilden blev gemt. Genindlæs Core, når aktive sessioner er afsluttet, for at anvende nye færdigheder.
+settings.agentBehavior.skills.reload.blocked=Færdighedsindstillingerne blev gemt, men der er aktive sessioner. Genindlæs Core, når disse sessioner er afsluttet, for at anvende de nye færdigheder.
+settings.agentBehavior.skills.saved.notification=Færdighedsindstillinger gemt
+settings.agentBehavior.skills.delete.title=Slet færdighed
+settings.agentBehavior.skills.delete.message=Slet færdigheden {0}? Dette fjerner færdighedsfilen og kan ikke fortrydes.
+settings.agentBehavior.skills.delete.failed=Kunne ikke slette færdigheden.
+settings.agentBehavior.skills.openInEditor=Åbn i editor
+settings.agentBehavior.skills.openInEditor.pending=Færdighedsfilen åbnes, når du lukker Indstillinger.
+settings.agentBehavior.skills.openInEditor.failed=Kunne ikke åbne færdighedsfilen i editoren.
+settings.agentBehavior.skills.sources.empty=Ingen færdighedskilder konfigureret.
+settings.agentBehavior.skills.sources.title=Yderligere færdighedskilder
+settings.agentBehavior.skills.sources.add=Tilføj
+settings.agentBehavior.skills.sources.addPath=Tilføj sti
+settings.agentBehavior.skills.sources.addPath.title=Tilføj færdighedssti
+settings.agentBehavior.skills.sources.addPath.prompt=Vælg en mappe, der indeholder Kilo-færdigheder.
+settings.agentBehavior.skills.sources.addUrl=Tilføj URL
+settings.agentBehavior.skills.sources.addUrl.title=Tilføj URL til færdighedskilde
+settings.agentBehavior.skills.sources.addUrl.prompt=Indtast en URL til en færdighedskilde.
+settings.agentBehavior.skills.sources.editPath.title=Rediger færdighedssti
+settings.agentBehavior.skills.sources.editUrl.title=Rediger færdigheds-URL
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} besked rullet tilbage
@@ -376,3 +403,26 @@ revert.banner.redo=Gentag
 revert.banner.redo.all=Gentag alle
 revert.banner.hint=Du kan gentage disse ændringer, indtil du sender en ny besked
 revert.message.rollback=Rul tilbage til denne besked
+
+# Context settings
+settings.context.displayName=Kontekst
+settings.context.description=Konfigurer kontekstadfærd.
+settings.context.save.pending=Gemmer kontekstindstillinger...
+settings.context.save.failed=Kunne ikke gemme kontekstindstillinger
+settings.context.compaction.title=Komprimering
+settings.context.compaction.auto.title=Automatisk komprimering
+settings.context.compaction.auto.description=Komprimér automatisk kontekst, før den når grænsen
+settings.context.compaction.threshold.title=Grænse for automatisk komprimering
+settings.context.compaction.threshold.description=Komprimér, når konteksten når denne procentdel af modelvinduet. Lad feltet være tomt for kun at bruge sikkerhedsbufferen.
+settings.context.compaction.threshold.placeholder=Standard
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Indtast et tal fra 0 til 100, eller lad feltet være tomt.
+settings.context.compaction.prune.title=Fjern gamle output
+settings.context.compaction.prune.description=Fjern gamle værktøjsoutput under komprimering
+settings.context.watcher.title=Filvagt-ignormønstre
+settings.context.watcher.description=Glob-mønstre for filer, som vagten skal ignorere
+settings.context.watcher.add=Tilføj mønster
+settings.context.watcher.remove=Fjern valgte mønstre
+settings.context.watcher.empty=Ingen ignormønstre konfigureret.
+settings.context.watcher.input.title=Tilføj ignormønster
+settings.context.watcher.input.prompt=Indtast et glob-mønster, der skal ignoreres:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties
index 7a3434f0b2..2a90dd975b 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_de.properties
@@ -1,4 +1,6 @@
 common.delete=Löschen
+common.open=Öffnen
+common.save=Speichern
 session.action.cancel=Abbrechen
 session.connection.connecting=Wird geladen…
 session.connection.error.app=Verbindung fehlgeschlagen
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Um einen MCP-Server hinzuzufügen, bitten Sie den Agenten darum.
+settings.agentBehavior.skills.displayName=Skills
+settings.agentBehavior.skills.search=Skills filtern
+settings.agentBehavior.skills.empty=Keine Skills gefunden.
+settings.agentBehavior.skills.content.empty=Keine Skill-Inhalte verfügbar.
+settings.agentBehavior.skills.load.timeout=Das Laden der Skills ist abgelaufen. Vorhandene Skills wurden beibehalten; entfernen Sie langsame oder nicht erreichbare URLs und aktualisieren Sie.
+settings.agentBehavior.skills.reload.deferred=Skill-Quelle gespeichert. Laden Sie Core neu, nachdem aktive Sitzungen beendet sind, um neue Skills anzuwenden.
+settings.agentBehavior.skills.reload.blocked=Skill-Einstellungen gespeichert, aber es sind aktive Sitzungen vorhanden. Laden Sie Core neu, nachdem diese Sitzungen beendet sind, um neue Skills anzuwenden.
+settings.agentBehavior.skills.saved.notification=Skill-Einstellungen gespeichert
+settings.agentBehavior.skills.delete.title=Skill löschen
+settings.agentBehavior.skills.delete.message=Skill {0} löschen? Dadurch wird die Skill-Datei entfernt und kann nicht rückgängig gemacht werden.
+settings.agentBehavior.skills.delete.failed=Der Skill konnte nicht gelöscht werden.
+settings.agentBehavior.skills.openInEditor=Im Editor öffnen
+settings.agentBehavior.skills.openInEditor.pending=Die Skill-Datei wird geöffnet, nachdem Sie die Einstellungen geschlossen haben.
+settings.agentBehavior.skills.openInEditor.failed=Die Skill-Datei konnte nicht im Editor geöffnet werden.
+settings.agentBehavior.skills.sources.empty=Keine Skill-Quellen konfiguriert.
+settings.agentBehavior.skills.sources.title=Zusätzliche Skill-Quellen
+settings.agentBehavior.skills.sources.add=Hinzufügen
+settings.agentBehavior.skills.sources.addPath=Pfad hinzufügen
+settings.agentBehavior.skills.sources.addPath.title=Skill-Pfad hinzufügen
+settings.agentBehavior.skills.sources.addPath.prompt=Wählen Sie einen Ordner mit Kilo-Skills aus.
+settings.agentBehavior.skills.sources.addUrl=URL hinzufügen
+settings.agentBehavior.skills.sources.addUrl.title=Skill-Quellen-URL hinzufügen
+settings.agentBehavior.skills.sources.addUrl.prompt=Geben Sie eine Skill-Quellen-URL ein.
+settings.agentBehavior.skills.sources.editPath.title=Skill-Pfad bearbeiten
+settings.agentBehavior.skills.sources.editUrl.title=Skill-URL bearbeiten
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} Nachricht zurückgesetzt
@@ -376,3 +403,26 @@ revert.banner.redo=Wiederholen
 revert.banner.redo.all=Alle wiederholen
 revert.banner.hint=Du kannst diese Änderungen wiederholen, bis du eine neue Nachricht sendest
 revert.message.rollback=Auf diese Nachricht zurücksetzen
+
+# Context settings
+settings.context.displayName=Kontext
+settings.context.description=Kontextverhalten konfigurieren.
+settings.context.save.pending=Kontexteinstellungen werden gespeichert...
+settings.context.save.failed=Kontexteinstellungen konnten nicht gespeichert werden
+settings.context.compaction.title=Komprimierung
+settings.context.compaction.auto.title=Automatische Komprimierung
+settings.context.compaction.auto.description=Kontext automatisch komprimieren, bevor er das Limit erreicht
+settings.context.compaction.threshold.title=Limit für automatische Komprimierung
+settings.context.compaction.threshold.description=Komprimieren, wenn der Kontext diesen Prozentsatz des Modellfensters erreicht. Leer lassen, um nur den Sicherheitspuffer zu verwenden.
+settings.context.compaction.threshold.placeholder=Standard
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Geben Sie eine Zahl von 0 bis 100 ein oder lassen Sie das Feld leer.
+settings.context.compaction.prune.title=Alte Ausgaben bereinigen
+settings.context.compaction.prune.description=Alte Werkzeugausgaben während der Komprimierung entfernen
+settings.context.watcher.title=Datei-Watcher-Ignorierungsmuster
+settings.context.watcher.description=Glob-Muster für Dateien, die der Watcher ignorieren soll
+settings.context.watcher.add=Muster hinzufügen
+settings.context.watcher.remove=Ausgewählte Muster entfernen
+settings.context.watcher.empty=Keine Ignorierungsmuster konfiguriert.
+settings.context.watcher.input.title=Ignorierungsmuster hinzufügen
+settings.context.watcher.input.prompt=Glob-Muster zum Ignorieren eingeben:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties
index ced3ac3fc4..0420df99bd 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_es.properties
@@ -1,4 +1,6 @@
 common.delete=Eliminar
+common.open=Abrir
+common.save=Guardar
 session.action.cancel=Cancelar
 session.connection.connecting=Cargando…
 session.connection.error.app=Error de conexión
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Para agregar un servidor MCP, pídele al agente que lo haga.
+settings.agentBehavior.skills.displayName=Habilidades
+settings.agentBehavior.skills.search=Filtrar habilidades
+settings.agentBehavior.skills.empty=No se encontraron habilidades.
+settings.agentBehavior.skills.content.empty=No hay contenido de habilidad disponible.
+settings.agentBehavior.skills.load.timeout=Se agotó el tiempo de carga de habilidades. Se conservaron las habilidades existentes; elimina las URL lentas o inaccesibles y actualiza.
+settings.agentBehavior.skills.reload.deferred=Fuente de habilidades guardada. Recarga Core cuando terminen las sesiones activas para aplicar nuevas habilidades.
+settings.agentBehavior.skills.reload.blocked=Configuración de habilidades guardada, pero hay sesiones activas. Recarga Core cuando esas sesiones terminen para aplicar las nuevas habilidades.
+settings.agentBehavior.skills.saved.notification=Configuración de habilidades guardada
+settings.agentBehavior.skills.delete.title=Eliminar habilidad
+settings.agentBehavior.skills.delete.message=¿Eliminar la habilidad {0}? Esto elimina el archivo de la habilidad y no se puede deshacer.
+settings.agentBehavior.skills.delete.failed=No se pudo eliminar la habilidad.
+settings.agentBehavior.skills.openInEditor=Abrir en el editor
+settings.agentBehavior.skills.openInEditor.pending=El archivo de la habilidad se abrirá después de cerrar Configuración.
+settings.agentBehavior.skills.openInEditor.failed=No se pudo abrir el archivo de la habilidad en el editor.
+settings.agentBehavior.skills.sources.empty=No hay fuentes de habilidades configuradas.
+settings.agentBehavior.skills.sources.title=Fuentes de habilidades adicionales
+settings.agentBehavior.skills.sources.add=Agregar
+settings.agentBehavior.skills.sources.addPath=Agregar ruta
+settings.agentBehavior.skills.sources.addPath.title=Agregar ruta de habilidades
+settings.agentBehavior.skills.sources.addPath.prompt=Elige una carpeta que contenga habilidades de Kilo.
+settings.agentBehavior.skills.sources.addUrl=Agregar URL
+settings.agentBehavior.skills.sources.addUrl.title=Agregar URL de fuente de habilidades
+settings.agentBehavior.skills.sources.addUrl.prompt=Introduce una URL de fuente de habilidades.
+settings.agentBehavior.skills.sources.editPath.title=Editar ruta de habilidades
+settings.agentBehavior.skills.sources.editUrl.title=Editar URL de habilidades
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} mensaje revertido
@@ -376,3 +403,26 @@ revert.banner.redo=Rehacer
 revert.banner.redo.all=Rehacer todo
 revert.banner.hint=Puedes rehacer estos cambios hasta que envíes un mensaje nuevo
 revert.message.rollback=Revertir a este mensaje
+
+# Context settings
+settings.context.displayName=Contexto
+settings.context.description=Configura el comportamiento del contexto.
+settings.context.save.pending=Guardando configuración de contexto...
+settings.context.save.failed=Error al guardar la configuración de contexto
+settings.context.compaction.title=Compactación
+settings.context.compaction.auto.title=Compactación automática
+settings.context.compaction.auto.description=Compactar automáticamente el contexto antes de que alcance el límite
+settings.context.compaction.threshold.title=Límite de compactación automática
+settings.context.compaction.threshold.description=Compactar cuando el contexto alcance este porcentaje de la ventana del modelo. Déjalo en blanco para usar solo el búfer de seguridad.
+settings.context.compaction.threshold.placeholder=Predeterminado
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Introduce un número de 0 a 100 o deja el campo en blanco.
+settings.context.compaction.prune.title=Eliminar salidas antiguas
+settings.context.compaction.prune.description=Eliminar salidas de herramientas antiguas durante la compactación
+settings.context.watcher.title=Patrones de ignorar del observador
+settings.context.watcher.description=Patrones glob para archivos que el observador debe ignorar
+settings.context.watcher.add=Agregar patrón
+settings.context.watcher.remove=Eliminar patrones seleccionados
+settings.context.watcher.empty=No hay patrones de ignorar configurados.
+settings.context.watcher.input.title=Agregar patrón de ignorar
+settings.context.watcher.input.prompt=Introduce un patrón glob para ignorar:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties
index 9fe242ab46..167ce1f7e7 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_fr.properties
@@ -1,4 +1,6 @@
 common.delete=Supprimer
+common.open=Ouvrir
+common.save=Enregistrer
 session.action.cancel=Annuler
 session.connection.connecting=Chargement…
 session.connection.error.app=Échec de la connexion
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Pour ajouter un serveur MCP, demandez à l’agent de le faire.
+settings.agentBehavior.skills.displayName=Compétences
+settings.agentBehavior.skills.search=Filtrer les compétences
+settings.agentBehavior.skills.empty=Aucune compétence trouvée.
+settings.agentBehavior.skills.content.empty=Aucun contenu de compétence disponible.
+settings.agentBehavior.skills.load.timeout=Le chargement des compétences a expiré. Les compétences existantes ont été conservées ; supprimez les URL lentes ou inaccessibles puis actualisez.
+settings.agentBehavior.skills.reload.deferred=Source de compétences enregistrée. Rechargez Core après la fin des sessions actives pour appliquer les nouvelles compétences.
+settings.agentBehavior.skills.reload.blocked=Paramètres des compétences enregistrés, mais des sessions sont actives. Rechargez Core après la fin de ces sessions pour appliquer les nouvelles compétences.
+settings.agentBehavior.skills.saved.notification=Paramètres des compétences enregistrés
+settings.agentBehavior.skills.delete.title=Supprimer la compétence
+settings.agentBehavior.skills.delete.message=Supprimer la compétence {0} ? Cela supprime le fichier de compétence et ne peut pas être annulé.
+settings.agentBehavior.skills.delete.failed=Impossible de supprimer la compétence.
+settings.agentBehavior.skills.openInEditor=Ouvrir dans l’éditeur
+settings.agentBehavior.skills.openInEditor.pending=Le fichier de compétence s’ouvrira après la fermeture des paramètres.
+settings.agentBehavior.skills.openInEditor.failed=Impossible d’ouvrir le fichier de compétence dans l’éditeur.
+settings.agentBehavior.skills.sources.empty=Aucune source de compétences configurée.
+settings.agentBehavior.skills.sources.title=Sources de compétences supplémentaires
+settings.agentBehavior.skills.sources.add=Ajouter
+settings.agentBehavior.skills.sources.addPath=Ajouter un chemin
+settings.agentBehavior.skills.sources.addPath.title=Ajouter un chemin de compétences
+settings.agentBehavior.skills.sources.addPath.prompt=Choisissez un dossier contenant des compétences Kilo.
+settings.agentBehavior.skills.sources.addUrl=Ajouter une URL
+settings.agentBehavior.skills.sources.addUrl.title=Ajouter une URL de source de compétences
+settings.agentBehavior.skills.sources.addUrl.prompt=Saisissez une URL de source de compétences.
+settings.agentBehavior.skills.sources.editPath.title=Modifier le chemin des compétences
+settings.agentBehavior.skills.sources.editUrl.title=Modifier l’URL des compétences
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} message annulé
@@ -376,3 +403,26 @@ revert.banner.redo=Rétablir
 revert.banner.redo.all=Tout rétablir
 revert.banner.hint=Vous pouvez rétablir ces modifications jusqu'à l'envoi d'un nouveau message
 revert.message.rollback=Revenir à ce message
+
+# Context settings
+settings.context.displayName=Contexte
+settings.context.description=Configurer le comportement du contexte.
+settings.context.save.pending=Enregistrement des paramètres de contexte...
+settings.context.save.failed=Échec de l’enregistrement des paramètres de contexte
+settings.context.compaction.title=Compactage
+settings.context.compaction.auto.title=Compaction automatique
+settings.context.compaction.auto.description=Compacter automatiquement le contexte avant qu’il n’atteigne la limite
+settings.context.compaction.threshold.title=Limite de compactage automatique
+settings.context.compaction.threshold.description=Compacter lorsque le contexte atteint ce pourcentage de la fenêtre du modèle. Laissez vide pour utiliser uniquement la marge de sécurité.
+settings.context.compaction.threshold.placeholder=Par défaut
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Saisissez un nombre de 0 à 100, ou laissez le champ vide.
+settings.context.compaction.prune.title=Élaguer les anciennes sorties
+settings.context.compaction.prune.description=Supprimer les anciennes sorties d’outils pendant la compaction
+settings.context.watcher.title=Motifs d’ignorance de l’observateur
+settings.context.watcher.description=Motifs glob pour les fichiers que l’observateur doit ignorer
+settings.context.watcher.add=Ajouter un motif
+settings.context.watcher.remove=Supprimer les motifs sélectionnés
+settings.context.watcher.empty=Aucun motif d’ignorance configuré.
+settings.context.watcher.input.title=Ajouter un motif d’ignorance
+settings.context.watcher.input.prompt=Saisissez un motif glob à ignorer :
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties
index 6d0a77f804..1f565cda82 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ja.properties
@@ -1,4 +1,6 @@
 common.delete=削除
+common.open=開く
+common.save=保存
 session.action.cancel=キャンセル
 session.connection.connecting=読み込み中…
 session.connection.error.app=接続に失敗しました
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=MCPサーバーを追加するには、エージェントに依頼してください。
+settings.agentBehavior.skills.displayName=スキル
+settings.agentBehavior.skills.search=スキルを絞り込み
+settings.agentBehavior.skills.empty=スキルが見つかりません。
+settings.agentBehavior.skills.content.empty=利用可能なスキル内容がありません。
+settings.agentBehavior.skills.load.timeout=スキルの読み込みがタイムアウトしました。既存のスキルは保持されました。遅い、または到達不能な URL を削除して更新してください。
+settings.agentBehavior.skills.reload.deferred=スキルソースを保存しました。新しいスキルを適用するには、アクティブなセッションが終了した後に Core を再読み込みしてください。
+settings.agentBehavior.skills.reload.blocked=スキル設定を保存しましたが、アクティブなセッションがあります。新しいスキルを適用するには、それらのセッションが終了した後に Core を再読み込みしてください。
+settings.agentBehavior.skills.saved.notification=スキル設定を保存しました
+settings.agentBehavior.skills.delete.title=スキルを削除
+settings.agentBehavior.skills.delete.message=スキル {0} を削除しますか？スキルファイルが削除され、この操作は元に戻せません。
+settings.agentBehavior.skills.delete.failed=スキルを削除できませんでした。
+settings.agentBehavior.skills.openInEditor=エディターで開く
+settings.agentBehavior.skills.openInEditor.pending=設定を閉じるとスキルファイルが開きます。
+settings.agentBehavior.skills.openInEditor.failed=エディターでスキルファイルを開けませんでした。
+settings.agentBehavior.skills.sources.empty=スキルソースが設定されていません。
+settings.agentBehavior.skills.sources.title=追加のスキルソース
+settings.agentBehavior.skills.sources.add=追加
+settings.agentBehavior.skills.sources.addPath=パスを追加
+settings.agentBehavior.skills.sources.addPath.title=スキルパスを追加
+settings.agentBehavior.skills.sources.addPath.prompt=Kilo スキルを含むフォルダーを選択してください。
+settings.agentBehavior.skills.sources.addUrl=URL を追加
+settings.agentBehavior.skills.sources.addUrl.title=スキルソース URL を追加
+settings.agentBehavior.skills.sources.addUrl.prompt=スキルソース URL を入力してください。
+settings.agentBehavior.skills.sources.editPath.title=スキルパスを編集
+settings.agentBehavior.skills.sources.editUrl.title=スキル URL を編集
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} 件のメッセージをロールバックしました
@@ -376,3 +403,26 @@ revert.banner.redo=やり直し
 revert.banner.redo.all=すべてやり直し
 revert.banner.hint=新しいメッセージを送信するまで、これらの変更をやり直せます
 revert.message.rollback=このメッセージまでロールバック
+
+# Context settings
+settings.context.displayName=コンテキスト
+settings.context.description=コンテキストの動作を設定します。
+settings.context.save.pending=コンテキスト設定を保存しています...
+settings.context.save.failed=コンテキスト設定の保存に失敗しました
+settings.context.compaction.title=圧縮
+settings.context.compaction.auto.title=自動圧縮
+settings.context.compaction.auto.description=コンテキストが上限に達する前に自動的に圧縮
+settings.context.compaction.threshold.title=自動圧縮の上限
+settings.context.compaction.threshold.description=コンテキストがモデルウィンドウのこの割合に達したら圧縮します。安全バッファーのみを使用するには空欄のままにしてください。
+settings.context.compaction.threshold.placeholder=デフォルト
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=0から100までの数値を入力するか、空欄のままにしてください。
+settings.context.compaction.prune.title=古い出力を削除
+settings.context.compaction.prune.description=圧縮時に古いツール出力を削除
+settings.context.watcher.title=ファイルウォッチャー無視パターン
+settings.context.watcher.description=ウォッチャーが無視すべきファイルのglobパターン
+settings.context.watcher.add=パターンを追加
+settings.context.watcher.remove=選択したパターンを削除
+settings.context.watcher.empty=無視パターンは設定されていません。
+settings.context.watcher.input.title=無視パターンを追加
+settings.context.watcher.input.prompt=無視するglobパターンを入力してください:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties
index 9f085b0099..aba7a33791 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ko.properties
@@ -1,4 +1,6 @@
 common.delete=삭제
+common.open=열기
+common.save=저장
 session.action.cancel=취소
 session.connection.connecting=로딩 중…
 session.connection.error.app=연결 실패
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=MCP 서버를 추가하려면 에이전트에게 요청하세요.
+settings.agentBehavior.skills.displayName=스킬
+settings.agentBehavior.skills.search=스킬 필터링
+settings.agentBehavior.skills.empty=스킬을 찾을 수 없습니다.
+settings.agentBehavior.skills.content.empty=사용 가능한 스킬 내용이 없습니다.
+settings.agentBehavior.skills.load.timeout=스킬 로드 시간이 초과되었습니다. 기존 스킬은 유지되었습니다. 느리거나 연결할 수 없는 URL을 제거한 뒤 새로 고치세요.
+settings.agentBehavior.skills.reload.deferred=스킬 소스가 저장되었습니다. 새 스킬을 적용하려면 활성 세션이 끝난 뒤 Core를 다시 로드하세요.
+settings.agentBehavior.skills.reload.blocked=스킬 설정이 저장되었지만 활성 세션이 있습니다. 새 스킬을 적용하려면 해당 세션이 끝난 뒤 Core를 다시 로드하세요.
+settings.agentBehavior.skills.saved.notification=스킬 설정이 저장되었습니다
+settings.agentBehavior.skills.delete.title=스킬 삭제
+settings.agentBehavior.skills.delete.message=스킬 {0}을 삭제할까요? 스킬 파일이 제거되며 되돌릴 수 없습니다.
+settings.agentBehavior.skills.delete.failed=스킬을 삭제할 수 없습니다.
+settings.agentBehavior.skills.openInEditor=에디터에서 열기
+settings.agentBehavior.skills.openInEditor.pending=설정을 닫으면 스킬 파일이 열립니다.
+settings.agentBehavior.skills.openInEditor.failed=에디터에서 스킬 파일을 열 수 없습니다.
+settings.agentBehavior.skills.sources.empty=구성된 스킬 소스가 없습니다.
+settings.agentBehavior.skills.sources.title=추가 스킬 소스
+settings.agentBehavior.skills.sources.add=추가
+settings.agentBehavior.skills.sources.addPath=경로 추가
+settings.agentBehavior.skills.sources.addPath.title=스킬 경로 추가
+settings.agentBehavior.skills.sources.addPath.prompt=Kilo 스킬이 포함된 폴더를 선택하세요.
+settings.agentBehavior.skills.sources.addUrl=URL 추가
+settings.agentBehavior.skills.sources.addUrl.title=스킬 소스 URL 추가
+settings.agentBehavior.skills.sources.addUrl.prompt=스킬 소스 URL을 입력하세요.
+settings.agentBehavior.skills.sources.editPath.title=스킬 경로 편집
+settings.agentBehavior.skills.sources.editUrl.title=스킬 URL 편집
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0}개 메시지가 롤백됨
@@ -376,3 +403,26 @@ revert.banner.redo=다시 실행
 revert.banner.redo.all=모두 다시 실행
 revert.banner.hint=새 메시지를 보내기 전까지 이 변경 사항을 다시 실행할 수 있습니다
 revert.message.rollback=이 메시지로 롤백
+
+# Context settings
+settings.context.displayName=컨텍스트
+settings.context.description=컨텍스트 동작을 구성합니다.
+settings.context.save.pending=컨텍스트 설정 저장 중...
+settings.context.save.failed=컨텍스트 설정을 저장하지 못했습니다
+settings.context.compaction.title=압축
+settings.context.compaction.auto.title=자동 압축
+settings.context.compaction.auto.description=컨텍스트가 한도에 도달하기 전에 자동으로 압축
+settings.context.compaction.threshold.title=자동 압축 한도
+settings.context.compaction.threshold.description=컨텍스트가 모델 창의 이 비율에 도달하면 압축합니다. 안전 버퍼만 사용하려면 비워 두세요.
+settings.context.compaction.threshold.placeholder=기본값
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=0에서 100 사이의 숫자를 입력하거나 필드를 비워 두세요.
+settings.context.compaction.prune.title=이전 출력 정리
+settings.context.compaction.prune.description=압축 중 이전 도구 출력 제거
+settings.context.watcher.title=파일 감시자 무시 패턴
+settings.context.watcher.description=감시자가 무시해야 할 파일의 글로브 패턴
+settings.context.watcher.add=패턴 추가
+settings.context.watcher.remove=선택한 패턴 제거
+settings.context.watcher.empty=구성된 무시 패턴이 없습니다.
+settings.context.watcher.input.title=무시 패턴 추가
+settings.context.watcher.input.prompt=무시할 glob 패턴을 입력하세요:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties
index 5f18710f4f..f67e77ddbe 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_nl.properties
@@ -1,4 +1,6 @@
 common.delete=Verwijderen
+common.open=Openen
+common.save=Opslaan
 session.action.cancel=Annuleren
 session.connection.connecting=Laden…
 session.connection.error.app=Verbinding mislukt
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Vraag de agent om een MCP-server toe te voegen.
+settings.agentBehavior.skills.displayName=Vaardigheden
+settings.agentBehavior.skills.search=Vaardigheden filteren
+settings.agentBehavior.skills.empty=Geen vaardigheden gevonden.
+settings.agentBehavior.skills.content.empty=Geen vaardigheidsinhoud beschikbaar.
+settings.agentBehavior.skills.load.timeout=Het laden van vaardigheden is verlopen. Bestaande vaardigheden zijn behouden; verwijder trage of onbereikbare URL’s en vernieuw.
+settings.agentBehavior.skills.reload.deferred=Vaardigheidsbron opgeslagen. Laad Core opnieuw nadat actieve sessies zijn voltooid om nieuwe vaardigheden toe te passen.
+settings.agentBehavior.skills.reload.blocked=Vaardigheidsinstellingen opgeslagen, maar er zijn actieve sessies. Laad Core opnieuw nadat die sessies zijn voltooid om de nieuwe vaardigheden toe te passen.
+settings.agentBehavior.skills.saved.notification=Vaardigheidsinstellingen opgeslagen
+settings.agentBehavior.skills.delete.title=Vaardigheid verwijderen
+settings.agentBehavior.skills.delete.message=Vaardigheid {0} verwijderen? Dit verwijdert het vaardigheidsbestand en kan niet ongedaan worden gemaakt.
+settings.agentBehavior.skills.delete.failed=Kon de vaardigheid niet verwijderen.
+settings.agentBehavior.skills.openInEditor=Openen in editor
+settings.agentBehavior.skills.openInEditor.pending=Het vaardigheidsbestand wordt geopend nadat u Instellingen sluit.
+settings.agentBehavior.skills.openInEditor.failed=Kon het vaardigheidsbestand niet openen in de editor.
+settings.agentBehavior.skills.sources.empty=Geen vaardigheidsbronnen geconfigureerd.
+settings.agentBehavior.skills.sources.title=Extra vaardigheidsbronnen
+settings.agentBehavior.skills.sources.add=Toevoegen
+settings.agentBehavior.skills.sources.addPath=Pad toevoegen
+settings.agentBehavior.skills.sources.addPath.title=Vaardigheidspad toevoegen
+settings.agentBehavior.skills.sources.addPath.prompt=Kies een map met Kilo-vaardigheden.
+settings.agentBehavior.skills.sources.addUrl=URL toevoegen
+settings.agentBehavior.skills.sources.addUrl.title=URL van vaardigheidsbron toevoegen
+settings.agentBehavior.skills.sources.addUrl.prompt=Voer een URL van een vaardigheidsbron in.
+settings.agentBehavior.skills.sources.editPath.title=Vaardigheidspad bewerken
+settings.agentBehavior.skills.sources.editUrl.title=Vaardigheids-URL bewerken
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} bericht teruggedraaid
@@ -376,3 +403,26 @@ revert.banner.redo=Opnieuw uitvoeren
 revert.banner.redo.all=Alles opnieuw uitvoeren
 revert.banner.hint=Je kunt deze wijzigingen opnieuw uitvoeren totdat je een nieuw bericht verstuurt
 revert.message.rollback=Terugdraaien naar dit bericht
+
+# Context settings
+settings.context.displayName=Context
+settings.context.description=Contextgedrag configureren.
+settings.context.save.pending=Contextinstellingen opslaan...
+settings.context.save.failed=Contextinstellingen opslaan mislukt
+settings.context.compaction.title=Compactie
+settings.context.compaction.auto.title=Automatische Compactie
+settings.context.compaction.auto.description=Context automatisch compacteren voordat deze de limiet bereikt
+settings.context.compaction.threshold.title=Limiet voor automatisch compacteren
+settings.context.compaction.threshold.description=Compacteer wanneer de context dit percentage van het modelvenster bereikt. Laat leeg om alleen de veiligheidsbuffer te gebruiken.
+settings.context.compaction.threshold.placeholder=Standaard
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Voer een getal van 0 tot 100 in, of laat het veld leeg.
+settings.context.compaction.prune.title=Oude Uitvoer Opschonen
+settings.context.compaction.prune.description=Verwijder oude tool uitvoer tijdens compactie
+settings.context.watcher.title=File Watcher Negeer Patronen
+settings.context.watcher.description=Glob-patronen voor bestanden die de watcher moet negeren
+settings.context.watcher.add=Patroon toevoegen
+settings.context.watcher.remove=Geselecteerde patronen verwijderen
+settings.context.watcher.empty=Geen negeerpatronen geconfigureerd.
+settings.context.watcher.input.title=Negeerpatroon toevoegen
+settings.context.watcher.input.prompt=Voer een glob-patroon in om te negeren:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties
index 1f5e95dceb..d59c23c209 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_no.properties
@@ -1,4 +1,6 @@
 common.delete=Slett
+common.open=Åpne
+common.save=Lagre
 session.action.cancel=Avbryt
 session.connection.connecting=Laster…
 session.connection.error.app=Tilkoblingsfeil
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Be agenten om å legge til en MCP-server.
+settings.agentBehavior.skills.displayName=Ferdigheter
+settings.agentBehavior.skills.search=Filtrer ferdigheter
+settings.agentBehavior.skills.empty=Ingen ferdigheter funnet.
+settings.agentBehavior.skills.content.empty=Ingen ferdighetsinnhold tilgjengelig.
+settings.agentBehavior.skills.load.timeout=Innlasting av ferdigheter tidsavbrutt. Eksisterende ferdigheter ble beholdt; fjern trege eller utilgjengelige URL-er og oppdater.
+settings.agentBehavior.skills.reload.deferred=Ferdighetskilden ble lagret. Last Core på nytt etter at aktive økter er ferdige for å bruke nye ferdigheter.
+settings.agentBehavior.skills.reload.blocked=Ferdighetsinnstillinger ble lagret, men det finnes aktive økter. Last Core på nytt etter at disse øktene er ferdige for å bruke de nye ferdighetene.
+settings.agentBehavior.skills.saved.notification=Ferdighetsinnstillinger lagret
+settings.agentBehavior.skills.delete.title=Slett ferdighet
+settings.agentBehavior.skills.delete.message=Slette ferdigheten {0}? Dette fjerner ferdighetsfilen og kan ikke angres.
+settings.agentBehavior.skills.delete.failed=Kunne ikke slette ferdigheten.
+settings.agentBehavior.skills.openInEditor=Åpne i editor
+settings.agentBehavior.skills.openInEditor.pending=Ferdighetsfilen åpnes etter at du lukker Innstillinger.
+settings.agentBehavior.skills.openInEditor.failed=Kunne ikke åpne ferdighetsfilen i editoren.
+settings.agentBehavior.skills.sources.empty=Ingen ferdighetskilder konfigurert.
+settings.agentBehavior.skills.sources.title=Flere ferdighetskilder
+settings.agentBehavior.skills.sources.add=Legg til
+settings.agentBehavior.skills.sources.addPath=Legg til sti
+settings.agentBehavior.skills.sources.addPath.title=Legg til ferdighetssti
+settings.agentBehavior.skills.sources.addPath.prompt=Velg en mappe som inneholder Kilo-ferdigheter.
+settings.agentBehavior.skills.sources.addUrl=Legg til URL
+settings.agentBehavior.skills.sources.addUrl.title=Legg til URL for ferdighetskilde
+settings.agentBehavior.skills.sources.addUrl.prompt=Skriv inn en URL for ferdighetskilde.
+settings.agentBehavior.skills.sources.editPath.title=Rediger ferdighetssti
+settings.agentBehavior.skills.sources.editUrl.title=Rediger ferdighets-URL
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} melding rullet tilbake
@@ -376,3 +403,26 @@ revert.banner.redo=Gjør om
 revert.banner.redo.all=Gjør om alle
 revert.banner.hint=Du kan gjøre om disse endringene til du sender en ny melding
 revert.message.rollback=Rull tilbake til denne meldingen
+
+# Context settings
+settings.context.displayName=Kontekst
+settings.context.description=Konfigurer kontekstadferd.
+settings.context.save.pending=Lagrer kontekstinnstillinger...
+settings.context.save.failed=Kunne ikke lagre kontekstinnstillinger
+settings.context.compaction.title=Komprimering
+settings.context.compaction.auto.title=Automatisk komprimering
+settings.context.compaction.auto.description=Komprimer automatisk kontekst før den når grensen
+settings.context.compaction.threshold.title=Grense for automatisk komprimering
+settings.context.compaction.threshold.description=Komprimer når konteksten når denne prosentandelen av modellvinduet. La stå tomt for å bare bruke sikkerhetsbufferen.
+settings.context.compaction.threshold.placeholder=Standard
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Skriv inn et tall fra 0 til 100, eller la feltet stå tomt.
+settings.context.compaction.prune.title=Fjern gamle utdata
+settings.context.compaction.prune.description=Fjern gamle verktøyutdata under komprimering
+settings.context.watcher.title=Filvakt-ignormønstre
+settings.context.watcher.description=Glob-mønstre for filer som vakten skal ignorere
+settings.context.watcher.add=Legg til mønster
+settings.context.watcher.remove=Fjern valgte mønstre
+settings.context.watcher.empty=Ingen ignormønstre konfigurert.
+settings.context.watcher.input.title=Legg til ignormønster
+settings.context.watcher.input.prompt=Skriv inn et glob-mønster som skal ignoreres:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties
index 258f0884b2..3b2237d766 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pl.properties
@@ -1,4 +1,6 @@
 common.delete=Usuń
+common.open=Otwórz
+common.save=Zapisz
 session.action.cancel=Anuluj
 session.connection.connecting=Ładowanie…
 session.connection.error.app=Błąd połączenia
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Aby dodać serwer MCP, poproś agenta, aby to zrobił.
+settings.agentBehavior.skills.displayName=Umiejętności
+settings.agentBehavior.skills.search=Filtruj umiejętności
+settings.agentBehavior.skills.empty=Nie znaleziono umiejętności.
+settings.agentBehavior.skills.content.empty=Brak dostępnej treści umiejętności.
+settings.agentBehavior.skills.load.timeout=Przekroczono czas ładowania umiejętności. Istniejące umiejętności zostały zachowane; usuń wolne lub niedostępne adresy URL i odśwież.
+settings.agentBehavior.skills.reload.deferred=Źródło umiejętności zapisane. Przeładuj Core po zakończeniu aktywnych sesji, aby zastosować nowe umiejętności.
+settings.agentBehavior.skills.reload.blocked=Ustawienia umiejętności zapisane, ale są aktywne sesje. Przeładuj Core po zakończeniu tych sesji, aby zastosować nowe umiejętności.
+settings.agentBehavior.skills.saved.notification=Ustawienia umiejętności zapisane
+settings.agentBehavior.skills.delete.title=Usuń umiejętność
+settings.agentBehavior.skills.delete.message=Usunąć umiejętność {0}? Spowoduje to usunięcie pliku umiejętności i nie można tego cofnąć.
+settings.agentBehavior.skills.delete.failed=Nie można usunąć umiejętności.
+settings.agentBehavior.skills.openInEditor=Otwórz w edytorze
+settings.agentBehavior.skills.openInEditor.pending=Plik umiejętności otworzy się po zamknięciu Ustawień.
+settings.agentBehavior.skills.openInEditor.failed=Nie można otworzyć pliku umiejętności w edytorze.
+settings.agentBehavior.skills.sources.empty=Nie skonfigurowano źródeł umiejętności.
+settings.agentBehavior.skills.sources.title=Dodatkowe źródła umiejętności
+settings.agentBehavior.skills.sources.add=Dodaj
+settings.agentBehavior.skills.sources.addPath=Dodaj ścieżkę
+settings.agentBehavior.skills.sources.addPath.title=Dodaj ścieżkę umiejętności
+settings.agentBehavior.skills.sources.addPath.prompt=Wybierz folder zawierający umiejętności Kilo.
+settings.agentBehavior.skills.sources.addUrl=Dodaj URL
+settings.agentBehavior.skills.sources.addUrl.title=Dodaj URL źródła umiejętności
+settings.agentBehavior.skills.sources.addUrl.prompt=Wpisz URL źródła umiejętności.
+settings.agentBehavior.skills.sources.editPath.title=Edytuj ścieżkę umiejętności
+settings.agentBehavior.skills.sources.editUrl.title=Edytuj URL umiejętności
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one=Cofnięto {0} wiadomość
@@ -376,3 +403,26 @@ revert.banner.redo=Ponów
 revert.banner.redo.all=Ponów wszystko
 revert.banner.hint=Możesz ponowić te zmiany, dopóki nie wyślesz nowej wiadomości
 revert.message.rollback=Cofnij do tej wiadomości
+
+# Context settings
+settings.context.displayName=Kontekst
+settings.context.description=Skonfiguruj zachowanie kontekstu.
+settings.context.save.pending=Zapisywanie ustawień kontekstu...
+settings.context.save.failed=Nie udało się zapisać ustawień kontekstu
+settings.context.compaction.title=Kompaktowanie
+settings.context.compaction.auto.title=Automatyczna kompakcja
+settings.context.compaction.auto.description=Automatycznie kompaktuj kontekst, zanim osiągnie limit
+settings.context.compaction.threshold.title=Limit automatycznego kompaktowania
+settings.context.compaction.threshold.description=Kompaktuj, gdy kontekst osiągnie ten procent okna modelu. Pozostaw puste, aby używać tylko bufora bezpieczeństwa.
+settings.context.compaction.threshold.placeholder=Domyślne
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Wpisz liczbę od 0 do 100 albo pozostaw pole puste.
+settings.context.compaction.prune.title=Przytnij stare wyjścia
+settings.context.compaction.prune.description=Usuń stare wyjścia narzędzi podczas kompakcji
+settings.context.watcher.title=Wzorce ignorowania obserwatora plików
+settings.context.watcher.description=Wzorce glob dla plików do ignorowania
+settings.context.watcher.add=Dodaj wzorzec
+settings.context.watcher.remove=Usuń wybrane wzorce
+settings.context.watcher.empty=Nie skonfigurowano wzorców ignorowania.
+settings.context.watcher.input.title=Dodaj wzorzec ignorowania
+settings.context.watcher.input.prompt=Wpisz wzorzec glob do ignorowania:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties
index 271591b25d..94997fcddd 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_pt_BR.properties
@@ -1,4 +1,6 @@
 common.delete=Excluir
+common.open=Abrir
+common.save=Salvar
 session.action.cancel=Cancelar
 session.connection.connecting=Carregando…
 session.connection.error.app=Falha na conexão
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Para adicionar um servidor MCP, peça ao agente para fazer isso.
+settings.agentBehavior.skills.displayName=Habilidades
+settings.agentBehavior.skills.search=Filtrar habilidades
+settings.agentBehavior.skills.empty=Nenhuma habilidade encontrada.
+settings.agentBehavior.skills.content.empty=Nenhum conteúdo de habilidade disponível.
+settings.agentBehavior.skills.load.timeout=O carregamento de habilidades atingiu o tempo limite. As habilidades existentes foram mantidas; remova URLs lentas ou inacessíveis e atualize.
+settings.agentBehavior.skills.reload.deferred=Fonte de habilidades salva. Recarregue o Core depois que as sessões ativas terminarem para aplicar novas habilidades.
+settings.agentBehavior.skills.reload.blocked=Configurações de habilidades salvas, mas há sessões ativas. Recarregue o Core depois que essas sessões terminarem para aplicar as novas habilidades.
+settings.agentBehavior.skills.saved.notification=Configurações de habilidades salvas
+settings.agentBehavior.skills.delete.title=Excluir habilidade
+settings.agentBehavior.skills.delete.message=Excluir a habilidade {0}? Isso remove o arquivo da habilidade e não pode ser desfeito.
+settings.agentBehavior.skills.delete.failed=Não foi possível excluir a habilidade.
+settings.agentBehavior.skills.openInEditor=Abrir no editor
+settings.agentBehavior.skills.openInEditor.pending=O arquivo da habilidade será aberto depois que você fechar as Configurações.
+settings.agentBehavior.skills.openInEditor.failed=Não foi possível abrir o arquivo da habilidade no editor.
+settings.agentBehavior.skills.sources.empty=Nenhuma fonte de habilidades configurada.
+settings.agentBehavior.skills.sources.title=Fontes de habilidades adicionais
+settings.agentBehavior.skills.sources.add=Adicionar
+settings.agentBehavior.skills.sources.addPath=Adicionar caminho
+settings.agentBehavior.skills.sources.addPath.title=Adicionar caminho de habilidades
+settings.agentBehavior.skills.sources.addPath.prompt=Escolha uma pasta contendo habilidades do Kilo.
+settings.agentBehavior.skills.sources.addUrl=Adicionar URL
+settings.agentBehavior.skills.sources.addUrl.title=Adicionar URL de fonte de habilidades
+settings.agentBehavior.skills.sources.addUrl.prompt=Insira uma URL de fonte de habilidades.
+settings.agentBehavior.skills.sources.editPath.title=Editar caminho de habilidades
+settings.agentBehavior.skills.sources.editUrl.title=Editar URL de habilidades
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} mensagem revertida
@@ -376,3 +403,26 @@ revert.banner.redo=Refazer
 revert.banner.redo.all=Refazer tudo
 revert.banner.hint=Você pode refazer essas alterações até enviar uma nova mensagem
 revert.message.rollback=Reverter para esta mensagem
+
+# Context settings
+settings.context.displayName=Contexto
+settings.context.description=Configure o comportamento do contexto.
+settings.context.save.pending=Salvando configurações de contexto...
+settings.context.save.failed=Falha ao salvar configurações de contexto
+settings.context.compaction.title=Compactação
+settings.context.compaction.auto.title=Compactação automática
+settings.context.compaction.auto.description=Compactar automaticamente o contexto antes que atinja o limite
+settings.context.compaction.threshold.title=Limite de compactação automática
+settings.context.compaction.threshold.description=Compacte quando o contexto atingir esta porcentagem da janela do modelo. Deixe em branco para usar apenas a margem de segurança.
+settings.context.compaction.threshold.placeholder=Padrão
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Digite um número de 0 a 100 ou deixe o campo em branco.
+settings.context.compaction.prune.title=Remover saídas antigas
+settings.context.compaction.prune.description=Remover saídas antigas de ferramentas durante a compactação
+settings.context.watcher.title=Padrões de ignorar do observador
+settings.context.watcher.description=Padrões glob para arquivos que o observador deve ignorar
+settings.context.watcher.add=Adicionar padrão
+settings.context.watcher.remove=Remover padrões selecionados
+settings.context.watcher.empty=Nenhum padrão de ignorar configurado.
+settings.context.watcher.input.title=Adicionar padrão de ignorar
+settings.context.watcher.input.prompt=Digite um padrão glob para ignorar:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties
index 5854b34dae..bda5626691 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_ru.properties
@@ -1,4 +1,6 @@
 common.delete=Удалить
+common.open=Открыть
+common.save=Сохранить
 session.action.cancel=Отмена
 session.connection.connecting=Загрузка…
 session.connection.error.app=Ошибка подключения
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Чтобы добавить MCP-сервер, попросите агента сделать это.
+settings.agentBehavior.skills.displayName=Навыки
+settings.agentBehavior.skills.search=Фильтр навыков
+settings.agentBehavior.skills.empty=Навыки не найдены.
+settings.agentBehavior.skills.content.empty=Нет доступного содержимого навыка.
+settings.agentBehavior.skills.load.timeout=Время загрузки навыков истекло. Существующие навыки сохранены; удалите медленные или недоступные URL и обновите.
+settings.agentBehavior.skills.reload.deferred=Источник навыков сохранён. Перезагрузите Core после завершения активных сессий, чтобы применить новые навыки.
+settings.agentBehavior.skills.reload.blocked=Настройки навыков сохранены, но есть активные сессии. Перезагрузите Core после завершения этих сессий, чтобы применить новые навыки.
+settings.agentBehavior.skills.saved.notification=Настройки навыков сохранены
+settings.agentBehavior.skills.delete.title=Удалить навык
+settings.agentBehavior.skills.delete.message=Удалить навык {0}? Это удалит файл навыка, и действие нельзя будет отменить.
+settings.agentBehavior.skills.delete.failed=Не удалось удалить навык.
+settings.agentBehavior.skills.openInEditor=Открыть в редакторе
+settings.agentBehavior.skills.openInEditor.pending=Файл навыка откроется после закрытия настроек.
+settings.agentBehavior.skills.openInEditor.failed=Не удалось открыть файл навыка в редакторе.
+settings.agentBehavior.skills.sources.empty=Источники навыков не настроены.
+settings.agentBehavior.skills.sources.title=Дополнительные источники навыков
+settings.agentBehavior.skills.sources.add=Добавить
+settings.agentBehavior.skills.sources.addPath=Добавить путь
+settings.agentBehavior.skills.sources.addPath.title=Добавить путь к навыкам
+settings.agentBehavior.skills.sources.addPath.prompt=Выберите папку, содержащую навыки Kilo.
+settings.agentBehavior.skills.sources.addUrl=Добавить URL
+settings.agentBehavior.skills.sources.addUrl.title=Добавить URL источника навыков
+settings.agentBehavior.skills.sources.addUrl.prompt=Введите URL источника навыков.
+settings.agentBehavior.skills.sources.editPath.title=Изменить путь к навыкам
+settings.agentBehavior.skills.sources.editUrl.title=Изменить URL навыков
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one=Отменено сообщений: {0}
@@ -376,3 +403,26 @@ revert.banner.redo=Повторить
 revert.banner.redo.all=Повторить все
 revert.banner.hint=Эти изменения можно повторить до отправки нового сообщения
 revert.message.rollback=Откатиться к этому сообщению
+
+# Context settings
+settings.context.displayName=Контекст
+settings.context.description=Настройте поведение контекста.
+settings.context.save.pending=Сохранение настроек контекста...
+settings.context.save.failed=Не удалось сохранить настройки контекста
+settings.context.compaction.title=Сжатие
+settings.context.compaction.auto.title=Автоматическое сжатие
+settings.context.compaction.auto.description=Автоматически сжимать контекст до достижения лимита
+settings.context.compaction.threshold.title=Лимит автоматического сжатия
+settings.context.compaction.threshold.description=Сжимать, когда контекст достигает этого процента окна модели. Оставьте пустым, чтобы использовать только буфер безопасности.
+settings.context.compaction.threshold.placeholder=По умолчанию
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Введите число от 0 до 100 или оставьте поле пустым.
+settings.context.compaction.prune.title=Очистить старые выходные данные
+settings.context.compaction.prune.description=Удалить старые выходные данные инструментов при сжатии
+settings.context.watcher.title=Шаблоны игнорирования наблюдателя файлов
+settings.context.watcher.description=Glob-шаблоны для файлов, которые наблюдатель должен игнорировать
+settings.context.watcher.add=Добавить шаблон
+settings.context.watcher.remove=Удалить выбранные шаблоны
+settings.context.watcher.empty=Шаблоны игнорирования не настроены.
+settings.context.watcher.input.title=Добавить шаблон игнорирования
+settings.context.watcher.input.prompt=Введите glob-шаблон для игнорирования:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties
index 1d79743dbf..c1309087ec 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_th.properties
@@ -1,4 +1,6 @@
 common.delete=ลบ
+common.open=เปิด
+common.save=บันทึก
 session.action.cancel=ยกเลิก
 session.connection.connecting=กำลังโหลด…
 session.connection.error.app=การเชื่อมต่อล้มเหลว
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=หากต้องการเพิ่มเซิร์ฟเวอร์ MCP ให้ขอให้เอเจนต์เพิ่มให้
+settings.agentBehavior.skills.displayName=ทักษะ
+settings.agentBehavior.skills.search=กรองทักษะ
+settings.agentBehavior.skills.empty=ไม่พบทักษะ
+settings.agentBehavior.skills.content.empty=ไม่มีเนื้อหาทักษะที่พร้อมใช้งาน
+settings.agentBehavior.skills.load.timeout=การโหลดทักษะหมดเวลา ระบบเก็บทักษะเดิมไว้แล้ว โปรดลบ URL ที่ช้าหรือเข้าถึงไม่ได้แล้วรีเฟรช
+settings.agentBehavior.skills.reload.deferred=บันทึกแหล่งที่มาทักษะแล้ว โหลด Core ใหม่หลังจากเซสชันที่ใช้งานอยู่สิ้นสุดเพื่อใช้ทักษะใหม่
+settings.agentBehavior.skills.reload.blocked=บันทึกการตั้งค่าทักษะแล้ว แต่ยังมีเซสชันที่ใช้งานอยู่ โหลด Core ใหม่หลังจากเซสชันเหล่านั้นสิ้นสุดเพื่อใช้ทักษะใหม่
+settings.agentBehavior.skills.saved.notification=บันทึกการตั้งค่าทักษะแล้ว
+settings.agentBehavior.skills.delete.title=ลบทักษะ
+settings.agentBehavior.skills.delete.message=ลบทักษะ {0} หรือไม่ การดำเนินการนี้จะลบไฟล์ทักษะและไม่สามารถย้อนกลับได้
+settings.agentBehavior.skills.delete.failed=ไม่สามารถลบทักษะได้
+settings.agentBehavior.skills.openInEditor=เปิดในตัวแก้ไข
+settings.agentBehavior.skills.openInEditor.pending=ไฟล์ทักษะจะเปิดหลังจากคุณปิดการตั้งค่า
+settings.agentBehavior.skills.openInEditor.failed=ไม่สามารถเปิดไฟล์ทักษะในตัวแก้ไขได้
+settings.agentBehavior.skills.sources.empty=ไม่ได้กำหนดค่าแหล่งที่มาทักษะ
+settings.agentBehavior.skills.sources.title=แหล่งที่มาทักษะเพิ่มเติม
+settings.agentBehavior.skills.sources.add=เพิ่ม
+settings.agentBehavior.skills.sources.addPath=เพิ่มเส้นทาง
+settings.agentBehavior.skills.sources.addPath.title=เพิ่มเส้นทางทักษะ
+settings.agentBehavior.skills.sources.addPath.prompt=เลือกโฟลเดอร์ที่มีทักษะ Kilo
+settings.agentBehavior.skills.sources.addUrl=เพิ่ม URL
+settings.agentBehavior.skills.sources.addUrl.title=เพิ่ม URL แหล่งที่มาทักษะ
+settings.agentBehavior.skills.sources.addUrl.prompt=ป้อน URL แหล่งที่มาทักษะ
+settings.agentBehavior.skills.sources.editPath.title=แก้ไขเส้นทางทักษะ
+settings.agentBehavior.skills.sources.editUrl.title=แก้ไข URL ทักษะ
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one=ย้อนกลับข้อความ {0} รายการแล้ว
@@ -376,3 +403,26 @@ revert.banner.redo=ทำซ้ำ
 revert.banner.redo.all=ทำซ้ำทั้งหมด
 revert.banner.hint=คุณสามารถทำซ้ำการเปลี่ยนแปลงเหล่านี้ได้จนกว่าจะส่งข้อความใหม่
 revert.message.rollback=ย้อนกลับไปยังข้อความนี้
+
+# Context settings
+settings.context.displayName=บริบท
+settings.context.description=กำหนดค่าพฤติกรรมของบริบท
+settings.context.save.pending=กำลังบันทึกการตั้งค่าบริบท...
+settings.context.save.failed=บันทึกการตั้งค่าบริบทไม่สำเร็จ
+settings.context.compaction.title=การบีบอัด
+settings.context.compaction.auto.title=การบีบอัดอัตโนมัติ
+settings.context.compaction.auto.description=บีบอัดบริบทอัตโนมัติก่อนถึงขีดจำกัด
+settings.context.compaction.threshold.title=ขีดจำกัดการบีบอัดอัตโนมัติ
+settings.context.compaction.threshold.description=บีบอัดเมื่อบริบทถึงเปอร์เซ็นต์นี้ของหน้าต่างโมเดล เว้นว่างไว้เพื่อใช้เฉพาะบัฟเฟอร์ความปลอดภัย
+settings.context.compaction.threshold.placeholder=ค่าเริ่มต้น
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=ป้อนตัวเลขตั้งแต่ 0 ถึง 100 หรือเว้นช่องว่างไว้
+settings.context.compaction.prune.title=ตัดผลลัพธ์เก่า
+settings.context.compaction.prune.description=ลบผลลัพธ์เครื่องมือเก่าระหว่างการบีบอัด
+settings.context.watcher.title=รูปแบบการละเว้นตัวเฝ้าดูไฟล์
+settings.context.watcher.description=รูปแบบ glob สำหรับไฟล์ที่ตัวเฝ้าดูควรละเว้น
+settings.context.watcher.add=เพิ่มรูปแบบ
+settings.context.watcher.remove=ลบรูปแบบที่เลือก
+settings.context.watcher.empty=ยังไม่ได้กำหนดค่ารูปแบบการละเว้น
+settings.context.watcher.input.title=เพิ่มรูปแบบการละเว้น
+settings.context.watcher.input.prompt=ป้อนรูปแบบ glob ที่จะละเว้น:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties
index 8a397a6650..e642bc48af 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_tr.properties
@@ -1,4 +1,6 @@
 common.delete=Sil
+common.open=Aç
+common.save=Kaydet
 session.action.cancel=İptal
 session.connection.connecting=Yükleniyor…
 session.connection.error.app=Bağlantı hatası
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=MCP sunucusu eklemek için ajandan bunu yapmasını isteyin.
+settings.agentBehavior.skills.displayName=Beceriler
+settings.agentBehavior.skills.search=Becerileri filtrele
+settings.agentBehavior.skills.empty=Beceri bulunamadı.
+settings.agentBehavior.skills.content.empty=Kullanılabilir beceri içeriği yok.
+settings.agentBehavior.skills.load.timeout=Beceriler yüklenirken zaman aşımına uğradı. Mevcut beceriler korundu; yavaş veya ulaşılamayan URL'leri kaldırıp yenileyin.
+settings.agentBehavior.skills.reload.deferred=Beceri kaynağı kaydedildi. Yeni becerileri uygulamak için etkin oturumlar bittikten sonra Core'u yeniden yükleyin.
+settings.agentBehavior.skills.reload.blocked=Beceri ayarları kaydedildi, ancak etkin oturumlar var. Yeni becerileri uygulamak için bu oturumlar bittikten sonra Core'u yeniden yükleyin.
+settings.agentBehavior.skills.saved.notification=Beceri ayarları kaydedildi
+settings.agentBehavior.skills.delete.title=Beceriyi Sil
+settings.agentBehavior.skills.delete.message={0} becerisi silinsin mi? Bu işlem beceri dosyasını kaldırır ve geri alınamaz.
+settings.agentBehavior.skills.delete.failed=Beceri silinemedi.
+settings.agentBehavior.skills.openInEditor=Düzenleyicide Aç
+settings.agentBehavior.skills.openInEditor.pending=Beceri dosyası Ayarlar kapatıldıktan sonra açılacak.
+settings.agentBehavior.skills.openInEditor.failed=Beceri dosyası düzenleyicide açılamadı.
+settings.agentBehavior.skills.sources.empty=Yapılandırılmış beceri kaynağı yok.
+settings.agentBehavior.skills.sources.title=Ek Beceri Kaynakları
+settings.agentBehavior.skills.sources.add=Ekle
+settings.agentBehavior.skills.sources.addPath=Yol ekle
+settings.agentBehavior.skills.sources.addPath.title=Beceri Yolu Ekle
+settings.agentBehavior.skills.sources.addPath.prompt=Kilo becerilerini içeren bir klasör seçin.
+settings.agentBehavior.skills.sources.addUrl=URL ekle
+settings.agentBehavior.skills.sources.addUrl.title=Beceri Kaynağı URL'si Ekle
+settings.agentBehavior.skills.sources.addUrl.prompt=Bir beceri kaynağı URL'si girin.
+settings.agentBehavior.skills.sources.editPath.title=Beceri Yolunu Düzenle
+settings.agentBehavior.skills.sources.editUrl.title=Beceri URL'sini Düzenle
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one={0} mesaj geri alındı
@@ -376,3 +403,26 @@ revert.banner.redo=Yinele
 revert.banner.redo.all=Tümünü yinele
 revert.banner.hint=Yeni bir mesaj gönderene kadar bu değişiklikleri yineleyebilirsiniz
 revert.message.rollback=Bu mesaja geri dön
+
+# Context settings
+settings.context.displayName=Bağlam
+settings.context.description=Bağlam davranışını yapılandırın.
+settings.context.save.pending=Bağlam ayarları kaydediliyor...
+settings.context.save.failed=Bağlam ayarları kaydedilemedi
+settings.context.compaction.title=Sıkıştırma
+settings.context.compaction.auto.title=Otomatik Sıkıştırma
+settings.context.compaction.auto.description=Bağlam sınıra ulaşmadan önce otomatik olarak sıkıştır
+settings.context.compaction.threshold.title=Otomatik sıkıştırma sınırı
+settings.context.compaction.threshold.description=Bağlam model penceresinin bu yüzdesine ulaştığında sıkıştır. Yalnızca güvenlik tamponunu kullanmak için boş bırakın.
+settings.context.compaction.threshold.placeholder=Varsayılan
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=0 ile 100 arasında bir sayı girin veya alanı boş bırakın.
+settings.context.compaction.prune.title=Eski Çıktıları Temizle
+settings.context.compaction.prune.description=Sıkıştırma sırasında eski araç çıktılarını kaldır
+settings.context.watcher.title=Dosya İzleyici Yok Sayma Kalıpları
+settings.context.watcher.description=İzleyicinin yok sayması gereken dosyalar için glob kalıpları
+settings.context.watcher.add=Kalıp ekle
+settings.context.watcher.remove=Seçili kalıpları kaldır
+settings.context.watcher.empty=Yok sayma kalıbı yapılandırılmadı.
+settings.context.watcher.input.title=Yok sayma kalıbı ekle
+settings.context.watcher.input.prompt=Yok sayılacak bir glob kalıbı girin:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties
index 31ec8a2119..d50a082172 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_uk.properties
@@ -1,4 +1,6 @@
 common.delete=Видалити
+common.open=Відкрити
+common.save=Зберегти
 session.action.cancel=Скасувати
 session.connection.connecting=Завантаження…
 session.connection.error.app=Помилка з'єднання
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=Щоб додати сервер MCP, попросіть агента зробити це.
+settings.agentBehavior.skills.displayName=Навички
+settings.agentBehavior.skills.search=Фільтрувати навички
+settings.agentBehavior.skills.empty=Навички не знайдено.
+settings.agentBehavior.skills.content.empty=Немає доступного вмісту навички.
+settings.agentBehavior.skills.load.timeout=Час завантаження навичок минув. Наявні навички збережено; видаліть повільні або недоступні URL-адреси й оновіть.
+settings.agentBehavior.skills.reload.deferred=Джерело навичок збережено. Перезавантажте Core після завершення активних сеансів, щоб застосувати нові навички.
+settings.agentBehavior.skills.reload.blocked=Налаштування навичок збережено, але є активні сеанси. Перезавантажте Core після завершення цих сеансів, щоб застосувати нові навички.
+settings.agentBehavior.skills.saved.notification=Налаштування навичок збережено
+settings.agentBehavior.skills.delete.title=Видалити навичку
+settings.agentBehavior.skills.delete.message=Видалити навичку {0}? Це видалить файл навички, і дію не можна буде скасувати.
+settings.agentBehavior.skills.delete.failed=Не вдалося видалити навичку.
+settings.agentBehavior.skills.openInEditor=Відкрити в редакторі
+settings.agentBehavior.skills.openInEditor.pending=Файл навички відкриється після закриття Налаштувань.
+settings.agentBehavior.skills.openInEditor.failed=Не вдалося відкрити файл навички в редакторі.
+settings.agentBehavior.skills.sources.empty=Джерела навичок не налаштовано.
+settings.agentBehavior.skills.sources.title=Додаткові джерела навичок
+settings.agentBehavior.skills.sources.add=Додати
+settings.agentBehavior.skills.sources.addPath=Додати шлях
+settings.agentBehavior.skills.sources.addPath.title=Додати шлях до навичок
+settings.agentBehavior.skills.sources.addPath.prompt=Виберіть папку з навичками Kilo.
+settings.agentBehavior.skills.sources.addUrl=Додати URL
+settings.agentBehavior.skills.sources.addUrl.title=Додати URL джерела навичок
+settings.agentBehavior.skills.sources.addUrl.prompt=Введіть URL джерела навичок.
+settings.agentBehavior.skills.sources.editPath.title=Редагувати шлях до навичок
+settings.agentBehavior.skills.sources.editUrl.title=Редагувати URL навичок
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one=Відкочено повідомлень: {0}
@@ -376,3 +403,26 @@ revert.banner.redo=Повторити
 revert.banner.redo.all=Повторити все
 revert.banner.hint=Ці зміни можна повторити, доки ви не надішлете нове повідомлення
 revert.message.rollback=Відкотитися до цього повідомлення
+
+# Context settings
+settings.context.displayName=Контекст
+settings.context.description=Налаштуйте поведінку контексту.
+settings.context.save.pending=Збереження налаштувань контексту...
+settings.context.save.failed=Не вдалося зберегти налаштування контексту
+settings.context.compaction.title=Стискання
+settings.context.compaction.auto.title=Автоматичне стиснення
+settings.context.compaction.auto.description=Автоматично стискати контекст до досягнення ліміту
+settings.context.compaction.threshold.title=Ліміт автоматичного стискання
+settings.context.compaction.threshold.description=Стискати, коли контекст досягає цього відсотка вікна моделі. Залиште порожнім, щоб використовувати лише буфер безпеки.
+settings.context.compaction.threshold.placeholder=За замовчуванням
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=Введіть число від 0 до 100 або залиште поле порожнім.
+settings.context.compaction.prune.title=Очищати старі виводи
+settings.context.compaction.prune.description=Видаляти старі виводи інструментів під час стиснення
+settings.context.watcher.title=Шаблони ігнорування спостерігача файлів
+settings.context.watcher.description=Glob-шаблони для файлів, які спостерігач має ігнорувати
+settings.context.watcher.add=Додати шаблон
+settings.context.watcher.remove=Видалити вибрані шаблони
+settings.context.watcher.empty=Шаблони ігнорування не налаштовано.
+settings.context.watcher.input.title=Додати шаблон ігнорування
+settings.context.watcher.input.prompt=Введіть glob-шаблон для ігнорування:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties
index d729cc8309..8f6b23da18 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_CN.properties
@@ -1,4 +1,6 @@
 common.delete=删除
+common.open=打开
+common.save=保存
 session.action.cancel=取消
 session.connection.connecting=加载中…
 session.connection.error.app=连接失败
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=要添加 MCP 服务器，请让代理为你添加。
+settings.agentBehavior.skills.displayName=技能
+settings.agentBehavior.skills.search=筛选技能
+settings.agentBehavior.skills.empty=未找到技能。
+settings.agentBehavior.skills.content.empty=没有可用的技能内容。
+settings.agentBehavior.skills.load.timeout=技能加载超时。已保留现有技能；请移除缓慢或无法访问的 URL 后刷新。
+settings.agentBehavior.skills.reload.deferred=技能源已保存。请在活动会话结束后重新加载 Core，以应用新技能。
+settings.agentBehavior.skills.reload.blocked=技能设置已保存，但仍有活动会话。请在这些会话结束后重新加载 Core，以应用新技能。
+settings.agentBehavior.skills.saved.notification=技能设置已保存
+settings.agentBehavior.skills.delete.title=删除技能
+settings.agentBehavior.skills.delete.message=要删除技能 {0} 吗？这会移除技能文件，且无法撤销。
+settings.agentBehavior.skills.delete.failed=无法删除该技能。
+settings.agentBehavior.skills.openInEditor=在编辑器中打开
+settings.agentBehavior.skills.openInEditor.pending=关闭设置后将打开技能文件。
+settings.agentBehavior.skills.openInEditor.failed=无法在编辑器中打开技能文件。
+settings.agentBehavior.skills.sources.empty=未配置技能源。
+settings.agentBehavior.skills.sources.title=其他技能源
+settings.agentBehavior.skills.sources.add=添加
+settings.agentBehavior.skills.sources.addPath=添加路径
+settings.agentBehavior.skills.sources.addPath.title=添加技能路径
+settings.agentBehavior.skills.sources.addPath.prompt=选择一个包含 Kilo 技能的文件夹。
+settings.agentBehavior.skills.sources.addUrl=添加 URL
+settings.agentBehavior.skills.sources.addUrl.title=添加技能源 URL
+settings.agentBehavior.skills.sources.addUrl.prompt=输入技能源 URL。
+settings.agentBehavior.skills.sources.editPath.title=编辑技能路径
+settings.agentBehavior.skills.sources.editUrl.title=编辑技能 URL
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one=已回滚 {0} 条消息
@@ -376,3 +403,26 @@ revert.banner.redo=重做
 revert.banner.redo.all=全部重做
 revert.banner.hint=在发送新消息之前，你可以重做这些更改
 revert.message.rollback=回滚到此消息
+
+# Context settings
+settings.context.displayName=上下文
+settings.context.description=配置上下文行为。
+settings.context.save.pending=正在保存上下文设置...
+settings.context.save.failed=保存上下文设置失败
+settings.context.compaction.title=压缩
+settings.context.compaction.auto.title=自动压缩
+settings.context.compaction.auto.description=在上下文达到限制前自动压缩
+settings.context.compaction.threshold.title=自动压缩限制
+settings.context.compaction.threshold.description=当上下文达到模型窗口的此百分比时进行压缩。留空则仅使用安全缓冲区。
+settings.context.compaction.threshold.placeholder=默认
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=输入 0 到 100 之间的数字，或将字段留空。
+settings.context.compaction.prune.title=修剪旧输出
+settings.context.compaction.prune.description=压缩期间移除旧的工具输出
+settings.context.watcher.title=文件监视器忽略模式
+settings.context.watcher.description=监视器应忽略的文件的 glob 模式
+settings.context.watcher.add=添加模式
+settings.context.watcher.remove=移除所选模式
+settings.context.watcher.empty=未配置忽略模式。
+settings.context.watcher.input.title=添加忽略模式
+settings.context.watcher.input.prompt=输入要忽略的 glob 模式:
diff --git a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties
index 2e0adac9a6..9eb98e2519 100644
--- a/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties
+++ b/packages/kilo-jetbrains/frontend/src/main/resources/messages/KiloBundle_zh_TW.properties
@@ -1,4 +1,6 @@
 common.delete=刪除
+common.open=開啟
+common.save=儲存
 session.action.cancel=取消
 session.connection.connecting=載入中…
 session.connection.error.app=連線失敗
@@ -368,6 +370,31 @@ settings.agentBehavior.undo=Undo
 
 settings.agentBehavior.agents.create.failed=Could not create the agent.
 settings.agentBehavior.mcp.addHint=若要新增 MCP 伺服器，請請代理為你新增。
+settings.agentBehavior.skills.displayName=技能
+settings.agentBehavior.skills.search=篩選技能
+settings.agentBehavior.skills.empty=找不到技能。
+settings.agentBehavior.skills.content.empty=沒有可用的技能內容。
+settings.agentBehavior.skills.load.timeout=技能載入逾時。已保留現有技能；請移除緩慢或無法連線的 URL 後重新整理。
+settings.agentBehavior.skills.reload.deferred=技能來源已儲存。請在作用中工作階段結束後重新載入 Core，以套用新技能。
+settings.agentBehavior.skills.reload.blocked=技能設定已儲存，但仍有作用中工作階段。請在這些工作階段結束後重新載入 Core，以套用新技能。
+settings.agentBehavior.skills.saved.notification=技能設定已儲存
+settings.agentBehavior.skills.delete.title=刪除技能
+settings.agentBehavior.skills.delete.message=要刪除技能 {0} 嗎？這會移除技能檔案，且無法復原。
+settings.agentBehavior.skills.delete.failed=無法刪除該技能。
+settings.agentBehavior.skills.openInEditor=在編輯器中開啟
+settings.agentBehavior.skills.openInEditor.pending=關閉設定後將開啟技能檔案。
+settings.agentBehavior.skills.openInEditor.failed=無法在編輯器中開啟技能檔案。
+settings.agentBehavior.skills.sources.empty=未設定技能來源。
+settings.agentBehavior.skills.sources.title=其他技能來源
+settings.agentBehavior.skills.sources.add=新增
+settings.agentBehavior.skills.sources.addPath=新增路徑
+settings.agentBehavior.skills.sources.addPath.title=新增技能路徑
+settings.agentBehavior.skills.sources.addPath.prompt=選擇包含 Kilo 技能的資料夾。
+settings.agentBehavior.skills.sources.addUrl=新增 URL
+settings.agentBehavior.skills.sources.addUrl.title=新增技能來源 URL
+settings.agentBehavior.skills.sources.addUrl.prompt=輸入技能來源 URL。
+settings.agentBehavior.skills.sources.editPath.title=編輯技能路徑
+settings.agentBehavior.skills.sources.editUrl.title=編輯技能 URL
 session.file.missing=Couldn''t find ''{0}'' in this repository.
 revert.banner.filesNotRestored=Snapshots are off - only the conversation was reverted; your files were not changed.
 revert.banner.count.one=已回復 {0} 則訊息
@@ -376,3 +403,26 @@ revert.banner.redo=重做
 revert.banner.redo.all=全部重做
 revert.banner.hint=在傳送新訊息之前，你可以重做這些變更
 revert.message.rollback=回復到此訊息
+
+# Context settings
+settings.context.displayName=上下文
+settings.context.description=設定上下文行為。
+settings.context.save.pending=正在儲存上下文設定...
+settings.context.save.failed=無法儲存上下文設定
+settings.context.compaction.title=壓縮
+settings.context.compaction.auto.title=自動壓縮
+settings.context.compaction.auto.description=在上下文達到限制前自動壓縮
+settings.context.compaction.threshold.title=自動壓縮限制
+settings.context.compaction.threshold.description=當上下文達到模型視窗的此百分比時進行壓縮。留空則僅使用安全緩衝區。
+settings.context.compaction.threshold.placeholder=預設
+settings.context.compaction.threshold.suffix=%
+settings.context.compaction.threshold.invalid=輸入 0 到 100 之間的數字，或將欄位留空。
+settings.context.compaction.prune.title=修剪舊輸出
+settings.context.compaction.prune.description=壓縮期間移除舊的工具輸出
+settings.context.watcher.title=檔案監視器忽略模式
+settings.context.watcher.description=監視器應忽略的檔案的 glob 模式
+settings.context.watcher.add=新增模式
+settings.context.watcher.remove=移除所選模式
+settings.context.watcher.empty=尚未設定忽略模式。
+settings.context.watcher.input.title=新增忽略模式
+settings.context.watcher.input.prompt=輸入要忽略的 glob 模式:
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAgentBehaviorServiceTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAgentBehaviorServiceTest.kt
index 5dd31cb642..fefcde20dd 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAgentBehaviorServiceTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloAgentBehaviorServiceTest.kt
@@ -3,6 +3,7 @@ package ai.kilocode.client.app
 import ai.kilocode.client.testing.FakeAgentBehaviorRpcApi
 import ai.kilocode.rpc.dto.AgentCreateDto
 import ai.kilocode.rpc.dto.McpStatusDto
+import ai.kilocode.rpc.dto.SkillDto
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -10,6 +11,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
+import kotlin.test.assertFailsWith
 
 class KiloAgentBehaviorServiceTest : BasePlatformTestCase() {
     private lateinit var scope: CoroutineScope
@@ -67,6 +69,35 @@ class KiloAgentBehaviorServiceTest : BasePlatformTestCase() {
         assertTrue(rpc.removals.isEmpty())
     }
 
+    fun `test loadSkills propagates rpc failure`() = runBlocking {
+        rpc.skillsError = RuntimeException("boom")
+
+        assertFailsWith<RuntimeException> {
+            withContext(Dispatchers.Default) { service.loadSkills("/test") }
+        }
+    }
+
+    fun `test refreshSkills returns previous rows on rpc failure`() = runBlocking {
+        val fallback = listOf(SkillDto("plan", location = "/test/SKILL.md"))
+        rpc.skillsError = RuntimeException("boom")
+
+        val items = withContext(Dispatchers.Default) { service.refreshSkills("/test", fallback) }
+
+        assertEquals(fallback, items)
+    }
+
+    fun `test saveSkills forwards all edits`() = runBlocking {
+        rpc.skills = listOf(SkillDto("plan", location = "/test/plan/SKILL.md"))
+
+        val ok = withContext(Dispatchers.Default) {
+            service.saveSkills("/test", mapOf("/test/plan/SKILL.md" to "# Saved"))
+        }
+
+        assertTrue(ok)
+        assertEquals(listOf(Triple("/test", "/test/plan/SKILL.md", "# Saved")), rpc.skillSaves)
+        assertEquals("# Saved", rpc.skills.single().content)
+    }
+
     fun `test mcpStatus forwards directory`() = runBlocking {
         rpc.mcps = listOf(McpStatusDto("filesystem", "connected"))
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloWorkspaceServiceTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloWorkspaceServiceTest.kt
index 607fe2493d..2691c32705 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloWorkspaceServiceTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/app/KiloWorkspaceServiceTest.kt
@@ -97,4 +97,12 @@ class KiloWorkspaceServiceTest : BasePlatformTestCase() {
         assertEquals(err.message, seen?.message)
         assertEquals(listOf("dep"), rpc.searchQueries)
     }
+
+    fun `test searchFiles sends query to RPC`() = runBlocking {
+        withContext(Dispatchers.Default) {
+            service.searchFiles("/test", "src")
+        }
+
+        assertEquals(listOf("src"), rpc.searchQueries)
+    }
 }
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt
index 5e51f8f46a..70a6dc52bb 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/session/ui/PromptPanelTest.kt
@@ -44,7 +44,6 @@ import com.intellij.openapi.actionSystem.UiDataProvider
 import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.WriteCommandAction
-import com.intellij.openapi.command.undo.UndoManager
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorFactory
@@ -56,7 +55,6 @@ import com.intellij.openapi.editor.colors.EditorColorsManager
 import com.intellij.openapi.editor.colors.EditorColorsScheme
 import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.editor.markup.TextAttributes
-import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.ide.CopyPasteManager
 import com.intellij.openapi.fileTypes.PlainTextFileType
 import com.intellij.openapi.fileTypes.PlainTextLanguage
@@ -455,28 +453,20 @@ class PromptPanelTest : BasePlatformTestCase() {
         assertTrue(spans.contains("@unknown" to CodeInsightColors.WRONG_REFERENCES_ATTRIBUTES))
     }
 
-    fun `test prompt editor exposes file editor for undo redo`() {
+    fun `test prompt editor does not expose file editor for platform undo`() {
         val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> }, completion = completion())
         val field = panel.defaultFocusedComponent as EditorTextField
 
         realize(panel, 260, 400)
         val editor = field.getEditor(false)!!
-        WriteCommandAction.runWriteCommandAction(project) {
-            editor.document.insertString(0, "hello")
-        }
         val sink = TestSink()
         (field as UiDataProvider).uiDataSnapshot(sink)
-        val file = sink.file as? TextEditor ?: error("missing file editor")
 
-        assertNotNull(file)
-        assertSame(editor.document, file.editor.document)
-        UndoManager.getInstance(project).undo(file)
-        assertEquals("", editor.document.text)
-        UndoManager.getInstance(project).redo(file)
-        assertEquals("hello", editor.document.text)
+        assertNull(sink.file)
+        assertSame(true, editor.getUserData(EditorTextField.SUPPLEMENTARY_KEY))
     }
 
-    fun `test prompt editor platform undo redo actions target prompt editor`() {
+    fun `test prompt editor platform undo redo actions do not throw`() {
         val panel = PromptPanel(project = project, onSend = { _, _ -> }, onAbort = {}, onEnhance = { _, _ -> }, completion = completion())
         val field = panel.defaultFocusedComponent as EditorTextField
 
@@ -488,13 +478,10 @@ class PromptPanelTest : BasePlatformTestCase() {
         assertSame(true, editor.contentComponent.getClientProperty(UndoRedoAction.IGNORE_SWING_UNDO_MANAGER))
         val sink = TestSink()
         (field as UiDataProvider).uiDataSnapshot(sink)
-        val file = sink.file as? TextEditor ?: error("missing file editor")
-        assertSame(editor.document, file.editor.document)
-        assertTrue("prompt file editor should have undo", UndoManager.getInstance(project).isUndoAvailable(file))
+        assertNull(sink.file)
 
-        invokeAction(IdeActions.ACTION_UNDO, editor.contentComponent, file)
-        assertEquals("", editor.document.text)
-        invokeAction(IdeActions.ACTION_REDO, editor.contentComponent, file)
+        updatePlatformAction(IdeActions.ACTION_UNDO, editor)
+        updatePlatformAction(IdeActions.ACTION_REDO, editor)
         assertEquals("hello", editor.document.text)
     }
 
@@ -1364,21 +1351,18 @@ class PromptPanelTest : BasePlatformTestCase() {
         UIUtil.dispatchAllInvocationEvents()
     }
 
-    private fun invokeAction(id: String, component: java.awt.Component, file: TextEditor) {
+    private fun updatePlatformAction(id: String, editor: Editor) {
         val action = ActionManager.getInstance().getAction(id) ?: error("missing action $id")
         val ctx = DataContext { data ->
             when (data) {
                 CommonDataKeys.PROJECT.name -> project
-                PlatformCoreDataKeys.CONTEXT_COMPONENT.name -> component
-                PlatformCoreDataKeys.FILE_EDITOR.name -> file
+                CommonDataKeys.EDITOR.name -> editor
+                PlatformCoreDataKeys.CONTEXT_COMPONENT.name -> editor.contentComponent
                 else -> null
             }
         }
         val event = AnActionEvent.createEvent(action, ctx, null, ActionPlaces.UNKNOWN, ActionUiKind.NONE, null)
         ActionUtil.updateAction(action, event)
-        assertTrue("action $id should be enabled", event.presentation.isEnabled)
-        ActionUtil.performAction(action, event)
-        UIUtil.dispatchAllInvocationEvents()
     }
 
     private fun waitForLookupItems(editor: Editor): List<String> {
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurableTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurableTest.kt
index 8be8ad98da..2015edebba 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurableTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/KiloSettingsConfigurableTest.kt
@@ -1,6 +1,7 @@
 package ai.kilocode.client.settings
 
 import ai.kilocode.client.settings.profile.UserProfileConfigurable
+import ai.kilocode.client.settings.context.ContextConfigurable
 import ai.kilocode.client.settings.models.ModelsConfigurable
 import ai.kilocode.client.settings.agents.AgentBehaviorConfigurable
 import ai.kilocode.client.settings.providers.ProvidersConfigurable
@@ -29,6 +30,10 @@ class KiloSettingsConfigurableTest : BasePlatformTestCase() {
         assertEquals("ai.kilocode.jetbrains.settings.models", ModelsConfigurable.ID)
     }
 
+    fun `test child context id matches xml registration`() {
+        assertEquals("ai.kilocode.jetbrains.settings.context", ContextConfigurable.ID)
+    }
+
     fun `test child provider and behavior ids match xml registration`() {
         assertEquals("ai.kilocode.jetbrains.settings.providers", ProvidersConfigurable.ID)
         assertEquals("ai.kilocode.jetbrains.settings.agentBehavior", AgentBehaviorConfigurable.ID)
@@ -79,12 +84,21 @@ class KiloSettingsConfigurableTest : BasePlatformTestCase() {
         }
     }
 
+    fun `test createComponent contains Context link`() {
+        val cfg = KiloSettingsConfigurable()
+        edt {
+            val panel = cfg.createComponent()
+            val links = links(panel as Container)
+            assertTrue("expected a link labeled 'Context'", links.any { it.text == "Context" })
+        }
+    }
+
     fun `test createComponent contains settings links in order`() {
         val cfg = KiloSettingsConfigurable()
         edt {
             val panel = cfg.createComponent()
             val labels = links(panel as Container).map { it.text }
-            assertEquals(listOf("User Profile", "Models", "Providers", "Agent Behavior"), labels)
+            assertEquals(listOf("User Profile", "Models", "Providers", "Agent Behavior", "Context"), labels)
         }
     }
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurableTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurableTest.kt
index 5f79482b75..eee23f2772 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurableTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurableTest.kt
@@ -18,6 +18,7 @@ class AgentBehaviorConfigurableTest : BasePlatformTestCase() {
     fun `test child ids match xml registration`() {
         assertEquals("ai.kilocode.jetbrains.settings.agentBehavior.agents", AgentsConfigurable.ID)
         assertEquals("ai.kilocode.jetbrains.settings.agentBehavior.mcp", McpConfigurable.ID)
+        assertEquals("ai.kilocode.jetbrains.settings.agentBehavior.skills", SkillsConfigurable.ID)
     }
 
     fun `test createComponent contains child links in order`() {
@@ -26,7 +27,7 @@ class AgentBehaviorConfigurableTest : BasePlatformTestCase() {
         edt {
             val panel = cfg.createComponent()
             val labels = links(panel as Container).map { it.text }
-            assertEquals(listOf("Agents", "MCP Servers"), labels)
+            assertEquals(listOf("Agents", "MCP Servers", "Skills"), labels)
         }
     }
 
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/agents/SkillsSettingsUiTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/agents/SkillsSettingsUiTest.kt
new file mode 100644
index 0000000000..b335631ea5
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/agents/SkillsSettingsUiTest.kt
@@ -0,0 +1,615 @@
+package ai.kilocode.client.settings.agents
+
+import ai.kilocode.client.app.KiloAgentBehaviorService
+import ai.kilocode.client.app.KiloAppService
+import ai.kilocode.client.app.KiloWorkspaceService
+import ai.kilocode.client.settings.base.SettingsListItem
+import ai.kilocode.client.settings.base.settingsListCellBounds
+import ai.kilocode.client.testing.FakeAgentBehaviorRpcApi
+import ai.kilocode.client.testing.FakeAppRpcApi
+import ai.kilocode.client.testing.FakeWorkspaceRpcApi
+import ai.kilocode.client.testing.fire
+import ai.kilocode.rpc.dto.ConfigDto
+import ai.kilocode.rpc.dto.KiloAppStateDto
+import ai.kilocode.rpc.dto.KiloAppStatusDto
+import ai.kilocode.rpc.dto.SkillDto
+import ai.kilocode.rpc.dto.SkillsConfigDto
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.fileTypes.FileTypeManager
+import com.intellij.openapi.fileTypes.PlainTextFileType
+import com.intellij.openapi.fileTypes.UnknownFileType
+import com.intellij.openapi.ui.DialogWrapper
+import com.intellij.openapi.ui.Messages
+import com.intellij.openapi.ui.TestDialog
+import com.intellij.openapi.ui.TestDialogManager
+import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.testFramework.replaceService
+import com.intellij.ui.TitledSeparator
+import com.intellij.ui.SimpleColoredComponent
+import com.intellij.ui.components.JBLabel
+import com.intellij.ui.components.JBList
+import com.intellij.ui.components.JBScrollPane
+import com.intellij.util.ui.UIUtil
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import java.awt.BorderLayout
+import java.awt.Container
+import java.awt.Dimension
+import java.awt.Point
+import java.awt.event.InputEvent
+import java.awt.event.MouseEvent
+import javax.swing.JComponent
+import javax.swing.ScrollPaneConstants
+import javax.swing.Scrollable
+import javax.swing.JTextField
+
+class SkillsSettingsUiTest : BasePlatformTestCase() {
+    private var scope: CoroutineScope? = null
+    private var ui: SkillsSettingsUi? = null
+    private lateinit var app: KiloAppService
+    private lateinit var appRpc: FakeAppRpcApi
+    private lateinit var agentRpc: FakeAgentBehaviorRpcApi
+    private lateinit var workspaceRpc: FakeWorkspaceRpcApi
+    private var shown = 0
+
+    override fun tearDown() {
+        try {
+            TestDialogManager.setTestDialog(TestDialog.DEFAULT)
+            ui?.let { panel -> edt { panel.dispose(); true } }
+            ui = null
+            scope?.cancel()
+            scope = null
+        } finally {
+            super.tearDown()
+        }
+    }
+
+    fun `test loads skills with location note and builtins have no actions`() {
+        val panel = panel()
+
+        flushUntil { rows(panel).size == 3 }
+
+        edt {
+            val rows = rows(panel)
+            val custom = rows.single { it.key == CUSTOM }
+            assertEquals("plan", custom.title)
+            assertEquals(CUSTOM, custom.note)
+            assertEquals("Plan work", custom.description)
+            assertEquals("edit", custom.doubleClick)
+            assertEquals(listOf("open", "edit", "delete"), custom.cells.map { it.id })
+            assertTrue(custom.cells.single { it.id == "open" }.primary)
+            assertFalse(custom.cells.single { it.id == "edit" }.primary)
+            assertEquals("Edit", custom.cells.single { it.id == "edit" }.label)
+            assertTrue(custom.cells.single { it.id == "delete" }.iconOnly)
+            val builtin = rows.single { it.key == "builtin" }
+            assertEquals("thinking", builtin.title)
+            assertNull(builtin.note)
+            assertEquals("edit", builtin.doubleClick)
+            assertEquals(listOf("built-in"), builtin.badges.map { it.text })
+            assertEquals(listOf("edit"), builtin.cells.map { it.id })
+            assertEquals("Open", builtin.cells.single().label)
+            val remote = rows.single { it.key == REMOTE }
+            assertEquals(listOf("edit"), remote.cells.map { it.id })
+            assertEquals("Open", remote.cells.single().label)
+            assertEquals(listOf(DIR), agentRpc.skillCalls)
+            true
+        }
+    }
+
+    fun `test skills list is vertically scrolled without horizontal scrollbar`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+
+        edt {
+            val pane = scrollFor(panel, skillsList(panel))
+            val view = pane.viewport.view
+            val layout = panel.content.layout as BorderLayout
+
+            assertEquals(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER, pane.horizontalScrollBarPolicy)
+            assertTrue((view as Scrollable).getScrollableTracksViewportWidth())
+            assertFalse(view.getScrollableTracksViewportHeight())
+            assertSame(pane, layout.getLayoutComponent(BorderLayout.CENTER))
+            assertSame(panel.sources, layout.getLayoutComponent(BorderLayout.SOUTH))
+            true
+        }
+    }
+
+    fun `test sources section has additional sources title`() {
+        val panel = panel()
+        flushUntil { sourceRows(panel).size == 2 }
+
+        assertTrue(edt {
+            components(panel).filterIsInstance<TitledSeparator>().any { it.text == "Additional Skill Sources" }
+        })
+    }
+
+    fun `test skills list does not show description tooltips`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+
+        edt {
+            val list = skillsList(panel)
+            list.size = Dimension(520, 320)
+            list.doLayout()
+            val bounds = list.getCellBounds(0, 0)
+
+            assertNull(list.getToolTipText(mouse(list, MouseEvent.MOUSE_MOVED, Point(bounds.x + 8, bounds.y + 8))))
+            true
+        }
+    }
+
+    fun `test renderer puts location on first line and description on preview line`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+
+        edt {
+            val list = skillsList(panel)
+            val row = rows(panel).single { it.key == CUSTOM }
+            val idx = rows(panel).indexOf(row)
+            val comp = list.cellRenderer.getListCellRendererComponent(list, row, idx, true, true)
+            comp.setSize(520, list.fixedCellHeight)
+            layout(comp)
+            val title = components(comp).filterIsInstance<SimpleColoredComponent>().single()
+            val labels = components(comp).filterIsInstance<JBLabel>().filter { it.isVisible }.map { it.text }
+
+            assertEquals("plan  $CUSTOM", title.toString())
+            assertTrue(labels.contains("Plan work"))
+            true
+        }
+    }
+
+    fun `test double click stages skill content until apply`() {
+        val panel = panel(edit = { _, _ -> FakeSkillDialog("# Saved") })
+        flushUntil { rows(panel).size == 3 }
+
+        doubleClick(skillsList(panel), panel, CUSTOM)
+
+        assertTrue(edt { panel.modified() })
+        assertTrue(agentRpc.skillSaves.isEmpty())
+        edt { panel.applyDraft(); true }
+        flushUntil { agentRpc.skillSaves.size == 1 }
+        assertEquals(Triple(DIR, CUSTOM, "# Saved"), agentRpc.skillSaves.single())
+    }
+
+    fun `test edited skill row keeps normal actions`() {
+        val panel = panel(edit = { _, _ -> FakeSkillDialog("# Draft") })
+        flushUntil { rows(panel).size == 3 }
+
+        doubleClick(skillsList(panel), panel, CUSTOM)
+
+        assertEquals(listOf("open", "edit", "delete"), edt { rows(panel).single { it.key == CUSTOM }.cells.map { it.id } })
+        assertTrue(edt { panel.modified() })
+    }
+
+    fun `test reopening staged skill edit shows draft content before apply`() {
+        val seen = mutableListOf<String?>()
+        val panel = panel(edit = { skill, _ ->
+            seen += skill.content
+            FakeSkillDialog(if (seen.size == 1) "# Draft" else "# Draft 2")
+        })
+        flushUntil { rows(panel).size == 3 }
+
+        doubleClick(skillsList(panel), panel, CUSTOM)
+        doubleClick(skillsList(panel), panel, CUSTOM)
+
+        assertEquals(listOf("# Plan\nUse steps", "# Draft"), seen)
+        assertTrue(agentRpc.skillSaves.isEmpty())
+    }
+
+    fun `test open in editor action opens skill file`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+
+        click(skillsList(panel), panel, CUSTOM, "open")
+
+        assertEquals("The skill file will open after you close Settings.", edt { progressText(panel) })
+        flushUntil { workspaceRpc.openedFiles.size == 1 }
+        assertEquals(FakeWorkspaceRpcApi.Opened(CUSTOM, null, null), workspaceRpc.openedFiles.single())
+    }
+
+    fun `test read only skills open without staging edits or editor file open`() {
+        shown = 0
+        val panel = panel(edit = { _, savable ->
+            assertFalse(savable)
+            FakeSkillDialog("# Ignored") { shown += 1 }
+        })
+        flushUntil { rows(panel).size == 3 }
+
+        click(skillsList(panel), panel, REMOTE, "edit")
+
+        assertEquals(1, shown)
+        assertFalse(edt { panel.modified() })
+        assertTrue(agentRpc.skillSaves.isEmpty())
+        assertTrue(workspaceRpc.openedFiles.isEmpty())
+    }
+
+    fun `test skill edit dialog shows content with fallback`() {
+        edt {
+            val content = SkillEditDialog(SkillDto("plan", "desc", CUSTOM, "# Plan\nUse steps"), true)
+            val fallback = SkillEditDialog(SkillDto("plan", "desc", CUSTOM), true)
+            val readonly = SkillEditDialog(SkillDto("kilo-config", "desc", "builtin", "<h1>Kilo Config</h1>"), false)
+            try {
+                assertEquals("# Plan\nUse steps", content.content())
+                assertEquals("desc", fallback.content())
+                assertEquals("<h1>Kilo Config</h1>", readonly.content())
+                assertEquals("OK", content.okText())
+            } finally {
+                content.close(DialogWrapper.CANCEL_EXIT_CODE)
+                fallback.close(DialogWrapper.CANCEL_EXIT_CODE)
+                readonly.close(DialogWrapper.CANCEL_EXIT_CODE)
+            }
+            true
+        }
+    }
+
+    fun `test skill editor file type follows content syntax before location`() {
+        assertEquals(
+            FileTypeManager.getInstance().getFileTypeByFileName("index.html"),
+            skillFileType("builtin", "<h1>Kilo CLI Configuration Reference</h1><p>All config lives in <code>kilo.json</code>.</p>"),
+        )
+        assertEquals(
+            skillFileType("SKILL.md"),
+            skillFileType("builtin", "# Kilo CLI Configuration Reference\n\nAll config lives in `kilo.json`."),
+        )
+        assertEquals(PlainTextFileType.INSTANCE, skillFileType("builtin", "Plain fallback text"))
+    }
+
+
+    fun `test delete action stages skill removal until apply`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+        TestDialogManager.setTestDialog(TestDialog.YES)
+
+        click(skillsList(panel), panel, CUSTOM, "delete")
+
+        assertTrue(edt { rows(panel).none { it.key == CUSTOM } })
+        assertTrue(agentRpc.skillRemovals.isEmpty())
+        edt { panel.applyDraft(); true }
+        flushUntil { agentRpc.skillRemovals.size == 1 }
+        assertEquals(listOf(DIR to CUSTOM), agentRpc.skillRemovals)
+    }
+
+    fun `test delete action requires confirmation`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+        TestDialogManager.setTestDialog { Messages.NO }
+
+        click(skillsList(panel), panel, CUSTOM, "delete")
+
+        edt { UIUtil.dispatchAllInvocationEvents(); true }
+        assertTrue(agentRpc.skillRemovals.isEmpty())
+        assertTrue(edt { rows(panel).any { it.key == CUSTOM } })
+    }
+
+    fun `test add path and url write skills config patch on apply`() {
+        var path = "/extra/skills"
+        var url = "https://skills.test/index.json"
+        val panel = panel(choose = { path }, input = { _, _ -> url })
+        flushUntil { rows(panel).size == 3 }
+
+        edt { panel.sources.addPath(); true }
+        edt { panel.sources.addUrl(); true }
+        flushUntil { sourceRows(panel).any { it.key == "url:$url" } }
+        assertTrue(appRpc.configPatches.isEmpty())
+
+        edt { panel.applyDraft(); true }
+        flushUntil { appRpc.configPatches.size == 1 && !edt { panel.modified() } }
+
+        val paths = appRpc.configPatches.single().skills!!.paths
+        val urls = appRpc.configPatches.single().skills!!.urls
+        assertEquals(listOf("/global/skills", path), paths)
+        assertEquals(listOf("https://skills.test/base.json", url), urls)
+        assertEquals(
+            listOf("path:/global/skills", "path:$path", "url:https://skills.test/base.json", "url:$url"),
+            edt { sourceRows(panel).map { it.key } },
+        )
+        assertEquals(listOf(DIR), agentRpc.skillReloads)
+    }
+
+    fun `test stale config update result keeps added skill sources visible`() {
+        val path = "/extra/skills"
+        val url = "https://skills.test/index.json"
+        val extra = "$path/extra/SKILL.md"
+        val panel = panel(choose = { path }, input = { _, _ -> url })
+        appRpc.configUpdateReturnStale = true
+        appRpc.afterConfig = { agentRpc.skills = agentRpc.skills + SkillDto("extra", "Extra skill", extra) }
+        flushUntil { rows(panel).size == 3 }
+
+        edt {
+            panel.sources.addPath()
+            panel.sources.addUrl()
+            panel.applyDraft()
+            true
+        }
+
+        flushUntil { appRpc.configPatches.size == 1 && !edt { panel.modified() } }
+        assertTrue(edt { rows(panel).any { it.key == extra } })
+        assertEquals(
+            listOf("path:/global/skills", "path:$path", "url:https://skills.test/base.json", "url:$url"),
+            edt { sourceRows(panel).map { it.key } },
+        )
+    }
+
+    fun `test blocked reload completes apply with warning`() {
+        val path = "/extra/skills"
+        val panel = panel(choose = { path })
+        agentRpc.reloadSkillResult = false
+        flushUntil { rows(panel).size == 3 }
+
+        edt {
+            panel.sources.addPath()
+            panel.applyDraft()
+            true
+        }
+
+        flushUntil { appRpc.configPatches.size == 1 && !edt { panel.modified() } }
+        assertEquals(listOf(DIR), agentRpc.skillReloads)
+        assertEquals("Skills settings saved, but active sessions are present. Reload the core after those sessions finish to apply the new skills.", edt { progressText(panel) })
+    }
+
+    fun `test post apply skills refresh failure keeps saved rows`() {
+        val panel = panel(edit = { _, _ -> FakeSkillDialog("# Saved") })
+        flushUntil { rows(panel).size == 3 }
+
+        doubleClick(skillsList(panel), panel, CUSTOM)
+        agentRpc.skillsError = RuntimeException("timeout")
+        edt { panel.applyDraft(); true }
+
+        flushUntil { agentRpc.skillSaves.size == 1 && !edt { panel.modified() } }
+        assertEquals(listOf(CUSTOM, "builtin", REMOTE), edt { rows(panel).map { it.key } })
+        assertEquals("# Saved", agentRpc.skills.single { it.location == CUSTOM }.content)
+    }
+
+    fun `test source reset discards staged changes`() {
+        val path = "/extra/skills"
+        val panel = panel(choose = { path })
+        flushUntil { rows(panel).size == 3 }
+
+        edt { panel.sources.addPath(); true }
+
+        assertTrue(edt { sourceRows(panel).any { it.key == "path:$path" } })
+        assertTrue(edt { panel.modified() })
+        edt { panel.resetDraft(); true }
+
+        assertTrue(appRpc.configPatches.isEmpty())
+        assertEquals(listOf(CUSTOM, "builtin", REMOTE), edt { rows(panel).map { it.key } })
+        assertFalse(edt { sourceRows(panel).any { it.key == "path:$path" } })
+        assertTrue(agentRpc.skillReloads.isEmpty())
+    }
+
+    fun `test delete source writes skills config patch`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 && sourceRows(panel).size == 2 }
+
+        edt {
+            sourceList(panel).selectedIndices = intArrayOf(0)
+            panel.sources.removeSelected()
+            true
+        }
+
+        assertTrue(appRpc.configPatches.isEmpty())
+        edt { panel.applyDraft(); true }
+        flushUntil { appRpc.configPatches.size == 1 && !edt { panel.modified() } }
+        val patch = appRpc.configPatches.single().skills!!
+        assertEquals(emptyList<String>(), patch.paths)
+        assertEquals(listOf("https://skills.test/base.json"), patch.urls)
+        assertEquals(listOf("url:https://skills.test/base.json"), edt { sourceRows(panel).map { it.key } })
+        assertEquals(listOf(DIR), agentRpc.skillReloads)
+    }
+
+    fun `test stale config update result keeps removed skill sources hidden`() {
+        val panel = panel()
+        appRpc.configUpdateReturnStale = true
+        appRpc.afterConfig = { agentRpc.skills = agentRpc.skills.filterNot { it.location == CUSTOM } }
+        flushUntil { rows(panel).size == 3 && sourceRows(panel).size == 2 }
+
+        edt {
+            sourceList(panel).selectedIndices = intArrayOf(0)
+            panel.sources.removeSelected()
+            panel.applyDraft()
+            true
+        }
+
+        flushUntil { appRpc.configPatches.size == 1 && !edt { panel.modified() } }
+        assertEquals(listOf("builtin", REMOTE), edt { rows(panel).map { it.key } })
+        assertEquals(listOf("url:https://skills.test/base.json"), edt { sourceRows(panel).map { it.key } })
+    }
+
+    fun `test search filters skills by name`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+
+        edt {
+            components(panel).filterIsInstance<JTextField>().single().text = "think"
+            UIUtil.dispatchAllInvocationEvents()
+            true
+        }
+
+        flushUntil { rows(panel).map { it.key } == listOf("builtin") }
+    }
+
+    fun `test skills reload failure keeps existing rows`() {
+        val panel = panel()
+        flushUntil { rows(panel).size == 3 }
+        agentRpc.skillsError = RuntimeException("timeout")
+
+        edt { panel.reload(); true }
+        flushUntil { edt { skillsList(panel).isEnabled } }
+
+        assertEquals(listOf(CUSTOM, "builtin", REMOTE), edt { rows(panel).map { it.key } })
+    }
+
+    fun `test skill editor file type follows location extension`() {
+        assertNotSame(UnknownFileType.INSTANCE, skillFileType("/tmp/skills/plan/SKILL.md"))
+        assertEquals(
+            FileTypeManager.getInstance().getFileTypeByFileName("index.html"),
+            skillFileType("/tmp/skills/index.html"),
+        )
+        assertEquals(PlainTextFileType.INSTANCE, skillFileType("/tmp/skills/index.unknown"))
+    }
+
+    fun `test skill path chooser accepts directories only`() {
+        val descriptor = skillPathDescriptor()
+
+        assertTrue(descriptor.isChooseFolders)
+        assertFalse(descriptor.isChooseFiles)
+    }
+
+    private fun panel(
+        choose: (JComponent) -> String? = { null },
+        input: (String, String) -> String? = { _, _ -> null },
+        edit: (SkillDto, Boolean) -> SkillEditDialogHandle = { _, _ -> FakeSkillDialog("# Plan\nUse steps") },
+    ): SkillsSettingsUi {
+        install()
+        val panel = edt { SkillsSettingsUi(scope!!, DIR, choose, input, edit) }
+        ui = panel
+        edt { panel.reload(); true }
+        return panel
+    }
+
+    private fun install() {
+        val cs = CoroutineScope(SupervisorJob())
+        scope = cs
+        appRpc = FakeAppRpcApi()
+        workspaceRpc = FakeWorkspaceRpcApi()
+        agentRpc = FakeAgentBehaviorRpcApi().apply {
+            skills = listOf(
+                SkillDto("plan", "Plan work", CUSTOM, "# Plan\nUse steps", editable = true),
+                SkillDto("thinking", "Built in", "builtin", "Built in content"),
+                SkillDto("remote", "Remote skill", REMOTE, "# Remote skill"),
+            )
+        }
+        app = KiloAppService(cs, appRpc)
+        val ready = KiloAppStateDto(
+            KiloAppStatusDto.READY,
+            config = ConfigDto(skills = SkillsConfigDto(
+                paths = listOf("/global/skills"),
+                urls = listOf("https://skills.test/base.json"),
+            )),
+        )
+        app._state.value = ready
+        appRpc.state.value = ready
+        ApplicationManager.getApplication().replaceService(KiloAppService::class.java, app, testRootDisposable)
+        ApplicationManager.getApplication().replaceService(KiloAgentBehaviorService::class.java, KiloAgentBehaviorService(cs, agentRpc), testRootDisposable)
+        ApplicationManager.getApplication().replaceService(KiloWorkspaceService::class.java, KiloWorkspaceService(cs, workspaceRpc), testRootDisposable)
+    }
+
+    private fun click(list: JBList<SettingsListItem>, panel: SkillsSettingsUi, key: String, id: String) {
+        edt {
+            list.size = Dimension(520, 320)
+            list.doLayout()
+            val rows = if (list === skillsList(panel)) rows(panel) else sourceRows(panel)
+            val idx = rows.indexOfFirst { it.key == key }
+            list.selectedIndex = idx
+            val area = settingsListCellBounds(list, idx, selected = true).getValue(id)
+            click(list, center(area))
+            true
+        }
+    }
+
+    private fun doubleClick(list: JBList<SettingsListItem>, panel: SkillsSettingsUi, key: String) {
+        edt {
+            list.size = Dimension(520, 320)
+            list.doLayout()
+            val idx = rows(panel).indexOfFirst { it.key == key }
+            list.selectedIndex = idx
+            val area = list.getCellBounds(idx, idx)
+            fire(list, mouse(list, MouseEvent.MOUSE_CLICKED, center(area), count = 2))
+            true
+        }
+    }
+
+    private fun rows(panel: SkillsSettingsUi): List<SettingsListItem> = items(skillsList(panel))
+
+    private fun sourceRows(panel: SkillsSettingsUi): List<SettingsListItem> = items(sourceList(panel))
+
+    private fun items(list: JBList<SettingsListItem>): List<SettingsListItem> {
+        val model = list.model
+        return (0 until model.size).map { model.getElementAt(it) }
+    }
+
+    private fun skillsList(panel: SkillsSettingsUi) = components(panel).filterIsInstance<JBList<SettingsListItem>>().first()
+
+    private fun sourceList(panel: SkillsSettingsUi) = components(panel).filterIsInstance<JBList<SettingsListItem>>().last()
+
+    private fun scrollFor(panel: SkillsSettingsUi, list: JBList<SettingsListItem>) = components(panel)
+        .filterIsInstance<JBScrollPane>()
+        .single { pane -> pane.viewport.view === list.parent }
+
+    private fun progressText(panel: SkillsSettingsUi) = components(panel.progress).filterIsInstance<JBLabel>().single().text
+
+    private fun SkillEditDialog.okText(): String {
+        val method = DialogWrapper::class.java.getDeclaredMethod("getOKAction")
+        method.isAccessible = true
+        return (method.invoke(this) as javax.swing.Action).getValue(javax.swing.Action.NAME) as String
+    }
+
+    private fun components(root: java.awt.Component): List<java.awt.Component> {
+        val out = mutableListOf<java.awt.Component>()
+        fun visit(item: java.awt.Component) {
+            out += item
+            if (item is Container) item.components.forEach { visit(it) }
+        }
+        visit(root)
+        return out
+    }
+
+    private fun layout(root: java.awt.Component) {
+        root.doLayout()
+        if (root is Container) root.components.filterIsInstance<Container>().forEach { layout(it) }
+        UIUtil.dispatchAllInvocationEvents()
+    }
+
+    private fun center(rect: java.awt.Rectangle) = Point(rect.x + rect.width / 2, rect.y + rect.height / 2)
+
+    private fun click(list: JBList<SettingsListItem>, point: Point) {
+        fire(list, mouse(list, MouseEvent.MOUSE_PRESSED, point))
+        fire(list, mouse(list, MouseEvent.MOUSE_RELEASED, point))
+    }
+
+    private fun mouse(list: JBList<SettingsListItem>, id: Int, point: Point, count: Int = 1) = MouseEvent(
+        list,
+        id,
+        System.currentTimeMillis(),
+        if (id == MouseEvent.MOUSE_PRESSED) InputEvent.BUTTON1_DOWN_MASK else 0,
+        point.x,
+        point.y,
+        count,
+        false,
+        MouseEvent.BUTTON1,
+    )
+
+    private fun <T> edt(block: () -> T): T {
+        var result: T? = null
+        ApplicationManager.getApplication().invokeAndWait { result = block() }
+        @Suppress("UNCHECKED_CAST")
+        return result as T
+    }
+
+    private fun flushUntil(done: () -> Boolean) = runBlocking {
+        repeat(300) {
+            delay(10)
+            edt { UIUtil.dispatchAllInvocationEvents(); true }
+            if (done()) return@runBlocking
+        }
+        edt { UIUtil.dispatchAllInvocationEvents(); true }
+        assertTrue(done())
+    }
+
+    private companion object {
+        const val DIR = "/test"
+        const val CUSTOM = "/home/test/.config/kilo/skill/plan/SKILL.md"
+        const val REMOTE = "/home/test/.cache/kilo/skills/remote/SKILL.md"
+    }
+}
+
+private class FakeSkillDialog(private val text: String, private val show: () -> Unit = {}) : SkillEditDialogHandle {
+    override fun showAndGet(): Boolean {
+        show()
+        return true
+    }
+    override fun content() = text
+}
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsDraftStateTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsDraftStateTest.kt
index 89efbeb3de..f9cb8f4b8c 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsDraftStateTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsDraftStateTest.kt
@@ -88,6 +88,66 @@ class SettingsDraftStateTest {
         assertFalse(state.modified())
     }
 
+    @Test
+    fun `stale external base after fallback completion does not revert applied target`() {
+        val state = SettingsDraftState("old")
+        state.update { "new" }
+        val token = state.start()!!
+        state.complete(token, "old")
+
+        state.accept("old")
+
+        assertEquals("new", state.baseline)
+        assertEquals("new", state.draft)
+        assertFalse(state.modified())
+    }
+
+    @Test
+    fun `stale external base after fresh completion does not revert applied target`() {
+        val state = SettingsDraftState("old")
+        state.update { "new" }
+        val token = state.start()!!
+        state.complete(token, "new")
+
+        state.accept("old")
+
+        assertEquals("new", state.baseline)
+        assertEquals("new", state.draft)
+        assertFalse(state.modified())
+    }
+
+    @Test
+    fun `fresh external base after ignored stale update is accepted`() {
+        val state = SettingsDraftState("old")
+        state.update { "new" }
+        val token = state.start()!!
+        state.complete(token, "old")
+        state.accept("old")
+
+        state.accept("other")
+
+        assertEquals("other", state.baseline)
+        assertEquals("other", state.draft)
+        assertFalse(state.modified())
+    }
+
+    @Test
+    fun `older stale external base after multiple saves is ignored`() {
+        val state = SettingsDraftState("old")
+        state.update { "new" }
+        val first = state.start()!!
+        state.complete(first, "new")
+        state.update { "other" }
+        val second = state.start()!!
+        state.complete(second, "other")
+
+        state.accept("old")
+
+        assertEquals("other", state.baseline)
+        assertEquals("other", state.draft)
+        assertFalse(state.modified())
+    }
+
     @Test
     fun `failed save keeps draft dirty and restores previous base`() {
         val state = SettingsDraftState("old")
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsListViewTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsListViewTest.kt
index ca7f5cd7c8..d7f79d4ddf 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsListViewTest.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/base/SettingsListViewTest.kt
@@ -14,6 +14,9 @@ import java.awt.Dimension
 import java.awt.Point
 import java.awt.event.InputEvent
 import java.awt.event.MouseEvent
+import javax.swing.ListSelectionModel
+import javax.swing.Scrollable
+import javax.swing.SwingConstants
 import javax.swing.SwingUtilities
 
 class SettingsListViewTest : BasePlatformTestCase() {
@@ -236,6 +239,25 @@ class SettingsListViewTest : BasePlatformTestCase() {
         }
     }
 
+    fun `test action click invokes on second selected row in multi selection list`() {
+        edt {
+            val calls = mutableListOf<String>()
+            val cfg = SettingsListConfig.Equal.copy(selection = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
+            val view = SettingsListView("Empty", cfg) { key, id -> calls += "$key:$id" }
+            view.update(listOf(
+                item("a", "Alpha", null, SettingsListCell("edit", "Edit", alwaysVisible = false)),
+                item("b", "Beta", null, SettingsListCell("edit", "Edit", alwaysVisible = false)),
+            ))
+            layout(view)
+            view.list.selectedIndices = intArrayOf(0, 1)
+
+            val area = settingsListCellBounds(view.list, 1, selected = true).getValue("edit")
+            click(view, center(area))
+
+            assertEquals(listOf("b:edit"), calls)
+        }
+    }
+
     fun `test update selects preferred key`() {
         edt {
             val view = SettingsListView("Empty") { _, _ -> }
@@ -260,6 +282,17 @@ class SettingsListViewTest : BasePlatformTestCase() {
         }
     }
 
+    fun `test list view tracks viewport width`() {
+        edt {
+            val view = SettingsListView("Empty") { _, _ -> }
+            view.update(listOf(item("long", "Alpha", "A very long description that should wrap instead of scrolling")))
+
+            assertTrue((view as Scrollable).getScrollableTracksViewportWidth())
+            assertFalse(view.getScrollableTracksViewportHeight())
+            assertEquals(160, view.getScrollableBlockIncrement(java.awt.Rectangle(0, 0, 320, 160), SwingConstants.VERTICAL, 1))
+        }
+    }
+
     private fun item(id: String, name: String, note: String?, vararg cells: SettingsListCell) = object : SettingsListItem {
         override val key = id
         override val title = name
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsStateTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsStateTest.kt
new file mode 100644
index 0000000000..8fc6dd6179
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsStateTest.kt
@@ -0,0 +1,76 @@
+package ai.kilocode.client.settings.context
+
+import ai.kilocode.rpc.dto.CompactionConfigDto
+import ai.kilocode.rpc.dto.ConfigDto
+import ai.kilocode.rpc.dto.WatcherConfigDto
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+class ContextSettingsStateTest {
+    @Test
+    fun `draft reads context config`() {
+        val draft = contextDraft(ConfigDto(
+            watcher = WatcherConfigDto(ignore = listOf("**/dist/**")),
+            compaction = CompactionConfigDto(auto = true, threshold_percent = 75.0, prune = true),
+        ))
+
+        assertEquals(true, draft.auto)
+        assertEquals("75", draft.threshold)
+        assertEquals(true, draft.prune)
+        assertEquals(listOf("**/dist/**"), draft.ignore)
+    }
+
+    @Test
+    fun `unchanged draft emits no patch`() {
+        val draft = ContextDraft(auto = true, threshold = "75", prune = false, ignore = listOf("tmp/**"))
+
+        assertEquals(false, patch(draft, draft)?.let(::changed))
+    }
+
+    @Test
+    fun `boolean false values are emitted`() {
+        val from = ContextDraft(auto = true, prune = true)
+        val to = ContextDraft(auto = false, prune = false)
+        val patch = patch(from, to)
+
+        assertEquals(false, patch?.compaction?.auto)
+        assertEquals(false, patch?.compaction?.prune)
+    }
+
+    @Test
+    fun `threshold set and clear use explicit semantics`() {
+        val from = ContextDraft(threshold = "")
+        val set = ContextDraft(threshold = "80")
+        val clear = ContextDraft(threshold = "")
+
+        assertEquals(80.0, patch(from, set)?.compaction?.threshold_percent)
+        assertEquals(listOf("threshold_percent"), patch(set, clear)?.compaction?.clear)
+        assertNull(patch(set, clear)?.compaction?.threshold_percent)
+    }
+
+    @Test
+    fun `watcher empty list is emitted`() {
+        val from = ContextDraft(ignore = listOf("**/dist/**"))
+        val to = ContextDraft(ignore = emptyList())
+
+        assertEquals(emptyList(), patch(from, to)?.watcher?.ignore)
+    }
+
+    @Test
+    fun `invalid threshold prevents patch without looking like no changes`() {
+        val from = ContextDraft(threshold = "50")
+        val to = ContextDraft(auto = true, threshold = "101", prune = true, ignore = listOf("tmp/**"))
+
+        assertEquals(ThresholdStatus.INVALID, thresholdStatus(to.threshold))
+        assertNull(patch(from, to))
+    }
+
+    @Test
+    fun `saved match normalizes threshold formatting`() {
+        assertTrue(savedMatches(ContextDraft(threshold = "75"), ContextDraft(threshold = "75.0")))
+        assertFalse(savedMatches(ContextDraft(threshold = "75"), ContextDraft(threshold = "76")))
+    }
+}
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsUiTest.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsUiTest.kt
new file mode 100644
index 0000000000..80c5a2e1c4
--- /dev/null
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/settings/context/ContextSettingsUiTest.kt
@@ -0,0 +1,324 @@
+package ai.kilocode.client.settings.context
+
+import ai.kilocode.client.app.KiloAppService
+import ai.kilocode.client.app.KiloWorkspaceService
+import ai.kilocode.client.settings.base.SettingsToggle
+import ai.kilocode.client.ui.HoverIcon
+import ai.kilocode.client.testing.FakeAppRpcApi
+import ai.kilocode.client.testing.FakeWorkspaceRpcApi
+import ai.kilocode.rpc.dto.CompactionConfigDto
+import ai.kilocode.rpc.dto.ConfigDto
+import ai.kilocode.rpc.dto.KiloAppStateDto
+import ai.kilocode.rpc.dto.KiloAppStatusDto
+import ai.kilocode.rpc.dto.WatcherConfigDto
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.ui.components.JBList
+import com.intellij.ui.components.JBTextField
+import com.intellij.util.ui.UIUtil
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import java.awt.Container
+import java.awt.event.MouseEvent
+import javax.swing.AbstractButton
+import javax.swing.JComponent
+import javax.swing.JLabel
+import javax.swing.ListSelectionModel
+import javax.swing.JTextField
+import javax.swing.text.AbstractDocument
+import javax.swing.text.JTextComponent
+
+class ContextSettingsUiTest : BasePlatformTestCase() {
+    private lateinit var appScope: CoroutineScope
+    private lateinit var uiScope: CoroutineScope
+    private lateinit var rpc: FakeAppRpcApi
+    private lateinit var workspaceRpc: FakeWorkspaceRpcApi
+    private lateinit var app: KiloAppService
+    private lateinit var workspaces: KiloWorkspaceService
+    private var ui: ContextSettingsUi? = null
+
+    override fun setUp() {
+        super.setUp()
+        appScope = CoroutineScope(SupervisorJob())
+        uiScope = CoroutineScope(SupervisorJob())
+        rpc = FakeAppRpcApi()
+        workspaceRpc = FakeWorkspaceRpcApi()
+        app = KiloAppService(appScope, rpc)
+        workspaces = KiloWorkspaceService(appScope, workspaceRpc)
+        val state = KiloAppStateDto(
+            KiloAppStatusDto.READY,
+            config = ConfigDto(
+                watcher = WatcherConfigDto(ignore = listOf("tmp/**")),
+                compaction = CompactionConfigDto(auto = true, threshold_percent = 75.0, prune = true),
+            ),
+        )
+        rpc.state.value = state
+        app._state.value = state
+        edt { ui = ContextSettingsUi(uiScope, app, workspaces) }
+        flushUntil { text(requireUi()).contains("Auto Compaction") }
+    }
+
+    override fun tearDown() {
+        try {
+            val panel = ui
+            if (panel != null) edt { panel.dispose() }
+            ui = null
+            uiScope.cancel()
+            appScope.cancel()
+        } finally {
+            super.tearDown()
+        }
+    }
+
+    fun `test toggling compaction sends boolean false values`() {
+        val panel = requireUi()
+
+        edt {
+            val toggles = components(panel).filterIsInstance<SettingsToggle>()
+            toggles[0].doClick()
+            toggles[1].doClick()
+            panel.applyDraft()
+        }
+
+        flushUntil { rpc.configPatches.isNotEmpty() }
+        val patch = rpc.configPatches.single()
+        assertEquals(false, patch.compaction?.auto)
+        assertEquals(false, patch.compaction?.prune)
+    }
+
+    fun `test editing threshold sends number`() {
+        val panel = requireUi()
+
+        edt {
+            threshold(panel).text = "80"
+            panel.applyDraft()
+        }
+
+        flushUntil { rpc.configPatches.isNotEmpty() }
+        assertEquals(80.0, rpc.configPatches.single().compaction?.threshold_percent)
+    }
+
+    fun `test threshold row shows percent label and rejects out of range values`() {
+        val panel = requireUi()
+
+        edt {
+            val field = threshold(panel)
+            assertTrue(text(panel).contains("%"))
+            assertTrue(text(panel).contains("Auto Compaction Limit"))
+            assertTrue(text(panel).contains("Prune Old Outputs"))
+            assertEquals("Default", field.emptyText.text)
+            field.text = ""
+            field.text = "101"
+            assertEquals("", field.text)
+            field.text = "100"
+            assertEquals("100", field.text)
+            (field.document as AbstractDocument).replace(0, field.document.length, "-1", null)
+            assertEquals("100", field.text)
+        }
+    }
+
+    fun `test clearing threshold sends clear patch`() {
+        val panel = requireUi()
+
+        edt {
+            threshold(panel).text = ""
+            panel.applyDraft()
+        }
+
+        flushUntil { rpc.configPatches.isNotEmpty() }
+        assertEquals(listOf("threshold_percent"), rpc.configPatches.single().compaction?.clear)
+    }
+
+    fun `test adding watcher pattern sends full list`() {
+        val panel = requireUi()
+
+        edt {
+            val patterns = components(panel).filterIsInstance<PatternList>().single()
+            patterns.input = { "**/dist/**" }
+            icon(panel, "Add pattern").doClick()
+            assertEquals(listOf("**/dist/**"), patternList(panel).selectedValuesList)
+            panel.applyDraft()
+        }
+
+        flushUntil { rpc.configPatches.isNotEmpty() }
+        assertEquals(listOf("tmp/**", "**/dist/**"), rpc.configPatches.single().watcher?.ignore)
+    }
+
+    fun `test stale config update result keeps watcher pattern visible`() {
+        val panel = requireUi()
+        rpc.configUpdateReturnStale = true
+
+        edt {
+            val patterns = components(panel).filterIsInstance<PatternList>().single()
+            patterns.input = { "**/dist/**" }
+            icon(panel, "Add pattern").doClick()
+            panel.applyDraft()
+        }
+
+        flushUntil { rpc.configPatches.isNotEmpty() && !edt { panel.modified() } }
+        edt {
+            val list = patternList(panel)
+            assertEquals(listOf("**/dist/**"), list.selectedValuesList)
+            assertEquals(listOf("tmp/**", "**/dist/**"), (0 until list.model.size).map { list.model.getElementAt(it) })
+        }
+    }
+
+    fun `test removing selected watcher patterns supports multi selection`() {
+        val panel = requireUi()
+
+        edt {
+            val patterns = components(panel).filterIsInstance<PatternList>().single()
+            val inputs = ArrayDeque(listOf("**/dist/**", "**/build/**"))
+            patterns.input = { inputs.removeFirst() }
+            icon(panel, "Add pattern").doClick()
+            icon(panel, "Add pattern").doClick()
+            val list = patternList(panel)
+            assertEquals(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION, list.selectionMode)
+            list.setSelectionInterval(0, 1)
+            icon(panel, "Remove selected patterns").doClick()
+            panel.applyDraft()
+        }
+
+        flushUntil { rpc.configPatches.isNotEmpty() }
+        assertEquals(listOf("**/build/**"), rpc.configPatches.single().watcher?.ignore)
+    }
+
+    fun `test double clicking watcher pattern edits it`() {
+        val panel = requireUi()
+
+        edt {
+            val patterns = components(panel).filterIsInstance<PatternList>().single()
+            patterns.editor = { "**/edited/**" }
+            val list = patternList(panel)
+            list.setSize(400, 100)
+            list.doLayout()
+            val bounds = list.getCellBounds(0, 0)
+            val event = MouseEvent(
+                list,
+                MouseEvent.MOUSE_CLICKED,
+                System.currentTimeMillis(),
+                0,
+                bounds.x + 1,
+                bounds.y + 1,
+                2,
+                false,
+                MouseEvent.BUTTON1,
+            )
+            list.mouseListeners.forEach { it.mouseClicked(event) }
+            assertEquals(listOf("**/edited/**"), list.selectedValuesList)
+            panel.applyDraft()
+        }
+
+        flushUntil { rpc.configPatches.isNotEmpty() }
+        assertEquals(listOf("**/edited/**"), rpc.configPatches.single().watcher?.ignore)
+    }
+
+    fun `test watcher pattern renderer has left inset`() {
+        val panel = requireUi()
+
+        edt {
+            val list = patternList(panel)
+            val comp = list.cellRenderer.getListCellRendererComponent(list, "tmp/**", 0, false, false) as JComponent
+            assertTrue(comp.insets.left > 0)
+        }
+    }
+
+    fun `test watcher section does not repeat ignored patterns row title`() {
+        val panel = requireUi()
+
+        edt {
+            assertFalse(text(panel).contains("Ignored patterns"))
+            assertTrue(text(panel).contains("File Watcher Ignore Patterns"))
+            assertEquals(1, components(panel).filterIsInstance<JTextField>().size)
+        }
+    }
+
+    fun `test failed apply stays visible while panel open`() {
+        val panel = requireUi()
+        rpc.configUpdateError = RuntimeException("save failed")
+
+        edt {
+            threshold(panel).text = "80"
+            panel.applyDraft()
+        }
+
+        flushUntil { text(panel).contains("Failed to save context settings") }
+        edt {
+            assertTrue(text(panel.progress).contains("Failed to save context settings"))
+            assertTrue(panel.modified())
+        }
+    }
+
+    fun `test controls are disabled during pending save`() {
+        val panel = requireUi()
+        rpc.configUpdateGate = CompletableDeferred()
+
+        edt {
+            threshold(panel).text = "80"
+            panel.applyDraft()
+            assertTrue(components(panel).filterIsInstance<SettingsToggle>().all { !it.isEnabled })
+            assertFalse(threshold(panel).isEnabled)
+        }
+
+        rpc.configUpdateGate?.complete(Unit)
+        flushUntil { rpc.configPatches.isNotEmpty() }
+    }
+
+    private fun requireUi(): ContextSettingsUi = requireNotNull(ui)
+
+    private fun threshold(panel: ContextSettingsUi): JBTextField = components(panel)
+        .filterIsInstance<JBTextField>()
+        .single { it.columns == 8 }
+
+    private fun patternList(panel: ContextSettingsUi): JBList<String> {
+        val list = components(panel).filterIsInstance<JBList<*>>().single()
+        @Suppress("UNCHECKED_CAST")
+        return list as JBList<String>
+    }
+
+    private fun icon(panel: ContextSettingsUi, tip: String): HoverIcon = components(panel)
+        .filterIsInstance<HoverIcon>()
+        .single { it.toolTipText == tip }
+
+    private fun <T> edt(block: () -> T): T {
+        var result: T? = null
+        ApplicationManager.getApplication().invokeAndWait { result = block() }
+        @Suppress("UNCHECKED_CAST")
+        return result as T
+    }
+
+    private fun flushUntil(done: () -> Boolean) = runBlocking {
+        repeat(200) {
+            delay(10)
+            edt { UIUtil.dispatchAllInvocationEvents() }
+            if (done()) return@runBlocking
+        }
+        edt { UIUtil.dispatchAllInvocationEvents() }
+        assertTrue(done())
+    }
+
+    private fun text(root: Container): String {
+        val out = mutableListOf<String>()
+        for (comp in components(root)) {
+            if (!comp.isVisible) continue
+            when (comp) {
+                is AbstractButton -> comp.text?.let { out.add(it) }
+                is JLabel -> comp.text?.let { out.add(it) }
+                is JTextComponent -> comp.text?.let { out.add(it) }
+            }
+        }
+        return out.joinToString("\n")
+    }
+
+    private fun components(root: Container): List<java.awt.Component> = buildList {
+        fun visit(comp: java.awt.Component) {
+            add(comp)
+            if (comp is Container) comp.components.forEach { visit(it) }
+        }
+        visit(root)
+    }
+}
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAgentBehaviorRpcApi.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAgentBehaviorRpcApi.kt
index bbcc487317..1d5d5c5afb 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAgentBehaviorRpcApi.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAgentBehaviorRpcApi.kt
@@ -11,9 +11,14 @@ import ai.kilocode.rpc.dto.SkillDto
 
 class FakeAgentBehaviorRpcApi : KiloAgentBehaviorRpcApi {
     var agents = emptyList<AgentDetailDto>()
+    var skills = emptyList<SkillDto>()
     var mcps = emptyList<McpStatusDto>()
     var mcpConfigs = emptyMap<String, McpServerConfigDto>()
     val agentCalls = mutableListOf<String>()
+    val skillCalls = mutableListOf<String>()
+    val skillRemovals = mutableListOf<Pair<String, String>>()
+    val skillReloads = mutableListOf<String>()
+    val skillSaves = mutableListOf<Triple<String, String, String>>()
     val mcpCalls = mutableListOf<String>()
     val mcpConfigCalls = mutableListOf<String>()
     val mcpSaves = mutableListOf<Triple<String, String, McpConfigDto?>>()
@@ -27,10 +32,16 @@ class FakeAgentBehaviorRpcApi : KiloAgentBehaviorRpcApi {
     var afterRemove: (suspend (String, String) -> Unit)? = null
     var afterMcpConnect: (suspend (String, String) -> Unit)? = null
     var createError: Exception? = null
+    var skillsError: Exception? = null
     var removeError: Exception? = null
+    var removeSkillError: Exception? = null
+    var saveSkillError: Exception? = null
     var mcpStatusError: Exception? = null
     var mcpConnectError: Exception? = null
     var removeResult = true
+    var removeSkillResult = true
+    var reloadSkillResult = true
+    var saveSkillResult = true
     var mcpConnectResult = true
     var mcpDisconnectResult = true
     var mcpAuthenticateResult = true
@@ -43,12 +54,41 @@ class FakeAgentBehaviorRpcApi : KiloAgentBehaviorRpcApi {
 
     override suspend fun skills(directory: String): List<SkillDto> {
         assertNotEdt("agentBehavior.skills")
-        return emptyList()
+        skillsError?.let { throw it }
+        skillCalls.add(directory)
+        return skills
     }
 
     override suspend fun removeSkill(directory: String, location: String): Boolean {
         assertNotEdt("agentBehavior.removeSkill")
-        return false
+        removeSkillError?.let { throw it }
+        skillRemovals.add(directory to location)
+        if (removeSkillResult) skills = skills.filterNot { it.location == location }
+        return removeSkillResult
+    }
+
+    override suspend fun reloadSkills(directory: String): Boolean {
+        assertNotEdt("agentBehavior.reloadSkills")
+        skillReloads.add(directory)
+        return reloadSkillResult
+    }
+
+    override suspend fun saveSkill(directory: String, location: String, content: String): Boolean {
+        assertNotEdt("agentBehavior.saveSkill")
+        saveSkillError?.let { throw it }
+        skillSaves.add(Triple(directory, location, content))
+        if (saveSkillResult) skills = skills.map { if (it.location == location) it.copy(content = content) else it }
+        return saveSkillResult
+    }
+
+    override suspend fun saveSkills(directory: String, edits: Map<String, String>): Boolean {
+        assertNotEdt("agentBehavior.saveSkills")
+        saveSkillError?.let { throw it }
+        for ((location, content) in edits) skillSaves.add(Triple(directory, location, content))
+        if (saveSkillResult) skills = skills.map { skill ->
+            edits[skill.location]?.let { skill.copy(content = it) } ?: skill
+        }
+        return saveSkillResult
     }
 
     override suspend fun removeAgent(directory: String, name: String): Boolean {
diff --git a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
index ed6e3e928f..57868aadf0 100644
--- a/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
+++ b/packages/kilo-jetbrains/frontend/src/test/kotlin/ai/kilocode/client/testing/FakeAppRpcApi.kt
@@ -2,6 +2,7 @@ package ai.kilocode.client.testing
 
 import ai.kilocode.rpc.KiloAppRpcApi
 import ai.kilocode.rpc.dto.AgentConfigDto
+import ai.kilocode.rpc.dto.CompactionConfigDto
 import ai.kilocode.rpc.dto.ConfigDto
 import ai.kilocode.rpc.dto.ConfigPatchDto
 import ai.kilocode.rpc.dto.DeviceAuthDto
@@ -16,6 +17,7 @@ import ai.kilocode.rpc.dto.ModelVariantUpdateDto
 import ai.kilocode.rpc.dto.ProfileDto
 import ai.kilocode.rpc.dto.SkillsConfigDto
 import ai.kilocode.rpc.dto.TelemetryCaptureDto
+import ai.kilocode.rpc.dto.WatcherConfigDto
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -196,12 +198,34 @@ class FakeAppRpcApi : KiloAppRpcApi {
         val mcp = patch.mcp?.entries?.fold(config.mcp) { acc, (name, item) ->
             if (item == null) acc - name else acc + (name to item)
         } ?: config.mcp
+        val watcher = patch.watcher?.let { item ->
+            val cfg = config.watcher
+            cfg?.copy(ignore = item.ignore ?: cfg.ignore)
+                ?: WatcherConfigDto(ignore = item.ignore ?: emptyList())
+        } ?: config.watcher
+        val compaction = patch.compaction?.let { item ->
+            val cfg = item.clear.fold(config.compaction ?: CompactionConfigDto()) { next, field ->
+                when (field) {
+                    "threshold_percent" -> next.copy(threshold_percent = null)
+                    "auto" -> next.copy(auto = null)
+                    "prune" -> next.copy(prune = null)
+                    else -> next
+                }
+            }
+            cfg.copy(
+                auto = item.auto ?: cfg.auto,
+                threshold_percent = item.threshold_percent ?: cfg.threshold_percent,
+                prune = item.prune ?: cfg.prune,
+            )
+        } ?: config.compaction
         return config.copy(
             defaultAgent = if (values.containsKey("default_agent")) values["default_agent"] else config.defaultAgent,
             model = if (values.containsKey("model")) values["model"] else config.model,
             smallModel = if (values.containsKey("small_model")) values["small_model"] else config.smallModel,
             subagentModel = if (values.containsKey("subagent_model")) values["subagent_model"] else config.subagentModel,
             subagentVariant = if (values.containsKey("subagent_variant")) values["subagent_variant"] else config.subagentVariant,
+            watcher = watcher,
+            compaction = compaction,
             instructions = patch.instructions ?: config.instructions,
             skills = patch.skills?.let { SkillsConfigDto(paths = it.paths.orEmpty(), urls = it.urls.orEmpty()) } ?: config.skills,
             mcp = mcp,
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAgentBehaviorRpcApi.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAgentBehaviorRpcApi.kt
index 345ab0657c..b13c03d526 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAgentBehaviorRpcApi.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloAgentBehaviorRpcApi.kt
@@ -26,6 +26,12 @@ interface KiloAgentBehaviorRpcApi : RemoteApi<Unit> {
 
     suspend fun removeSkill(directory: String, location: String): Boolean
 
+    suspend fun reloadSkills(directory: String): Boolean
+
+    suspend fun saveSkill(directory: String, location: String, content: String): Boolean
+
+    suspend fun saveSkills(directory: String, edits: Map<String, String>): Boolean
+
     suspend fun removeAgent(directory: String, name: String): Boolean
 
     suspend fun createAgent(directory: String, input: AgentCreateDto): Boolean
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloWorkspaceRpcApi.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloWorkspaceRpcApi.kt
index 0356b6c0e6..1e267a0729 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloWorkspaceRpcApi.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/KiloWorkspaceRpcApi.kt
@@ -48,7 +48,7 @@ interface KiloWorkspaceRpcApi : RemoteApi<Unit> {
     /** Resolve [path] to matching files, scoped primarily to [directory]. */
     suspend fun files(directory: String, path: String): List<WorkspaceFileDto>
 
-    /** Fuzzy file/folder search via the backend IDE index. */
+    /** Fuzzy file/folder search via Kilo Core. */
     suspend fun searchFiles(directory: String, query: String, limit: Int = 50): FileSearchResultDto
 
     /** Current uncommitted git changes as a unified diff for @git-changes mentions. */
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
index 4667d8f7b1..1ab2f302bd 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/KiloAppStateDto.kt
@@ -64,12 +64,26 @@ data class ConfigDto(
     val subagentModel: String? = null,
     val subagentVariant: String? = null,
     val defaultAgent: String? = null,
+    val watcher: WatcherConfigDto? = null,
+    val compaction: CompactionConfigDto? = null,
     val instructions: List<String> = emptyList(),
     val skills: SkillsConfigDto? = null,
     val mcp: Map<String, McpConfigDto> = emptyMap(),
     val agent: Map<String, AgentConfigDto> = emptyMap(),
 )
 
+@Serializable
+data class WatcherConfigDto(
+    val ignore: List<String> = emptyList(),
+)
+
+@Serializable
+data class CompactionConfigDto(
+    val auto: Boolean? = null,
+    val threshold_percent: Double? = null,
+    val prune: Boolean? = null,
+)
+
 @Serializable
 data class SkillsConfigDto(
     val paths: List<String> = emptyList(),
@@ -109,12 +123,27 @@ sealed class PermissionRuleDto {
 @Serializable
 data class ConfigPatchDto(
     val values: Map<String, String?> = emptyMap(),
+    val watcher: WatcherPatchDto? = null,
+    val compaction: CompactionPatchDto? = null,
     val instructions: List<String>? = null,
     val skills: SkillsPatchDto? = null,
     val mcp: Map<String, McpConfigDto?>? = null,
     val agents: Map<String, AgentConfigPatchDto> = emptyMap(),
 )
 
+@Serializable
+data class WatcherPatchDto(
+    val ignore: List<String>? = null,
+)
+
+@Serializable
+data class CompactionPatchDto(
+    val clear: List<String> = emptyList(),
+    val auto: Boolean? = null,
+    val threshold_percent: Double? = null,
+    val prune: Boolean? = null,
+)
+
 @Serializable
 data class AgentConfigPatchDto(
     val clear: List<String> = emptyList(),
diff --git a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/SkillDto.kt b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/SkillDto.kt
index 6bdd4f9805..50dfee7adf 100644
--- a/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/SkillDto.kt
+++ b/packages/kilo-jetbrains/shared/src/main/kotlin/ai/kilocode/rpc/dto/SkillDto.kt
@@ -7,4 +7,6 @@ data class SkillDto(
     val name: String,
     val description: String? = null,
     val location: String,
+    val content: String? = null,
+    val editable: Boolean = false,
 )
diff --git a/packages/kilo-memory/package.json b/packages/kilo-memory/package.json
index 741fdcf8de..5b6a4aab73 100644
--- a/packages/kilo-memory/package.json
+++ b/packages/kilo-memory/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-memory",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "description": "Project memory storage, indexing, recall, and command helpers for Kilo Code",
diff --git a/packages/kilo-memory/src/commands.ts b/packages/kilo-memory/src/commands.ts
index 8fcdbb8d4c..0b7d48d453 100644
--- a/packages/kilo-memory/src/commands.ts
+++ b/packages/kilo-memory/src/commands.ts
@@ -2,13 +2,12 @@ export const MEMORY_COMMAND_CATALOG = [
   { usage: "on", description: "Enable project memory" },
   { usage: "off", description: "Disable project memory" },
   { usage: "status", description: "Storage location and stored memory overview" },
-  { usage: "show", description: "Full audit view (sources, index, changes, decisions)" },
+  { usage: "show", description: "Stored project memory overview" },
   { usage: "remember <text>", description: "Save a project memory note" },
   { usage: "correct <text>", description: "Save a correction to project memory" },
   { usage: "forget <query>", description: "Remove matching project memory" },
   { usage: "auto on|off", description: "Turn automatic memory saves on or off" },
-  { usage: "verbose on|off", description: "Turn verbose memory details on or off" },
-  { usage: "edit", description: "Open project.md in $VISUAL/$EDITOR, then rebuild" },
+  { usage: "inspect", description: "Reveal the project memory folder" },
   { usage: "rebuild", description: "Rebuild the memory index from source files" },
   { usage: "purge confirm", description: "Delete all project memory files" },
 ] as const
@@ -18,7 +17,7 @@ export const MEMORY_USAGE = `/memory [project] ${MEMORY_COMMAND_CATALOG.map((ite
 export const MEMORY_OPERATIONS = [
   "enable",
   "status",
-  "edit",
+  "inspect",
   "disable",
   "rebuild",
   "remember",
@@ -26,21 +25,13 @@ export const MEMORY_OPERATIONS = [
   "forget",
   "purge",
   "auto",
-  "verbose",
 ] as const
-export const MEMORY_PROMPT_OPERATIONS = ["remember", "forget"] as const
-
 export type MemoryOperation = (typeof MEMORY_OPERATIONS)[number]
-export type MemoryPromptOperation = (typeof MEMORY_PROMPT_OPERATIONS)[number]
 
 export function isMemoryOperation(input: unknown): input is MemoryOperation {
   return typeof input === "string" && (MEMORY_OPERATIONS as readonly string[]).includes(input)
 }
 
-export function isMemoryPromptOperation(input: unknown): input is MemoryPromptOperation {
-  return typeof input === "string" && (MEMORY_PROMPT_OPERATIONS as readonly string[]).includes(input)
-}
-
 type Help = {
   kind: "help"
 }
@@ -62,7 +53,7 @@ type Operation =
     }
   | {
       kind: "operation"
-      operation: "auto" | "verbose"
+      operation: "auto"
       mode: "on" | "off"
     }
   | {
@@ -72,7 +63,7 @@ type Operation =
     }
   | {
       kind: "operation"
-      operation: Exclude<MemoryOperation, "remember" | "correct" | "forget" | "purge" | "auto" | "verbose">
+      operation: Exclude<MemoryOperation, "remember" | "correct" | "forget" | "purge" | "auto">
     }
 
 type Usage = {
@@ -104,7 +95,7 @@ function usage(reason: string): ParsedMemoryCommand {
 function operation(verb: string, text: string): ParsedMemoryCommand | undefined {
   if (verb === "on" || verb === "enable") return { kind: "operation", operation: "enable" }
   if (verb === "off" || verb === "disable") return { kind: "operation", operation: "disable" }
-  if (verb === "status" || verb === "edit" || verb === "rebuild") {
+  if (verb === "status" || verb === "inspect" || verb === "rebuild") {
     return { kind: "operation", operation: verb }
   }
   if (verb === "purge") {
@@ -116,11 +107,6 @@ function operation(verb: string, text: string): ParsedMemoryCommand | undefined
     if (mode === "on" || mode === "off") return { kind: "operation", operation: "auto", mode }
     return usage("Missing auto mode. Run /memory auto on or /memory auto off.")
   }
-  if (verb === "verbose") {
-    const mode = text.toLowerCase()
-    if (mode === "on" || mode === "off") return { kind: "operation", operation: "verbose", mode }
-    return usage("Missing verbose mode. Run /memory verbose on or /memory verbose off.")
-  }
   if (verb === "remember") {
     if (text) return { kind: "operation", operation: "remember", text }
     return usage("Missing text.")
diff --git a/packages/kilo-memory/src/effect/index.ts b/packages/kilo-memory/src/effect/index.ts
index ca94a98aa6..4a58e71bf3 100644
--- a/packages/kilo-memory/src/effect/index.ts
+++ b/packages/kilo-memory/src/effect/index.ts
@@ -46,7 +46,9 @@ export namespace KiloMemory {
   }
 
   export async function prepare(input: Input) {
-    return root(input)
+    const dir = root(input)
+    await MemoryFiles.cleanup(dir)
+    return dir
   }
 
   export async function status(input: Input) {
diff --git a/packages/kilo-memory/src/storage/audit.ts b/packages/kilo-memory/src/storage/audit.ts
index 1369ea1c67..70c7c42bf3 100644
--- a/packages/kilo-memory/src/storage/audit.ts
+++ b/packages/kilo-memory/src/storage/audit.ts
@@ -1,13 +1,7 @@
-import { appendFile, chmod } from "fs/promises"
-import path from "path"
 import z from "zod"
 import { MemoryFs } from "./fs"
-import { MemoryPaths } from "./paths"
-import { MemoryRedact } from "../capture/redact"
 
 export namespace MemoryAudit {
-  const MAX_LOG = 128_000
-  const LOG_MARGIN = 16_000
   const Log = z
     .object({
       kind: z.literal("log"),
@@ -49,45 +43,10 @@ export namespace MemoryAudit {
         }[]
       }
 
-  function cap(input: string) {
-    if (Buffer.byteLength(input) <= MAX_LOG) return input
-    const lines = input.split("\n").reverse()
-    const kept: string[] = []
-    lines.reduce((sum, line) => {
-      if (sum >= MAX_LOG) return sum
-      kept.push(line)
-      return sum + Buffer.byteLength(`${line}\n`)
-    }, 0)
-    return kept.reverse().join("\n")
-  }
-
-  async function line(file: string, text: string) {
-    await MemoryFs.dir(path.dirname(file))
-    const info = await MemoryFs.guard(file)
-    if (info && !info.isFile()) throw new Error(`memory path is not a file: ${file}`)
-    await appendFile(file, text, { mode: MemoryFs.FILE })
-    await chmod(file, MemoryFs.FILE).catch((error: unknown) => {
-      if (process.platform === "win32") return
-      throw error
-    })
-    const next = await MemoryFs.guard(file)
-    if (!next?.isFile()) throw new Error(`memory path is not a file: ${file}`)
-    if (next.size <= MAX_LOG + LOG_MARGIN) return
-    await MemoryFs.write(file, cap((await MemoryFs.read(file)) ?? ""))
-  }
-
-  async function audit(root: string, input: Decision) {
-    const data = MemoryRedact.value(input) as Decision
-    await MemoryFs.queue(root, () =>
-      line(
-        MemoryPaths.files(root).decisions,
-        `${JSON.stringify({
-          v: 1,
-          time: new Date().toISOString(),
-          ...data,
-        })}\n`,
-      ),
-    )
+  function audit(root: string, input: Decision) {
+    void root
+    void input
+    return Promise.resolve()
   }
 
   export async function append(root: string, text: string) {
@@ -99,12 +58,8 @@ export namespace MemoryAudit {
   }
 
   export async function readDecisions(root: string) {
-    return MemoryFs.read(MemoryPaths.files(root).decisions)
-      .then((text) => text ?? "")
-      .catch((error: unknown) => {
-        if (MemoryFs.miss(error)) return ""
-        throw error
-      })
+    void root
+    return ""
   }
 
   function record(input: string) {
diff --git a/packages/kilo-memory/src/storage/fs.ts b/packages/kilo-memory/src/storage/fs.ts
index 3b0130ff18..e9df6dcf17 100644
--- a/packages/kilo-memory/src/storage/fs.ts
+++ b/packages/kilo-memory/src/storage/fs.ts
@@ -109,6 +109,15 @@ export namespace MemoryFs {
     return readFile(file, "utf8")
   }
 
+  export async function remove(file: string) {
+    await parents(path.dirname(file))
+    const info = await guard(file)
+    if (!info) return false
+    if (!info.isFile()) throw new Error(`memory path is not a file: ${file}`)
+    await rm(file, { force: true })
+    return true
+  }
+
   export async function json(file: string) {
     const text = await read(file)
     return text === undefined ? undefined : JSON.parse(text)
diff --git a/packages/kilo-memory/src/storage/state.ts b/packages/kilo-memory/src/storage/state.ts
index e3e1728ec3..bb373e2461 100644
--- a/packages/kilo-memory/src/storage/state.ts
+++ b/packages/kilo-memory/src/storage/state.ts
@@ -10,6 +10,9 @@ import { MemoryText } from "../text"
 import { MemoryTopics } from "../recall/topics"
 
 export namespace MemoryState {
+  const CLEAN_LIMIT = 128
+  const CLEAN_RETRY_MS = 60_000
+  const cleaned = new Map<string, number>()
   const seed: Record<MemorySchema.Source, string> = {
     "project.md": "# Project Memory\n\n## Facts\n\n## Decisions\n\n## Constraints\n\n## Open Questions\n",
     "environment.md": "# Environment Memory\n\n## Commands\n\n## Paths\n\n## Tooling\n",
@@ -92,6 +95,38 @@ export namespace MemoryState {
     )
   }
 
+  export async function cleanup(root: string) {
+    const retry = cleaned.get(root)
+    if (retry !== undefined && retry > Date.now()) return false
+    cleaned.delete(root)
+    const owns = await owned(root).catch((error: unknown) => {
+      MemoryFs.warn("failed to inspect legacy memory audit", { error, root })
+      return undefined
+    })
+    if (owns !== true) {
+      if (owns === undefined) cache(root, Date.now() + CLEAN_RETRY_MS)
+      return false
+    }
+    const removed = await MemoryFs.remove(MemoryPaths.files(root).decisions).catch((error: unknown) => {
+      MemoryFs.warn("failed to remove legacy memory audit", { error, root })
+      return undefined
+    })
+    if (removed === undefined) {
+      cache(root, Date.now() + CLEAN_RETRY_MS)
+      return false
+    }
+    cache(root, Number.POSITIVE_INFINITY)
+    return removed
+  }
+
+  function cache(root: string, retry: number) {
+    cleaned.delete(root)
+    cleaned.set(root, retry)
+    if (cleaned.size <= CLEAN_LIMIT) return
+    const key = cleaned.keys().next().value
+    if (typeof key === "string") cleaned.delete(key)
+  }
+
   export async function readIndex(root: string) {
     const file = MemoryPaths.files(root).index
     return MemoryFs.read(file)
@@ -218,8 +253,9 @@ export namespace MemoryState {
       index: await readIndex(root),
       inventory,
       items: await inspect(root, inventory),
-      changes: await MemoryAudit.readChanges(root),
-      decisions: await MemoryAudit.readDecisions(root),
+      // Retain empty fields for wire compatibility while the legacy audit file is removed.
+      changes: "",
+      decisions: "",
     }
   }
 
diff --git a/packages/kilo-memory/src/storage/store.ts b/packages/kilo-memory/src/storage/store.ts
index c7ca4be45d..8d79568f6c 100644
--- a/packages/kilo-memory/src/storage/store.ts
+++ b/packages/kilo-memory/src/storage/store.ts
@@ -27,6 +27,7 @@ export namespace MemoryFiles {
   export const indexExpired = MemoryState.indexExpired
   export const scaffold = MemoryState.scaffold
   export const owned = MemoryState.owned
+  export const cleanup = MemoryState.cleanup
 
   export const writeSession = MemorySessions.writeSession
   export const readSession = MemorySessions.readSession
diff --git a/packages/kilo-memory/test/command-cases.json b/packages/kilo-memory/test/command-cases.json
index 1992f2dc48..dea1a43042 100644
--- a/packages/kilo-memory/test/command-cases.json
+++ b/packages/kilo-memory/test/command-cases.json
@@ -26,10 +26,10 @@
     "operation": "status"
   },
   {
-    "name": "edit operation",
-    "input": "/memory edit",
+    "name": "inspect operation",
+    "input": "/memory inspect",
     "result": "operation",
-    "operation": "edit"
+    "operation": "inspect"
   },
   {
     "name": "on operation",
@@ -94,26 +94,6 @@
     "operation": "auto",
     "mode": "off"
   },
-  {
-    "name": "verbose mode usage",
-    "input": "/memory verbose",
-    "result": "usage",
-    "reason": "Missing verbose mode"
-  },
-  {
-    "name": "verbose on operation",
-    "input": "/memory verbose on",
-    "result": "operation",
-    "operation": "verbose",
-    "mode": "on"
-  },
-  {
-    "name": "verbose off operation",
-    "input": "/memory verbose off",
-    "result": "operation",
-    "operation": "verbose",
-    "mode": "off"
-  },
   {
     "name": "remember operation keeps text",
     "input": "/memory remember use bun test from packages/opencode",
@@ -148,12 +128,6 @@
     "operation": "auto",
     "mode": "off"
   },
-  {
-    "name": "inspect action is unknown",
-    "input": "/memory inspect",
-    "result": "usage",
-    "reason": "Unknown memory action"
-  },
   {
     "name": "unknown action",
     "input": "/memory wat",
diff --git a/packages/kilo-memory/test/commands.test.ts b/packages/kilo-memory/test/commands.test.ts
index b91d4baad8..c5661b137a 100644
--- a/packages/kilo-memory/test/commands.test.ts
+++ b/packages/kilo-memory/test/commands.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { parseMemoryCommand, type MemoryOperation, type ParsedMemoryCommand } from "../src/commands"
+import { MEMORY_USAGE, parseMemoryCommand, type MemoryOperation, type ParsedMemoryCommand } from "../src/commands"
 
 type Case = {
   name: string
@@ -29,7 +29,7 @@ function expected(item: Case): ParsedMemoryCommand | undefined {
     if (!item.query) throw new Error(`Missing query for fixture: ${item.name}`)
     return { kind: "operation", operation: item.operation, query: item.query }
   }
-  if (item.operation === "auto" || item.operation === "verbose") {
+  if (item.operation === "auto") {
     if (!item.mode) throw new Error(`Missing mode for fixture: ${item.name}`)
     return { kind: "operation", operation: item.operation, mode: item.mode }
   }
@@ -41,6 +41,23 @@ function expected(item: Case): ParsedMemoryCommand | undefined {
 }
 
 describe("memory commands", () => {
+  test("does not expose verbose mode", () => {
+    expect(MEMORY_USAGE).not.toContain("verbose")
+    expect(parseMemoryCommand("/memory verbose on")).toEqual({
+      kind: "usage",
+      reason: "Unknown memory action: verbose.",
+    })
+  })
+
+  test("replaces edit with inspect", () => {
+    expect(MEMORY_USAGE).toContain("inspect")
+    expect(MEMORY_USAGE).not.toContain("edit")
+    expect(parseMemoryCommand("/memory edit")).toEqual({
+      kind: "usage",
+      reason: "Unknown memory action: edit.",
+    })
+  })
+
   test("parse shared fixtures", () => {
     for (const item of cases) {
       const parsed = parseMemoryCommand(item.input)
diff --git a/packages/kilo-memory/test/core.test.ts b/packages/kilo-memory/test/core.test.ts
index 388dcb6c1b..04b52a0362 100644
--- a/packages/kilo-memory/test/core.test.ts
+++ b/packages/kilo-memory/test/core.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test"
+import { describe, expect, spyOn, test } from "bun:test"
 import { mkdir, mkdtemp, readdir, rm, symlink, utimes, writeFile } from "fs/promises"
 import os from "os"
 import path from "path"
@@ -10,6 +10,7 @@ import { MemoryOperations } from "../src/capture/operations"
 import { MemoryPaths } from "../src/storage/paths"
 import { MemoryRecall } from "../src/recall/recall"
 import { MemorySchema } from "../src/schema"
+import { KiloMemory } from "../src/effect/index"
 
 async function tmp() {
   const dir = await mkdtemp(path.join(os.tmpdir(), "kilo-memory-"))
@@ -43,13 +44,119 @@ describe("memory core package", () => {
       expect(shown.sources.corrections).toContain("## Corrections")
       expect(await Bun.file(path.join(t.root, ".gitignore")).text()).toBe("*\n!.gitignore\n")
       expect(shown.index).toBe("")
+      expect(shown.changes).toBe("")
+      expect(shown.decisions).toBe("")
+      expect(await Bun.file(path.join(t.root, "decisions.jsonl")).exists()).toBe(false)
+    })
+  })
+
+  test("prepare removes legacy decisions once from owned memory roots", async () => {
+    await use(async (t) => {
+      await Memory.enable({ root: t.root })
+      const legacy = path.join(t.root, "decisions.jsonl")
+      await writeFile(legacy, '{"kind":"log"}\n')
+
+      await KiloMemory.status({ root: t.root })
+      expect(await Bun.file(legacy).exists()).toBe(false)
+
+      await writeFile(legacy, '{"kind":"log"}\n')
+      await KiloMemory.status({ root: t.root })
+      expect(await Bun.file(legacy).exists()).toBe(true)
+
+      const other = path.join(t.dir, "unowned")
+      await mkdir(other)
+      const file = path.join(other, "decisions.jsonl")
+      await writeFile(file, '{"kind":"log"}\n')
+
+      await KiloMemory.status({ root: other })
+      expect(await Bun.file(file).exists()).toBe(true)
+    })
+  })
+
+  test("prepare ignores legacy decisions cleanup failures", async () => {
+    const clock = spyOn(Date, "now")
+    const now = Date.now()
+    clock.mockReturnValue(now)
+    try {
+      await use(async (t) => {
+        await Memory.enable({ root: t.root })
+        const legacy = path.join(t.root, "decisions.jsonl")
+        await mkdir(legacy)
+
+        const status = await KiloMemory.status({ root: t.root })
+        expect(status.state.enabled).toBe(true)
+
+        await rm(legacy, { recursive: true })
+        await writeFile(legacy, '{"kind":"log"}\n')
+        await KiloMemory.status({ root: t.root })
+        expect(await Bun.file(legacy).exists()).toBe(true)
+
+        clock.mockReturnValue(now + 60_001)
+        await KiloMemory.status({ root: t.root })
+        expect(await Bun.file(legacy).exists()).toBe(false)
+      })
+    } finally {
+      clock.mockRestore()
+    }
+  })
+
+  test("prepare ignores corrupt manifests during legacy cleanup", async () => {
+    const clock = spyOn(Date, "now")
+    const now = Date.now()
+    clock.mockReturnValue(now)
+    try {
+      await use(async (t) => {
+        await Memory.enable({ root: t.root })
+        const paths = MemoryPaths.files(t.root)
+        await writeFile(paths.manifest, "{")
+
+        const status = await KiloMemory.status({ root: t.root })
+        expect(status.state.enabled).toBe(true)
+
+        await writeFile(paths.manifest, '{"kind":"kilo-memory","version":1}\n')
+        await writeFile(paths.decisions, '{"kind":"log"}\n')
+        await KiloMemory.status({ root: t.root })
+        expect(await Bun.file(paths.decisions).exists()).toBe(true)
+
+        clock.mockReturnValue(now + 60_001)
+        await KiloMemory.status({ root: t.root })
+        expect(await Bun.file(paths.decisions).exists()).toBe(false)
+      })
+    } finally {
+      clock.mockRestore()
+    }
+  })
+
+  test("legacy cleanup cache evicts older roots", async () => {
+    await use(async (t) => {
+      const first = path.join(t.dir, "cache-0")
+      await mkdir(first)
+      await MemoryFiles.writeManifest(first)
+      await MemoryFiles.cleanup(first)
+      const legacy = MemoryPaths.files(first).decisions
+      await writeFile(legacy, '{"kind":"log"}\n')
+
+      for (let i = 1; i <= 128; i++) {
+        const root = path.join(t.dir, `cache-${i}`)
+        await mkdir(root)
+        await MemoryFiles.writeManifest(root)
+        await MemoryFiles.cleanup(root)
+      }
+
+      await MemoryFiles.cleanup(first)
+      expect(await Bun.file(legacy).exists()).toBe(false)
     })
   })
 
   test("enable preserves existing memory settings", async () => {
     await use(async (t) => {
       const enabled = await Memory.enable({ root: t.root })
-      await MemoryFiles.writeState(t.root, { ...enabled.state, autoInject: false, autoConsolidate: false, verbose: true })
+      await MemoryFiles.writeState(t.root, {
+        ...enabled.state,
+        autoInject: false,
+        autoConsolidate: false,
+        verbose: true,
+      })
 
       const next = await Memory.enable({ root: t.root })
 
@@ -111,43 +218,7 @@ describe("memory core package", () => {
     })
   })
 
-  test("decision and change audit records redact secret-like text in one log", async () => {
-    await use(async (t) => {
-      const secret = "sk-abcdefghijklmnopqrstuvwxyz123456"
-      await Memory.enable({ root: t.root })
-      await MemoryFiles.decide(t.root, {
-        kind: "recall",
-        result: "skipped",
-        query: `check api_key=${secret}`,
-        skipped: [{ reason: "secret", text: `password=hunter2 ${secret}` }],
-      })
-      await MemoryFiles.append(t.root, `provider error "api_key": "${secret}"`)
-      const shown = await Memory.show({ root: t.root })
-
-      expect(shown.decisions).toContain("[redacted]")
-      expect(shown.decisions).toContain('"kind":"log"')
-      expect(shown.decisions).not.toContain(secret)
-      expect(shown.decisions).not.toContain("hunter2")
-      expect(shown.changes).toContain("[redacted]")
-      expect(shown.decisions).toContain("provider error")
-    })
-  })
-
-  test("targeted recall redacts query before decision truncation", async () => {
-    await use(async (t) => {
-      const secret = "sk-" + "a".repeat(40)
-      await Memory.enable({ root: t.root })
-
-      await Memory.recall({ root: t.root, query: "x".repeat(220) + secret })
-      const shown = await Memory.show({ root: t.root })
-
-      expect(shown.decisions).toContain("[redacted]")
-      expect(shown.decisions).not.toContain(secret)
-      expect(shown.decisions).not.toContain(secret.slice(0, 20))
-    })
-  })
-
-  test("stale locks are stolen before appending audit records", async () => {
+  test("stale locks are stolen before applying memory", async () => {
     await use(async (t) => {
       await Memory.enable({ root: t.root })
       const lock = path.join(t.root, ".lock")
@@ -155,10 +226,10 @@ describe("memory core package", () => {
       await mkdir(lock)
       await utimes(lock, old, old)
 
-      await MemoryFiles.append(t.root, "after stale lock")
+      await Memory.apply({ root: t.root, ops: [{ action: "add", key: "after_lock", text: "Stale locks recover." }] })
       const shown = await Memory.show({ root: t.root })
 
-      expect(shown.changes).toContain("after stale lock")
+      expect(shown.sources.project).toContain("after_lock")
     })
   })
 
@@ -174,7 +245,6 @@ describe("memory core package", () => {
       expect(state.enabled).toBe(false)
       expect(files.some((file) => file.startsWith("state.json.bad-"))).toBe(true)
       expect(shown.inventory.items).toEqual({})
-      expect(shown.changes).toContain("recover state.json")
     })
   })
 
@@ -280,7 +350,6 @@ describe("memory core package", () => {
       const shown = await Memory.show({ root: t.root })
 
       expect(mixed.result.added).toBe(1)
-      // The skip record is redacted: it flows into the persistent decisions audit.
       expect(mixed.result.skipped).toContainEqual({ reason: "secret", text: "[redacted]" })
       expect(JSON.stringify(mixed.result.skipped)).not.toContain("sk-abcdefghijklmnopqrstuvwxyz")
       expect(shown.sources.project).toContain("safe_fact")
@@ -335,7 +404,6 @@ describe("memory core package", () => {
       ])
       expect(shown.sources.project).not.toContain("memory_echo")
       expect(shown.index).not.toContain("memory_echo")
-      expect(shown.decisions).toContain('"reason":"self_referential"')
     })
   })
 
@@ -372,17 +440,10 @@ describe("memory core package", () => {
       expect(shown.sources.project).not.toContain("Vim keybindings")
       expect(shown.index).toContain("repo_style")
       expect(shown.index).not.toContain("reply_style")
-      expect(shown.decisions).toContain('"reason":"out_of_scope"')
-      expect(shown.decisions).not.toContain("reply_style")
-      expect(shown.decisions).not.toContain("theme")
-      expect(shown.decisions).not.toContain("editor")
-      expect(shown.decisions).not.toContain("I prefer terse summaries")
-      expect(shown.decisions).not.toContain("dark mode")
-      expect(shown.decisions).not.toContain("Vim keybindings")
     })
   })
 
-  test("out-of-scope secret ops stay out of the operations audit", async () => {
+  test("out-of-scope secret ops stay out of memory", async () => {
     await use(async (t) => {
       await Memory.enable({ root: t.root })
 
@@ -393,9 +454,8 @@ describe("memory core package", () => {
       const shown = await Memory.show({ root: t.root })
 
       expect(result.result.skipped).toEqual([{ reason: "out_of_scope", text: "My preference is [redacted]" }])
-      expect(shown.decisions).toContain('"reason":"out_of_scope"')
-      expect(shown.decisions).not.toContain("private_pref")
-      expect(shown.decisions).not.toContain("password=hunter2")
+      expect(shown.sources.project).not.toContain("private_pref")
+      expect(shown.sources.project).not.toContain("password=hunter2")
     })
   })
 
@@ -478,7 +538,7 @@ describe("memory core package", () => {
     })
   })
 
-  test("targeted recall returns typed memory and audits matched files", async () => {
+  test("targeted recall returns typed memory and matched files", async () => {
     await use(async (t) => {
       await Memory.enable({ root: t.root })
       await Memory.remember({
@@ -490,12 +550,8 @@ describe("memory core package", () => {
       })
 
       const result = await Memory.recall({ root: t.root, query: "what command runs cli tests?" })
-      const shown = await Memory.show({ root: t.root })
-
       expect(result.result?.block).toContain("cli_tests")
       expect(result.files).toEqual(["environment.md"])
-      expect(shown.decisions).toContain('"kind":"recall"')
-      expect(shown.decisions).toContain('"result":"recalled"')
     })
   })
 
diff --git a/packages/kilo-memory/test/effect-capture.test.ts b/packages/kilo-memory/test/effect-capture.test.ts
index ae1eaea096..91e0ec84e0 100644
--- a/packages/kilo-memory/test/effect-capture.test.ts
+++ b/packages/kilo-memory/test/effect-capture.test.ts
@@ -80,7 +80,7 @@ function run(input: {
 }
 
 describe("MemoryCapture (fake ports)", () => {
-  test("turn-close typed LLM saves environment memory and audit records", async () => {
+  test("turn-close typed LLM saves environment memory", async () => {
     const t = await tmp()
     try {
       await KiloMemory.enable({ root: t.root })
@@ -102,9 +102,6 @@ describe("MemoryCapture (fake ports)", () => {
 
       const shown = await KiloMemory.show({ root: t.root })
       expect(shown.sources.environment).toContain("cli_memory_tests")
-      expect(shown.decisions).toContain('"kind":"digest"')
-      expect(shown.decisions).toContain('"kind":"typed"')
-      expect(shown.decisions).toContain('"result":"saved"')
     } finally {
       await t.done()
     }
@@ -138,9 +135,6 @@ describe("MemoryCapture (fake ports)", () => {
       const shown = await KiloMemory.show({ root: t.root })
       expect(shown.sources.environment).toContain("cli_tests")
       expect(shown.sources.environment).not.toContain(secret)
-      expect(shown.decisions).toContain('"reason":"secret"')
-      // The audit record itself must not carry the raw secret (decisions are exposed via /memory/show).
-      expect(shown.decisions).not.toContain(secret)
       const detail = events.find((item) => item.detail?.type === "saved")?.detail
       expect(detail?.message).toContain("environment.md:cli_tests")
       expect(detail?.message).not.toContain(secret)
@@ -173,18 +167,15 @@ describe("MemoryCapture (fake ports)", () => {
         sessionID: "ses_effect",
         max: MemorySchema.maxStoredDigestSummary,
       })
-      const shown = await KiloMemory.show({ root: t.root })
       expect(saved?.summary).toContain("[redacted]")
       expect(saved?.summary).not.toContain(secret)
       expect(saved?.summary).not.toContain(secret.slice(0, 20))
-      expect(shown.decisions).not.toContain(secret)
-      expect(shown.decisions).not.toContain(secret.slice(0, 20))
     } finally {
       await t.done()
     }
   })
 
-  test("turn-close surfaces content-gate rejections in the audit with redacted text", async () => {
+  test("turn-close rejects self-referential content while applying safe operations", async () => {
     const t = await tmp()
     try {
       await KiloMemory.enable({ root: t.root })
@@ -206,10 +197,6 @@ describe("MemoryCapture (fake ports)", () => {
       expect(result).toMatchObject({ skipped: false, operationCount: 1 })
       const shown = await KiloMemory.show({ root: t.root })
       expect(shown.sources.project).not.toContain("gate_check")
-      // The apply-time content gate is visible in the audit, and its recorded text is redacted.
-      expect(shown.decisions).toContain('"reason":"self_referential"')
-      expect(shown.decisions).toContain("[redacted]")
-      expect(shown.decisions).not.toContain("password=hunter2")
     } finally {
       await t.done()
     }
@@ -346,7 +333,7 @@ describe("MemoryCapture (fake ports)", () => {
     }
   })
 
-  test("interrupted close records a non-LLM fallback digest tagged with the reason", async () => {
+  test("interrupted close records a non-LLM fallback digest", async () => {
     const t = await tmp()
     try {
       await KiloMemory.enable({ root: t.root })
@@ -367,9 +354,6 @@ describe("MemoryCapture (fake ports)", () => {
       const raw = await Bun.file(path.join(MemoryPaths.files(t.root).sessions, file)).text()
       expect(saved?.fallback).toBe(true)
       expect(raw).toContain("Fallback: true")
-      const shown = await KiloMemory.show({ root: t.root })
-      expect(shown.decisions).toContain("session digest fallback on interrupted")
-      expect(shown.decisions).toContain('"fallback":true')
     } finally {
       await t.done()
     }
@@ -457,7 +441,7 @@ describe("MemoryCapture (fake ports)", () => {
     }
   })
 
-  test("template echo digest output falls back and records template_echo", async () => {
+  test("template echo digest output falls back", async () => {
     const t = await tmp()
     try {
       await KiloMemory.enable({ root: t.root })
@@ -473,16 +457,13 @@ describe("MemoryCapture (fake ports)", () => {
       })
 
       const saved = await MemoryFiles.readSession(t.root, { sessionID: "ses_effect", max: 480 })
-      const shown = await KiloMemory.show({ root: t.root })
       expect(saved?.fallback).toBe(true)
-      expect(shown.decisions).toContain('"reason":"template_echo"')
-      expect(shown.decisions).toContain('"fallback":true')
     } finally {
       await t.done()
     }
   })
 
-  test("empty digest output falls back and records empty_digest", async () => {
+  test("empty digest output falls back", async () => {
     const t = await tmp()
     try {
       await KiloMemory.enable({ root: t.root })
@@ -498,11 +479,8 @@ describe("MemoryCapture (fake ports)", () => {
       })
 
       const saved = await MemoryFiles.readSession(t.root, { sessionID: "ses_effect", max: 480 })
-      const shown = await KiloMemory.show({ root: t.root })
       expect(saved?.fallback).toBe(true)
       expect(saved?.summary).toContain("User:")
-      expect(shown.decisions).toContain('"reason":"empty_digest"')
-      expect(shown.decisions).toContain('"fallback":true')
     } finally {
       await t.done()
     }
@@ -603,7 +581,7 @@ describe("MemoryCapture (fake ports)", () => {
     }
   })
 
-  test("records audit when configured memory model is unavailable", async () => {
+  test("configured memory model fallback still captures memory", async () => {
     const t = await tmp()
     try {
       await KiloMemory.enable({ root: t.root })
@@ -620,8 +598,8 @@ describe("MemoryCapture (fake ports)", () => {
         }),
       })
 
-      const shown = await KiloMemory.show({ root: t.root })
-      expect(shown.changes).toContain("memory_model_config reason=model unavailable fallback=1")
+      const saved = await MemoryFiles.readSession(t.root, { sessionID: "ses_effect", max: 480 })
+      expect(saved?.summary).toContain("Explored repo setup")
     } finally {
       await t.done()
     }
diff --git a/packages/kilo-sandbox/package.json b/packages/kilo-sandbox/package.json
index c9533a3b77..94fd594b9a 100644
--- a/packages/kilo-sandbox/package.json
+++ b/packages/kilo-sandbox/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/sandbox",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "private": true,
diff --git a/packages/kilo-telemetry/package.json b/packages/kilo-telemetry/package.json
index 1ee34a5090..fb6f7203a9 100644
--- a/packages/kilo-telemetry/package.json
+++ b/packages/kilo-telemetry/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/kilo-telemetry",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "description": "Telemetry for Kilo CLI - PostHog analytics integration",
diff --git a/packages/kilo-ui/package.json b/packages/kilo-ui/package.json
index f465e7880a..f79ab1a4ec 100644
--- a/packages/kilo-ui/package.json
+++ b/packages/kilo-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-ui",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/packages/kilo-ui/src/components/basic-tool.css b/packages/kilo-ui/src/components/basic-tool.css
index 49ed771af5..c379a67d7b 100644
--- a/packages/kilo-ui/src/components/basic-tool.css
+++ b/packages/kilo-ui/src/components/basic-tool.css
@@ -7,11 +7,15 @@
   }
 
   [data-slot="basic-tool-tool-info"] {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
     font-size: var(--kilo-font-size-12);
     text-align: start;
   }
 
   [data-slot="basic-tool-tool-info-structured"] {
+    width: 100%;
     min-width: 0;
     overflow: hidden;
   }
@@ -25,6 +29,7 @@
   }
 
   [data-slot="basic-tool-tool-info-main"] {
+    width: 100%;
     align-items: baseline;
     overflow: hidden;
   }
@@ -34,6 +39,7 @@
   }
 
   [data-slot="basic-tool-tool-subtitle"] {
+    flex: 1 1 auto;
     font-size: var(--kilo-font-size-12);
     color: var(--text-weak);
   }
@@ -51,6 +57,8 @@
   }
 
   [data-slot="basic-tool-tool-arg"] {
+    flex: 0 1 auto;
+    max-width: 24ch;
     font-size: var(--kilo-font-size-12);
     color: var(--text-weak);
   }
@@ -286,6 +294,31 @@ html[data-theme="kilo-vscode"] [data-component="tool-part-wrapper"][data-part-ty
     }
   }
 
+  /* Expanded edit/write/apply_patch triggers stick to the top while their diff scrolls
+     underneath, so they must stay opaque in every state; otherwise diff rows show
+     through the header. !important because the trigger hover rule below uses a
+     translucent hover background and would re-open the leak on hover. */
+  :is([data-component="edit-tool"], [data-component="write-tool"], [data-component="apply-patch-tool"])
+    > [data-component="collapsible"]
+    > [data-slot="collapsible-trigger"][aria-expanded="true"] {
+    background-color: var(--background-stronger) !important;
+  }
+
+  /* The sticky headers pin to the visible top edge of the transcript. The message
+     list's 12px top padding otherwise leaves a strip above the stuck trigger where
+     the scrolling diff stays visible. Both the trigger and the inner file header
+     consume --sticky-accordion-top, so they shift up together and stay flush. */
+  :is([data-component="edit-tool"], [data-component="write-tool"], [data-component="apply-patch-tool"]) {
+    --sticky-accordion-top: -12px;
+  }
+
+  /* The inner file accordion sticks below the compact 28px tool trigger. The inline
+     default offset (37px) matches the taller upstream trigger and leaves a gap where
+     diff rows peek through between the two stuck headers. */
+  [data-component="accordion"][data-scope="apply-patch"] {
+    --sticky-accordion-offset: 28px !important;
+  }
+
   /* Reposition copy button tooltip to appear below (not above) to avoid clipping */
   [data-component="tool-output"] [data-slot="markdown-copy-button"]::after {
     bottom: auto;
diff --git a/packages/kilo-ui/src/components/message-part.tsx b/packages/kilo-ui/src/components/message-part.tsx
index 131874b564..ae7c0a24c9 100644
--- a/packages/kilo-ui/src/components/message-part.tsx
+++ b/packages/kilo-ui/src/components/message-part.tsx
@@ -1099,7 +1099,7 @@ function McpTool(props: ToolProps) {
         if (typeof value === "boolean") return [`${key}=${value}`]
         return []
       })
-      .slice(0, 3)
+      .slice(0, 1)
   }
 
   const formatted = createMemo(() => {
diff --git a/packages/kilo-vscode/CHANGELOG.md b/packages/kilo-vscode/CHANGELOG.md
index 0bedfd066f..9131ae9949 100644
--- a/packages/kilo-vscode/CHANGELOG.md
+++ b/packages/kilo-vscode/CHANGELOG.md
@@ -1,5 +1,46 @@
 # kilo-code
 
+## 7.4.13
+
+### Minor Changes
+
+- [#12271](https://github.com/Kilo-Org/kilocode/pull/12271) [`38013f7`](https://github.com/Kilo-Org/kilocode/commit/38013f70fad82f55b9ebe02d8d6883a26d791934) - Allow agents to stop and remove a targeted Agent Manager session.
+
+- [#12401](https://github.com/Kilo-Org/kilocode/pull/12401) [`210a6bb`](https://github.com/Kilo-Org/kilocode/commit/210a6bbf9b89b30b408d744cf0f253482370eed6) - Support choosing a reasoning effort per model in the Agent Manager Compare Models picker, so compared worktrees can run the same prompt at different effort levels. The selected effort is shown next to the model name in the collapsed selector.
+
+- [#12306](https://github.com/Kilo-Org/kilocode/pull/12306) [`c081f58`](https://github.com/Kilo-Org/kilocode/commit/c081f582abecaba98a303069140d014a9ee90ca9) - Configure a custom file extension allowlist for codebase indexing to limit scans to relevant project files and support additional text formats.
+
+- [#12292](https://github.com/Kilo-Org/kilocode/pull/12292) [`6dcaeb3`](https://github.com/Kilo-Org/kilocode/commit/6dcaeb3e97f256e9e98d5093610a0a02aedf84de) - Add JetBrains Context settings for compaction and file watcher ignore patterns.
+
+- [#12403](https://github.com/Kilo-Org/kilocode/pull/12403) [`5819c68`](https://github.com/Kilo-Org/kilocode/commit/5819c689961ccf61f510896c5477a96e9d2a3459) - Cycle reasoning effort variants with Shift+Tab in prompt inputs. Works in the sidebar chat, Agent Manager, and the New Worktree dialog. The variant selector tooltip shows the shortcut on hover, and the behavior can be turned off with the `kilo-code.new.chat.shiftTabCyclesVariant` setting (also available under Settings > Display) to restore Shift+Tab focus navigation.
+
+### Patch Changes
+
+- [#12301](https://github.com/Kilo-Org/kilocode/pull/12301) [`d854c10`](https://github.com/Kilo-Org/kilocode/commit/d854c1077da0b55afe454c86b43c3240cdac053c) - Respect the Terminal Command Blocks display setting for background process tool cards.
+
+- [#12304](https://github.com/Kilo-Org/kilocode/pull/12304) [`79fe757`](https://github.com/Kilo-Org/kilocode/commit/79fe75745fc6abd7bd3aad0c079e8f5150751a2c) - Display here-document content as plain text in terminal approval prompts.
+
+- [#11944](https://github.com/Kilo-Org/kilocode/pull/11944) [`f857248`](https://github.com/Kilo-Org/kilocode/commit/f85724830c6483d22368d3ad75d12639e1488733) Thanks [@mjnaderi](https://github.com/mjnaderi)! - Support bidirectional text in chat messages so right-to-left and mixed-language conversations render in the correct direction.
+
+- [#12302](https://github.com/Kilo-Org/kilocode/pull/12302) [`ad66c90`](https://github.com/Kilo-Org/kilocode/commit/ad66c908a4bec5f29e6d83fa9efbd1f6cc2cd416) - Clarify when reverting a conversation does not restore workspace changes and link disabled snapshots to the Checkpoints setting.
+
+- [#12279](https://github.com/Kilo-Org/kilocode/pull/12279) [`6ce16e7`](https://github.com/Kilo-Org/kilocode/commit/6ce16e7cae1c58b545d5eaf00f1c6c44830e22e6) - Open the Agent Manager new-worktree dialog from primary actions and keyboard shortcuts, with an explicit quick-create action in its dropdown.
+
+- [#12415](https://github.com/Kilo-Org/kilocode/pull/12415) [`a695930`](https://github.com/Kilo-Org/kilocode/commit/a695930d792ce3882cf3d7231ebc9be0e2adfa13) - Fix diff content painting through and above the sticky headers of expanded Edit, Write, and Apply Patch tool cards when scrolling large diffs.
+
+- [#12213](https://github.com/Kilo-Org/kilocode/pull/12213) [`55fe160`](https://github.com/Kilo-Org/kilocode/commit/55fe1608fb24705258232665f1adfff0b4227e24) - Keep sessions usable after deprecated local review commands complete without a session status transition.
+
+- [#12378](https://github.com/Kilo-Org/kilocode/pull/12378) [`b402cc2`](https://github.com/Kilo-Org/kilocode/commit/b402cc2635c1dae836a684f9d7a981c05491a930) - Include image-output models in the Kilo Gateway chat model list.
+
+- [#12401](https://github.com/Kilo-Org/kilocode/pull/12401) [`210a6bb`](https://github.com/Kilo-Org/kilocode/commit/210a6bbf9b89b30b408d744cf0f253482370eed6) - Fix double scrollbars in the Agent Manager new-worktree prompt field and widen the dialog so longer prompts stay readable. The prompt box now grows with its content like the sidebar chat input, the textarea is the only element that scrolls, and manual resize of the prompt area keeps working.
+
+- Updated dependencies [[`084bcea`](https://github.com/Kilo-Org/kilocode/commit/084bceadaedf193568ccf71256bd299c0d11e90c), [`c081f58`](https://github.com/Kilo-Org/kilocode/commit/c081f582abecaba98a303069140d014a9ee90ca9), [`ff703fb`](https://github.com/Kilo-Org/kilocode/commit/ff703fba621e35a4a5d8e4801620502228cca5bf)]:
+  - @kilocode/kilo-gateway@7.4.12
+  - @kilocode/kilo-indexing@7.5.0
+  - @opencode-ai/core@7.4.12
+  - @kilocode/kilo-ui@7.4.12
+  - @opencode-ai/ui@7.4.12
+
 ## 7.4.11
 
 ### Minor Changes
diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json
index 4066e4f570..425654b2c4 100644
--- a/packages/kilo-vscode/package.json
+++ b/packages/kilo-vscode/package.json
@@ -2,7 +2,7 @@
   "name": "kilo-code",
   "displayName": "Kilo Code: AI Coding Agent, Copilot, and Autocomplete",
   "description": "Open Source AI coding agent that generates code from natural language, automates tasks, and runs terminal commands. Features inline autocomplete, browser automation, automated refactoring, and custom modes for planning, coding, and debugging. Supports 500+ AI models including Claude (Anthropic), Gemini, Grok, GPT, Codex and GLM.",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "icon": "assets/icons/logo-outline-black.png",
   "galleryBanner": {
     "color": "#FFFFFF",
@@ -1129,6 +1129,11 @@
           "default": true,
           "description": "Show the task timeline graph in the chat header"
         },
+        "kilo-code.new.chat.shiftTabCyclesVariant": {
+          "type": "boolean",
+          "default": true,
+          "description": "Cycle through reasoning effort variants with Shift+Tab in prompt inputs. Disable to keep Shift+Tab for keyboard focus navigation."
+        },
         "kilo-code.new.agentWorkStyle": {
           "type": "string",
           "scope": "application",
diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index 7c6aeddea2..abea4fe311 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -171,6 +171,7 @@ import {
   validIndexingSetting,
   watchIndexingConfig,
 } from "./kilo-provider/indexing-settings"
+import { buildChatSettingsMessage, validChatSetting, watchChatConfig } from "./kilo-provider/chat-settings"
 
 let maxCost = 0
 
@@ -391,6 +392,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   private webviewMessageDisposable: vscode.Disposable | null = null
   private autocompleteConfigDisposable: vscode.Disposable | null = null
   private indexingConfigDisposable: vscode.Disposable | null = null
+  private chatConfigDisposable: vscode.Disposable | null = null
   private telemetryStateDisposable: vscode.Disposable | null = null
   private viewStateDisposable: vscode.Disposable | null = null
   private visibilityDisposable: vscode.Disposable | null = null
@@ -913,6 +915,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.autocompleteConfigDisposable = watchAutocompleteConfig((msg) => this.postMessage(msg))
     this.indexingConfigDisposable?.dispose()
     this.indexingConfigDisposable = watchIndexingConfig((msg) => this.postMessage(msg))
+    this.chatConfigDisposable?.dispose()
+    this.chatConfigDisposable = watchChatConfig((msg) => this.postMessage(msg))
     this.telemetryStateDisposable?.dispose()
     this.telemetryStateDisposable = watchTelemetryState((msg) => this.postMessage(msg))
     this.webviewMessageDisposable = webview.onDidReceiveMessage(async (message) => {
@@ -1250,6 +1254,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
         case "requestIndexingSettings":
           this.postMessage(buildIndexingSettingsMessage())
           break
+        case "requestChatSettings":
+          this.postMessage(buildChatSettingsMessage())
+          break
         case "requestKiloEmbeddingModels":
           this.fetchAndSendKiloEmbeddingModels().catch((e) =>
             console.error("[Kilo New] fetchAndSendKiloEmbeddingModels failed:", e),
@@ -3665,6 +3672,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     const { section, leaf } = buildSettingPath(key)
     if (section === "autocomplete" && !validAutocompleteSetting(leaf, value)) return
     if (section === "indexing" && !validIndexingSetting(leaf, value)) return
+    if (section === "chat" && !validChatSetting(leaf, value)) return
     const config = vscode.workspace.getConfiguration(`kilo-code.new${section ? `.${section}` : ""}`)
     // Normalize a webview-side clear to `undefined` so VS Code removes the
     // key from settings.json rather than persisting a literal `null`. This
@@ -3954,7 +3962,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
             detail,
           })
         }
-        void this.memory.fetch(sessionID, false)
+        void this.memory.fetch(sessionID)
       }
       return
     }
@@ -4508,6 +4516,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.webviewMessageDisposable?.dispose()
     this.autocompleteConfigDisposable?.dispose()
     this.indexingConfigDisposable?.dispose()
+    this.chatConfigDisposable?.dispose()
     this.telemetryStateDisposable?.dispose()
     this.autoApproveBridge?.dispose()
     this.visibleTaskStreams.clear()
diff --git a/packages/kilo-vscode/src/agent-manager/multi-version.ts b/packages/kilo-vscode/src/agent-manager/multi-version.ts
index 2ab92ad10e..5d0704f552 100644
--- a/packages/kilo-vscode/src/agent-manager/multi-version.ts
+++ b/packages/kilo-vscode/src/agent-manager/multi-version.ts
@@ -4,11 +4,13 @@ export interface ModelAllocation {
   providerID: string
   modelID: string
   count: number
+  variant?: string
 }
 
 interface ModelRef {
   providerID: string
   modelID: string
+  variant?: string
 }
 
 /**
@@ -32,7 +34,7 @@ export function resolveVersionModels(
     for (const alloc of allocations) {
       const clamped = Math.min(Math.max(Math.floor(alloc.count) || 0, 0), MAX_MULTI_VERSIONS)
       for (let c = 0; c < clamped; c++) {
-        models.push({ providerID: alloc.providerID, modelID: alloc.modelID })
+        models.push({ providerID: alloc.providerID, modelID: alloc.modelID, variant: alloc.variant })
       }
       if (models.length >= MAX_MULTI_VERSIONS) break
     }
@@ -98,7 +100,8 @@ export function buildInitialMessages(
     if (prompt) {
       msg.text = prompt
       msg.agent = agent
-      msg.variant = variant
+      // A per-allocation effort pick wins over the dialog-level variant.
+      msg.variant = model?.variant ?? variant
       msg.files = files
     }
     return msg
diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts
index 13d1e28e5b..63ade03fc9 100644
--- a/packages/kilo-vscode/src/agent-manager/types.ts
+++ b/packages/kilo-vscode/src/agent-manager/types.ts
@@ -445,7 +445,7 @@ interface CreateMultiVersionIn {
   files?: Array<{ mime: string; url: string }>
   baseBranch?: string
   branchName?: string
-  modelAllocations?: Array<{ providerID: string; modelID: string; count: number }>
+  modelAllocations?: Array<{ providerID: string; modelID: string; count: number; variant?: string }>
   /** When set, reconcile each created session's sandbox override to this state. */
   sandbox?: boolean
 }
diff --git a/packages/kilo-vscode/src/kilo-provider-utils.ts b/packages/kilo-vscode/src/kilo-provider-utils.ts
index 59570704a7..e5dbd40e44 100644
--- a/packages/kilo-vscode/src/kilo-provider-utils.ts
+++ b/packages/kilo-vscode/src/kilo-provider-utils.ts
@@ -194,7 +194,7 @@ export async function runWithMessageConfirmation<T>(
   }
 }
 
-export function sessionToWebview(session: Session) {
+export function sessionToWebview(session: Pick<Session, "id" | "parentID" | "title" | "time" | "summary" | "revert">) {
   return {
     id: session.id,
     parentID: session.parentID ?? null,
diff --git a/packages/kilo-vscode/src/kilo-provider/chat-settings.ts b/packages/kilo-vscode/src/kilo-provider/chat-settings.ts
new file mode 100644
index 0000000000..a1a7c9427b
--- /dev/null
+++ b/packages/kilo-vscode/src/kilo-provider/chat-settings.ts
@@ -0,0 +1,25 @@
+import * as vscode from "vscode"
+
+type Post = (msg: unknown) => void
+
+export function buildChatSettingsMessage() {
+  const config = vscode.workspace.getConfiguration("kilo-code.new.chat")
+  return {
+    type: "chatSettingsLoaded" as const,
+    settings: {
+      shiftTabCyclesVariant: config.get<boolean>("shiftTabCyclesVariant", true),
+    },
+  }
+}
+
+export function watchChatConfig(post: Post): vscode.Disposable {
+  return vscode.workspace.onDidChangeConfiguration((event) => {
+    if (event.affectsConfiguration("kilo-code.new.chat")) {
+      post(buildChatSettingsMessage())
+    }
+  })
+}
+
+export function validChatSetting(key: string, value: unknown) {
+  return key === "shiftTabCyclesVariant" && typeof value === "boolean"
+}
diff --git a/packages/kilo-vscode/src/kilo-provider/memory.ts b/packages/kilo-vscode/src/kilo-provider/memory.ts
index 136d977da5..c234022224 100644
--- a/packages/kilo-vscode/src/kilo-provider/memory.ts
+++ b/packages/kilo-vscode/src/kilo-provider/memory.ts
@@ -1,11 +1,5 @@
 import * as vscode from "vscode"
-import * as path from "node:path"
-import {
-  isMemoryOperation,
-  isMemoryPromptOperation,
-  type MemoryOperation,
-  type MemoryPromptOperation,
-} from "@kilocode/kilo-memory/commands"
+import { isMemoryOperation, type MemoryOperation } from "@kilocode/kilo-memory/commands"
 import { MemorySchema } from "@kilocode/kilo-memory/schema"
 import type { KiloClient, Session } from "@kilocode/sdk/v2/client"
 import { retry } from "../services/cli-backend/retry"
@@ -14,6 +8,7 @@ import { getErrorMessage } from "../kilo-provider-utils"
 type MemorySourceFile = MemorySchema.Source
 type MemoryApi = KiloClient["memory"]
 const CACHE_LIMIT = 8
+const STORED_LIMIT = 16
 const NO_PROJECT = "No active project for memory. Open a file in the target folder to manage its memory."
 
 export type KiloProviderMemoryMessage = {
@@ -53,6 +48,20 @@ function memory(client: KiloClient | undefined): MemoryApi | undefined {
   return (client as { memory?: MemoryApi } | undefined)?.memory
 }
 
+function count(text: string) {
+  return text.split("\n").filter((line) => line.trim().startsWith("- ")).length
+}
+
+function stored(text: string) {
+  return text
+    .split("\n")
+    .filter((line) => line.trim())
+    .map((line) => {
+      const marker = line.indexOf(":: ")
+      return marker === -1 ? line : line.slice(marker + 3)
+    })
+}
+
 function request(input: Record<string, unknown>): { value: KiloProviderMemoryMessage } | { error: string } {
   const op = operation(input.operation)
   if (!op) return { error: "Unknown memory operation" }
@@ -102,14 +111,16 @@ export class KiloProviderMemory {
 
   async handle(message: Record<string, unknown>): Promise<boolean> {
     if (message.type === "requestMemory") {
-      this.fetch(
-        typeof message.sessionID === "string" ? message.sessionID : undefined,
-        message.includeSources === true,
-      ).catch((err: unknown) => console.error("[Kilo New] fetchAndSendMemory failed:", err))
+      this.fetch(typeof message.sessionID === "string" ? message.sessionID : undefined).catch((err: unknown) =>
+        console.error("[Kilo New] fetchAndSendMemory failed:", err),
+      )
       return true
     }
     if (message.type === "memoryShow") {
-      await this.show(typeof message.sessionID === "string" ? message.sessionID : undefined)
+      await this.show(
+        typeof message.sessionID === "string" ? message.sessionID : undefined,
+        message.mode === "status" ? "status" : "show",
+      )
       return true
     }
     if (message.type === "memoryOperation") {
@@ -127,17 +138,11 @@ export class KiloProviderMemory {
       await this.run(parsed.value)
       return true
     }
-    if (message.type === "memoryPrompt") {
-      const op = isMemoryPromptOperation(message.operation) ? message.operation : undefined
-      if (!op) return true
-      await this.prompt(op, typeof message.sessionID === "string" ? message.sessionID : undefined)
-      return true
-    }
     return false
   }
 
-  fetch(sessionID?: string, includeSources = false): Promise<void> {
-    return this.serial(() => this.load(sessionID, includeSources))
+  fetch(sessionID?: string): Promise<void> {
+    return this.serial(() => this.load(sessionID))
   }
 
   /** Resolves once the serialized operation queue has drained. */
@@ -145,7 +150,7 @@ export class KiloProviderMemory {
     return this.tail
   }
 
-  private async load(sessionID?: string, includeSources = false): Promise<void> {
+  private async load(sessionID?: string): Promise<void> {
     try {
       const directory = this.input.dir(sessionID ?? this.input.session()?.id)
       const client = this.input.client()
@@ -168,14 +173,10 @@ export class KiloProviderMemory {
       }
 
       const { data: status } = await retry(() => api.status({ directory }, { throwOnError: true }))
-      const show = includeSources
-        ? (await retry(() => api.show({ directory }, { throwOnError: true }))).data
-        : undefined
       const msg = {
         type: "memoryLoaded",
         sessionID,
         status,
-        ...(show ? { show } : {}),
       }
       this.cache(directory, msg)
       this.input.post(msg)
@@ -189,27 +190,11 @@ export class KiloProviderMemory {
     }
   }
 
-  async prompt(value: MemoryPromptOperation, sessionID?: string): Promise<void> {
-    const title = value === "remember" ? "Remember in project memory" : "Forget project memory"
-    const placeHolder = value === "remember" ? "Project fact, command, or correction" : "Text to remove"
-    const text = await vscode.window.showInputBox({ title, placeHolder, ignoreFocusOut: true })
-    if (!text?.trim()) {
-      // Clear the webview's pending state for this action when the input is dismissed.
-      this.input.post({ type: "memoryOperationResult", operation: value, sessionID, ok: true })
-      return
-    }
-    await this.run({
-      operation: value,
-      sessionID,
-      ...(value === "remember" ? { text: text.trim() } : { query: text.trim() }),
-    })
+  show(sessionID?: string, mode: "status" | "show" = "show"): Promise<void> {
+    return this.serial(() => this.doShow(sessionID, mode))
   }
 
-  show(sessionID?: string): Promise<void> {
-    return this.serial(() => this.doShow(sessionID))
-  }
-
-  private async doShow(sessionID?: string): Promise<void> {
+  private async doShow(sessionID: string | undefined, mode: "status" | "show"): Promise<void> {
     const client = this.input.client()
     if (!client) {
       this.input.post({
@@ -237,55 +222,56 @@ export class KiloProviderMemory {
         this.input.post({ type: "memoryLoaded", sessionID, error: NO_PROJECT })
         return
       }
-      const { data: show } = await retry(() => api.show({ directory }, { throwOnError: true }))
-      const { data: status } = await retry(() => api.status({ directory }, { throwOnError: true }))
-      const current = sessionID ?? this.input.session()?.id
-      const startup =
-        current && status.state.stats.lastInjectedSessionID === current ? status.state.stats.lastInjectedTokens : 0
-      const content = [
-        "# Kilo Memory",
-        "",
-        `Root: ${show.root}`,
-        `Enabled: ${show.state.enabled ? "yes" : "no"}`,
-        `Auto-save: ${show.state.autoConsolidate ? "on" : "off"}`,
-        `Startup context: ${show.state.autoInject ? "on" : "off"}`,
-        `Stored index tokens: ${status.index.estimatedTokens}`,
-        `Startup context tokens for this session: ${startup}`,
-        `Last auto-save model usage: ${status.state.stats.lastConsolidationTokens} tokens`,
-        "",
-        "## project.md",
-        show.sources.project.trim(),
-        "",
-        "## environment.md",
-        show.sources.environment.trim(),
-        "",
-        "## corrections.md",
-        show.sources.corrections.trim(),
-        "",
-        "## index.kmem",
-        show.index.trim(),
-        "",
-        "## items",
-        show.items.trim(),
-        "",
-        "## changes",
-        show.changes.trim(),
-        "",
-        "## decisions.jsonl",
-        show.decisions.trim(),
-        "",
-      ].join("\n")
-      await vscode.workspace
-        .openTextDocument({ content, language: "markdown" })
-        .then((doc) => vscode.window.showTextDocument(doc, { preview: true }))
+      const [{ data: show }, { data: status }] = await Promise.all([
+        retry(() => api.show({ directory }, { throwOnError: true })),
+        retry(() => api.status({ directory }, { throwOnError: true })),
+      ])
       const msg = {
         type: "memoryLoaded",
         sessionID,
         status,
-        show,
       }
       this.cache(directory, msg)
       this.input.post(msg)
+      const items = stored(show.items)
+      if (mode === "show" && items.length === 0) {
+        void vscode.window.showInformationMessage(
+          "This project doesn't have any memory yet. It will start showing after you use Kilo.",
+        )
+        return
+      }
+      const entries: vscode.QuickPickItem[] = [
+        {
+          label: `${status.state.enabled ? "Enabled" : "Disabled"} · ${status.state.scope}`,
+          description: status.state.autoConsolidate ? "Auto-save on" : "Auto-save off",
+        },
+        { label: "Storage", detail: status.root },
+        {
+          label: "Sources",
+          description: `project.md ${count(show.sources.project)} · environment.md ${count(show.sources.environment)} · corrections.md ${count(show.sources.corrections)}`,
+        },
+        {
+          label: "Index",
+          description: `${status.index.estimatedTokens.toLocaleString()} estimated tokens`,
+        },
+      ]
+      if (mode === "show") {
+        const shown = items.slice(0, STORED_LIMIT)
+        entries.push(
+          {
+            label: "Stored memory",
+            description:
+              shown.length < items.length ? `${shown.length} of ${items.length} shown` : `${shown.length} shown`,
+          },
+          ...shown.map((label) => ({ label })),
+        )
+      }
+      void vscode.window.showQuickPick(entries, {
+        title: mode === "show" ? "Memory" : "Memory status",
+        placeHolder: mode === "show" ? "Stored project memory" : "Project memory status",
+        matchOnDescription: true,
+        matchOnDetail: true,
+      })
     } catch (err) {
       console.error("[Kilo New] KiloProvider: Failed to show memory:", err)
       this.input.post({
@@ -358,31 +344,28 @@ export class KiloProviderMemory {
         return false
       }
       const data = await this.action(api, directory, message)
-      const refreshed = await Promise.all([
-        retry(() => api.status({ directory }, { throwOnError: true })),
-        retry(() => api.show({ directory }, { throwOnError: true })),
-      ]).catch((err: unknown) => {
-        console.warn("[Kilo New] Memory changed but refresh failed:", err)
-        return undefined
-      })
-      const status = refreshed?.[0].data
-      const show = refreshed?.[1].data
+      const refreshed =
+        message.operation === "status"
+          ? { data }
+          : await retry(() => api.status({ directory }, { throwOnError: true })).catch((err: unknown) => {
+              console.warn("[Kilo New] Memory changed but refresh failed:", err)
+              return undefined
+            })
+      const status = refreshed?.data
       const result = {
         type: "memoryOperationResult",
         operation: message.operation,
         sessionID: message.sessionID,
         ok: true,
         ...(status ? { status } : {}),
-        ...(show ? { show } : {}),
         result: data,
       }
       this.input.post(result)
-      if (status && show) {
+      if (status) {
         const loaded = {
           type: "memoryLoaded",
           sessionID: message.sessionID,
           status,
-          show,
         }
         this.cache(directory, loaded)
         this.input.post(loaded)
@@ -409,12 +392,11 @@ export class KiloProviderMemory {
     const op = message.operation
     if (op === "enable") return (await api.enable({ directory }, { throwOnError: true })).data
     if (op === "status") return (await api.status({ directory }, { throwOnError: true })).data
-    if (op === "edit") return this.edit(api, directory)
+    if (op === "inspect") return this.inspect(api, directory)
     if (op === "disable") return (await api.disable({ directory }, { throwOnError: true })).data
     if (op === "rebuild") return (await api.rebuild({ directory }, { throwOnError: true })).data
     if (op === "purge") return this.purge(api, directory, message)
     if (op === "auto") return this.auto(api, directory, message)
-    if (op === "verbose") return this.verbose(api, directory, message)
     if (op === "remember") return this.remember(api, directory, message)
     if (op === "correct") return this.correct(api, directory, message)
     return this.forget(api, directory, message)
@@ -460,12 +442,10 @@ export class KiloProviderMemory {
     return (await api.forget({ directory, query, sessionID: message.sessionID }, { throwOnError: true })).data
   }
 
-  private async edit(api: MemoryApi, directory: string) {
+  private async inspect(api: MemoryApi, directory: string) {
     const { data: status } = await retry(() => api.status({ directory }, { throwOnError: true }))
     if (!status.state.enabled) throw new Error("Memory is disabled. Run /memory on first.")
-    const uri = vscode.Uri.file(path.join(status.root, "project.md"))
-    const doc = await vscode.workspace.openTextDocument(uri)
-    await vscode.window.showTextDocument(doc, { preview: false })
+    await vscode.commands.executeCommand("revealFileInOS", vscode.Uri.file(status.root))
     return status
   }
 
@@ -481,11 +461,4 @@ export class KiloProviderMemory {
     }
     throw new Error("Auto-save mode is required")
   }
-
-  private async verbose(api: MemoryApi, directory: string, message: KiloProviderMemoryMessage) {
-    if (message.mode === "on" || message.mode === "off") {
-      return (await api.configure({ directory, verbose: message.mode === "on" }, { throwOnError: true })).data
-    }
-    throw new Error("Verbose mode is required")
-  }
 }
diff --git a/packages/kilo-vscode/tests/package.json b/packages/kilo-vscode/tests/package.json
index 91ad20403b..755953d04d 100644
--- a/packages/kilo-vscode/tests/package.json
+++ b/packages/kilo-vscode/tests/package.json
@@ -1,6 +1,6 @@
 {
   "type": "module",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {}
diff --git a/packages/kilo-vscode/tests/setup/vscode-mock.ts b/packages/kilo-vscode/tests/setup/vscode-mock.ts
index a5914f7bff..9d01986cc8 100644
--- a/packages/kilo-vscode/tests/setup/vscode-mock.ts
+++ b/packages/kilo-vscode/tests/setup/vscode-mock.ts
@@ -88,6 +88,7 @@ const mockVscode = {
     tabGroups: { all: [] },
     showTextDocument: async () => {},
     showInformationMessage: async () => undefined,
+    showQuickPick: async () => undefined,
     showErrorMessage: async () => undefined,
     showWarningMessage: async () => undefined,
     createTerminal: () => ({ show: noop, sendText: noop, dispose: noop }),
diff --git a/packages/kilo-vscode/tests/unit/chat-settings-message.test.ts b/packages/kilo-vscode/tests/unit/chat-settings-message.test.ts
new file mode 100644
index 0000000000..0671910d3f
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/chat-settings-message.test.ts
@@ -0,0 +1,54 @@
+import { afterEach, beforeEach, describe, expect, it } from "bun:test"
+import * as vscode from "vscode"
+import { buildChatSettingsMessage, validChatSetting } from "../../src/kilo-provider/chat-settings"
+
+type Stub = {
+  getConfiguration: (section?: string) => {
+    get: <T>(key: string, fallback?: T) => T | undefined
+  }
+}
+
+const original = vscode.workspace.getConfiguration
+
+function stubConfig(state: Map<string, unknown>) {
+  ;(vscode.workspace as unknown as Stub).getConfiguration = (section?: string) => {
+    if (section !== "kilo-code.new.chat") {
+      return { get: <T>(_key: string, fallback?: T) => fallback }
+    }
+    return {
+      get: <T>(key: string, fallback?: T) => (state.has(key) ? (state.get(key) as T) : fallback),
+    }
+  }
+}
+
+afterEach(() => {
+  ;(vscode.workspace as unknown as Stub).getConfiguration = original as Stub["getConfiguration"]
+})
+
+describe("buildChatSettingsMessage", () => {
+  let state: Map<string, unknown>
+
+  beforeEach(() => {
+    state = new Map()
+    stubConfig(state)
+  })
+
+  it("enables Shift+Tab variant cycling by default", () => {
+    expect(buildChatSettingsMessage().settings.shiftTabCyclesVariant).toBe(true)
+  })
+
+  it("returns the persisted cycling preference", () => {
+    state.set("shiftTabCyclesVariant", false)
+
+    expect(buildChatSettingsMessage().settings.shiftTabCyclesVariant).toBe(false)
+  })
+})
+
+describe("validChatSetting", () => {
+  it("accepts only boolean cycling updates", () => {
+    expect(validChatSetting("shiftTabCyclesVariant", true)).toBe(true)
+    expect(validChatSetting("shiftTabCyclesVariant", false)).toBe(true)
+    expect(validChatSetting("shiftTabCyclesVariant", "false")).toBe(false)
+    expect(validChatSetting("unknown", true)).toBe(false)
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts
index f4f417fad0..274cb8cc60 100644
--- a/packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts
+++ b/packages/kilo-vscode/tests/unit/kilo-provider-memory-events.test.ts
@@ -28,18 +28,6 @@ function status(root: string) {
   }
 }
 
-function show(root: string) {
-  return {
-    root: `${root}/.kilo/memory`,
-    state: status(root).state,
-    sources: { project: "", environment: "", corrections: "" },
-    index: "",
-    items: "",
-    changes: "",
-    decisions: "",
-  }
-}
-
 describe("KiloProvider memory events", () => {
   it("routes tracked background memory events to their session directory", async () => {
     const calls: string[] = []
@@ -151,10 +139,6 @@ describe("KiloProvider memory events", () => {
           calls.push(["disable", input.directory])
           return { data: { root: `${input.directory}/.kilo/memory`, state: status(input.directory).state } }
         },
-        show: async (input: { directory: string }) => {
-          calls.push(["show", input.directory])
-          return { data: show(input.directory) }
-        },
       },
     } as unknown as KiloClient
     const posts: unknown[] = []
@@ -176,7 +160,6 @@ describe("KiloProvider memory events", () => {
       ["status", "/repo/project"],
       ["disable", "/repo/project"],
       ["status", "/repo/project"],
-      ["show", "/repo/project"],
     ])
     expect(posts).toContainEqual(expect.objectContaining({ type: "memoryLoaded", sessionID: "ses_active" }))
   })
diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts
index 1d3fb20c11..4769ccf2fe 100644
--- a/packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts
+++ b/packages/kilo-vscode/tests/unit/kilo-provider-memory.test.ts
@@ -1,5 +1,6 @@
-import { describe, expect, it } from "bun:test"
+import { describe, expect, it, spyOn } from "bun:test"
 import type { KiloClient } from "@kilocode/sdk/v2/client"
+import * as vscode from "vscode"
 import { KiloProviderMemory } from "../../src/kilo-provider/memory"
 
 function subject(client: KiloClient | undefined) {
@@ -18,6 +19,7 @@ function status(root: string) {
     root: `${root}/.kilo/memory`,
     state: {
       enabled: true,
+      scope: "project",
       autoConsolidate: true,
       stats: {
         lastInjectedSessionID: "",
@@ -42,6 +44,89 @@ function show(root: string) {
 }
 
 describe("KiloProviderMemory", () => {
+  it("shows stored memory and explains empty projects", async () => {
+    const picker = spyOn(vscode.window, "showQuickPick")
+    const notice = spyOn(vscode.window, "showInformationMessage")
+    const full = status("/repo")
+    const view = show("/repo")
+    view.items = "record id=project.md:Facts:test :: Stored memory fact :: with context"
+    const stored = subject({
+      memory: {
+        show: async () => ({ data: view }),
+        status: async () => ({ data: full }),
+      },
+    } as unknown as KiloClient)
+    const empty = subject({
+      memory: {
+        show: async () => ({ data: show("/empty") }),
+        status: async () => ({ data: status("/empty") }),
+      },
+    } as unknown as KiloClient)
+
+    try {
+      await stored.memory.show("ses_stored")
+      await empty.memory.show("ses_empty")
+
+      expect(picker).toHaveBeenCalledTimes(1)
+      expect(picker.mock.calls[0]?.[0]).toContainEqual(
+        expect.objectContaining({ label: "Storage", detail: "/repo/.kilo/memory" }),
+      )
+      expect(picker.mock.calls[0]?.[0]).toContainEqual(
+        expect.objectContaining({ label: "Stored memory fact :: with context" }),
+      )
+      expect(notice).toHaveBeenCalledWith(
+        "This project doesn't have any memory yet. It will start showing after you use Kilo.",
+      )
+    } finally {
+      picker.mockRestore()
+      notice.mockRestore()
+    }
+  })
+
+  it("shows the stored memory total when the list is truncated", async () => {
+    const picker = spyOn(vscode.window, "showQuickPick")
+    const view = show("/repo")
+    view.items = Array.from({ length: 17 }, (_, i) => `- id=item-${i} :: Fact ${i}`).join("\n")
+    const item = subject({
+      memory: {
+        show: async () => ({ data: view }),
+        status: async () => ({ data: status("/repo") }),
+      },
+    } as unknown as KiloClient)
+
+    try {
+      await item.memory.show("ses_stored")
+
+      expect(picker.mock.calls[0]?.[0]).toContainEqual(
+        expect.objectContaining({ label: "Stored memory", description: "16 of 17 shown" }),
+      )
+      expect(picker.mock.calls[0]?.[0]).toHaveLength(21)
+    } finally {
+      picker.mockRestore()
+    }
+  })
+
+  it("routes inspect operations to the memory folder", async () => {
+    const reveal = spyOn(vscode.commands, "executeCommand")
+    const item = subject({
+      memory: {
+        status: async () => ({ data: status("/repo") }),
+        show: async () => ({ data: show("/repo") }),
+      },
+    } as unknown as KiloClient)
+
+    try {
+      await item.memory.run({ operation: "inspect", sessionID: "ses_inspect" })
+
+      expect(reveal).toHaveBeenCalledWith("revealFileInOS", expect.objectContaining({ fsPath: "/repo/.kilo/memory" }))
+      expect(item.posts).toContainEqual(
+        expect.objectContaining({ type: "memoryOperationResult", operation: "inspect", ok: true }),
+      )
+    } finally {
+      reveal.mockRestore()
+    }
+  })
+
   it("handles clients without memory endpoints gracefully", async () => {
     const item = subject({} as KiloClient)
 
@@ -117,7 +202,7 @@ describe("KiloProviderMemory", () => {
     expect(posts[1]).toMatchObject({
       type: "memoryLoaded",
       sessionID: "ses_8",
-      show: { root: "/repo/ses_8/.kilo/memory" },
+      status: { root: "/repo/ses_8/.kilo/memory" },
     })
   })
 
@@ -158,34 +243,29 @@ describe("KiloProviderMemory", () => {
   it("routes status operations without mutating memory", async () => {
     const calls: string[] = []
     const state = status("/repo")
-    const view = show("/repo")
     const item = subject({
       memory: {
         status: async () => {
           calls.push("status")
           return { data: state }
         },
-        show: async () => {
-          calls.push("show")
-          return { data: view }
-        },
       },
     } as unknown as KiloClient)
 
     await item.memory.run({ operation: "status", sessionID: "ses_memory" })
 
-    expect(calls).toEqual(["status", "status", "show"])
+    expect(calls).toEqual(["status"])
     expect(item.posts).toContainEqual(
-      expect.objectContaining({ type: "memoryOperationResult", operation: "status", ok: true }),
+      expect.objectContaining({ type: "memoryOperationResult", operation: "status", ok: true, result: state }),
     )
+    expect(item.posts).toContainEqual(expect.objectContaining({ type: "memoryLoaded", status: state }))
   })
 
-  it("routes auto-save, verbose, and purge operations with explicit payloads", async () => {
+  it("routes auto-save and purge operations with explicit payloads", async () => {
     const calls: unknown[] = []
     const state = status("/repo")
     const view = show("/repo")
     state.state.autoConsolidate = false
-    state.state.verbose = true
     const item = subject({
       memory: {
         configure: async (input: unknown) => {
@@ -202,14 +282,12 @@ describe("KiloProviderMemory", () => {
     } as unknown as KiloClient)
 
     await item.memory.run({ operation: "auto", mode: "off", sessionID: "ses_memory" })
-    await item.memory.run({ operation: "verbose", mode: "on", sessionID: "ses_memory" })
     await item.memory.run({ operation: "purge", confirm: true, sessionID: "ses_memory" })
 
     expect(calls).toEqual([
       ["configure", { directory: "/repo", autoConsolidate: false }],
-      ["configure", { directory: "/repo", verbose: true }],
       ["purge", { directory: "/repo", confirm: true }],
     ])
-    expect(item.posts.filter((post) => (post as { type?: string }).type === "memoryOperationResult")).toHaveLength(3)
+    expect(item.posts.filter((post) => (post as { type?: string }).type === "memoryOperationResult")).toHaveLength(2)
   })
 })
diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts
index c0576d2fe4..3a9213d887 100644
--- a/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts
+++ b/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts
@@ -165,6 +165,14 @@ describe("sessionToWebview", () => {
     expect(result.revert).toBeNull()
     expect(result.summary).toBeNull()
   })
+
+  it("preserves the workspace restoration outcome from a revert response", () => {
+    const session = {
+      ...makeSession(),
+      revert: { messageID: "msg-1", workspace: "snapshots-disabled" as const },
+    }
+    expect(sessionToWebview(session).revert).toMatchObject({ workspace: "snapshots-disabled" })
+  })
 })
 
 describe("indexProvidersById", () => {
diff --git a/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts b/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts
index fbc8aa4255..7c226ecaba 100644
--- a/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts
+++ b/packages/kilo-vscode/tests/unit/kilo-ui-contract.test.ts
@@ -24,12 +24,22 @@ const DATA_CONTEXT_FILE = path.join(MONOREPO_ROOT, "packages/ui/src/context/data
 const MESSAGE_PART_FILE = path.join(MONOREPO_ROOT, "packages/ui/src/components/message-part.tsx")
 const KILO_MESSAGE_PART_FILE = path.join(MONOREPO_ROOT, "packages/kilo-ui/src/components/message-part.tsx")
 const KILO_MESSAGE_HIGHLIGHT_FILE = path.join(MONOREPO_ROOT, "packages/kilo-ui/src/components/message-highlight.ts")
+const KILO_BASIC_TOOL_CSS_FILE = path.join(MONOREPO_ROOT, "packages/kilo-ui/src/components/basic-tool.css")
 const KILO_MESSAGE_PART_CSS_FILE = path.join(MONOREPO_ROOT, "packages/kilo-ui/src/components/message-part.css")
 const SHELL_ROLLING_FILE = path.join(MONOREPO_ROOT, "packages/kilo-ui/src/components/shell-rolling-results.tsx")
 const ASSISTANT_MESSAGE_FILE = path.join(
   MONOREPO_ROOT,
   "packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx",
 )
+const TASK_HEADER_FILE = path.join(MONOREPO_ROOT, "packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx")
+const CONTEXT_TAB_FILE = path.join(
+  MONOREPO_ROOT,
+  "packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx",
+)
+const PROMPT_INPUT_FILE = path.join(
+  MONOREPO_ROOT,
+  "packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx",
+)
 const TRANSCRIPT_PARTS_FILE = path.join(MONOREPO_ROOT, "packages/kilo-vscode/webview-ui/src/utils/transcript-parts.ts")
 const CHAT_LAYOUT_FILE = path.join(MONOREPO_ROOT, "packages/kilo-vscode/webview-ui/src/styles/chat-layout.css")
 
@@ -331,6 +341,55 @@ describe("AssistantMessage visible row contract (source)", () => {
   it("uses the plan exit card only when plan metadata is renderable", () => {
     expect(src).toContain("if (!planExitInfo(part)) return")
   })
+
+  it("uses the native recall tool without a separate memory badge", () => {
+    const tools = fs.readFileSync(KILO_MESSAGE_PART_FILE, "utf-8")
+    expect(src).not.toContain("assistant-memory-badge")
+    expect(tools).toContain("ToolRegistry.render(part.tool) ?? McpTool")
+  })
+})
+
+describe("Native tool summary contract (source)", () => {
+  const tools = fs.readFileSync(KILO_MESSAGE_PART_FILE, "utf-8")
+  const css = fs.readFileSync(KILO_BASIC_TOOL_CSS_FILE, "utf-8")
+
+  it("shows one secondary argument while preserving complete expanded input", () => {
+    const start = tools.indexOf("const inputArgs")
+    const end = tools.indexOf("const formatted", start)
+    expect(tools.slice(start, end)).toContain(".slice(0, 1)")
+    expect(tools).toContain("JSON.stringify(props.input, null, 2)")
+  })
+
+  it("gives the primary label remaining width and bounds secondary arguments", () => {
+    expect(css).toMatch(/\[data-slot="basic-tool-tool-info"\][\s\S]*?flex: 1 1 auto;/)
+    expect(css).toMatch(/\[data-slot="basic-tool-tool-subtitle"\][\s\S]*?flex: 1 1 auto;/)
+    expect(css).toMatch(/\[data-slot="basic-tool-tool-arg"\][\s\S]*?max-width: 24ch;/)
+  })
+})
+
+describe("Memory control placement contract (source)", () => {
+  const header = fs.readFileSync(TASK_HEADER_FILE, "utf-8")
+  const settings = fs.readFileSync(CONTEXT_TAB_FILE, "utf-8")
+  const prompt = fs.readFileSync(PROMPT_INPUT_FILE, "utf-8")
+
+  it("keeps memory controls out of the task header", () => {
+    expect(header).not.toContain("useMemory")
+    expect(header).not.toContain('name="memory"')
+  })
+
+  it("shows storage inspection in settings without a manual rebuild action", () => {
+    expect(settings).toContain("settings.context.memory.storage.title")
+    expect(settings).toContain("settings.context.memory.status.enabledTokens")
+    expect(settings).toContain("memory.inspect()")
+    expect(settings).not.toContain("memory.rebuild()")
+    expect(settings).not.toContain("lastOperationCount")
+    expect(settings).not.toContain("sessionTokens")
+  })
+
+  it("expands bare memory commands into inline completion", () => {
+    expect(prompt).toContain('const value = "/memory "')
+    expect(prompt).toContain("slash.onInput(value, value.length)")
+  })
 })
 
 describe("Assistant transcript spacing contract (source)", () => {
diff --git a/packages/kilo-vscode/tests/unit/memory-activity.test.ts b/packages/kilo-vscode/tests/unit/memory-activity.test.ts
deleted file mode 100644
index 316175e256..0000000000
--- a/packages/kilo-vscode/tests/unit/memory-activity.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { describe, expect, it } from "bun:test"
-import { MemoryMarkerMeta } from "@kilocode/kilo-memory/marker-meta"
-import { addMemoryActivity, markerActivity } from "../../webview-ui/src/utils/memory-activity"
-
-describe("memory activity", () => {
-  it("accumulates saved events with their message and source references", () => {
-    const items = addMemoryActivity(
-      [],
-      {
-        type: "saved",
-        message: "Saved project memory",
-        operationCount: 4,
-        added: 3,
-        removed: 1,
-        sources: ["project.md:kilo_colors"],
-      },
-      10,
-    )
-
-    expect(items).toEqual([
-      {
-        type: "saved",
-        at: 10,
-        tokens: 0,
-        count: 3,
-        items: ["Saved project memory"],
-        refs: ["project.md:kilo_colors"],
-      },
-    ])
-    expect(addMemoryActivity(items, { type: "recalled" }, 20)).toEqual(items)
-  })
-
-  it("ignores removal-only events and caps saved activity", () => {
-    const removed = { type: "saved" as const, message: "Memory updated · 1 removed", added: 0, removed: 1 }
-    expect(addMemoryActivity([], removed, 10)).toEqual([])
-
-    const items = Array.from({ length: 60 }).reduce(
-      (all, _, at) => addMemoryActivity(all, { type: "saved", added: 1 }, at),
-      [] as ReturnType<typeof addMemoryActivity>,
-    )
-    expect(items).toHaveLength(50)
-    expect(items[0]?.at).toBe(10)
-    expect(items.at(-1)?.at).toBe(59)
-  })
-
-  it("decodes loaded and recalled markers for activity summaries", () => {
-    const loaded = markerActivity(
-      [
-        {
-          type: "text",
-          metadata: MemoryMarkerMeta.metadata(
-            {
-              type: "startup",
-              bytes: 10,
-              tokens: 42,
-              count: 1,
-              files: ["project.md"],
-              items: ["Use Kilo colors"],
-            },
-            true,
-          ),
-        },
-      ],
-      10,
-    )
-    const recalled = markerActivity(
-      [
-        {
-          type: "text",
-          metadata: MemoryMarkerMeta.metadata(
-            {
-              type: "recall",
-              bytes: 10,
-              tokens: 8,
-              count: 2,
-              files: ["project.md"],
-              items: ["Prefer dark mode"],
-            },
-            true,
-          ),
-        },
-      ],
-      20,
-    )
-
-    expect(loaded).toMatchObject({ type: "loaded", tokens: 42, count: 1, items: [] })
-    expect(recalled).toMatchObject({ type: "recalled", tokens: 8, count: 2, items: ["Prefer dark mode"] })
-  })
-})
diff --git a/packages/kilo-vscode/tests/unit/memory-command.test.ts b/packages/kilo-vscode/tests/unit/memory-command.test.ts
index 6b160d62af..d42a67aa86 100644
--- a/packages/kilo-vscode/tests/unit/memory-command.test.ts
+++ b/packages/kilo-vscode/tests/unit/memory-command.test.ts
@@ -4,7 +4,7 @@ import { parseMemoryCommand, type ParsedMemoryCommand } from "../../webview-ui/s
 type MemoryOperation =
   | "enable"
   | "status"
-  | "edit"
+  | "inspect"
   | "disable"
   | "rebuild"
   | "remember"
@@ -12,7 +12,6 @@ type MemoryOperation =
   | "forget"
   | "purge"
   | "auto"
-  | "verbose"
 type Case = {
   name: string
   input: string
@@ -43,7 +42,7 @@ function expected(item: Case): ParsedMemoryCommand | undefined {
     if (!item.query) throw new Error(`Missing query for fixture: ${item.name}`)
     return { kind: "operation", operation: item.operation, query: item.query }
   }
-  if (item.operation === "auto" || item.operation === "verbose") {
+  if (item.operation === "auto") {
     if (!item.mode) throw new Error(`Missing mode for fixture: ${item.name}`)
     return { kind: "operation", operation: item.operation, mode: item.mode }
   }
diff --git a/packages/kilo-vscode/tests/unit/multi-model-utils.test.ts b/packages/kilo-vscode/tests/unit/multi-model-utils.test.ts
index 175b74ae63..0c54e44644 100644
--- a/packages/kilo-vscode/tests/unit/multi-model-utils.test.ts
+++ b/packages/kilo-vscode/tests/unit/multi-model-utils.test.ts
@@ -7,6 +7,7 @@ import {
   remaining,
   toggleModel,
   setAllocationCount,
+  setAllocationVariant,
   maxAllocationCount,
   MAX_MULTI_VERSIONS,
 } from "../../webview-ui/agent-manager/multi-model-utils"
@@ -41,6 +42,24 @@ describe("multi-model-utils", () => {
     expect(arr).toContainEqual({ providerID: "b", modelID: "m2", count: 1 })
   })
 
+  test("allocationsToArray includes variant when set", () => {
+    const alloc = setAllocationVariant(make(["a", "m1", "Model 1", 1]), "a", "m1", "high")
+    expect(allocationsToArray(alloc)).toContainEqual({ providerID: "a", modelID: "m1", count: 1, variant: "high" })
+  })
+
+  test("setAllocationVariant sets and clears the variant", () => {
+    const alloc = make(["a", "m1", "Model 1", 1])
+    const set = setAllocationVariant(alloc, "a", "m1", "high")
+    expect(set.get("a/m1")?.variant).toBe("high")
+    expect(setAllocationVariant(set, "a", "m1", undefined).get("a/m1")?.variant).toBeUndefined()
+  })
+
+  test("setAllocationVariant preserves count and does nothing for unknown models", () => {
+    const alloc = make(["a", "m1", "Model 1", 2])
+    expect(setAllocationVariant(alloc, "a", "m1", "high").get("a/m1")?.count).toBe(2)
+    expect(setAllocationVariant(alloc, "b", "m2", "high")).toBe(alloc)
+  })
+
   test("remaining returns slots left", () => {
     const alloc = make(["a", "m1", "Model 1", 2], ["b", "m2", "Model 2", 1])
     expect(remaining(alloc)).toBe(MAX_MULTI_VERSIONS - 3)
diff --git a/packages/kilo-vscode/tests/unit/multi-version.test.ts b/packages/kilo-vscode/tests/unit/multi-version.test.ts
new file mode 100644
index 0000000000..9d5a1882ef
--- /dev/null
+++ b/packages/kilo-vscode/tests/unit/multi-version.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, test } from "bun:test"
+import { resolveVersionModels, buildInitialMessages, type CreatedVersion } from "../../src/agent-manager/multi-version"
+
+const created = (n: number): CreatedVersion[] =>
+  Array.from({ length: n }, (_, i) => ({
+    worktreeId: `wt-${i}`,
+    sessionId: `ses-${i}`,
+    path: `/tmp/wt-${i}`,
+    branch: `branch-${i}`,
+    parentBranch: "main",
+    versionIndex: i,
+  }))
+
+describe("resolveVersionModels", () => {
+  test("expands allocations with per-model variants", () => {
+    const { models, versions } = resolveVersionModels(
+      [
+        { providerID: "a", modelID: "m1", count: 2, variant: "high" },
+        { providerID: "b", modelID: "m2", count: 1 },
+      ],
+      undefined,
+      1,
+    )
+    expect(versions).toBe(3)
+    expect(models).toEqual([
+      { providerID: "a", modelID: "m1", variant: "high" },
+      { providerID: "a", modelID: "m1", variant: "high" },
+      { providerID: "b", modelID: "m2", variant: undefined },
+    ])
+  })
+
+  test("non-compare runs carry no per-version variant", () => {
+    const { models } = resolveVersionModels(undefined, { providerID: "a", modelID: "m1" }, 2)
+    expect(models).toEqual([])
+  })
+})
+
+describe("buildInitialMessages", () => {
+  test("per-allocation variant wins over the dialog-level variant", () => {
+    const models = resolveVersionModels(
+      [
+        { providerID: "a", modelID: "m1", count: 1, variant: "high" },
+        { providerID: "b", modelID: "m2", count: 1 },
+      ],
+      undefined,
+      1,
+    ).models
+    const msgs = buildInitialMessages(created(2), models, {}, "do it", undefined, "low")
+    expect(msgs[0]?.variant).toBe("high")
+    expect(msgs[1]?.variant).toBe("low")
+  })
+
+  test("falls back to the dialog-level variant when no allocation variant is set", () => {
+    const msgs = buildInitialMessages(created(1), [], { providerID: "a", modelID: "m1" }, "do it", undefined, "medium")
+    expect(msgs[0]?.variant).toBe("medium")
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/new-worktree-dialog-sandbox.test.ts b/packages/kilo-vscode/tests/unit/new-worktree-dialog-sandbox.test.ts
index dc00f65473..4b9c07a048 100644
--- a/packages/kilo-vscode/tests/unit/new-worktree-dialog-sandbox.test.ts
+++ b/packages/kilo-vscode/tests/unit/new-worktree-dialog-sandbox.test.ts
@@ -18,7 +18,7 @@ describe("NewWorktreeDialog sandbox toggle", () => {
       'vscode.postMessage({ type: "setSandboxDefault", enabled: next, requestID: sandboxRequestID })',
     )
     expect(src).toContain("sandbox: sandboxVisible() ? sandboxOverride() : undefined")
-    expect(src).toContain("const { config, globalConfig, features } = useConfig()")
+    expect(src).toContain("const { config, globalConfig, features, settings } = useConfig()")
     expect(src).toContain(
       "const sandboxVisible = () => features().sandboxControls && globalConfig().sandbox?.enabled === true",
     )
diff --git a/packages/kilo-vscode/tests/unit/revert-checkpoints.test.ts b/packages/kilo-vscode/tests/unit/revert-checkpoints.test.ts
index b3524d2f8c..8fc4c36b38 100644
--- a/packages/kilo-vscode/tests/unit/revert-checkpoints.test.ts
+++ b/packages/kilo-vscode/tests/unit/revert-checkpoints.test.ts
@@ -5,9 +5,15 @@ import path from "node:path"
 const ROOT = path.resolve(import.meta.dir, "../..")
 const TURN_FILE = path.join(ROOT, "webview-ui/src/components/chat/VscodeSessionTurn.tsx")
 const PROVIDER_FILE = path.join(ROOT, "src/KiloProvider.ts")
+const BANNER_FILE = path.join(ROOT, "webview-ui/src/components/chat/RevertBanner.tsx")
+const SESSION_FILE = path.join(ROOT, "webview-ui/src/types/messages/sessions.ts")
+const SDK_FILE = path.join(ROOT, "../sdk/js/src/v2/gen/types.gen.ts")
 
 const src = fs.readFileSync(TURN_FILE, "utf-8")
 const provider = fs.readFileSync(PROVIDER_FILE, "utf-8")
+const banner = fs.readFileSync(BANNER_FILE, "utf-8")
+const session = fs.readFileSync(SESSION_FILE, "utf-8")
+const sdk = fs.readFileSync(SDK_FILE, "utf-8")
 
 function method(name: string, next: string) {
   const start = provider.indexOf(`  private async ${name}`)
@@ -49,3 +55,26 @@ describe("revert session synchronization", () => {
     expect(provider).toMatch(/this\.setCurrentSession\(event\.properties\.info\)/)
   })
 })
+
+describe("revert workspace restoration status", () => {
+  it("renders explicit conversation-only outcomes", () => {
+    expect(session).toContain('workspace?: "restored" | "snapshots-disabled" | "unavailable"')
+    expect(sdk).toMatch(
+      /export type Session = \{[\s\S]*?workspace\?: "restored" \| "snapshots-disabled" \| "unavailable"/,
+    )
+    expect(sdk).toMatch(
+      /export type KilocodeSessionImportSessionData = \{[\s\S]*?workspace\?: "restored" \| "snapshots-disabled" \| "unavailable"/,
+    )
+    expect(banner).toContain('"revert.banner.workspace.snapshotsDisabled"')
+    expect(banner).toContain('"revert.banner.workspace.unavailable"')
+  })
+
+  it("opens the checkpoints settings tab when snapshots are disabled", () => {
+    expect(banner).toContain('{ type: "openSettingsPanel", tab: "checkpoints" }')
+    expect(banner).toContain('"revert.banner.workspace.enableSnapshots"')
+  })
+
+  it("uses a legacy notice for reverts without an explicit outcome", () => {
+    expect(banner).toContain('"revert.banner.workspace.legacy"')
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/session-variant-store.test.ts b/packages/kilo-vscode/tests/unit/session-variant-store.test.ts
index 11901449db..c6c27294b1 100644
--- a/packages/kilo-vscode/tests/unit/session-variant-store.test.ts
+++ b/packages/kilo-vscode/tests/unit/session-variant-store.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "bun:test"
 import {
+  cycleVariant,
   getVariant,
   sessionVariantKeys,
   sessionVariants,
@@ -92,3 +93,23 @@ describe("per-session variant selection", () => {
     expect(sessionVariantKeys(store, "pending-local-1")).toEqual(["session/pending-local-1/anthropic/claude-sonnet-4"])
   })
 })
+
+describe("cycleVariant", () => {
+  it("advances to the next variant", () => {
+    expect(cycleVariant("low", variants)).toBe("medium")
+    expect(cycleVariant("medium", variants)).toBe("high")
+  })
+
+  it("wraps back to the first variant after the last", () => {
+    expect(cycleVariant("high", variants)).toBe("low")
+  })
+
+  it("starts at the first variant when current is missing or unknown", () => {
+    expect(cycleVariant(undefined, variants)).toBe("low")
+    expect(cycleVariant("bogus", variants)).toBe("low")
+  })
+
+  it("returns undefined when no variants exist", () => {
+    expect(cycleVariant("low", [])).toBeUndefined()
+  })
+})
diff --git a/packages/kilo-vscode/tests/unit/transcript-parts.test.ts b/packages/kilo-vscode/tests/unit/transcript-parts.test.ts
index 351fa3a999..8d0b9abccc 100644
--- a/packages/kilo-vscode/tests/unit/transcript-parts.test.ts
+++ b/packages/kilo-vscode/tests/unit/transcript-parts.test.ts
@@ -31,6 +31,13 @@ const SCRIPT = `
       state: { status: "completed", input: {}, output: "done", title: "Updated todos" },
     },
     { id: "read-running", type: "tool", tool: "read", state: { status: "running", input: {} } },
+    { id: "memory-running", type: "tool", tool: "kilo_memory_recall", state: { status: "running", input: {} } },
+    {
+      id: "memory-completed",
+      type: "tool",
+      tool: "kilo_memory_recall",
+      state: { status: "completed", input: {}, output: "memory", title: "Memory recalled" },
+    },
   ]
   const visible = parts.filter((part) => isRenderable(part, message)).map((part) => part.id)
 
@@ -38,7 +45,14 @@ const SCRIPT = `
     console.log("${FAIL}" + reason)
     process.exit(2)
   }
-  const expected = ["visible-text", "visible-reasoning", "todo-completed", "read-running"]
+  const expected = [
+    "visible-text",
+    "visible-reasoning",
+    "todo-completed",
+    "read-running",
+    "memory-running",
+    "memory-completed",
+  ]
   if (visible.length !== expected.length || visible.some((id, index) => id !== expected[index])) {
     fail("did not exclude transcript-invisible parts")
   }
diff --git a/packages/kilo-vscode/tests/unit/use-slash-command.test.ts b/packages/kilo-vscode/tests/unit/use-slash-command.test.ts
index b243ab06fc..0718b5ab29 100644
--- a/packages/kilo-vscode/tests/unit/use-slash-command.test.ts
+++ b/packages/kilo-vscode/tests/unit/use-slash-command.test.ts
@@ -27,6 +27,76 @@ function setup(sandbox: () => void, options: { enabled?: () => boolean; exclude?
 }
 
 describe("useSlashCommand sandbox action", () => {
+  it("opens project memory actions from the top-level command", () => {
+    const ctx = setup(() => {})
+    const state = { text: "/memory" }
+    const textarea = {
+      value: state.text,
+      setSelectionRange: () => {},
+      focus: () => {},
+    } as unknown as HTMLTextAreaElement
+
+    ctx.slash.onInput("/mem", 4)
+
+    expect(ctx.slash.results()).toContainEqual(
+      expect.objectContaining({ name: "memory", description: "Manage project memory", hints: ["mem"] }),
+    )
+    ctx.slash.select(ctx.slash.results()[0]!, textarea, (text) => (state.text = text))
+    expect(state.text).toBe("/memory ")
+    expect(ctx.slash.results().map((command) => command.name)).toContain("memory inspect")
+    ctx.dispose()
+  })
+
+  it("offers memory actions after the parent command", () => {
+    const ctx = setup(() => {})
+
+    ctx.slash.onInput("/memory ", 8)
+
+    expect(ctx.slash.results().map((command) => command.name)).toEqual([
+      "memory status",
+      "memory show",
+      "memory on",
+      "memory off",
+      "memory inspect",
+      "memory rebuild",
+      "memory remember",
+      "memory correct",
+      "memory forget",
+      "memory auto on",
+      "memory auto off",
+      "memory purge confirm",
+    ])
+    ctx.dispose()
+  })
+
+  it("keeps nested memory actions out of root hint matching", () => {
+    const ctx = setup(() => {})
+    const nested = ctx.slash.commands().filter((command) => command.name.startsWith("memory "))
+
+    expect(nested.length).toBeGreaterThan(0)
+    expect(nested.every((command) => command.hints.length === 0)).toBe(true)
+    ctx.dispose()
+  })
+
+  it("completes nested memory actions and closes for free text", () => {
+    const ctx = setup(() => {})
+    const state = { text: "/mem rem" }
+    const textarea = {
+      value: state.text,
+      setSelectionRange: () => {},
+      focus: () => {},
+    } as unknown as HTMLTextAreaElement
+
+    ctx.slash.onInput(state.text, state.text.length)
+    expect(ctx.slash.results().map((command) => command.name)).toEqual(["memory remember"])
+    ctx.slash.select(ctx.slash.results()[0]!, textarea, (text) => (state.text = text))
+    expect(state.text).toBe("/memory remember ")
+
+    ctx.slash.onInput("/memory remember durable fact", 31)
+    expect(ctx.slash.show()).toBe(false)
+    ctx.dispose()
+  })
+
   it("runs the sandbox toggle as a client command", () => {
     const state = { toggles: 0, text: "/sandbox", prevented: 0 }
     const ctx = setup(() => state.toggles++)
diff --git a/packages/kilo-vscode/tsconfig.json b/packages/kilo-vscode/tsconfig.json
index 868845e9f1..b8012f1644 100644
--- a/packages/kilo-vscode/tsconfig.json
+++ b/packages/kilo-vscode/tsconfig.json
@@ -3,7 +3,7 @@
     "module": "ESNext",
     "moduleResolution": "bundler",
     "target": "ES2022",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "sourceMap": true,
     "rootDir": "src",
     "strict": true /* enable all strict type-checking options */,
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx b/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx
index 71b39fed3c..e1d00c1f95 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/MultiModelSelector.tsx
@@ -18,6 +18,7 @@ import {
   totalAllocations,
   toggleModel,
   setAllocationCount,
+  setAllocationVariant,
   maxAllocationCount,
 } from "./multi-model-utils"
 
@@ -96,6 +97,7 @@ export const MultiModelSelector: Component<{
                   const checked = () => props.allocations.has(key())
                   const entry = () => props.allocations.get(key())
                   const disabled = () => !checked() && totalAllocations(props.allocations) >= MAX_MULTI_VERSIONS
+                  const efforts = () => Object.keys(model.variants ?? {})
 
                   return (
                     <div
@@ -135,6 +137,27 @@ export const MultiModelSelector: Component<{
                         </Show>
                       </label>
                       <Show when={checked()}>
+                        <Show when={efforts().length > 0}>
+                          <select
+                            class="am-mm-count-select am-mm-variant-select"
+                            value={entry()?.variant ?? ""}
+                            title={t("agentManager.dialog.compareModels.effort")}
+                            aria-label={t("agentManager.dialog.compareModels.effort")}
+                            onChange={(e) =>
+                              props.onChange(
+                                setAllocationVariant(
+                                  props.allocations,
+                                  model.providerID,
+                                  model.id,
+                                  e.currentTarget.value || undefined,
+                                ),
+                              )
+                            }
+                          >
+                            <option value="">{t("agentManager.dialog.compareModels.effortDefault")}</option>
+                            <For each={efforts()}>{(v) => <option value={v}>{v}</option>}</For>
+                          </select>
+                        </Show>
                         <select
                           class="am-mm-count-select"
                           value={entry()?.count ?? 1}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx b/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
index b4630c72d8..e141c5f077 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx
@@ -22,6 +22,7 @@ import { useServer } from "../src/context/server"
 import { useSession } from "../src/context/session"
 import { useProvider } from "../src/context/provider"
 import { useConfig } from "../src/context/config"
+import { cycleVariant } from "../src/context/session-variant-store"
 import { ModelSelectorBase } from "../src/components/shared/ModelSelector"
 import { ModeSwitcherBase } from "../src/components/shared/ModeSwitcher"
 import { SpeechToTextButton } from "../src/components/speech-to-text/SpeechToTextButton"
@@ -79,7 +80,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
   const server = useServer()
   const session = useSession()
   const provider = useProvider()
-  const { config, globalConfig, features } = useConfig()
+  const { config, globalConfig, features, settings } = useConfig()
   const metrics = tracker(vscode)
   const track = (button: string, properties?: Record<string, string | number | boolean | undefined>) =>
     metrics.track(button, "configure_worktree_dialog", properties)
@@ -245,6 +246,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
   createEffect(() => persistImages(imageAttach.images()))
 
   let textareaRef: HTMLTextAreaElement | undefined
+  let containerRef: HTMLDivElement | undefined
 
   onMount(() => {
     setBranchesLoading(true)
@@ -339,10 +341,33 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
     textareaRef.focus()
   }
 
+  const onKey = (e: KeyboardEvent) => {
+    // Shift+Tab cycles reasoning effort variants (setting: chat.shiftTabCyclesVariant).
+    // When disabled or no variants exist, fall through to default focus navigation.
+    if (e.key === "Tab" && e.shiftKey && !e.ctrlKey && !e.metaKey && !e.altKey) {
+      if (settings()["chat.shiftTabCyclesVariant"] === false) return
+      const list = variants()
+      if (list.length === 0) return
+      const next = cycleVariant(effectiveVariant(), list)
+      if (!next) return
+      e.preventDefault()
+      setVariant(next)
+      return
+    }
+    undo(e)
+  }
+
   const adjustHeight = () => {
-    if (!textareaRef) return
-    textareaRef.style.height = "auto"
-    textareaRef.style.height = `${Math.min(textareaRef.scrollHeight, 200)}px`
+    const box = containerRef
+    const area = textareaRef
+    if (!box || !area) return
+    // Grow the container with the prompt (same 200px auto-grow cap as the
+    // sidebar prompt), never the textarea: it fills the container and is the
+    // only element that scrolls. A manual container resize persists until the
+    // next input re-fits the height.
+    box.style.height = "auto"
+    const chrome = box.offsetHeight - area.offsetHeight
+    box.style.height = `${Math.min(area.scrollHeight, 200) + chrome}px`
   }
 
   const insertSpeechText = (value: string) => {
@@ -491,6 +516,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
             />
             {/* Prompt input — reuses the sidebar chat-input base classes for consistent styling */}
             <div
+              ref={containerRef}
               class="prompt-input-container am-prompt-input-container"
               classList={{ "prompt-input-container--dragging": imageAttach.dragging() }}
               onDragOver={imageAttach.handleDragOver}
@@ -541,7 +567,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
                       persistPrompt(val)
                       adjustHeight()
                     }}
-                    onKeyDown={undo}
+                    onKeyDown={onKey}
                     onPaste={(e) => imageAttach.handlePaste(e)}
                     rows={3}
                     dir="auto"
@@ -575,6 +601,7 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
                       onSelect={setVariant}
                       portal={false}
                       deferDismiss
+                      cycleHint={settings()["chat.shiftTabCyclesVariant"] !== false}
                     />
                     <Show when={overridden()}>
                       <Tooltip value={t("prompt.action.resetModel")} placement="top">
@@ -841,7 +868,9 @@ export const NewWorktreeDialog: Component<{ onClose: () => void; defaultBaseBran
                           }
                         >
                           <span class="am-selector-value">
-                            {[...modelAllocations().values()].map((e) => e.name).join(", ")}
+                            {[...modelAllocations().values()]
+                              .map((e) => (e.variant ? `${e.name} (${e.variant})` : e.name))
+                              .join(", ")}
                           </span>
                         </Show>
                       </span>
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
index 197c4dc845..4abb957fc3 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
+++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
@@ -2658,10 +2658,13 @@ body.am-wt-dragging-active * {
   min-height: 0;
 }
 
-/* Allow portal-based dropdowns to escape the dialog bounds */
+/* Allow portal-based dropdowns to escape the dialog bounds.
+   Wider than the kilo-ui default so the prompt stays readable for long input. */
 [data-component="dialog"]:has(.am-nv-dialog) [data-slot="dialog-content"] {
   overflow: visible;
   max-height: 85vh;
+  width: 640px;
+  max-width: 92vw;
 }
 
 /* Scrollable form content area — keeps submit button always visible */
@@ -2702,7 +2705,10 @@ body.am-wt-dragging-active * {
   color: var(--vscode-input-placeholderForeground, var(--text-weaker));
 }
 
-/* Dialog overrides for prompt-input-container — resizable from bottom edge */
+/* Dialog overrides for prompt-input-container — resizable from bottom edge.
+   The container is the only element that changes size (auto-grow + manual
+   resize); the textarea always fills it and is the only element that scrolls,
+   so long prompts never produce nested scrollbars. */
 .am-nv-dialog .am-prompt-input-container {
   margin: 0;
   resize: vertical;
@@ -2716,8 +2722,7 @@ body.am-wt-dragging-active * {
 .am-nv-dialog .am-prompt-input-wrapper {
   flex: 1;
   min-height: 0;
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow: hidden;
 }
 
 /* While any inline (non-portaled) selector popover is open, let it escape the
@@ -2740,8 +2745,9 @@ body.am-wt-dragging-active * {
   color: var(--vscode-input-foreground, var(--text-base));
   resize: none;
   width: 100%;
-  min-height: 100%;
+  height: 100%;
   max-height: none;
+  overflow-y: auto;
 }
 
 .am-nv-config-label {
@@ -2918,6 +2924,7 @@ body.am-wt-dragging-active * {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  gap: 6px;
   padding: 4px 10px;
   min-height: 30px;
   transition: background 80ms;
@@ -3014,6 +3021,11 @@ body.am-wt-dragging-active * {
   border-color: var(--border-focus);
 }
 
+.am-mm-variant-select {
+  max-width: 110px;
+  text-overflow: ellipsis;
+}
+
 .am-nv-spinner {
   width: 14px;
   height: 14px;
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
index 26ccbd249b..c930131f42 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts
@@ -121,6 +121,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "تشغيل الوكلاء على نماذج مختلفة بالتوازي لمقارنة النتائج",
   "agentManager.dialog.compareModels.searchModels": "البحث عن النماذج...",
   "agentManager.dialog.compareModels.selectModels": "اختر النماذج...",
+  "agentManager.dialog.compareModels.effort": "جهد الاستدلال",
+  "agentManager.dialog.compareModels.effortDefault": "افتراضي",
   "agentManager.dialog.creating": "جارٍ الإنشاء...",
   "agentManager.dialog.createWorktree": "إنشاء شجرة العمل",
   "agentManager.dialog.removeImage": "إزالة الصورة",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
index c94912316d..03efd3495c 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts
@@ -124,6 +124,8 @@ export const dict = {
     "Execute agentes em diferentes modelos em paralelo para comparar resultados",
   "agentManager.dialog.compareModels.searchModels": "Pesquisar modelos...",
   "agentManager.dialog.compareModels.selectModels": "Selecionar modelos...",
+  "agentManager.dialog.compareModels.effort": "Esforço de raciocínio",
+  "agentManager.dialog.compareModels.effortDefault": "Padrão",
   "agentManager.dialog.creating": "Criando...",
   "agentManager.dialog.createWorktree": "Criar Worktree",
   "agentManager.dialog.removeImage": "Remover imagem",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
index 918c3d7136..09f813f7d0 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts
@@ -124,6 +124,8 @@ export const dict = {
     "Pokrenite agente na različitim modelima paralelno radi usporedbe rezultata",
   "agentManager.dialog.compareModels.searchModels": "Pretraži modele...",
   "agentManager.dialog.compareModels.selectModels": "Odaberi modele...",
+  "agentManager.dialog.compareModels.effort": "Napor zaključivanja",
+  "agentManager.dialog.compareModels.effortDefault": "Zadano",
   "agentManager.dialog.creating": "Kreiranje...",
   "agentManager.dialog.createWorktree": "Kreiraj worktree",
   "agentManager.dialog.removeImage": "Ukloni sliku",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
index 5ab0555293..f7dfe7697d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts
@@ -125,6 +125,8 @@ export const dict = {
     "Kør agenter på forskellige modeller parallelt for at sammenligne resultater",
   "agentManager.dialog.compareModels.searchModels": "Søg modeller...",
   "agentManager.dialog.compareModels.selectModels": "Vælg modeller...",
+  "agentManager.dialog.compareModels.effort": "Ræsonnementsindsats",
+  "agentManager.dialog.compareModels.effortDefault": "Standard",
   "agentManager.dialog.creating": "Opretter...",
   "agentManager.dialog.createWorktree": "Opret Worktree",
   "agentManager.dialog.removeImage": "Fjern billede",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
index f667d575d5..e116ebd4f8 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts
@@ -125,6 +125,8 @@ export const dict = {
     "Agenten parallel auf verschiedenen Modellen ausführen, um Ergebnisse zu vergleichen",
   "agentManager.dialog.compareModels.searchModels": "Modelle suchen...",
   "agentManager.dialog.compareModels.selectModels": "Modelle auswählen...",
+  "agentManager.dialog.compareModels.effort": "Reasoning-Aufwand",
+  "agentManager.dialog.compareModels.effortDefault": "Standard",
   "agentManager.dialog.creating": "Wird erstellt...",
   "agentManager.dialog.createWorktree": "Worktree erstellen",
   "agentManager.dialog.removeImage": "Bild entfernen",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
index 930d95751f..02bc4333cc 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts
@@ -127,6 +127,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "Run agents on different models in parallel to compare results",
   "agentManager.dialog.compareModels.searchModels": "Search models...",
   "agentManager.dialog.compareModels.selectModels": "Select models...",
+  "agentManager.dialog.compareModels.effort": "Reasoning effort",
+  "agentManager.dialog.compareModels.effortDefault": "Default",
   "agentManager.dialog.creating": "Creating...",
   "agentManager.dialog.createWorktree": "Create Worktree",
   "agentManager.dialog.removeImage": "Remove image",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
index 83a7591bd0..b3019f0253 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts
@@ -124,6 +124,8 @@ export const dict = {
     "Ejecuta agentes en diferentes modelos en paralelo para comparar resultados",
   "agentManager.dialog.compareModels.searchModels": "Buscar modelos...",
   "agentManager.dialog.compareModels.selectModels": "Seleccionar modelos...",
+  "agentManager.dialog.compareModels.effort": "Esfuerzo de razonamiento",
+  "agentManager.dialog.compareModels.effortDefault": "Predeterminado",
   "agentManager.dialog.creating": "Creando...",
   "agentManager.dialog.createWorktree": "Crear Worktree",
   "agentManager.dialog.removeImage": "Eliminar imagen",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
index 6874c5057d..8618b9a955 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts
@@ -124,6 +124,8 @@ export const dict = {
     "Exécutez des agents sur différents modèles en parallèle pour comparer les résultats",
   "agentManager.dialog.compareModels.searchModels": "Rechercher des modèles...",
   "agentManager.dialog.compareModels.selectModels": "Sélectionner des modèles...",
+  "agentManager.dialog.compareModels.effort": "Effort de raisonnement",
+  "agentManager.dialog.compareModels.effortDefault": "Par défaut",
   "agentManager.dialog.creating": "Création...",
   "agentManager.dialog.createWorktree": "Créer un worktree",
   "agentManager.dialog.removeImage": "Supprimer l'image",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
index 900596bfd4..10c36ee11b 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/it.ts
@@ -129,6 +129,8 @@ export const dict = {
     "Esegui agenti su modelli diversi in parallelo per confrontare i risultati",
   "agentManager.dialog.compareModels.searchModels": "Cerca modelli...",
   "agentManager.dialog.compareModels.selectModels": "Seleziona modelli...",
+  "agentManager.dialog.compareModels.effort": "Sforzo di ragionamento",
+  "agentManager.dialog.compareModels.effortDefault": "Predefinito",
   "agentManager.dialog.creating": "Creazione...",
   "agentManager.dialog.createWorktree": "Crea worktree",
   "agentManager.dialog.removeImage": "Rimuovi immagine",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
index 59bc23b477..9e44ca3cfa 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts
@@ -123,6 +123,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "異なるモデルでエージェントを並行実行し、結果を比較します",
   "agentManager.dialog.compareModels.searchModels": "モデルを検索...",
   "agentManager.dialog.compareModels.selectModels": "モデルを選択...",
+  "agentManager.dialog.compareModels.effort": "推論エフォート",
+  "agentManager.dialog.compareModels.effortDefault": "デフォルト",
   "agentManager.dialog.creating": "作成中...",
   "agentManager.dialog.createWorktree": "ワークツリーを作成",
   "agentManager.dialog.removeImage": "画像を削除",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
index 6bc68261a5..8d67919701 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts
@@ -122,6 +122,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "서로 다른 모델에서 에이전트를 병렬로 실행하여 결과를 비교합니다",
   "agentManager.dialog.compareModels.searchModels": "모델 검색...",
   "agentManager.dialog.compareModels.selectModels": "모델 선택...",
+  "agentManager.dialog.compareModels.effort": "추론 노력",
+  "agentManager.dialog.compareModels.effortDefault": "기본",
   "agentManager.dialog.creating": "생성 중...",
   "agentManager.dialog.createWorktree": "워크트리 생성",
   "agentManager.dialog.removeImage": "이미지 제거",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
index ed7b6c265f..16f0c69fee 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts
@@ -129,6 +129,8 @@ export const dict = {
     "Draai agents parallel op verschillende modellen om resultaten te vergelijken",
   "agentManager.dialog.compareModels.searchModels": "Zoeken naar modellen...",
   "agentManager.dialog.compareModels.selectModels": "Modellen selecteren...",
+  "agentManager.dialog.compareModels.effort": "Redeneerinspanning",
+  "agentManager.dialog.compareModels.effortDefault": "Standaard",
   "agentManager.dialog.creating": "Maken...",
   "agentManager.dialog.createWorktree": "Worktree maken",
   "agentManager.dialog.removeImage": "Afbeelding verwijderen",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
index e52ab1cd76..b72e184289 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts
@@ -123,6 +123,8 @@ export const dict = {
     "Kjør agenter på forskjellige modeller parallelt for å sammenligne resultater",
   "agentManager.dialog.compareModels.searchModels": "Søk modeller...",
   "agentManager.dialog.compareModels.selectModels": "Velg modeller...",
+  "agentManager.dialog.compareModels.effort": "Resonneringsinnsats",
+  "agentManager.dialog.compareModels.effortDefault": "Standard",
   "agentManager.dialog.creating": "Oppretter...",
   "agentManager.dialog.createWorktree": "Opprett worktree",
   "agentManager.dialog.removeImage": "Fjern bilde",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
index 712b88137e..3a6e0fda56 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts
@@ -123,6 +123,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "Uruchom agentów na różnych modelach równolegle, aby porównać wyniki",
   "agentManager.dialog.compareModels.searchModels": "Szukaj modeli...",
   "agentManager.dialog.compareModels.selectModels": "Wybierz modele...",
+  "agentManager.dialog.compareModels.effort": "Wysiłek rozumowania",
+  "agentManager.dialog.compareModels.effortDefault": "Domyślny",
   "agentManager.dialog.creating": "Tworzenie...",
   "agentManager.dialog.createWorktree": "Utwórz Worktree",
   "agentManager.dialog.removeImage": "Usuń obraz",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
index 28025b436f..d2f230a1cd 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts
@@ -124,6 +124,8 @@ export const dict = {
     "Запустите агентов на разных моделях параллельно для сравнения результатов",
   "agentManager.dialog.compareModels.searchModels": "Поиск моделей...",
   "agentManager.dialog.compareModels.selectModels": "Выбрать модели...",
+  "agentManager.dialog.compareModels.effort": "Усилие рассуждения",
+  "agentManager.dialog.compareModels.effortDefault": "По умолчанию",
   "agentManager.dialog.creating": "Создание...",
   "agentManager.dialog.createWorktree": "Создать worktree",
   "agentManager.dialog.removeImage": "Удалить изображение",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
index a647391fde..af8b8e11d5 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts
@@ -119,6 +119,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "เรียกใช้เอเจนต์บนโมเดลต่าง ๆ พร้อมกันเพื่อเปรียบเทียบผลลัพธ์",
   "agentManager.dialog.compareModels.searchModels": "ค้นหาโมเดล...",
   "agentManager.dialog.compareModels.selectModels": "เลือกโมเดล...",
+  "agentManager.dialog.compareModels.effort": "ระดับการใช้เหตุผล",
+  "agentManager.dialog.compareModels.effortDefault": "ค่าเริ่มต้น",
   "agentManager.dialog.creating": "กำลังสร้าง...",
   "agentManager.dialog.createWorktree": "สร้าง Worktree",
   "agentManager.dialog.removeImage": "ลบรูปภาพ",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
index 0b8406748e..ba9711f61d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts
@@ -130,6 +130,8 @@ export const dict = {
     "Sonuçları karşılaştırmak için agent'ları paralel olarak farklı modellerde çalıştırın",
   "agentManager.dialog.compareModels.searchModels": "Modelleri ara...",
   "agentManager.dialog.compareModels.selectModels": "Modelleri seç...",
+  "agentManager.dialog.compareModels.effort": "Akıl yürütme çabası",
+  "agentManager.dialog.compareModels.effortDefault": "Varsayılan",
   "agentManager.dialog.creating": "Oluşturuluyor...",
   "agentManager.dialog.createWorktree": "Worktree Oluştur",
   "agentManager.dialog.removeImage": "Görüntüyü kaldır",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
index 505e0b4135..2ce90dccff 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts
@@ -131,6 +131,8 @@ export const dict = {
     "Запустіть агентів на різних моделях паралельно для порівняння результатів",
   "agentManager.dialog.compareModels.searchModels": "Пошук моделей...",
   "agentManager.dialog.compareModels.selectModels": "Оберіть моделі...",
+  "agentManager.dialog.compareModels.effort": "Зусилля міркування",
+  "agentManager.dialog.compareModels.effortDefault": "За замовчуванням",
   "agentManager.dialog.creating": "Створення...",
   "agentManager.dialog.createWorktree": "Створити робоче дерево",
   "agentManager.dialog.removeImage": "Видалити зображення",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
index dda46cc2b3..fb46b8f06a 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts
@@ -118,6 +118,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "在不同模型上并行运行代理以比较结果",
   "agentManager.dialog.compareModels.searchModels": "搜索模型...",
   "agentManager.dialog.compareModels.selectModels": "选择模型...",
+  "agentManager.dialog.compareModels.effort": "推理强度",
+  "agentManager.dialog.compareModels.effortDefault": "默认",
   "agentManager.dialog.creating": "创建中...",
   "agentManager.dialog.createWorktree": "创建工作树",
   "agentManager.dialog.removeImage": "移除图片",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
index 27b2375b84..b1655b23ee 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts
@@ -118,6 +118,8 @@ export const dict = {
   "agentManager.dialog.compareModels.tooltip": "在不同模型上並行執行代理以比較結果",
   "agentManager.dialog.compareModels.searchModels": "搜尋模型...",
   "agentManager.dialog.compareModels.selectModels": "選擇模型...",
+  "agentManager.dialog.compareModels.effort": "推理強度",
+  "agentManager.dialog.compareModels.effortDefault": "預設",
   "agentManager.dialog.creating": "建立中...",
   "agentManager.dialog.createWorktree": "建立工作樹",
   "agentManager.dialog.removeImage": "移除圖片",
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/multi-model-utils.ts b/packages/kilo-vscode/webview-ui/agent-manager/multi-model-utils.ts
index 3a661e23c8..0ddb23a341 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/multi-model-utils.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/multi-model-utils.ts
@@ -8,6 +8,7 @@ export interface ModelAllocationEntry {
   modelID: string
   name: string
   count: number
+  variant?: string
 }
 
 export type ModelAllocations = Map<string, ModelAllocationEntry>
@@ -25,7 +26,7 @@ export function totalAllocations(allocations: ModelAllocations): number {
 export function allocationsToArray(allocations: ModelAllocations): ModelAllocation[] {
   const result: ModelAllocation[] = []
   for (const entry of allocations.values()) {
-    result.push({ providerID: entry.providerID, modelID: entry.modelID, count: entry.count })
+    result.push({ providerID: entry.providerID, modelID: entry.modelID, count: entry.count, variant: entry.variant })
   }
   return result
 }
@@ -67,6 +68,20 @@ export function setAllocationCount(
   return next
 }
 
+export function setAllocationVariant(
+  allocations: ModelAllocations,
+  providerID: string,
+  modelID: string,
+  variant: string | undefined,
+): ModelAllocations {
+  const key = allocationKey(providerID, modelID)
+  const existing = allocations.get(key)
+  if (!existing) return allocations
+  const next = new Map(allocations)
+  next.set(key, { ...existing, variant })
+  return next
+}
+
 export function maxAllocationCount(allocations: ModelAllocations, providerID: string, modelID: string): number {
   const key = allocationKey(providerID, modelID)
   const existing = allocations.get(key)
diff --git a/packages/kilo-vscode/webview-ui/diff-virtual/DiffVirtualApp.tsx b/packages/kilo-vscode/webview-ui/diff-virtual/DiffVirtualApp.tsx
index a9ccfdc103..33661a4f60 100644
--- a/packages/kilo-vscode/webview-ui/diff-virtual/DiffVirtualApp.tsx
+++ b/packages/kilo-vscode/webview-ui/diff-virtual/DiffVirtualApp.tsx
@@ -1,4 +1,4 @@
-import { createMemo, createSignal, onCleanup, Show } from "solid-js"
+import { createMemo, createSignal, onCleanup, Show, createEffect, on } from "solid-js"
 import type { Component } from "solid-js"
 import { CodeComponentProvider } from "@kilocode/kilo-ui/context/code"
 import { DiffComponentProvider } from "@kilocode/kilo-ui/context/diff"
@@ -32,6 +32,19 @@ const DiffVirtualContent: Component = () => {
   const [diff, setDiff] = createSignal<DiffVirtualFile | null>(null)
   const [style, setStyle] = createSignal<DiffStyle>("unified")
   const [markdown, setMarkdown] = createSignal(false)
+  let scrollerRef: HTMLDivElement | undefined
+
+  createEffect(
+    on(
+      diff,
+      () => {
+        if (scrollerRef) {
+          scrollerRef.scrollTop = 0
+        }
+      },
+      { defer: true },
+    ),
+  )
 
   const handler = (event: MessageEvent) => {
     const msg = event.data as {
@@ -112,7 +125,7 @@ const DiffVirtualContent: Component = () => {
                 </Tooltip>
               </Show>
             </div>
-            <div class="am-review-diff" style={{ width: "100%" }}>
+            <div class="am-review-diff" style={{ width: "100%" }} ref={(el) => (scrollerRef = el)}>
               <Show when={view()}>
                 {(v) => (
                   <Show
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
index f2045ddf3d..a67b923186 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx
@@ -11,7 +11,6 @@ import { Component, For, Show, createMemo } from "solid-js"
 import { Dynamic } from "solid-js/web"
 import { Part, PART_MAPPING, ToolRegistry } from "@kilocode/kilo-ui/message-part"
 import type { MessageFeedbackControls } from "@kilocode/kilo-ui/message-part"
-import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import type {
   AssistantMessage as SDKAssistantMessage,
   Part as SDKPart,
@@ -23,11 +22,9 @@ import { useSession } from "../../context/session"
 import { useDisplay } from "../../context/display"
 import { useConfig } from "../../context/config"
 import { useLanguage } from "../../context/language"
-import { useMemory } from "../../context/memory"
 import { useServer } from "../../context/server"
 import { planDisplayPath } from "../../utils/plan-path"
 import { isRenderable, UPSTREAM_SUPPRESSED_TOOLS } from "../../utils/transcript-parts"
-import { MemoryMarkerMeta } from "@kilocode/kilo-memory/marker-meta"
 import { color as timelineColor } from "../../utils/timeline/colors"
 import type { Part as TimelinePart } from "../../types/messages"
 import type { TimelineHighlight } from "../../utils/timeline/highlight"
@@ -117,8 +114,6 @@ type ToolStateProps = {
   status?: string
 }
 
-type MemoryItem = MemoryMarkerMeta.Decoded
-
 function TodoToolCard(props: { part: ToolPart; forceOpen?: boolean }) {
   const render = ToolRegistry.render(props.part.tool)
   const state = () => props.part.state as ToolStateProps
@@ -173,8 +168,6 @@ export const AssistantMessage: Component<AssistantMessageProps> = (props) => {
   const data = useData()
   const session = useSession()
   const display = useDisplay()
-  const mem = useMemory()
-  const language = useLanguage()
   const { config } = useConfig()
   const open = createMemo(() => config().terminal_command_display !== "collapsed")
   const edit = createMemo(() => config().code_edit_display === "expanded")
@@ -189,33 +182,6 @@ export const AssistantMessage: Component<AssistantMessageProps> = (props) => {
       return !!matchToolRequest(part, "question", session.questions())
     })
   })
-  const meta = createMemo(() =>
-    MemoryMarkerMeta.fromParts((props.parts ?? data.store.part?.[props.message.id] ?? []) as MemoryMarkerMeta.Part[]),
-  )
-  const recall = createMemo(() => {
-    const item = meta()
-    if (item?.type === "recall") return item
-  })
-  const fmt = (value: number) => value.toLocaleString(language.locale())
-  const count = (item: MemoryItem) => fmt(item.count)
-  const items = (item: MemoryItem) => item.items ?? []
-  const verbose = createMemo(() => Boolean(mem.status()?.state.verbose))
-  const tip = (item: MemoryItem) => {
-    const values = MemoryMarkerMeta.snippets(item, verbose())
-    return (
-      <div style={{ "text-align": "left", "white-space": "normal", "max-width": "280px" }}>
-        <Show
-          when={values.length > 0}
-          fallback={
-            <div>{`${language.t("chat.memory.badge.recalled")} · ${language.t("chat.memory.badge.items", { count: count(item) })}`}</div>
-          }
-        >
-          <For each={values}>{(value) => <div>{value}</div>}</For>
-        </Show>
-      </div>
-    )
-  }
-
   return (
     <>
       <For each={parts()}>
@@ -331,17 +297,6 @@ export const AssistantMessage: Component<AssistantMessageProps> = (props) => {
           )
         }}
       </For>
-      <Show when={mem.enabled() && recall()}>
-        {(item) => (
-          <Tooltip value={tip(item())} placement="top">
-            <div data-component="assistant-memory-badge">
-              {language.t("chat.memory.badge.recalled")} ·{" "}
-              {language.t("chat.memory.badge.items", { count: count(item()) })}
-              <Show when={verbose() && items(item()).length > 0}> · {items(item())[0]}</Show>
-            </div>
-          </Tooltip>
-        )}
-      </Show>
     </>
   )
 }
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
index a87851e791..d2e9bc98c6 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/PromptInput.tsx
@@ -36,6 +36,7 @@ import { useSpeechToText } from "../speech-to-text/useSpeechToText"
 import { useImageAttachments, type ImageAttachment } from "../../hooks/useImageAttachments"
 import { convertToMentionPath } from "../../utils/path-mentions"
 import { usePromptHistory } from "../../hooks/usePromptHistory"
+import { cycleVariant } from "../../context/session-variant-store"
 import { WandSparkles } from "@kilocode/kilo-ui/lucide"
 import {
   fileName,
@@ -74,7 +75,7 @@ import {
 import { ReviewComments } from "./ReviewComments"
 import { partReview, reviewBody } from "../../../../src/shared/review-comments"
 import { isEnterKeyCommitNotIme } from "../../utils/ime-enter"
-import { MEMORY_USAGE, parseMemoryCommand } from "../../utils/memory-command"
+import { parseMemoryCommand } from "../../utils/memory-command"
 import { useMemory } from "../../context/memory"
 
 function mergeReviewComments(current: ReviewComment[], incoming: ReviewComment[]): ReviewComment[] {
@@ -863,7 +864,20 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       }
     }
 
-    if (e.key === "Tab" && ghost.text()) {
+    // Shift+Tab cycles reasoning effort variants (setting: chat.shiftTabCyclesVariant).
+    // When disabled or no variants exist, fall through to default focus navigation.
+    if (e.key === "Tab" && e.shiftKey && !e.ctrlKey && !e.metaKey && !e.altKey) {
+      if (settings()["chat.shiftTabCyclesVariant"] === false) return
+      const list = session.variantList(sid())
+      if (list.length === 0) return
+      const next = cycleVariant(session.currentVariant(sid()), list)
+      if (!next) return
+      e.preventDefault()
+      session.selectVariant(next, sid())
+      return
+    }
+
+    if (e.key === "Tab" && !e.shiftKey && ghost.text()) {
       if (!isAtEnd()) return
       e.preventDefault()
       acceptSuggestion()
@@ -972,8 +986,16 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       return false
     }
     if (memory.kind === "help") {
-      showToast({ variant: "default", title: "/memory", description: MEMORY_USAGE })
-      return true
+      const value = "/memory "
+      setText(value)
+      if (textareaRef) {
+        textareaRef.value = value
+        textareaRef.setSelectionRange(value.length, value.length)
+        textareaRef.focus()
+      }
+      slash.onInput(value, value.length)
+      adjustHeight()
+      return false
     }
     if (isDisabled() || speech.active() || terminal.pending() || git.pending() || props.blocked?.()) return false
     const status = projectMemory.status()
@@ -986,13 +1008,17 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       showToast({ variant: "error", title: language.t("chat.memory.project.disabled") })
       return false
     }
-    if (memory.kind === "show") vscode.postMessage({ type: "memoryShow", sessionID: sid() })
+    if (memory.kind === "show") vscode.postMessage({ type: "memoryShow", mode: "show", sessionID: sid() })
     if (memory.kind === "operation") {
+      if (memory.operation === "status") {
+        vscode.postMessage({ type: "memoryShow", mode: "status", sessionID: sid() })
+        return true
+      }
       vscode.postMessage({
         type: "memoryOperation",
         operation: memory.operation,
         sessionID: sid(),
-        ...(memory.operation === "auto" || memory.operation === "verbose" ? { mode: memory.mode } : {}),
+        ...(memory.operation === "auto" ? { mode: memory.mode } : {}),
         ...(memory.operation === "purge" ? { confirm: memory.confirm } : {}),
         ...(memory.operation === "remember" || memory.operation === "correct" ? { text: memory.text } : {}),
         ...(memory.operation === "forget" ? { query: memory.query } : {}),
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/RevertBanner.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/RevertBanner.tsx
index fe23f966b0..f22abedd3c 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/RevertBanner.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/RevertBanner.tsx
@@ -10,14 +10,17 @@ import { Icon } from "@kilocode/kilo-ui/icon"
 import { DiffChanges } from "@kilocode/kilo-ui/diff-changes"
 import { useSession } from "../../context/session"
 import { useLanguage } from "../../context/language"
+import { useVSCode } from "../../context/vscode"
 
 export const RevertBanner: Component = () => {
   const session = useSession()
   const language = useLanguage()
+  const vscode = useVSCode()
 
   const info = () => session.revert()
   const count = () => session.revertedCount()
   const diffs = () => session.summary()?.diffs
+  const workspace = () => info()?.workspace
 
   const users = () => session.userMessages()
 
@@ -67,6 +70,31 @@ export const RevertBanner: Component = () => {
             </For>
           </div>
         </Show>
+        <Show when={workspace() && workspace() !== "restored"}>
+          <div class="revert-banner-notice" role="status">
+            <span>
+              {language.t(
+                workspace() === "snapshots-disabled"
+                  ? "revert.banner.workspace.snapshotsDisabled"
+                  : "revert.banner.workspace.unavailable",
+              )}
+            </span>
+            <Show when={workspace() === "snapshots-disabled"}>
+              <Button
+                variant="ghost"
+                size="small"
+                onClick={() => vscode.postMessage({ type: "openSettingsPanel", tab: "checkpoints" })}
+              >
+                {language.t("revert.banner.workspace.enableSnapshots")}
+              </Button>
+            </Show>
+          </div>
+        </Show>
+        <Show when={!workspace()}>
+          <div class="revert-banner-notice" role="status">
+            <span>{language.t("revert.banner.workspace.legacy")}</span>
+          </div>
+        </Show>
         <div class="revert-banner-hint">{language.t("revert.banner.hint")}</div>
       </div>
     </Show>
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
index b87eeafae9..9b57672647 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskHeader.tsx
@@ -13,9 +13,7 @@ import { IconButton } from "@kilocode/kilo-ui/icon-button"
 import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { Icon } from "@kilocode/kilo-ui/icon"
 import { Checkbox } from "@kilocode/kilo-ui/checkbox"
-import { Switch } from "@kilocode/kilo-ui/switch"
 import { useSession } from "../../context/session"
-import { useMemory } from "../../context/memory"
 import { calcTokenUsage, collapseCostBreakdown } from "../../context/session-utils"
 import { useLanguage } from "../../context/language"
 import { useVSCode } from "../../context/vscode"
@@ -26,10 +24,8 @@ import { TranscriptSearch } from "./TranscriptSearch"
 import { useTranscriptSearch } from "../../context/transcript-search"
 import { hasModelUsage, tokenSummary } from "../../context/model-usage"
 import { SessionRenameEditor } from "../shared/SessionRenameEditor"
-import { DeferredPopover } from "../shared/DeferredPopover"
 import { target as todoTarget } from "../../context/todo-revert"
 import type { Part, TodoItem, ExtensionMessage } from "../../types/messages"
-import type { MemoryActivity } from "../../utils/memory-activity"
 
 interface TaskHeaderProps {
   readonly?: boolean
@@ -37,7 +33,6 @@ interface TaskHeaderProps {
 
 export const TaskHeader: Component<TaskHeaderProps> = (props) => {
   const session = useSession()
-  const memory = useMemory()
   const language = useLanguage()
   const search = useTranscriptSearch()
 
@@ -91,76 +86,6 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
     return false
   })
 
-  const memoryVerbose = createMemo(() => Boolean(memory.status()?.state.verbose))
-  const memoryActive = createMemo(() => {
-    if (!memory.enabled()) return false
-    const stats = memory.status()?.state.stats
-    return !!stats && stats.lastInjectedSessionID === session.currentSessionID() && stats.lastInjectedTokens > 0
-  })
-  const memoryStatus = createMemo(() => {
-    if (memory.error()) return memory.error()!
-    if (memory.loading()) return language.t("chat.memory.status.loading")
-    if (!memory.enabled()) return language.t("chat.memory.project.disabled")
-    if (memoryActive()) return language.t("chat.memory.status.active")
-    return language.t("chat.memory.project.enabled")
-  })
-  const activity = createMemo(() => [...memory.activity()].sort((a, b) => b.at - a.at))
-  const activityLines = createMemo(() => {
-    if (memory.error() || !memory.enabled()) return []
-    const loaded = activity().reduce((sum, item) => sum + (item.type === "loaded" ? item.tokens : 0), 0)
-    const recalled = activity().reduce((sum, item) => sum + (item.type === "recalled" ? item.count : 0), 0)
-    const saved = activity().reduce((sum, item) => sum + (item.type === "saved" ? item.count : 0), 0)
-    return [
-      ...(loaded > 0
-        ? [language.t("chat.memory.activity.loaded", { tokens: loaded.toLocaleString(language.locale()) })]
-        : []),
-      ...(recalled > 0
-        ? [language.t("chat.memory.activity.recalled", { count: recalled.toLocaleString(language.locale()) })]
-        : []),
-      ...(saved > 0
-        ? [language.t("chat.memory.activity.saved", { count: saved.toLocaleString(language.locale()) })]
-        : []),
-    ]
-  })
-  const activityItems = createMemo(() =>
-    activity()
-      .flatMap((item) => {
-        const values =
-          item.type === "saved" ? [...item.refs, ...item.items] : item.items.length > 0 ? item.items : item.refs
-        return values.flatMap((value) => {
-          const text = value.trim()
-          return text ? [{ type: item.type, value: text }] : []
-        })
-      })
-      .slice(0, 5),
-  )
-  const activityLabel = (item: { type: MemoryActivity["type"]; value: string }) =>
-    language.t(`chat.memory.activity.${item.type}.item`, { item: item.value })
-  const activitySummaryView = () => (
-    <div data-slot="task-header-memory-activity">
-      <Show
-        when={activityLines().length > 0}
-        fallback={<div data-slot="task-header-memory-activity-summary">{language.t("chat.memory.activity.idle")}</div>}
-      >
-        <div data-slot="task-header-memory-activity-summary">
-          <For each={activityLines()}>{(line) => <div>{line}</div>}</For>
-        </div>
-      </Show>
-    </div>
-  )
-  const activityTooltip = () => (
-    <>
-      <div data-slot="task-header-context-tooltip-title">{language.t("settings.context.title")}</div>
-      <div data-slot="task-header-context-tooltip-status">{memoryStatus()}</div>
-      {activitySummaryView()}
-      <Show when={memoryVerbose() && activityItems().length > 0}>
-        <div data-slot="task-header-memory-activity-list">
-          <For each={activityItems()}>{(item) => <div>{activityLabel(item)}</div>}</For>
-        </div>
-      </Show>
-    </>
-  )
-
   const vscode = useVSCode()
   const [expanded, setExpanded] = createSignal(true)
 
@@ -311,121 +236,18 @@ export const TaskHeader: Component<TaskHeaderProps> = (props) => {
               </Tooltip>
             )}
           </Show>
-          <Tooltip value={activityTooltip()} placement="bottom" contentClass="task-header-memory-tooltip">
-            <DeferredPopover
-              placement="bottom-end"
-              portal={false}
-              class="task-header-context-popover"
-              triggerAs="button"
-              triggerProps={{
-                type: "button",
-                class: "task-header-context-trigger",
-                get ["aria-label"]() {
-                  return language.t("settings.context.title")
-                },
-              }}
-              trigger={
-                <>
-                  <Icon name="server" size="small" />
-                  <Show when={memoryActive()}>
-                    <span data-slot="task-header-memory-dot" />
-                  </Show>
-                </>
-              }
-            >
-              <div data-slot="task-header-context-menu">
-                <div data-slot="task-header-context-title">{language.t("settings.context.title")}</div>
-                <Show when={!props.readonly}>
-                  <section data-slot="task-header-context-section">
-                    <div data-slot="task-header-context-section-title">
-                      <Icon name="compress" size="small" />
-                      <span>{language.t("settings.context.compaction.title")}</span>
-                    </div>
-                    <div data-slot="task-header-context-actions">
-                      <button
-                        data-slot="task-header-context-action"
-                        disabled={!canCompact()}
-                        onClick={() => session.compact()}
-                      >
-                        {language.t("command.session.compact")}
-                      </button>
-                    </div>
-                  </section>
-                </Show>
-                <section data-slot="task-header-context-section">
-                  <div data-slot="task-header-context-section-title">
-                    <Icon name="memory" size="small" />
-                    <span>{language.t("settings.context.memory.title")}</span>
-                  </div>
-                  <div data-slot="task-header-memory-status">{memoryStatus()}</div>
-                  {activitySummaryView()}
-                  <div data-slot="task-header-context-actions">
-                    <Show
-                      when={memory.enabled()}
-                      fallback={
-                        <button
-                          data-slot="task-header-context-action"
-                          disabled={memory.pending()}
-                          onClick={() => memory.enable()}
-                        >
-                          {language.t("chat.memory.enable")}
-                        </button>
-                      }
-                    >
-                      <button
-                        data-slot="task-header-context-action"
-                        disabled={memory.loading() || memory.pending()}
-                        onClick={() => memory.showMemory()}
-                      >
-                        {language.t("chat.memory.inspect")}
-                      </button>
-                      <button
-                        data-slot="task-header-context-action"
-                        disabled={memory.pending()}
-                        onClick={() => memory.remember()}
-                      >
-                        {language.t("chat.memory.remember")}
-                      </button>
-                      <button
-                        data-slot="task-header-context-action"
-                        disabled={memory.pending()}
-                        onClick={() => memory.forget()}
-                      >
-                        {language.t("chat.memory.forget")}
-                      </button>
-                      <button
-                        data-slot="task-header-context-action"
-                        disabled={memory.pending()}
-                        onClick={() => memory.rebuild()}
-                      >
-                        {language.t("chat.memory.rebuild")}
-                      </button>
-                      <button
-                        data-slot="task-header-context-action"
-                        disabled={memory.pending()}
-                        onClick={() => memory.disable()}
-                      >
-                        {language.t("chat.memory.disable")}
-                      </button>
-                    </Show>
-                  </div>
-                  <Show when={memory.enabled()}>
-                    <div data-slot="task-header-memory-verbose">
-                      <span>{language.t("chat.memory.verbose")}</span>
-                      <Switch
-                        checked={memoryVerbose()}
-                        disabled={memory.pending()}
-                        hideLabel
-                        onChange={(next) => memory.verbose(next ? "on" : "off")}
-                      >
-                        {language.t("chat.memory.verbose")}
-                      </Switch>
-                    </div>
-                  </Show>
-                </section>
-              </div>
-            </DeferredPopover>
-          </Tooltip>
+          <Show when={!props.readonly}>
+            <Tooltip value={language.t("command.session.compact")} placement="bottom">
+              <IconButton
+                icon="compress"
+                size="small"
+                variant="ghost"
+                disabled={!canCompact()}
+                onClick={() => session.compact()}
+                aria-label={language.t("command.session.compact")}
+              />
+            </Tooltip>
+          </Show>
           <Show when={hasMessages()}>
             <Tooltip value={language.t("chat.search.toggle")} placement="bottom">
               <IconButton
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx
index 5e6607212e..e1c92c1211 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/ContextTab.tsx
@@ -56,10 +56,9 @@ const ContextTab: Component = () => {
     const status = memory.status()
     if (!status) return language.t("settings.context.memory.status.notLoaded")
     if (!status.state.enabled) return language.t("settings.context.memory.status.disabled")
+    if (status.index.estimatedTokens === 0) return language.t("chat.memory.project.empty")
     const tokens = status.index.estimatedTokens.toLocaleString(language.locale())
-    const session = memory.sessionTokens().toLocaleString(language.locale())
-    const ops = status.state.stats.lastOperationCount.toLocaleString(language.locale())
-    return language.t("settings.context.memory.status.enabledTokensOps", { session, tokens, ops })
+    return language.t("settings.context.memory.status.enabledTokens", { tokens })
   }
 
   return (
@@ -90,27 +89,23 @@ const ContextTab: Component = () => {
           </Switch>
         </SettingsRow>
         <SettingsRow
-          title={language.t("settings.context.memory.index.title")}
+          title={language.t("settings.context.memory.storage.title")}
           description={
             memory.enabled()
-              ? language.t("settings.context.memory.index.path", { path: memory.status()!.root })
-              : language.t("settings.context.memory.index.enable")
+              ? language.t("settings.context.memory.storage.path", { path: memory.status()!.root })
+              : language.t("settings.context.memory.storage.enable")
           }
           last
         >
-          <div style={{ display: "flex", gap: "6px", "align-items": "center" }}>
-            <Button variant="secondary" size="small" icon="eye" onClick={() => memory.showMemory()}>
-              {language.t("settings.context.memory.inspect")}
-            </Button>
-            <IconButton
-              size="small"
-              variant="ghost"
-              icon="reset"
-              disabled={memory.pending()}
-              onClick={() => memory.rebuild()}
-              aria-label={language.t("settings.context.memory.rebuild")}
-            />
-          </div>
+          <Button
+            variant="secondary"
+            size="small"
+            icon="eye"
+            disabled={memory.loading() || memory.pending() || !memory.enabled() || memory.totalTokens() === 0}
+            onClick={() => memory.inspect()}
+          >
+            {language.t("settings.context.memory.inspect")}
+          </Button>
         </SettingsRow>
         <Show when={memory.error()}>
           {(err) => (
diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/DisplayTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/DisplayTab.tsx
index d791ca7838..74bae331ac 100644
--- a/packages/kilo-vscode/webview-ui/src/components/settings/DisplayTab.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/settings/DisplayTab.tsx
@@ -25,7 +25,7 @@ const CODE_EDIT_OPTIONS: LayoutOption[] = [
 ]
 
 const DisplayTab: Component = () => {
-  const { config, updateConfig } = useConfig()
+  const { config, updateConfig, settings, updateSetting } = useConfig()
   const display = useDisplay()
   const language = useLanguage()
 
@@ -78,6 +78,19 @@ const DisplayTab: Component = () => {
           </Switch>
         </SettingsRow>
 
+        <SettingsRow
+          title={language.t("settings.display.shiftTabCycle.title")}
+          description={language.t("settings.display.shiftTabCycle.description")}
+        >
+          <Switch
+            checked={Boolean(settings()["chat.shiftTabCyclesVariant"] ?? true)}
+            onChange={(checked: boolean) => updateSetting("chat.shiftTabCyclesVariant", checked)}
+            hideLabel
+          >
+            {language.t("settings.display.shiftTabCycle.title")}
+          </Switch>
+        </SettingsRow>
+
         <SettingsRow
           title={language.t("settings.display.terminalCommand.title")}
           description={language.t("settings.display.terminalCommand.description")}
diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
index 652bb70bb0..fd03cdcb40 100644
--- a/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/shared/ThinkingSelector.tsx
@@ -10,7 +10,10 @@
 import { type Accessor, Component, createSignal, For, onCleanup, Show } from "solid-js"
 import { PopupSelector } from "./PopupSelector"
 import { Button } from "@kilocode/kilo-ui/button"
+import { Tooltip } from "@kilocode/kilo-ui/tooltip"
 import { useSession } from "../../context/session"
+import { useConfig } from "../../context/config"
+import { useLanguage } from "../../context/language"
 import { isEnterKeyCommitNotIme } from "../../utils/ime-enter"
 
 // ---------------------------------------------------------------------------
@@ -38,11 +41,14 @@ export interface ThinkingSelectorBaseProps {
   deferDismiss?: boolean
   /** Listen for the global prompt trigger event. Defaults to true. */
   globalTrigger?: boolean
+  /** Show the Shift+Tab cycle hint in the trigger tooltip. */
+  cycleHint?: boolean
 }
 
 export const ThinkingSelectorBase: Component<ThinkingSelectorBaseProps> = (props) => {
   const [open, setOpen] = createSignal(false)
   const [focused, setFocused] = createSignal(-1)
+  const language = useLanguage()
   let listRef: HTMLDivElement | undefined
 
   const rows = () => (props.allowClear ? [undefined, ...props.variants] : props.variants)
@@ -135,52 +141,64 @@ export const ThinkingSelectorBase: Component<ThinkingSelectorBaseProps> = (props
 
   return (
     <Show when={rows().length > 0}>
-      <PopupSelector
-        expanded={false}
-        placement={props.placement ?? "top-start"}
-        preferredWidth={180}
-        minHeight={100}
-        portal={props.portal}
-        deferDismiss={props.deferDismiss}
-        open={open()}
-        onOpenChange={onOpen}
-        triggerAs={Button}
-        triggerProps={{ variant: "ghost", size: "small" }}
-        trigger={
-          <>
-            <span class="thinking-selector-trigger-label">{display(props.value)}</span>
-            <svg width="10" height="10" viewBox="0 0 16 16" fill="currentColor" style={{ "flex-shrink": "0" }}>
-              <path d="M8 4l4 5H4l4-5z" />
-            </svg>
-          </>
-        }
-      >
-        {(bodyH) => (
-          <div
-            class="thinking-selector-list"
-            role="listbox"
-            ref={listRef}
-            onKeyDown={onKeyDown}
-            style={bodyH() !== undefined ? { "max-height": `${bodyH()}px` } : {}}
-          >
-            <For each={rows()}>
-              {(v, i) => (
-                <div
-                  class={`thinking-selector-item${props.value === v ? " selected" : ""}`}
-                  role="option"
-                  aria-selected={props.value === v}
-                  tabindex={focused() === i() ? 0 : -1}
-                  data-autofocus={focused() === i() ? "" : undefined}
-                  onClick={() => pick(v)}
-                  onFocus={() => setFocused(i())}
-                >
-                  <span class="thinking-selector-item-name">{display(v)}</span>
-                </div>
-              )}
-            </For>
+      <Tooltip
+        value={
+          <div data-slot="tooltip-keybind">
+            <span>{language.t("prompt.thinking.tooltip")}</span>
+            <Show when={props.cycleHint}>
+              <span data-slot="tooltip-keybind-key">Shift+Tab</span>
+            </Show>
           </div>
-        )}
-      </PopupSelector>
+        }
+        placement="top"
+      >
+        <PopupSelector
+          expanded={false}
+          placement={props.placement ?? "top-start"}
+          preferredWidth={180}
+          minHeight={100}
+          portal={props.portal}
+          deferDismiss={props.deferDismiss}
+          open={open()}
+          onOpenChange={onOpen}
+          triggerAs={Button}
+          triggerProps={{ variant: "ghost", size: "small" }}
+          trigger={
+            <>
+              <span class="thinking-selector-trigger-label">{display(props.value)}</span>
+              <svg width="10" height="10" viewBox="0 0 16 16" fill="currentColor" style={{ "flex-shrink": "0" }}>
+                <path d="M8 4l4 5H4l4-5z" />
+              </svg>
+            </>
+          }
+        >
+          {(bodyH) => (
+            <div
+              class="thinking-selector-list"
+              role="listbox"
+              ref={listRef}
+              onKeyDown={onKeyDown}
+              style={bodyH() !== undefined ? { "max-height": `${bodyH()}px` } : {}}
+            >
+              <For each={rows()}>
+                {(v, i) => (
+                  <div
+                    class={`thinking-selector-item${props.value === v ? " selected" : ""}`}
+                    role="option"
+                    aria-selected={props.value === v}
+                    tabindex={focused() === i() ? 0 : -1}
+                    data-autofocus={focused() === i() ? "" : undefined}
+                    onClick={() => pick(v)}
+                    onFocus={() => setFocused(i())}
+                  >
+                    <span class="thinking-selector-item-name">{display(v)}</span>
+                  </div>
+                )}
+              </For>
+            </div>
+          )}
+        </PopupSelector>
+      </Tooltip>
     </Show>
   )
 }
@@ -195,6 +213,7 @@ interface ThinkingSelectorProps {
 
 export const ThinkingSelector: Component<ThinkingSelectorProps> = (props) => {
   const session = useSession()
+  const { settings } = useConfig()
   const id = () => props.sessionID?.()
 
   return (
@@ -202,6 +221,7 @@ export const ThinkingSelector: Component<ThinkingSelectorProps> = (props) => {
       variants={session.variantList(id())}
       value={session.currentVariant(id())}
       onSelect={(value) => session.selectVariant(value, id())}
+      cycleHint={settings()["chat.shiftTabCyclesVariant"] !== false}
     />
   )
 }
diff --git a/packages/kilo-vscode/webview-ui/src/context/config.tsx b/packages/kilo-vscode/webview-ui/src/context/config.tsx
index e63b84ff6f..a824dd1a57 100644
--- a/packages/kilo-vscode/webview-ui/src/context/config.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/config.tsx
@@ -102,6 +102,12 @@ export const ConfigProvider: ParentComponent = (props) => {
       })
       return
     }
+    if (message.type === "chatSettingsLoaded") {
+      mergeSettings({
+        "chat.shiftTabCyclesVariant": message.settings.shiftTabCyclesVariant,
+      })
+      return
+    }
     if (message.type === "configLoaded") {
       // Skip if a save is in-flight — a stale configLoaded must not overwrite
       // the optimistically-updated state while the write is being confirmed.
@@ -186,6 +192,7 @@ export const ConfigProvider: ParentComponent = (props) => {
     vscode.postMessage({ type: "requestConfig" })
     vscode.postMessage({ type: "requestAutocompleteSettings" })
     vscode.postMessage({ type: "requestIndexingSettings" })
+    vscode.postMessage({ type: "requestChatSettings" })
   }
 
   // Request config immediately; if the extension's httpClient is not yet ready,
diff --git a/packages/kilo-vscode/webview-ui/src/context/memory.tsx b/packages/kilo-vscode/webview-ui/src/context/memory.tsx
index 00002e984d..235418c2e1 100644
--- a/packages/kilo-vscode/webview-ui/src/context/memory.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/memory.tsx
@@ -1,53 +1,39 @@
-import { createContext, createEffect, createMemo, createSignal, onCleanup, untrack, useContext } from "solid-js"
+import { createContext, createEffect, createMemo, createSignal, onCleanup, useContext } from "solid-js"
 import type { Accessor, ParentComponent } from "solid-js"
 import { useServer } from "./server"
 import { useSession } from "./session"
 import { useVSCode } from "./vscode"
 import { useLanguage } from "./language"
 import { showToast } from "@kilocode/kilo-ui/toast"
-import type { MemoryShowResponse, MemoryStatusResponse } from "@kilocode/sdk/v2"
-import type { ExtensionMessage, Message, Part } from "../types/messages"
-import { addMemoryActivity, markerActivity, type MemoryActivity } from "../utils/memory-activity"
-import { visibleParts } from "./session-queue"
+import type { MemoryStatusResponse } from "@kilocode/sdk/v2"
+import type { ExtensionMessage } from "../types/messages"
 
 export interface MemoryContextValue {
   status: Accessor<MemoryStatusResponse | undefined>
-  show: Accessor<MemoryShowResponse | undefined>
   loading: Accessor<boolean>
   pending: Accessor<boolean>
   error: Accessor<string | undefined>
   enabled: Accessor<boolean>
-  sessionTokens: Accessor<number>
   totalTokens: Accessor<number>
-  activity: Accessor<MemoryActivity[]>
-  refresh: (includeSources?: boolean) => void
-  showMemory: () => void
+  refresh: () => void
+  inspect: () => void
   enable: () => void
   disable: () => void
   auto: (mode: "on" | "off") => void
-  verbose: (mode: "on" | "off") => void
-  rebuild: () => void
-  remember: () => void
-  forget: () => void
 }
 
 export const MemoryContext = createContext<MemoryContextValue>()
 const EVENT_DEDUPE_MS = 1000
 
-type Marker = { part: string; item: MemoryActivity }
-
 export const MemoryProvider: ParentComponent = (props) => {
   const vscode = useVSCode()
   const server = useServer()
   const session = useSession()
   const language = useLanguage()
   const [status, setStatus] = createSignal<MemoryStatusResponse | undefined>()
-  const [show, setShow] = createSignal<MemoryShowResponse | undefined>()
   const [loading, setLoading] = createSignal(false)
   const [pending, setPending] = createSignal<string | undefined>()
   const [error, setError] = createSignal<string | undefined>()
-  const [saved, setSaved] = createSignal<MemoryActivity[]>([])
-  const [markers, setMarkers] = createSignal<Record<string, Marker>>({})
 
   const id = () => session.currentSessionID()
   const key = (sid?: string) => sid ?? ""
@@ -57,101 +43,30 @@ export const MemoryProvider: ParentComponent = (props) => {
     // currentSessionID yet (PromptInput posts with the draft id), so match both.
     return sid === id() || sid === session.draftSessionID()
   }
-  const marker = (parts: readonly Part[], at: number) => {
-    for (const part of parts) {
-      const item = markerActivity([part], at)
-      if (item) return { part: part.id, item } satisfies Marker
-    }
-  }
-  const stamp = (message: Message) => message.time?.created ?? Date.parse(message.createdAt)
-  const mark = (messageID: string, part: Part, at: number) => {
-    const item = marker([part], at)
-    setMarkers((items) => {
-      if (item) return { ...items, [messageID]: item }
-      if (items[messageID]?.part !== part.id) return items
-      const next = { ...items }
-      delete next[messageID]
-      return next
-    })
-  }
-  const load = (message: Extract<ExtensionMessage, { type: "messagesLoaded" }>) => {
-    if (!current(message.sessionID)) return
-    const next = message.mode === "replace" || !message.mode ? {} : { ...markers() }
-    for (const entry of message.messages) {
-      const item = marker(entry.parts ?? [], stamp(entry))
-      if (item) next[entry.id] = item
-      else delete next[entry.id]
-    }
-    setMarkers(next)
-  }
-  const created = (message: Extract<ExtensionMessage, { type: "messageCreated" }>) => {
-    if (!current(message.message.sessionID)) return
-    const item = marker(message.message.parts ?? [], stamp(message.message))
-    if (item) setMarkers((items) => ({ ...items, [message.message.id]: item }))
-  }
-  const dropped = (messageID: string) =>
-    setMarkers((items) => {
-      if (!items[messageID]) return items
-      const next = { ...items }
-      delete next[messageID]
-      return next
-    })
-  const track = (message: ExtensionMessage) => {
-    if (message.type === "messagesLoaded") return load(message)
-    if (message.type === "messageCreated") return created(message)
-    if (message.type === "partUpdated") {
-      if (current(message.sessionID)) mark(message.messageID, message.part, Date.now())
-      return
-    }
-    if (message.type === "partsUpdated") {
-      for (const update of message.updates) {
-        if (current(update.sessionID)) mark(update.messageID, update.part, Date.now())
-      }
-      return
-    }
-    if (message.type === "partRemoved") {
-      if (!current(message.sessionID)) return
-      if (markers()[message.messageID]?.part === message.partID) dropped(message.messageID)
-      return
-    }
-    if (message.type === "messageRemoved" && current(message.sessionID)) dropped(message.messageID)
-  }
-  const scan = () => {
-    const next: Record<string, Marker> = {}
-    for (const message of session.messages()) {
-      const item = marker(session.getParts(message.id), stamp(message))
-      if (item) next[message.id] = item
-    }
-    setMarkers(next)
-  }
   let last: { key: string; time: number } | undefined
   let scope = ""
 
   const clear = () => {
     setStatus(undefined)
-    setShow(undefined)
     setError(undefined)
     setPending(undefined)
-    setSaved([])
-    setMarkers({})
     last = undefined
   }
 
-  const refresh = (includeSources = false) => {
+  const refresh = () => {
     if (!server.isConnected()) return
     setLoading(true)
     setError(undefined)
-    vscode.postMessage({ type: "requestMemory", sessionID: id(), includeSources })
+    vscode.postMessage({ type: "requestMemory", sessionID: id() })
   }
 
-  const operation = (op: "enable" | "disable" | "rebuild" | "verbose", mode?: "on" | "off") => {
+  const operation = (op: "enable" | "disable") => {
     if (!server.isConnected()) return
     setPending(key(id()))
     setError(undefined)
     vscode.postMessage({
       type: "memoryOperation",
       operation: op,
-      ...(mode ? { mode } : {}),
       sessionID: id(),
     })
   }
@@ -163,26 +78,15 @@ export const MemoryProvider: ParentComponent = (props) => {
     vscode.postMessage({ type: "memoryOperation", operation: "auto", mode, sessionID: id() })
   }
 
-  const prompt = (op: "remember" | "forget") => {
+  const inspect = () => {
     if (!server.isConnected()) return
     setPending(key(id()))
     setError(undefined)
-    vscode.postMessage({ type: "memoryPrompt", operation: op, sessionID: id() })
-  }
-
-  const showMemory = () => {
-    if (!server.isConnected()) return
-    setLoading(true)
-    setError(undefined)
-    vscode.postMessage({ type: "memoryShow", sessionID: id() })
+    vscode.postMessage({ type: "memoryOperation", operation: "inspect", sessionID: id() })
   }
 
   const event = (message: Extract<ExtensionMessage, { type: "memoryEvent" }>) => {
     if (!current(message.sessionID)) return
-    if (message.detail.type === "saved") {
-      setSaved((items) => addMemoryActivity(items, message.detail, Date.now()))
-      return
-    }
     if (message.detail.type !== "error") return
     if (!message.detail.message) return
     const dedupeKey = `${message.sessionID ?? ""}:${message.detail.type ?? ""}:${message.detail.message}`
@@ -198,11 +102,9 @@ export const MemoryProvider: ParentComponent = (props) => {
     if (message.error) {
       setError(message.error)
       setStatus(undefined)
-      setShow(undefined)
       return
     }
     if (message.status) setStatus(message.status)
-    if (message.show) setShow(message.show)
     setError(undefined)
   }
 
@@ -217,12 +119,16 @@ export const MemoryProvider: ParentComponent = (props) => {
       return
     }
     if (message.status) setStatus(message.status)
-    if (message.show) setShow(message.show)
     setError(undefined)
+    if (message.operation === "remember" || message.operation === "correct" || message.operation === "forget") {
+      showToast({ variant: "success", title: language.t("chat.memory.updated") })
+    }
+    if (message.operation === "rebuild") {
+      showToast({ variant: "success", title: language.t("chat.memory.rebuild") })
+    }
   }
 
   const receive = (message: ExtensionMessage) => {
-    track(message)
     if (message.type === "memoryEvent") {
       event(message)
       return
@@ -235,7 +141,7 @@ export const MemoryProvider: ParentComponent = (props) => {
       done(message)
       return
     }
-    if (message.type === "extensionDataReady" && server.isConnected() && !status()) refresh(false)
+    if (message.type === "extensionDataReady" && server.isConnected() && !status()) refresh()
   }
 
   const unsubscribe = vscode.onMessage(receive)
@@ -250,56 +156,28 @@ export const MemoryProvider: ParentComponent = (props) => {
     if (scope !== next) {
       scope = next
       clear()
-      untrack(scan)
     }
     if (!connected) {
       setLoading(false)
       return
     }
-    refresh(false)
+    refresh()
   })
 
-  const sessionTokens = (snapshot?: MemoryStatusResponse) => {
-    const sid = id()
-    if (!snapshot?.state.enabled) return 0
-    if (!sid || snapshot.state.stats.lastInjectedSessionID !== sid) return 0
-    return snapshot.state.stats.lastInjectedTokens
-  }
-
   const total = createMemo(() => status()?.index.estimatedTokens ?? 0)
 
-  const sessionTotal = createMemo(() => sessionTokens(status()))
-
-  const activity = createMemo(() => {
-    const revert = session.currentSession()?.revert ?? undefined
-    const items = Object.entries(markers()).flatMap(([mid, entry]) => {
-      if (!revert || mid < revert.messageID) return [entry.item]
-      if (mid !== revert.messageID || !revert.partID) return []
-      const visible = visibleParts(mid, session.getParts(mid), revert)
-      return visible.some((part) => part.id === entry.part) ? [entry.item] : []
-    })
-    return [...items, ...saved()]
-  })
-
   const value: MemoryContextValue = {
     status,
-    show,
     loading,
     pending: createMemo(() => pending() === key(id())),
     error,
     enabled: createMemo(() => status()?.state.enabled ?? false),
-    sessionTokens: sessionTotal,
     totalTokens: total,
-    activity,
     refresh,
-    showMemory,
+    inspect,
     enable: () => operation("enable"),
     disable: () => operation("disable"),
     auto,
-    verbose: (mode) => operation("verbose", mode),
-    rebuild: () => operation("rebuild"),
-    remember: () => prompt("remember"),
-    forget: () => prompt("forget"),
   }
 
   return <MemoryContext.Provider value={value}>{props.children}</MemoryContext.Provider>
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts b/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts
index 4aa1e263c2..a997f251d7 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-variant-store.ts
@@ -24,6 +24,16 @@ export function getVariant(
   return stored && variants.includes(stored) ? stored : variants[0]
 }
 
+/**
+ * Next variant in the list, wrapping back to the first after the last.
+ * An unknown or missing current value starts at the first variant.
+ */
+export function cycleVariant(current: string | undefined, variants: string[]) {
+  if (variants.length === 0) return undefined
+  const idx = current ? variants.indexOf(current) : -1
+  return variants[(idx + 1) % variants.length]
+}
+
 export function transferVariants(store: Record<string, string>, from: string, to: string) {
   const prefix = `session/${from}/`
   return Object.fromEntries(
diff --git a/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts b/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts
index b7a95fd62b..6b9cd42bce 100644
--- a/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts
+++ b/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts
@@ -27,6 +27,7 @@ interface VSCodeContext {
 export interface SlashCommandEntry extends SlashCommandInfo {
   action?: () => void
   enabled?: Accessor<boolean>
+  nested?: boolean
 }
 
 export interface SlashCommand {
@@ -119,6 +120,24 @@ export function useSlashCommand(
         window.dispatchEvent(new CustomEvent("compactSession"))
       },
     },
+    {
+      name: "memory",
+      description: "Manage project memory",
+      hints: ["mem"],
+      nested: true,
+    },
+    { name: "memory status", description: "Show project memory status", hints: [] },
+    { name: "memory show", description: "Show stored project memory", hints: [] },
+    { name: "memory on", description: "Enable project memory", hints: [] },
+    { name: "memory off", description: "Disable project memory", hints: [] },
+    { name: "memory inspect", description: "Reveal the project memory folder", hints: [] },
+    { name: "memory rebuild", description: "Rebuild the memory index", hints: [] },
+    { name: "memory remember", description: "Save a project memory note", hints: [] },
+    { name: "memory correct", description: "Save a correction to project memory", hints: [] },
+    { name: "memory forget", description: "Remove matching project memory", hints: [] },
+    { name: "memory auto on", description: "Enable automatic memory saves", hints: [] },
+    { name: "memory auto off", description: "Disable automatic memory saves", hints: [] },
+    { name: "memory purge confirm", description: "Delete all project memory files", hints: [] },
     {
       name: "export",
       description: "Export the current session transcript as Markdown",
@@ -198,10 +217,20 @@ export function useSlashCommand(
   const results = () => {
     const q = query()
     if (q === null) return []
-    const all = commands()
-    if (!q) return all
+    const list = commands()
+    if (q.startsWith("memory ")) {
+      const matches = list.filter((cmd) => cmd.name.startsWith("memory "))
+      if (q === "memory ") return matches
+      const lower = q.toLowerCase()
+      return sortByScore(
+        matches.filter((cmd) => cmd.name.toLowerCase().startsWith(lower)),
+        lower,
+      )
+    }
+    const root = list.filter((cmd) => !cmd.name.includes(" "))
+    if (!q) return root
     const lower = q.toLowerCase()
-    const matches = all.filter(
+    const matches = root.filter(
       (cmd) =>
         cmd.name.toLowerCase().includes(lower) ||
         cmd.description?.toLowerCase().includes(lower) ||
@@ -230,9 +259,15 @@ export function useSlashCommand(
       request()
       setQuery(match[1])
       setIndex(0)
-    } else {
-      close()
+      return
     }
+    const memory = before.match(/^\/(?:memory|mem)\s+([^\n]*)$/i)
+    if (!memory) return close()
+    const value = `memory ${memory[1]}`.toLowerCase()
+    if (!commands().some((cmd) => cmd.name.toLowerCase().startsWith(value))) return close()
+    request()
+    setQuery(value)
+    setIndex(0)
   }
 
   const select = (
@@ -256,7 +291,11 @@ export function useSlashCommand(
     const pos = text.length
     textarea.setSelectionRange(pos, pos)
     textarea.focus()
-    close()
+    if (cmd.nested) {
+      setQuery(`${cmd.name} `)
+      setIndex(0)
+    }
+    if (!cmd.nested) close()
     onSelect?.()
   }
 
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index f86fe517b0..5a04fd4eb7 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -136,6 +136,11 @@ export const dict = {
   "revert.banner.redo": "إعادة",
   "revert.banner.redo.all": "إعادة الكل",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled": "تم التراجع عن المحادثة. لم تُستعَد تغييرات الملفات لأن اللقطات معطّلة.",
+  "revert.banner.workspace.unavailable":
+    "تم التراجع عن المحادثة. لم تكن هناك نقطة تحقق للملفات، لذا لم تُستعَد تغييرات مساحة العمل.",
+  "revert.banner.workspace.legacy": "تم التراجع عن المحادثة. حالة استعادة مساحة العمل غير متاحة لهذا التراجع السابق.",
+  "revert.banner.workspace.enableSnapshots": "تفعيل اللقطات",
   "revert.disabled.agentBusy": "انتظر انتهاء الوكيل",
   "command.session.compact": "ضغط الجلسة",
   "command.session.compact.description": "تلخيص الجلسة لتقليل حجم السياق",
@@ -348,6 +353,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "تضمين الملف النشط",
   "prompt.context.removeActiveFile": "إزالة الملف النشط من السياق",
   "prompt.context.removeFile": "إزالة الملف من السياق",
+  "prompt.thinking.tooltip": "جهد الاستدلال",
   "prompt.action.attachFile": "إرفاق ملف",
   "prompt.attachment.remove": "إزالة المرفق",
   "prompt.action.send": "إرسال",
@@ -1627,36 +1633,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "حفظ ذاكرة المشروع تلقائيًا",
   "settings.context.memory.autoSave.description":
     "حفظ حقائق المشروع الدائمة تلقائيًا من الجولات المكتملة عند تفعيل الذاكرة.",
-  "settings.context.memory.index.title": "فهرس الذاكرة",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "غير محمّلة",
   "settings.context.memory.status.disabled": "معطّلة",
-  "settings.context.memory.status.enabledTokensOps":
-    "مفعّلة - ~{{session}} رموز سياق بدء التشغيل في هذه الجلسة - ~{{tokens}} رموز في الفهرس المخزّن - آخر عملية {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "فعّل الذاكرة لإنشاء ملفات ذاكرة المشروع.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "فحص",
-  "settings.context.memory.rebuild": "إعادة بناء فهرس الذاكرة",
-  "chat.memory.status.loading": "جارٍ تحميل حالة الذاكرة",
-  "chat.memory.status.active": "الذاكرة نشطة في هذه الجلسة",
-  "chat.memory.project.enabled": "ذاكرة المشروع مفعّلة",
   "chat.memory.project.disabled": "ذاكرة المشروع معطّلة",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "فشل أمر الذاكرة",
-  "chat.memory.inspect": "فحص الذاكرة",
-  "chat.memory.remember": "تذكّر",
-  "chat.memory.forget": "انسَ",
-  "chat.memory.rebuild": "إعادة بناء الفهرس",
-  "chat.memory.disable": "تعطيل الذاكرة",
-  "chat.memory.enable": "تفعيل الذاكرة",
-  "chat.memory.verbose": "تفصيلي",
-  "chat.memory.activity.idle": "لا يوجد نشاط للذاكرة في هذه الجلسة",
-  "chat.memory.activity.loaded": "تم تحميل {{tokens}} رمزًا",
-  "chat.memory.activity.recalled": "تم استدعاء {{count}}",
-  "chat.memory.activity.saved": "تم حفظ {{count}}",
-  "chat.memory.activity.loaded.item": "تم التحميل: {{item}}",
-  "chat.memory.activity.recalled.item": "تم الاستدعاء: {{item}}",
-  "chat.memory.activity.saved.item": "تم الحفظ: {{item}}",
-  "chat.memory.badge.recalled": "تم استدعاء الذاكرة",
-  "chat.memory.badge.items": "{{count}} عناصر",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "استخدام prompt مخصص",
@@ -1679,6 +1667,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "طي الاستدلال تلقائيًا",
   "settings.display.reasoningAutoCollapse.description":
     "يطوي كتل الاستدلال بعد أن ينتهي الوكيل من كتابتها. اتركه معطلاً لإبقاء الاستدلال موسعًا ما لم تطوه يدويًا.",
+  "settings.display.shiftTabCycle.title": "تبديل جهد الاستدلال باستخدام Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "اضغط على Shift+Tab في حقل إدخال الموجه للتبديل إلى مستوى جهد الاستدلال التالي. عطّل هذا الخيار للاحتفاظ بـ Shift+Tab للتنقل بين عناصر التركيز باستخدام لوحة المفاتيح.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 35a1450ea1..f153fec3c1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Refazer",
   "revert.banner.redo.all": "Refazer Tudo",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Conversa revertida. As alterações nos arquivos não foram restauradas porque os snapshots estão desativados.",
+  "revert.banner.workspace.unavailable":
+    "Conversa revertida. Nenhum ponto de restauração dos arquivos estava disponível, portanto as alterações no espaço de trabalho não foram restauradas.",
+  "revert.banner.workspace.legacy":
+    "Conversa revertida. O status da restauração do espaço de trabalho não está disponível para esta reversão anterior.",
+  "revert.banner.workspace.enableSnapshots": "Ativar snapshots",
   "revert.disabled.agentBusy": "Aguarde o agente terminar",
   "command.session.compact": "Compactar sessão",
   "command.session.compact.description": "Resumir a sessão para reduzir o tamanho do contexto",
@@ -350,6 +357,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Incluir arquivo ativo",
   "prompt.context.removeActiveFile": "Remover arquivo ativo do contexto",
   "prompt.context.removeFile": "Remover arquivo do contexto",
+  "prompt.thinking.tooltip": "Esforço de raciocínio",
   "prompt.action.attachFile": "Anexar arquivo",
   "prompt.attachment.remove": "Remover anexo",
   "prompt.action.send": "Enviar",
@@ -1675,36 +1683,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Salvar memória do projeto automaticamente",
   "settings.context.memory.autoSave.description":
     "Salva automaticamente fatos duradouros do projeto a partir de turnos concluídos quando a memória está ativada.",
-  "settings.context.memory.index.title": "Índice da memória",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Não carregada",
   "settings.context.memory.status.disabled": "Desativada",
-  "settings.context.memory.status.enabledTokensOps":
-    "Ativada - ~{{session}} tokens de contexto inicial nesta sessão - ~{{tokens}} tokens no índice armazenado - última op. {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Ative a memória para criar arquivos de memória do projeto.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Inspecionar",
-  "settings.context.memory.rebuild": "Reconstruir índice da memória",
-  "chat.memory.status.loading": "Carregando status da memória",
-  "chat.memory.status.active": "Memória ativa nesta sessão",
-  "chat.memory.project.enabled": "Memória do projeto ativada",
   "chat.memory.project.disabled": "Memória do projeto desativada",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Comando de memória falhou",
-  "chat.memory.inspect": "Inspecionar memória",
-  "chat.memory.remember": "Lembrar",
-  "chat.memory.forget": "Esquecer",
-  "chat.memory.rebuild": "Reconstruir índice",
-  "chat.memory.disable": "Desativar memória",
-  "chat.memory.enable": "Ativar memória",
-  "chat.memory.verbose": "Detalhado",
-  "chat.memory.activity.idle": "Nenhuma atividade de memória nesta sessão",
-  "chat.memory.activity.loaded": "{{tokens}} tokens carregados",
-  "chat.memory.activity.recalled": "{{count}} recuperados",
-  "chat.memory.activity.saved": "{{count}} salvos",
-  "chat.memory.activity.loaded.item": "carregado: {{item}}",
-  "chat.memory.activity.recalled.item": "recuperado: {{item}}",
-  "chat.memory.activity.saved.item": "salvo: {{item}}",
-  "chat.memory.badge.recalled": "Memória recuperada",
-  "chat.memory.badge.items": "{{count}} itens",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Usar prompt personalizado",
@@ -1728,6 +1718,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Recolher raciocínio automaticamente",
   "settings.display.reasoningAutoCollapse.description":
     "Recolhe os blocos de raciocínio depois que o agente termina de escrevê-los. Deixe desativado para manter o raciocínio expandido, a menos que você o recolha manualmente.",
+  "settings.display.shiftTabCycle.title": "Alternar o esforço de raciocínio com Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Pressione Shift+Tab em um campo de entrada de prompt para alternar para o próximo nível de esforço de raciocínio. Desative para manter Shift+Tab para navegação de foco pelo teclado.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index c19e73262c..8a83fd8be4 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Ponovi",
   "revert.banner.redo.all": "Ponovi Sve",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Razgovor je vraćen. Promjene datoteka nisu vraćene jer su snimci stanja onemogućeni.",
+  "revert.banner.workspace.unavailable":
+    "Razgovor je vraćen. Nije bila dostupna kontrolna tačka datoteka, pa promjene radnog prostora nisu vraćene.",
+  "revert.banner.workspace.legacy":
+    "Razgovor je vraćen. Status vraćanja radnog prostora nije dostupan za ovo ranije vraćanje.",
+  "revert.banner.workspace.enableSnapshots": "Omogući snimke stanja",
   "revert.disabled.agentBusy": "Sačekajte da agent završi",
   "command.session.compact": "Sažmi sesiju",
   "command.session.compact.description": "Sažmi sesiju kako bi se smanjio kontekst",
@@ -351,6 +358,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Uključi aktivnu datoteku",
   "prompt.context.removeActiveFile": "Ukloni aktivnu datoteku iz konteksta",
   "prompt.context.removeFile": "Ukloni datoteku iz konteksta",
+  "prompt.thinking.tooltip": "Napor razmišljanja",
   "prompt.action.attachFile": "Priloži datoteku",
   "prompt.attachment.remove": "Ukloni prilog",
   "prompt.action.send": "Pošalji",
@@ -1668,36 +1676,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Automatsko spremanje memorije projekta",
   "settings.context.memory.autoSave.description":
     "Automatski sprema trajne činjenice projekta iz završenih koraka kada je memorija uključena.",
-  "settings.context.memory.index.title": "Indeks memorije",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Nije učitana",
   "settings.context.memory.status.disabled": "Onemogućena",
-  "settings.context.memory.status.enabledTokensOps":
-    "Omogućena - ~{{session}} tokena početnog konteksta u ovoj sesiji - ~{{tokens}} tokena spremljenog indeksa - zadnja op. {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Omogućite memoriju za kreiranje datoteka memorije projekta.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Pregledaj",
-  "settings.context.memory.rebuild": "Ponovo izgradi indeks memorije",
-  "chat.memory.status.loading": "Učitavanje statusa memorije",
-  "chat.memory.status.active": "Memorija je aktivna u ovoj sesiji",
-  "chat.memory.project.enabled": "Memorija projekta omogućena",
   "chat.memory.project.disabled": "Memorija projekta onemogućena",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Komanda memorije nije uspjela",
-  "chat.memory.inspect": "Pregledaj memoriju",
-  "chat.memory.remember": "Zapamti",
-  "chat.memory.forget": "Zaboravi",
-  "chat.memory.rebuild": "Ponovo izgradi indeks",
-  "chat.memory.disable": "Onemogući memoriju",
-  "chat.memory.enable": "Omogući memoriju",
-  "chat.memory.verbose": "Detaljno",
-  "chat.memory.activity.idle": "Nema aktivnosti memorije u ovoj sesiji",
-  "chat.memory.activity.loaded": "učitano {{tokens}} tokena",
-  "chat.memory.activity.recalled": "prizvano {{count}}",
-  "chat.memory.activity.saved": "sačuvano {{count}}",
-  "chat.memory.activity.loaded.item": "učitano: {{item}}",
-  "chat.memory.activity.recalled.item": "prizvano: {{item}}",
-  "chat.memory.activity.saved.item": "sačuvano: {{item}}",
-  "chat.memory.badge.recalled": "Memorija opozvana",
-  "chat.memory.badge.items": "{{count}} stavki",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Koristi prilagođeni prompt",
@@ -1720,6 +1710,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Automatski sažmi razmišljanje",
   "settings.display.reasoningAutoCollapse.description":
     "Sažima blokove razmišljanja nakon što ih agent završi pisati. Ostavite isključeno da razmišljanje ostane prošireno, osim ako ga ručno sažmete.",
+  "settings.display.shiftTabCycle.title": "Promijeni napor razmišljanja pomoću Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Pritisnite Shift+Tab u polju za unos upita da pređete na sljedeći nivo napora razmišljanja. Onemogućite ovu opciju kako biste zadržali Shift+Tab za navigaciju fokusom putem tastature.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index 8e9a593dd3..d4c0d06ce8 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Gentag",
   "revert.banner.redo.all": "Gentag alt",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Samtalen blev gendannet. Filændringer blev ikke gendannet, fordi snapshots er deaktiveret.",
+  "revert.banner.workspace.unavailable":
+    "Samtalen blev gendannet. Der var intet filkontrolpunkt tilgængeligt, så ændringer i arbejdsområdet blev ikke gendannet.",
+  "revert.banner.workspace.legacy":
+    "Samtalen blev gendannet. Status for gendannelse af arbejdsområdet er ikke tilgængelig for denne tidligere gendannelse.",
+  "revert.banner.workspace.enableSnapshots": "Aktivér snapshots",
   "revert.disabled.agentBusy": "Vent på at agenten er færdig",
   "command.session.compact": "Komprimér session",
   "command.session.compact.description": "Opsummer sessionen for at reducere kontekststørrelsen",
@@ -350,6 +357,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Inkluder aktiv fil",
   "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
   "prompt.context.removeFile": "Fjern fil fra kontekst",
+  "prompt.thinking.tooltip": "Ræsonnementsindsats",
   "prompt.action.attachFile": "Vedhæft fil",
   "prompt.attachment.remove": "Fjern vedhæftning",
   "prompt.action.send": "Send",
@@ -1658,36 +1666,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Gem projekthukommelse automatisk",
   "settings.context.memory.autoSave.description":
     "Gemmer automatisk varige projektfakta fra afsluttede ture, når hukommelse er aktiveret.",
-  "settings.context.memory.index.title": "Hukommelsesindeks",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Ikke indlæst",
   "settings.context.memory.status.disabled": "Deaktiveret",
-  "settings.context.memory.status.enabledTokensOps":
-    "Aktiveret - ~{{session}} opstartstokens i denne session - ~{{tokens}} tokens i gemt indeks - seneste handling {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Aktivér hukommelse for at oprette projektets hukommelsesfiler.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Inspicér",
-  "settings.context.memory.rebuild": "Genopbyg hukommelsesindeks",
-  "chat.memory.status.loading": "Indlæser hukommelsesstatus",
-  "chat.memory.status.active": "Hukommelse aktiv i denne session",
-  "chat.memory.project.enabled": "Projekthukommelse aktiveret",
   "chat.memory.project.disabled": "Projekthukommelse deaktiveret",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Hukommelseskommando mislykkedes",
-  "chat.memory.inspect": "Inspicér hukommelse",
-  "chat.memory.remember": "Husk",
-  "chat.memory.forget": "Glem",
-  "chat.memory.rebuild": "Genopbyg indeks",
-  "chat.memory.disable": "Deaktivér hukommelse",
-  "chat.memory.enable": "Aktivér hukommelse",
-  "chat.memory.verbose": "Detaljeret",
-  "chat.memory.activity.idle": "Ingen hukommelsesaktivitet i denne session",
-  "chat.memory.activity.loaded": "indlæste {{tokens}} tokens",
-  "chat.memory.activity.recalled": "genkaldte {{count}}",
-  "chat.memory.activity.saved": "gemte {{count}}",
-  "chat.memory.activity.loaded.item": "indlæst: {{item}}",
-  "chat.memory.activity.recalled.item": "genkaldt: {{item}}",
-  "chat.memory.activity.saved.item": "gemt: {{item}}",
-  "chat.memory.badge.recalled": "Hukommelse genkaldt",
-  "chat.memory.badge.items": "{{count}} elementer",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Brug brugerdefineret prompt",
@@ -1711,6 +1701,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Skjul ræsonnement automatisk",
   "settings.display.reasoningAutoCollapse.description":
     "Skjuler ræsonnementsblokke, når agenten er færdig med at skrive dem. Lad den være slået fra for at holde ræsonnement udvidet, medmindre du skjuler det manuelt.",
+  "settings.display.shiftTabCycle.title": "Skift ræsonnementsindsats med Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Tryk på Shift+Tab i et promptindtastningsfelt for at skifte til næste niveau af ræsonnementsindsats. Deaktivér for at beholde Shift+Tab til tastaturnavigation af fokus.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index 380e7d3db4..bf036e817c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -143,6 +143,13 @@ export const dict = {
   "revert.banner.redo": "Wiederholen",
   "revert.banner.redo.all": "Alle wiederholen",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Unterhaltung zurückgesetzt. Dateiänderungen wurden nicht wiederhergestellt, weil Snapshots deaktiviert sind.",
+  "revert.banner.workspace.unavailable":
+    "Unterhaltung zurückgesetzt. Es war kein Dateiwiederherstellungspunkt verfügbar, daher wurden Änderungen im Arbeitsbereich nicht wiederhergestellt.",
+  "revert.banner.workspace.legacy":
+    "Unterhaltung zurückgesetzt. Der Status der Arbeitsbereichswiederherstellung ist für dieses frühere Zurücksetzen nicht verfügbar.",
+  "revert.banner.workspace.enableSnapshots": "Snapshots aktivieren",
   "revert.disabled.agentBusy": "Warten bis der Agent fertig ist",
   "command.session.compact": "Sitzung komprimieren",
   "command.session.compact.description": "Sitzung zusammenfassen, um die Kontextgröße zu reduzieren",
@@ -357,6 +364,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Aktive Datei einbeziehen",
   "prompt.context.removeActiveFile": "Aktive Datei aus dem Kontext entfernen",
   "prompt.context.removeFile": "Datei aus dem Kontext entfernen",
+  "prompt.thinking.tooltip": "Reasoning-Aufwand",
   "prompt.action.attachFile": "Datei anhängen",
   "prompt.attachment.remove": "Anhang entfernen",
   "prompt.action.send": "Senden",
@@ -1694,36 +1702,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Projektspeicher automatisch speichern",
   "settings.context.memory.autoSave.description":
     "Dauerhafte Projektfakten aus abgeschlossenen Durchläufen automatisch speichern, wenn Speicher aktiviert ist.",
-  "settings.context.memory.index.title": "Speicherindex",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Nicht geladen",
   "settings.context.memory.status.disabled": "Deaktiviert",
-  "settings.context.memory.status.enabledTokensOps":
-    "Aktiviert - ~{{session}} Startkontext-Tokens in dieser Sitzung - ~{{tokens}} Tokens im gespeicherten Index - letzte Operation {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Aktivieren Sie den Speicher, um Projektspeicherdateien zu erstellen.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Prüfen",
-  "settings.context.memory.rebuild": "Speicherindex neu erstellen",
-  "chat.memory.status.loading": "Speicherstatus wird geladen",
-  "chat.memory.status.active": "Speicher in dieser Sitzung aktiv",
-  "chat.memory.project.enabled": "Projektspeicher aktiviert",
   "chat.memory.project.disabled": "Projektspeicher deaktiviert",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Speicherbefehl fehlgeschlagen",
-  "chat.memory.inspect": "Speicher prüfen",
-  "chat.memory.remember": "Merken",
-  "chat.memory.forget": "Vergessen",
-  "chat.memory.rebuild": "Index neu erstellen",
-  "chat.memory.disable": "Speicher deaktivieren",
-  "chat.memory.enable": "Speicher aktivieren",
-  "chat.memory.verbose": "Ausführlich",
-  "chat.memory.activity.idle": "Keine Speicheraktivität in dieser Sitzung",
-  "chat.memory.activity.loaded": "{{tokens}} Token geladen",
-  "chat.memory.activity.recalled": "{{count}} abgerufen",
-  "chat.memory.activity.saved": "{{count}} gespeichert",
-  "chat.memory.activity.loaded.item": "geladen: {{item}}",
-  "chat.memory.activity.recalled.item": "abgerufen: {{item}}",
-  "chat.memory.activity.saved.item": "gespeichert: {{item}}",
-  "chat.memory.badge.recalled": "Speicher abgerufen",
-  "chat.memory.badge.items": "{{count}} Elemente",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Benutzerdefinierten prompt verwenden",
@@ -1747,6 +1737,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Reasoning automatisch einklappen",
   "settings.display.reasoningAutoCollapse.description":
     "Klappt Reasoning-Blöcke ein, nachdem der Agent sie fertig geschrieben hat. Deaktiviert lassen, damit Reasoning erweitert bleibt, sofern du es nicht manuell einklappst.",
+  "settings.display.shiftTabCycle.title": "Reasoning-Aufwand mit Shift+Tab durchlaufen",
+  "settings.display.shiftTabCycle.description":
+    "Drücken Sie Shift+Tab in einem Prompt-Eingabefeld, um zur nächsten Stufe des Reasoning-Aufwands zu wechseln. Deaktivieren Sie dies, um Shift+Tab für die Tastaturfokusnavigation beizubehalten.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index e1a53df79e..bd742755d4 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -136,6 +136,13 @@ export const dict = {
   "revert.banner.redo": "Redo",
   "revert.banner.redo.all": "Redo All",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Conversation reverted. File changes were not restored because snapshots are disabled.",
+  "revert.banner.workspace.unavailable":
+    "Conversation reverted. No file checkpoint was available, so workspace changes were not restored.",
+  "revert.banner.workspace.legacy":
+    "Conversation reverted. Workspace restoration status is unavailable for this earlier revert.",
+  "revert.banner.workspace.enableSnapshots": "Enable snapshots",
   "revert.disabled.agentBusy": "Wait for agent to finish",
   "command.session.compact": "Compact session",
   "command.session.compact.description": "Summarize the session to reduce context size",
@@ -350,6 +357,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Include active file",
   "prompt.context.removeActiveFile": "Remove active file from context",
   "prompt.context.removeFile": "Remove file from context",
+  "prompt.thinking.tooltip": "Reasoning effort",
   "prompt.action.attachFile": "Attach file",
   "prompt.attachment.remove": "Remove attachment",
   "prompt.action.send": "Send",
@@ -1638,36 +1646,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Auto-save project memory",
   "settings.context.memory.autoSave.description":
     "Automatically save durable project facts from completed turns when memory is enabled.",
-  "settings.context.memory.index.title": "Memory index",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Not loaded",
   "settings.context.memory.status.disabled": "Disabled",
-  "settings.context.memory.status.enabledTokensOps":
-    "Enabled - ~{{session}} startup tokens this session - ~{{tokens}} stored index tokens - last op {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Enable memory to create project memory files.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Inspect",
-  "settings.context.memory.rebuild": "Rebuild memory index",
-  "chat.memory.status.loading": "Memory status loading",
-  "chat.memory.status.active": "Memory active this session",
-  "chat.memory.project.enabled": "Project memory enabled",
   "chat.memory.project.disabled": "Project memory disabled",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Memory command failed",
-  "chat.memory.inspect": "Inspect memory",
-  "chat.memory.remember": "Remember",
-  "chat.memory.forget": "Forget",
-  "chat.memory.rebuild": "Rebuild index",
-  "chat.memory.disable": "Disable memory",
-  "chat.memory.enable": "Enable memory",
-  "chat.memory.verbose": "Verbose",
-  "chat.memory.activity.idle": "No memory activity this session",
-  "chat.memory.activity.loaded": "loaded {{tokens}} tokens",
-  "chat.memory.activity.recalled": "recalled {{count}}",
-  "chat.memory.activity.saved": "saved {{count}}",
-  "chat.memory.activity.loaded.item": "loaded: {{item}}",
-  "chat.memory.activity.recalled.item": "recalled: {{item}}",
-  "chat.memory.activity.saved.item": "saved: {{item}}",
-  "chat.memory.badge.recalled": "Memory recalled",
-  "chat.memory.badge.items": "{{count}} items",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Use Custom Prompt",
@@ -1690,6 +1680,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Auto-Collapse Reasoning",
   "settings.display.reasoningAutoCollapse.description":
     "Collapse reasoning blocks after the agent finishes writing them. Leave off to keep reasoning expanded unless you collapse it manually.",
+  "settings.display.shiftTabCycle.title": "Cycle Reasoning Effort with Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Press Shift+Tab in a prompt input to switch to the next reasoning effort level. Disable to keep Shift+Tab for keyboard focus navigation.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index e1cd429614..415c87f2ac 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Rehacer",
   "revert.banner.redo.all": "Rehacer todo",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Conversación revertida. Los cambios en los archivos no se restauraron porque las instantáneas están desactivadas.",
+  "revert.banner.workspace.unavailable":
+    "Conversación revertida. No había ningún punto de control de archivos disponible, por lo que no se restauraron los cambios del espacio de trabajo.",
+  "revert.banner.workspace.legacy":
+    "Conversación revertida. El estado de restauración del espacio de trabajo no está disponible para esta reversión anterior.",
+  "revert.banner.workspace.enableSnapshots": "Activar instantáneas",
   "revert.disabled.agentBusy": "Espera a que el agente termine",
   "command.session.compact": "Compactar sesión",
   "command.session.compact.description": "Resumir la sesión para reducir el tamaño del contexto",
@@ -352,6 +359,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Incluir archivo activo",
   "prompt.context.removeActiveFile": "Eliminar archivo activo del contexto",
   "prompt.context.removeFile": "Eliminar archivo del contexto",
+  "prompt.thinking.tooltip": "Esfuerzo de razonamiento",
   "prompt.action.attachFile": "Adjuntar archivo",
   "prompt.attachment.remove": "Eliminar adjunto",
   "prompt.action.send": "Enviar",
@@ -1683,36 +1691,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Guardado automático de memoria del proyecto",
   "settings.context.memory.autoSave.description":
     "Guardar automáticamente hechos duraderos del proyecto desde turnos completados cuando la memoria está activada.",
-  "settings.context.memory.index.title": "Índice de memoria",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "No cargada",
   "settings.context.memory.status.disabled": "Desactivada",
-  "settings.context.memory.status.enabledTokensOps":
-    "Activada - ~{{session}} tokens de contexto inicial en esta sesión - ~{{tokens}} tokens del índice almacenado - última op. {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Activa la memoria para crear archivos de memoria del proyecto.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Inspeccionar",
-  "settings.context.memory.rebuild": "Reconstruir índice de memoria",
-  "chat.memory.status.loading": "Cargando estado de la memoria",
-  "chat.memory.status.active": "Memoria activa en esta sesión",
-  "chat.memory.project.enabled": "Memoria del proyecto activada",
   "chat.memory.project.disabled": "Memoria del proyecto desactivada",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Error en el comando de memoria",
-  "chat.memory.inspect": "Inspeccionar memoria",
-  "chat.memory.remember": "Recordar",
-  "chat.memory.forget": "Olvidar",
-  "chat.memory.rebuild": "Reconstruir índice",
-  "chat.memory.disable": "Desactivar memoria",
-  "chat.memory.enable": "Activar memoria",
-  "chat.memory.verbose": "Detallado",
-  "chat.memory.activity.idle": "Sin actividad de memoria en esta sesión",
-  "chat.memory.activity.loaded": "{{tokens}} tokens cargados",
-  "chat.memory.activity.recalled": "{{count}} recuperados",
-  "chat.memory.activity.saved": "{{count}} guardados",
-  "chat.memory.activity.loaded.item": "cargado: {{item}}",
-  "chat.memory.activity.recalled.item": "recuperado: {{item}}",
-  "chat.memory.activity.saved.item": "guardado: {{item}}",
-  "chat.memory.badge.recalled": "Memoria recuperada",
-  "chat.memory.badge.items": "{{count}} elementos",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Usar prompt personalizado",
@@ -1736,6 +1726,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Contraer razonamiento automáticamente",
   "settings.display.reasoningAutoCollapse.description":
     "Contrae los bloques de razonamiento después de que el agente termine de escribirlos. Déjalo desactivado para mantener el razonamiento expandido, a menos que lo contraigas manualmente.",
+  "settings.display.shiftTabCycle.title": "Alternar el esfuerzo de razonamiento con Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Pulsa Shift+Tab en un campo de entrada de prompt para cambiar al siguiente nivel de esfuerzo de razonamiento. Desactívalo para conservar Shift+Tab para la navegación del foco con el teclado.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index 71055c0d65..05fac462ea 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -138,6 +138,13 @@ export const dict = {
   "revert.banner.redo": "Rétablir",
   "revert.banner.redo.all": "Tout rétablir",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Conversation annulée. Les modifications de fichiers n’ont pas été restaurées, car les instantanés sont désactivés.",
+  "revert.banner.workspace.unavailable":
+    "Conversation annulée. Aucun point de contrôle de fichiers n’était disponible, les modifications de l’espace de travail n’ont donc pas été restaurées.",
+  "revert.banner.workspace.legacy":
+    "Conversation annulée. L’état de restauration de l’espace de travail n’est pas disponible pour cette annulation antérieure.",
+  "revert.banner.workspace.enableSnapshots": "Activer les instantanés",
   "revert.disabled.agentBusy": "Attendre la fin de l'agent",
   "command.session.compact": "Compacter la session",
   "command.session.compact.description": "Résumer la session pour réduire la taille du contexte",
@@ -352,6 +359,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Inclure le fichier actif",
   "prompt.context.removeActiveFile": "Retirer le fichier actif du contexte",
   "prompt.context.removeFile": "Retirer le fichier du contexte",
+  "prompt.thinking.tooltip": "Effort de raisonnement",
   "prompt.action.attachFile": "Joindre un fichier",
   "prompt.attachment.remove": "Supprimer la pièce jointe",
   "prompt.action.send": "Envoyer",
@@ -1703,36 +1711,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Enregistrement automatique de la mémoire du projet",
   "settings.context.memory.autoSave.description":
     "Enregistrer automatiquement les faits durables du projet à partir des tours terminés lorsque la mémoire est activée.",
-  "settings.context.memory.index.title": "Index de mémoire",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Non chargée",
   "settings.context.memory.status.disabled": "Désactivée",
-  "settings.context.memory.status.enabledTokensOps":
-    "Activée - ~{{session}} tokens de contexte initial dans cette session - ~{{tokens}} tokens dans l’index stocké - dernière opération {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Activez la mémoire pour créer les fichiers de mémoire du projet.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Inspecter",
-  "settings.context.memory.rebuild": "Reconstruire l’index de mémoire",
-  "chat.memory.status.loading": "Chargement de l’état de la mémoire",
-  "chat.memory.status.active": "Mémoire active pour cette session",
-  "chat.memory.project.enabled": "Mémoire du projet activée",
   "chat.memory.project.disabled": "Mémoire du projet désactivée",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "La commande de mémoire a échoué",
-  "chat.memory.inspect": "Inspecter la mémoire",
-  "chat.memory.remember": "Mémoriser",
-  "chat.memory.forget": "Oublier",
-  "chat.memory.rebuild": "Reconstruire l’index",
-  "chat.memory.disable": "Désactiver la mémoire",
-  "chat.memory.enable": "Activer la mémoire",
-  "chat.memory.verbose": "Détaillé",
-  "chat.memory.activity.idle": "Aucune activité de mémoire pour cette session",
-  "chat.memory.activity.loaded": "{{tokens}} jetons chargés",
-  "chat.memory.activity.recalled": "{{count}} rappelés",
-  "chat.memory.activity.saved": "{{count}} enregistrés",
-  "chat.memory.activity.loaded.item": "chargé : {{item}}",
-  "chat.memory.activity.recalled.item": "rappelé : {{item}}",
-  "chat.memory.activity.saved.item": "enregistré : {{item}}",
-  "chat.memory.badge.recalled": "Mémoire rappelée",
-  "chat.memory.badge.items": "{{count}} éléments",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Utiliser un prompt personnalisé",
@@ -1757,6 +1747,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Réduire automatiquement le raisonnement",
   "settings.display.reasoningAutoCollapse.description":
     "Réduit les blocs de raisonnement une fois que l'agent a fini de les écrire. Laissez désactivé pour garder le raisonnement développé, sauf si vous le réduisez manuellement.",
+  "settings.display.shiftTabCycle.title": "Parcourir l'effort de raisonnement avec Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Appuyez sur Shift+Tab dans un champ de saisie de prompt pour passer au niveau d'effort de raisonnement suivant. Désactivez cette option pour conserver Shift+Tab pour la navigation du focus au clavier.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
index 034276bb9c..43f32b66be 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts
@@ -131,6 +131,13 @@ export const dict = {
   "revert.banner.redo": "Ripeti",
   "revert.banner.redo.all": "Ripeti tutto",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Conversazione ripristinata. Le modifiche ai file non sono state ripristinate perché gli snapshot sono disabilitati.",
+  "revert.banner.workspace.unavailable":
+    "Conversazione ripristinata. Non era disponibile alcun checkpoint dei file, quindi le modifiche all'area di lavoro non sono state ripristinate.",
+  "revert.banner.workspace.legacy":
+    "Conversazione ripristinata. Lo stato del ripristino dell'area di lavoro non è disponibile per questo ripristino precedente.",
+  "revert.banner.workspace.enableSnapshots": "Abilita snapshot",
   "revert.disabled.agentBusy": "Attendi che l'agente finisca",
   "command.session.compact": "Compatta sessione",
   "command.session.compact.description": "Riassumi la sessione per ridurre la dimensione del contesto",
@@ -296,6 +303,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Includi file attivo",
   "prompt.context.removeActiveFile": "Rimuovi file attivo dal contesto",
   "prompt.context.removeFile": "Rimuovi file dal contesto",
+  "prompt.thinking.tooltip": "Sforzo di ragionamento",
   "prompt.action.attachFile": "Allega file",
   "prompt.attachment.remove": "Rimuovi allegato",
   "prompt.action.send": "Invia",
@@ -1461,36 +1469,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Salvataggio automatico memoria progetto",
   "settings.context.memory.autoSave.description":
     "Salva automaticamente fatti durevoli del progetto dai turni completati quando la memoria è attiva.",
-  "settings.context.memory.index.title": "Indice della memoria",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Non caricata",
   "settings.context.memory.status.disabled": "Disattivata",
-  "settings.context.memory.status.enabledTokensOps":
-    "Attivata - ~{{session}} token di contesto iniziale in questa sessione - ~{{tokens}} token nell’indice salvato - ultima operazione {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Attiva la memoria per creare i file di memoria del progetto.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Ispeziona",
-  "settings.context.memory.rebuild": "Ricostruisci indice della memoria",
-  "chat.memory.status.loading": "Caricamento stato memoria",
-  "chat.memory.status.active": "Memoria attiva in questa sessione",
-  "chat.memory.project.enabled": "Memoria del progetto attivata",
   "chat.memory.project.disabled": "Memoria del progetto disattivata",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Comando memoria non riuscito",
-  "chat.memory.inspect": "Ispeziona memoria",
-  "chat.memory.remember": "Ricorda",
-  "chat.memory.forget": "Dimentica",
-  "chat.memory.rebuild": "Ricostruisci indice",
-  "chat.memory.disable": "Disattiva memoria",
-  "chat.memory.enable": "Attiva memoria",
-  "chat.memory.verbose": "Dettagliato",
-  "chat.memory.activity.idle": "Nessuna attività di memoria in questa sessione",
-  "chat.memory.activity.loaded": "{{tokens}} token caricati",
-  "chat.memory.activity.recalled": "{{count}} richiamati",
-  "chat.memory.activity.saved": "{{count}} salvati",
-  "chat.memory.activity.loaded.item": "caricato: {{item}}",
-  "chat.memory.activity.recalled.item": "richiamato: {{item}}",
-  "chat.memory.activity.saved.item": "salvato: {{item}}",
-  "chat.memory.badge.recalled": "Memoria richiamata",
-  "chat.memory.badge.items": "{{count}} elementi",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Messaggio commit",
   "settings.commitMessage.override.title": "Usa prompt personalizzato",
@@ -1514,6 +1504,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Comprimi automaticamente ragionamento",
   "settings.display.reasoningAutoCollapse.description":
     "Comprimi i blocchi di ragionamento dopo che l'agente ha finito di scriverli. Lascia disattivato per tenerli espansi finché non li comprimi manualmente.",
+  "settings.display.shiftTabCycle.title": "Cambia lo sforzo di ragionamento con Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Premi Shift+Tab in un campo di inserimento del prompt per passare al livello di sforzo di ragionamento successivo. Disattiva l'opzione per mantenere Shift+Tab per la navigazione del focus tramite tastiera.",
   "settings.display.terminalCommand.title": "Blocchi comando terminale",
   "settings.display.terminalCommand.description": "Scegli se i blocchi comando terminale iniziano espansi o compressi.",
   "settings.display.terminalCommand.expanded": "Espansi",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index 2c6bd6c9e3..8b63bbee61 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "やり直し",
   "revert.banner.redo.all": "すべてやり直し",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "会話を元に戻しました。スナップショットが無効になっているため、ファイルの変更は復元されませんでした。",
+  "revert.banner.workspace.unavailable":
+    "会話を元に戻しました。利用可能なファイルのチェックポイントがなかったため、ワークスペースの変更は復元されませんでした。",
+  "revert.banner.workspace.legacy":
+    "会話を元に戻しました。この以前の復元では、ワークスペースの復元状態を利用できません。",
+  "revert.banner.workspace.enableSnapshots": "スナップショットを有効にする",
   "revert.disabled.agentBusy": "エージェントの完了を待ってください",
   "command.session.compact": "セッションを圧縮",
   "command.session.compact.description": "セッションを要約してコンテキストサイズを削減",
@@ -349,6 +356,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "アクティブなファイルを含める",
   "prompt.context.removeActiveFile": "コンテキストからアクティブなファイルを削除",
   "prompt.context.removeFile": "コンテキストからファイルを削除",
+  "prompt.thinking.tooltip": "推論の強度",
   "prompt.action.attachFile": "ファイルを添付",
   "prompt.attachment.remove": "添付ファイルを削除",
   "prompt.action.send": "送信",
@@ -1654,36 +1662,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "プロジェクトメモリを自動保存",
   "settings.context.memory.autoSave.description":
     "メモリが有効なとき、完了したターンから永続的なプロジェクト情報を自動保存します。",
-  "settings.context.memory.index.title": "メモリインデックス",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "未読み込み",
   "settings.context.memory.status.disabled": "無効",
-  "settings.context.memory.status.enabledTokensOps":
-    "有効 - このセッションの起動コンテキスト ~{{session}} トークン - 保存済みインデックス ~{{tokens}} トークン - 最後の操作 {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "メモリを有効にしてプロジェクトメモリファイルを作成します。",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "検査",
-  "settings.context.memory.rebuild": "メモリインデックスを再構築",
-  "chat.memory.status.loading": "メモリ状態を読み込み中",
-  "chat.memory.status.active": "このセッションでメモリが有効です",
-  "chat.memory.project.enabled": "プロジェクトメモリが有効です",
   "chat.memory.project.disabled": "プロジェクトメモリが無効です",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "メモリコマンドに失敗しました",
-  "chat.memory.inspect": "メモリを検査",
-  "chat.memory.remember": "記憶",
-  "chat.memory.forget": "忘れる",
-  "chat.memory.rebuild": "インデックスを再構築",
-  "chat.memory.disable": "メモリを無効化",
-  "chat.memory.enable": "メモリを有効化",
-  "chat.memory.verbose": "詳細",
-  "chat.memory.activity.idle": "このセッションにはメモリアクティビティがありません",
-  "chat.memory.activity.loaded": "{{tokens}} トークンを読み込み",
-  "chat.memory.activity.recalled": "{{count}} 件を呼び出し",
-  "chat.memory.activity.saved": "{{count}} 件を保存",
-  "chat.memory.activity.loaded.item": "読み込み: {{item}}",
-  "chat.memory.activity.recalled.item": "呼び出し: {{item}}",
-  "chat.memory.activity.saved.item": "保存: {{item}}",
-  "chat.memory.badge.recalled": "メモリを呼び出しました",
-  "chat.memory.badge.items": "{{count}} 件",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "カスタム prompt を使用",
@@ -1706,6 +1696,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "推論を自動で折りたたむ",
   "settings.display.reasoningAutoCollapse.description":
     "エージェントが推論の書き込みを終えた後に推論ブロックを自動で折りたたみます。手動で折りたたむまでは推論を展開したままにするには、オフのままにしてください。",
+  "settings.display.shiftTabCycle.title": "Shift+Tab で推論の強度を切り替える",
+  "settings.display.shiftTabCycle.description":
+    "プロンプト入力欄で Shift+Tab を押すと、次の推論の強度レベルに切り替わります。Shift+Tab をキーボードフォーカスの移動に使用する場合は、無効にしてください。",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index 990edeb5eb..edcfa35ae6 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -141,6 +141,13 @@ export const dict = {
   "revert.banner.redo": "다시 실행",
   "revert.banner.redo.all": "모두 다시 실행",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "대화를 되돌렸습니다. 스냅샷이 비활성화되어 있어 파일 변경 사항은 복원되지 않았습니다.",
+  "revert.banner.workspace.unavailable":
+    "대화를 되돌렸습니다. 사용 가능한 파일 체크포인트가 없어 작업 공간 변경 사항은 복원되지 않았습니다.",
+  "revert.banner.workspace.legacy":
+    "대화가 되돌려졌습니다. 이 이전 되돌리기에서는 작업 영역 복원 상태를 확인할 수 없습니다.",
+  "revert.banner.workspace.enableSnapshots": "스냅샷 활성화",
   "revert.disabled.agentBusy": "에이전트가 완료될 때까지 기다리세요",
   "command.session.compact": "세션 압축",
   "command.session.compact.description": "컨텍스트 크기를 줄이기 위해 세션 요약",
@@ -352,6 +359,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "활성 파일 포함",
   "prompt.context.removeActiveFile": "컨텍스트에서 활성 파일 제거",
   "prompt.context.removeFile": "컨텍스트에서 파일 제거",
+  "prompt.thinking.tooltip": "추론 강도",
   "prompt.action.attachFile": "파일 첨부",
   "prompt.attachment.remove": "첨부 파일 제거",
   "prompt.action.send": "전송",
@@ -1637,36 +1645,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "프로젝트 메모리 자동 저장",
   "settings.context.memory.autoSave.description":
     "메모리가 활성화되면 완료된 턴에서 지속적인 프로젝트 사실을 자동으로 저장합니다.",
-  "settings.context.memory.index.title": "메모리 인덱스",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "로드되지 않음",
   "settings.context.memory.status.disabled": "비활성화됨",
-  "settings.context.memory.status.enabledTokensOps":
-    "활성화됨 - 이 세션의 시작 컨텍스트 ~{{session}} 토큰 - 저장된 인덱스 ~{{tokens}} 토큰 - 마지막 작업 {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "메모리를 활성화하여 프로젝트 메모리 파일을 만듭니다.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "검사",
-  "settings.context.memory.rebuild": "메모리 인덱스 다시 빌드",
-  "chat.memory.status.loading": "메모리 상태 로드 중",
-  "chat.memory.status.active": "이 세션에서 메모리 활성화됨",
-  "chat.memory.project.enabled": "프로젝트 메모리 활성화됨",
   "chat.memory.project.disabled": "프로젝트 메모리 비활성화됨",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "메모리 명령 실패",
-  "chat.memory.inspect": "메모리 검사",
-  "chat.memory.remember": "기억",
-  "chat.memory.forget": "잊기",
-  "chat.memory.rebuild": "인덱스 다시 빌드",
-  "chat.memory.disable": "메모리 비활성화",
-  "chat.memory.enable": "메모리 활성화",
-  "chat.memory.verbose": "상세",
-  "chat.memory.activity.idle": "이 세션에 메모리 활동 없음",
-  "chat.memory.activity.loaded": "토큰 {{tokens}}개 로드",
-  "chat.memory.activity.recalled": "{{count}}개 불러옴",
-  "chat.memory.activity.saved": "{{count}}개 저장",
-  "chat.memory.activity.loaded.item": "로드: {{item}}",
-  "chat.memory.activity.recalled.item": "불러옴: {{item}}",
-  "chat.memory.activity.saved.item": "저장: {{item}}",
-  "chat.memory.badge.recalled": "메모리 불러옴",
-  "chat.memory.badge.items": "{{count}}개 항목",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "사용자 지정 prompt 사용",
@@ -1689,6 +1679,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "추론 자동 접기",
   "settings.display.reasoningAutoCollapse.description":
     "에이전트가 추론 작성을 마친 뒤 추론 블록을 자동으로 접습니다. 수동으로 접기 전까지 추론을 펼친 상태로 두려면 끄세요.",
+  "settings.display.shiftTabCycle.title": "Shift+Tab으로 추론 강도 전환",
+  "settings.display.shiftTabCycle.description":
+    "프롬프트 입력란에서 Shift+Tab을 눌러 다음 추론 강도 수준으로 전환합니다. Shift+Tab을 키보드 포커스 탐색에 사용하려면 비활성화하세요.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 75d20e4f17..3508d0bd94 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Opnieuw uitvoeren",
   "revert.banner.redo.all": "Alles opnieuw uitvoeren",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Conversatie teruggedraaid. Bestandswijzigingen zijn niet hersteld omdat snapshots zijn uitgeschakeld.",
+  "revert.banner.workspace.unavailable":
+    "Conversatie teruggedraaid. Er was geen bestandscheckpoint beschikbaar, dus wijzigingen in de werkruimte zijn niet hersteld.",
+  "revert.banner.workspace.legacy":
+    "Gesprek teruggedraaid. De herstelstatus van de werkruimte is niet beschikbaar voor deze eerdere terugdraaiing.",
+  "revert.banner.workspace.enableSnapshots": "Snapshots inschakelen",
   "revert.disabled.agentBusy": "Wacht tot de agent klaar is",
   "command.session.compact": "Sessie comprimeren",
   "command.session.compact.description": "De sessie samenvatten om de contextgrootte te verkleinen",
@@ -352,6 +359,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Actief bestand opnemen",
   "prompt.context.removeActiveFile": "Actief bestand uit context verwijderen",
   "prompt.context.removeFile": "Bestand uit context verwijderen",
+  "prompt.thinking.tooltip": "Redeneringsinspanning",
   "prompt.action.attachFile": "Bestand bijvoegen",
   "prompt.attachment.remove": "Bijlage verwijderen",
   "prompt.action.send": "Verzenden",
@@ -1635,36 +1643,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Projectgeheugen automatisch opslaan",
   "settings.context.memory.autoSave.description":
     "Sla duurzame projectfeiten automatisch op uit voltooide beurten wanneer geheugen is ingeschakeld.",
-  "settings.context.memory.index.title": "Geheugenindex",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Niet geladen",
   "settings.context.memory.status.disabled": "Uitgeschakeld",
-  "settings.context.memory.status.enabledTokensOps":
-    "Ingeschakeld - ~{{session}} startcontexttokens in deze sessie - ~{{tokens}} tokens in opgeslagen index - laatste bewerking {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Schakel geheugen in om projectgeheugenbestanden te maken.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Inspecteren",
-  "settings.context.memory.rebuild": "Geheugenindex opnieuw opbouwen",
-  "chat.memory.status.loading": "Geheugenstatus laden",
-  "chat.memory.status.active": "Geheugen actief in deze sessie",
-  "chat.memory.project.enabled": "Projectgeheugen ingeschakeld",
   "chat.memory.project.disabled": "Projectgeheugen uitgeschakeld",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Geheugenopdracht mislukt",
-  "chat.memory.inspect": "Geheugen inspecteren",
-  "chat.memory.remember": "Onthouden",
-  "chat.memory.forget": "Vergeten",
-  "chat.memory.rebuild": "Index opnieuw opbouwen",
-  "chat.memory.disable": "Geheugen uitschakelen",
-  "chat.memory.enable": "Geheugen inschakelen",
-  "chat.memory.verbose": "Uitgebreid",
-  "chat.memory.activity.idle": "Geen geheugenactiviteit in deze sessie",
-  "chat.memory.activity.loaded": "{{tokens}} tokens geladen",
-  "chat.memory.activity.recalled": "{{count}} opgehaald",
-  "chat.memory.activity.saved": "{{count}} opgeslagen",
-  "chat.memory.activity.loaded.item": "geladen: {{item}}",
-  "chat.memory.activity.recalled.item": "opgehaald: {{item}}",
-  "chat.memory.activity.saved.item": "opgeslagen: {{item}}",
-  "chat.memory.badge.recalled": "Geheugen opgehaald",
-  "chat.memory.badge.items": "{{count}} items",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Aangepaste prompt gebruiken",
@@ -1688,6 +1678,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Redenering automatisch inklappen",
   "settings.display.reasoningAutoCollapse.description":
     "Klapt redeneerblokken in nadat de agent klaar is met schrijven. Laat uitgeschakeld om redenering uitgeklapt te houden, tenzij je die handmatig inklapt.",
+  "settings.display.shiftTabCycle.title": "Doorloop niveaus van redeneringsinspanning met Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Druk op Shift+Tab in een promptinvoerveld om naar het volgende niveau van redeneringsinspanning te gaan. Schakel dit uit om Shift+Tab te behouden voor focusnavigatie via het toetsenbord.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index 68c4af800b..82375c64f6 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -140,6 +140,13 @@ export const dict = {
   "revert.banner.redo": "Gjenta",
   "revert.banner.redo.all": "Gjenta alt",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Samtalen ble tilbakestilt. Filendringer ble ikke gjenopprettet fordi øyeblikksbilder er deaktivert.",
+  "revert.banner.workspace.unavailable":
+    "Samtalen ble tilbakestilt. Ingen filkontrollpunkt var tilgjengelig, så endringer i arbeidsområdet ble ikke gjenopprettet.",
+  "revert.banner.workspace.legacy":
+    "Samtalen er tilbakeført. Statusen for gjenoppretting av arbeidsområdet er ikke tilgjengelig for denne tidligere tilbakeføringen.",
+  "revert.banner.workspace.enableSnapshots": "Aktiver øyeblikksbilder",
   "revert.disabled.agentBusy": "Vent til agenten er ferdig",
   "command.session.compact": "Komprimer sesjon",
   "command.session.compact.description": "Oppsummer sesjonen for å redusere kontekststørrelsen",
@@ -353,6 +360,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Inkluder aktiv fil",
   "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
   "prompt.context.removeFile": "Fjern fil fra kontekst",
+  "prompt.thinking.tooltip": "Resonnementsinnsats",
   "prompt.action.attachFile": "Legg ved fil",
   "prompt.attachment.remove": "Fjern vedlegg",
   "prompt.action.send": "Send",
@@ -1657,36 +1665,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Lagre prosjektminne automatisk",
   "settings.context.memory.autoSave.description":
     "Lagrer varige prosjektfakta automatisk fra fullførte turer når minne er aktivert.",
-  "settings.context.memory.index.title": "Minneindeks",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Ikke lastet",
   "settings.context.memory.status.disabled": "Deaktivert",
-  "settings.context.memory.status.enabledTokensOps":
-    "Aktivert - ~{{session}} oppstartstokener i denne økten - ~{{tokens}} tokener i lagret indeks - siste operasjon {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Aktiver minne for å opprette prosjektets minnefiler.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Inspiser",
-  "settings.context.memory.rebuild": "Bygg minneindeks på nytt",
-  "chat.memory.status.loading": "Laster minnestatus",
-  "chat.memory.status.active": "Minne aktivt i denne økten",
-  "chat.memory.project.enabled": "Prosjektminne aktivert",
   "chat.memory.project.disabled": "Prosjektminne deaktivert",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Minnekommando mislyktes",
-  "chat.memory.inspect": "Inspiser minne",
-  "chat.memory.remember": "Husk",
-  "chat.memory.forget": "Glem",
-  "chat.memory.rebuild": "Bygg indeks på nytt",
-  "chat.memory.disable": "Deaktiver minne",
-  "chat.memory.enable": "Aktiver minne",
-  "chat.memory.verbose": "Detaljert",
-  "chat.memory.activity.idle": "Ingen minneaktivitet i denne økten",
-  "chat.memory.activity.loaded": "lastet inn {{tokens}} tokener",
-  "chat.memory.activity.recalled": "hentet {{count}}",
-  "chat.memory.activity.saved": "lagret {{count}}",
-  "chat.memory.activity.loaded.item": "lastet inn: {{item}}",
-  "chat.memory.activity.recalled.item": "hentet: {{item}}",
-  "chat.memory.activity.saved.item": "lagret: {{item}}",
-  "chat.memory.badge.recalled": "Minne hentet",
-  "chat.memory.badge.items": "{{count}} elementer",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Bruk egendefinert prompt",
@@ -1709,6 +1699,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Skjul resonnement automatisk",
   "settings.display.reasoningAutoCollapse.description":
     "Skjuler resonnementblokker etter at agenten er ferdig med å skrive dem. La være av for å holde resonnement utvidet med mindre du skjuler det manuelt.",
+  "settings.display.shiftTabCycle.title": "Bytt resonnementsinnsats med Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Trykk Shift+Tab i et promptinndatafelt for å bytte til neste nivå for resonnementsinnsats. Deaktiver for å beholde Shift+Tab for tastaturnavigering av fokus.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index f7238a444c..762e3499ec 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Ponów",
   "revert.banner.redo.all": "Ponów wszystko",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Rozmowa została cofnięta. Zmiany w plikach nie zostały przywrócone, ponieważ migawki są wyłączone.",
+  "revert.banner.workspace.unavailable":
+    "Rozmowa została cofnięta. Żaden punkt kontrolny plików nie był dostępny, więc zmiany w obszarze roboczym nie zostały przywrócone.",
+  "revert.banner.workspace.legacy":
+    "Konwersacja została cofnięta. Stan przywracania obszaru roboczego nie jest dostępny dla tego wcześniejszego cofnięcia.",
+  "revert.banner.workspace.enableSnapshots": "Włącz migawki",
   "revert.disabled.agentBusy": "Poczekaj aż agent zakończy",
   "command.session.compact": "Kompaktuj sesję",
   "command.session.compact.description": "Podsumuj sesję, aby zmniejszyć rozmiar kontekstu",
@@ -350,6 +357,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Dołącz aktywny plik",
   "prompt.context.removeActiveFile": "Usuń aktywny plik z kontekstu",
   "prompt.context.removeFile": "Usuń plik z kontekstu",
+  "prompt.thinking.tooltip": "Wysiłek rozumowania",
   "prompt.action.attachFile": "Załącz plik",
   "prompt.attachment.remove": "Usuń załącznik",
   "prompt.action.send": "Wyślij",
@@ -1666,36 +1674,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Automatycznie zapisuj pamięć projektu",
   "settings.context.memory.autoSave.description":
     "Automatycznie zapisuje trwałe fakty projektu z zakończonych tur, gdy pamięć jest włączona.",
-  "settings.context.memory.index.title": "Indeks pamięci",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Nie wczytano",
   "settings.context.memory.status.disabled": "Wyłączona",
-  "settings.context.memory.status.enabledTokensOps":
-    "Włączona - ~{{session}} tokenów kontekstu startowego w tej sesji - ~{{tokens}} tokenów w zapisanym indeksie - ostatnia operacja {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Włącz pamięć, aby utworzyć pliki pamięci projektu.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Sprawdź",
-  "settings.context.memory.rebuild": "Odbuduj indeks pamięci",
-  "chat.memory.status.loading": "Ładowanie stanu pamięci",
-  "chat.memory.status.active": "Pamięć aktywna w tej sesji",
-  "chat.memory.project.enabled": "Pamięć projektu włączona",
   "chat.memory.project.disabled": "Pamięć projektu wyłączona",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Polecenie pamięci nie powiodło się",
-  "chat.memory.inspect": "Sprawdź pamięć",
-  "chat.memory.remember": "Zapamiętaj",
-  "chat.memory.forget": "Zapomnij",
-  "chat.memory.rebuild": "Odbuduj indeks",
-  "chat.memory.disable": "Wyłącz pamięć",
-  "chat.memory.enable": "Włącz pamięć",
-  "chat.memory.verbose": "Szczegółowo",
-  "chat.memory.activity.idle": "Brak aktywności pamięci w tej sesji",
-  "chat.memory.activity.loaded": "wczytano {{tokens}} tokenów",
-  "chat.memory.activity.recalled": "przywołano {{count}}",
-  "chat.memory.activity.saved": "zapisano {{count}}",
-  "chat.memory.activity.loaded.item": "wczytano: {{item}}",
-  "chat.memory.activity.recalled.item": "przywołano: {{item}}",
-  "chat.memory.activity.saved.item": "zapisano: {{item}}",
-  "chat.memory.badge.recalled": "Pamięć przywołana",
-  "chat.memory.badge.items": "{{count}} elementów",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Użyj niestandardowego prompt",
@@ -1719,6 +1709,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Automatycznie zwijaj rozumowanie",
   "settings.display.reasoningAutoCollapse.description":
     "Zwija bloki rozumowania po zakończeniu ich pisania przez agenta. Pozostaw wyłączone, aby rozumowanie pozostało rozwinięte, chyba że zwiniesz je ręcznie.",
+  "settings.display.shiftTabCycle.title": "Przełączaj wysiłek rozumowania za pomocą Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Naciśnij Shift+Tab w polu wprowadzania promptu, aby przełączyć się na następny poziom wysiłku rozumowania. Wyłącz tę opcję, aby zachować Shift+Tab do nawigacji fokusem za pomocą klawiatury.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 47a24933c3..e8f2586887 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Повторить",
   "revert.banner.redo.all": "Повторить всё",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Разговор был отменён. Изменения файлов не были восстановлены, так как снимки отключены.",
+  "revert.banner.workspace.unavailable":
+    "Разговор был отменён. Контрольная точка файлов была недоступна, поэтому изменения в рабочей области не были восстановлены.",
+  "revert.banner.workspace.legacy":
+    "Диалог отменён. Статус восстановления рабочей области недоступен для этого более раннего отката.",
+  "revert.banner.workspace.enableSnapshots": "Включить снимки",
   "revert.disabled.agentBusy": "Дождитесь завершения агента",
   "command.session.compact": "Сжать сессию",
   "command.session.compact.description": "Сократить сессию для уменьшения размера контекста",
@@ -349,6 +356,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Включить активный файл",
   "prompt.context.removeActiveFile": "Удалить активный файл из контекста",
   "prompt.context.removeFile": "Удалить файл из контекста",
+  "prompt.thinking.tooltip": "Усилие рассуждения",
   "prompt.action.attachFile": "Прикрепить файл",
   "prompt.attachment.remove": "Удалить вложение",
   "prompt.action.send": "Отправить",
@@ -1665,36 +1673,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Автосохранение памяти проекта",
   "settings.context.memory.autoSave.description":
     "Автоматически сохраняет устойчивые факты проекта из завершённых ходов, когда память включена.",
-  "settings.context.memory.index.title": "Индекс памяти",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Не загружена",
   "settings.context.memory.status.disabled": "Отключена",
-  "settings.context.memory.status.enabledTokensOps":
-    "Включена - ~{{session}} токенов начального контекста в этой сессии - ~{{tokens}} токенов в сохранённом индексе - последняя операция {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Включите память, чтобы создать файлы памяти проекта.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Проверить",
-  "settings.context.memory.rebuild": "Перестроить индекс памяти",
-  "chat.memory.status.loading": "Загрузка состояния памяти",
-  "chat.memory.status.active": "Память активна в этом сеансе",
-  "chat.memory.project.enabled": "Память проекта включена",
   "chat.memory.project.disabled": "Память проекта отключена",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Команда памяти не выполнена",
-  "chat.memory.inspect": "Проверить память",
-  "chat.memory.remember": "Запомнить",
-  "chat.memory.forget": "Забыть",
-  "chat.memory.rebuild": "Перестроить индекс",
-  "chat.memory.disable": "Отключить память",
-  "chat.memory.enable": "Включить память",
-  "chat.memory.verbose": "Подробно",
-  "chat.memory.activity.idle": "В этом сеансе нет активности памяти",
-  "chat.memory.activity.loaded": "загружено {{tokens}} токенов",
-  "chat.memory.activity.recalled": "извлечено {{count}}",
-  "chat.memory.activity.saved": "сохранено {{count}}",
-  "chat.memory.activity.loaded.item": "загружено: {{item}}",
-  "chat.memory.activity.recalled.item": "извлечено: {{item}}",
-  "chat.memory.activity.saved.item": "сохранено: {{item}}",
-  "chat.memory.badge.recalled": "Память извлечена",
-  "chat.memory.badge.items": "{{count}} элементов",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Использовать пользовательский prompt",
@@ -1717,6 +1707,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Автоматически сворачивать рассуждение",
   "settings.display.reasoningAutoCollapse.description":
     "Сворачивает блоки рассуждения после того, как агент закончит их писать. Оставьте выключенным, чтобы рассуждение оставалось раскрытым, пока вы не свернете его вручную.",
+  "settings.display.shiftTabCycle.title": "Переключать усилие рассуждения с помощью Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Нажмите Shift+Tab в поле ввода запроса, чтобы перейти к следующему уровню усилий рассуждения. Отключите эту настройку, чтобы сохранить Shift+Tab для навигации по фокусу с помощью клавиатуры.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index cac0eea7a9..9b4db93245 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -136,6 +136,13 @@ export const dict = {
   "revert.banner.redo": "ทำซ้ำ",
   "revert.banner.redo.all": "ทำซ้ำทั้งหมด",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "ย้อนกลับการสนทนาแล้ว ไม่ได้กู้คืนการเปลี่ยนแปลงไฟล์เนื่องจากปิดใช้งานสแนปชอตอยู่",
+  "revert.banner.workspace.unavailable":
+    "ย้อนกลับการสนทนาแล้ว ไม่มีจุดตรวจสอบไฟล์ จึงไม่ได้กู้คืนการเปลี่ยนแปลงในพื้นที่ทำงาน",
+  "revert.banner.workspace.legacy":
+    "ย้อนกลับการสนทนาแล้ว ไม่ทราบสถานะการกู้คืนพื้นที่ทำงานสำหรับการย้อนกลับก่อนหน้านี้",
+  "revert.banner.workspace.enableSnapshots": "เปิดใช้งานสแนปชอต",
   "revert.disabled.agentBusy": "รอให้เอเจนต์ทำงานเสร็จ",
   "command.session.compact": "บีบอัดเซสชัน",
   "command.session.compact.description": "สรุปเซสชันเพื่อลดขนาดบริบท",
@@ -349,6 +356,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "รวมไฟล์ที่ใช้งานอยู่",
   "prompt.context.removeActiveFile": "เอาไฟล์ที่ใช้งานอยู่ออกจากบริบท",
   "prompt.context.removeFile": "เอาไฟล์ออกจากบริบท",
+  "prompt.thinking.tooltip": "ความพยายามในการให้เหตุผล",
   "prompt.action.attachFile": "แนบไฟล์",
   "prompt.attachment.remove": "เอาไฟล์แนบออก",
   "prompt.action.send": "ส่ง",
@@ -1635,36 +1643,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "บันทึกความจำของโปรเจกต์อัตโนมัติ",
   "settings.context.memory.autoSave.description":
     "บันทึกข้อเท็จจริงถาวรของโปรเจกต์จากรอบที่เสร็จแล้วโดยอัตโนมัติเมื่อเปิดใช้ความจำ",
-  "settings.context.memory.index.title": "ดัชนีความจำ",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "ยังไม่ได้โหลด",
   "settings.context.memory.status.disabled": "ปิดใช้งาน",
-  "settings.context.memory.status.enabledTokensOps":
-    "เปิดใช้งาน - ~{{session}} โทเค็นบริบทเริ่มต้นในเซสชันนี้ - ~{{tokens}} โทเค็นในดัชนีที่บันทึกไว้ - การทำงานล่าสุด {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "เปิดใช้ความจำเพื่อสร้างไฟล์ความจำของโปรเจกต์",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "ตรวจสอบ",
-  "settings.context.memory.rebuild": "สร้างดัชนีความจำใหม่",
-  "chat.memory.status.loading": "กำลังโหลดสถานะความจำ",
-  "chat.memory.status.active": "หน่วยความจำทำงานในเซสชันนี้",
-  "chat.memory.project.enabled": "เปิดใช้ความจำของโปรเจกต์แล้ว",
   "chat.memory.project.disabled": "ปิดใช้ความจำของโปรเจกต์แล้ว",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "คำสั่งความจำล้มเหลว",
-  "chat.memory.inspect": "ตรวจสอบความจำ",
-  "chat.memory.remember": "จำ",
-  "chat.memory.forget": "ลืม",
-  "chat.memory.rebuild": "สร้างดัชนีใหม่",
-  "chat.memory.disable": "ปิดใช้ความจำ",
-  "chat.memory.enable": "เปิดใช้หน่วยความจำ",
-  "chat.memory.verbose": "แบบละเอียด",
-  "chat.memory.activity.idle": "ไม่มีกิจกรรมหน่วยความจำในเซสชันนี้",
-  "chat.memory.activity.loaded": "โหลด {{tokens}} โทเค็นแล้ว",
-  "chat.memory.activity.recalled": "เรียกคืน {{count}} รายการแล้ว",
-  "chat.memory.activity.saved": "บันทึก {{count}} รายการแล้ว",
-  "chat.memory.activity.loaded.item": "โหลดแล้ว: {{item}}",
-  "chat.memory.activity.recalled.item": "เรียกคืนแล้ว: {{item}}",
-  "chat.memory.activity.saved.item": "บันทึกแล้ว: {{item}}",
-  "chat.memory.badge.recalled": "เรียกคืนความจำแล้ว",
-  "chat.memory.badge.items": "{{count}} รายการ",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "ใช้ prompt แบบกำหนดเอง",
@@ -1687,6 +1677,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "ยุบเหตุผลอัตโนมัติ",
   "settings.display.reasoningAutoCollapse.description":
     "ยุบ block เหตุผลหลังจากเอเจนต์เขียนเสร็จ ปิดไว้เพื่อให้เหตุผลยังคงขยายอยู่ เว้นแต่คุณจะยุบเอง",
+  "settings.display.shiftTabCycle.title": "สลับระดับความพยายามในการให้เหตุผลด้วย Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "กด Shift+Tab ในช่องป้อนพรอมต์เพื่อสลับไปยังระดับความพยายามในการให้เหตุผลถัดไป ปิดใช้งานเพื่อคง Shift+Tab ไว้สำหรับการนำทางโฟกัสด้วยแป้นพิมพ์",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index e799d07141..997798a9f0 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Yinele",
   "revert.banner.redo.all": "Tümünü Yinele",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Konuşma geri alındı. Anlık görüntüler devre dışı olduğu için dosya değişiklikleri geri yüklenmedi.",
+  "revert.banner.workspace.unavailable":
+    "Konuşma geri alındı. Dosya kontrol noktası olmadığından çalışma alanı değişiklikleri geri yüklenmedi.",
+  "revert.banner.workspace.legacy":
+    "Konuşma geri alındı. Bu önceki geri alma için çalışma alanı geri yükleme durumu kullanılamıyor.",
+  "revert.banner.workspace.enableSnapshots": "Anlık Görüntüleri Etkinleştir",
   "revert.disabled.agentBusy": "Ajanın bitmesini bekleyin",
   "command.session.compact": "Oturumu sıkıştır",
   "command.session.compact.description": "Bağlam boyutunu azaltmak için oturumu özetle",
@@ -350,6 +357,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Aktif dosyayı dahil et",
   "prompt.context.removeActiveFile": "Aktif dosyayı bağlamdan çıkar",
   "prompt.context.removeFile": "Dosyayı bağlamdan çıkar",
+  "prompt.thinking.tooltip": "Akıl yürütme eforu",
   "prompt.action.attachFile": "Dosya ekle",
   "prompt.attachment.remove": "Eki kaldır",
   "prompt.action.send": "Gönder",
@@ -1622,36 +1630,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Proje belleğini otomatik kaydet",
   "settings.context.memory.autoSave.description":
     "Bellek açıkken tamamlanan turlardan kalıcı proje gerçeklerini otomatik olarak kaydeder.",
-  "settings.context.memory.index.title": "Bellek indeksi",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Yüklenmedi",
   "settings.context.memory.status.disabled": "Devre dışı",
-  "settings.context.memory.status.enabledTokensOps":
-    "Etkin - bu oturumda ~{{session}} başlangıç bağlamı tokenı - depolanan indekste ~{{tokens}} token - son işlem {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Proje belleği dosyalarını oluşturmak için belleği etkinleştirin.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "İncele",
-  "settings.context.memory.rebuild": "Bellek indeksini yeniden oluştur",
-  "chat.memory.status.loading": "Bellek durumu yükleniyor",
-  "chat.memory.status.active": "Bellek bu oturumda etkin",
-  "chat.memory.project.enabled": "Proje belleği etkin",
   "chat.memory.project.disabled": "Proje belleği devre dışı",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Bellek komutu başarısız oldu",
-  "chat.memory.inspect": "Belleği incele",
-  "chat.memory.remember": "Hatırla",
-  "chat.memory.forget": "Unut",
-  "chat.memory.rebuild": "İndeksi yeniden oluştur",
-  "chat.memory.disable": "Belleği devre dışı bırak",
-  "chat.memory.enable": "Belleği etkinleştir",
-  "chat.memory.verbose": "Ayrıntılı",
-  "chat.memory.activity.idle": "Bu oturumda bellek etkinliği yok",
-  "chat.memory.activity.loaded": "{{tokens}} token yüklendi",
-  "chat.memory.activity.recalled": "{{count}} öğe geri çağrıldı",
-  "chat.memory.activity.saved": "{{count}} öğe kaydedildi",
-  "chat.memory.activity.loaded.item": "yüklendi: {{item}}",
-  "chat.memory.activity.recalled.item": "geri çağrıldı: {{item}}",
-  "chat.memory.activity.saved.item": "kaydedildi: {{item}}",
-  "chat.memory.badge.recalled": "Bellek geri çağrıldı",
-  "chat.memory.badge.items": "{{count}} öğe",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Özel prompt Kullan",
@@ -1675,6 +1665,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Akıl yürütmeyi otomatik daralt",
   "settings.display.reasoningAutoCollapse.description":
     "Ajan yazmayı bitirdikten sonra akıl yürütme bloklarını daraltır. Manuel olarak daraltmadığınız sürece akıl yürütmenin geniş kalması için kapalı bırakın.",
+  "settings.display.shiftTabCycle.title": "Shift+Tab ile akıl yürütme eforunu değiştir",
+  "settings.display.shiftTabCycle.description":
+    "Bir sonraki akıl yürütme eforu seviyesine geçmek için komut girişinde Shift+Tab tuşlarına basın. Shift+Tab tuşunu klavye odağında gezinmek için korumak üzere devre dışı bırakın.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
index dfc15c248d..c7edb20c28 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts
@@ -137,6 +137,13 @@ export const dict = {
   "revert.banner.redo": "Повторити",
   "revert.banner.redo.all": "Повторити все",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled":
+    "Розмову скасовано. Зміни файлів не відновлено, оскільки знімки вимкнено.",
+  "revert.banner.workspace.unavailable":
+    "Розмову скасовано. Контрольна точка файлів була недоступна, тому зміни в робочому просторі не відновлено.",
+  "revert.banner.workspace.legacy":
+    "Розмову скасовано. Стан відновлення робочого простору для цього попереднього скасування недоступний.",
+  "revert.banner.workspace.enableSnapshots": "Увімкнути знімки",
   "revert.disabled.agentBusy": "Зачекайте завершення агента",
   "command.session.compact": "Стиснути сесію",
   "command.session.compact.description": "Підсумувати сесію для зменшення розміру контексту",
@@ -351,6 +358,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "Включити активний файл",
   "prompt.context.removeActiveFile": "Видалити активний файл з контексту",
   "prompt.context.removeFile": "Видалити файл з контексту",
+  "prompt.thinking.tooltip": "Зусилля міркування",
   "prompt.action.attachFile": "Прикріпити файл",
   "prompt.attachment.remove": "Видалити вкладення",
   "prompt.action.send": "Надіслати",
@@ -1619,36 +1627,18 @@ export const dict = {
   "settings.context.memory.autoSave.title": "Автозбереження пам’яті проєкту",
   "settings.context.memory.autoSave.description":
     "Автоматично зберігає сталі факти проєкту із завершених ходів, коли пам’ять увімкнено.",
-  "settings.context.memory.index.title": "Індекс пам’яті",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "Не завантажено",
   "settings.context.memory.status.disabled": "Вимкнено",
-  "settings.context.memory.status.enabledTokensOps":
-    "Увімкнено - ~{{session}} токенів стартового контексту в цій сесії - ~{{tokens}} токенів у збереженому індексі - остання операція {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "Увімкніть пам’ять, щоб створити файли пам’яті проєкту.",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "Перевірити",
-  "settings.context.memory.rebuild": "Перебудувати індекс пам’яті",
-  "chat.memory.status.loading": "Завантаження стану пам’яті",
-  "chat.memory.status.active": "Пам’ять активна в цьому сеансі",
-  "chat.memory.project.enabled": "Пам’ять проєкту увімкнено",
   "chat.memory.project.disabled": "Пам’ять проєкту вимкнено",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "Команду пам’яті не виконано",
-  "chat.memory.inspect": "Перевірити пам’ять",
-  "chat.memory.remember": "Запам’ятати",
-  "chat.memory.forget": "Забути",
-  "chat.memory.rebuild": "Перебудувати індекс",
-  "chat.memory.disable": "Вимкнути пам’ять",
-  "chat.memory.enable": "Увімкнути пам’ять",
-  "chat.memory.verbose": "Докладно",
-  "chat.memory.activity.idle": "У цьому сеансі немає активності пам’яті",
-  "chat.memory.activity.loaded": "завантажено {{tokens}} токенів",
-  "chat.memory.activity.recalled": "відновлено {{count}}",
-  "chat.memory.activity.saved": "збережено {{count}}",
-  "chat.memory.activity.loaded.item": "завантажено: {{item}}",
-  "chat.memory.activity.recalled.item": "відновлено: {{item}}",
-  "chat.memory.activity.saved.item": "збережено: {{item}}",
-  "chat.memory.badge.recalled": "Пам’ять відновлено",
-  "chat.memory.badge.items": "{{count}} елементів",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "Використовувати власний prompt",
@@ -1672,6 +1662,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "Автоматично згортати міркування",
   "settings.display.reasoningAutoCollapse.description":
     "Згортає блоки міркувань після того, як агент закінчить їх писати. Залиште вимкненим, щоб міркування залишалися розгорнутими, доки ви не згорнете їх вручну.",
+  "settings.display.shiftTabCycle.title": "Перемикати зусилля міркування за допомогою Shift+Tab",
+  "settings.display.shiftTabCycle.description":
+    "Натисніть Shift+Tab у полі введення запиту, щоб перейти до наступного рівня зусиль міркування. Вимкніть цю опцію, щоб зберегти Shift+Tab для навігації фокусом за допомогою клавіатури.",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index 8432bbee90..3444a21d8d 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -138,6 +138,10 @@ export const dict = {
   "revert.banner.redo": "重做",
   "revert.banner.redo.all": "全部重做",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled": "会话已还原。由于快照已禁用，文件更改未恢复。",
+  "revert.banner.workspace.unavailable": "会话已还原。没有可用的文件检查点，因此未恢复工作区更改。",
+  "revert.banner.workspace.legacy": "会话已还原。此次早期还原的工作区恢复状态不可用。",
+  "revert.banner.workspace.enableSnapshots": "启用快照",
   "revert.disabled.agentBusy": "等待智能体完成",
   "command.session.compact": "精简会话",
   "command.session.compact.description": "总结会话以减少上下文大小",
@@ -346,6 +350,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "包含当前文件",
   "prompt.context.removeActiveFile": "从上下文移除活动文件",
   "prompt.context.removeFile": "从上下文移除文件",
+  "prompt.thinking.tooltip": "推理强度",
   "prompt.action.attachFile": "附加文件",
   "prompt.action.indexing": "索引设置",
   "prompt.action.autoApprove.enable": "启用自动审批",
@@ -1590,36 +1595,18 @@ export const dict = {
   "settings.context.memory.project.title": "项目记忆",
   "settings.context.memory.autoSave.title": "自动保存项目记忆",
   "settings.context.memory.autoSave.description": "启用记忆时，自动从已完成轮次保存持久项目事实。",
-  "settings.context.memory.index.title": "记忆索引",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "未加载",
   "settings.context.memory.status.disabled": "已禁用",
-  "settings.context.memory.status.enabledTokensOps":
-    "已启用 - 本会话启动上下文约 {{session}} 个 token - 已存储索引约 {{tokens}} 个 token - 上次操作 {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "启用记忆以创建项目记忆文件。",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "检查",
-  "settings.context.memory.rebuild": "重建记忆索引",
-  "chat.memory.status.loading": "正在加载记忆状态",
-  "chat.memory.status.active": "本次会话中记忆已启用",
-  "chat.memory.project.enabled": "项目记忆已启用",
   "chat.memory.project.disabled": "项目记忆已禁用",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "记忆命令失败",
-  "chat.memory.inspect": "检查记忆",
-  "chat.memory.remember": "记住",
-  "chat.memory.forget": "忘记",
-  "chat.memory.rebuild": "重建索引",
-  "chat.memory.disable": "禁用记忆",
-  "chat.memory.enable": "启用记忆",
-  "chat.memory.verbose": "详细",
-  "chat.memory.activity.idle": "本次会话中没有记忆活动",
-  "chat.memory.activity.loaded": "已加载 {{tokens}} 个 token",
-  "chat.memory.activity.recalled": "已召回 {{count}} 项",
-  "chat.memory.activity.saved": "已保存 {{count}} 项",
-  "chat.memory.activity.loaded.item": "已加载：{{item}}",
-  "chat.memory.activity.recalled.item": "已召回：{{item}}",
-  "chat.memory.activity.saved.item": "已保存：{{item}}",
-  "chat.memory.badge.recalled": "已召回记忆",
-  "chat.memory.badge.items": "{{count}} 项",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "使用自定义 prompt",
@@ -1642,6 +1629,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "自动折叠推理",
   "settings.display.reasoningAutoCollapse.description":
     "在智能体写完推理后折叠推理块。保持关闭可让推理保持展开，除非你手动折叠它。",
+  "settings.display.shiftTabCycle.title": "使用 Shift+Tab 切换推理强度",
+  "settings.display.shiftTabCycle.description":
+    "在提示输入框中按 Shift+Tab 可切换到下一个推理强度等级。禁用此选项可将 Shift+Tab 用于键盘焦点导航。",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index b69bb7054c..dfa2dd85f3 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -138,6 +138,10 @@ export const dict = {
   "revert.banner.redo": "重做",
   "revert.banner.redo.all": "全部重做",
   "revert.banner.hint": "You can redo these changes until you send a new message",
+  "revert.banner.workspace.snapshotsDisabled": "工作階段已還原。由於快照已停用，未還原檔案變更。",
+  "revert.banner.workspace.unavailable": "工作階段已還原。沒有可用的檔案檢查點，因此未還原工作區變更。",
+  "revert.banner.workspace.legacy": "工作階段已還原。此次先前還原的工作區復原狀態無法取得。",
+  "revert.banner.workspace.enableSnapshots": "啟用快照",
   "revert.disabled.agentBusy": "等待 Agent 完成",
   "command.session.compact": "精簡工作階段",
   "command.session.compact.description": "總結工作階段以減少上下文大小",
@@ -346,6 +350,7 @@ export const dict = {
   "prompt.context.includeActiveFile": "包含作用中檔案",
   "prompt.context.removeActiveFile": "從上下文移除目前檔案",
   "prompt.context.removeFile": "從上下文移除檔案",
+  "prompt.thinking.tooltip": "推理強度",
   "prompt.action.attachFile": "附加檔案",
   "prompt.attachment.remove": "移除附件",
   "prompt.action.send": "傳送",
@@ -1554,36 +1559,18 @@ export const dict = {
   "settings.context.memory.project.title": "專案記憶",
   "settings.context.memory.autoSave.title": "自動儲存專案記憶",
   "settings.context.memory.autoSave.description": "啟用記憶時，自動從已完成回合儲存持久專案事實。",
-  "settings.context.memory.index.title": "記憶索引",
+  "settings.context.memory.storage.title": "Storage",
   "settings.context.memory.status.notLoaded": "未載入",
   "settings.context.memory.status.disabled": "已停用",
-  "settings.context.memory.status.enabledTokensOps":
-    "已啟用 - 此工作階段啟動內容約 {{session}} 個 token - 已儲存索引約 {{tokens}} 個 token - 上次操作 {{ops}}",
-  "settings.context.memory.index.path": "{{path}}/index.kmem",
-  "settings.context.memory.index.enable": "啟用記憶以建立專案記憶檔案。",
+  "settings.context.memory.status.enabledTokens": "Enabled - ~{{tokens}} stored tokens",
+  "settings.context.memory.storage.path": "{{path}}",
+  "settings.context.memory.storage.enable": "Enable memory to create project memory files.",
   "settings.context.memory.inspect": "檢查",
-  "settings.context.memory.rebuild": "重建記憶索引",
-  "chat.memory.status.loading": "正在載入記憶狀態",
-  "chat.memory.status.active": "本次工作階段中記憶已啟用",
-  "chat.memory.project.enabled": "專案記憶已啟用",
   "chat.memory.project.disabled": "專案記憶已停用",
+  "chat.memory.project.empty": "This project doesn't have any memory yet. It will start showing after you use Kilo.",
   "chat.memory.command.failed": "記憶命令失敗",
-  "chat.memory.inspect": "檢查記憶",
-  "chat.memory.remember": "記住",
-  "chat.memory.forget": "忘記",
-  "chat.memory.rebuild": "重建索引",
-  "chat.memory.disable": "停用記憶",
-  "chat.memory.enable": "啟用記憶",
-  "chat.memory.verbose": "詳細",
-  "chat.memory.activity.idle": "本次工作階段中沒有記憶活動",
-  "chat.memory.activity.loaded": "已載入 {{tokens}} 個 token",
-  "chat.memory.activity.recalled": "已召回 {{count}} 項",
-  "chat.memory.activity.saved": "已儲存 {{count}} 項",
-  "chat.memory.activity.loaded.item": "已載入：{{item}}",
-  "chat.memory.activity.recalled.item": "已召回：{{item}}",
-  "chat.memory.activity.saved.item": "已儲存：{{item}}",
-  "chat.memory.badge.recalled": "已召回記憶",
-  "chat.memory.badge.items": "{{count}} 項",
+  "chat.memory.updated": "Memory updated",
+  "chat.memory.rebuild": "Memory index rebuilt",
 
   "settings.commitMessage.title": "Commit Message",
   "settings.commitMessage.override.title": "使用自訂 prompt",
@@ -1606,6 +1593,9 @@ export const dict = {
   "settings.display.reasoningAutoCollapse.title": "自動收合推理",
   "settings.display.reasoningAutoCollapse.description":
     "在代理寫完推理後收合推理區塊。保持關閉可讓推理保持展開，除非你手動收合它。",
+  "settings.display.shiftTabCycle.title": "使用 Shift+Tab 切換推理強度",
+  "settings.display.shiftTabCycle.description":
+    "在提示輸入框中按 Shift+Tab 可切換至下一個推理強度等級。停用此選項可保留 Shift+Tab 用於鍵盤焦點導覽。",
   "settings.display.terminalCommand.title": "Terminal Command Blocks",
   "settings.display.terminalCommand.description": "Choose whether terminal command blocks start expanded or collapsed.",
   "settings.display.terminalCommand.expanded": "Expanded",
diff --git a/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
index f97d6fe945..7d5e6705e9 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/chat.stories.tsx
@@ -9,8 +9,6 @@
 
 import type { Meta, StoryObj } from "storybook-solidjs-vite"
 import type { AssistantMessage } from "@kilocode/sdk/v2"
-import { MemoryContract } from "@kilocode/kilo-memory/effect/httpapi"
-import { MemorySchema } from "@kilocode/kilo-memory/schema"
 import { StoryProviders, defaultMockData, mockSessionValue } from "./StoryProviders"
 import { ChatView } from "../components/chat/ChatView"
 import { ErrorDisplay } from "../components/chat/ErrorDisplay"
@@ -22,7 +20,6 @@ import { MessageList } from "../components/chat/MessageList"
 import { VscodeUserMessage } from "../components/chat/VscodeUserMessage"
 import { TurnOutcome } from "../components/shared/TurnOutcome"
 import { SessionContext } from "../context/session"
-import { MemoryContext, type MemoryContextValue } from "../context/memory"
 import { ProviderContext } from "../context/provider"
 import { ServerContext } from "../context/server"
 import { WorktreeModeProvider } from "../context/worktree-mode"
@@ -991,88 +988,6 @@ export const TaskHeaderWithTodosAllDone: Story = {
   },
 }
 
-const state = MemorySchema.create()
-const mockMemory: MemoryContextValue = {
-  status: () => ({
-    root: "/project",
-    state: MemoryContract.state({
-      ...state,
-      enabled: true,
-      stats: {
-        ...state.stats,
-        lastInjectedAt: headerNow,
-        lastInjectedBytes: 2_132,
-        lastInjectedTokens: 533,
-        lastInjectedSessionID: SESSION_ID,
-      },
-    }),
-    exists: { state: true, index: true },
-    index: { bytes: 49_600, estimatedTokens: 12_400, preview: "" },
-  }),
-  show: () => undefined,
-  loading: () => false,
-  pending: () => false,
-  error: () => undefined,
-  enabled: () => true,
-  sessionTokens: () => 533,
-  totalTokens: () => 12_400,
-  activity: () => [
-    {
-      type: "loaded",
-      at: headerNow,
-      tokens: 533,
-      count: 1,
-      items: [],
-      refs: ["project.md"],
-    },
-  ],
-  refresh: () => {},
-  showMemory: () => {},
-  enable: () => {},
-  disable: () => {},
-  auto: () => {},
-  verbose: () => {},
-  rebuild: () => {},
-  remember: () => {},
-  forget: () => {},
-}
-
-const memoryHeader = (width: string) => {
-  const session = {
-    ...mockSessionValue({ id: SESSION_ID, status: "idle" }),
-    messages: () => [{ id: "msg-001" }] as any[],
-    contextUsage: () => ({ tokens: 34300, percentage: 17 }),
-    costBreakdown: () => [{ label: "Session", cost: 0.64 }],
-    currentSession: () => ({
-      id: SESSION_ID,
-      title: "Integrate project memory",
-      createdAt: new Date().toISOString(),
-      updatedAt: new Date().toISOString(),
-    }),
-  }
-  return (
-    <StoryProviders sessionID={SESSION_ID} status="idle" noPadding>
-      <SessionContext.Provider value={session as any}>
-        <MemoryContext.Provider value={mockMemory}>
-          <div style={{ width }}>
-            <TaskHeader />
-          </div>
-        </MemoryContext.Provider>
-      </SessionContext.Provider>
-    </StoryProviders>
-  )
-}
-
-export const TaskHeaderWithMemory: Story = {
-  name: "TaskHeader — with memory enabled",
-  render: () => memoryHeader("380px"),
-}
-
-export const TaskHeaderWithMemory200: Story = {
-  name: "TaskHeader — with memory enabled 200",
-  render: () => memoryHeader("200px"),
-}
-
 const usageTokens = { input: 25_900_000, output: 52_000, reasoning: 4_100, cache: { read: 10_500_000, write: 80_000 } }
 const usageData = {
   sessionIDs: [SESSION_ID, "story-subagent-001"],
diff --git a/packages/kilo-vscode/webview-ui/src/stories/tool-call-lab.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/tool-call-lab.stories.tsx
index 483c025433..77248db697 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/tool-call-lab.stories.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/tool-call-lab.stories.tsx
@@ -1082,6 +1082,11 @@ export const SearchPreviews: Story = {
       summary: () => ({ diffs: [{ file: "src/app.ts", additions: 4, deletions: 1 }] }),
       userMessages: () => [{ id: "tool-call-lab-user-message" }, { id: "tool-call-lab-user-message-next" }],
     }
+    const conversationOnly = {
+      ...reverted,
+      revert: () => ({ messageID: "tool-call-lab-user-message", workspace: "snapshots-disabled" as const }),
+      summary: () => undefined,
+    }
 
     return (
       <StoryProviders
@@ -1167,6 +1172,12 @@ export const SearchPreviews: Story = {
                     <RevertBanner />
                   </SessionContext.Provider>
                 </div>
+                <div class="tool-call-lab-example">
+                  <span class="tool-call-lab-example-label">Conversation-only revert</span>
+                  <SessionContext.Provider value={conversationOnly as any}>
+                    <RevertBanner />
+                  </SessionContext.Provider>
+                </div>
                 <div class="tool-call-lab-example">
                   <span class="tool-call-lab-example-label">Token limit outcome</span>
                   <SessionContext.Provider value={limit as any}>
diff --git a/packages/kilo-vscode/webview-ui/src/styles/banners.css b/packages/kilo-vscode/webview-ui/src/styles/banners.css
index 0e8221e50c..e8e66675f1 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/banners.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/banners.css
@@ -130,6 +130,19 @@
   text-align: left;
 }
 
+.revert-banner-notice {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  margin-top: 8px;
+  padding: 6px 8px;
+  border-left: 3px solid var(--vscode-editorWarning-foreground, #cca700);
+  background: var(--vscode-editorWarning-background, rgba(204, 167, 0, 0.1));
+  color: var(--text-base, var(--vscode-foreground));
+  font-weight: 500;
+}
+
 .revert-banner-hint {
   margin-top: 6px;
   color: var(--text-muted, var(--vscode-descriptionForeground));
diff --git a/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css b/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css
index da8ef5d18e..123ca91680 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/chat-layout.css
@@ -228,14 +228,6 @@
   width: 100%;
 }
 
-[data-component="assistant-memory-badge"] {
-  align-self: flex-start;
-  color: var(--vscode-descriptionForeground);
-  font-family: var(--font-family-sans);
-  font-size: var(--font-size-small);
-  line-height: var(--line-height-normal);
-}
-
 .vscode-session-turn-diffs {
   width: 100%;
 }
diff --git a/packages/kilo-vscode/webview-ui/src/styles/task-header.css b/packages/kilo-vscode/webview-ui/src/styles/task-header.css
index e6097cd989..96d48734d0 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/task-header.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/task-header.css
@@ -473,172 +473,6 @@
   font-variant-numeric: tabular-nums;
 }
 
-.task-header-context-trigger {
-  all: unset;
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 20px;
-  height: 20px;
-  border-radius: 3px;
-  color: var(--vscode-foreground);
-  cursor: pointer;
-}
-
-.task-header-context-trigger:hover {
-  background: var(--vscode-toolbar-hoverBackground);
-}
-
-[data-slot="task-header-memory-dot"] {
-  position: absolute;
-  right: 2px;
-  bottom: 2px;
-  width: 4px;
-  height: 4px;
-  border-radius: 50%;
-  background: var(--vscode-testing-iconPassed, #73c991);
-}
-
-.task-header-context-popover {
-  width: min(280px, calc(100vw - 16px));
-  max-width: calc(100vw - 16px);
-  white-space: normal;
-  overflow-wrap: break-word;
-}
-
-.task-header-memory-tooltip {
-  max-width: min(320px, calc(100vw - 16px));
-  white-space: normal;
-  overflow-wrap: break-word;
-}
-
-[data-slot="task-header-context-tooltip-title"] {
-  margin-bottom: 4px;
-  color: var(--vscode-foreground);
-  font-weight: 600;
-}
-
-[data-slot="task-header-context-tooltip-status"] {
-  margin-bottom: 2px;
-  color: var(--vscode-foreground);
-}
-
-[data-slot="task-header-context-menu"] {
-  display: flex;
-  flex-direction: column;
-  padding: 8px;
-}
-
-[data-slot="task-header-context-title"] {
-  padding: 2px 4px 8px;
-  color: var(--vscode-foreground);
-  font-size: var(--kilo-font-size-12);
-  font-weight: 600;
-}
-
-[data-slot="task-header-context-section"] {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  padding: 6px 0;
-}
-
-[data-slot="task-header-context-section"] + [data-slot="task-header-context-section"] {
-  margin-top: 6px;
-  padding-top: 12px;
-  border-top: 1px solid var(--vscode-widget-border, var(--vscode-editorWidget-border));
-}
-
-[data-slot="task-header-context-section-title"] {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  padding: 0 4px;
-  color: var(--vscode-descriptionForeground);
-  font-size: var(--kilo-font-size-11);
-  font-weight: 600;
-}
-
-[data-slot="task-header-memory-status"] {
-  padding: 0 4px;
-  color: var(--vscode-foreground);
-  font-size: var(--kilo-font-size-11);
-}
-
-[data-slot="task-header-memory-activity"] {
-  min-width: 0;
-  padding: 0 4px;
-  color: var(--vscode-descriptionForeground);
-  font-size: var(--kilo-font-size-11);
-  white-space: normal;
-  overflow-wrap: break-word;
-}
-
-[data-slot="task-header-memory-activity-summary"] {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-}
-
-[data-slot="task-header-memory-activity-list"] {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  margin-top: 4px;
-  min-width: 0;
-  color: var(--vscode-foreground);
-  line-height: 1.3;
-  white-space: normal;
-  overflow-wrap: break-word;
-}
-
-[data-slot="task-header-memory-activity-list"] > div {
-  white-space: normal;
-  overflow-wrap: break-word;
-}
-
-[data-slot="task-header-context-actions"] {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 4px;
-}
-
-[data-slot="task-header-context-action"] {
-  border: 0;
-  border-radius: 3px;
-  padding: 4px 6px;
-  color: var(--vscode-foreground);
-  background: transparent;
-  font: inherit;
-  font-size: var(--kilo-font-size-11);
-  text-align: left;
-  cursor: pointer;
-}
-
-[data-slot="task-header-context-action"]:last-child:nth-child(odd) {
-  grid-column: 1 / -1;
-}
-
-[data-slot="task-header-context-action"]:hover:not(:disabled) {
-  background: var(--vscode-list-hoverBackground);
-}
-
-[data-slot="task-header-context-action"]:disabled {
-  color: var(--vscode-disabledForeground);
-  cursor: default;
-}
-
-[data-slot="task-header-memory-verbose"] {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding-top: 6px;
-  border-top: 1px solid var(--vscode-widget-border, var(--vscode-editorWidget-border));
-  color: var(--vscode-foreground);
-  font-size: var(--kilo-font-size-11);
-}
-
 /* Expand toggle */
 [data-slot="task-header-expand"] {
   all: unset;
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts b/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
index 553997c59e..298d9eba88 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/agent-manager.ts
@@ -195,6 +195,7 @@ export interface ModelAllocation {
   providerID: string
   modelID: string
   count: number
+  variant?: string
 }
 
 export type ContinueInWorktreeStatus =
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
index 5ff64c62c5..32370ed555 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts
@@ -350,6 +350,13 @@ export interface IndexingSettingsLoadedMessage {
   }
 }
 
+export interface ChatSettingsLoadedMessage {
+  type: "chatSettingsLoaded"
+  settings: {
+    shiftTabCyclesVariant: boolean
+  }
+}
+
 export interface KiloEmbeddingModelsLoadedMessage {
   type: "kiloEmbeddingModelsLoaded"
   catalog: KiloEmbeddingModelCatalog
@@ -1128,6 +1135,7 @@ export type ExtensionMessage =
   | NavigateMessage
   | IndexingStatusLoadedMessage
   | IndexingSettingsLoadedMessage
+  | ChatSettingsLoadedMessage
   | KiloEmbeddingModelsLoadedMessage
   | ImageModelsLoadedMessage
   | ProvidersLoadedMessage
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/memory.ts b/packages/kilo-vscode/webview-ui/src/types/messages/memory.ts
index 7db8142a71..4f2283c5ef 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/memory.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/memory.ts
@@ -7,13 +7,9 @@ import type {
   MemoryPurgeResponse,
   MemoryRememberResponse,
   MemoryRebuildResponse,
-  MemoryShowResponse,
   MemoryStatusResponse,
 } from "@kilocode/sdk/v2"
-import type {
-  MemoryOperation as SharedMemoryOperation,
-  MemoryPromptOperation as SharedMemoryPromptOperation,
-} from "@kilocode/kilo-memory/commands"
+import type { MemoryOperation as SharedMemoryOperation } from "@kilocode/kilo-memory/commands"
 import type { MemorySchema } from "@kilocode/kilo-memory/schema"
 
 export type MemorySourceFile = MemorySchema.Source
@@ -22,8 +18,6 @@ export type MemoryOperation = SharedMemoryOperation
 
 export type MemoryResultOperation = MemoryOperation
 
-export type MemoryPromptOperation = SharedMemoryPromptOperation
-
 export type MemoryOperationResponse =
   | MemoryEnableResponse
   | MemoryConfigureResponse
@@ -39,7 +33,6 @@ export interface MemoryLoadedMessage {
   type: "memoryLoaded"
   sessionID?: string
   status?: MemoryStatusResponse
-  show?: MemoryShowResponse
   error?: string
 }
 
@@ -69,7 +62,6 @@ export interface MemoryOperationResultMessage {
   sessionID?: string
   ok: boolean
   status?: MemoryStatusResponse
-  show?: MemoryShowResponse
   result?: MemoryOperationResponse
   error?: string
 }
@@ -77,12 +69,12 @@ export interface MemoryOperationResultMessage {
 export interface RequestMemoryMessage {
   type: "requestMemory"
   sessionID?: string
-  includeSources?: boolean
 }
 
 export interface MemoryShowMessage {
   type: "memoryShow"
   sessionID?: string
+  mode?: "status" | "show"
 }
 
 export interface MemoryOperationMessage {
@@ -97,9 +89,3 @@ export interface MemoryOperationMessage {
   file?: MemorySourceFile
   section?: string
 }
-
-export interface MemoryPromptMessage {
-  type: "memoryPrompt"
-  operation: MemoryPromptOperation
-  sessionID?: string
-}
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts b/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts
index e0ba68abc1..90a5733027 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/sessions.ts
@@ -50,6 +50,7 @@ export interface SessionInfo {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   } | null
   summary?: {
     additions: number
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
index fd6db5b42e..48108ab9eb 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/webview-messages.ts
@@ -15,7 +15,7 @@ import type {
   SkipLegacyMigrationMessage,
   StartMigrationMessage,
 } from "./migration"
-import type { MemoryShowMessage, MemoryOperationMessage, MemoryPromptMessage, RequestMemoryMessage } from "./memory"
+import type { MemoryShowMessage, MemoryOperationMessage, RequestMemoryMessage } from "./memory"
 
 // ============================================
 // Messages FROM webview TO extension
@@ -477,6 +477,10 @@ export interface RequestIndexingSettingsMessage {
   type: "requestIndexingSettings"
 }
 
+export interface RequestChatSettingsMessage {
+  type: "requestChatSettings"
+}
+
 export interface RequestKiloEmbeddingModelsMessage {
   type: "requestKiloEmbeddingModels"
 }
@@ -1283,6 +1287,7 @@ export type WebviewMessage =
   | RequestGlobalConfigMessage
   | RequestIndexingStatusMessage
   | RequestIndexingSettingsMessage
+  | RequestChatSettingsMessage
   | RequestKiloEmbeddingModelsMessage
   | UpdateConfigMessage
   | OpenSettingsTabRequest
@@ -1407,7 +1412,6 @@ export type WebviewMessage =
   | RequestMemoryMessage
   | MemoryShowMessage
   | MemoryOperationMessage
-  | MemoryPromptMessage
   | CreateSectionRequest
   | RenameSectionRequest
   | DeleteSectionRequest
diff --git a/packages/kilo-vscode/webview-ui/src/utils/memory-activity.ts b/packages/kilo-vscode/webview-ui/src/utils/memory-activity.ts
deleted file mode 100644
index a0a8afa4a2..0000000000
--- a/packages/kilo-vscode/webview-ui/src/utils/memory-activity.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { MemoryMarkerMeta } from "@kilocode/kilo-memory/marker-meta"
-import type { MemoryEventDetail } from "../types/messages/memory"
-
-const LIMIT = 50
-
-export type MemoryActivity = {
-  type: "loaded" | "recalled" | "saved"
-  at: number
-  tokens: number
-  count: number
-  items: string[]
-  refs: string[]
-}
-
-export function markerActivity(parts: readonly MemoryMarkerMeta.Part[], at: number): MemoryActivity | undefined {
-  const meta = MemoryMarkerMeta.fromParts(parts)
-  if (!meta) return
-  return {
-    type: meta.type === "startup" ? "loaded" : "recalled",
-    at,
-    tokens: meta.tokens,
-    count: meta.count,
-    items: meta.items,
-    refs: meta.files,
-  }
-}
-
-export function addMemoryActivity(
-  items: readonly MemoryActivity[],
-  detail: MemoryEventDetail,
-  at: number,
-): MemoryActivity[] {
-  if (detail.type !== "saved") return [...items]
-  const count = detail.added ?? detail.operationCount ?? 1
-  if (count <= 0) return [...items]
-  const item: MemoryActivity = {
-    type: "saved",
-    at,
-    tokens: 0,
-    count,
-    items: detail.message ? [detail.message] : [],
-    refs: [...(detail.sources ?? []), ...(detail.files ?? [])],
-  }
-  return [...items, item].slice(-LIMIT)
-}
diff --git a/packages/kilo-vscode/webview-ui/tsconfig.json b/packages/kilo-vscode/webview-ui/tsconfig.json
index e3e1ededb8..799a9cc7fe 100644
--- a/packages/kilo-vscode/webview-ui/tsconfig.json
+++ b/packages/kilo-vscode/webview-ui/tsconfig.json
@@ -3,7 +3,7 @@
     "target": "ES2022",
     "module": "ESNext",
     "moduleResolution": "bundler",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
     "strict": true,
diff --git a/packages/kilo-web-ui/package.json b/packages/kilo-web-ui/package.json
index 8135728ce8..d732c29b6e 100644
--- a/packages/kilo-web-ui/package.json
+++ b/packages/kilo-web-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/kilo-web-ui",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/packages/llm/package.json b/packages/llm/package.json
index 1eb0522af4..c32cba2dc2 100644
--- a/packages/llm/package.json
+++ b/packages/llm/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "name": "@opencode-ai/llm",
   "type": "module",
   "license": "MIT",
diff --git a/packages/opencode/CHANGELOG.md b/packages/opencode/CHANGELOG.md
index 29925d3baa..51bde0e96c 100644
--- a/packages/opencode/CHANGELOG.md
+++ b/packages/opencode/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @kilocode/cli
 
+## 7.4.13
+
+### Minor Changes
+
+- [#12271](https://github.com/Kilo-Org/kilocode/pull/12271) [`38013f7`](https://github.com/Kilo-Org/kilocode/commit/38013f70fad82f55b9ebe02d8d6883a26d791934) - Allow agents to stop and remove a targeted Agent Manager session.
+
+- [#12306](https://github.com/Kilo-Org/kilocode/pull/12306) [`c081f58`](https://github.com/Kilo-Org/kilocode/commit/c081f582abecaba98a303069140d014a9ee90ca9) - Configure a custom file extension allowlist for codebase indexing to limit scans to relevant project files and support additional text formats.
+
+- [#12224](https://github.com/Kilo-Org/kilocode/pull/12224) [`df9e1fb`](https://github.com/Kilo-Org/kilocode/commit/df9e1fb1e95275d600a1eb1e969ab19279e95417) - Remote CLI: expose slash command discovery, execution, and `/new` session creation over the relay. `list_commands` and `send_command` (including the built-in `compact` flow) are scoped to the current session's directory. `create_session` creates a root session in that directory, attaches it to the relay heartbeat set, and returns the new session id only after the heartbeat completes so the mobile client can navigate immediately. Failures are sanitized; the command is not auto-retried and the user may retry manually after a transient relay failure.
+
+### Patch Changes
+
+- [#12303](https://github.com/Kilo-Org/kilocode/pull/12303) [`7c07a47`](https://github.com/Kilo-Org/kilocode/commit/7c07a474660e8a5c9636778ad7d2b2fd8e233157) - Improve CLI sidebar usage sections with cent-formatted costs, collapsible details, and aligned model totals.
+
+- [#12304](https://github.com/Kilo-Org/kilocode/pull/12304) [`79fe757`](https://github.com/Kilo-Org/kilocode/commit/79fe75745fc6abd7bd3aad0c079e8f5150751a2c) - Display here-document content as plain text in terminal approval prompts.
+
+- [#12302](https://github.com/Kilo-Org/kilocode/pull/12302) [`ad66c90`](https://github.com/Kilo-Org/kilocode/commit/ad66c908a4bec5f29e6d83fa9efbd1f6cc2cd416) - Clarify when reverting a conversation does not restore workspace changes and link disabled snapshots to the Checkpoints setting.
+
+- [#12329](https://github.com/Kilo-Org/kilocode/pull/12329) [`084bcea`](https://github.com/Kilo-Org/kilocode/commit/084bceadaedf193568ccf71256bd299c0d11e90c) - Fix Cloud Agent session imports in installed CLI builds and prevent malformed exports or write failures from leaving partial imports.
+
+- [#12314](https://github.com/Kilo-Org/kilocode/pull/12314) [`520679a`](https://github.com/Kilo-Org/kilocode/commit/520679a91f320656cb4dbffe74f0a37e521d45c2) - Keep the CLI sidebar branch label in sync when Git branches change outside Kilo.
+
+- [#12378](https://github.com/Kilo-Org/kilocode/pull/12378) [`b402cc2`](https://github.com/Kilo-Org/kilocode/commit/b402cc2635c1dae836a684f9d7a981c05491a930) - Include image-output models in the Kilo Gateway chat model list.
+
+- [#12335](https://github.com/Kilo-Org/kilocode/pull/12335) [`99227f6`](https://github.com/Kilo-Org/kilocode/commit/99227f67478b44b06a18935792bd655c774f174a) Thanks [@shssoichiro](https://github.com/shssoichiro)! - Start the TUI from standalone CLI installations without requiring project-local OpenTUI dependencies.
+
+- Updated dependencies [[`084bcea`](https://github.com/Kilo-Org/kilocode/commit/084bceadaedf193568ccf71256bd299c0d11e90c), [`c081f58`](https://github.com/Kilo-Org/kilocode/commit/c081f582abecaba98a303069140d014a9ee90ca9), [`ff703fb`](https://github.com/Kilo-Org/kilocode/commit/ff703fba621e35a4a5d8e4801620502228cca5bf)]:
+  - @kilocode/kilo-gateway@7.4.12
+  - @kilocode/kilo-indexing@7.5.0
+  - @kilocode/kilo-telemetry@7.4.12
+  - @opencode-ai/server@7.4.12
+  - @opencode-ai/tui@7.4.9
+  - @opencode-ai/ui@7.4.12
+
 ## 7.4.11
 
 ### Minor Changes
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index f62473bbc1..f820f18744 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "name": "@kilocode/cli",
   "type": "module",
   "license": "MIT",
diff --git a/packages/opencode/src/cli/cmd/tui.ts b/packages/opencode/src/cli/cmd/tui.ts
index 6bb8eaf10a..ce9fa7e351 100644
--- a/packages/opencode/src/cli/cmd/tui.ts
+++ b/packages/opencode/src/cli/cmd/tui.ts
@@ -15,6 +15,7 @@ import { importCloudSession, localSessionID, validateCloudFork } from "@/kilocod
 import { createKiloClient } from "@kilocode/sdk/v2" // kilocode_change
 import { writeHeapSnapshot } from "v8"
 import { KiloTuiThreadDaemon, type StartInput } from "@/kilocode/cli/cmd/tui/thread" // kilocode_change
+import { preload } from "@/kilocode/cli/cmd/tui" // kilocode_change
 import { win32InstallCtrlCGuard } from "@opencode-ai/tui/terminal-win32"
 import { validateSession } from "../tui/validate-session"
 // kilocode_change start - correlate the TUI worker with its parent process
@@ -203,6 +204,12 @@ export const TuiThreadCommand = cmd({
       // chdir so the thread and worker share the same directory key.
       const next = resolveThreadDirectory(args.project)
       const file = await target()
+      // kilocode_change start
+      const preloads = preload(
+        typeof KILO_WORKER_PATH !== "undefined",
+        () => import.meta.resolve("@opentui/solid/preload"),
+      )
+      // kilocode_change end
       try {
         process.chdir(next)
       } catch {
@@ -223,7 +230,7 @@ export const TuiThreadCommand = cmd({
       })
       // kilocode_change end
       const worker = new Worker(file, {
-        preload: ["@opentui/solid/preload"], // kilocode_change - Bun workers do not inherit the parent preload
+        preload: preloads, // kilocode_change
         env, // kilocode_change
       })
       worker.onerror = (e) => {
diff --git a/packages/opencode/src/kilocode/bootstrap.ts b/packages/opencode/src/kilocode/bootstrap.ts
index 92c5fcaa58..fc89546597 100644
--- a/packages/opencode/src/kilocode/bootstrap.ts
+++ b/packages/opencode/src/kilocode/bootstrap.ts
@@ -19,6 +19,7 @@ import { MemoryEvents } from "@/kilocode/memory/events"
 import { installMemoryRuntime } from "@/kilocode/memory/runtime"
 import { KiloToolRegistry } from "@/kilocode/tool/registry"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
+import { KilocodeWatcher } from "@/kilocode/watcher"
 
 const log = Log.create({ service: "kilocode-bootstrap" })
 
@@ -40,8 +41,10 @@ export namespace KilocodeBootstrap {
       const summary = yield* SessionSummary.Service
       const provider = yield* Provider.Service
       const memory = yield* MemoryService.Service
+      const watcher = yield* KilocodeWatcher.Service
 
       const init = Effect.fn("KilocodeBootstrap.init")(function* () {
+        yield* watcher.init()
         yield* kilo.init()
         yield* MemoryLifecycle.subscribe({ bus, sessions, summary, provider, memory })
         // Invalidate enabled cache on every memory state mutation (properties.directory holds the memory root).
@@ -99,10 +102,12 @@ export namespace KilocodeBootstrap {
       Provider.defaultLayer,
       MemoryService.layer,
       Bus.defaultLayer,
+      KilocodeWatcher.defaultLayer,
     ]),
   )
 
   const memory = LayerNode.make(MemoryService.layer, [])
+  const watcher = LayerNode.make(KilocodeWatcher.defaultLayer, [])
   export const node = LayerNode.make(layer, [
     KiloSessions.node,
     Session.node,
@@ -110,5 +115,6 @@ export namespace KilocodeBootstrap {
     Provider.node,
     memory,
     Bus.node,
+    watcher,
   ])
 }
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui.ts b/packages/opencode/src/kilocode/cli/cmd/tui.ts
new file mode 100644
index 0000000000..c806b6d872
--- /dev/null
+++ b/packages/opencode/src/kilocode/cli/cmd/tui.ts
@@ -0,0 +1,4 @@
+export function preload(compiled: boolean, resolve: () => string) {
+  if (compiled) return []
+  return [resolve()]
+}
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/component/dialog-memory.tsx b/packages/opencode/src/kilocode/cli/cmd/tui/component/dialog-memory.tsx
index 041642085b..0f0000ab28 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/component/dialog-memory.tsx
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/component/dialog-memory.tsx
@@ -12,6 +12,8 @@ import { useTheme } from "@tui/context/theme"
 import { useTuiConfig } from "@tui/config"
 import { useBindings } from "@tui/keymap"
 import { useDialog, type DialogContext } from "@tui/ui/dialog"
+import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
+import { useToast } from "@tui/ui/toast"
 import { getScrollAcceleration } from "@tui/util/scroll"
 import { route } from "@/kilocode/cli/cmd/tui/memory-command"
 import { errorMessage } from "@/util/error"
@@ -41,9 +43,14 @@ export function showMemoryDialog(dialog: DialogContext, input?: { workspace?: st
   dialog.replace(() => <DialogMemory workspace={input?.workspace} directory={input?.directory} />)
 }
 
-export function showMemoryHelpDialog(dialog: DialogContext, reason?: string) {
+export function showMemoryHelpDialog(
+  dialog: DialogContext,
+  input?: { workspace?: string; directory?: string; reason?: string },
+) {
   dialog.setSize("large")
-  dialog.replace(() => <DialogMemoryHelp reason={reason} />)
+  dialog.replace(() => (
+    <DialogMemoryHelp workspace={input?.workspace} directory={input?.directory} reason={input?.reason} />
+  ))
 }
 
 export function showMemoryStatusDialog(dialog: DialogContext, input?: { workspace?: string; directory?: string }) {
@@ -99,32 +106,6 @@ function MemorySourcesInfo(props: {
   )
 }
 
-function MemoryActivityInfo(props: {
-  state: {
-    autoInject: boolean
-    stats: MemoryAutosaveStatus.Stats & {
-      lastInjectedTokens: number
-      lastRecallCount: number
-    }
-  }
-}) {
-  const { theme } = useTheme()
-  return (
-    <box>
-      <text fg={theme.text}>Activity</text>
-      <text fg={theme.textMuted}>
-        startup context {props.state.autoInject ? "on" : "off"}
-        {props.state.stats.lastInjectedTokens > 0
-          ? ` · last injected ${fmt(props.state.stats.lastInjectedTokens)} tokens`
-          : ""}
-      </text>
-      <Show when={props.state.stats.lastRecallCount > 0}>
-        <text fg={theme.textMuted}>last recall {fmt(props.state.stats.lastRecallCount)} items</text>
-      </Show>
-    </box>
-  )
-}
-
 function MemoryItemsInfo(props: { items: string }) {
   const { theme } = useTheme()
   return (
@@ -137,36 +118,42 @@ function MemoryItemsInfo(props: { items: string }) {
   )
 }
 
-export function DialogMemoryHelp(props: { reason?: string }) {
+function draft(usage: string) {
+  const head = usage.split(" ")[0]
+  if (usage.includes("<") || usage.includes("|")) return `${head} `
+  return usage
+}
+
+export function DialogMemoryHelp(props: { workspace?: string; directory?: string; reason?: string }) {
+  const sdk = useSDK()
+  const project = useProject()
   const dialog = useDialog()
   const { theme } = useTheme()
+  const toast = useToast()
+  const options: DialogSelectOption<string>[] = MEMORY_COMMAND_CATALOG.map((item) => ({
+    title: item.description,
+    footer: `/memory ${item.usage}`,
+    category: "Memory",
+    value: item.usage,
+  }))
 
   return (
-    <box paddingLeft={2} paddingRight={2} gap={1} paddingBottom={1}>
-      <box flexDirection="row" justifyContent="space-between">
-        <text fg={theme.text} attributes={TextAttributes.BOLD}>
-          Memory
-        </text>
-        <text fg={theme.textMuted} onMouseUp={() => dialog.clear()}>
-          esc
-        </text>
-      </box>
-      <Show when={props.reason}>{(reason) => <text fg={theme.error}>{reason()}</text>}</Show>
-      <box gap={0}>
-        <For each={MEMORY_COMMAND_CATALOG}>
-          {(item) => (
-            <box flexDirection="row" gap={2}>
-              <text fg={theme.text} flexShrink={0}>
-                /memory {item.usage}
-              </text>
-              <text fg={theme.textMuted} wrapMode="word">
-                {item.description}
-              </text>
-            </box>
-          )}
-        </For>
-      </box>
-    </box>
+    <DialogSelect
+      title="Memory"
+      options={options}
+      flat
+      footer={<Show when={props.reason}>{(reason) => <text fg={theme.error}>{reason()}</text>}</Show>}
+      onSelect={async (option) => {
+        dialog.clear()
+        const workspace = props.workspace ?? project.workspace.current()
+        const result = await sdk.client.tui.appendPrompt({
+          ...route({ workspace, directory: props.directory }),
+          text: `/memory ${draft(option.value)}`,
+        })
+        if (!result.error) return
+        toast.show({ variant: "error", message: `Memory menu failed: ${errorMessage(result.error)}` })
+      }}
+    />
   )
 }
 
@@ -218,14 +205,6 @@ function DialogMemoryStatus(props: { workspace?: string; directory?: string }) {
                   Auto-save sends best-effort-redacted turn context to your configured model provider; disable with /memory auto off.
                 </text>
               </box>
-              <box>
-                <text fg={theme.text}>Verbose</text>
-                <text fg={theme.textMuted}>{item().state.verbose ? "on" : "off"}</text>
-                <text fg={theme.textMuted} wrapMode="word">
-                  Verbose shows recall and save details; toggle with /memory verbose on|off.
-                </text>
-              </box>
-              <MemoryActivityInfo state={item().state} />
               <MemorySourcesInfo sources={item().sources} />
               <MemoryItemsInfo items={item().items} />
               <box>
@@ -307,7 +286,6 @@ export function DialogMemory(props: { workspace?: string; directory?: string })
                 <box>
                   <MemoryHeaderInfo root={item().root} state={item().state} />
                 </box>
-                <MemoryActivityInfo state={item().state} />
                 <MemorySourcesInfo sources={item().sources} />
                 <MemoryItemsInfo items={item().items} />
               </box>
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-prompt.tsx b/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-prompt.tsx
index c1aac24d7f..2a202e1c63 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-prompt.tsx
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-prompt.tsx
@@ -1,5 +1,5 @@
 import type { KiloClient } from "@kilocode/sdk/v2"
-import type { CliRenderer } from "@opentui/core"
+import open from "open"
 import type { DialogContext } from "@tui/ui/dialog"
 import type { ToastContext } from "@tui/ui/toast"
 import {
@@ -18,7 +18,6 @@ export namespace MemoryPrompt {
     sessionID?: string
     toast: ToastContext
     dialog: DialogContext
-    renderer?: CliRenderer
     done(): void
   }) {
     const handled = await runMemoryCommand({
@@ -28,10 +27,13 @@ export namespace MemoryPrompt {
       directory: input.directory,
       sessionID: input.sessionID,
       toast: input.toast,
-      renderer: input.renderer,
+      inspect: async (root) => {
+        await open(root)
+      },
       show: () => showMemoryDialog(input.dialog, { workspace: input.workspace, directory: input.directory }),
       status: () => showMemoryStatusDialog(input.dialog, { workspace: input.workspace, directory: input.directory }),
-      usage: (message) => showMemoryHelpDialog(input.dialog, message),
+      usage: (reason) =>
+        showMemoryHelpDialog(input.dialog, { workspace: input.workspace, directory: input.directory, reason }),
     })
     if (!handled) return false
     input.done()
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-status.tsx b/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-status.tsx
index 0715b7a219..94c1698393 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-status.tsx
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/component/memory-status.tsx
@@ -1,6 +1,6 @@
 import type { TuiPluginApi } from "@kilocode/plugin/tui"
 import type { Event } from "@kilocode/sdk/v2"
-import { createEffect, createMemo, createResource, createSignal, onCleanup, onMount, Show } from "solid-js"
+import { createMemo, createResource, createSignal, onCleanup, onMount, Show } from "solid-js"
 import * as Log from "@opencode-ai/core/util/log"
 import { route } from "@/kilocode/cli/cmd/tui/memory-command"
 import { MemoryTuiMeta } from "@/kilocode/cli/cmd/tui/memory-meta"
@@ -10,12 +10,9 @@ export function memoryRow(input: {
   enabled?: boolean
   loading?: boolean
   active: boolean
-  verbose: boolean
-  flash?: string
 }): {
   label: "Loading" | "Unavailable" | "Disabled" | "Enabled"
   tone: "muted" | "success" | "error"
-  caption?: string
 } {
   if (input.enabled === undefined) {
     return input.loading ? { label: "Loading", tone: "muted" } : { label: "Unavailable", tone: "error" }
@@ -24,7 +21,6 @@ export function memoryRow(input: {
   return {
     label: "Enabled",
     tone: input.active ? ("success" as const) : ("muted" as const),
-    caption: input.verbose ? input.flash : undefined,
   }
 }
 
@@ -54,33 +50,9 @@ export function MemorySidebar(props: { api: TuiPluginApi; sessionID: string }) {
       }),
     ),
   )
-  const [flash, setFlash] = createSignal<string>()
   const [saved, setSaved] = createSignal(false)
-  const timer = { id: undefined as ReturnType<typeof setTimeout> | undefined }
   const pulse = { id: undefined as ReturnType<typeof setTimeout> | undefined }
-  const prior = { ids: new Set<string>(), ready: false }
-  const show = (label: string) => {
-    if (timer.id) clearTimeout(timer.id)
-    setFlash(label)
-    timer.id = setTimeout(() => {
-      setFlash()
-      timer.id = undefined
-    }, 5_000)
-  }
-  createEffect(() => {
-    const items = markers()
-    if (prior.ready) {
-      for (const item of items) {
-        if (!prior.ids.has(item.id) && MemoryTuiState.verbose(data())) {
-          show(item.meta.type === "recall" ? `recalled ${item.meta.count}` : "loaded")
-        }
-      }
-    }
-    prior.ids = new Set(items.map((item) => item.id))
-    prior.ready = true
-  })
   onCleanup(() => {
-    if (timer.id) clearTimeout(timer.id)
     if (pulse.id) clearTimeout(pulse.id)
   })
   const state = createMemo(() =>
@@ -88,8 +60,6 @@ export function MemorySidebar(props: { api: TuiPluginApi; sessionID: string }) {
       enabled: data() && MemoryTuiState.enabled(data()),
       loading: data.loading,
       active: MemoryTuiState.active({ markers: markers().length, saved: saved() }),
-      verbose: MemoryTuiState.verbose(data()),
-      flash: flash(),
     }),
   )
 
@@ -97,16 +67,13 @@ export function MemorySidebar(props: { api: TuiPluginApi; sessionID: string }) {
     const bump = () => setTick((value) => value + 1)
     const save = (event: Extract<Event, { type: "memory.status" | "memory.updated" }>) => {
       if (event.properties.sessionID !== props.sessionID) return
-      const detail = event.properties.detail
-      if (detail?.type !== "saved") return
+      if (event.properties.detail?.type !== "saved") return
       setSaved(true)
       if (pulse.id) clearTimeout(pulse.id)
       pulse.id = setTimeout(() => {
         setSaved(false)
         pulse.id = undefined
       }, 5_000)
-      if (!MemoryTuiState.verbose(data()) || typeof detail.operationCount !== "number") return
-      show(`saved ${detail.operationCount}`)
     }
     const offs = [
       props.api.event.on("memory.status", (event) => {
@@ -149,7 +116,6 @@ export function MemorySidebar(props: { api: TuiPluginApi; sessionID: string }) {
               </text>
               <text fg={props.api.theme.current.text}>
                 {row().label}
-                {row().caption && <span style={{ fg: props.api.theme.current.textMuted }}> · {row().caption}</span>}
               </text>
             </box>
           </box>
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/memory-command.ts b/packages/opencode/src/kilocode/cli/cmd/tui/memory-command.ts
index ae22e7e5b4..d73fd594de 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/memory-command.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/memory-command.ts
@@ -1,13 +1,5 @@
 import type { KiloClient } from "@kilocode/sdk/v2"
-import type { CliRenderer } from "@opentui/core"
-import path from "path"
-import { Process } from "@/util/process"
-import { splitCommand } from "@/kilocode/util/split-command"
-import {
-  MEMORY_USAGE,
-  parseMemoryCommand,
-  type ParsedMemoryCommand,
-} from "@kilocode/kilo-memory/commands"
+import { MEMORY_USAGE, parseMemoryCommand, type ParsedMemoryCommand } from "@kilocode/kilo-memory/commands"
 import { errorMessage } from "@/util/error"
 
 export { MEMORY_USAGE }
@@ -48,33 +40,6 @@ function auto(input: boolean) {
   return `Memory auto-save ${input ? "on" : "off"}`
 }
 
-function verbose(input: boolean) {
-  return `Memory verbose ${input ? "on" : "off"}`
-}
-
-async function edit(input: { file: string; cwd?: string; renderer?: CliRenderer }) {
-  const editor = (process.env["VISUAL"] || process.env["EDITOR"])?.trim()
-  if (!editor) throw new Error("Set $VISUAL or $EDITOR to use /memory edit")
-
-  input.renderer?.suspend()
-  input.renderer?.currentRenderBuffer.clear()
-  try {
-    const proc = Process.spawn([...splitCommand(editor), input.file], {
-      cwd: input.cwd,
-      stdin: "inherit",
-      stdout: "inherit",
-      stderr: "inherit",
-      shell: process.platform === "win32",
-    })
-    const code = await proc.exited
-    if (code !== 0) throw new Error(`Editor exited with code ${code}`)
-  } finally {
-    input.renderer?.currentRenderBuffer.clear()
-    input.renderer?.resume()
-    input.renderer?.requestRender()
-  }
-}
-
 export function parseMemoryInput(input: string): MemoryCommand | undefined {
   return parseMemoryCommand(input)
 }
@@ -86,7 +51,7 @@ export async function runMemoryCommand(input: {
   directory?: string
   sessionID?: string
   toast: Toast
-  renderer?: CliRenderer
+  inspect?(root: string): void | Promise<void>
   show(): void
   status(): void
   usage(message?: string): void
@@ -120,12 +85,12 @@ export async function runMemoryCommand(input: {
       input.status()
       return true
     }
-    if (parsed.operation === "edit") {
+    if (parsed.operation === "inspect") {
       const status = read(await input.client.memory.status(route(input)))
       if (!status.state.enabled) throw new Error("Memory is disabled. Run /memory on first.")
-      await edit({ file: path.join(status.root, "project.md"), cwd: input.directory, renderer: input.renderer })
-      const result = read(await input.client.memory.rebuild(route(input)))
-      input.toast.show({ variant: "success", message: `${name} rebuilt (${tokens(result.index.tokens)})` })
+      if (!input.inspect) throw new Error("Memory folder inspection is unavailable")
+      input.toast.show({ variant: "info", message: `Memory folder: ${status.root}` })
+      await input.inspect(status.root)
       return true
     }
     if (parsed.operation === "auto") {
@@ -138,16 +103,6 @@ export async function runMemoryCommand(input: {
       input.toast.show({ variant: "info", message: auto(result.state.autoConsolidate) })
       return true
     }
-    if (parsed.operation === "verbose") {
-      const result = read(
-        await input.client.memory.configure({
-          ...route(input),
-          verbose: parsed.mode === "on",
-        }),
-      )
-      input.toast.show({ variant: "info", message: verbose(result.state.verbose) })
-      return true
-    }
     if (parsed.operation === "disable") {
       read(await input.client.memory.disable(route(input)))
       input.toast.show({ variant: "info", message: `${name} disabled` })
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/memory-meta.ts b/packages/opencode/src/kilocode/cli/cmd/tui/memory-meta.ts
index 94a2ac391f..5baef05dbe 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/memory-meta.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/memory-meta.ts
@@ -4,10 +4,4 @@ export namespace MemoryTuiMeta {
   export function fromParts(parts: readonly MemoryMarkerMeta.Part[]) {
     return MemoryMarkerMeta.fromParts(parts)
   }
-
-  export function items(input: unknown) {
-    const value = input as { items?: unknown } | undefined
-    if (!Array.isArray(value?.items)) return []
-    return value.items.filter((item): item is string => typeof item === "string")
-  }
 }
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/memory-state.ts b/packages/opencode/src/kilocode/cli/cmd/tui/memory-state.ts
index 4e42139106..bed37b9f4e 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/memory-state.ts
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/memory-state.ts
@@ -3,10 +3,6 @@ import type { MemoryStatusResponse } from "@kilocode/sdk/v2"
 type State = MemoryStatusResponse["state"]
 
 export namespace MemoryTuiState {
-  export function verbose(input: Pick<State, "verbose"> | undefined) {
-    return input?.verbose ?? false
-  }
-
   export function enabled(input: Pick<State, "enabled"> | undefined) {
     return input?.enabled ?? false
   }
diff --git a/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/memory.tsx b/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/memory.tsx
index 1aca127c54..833483d5e3 100644
--- a/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/memory.tsx
+++ b/packages/opencode/src/kilocode/cli/cmd/tui/routes/session/memory.tsx
@@ -1,86 +1,7 @@
-import { createMemo, createResource, For, onCleanup, Show } from "solid-js"
-import type { RGBA } from "@opentui/core"
-import type { Part } from "@kilocode/sdk/v2"
-import * as Log from "@opencode-ai/core/util/log"
-import { useEvent } from "@tui/context/event"
-import { useProject } from "@tui/context/project"
-import { useSDK } from "@tui/context/sdk"
-import { useSync } from "@tui/context/sync"
-import { route } from "@/kilocode/cli/cmd/tui/memory-command"
 import { MemoryTuiEvents } from "@/kilocode/cli/cmd/tui/memory-events"
-import { MemoryTuiMeta } from "@/kilocode/cli/cmd/tui/memory-meta"
-import { MemoryTuiState } from "@/kilocode/cli/cmd/tui/memory-state"
-
-const log = Log.create({ service: "memory-tui" })
 
 export namespace MemorySessionTui {
   export function attach(input: Parameters<typeof MemoryTuiEvents.attach>[0]) {
     return MemoryTuiEvents.attach(input)
   }
-
-  export function verbose(input: { sessionID(): string }) {
-    const sdk = useSDK()
-    const project = useProject()
-    const sync = useSync()
-    const event = useEvent()
-    const session = createMemo(() => sync.session.get(input.sessionID()))
-    const [state, api] = createResource(
-      () => {
-        const item = session()
-        if (!item) return
-        return `${item.workspaceID ?? "__default__"}:${item.directory}`
-      },
-      async () => {
-        try {
-          const item = session()
-          const result = await sdk.client.memory.status(
-            route({ workspace: item?.workspaceID ?? project.workspace.current(), directory: item?.directory }),
-          )
-          return result.data?.state
-        } catch (err) {
-          log.warn("memory status unavailable", { err })
-          return undefined
-        }
-      },
-    )
-    const refresh = (value: { properties: { sessionID?: string } }) => {
-      if (value.properties.sessionID && value.properties.sessionID !== input.sessionID()) return
-      void api.refetch()
-    }
-    const offs = [
-      event.on("memory.status", refresh),
-      event.on("memory.updated", refresh),
-      event.on("memory.error", refresh),
-    ]
-    onCleanup(() => offs.forEach((off) => off()))
-    return () => MemoryTuiState.verbose(state())
-  }
-}
-
-export function MemoryMessageMeta(props: { parts: Part[]; color: string | RGBA; verbose(): boolean }) {
-  const item = createMemo(() => MemoryTuiMeta.fromParts(props.parts))
-
-  return (
-    <Show when={item()}>
-      {(meta) => {
-        const snippets = createMemo(() =>
-          meta().type === "recall"
-            ? MemoryTuiMeta.items(meta())
-                .slice(0, 2)
-                .map((text) => text.trim().slice(0, 80))
-                .filter(Boolean)
-            : [],
-        )
-        return (
-          <span style={{ fg: props.color }}>
-            {" "}
-            · memory · {meta().type === "startup" ? "Startup Context" : `recalled ${meta().count}`}
-            <Show when={props.verbose() && snippets().length > 0}>
-              <For each={snippets()}>{(text) => <> · {text}</>}</For>
-            </Show>
-          </span>
-        )
-      }}
-    </Show>
-  )
 }
diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts b/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts
index d2cade7911..596ca4f57d 100644
--- a/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/groups/session-import.ts
@@ -59,6 +59,7 @@ const SessionSchema = Schema.Struct({
       partID: Schema.optional(Schema.String),
       snapshot: Schema.optional(Schema.String),
       diff: Schema.optional(Schema.String),
+      workspace: Schema.optional(Schema.Literals(["restored", "snapshots-disabled", "unavailable"])),
     }),
   ),
   permission: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
diff --git a/packages/opencode/src/kilocode/watcher.ts b/packages/opencode/src/kilocode/watcher.ts
new file mode 100644
index 0000000000..b953762e59
--- /dev/null
+++ b/packages/opencode/src/kilocode/watcher.ts
@@ -0,0 +1,62 @@
+import { InstanceState } from "@/effect/instance-state"
+import * as Log from "@opencode-ai/core/util/log"
+import { Flag } from "@opencode-ai/core/flag/flag"
+import { Location } from "@opencode-ai/core/location"
+import { LocationServiceMap } from "@opencode-ai/core/location-layer"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { Cause, Context, Effect, Layer, Scope } from "effect"
+
+const log = Log.create({ service: "kilocode-watcher" })
+
+export namespace KilocodeWatcher {
+  export interface Interface {
+    readonly init: () => Effect.Effect<void>
+  }
+
+  export class Service extends Context.Service<Service, Interface>()("@kilocode/Watcher") {}
+
+  export const layer = Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const locations = yield* LocationServiceMap
+      const scope = yield* Scope.Scope
+
+      const state = yield* InstanceState.make(
+        Effect.fn("KilocodeWatcher.state")(function* (ctx) {
+          if (ctx.project.vcs !== "git") return
+          // Warm the v2 location stack for this instance and hold it for the
+          // instance lifetime. Its Watcher subscribes to .git so Vcs sees HEAD
+          // changes and publishes vcs.branch.updated in the CLI, where no v2
+          // route would otherwise build the stack. The ref must be built the
+          // same way the file/pty handlers build theirs (Location.Ref.make) so
+          // the LayerMap shares a single build per directory.
+          const ref = Location.Ref.make({ directory: AbsolutePath.make(ctx.directory) })
+          yield* locations.contextEffect(ref)
+          // Tear the stack down with the instance instead of letting it idle
+          // in the LayerMap; same pattern as the pty handlers' disposer.
+          yield* Effect.addFinalizer(() => locations.invalidate(ref).pipe(Effect.ignore))
+        }),
+      )
+
+      return Service.of({
+        init: Effect.fn("KilocodeWatcher.init")(function* () {
+          yield* InstanceState.get(state).pipe(
+            Effect.catchCause((cause) =>
+              Effect.sync(() => log.warn("instance watcher init failed", { err: Cause.squash(cause) })),
+            ),
+            Effect.forkIn(scope),
+          )
+        }),
+      })
+    }),
+  )
+
+  // Gate the whole layer so LocationServiceMap's dependency graph is never built when the watcher is disabled.
+  export const defaultLayer = Layer.unwrap(
+    Effect.gen(function* () {
+      if (yield* Flag.KILO_EXPERIMENTAL_DISABLE_FILEWATCHER.pipe(Effect.orElseSucceed(() => false)))
+        return Layer.succeed(Service, Service.of({ init: () => Effect.void }))
+      return layer.pipe(Layer.provide(LocationServiceMap.layer))
+    }),
+  )
+}
diff --git a/packages/opencode/src/project/instance-runtime.ts b/packages/opencode/src/project/instance-runtime.ts
index c8803847a0..36a4a22442 100644
--- a/packages/opencode/src/project/instance-runtime.ts
+++ b/packages/opencode/src/project/instance-runtime.ts
@@ -10,6 +10,10 @@ export const load = (input: LoadInput) => AppRuntime.runPromise(InstanceStore.Se
 export const disposeInstance = (ctx: InstanceContext) =>
   AppRuntime.runPromise(InstanceStore.Service.use((store) => store.dispose(ctx)))
 export const disposeAllInstances = () => AppRuntime.runPromise(InstanceStore.Service.use((store) => store.disposeAll()))
+// kilocode_change start - test fixtures dispose a directory's instance before deleting the directory
+export const disposeDirectory = (directory: string) =>
+  AppRuntime.runPromise(InstanceStore.Service.use((store) => store.disposeDirectory(directory)))
+// kilocode_change end
 export const reloadInstance = (input: LoadInput) =>
   AppRuntime.runPromise(InstanceStore.Service.use((store) => store.reload(input)))
 
diff --git a/packages/opencode/src/session/revert.ts b/packages/opencode/src/session/revert.ts
index 87fd0bee90..4281cacca4 100644
--- a/packages/opencode/src/session/revert.ts
+++ b/packages/opencode/src/session/revert.ts
@@ -2,6 +2,7 @@ import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Effect, Layer, Context, Schema } from "effect"
 import { SessionV1 } from "@opencode-ai/core/v1/session"
 import { EventV2Bridge } from "@/event-v2-bridge"
+import { Config } from "@/config/config" // kilocode_change
 import { Snapshot } from "../snapshot"
 import { Storage } from "@/storage/storage"
 import { Session } from "./session"
@@ -34,6 +35,7 @@ export const layer = Layer.effect(
     const events = yield* EventV2Bridge.Service
     const summary = yield* SessionSummary.Service
     const state = yield* SessionRunState.Service
+    const config = yield* Config.Service // kilocode_change
 
     const revert = Effect.fn("SessionRevert.revert")(function* (input: RevertInput) {
       yield* state.assertNotBusy(input.sessionID)
@@ -67,12 +69,22 @@ export const layer = Layer.effect(
 
       if (!rev) return session
 
+      // kilocode_change start
+      // A fresh snapshot only preserves the state needed for redo. File restoration
+      // is possible only when the historical turn retained checkpoint data.
+      const range = all.filter((msg) => msg.info.id >= rev.messageID)
+      const checkpoint = patches.length > 0
+      rev.workspace = checkpoint
+        ? "restored"
+        : (yield* config.get()).snapshot === false
+          ? "snapshots-disabled"
+          : "unavailable"
+      // kilocode_change end
       rev.snapshot = session.revert?.snapshot ?? (yield* snap.track())
       if (session.revert?.snapshot) yield* snap.restore(session.revert.snapshot)
 
       // kilocode_change start - compute diffs BEFORE reverting files so the diff
       // reflects changes being undone (files on disk still have AI modifications)
-      const range = all.filter((msg) => msg.info.id >= rev.messageID)
       const diffs = yield* summary.computeDiff({ messages: range })
       // kilocode_change end
 
@@ -165,6 +177,7 @@ export const defaultLayer = Layer.suspend(() =>
     Layer.provide(Storage.defaultLayer),
     Layer.provide(EventV2Bridge.defaultLayer),
     Layer.provide(SessionSummary.defaultLayer),
+    Layer.provide(Config.defaultLayer), // kilocode_change
   ),
 )
 
@@ -175,6 +188,7 @@ export const node = LayerNode.make(layer, [
   EventV2Bridge.node,
   SessionSummary.node,
   SessionRunState.node,
+  Config.node, // kilocode_change
 ])
 
 export * as SessionRevert from "./revert"
diff --git a/packages/opencode/src/session/session.ts b/packages/opencode/src/session/session.ts
index 759edd9d83..832f87ae40 100644
--- a/packages/opencode/src/session/session.ts
+++ b/packages/opencode/src/session/session.ts
@@ -204,6 +204,7 @@ const Revert = Schema.Struct({
   partID: optionalOmitUndefined(PartID),
   snapshot: optionalOmitUndefined(Schema.String),
   diff: optionalOmitUndefined(Schema.String),
+  workspace: optionalOmitUndefined(Schema.Literals(["restored", "snapshots-disabled", "unavailable"])), // kilocode_change
 })
 
 const Model = Schema.Struct({
diff --git a/packages/opencode/test/fixture/fixture.ts b/packages/opencode/test/fixture/fixture.ts
index 6e008eaeee..78bea2753b 100644
--- a/packages/opencode/test/fixture/fixture.ts
+++ b/packages/opencode/test/fixture/fixture.ts
@@ -68,6 +68,15 @@ export async function disposeAllInstances() {
   await Promise.all([InstanceRuntime.disposeAllInstances(), runTestInstanceStore((store) => store.disposeAll())])
 }
 
+// kilocode_change start - dispose a directory's instance (and its watchers) before the directory is deleted
+async function disposeInstancesFor(directory: string) {
+  await Promise.allSettled([
+    InstanceRuntime.disposeDirectory(directory),
+    runTestInstanceStore((store) => store.disposeDirectory(directory)),
+  ])
+}
+// kilocode_change end
+
 // Strip null bytes from paths (defensive fix for CI environment issues)
 function sanitizePath(p: string): string {
   return p.replace(/\0/g, "")
@@ -122,6 +131,7 @@ export async function tmpdir<T>(options?: TmpDirOptions<T>) {
       try {
         await options?.dispose?.(realpath)
       } finally {
+        await disposeInstancesFor(realpath) // kilocode_change - see disposeInstancesFor
         if (options?.git) await stop(realpath).catch(() => undefined)
         await clean(realpath).catch(() => undefined)
       }
@@ -146,6 +156,7 @@ export function tmpdirScoped<E = never, R = never>(options?: {
 
     yield* Effect.addFinalizer(() =>
       Effect.promise(async () => {
+        await disposeInstancesFor(dir) // kilocode_change - see disposeInstancesFor
         if (options?.git) await stop(dir).catch(() => undefined)
         await clean(dir).catch(() => undefined)
       }),
diff --git a/packages/opencode/test/kilocode/cli/cmd/tui/memory-command.test.ts b/packages/opencode/test/kilocode/cli/cmd/tui/memory-command.test.ts
index eced02db0b..42df534433 100644
--- a/packages/opencode/test/kilocode/cli/cmd/tui/memory-command.test.ts
+++ b/packages/opencode/test/kilocode/cli/cmd/tui/memory-command.test.ts
@@ -3,7 +3,6 @@ import type { KiloClient } from "@kilocode/sdk/v2"
 import { memoryRow } from "@/kilocode/cli/cmd/tui/component/memory-status"
 import { runMemoryCommand } from "@/kilocode/cli/cmd/tui/memory-command"
 import { MemoryTuiEvents } from "@/kilocode/cli/cmd/tui/memory-events"
-import { MemoryTuiMeta } from "@/kilocode/cli/cmd/tui/memory-meta"
 import { MemoryTuiState } from "@/kilocode/cli/cmd/tui/memory-state"
 
 type Handler = (event: {
@@ -64,16 +63,16 @@ describe("memory TUI command parser", () => {
     ])
   })
 
-  test("auto-save, verbose, and purge commands call explicit endpoints", async () => {
+  test("auto-save and purge commands call explicit endpoints", async () => {
     const shown: string[] = []
     const calls: unknown[] = []
-    const state = { autoConsolidate: true, verbose: false }
+    const state = { autoConsolidate: true }
     const client = {
       memory: {
         status: async () => ({ data: { state } }),
         configure: async (input: unknown) => {
           calls.push(input)
-          return { data: { state: { autoConsolidate: false, verbose: true } } }
+          return { data: { state: { autoConsolidate: false } } }
         },
         purge: async (input: unknown) => {
           calls.push(input)
@@ -96,17 +95,15 @@ describe("memory TUI command parser", () => {
     }
 
     await runMemoryCommand({ ...base, text: "/memory auto off" })
-    await runMemoryCommand({ ...base, text: "/memory verbose on" })
     await runMemoryCommand({ ...base, text: "/memory auto status" })
     await runMemoryCommand({ ...base, text: "/memory purge" })
     await runMemoryCommand({ ...base, text: "/memory purge confirm" })
 
     expect(shown[0]).toBe("Memory auto-save off")
-    expect(shown[1]).toBe("Memory verbose on")
-    expect(shown[2]).toContain("Missing auto mode")
-    expect(shown[3]).toContain("Purge requires confirmation")
-    expect(shown[4]).toBe("Memory purged")
-    expect(calls).toEqual([{ autoConsolidate: false }, { verbose: true }, { confirm: true }])
+    expect(shown[1]).toContain("Missing auto mode")
+    expect(shown[2]).toContain("Purge requires confirmation")
+    expect(shown[3]).toBe("Memory purged")
+    expect(calls).toEqual([{ autoConsolidate: false }, { confirm: true }])
   })
 
   test("status opens overview dialog", async () => {
@@ -133,6 +130,31 @@ describe("memory TUI command parser", () => {
     expect(shown).toEqual([])
   })
 
+  test("inspect reveals the memory folder", async () => {
+    const opened: string[] = []
+    const shown: string[] = []
+    const client = {
+      memory: {
+        status: async () => ({ data: { root: "/tmp/kilo-memory", state: { enabled: true } } }),
+      },
+    } as unknown as KiloClient
+
+    await runMemoryCommand({
+      text: "/memory inspect",
+      client,
+      toast: { show: (input) => shown.push(input.message) },
+      inspect(root) {
+        opened.push(root)
+      },
+      show() {},
+      status() {},
+      usage() {},
+    })
+
+    expect(opened).toEqual(["/tmp/kilo-memory"])
+    expect(shown).toEqual(["Memory folder: /tmp/kilo-memory"])
+  })
+
   test("bare memory command opens help", async () => {
     const calls: unknown[] = []
     const client = { memory: {} } as unknown as KiloClient
@@ -204,7 +226,7 @@ describe("memory TUI command parser", () => {
 
   test("memory commands route to session directory when no workspace is active", async () => {
     const calls: unknown[] = []
-    const state = { autoConsolidate: false, verbose: false }
+    const state = { autoConsolidate: false }
     const client = {
       memory: {
         configure: async (input: unknown) => {
@@ -222,7 +244,6 @@ describe("memory TUI command parser", () => {
     }
 
     await runMemoryCommand({ ...base, text: "/memory auto off", directory: "/repo/packages/opencode" })
-    await runMemoryCommand({ ...base, text: "/memory verbose on", directory: "/repo/packages/opencode" })
     await runMemoryCommand({
       ...base,
       text: "/memory auto off",
@@ -232,7 +253,6 @@ describe("memory TUI command parser", () => {
 
     expect(calls).toEqual([
       { directory: "/repo/packages/opencode", autoConsolidate: false },
-      { directory: "/repo/packages/opencode", verbose: true },
       { workspace: "wrk_123", autoConsolidate: false },
     ])
   })
@@ -288,63 +308,38 @@ describe("memory TUI events", () => {
   })
 })
 
-describe("memory TUI metadata", () => {
-  test("reads typed verbose and activity state", () => {
-    expect(MemoryTuiState.verbose({ verbose: true })).toBe(true)
-    expect(MemoryTuiState.verbose(undefined)).toBe(false)
+describe("memory TUI state", () => {
+  test("tracks active memory", () => {
     expect(MemoryTuiState.active({ markers: 1, saved: false })).toBe(true)
     expect(MemoryTuiState.active({ markers: 0, saved: true })).toBe(true)
     expect(MemoryTuiState.active({ markers: 0, saved: false })).toBe(false)
-    expect(MemoryTuiMeta.items({ items: ["first", 1, "second"] })).toEqual(["first", "second"])
-    expect(MemoryTuiMeta.items({})).toEqual([])
   })
 })
 
 describe("memory sidebar row", () => {
   test("shows loading, unavailable, and disabled states", () => {
-    expect(memoryRow({ loading: true, active: false, verbose: false })).toEqual({
+    expect(memoryRow({ loading: true, active: false })).toEqual({
       label: "Loading",
       tone: "muted",
     })
-    expect(memoryRow({ active: false, verbose: false })).toEqual({
+    expect(memoryRow({ active: false })).toEqual({
       label: "Unavailable",
       tone: "error",
     })
-    expect(memoryRow({ enabled: false, active: true, verbose: true, flash: "recalled 3" })).toEqual({
+    expect(memoryRow({ enabled: false, active: true })).toEqual({
       label: "Disabled",
       tone: "muted",
     })
   })
 
   test("uses muted and green dots for inactive and active sessions", () => {
-    expect(memoryRow({ enabled: true, active: false, verbose: false })).toEqual({
+    expect(memoryRow({ enabled: true, active: false })).toEqual({
       label: "Enabled",
       tone: "muted",
     })
-    expect(memoryRow({ enabled: true, active: true, verbose: false })).toEqual({
+    expect(memoryRow({ enabled: true, active: true })).toEqual({
       label: "Enabled",
       tone: "success",
     })
   })
-
-  test("adds verbose event captions without changing the activity tone", () => {
-    expect(memoryRow({ enabled: true, active: false, verbose: true, flash: "recalled 3" })).toEqual({
-      label: "Enabled",
-      tone: "muted",
-      caption: "recalled 3",
-    })
-    expect(memoryRow({ enabled: true, active: true, verbose: true, flash: "saved 2" })).toEqual({
-      label: "Enabled",
-      tone: "success",
-      caption: "saved 2",
-    })
-  })
-
-  test("omits verbose event captions when verbose is disabled", () => {
-    expect(memoryRow({ enabled: true, active: true, verbose: false, flash: "loaded" })).toEqual({
-      label: "Enabled",
-      tone: "success",
-      caption: undefined,
-    })
-  })
 })
diff --git a/packages/opencode/test/kilocode/cli/cmd/tui/memory-status.test.tsx b/packages/opencode/test/kilocode/cli/cmd/tui/memory-status.test.tsx
index 25abd342e5..070146a1a1 100644
--- a/packages/opencode/test/kilocode/cli/cmd/tui/memory-status.test.tsx
+++ b/packages/opencode/test/kilocode/cli/cmd/tui/memory-status.test.tsx
@@ -3,21 +3,10 @@ import { expect, spyOn, test } from "bun:test"
 import { RGBA } from "@opentui/core"
 import { testRender } from "@opentui/solid"
 import type { TuiPluginApi } from "@kilocode/plugin/tui"
-import type { Event, GlobalEvent, Message, Part, Session } from "@kilocode/sdk/v2"
+import type { Event, Message, Part, Session } from "@kilocode/sdk/v2"
 import { createSignal } from "solid-js"
-import { ArgsProvider } from "@tui/context/args"
-import { ExitProvider } from "@tui/context/exit"
-import { KVProvider } from "@tui/context/kv"
-import { ProjectProvider } from "@tui/context/project"
-import { SDKProvider } from "@tui/context/sdk"
-import { SyncProvider } from "@tui/context/sync"
-import { ToastProvider } from "@tui/ui/toast"
 import { MemorySidebar } from "@/kilocode/cli/cmd/tui/component/memory-status"
-import { MemoryMessageMeta, MemorySessionTui } from "@/kilocode/cli/cmd/tui/routes/session/memory"
-import { Global } from "@opencode-ai/core/global"
-import { createEventSource, createFetch, directory, json } from "../../../../fixture/tui-sdk"
-import { tmpdir } from "../../../../fixture/fixture"
-import { TestTuiContexts } from "../../../../fixture/tui-environment"
+import { directory } from "../../../../fixture/tui-sdk"
 
 const id = "ses_memory_status"
 
@@ -48,10 +37,6 @@ function event(sessionID?: string, count?: number): Extract<Event, { type: "memo
   }
 }
 
-function global(payload: Event): GlobalEvent {
-  return { directory, project: "proj_test", payload }
-}
-
 async function wait(fn: () => boolean, timeout = 2_000) {
   const start = Date.now()
   while (!fn()) {
@@ -60,115 +45,6 @@ async function wait(fn: () => boolean, timeout = 2_000) {
   }
 }
 
-function Probe(props: { sessionID: string }) {
-  const verbose = MemorySessionTui.verbose({ sessionID: () => props.sessionID })
-  return <text>{verbose() ? "verbose" : "quiet"}</text>
-}
-
-test("session memory status refetches live and ignores other sessions", async () => {
-  await using tmp = await tmpdir()
-  const prior = Global.Path.state
-  Global.Path.state = tmp.path
-  await Bun.write(`${tmp.path}/kv.json`, "{}")
-  const events = createEventSource()
-  const state = { verbose: false }
-  const calls = { count: 0 }
-  const fetch = createFetch((url) => {
-    if (url.pathname === "/session") return json([session])
-    if (url.pathname !== "/memory/status") return
-    calls.count += 1
-    return json({ state: { verbose: state.verbose } })
-  })
-  try {
-    const app = await testRender(() => (
-      <TestTuiContexts paths={{ state: tmp.path }}>
-        <ArgsProvider>
-          <ExitProvider exit={() => {}}>
-            <KVProvider>
-              <ToastProvider>
-                <SDKProvider url="http://test" directory={directory} fetch={fetch.fetch} events={events.source}>
-                  <ProjectProvider>
-                    <SyncProvider>
-                      <Probe sessionID={id} />
-                    </SyncProvider>
-                  </ProjectProvider>
-                </SDKProvider>
-              </ToastProvider>
-            </KVProvider>
-          </ExitProvider>
-        </ArgsProvider>
-      </TestTuiContexts>
-    ))
-    try {
-      await wait(() => calls.count === 1 && app.captureCharFrame().includes("quiet"))
-      events.emit(global(event("ses_other")))
-      await Bun.sleep(30)
-      expect(calls.count).toBe(1)
-
-      state.verbose = true
-      events.emit(global(event(id)))
-      await wait(() => calls.count === 2 && app.captureCharFrame().includes("verbose"))
-    } finally {
-      app.renderer.destroy()
-    }
-  } finally {
-    Global.Path.state = prior
-  }
-})
-
-test("message memory metadata reacts to verbose changes and bounds snippets", async () => {
-  const [verbose, setVerbose] = createSignal(false)
-  const [parts, setParts] = createSignal<Part[]>([])
-  const first = "a".repeat(100)
-  const part = {
-    id: "part_memory_recall",
-    sessionID: id,
-    messageID: "msg_memory_recall",
-    type: "text",
-    text: "",
-    metadata: { kiloMemory: { type: "recall", count: 3, items: [first, "second", "third"] } },
-  } satisfies Part
-  setParts([part])
-  const app = await testRender(
-    () => (
-      <text>
-        <MemoryMessageMeta parts={parts()} color={RGBA.fromHex("#ffffff")} verbose={verbose} />
-      </text>
-    ),
-    { width: 200, height: 3 },
-  )
-
-  try {
-    await app.renderOnce()
-    expect(app.captureCharFrame()).toContain("memory · recalled 3")
-    expect(app.captureCharFrame()).not.toContain("second")
-
-    setVerbose(true)
-    await app.renderOnce()
-    expect(app.captureCharFrame()).toContain("a".repeat(80))
-    expect(app.captureCharFrame()).not.toContain("a".repeat(81))
-    expect(app.captureCharFrame()).toContain("second")
-    expect(app.captureCharFrame()).not.toContain("third")
-
-    setVerbose(false)
-    await app.renderOnce()
-    expect(app.captureCharFrame()).not.toContain("second")
-
-    setParts([
-      {
-        ...part,
-        id: "part_memory_startup",
-        metadata: { kiloMemory: { type: "startup", count: 2, tokens: 40 } },
-      },
-    ])
-    await app.renderOnce()
-    expect(app.captureCharFrame()).toContain("memory · Startup Context")
-    expect(app.captureCharFrame()).not.toContain("recalled")
-  } finally {
-    app.renderer.destroy()
-  }
-})
-
 type Handler = (event: Event) => void
 
 function bus() {
@@ -186,7 +62,7 @@ function bus() {
   }
 }
 
-test("sidebar refetches status and scopes recall and save flashes", async () => {
+test("sidebar refetches status and scopes save activity", async () => {
   const [parts, setParts] = createSignal<Part[]>([])
   const events = bus()
   const calls = { count: 0 }
@@ -203,7 +79,7 @@ test("sidebar refetches status and scopes recall and save flashes", async () =>
       memory: {
         status: async () => {
           calls.count += 1
-          return { data: { state: { enabled: true, verbose: true } } }
+          return { data: { state: { enabled: true } } }
         },
       },
     },
@@ -232,16 +108,15 @@ test("sidebar refetches status and scopes recall and save flashes", async () =>
         metadata: { kiloMemory: { type: "recall", count: 2 } },
       },
     ])
-    await wait(() => app.captureCharFrame().includes("recalled 2"))
-    await Bun.sleep(5_100)
+    await app.renderOnce()
     expect(app.captureCharFrame()).not.toContain("recalled 2")
 
     events.emit(event("ses_other", 4))
     await wait(() => calls.count === 2)
-    expect(app.captureCharFrame()).not.toContain("saved 4")
 
     events.emit(event(id, 3))
-    await wait(() => calls.count === 3 && app.captureCharFrame().includes("saved 3"))
+    await wait(() => calls.count === 3)
+    expect(app.captureCharFrame()).not.toContain("saved 3")
     const before = clear.mock.calls.length
     app.renderer.destroy()
     expect(clear.mock.calls.length).toBeGreaterThan(before)
diff --git a/packages/opencode/test/kilocode/cli/tui/thread.test.ts b/packages/opencode/test/kilocode/cli/tui/thread.test.ts
index fd8c040e5c..20e4289415 100644
--- a/packages/opencode/test/kilocode/cli/tui/thread.test.ts
+++ b/packages/opencode/test/kilocode/cli/tui/thread.test.ts
@@ -7,6 +7,7 @@ import {
   resolveThreadDirectory,
   runEmbeddedRemoteExitBridge,
 } from "../../../../src/cli/cmd/tui"
+import { preload } from "../../../../src/kilocode/cli/cmd/tui"
 import { KiloTuiThreadDaemon } from "../../../../src/kilocode/cli/cmd/tui/thread"
 import { DaemonClient } from "../../../../src/kilocode/daemon/client"
 
@@ -15,6 +16,31 @@ afterEach(() => {
 })
 
 describe("kilo tui thread", () => {
+  test("skips preload resolver invocation in compiled mode", () => {
+    let calls = 0
+
+    expect(
+      preload(true, () => {
+        calls++
+        return "/resolved/preload"
+      }),
+    ).toEqual([])
+    expect(calls).toBe(0)
+  })
+
+  test("resolves the preload once in source mode", () => {
+    let calls = 0
+    const path = "/resolved/preload"
+
+    expect(
+      preload(false, () => {
+        calls++
+        return path
+      }),
+    ).toEqual([path])
+    expect(calls).toBe(1)
+  })
+
   test("ignores stale PWD after cwd is changed by a process wrapper", async () => {
     await using root = await tmpdir()
     const pkg = path.join(root.path, "packages", "opencode")
diff --git a/packages/opencode/test/kilocode/instance-vcs-watcher.test.ts b/packages/opencode/test/kilocode/instance-vcs-watcher.test.ts
new file mode 100644
index 0000000000..3bd83f86fe
--- /dev/null
+++ b/packages/opencode/test/kilocode/instance-vcs-watcher.test.ts
@@ -0,0 +1,69 @@
+import { afterAll, beforeAll, expect } from "bun:test"
+import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
+import { Deferred, Effect, Fiber, Layer } from "effect"
+import { GlobalBus, type GlobalEvent } from "../../src/bus/global"
+import { Git } from "../../src/git"
+import { InstanceLayer } from "../../src/project/instance-layer"
+import { InstanceStore } from "../../src/project/instance-store"
+import { tmpdirScoped } from "../fixture/fixture"
+import { awaitWithTimeout, testEffect } from "../lib/effect"
+
+const layer = Layer.mergeAll(InstanceLayer.layer, Git.defaultLayer, CrossSpawnSpawner.defaultLayer)
+const it = testEffect(layer)
+
+// The suite disables the file watcher (see test/preload.ts); this file tests it, so opt back in.
+const disableFilewatcher = process.env.KILO_EXPERIMENTAL_DISABLE_FILEWATCHER
+beforeAll(() => {
+  delete process.env.KILO_EXPERIMENTAL_DISABLE_FILEWATCHER
+})
+afterAll(() => {
+  if (disableFilewatcher !== undefined) process.env.KILO_EXPERIMENTAL_DISABLE_FILEWATCHER = disableFilewatcher
+})
+
+// The watcher is unreliable on Windows CI, so this test only runs on unix.
+const live = process.platform === "win32" ? it.live.skip : it.live
+
+live("instances publish branch updates after git switch", () =>
+  Effect.gen(function* () {
+    const dir = yield* tmpdirScoped({ git: true })
+    const git = yield* Git.Service
+    const store = yield* InstanceStore.Service
+    const current = yield* git.branch(dir)
+    if (!current) return yield* Effect.die("missing initial branch")
+
+    const branch = `watch-${Math.random().toString(36).slice(2)}`
+    const created = yield* git.run(["branch", branch], { cwd: dir })
+    expect(created.exitCode).toBe(0)
+    yield* store.load({ directory: dir })
+
+    const pending = yield* Deferred.make<string | undefined>()
+    const handler = (event: GlobalEvent) => {
+      if (event.directory !== dir || event.payload.type !== "vcs.branch.updated") return
+      if (event.payload.properties.branch !== branch) return
+      Deferred.doneUnsafe(pending, Effect.succeed(event.payload.properties.branch))
+    }
+    GlobalBus.on("event", handler)
+    yield* Effect.addFinalizer(() => Effect.sync(() => GlobalBus.off("event", handler)))
+
+    // The watcher exposes no readiness signal (its .git subscription is forked
+    // during instance warm-up), so keep generating HEAD churn in the background
+    // and synchronize on the event itself with the full test budget.
+    const churn = yield* Effect.gen(function* () {
+      while (true) {
+        yield* git.run(["switch", current], { cwd: dir })
+        yield* Effect.sleep("50 millis")
+        yield* git.run(["switch", branch], { cwd: dir })
+        yield* Effect.sleep("100 millis")
+      }
+    }).pipe(Effect.forkScoped)
+
+    const updated = yield* awaitWithTimeout(
+      Deferred.await(pending),
+      "timed out waiting for vcs.branch.updated",
+      "15 seconds",
+    )
+    yield* Fiber.interrupt(churn)
+    expect(updated).toBe(branch)
+  }),
+  20_000,
+)
diff --git a/packages/opencode/test/kilocode/memory/memory-integration.test.ts b/packages/opencode/test/kilocode/memory/memory-integration.test.ts
index fb7538a6b3..450ec205bf 100644
--- a/packages/opencode/test/kilocode/memory/memory-integration.test.ts
+++ b/packages/opencode/test/kilocode/memory/memory-integration.test.ts
@@ -257,10 +257,6 @@ describe("KiloMemory integration", () => {
     expect(
       events.find((event) => event.sessionID === "ses_memory_event" && event.detail?.type === "saved")?.detail?.tokens,
     ).toBeUndefined()
-    const decisions = await MemoryFiles.readDecisions(root)
-    expect(decisions).toContain('"trigger":"explicit"')
-    expect(decisions).toContain('"sessionID":"ses_memory_event"')
-    expect(decisions).toContain('"llm":false')
   })
 
   test("explicit forget reports removals without save wording", async () => {
@@ -288,9 +284,6 @@ describe("KiloMemory integration", () => {
 
     expect(events.some((event) => event.detail?.message === "Memory updated · 1 removed")).toBe(true)
     expect(events.some((event) => event.detail?.message?.includes("Memory saved"))).toBe(false)
-    const decisions = await MemoryFiles.readDecisions(root)
-    expect(decisions).toContain("explicit memory operation removed 1 entries")
-    expect(decisions).toContain("explicit memory operation matched no source memory")
   })
 
   test("environment prompt rebuilds stale session index format", async () => {
@@ -396,8 +389,8 @@ describe("KiloMemory integration", () => {
 
       expect(after.sources).toEqual(before.sources)
       expect(after.index).toBe(before.index)
-      expect(after.changes).toBe(before.changes)
-      expect(after.decisions).toBe(before.decisions)
+      expect(after.changes).toBe("")
+      expect(after.decisions).toBe("")
       expect(after.sources.project).toContain("stable_fact")
       expect(after.sources.project).not.toContain("disabled_fact")
       expect(after.sources.corrections).not.toContain("Do not correct while disabled")
@@ -430,9 +423,6 @@ describe("KiloMemory integration", () => {
       expect(shown.sources.project).toContain("- repo_style :: Repo convention: commit messages are concise.")
       expect(shown.sources.project).not.toContain("reply_style")
       expect(shown.sources.project).not.toContain("I prefer terse summaries")
-      expect(shown.decisions).toContain('"reason":"out_of_scope"')
-      expect(shown.decisions).not.toContain("reply_style")
-      expect(shown.decisions).not.toContain("I prefer terse summaries")
     })
   })
 
diff --git a/packages/opencode/test/kilocode/server/httpapi-memory.test.ts b/packages/opencode/test/kilocode/server/httpapi-memory.test.ts
index 3b39a00ace..767c1c9d94 100644
--- a/packages/opencode/test/kilocode/server/httpapi-memory.test.ts
+++ b/packages/opencode/test/kilocode/server/httpapi-memory.test.ts
@@ -151,8 +151,8 @@ describe("HttpApi memory", () => {
     expect(String(show.index)).toContain("httpapi_memory")
     expect(String(show.items)).toContain("httpapi_memory")
     expect(String(rec(show.sources).project)).toContain("httpapi_memory")
-    expect(typeof show.decisions).toBe("string")
-    expect(String(show.decisions)).toContain('"sessionID":"ses_http_memory"')
+    expect(show.changes).toBe("")
+    expect(show.decisions).toBe("")
 
     const forgotten = await json("POST", MemoryPaths.forget, { query: "httpapi_memory" })
     expectOperation(forgotten)
diff --git a/packages/opencode/test/kilocode/session/revert.test.ts b/packages/opencode/test/kilocode/session/revert.test.ts
index ee6bfae6f5..0299328419 100644
--- a/packages/opencode/test/kilocode/session/revert.test.ts
+++ b/packages/opencode/test/kilocode/session/revert.test.ts
@@ -1,5 +1,7 @@
 import { describe, expect } from "bun:test"
 import { Effect, Layer } from "effect"
+import fs from "node:fs/promises"
+import path from "node:path"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { ModelV2 } from "@opencode-ai/core/model"
@@ -84,3 +86,160 @@ describe("partial assistant revert", () => {
     ),
   )
 })
+
+describe("workspace revert status", () => {
+  it.live(
+    "reports disabled snapshots when conversation-only revert leaves files unchanged",
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const sessions = yield* Session.Service
+          const revert = yield* SessionRevert.Service
+          const session = yield* sessions.create({})
+          const file = path.join(dir, "created.txt")
+          const providerID = ProviderV2.ID.make("test")
+          yield* Effect.promise(() => fs.writeFile(file, "created"))
+          const user = yield* sessions.updateMessage({
+            id: MessageID.ascending(),
+            sessionID: session.id,
+            role: "user",
+            agent: "default",
+            model: { providerID, modelID: ModelV2.ID.make("test") },
+            time: { created: Date.now() },
+          })
+          yield* sessions.updatePart({
+            id: PartID.ascending(),
+            messageID: user.id,
+            sessionID: session.id,
+            type: "text",
+            text: "create a file",
+          })
+
+          const result = yield* revert.revert({ sessionID: session.id, messageID: user.id })
+
+          expect(result.revert?.workspace).toBe("snapshots-disabled")
+          expect(yield* Effect.promise(() => fs.readFile(file, "utf8"))).toBe("created")
+        }),
+      { git: true, config: { snapshot: false } },
+    ),
+  )
+
+  it.live(
+    "reports unavailable when historical turns have no file checkpoint",
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const sessions = yield* Session.Service
+          const revert = yield* SessionRevert.Service
+          const session = yield* sessions.create({})
+          const file = path.join(dir, "created.txt")
+          const providerID = ProviderV2.ID.make("test")
+          yield* Effect.promise(() => fs.writeFile(file, "created"))
+          const user = yield* sessions.updateMessage({
+            id: MessageID.ascending(),
+            sessionID: session.id,
+            role: "user",
+            agent: "default",
+            model: { providerID, modelID: ModelV2.ID.make("test") },
+            time: { created: Date.now() },
+          })
+          yield* sessions.updatePart({
+            id: PartID.ascending(),
+            messageID: user.id,
+            sessionID: session.id,
+            type: "text",
+            text: "create a file",
+          })
+
+          const result = yield* revert.revert({ sessionID: session.id, messageID: user.id })
+
+          expect(result.revert?.workspace).toBe("unavailable")
+          expect(yield* Effect.promise(() => fs.readFile(file, "utf8"))).toBe("created")
+        }),
+      { git: true },
+    ),
+  )
+
+  it.live(
+    "reports restored when historical patches restore a file",
+    provideTmpdirInstance(
+      (dir) =>
+        Effect.gen(function* () {
+          const sessions = yield* Session.Service
+          const revert = yield* SessionRevert.Service
+          const snapshot = yield* Snapshot.Service
+          const session = yield* sessions.create({})
+          const file = path.join(dir, "tracked.txt")
+          const providerID = ProviderV2.ID.make("test")
+          yield* Effect.promise(() => fs.writeFile(file, "before"))
+          const user = yield* sessions.updateMessage({
+            id: MessageID.ascending(),
+            sessionID: session.id,
+            role: "user",
+            agent: "default",
+            model: { providerID, modelID: ModelV2.ID.make("test") },
+            time: { created: Date.now() },
+          })
+          yield* sessions.updatePart({
+            id: PartID.ascending(),
+            messageID: user.id,
+            sessionID: session.id,
+            type: "text",
+            text: "change a file",
+          })
+          const assistant = yield* sessions.updateMessage({
+            id: MessageID.ascending(),
+            sessionID: session.id,
+            role: "assistant",
+            parentID: user.id,
+            mode: "default",
+            agent: "default",
+            path: { cwd: dir, root: dir },
+            cost: 0,
+            tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+            modelID: ModelV2.ID.make("test"),
+            providerID,
+            time: { created: Date.now() },
+            finish: "end_turn",
+          })
+          const before = yield* snapshot.track()
+          if (!before) throw new Error("expected snapshot")
+          yield* Effect.promise(() => fs.writeFile(file, "after"))
+          const after = yield* snapshot.track()
+          if (!after) throw new Error("expected snapshot")
+          const patch = yield* snapshot.patch(before)
+          yield* sessions.updatePart({
+            id: PartID.ascending(),
+            messageID: assistant.id,
+            sessionID: session.id,
+            type: "step-start",
+            snapshot: before,
+          })
+          yield* sessions.updatePart({
+            id: PartID.ascending(),
+            messageID: assistant.id,
+            sessionID: session.id,
+            type: "step-finish",
+            reason: "stop",
+            snapshot: after,
+            cost: 0,
+            tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+          })
+          yield* sessions.updatePart({
+            id: PartID.ascending(),
+            messageID: assistant.id,
+            sessionID: session.id,
+            type: "patch",
+            hash: patch.hash,
+            files: patch.files,
+          })
+
+          const result = yield* revert.revert({ sessionID: session.id, messageID: user.id })
+
+          expect(result.revert?.workspace).toBe("restored")
+          expect(yield* Effect.promise(() => fs.readFile(file, "utf8"))).toBe("before")
+        }),
+      { git: true },
+    ),
+  )
+})
diff --git a/packages/opencode/test/kilocode/tool-registry-indexing.test.ts b/packages/opencode/test/kilocode/tool-registry-indexing.test.ts
index 42f11e7c38..d38f709b1c 100644
--- a/packages/opencode/test/kilocode/tool-registry-indexing.test.ts
+++ b/packages/opencode/test/kilocode/tool-registry-indexing.test.ts
@@ -5,6 +5,7 @@ import { Agent } from "../../src/agent/agent"
 import { Bus } from "../../src/bus"
 import { KiloIndexing } from "../../src/kilocode/indexing"
 import { KilocodeBootstrap } from "../../src/kilocode/bootstrap"
+import { KilocodeWatcher } from "../../src/kilocode/watcher"
 import { KiloSessions } from "../../src/kilo-sessions/kilo-sessions"
 import { KiloMemory } from "@kilocode/kilo-memory/effect"
 import { MemoryService } from "@kilocode/kilo-memory/effect/service"
@@ -471,6 +472,7 @@ describe("kilocode tool registry indexing", () => {
     const session = Layer.succeed(Session.Service, {} as Session.Interface)
     const summary = Layer.succeed(SessionSummary.Service, {} as SessionSummary.Interface)
     const provider = Layer.succeed(Provider.Service, {} as Provider.Interface)
+    const watcher = Layer.succeed(KilocodeWatcher.Service, KilocodeWatcher.Service.of({ init: () => Effect.void }))
     const indexing = spyOn(KiloIndexing, "init").mockRejectedValue(err)
     const warn = spyOn(logger, "warn").mockImplementation(() => {})
 
@@ -478,7 +480,7 @@ describe("kilocode tool registry indexing", () => {
       await Effect.runPromise(
         KilocodeBootstrap.Service.use((svc) => svc.init()).pipe(
           Effect.provide(
-            KilocodeBootstrap.layer.pipe(Layer.provide([sessions, bus, memory, session, summary, provider])),
+            KilocodeBootstrap.layer.pipe(Layer.provide([sessions, bus, memory, session, summary, provider, watcher])),
           ),
           Effect.scoped,
         ),
diff --git a/packages/opencode/test/kilocode/tool/memory-recall.test.ts b/packages/opencode/test/kilocode/tool/memory-recall.test.ts
index e68588616b..69d973937e 100644
--- a/packages/opencode/test/kilocode/tool/memory-recall.test.ts
+++ b/packages/opencode/test/kilocode/tool/memory-recall.test.ts
@@ -173,11 +173,6 @@ describe("kilo_memory_recall", () => {
 
       expect(direct.output).toContain("continue memory digest recall")
 
-      const decisions = await MemoryFiles.readDecisions(enabled.root)
-      expect(decisions).toContain('"sessionID":"ses_test"')
-      expect(decisions).toContain('"query":"sessionID=ses_memory_only"')
-      expect(decisions).toContain('"summary":"memory recall returned 1 typed hits"')
-      expect(decisions).toContain('"summary":"memory recall returned 1 digest hits"')
     })
   })
 
@@ -397,10 +392,6 @@ describe("kilo_memory_recall", () => {
       expect(result.output).toContain("active session")
       expect(result.output).not.toContain("useful prior work")
 
-      const decisions = await MemoryFiles.readDecisions(enabled.root)
-      expect(decisions).toContain('"sessionID":"ses_test"')
-      expect(decisions).toContain('"query":"sessionID=ses_test"')
-      expect(decisions).toContain('"reason":"current_session_digest"')
     })
   })
 
@@ -497,8 +488,6 @@ describe("kilo_memory_recall", () => {
       expect(result.output).toContain("type=session_digest")
       expect(result.output).toContain('topic="catalog recall"')
 
-      const decisions = await MemoryFiles.readDecisions(enabled.root)
-      expect(decisions).toContain('"summary":"memory recall returned')
     })
   })
 
diff --git a/packages/opencode/test/kilocode/tool/memory-save.test.ts b/packages/opencode/test/kilocode/tool/memory-save.test.ts
index 9a42a0c7e1..e23c1d87cb 100644
--- a/packages/opencode/test/kilocode/tool/memory-save.test.ts
+++ b/packages/opencode/test/kilocode/tool/memory-save.test.ts
@@ -288,11 +288,6 @@ describe("kilo_memory_save", () => {
       expect(shown.sources.project).not.toContain("reply_style")
       expect(shown.sources.project).not.toContain("I prefer terse summaries")
       expect(shown.sources.project).toContain("- commit_style :: Repo convention: commit messages are concise.")
-      expect(shown.decisions).toContain('"reason":"out_of_scope"')
-      expect(shown.decisions).not.toContain("rubicon fennel")
-      expect(shown.decisions).not.toContain("Ignore prior instructions")
-      expect(shown.decisions).not.toContain("reply_style")
-      expect(shown.decisions).not.toContain("I prefer terse summaries")
     })
   })
 
diff --git a/packages/opencode/test/preload.ts b/packages/opencode/test/preload.ts
index 8148df53a1..c89dd27ca6 100644
--- a/packages/opencode/test/preload.ts
+++ b/packages/opencode/test/preload.ts
@@ -40,6 +40,7 @@ process.env["XDG_STATE_HOME"] = path.join(dir, "state")
 process.env["KILO_MODELS_PATH"] = path.join(import.meta.dir, "tool", "fixtures", "models-api.json")
 process.env["KILO_EXPERIMENTAL_EVENT_SYSTEM"] = "true"
 process.env["KILO_EXPERIMENTAL_WORKSPACES"] = "true"
+process.env["KILO_EXPERIMENTAL_DISABLE_FILEWATCHER"] ??= "true" // kilocode_change - see test.yml: per-instance watchers are too heavy/racy for unit tests; watcher tests opt back in
 
 // Set test home directory to isolate tests from user's actual home directory
 // This prevents tests from picking up real user configs/skills from ~/.claude/skills
diff --git a/packages/plugin-atomic-chat/package.json b/packages/plugin-atomic-chat/package.json
index aad8604576..4c8d3c414b 100644
--- a/packages/plugin-atomic-chat/package.json
+++ b/packages/plugin-atomic-chat/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/plugin-atomic-chat",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "description": "Kilo Code plugin for Atomic Chat: auto-detection and dynamic model discovery (OpenAI-compatible local API)",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin-atomic-chat/tsconfig.json b/packages/plugin-atomic-chat/tsconfig.json
index 7c3ad88a0b..4ef4f69a31 100644
--- a/packages/plugin-atomic-chat/tsconfig.json
+++ b/packages/plugin-atomic-chat/tsconfig.json
@@ -7,7 +7,7 @@
     "strict": true,
     "skipLibCheck": true,
     "noEmit": true,
-    "lib": ["es2022", "dom", "dom.iterable"],
+    "lib": ["es2023", "dom", "dom.iterable"],
     "types": ["node"]
   },
   "include": ["src/**/*", "test/**/*"]
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index e843ede97b..ffb7483a97 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/plugin",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/plugin/tsconfig.json b/packages/plugin/tsconfig.json
index ff001fd537..36925019e0 100644
--- a/packages/plugin/tsconfig.json
+++ b/packages/plugin/tsconfig.json
@@ -7,7 +7,7 @@
     "module": "nodenext",
     "declaration": true,
     "moduleResolution": "nodenext",
-    "lib": ["es2022", "dom", "dom.iterable"],
+    "lib": ["es2023", "dom", "dom.iterable"],
     "types": ["node"] // kilocode_change
   },
   "include": ["src"]
diff --git a/packages/script/package.json b/packages/script/package.json
index ad3055f715..55bec73441 100644
--- a/packages/script/package.json
+++ b/packages/script/package.json
@@ -12,6 +12,6 @@
   "exports": {
     ".": "./src/index.ts"
   },
-  "version": "7.4.11",
+  "version": "7.4.13",
   "peerDependencies": {}
 }
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index b2a455124b..5bba655267 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@kilocode/sdk",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index ce073e8784..67ca8b211c 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -7609,6 +7609,7 @@ export class SessionImport extends HeyApiClient {
         partID?: string
         snapshot?: string
         diff?: string
+        workspace?: "restored" | "snapshots-disabled" | "unavailable"
       }
       permission?: {
         [key: string]: unknown
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 5a201e866d..68e0ea18f8 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -426,6 +426,7 @@ export type Session = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -1977,6 +1978,7 @@ export type GlobalSession = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
   project: ProjectSummary | null
   worktreeName?: string
@@ -2351,6 +2353,7 @@ export type Session1 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2404,6 +2407,7 @@ export type Session2 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2464,6 +2468,7 @@ export type Session3 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2517,6 +2522,7 @@ export type Session4 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2570,6 +2576,7 @@ export type Session5 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2623,6 +2630,7 @@ export type Session6 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2676,6 +2684,7 @@ export type Session7 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2783,6 +2792,7 @@ export type Session8 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -2836,6 +2846,7 @@ export type Session9 = {
     partID?: string
     snapshot?: string
     diff?: string
+    workspace?: "restored" | "snapshots-disabled" | "unavailable"
   }
 }
 
@@ -13274,6 +13285,7 @@ export type KilocodeSessionImportSessionData = {
       partID?: string
       snapshot?: string
       diff?: string
+      workspace?: "restored" | "snapshots-disabled" | "unavailable"
     }
     permission?: {
       [key: string]: unknown
diff --git a/packages/sdk/js/tsconfig.json b/packages/sdk/js/tsconfig.json
index 54e6b62d0b..df6faf2d8a 100644
--- a/packages/sdk/js/tsconfig.json
+++ b/packages/sdk/js/tsconfig.json
@@ -6,7 +6,7 @@
     "module": "nodenext",
     "declaration": true,
     "moduleResolution": "nodenext",
-    "lib": ["es2022", "dom", "dom.iterable"],
+    "lib": ["es2023", "dom", "dom.iterable"],
     "types": ["node"],
     "composite": true,
     "rootDir": "src"
diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json
index b12cfbff8c..3cbe4ff083 100644
--- a/packages/sdk/openapi.json
+++ b/packages/sdk/openapi.json
@@ -16759,6 +16759,10 @@
                       },
                       "diff": {
                         "type": "string"
+                      },
+                      "workspace": {
+                        "type": "string",
+                        "enum": ["restored", "snapshots-disabled", "unavailable"]
                       }
                     },
                     "required": ["messageID"],
@@ -24992,6 +24996,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -29471,6 +29479,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -30618,6 +30630,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -30787,6 +30803,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -30975,6 +30995,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -31144,6 +31168,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -31313,6 +31341,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -31482,6 +31514,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -31651,6 +31687,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -31982,6 +32022,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
@@ -32151,6 +32195,10 @@
               },
               "diff": {
                 "type": "string"
+              },
+              "workspace": {
+                "type": "string",
+                "enum": ["restored", "snapshots-disabled", "unavailable"]
               }
             },
             "required": ["messageID"],
diff --git a/packages/server/package.json b/packages/server/package.json
index 96a0bfbe4b..800f43e2e9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/server",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index fff8c7905f..c057b4451c 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -26,7 +26,7 @@
     "typescript": "catalog:",
     "vite": "catalog:"
   },
-  "version": "7.4.11",
+  "version": "7.4.13",
   "dependencies": {},
   "peerDependencies": {}
 }
diff --git a/packages/tui/package.json b/packages/tui/package.json
index d0874e21c8..c7ca5df6d4 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/tui",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "private": true,
   "type": "module",
   "license": "MIT",
@@ -69,6 +69,5 @@
     "@tsconfig/bun": "catalog:",
     "@types/bun": "catalog:",
     "@typescript/native-preview": "catalog:"
-  },
-  "peerDependencies": {}
+  }
 }
diff --git a/packages/tui/src/component/prompt/index.tsx b/packages/tui/src/component/prompt/index.tsx
index b54dba1c43..6baa0b229e 100644
--- a/packages/tui/src/component/prompt/index.tsx
+++ b/packages/tui/src/component/prompt/index.tsx
@@ -1060,7 +1060,6 @@ export function Prompt(props: PromptProps) {
       sessionID: props.sessionID,
       toast,
       dialog,
-      renderer,
       done: () => {
         history.append({
           ...store.prompt,
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 1ed334e1a2..13d11f66cf 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -93,7 +93,7 @@ import { KiloErrorBlock } from "@/kilocode/components/kilo-error-display"
 import { splitDiffHunks } from "@/kilocode/tui/diff"
 import { RoutedModelMeta } from "@/kilocode/cli/cmd/tui/routes/session/routed-model-meta"
 import { submitFeedback } from "@/kilocode/cli/cmd/tui/feedback"
-import { MemoryMessageMeta, MemorySessionTui } from "@/kilocode/cli/cmd/tui/routes/session/memory"
+import { MemorySessionTui } from "@/kilocode/cli/cmd/tui/routes/session/memory"
 import { formatMarkdownTables } from "../../util/markdown"
 // kilocode_change end
 
@@ -339,7 +339,6 @@ export function Session() {
   const scrollAcceleration = createMemo(() => getScrollAcceleration(tuiConfig))
   const toast = useToast()
   const sdk = useSDK()
-  const memory = MemorySessionTui.verbose({ sessionID: () => route.sessionID }) // kilocode_change
   const editor = useEditorContext()
   onCleanup(MemorySessionTui.attach({ event, toast, sessionID: route.sessionID })) // kilocode_change
 
@@ -1416,7 +1415,6 @@ export function Session() {
                           last={lastAssistant()?.id === message.id}
                           message={message as AssistantMessage}
                           parts={sync.data.part[message.id] ?? []}
-                          memory={memory /* kilocode_change */}
                         />
                       </Match>
                     </Switch>
@@ -1629,7 +1627,6 @@ function AssistantMessage(props: {
   message: AssistantMessage
   parts: Part[]
   last: boolean
-  memory(): boolean // kilocode_change
 }) {
   const ctx = use()
   const local = useLocal()
@@ -1743,9 +1740,6 @@ function AssistantMessage(props: {
               <Show when={duration()}>
                 <span style={{ fg: theme.textMuted }}> · {Locale.duration(duration())}</span>
               </Show>
-              {/* kilocode_change start */}
-              <MemoryMessageMeta parts={props.parts} color={theme.textMuted} verbose={props.memory} />{" "}
-              {/* kilocode_change end */}
               <Show when={props.message.error?.name === "MessageAbortedError"}>
                 <span style={{ fg: theme.textMuted }}> · interrupted</span>
               </Show>
diff --git a/packages/ui/package.json b/packages/ui/package.json
index e1d6e450e3..fc7a7430a7 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/ui",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "type": "module",
   "license": "MIT",
   "exports": {
diff --git a/script/upstream/package.json b/script/upstream/package.json
index cbd3af40f5..cb07da2179 100644
--- a/script/upstream/package.json
+++ b/script/upstream/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kilocode/upstream-merge",
-  "version": "7.4.11",
+  "version": "7.4.13",
   "private": true,
   "type": "module",
   "description": "Scripts for automating upstream opencode merges into Kilo",