zam-core 0.10.7 → 0.10.9

package/dist/cli/commands/mcp.js

@@ -6122,6 +6122,14 @@ function setAgentConnectAutoDone(done, path = defaultConfigPath()) {
   }
   saveInstallConfig(config, path);
 }
+function getLastRepairedVersion(path = defaultConfigPath()) {
+  return loadInstallConfig(path).lastRepairedVersion;
+}
+function setLastRepairedVersion(version, path = defaultConfigPath()) {
+  const config = loadInstallConfig(path);
+  config.lastRepairedVersion = version;
+  saveInstallConfig(config, path);
+}
 function getConfiguredWorkspaces(path = defaultConfigPath()) {
   return loadInstallConfig(path).workspaces ?? [];
 }
@@ -6844,6 +6852,7 @@ __export(kernel_exports, {
   getInstallMode: () => getInstallMode,
   getKnowledgeContextById: () => getKnowledgeContextById,
   getKnowledgeContextByName: () => getKnowledgeContextByName,
+  getLastRepairedVersion: () => getLastRepairedVersion,
   getMachineAiConfig: () => getMachineAiConfig,
   getMachineAiModels: () => getMachineAiModels,
   getMonitorDir: () => getMonitorDir,
@@ -6939,6 +6948,7 @@ __export(kernel_exports, {
   setAgentConnectAutoDone: () => setAgentConnectAutoDone,
   setInstallChannel: () => setInstallChannel,
   setInstallMode: () => setInstallMode,
+  setLastRepairedVersion: () => setLastRepairedVersion,
   setProviderApiKey: () => setProviderApiKey,
   setSetting: () => setSetting,
   setTursoCredentials: () => setTursoCredentials,
@@ -7016,8 +7026,8 @@ var init_kernel = __esm({
 
 // src/cli/commands/mcp.ts
 init_kernel();
-import { existsSync as existsSync19, readFileSync as readFileSync17 } from "fs";
-import { dirname as dirname11, join as join23 } from "path";
+import { existsSync as existsSync21, readFileSync as readFileSync18 } from "fs";
+import { dirname as dirname11, join as join24 } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import {
   RESOURCE_MIME_TYPE,
@@ -8132,7 +8142,7 @@ async function prepareRecallChain(db, opts) {
       } else {
         spawnLocalRunner(endpoint.url, endpoint.model, endpoint.runner);
         while (Date.now() < deadline) {
-          await new Promise((resolve6) => setTimeout(resolve6, 1e3));
+          await new Promise((resolve7) => setTimeout(resolve7, 1e3));
           if (await isLlmOnline(endpoint.url)) {
             online = true;
             break;
@@ -8425,7 +8435,7 @@ async function startLocalRunner(url, model, locale, hint) {
   let attempts = 0;
   const dotsPerLine = 30;
   while (true) {
-    await new Promise((resolve6) => setTimeout(resolve6, 500));
+    await new Promise((resolve7) => setTimeout(resolve7, 500));
     if (await isLlmOnline(url)) {
       if (attempts > 0) process.stdout.write("\n");
       return true;
@@ -8485,8 +8495,8 @@ async function fetchWithInteractiveTimeout(url, options = {}) {
   const dotsPerLine = 30;
   while (true) {
     let timeoutId;
-    const timeoutPromise = new Promise((resolve6) => {
-      timeoutId = setTimeout(() => resolve6("timeout"), timeoutMs);
+    const timeoutPromise = new Promise((resolve7) => {
+      timeoutId = setTimeout(() => resolve7("timeout"), timeoutMs);
     });
     const dotsInterval = setInterval(() => {
       process.stdout.write(".");
@@ -9830,11 +9840,11 @@ async function publishUiIntent(app, input = {}, opts = {}) {
 
 // src/cli/commands/bridge.ts
 init_kernel();
-import { execFileSync as execFileSync4 } from "child_process";
+import { execFileSync as execFileSync5 } from "child_process";
 import { randomBytes as randomBytes2 } from "crypto";
-import { existsSync as existsSync18, readdirSync as readdirSync2, readFileSync as readFileSync16, rmSync as rmSync3 } from "fs";
-import { homedir as homedir14, tmpdir as tmpdir3 } from "os";
-import { join as join22, resolve as resolve5 } from "path";
+import { existsSync as existsSync20, readdirSync as readdirSync2, readFileSync as readFileSync17, rmSync as rmSync3 } from "fs";
+import { homedir as homedir15, tmpdir as tmpdir3 } from "os";
+import { join as join23, resolve as resolve6 } from "path";
 import { Command } from "commander";
 import { ulid as ulid11 } from "ulid";
 
@@ -9913,7 +9923,7 @@ async function readWebLink(url) {
         redirect: "manual",
         signal: controller.signal,
         headers: {
-          "User-Agent": "ZAM-Content-Studio/0.10.7"
+          "User-Agent": "ZAM-Content-Studio/0.10.9"
         }
       });
       if (res.status >= 300 && res.status < 400) {
@@ -10373,6 +10383,7 @@ function detectInstalledConnectHarnesses(options = {}) {
   return detected;
 }
 function parseMcpJsonConfig(path, content) {
+  if (content.trim() === "") return {};
   let parsed;
   try {
     parsed = JSON.parse(content);
@@ -10418,17 +10429,21 @@ function connectHarnessMcp(harnessId, opts) {
     if (!existing.mcpServers) {
       existing.mcpServers = {};
     }
-    if (opts.zamPath.endsWith(".js")) {
-      existing.mcpServers.zam = {
-        command: process.execPath,
-        args: [opts.zamPath, "mcp"]
-      };
-    } else {
-      existing.mcpServers.zam = {
-        command: opts.zamPath,
-        args: ["mcp"]
-      };
+    const expected = opts.zamPath.endsWith(".js") ? {
+      command: process.execPath,
+      args: [opts.zamPath, "mcp"]
+    } : {
+      command: opts.zamPath,
+      args: ["mcp"]
+    };
+    const current = existing.mcpServers.zam;
+    if (typeof current === "object" && current !== null && !Array.isArray(current)) {
+      const c = current;
+      if (c.command === expected.command && JSON.stringify(c.args) === JSON.stringify(expected.args)) {
+        alreadyConfigured = true;
+      }
     }
+    existing.mcpServers.zam = expected;
     return JSON.stringify(existing, null, 2);
   };
   if (harnessId === "claude-code") {
@@ -10455,25 +10470,7 @@ function connectHarnessMcp(harnessId, opts) {
   } else if (harnessId === "antigravity") {
     targetPath = join16(opts.home, ".gemini", "config", "mcp_config.json");
     hint = "Shared config read by Antigravity CLI and IDE (2.0+); older IDE builds read ~/.gemini/antigravity/mcp_config.json instead. Refresh Installed MCP Servers; the first tool call may still require approval.";
-    let existing = {};
-    if (exists(targetPath)) {
-      existing = parseMcpJsonConfig(targetPath, read(targetPath));
-    }
-    if (!existing.mcpServers) {
-      existing.mcpServers = {};
-    }
-    if (opts.zamPath.endsWith(".js")) {
-      existing.mcpServers.zam = {
-        command: process.execPath,
-        args: [opts.zamPath, "mcp"]
-      };
-    } else {
-      existing.mcpServers.zam = {
-        command: opts.zamPath,
-        args: ["mcp"]
-      };
-    }
-    content = JSON.stringify(existing, null, 2);
+    content = mergeMcpServersJson(targetPath);
   } else if (harnessId === "opencode") {
     targetPath = join16(opts.home, ".config", "opencode", "opencode.json");
     hint = "OpenCode will load the enabled 'zam' MCP server on next launch.";
@@ -10487,11 +10484,19 @@ function connectHarnessMcp(harnessId, opts) {
     }
     const servers = mcp ?? {};
     const cmd = opts.zamPath.endsWith(".js") ? [process.execPath, opts.zamPath, "mcp"] : [opts.zamPath, "mcp"];
-    servers.zam = {
+    const expected = {
       type: "local",
       command: cmd,
       enabled: true
     };
+    const current = servers.zam;
+    if (typeof current === "object" && current !== null && !Array.isArray(current)) {
+      const c = current;
+      if (c.type === expected.type && c.enabled === expected.enabled && JSON.stringify(c.command) === JSON.stringify(expected.command)) {
+        alreadyConfigured = true;
+      }
+    }
+    servers.zam = expected;
     existing.mcp = servers;
     content = JSON.stringify(existing, null, 2);
   } else if (harnessId === "codex") {
@@ -10602,21 +10607,25 @@ ${zamExtension}
     if (!existing.mcpServers) {
       existing.mcpServers = {};
     }
-    if (opts.zamPath.endsWith(".js")) {
-      existing.mcpServers.zam = {
-        type: "local",
-        command: process.execPath,
-        args: [opts.zamPath, "mcp"],
-        tools: ["*"]
-      };
-    } else {
-      existing.mcpServers.zam = {
-        type: "local",
-        command: opts.zamPath,
-        args: ["mcp"],
-        tools: ["*"]
-      };
+    const expected = opts.zamPath.endsWith(".js") ? {
+      type: "local",
+      command: process.execPath,
+      args: [opts.zamPath, "mcp"],
+      tools: ["*"]
+    } : {
+      type: "local",
+      command: opts.zamPath,
+      args: ["mcp"],
+      tools: ["*"]
+    };
+    const current = existing.mcpServers.zam;
+    if (typeof current === "object" && current !== null && !Array.isArray(current)) {
+      const c = current;
+      if (c.type === expected.type && c.command === expected.command && JSON.stringify(c.args) === JSON.stringify(expected.args) && JSON.stringify(c.tools) === JSON.stringify(expected.tools)) {
+        alreadyConfigured = true;
+      }
     }
+    existing.mcpServers.zam = expected;
     content = JSON.stringify(existing, null, 2);
   }
   return {
@@ -11043,6 +11052,127 @@ function inspectConnectHarnesses(deps = {}) {
   return { zamOnPath: Boolean(foundZam), harnesses };
 }
 
+// src/cli/cli-install.ts
+import { execFileSync as execFileSync4 } from "child_process";
+import {
+  chmodSync as chmodSync2,
+  existsSync as existsSync17,
+  mkdirSync as mkdirSync13,
+  readFileSync as readFileSync14,
+  writeFileSync as writeFileSync11
+} from "fs";
+import { homedir as homedir14 } from "os";
+import { delimiter as delimiter2, join as join19, resolve as resolve5 } from "path";
+var BUILT_CLI_PATTERN = /[\\/]dist[\\/]cli[\\/]index\.js$/;
+function normalizeForCompare(path, platform) {
+  const resolved = resolve5(path);
+  return platform === "win32" ? resolved.toLowerCase() : resolved;
+}
+function windowsShimContent(nodePath, cliPath) {
+  return `@echo off\r
+"${nodePath}" "${cliPath}" %*\r
+`;
+}
+function unixShimContent(nodePath, cliPath) {
+  return `#!/bin/sh
+exec "${nodePath}" "${cliPath}" "$@"
+`;
+}
+function psQuote(value) {
+  return `'${value.replace(/'/g, "''")}'`;
+}
+function ensureWindowsUserPath(binDir) {
+  const script = [
+    "$ErrorActionPreference = 'Stop'",
+    "$key = [Microsoft.Win32.Registry]::CurrentUser.CreateSubKey('Environment', $true)",
+    "$old = [string]$key.GetValue('Path', '', [Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames)",
+    `$target = ${psQuote(binDir)}`,
+    "$expanded = ($old -split ';') | Where-Object { $_ -ne '' } | ForEach-Object { [Environment]::ExpandEnvironmentVariables($_).TrimEnd('\\') }",
+    "if ($expanded -contains $target.TrimEnd('\\')) { 'present'; exit 0 }",
+    "$new = if ($old -and -not $old.EndsWith(';')) { $old + ';' + $target } else { $old + $target }",
+    "$key.SetValue('Path', $new, [Microsoft.Win32.RegistryValueKind]::ExpandString)",
+    `$sig = '[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] public static extern IntPtr SendMessageTimeout(IntPtr hWnd, uint Msg, UIntPtr wParam, string lParam, uint fuFlags, uint uTimeout, out UIntPtr lpdwResult);'`,
+    "$type = Add-Type -MemberDefinition $sig -Name 'ZamEnvBroadcast' -Namespace 'ZamInstall' -PassThru",
+    "[UIntPtr]$result = [UIntPtr]::Zero",
+    "$null = $type::SendMessageTimeout([IntPtr]0xffff, 0x001A, [UIntPtr]::Zero, 'Environment', 2, 5000, [ref]$result)",
+    "'updated'"
+  ].join("; ");
+  const output = execFileSync4(
+    "powershell.exe",
+    ["-NoProfile", "-NonInteractive", "-Command", script],
+    { stdio: ["ignore", "pipe", "pipe"], windowsHide: true }
+  ).toString().trim();
+  return output.endsWith("updated");
+}
+function ensureUnixUserPath(home, platform) {
+  const profile = join19(home, platform === "darwin" ? ".zprofile" : ".profile");
+  const existing = existsSync17(profile) ? readFileSync14(profile, "utf8") : "";
+  if (existing.includes(".zam/bin")) return false;
+  const block = `
+# Added by ZAM: keep the zam CLI on PATH
+export PATH="$HOME/.zam/bin:$PATH"
+`;
+  writeFileSync11(profile, existing + block, "utf8");
+  return true;
+}
+function installCliShim(options = {}) {
+  const home = options.home ?? homedir14();
+  const platform = options.platform ?? process.platform;
+  const env = options.env ?? process.env;
+  const find = options.find ?? findExecutable;
+  const nodePath = resolve5(options.nodePath ?? process.execPath);
+  const cliPath = resolve5(options.cliPath ?? process.argv[1] ?? "");
+  const binDir = join19(home, ".zam", "bin");
+  const shimPath = join19(binDir, platform === "win32" ? "zam.cmd" : "zam");
+  const report = {
+    status: "ok",
+    binDir,
+    shimPath,
+    nodePath,
+    cliPath,
+    onPath: false,
+    pathUpdated: false,
+    needsNewTerminal: false
+  };
+  if (!BUILT_CLI_PATTERN.test(cliPath) || !existsSync17(cliPath)) {
+    report.status = "skipped";
+    report.detail = `Not running from a built CLI entry (${cliPath}); nothing to link.`;
+    return report;
+  }
+  try {
+    const existing = find("zam");
+    if (existing && normalizeForCompare(existing, platform) !== normalizeForCompare(shimPath, platform)) {
+      report.status = "external";
+      report.onPath = true;
+      report.detail = existing;
+      return report;
+    }
+    const content = platform === "win32" ? windowsShimContent(nodePath, cliPath) : unixShimContent(nodePath, cliPath);
+    const existed = existsSync17(shimPath);
+    const changed = !existed || readFileSync14(shimPath, "utf8") !== content;
+    if (changed) {
+      mkdirSync13(binDir, { recursive: true });
+      writeFileSync11(shimPath, content, "utf8");
+      if (platform !== "win32") chmodSync2(shimPath, 493);
+    }
+    report.status = !existed ? "installed" : changed ? "refreshed" : "ok";
+    const processPathHasBin = (env.PATH ?? "").split(delimiter2).map((entry) => normalizeForCompare(entry.trim() || ".", platform)).includes(normalizeForCompare(binDir, platform));
+    if (processPathHasBin) {
+      report.onPath = true;
+      return report;
+    }
+    const ensureUserPath = options.ensureUserPath ?? (platform === "win32" ? ensureWindowsUserPath : () => ensureUnixUserPath(home, platform));
+    report.pathUpdated = ensureUserPath(binDir);
+    report.onPath = true;
+    report.needsNewTerminal = true;
+    return report;
+  } catch (error) {
+    report.status = "error";
+    report.detail = error instanceof Error ? error.message : String(error);
+    return report;
+  }
+}
+
 // src/cli/curriculum/breadcrumb.ts
 init_kernel();
 var LAST_SELECTION_KEY = "curriculum.lastSelection";
@@ -27729,6 +27859,297 @@ function getCurriculumProvider(id) {
   return CURRICULUM_PROVIDERS.find((provider) => provider.id === id);
 }
 
+// src/cli/install-repair.ts
+init_kernel();
+import { existsSync as existsSync19 } from "fs";
+
+// src/cli/provisioning/index.ts
+import {
+  existsSync as existsSync18,
+  lstatSync as lstatSync2,
+  mkdirSync as mkdirSync14,
+  readFileSync as readFileSync15,
+  realpathSync,
+  rmSync as rmSync2,
+  symlinkSync,
+  writeFileSync as writeFileSync12
+} from "fs";
+import { basename as basename4, dirname as dirname10, join as join20 } from "path";
+import { fileURLToPath as fileURLToPath5 } from "url";
+var packageRoot3 = [
+  fileURLToPath5(new URL("../..", import.meta.url)),
+  fileURLToPath5(new URL("../../..", import.meta.url))
+].find((candidate) => existsSync18(join20(candidate, "package.json"))) ?? fileURLToPath5(new URL("../..", import.meta.url));
+var ALL_SETUP_AGENTS = ["claude", "copilot", "codex", "agent"];
+var SKILL_PAIRS = [
+  {
+    from: join20(packageRoot3, ".claude", "skills", "zam", "SKILL.md"),
+    to: join20(".claude", "skills", "zam", "SKILL.md"),
+    agents: ["claude", "copilot"]
+  },
+  {
+    from: join20(packageRoot3, ".agent", "skills", "zam", "SKILL.md"),
+    to: join20(".agent", "skills", "zam", "SKILL.md"),
+    agents: ["agent"]
+  },
+  {
+    from: join20(packageRoot3, ".agents", "skills", "zam", "SKILL.md"),
+    to: join20(".agents", "skills", "zam", "SKILL.md"),
+    agents: ["codex"]
+  }
+];
+function parseSetupAgents(value) {
+  if (!value || value.trim().toLowerCase() === "all") {
+    return new Set(ALL_SETUP_AGENTS);
+  }
+  const aliases = {
+    claude: ["claude"],
+    copilot: ["copilot"],
+    codex: ["codex"],
+    agent: ["agent"],
+    opencode: ["agent"]
+  };
+  const selected = /* @__PURE__ */ new Set();
+  for (const raw of value.split(",")) {
+    const key = raw.trim().toLowerCase();
+    const mapped = aliases[key];
+    if (!mapped) {
+      throw new Error(
+        `Unknown agent "${raw}". Use: all, claude, copilot, codex, agent.`
+      );
+    }
+    for (const item of mapped) selected.add(item);
+  }
+  return selected;
+}
+function pathExists(path) {
+  try {
+    lstatSync2(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isSymbolicLink(path) {
+  try {
+    return lstatSync2(path).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+function comparableRealPath(path) {
+  const real = realpathSync(path);
+  return process.platform === "win32" ? real.toLowerCase() : real;
+}
+function pathsResolveToSameDirectory(sourceDir, destinationDir) {
+  try {
+    return comparableRealPath(destinationDir) === comparableRealPath(sourceDir);
+  } catch {
+    return false;
+  }
+}
+function linkPointsTo(sourceDir, destinationDir) {
+  return isSymbolicLink(destinationDir) && pathsResolveToSameDirectory(sourceDir, destinationDir);
+}
+function isZamSkillCopy(destinationDir) {
+  try {
+    if (!lstatSync2(destinationDir).isDirectory()) return false;
+    const skillFile = join20(destinationDir, "SKILL.md");
+    if (!existsSync18(skillFile)) return false;
+    return /^name:\s*zam\s*$/m.test(readFileSync15(skillFile, "utf8"));
+  } catch {
+    return false;
+  }
+}
+function classifySkillDestination(sourceDir, destinationDir) {
+  if (!existsSync18(sourceDir)) return "source-missing";
+  if (!isSymbolicLink(destinationDir) && pathsResolveToSameDirectory(sourceDir, destinationDir)) {
+    return "source-directory";
+  }
+  if (linkPointsTo(sourceDir, destinationDir)) return "linked";
+  if (!pathExists(destinationDir)) return "missing";
+  if (isSymbolicLink(destinationDir)) return "broken";
+  if (isZamSkillCopy(destinationDir)) return "stale-copy";
+  return "unmanaged";
+}
+function wireSkills(cwd = process.cwd(), agents = parseSetupAgents(), opts = {}) {
+  const results = [];
+  const log = (message) => {
+    if (!opts.quiet) console.log(message);
+  };
+  for (const { from, to, agents: pairAgents } of SKILL_PAIRS) {
+    if (!pairAgents.some((agent) => agents.has(agent))) continue;
+    const sourceDir = dirname10(from);
+    const destinationDir = dirname10(join20(cwd, to));
+    const label = dirname10(to);
+    const state = classifySkillDestination(sourceDir, destinationDir);
+    if (state === "source-missing") {
+      if (!opts.quiet) {
+        console.warn(`  warn  source not found, skipping: ${sourceDir}`);
+      }
+      results.push({
+        source: sourceDir,
+        destination: destinationDir,
+        action: "skipped",
+        reason: "source-not-found"
+      });
+      continue;
+    }
+    if (state === "source-directory") {
+      log(`  skip  ${label} (package source)`);
+      results.push({
+        source: sourceDir,
+        destination: destinationDir,
+        action: "skipped",
+        reason: "source-directory"
+      });
+      continue;
+    }
+    if (state === "linked") {
+      log(`  skip  ${label} (already linked)`);
+      results.push({
+        source: sourceDir,
+        destination: destinationDir,
+        action: "skipped",
+        reason: "already-linked"
+      });
+      continue;
+    }
+    const destinationExists = state !== "missing";
+    const replaceExisting = destinationExists && (Boolean(opts.force) || state === "broken" || state === "stale-copy");
+    if (destinationExists && !replaceExisting) {
+      if (!opts.quiet) {
+        console.warn(
+          `  warn  ${label} already exists and is not managed by ZAM; use --force to replace it`
+        );
+      }
+      results.push({
+        source: sourceDir,
+        destination: destinationDir,
+        action: "skipped",
+        reason: "unmanaged-destination"
+      });
+      continue;
+    }
+    const action = destinationExists ? "relinked" : "linked";
+    if (opts.dryRun) {
+      log(`  would ${action === "linked" ? "link" : "relink"}  ${label}`);
+    } else {
+      if (destinationExists) {
+        rmSync2(destinationDir, { recursive: true, force: true });
+      }
+      mkdirSync14(dirname10(destinationDir), { recursive: true });
+      symlinkSync(
+        sourceDir,
+        destinationDir,
+        process.platform === "win32" ? "junction" : "dir"
+      );
+      log(`  ${action === "linked" ? "link" : "relink"}  ${label}`);
+    }
+    results.push({ source: sourceDir, destination: destinationDir, action });
+  }
+  return results;
+}
+function inspectSkillLinks(cwd = process.cwd(), agents = parseSetupAgents()) {
+  const results = [];
+  for (const { from, to, agents: pairAgents } of SKILL_PAIRS) {
+    if (!pairAgents.some((agent) => agents.has(agent))) continue;
+    const sourceDir = dirname10(from);
+    const destinationDir = dirname10(join20(cwd, to));
+    results.push({
+      agents: pairAgents,
+      source: sourceDir,
+      destination: destinationDir,
+      state: classifySkillDestination(sourceDir, destinationDir)
+    });
+  }
+  return results;
+}
+function summarizeSkillLinkHealth(inspections) {
+  if (inspections.some((item) => item.state === "unmanaged")) {
+    return "unmanaged";
+  }
+  const repairable = ["missing", "broken", "stale-copy"];
+  if (inspections.some((item) => repairable.includes(item.state))) {
+    return "needs-repair";
+  }
+  return "healthy";
+}
+
+// src/cli/install-repair.ts
+function defaultRepairWorkspaces() {
+  const summary = {
+    provisioned: 0,
+    missing: 0,
+    relinked: 0
+  };
+  try {
+    const agents = parseSetupAgents();
+    for (const workspace of getConfiguredWorkspaces()) {
+      if (!existsSync19(workspace.path)) {
+        summary.missing += 1;
+        continue;
+      }
+      const results = wireSkills(workspace.path, agents, { quiet: true });
+      summary.provisioned += 1;
+      summary.relinked += results.filter(
+        (result) => result.action === "linked" || result.action === "relinked"
+      ).length;
+    }
+  } catch (error) {
+    summary.error = error instanceof Error ? error.message : String(error);
+  }
+  return summary;
+}
+function defaultConnectAgents(deps) {
+  const report = performAgentConnect({}, deps);
+  const companion = report.results.find((result) => result.extension?.kind === "vscode")?.extension?.action ?? null;
+  return {
+    success: report.success,
+    detected: report.detected,
+    connected: report.results.filter(
+      (result) => !result.error && (result.alreadyConfigured || result.wrote)
+    ).length,
+    companion,
+    errors: report.results.flatMap(
+      (result) => result.error ? [`${result.label}: ${result.error}`] : []
+    )
+  };
+}
+function performInstallRepair(opts = {}, deps = {}) {
+  const version = (deps.version ?? currentVersion)();
+  const getLastRepaired = deps.getLastRepaired ?? getLastRepairedVersion;
+  if (opts.ifVersionChanged && getLastRepaired() === version) {
+    return {
+      version,
+      skipped: true,
+      cli: null,
+      workspaces: null,
+      agents: null
+    };
+  }
+  const cli = (deps.installCli ?? installCliShim)();
+  const workspaces = (deps.repairWorkspaces ?? defaultRepairWorkspaces)();
+  const agentDeps = {};
+  if (cli.status === "installed" || cli.status === "refreshed" || cli.status === "ok") {
+    agentDeps.findZam = () => cli.shimPath;
+  }
+  let agents;
+  try {
+    agents = (deps.connectAgents ?? defaultConnectAgents)(agentDeps);
+  } catch (error) {
+    agents = {
+      success: false,
+      detected: [],
+      connected: 0,
+      companion: null,
+      errors: [error instanceof Error ? error.message : String(error)]
+    };
+  }
+  (deps.setLastRepaired ?? setLastRepairedVersion)(version);
+  return { version, skipped: false, cli, workspaces, agents };
+}
+
 // src/cli/llm/capability-probe.ts
 init_kernel();
 var EMBEDDING_MODEL_HINTS = [
@@ -27853,9 +28274,9 @@ function validateModelSave(entry, probe, now = () => (/* @__PURE__ */ new Date()
 // src/cli/llm/vision.ts
 init_kernel();
 import { randomBytes } from "crypto";
-import { readFileSync as readFileSync14 } from "fs";
+import { readFileSync as readFileSync16 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { basename as basename4, join as join19 } from "path";
+import { basename as basename5, join as join21 } from "path";
 var LANGUAGE_NAMES2 = {
   en: "English",
   de: "German",
@@ -27891,13 +28312,13 @@ async function observeUiSnapshotViaLLM(db, input) {
   const imageUrls = [];
   const isVideo = /\.(mp4|mov|m4v|avi|mkv|webm)$/i.test(input.imagePath);
   if (isVideo) {
-    const { mkdirSync: mkdirSync15, readdirSync: readdirSync3, rmSync: rmSync4 } = await import("fs");
+    const { mkdirSync: mkdirSync16, readdirSync: readdirSync3, rmSync: rmSync4 } = await import("fs");
     const { execSync: execSync5 } = await import("child_process");
-    const tempDir = join19(
+    const tempDir = join21(
       tmpdir2(),
       `zam-frames-${randomBytes(4).toString("hex")}`
     );
-    mkdirSync15(tempDir, { recursive: true });
+    mkdirSync16(tempDir, { recursive: true });
     try {
       execSync5(
         `ffmpeg -i "${input.imagePath}" -vf "fps=1/3,scale=1280:-1" -vsync vfr "${tempDir}/frame_%03d.png"`,
@@ -27926,7 +28347,7 @@ async function observeUiSnapshotViaLLM(db, input) {
         }
       }
       for (const file of sampledFiles) {
-        const bytes = readFileSync14(join19(tempDir, file));
+        const bytes = readFileSync16(join21(tempDir, file));
         imageUrls.push(`data:image/png;base64,${bytes.toString("base64")}`);
       }
     } finally {
@@ -27936,7 +28357,7 @@ async function observeUiSnapshotViaLLM(db, input) {
       }
     }
   } else {
-    const imageBytes = readFileSync14(input.imagePath);
+    const imageBytes = readFileSync16(input.imagePath);
     const ext = input.imagePath.split(".").pop()?.toLowerCase();
     const mime = ext === "jpg" || ext === "jpeg" ? "image/jpeg" : "image/png";
     imageUrls.push(`data:${mime};base64,${imageBytes.toString("base64")}`);
@@ -28174,7 +28595,7 @@ function buildReport(input, draft) {
     evidence: [
       {
         type: "keyframe",
-        ref: input.evidenceRef ?? basename4(input.imagePath),
+        ref: input.evidenceRef ?? basename5(input.imagePath),
         redacted: input.redacted ?? false
       }
     ],
@@ -28196,7 +28617,7 @@ function uncertainReport(input, summary) {
     evidence: [
       {
         type: "keyframe",
-        ref: input.evidenceRef ?? basename4(input.imagePath),
+        ref: input.evidenceRef ?? basename5(input.imagePath),
         redacted: input.redacted ?? false
       }
     ],
@@ -28406,219 +28827,6 @@ async function withProviderScope(machine, action) {
   await withDb(action);
 }
 
-// src/cli/provisioning/index.ts
-import {
-  existsSync as existsSync17,
-  lstatSync as lstatSync2,
-  mkdirSync as mkdirSync13,
-  readFileSync as readFileSync15,
-  realpathSync,
-  rmSync as rmSync2,
-  symlinkSync,
-  writeFileSync as writeFileSync11
-} from "fs";
-import { basename as basename5, dirname as dirname10, join as join20 } from "path";
-import { fileURLToPath as fileURLToPath5 } from "url";
-var packageRoot3 = [
-  fileURLToPath5(new URL("../..", import.meta.url)),
-  fileURLToPath5(new URL("../../..", import.meta.url))
-].find((candidate) => existsSync17(join20(candidate, "package.json"))) ?? fileURLToPath5(new URL("../..", import.meta.url));
-var ALL_SETUP_AGENTS = ["claude", "copilot", "codex", "agent"];
-var SKILL_PAIRS = [
-  {
-    from: join20(packageRoot3, ".claude", "skills", "zam", "SKILL.md"),
-    to: join20(".claude", "skills", "zam", "SKILL.md"),
-    agents: ["claude", "copilot"]
-  },
-  {
-    from: join20(packageRoot3, ".agent", "skills", "zam", "SKILL.md"),
-    to: join20(".agent", "skills", "zam", "SKILL.md"),
-    agents: ["agent"]
-  },
-  {
-    from: join20(packageRoot3, ".agents", "skills", "zam", "SKILL.md"),
-    to: join20(".agents", "skills", "zam", "SKILL.md"),
-    agents: ["codex"]
-  }
-];
-function parseSetupAgents(value) {
-  if (!value || value.trim().toLowerCase() === "all") {
-    return new Set(ALL_SETUP_AGENTS);
-  }
-  const aliases = {
-    claude: ["claude"],
-    copilot: ["copilot"],
-    codex: ["codex"],
-    agent: ["agent"],
-    opencode: ["agent"]
-  };
-  const selected = /* @__PURE__ */ new Set();
-  for (const raw of value.split(",")) {
-    const key = raw.trim().toLowerCase();
-    const mapped = aliases[key];
-    if (!mapped) {
-      throw new Error(
-        `Unknown agent "${raw}". Use: all, claude, copilot, codex, agent.`
-      );
-    }
-    for (const item of mapped) selected.add(item);
-  }
-  return selected;
-}
-function pathExists(path) {
-  try {
-    lstatSync2(path);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function isSymbolicLink(path) {
-  try {
-    return lstatSync2(path).isSymbolicLink();
-  } catch {
-    return false;
-  }
-}
-function comparableRealPath(path) {
-  const real = realpathSync(path);
-  return process.platform === "win32" ? real.toLowerCase() : real;
-}
-function pathsResolveToSameDirectory(sourceDir, destinationDir) {
-  try {
-    return comparableRealPath(destinationDir) === comparableRealPath(sourceDir);
-  } catch {
-    return false;
-  }
-}
-function linkPointsTo(sourceDir, destinationDir) {
-  return isSymbolicLink(destinationDir) && pathsResolveToSameDirectory(sourceDir, destinationDir);
-}
-function isZamSkillCopy(destinationDir) {
-  try {
-    if (!lstatSync2(destinationDir).isDirectory()) return false;
-    const skillFile = join20(destinationDir, "SKILL.md");
-    if (!existsSync17(skillFile)) return false;
-    return /^name:\s*zam\s*$/m.test(readFileSync15(skillFile, "utf8"));
-  } catch {
-    return false;
-  }
-}
-function classifySkillDestination(sourceDir, destinationDir) {
-  if (!existsSync17(sourceDir)) return "source-missing";
-  if (!isSymbolicLink(destinationDir) && pathsResolveToSameDirectory(sourceDir, destinationDir)) {
-    return "source-directory";
-  }
-  if (linkPointsTo(sourceDir, destinationDir)) return "linked";
-  if (!pathExists(destinationDir)) return "missing";
-  if (isSymbolicLink(destinationDir)) return "broken";
-  if (isZamSkillCopy(destinationDir)) return "stale-copy";
-  return "unmanaged";
-}
-function wireSkills(cwd = process.cwd(), agents = parseSetupAgents(), opts = {}) {
-  const results = [];
-  const log = (message) => {
-    if (!opts.quiet) console.log(message);
-  };
-  for (const { from, to, agents: pairAgents } of SKILL_PAIRS) {
-    if (!pairAgents.some((agent) => agents.has(agent))) continue;
-    const sourceDir = dirname10(from);
-    const destinationDir = dirname10(join20(cwd, to));
-    const label = dirname10(to);
-    const state = classifySkillDestination(sourceDir, destinationDir);
-    if (state === "source-missing") {
-      if (!opts.quiet) {
-        console.warn(`  warn  source not found, skipping: ${sourceDir}`);
-      }
-      results.push({
-        source: sourceDir,
-        destination: destinationDir,
-        action: "skipped",
-        reason: "source-not-found"
-      });
-      continue;
-    }
-    if (state === "source-directory") {
-      log(`  skip  ${label} (package source)`);
-      results.push({
-        source: sourceDir,
-        destination: destinationDir,
-        action: "skipped",
-        reason: "source-directory"
-      });
-      continue;
-    }
-    if (state === "linked") {
-      log(`  skip  ${label} (already linked)`);
-      results.push({
-        source: sourceDir,
-        destination: destinationDir,
-        action: "skipped",
-        reason: "already-linked"
-      });
-      continue;
-    }
-    const destinationExists = state !== "missing";
-    const replaceExisting = destinationExists && (Boolean(opts.force) || state === "broken" || state === "stale-copy");
-    if (destinationExists && !replaceExisting) {
-      if (!opts.quiet) {
-        console.warn(
-          `  warn  ${label} already exists and is not managed by ZAM; use --force to replace it`
-        );
-      }
-      results.push({
-        source: sourceDir,
-        destination: destinationDir,
-        action: "skipped",
-        reason: "unmanaged-destination"
-      });
-      continue;
-    }
-    const action = destinationExists ? "relinked" : "linked";
-    if (opts.dryRun) {
-      log(`  would ${action === "linked" ? "link" : "relink"}  ${label}`);
-    } else {
-      if (destinationExists) {
-        rmSync2(destinationDir, { recursive: true, force: true });
-      }
-      mkdirSync13(dirname10(destinationDir), { recursive: true });
-      symlinkSync(
-        sourceDir,
-        destinationDir,
-        process.platform === "win32" ? "junction" : "dir"
-      );
-      log(`  ${action === "linked" ? "link" : "relink"}  ${label}`);
-    }
-    results.push({ source: sourceDir, destination: destinationDir, action });
-  }
-  return results;
-}
-function inspectSkillLinks(cwd = process.cwd(), agents = parseSetupAgents()) {
-  const results = [];
-  for (const { from, to, agents: pairAgents } of SKILL_PAIRS) {
-    if (!pairAgents.some((agent) => agents.has(agent))) continue;
-    const sourceDir = dirname10(from);
-    const destinationDir = dirname10(join20(cwd, to));
-    results.push({
-      agents: pairAgents,
-      source: sourceDir,
-      destination: destinationDir,
-      state: classifySkillDestination(sourceDir, destinationDir)
-    });
-  }
-  return results;
-}
-function summarizeSkillLinkHealth(inspections) {
-  if (inspections.some((item) => item.state === "unmanaged")) {
-    return "unmanaged";
-  }
-  const repairable = ["missing", "broken", "stale-copy"];
-  if (inspections.some((item) => repairable.includes(item.state))) {
-    return "needs-repair";
-  }
-  return "healthy";
-}
-
 // src/cli/users/identity.ts
 init_kernel();
 async function ensureDefaultUser(db, preferredUserId) {
@@ -28642,13 +28850,13 @@ async function resolveUser(opts, db, resolveOpts) {
 }
 
 // src/cli/workspaces/backup.ts
-import { mkdirSync as mkdirSync14 } from "fs";
-import { join as join21 } from "path";
+import { mkdirSync as mkdirSync15 } from "fs";
+import { join as join22 } from "path";
 async function backupDatabaseTo(db, targetDir) {
-  const backupDir = join21(targetDir, "zam-backups");
-  mkdirSync14(backupDir, { recursive: true });
+  const backupDir = join22(targetDir, "zam-backups");
+  mkdirSync15(backupDir, { recursive: true });
   const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const dest = join21(backupDir, `zam-${stamp}.db`);
+  const dest = join22(backupDir, `zam-${stamp}.db`);
   await db.exec(`VACUUM INTO '${dest.replace(/'/g, "''")}'`);
   return dest;
 }
@@ -28779,20 +28987,20 @@ bridgeCommand.command("workspace-info").description("Report the workspace dir, i
       activeWorkspace,
       workspaceDir: activeWorkspace.path,
       defaultWorkspaceDir: defaultWorkspaceDir(),
-      dataDir: join22(homedir14(), ".zam")
+      dataDir: join23(homedir15(), ".zam")
     });
   });
 });
 function provisionConfiguredWorkspaces() {
   return getConfiguredWorkspaces().flatMap(
-    (workspace) => existsSync18(workspace.path) ? wireSkills(workspace.path, parseSetupAgents(), { quiet: true }) : []
+    (workspace) => existsSync20(workspace.path) ? wireSkills(workspace.path, parseSetupAgents(), { quiet: true }) : []
   );
 }
 function buildWorkspaceLinkHealth(workspaces) {
   const agents = parseSetupAgents();
   const map = {};
   for (const workspace of workspaces) {
-    if (!existsSync18(workspace.path)) continue;
+    if (!existsSync20(workspace.path)) continue;
     const links = inspectSkillLinks(workspace.path, agents);
     map[workspace.id] = {
       health: summarizeSkillLinkHealth(links),
@@ -28822,7 +29030,7 @@ bridgeCommand.command("workspace-list").description("List configured ZAM workspa
       activeWorkspace,
       workspaceDir: activeWorkspace.path,
       defaultWorkspaceDir: defaultWorkspaceDir(),
-      dataDir: join22(homedir14(), ".zam"),
+      dataDir: join23(homedir15(), ".zam"),
       linkHealth: buildWorkspaceLinkHealth(workspaces)
     });
   });
@@ -28837,7 +29045,7 @@ bridgeCommand.command("workspace-repair-links").description(
   if (!id) jsonError("A non-empty --id is required");
   const workspace = getConfiguredWorkspaces().find((item) => item.id === id);
   if (!workspace) jsonError(`Workspace "${id}" is not configured`);
-  if (!existsSync18(workspace.path)) {
+  if (!existsSync20(workspace.path)) {
     jsonError(`Workspace path does not exist: ${workspace.path}`);
   }
   const agents = parseSetupAgents(opts.agents);
@@ -28868,8 +29076,8 @@ function parseBridgeWorkspaceKind(value) {
 bridgeCommand.command("workspace-add").description("Register an existing directory as a ZAM workspace (JSON)").requiredOption("--path <dir>", "Existing workspace/repository directory").option("--id <id>", "Workspace id").option("--label <label>", "Human-readable label").option("--kind <kind>", "Workspace kind", "custom").action(async (opts) => {
   const raw = String(opts.path ?? "").trim();
   if (!raw) jsonError("A non-empty --path is required");
-  const path = resolve5(raw);
-  if (!existsSync18(path)) jsonError(`Workspace path does not exist: ${path}`);
+  const path = resolve6(raw);
+  if (!existsSync20(path)) jsonError(`Workspace path does not exist: ${path}`);
   const id = opts.id ? String(opts.id).trim() : void 0;
   if (opts.id && !id) jsonError("A non-empty --id is required");
   const kind = parseBridgeWorkspaceKind(opts.kind);
@@ -28913,8 +29121,8 @@ bridgeCommand.command("workspace-remove").description("Unregister a ZAM workspac
 bridgeCommand.command("set-workspace-dir").description("Set the personal workspace directory (JSON)").requiredOption("--dir <path>", "Path to the workspace directory").action(async (opts) => {
   const raw = String(opts.dir ?? "").trim();
   if (!raw) jsonError("A non-empty --dir is required");
-  const dir = resolve5(raw);
-  if (!existsSync18(dir)) jsonError(`Workspace path does not exist: ${dir}`);
+  const dir = resolve6(raw);
+  if (!existsSync20(dir)) jsonError(`Workspace path does not exist: ${dir}`);
   const skillLinks = wireSkills(dir, parseSetupAgents(), { quiet: true });
   await withDb2(async (db) => {
     const workspace = await activateWorkspacePath(db, dir);
@@ -28977,7 +29185,7 @@ bridgeCommand.command("agent-open").description("Launch an agent harness in the
       jsonError(`Workspace is not configured: ${opts.workspace}`);
     }
     const activeWorkspace = await ensureActiveWorkspace(db);
-    const workspace = opts.dir ? existsSync18(opts.dir) ? opts.dir : homedir14() : existingWorkspaceDirOrHome(configuredWorkspace ?? activeWorkspace);
+    const workspace = opts.dir ? existsSync20(opts.dir) ? opts.dir : homedir15() : existingWorkspaceDirOrHome(configuredWorkspace ?? activeWorkspace);
     launchHarness(harness, {
       executable,
       workspace,
@@ -29349,7 +29557,7 @@ bridgeCommand.command("discover-skills").description(
   "20"
 ).action(async (opts) => {
   try {
-    const monitorDir = join22(homedir14(), ".zam", "monitor");
+    const monitorDir = join23(homedir15(), ".zam", "monitor");
     let files;
     try {
       files = readdirSync2(monitorDir).filter((f) => f.endsWith(".jsonl"));
@@ -29362,7 +29570,7 @@ bridgeCommand.command("discover-skills").description(
       return;
     }
     const limit = Number(opts.limit);
-    const sorted = files.map((f) => ({ name: f, path: join22(monitorDir, f) })).sort((a, b) => b.name.localeCompare(a.name)).slice(0, limit);
+    const sorted = files.map((f) => ({ name: f, path: join23(monitorDir, f) })).sort((a, b) => b.name.localeCompare(a.name)).slice(0, limit);
     const sessionCommands = /* @__PURE__ */ new Map();
     for (const file of sorted) {
       const sessionId = file.name.replace(".jsonl", "");
@@ -29474,7 +29682,7 @@ bridgeCommand.command("observe-ui-snapshot").description(
 });
 function resolveWindowsPowerShell() {
   try {
-    execFileSync4("where.exe", ["pwsh.exe"], { stdio: "ignore" });
+    execFileSync5("where.exe", ["pwsh.exe"], { stdio: "ignore" });
     return "pwsh";
   } catch {
     return "powershell";
@@ -29489,7 +29697,7 @@ function captureScreenshot(outputPath, hwnd, processName) {
     throw new Error(`Invalid process name format: ${processName}`);
   }
   if (platform === "win32") {
-    const stdout = execFileSync4(
+    const stdout = execFileSync5(
       resolveWindowsPowerShell(),
       [
         "-NoProfile",
@@ -29802,13 +30010,13 @@ Write-CaptureResult "fullscreen" $hwndVal $matchedBy
   } else if (platform === "darwin") {
     if (hwnd) {
       const parsedHwnd = hwnd.startsWith("0x") ? parseInt(hwnd, 16) : parseInt(hwnd, 10);
-      execFileSync4("screencapture", ["-l", String(parsedHwnd), outputPath], {
+      execFileSync5("screencapture", ["-l", String(parsedHwnd), outputPath], {
         stdio: "pipe"
       });
       return { method: "screencapture-window", target: null };
     } else if (processName) {
       try {
-        const windowId = execFileSync4(
+        const windowId = execFileSync5(
           "osascript",
           [
             "-e",
@@ -29817,17 +30025,17 @@ Write-CaptureResult "fullscreen" $hwndVal $matchedBy
           { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"] }
         ).trim();
         if (windowId && /^\d+$/.test(windowId)) {
-          execFileSync4("screencapture", ["-l", windowId, outputPath], {
+          execFileSync5("screencapture", ["-l", windowId, outputPath], {
             stdio: "pipe"
           });
           return { method: "screencapture-window", target: null };
         }
       } catch {
       }
-      execFileSync4("screencapture", ["-x", outputPath], { stdio: "pipe" });
+      execFileSync5("screencapture", ["-x", outputPath], { stdio: "pipe" });
       return { method: "screencapture-full", target: null };
     } else {
-      execFileSync4("screencapture", ["-x", outputPath], { stdio: "pipe" });
+      execFileSync5("screencapture", ["-x", outputPath], { stdio: "pipe" });
       return { method: "screencapture-full", target: null };
     }
   } else {
@@ -29864,7 +30072,7 @@ bridgeCommand.command("capture-ui").description("Capture a screenshot for agent-
         return;
       }
     }
-    const outputPath = opts.image ?? opts.output ?? join22(tmpdir3(), `zam-capture-${randomBytes2(4).toString("hex")}.png`);
+    const outputPath = opts.image ?? opts.output ?? join23(tmpdir3(), `zam-capture-${randomBytes2(4).toString("hex")}.png`);
     const captureResult = isProvided ? { method: "provided", target: null } : captureScreenshot(outputPath, opts.hwnd, opts.processName);
     if (!isProvided) {
       const post = decidePostCapture(policy, {
@@ -29892,7 +30100,7 @@ bridgeCommand.command("capture-ui").description("Capture a screenshot for agent-
         return;
       }
     }
-    const imageBytes = readFileSync16(outputPath);
+    const imageBytes = readFileSync17(outputPath);
     const base64 = imageBytes.toString("base64");
     jsonOut({
       sessionId: opts.session ?? null,
@@ -29919,11 +30127,11 @@ bridgeCommand.command("start-recording").description("Start screen recording in
     return;
   }
   const sessionId = opts.session;
-  const statePath = join22(tmpdir3(), `zam-recording-${sessionId}.json`);
+  const statePath = join23(tmpdir3(), `zam-recording-${sessionId}.json`);
   const defaultExt = platform === "win32" ? ".mkv" : ".mov";
-  const outputPath = opts.output ?? join22(tmpdir3(), `zam-recording-${sessionId}${defaultExt}`);
-  const { existsSync: existsSync20, writeFileSync: writeFileSync12, openSync, closeSync } = await import("fs");
-  if (existsSync20(statePath)) {
+  const outputPath = opts.output ?? join23(tmpdir3(), `zam-recording-${sessionId}${defaultExt}`);
+  const { existsSync: existsSync22, writeFileSync: writeFileSync13, openSync, closeSync } = await import("fs");
+  if (existsSync22(statePath)) {
     jsonOut({
       sessionId,
       started: false,
@@ -29931,7 +30139,7 @@ bridgeCommand.command("start-recording").description("Start screen recording in
     });
     return;
   }
-  const logPath = join22(tmpdir3(), `zam-recording-${sessionId}.log`);
+  const logPath = join23(tmpdir3(), `zam-recording-${sessionId}.log`);
   let logFd;
   try {
     logFd = openSync(logPath, "w");
@@ -29977,7 +30185,7 @@ bridgeCommand.command("start-recording").description("Start screen recording in
   }
   child.unref();
   if (child.pid) {
-    writeFileSync12(
+    writeFileSync13(
       statePath,
       JSON.stringify({
         pid: child.pid,
@@ -30013,9 +30221,9 @@ bridgeCommand.command("stop-recording").description(
     return;
   }
   const sessionId = opts.session;
-  const statePath = join22(tmpdir3(), `zam-recording-${sessionId}.json`);
-  const { existsSync: existsSync20, readFileSync: readFileSync18, rmSync: rmSync4 } = await import("fs");
-  if (!existsSync20(statePath)) {
+  const statePath = join23(tmpdir3(), `zam-recording-${sessionId}.json`);
+  const { existsSync: existsSync22, readFileSync: readFileSync19, rmSync: rmSync4 } = await import("fs");
+  if (!existsSync22(statePath)) {
     jsonOut({
       sessionId,
       stopped: false,
@@ -30023,7 +30231,7 @@ bridgeCommand.command("stop-recording").description(
     });
     return;
   }
-  const state = JSON.parse(readFileSync18(statePath, "utf8"));
+  const state = JSON.parse(readFileSync19(statePath, "utf8"));
   const { pid, outputPath } = state;
   try {
     process.kill(pid, "SIGINT");
@@ -30039,7 +30247,7 @@ bridgeCommand.command("stop-recording").description(
   };
   let attempts = 0;
   while (isProcessRunning(pid) && attempts < 20) {
-    await new Promise((resolve6) => setTimeout(resolve6, 250));
+    await new Promise((resolve7) => setTimeout(resolve7, 250));
     attempts++;
   }
   if (isProcessRunning(pid)) {
@@ -30052,7 +30260,7 @@ bridgeCommand.command("stop-recording").description(
     rmSync4(statePath, { force: true });
   } catch {
   }
-  if (!existsSync20(outputPath)) {
+  if (!existsSync22(outputPath)) {
     jsonOut({
       sessionId,
       stopped: false,
@@ -30482,7 +30690,7 @@ bridgeCommand.command("cloud-model-hint").description("Suggest a cloud model for
 });
 bridgeCommand.command("local-llm-hints").description("Detect installed local LLM servers and suggest defaults (JSON)").action(() => {
   const profile = getSystemProfile();
-  const flmInstalled = hasCommand("flm") || existsSync18("C:\\Program Files\\flm\\flm.exe");
+  const flmInstalled = hasCommand("flm") || existsSync20("C:\\Program Files\\flm\\flm.exe");
   const ollamaInstalled = isOllamaInstalled();
   const runners = [
     { id: "flm", label: "FastFlowLM", installed: flmInstalled },
@@ -30714,13 +30922,15 @@ bridgeCommand.command("desktop-bootstrap").description("Initialize first-run des
     const userId = await ensureDefaultUser(db, opts.user);
     const { enabled, url, model, locale } = await getLlmConfig(db);
     const { workspaceDir, activeWorkspaceId, skillLinks } = await ensureDesktopWorkspace(db);
+    const cli = installCliShim();
     jsonOut({
       userId,
       locale,
       llm: { enabled, url, model },
       activeWorkspaceId,
       workspaceDir,
-      skillLinks
+      skillLinks,
+      cli
     });
   });
 });
@@ -30737,6 +30947,22 @@ bridgeCommand.command("get-settings").description("Get active ZAM settings (JSON
     });
   });
 });
+bridgeCommand.command("install-repair").description(
+  "Verify and repair this machine's ZAM installation: CLI shim + PATH, workspace skill links, agent configs and companion extensions (JSON)"
+).option(
+  "--if-version-changed",
+  "Only run when the app version differs from the last repaired one; reports skipped:true otherwise"
+).action((opts) => {
+  try {
+    jsonOut(
+      performInstallRepair({
+        ifVersionChanged: Boolean(opts.ifVersionChanged)
+      })
+    );
+  } catch (err) {
+    jsonError(err.message);
+  }
+});
 bridgeCommand.command("agent-harness-status").description(
   "Detect installed agent harnesses and their ZAM MCP configuration state (JSON)"
 ).action(() => {
@@ -32393,11 +32619,11 @@ bridgeCommand.command("serve").description("Start the persistent JSON-RPC stdin/
 
 // src/cli/commands/mcp.ts
 var __dirname = dirname11(fileURLToPath6(import.meta.url));
-var pkgPath = join23(__dirname, "..", "..", "package.json");
-if (!existsSync19(pkgPath)) {
-  pkgPath = join23(__dirname, "..", "..", "..", "package.json");
+var pkgPath = join24(__dirname, "..", "..", "package.json");
+if (!existsSync21(pkgPath)) {
+  pkgPath = join24(__dirname, "..", "..", "..", "package.json");
 }
-var pkg = JSON.parse(readFileSync17(pkgPath, "utf-8"));
+var pkg = JSON.parse(readFileSync18(pkgPath, "utf-8"));
 var STUDIO_RESOURCE_URI = "ui://zam/studio";
 var RECALL_RESOURCE_URI = "ui://zam/recall";
 var GRAPH_RESOURCE_URI = "ui://zam/graph";
@@ -32422,13 +32648,13 @@ var STUDIO_BRIDGE_ALLOWED_COMMANDS = /* @__PURE__ */ new Set([
 function loadPanelHtml(fileName, placeholderTitle) {
   const candidates = [
     // dist/cli/commands/mcp.js → dist/ui/
-    join23(__dirname, "..", "..", "ui", fileName),
+    join24(__dirname, "..", "..", "ui", fileName),
     // src/cli/commands/mcp.ts via tsx → <repo>/dist/ui/
-    join23(__dirname, "..", "..", "..", "dist", "ui", fileName)
+    join24(__dirname, "..", "..", "..", "dist", "ui", fileName)
   ];
   for (const candidate of candidates) {
-    if (existsSync19(candidate)) {
-      return readFileSync17(candidate, "utf-8");
+    if (existsSync21(candidate)) {
+      return readFileSync18(candidate, "utf-8");
     }
   }
   return `<!doctype html>