oh-my-opencode 5.1.32 → 5.1.34

package/dist/index.js

@@ -4713,11 +4713,6 @@ function formatDurationHuman(milliseconds) {
   return `${seconds}s`;
 }
 
-// packages/utils/src/shell-command-escape.ts
-function shellEscapeForDoubleQuotedCommand(value) {
-  return value.replace(/\\/g, "\\\\").replace(/\$/g, "\\$").replace(/`/g, "\\`").replace(/"/g, "\\\"").replace(/;/g, "\\;").replace(/\|/g, "\\|").replace(/&/g, "\\&").replace(/#/g, "\\#").replace(/\(/g, "\\(").replace(/\)/g, "\\)");
-}
-
 // packages/utils/src/jsonc-parser.ts
 function stripBom3(content) {
   return content.charCodeAt(0) === 65279 ? content.slice(1) : content;
@@ -6187,58 +6182,52 @@ function toGitFileStatus(statusToken) {
     return "deleted";
   return "modified";
 }
-function normalizeGitStatusPath(statusToken, filePath) {
-  if (statusToken !== "R" && statusToken !== "C")
-    return filePath;
-  const arrowIndex = filePath.lastIndexOf(" -> ");
-  return arrowIndex === -1 ? filePath : filePath.slice(arrowIndex + 4);
-}
-function parseGitStatusPorcelainLine(line) {
-  if (!line)
-    return null;
-  const statusToken = line.substring(0, 2).trim();
-  const filePath = normalizeGitStatusPath(statusToken, line.substring(3));
-  if (!filePath)
-    return null;
-  return {
-    filePath,
-    status: toGitFileStatus(statusToken)
-  };
-}
 
-// packages/utils/src/git-worktree/parse-status-porcelain.ts
-function parseGitStatusPorcelain(output) {
+// packages/utils/src/git-worktree/parse-status-porcelain-z.ts
+function parseGitStatusPorcelainZ(output) {
   const map = new Map;
   if (!output)
     return map;
-  for (const line of output.split(`
-`)) {
-    const parsed = parseGitStatusPorcelainLine(line);
-    if (!parsed)
+  const fields = output.split("\x00");
+  for (let index = 0;index < fields.length; index++) {
+    const record = fields[index];
+    if (record.length < 4)
       continue;
-    map.set(parsed.filePath, parsed.status);
+    const statusCode = record.substring(0, 2);
+    map.set(record.substring(3), statusCode.includes("C") ? "added" : toGitFileStatus(statusCode.trim()));
+    if (statusCode.includes("R") || statusCode.includes("C"))
+      index++;
   }
   return map;
 }
-var init_parse_status_porcelain = () => {};
+var init_parse_status_porcelain_z = () => {};
 
-// packages/utils/src/git-worktree/parse-diff-numstat.ts
-function parseGitDiffNumstat(output, statusMap) {
+// packages/utils/src/git-worktree/parse-diff-numstat-z.ts
+function toCount(value) {
+  return value === "-" ? 0 : parseInt(value, 10);
+}
+function parseGitDiffNumstatZ(output, statusMap) {
   if (!output)
     return [];
   const stats = [];
-  for (const line of output.split(`
-`)) {
-    const parts = line.split("\t");
-    if (parts.length < 3)
+  const fields = output.split("\x00");
+  for (let index = 0;index < fields.length; index++) {
+    const field = fields[index];
+    const firstTab = field.indexOf("\t");
+    const secondTab = field.indexOf("\t", firstTab + 1);
+    if (firstTab === -1 || secondTab === -1)
+      continue;
+    let path = field.slice(secondTab + 1);
+    if (path === "") {
+      index += 2;
+      path = fields[index];
+    }
+    if (!path)
       continue;
-    const [addedStr, removedStr, path] = parts;
-    const added = addedStr === "-" ? 0 : parseInt(addedStr, 10);
-    const removed = removedStr === "-" ? 0 : parseInt(removedStr, 10);
     stats.push({
       path,
-      added,
-      removed,
+      added: toCount(field.slice(0, firstTab)),
+      removed: toCount(field.slice(firstTab + 1, secondTab)),
       status: statusMap.get(path) ?? "modified"
     });
   }
@@ -6251,46 +6240,43 @@ import * as fs3 from "fs";
 import { join as join12 } from "path";
 function collectGitDiffStats(directory) {
   try {
-    const diffOutput = childProcess.execFileSync("git", ["diff", "--numstat", "HEAD"], {
+    const diffOutput = childProcess.execFileSync("git", ["diff", "--numstat", "-z", "-M", "HEAD"], {
       cwd: directory,
       encoding: "utf-8",
       timeout: 5000,
       stdio: ["pipe", "pipe", "pipe"]
-    }).trimEnd();
-    const statusOutput = childProcess.execFileSync("git", ["status", "--porcelain"], {
+    });
+    const statusOutput = childProcess.execFileSync("git", ["status", "--porcelain", "-z", "--find-renames", "--untracked-files=all"], {
       cwd: directory,
       encoding: "utf-8",
       timeout: 5000,
       stdio: ["pipe", "pipe", "pipe"]
-    }).trimEnd();
-    const untrackedOutput = childProcess.execFileSync("git", ["ls-files", "--others", "--exclude-standard"], {
+    });
+    const untrackedOutput = childProcess.execFileSync("git", ["ls-files", "-z", "--others", "--exclude-standard"], {
       cwd: directory,
       encoding: "utf-8",
       timeout: 5000,
       stdio: ["pipe", "pipe", "pipe"]
-    }).trimEnd();
-    const untrackedNumstat = untrackedOutput ? untrackedOutput.split(`
-`).filter(Boolean).map((filePath) => {
+    });
+    const untrackedNumstat = untrackedOutput ? untrackedOutput.split("\x00").filter(Boolean).map((filePath) => {
       try {
         const content = fs3.readFileSync(join12(directory, filePath), "utf-8");
         const lineCount = content.split(`
 `).length - (content.endsWith(`
 `) ? 1 : 0);
-        return `${lineCount}	0	${filePath}`;
+        return `${lineCount}	0	${filePath}\x00`;
       } catch (error) {
         if (!(error instanceof Error)) {
           throw error;
         }
-        return `0	0	${filePath}`;
+        return `0	0	${filePath}\x00`;
       }
-    }).join(`
-`) : "";
-    const combinedNumstat = [diffOutput, untrackedNumstat].filter(Boolean).join(`
-`).trim();
+    }).join("") : "";
+    const combinedNumstat = diffOutput + untrackedNumstat;
     if (!combinedNumstat)
       return [];
-    const statusMap = parseGitStatusPorcelain(statusOutput);
-    return parseGitDiffNumstat(combinedNumstat, statusMap);
+    const statusMap = parseGitStatusPorcelainZ(statusOutput);
+    return parseGitDiffNumstatZ(combinedNumstat, statusMap);
   } catch (error) {
     if (!(error instanceof Error)) {
       throw error;
@@ -6299,13 +6285,18 @@ function collectGitDiffStats(directory) {
   }
 }
 var init_collect_git_diff_stats = __esm(() => {
-  init_parse_status_porcelain();
+  init_parse_status_porcelain_z();
 });
 
 // packages/utils/src/git-worktree/format-file-changes.ts
 function normalizePath(path) {
   return path.replaceAll("\\", "/");
 }
+function displayPath2(path) {
+  if (!UNSAFE_DISPLAY_CHARACTER.test(path))
+    return path;
+  return JSON.stringify(path).replace(UNSAFE_DISPLAY_CHARACTERS, (character) => `\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
 function formatFileChanges(stats, notepadPath) {
   if (stats.length === 0)
     return `[FILE CHANGES SUMMARY]
@@ -6318,21 +6309,21 @@ No file changes detected.
   if (modified.length > 0) {
     lines.push("Modified files:");
     for (const f of modified) {
-      lines.push(`  ${f.path}  (+${f.added}, -${f.removed})`);
+      lines.push(`  ${displayPath2(f.path)}  (+${f.added}, -${f.removed})`);
     }
     lines.push("");
   }
   if (added.length > 0) {
     lines.push("Created files:");
     for (const f of added) {
-      lines.push(`  ${f.path}  (+${f.added})`);
+      lines.push(`  ${displayPath2(f.path)}  (+${f.added})`);
     }
     lines.push("");
   }
   if (deleted.length > 0) {
     lines.push("Deleted files:");
     for (const f of deleted) {
-      lines.push(`  ${f.path}  (-${f.removed})`);
+      lines.push(`  ${displayPath2(f.path)}  (-${f.removed})`);
     }
     lines.push("");
   }
@@ -6344,17 +6335,23 @@ No file changes detected.
     });
     if (notepadStat) {
       lines.push("[NOTEPAD UPDATED]");
-      lines.push(`  ${notepadStat.path}  (+${notepadStat.added})`);
+      lines.push(`  ${displayPath2(notepadStat.path)}  (+${notepadStat.added})`);
       lines.push("");
     }
   }
   return lines.join(`
 `);
 }
+var UNSAFE_DISPLAY_CHARACTER, UNSAFE_DISPLAY_CHARACTERS;
+var init_format_file_changes = __esm(() => {
+  UNSAFE_DISPLAY_CHARACTER = /[\p{Cc}\u2028\u2029]/u;
+  UNSAFE_DISPLAY_CHARACTERS = /[\p{Cc}\u2028\u2029]/gu;
+});
 
 // packages/utils/src/git-worktree/index.ts
 var init_git_worktree = __esm(() => {
   init_collect_git_diff_stats();
+  init_format_file_changes();
 });
 
 // packages/utils/src/internal-initiator-marker.ts
@@ -8331,9 +8328,22 @@ function buildTmuxAttachCommand(serverUrl, sessionId, directory = process.cwd())
   const escapedDirectory = shellQuoteForNestedCommand(directory || process.cwd());
   return `${TMUX_COMMAND_SHELL} -c "opencode attach ${escapedUrl} --session ${escapedSessionId} --dir ${escapedDirectory}"`;
 }
+function withoutNul(value) {
+  return value.replaceAll("\x00", "");
+}
+function escapeTmuxFormat(value) {
+  return value.replaceAll("#", "##");
+}
+function buildSubagentPaneTitle(description) {
+  const shown = withoutNul(description).slice(0, PANE_TITLE_DESCRIPTION_LIMIT);
+  return `omo-subagent-${escapeTmuxFormat(shown)}`;
+}
 function buildTmuxPlaceholderCommand(description) {
-  const escapedDescription = shellEscapeForDoubleQuotedCommand(description);
-  return `${TMUX_COMMAND_SHELL} -c "printf '%s\\n%s\\n' \\"OMO subagent pane ready: ${escapedDescription}\\" \\"Focus this pane to attach.\\"; while :; do sleep 86400; done"`;
+  const clean = withoutNul(description);
+  const shown = clean.length > PLACEHOLDER_DESCRIPTION_LIMIT ? `${clean.slice(0, PLACEHOLDER_DESCRIPTION_LIMIT)}\u2026` : clean;
+  const banner = shellQuoteForNestedCommand(`OMO subagent pane ready: ${shown}`);
+  const hint = shellQuoteForNestedCommand("Focus this pane to attach.");
+  return `${TMUX_COMMAND_SHELL} -c "printf '%s\\n%s\\n' ${banner} ${hint}; while :; do sleep 86400; done"`;
 }
 function buildPaneAuthEnvironmentArgs() {
   const password = process.env.OPENCODE_SERVER_PASSWORD;
@@ -8347,10 +8357,7 @@ function buildPaneAuthEnvironmentArgs() {
   }
   return args;
 }
-var TMUX_COMMAND_SHELL = "/bin/sh";
-var init_pane_command = __esm(() => {
-  init_src();
-});
+var TMUX_COMMAND_SHELL = "/bin/sh", PLACEHOLDER_DESCRIPTION_LIMIT = 2000, PANE_TITLE_DESCRIPTION_LIMIT = 20;
 
 // packages/tmux-core/src/tmux-utils/pane-spawn.ts
 async function resolveSpawnTmuxPaneDeps(deps) {
@@ -8422,7 +8429,7 @@ async function spawnTmuxPane(sessionId, description, config, serverUrl, _directo
   if (result.exitCode !== 0 || !paneId) {
     return { success: false };
   }
-  const title = `omo-subagent-${description.slice(0, 20)}`;
+  const title = buildSubagentPaneTitle(description);
   const titleResult = await runTmuxCommand(tmux, ["select-pane", "-t", paneId, "-T", title]);
   if (titleResult.exitCode !== 0) {
     log("[spawnTmuxPane] WARNING: failed to set pane title", {
@@ -8437,7 +8444,6 @@ async function spawnTmuxPane(sessionId, description, config, serverUrl, _directo
 var init_pane_spawn = __esm(() => {
   init_environment();
   init_server_health();
-  init_pane_command();
 });
 
 // packages/tmux-core/src/tmux-utils/pane-close.ts
@@ -8510,7 +8516,7 @@ async function replaceTmuxPane(paneId, sessionId, description, config, _serverUr
     log("[replaceTmuxPane] FAILED", { paneId, exitCode: result.exitCode, stderr: result.stderr.trim() });
     return { success: false };
   }
-  const title = `omo-subagent-${description.slice(0, 20)}`;
+  const title = buildSubagentPaneTitle(description);
   const titleResult = await runTmuxCommand(tmux, ["select-pane", "-t", paneId, "-T", title]);
   if (titleResult.exitCode !== 0) {
     log("[replaceTmuxPane] WARNING: failed to set pane title", {
@@ -8525,7 +8531,6 @@ async function replaceTmuxPane(paneId, sessionId, description, config, _serverUr
 }
 var init_pane_replace = __esm(() => {
   init_environment();
-  init_pane_command();
 });
 
 // packages/tmux-core/src/tmux-utils/pane-activate.ts
@@ -8570,7 +8575,6 @@ async function activateTmuxPane(paneId, sessionId, serverUrl, directory, deps =
 var init_pane_activate = __esm(() => {
   init_runner();
   init_environment();
-  init_pane_command();
 });
 
 // packages/tmux-core/src/tmux-utils/window-spawn.ts
@@ -8638,7 +8642,7 @@ async function spawnTmuxWindow(sessionId, description, config, serverUrl, _direc
     log("[spawnTmuxWindow] FAILED", { exitCode: result.exitCode, stderr: result.stderr.trim() });
     return { success: false };
   }
-  const title = `omo-subagent-${description.slice(0, 20)}`;
+  const title = buildSubagentPaneTitle(description);
   const titleResult = await runTmuxCommand(tmux, ["select-pane", "-t", paneId, "-T", title]);
   if (titleResult.exitCode !== 0) {
     log("[spawnTmuxWindow] WARNING: failed to set pane title", {
@@ -8655,7 +8659,6 @@ var ISOLATED_WINDOW_NAME = "omo-agents";
 var init_window_spawn = __esm(() => {
   init_environment();
   init_server_health();
-  init_pane_command();
 });
 
 // packages/tmux-core/src/tmux-utils/session-spawn.ts
@@ -8762,7 +8765,7 @@ async function spawnTmuxSession(sessionId, description, config, serverUrl, _dire
     log("[spawnTmuxSession] FAILED", { exitCode: result.exitCode, stderr: result.stderr.trim() });
     return { success: false };
   }
-  const title = `omo-subagent-${description.slice(0, 20)}`;
+  const title = buildSubagentPaneTitle(description);
   const titleResult = await runTmuxCommand(tmux, ["select-pane", "-t", paneId, "-T", title]);
   if (titleResult.exitCode !== 0) {
     log("[spawnTmuxSession] WARNING: failed to set pane title", {
@@ -8779,7 +8782,6 @@ var ISOLATED_SESSION_NAME_PREFIX = "omo-agents";
 var init_session_spawn = __esm(() => {
   init_environment();
   init_server_health();
-  init_pane_command();
 });
 
 // packages/tmux-core/src/tmux-utils/session-kill.ts
@@ -8970,7 +8972,6 @@ var init_tmux_utils = __esm(() => {
   init_session_spawn();
   init_session_kill();
   init_stale_session_sweep();
-  init_pane_command();
   init_layout();
   init_spawn_process();
 });
@@ -9469,7 +9470,7 @@ var init_stale_attach_pane_sweep = __esm(() => {
 });
 
 // packages/omo-opencode/src/shared/tmux/tmux-utils/pane-command.ts
-var init_pane_command2 = () => {};
+var init_pane_command = () => {};
 
 // packages/omo-opencode/src/shared/tmux/tmux-utils/layout.ts
 async function enforceMainPaneWidth2(mainPaneId, windowWidth, mainPaneSizeOrOptions) {
@@ -9502,7 +9503,7 @@ var init_tmux_utils2 = __esm(() => {
   init_session_kill2();
   init_stale_session_sweep2();
   init_stale_attach_pane_sweep();
-  init_pane_command2();
+  init_pane_command();
   init_layout2();
 });
 
@@ -19641,7 +19642,7 @@ function selectExistingTeammatePane(teammatePanes, callerPaneId) {
 function buildSplitArgs(callerPaneId, teammatePanes, member) {
   const environmentArgs = buildPaneEnvironmentArgs();
   if (teammatePanes.length === 0) {
-    return ["split-window", ...environmentArgs, "-t", callerPaneId, "-h", "-d", "-l", "70%", "-P", "-F", "#{pane_id}", "-c", getPaneWorkingDirectory(member)];
+    return ["split-window", ...environmentArgs, "-t", callerPaneId, "-h", "-d", "-l", "70%", "-P", "-F", "#{pane_id}", "-c", escapeTmuxFormat(getPaneWorkingDirectory(member))];
   }
   return [
     "split-window",
@@ -19654,7 +19655,7 @@ function buildSplitArgs(callerPaneId, teammatePanes, member) {
     "-F",
     "#{pane_id}",
     "-c",
-    getPaneWorkingDirectory(member)
+    escapeTmuxFormat(getPaneWorkingDirectory(member))
   ];
 }
 async function createTeamLayoutInCallerWindow(tmuxPath, callerPaneId, windowTarget, members, serverUrl, deps) {
@@ -20317,6 +20318,7 @@ var nonNegativeInteger = z5.number().int().nonnegative();
 var OmoComputerSettingsLayerSchema = z5.object({
   enabled: z5.boolean().describe("Experimental: register the computer tool in OmO Native sessions (default: on where the host is supported; false leaves it unregistered)"),
   display: z5.string().min(1),
+  showCursor: z5.boolean().describe("Show the display-only macOS cursor overlay (default: true; false hides it)"),
   max_width: positiveInteger,
   max_height: positiveInteger,
   screenshot_max_bytes: positiveInteger,
@@ -22117,8 +22119,17 @@ function isFileExistsError(error) {
 function backupCandidate(basePath, attempt) {
   return attempt === 0 ? basePath : `${basePath}.${attempt}`;
 }
+function writePlannedBackup(plannedPath, content, fileSystem) {
+  try {
+    if (fileSystem.existsSync(plannedPath) && fileSystem.readFileSync(plannedPath, "utf-8") === content)
+      return plannedPath;
+  } catch {}
+  return writeBackupFrom(plannedPath, content, fileSystem);
+}
 function writeBackup(path, content, fileSystem) {
-  const basePath = `${path}.bak.${backupSuffix()}`;
+  return writeBackupFrom(`${path}.bak.${backupSuffix()}`, content, fileSystem);
+}
+function writeBackupFrom(basePath, content, fileSystem) {
   let attempt = 0;
   while (true) {
     const candidate = backupCandidate(basePath, attempt);
@@ -22223,7 +22234,7 @@ function updateOmoConfig(options) {
   if (existed) {
     try {
       assertConfigPathIsSafe(path, fileSystem);
-      backupPath = writeBackup(path, content, fileSystem);
+      backupPath = options.backupPath === undefined ? writeBackup(path, content, fileSystem) : writePlannedBackup(options.backupPath, content, fileSystem);
     } catch (error) {
       if (error instanceof OmoConfigWriteError)
         throw error;
@@ -22540,6 +22551,7 @@ var writeOmoMigrationTarget = (input) => {
   const options = writerInput(input.targetPath, input.env);
   const result = updateOmoConfig({
     ...options,
+    ...input.backupPath === undefined ? {} : { backupPath: input.backupPath },
     edits: input.edits,
     env: input.env,
     fileSystem: input.fileSystem,
@@ -22548,6 +22560,7 @@ var writeOmoMigrationTarget = (input) => {
   if (!sameResolvedPath(result.path, input.targetPath)) {
     throw new MigrationTransactionError(`Migration writer resolved ${result.path} instead of ${input.targetPath}`);
   }
+  return result.backupPath === undefined ? {} : { backupPath: result.backupPath };
 };
 function prepareTargetWrite(input) {
   const targetCleanup = stripRetiredCodegraph(input.target);
@@ -22585,12 +22598,14 @@ function prepareTargetReplacement(input) {
   };
 }
 function writePreparedTarget(input) {
-  input.writeTarget({
+  const written = input.writeTarget({
+    ...input.backupPath === undefined ? {} : { backupPath: input.backupPath },
     edits: input.prepared.edits,
     env: input.env,
     fileSystem: input.fileSystem,
     targetPath: input.targetPath
   });
+  return written?.backupPath;
 }
 
 // packages/omo-config-core/src/migration/journal.ts
@@ -22630,6 +22645,9 @@ function parseJournal(value) {
   if (!value["completedMoves"].every((path) => typeof path === "string")) {
     throw new Error("Migration journal completed moves are invalid");
   }
+  const targetBackupPath = value["targetBackupPath"];
+  if (targetBackupPath !== undefined && typeof targetBackupPath !== "string")
+    throw new Error("Migration journal target backup is invalid");
   if (!Array.isArray(value["backupMoves"]))
     throw new Error("Migration journal backup plan is invalid");
   const backupMoves = [];
@@ -22644,6 +22662,7 @@ function parseJournal(value) {
     completedMoves: [...value["completedMoves"]],
     diagnostics: diagnostics === undefined ? [] : [...diagnostics],
     migrationId: value["migrationId"],
+    ...targetBackupPath === undefined ? {} : { targetBackupPath },
     targetPath: value["targetPath"],
     targetWrite: {
       additions: { ...value["targetWrite"]["additions"] },
@@ -22832,12 +22851,24 @@ function acquireMigrationLock(input) {
 }
 
 // packages/omo-config-core/src/migration/recovery.ts
+function backupPathForResume(planned, targetPath, fileSystem) {
+  if (planned === undefined || !fileSystem.existsSync(planned) || !fileSystem.existsSync(targetPath))
+    return planned;
+  if (fileSystem.readFileSync(planned, "utf-8") === fileSystem.readFileSync(targetPath, "utf-8"))
+    return planned;
+  let attempt = 1;
+  while (fileSystem.existsSync(`${planned}.${attempt}`))
+    attempt += 1;
+  return `${planned}.${attempt}`;
+}
 function resumeMigrationJournal(input) {
-  const journal = readMigrationJournal(input.fileSystem, input.env);
-  if (journal === null)
-    return false;
+  const read = readMigrationJournal(input.fileSystem, input.env);
+  if (read === null)
+    return { resumed: false };
+  let journal = read;
   input.renewLock();
   const target = targetDocument(journal.targetPath, input.fileSystem);
+  let writtenBackupPath;
   if (!hasMigrationMarker(target, journal.migrationId)) {
     const prepared = journal.targetWrite.mode === "replace-target" ? prepareTargetReplacement({
       document: journal.targetWrite.additions,
@@ -22850,7 +22881,13 @@ function resumeMigrationJournal(input) {
       target,
       targetPath: journal.targetPath
     });
-    writePreparedTarget({
+    const backupPath = backupPathForResume(journal.targetBackupPath, journal.targetPath, input.fileSystem);
+    if (backupPath !== journal.targetBackupPath && backupPath !== undefined) {
+      journal = { ...journal, targetBackupPath: backupPath };
+      writeMigrationJournal(journal, input.fileSystem, input.env, input.process, input.clock);
+    }
+    writtenBackupPath = writePreparedTarget({
+      ...journal.targetBackupPath === undefined ? {} : { backupPath: journal.targetBackupPath },
       env: input.env,
       fileSystem: input.fileSystem,
       prepared,
@@ -22876,7 +22913,8 @@ function resumeMigrationJournal(input) {
     writeMigrationJournal(targetRecorded, input.fileSystem, input.env, input.process, input.clock);
   }
   removeMigrationJournal(input.fileSystem, input.env);
-  return true;
+  const targetBackupPath = writtenBackupPath ?? (journal.targetBackupPath !== undefined && input.fileSystem.existsSync(journal.targetBackupPath) ? journal.targetBackupPath : undefined);
+  return targetBackupPath === undefined ? { resumed: true } : { resumed: true, targetBackupPath };
 }
 
 // packages/omo-config-core/src/migration/batch.ts
@@ -22930,6 +22968,15 @@ function assertSafeSourcePaths(sources, protectedPaths) {
 function directoryPath2(path) {
   return path.startsWith("/") ? posix3.dirname(path) : dirname4(path);
 }
+function plannedTargetBackupPath(targetPath, clock, fileSystem) {
+  if (!fileSystem.existsSync(targetPath))
+    return;
+  const base = `${targetPath}.bak.${new Date(clock.now()).toISOString().replace(/[:.]/g, "-")}`;
+  let candidate = base;
+  for (let attempt = 1;fileSystem.existsSync(candidate); attempt += 1)
+    candidate = `${base}.${attempt}`;
+  return candidate;
+}
 function ensureBackupDirectories(moves, fileSystem) {
   for (const move of moves)
     fileSystem.mkdirSync(directoryPath2(move.to), { recursive: true });
@@ -22968,11 +23015,13 @@ function executePlan(input) {
   if (input.dryRun)
     return { diagnostics, journalResumed, preview, status: "planned" };
   ensureBackupDirectories(moves, fileSystem);
+  const targetBackupPath = plannedTargetBackupPath(plan.targetPath, input.clock, fileSystem);
   const journal = {
     backupMoves: moves,
     completedMoves: [],
     diagnostics,
     migrationId: plan.id,
+    ...targetBackupPath === undefined ? {} : { targetBackupPath },
     targetPath: plan.targetPath,
     targetWrite: {
       additions: transformed.document,
@@ -22984,7 +23033,7 @@ function executePlan(input) {
   writeMigrationJournal(journal, fileSystem, env, input.process, input.clock);
   input.onBoundary?.("journal-written");
   input.renewLock();
-  writePreparedTarget({ env, fileSystem, prepared, targetPath: plan.targetPath, writeTarget: input.writeTarget });
+  writePreparedTarget({ ...targetBackupPath === undefined ? {} : { backupPath: targetBackupPath }, env, fileSystem, prepared, targetPath: plan.targetPath, writeTarget: input.writeTarget });
   input.onBoundary?.("target-written");
   const targetRecorded = { ...journal, targetWritten: true };
   writeMigrationJournal(targetRecorded, fileSystem, env, input.process, input.clock);
@@ -23000,7 +23049,7 @@ function executePlan(input) {
     input.onBoundary?.("source-recorded");
   }
   removeMigrationJournal(fileSystem, env);
-  return { diagnostics, journalResumed, preview, status: "migrated" };
+  return { diagnostics, journalResumed, preview, status: "migrated", ...targetBackupPath === undefined ? {} : { targetBackupPath } };
 }
 function runMigrations(options) {
   const clock = options.clock ?? DEFAULT_MIGRATION_CLOCK;
@@ -23014,7 +23063,8 @@ function runMigrations(options) {
   if (lock === null)
     return { journalResumed: false, results: [], status: "locked" };
   try {
-    const journalResumed = resumeMigrationJournal({ clock, env, fileSystem, process: process2, renewLock: lock.renew, writeTarget });
+    const resumed = resumeMigrationJournal({ clock, env, fileSystem, process: process2, renewLock: lock.renew, writeTarget });
+    const journalResumed = resumed.resumed;
     lock.renew();
     const results = options.discover().map((plan) => executePlan({
       clock,
@@ -23030,7 +23080,7 @@ function runMigrations(options) {
     }));
     if (options.dryRun !== true)
       options.afterMigrations?.(results);
-    return { journalResumed, results, status: "completed" };
+    return { journalResumed, ...resumed.targetBackupPath === undefined ? {} : { resumedTargetBackupPath: resumed.targetBackupPath }, results, status: "completed" };
   } finally {
     lock.release();
   }
@@ -23094,6 +23144,11 @@ var AGENT_MODEL_REQUIREMENTS = {
     fallbackChain: [
       { providers: ["openai", "chatgpt-subscription", "opencode"], model: "gpt-5.6-sol", variant: "xhigh" },
       { providers: ["github-copilot"], model: "gpt-5.6-sol", variant: "high" },
+      {
+        providers: ["google", "google-vertex", "opencode"],
+        model: "gemini-4-argon",
+        variant: "high"
+      },
       {
         providers: ["google", "github-copilot", "opencode"],
         model: "gemini-3.1-pro",
@@ -23183,6 +23238,11 @@ var AGENT_MODEL_REQUIREMENTS = {
         model: "claude-opus-5-5",
         variant: "max"
       },
+      {
+        providers: ["google", "google-vertex", "opencode"],
+        model: "gemini-4-argon",
+        variant: "high"
+      },
       {
         providers: ["google", "github-copilot", "opencode"],
         model: "gemini-3.1-pro",
@@ -23225,6 +23285,7 @@ var AGENT_MODEL_REQUIREMENTS = {
 var CATEGORY_MODEL_REQUIREMENTS = {
   "visual-engineering": {
     fallbackChain: [
+      { providers: ["google", "google-vertex", "opencode"], model: "gemini-4-argon", variant: "low" },
       {
         providers: ["anthropic", "anthropic-api", "github-copilot", "opencode"],
         model: "claude-fable-5-1",
@@ -23360,6 +23421,7 @@ var CATEGORY_MODEL_REQUIREMENTS = {
   writing: {
     requiresAnyModel: true,
     fallbackChain: [
+      { providers: ["google", "google-vertex", "opencode"], model: "gemini-4-argon", variant: "low" },
       {
         providers: ["anthropic", "anthropic-api", "github-copilot", "opencode"],
         model: "claude-opus-5-5",
@@ -27880,7 +27942,7 @@ Approach:
 var GOOGLE_CATEGORIES = [
   {
     name: "visual-engineering",
-    config: { model: "anthropic/claude-fable-5-1", variant: "max" },
+    config: { model: "google/gemini-4-argon", variant: "low" },
     description: "Visual design, UI/UX, frontend, styling, animation, and design systems",
     promptAppend: VISUAL_CATEGORY_PROMPT_APPEND
   },
@@ -27921,7 +27983,7 @@ ANTI-AI-SLOP RULES (NON-NEGOTIABLE):
 var KIMI_CATEGORIES = [
   {
     name: "writing",
-    config: { model: "anthropic/claude-opus-5-5", variant: "low" },
+    config: { model: "google/gemini-4-argon", variant: "low" },
     description: "Documentation, prose, technical writing",
     promptAppend: WRITING_CATEGORY_PROMPT_APPEND
   }
@@ -29434,6 +29496,28 @@ var model_capabilities_generated_default = {
   generatedAt: "2026-07-29T03:28:21.339Z",
   sourceUrl: "https://models.dev/api.json",
   models: {
+    "gemini-4-argon": {
+      id: "gemini-4-argon",
+      family: "gemini",
+      reasoning: true,
+      temperature: false,
+      toolCall: true,
+      modalities: {
+        input: [
+          "text",
+          "image",
+          "audio",
+          "pdf"
+        ],
+        output: [
+          "text"
+        ]
+      },
+      limit: {
+        context: 1048576,
+        output: 65535
+      }
+    },
     "glm-5": {
       id: "glm-5",
       family: "glm",
@@ -88194,7 +88278,7 @@ function parseToolsConfig(toolsValue) {
 var ANTHROPIC_PREFIX = "anthropic/";
 var CLAUDE_CODE_ALIAS_MAP = new Map([
   ["sonnet", `${ANTHROPIC_PREFIX}claude-sonnet-4-6`],
-  ["opus", `${ANTHROPIC_PREFIX}claude-opus-4-8`],
+  ["opus", `${ANTHROPIC_PREFIX}claude-opus-5-5`],
   ["haiku", `${ANTHROPIC_PREFIX}claude-haiku-5-5`]
 ]);
 function mapClaudeModelString(model, anthropicProvider) {
@@ -99137,7 +99221,7 @@ function getCachedVersion(options = {}) {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "5.1.32",
+  version: "5.1.34",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -99314,7 +99398,7 @@ var package_default = {
   },
   devDependencies: {
     "@clack/prompts": "^1.8.1",
-    "@code-yeongyu/senpi": "2026.10.12",
+    "@code-yeongyu/senpi": "2026.10.16",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
@@ -99365,7 +99449,7 @@ var package_default = {
     "js-yaml": "^5.4.2",
     "jsonc-parser": "^3.3.1",
     "node-pty": "^1.1.0",
-    omowright: "github:code-yeongyu/omowright#293ca5002cbd4c8b0c104c5934683385ef7e0d3a",
+    omowright: "github:code-yeongyu/omowright#f87ef4d63fe7b56fe117dbab246c8ad88dd8a780",
     picocolors: "^1.1.1",
     picomatch: "^4.0.7",
     "posthog-node": "^5.52.4",
@@ -99373,18 +99457,18 @@ var package_default = {
     typescript: "^7.0.2"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "5.1.32",
-    "oh-my-opencode-darwin-x64": "5.1.32",
-    "oh-my-opencode-darwin-x64-baseline": "5.1.32",
-    "oh-my-opencode-linux-arm64": "5.1.32",
-    "oh-my-opencode-linux-arm64-musl": "5.1.32",
-    "oh-my-opencode-linux-x64": "5.1.32",
-    "oh-my-opencode-linux-x64-baseline": "5.1.32",
-    "oh-my-opencode-linux-x64-musl": "5.1.32",
-    "oh-my-opencode-linux-x64-musl-baseline": "5.1.32",
-    "oh-my-opencode-windows-arm64": "5.1.32",
-    "oh-my-opencode-windows-x64": "5.1.32",
-    "oh-my-opencode-windows-x64-baseline": "5.1.32"
+    "oh-my-opencode-darwin-arm64": "5.1.34",
+    "oh-my-opencode-darwin-x64": "5.1.34",
+    "oh-my-opencode-darwin-x64-baseline": "5.1.34",
+    "oh-my-opencode-linux-arm64": "5.1.34",
+    "oh-my-opencode-linux-arm64-musl": "5.1.34",
+    "oh-my-opencode-linux-x64": "5.1.34",
+    "oh-my-opencode-linux-x64-baseline": "5.1.34",
+    "oh-my-opencode-linux-x64-musl": "5.1.34",
+    "oh-my-opencode-linux-x64-musl-baseline": "5.1.34",
+    "oh-my-opencode-windows-arm64": "5.1.34",
+    "oh-my-opencode-windows-x64": "5.1.34",
+    "oh-my-opencode-windows-x64-baseline": "5.1.34"
   },
   overrides: {
     hono: "^4.13.8",
@@ -100605,7 +100689,8 @@ function runOpenCodeStartupMigration(options) {
       migratedFrom: [],
       reloadRequired: false,
       results: [],
-      skippedConflictCount: 0
+      skippedConflictCount: 0,
+      targetBackupPaths: []
     };
   }
   try {
@@ -100629,12 +100714,18 @@ function runOpenCodeStartupMigration(options) {
       })
     });
     const migratedFrom = uniqueSources(batch.results);
+    const targetBackupPaths = [
+      ...batch.resumedTargetBackupPath === undefined ? [] : [batch.resumedTargetBackupPath],
+      ...batch.results.flatMap((result) => result.targetBackupPath === undefined ? [] : [result.targetBackupPath])
+    ];
     return {
       journalResumed: batch.journalResumed,
       migratedFrom,
       reloadRequired: batch.journalResumed || migratedFrom.length > 0,
       results: batch.results,
       skippedConflictCount: skippedConflictCount(batch.results),
+      targetBackupPaths,
+      ...batch.resumedTargetBackupPath === undefined ? {} : { resumedTargetBackupPath: batch.resumedTargetBackupPath },
       ...batch.status === "locked" ? { error: "Configuration migration is already running" } : {}
     };
   } catch (error) {
@@ -100644,7 +100735,8 @@ function runOpenCodeStartupMigration(options) {
       migratedFrom: [],
       reloadRequired: false,
       results: [],
-      skippedConflictCount: 0
+      skippedConflictCount: 0,
+      targetBackupPaths: []
     };
   }
 }
@@ -142452,17 +142544,24 @@ class ConcurrencyManager {
     }
     return model;
   }
-  async acquire(model, taskId) {
+  tryAcquire(model) {
     const key = this.getConcurrencyKey(model);
     const limit = this.getConcurrencyLimit(model);
     if (limit === Infinity) {
-      return;
+      return true;
     }
     const current = this.counts.get(key) ?? 0;
     if (current < limit) {
       this.counts.set(key, current + 1);
+      return true;
+    }
+    return false;
+  }
+  async acquire(model, taskId) {
+    if (this.tryAcquire(model)) {
       return;
     }
+    const key = this.getConcurrencyKey(model);
     return new Promise((resolve, reject) => {
       const queue = this.queues.get(key) ?? [];
       const entry = {
@@ -142765,9 +142864,17 @@ async function tryFallbackRetry(args) {
   const rawKey = task.model ? `${task.model.providerID}/${task.model.modelID}` : task.agent;
   const key = concurrencyManager.getConcurrencyKey(rawKey);
   const queue = queuesByKey.get(key) ?? [];
+  const hasContinuation = !!task.originalPrompt && task.originalPrompt !== task.prompt;
+  const retryPrompt = hasContinuation ? `${task.originalPrompt}
+
+[Latest continuation instruction]
+${task.prompt}` : task.prompt;
+  const retryNote = hasContinuation ? `
+
+[Note: this is a retry in a new session after the previous session failed; the earlier session's context is not available. Work from the original task and latest continuation instruction above.]` : "";
   const retryInput = {
     description: task.description,
-    prompt: task.prompt,
+    prompt: `${retryPrompt}${retryNote}`,
     agent: task.agent,
     parentSessionId: task.parentSessionId,
     parentMessageId: task.parentMessageId,
@@ -144701,6 +144808,25 @@ class TaskHistory {
   clearSession(parentSessionID) {
     this.entries.delete(parentSessionID);
   }
+  restoreEntry(parentSessionID, taskID, entry) {
+    const list = this.entries.get(parentSessionID);
+    if (!list) {
+      if (entry)
+        this.record(parentSessionID, entry);
+      return;
+    }
+    const index = list.findIndex((current) => current.id === taskID);
+    if (index !== -1) {
+      if (entry)
+        list[index] = { ...entry };
+      else
+        list.splice(index, 1);
+    } else if (entry) {
+      this.record(parentSessionID, entry);
+    }
+    if (list.length === 0)
+      this.entries.delete(parentSessionID);
+  }
   clearAll() {
     this.entries.clear();
   }
@@ -145300,6 +145426,7 @@ class BackgroundManager {
   processingKeys = new Set;
   completionTimers = new Map;
   syncAttachedSessions = new Set;
+  resumesAwaitingAdmission = new Set;
   completedTaskArchive = new Map;
   completedTaskSummaries = new Map;
   idleDeferralTimers = new Map;
@@ -145506,8 +145633,12 @@ class BackgroundManager {
     taskIDs.add(task.id);
     this.tasksByParentSession.set(parentSessionID, taskIDs);
   }
-  captureResumeTaskSnapshot(task) {
+  captureResumeTaskSnapshot(task, resumeParentSessionID) {
     return {
+      prompt: task.prompt,
+      originalPrompt: task.originalPrompt,
+      queuedAt: task.queuedAt,
+      historyEntry: this.taskHistory.getByParentSession(resumeParentSessionID).find((entry) => entry.id === task.id),
       status: task.status,
       completedAt: task.completedAt,
       error: task.error,
@@ -145523,16 +145654,23 @@ class BackgroundManager {
     };
   }
   restoreTaskAfterSkippedResume(task, snapshot, skippedStatus) {
+    if (this.shutdownTriggered)
+      return;
     log2("[background-agent] Restoring task after skipped resume prompt:", {
       taskId: task.id,
       sessionID: task.sessionId,
       skippedStatus
     });
+    const resumeParentSessionID = task.parentSessionId;
     this.cleanupPendingByParent(task);
+    this.taskHistory.restoreEntry(resumeParentSessionID, task.id, snapshot.historyEntry);
     if (task.concurrencyKey) {
       this.concurrencyManager.release(task.concurrencyKey);
     }
     task.status = snapshot.status;
+    task.prompt = snapshot.prompt;
+    task.originalPrompt = snapshot.originalPrompt;
+    task.queuedAt = snapshot.queuedAt;
     task.completedAt = snapshot.completedAt;
     task.error = snapshot.error;
     task.startedAt = snapshot.startedAt;
@@ -145549,6 +145687,9 @@ class BackgroundManager {
       this.scheduleTaskRemoval(task.id);
     }
     this.updateBackgroundTaskMarker(task.parentSessionId);
+    if (resumeParentSessionID !== task.parentSessionId) {
+      this.updateBackgroundTaskMarker(resumeParentSessionID);
+    }
   }
   removeTaskFromParentIndex(taskID, parentSessionID) {
     if (!parentSessionID) {
@@ -146145,14 +146286,74 @@ The fallback retry session is now created and can be inspected directly.
     if (existingTask.status === "running") {
       throw new Error(`Task ${existingTask.id} is currently running and cannot accept a continuation prompt. ` + "Wait for it to complete before resuming it with task_id.");
     }
-    const resumeSnapshot = this.captureResumeTaskSnapshot(existingTask);
+    if (existingTask.status === "pending" && existingTask.pendingResume) {
+      throw new Error(`Task ${existingTask.id} already has a continuation queued for admission and cannot accept another one. ` + "Wait for it to start and complete before resuming it with task_id.");
+    }
+    if (this.resumesAwaitingAdmission.has(existingTask.id)) {
+      throw new Error(`Task ${existingTask.id} is already being resumed and cannot accept another continuation. ` + "Wait for it to complete before resuming it with task_id.");
+    }
+    const resumeSnapshot = this.captureResumeTaskSnapshot(existingTask, input.parentSessionId);
     const completionTimer = this.completionTimers.get(existingTask.id);
     if (completionTimer) {
       clearTimeout(completionTimer);
       this.completionTimers.delete(existingTask.id);
     }
     const concurrencyKey = this.concurrencyManager.getConcurrencyKey(existingTask.concurrencyGroup ?? existingTask.agent);
-    await this.concurrencyManager.acquire(concurrencyKey);
+    if (this.concurrencyManager.tryAcquire(concurrencyKey)) {
+      this.resumesAwaitingAdmission.add(existingTask.id);
+      try {
+        await Promise.resolve();
+        return await this.startResumedTask(existingTask, input, resumeSnapshot, concurrencyKey);
+      } finally {
+        this.resumesAwaitingAdmission.delete(existingTask.id);
+      }
+    }
+    const admission = this.concurrencyManager.acquire(concurrencyKey, existingTask.id);
+    const resumeToken = {};
+    existingTask.pendingResume = resumeToken;
+    existingTask.status = "pending";
+    existingTask.queuedAt = new Date;
+    existingTask.completedAt = undefined;
+    existingTask.error = undefined;
+    this.updateTaskParent(existingTask, input.parentSessionId);
+    existingTask.parentMessageId = input.parentMessageId;
+    existingTask.parentModel = input.parentModel;
+    existingTask.parentAgent = input.parentAgent;
+    if (input.parentTools)
+      existingTask.parentTools = input.parentTools;
+    if (input.parentSessionId) {
+      const pending = this.pendingByParent.get(input.parentSessionId) ?? new Set;
+      pending.add(existingTask.id);
+      this.pendingByParent.set(input.parentSessionId, pending);
+    }
+    this.taskHistory.record(input.parentSessionId, { id: existingTask.id, sessionID: existingTask.sessionId, agent: existingTask.agent, description: existingTask.description, status: "pending", category: existingTask.category });
+    getTaskToastManager()?.addTask({ id: existingTask.id, description: existingTask.description, agent: existingTask.agent, isBackground: true, status: "queued" });
+    this.updateBackgroundTaskMarker(existingTask.parentSessionId);
+    admission.then(async () => {
+      if (this.shutdownTriggered || existingTask.status !== "pending" || existingTask.pendingResume !== resumeToken) {
+        this.concurrencyManager.release(concurrencyKey);
+        return;
+      }
+      await this.startResumedTask(existingTask, input, resumeSnapshot, concurrencyKey);
+    }).catch((error) => {
+      this.logger("[background-agent] Queued resume was not admitted:", { taskId: existingTask.id, error: error instanceof Error ? error.message : String(error) });
+      if (this.shutdownTriggered || existingTask.status !== "pending" || existingTask.pendingResume !== resumeToken)
+        return;
+      existingTask.pendingResume = undefined;
+      this.restoreTaskAfterSkippedResume(existingTask, resumeSnapshot, "unavailable");
+    });
+    return existingTask;
+  }
+  async startResumedTask(existingTask, input, resumeSnapshot, concurrencyKey) {
+    if (this.shutdownTriggered) {
+      this.concurrencyManager.release(concurrencyKey);
+      return existingTask;
+    }
+    if (!existingTask.sessionId)
+      throw new Error(`Task has no sessionID: ${existingTask.id}`);
+    existingTask.pendingResume = undefined;
+    existingTask.originalPrompt ??= existingTask.prompt;
+    existingTask.prompt = input.prompt;
     existingTask.concurrencyKey = concurrencyKey;
     existingTask.concurrencyGroup = concurrencyKey;
     existingTask.status = "running";
@@ -146166,6 +146367,15 @@ The fallback retry session is now created and can be inspected directly.
       existingTask.parentTools = input.parentTools;
     }
     existingTask.startedAt = new Date;
+    this.taskHistory.record(input.parentSessionId, {
+      id: existingTask.id,
+      sessionID: existingTask.sessionId,
+      agent: existingTask.agent,
+      description: existingTask.description,
+      status: "running",
+      category: existingTask.category,
+      startedAt: existingTask.startedAt
+    });
     existingTask.progress = {
       toolCalls: existingTask.progress?.toolCalls ?? 0,
       toolCallWindow: existingTask.progress?.toolCallWindow,
@@ -146276,6 +146486,16 @@ The fallback retry session is now created and can be inspected directly.
       const errorMessage = errorInfo.message ?? (error instanceof Error ? error.message : String(error));
       existingTask.error = errorMessage;
       existingTask.completedAt = new Date;
+      this.taskHistory.record(existingTask.parentSessionId, {
+        id: existingTask.id,
+        sessionID: existingTask.sessionId,
+        agent: existingTask.agent,
+        description: existingTask.description,
+        status: "interrupt",
+        category: existingTask.category,
+        startedAt: existingTask.startedAt,
+        completedAt: existingTask.completedAt
+      });
       if (existingTask.rootSessionId) {
         this.unregisterRootDescendant(existingTask.rootSessionId);
       }
@@ -147596,7 +147816,17 @@ The task was re-queued on a fallback model after a retryable failure.
     this.stopPolling();
     const trackedSessionIDs = new Set;
     const abortRequests = [];
+    const queuedResumeParents = new Set;
     for (const task of this.tasks.values()) {
+      if (task.pendingResume) {
+        queuedResumeParents.add(task.parentSessionId);
+        task.pendingResume = undefined;
+        task.status = "cancelled";
+        task.completedAt = new Date;
+        this.concurrencyManager.cancelWaiter(task.concurrencyGroup ?? task.agent, task.id);
+        this.cleanupPendingByParent(task);
+        removeTaskToastTracking(task.id);
+      }
       if (task.sessionId) {
         trackedSessionIDs.add(task.sessionId);
       }
@@ -147662,6 +147892,9 @@ The task was re-queued on a fallback model after a retryable failure.
     this.queuesByKey.clear();
     this.processingKeys.clear();
     this.taskHistory.clearAll();
+    for (const parentSessionID of queuedResumeParents) {
+      this.updateBackgroundTaskMarker(parentSessionID);
+    }
     this.completedTaskSummaries.clear();
     this.unregisterProcessCleanup();
     log2("[background-agent] Shutdown complete");
@@ -187988,11 +188221,12 @@ function startupToastBody(input) {
   const summary = input.migratedFrom.length === 0 ? "" : `Migrated ${input.migratedFrom.length} legacy source${input.migratedFrom.length === 1 ? "" : "s"}.`;
   const conflicts = input.skippedConflictCount === 0 ? "" : ` Kept ${input.skippedConflictCount} existing value${input.skippedConflictCount === 1 ? "" : "s"}.`;
   const diagnostics = input.diagnostics.length === 0 ? "" : ` ${input.diagnostics.join(" ")}`;
+  const backups = input.targetBackupPaths.length === 0 ? "" : ` Previous config saved as ${input.targetBackupPaths.join(", ")}.`;
   if (input.error !== undefined) {
-    return { title: "Configuration migration failed", message: `${input.error}${diagnostics}`, variant: "error" };
+    return { title: "Configuration migration failed", message: `${input.error}${backups}${diagnostics}`, variant: "error" };
   }
-  if (summary.length > 0)
-    return { title: "Configuration migrated", message: `${summary}${conflicts}${diagnostics}`, variant: "success" };
+  if (summary.length > 0 || backups.length > 0)
+    return { title: "Configuration migrated", message: `${summary}${conflicts}${backups}${diagnostics}`.trim(), variant: "success" };
   if (diagnostics.length > 0)
     return { title: "Configuration diagnostics", message: input.diagnostics.join(" "), variant: "warning" };
   return;
@@ -188015,7 +188249,8 @@ function createPluginModule(overrides = {}) {
       error: startupMigration.error,
       journalResumed: startupMigration.journalResumed,
       migratedFrom: startupMigration.migratedFrom,
-      skippedConflictCount: startupMigration.skippedConflictCount
+      skippedConflictCount: startupMigration.skippedConflictCount,
+      targetBackupPaths: startupMigration.targetBackupPaths
     });
     if (startupMigration.error !== undefined) {
       console.warn(`[config-migration] legacy configuration changes were not applied: ${startupMigration.error}`);
@@ -188024,7 +188259,8 @@ function createPluginModule(overrides = {}) {
       diagnostics: startupDiagnostics,
       ...startupMigration.error === undefined ? {} : { error: startupMigration.error },
       migratedFrom: startupMigration.migratedFrom,
-      skippedConflictCount: startupMigration.skippedConflictCount
+      skippedConflictCount: startupMigration.skippedConflictCount,
+      targetBackupPaths: startupMigration.targetBackupPaths
     });
     if (toast !== undefined)
       showStartupToast(input.client, toast, deps.log);