diff --git a/packages/kilo-vscode/src/kilo-provider/handlers/migration.ts b/packages/kilo-vscode/src/kilo-provider/handlers/migration.ts
index ee8a32f28a2..b95d630610f 100644
--- a/packages/kilo-vscode/src/kilo-provider/handlers/migration.ts
+++ b/packages/kilo-vscode/src/kilo-provider/handlers/migration.ts
@@ -114,15 +114,13 @@ export async function handleStartLegacyMigration(
       ctx.cachedLegacyData?.settings,
     )
 
-    // Dispose all instances after migration
-    // Reloading the data will be handled once the server replies with a global.disposed event
-    await ctx.disposeGlobal()
-
-    // Only mark as completed if at least one item succeeded — if everything failed
-    // the user can still re-run migration via Settings → About.
+    const failed = results.some((r) => r.status === "error")
     const success = results.some((r) => r.status === "success")
 
-    if (success) {
+    if (!failed && success) {
+      // Dispose all instances after a fully successful migration.
+      // Reloading the data will be handled once the server replies with a global.disposed event.
+      await ctx.disposeGlobal()
       await MigrationService.setMigrationStatus(
         ctx.extensionContext as Parameters<typeof MigrationService.setMigrationStatus>[0],
         "completed",
diff --git a/packages/kilo-vscode/src/legacy-migration/errors/migration-error.ts b/packages/kilo-vscode/src/legacy-migration/errors/migration-error.ts
new file mode 100644
index 00000000000..a54892df80e
--- /dev/null
+++ b/packages/kilo-vscode/src/legacy-migration/errors/migration-error.ts
@@ -0,0 +1,83 @@
+interface ErrorLike {
+  message?: unknown
+  status?: unknown
+  data?: unknown
+  body?: unknown
+}
+
+function isObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null
+}
+
+function getText(value: unknown): string | undefined {
+  if (typeof value === "string") {
+    const text = value.trim()
+    return text || undefined
+  }
+
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value)
+  }
+
+  return undefined
+}
+
+function getMessage(value: unknown) {
+  if (!isObject(value)) return undefined
+  return getText((value as ErrorLike).message)
+}
+
+function getStatus(value: unknown) {
+  if (!isObject(value)) return undefined
+  const status = (value as ErrorLike).status
+  return typeof status === "number" ? String(status) : getText(status)
+}
+
+function getBody(value: unknown) {
+  if (!isObject(value)) return undefined
+
+  const body = (value as ErrorLike).body
+  const text = getText(body)
+  if (text) return text
+
+  if (isObject(body)) {
+    const msg = getMessage(body)
+    if (msg) return msg
+  }
+
+  return undefined
+}
+
+function getData(value: unknown) {
+  if (!isObject(value)) return undefined
+
+  const data = (value as ErrorLike).data
+  const text = getText(data)
+  if (text) return text
+
+  if (isObject(data)) {
+    const msg = getMessage(data)
+    if (msg) return msg
+  }
+
+  return undefined
+}
+
+export function getMigrationErrorMessage(err: unknown) {
+  const message = getMessage(err)
+  if (message) return message
+
+  const body = getBody(err)
+  if (body) return body
+
+  const data = getData(err)
+  if (data) return data
+
+  const status = getStatus(err)
+  if (status) return `Request failed (${status})`
+
+  const text = getText(err)
+  if (text) return text
+
+  return "Unknown migration error"
+}
diff --git a/packages/kilo-vscode/src/legacy-migration/legacy-types.ts b/packages/kilo-vscode/src/legacy-migration/legacy-types.ts
index c5a9231d5ed..854a7655bfb 100644
--- a/packages/kilo-vscode/src/legacy-migration/legacy-types.ts
+++ b/packages/kilo-vscode/src/legacy-migration/legacy-types.ts
@@ -323,10 +323,3 @@ export interface MigrationSelections {
   defaultModel: boolean
   settings: MigrationSettingsSelections
 }
-
-export interface MigrationResultItem {
-  item: string
-  category: "provider" | "mcpServer" | "customMode" | "defaultModel" | "settings" | "session"
-  status: "success" | "warning" | "error"
-  message?: string
-}
diff --git a/packages/kilo-vscode/src/legacy-migration/migration-service.ts b/packages/kilo-vscode/src/legacy-migration/migration-service.ts
index b3e4986aac8..1f4d4117204 100644
--- a/packages/kilo-vscode/src/legacy-migration/migration-service.ts
+++ b/packages/kilo-vscode/src/legacy-migration/migration-service.ts
@@ -16,6 +16,7 @@ import type {
 } from "@kilocode/sdk/v2/client"
 import { PROVIDER_MAP, UNSUPPORTED_PROVIDERS, DEFAULT_MODE_SLUGS } from "./provider-mapping"
 import type { ProviderMapping } from "./provider-mapping"
+import { getMigrationErrorMessage } from "./errors/migration-error"
 import type {
   LegacyProviderProfiles,
   LegacyProviderSettings,
@@ -30,8 +31,9 @@ import type {
   MigrationProviderInfo,
   MigrationMcpServerInfo,
   MigrationCustomModeInfo,
-  MigrationResultItem,
 } from "./legacy-types"
+import type { MigrationResultItem } from "./migration-types"
+import { createSessionID } from "./sessions/lib/ids"
 import { migrate as migrateSession } from "./sessions/migrate"
 
 // ---------------------------------------------------------------------------
@@ -212,19 +214,16 @@ export async function migrate(
 
   if (selections.sessions?.length) {
     for (const id of selections.sessions) {
-      onProgress("Chat sessions", "migrating")
+      onProgress(id, "migrating")
       const result = await migrateSession(id, context, client)
+      const reason = result.ok ? "Session migrated" : result.message
       results.push({
         item: id,
         category: "session",
         status: result.ok ? "success" : "error",
-        message: result.ok ? "Session migrated" : "Session migration failed",
+        message: reason,
       })
-      onProgress(
-        "Chat sessions",
-        result.ok ? "success" : "error",
-        result.ok ? "Session migrated" : "Session migration failed",
-      )
+      onProgress(id, result.ok ? "success" : "error", reason)
     }
   }
 
@@ -666,7 +665,7 @@ async function migrateAutocomplete(settings: LegacyAutocompleteSettings): Promis
       item: "Autocomplete settings",
       category: "settings",
       status: "error",
-      message: err instanceof Error ? err.message : String(err),
+      message: getMigrationErrorMessage(err),
     }
   }
 }
@@ -714,7 +713,7 @@ async function migrateLanguage(language: string): Promise<MigrationResultItem> {
       item: "Language preference",
       category: "settings",
       status: "error",
-      message: err instanceof Error ? err.message : String(err),
+      message: getMigrationErrorMessage(err),
     }
   }
 }
diff --git a/packages/kilo-vscode/src/legacy-migration/migration-types.ts b/packages/kilo-vscode/src/legacy-migration/migration-types.ts
new file mode 100644
index 00000000000..bd32d39ffd5
--- /dev/null
+++ b/packages/kilo-vscode/src/legacy-migration/migration-types.ts
@@ -0,0 +1,6 @@
+export interface MigrationResultItem {
+  item: string
+  category: "provider" | "mcpServer" | "customMode" | "defaultModel" | "settings" | "session"
+  status: "success" | "warning" | "error"
+  message?: string
+}
diff --git a/packages/kilo-vscode/src/legacy-migration/sessions/migrate.ts b/packages/kilo-vscode/src/legacy-migration/sessions/migrate.ts
index 8ca481e3178..0fa38fdaf0d 100644
--- a/packages/kilo-vscode/src/legacy-migration/sessions/migrate.ts
+++ b/packages/kilo-vscode/src/legacy-migration/sessions/migrate.ts
@@ -1,9 +1,22 @@
 import * as vscode from "vscode"
 import type { KiloClient } from "@kilocode/sdk/v2/client"
+import { getMigrationErrorMessage } from "../errors/migration-error"
 import type { LegacyHistoryItem } from "./lib/legacy-types"
 import { parseSession } from "./parser"
 
-export async function migrate(id: string, context: vscode.ExtensionContext, client: KiloClient) {
+type Result =
+  | {
+      ok: true
+      skipped?: boolean
+      payload: Awaited<ReturnType<typeof parseSession>>
+    }
+  | {
+      ok: false
+      payload: Awaited<ReturnType<typeof parseSession>>
+      message: string
+    }
+
+export async function migrate(id: string, context: vscode.ExtensionContext, client: KiloClient): Promise<Result> {
   const dir = vscode.Uri.joinPath(context.globalStorageUri, "tasks").fsPath
   const items = context.globalState.get<LegacyHistoryItem[]>("taskHistory", [])
   const item = items.find((item) => item.id === id)
@@ -46,7 +59,7 @@ export async function migrate(id: string, context: vscode.ExtensionContext, clie
     return {
       ok: false,
       payload,
-      error,
+      message: getMigrationErrorMessage(error),
     }
   }
 }
diff --git a/packages/kilo-vscode/webview-ui/src/components/migration/MigrationWizard.tsx b/packages/kilo-vscode/webview-ui/src/components/migration/MigrationWizard.tsx
index 3cfda340070..deca1fdb570 100644
--- a/packages/kilo-vscode/webview-ui/src/components/migration/MigrationWizard.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/migration/MigrationWizard.tsx
@@ -8,6 +8,7 @@
 
 import { Show, createSignal, onMount, onCleanup } from "solid-js"
 import type { Component, JSX } from "solid-js"
+import { showToast } from "@kilocode/kilo-ui/toast"
 import { useVSCode } from "../../context/vscode"
 import { useLanguage } from "../../context/language"
 import type {
@@ -154,7 +155,7 @@ const WarningSvg = (): JSX.Element => (
 // ---------------------------------------------------------------------------
 
 type Screen = "whats-new" | "migrate"
-type MigratePhase = "selecting" | "migrating" | "done"
+type MigratePhase = "selecting" | "migrating" | "error" | "done"
 
 interface ProgressEntry {
   item: string
@@ -263,7 +264,11 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
       if (msg?.type === "legacyMigrationComplete") {
         const complete = msg as LegacyMigrationCompleteMessage
         setResults(complete.results)
-        setPhase("done")
+        const hasErrors = complete.results.some((r) => r.status === "error")
+        setPhase(hasErrors ? "error" : "done")
+        if (!hasErrors) {
+          vscode.postMessage({ type: "loadSessions" })
+        }
       }
     }
 
@@ -323,8 +328,8 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
         const mode = customModes().find((m) => m.slug === slug)
         return { item: mode?.name ?? slug, group: "customModes", status: "pending" as const }
       }),
-      ...(migrateSessions() && sessions().length > 0
-        ? [{ item: "Chat sessions", group: "sessions", status: "pending" as const }]
+      ...(migrateSessions()
+        ? sessions().map((id) => ({ item: id, group: "sessions", status: "pending" as const }))
         : []),
       ...(migrateDefaultModel() && defaultModel()
         ? [{ item: "Default model", group: "defaultModel", status: "pending" as const }]
@@ -382,6 +387,11 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
     props.onComplete()
   }
 
+  const copySessionError = async (text: string) => {
+    await navigator.clipboard.writeText(text)
+    showToast({ variant: "success", title: language.t("migration.error.toast.copied") })
+  }
+
   // ---------------------------------------------------------------------------
   // Data helpers
   // ---------------------------------------------------------------------------
@@ -431,17 +441,19 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
 
   // Group-level status for progress display
   const groupStatus = (group: string): ProgressEntry["status"] => {
-    const entries = progressEntries().filter((e) => e.group === group)
+    const entries = progressEntries().filter((entry) => entry.group === group)
     if (entries.length === 0) return "pending"
-    if (entries.some((e) => e.status === "error")) return "error"
-    if (entries.some((e) => e.status === "warning")) return "warning"
-    if (entries.every((e) => e.status === "success")) return "success"
-    if (entries.some((e) => e.status === "migrating")) return "migrating"
+    if (entries.some((entry) => entry.status === "error")) return "error"
+    if (entries.some((entry) => entry.status === "warning")) return "warning"
+    if (entries.every((entry) => entry.status === "success")) return "success"
+    if (entries.some((entry) => entry.status === "migrating")) return "migrating"
     return "pending"
   }
 
-  const successCount = () => results().filter((r) => r.status === "success").length
+  const successCount = () => results().filter((result) => result.status === "success").length
   const totalCount = () => results().length
+  const groupMessage = (group: string) =>
+    progressEntries().find((entry) => entry.group === group && entry.status === "error")?.message
 
   // ---------------------------------------------------------------------------
   // Status icon renderer
@@ -677,8 +689,33 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
                     </label>
                   </Show>
                   <div class="migration-wizard__item-text">
-                    <div class="label">Chat Sessions &amp; History</div>
-                    <div class="desc">{sessions().length} sessions detected</div>
+                    <div class="label">{language.t("migration.migrate.chatHistory")}</div>
+                    <div class="desc">
+                      {language.t("migration.migrate.sessionsDetected", { count: String(sessions().length) })}
+                    </div>
+                    <Show
+                      when={
+                        (phase() === "error" || phase() === "done") &&
+                        groupStatus("sessions") === "error" &&
+                        groupMessage("sessions")
+                      }
+                    >
+                      <div class="migration-wizard__error-box">
+                        <div class="migration-wizard__error-box-header">
+                          <div class="migration-wizard__error-box-title">
+                            {language.t("migration.error.sessionFailed")}
+                          </div>
+                          <button
+                            type="button"
+                            class="migration-wizard__copy-btn"
+                            onClick={() => void copySessionError(groupMessage("sessions")!)}
+                          >
+                            {language.t("migration.error.action.copy")}
+                          </button>
+                        </div>
+                        <div class="migration-wizard__error-text">{groupMessage("sessions")}</div>
+                      </div>
+                    </Show>
                   </div>
                 </div>
               </Show>
@@ -768,6 +805,7 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
               </Show>
 
               {/* Cleanup option after done */}
+              {/*
               <Show when={phase() === "done"}>
                 <div class="migration-wizard__divider" />
                 <div class="migration-wizard__item migration-wizard__item--clickable">
@@ -787,6 +825,7 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
                   </div>
                 </div>
               </Show>
+              */}
             </div>
           </Show>
 
@@ -818,6 +857,18 @@ const MigrationWizard: Component<MigrationWizardProps> = (props) => {
                   {language.t("migration.migrate.button")}
                 </button>
               </Show>
+              <Show when={phase() === "error"}>
+                <button
+                  type="button"
+                  class="migration-wizard__btn migration-wizard__btn--primary"
+                  onClick={() => {
+                    vscode.postMessage({ type: "loadSessions" })
+                    setPhase("done")
+                  }}
+                >
+                  {language.t("migration.error.continue")}
+                </button>
+              </Show>
               <Show when={phase() === "done"}>
                 <button type="button" class="migration-wizard__btn migration-wizard__btn--primary" onClick={handleDone}>
                   {language.t("migration.complete.done")}
diff --git a/packages/kilo-vscode/webview-ui/src/components/migration/migration.css b/packages/kilo-vscode/webview-ui/src/components/migration/migration.css
index 52d29f4a028..8700ef023a2 100644
--- a/packages/kilo-vscode/webview-ui/src/components/migration/migration.css
+++ b/packages/kilo-vscode/webview-ui/src/components/migration/migration.css
@@ -171,7 +171,7 @@
 
 .migration-wizard__item {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   gap: 14px;
   padding: 11px 20px;
   border-top: 1px solid var(--vscode-panel-border);
@@ -299,6 +299,83 @@
   margin-top: 1px;
 }
 
+.migration-wizard__error-text {
+  font-size: 11px;
+  color: var(--vscode-errorForeground);
+  line-height: 1.4;
+  margin-top: 4px;
+}
+
+.migration-wizard__error-box {
+  margin-top: 12px;
+  padding: 12px 14px;
+  border: 1px solid color-mix(in srgb, var(--vscode-errorForeground) 28%, transparent);
+  border-radius: 12px;
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--vscode-errorForeground) 8%, transparent), transparent),
+    color-mix(in srgb, var(--vscode-editor-background) 92%, var(--vscode-errorForeground) 8%);
+  box-shadow:
+    inset 0 1px 0 rgba(255, 255, 255, 0.04),
+    0 10px 24px rgba(0, 0, 0, 0.14);
+}
+
+.migration-wizard__error-box-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  margin-bottom: 8px;
+}
+
+.migration-wizard__error-box-title {
+  font-size: 12px;
+  font-weight: 700;
+  color: var(--vscode-foreground);
+  letter-spacing: 0.01em;
+}
+
+.migration-wizard__error-box .migration-wizard__error-text {
+  margin-top: 0;
+  font-size: 12px;
+  line-height: 1.55;
+  color: color-mix(in srgb, var(--vscode-errorForeground) 92%, white 8%);
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+.migration-wizard__copy-btn {
+  appearance: none;
+  border: 1px solid var(--vscode-panel-border);
+  background: var(--vscode-editorWidget-background, var(--vscode-editor-background));
+  color: var(--vscode-foreground);
+  border-radius: 8px;
+  padding: 5px 10px;
+  min-height: 28px;
+  font-family: var(--vscode-font-family);
+  font-size: 11px;
+  font-weight: 600;
+  cursor: pointer;
+  transition:
+    background 0.16s ease,
+    border-color 0.16s ease,
+    transform 0.16s ease,
+    box-shadow 0.16s ease;
+}
+
+.migration-wizard__copy-btn:hover {
+  background: var(--vscode-list-hoverBackground);
+  border-color: var(--vscode-focusBorder);
+}
+
+.migration-wizard__copy-btn:active {
+  background: var(--vscode-toolbar-hoverBackground, var(--vscode-list-hoverBackground));
+}
+
+.migration-wizard__copy-btn:focus-visible {
+  outline: 1px solid var(--vscode-focusBorder);
+  outline-offset: 2px;
+}
+
 /* Disabled items */
 .migration-wizard__item--disabled {
   opacity: 0.45;
@@ -430,4 +507,9 @@ body.vscode-high-contrast-light {
   .migration-wizard__divider {
     background: var(--vscode-contrastBorder, var(--vscode-panel-border));
   }
+
+  .migration-wizard__error-box,
+  .migration-wizard__copy-btn {
+    border-color: var(--vscode-contrastBorder, var(--vscode-errorForeground));
+  }
 }
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
index d915e5ff3f0..07fead8a5e8 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts
@@ -1265,6 +1265,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "هذا يزيل الإعدادات القديمة من مساحة تخزين VS Code. لن تتمكن من إعادة تشغيل هذا الترحيل.",
   "migration.complete.done": "تم",
+  "migration.migrate.sessionsDetected": "تم اكتشاف {{count}} جلسة",
+  "migration.error.sessionFailed": "فشل ترحيل الجلسة",
+  "migration.error.continue": "متابعة",
+  "migration.error.action.copy": "نسخ",
+  "migration.error.toast.copied": "تم نسخ الخطأ إلى الحافظة",
   // legacy-migration end
 
   "error.details.show": "التفاصيل",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
index 646ace5e035..dd710e0d2ba 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts
@@ -1294,6 +1294,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Isso remove as configurações antigas do armazenamento do VS Code. Você não poderá executar esta migração novamente.",
   "migration.complete.done": "Concluído",
+  "migration.migrate.sessionsDetected": "{{count}} sessões detectadas",
+  "migration.error.sessionFailed": "Falha na migração da sessão",
+  "migration.error.continue": "Continuar",
+  "migration.error.action.copy": "Copiar",
+  "migration.error.toast.copied": "Erro copiado para a área de transferência",
   // legacy-migration end
 
   "error.details.show": "Detalhes",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
index 5dfa0817e15..d651b1708cc 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts
@@ -1290,6 +1290,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Ovo uklanja stare postavke iz VS Code pohrane. Nećete moći ponovo pokrenuti ovu migraciju.",
   "migration.complete.done": "Završeno",
+  "migration.migrate.sessionsDetected": "Otkrivene {{count}} sesije",
+  "migration.error.sessionFailed": "Migracija sesije nije uspjela",
+  "migration.error.continue": "Nastavi",
+  "migration.error.action.copy": "Kopiraj",
+  "migration.error.toast.copied": "Greška kopirana u međuspremnik",
   // legacy-migration end
 
   "error.details.show": "Detalji",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
index 161c3a283ca..cbf62eaae09 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts
@@ -1281,6 +1281,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Dette fjerner de gamle indstillinger fra VS Code-lageret. Du vil ikke kunne køre denne migrering igen.",
   "migration.complete.done": "Færdig",
+  "migration.migrate.sessionsDetected": "{{count}} sessioner fundet",
+  "migration.error.sessionFailed": "Sessionsmigrering mislykkedes",
+  "migration.error.continue": "Fortsæt",
+  "migration.error.action.copy": "Kopiér",
+  "migration.error.toast.copied": "Fejl kopieret til udklipsholder",
   // legacy-migration end
 
   "error.details.show": "Detaljer",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
index efe7ecdf898..5888adcd053 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts
@@ -1308,6 +1308,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Dadurch werden die alten Einstellungen aus dem VS Code-Speicher entfernt. Sie können diese Migration danach nicht erneut ausführen.",
   "migration.complete.done": "Fertig",
+  "migration.migrate.sessionsDetected": "{{count}} Sitzungen erkannt",
+  "migration.error.sessionFailed": "Sitzungsmigration fehlgeschlagen",
+  "migration.error.continue": "Weiter",
+  "migration.error.action.copy": "Kopieren",
+  "migration.error.toast.copied": "Fehler in die Zwischenablage kopiert",
   // legacy-migration end
 
   "error.details.show": "Details",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
index 7e5d1c0f01e..3056c9693e8 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts
@@ -1274,6 +1274,7 @@ export const dict = {
   "migration.migrate.keysDetected": "{{count}} keys detected",
   "migration.migrate.serversConfigured": "{{count}} server(s) configured",
   "migration.migrate.modesFound": "{{count}} mode(s) found",
+  "migration.migrate.sessionsDetected": "{{count}} sessions detected",
   "migration.migrate.nothingToMigrate": "Nothing to migrate was found in the legacy settings.",
 
   // Migrate — item labels (reused from old select keys)
@@ -1291,6 +1292,10 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "This removes the old settings from VS Code storage. You will not be able to re-run this migration.",
   "migration.complete.done": "Done",
+  "migration.error.sessionFailed": "Session migration failed",
+  "migration.error.continue": "Continue",
+  "migration.error.action.copy": "Copy",
+  "migration.error.toast.copied": "Error copied to clipboard",
   // legacy-migration end
 
   "error.details.show": "Details",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
index 1b0a8b80b3a..c79e2616153 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts
@@ -1281,6 +1281,7 @@ export const dict = {
   "migration.migrate.keysDetected": "{{count}} claves detectadas",
   "migration.migrate.serversConfigured": "{{count}} servidor(es) configurado(s)",
   "migration.migrate.modesFound": "{{count}} modo(s) encontrado(s)",
+  "migration.migrate.sessionsDetected": "{{count}} sesiones detectadas",
   "migration.migrate.nothingToMigrate": "No se encontró nada para migrar en la configuración heredada.",
 
   // Migrate — item labels (reused from old select keys)
@@ -1298,6 +1299,10 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Esto elimina la configuración antigua del almacenamiento de VS Code. No podrás volver a ejecutar esta migración.",
   "migration.complete.done": "Hecho",
+  "migration.error.sessionFailed": "La migración de la sesión falló",
+  "migration.error.continue": "Continuar",
+  "migration.error.action.copy": "Copiar",
+  "migration.error.toast.copied": "Error copiado al portapapeles",
   // legacy-migration end
 
   "error.details.show": "Detalles",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
index e1865dbfbae..e40a9637284 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts
@@ -1311,6 +1311,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Cela supprime les anciens paramètres du stockage de VS Code. Vous ne pourrez pas réexécuter cette migration.",
   "migration.complete.done": "Terminé",
+  "migration.migrate.sessionsDetected": "{{count}} sessions détectées",
+  "migration.error.sessionFailed": "La migration de la session a échoué",
+  "migration.error.continue": "Continuer",
+  "migration.error.action.copy": "Copier",
+  "migration.error.toast.copied": "Erreur copiée dans le presse-papiers",
   // legacy-migration end
 
   "error.details.show": "Détails",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
index 038f2a7f4b6..fc4cc4995a5 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts
@@ -1280,6 +1280,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "VS Codeのストレージから古い設定を削除します。この移行を再度実行することはできなくなります。",
   "migration.complete.done": "完了",
+  "migration.migrate.sessionsDetected": "{{count}} 件のセッションが見つかりました",
+  "migration.error.sessionFailed": "セッションの移行に失敗しました",
+  "migration.error.continue": "続行",
+  "migration.error.action.copy": "コピー",
+  "migration.error.toast.copied": "エラーをクリップボードにコピーしました",
   // legacy-migration end
 
   "error.details.show": "詳細",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
index fd28bd4da0c..9a056f021b0 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts
@@ -1268,6 +1268,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "이 작업은 VS Code 저장소에서 이전 설정을 제거합니다. 이 마이그레이션을 다시 실행할 수 없게 됩니다.",
   "migration.complete.done": "완료",
+  "migration.migrate.sessionsDetected": "{{count}}개의 세션이 감지되었습니다",
+  "migration.error.sessionFailed": "세션 마이그레이션에 실패했습니다",
+  "migration.error.continue": "계속",
+  "migration.error.action.copy": "복사",
+  "migration.error.toast.copied": "오류가 클립보드에 복사되었습니다",
   // legacy-migration end
 
   "error.details.show": "상세 정보",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
index 14dd51e58ef..5fde27fab3c 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts
@@ -1285,6 +1285,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Dit verwijdert de oude instellingen uit de VS Code-opslag. U zult deze migratie niet opnieuw kunnen uitvoeren.",
   "migration.complete.done": "Klaar",
+  "migration.migrate.sessionsDetected": "{{count}} sessies gedetecteerd",
+  "migration.error.sessionFailed": "Sessiemigratie is mislukt",
+  "migration.error.continue": "Doorgaan",
+  "migration.error.action.copy": "Kopiëren",
+  "migration.error.toast.copied": "Fout gekopieerd naar het klembord",
   // legacy-migration end
 
   "error.details.show": "Details",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
index 306fd74428a..5b37f25ba65 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts
@@ -1281,6 +1281,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Dette fjerner de gamle innstillingene fra VS Code-lagringen. Du vil ikke kunne kjøre denne migreringen på nytt.",
   "migration.complete.done": "Ferdig",
+  "migration.migrate.sessionsDetected": "{{count}} økter oppdaget",
+  "migration.error.sessionFailed": "Øktmigrering mislyktes",
+  "migration.error.continue": "Fortsett",
+  "migration.error.action.copy": "Kopier",
+  "migration.error.toast.copied": "Feil kopiert til utklippstavlen",
   // legacy-migration end
 
   "task.todos.progress": "{{done}}/{{total}} oppgaver fullført",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
index 3518ab6cd44..cd124b46834 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts
@@ -1289,6 +1289,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Spowoduje to usunięcie starych ustawień z magazynu VS Code. Nie będzie można ponownie uruchomić tej migracji.",
   "migration.complete.done": "Gotowe",
+  "migration.migrate.sessionsDetected": "Wykryto {{count}} sesji",
+  "migration.error.sessionFailed": "Migracja sesji nie powiodła się",
+  "migration.error.continue": "Kontynuuj",
+  "migration.error.action.copy": "Kopiuj",
+  "migration.error.toast.copied": "Błąd skopiowano do schowka",
   // legacy-migration end
 
   "error.details.show": "Szczegóły",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
index 7f5866475dc..1b9534cf5f7 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts
@@ -1288,6 +1288,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Это удалит старые настройки из хранилища VS Code. Вы не сможете запустить эту миграцию повторно.",
   "migration.complete.done": "Готово",
+  "migration.migrate.sessionsDetected": "Обнаружено {{count}} сеансов",
+  "migration.error.sessionFailed": "Не удалось перенести сеанс",
+  "migration.error.continue": "Продолжить",
+  "migration.error.action.copy": "Копировать",
+  "migration.error.toast.copied": "Ошибка скопирована в буфер обмена",
   // legacy-migration end
 
   "error.details.show": "Подробности",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
index f19a93d25aa..75cc91ba313 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts
@@ -1264,6 +1264,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "การดำเนินการนี้จะลบการตั้งค่าเดิมจากที่เก็บข้อมูล VS Code คุณจะไม่สามารถเรียกใช้การย้ายข้อมูลนี้ได้อีก",
   "migration.complete.done": "เสร็จสิ้น",
+  "migration.migrate.sessionsDetected": "ตรวจพบ {{count}} เซสชัน",
+  "migration.error.sessionFailed": "การย้ายเซสชันล้มเหลว",
+  "migration.error.continue": "ดำเนินการต่อ",
+  "migration.error.action.copy": "คัดลอก",
+  "migration.error.toast.copied": "คัดลอกข้อผิดพลาดไปยังคลิปบอร์ดแล้ว",
   // legacy-migration end
 
   "error.details.show": "รายละเอียด",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
index ff0dc211a26..fd96783b5b1 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts
@@ -1278,6 +1278,11 @@ export const dict = {
   "migration.complete.cleanupDescription":
     "Bu, VS Code depolamasından eski ayarları kaldırır. Bu taşımayı yeniden çalıştıramazsınız.",
   "migration.complete.done": "Bitti",
+  "migration.migrate.sessionsDetected": "{{count}} oturum bulundu",
+  "migration.error.sessionFailed": "Oturum taşıma işlemi başarısız oldu",
+  "migration.error.continue": "Devam et",
+  "migration.error.action.copy": "Kopyala",
+  "migration.error.toast.copied": "Hata panoya kopyalandı",
   // legacy-migration end
 
   "error.details.show": "Ayrıntılar",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
index f7eb55f25c5..0accaba0ffa 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts
@@ -1241,6 +1241,11 @@ export const dict = {
   "migration.complete.cleanup": "清除旧版设置数据",
   "migration.complete.cleanupDescription": "此操作将从 VS Code 存储中删除旧版设置。您将无法再次运行此迁移。",
   "migration.complete.done": "完成",
+  "migration.migrate.sessionsDetected": "检测到 {{count}} 个会话",
+  "migration.error.sessionFailed": "会话迁移失败",
+  "migration.error.continue": "继续",
+  "migration.error.action.copy": "复制",
+  "migration.error.toast.copied": "错误已复制到剪贴板",
   // legacy-migration end
 
   "error.details.show": "详细信息",
diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
index 677e7ed3478..eaab4c6cf7f 100644
--- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
+++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts
@@ -1244,6 +1244,11 @@ export const dict = {
   "migration.complete.cleanup": "清除舊版設定資料",
   "migration.complete.cleanupDescription": "此操作將從 VS Code 儲存中刪除舊版設定。您將無法再次執行此遷移。",
   "migration.complete.done": "完成",
+  "migration.migrate.sessionsDetected": "偵測到 {{count}} 個工作階段",
+  "migration.error.sessionFailed": "工作階段遷移失敗",
+  "migration.error.continue": "繼續",
+  "migration.error.action.copy": "複製",
+  "migration.error.toast.copied": "錯誤已複製到剪貼簿",
   // legacy-migration end
 
   "error.details.show": "詳細資訊",
diff --git a/packages/opencode/src/kilocode/session-import/service.ts b/packages/opencode/src/kilocode/session-import/service.ts
index 9c61a257182..d3eab7ab5bb 100644
--- a/packages/opencode/src/kilocode/session-import/service.ts
+++ b/packages/opencode/src/kilocode/session-import/service.ts
@@ -9,6 +9,7 @@ const target = (input: unknown) => input as never
 
 export namespace SessionImportService {
   export async function project(input: SessionImportType.Project): Promise<SessionImportType.Result> {
+
     // Do not resolve an empty legacy worktree, because that would fall back to the current
     // process directory and silently attach the migrated session to the wrong project.
     if (!input.worktree.trim()) {