diff --git a/.husky/_/post-checkout b/.husky/_/post-checkout
new file mode 100755
index 00000000000..5abf8ed93f7
--- /dev/null
+++ b/.husky/_/post-checkout
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { printf >&2 "\n%s\n\n" "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-checkout' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks')."; exit 2; }
+git lfs post-checkout "$@"
diff --git a/.husky/_/post-commit b/.husky/_/post-commit
new file mode 100755
index 00000000000..b8b76c2c425
--- /dev/null
+++ b/.husky/_/post-commit
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { printf >&2 "\n%s\n\n" "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-commit' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks')."; exit 2; }
+git lfs post-commit "$@"
diff --git a/.husky/_/post-merge b/.husky/_/post-merge
new file mode 100755
index 00000000000..726f909891a
--- /dev/null
+++ b/.husky/_/post-merge
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { printf >&2 "\n%s\n\n" "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-merge' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks')."; exit 2; }
+git lfs post-merge "$@"
diff --git a/.husky/_/pre-push b/.husky/_/pre-push
new file mode 100755
index 00000000000..5f26dc45523
--- /dev/null
+++ b/.husky/_/pre-push
@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { printf >&2 "\n%s\n\n" "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'pre-push' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks')."; exit 2; }
+git lfs pre-push "$@"
diff --git a/packages/kilo-gateway/src/api/constants.ts b/packages/kilo-gateway/src/api/constants.ts
index a10781e6b49..cdaff49e391 100644
--- a/packages/kilo-gateway/src/api/constants.ts
+++ b/packages/kilo-gateway/src/api/constants.ts
@@ -61,10 +61,8 @@ export const ENV_EDITOR_NAME = "KILOCODE_EDITOR_NAME"
 /** Tester header value for suppressing warnings */
 export const TESTER_SUPPRESS_VALUE = "SUPPRESS"
 
-// kilocode_change start
 /** Header name for feature tracking */
 export const HEADER_FEATURE = "X-KILOCODE-FEATURE"
 
 /** Environment variable name for feature override */
 export const ENV_FEATURE = "KILOCODE_FEATURE"
-// kilocode_change end
diff --git a/packages/kilo-gateway/src/api/notifications.ts b/packages/kilo-gateway/src/api/notifications.ts
index 2d0994e94bd..286686717eb 100644
--- a/packages/kilo-gateway/src/api/notifications.ts
+++ b/packages/kilo-gateway/src/api/notifications.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import { z } from "zod"
 import { KILO_API_BASE } from "./constants.js"
 
diff --git a/packages/kilo-gateway/src/auth/legacy-migration.ts b/packages/kilo-gateway/src/auth/legacy-migration.ts
index 1f53feb66d7..34944dbfb0d 100644
--- a/packages/kilo-gateway/src/auth/legacy-migration.ts
+++ b/packages/kilo-gateway/src/auth/legacy-migration.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 /**
  * Legacy Kilo CLI migration module
  *
diff --git a/packages/kilo-gateway/src/headers.ts b/packages/kilo-gateway/src/headers.ts
index c9767f3e1f8..0ec36805854 100644
--- a/packages/kilo-gateway/src/headers.ts
+++ b/packages/kilo-gateway/src/headers.ts
@@ -11,7 +11,7 @@ import {
   DEFAULT_EDITOR_NAME,
   ENV_EDITOR_NAME,
   TESTER_SUPPRESS_VALUE,
-  ENV_FEATURE, // kilocode_change
+  ENV_FEATURE,
 } from "./api/constants.js"
 
 /**
@@ -62,13 +62,11 @@ export function buildKiloHeaders(
     machineId?: string
   },
 ): Record<string, string> {
-  // kilocode_change start
   const feature = getFeatureHeader()
   const headers: Record<string, string> = {
     [X_KILOCODE_EDITORNAME]: getEditorNameHeader(),
     ...(feature ? { [X_KILOCODE_FEATURE]: feature } : {}),
   }
-  // kilocode_change end
 
   if (metadata?.taskId) {
     headers[X_KILOCODE_TASKID] = metadata.taskId
diff --git a/packages/kilo-gateway/src/index.ts b/packages/kilo-gateway/src/index.ts
index 9f10c75fb07..76ba1f03306 100644
--- a/packages/kilo-gateway/src/index.ts
+++ b/packages/kilo-gateway/src/index.ts
@@ -9,7 +9,7 @@ export { KiloAuthPlugin, default } from "./plugin.js"
 export { createKilo } from "./provider.js"
 export { createKiloDebug } from "./provider-debug.js"
 export { kiloCustomLoader } from "./loader.js"
-export { buildKiloHeaders, getEditorNameHeader, getFeatureHeader, DEFAULT_HEADERS } from "./headers.js" // kilocode_change - added getFeatureHeader
+export { buildKiloHeaders, getEditorNameHeader, getFeatureHeader, DEFAULT_HEADERS } from "./headers.js"
 
 // ============================================================================
 // Auth
diff --git a/packages/kilo-gateway/src/types.ts b/packages/kilo-gateway/src/types.ts
index d61c598f0d1..5afecffe09d 100644
--- a/packages/kilo-gateway/src/types.ts
+++ b/packages/kilo-gateway/src/types.ts
@@ -1,4 +1,3 @@
-// kilocode_change - Kilo Gateway types
 import type { Provider as SDK } from "ai"
 import type { LanguageModelV2 } from "@openrouter/ai-sdk-provider"
 
diff --git a/packages/kilo-i18n/src/ar.ts b/packages/kilo-i18n/src/ar.ts
index 27963894dcc..4a8cd1c79ff 100644
--- a/packages/kilo-i18n/src/ar.ts
+++ b/packages/kilo-i18n/src/ar.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/br.ts b/packages/kilo-i18n/src/br.ts
index 5ac4369243e..4734a98d0f4 100644
--- a/packages/kilo-i18n/src/br.ts
+++ b/packages/kilo-i18n/src/br.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/bs.ts b/packages/kilo-i18n/src/bs.ts
index e1400fc227c..28025010251 100644
--- a/packages/kilo-i18n/src/bs.ts
+++ b/packages/kilo-i18n/src/bs.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/da.ts b/packages/kilo-i18n/src/da.ts
index d5c89a5bf4d..16f0c8f6828 100644
--- a/packages/kilo-i18n/src/da.ts
+++ b/packages/kilo-i18n/src/da.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/de.ts b/packages/kilo-i18n/src/de.ts
index 97c12ef614a..b39b7eb4776 100644
--- a/packages/kilo-i18n/src/de.ts
+++ b/packages/kilo-i18n/src/de.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/en.ts b/packages/kilo-i18n/src/en.ts
index 237a635c751..070c3d41cea 100644
--- a/packages/kilo-i18n/src/en.ts
+++ b/packages/kilo-i18n/src/en.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 // Kilo-specific translations and overrides
 // Keys here will override any matching keys from upstream translations
 export const dict = {
diff --git a/packages/kilo-i18n/src/es.ts b/packages/kilo-i18n/src/es.ts
index 59165915854..25c5dba9f36 100644
--- a/packages/kilo-i18n/src/es.ts
+++ b/packages/kilo-i18n/src/es.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/fr.ts b/packages/kilo-i18n/src/fr.ts
index 513ffc6ba1f..d593e4a2be3 100644
--- a/packages/kilo-i18n/src/fr.ts
+++ b/packages/kilo-i18n/src/fr.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/ja.ts b/packages/kilo-i18n/src/ja.ts
index 676550a67e4..08eda7545aa 100644
--- a/packages/kilo-i18n/src/ja.ts
+++ b/packages/kilo-i18n/src/ja.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/ko.ts b/packages/kilo-i18n/src/ko.ts
index 0f76b05155b..cbbd28aa1f3 100644
--- a/packages/kilo-i18n/src/ko.ts
+++ b/packages/kilo-i18n/src/ko.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/no.ts b/packages/kilo-i18n/src/no.ts
index 3d6ede4b4b5..bd17fff9b59 100644
--- a/packages/kilo-i18n/src/no.ts
+++ b/packages/kilo-i18n/src/no.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/pl.ts b/packages/kilo-i18n/src/pl.ts
index 327317ebb49..63aea01e6e3 100644
--- a/packages/kilo-i18n/src/pl.ts
+++ b/packages/kilo-i18n/src/pl.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/ru.ts b/packages/kilo-i18n/src/ru.ts
index 182652dced8..7a0276ad710 100644
--- a/packages/kilo-i18n/src/ru.ts
+++ b/packages/kilo-i18n/src/ru.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/th.ts b/packages/kilo-i18n/src/th.ts
index eaef9b0bde9..d6f88c10b10 100644
--- a/packages/kilo-i18n/src/th.ts
+++ b/packages/kilo-i18n/src/th.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1":
diff --git a/packages/kilo-i18n/src/zh.ts b/packages/kilo-i18n/src/zh.ts
index 6cbf5301ab3..93d0f4f6c0d 100644
--- a/packages/kilo-i18n/src/zh.ts
+++ b/packages/kilo-i18n/src/zh.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1": "Kilo Gateway 为您提供一组精选的可靠优化模型，专为编码代理设计。",
diff --git a/packages/kilo-i18n/src/zht.ts b/packages/kilo-i18n/src/zht.ts
index 69f93085439..a5b9a019f62 100644
--- a/packages/kilo-i18n/src/zht.ts
+++ b/packages/kilo-i18n/src/zht.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export const dict = {
   // Kilo Gateway provider translations
   "provider.connect.kiloGateway.line1": "Kilo Gateway 為您提供一組精選的可靠優化模型，專為編碼代理設計。",
diff --git a/packages/kilo-ui/src/components/accordion.css b/packages/kilo-ui/src/components/accordion.css
index d7c70c5840a..aa522a7131f 100644
--- a/packages/kilo-ui/src/components/accordion.css
+++ b/packages/kilo-ui/src/components/accordion.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Accordion overrides */
 
 [data-component="accordion"] {
diff --git a/packages/kilo-ui/src/components/accordion.tsx b/packages/kilo-ui/src/components/accordion.tsx
index 24a9358ff78..5eac74c261a 100644
--- a/packages/kilo-ui/src/components/accordion.tsx
+++ b/packages/kilo-ui/src/components/accordion.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/accordion"
diff --git a/packages/kilo-ui/src/components/app-icon.tsx b/packages/kilo-ui/src/components/app-icon.tsx
index 80de2ede11a..6ab39549824 100644
--- a/packages/kilo-ui/src/components/app-icon.tsx
+++ b/packages/kilo-ui/src/components/app-icon.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/app-icon"
diff --git a/packages/kilo-ui/src/components/app-icons/types.ts b/packages/kilo-ui/src/components/app-icons/types.ts
index 0654a12f8fb..fe900620fc6 100644
--- a/packages/kilo-ui/src/components/app-icons/types.ts
+++ b/packages/kilo-ui/src/components/app-icons/types.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/icons/app"
diff --git a/packages/kilo-ui/src/components/auto-approve-bar.css b/packages/kilo-ui/src/components/auto-approve-bar.css
index 14aa6a8fc19..517e05d0846 100644
--- a/packages/kilo-ui/src/components/auto-approve-bar.css
+++ b/packages/kilo-ui/src/components/auto-approve-bar.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Auto-approve Bar overrides */
 
 [data-component="auto-approve-bar"] {
diff --git a/packages/kilo-ui/src/components/avatar.tsx b/packages/kilo-ui/src/components/avatar.tsx
index 3deb6c05d66..1de760ad7ab 100644
--- a/packages/kilo-ui/src/components/avatar.tsx
+++ b/packages/kilo-ui/src/components/avatar.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/avatar"
diff --git a/packages/kilo-ui/src/components/basic-tool.css b/packages/kilo-ui/src/components/basic-tool.css
index f440dd42da1..7891116b576 100644
--- a/packages/kilo-ui/src/components/basic-tool.css
+++ b/packages/kilo-ui/src/components/basic-tool.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Prevent tool-trigger content from pushing the collapsible arrow off-screen */
 [data-component="tool-trigger"] {
   [data-slot="basic-tool-tool-trigger-content"] {
diff --git a/packages/kilo-ui/src/components/basic-tool.tsx b/packages/kilo-ui/src/components/basic-tool.tsx
index 36c4fb31f42..66d15277b35 100644
--- a/packages/kilo-ui/src/components/basic-tool.tsx
+++ b/packages/kilo-ui/src/components/basic-tool.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/basic-tool"
diff --git a/packages/kilo-ui/src/components/button.css b/packages/kilo-ui/src/components/button.css
index 09fc5c1a8ce..2aa86b2078c 100644
--- a/packages/kilo-ui/src/components/button.css
+++ b/packages/kilo-ui/src/components/button.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Button overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="button"] {
diff --git a/packages/kilo-ui/src/components/button.tsx b/packages/kilo-ui/src/components/button.tsx
index 780a9fffc2d..2623a711ca1 100644
--- a/packages/kilo-ui/src/components/button.tsx
+++ b/packages/kilo-ui/src/components/button.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/button"
diff --git a/packages/kilo-ui/src/components/card.css b/packages/kilo-ui/src/components/card.css
index 3bfd65c7787..7e97fcf316a 100644
--- a/packages/kilo-ui/src/components/card.css
+++ b/packages/kilo-ui/src/components/card.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Card overrides – harmonized with @vscode/webview-ui-toolkit */
 
 [data-component="card"] {
diff --git a/packages/kilo-ui/src/components/card.tsx b/packages/kilo-ui/src/components/card.tsx
index f94fc8a57ed..e023f2946d2 100644
--- a/packages/kilo-ui/src/components/card.tsx
+++ b/packages/kilo-ui/src/components/card.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/card"
diff --git a/packages/kilo-ui/src/components/chat-input.css b/packages/kilo-ui/src/components/chat-input.css
index 6761767332c..bfd29fc7028 100644
--- a/packages/kilo-ui/src/components/chat-input.css
+++ b/packages/kilo-ui/src/components/chat-input.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Chat Input (Textarea with blue border) overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="chat-input"],
diff --git a/packages/kilo-ui/src/components/checkbox.css b/packages/kilo-ui/src/components/checkbox.css
index a39f431419d..cde6fa89b6e 100644
--- a/packages/kilo-ui/src/components/checkbox.css
+++ b/packages/kilo-ui/src/components/checkbox.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Checkbox overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="checkbox"] {
diff --git a/packages/kilo-ui/src/components/checkbox.tsx b/packages/kilo-ui/src/components/checkbox.tsx
index b7645e7afa3..0338fe0c530 100644
--- a/packages/kilo-ui/src/components/checkbox.tsx
+++ b/packages/kilo-ui/src/components/checkbox.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/checkbox"
diff --git a/packages/kilo-ui/src/components/code.css b/packages/kilo-ui/src/components/code.css
index a43012f109b..bfde26a279d 100644
--- a/packages/kilo-ui/src/components/code.css
+++ b/packages/kilo-ui/src/components/code.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Code overrides */
 
 [data-component="code"] {
diff --git a/packages/kilo-ui/src/components/code.tsx b/packages/kilo-ui/src/components/code.tsx
index afc131525e0..40b98cd70ed 100644
--- a/packages/kilo-ui/src/components/code.tsx
+++ b/packages/kilo-ui/src/components/code.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/code"
diff --git a/packages/kilo-ui/src/components/collapsible.tsx b/packages/kilo-ui/src/components/collapsible.tsx
index 019afa844f5..190f3a16cd3 100644
--- a/packages/kilo-ui/src/components/collapsible.tsx
+++ b/packages/kilo-ui/src/components/collapsible.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/collapsible"
diff --git a/packages/kilo-ui/src/components/context-menu.css b/packages/kilo-ui/src/components/context-menu.css
index 72d5402ab63..feeefc704c1 100644
--- a/packages/kilo-ui/src/components/context-menu.css
+++ b/packages/kilo-ui/src/components/context-menu.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Context Menu overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="context-menu-content"],
diff --git a/packages/kilo-ui/src/components/context-menu.tsx b/packages/kilo-ui/src/components/context-menu.tsx
index 8ab04ce1109..6657036b236 100644
--- a/packages/kilo-ui/src/components/context-menu.tsx
+++ b/packages/kilo-ui/src/components/context-menu.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context-menu"
diff --git a/packages/kilo-ui/src/components/dialog.css b/packages/kilo-ui/src/components/dialog.css
index e571f5cc7f8..742cd1690d7 100644
--- a/packages/kilo-ui/src/components/dialog.css
+++ b/packages/kilo-ui/src/components/dialog.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Dialog overrides – harmonized with @vscode/webview-ui-toolkit */
 
 [data-component="dialog-overlay"] {
diff --git a/packages/kilo-ui/src/components/dialog.tsx b/packages/kilo-ui/src/components/dialog.tsx
index 69329dcae3a..078bb487e82 100644
--- a/packages/kilo-ui/src/components/dialog.tsx
+++ b/packages/kilo-ui/src/components/dialog.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/dialog"
diff --git a/packages/kilo-ui/src/components/diff-changes.tsx b/packages/kilo-ui/src/components/diff-changes.tsx
index 03b78b6fc43..a0c85321530 100644
--- a/packages/kilo-ui/src/components/diff-changes.tsx
+++ b/packages/kilo-ui/src/components/diff-changes.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/diff-changes"
diff --git a/packages/kilo-ui/src/components/diff-ssr.tsx b/packages/kilo-ui/src/components/diff-ssr.tsx
index 6c99dd6dd2d..1c8c7f2dc79 100644
--- a/packages/kilo-ui/src/components/diff-ssr.tsx
+++ b/packages/kilo-ui/src/components/diff-ssr.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/diff-ssr"
diff --git a/packages/kilo-ui/src/components/diff.tsx b/packages/kilo-ui/src/components/diff.tsx
index 5f5cfa6ab0d..256d5495f57 100644
--- a/packages/kilo-ui/src/components/diff.tsx
+++ b/packages/kilo-ui/src/components/diff.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/diff"
diff --git a/packages/kilo-ui/src/components/dock-prompt.tsx b/packages/kilo-ui/src/components/dock-prompt.tsx
index b298a9de0f4..696987ecc56 100644
--- a/packages/kilo-ui/src/components/dock-prompt.tsx
+++ b/packages/kilo-ui/src/components/dock-prompt.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/dock-prompt"
diff --git a/packages/kilo-ui/src/components/dock-surface.tsx b/packages/kilo-ui/src/components/dock-surface.tsx
index 926b78cb5bd..b8f4ae1a5a6 100644
--- a/packages/kilo-ui/src/components/dock-surface.tsx
+++ b/packages/kilo-ui/src/components/dock-surface.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/dock-surface"
diff --git a/packages/kilo-ui/src/components/dropdown-menu.css b/packages/kilo-ui/src/components/dropdown-menu.css
index efda95ad8f3..00901bdca45 100644
--- a/packages/kilo-ui/src/components/dropdown-menu.css
+++ b/packages/kilo-ui/src/components/dropdown-menu.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Dropdown Menu overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="dropdown-menu-content"],
@@ -21,12 +20,10 @@
       color: var(--text-on-interactive-base, var(--text-strong));
     }
 
-    /* kilocode_change start - preserve disabled state behavior from upstream */
     &[data-disabled] {
       cursor: default;
       pointer-events: none;
     }
-    /* kilocode_change end */
   }
 
   [data-slot="dropdown-menu-separator"] {
diff --git a/packages/kilo-ui/src/components/dropdown-menu.tsx b/packages/kilo-ui/src/components/dropdown-menu.tsx
index 6ba18963d4c..c20c829c47b 100644
--- a/packages/kilo-ui/src/components/dropdown-menu.tsx
+++ b/packages/kilo-ui/src/components/dropdown-menu.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/dropdown-menu"
diff --git a/packages/kilo-ui/src/components/favicon.tsx b/packages/kilo-ui/src/components/favicon.tsx
index 14100f67bb2..a20f1586357 100644
--- a/packages/kilo-ui/src/components/favicon.tsx
+++ b/packages/kilo-ui/src/components/favicon.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/favicon"
diff --git a/packages/kilo-ui/src/components/file-icon.tsx b/packages/kilo-ui/src/components/file-icon.tsx
index 94137149586..276f9c0bb83 100644
--- a/packages/kilo-ui/src/components/file-icon.tsx
+++ b/packages/kilo-ui/src/components/file-icon.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/file-icon"
diff --git a/packages/kilo-ui/src/components/file-icons/types.ts b/packages/kilo-ui/src/components/file-icons/types.ts
index c04e859b953..3418f374888 100644
--- a/packages/kilo-ui/src/components/file-icons/types.ts
+++ b/packages/kilo-ui/src/components/file-icons/types.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/icons/file-type"
diff --git a/packages/kilo-ui/src/components/font.tsx b/packages/kilo-ui/src/components/font.tsx
index 00973f31ce6..f2664c6e18a 100644
--- a/packages/kilo-ui/src/components/font.tsx
+++ b/packages/kilo-ui/src/components/font.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/font"
diff --git a/packages/kilo-ui/src/components/hover-card.tsx b/packages/kilo-ui/src/components/hover-card.tsx
index 00abe9c09fb..e099c0bc298 100644
--- a/packages/kilo-ui/src/components/hover-card.tsx
+++ b/packages/kilo-ui/src/components/hover-card.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/hover-card"
diff --git a/packages/kilo-ui/src/components/icon-button.css b/packages/kilo-ui/src/components/icon-button.css
index 3c971819876..6a0a08cfe02 100644
--- a/packages/kilo-ui/src/components/icon-button.css
+++ b/packages/kilo-ui/src/components/icon-button.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Icon Button overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="icon-button"] {
diff --git a/packages/kilo-ui/src/components/icon-button.tsx b/packages/kilo-ui/src/components/icon-button.tsx
index bcfc87d4699..52c1b666f8d 100644
--- a/packages/kilo-ui/src/components/icon-button.tsx
+++ b/packages/kilo-ui/src/components/icon-button.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/icon-button"
diff --git a/packages/kilo-ui/src/components/icon.tsx b/packages/kilo-ui/src/components/icon.tsx
index d24cf0e8dfc..90f437ca620 100644
--- a/packages/kilo-ui/src/components/icon.tsx
+++ b/packages/kilo-ui/src/components/icon.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/icon"
diff --git a/packages/kilo-ui/src/components/image-preview.tsx b/packages/kilo-ui/src/components/image-preview.tsx
index 1fa59a41ea4..eefd941abe0 100644
--- a/packages/kilo-ui/src/components/image-preview.tsx
+++ b/packages/kilo-ui/src/components/image-preview.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/image-preview"
diff --git a/packages/kilo-ui/src/components/inline-input.css b/packages/kilo-ui/src/components/inline-input.css
index 377383066fa..a17e6b354b6 100644
--- a/packages/kilo-ui/src/components/inline-input.css
+++ b/packages/kilo-ui/src/components/inline-input.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Inline Input overrides */
 
 [data-component="inline-input"] {
diff --git a/packages/kilo-ui/src/components/inline-input.tsx b/packages/kilo-ui/src/components/inline-input.tsx
index 1824fb0ce7a..8d92fb70b88 100644
--- a/packages/kilo-ui/src/components/inline-input.tsx
+++ b/packages/kilo-ui/src/components/inline-input.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/inline-input"
diff --git a/packages/kilo-ui/src/components/keybind.tsx b/packages/kilo-ui/src/components/keybind.tsx
index 3a03af48f14..091a3c16e68 100644
--- a/packages/kilo-ui/src/components/keybind.tsx
+++ b/packages/kilo-ui/src/components/keybind.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/keybind"
diff --git a/packages/kilo-ui/src/components/line-comment.tsx b/packages/kilo-ui/src/components/line-comment.tsx
index 439c6e9776e..5d778dfcbdf 100644
--- a/packages/kilo-ui/src/components/line-comment.tsx
+++ b/packages/kilo-ui/src/components/line-comment.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/line-comment"
diff --git a/packages/kilo-ui/src/components/list.css b/packages/kilo-ui/src/components/list.css
index cdf44c888a3..8722cc81d89 100644
--- a/packages/kilo-ui/src/components/list.css
+++ b/packages/kilo-ui/src/components/list.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo List overrides – styled to match legacy SelectDropdown items */
 
 [data-component="list"] {
diff --git a/packages/kilo-ui/src/components/list.tsx b/packages/kilo-ui/src/components/list.tsx
index 1e52535838e..f0a09cf8a5d 100644
--- a/packages/kilo-ui/src/components/list.tsx
+++ b/packages/kilo-ui/src/components/list.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/list"
diff --git a/packages/kilo-ui/src/components/logo.tsx b/packages/kilo-ui/src/components/logo.tsx
index 06ed609630a..05614ed1ecc 100644
--- a/packages/kilo-ui/src/components/logo.tsx
+++ b/packages/kilo-ui/src/components/logo.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/logo"
diff --git a/packages/kilo-ui/src/components/markdown.tsx b/packages/kilo-ui/src/components/markdown.tsx
index 84fa665cd46..b40570c287f 100644
--- a/packages/kilo-ui/src/components/markdown.tsx
+++ b/packages/kilo-ui/src/components/markdown.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/markdown"
diff --git a/packages/kilo-ui/src/components/message-nav.tsx b/packages/kilo-ui/src/components/message-nav.tsx
index 17321685d9b..71ae819e25a 100644
--- a/packages/kilo-ui/src/components/message-nav.tsx
+++ b/packages/kilo-ui/src/components/message-nav.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/message-nav"
diff --git a/packages/kilo-ui/src/components/message-part.css b/packages/kilo-ui/src/components/message-part.css
index 83e43050307..063a52330f8 100644
--- a/packages/kilo-ui/src/components/message-part.css
+++ b/packages/kilo-ui/src/components/message-part.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Message Part overrides */
 
 [data-component="text-part"] {
diff --git a/packages/kilo-ui/src/components/message-part.tsx b/packages/kilo-ui/src/components/message-part.tsx
index a7dedd50c45..5b83670bb08 100644
--- a/packages/kilo-ui/src/components/message-part.tsx
+++ b/packages/kilo-ui/src/components/message-part.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/message-part"
diff --git a/packages/kilo-ui/src/components/message-row.css b/packages/kilo-ui/src/components/message-row.css
index 7afdcf77847..57cb7bdd442 100644
--- a/packages/kilo-ui/src/components/message-row.css
+++ b/packages/kilo-ui/src/components/message-row.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Message Row overrides */
 
 [data-component="message-row"] {
diff --git a/packages/kilo-ui/src/components/model-info-card.css b/packages/kilo-ui/src/components/model-info-card.css
index 53f1aada78b..b8cd8c5bbd5 100644
--- a/packages/kilo-ui/src/components/model-info-card.css
+++ b/packages/kilo-ui/src/components/model-info-card.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Model Info Card overrides – harmonized with @vscode/webview-ui-toolkit */
 
 [data-component="model-info-card"] {
diff --git a/packages/kilo-ui/src/components/model-selector.css b/packages/kilo-ui/src/components/model-selector.css
index 1ba023e1ab4..89cf891532e 100644
--- a/packages/kilo-ui/src/components/model-selector.css
+++ b/packages/kilo-ui/src/components/model-selector.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Model Selector Popover overrides – styled to match VSCode look */
 
 /* ModelSelectorPopover content panel */
diff --git a/packages/kilo-ui/src/components/popover.css b/packages/kilo-ui/src/components/popover.css
index e7f68707ef8..396a0b59923 100644
--- a/packages/kilo-ui/src/components/popover.css
+++ b/packages/kilo-ui/src/components/popover.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Popover overrides */
 
 [data-component="popover-content"] {
diff --git a/packages/kilo-ui/src/components/popover.tsx b/packages/kilo-ui/src/components/popover.tsx
index 9b39440d009..ce3ce7e577c 100644
--- a/packages/kilo-ui/src/components/popover.tsx
+++ b/packages/kilo-ui/src/components/popover.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/popover"
diff --git a/packages/kilo-ui/src/components/progress-circle.tsx b/packages/kilo-ui/src/components/progress-circle.tsx
index 7407415ec9a..20e60f51f06 100644
--- a/packages/kilo-ui/src/components/progress-circle.tsx
+++ b/packages/kilo-ui/src/components/progress-circle.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/progress-circle"
diff --git a/packages/kilo-ui/src/components/prompt-input.css b/packages/kilo-ui/src/components/prompt-input.css
index 1d258ae35d8..32c70da1939 100644
--- a/packages/kilo-ui/src/components/prompt-input.css
+++ b/packages/kilo-ui/src/components/prompt-input.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Prompt Input overrides – styled to match legacy ChatTextArea look */
 
 /* Form wrapper: VS Code native input look instead of pill shape */
diff --git a/packages/kilo-ui/src/components/provider-icon.tsx b/packages/kilo-ui/src/components/provider-icon.tsx
index 0eea53f910e..da73096897e 100644
--- a/packages/kilo-ui/src/components/provider-icon.tsx
+++ b/packages/kilo-ui/src/components/provider-icon.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/provider-icon"
diff --git a/packages/kilo-ui/src/components/provider-icons/types.ts b/packages/kilo-ui/src/components/provider-icons/types.ts
index bebc368086d..9aecae767db 100644
--- a/packages/kilo-ui/src/components/provider-icons/types.ts
+++ b/packages/kilo-ui/src/components/provider-icons/types.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/icons/provider"
diff --git a/packages/kilo-ui/src/components/radio-group.tsx b/packages/kilo-ui/src/components/radio-group.tsx
index 8015b496f6e..89acd568698 100644
--- a/packages/kilo-ui/src/components/radio-group.tsx
+++ b/packages/kilo-ui/src/components/radio-group.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/radio-group"
diff --git a/packages/kilo-ui/src/components/resize-handle.tsx b/packages/kilo-ui/src/components/resize-handle.tsx
index 39ae38b86ab..d6211237adb 100644
--- a/packages/kilo-ui/src/components/resize-handle.tsx
+++ b/packages/kilo-ui/src/components/resize-handle.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/resize-handle"
diff --git a/packages/kilo-ui/src/components/select.css b/packages/kilo-ui/src/components/select.css
index b4a8f691609..006ebc262ca 100644
--- a/packages/kilo-ui/src/components/select.css
+++ b/packages/kilo-ui/src/components/select.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Select overrides – styled to match legacy SelectDropdown look */
 
 /* Select trigger (renders as a Button, override the button sizing) */
diff --git a/packages/kilo-ui/src/components/select.tsx b/packages/kilo-ui/src/components/select.tsx
index 7b4aa81efde..d4a6c72f2cb 100644
--- a/packages/kilo-ui/src/components/select.tsx
+++ b/packages/kilo-ui/src/components/select.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/select"
diff --git a/packages/kilo-ui/src/components/session-review.tsx b/packages/kilo-ui/src/components/session-review.tsx
index 32526449841..ae260216c3d 100644
--- a/packages/kilo-ui/src/components/session-review.tsx
+++ b/packages/kilo-ui/src/components/session-review.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/session-review"
diff --git a/packages/kilo-ui/src/components/session-turn.tsx b/packages/kilo-ui/src/components/session-turn.tsx
index 842d3ac7e67..b267a716e2d 100644
--- a/packages/kilo-ui/src/components/session-turn.tsx
+++ b/packages/kilo-ui/src/components/session-turn.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/session-turn"
diff --git a/packages/kilo-ui/src/components/settings-sidebar.css b/packages/kilo-ui/src/components/settings-sidebar.css
index aca96b92346..607da9661ae 100644
--- a/packages/kilo-ui/src/components/settings-sidebar.css
+++ b/packages/kilo-ui/src/components/settings-sidebar.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Settings Sidebar overrides */
 
 [data-component="settings-sidebar"] {
diff --git a/packages/kilo-ui/src/components/spinner.tsx b/packages/kilo-ui/src/components/spinner.tsx
index 8163d16dd56..8c2a5867558 100644
--- a/packages/kilo-ui/src/components/spinner.tsx
+++ b/packages/kilo-ui/src/components/spinner.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/spinner"
diff --git a/packages/kilo-ui/src/components/status-indicator.css b/packages/kilo-ui/src/components/status-indicator.css
index 669dd7c43ba..b8bdfec65dd 100644
--- a/packages/kilo-ui/src/components/status-indicator.css
+++ b/packages/kilo-ui/src/components/status-indicator.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Status Indicators overrides */
 
 [data-component="status-indicator"] {
diff --git a/packages/kilo-ui/src/components/sticky-accordion-header.tsx b/packages/kilo-ui/src/components/sticky-accordion-header.tsx
index 697618deb59..a5cc4ce3949 100644
--- a/packages/kilo-ui/src/components/sticky-accordion-header.tsx
+++ b/packages/kilo-ui/src/components/sticky-accordion-header.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/sticky-accordion-header"
diff --git a/packages/kilo-ui/src/components/switch.css b/packages/kilo-ui/src/components/switch.css
index c53d02b2079..3317a530b91 100644
--- a/packages/kilo-ui/src/components/switch.css
+++ b/packages/kilo-ui/src/components/switch.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Switch overrides */
 
 [data-component="switch"] {
diff --git a/packages/kilo-ui/src/components/switch.tsx b/packages/kilo-ui/src/components/switch.tsx
index d8277299d6f..ffdc396d7df 100644
--- a/packages/kilo-ui/src/components/switch.tsx
+++ b/packages/kilo-ui/src/components/switch.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/switch"
diff --git a/packages/kilo-ui/src/components/tabs.css b/packages/kilo-ui/src/components/tabs.css
index e6065e6c4c6..15835b78760 100644
--- a/packages/kilo-ui/src/components/tabs.css
+++ b/packages/kilo-ui/src/components/tabs.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Tabs overrides – sized to match @vscode/webview-ui-toolkit panels */
 
 [data-component="tabs"] {
diff --git a/packages/kilo-ui/src/components/tabs.tsx b/packages/kilo-ui/src/components/tabs.tsx
index 38b5db328f6..f65d4ee49df 100644
--- a/packages/kilo-ui/src/components/tabs.tsx
+++ b/packages/kilo-ui/src/components/tabs.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/tabs"
diff --git a/packages/kilo-ui/src/components/tag.css b/packages/kilo-ui/src/components/tag.css
index a3fb79d4841..416c7a08072 100644
--- a/packages/kilo-ui/src/components/tag.css
+++ b/packages/kilo-ui/src/components/tag.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Tag (maps to legacy Badge) overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="tag"],
diff --git a/packages/kilo-ui/src/components/tag.tsx b/packages/kilo-ui/src/components/tag.tsx
index d88119b77de..7019bc03352 100644
--- a/packages/kilo-ui/src/components/tag.tsx
+++ b/packages/kilo-ui/src/components/tag.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/tag"
diff --git a/packages/kilo-ui/src/components/task-header.css b/packages/kilo-ui/src/components/task-header.css
index e87afed2ff7..df7ddc96766 100644
--- a/packages/kilo-ui/src/components/task-header.css
+++ b/packages/kilo-ui/src/components/task-header.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Task Header overrides */
 
 [data-component="task-header"] {
diff --git a/packages/kilo-ui/src/components/text-field.css b/packages/kilo-ui/src/components/text-field.css
index 12be2757517..31f64c0ea89 100644
--- a/packages/kilo-ui/src/components/text-field.css
+++ b/packages/kilo-ui/src/components/text-field.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Input / TextField overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="input"] {
diff --git a/packages/kilo-ui/src/components/text-field.tsx b/packages/kilo-ui/src/components/text-field.tsx
index dc94f876621..f99db50c3c1 100644
--- a/packages/kilo-ui/src/components/text-field.tsx
+++ b/packages/kilo-ui/src/components/text-field.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/text-field"
diff --git a/packages/kilo-ui/src/components/toast.css b/packages/kilo-ui/src/components/toast.css
index f45c7565830..3645b3b95c9 100644
--- a/packages/kilo-ui/src/components/toast.css
+++ b/packages/kilo-ui/src/components/toast.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Toast overrides – harmonized with @vscode/webview-ui-toolkit */
 
 [data-component="toast"] {
diff --git a/packages/kilo-ui/src/components/toast.tsx b/packages/kilo-ui/src/components/toast.tsx
index 8f077174133..7e65ea33d9e 100644
--- a/packages/kilo-ui/src/components/toast.tsx
+++ b/packages/kilo-ui/src/components/toast.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/toast"
diff --git a/packages/kilo-ui/src/components/tooltip.css b/packages/kilo-ui/src/components/tooltip.css
index 90fd285f469..f2c6f81a133 100644
--- a/packages/kilo-ui/src/components/tooltip.css
+++ b/packages/kilo-ui/src/components/tooltip.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Kilo Tooltip overrides – sized to match @vscode/webview-ui-toolkit */
 
 [data-component="tooltip"] {
diff --git a/packages/kilo-ui/src/components/tooltip.tsx b/packages/kilo-ui/src/components/tooltip.tsx
index 3c9dc669c1e..a1479303c2b 100644
--- a/packages/kilo-ui/src/components/tooltip.tsx
+++ b/packages/kilo-ui/src/components/tooltip.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/tooltip"
diff --git a/packages/kilo-ui/src/components/typewriter.tsx b/packages/kilo-ui/src/components/typewriter.tsx
index 410fe1832b8..3e96e08f51b 100644
--- a/packages/kilo-ui/src/components/typewriter.tsx
+++ b/packages/kilo-ui/src/components/typewriter.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/typewriter"
diff --git a/packages/kilo-ui/src/context/code.tsx b/packages/kilo-ui/src/context/code.tsx
index 98f1e351394..587f40b77a6 100644
--- a/packages/kilo-ui/src/context/code.tsx
+++ b/packages/kilo-ui/src/context/code.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/code"
diff --git a/packages/kilo-ui/src/context/data.tsx b/packages/kilo-ui/src/context/data.tsx
index bf4843765d0..3f06c8ee64c 100644
--- a/packages/kilo-ui/src/context/data.tsx
+++ b/packages/kilo-ui/src/context/data.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/data"
diff --git a/packages/kilo-ui/src/context/dialog.tsx b/packages/kilo-ui/src/context/dialog.tsx
index 18338bd44e5..7c2d2e23628 100644
--- a/packages/kilo-ui/src/context/dialog.tsx
+++ b/packages/kilo-ui/src/context/dialog.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/dialog"
diff --git a/packages/kilo-ui/src/context/diff.tsx b/packages/kilo-ui/src/context/diff.tsx
index be53aa52cf6..41103ee61ff 100644
--- a/packages/kilo-ui/src/context/diff.tsx
+++ b/packages/kilo-ui/src/context/diff.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/diff"
diff --git a/packages/kilo-ui/src/context/helper.tsx b/packages/kilo-ui/src/context/helper.tsx
index 84de698a098..d5b5c7450d6 100644
--- a/packages/kilo-ui/src/context/helper.tsx
+++ b/packages/kilo-ui/src/context/helper.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/helper"
diff --git a/packages/kilo-ui/src/context/i18n.tsx b/packages/kilo-ui/src/context/i18n.tsx
index 4f655945a5f..63588e2affa 100644
--- a/packages/kilo-ui/src/context/i18n.tsx
+++ b/packages/kilo-ui/src/context/i18n.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/i18n"
diff --git a/packages/kilo-ui/src/context/index.ts b/packages/kilo-ui/src/context/index.ts
index a2f821520d7..87374300894 100644
--- a/packages/kilo-ui/src/context/index.ts
+++ b/packages/kilo-ui/src/context/index.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context"
diff --git a/packages/kilo-ui/src/context/marked.tsx b/packages/kilo-ui/src/context/marked.tsx
index e8adc0851ed..1ef709617c7 100644
--- a/packages/kilo-ui/src/context/marked.tsx
+++ b/packages/kilo-ui/src/context/marked.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/marked"
diff --git a/packages/kilo-ui/src/context/worker-pool.tsx b/packages/kilo-ui/src/context/worker-pool.tsx
index babe6ea5a5b..263c05d9b4d 100644
--- a/packages/kilo-ui/src/context/worker-pool.tsx
+++ b/packages/kilo-ui/src/context/worker-pool.tsx
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/context/worker-pool"
diff --git a/packages/kilo-ui/src/hooks/index.ts b/packages/kilo-ui/src/hooks/index.ts
index 8868ba7737c..c3b66ced39d 100644
--- a/packages/kilo-ui/src/hooks/index.ts
+++ b/packages/kilo-ui/src/hooks/index.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/hooks"
diff --git a/packages/kilo-ui/src/i18n/ar.ts b/packages/kilo-ui/src/i18n/ar.ts
index 0e316b5369c..e0f874ac934 100644
--- a/packages/kilo-ui/src/i18n/ar.ts
+++ b/packages/kilo-ui/src/i18n/ar.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/ar"
diff --git a/packages/kilo-ui/src/i18n/br.ts b/packages/kilo-ui/src/i18n/br.ts
index c44df1799aa..f3d4075c2fc 100644
--- a/packages/kilo-ui/src/i18n/br.ts
+++ b/packages/kilo-ui/src/i18n/br.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/br"
diff --git a/packages/kilo-ui/src/i18n/bs.ts b/packages/kilo-ui/src/i18n/bs.ts
index a006a31d609..6e3a89546a2 100644
--- a/packages/kilo-ui/src/i18n/bs.ts
+++ b/packages/kilo-ui/src/i18n/bs.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/bs"
diff --git a/packages/kilo-ui/src/i18n/da.ts b/packages/kilo-ui/src/i18n/da.ts
index ed2d8fdd367..42504eabefa 100644
--- a/packages/kilo-ui/src/i18n/da.ts
+++ b/packages/kilo-ui/src/i18n/da.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/da"
diff --git a/packages/kilo-ui/src/i18n/de.ts b/packages/kilo-ui/src/i18n/de.ts
index d3bbfcae3f9..8e0b7feacce 100644
--- a/packages/kilo-ui/src/i18n/de.ts
+++ b/packages/kilo-ui/src/i18n/de.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/de"
diff --git a/packages/kilo-ui/src/i18n/en.ts b/packages/kilo-ui/src/i18n/en.ts
index 62e59eb1ea7..ade8a9d7c05 100644
--- a/packages/kilo-ui/src/i18n/en.ts
+++ b/packages/kilo-ui/src/i18n/en.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/en"
diff --git a/packages/kilo-ui/src/i18n/es.ts b/packages/kilo-ui/src/i18n/es.ts
index 97bb39cf0f6..20145b49382 100644
--- a/packages/kilo-ui/src/i18n/es.ts
+++ b/packages/kilo-ui/src/i18n/es.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/es"
diff --git a/packages/kilo-ui/src/i18n/fr.ts b/packages/kilo-ui/src/i18n/fr.ts
index 4904a991439..1a1545020b4 100644
--- a/packages/kilo-ui/src/i18n/fr.ts
+++ b/packages/kilo-ui/src/i18n/fr.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/fr"
diff --git a/packages/kilo-ui/src/i18n/ja.ts b/packages/kilo-ui/src/i18n/ja.ts
index 6cb87ad6c74..093bb1ff314 100644
--- a/packages/kilo-ui/src/i18n/ja.ts
+++ b/packages/kilo-ui/src/i18n/ja.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/ja"
diff --git a/packages/kilo-ui/src/i18n/ko.ts b/packages/kilo-ui/src/i18n/ko.ts
index cc72b7202b1..872ef7b4ff0 100644
--- a/packages/kilo-ui/src/i18n/ko.ts
+++ b/packages/kilo-ui/src/i18n/ko.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/ko"
diff --git a/packages/kilo-ui/src/i18n/no.ts b/packages/kilo-ui/src/i18n/no.ts
index 546d316f1a1..7f1ace59299 100644
--- a/packages/kilo-ui/src/i18n/no.ts
+++ b/packages/kilo-ui/src/i18n/no.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/no"
diff --git a/packages/kilo-ui/src/i18n/pl.ts b/packages/kilo-ui/src/i18n/pl.ts
index 3b042cb4adc..9de3e796690 100644
--- a/packages/kilo-ui/src/i18n/pl.ts
+++ b/packages/kilo-ui/src/i18n/pl.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/pl"
diff --git a/packages/kilo-ui/src/i18n/ru.ts b/packages/kilo-ui/src/i18n/ru.ts
index cd0f90ca5f9..2eb4a1d7421 100644
--- a/packages/kilo-ui/src/i18n/ru.ts
+++ b/packages/kilo-ui/src/i18n/ru.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/ru"
diff --git a/packages/kilo-ui/src/i18n/th.ts b/packages/kilo-ui/src/i18n/th.ts
index e6e7e5b8bfb..78e4c8bc8d8 100644
--- a/packages/kilo-ui/src/i18n/th.ts
+++ b/packages/kilo-ui/src/i18n/th.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/th"
diff --git a/packages/kilo-ui/src/i18n/zh.ts b/packages/kilo-ui/src/i18n/zh.ts
index e0e6e988680..5402471a979 100644
--- a/packages/kilo-ui/src/i18n/zh.ts
+++ b/packages/kilo-ui/src/i18n/zh.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/zh"
diff --git a/packages/kilo-ui/src/i18n/zht.ts b/packages/kilo-ui/src/i18n/zht.ts
index 5a0328f9d7e..ba349b97d7e 100644
--- a/packages/kilo-ui/src/i18n/zht.ts
+++ b/packages/kilo-ui/src/i18n/zht.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/i18n/zht"
diff --git a/packages/kilo-ui/src/index.ts b/packages/kilo-ui/src/index.ts
index 26c2b6a527d..3c6cc4b296c 100644
--- a/packages/kilo-ui/src/index.ts
+++ b/packages/kilo-ui/src/index.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 //
 // @kilocode/kilo-ui
 //
diff --git a/packages/kilo-ui/src/pierre/index.ts b/packages/kilo-ui/src/pierre/index.ts
index 18f34e32023..ad2f1af9066 100644
--- a/packages/kilo-ui/src/pierre/index.ts
+++ b/packages/kilo-ui/src/pierre/index.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/pierre"
diff --git a/packages/kilo-ui/src/pierre/worker.ts b/packages/kilo-ui/src/pierre/worker.ts
index 3c52cad72f1..31892568975 100644
--- a/packages/kilo-ui/src/pierre/worker.ts
+++ b/packages/kilo-ui/src/pierre/worker.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/pierre/worker"
diff --git a/packages/kilo-ui/src/styles/globals.css b/packages/kilo-ui/src/styles/globals.css
index 15548a41e14..b995c31af2f 100644
--- a/packages/kilo-ui/src/styles/globals.css
+++ b/packages/kilo-ui/src/styles/globals.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /*
  * Kilo UI Global Overrides
  *
diff --git a/packages/kilo-ui/src/styles/index.css b/packages/kilo-ui/src/styles/index.css
index 575d6f05abe..70b0b2efb28 100644
--- a/packages/kilo-ui/src/styles/index.css
+++ b/packages/kilo-ui/src/styles/index.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Wraps upstream styles and adds Kilo overrides */
 @import "@opencode-ai/ui/styles";
 
diff --git a/packages/kilo-ui/src/styles/tailwind/index.css b/packages/kilo-ui/src/styles/tailwind/index.css
index 5d62771ac66..c5e6aae4f02 100644
--- a/packages/kilo-ui/src/styles/tailwind/index.css
+++ b/packages/kilo-ui/src/styles/tailwind/index.css
@@ -1,4 +1,3 @@
-/* kilocode_change - new file */
 /* Wraps upstream tailwind styles and adds Kilo overrides */
 @import "@opencode-ai/ui/styles/tailwind";
 
diff --git a/packages/kilo-ui/src/theme/color.ts b/packages/kilo-ui/src/theme/color.ts
index 7fda95ebe55..bd77d4fee4a 100644
--- a/packages/kilo-ui/src/theme/color.ts
+++ b/packages/kilo-ui/src/theme/color.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/theme/color"
diff --git a/packages/kilo-ui/src/theme/context.tsx b/packages/kilo-ui/src/theme/context.tsx
index 79168f684cc..e54c99ead3b 100644
--- a/packages/kilo-ui/src/theme/context.tsx
+++ b/packages/kilo-ui/src/theme/context.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 // Copy of @opencode-ai/ui/theme/context.tsx with two changes:
 // 1. Imports DEFAULT_THEMES from our local default-themes (which includes Kilo themes)
 // 2. Default theme changed from "oc-1" to "kilo"
@@ -11,7 +10,7 @@ import { createSimpleContext } from "@opencode-ai/ui/context/helper"
 
 export type ColorScheme = "light" | "dark" | "system"
 
-const DEFAULT_THEME_ID = "kilo" // kilocode_change: was "oc-1"
+const DEFAULT_THEME_ID = "kilo"
 
 const STORAGE_KEYS = {
   THEME_ID: "opencode-theme-id",
@@ -77,7 +76,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
   init: (props: { defaultTheme?: string }) => {
     const [store, setStore] = createStore({
       themes: DEFAULT_THEMES as Record<string, DesktopTheme>,
-      themeId: props.defaultTheme ?? DEFAULT_THEME_ID, // kilocode_change: was "oc-1"
+      themeId: props.defaultTheme ?? DEFAULT_THEME_ID,
       colorScheme: "system" as ColorScheme,
       mode: getSystemMode(),
       previewThemeId: null as string | null,
diff --git a/packages/kilo-ui/src/theme/default-themes.ts b/packages/kilo-ui/src/theme/default-themes.ts
index 850777b4851..a048d4e5e4f 100644
--- a/packages/kilo-ui/src/theme/default-themes.ts
+++ b/packages/kilo-ui/src/theme/default-themes.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import type { DesktopTheme } from "@opencode-ai/ui/theme/types"
 import { DEFAULT_THEMES as UPSTREAM_THEMES } from "@opencode-ai/ui/theme/default-themes"
 import kiloJson from "./themes/kilo.json"
diff --git a/packages/kilo-ui/src/theme/index.ts b/packages/kilo-ui/src/theme/index.ts
index 23759871b77..995377cbe96 100644
--- a/packages/kilo-ui/src/theme/index.ts
+++ b/packages/kilo-ui/src/theme/index.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 export type {
   DesktopTheme,
   ThemeSeedColors,
diff --git a/packages/kilo-ui/src/theme/loader.ts b/packages/kilo-ui/src/theme/loader.ts
index 6c9a4ab5683..6de61d80688 100644
--- a/packages/kilo-ui/src/theme/loader.ts
+++ b/packages/kilo-ui/src/theme/loader.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/theme/loader"
diff --git a/packages/kilo-ui/src/theme/resolve.ts b/packages/kilo-ui/src/theme/resolve.ts
index 67036d92290..752e0dbaf66 100644
--- a/packages/kilo-ui/src/theme/resolve.ts
+++ b/packages/kilo-ui/src/theme/resolve.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/theme/resolve"
diff --git a/packages/kilo-ui/src/theme/types.ts b/packages/kilo-ui/src/theme/types.ts
index 0f38e4b5cfe..d8620363576 100644
--- a/packages/kilo-ui/src/theme/types.ts
+++ b/packages/kilo-ui/src/theme/types.ts
@@ -1,2 +1 @@
-// kilocode_change - new file
 export * from "@opencode-ai/ui/theme/types"
diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts
index 2dd78d3c777..b5f4c571c2d 100644
--- a/packages/kilo-vscode/src/KiloProvider.ts
+++ b/packages/kilo-vscode/src/KiloProvider.ts
@@ -1707,7 +1707,6 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
    * settings from the previous version of the extension which shares the same
    * extension ID and "kilo-code.*" namespace.
    */
-  // kilocode_change start
   private async handleResetAllSettings(): Promise<void> {
     const confirmed = await vscode.window.showWarningMessage(
       "Reset all Kilo Code extension settings to defaults?",
@@ -1735,7 +1734,6 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     this.sendBrowserSettings()
     this.sendNotificationSettings()
   }
-  // kilocode_change end
 
   /**
    * Read the current browser automation settings and push them to the webview.
diff --git a/packages/kilo-vscode/src/services/cli-backend/server-manager.ts b/packages/kilo-vscode/src/services/cli-backend/server-manager.ts
index 47bb423b927..3e1afb44612 100644
--- a/packages/kilo-vscode/src/services/cli-backend/server-manager.ts
+++ b/packages/kilo-vscode/src/services/cli-backend/server-manager.ts
@@ -68,7 +68,7 @@ export class ServerManager {
           KILO_SERVER_PASSWORD: password,
           KILO_CLIENT: "vscode",
           KILO_ENABLE_QUESTION_TOOL: "true",
-          KILOCODE_FEATURE: "vscode-extension", // kilocode_change - feature tracking
+          KILOCODE_FEATURE: "vscode-extension",
           KILO_TELEMETRY_LEVEL: vscode.env.isTelemetryEnabled ? "all" : "off",
           KILO_APP_NAME: "kilo-code",
           KILO_EDITOR_NAME: vscode.env.appName,
@@ -130,7 +130,7 @@ export class ServerManager {
 
   private getCliPath(): string {
     // Always use the bundled binary from the extension directory
-    const binName = process.platform === "win32" ? "kilo.exe" : "kilo" // kilocode_change
+    const binName = process.platform === "win32" ? "kilo.exe" : "kilo"
     const cliPath = path.join(this.context.extensionPath, "bin", binName)
     console.log("[Kilo New] ServerManager: 📦 Using CLI path:", cliPath)
     return cliPath
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
index 12c3bf3057f..5d9643b8ef7 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-auto-method.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - Kilo Gateway TUI component
 /**
  * Custom OAuth handler for Kilo Gateway
  *
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-notifications.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-notifications.tsx
index 6f7700d55ba..63657146ad5 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-notifications.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-notifications.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 /**
  * Kilo Notifications Dialog
  *
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx
index 460062675b8..877ed17ddcf 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-organization.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - Kilo Gateway TUI component
 /**
  * Kilo Gateway Organization Selection Dialog
  *
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-profile.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-profile.tsx
index 228be5a44a0..468484ed0ff 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-profile.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-profile.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 /**
  * Kilo Gateway Profile Dialog
  *
diff --git a/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx b/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx
index a5868bdc2fe..2fe5c5fedac 100644
--- a/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx
+++ b/packages/opencode/src/kilocode/components/dialog-kilo-team-select.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - Kilo Gateway TUI component
 /**
  * Kilo Gateway Team Selection Dialog
  *
diff --git a/packages/opencode/src/kilocode/components/kilo-news.tsx b/packages/opencode/src/kilocode/components/kilo-news.tsx
index dc74da69131..6c5508de459 100644
--- a/packages/opencode/src/kilocode/components/kilo-news.tsx
+++ b/packages/opencode/src/kilocode/components/kilo-news.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 /**
  * Kilo News Component
  *
diff --git a/packages/opencode/src/kilocode/components/notification-banner.tsx b/packages/opencode/src/kilocode/components/notification-banner.tsx
index d0df494b031..f03ddfa47a4 100644
--- a/packages/opencode/src/kilocode/components/notification-banner.tsx
+++ b/packages/opencode/src/kilocode/components/notification-banner.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 /**
  * Kilo Notification Banner
  *
diff --git a/packages/opencode/src/kilocode/components/tips.tsx b/packages/opencode/src/kilocode/components/tips.tsx
index fcd1f3d4ae2..65218fe7043 100644
--- a/packages/opencode/src/kilocode/components/tips.tsx
+++ b/packages/opencode/src/kilocode/components/tips.tsx
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 
 import { For } from "solid-js"
 import { DEFAULT_THEMES, useTheme } from "@tui/context/theme"
diff --git a/packages/opencode/src/kilocode/config-injector.ts b/packages/opencode/src/kilocode/config-injector.ts
index 43488791da5..9aadd7e8a3d 100644
--- a/packages/opencode/src/kilocode/config-injector.ts
+++ b/packages/opencode/src/kilocode/config-injector.ts
@@ -1,8 +1,8 @@
 import { Config } from "../config/config"
 import { ModesMigrator } from "./modes-migrator"
-import { RulesMigrator } from "./rules-migrator" // kilocode_change
+import { RulesMigrator } from "./rules-migrator"
 import { WorkflowsMigrator } from "./workflows-migrator"
-import { IgnoreMigrator } from "./ignore-migrator" // kilocode_change
+import { IgnoreMigrator } from "./ignore-migrator"
 
 export namespace KilocodeConfigInjector {
   export interface InjectionResult {
@@ -46,7 +46,6 @@ export namespace KilocodeConfigInjector {
       config.command = workflowsMigration.commands
     }
 
-    // kilocode_change start - Rules migration
     if (options.includeRules !== false) {
       const rulesMigration = await RulesMigrator.migrate({
         projectDir: options.projectDir,
@@ -60,9 +59,7 @@ export namespace KilocodeConfigInjector {
         config.instructions = rulesMigration.instructions
       }
     }
-    // kilocode_change end
 
-    // kilocode_change start - Ignore migration
     if (options.includeIgnore !== false) {
       const ignoreMigration = await IgnoreMigrator.migrate({
         projectDir: options.projectDir,
@@ -75,7 +72,6 @@ export namespace KilocodeConfigInjector {
         config.permission = mergePermissions(config.permission, ignoreMigration.permission)
       }
     }
-    // kilocode_change end
 
     return {
       configJson: JSON.stringify(config),
diff --git a/packages/opencode/src/kilocode/const.ts b/packages/opencode/src/kilocode/const.ts
index 8f499daee99..605c09e4f12 100644
--- a/packages/opencode/src/kilocode/const.ts
+++ b/packages/opencode/src/kilocode/const.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 
 import { Installation } from "@/installation"
 
diff --git a/packages/opencode/src/kilocode/enhance-prompt.ts b/packages/opencode/src/kilocode/enhance-prompt.ts
index 72fd1a47d03..c6246a5a28e 100644
--- a/packages/opencode/src/kilocode/enhance-prompt.ts
+++ b/packages/opencode/src/kilocode/enhance-prompt.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import { Provider } from "@/provider/provider"
 import { LLM } from "@/session/llm"
 import { Agent } from "@/agent/agent"
diff --git a/packages/opencode/src/kilocode/ignore-migrator.ts b/packages/opencode/src/kilocode/ignore-migrator.ts
index 2898a94ac9d..9c1a7a8125d 100644
--- a/packages/opencode/src/kilocode/ignore-migrator.ts
+++ b/packages/opencode/src/kilocode/ignore-migrator.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 
 import * as path from "path"
 import os from "os"
diff --git a/packages/opencode/src/kilocode/index.ts b/packages/opencode/src/kilocode/index.ts
index 261ff142c74..e1a741ca489 100644
--- a/packages/opencode/src/kilocode/index.ts
+++ b/packages/opencode/src/kilocode/index.ts
@@ -2,6 +2,6 @@ export { ModesMigrator } from "./modes-migrator"
 export { RulesMigrator } from "./rules-migrator"
 export { WorkflowsMigrator } from "./workflows-migrator"
 export { McpMigrator } from "./mcp-migrator"
-export { IgnoreMigrator } from "./ignore-migrator" // kilocode_change
+export { IgnoreMigrator } from "./ignore-migrator"
 export { KilocodeConfigInjector } from "./config-injector"
 export { KilocodePaths } from "./paths"
diff --git a/packages/opencode/src/kilocode/modes-migrator.ts b/packages/opencode/src/kilocode/modes-migrator.ts
index 8d73cb916b2..1060ec5a08f 100644
--- a/packages/opencode/src/kilocode/modes-migrator.ts
+++ b/packages/opencode/src/kilocode/modes-migrator.ts
@@ -23,7 +23,6 @@ export namespace ModesMigrator {
   }
 
   // Default modes to skip - these have native Opencode equivalents
-  // kilocode_change - added "build" for backward compatibility after renaming "build" to "code"
   const DEFAULT_MODE_SLUGS = new Set(["code", "build", "architect", "ask", "debug", "orchestrator"])
 
   // Group to permission mapping
diff --git a/packages/opencode/src/kilocode/project-id.ts b/packages/opencode/src/kilocode/project-id.ts
index 0d58c246138..dee8e2e3021 100644
--- a/packages/opencode/src/kilocode/project-id.ts
+++ b/packages/opencode/src/kilocode/project-id.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import { Instance } from "@/project/instance"
 import path from "path"
 import { $ } from "bun"
diff --git a/packages/opencode/src/kilocode/review/command.ts b/packages/opencode/src/kilocode/review/command.ts
index 87baa024145..4022aa68272 100644
--- a/packages/opencode/src/kilocode/review/command.ts
+++ b/packages/opencode/src/kilocode/review/command.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import type { Command } from "@/command"
 import { Review } from "./review"
 
diff --git a/packages/opencode/src/kilocode/review/review.ts b/packages/opencode/src/kilocode/review/review.ts
index 3bf5072ef4b..4c84fbfa347 100644
--- a/packages/opencode/src/kilocode/review/review.ts
+++ b/packages/opencode/src/kilocode/review/review.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import { $ } from "bun"
 import { Log } from "@/util/log"
 import { Instance } from "@/project/instance"
diff --git a/packages/opencode/src/kilocode/review/types.ts b/packages/opencode/src/kilocode/review/types.ts
index f8ad7ff770d..eb4d919148a 100644
--- a/packages/opencode/src/kilocode/review/types.ts
+++ b/packages/opencode/src/kilocode/review/types.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import z from "zod"
 
 export const DiffHunk = z.object({
diff --git a/packages/opencode/src/kilocode/rules-migrator.ts b/packages/opencode/src/kilocode/rules-migrator.ts
index ed5543e0497..49ee235a405 100644
--- a/packages/opencode/src/kilocode/rules-migrator.ts
+++ b/packages/opencode/src/kilocode/rules-migrator.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 
 import * as fs from "fs/promises"
 import * as path from "path"
diff --git a/packages/opencode/src/kilocode/workflows-migrator.ts b/packages/opencode/src/kilocode/workflows-migrator.ts
index e3151e12c38..c5a709de2be 100644
--- a/packages/opencode/src/kilocode/workflows-migrator.ts
+++ b/packages/opencode/src/kilocode/workflows-migrator.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 
 import * as fs from "fs/promises"
 import * as path from "path"
diff --git a/packages/opencode/test/kilocode/config-injector.test.ts b/packages/opencode/test/kilocode/config-injector.test.ts
index 5260e2bc90e..f762eee601f 100644
--- a/packages/opencode/test/kilocode/config-injector.test.ts
+++ b/packages/opencode/test/kilocode/config-injector.test.ts
@@ -109,7 +109,6 @@ describe("KilocodeConfigInjector", () => {
       expect(config.command["deploy"]).toBeDefined()
     })
 
-    // kilocode_change start - Rules migration tests
     test("includes rules in config", async () => {
       await using tmp = await tmpdir({
         init: async (dir) => {
@@ -197,9 +196,7 @@ describe("KilocodeConfigInjector", () => {
 
       expect(result.warnings.some((w) => w.includes("Legacy"))).toBe(true)
     })
-    // kilocode_change end
 
-    // kilocode_change start - Ignore migration tests
     test("includes ignore patterns in config", async () => {
       await using tmp = await tmpdir({
         init: async (dir) => {
@@ -283,7 +280,6 @@ describe("KilocodeConfigInjector", () => {
       expect(config.permission.read["*.env"]).toBe("deny")
       expect(config.permission.read[".env.example"]).toBe("allow")
     })
-    // kilocode_change end
   })
 
   describe("getEnvVars", () => {
diff --git a/packages/opencode/test/kilocode/kilo-gateway-headers.test.ts b/packages/opencode/test/kilocode/kilo-gateway-headers.test.ts
index 32050c74bf1..2700b363e52 100644
--- a/packages/opencode/test/kilocode/kilo-gateway-headers.test.ts
+++ b/packages/opencode/test/kilocode/kilo-gateway-headers.test.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 import { describe, it, expect, afterEach } from "bun:test"
 import { buildKiloHeaders, getFeatureHeader, getEditorNameHeader } from "@kilocode/kilo-gateway"
 import { HEADER_FEATURE, ENV_FEATURE } from "@kilocode/kilo-gateway"
diff --git a/packages/opencode/test/kilocode/model-cache-org.test.ts b/packages/opencode/test/kilocode/model-cache-org.test.ts
index 9299cfa3ba5..7b70e0c8dfa 100644
--- a/packages/opencode/test/kilocode/model-cache-org.test.ts
+++ b/packages/opencode/test/kilocode/model-cache-org.test.ts
@@ -1,4 +1,3 @@
-// kilocode_change - new file
 // Regression test: OAuth accountId must flow into model fetch as kilocodeOrganizationId
 // When a user logs in via OAuth and selects an enterprise organization, the model fetch
 // should use the organization-specific endpoint, not the personal endpoint.