zam-core 0.5.0 → 0.5.1

package/dist/cli/index.js

@@ -4477,6 +4477,13 @@ function upsertConfiguredWorkspace(workspace, path = defaultConfigPath()) {
   saveConfiguredWorkspaces(next, path);
   return next;
 }
+function removeConfiguredWorkspace(id, path = defaultConfigPath()) {
+  const next = getConfiguredWorkspaces(path).filter(
+    (workspace) => workspace.id !== id
+  );
+  saveConfiguredWorkspaces(next, path);
+  return next;
+}
 function detectSyncProvider(dir) {
   const p = dir.toLowerCase();
   if (p.includes("onedrive")) return "OneDrive";
@@ -5352,7 +5359,13 @@ var agentCommand = new Command("agent").description("Provision and inspect the a
 // src/cli/commands/bridge.ts
 import { execFileSync as execFileSync4 } from "child_process";
 import { randomBytes as randomBytes2 } from "crypto";
-import { existsSync as existsSync17, readdirSync as readdirSync2, readFileSync as readFileSync11, rmSync as rmSync2 } from "fs";
+import {
+  existsSync as existsSync17,
+  mkdirSync as mkdirSync10,
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync11,
+  rmSync as rmSync3
+} from "fs";
 import { homedir as homedir10, tmpdir as tmpdir3 } from "os";
 import { basename as basename5, join as join17, resolve as resolve5 } from "path";
 import { Command as Command4 } from "commander";
@@ -5974,7 +5987,7 @@ async function startLocalRunner(url, model, locale) {
   let attempts = 0;
   const dotsPerLine = 30;
   while (true) {
-    await new Promise((resolve8) => setTimeout(resolve8, 500));
+    await new Promise((resolve9) => setTimeout(resolve9, 500));
     if (await isLlmOnline(url)) {
       if (attempts > 0) process.stdout.write("\n");
       return true;
@@ -6129,8 +6142,8 @@ async function fetchWithInteractiveTimeout(url, options = {}) {
   const dotsPerLine = 30;
   while (true) {
     let timeoutId;
-    const timeoutPromise = new Promise((resolve8) => {
-      timeoutId = setTimeout(() => resolve8("timeout"), timeoutMs);
+    const timeoutPromise = new Promise((resolve9) => {
+      timeoutId = setTimeout(() => resolve9("timeout"), timeoutMs);
     });
     const dotsInterval = setInterval(() => {
       process.stdout.write(".");
@@ -6240,25 +6253,25 @@ async function observeUiSnapshotViaLLM(db, input8) {
   const imageUrls = [];
   const isVideo = /\.(mp4|mov|m4v|avi|mkv|webm)$/i.test(input8.imagePath);
   if (isVideo) {
-    const { mkdirSync: mkdirSync13, readdirSync: readdirSync3, rmSync: rmSync3 } = await import("fs");
+    const { mkdirSync: mkdirSync14, readdirSync: readdirSync4, rmSync: rmSync4 } = await import("fs");
     const { execSync: execSync6 } = await import("child_process");
     const tempDir = join14(
       tmpdir2(),
       `zam-frames-${randomBytes(4).toString("hex")}`
     );
-    mkdirSync13(tempDir, { recursive: true });
+    mkdirSync14(tempDir, { recursive: true });
     try {
       execSync6(
         `ffmpeg -i "${input8.imagePath}" -vf "fps=1/3,scale=1280:-1" -vsync vfr "${tempDir}/frame_%03d.png"`,
         { stdio: "ignore" }
       );
-      let files = readdirSync3(tempDir).filter((f) => f.endsWith(".png")).sort();
+      let files = readdirSync4(tempDir).filter((f) => f.endsWith(".png")).sort();
       if (files.length === 0) {
         execSync6(
           `ffmpeg -i "${input8.imagePath}" -vframes 1 "${tempDir}/frame_001.png"`,
           { stdio: "ignore" }
         );
-        files = readdirSync3(tempDir).filter((f) => f.endsWith(".png")).sort();
+        files = readdirSync4(tempDir).filter((f) => f.endsWith(".png")).sort();
       }
       const maxFrames = cfg.maxFrames ?? 100;
       let sampledFiles = files;
@@ -6280,7 +6293,7 @@ async function observeUiSnapshotViaLLM(db, input8) {
       }
     } finally {
       try {
-        rmSync3(tempDir, { recursive: true, force: true });
+        rmSync4(tempDir, { recursive: true, force: true });
       } catch {
       }
     }
@@ -6635,40 +6648,16 @@ async function resolveUser(opts, db, resolveOpts) {
   process.exit(1);
 }
 
-// src/cli/commands/shared/db.ts
-function defaultErrorHandler(message) {
-  console.error("Error:", message);
-  process.exit(1);
-}
-async function withDb(fn, onError = defaultErrorHandler) {
-  let db;
-  try {
-    db = await openDatabase();
-    await fn(db);
-  } catch (err) {
-    onError(err.message);
-  } finally {
-    await db?.close();
-  }
-}
-function jsonOut(data) {
-  console.log(JSON.stringify(data, null, 2));
-}
-
-// src/cli/commands/workspace.ts
-import { execFileSync as execFileSync3 } from "child_process";
-import { existsSync as existsSync16, mkdirSync as mkdirSync9, writeFileSync as writeFileSync8 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join16, resolve as resolve4 } from "path";
-import { confirm, input } from "@inquirer/prompts";
-import { Command as Command3 } from "commander";
-
 // src/cli/commands/setup.ts
 import {
-  copyFileSync as copyFileSync2,
   existsSync as existsSync15,
+  lstatSync,
   mkdirSync as mkdirSync8,
+  readdirSync as readdirSync2,
   readFileSync as readFileSync10,
+  realpathSync,
+  rmSync as rmSync2,
+  symlinkSync,
   writeFileSync as writeFileSync7
 } from "fs";
 import { basename as basename4, dirname as dirname5, join as join15, resolve as resolve3 } from "path";
@@ -6683,7 +6672,7 @@ var SKILL_PAIRS = [
   {
     from: join15(packageRoot, ".claude", "skills", "zam", "SKILL.md"),
     to: join15(".claude", "skills", "zam", "SKILL.md"),
-    agents: ["claude"]
+    agents: ["claude", "copilot"]
   },
   {
     from: join15(packageRoot, ".agent", "skills", "zam", "SKILL.md"),
@@ -6693,7 +6682,7 @@ var SKILL_PAIRS = [
   {
     from: join15(packageRoot, ".agents", "skills", "zam", "SKILL.md"),
     to: join15(".agents", "skills", "zam", "SKILL.md"),
-    agents: ["copilot", "codex"]
+    agents: ["codex"]
   }
 ];
 function parseSetupAgents(value) {
@@ -6720,34 +6709,119 @@ function parseSetupAgents(value) {
   }
   return selected;
 }
-function copySkills(force, cwd = process.cwd(), agents = parseSetupAgents(), dryRun = false) {
-  let anyAction = false;
+function pathExists(path) {
+  try {
+    lstatSync(path);
+    return true;
+  } 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) {
+  try {
+    return lstatSync(destinationDir).isSymbolicLink() && pathsResolveToSameDirectory(sourceDir, destinationDir);
+  } catch {
+    return false;
+  }
+}
+function isReplaceableCopiedSkill(destinationDir) {
+  try {
+    if (!lstatSync(destinationDir).isDirectory()) return false;
+    const entries = readdirSync2(destinationDir);
+    if (entries.length !== 1 || entries[0] !== "SKILL.md") return false;
+    return /^name:\s*zam\s*$/m.test(
+      readFileSync10(join15(destinationDir, "SKILL.md"), "utf8")
+    );
+  } catch {
+    return false;
+  }
+}
+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 dest = join15(cwd, to);
-    if (!existsSync15(from)) {
-      console.warn(`  warn  source not found, skipping: ${from}`);
+    const sourceDir = dirname5(from);
+    const destinationDir = dirname5(join15(cwd, to));
+    if (!existsSync15(sourceDir)) {
+      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 (existsSync15(dest) && !force) {
-      console.log(`  skip  ${to} (already present \xE2\u20AC\u201D use --force to update)`);
+    if (pathsResolveToSameDirectory(sourceDir, destinationDir) && !lstatSync(destinationDir).isSymbolicLink()) {
+      log(`  skip  ${dirname5(to)} (package source)`);
+      results.push({
+        source: sourceDir,
+        destination: destinationDir,
+        action: "skipped",
+        reason: "source-directory"
+      });
       continue;
     }
-    if (dryRun) {
-      console.log(`  would copy  ${to}`);
-      anyAction = true;
+    if (linkPointsTo(sourceDir, destinationDir)) {
+      log(`  skip  ${dirname5(to)} (already linked)`);
+      results.push({
+        source: sourceDir,
+        destination: destinationDir,
+        action: "skipped",
+        reason: "already-linked"
+      });
       continue;
     }
-    mkdirSync8(dirname5(dest), { recursive: true });
-    copyFileSync2(from, dest);
-    console.log(`  copy  ${to}`);
-    anyAction = true;
-  }
-  if (!anyAction && !force) {
-    console.log(
-      "\nSkill files are already up to date. Run with --force to overwrite."
-    );
+    const destinationExists = pathExists(destinationDir);
+    const replaceExisting = destinationExists && (Boolean(opts.force) || isReplaceableCopiedSkill(destinationDir));
+    if (destinationExists && !replaceExisting) {
+      if (!opts.quiet) {
+        console.warn(
+          `  warn  ${dirname5(to)} 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"}  ${dirname5(to)}`);
+    } else {
+      if (destinationExists) {
+        rmSync2(destinationDir, { recursive: true, force: true });
+      }
+      mkdirSync8(dirname5(destinationDir), { recursive: true });
+      symlinkSync(
+        sourceDir,
+        destinationDir,
+        process.platform === "win32" ? "junction" : "dir"
+      );
+      log(`  ${action === "linked" ? "link" : "relink"}  ${dirname5(to)}`);
+    }
+    results.push({ source: sourceDir, destination: destinationDir, action });
   }
+  return results;
 }
 function formatDatabaseInitTarget(target) {
   switch (target.kind) {
@@ -6825,7 +6899,7 @@ ZAM is available in this repository. Use the \`zam\` skill in Claude Code to tur
 
 - Skill files live under \`.claude/skills/zam/\`.
 - Fast-changing review data lives in \`~/.zam/\`, not in this repository.
-- Run \`zam setup --target . --agents claude --force\` after upgrading ZAM to refresh the skill.`,
+- The skill directory is linked to this ZAM installation and updates with it.`,
       Boolean(opts.dryRun)
     );
     logInstructionAction(action, "CLAUDE.md", Boolean(opts.dryRun));
@@ -6875,7 +6949,7 @@ ZAM is available in this repository. Select the \`zam\` skill through \`/skills\
 
 - Skill files live under \`.agents/skills/zam/\`.
 - Fast-changing review data lives in \`~/.zam/\`, not in this repository.
-- Run \`zam setup --target . --agents copilot,codex --force\` after upgrading ZAM to refresh the skill.`,
+- The skill directory is linked to this ZAM installation and updates with it.`,
       Boolean(opts.dryRun)
     );
     logInstructionAction(action, "AGENTS.md", Boolean(opts.dryRun));
@@ -6922,10 +6996,10 @@ function writeCopilotInstructions(cwd = process.cwd(), opts = {}) {
     dest,
     `## ZAM learning sessions
 
-ZAM is available in this repository through \`.agents/skills/zam/\`. Use the \`zam\` skill from Copilot-compatible skill selection surfaces to turn real work into an observed learning session with active recall and FSRS scheduling.
+ZAM is available in this repository through \`.claude/skills/zam/\`. Use the \`zam\` project skill from Copilot-compatible skill selection surfaces to turn real work into an observed learning session with active recall and FSRS scheduling.
 
 - Fast-changing review data lives in \`~/.zam/\`, not in this repository.
-- Run \`zam setup --target . --agents copilot --force\` after upgrading ZAM to refresh the skill.`,
+- The skill directory is linked to this ZAM installation and updates with it.`,
     Boolean(opts.dryRun)
   );
   logInstructionAction(
@@ -6935,12 +7009,8 @@ ZAM is available in this repository through \`.agents/skills/zam/\`. Use the \`z
   );
 }
 var setupCommand = new Command2("setup").description(
-  "Distribute ZAM skill files into this personal instance and initialize the database"
-).option(
-  "--force",
-  "overwrite existing skill files (use after upgrading zam)",
-  false
-).option("--skip-init", "skip database initialization", false).option("--skip-claude-md", "skip CLAUDE.md generation", false).option("--skip-agents-md", "skip AGENTS.md generation", false).option("--target <path>", "repository/workspace directory to set up").option(
+  "Link ZAM skill directories into this workspace and initialize the database"
+).option("--force", "replace an unmanaged existing ZAM skill directory", false).option("--skip-init", "skip database initialization", false).option("--skip-claude-md", "skip CLAUDE.md generation", false).option("--skip-agents-md", "skip AGENTS.md generation", false).option("--target <path>", "repository/workspace directory to set up").option(
   "--agents <list>",
   "comma-separated agents to wire: all, claude, copilot, codex, agent"
 ).option(
@@ -6962,7 +7032,10 @@ var setupCommand = new Command2("setup").description(
       `Setting up ZAM in ${target}${opts.dryRun ? " (dry run)" : ""}
 `
     );
-    copySkills(opts.force, target, agents, opts.dryRun);
+    wireSkills(target, agents, {
+      force: opts.force,
+      dryRun: opts.dryRun
+    });
     await initDatabase(opts.skipInit || opts.dryRun);
     if (agents.has("claude")) {
       writeClaudeMd(opts.skipClaudeMd, target, {
@@ -6970,7 +7043,7 @@ var setupCommand = new Command2("setup").description(
         updateExisting: updateExistingInstructions
       });
     }
-    if (agents.has("copilot") || agents.has("codex") || agents.has("agent")) {
+    if (agents.has("codex") || agents.has("agent")) {
       writeAgentsMd(opts.skipAgentsMd, target, {
         dryRun: opts.dryRun,
         updateExisting: updateExistingInstructions
@@ -6983,12 +7056,38 @@ var setupCommand = new Command2("setup").description(
       });
     }
     console.log(
-      "\nDone. Run `zam whoami --set <your-id>` to set your identity. Start the `zam` skill with `/zam` in Claude/Gemini-compatible clients or `$zam` (or `/skills`) in Codex."
+      "\nDone. Run `zam whoami --set <your-id>` to set your identity. Start the `zam` skill with `/zam` in Claude/Copilot/Gemini-compatible clients or `$zam` (or `/skills`) in Codex."
     );
   }
 );
 
+// src/cli/commands/shared/db.ts
+function defaultErrorHandler(message) {
+  console.error("Error:", message);
+  process.exit(1);
+}
+async function withDb(fn, onError = defaultErrorHandler) {
+  let db;
+  try {
+    db = await openDatabase();
+    await fn(db);
+  } catch (err) {
+    onError(err.message);
+  } finally {
+    await db?.close();
+  }
+}
+function jsonOut(data) {
+  console.log(JSON.stringify(data, null, 2));
+}
+
 // src/cli/commands/workspace.ts
+import { execFileSync as execFileSync3 } from "child_process";
+import { existsSync as existsSync16, mkdirSync as mkdirSync9, writeFileSync as writeFileSync8 } from "fs";
+import { homedir as homedir9 } from "os";
+import { join as join16, resolve as resolve4 } from "path";
+import { confirm, input } from "@inquirer/prompts";
+import { Command as Command3 } from "commander";
 function runGit(cwd, args) {
   try {
     return execFileSync3("git", args, {
@@ -7105,13 +7204,25 @@ workspaceCommand.command("add <id>").description("Register an existing directory
       ...parseScopes(opts.scopes) ? { knowledgeScopes: parseScopes(opts.scopes) } : {},
       ...opts.defaultAgent ? { defaultAgent: opts.defaultAgent } : {}
     };
+    wireSkills(path, parseSetupAgents());
     upsertConfiguredWorkspace(workspace);
-    console.log(`Registered workspace "${id}" at ${path}.`);
+    console.log(`Registered and linked workspace "${id}" at ${path}.`);
   } catch (err) {
     console.error(`Error: ${err.message}`);
     process.exit(1);
   }
 });
+workspaceCommand.command("remove <id>").description("Unregister a ZAM workspace without deleting its files").action((id) => {
+  const existing = getConfiguredWorkspaces().find((item) => item.id === id);
+  if (!existing) {
+    console.error(`Workspace "${id}" is not configured.`);
+    process.exit(1);
+  }
+  removeConfiguredWorkspace(id);
+  console.log(
+    `Unregistered workspace "${id}". Files in ${existing.path} were not changed.`
+  );
+});
 workspaceCommand.command("setup <id>").description("Install ZAM skills into a configured workspace").option(
   "--agents <list>",
   "comma-separated agents to wire: all, claude, copilot, codex, agent"
@@ -7131,19 +7242,17 @@ workspaceCommand.command("setup <id>").description("Install ZAM skills into a co
       `Setting up workspace "${workspace.id}" in ${workspace.path}${opts.dryRun ? " (dry run)" : ""}
 `
     );
-    copySkills(
-      Boolean(opts.force),
-      workspace.path,
-      agents,
-      Boolean(opts.dryRun)
-    );
+    wireSkills(workspace.path, agents, {
+      force: Boolean(opts.force),
+      dryRun: Boolean(opts.dryRun)
+    });
     if (agents.has("claude")) {
       writeClaudeMd(false, workspace.path, {
         dryRun: Boolean(opts.dryRun),
         updateExisting: true
       });
     }
-    if (agents.has("copilot") || agents.has("codex") || agents.has("agent")) {
+    if (agents.has("codex") || agents.has("agent")) {
       writeAgentsMd(false, workspace.path, {
         dryRun: Boolean(opts.dryRun),
         updateExisting: true
@@ -7447,6 +7556,37 @@ bridgeCommand.command("workspace-info").description("Report the workspace dir, i
     });
   });
 });
+function sameWorkspacePath(left, right) {
+  const normalize = (value) => {
+    const path = resolve5(value);
+    return process.platform === "win32" ? path.toLowerCase() : path;
+  };
+  return normalize(left) === normalize(right);
+}
+async function ensureDesktopWorkspace(db) {
+  const configured = getConfiguredWorkspaces();
+  const savedWorkspaceDir = await getSetting(db, "personal.workspace_dir");
+  const workspaceDir = savedWorkspaceDir || configured.find((workspace) => workspace.kind === "personal")?.path || join17(homedir10(), "Documents", "zam");
+  mkdirSync10(workspaceDir, { recursive: true });
+  if (!savedWorkspaceDir) {
+    await setSetting(db, "personal.workspace_dir", workspaceDir);
+  }
+  if (!configured.some(
+    (workspace) => sameWorkspacePath(workspace.path, workspaceDir)
+  )) {
+    const id = configured.some((workspace) => workspace.id === "personal") ? workspaceIdFromPath(workspaceDir) : "personal";
+    upsertConfiguredWorkspace({
+      id,
+      label: basename5(workspaceDir) || "ZAM",
+      kind: "personal",
+      path: workspaceDir
+    });
+  }
+  const skillLinks = getConfiguredWorkspaces().flatMap(
+    (workspace) => existsSync17(workspace.path) ? wireSkills(workspace.path, parseSetupAgents(), { quiet: true }) : []
+  );
+  return { workspaceDir, skillLinks };
+}
 bridgeCommand.command("workspace-list").description("List configured ZAM workspaces (JSON)").action(async () => {
   await withDb2(async (db) => {
     const workspaceDir = await getSetting(db, "personal.workspace_dir") || null;
@@ -7487,6 +7627,7 @@ bridgeCommand.command("workspace-add").description("Register an existing directo
     kind: parseBridgeWorkspaceKind(opts.kind),
     path
   };
+  const skillLinks = wireSkills(path, parseSetupAgents(), { quiet: true });
   await withDb2(async (db) => {
     await setSetting(db, "personal.workspace_dir", path);
     upsertConfiguredWorkspace(workspace);
@@ -7494,7 +7635,39 @@ bridgeCommand.command("workspace-add").description("Register an existing directo
       ok: true,
       workspace,
       workspaces: getConfiguredWorkspaces(),
-      workspaceDir: path
+      workspaceDir: path,
+      skillLinks
+    });
+  });
+});
+bridgeCommand.command("workspace-remove").description("Unregister a ZAM workspace without deleting its files (JSON)").requiredOption("--id <id>", "Workspace id").action(async (opts) => {
+  const id = String(opts.id ?? "").trim();
+  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`);
+  await withDb2(async (db) => {
+    const activeWorkspaceDir = await getSetting(db, "personal.workspace_dir") || null;
+    const remaining = removeConfiguredWorkspace(id);
+    let workspaceDir = activeWorkspaceDir;
+    let skillLinks = [];
+    if (activeWorkspaceDir && sameWorkspacePath(activeWorkspaceDir, workspace.path)) {
+      if (remaining.length > 0) {
+        workspaceDir = remaining[0].path;
+        await setSetting(db, "personal.workspace_dir", workspaceDir);
+      } else {
+        workspaceDir = join17(homedir10(), "Documents", "zam");
+        await setSetting(db, "personal.workspace_dir", workspaceDir);
+        const ensured = await ensureDesktopWorkspace(db);
+        workspaceDir = ensured.workspaceDir;
+        skillLinks = ensured.skillLinks;
+      }
+    }
+    jsonOut2({
+      ok: true,
+      removed: workspace,
+      workspaces: getConfiguredWorkspaces(),
+      workspaceDir,
+      skillLinks
     });
   });
 });
@@ -7502,9 +7675,11 @@ bridgeCommand.command("set-workspace-dir").description("Set the personal workspa
   const raw = String(opts.dir ?? "").trim();
   if (!raw) jsonError("A non-empty --dir is required");
   const dir = resolve5(raw);
+  if (!existsSync17(dir)) jsonError(`Workspace path does not exist: ${dir}`);
+  const skillLinks = wireSkills(dir, parseSetupAgents(), { quiet: true });
   await withDb2(async (db) => {
     await setSetting(db, "personal.workspace_dir", dir);
-    jsonOut2({ ok: true, workspaceDir: dir });
+    jsonOut2({ ok: true, workspaceDir: dir, skillLinks });
   });
 });
 bridgeCommand.command("agent-list").description("List agent harnesses with detection state + the default (JSON)").action(async () => {
@@ -7932,7 +8107,7 @@ bridgeCommand.command("discover-skills").description(
     const monitorDir = join17(homedir10(), ".zam", "monitor");
     let files;
     try {
-      files = readdirSync2(monitorDir).filter((f) => f.endsWith(".jsonl"));
+      files = readdirSync3(monitorDir).filter((f) => f.endsWith(".jsonl"));
     } catch {
       jsonOut2({ proposals: [], message: "No monitor logs found." });
       return;
@@ -8455,7 +8630,7 @@ bridgeCommand.command("capture-ui").description("Capture a screenshot for agent-
       if (!post.allowed) {
         if (!opts.output) {
           try {
-            rmSync2(outputPath, { force: true });
+            rmSync3(outputPath, { force: true });
           } catch {
           }
         }
@@ -8594,7 +8769,7 @@ bridgeCommand.command("stop-recording").description(
   }
   const sessionId = opts.session;
   const statePath = join17(tmpdir3(), `zam-recording-${sessionId}.json`);
-  const { existsSync: existsSync25, readFileSync: readFileSync16, rmSync: rmSync3 } = await import("fs");
+  const { existsSync: existsSync25, readFileSync: readFileSync16, rmSync: rmSync4 } = await import("fs");
   if (!existsSync25(statePath)) {
     jsonOut2({
       sessionId,
@@ -8619,7 +8794,7 @@ bridgeCommand.command("stop-recording").description(
   };
   let attempts = 0;
   while (isProcessRunning(pid) && attempts < 20) {
-    await new Promise((resolve8) => setTimeout(resolve8, 250));
+    await new Promise((resolve9) => setTimeout(resolve9, 250));
     attempts++;
   }
   if (isProcessRunning(pid)) {
@@ -8629,7 +8804,7 @@ bridgeCommand.command("stop-recording").description(
     }
   }
   try {
-    rmSync3(statePath, { force: true });
+    rmSync4(statePath, { force: true });
   } catch {
   }
   if (!existsSync25(outputPath)) {
@@ -8658,7 +8833,7 @@ bridgeCommand.command("stop-recording").description(
     return;
   }
   try {
-    rmSync3(outputPath, { force: true });
+    rmSync4(outputPath, { force: true });
   } catch {
   }
   jsonOut2({
@@ -8823,10 +8998,13 @@ bridgeCommand.command("desktop-bootstrap").description("Initialize first-run des
   await withDb2(async (db) => {
     const userId = await ensureDefaultUser(db, opts.user);
     const { enabled, url, model, locale } = await getLlmConfig(db);
+    const { workspaceDir, skillLinks } = await ensureDesktopWorkspace(db);
     jsonOut2({
       userId,
       locale,
-      llm: { enabled, url, model }
+      llm: { enabled, url, model },
+      workspaceDir,
+      skillLinks
     });
   });
 });
@@ -9510,7 +9688,7 @@ ZAM Auto-Stale Complete: Scanned ${changedFiles.length} file(s).`
 });
 
 // src/cli/commands/goal.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync10 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync11 } from "fs";
 import { resolve as resolve6 } from "path";
 import { input as input3 } from "@inquirer/prompts";
 import { Command as Command8 } from "commander";
@@ -9636,7 +9814,7 @@ ${"\u2500".repeat(50)}`);
 goalCommand.command("create").description("Create a new goal").option("--slug <slug>", "Goal slug (used as filename)").option("--title <title>", "Goal title").option("--parent <slug>", "Parent goal slug").option("--description <text>", "Goal description").option("--json", "Output as JSON").action(async (opts) => {
   const goalsDir = await resolveGoalsDir();
   if (!existsSync19(goalsDir)) {
-    mkdirSync10(goalsDir, { recursive: true });
+    mkdirSync11(goalsDir, { recursive: true });
   }
   let slug = opts.slug;
   let title = opts.title;
@@ -9695,9 +9873,9 @@ goalCommand.command("status <slug> <status>").description("Update a goal's statu
 });
 
 // src/cli/commands/init.ts
-import { existsSync as existsSync20, mkdirSync as mkdirSync11, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync20, mkdirSync as mkdirSync12, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir11 } from "os";
-import { join as join19 } from "path";
+import { join as join19, resolve as resolve7 } from "path";
 import { confirm as confirm2, input as input4 } from "@inquirer/prompts";
 import { Command as Command9 } from "commander";
 var HOME2 = homedir11();
@@ -9705,9 +9883,9 @@ function printLine(char = "\u2550", len = 60, color = "\x1B[36m") {
   console.log(`${color}${char.repeat(len)}\x1B[0m`);
 }
 function bootstrapSandboxWorkspace(workspaceDir) {
-  mkdirSync11(join19(workspaceDir, "beliefs"), { recursive: true });
-  mkdirSync11(join19(workspaceDir, "goals"), { recursive: true });
-  mkdirSync11(join19(workspaceDir, "skills"), { recursive: true });
+  mkdirSync12(join19(workspaceDir, "beliefs"), { recursive: true });
+  mkdirSync12(join19(workspaceDir, "goals"), { recursive: true });
+  mkdirSync12(join19(workspaceDir, "skills"), { recursive: true });
   const worldviewFile = join19(workspaceDir, "beliefs", "worldview.md");
   if (!existsSync20(worldviewFile)) {
     writeFileSync10(
@@ -9747,12 +9925,21 @@ var initCommand = new Command9("init").description("Launch the guided interactiv
   printLine();
   console.log("\n\x1B[1m[1/5] Setting up Local Workspace Sandbox\x1B[0m");
   const defaultWorkspace = join19(HOME2, "Documents", "zam");
-  const workspacePath = await input4({
-    message: "Choose your ZAM workspace directory:",
-    default: defaultWorkspace
-  });
+  const workspacePath = resolve7(
+    await input4({
+      message: "Choose your ZAM workspace directory:",
+      default: defaultWorkspace
+    })
+  );
   try {
     bootstrapSandboxWorkspace(workspacePath);
+    wireSkills(workspacePath, parseSetupAgents());
+    upsertConfiguredWorkspace({
+      id: "personal",
+      label: "Personal",
+      kind: "personal",
+      path: workspacePath
+    });
     console.log(
       `\x1B[32m\u2713 Local Sandbox created at: ${workspacePath}\x1B[0m`
     );
@@ -10732,7 +10919,7 @@ observerCommand.command("revoke <process>").description("Remove a process from o
 
 // src/cli/commands/profile.ts
 import { homedir as homedir12 } from "os";
-import { dirname as dirname6, join as join20, resolve as resolve7 } from "path";
+import { dirname as dirname6, join as join20, resolve as resolve8 } from "path";
 import { Command as Command13 } from "commander";
 var C2 = {
   reset: "\x1B[0m",
@@ -10763,7 +10950,7 @@ var profileCommand = new Command13("profile").description("Show or change this m
     if (opts.mode) setInstallMode(opts.mode);
     db = await openDatabaseWithSync({ initialize: true });
     if (opts.dir) {
-      await setSetting(db, "personal.workspace_dir", resolve7(opts.dir));
+      await setSetting(db, "personal.workspace_dir", resolve8(opts.dir));
     }
     const personalDir = await getSetting(db, "personal.workspace_dir") || defaultPersonalDir();
     await db.close();
@@ -11897,7 +12084,7 @@ skillCommand.command("add").description("Register a new agent skill").requiredOp
 });
 
 // src/cli/commands/snapshot.ts
-import { existsSync as existsSync22, mkdirSync as mkdirSync12, readFileSync as readFileSync13, writeFileSync as writeFileSync11 } from "fs";
+import { existsSync as existsSync22, mkdirSync as mkdirSync13, readFileSync as readFileSync13, writeFileSync as writeFileSync11 } from "fs";
 import { homedir as homedir13 } from "os";
 import { dirname as dirname7, join as join21 } from "path";
 import { Command as Command19 } from "commander";
@@ -11931,7 +12118,7 @@ var exportCmd = new Command19("export").description("Write a portable SQL-text s
     const out = opts.out ?? join21(personalDir, "snapshots", defaultOutName());
     const dir = dirname7(out);
     if (dir && dir !== "." && !existsSync22(dir)) {
-      mkdirSync12(dir, { recursive: true });
+      mkdirSync13(dir, { recursive: true });
     }
     writeFileSync11(out, snapshot, "utf-8");
     console.log(`Snapshot written: ${out}`);
@@ -12601,7 +12788,7 @@ ${C3.dim}After that, 'zam ui' launches it directly.${C3.reset}`
 
 // src/cli/commands/update.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync24, readFileSync as readFileSync14, realpathSync } from "fs";
+import { existsSync as existsSync24, readFileSync as readFileSync14, realpathSync as realpathSync2 } from "fs";
 import { dirname as dirname9, join as join23 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { confirm as confirm4 } from "@inquirer/prompts";
@@ -12715,7 +12902,7 @@ var checkCmd = new Command23("check").description("Check whether a newer ZAM has
   }
 );
 function findSourceRepo() {
-  let dir = realpathSync(dirname9(fileURLToPath4(import.meta.url)));
+  let dir = realpathSync2(dirname9(fileURLToPath4(import.meta.url)));
   let parent = dirname9(dir);
   while (parent !== dir) {
     if (existsSync24(join23(dir, ".git"))) return dir;