codebyplan 1.13.22 → 1.13.24

package/dist/cli.js

@@ -14,7 +14,7 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "1.13.22";
+    VERSION = "1.13.24";
     PACKAGE_NAME = "codebyplan";
   }
 });
@@ -149,6 +149,7 @@ var init_gitignore_block = __esm({
       ".codebyplan/device.local.json",
       ".codebyplan/statusline.local.json",
       ".codebyplan/worktree.local.json",
+      ".codebyplan/claude-status.local.json",
       ".codebyplan.local.json"
     ];
     GITIGNORE_BLOCK_START = "# >>> codebyplan (managed) >>>";
@@ -225,8 +226,8 @@ async function readLocalConfig(projectPath, onMigrationNotice) {
 }
 async function writeLocalConfig(projectPath, config) {
   const content = { device_id: config.device_id };
-  const path8 = localConfigPath(projectPath);
-  const dirPath = dirname(path8);
+  const path10 = localConfigPath(projectPath);
+  const dirPath = dirname(path10);
   let phase = "stat config directory";
   try {
     try {
@@ -246,7 +247,7 @@ async function writeLocalConfig(projectPath, config) {
     phase = "create config directory";
     await mkdir(dirPath, { recursive: true });
     phase = "write local config";
-    await writeFile2(path8, JSON.stringify(content, null, 2) + "\n", "utf-8");
+    await writeFile2(path10, JSON.stringify(content, null, 2) + "\n", "utf-8");
   } catch (err) {
     const code = err.code;
     if (code === "LEGACY_FILE_BLOCKS_DIR") {
@@ -396,7 +397,8 @@ var init_statusline_config = __esm({
         rate_limits: true,
         repo_pr: true,
         worktree: true,
-        infra_drift: true
+        infra_drift: true,
+        package_freshness: true
       },
       no_color: false
     };
@@ -467,12 +469,12 @@ async function readFallback(filename) {
   }
 }
 async function writeFallback(filename, data) {
-  const path8 = fallbackFile(filename);
-  await mkdir3(dirname2(path8), { recursive: true });
-  await writeFile4(path8, JSON.stringify(data, null, 2) + "\n", "utf-8");
+  const path10 = fallbackFile(filename);
+  await mkdir3(dirname2(path10), { recursive: true });
+  await writeFile4(path10, JSON.stringify(data, null, 2) + "\n", "utf-8");
   if (platform() !== "win32") {
     try {
-      await chmod(path8, 384);
+      await chmod(path10, 384);
     } catch {
     }
   }
@@ -677,8 +679,8 @@ async function getAuthHeaders() {
     return { headers: { "x-api-key": key }, via: "api_key" };
   }
 }
-function buildUrl(path8, params) {
-  const url = new URL(`${baseUrl()}/api${path8}`);
+function buildUrl(path10, params) {
+  const url = new URL(`${baseUrl()}/api${path10}`);
   if (params) {
     for (const [key, value] of Object.entries(params)) {
       if (value !== void 0) {
@@ -695,10 +697,10 @@ function isRetryable(err) {
   return false;
 }
 function delay(ms) {
-  return new Promise((resolve8) => setTimeout(resolve8, ms));
+  return new Promise((resolve9) => setTimeout(resolve9, ms));
 }
-async function request(method, path8, options) {
-  const url = buildUrl(path8, options?.params);
+async function request(method, path10, options) {
+  const url = buildUrl(path10, options?.params);
   const auth = await getAuthHeaders();
   let lastError;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -718,7 +720,7 @@ async function request(method, path8, options) {
         signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
       });
       if (!res.ok) {
-        let message = `API ${method} ${path8} failed with status ${res.status}`;
+        let message = `API ${method} ${path10} failed with status ${res.status}`;
         let code;
         try {
           const body = await res.json();
@@ -752,14 +754,14 @@ async function request(method, path8, options) {
   }
   throw lastError;
 }
-async function apiGet(path8, params) {
-  return request("GET", path8, { params });
+async function apiGet(path10, params) {
+  return request("GET", path10, { params });
 }
-async function apiPost(path8, body) {
-  return request("POST", path8, { body });
+async function apiPost(path10, body) {
+  return request("POST", path10, { body });
 }
-async function apiPut(path8, body) {
-  return request("PUT", path8, { body });
+async function apiPut(path10, body) {
+  return request("PUT", path10, { body });
 }
 async function callMcpTool(toolName, params) {
   const url = mcpEndpoint();
@@ -1053,7 +1055,7 @@ var init_device_flow = __esm({
         this.name = "OAuthInvalidClientError";
       }
     };
-    defaultSleep = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    defaultSleep = (ms) => new Promise((resolve9) => setTimeout(resolve9, ms));
   }
 });
 
@@ -1861,9 +1863,9 @@ import { createInterface } from "node:readline/promises";
 function getConfigPath(scope) {
   return scope === "user" ? join9(homedir4(), ".claude.json") : join9(process.cwd(), ".mcp.json");
 }
-async function readConfig(path8) {
+async function readConfig(path10) {
   try {
-    const raw = await readFile6(path8, "utf-8");
+    const raw = await readFile6(path10, "utf-8");
     const parsed = JSON.parse(raw);
     if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
       return parsed;
@@ -1994,11 +1996,6 @@ async function writeCodebyplanDirectory(projectPath, selectedRepo, deviceId) {
     JSON.stringify({}, null, 2) + "\n",
     "utf-8"
   );
-  await writeFile6(
-    join9(codebyplanDir, "cmux.json"),
-    JSON.stringify({}, null, 2) + "\n",
-    "utf-8"
-  );
   const statuslinePath = join9(codebyplanDir, "statusline.json");
   let statuslineExists = false;
   try {
@@ -2016,7 +2013,7 @@ async function writeCodebyplanDirectory(projectPath, selectedRepo, deviceId) {
   await writeLocalConfig(projectPath, { device_id: deviceId });
   console.log(`  Created ${codebyplanDir}/`);
   console.log(
-    `    repo.json, server.json, git.json, shipment.json, vendor.json, e2e.json, eslint.json, cmux.json, statusline.json`
+    `    repo.json, server.json, git.json, shipment.json, vendor.json, e2e.json, eslint.json, statusline.json`
   );
   console.log(`    device.local.json (gitignored)`);
   const gitignoreAction = await ensureManagedGitignoreBlock(projectPath);
@@ -2093,8 +2090,8 @@ async function runSetup() {
     const deviceId = await getOrCreateDeviceId(projectPath);
     let branch = "main";
     try {
-      const { execSync: execSync11 } = await import("node:child_process");
-      branch = execSync11("git symbolic-ref --short HEAD", {
+      const { execSync: execSync9 } = await import("node:child_process");
+      branch = execSync9("git symbolic-ref --short HEAD", {
         cwd: projectPath,
         encoding: "utf-8"
       }).trim();
@@ -2455,9 +2452,9 @@ import { join as join11 } from "node:path";
 function configPaths() {
   return [join11(homedir5(), ".claude.json"), join11(process.cwd(), ".mcp.json")];
 }
-async function readConfig2(path8) {
+async function readConfig2(path10) {
   try {
-    const raw = await readFile8(path8, "utf-8");
+    const raw = await readFile8(path10, "utf-8");
     const parsed = JSON.parse(raw);
     if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
       return parsed;
@@ -2471,7 +2468,7 @@ function entryHasLegacyApiKey(entry) {
   if (!entry || !entry.headers) return false;
   return "x-api-key" in entry.headers;
 }
-async function rewriteConfig(path8, config, newUrl) {
+async function rewriteConfig(path10, config, newUrl) {
   const servers = config.mcpServers;
   if (!servers) return false;
   const entry = servers.codebyplan;
@@ -2479,7 +2476,7 @@ async function rewriteConfig(path8, config, newUrl) {
   if (!entryHasLegacyApiKey(entry) && entry.url === newUrl && entry.type === "http")
     return false;
   servers.codebyplan = { type: "http", url: newUrl };
-  await writeFile7(path8, JSON.stringify(config, null, 2) + "\n", "utf-8");
+  await writeFile7(path10, JSON.stringify(config, null, 2) + "\n", "utf-8");
   return true;
 }
 async function runUpgradeAuth() {
@@ -2487,12 +2484,12 @@ async function runUpgradeAuth() {
   await runLogin();
   const newUrl = mcpEndpoint();
   let migrated = 0;
-  for (const path8 of configPaths()) {
-    const config = await readConfig2(path8);
+  for (const path10 of configPaths()) {
+    const config = await readConfig2(path10);
     if (!config) continue;
-    const changed = await rewriteConfig(path8, config, newUrl);
+    const changed = await rewriteConfig(path10, config, newUrl);
     if (changed) {
-      console.log(`  Updated ${path8}`);
+      console.log(`  Updated ${path10}`);
       migrated++;
     }
   }
@@ -3764,9 +3761,9 @@ async function eslintInit(repoId, projectPath) {
   Install ${missingPkgs.length} missing packages? [Y/n] `
     );
     if (confirmed) {
-      const { execSync: execSync11 } = await import("node:child_process");
+      const { execSync: execSync9 } = await import("node:child_process");
       try {
-        execSync11(installCmd, { cwd: projectPath, stdio: "inherit" });
+        execSync9(installCmd, { cwd: projectPath, stdio: "inherit" });
         console.log("  Packages installed.\n");
       } catch (err) {
         console.error(
@@ -4201,7 +4198,7 @@ function setRetryDelayMs(ms) {
   RETRY_DELAY_MS = ms;
 }
 function sleep(ms) {
-  return new Promise((resolve8) => setTimeout(resolve8, ms));
+  return new Promise((resolve9) => setTimeout(resolve9, ms));
 }
 function isTransientMcpError(err) {
   if (!(err instanceof McpError)) return false;
@@ -6252,6 +6249,8 @@ var init_create_repo = __esm({
 // src/cli/version-status.ts
 var version_status_exports = {};
 __export(version_status_exports, {
+  fetchLatestVersion: () => fetchLatestVersion,
+  resolveGuard: () => resolveGuard,
   runVersionStatus: () => runVersionStatus
 });
 import { execFileSync, execSync as execSync6 } from "node:child_process";
@@ -6667,451 +6666,6 @@ var init_upload_e2e_images = __esm({
   }
 });
 
-// src/lib/cmux.ts
-import { readFileSync as readFileSync6 } from "node:fs";
-import { join as join22 } from "node:path";
-function insideCmux() {
-  return !!process.env.CMUX_WORKSPACE_ID;
-}
-function resolveCmuxBin() {
-  return process.env.CMUX_BUNDLED_CLI_PATH || process.env.CMUX_CLAUDE_HOOK_CMUX_BIN || "cmux";
-}
-function readCmuxConfig(projectRoot) {
-  let raw = {};
-  try {
-    const text = readFileSync6(
-      join22(projectRoot, ".codebyplan", "cmux.json"),
-      "utf-8"
-    );
-    raw = JSON.parse(text);
-  } catch {
-    raw = {};
-  }
-  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
-    raw = {};
-  }
-  const config = raw;
-  return {
-    ...config,
-    auto_status: config.auto_status ?? true,
-    auto_dev_server: config.auto_dev_server ?? true
-  };
-}
-var init_cmux = __esm({
-  "src/lib/cmux.ts"() {
-    "use strict";
-  }
-});
-
-// src/cli/cmux-sync.ts
-var cmux_sync_exports = {};
-__export(cmux_sync_exports, {
-  runCmuxSync: () => runCmuxSync
-});
-import { execSync as execSync8, execFileSync as execFileSync2 } from "node:child_process";
-import { basename as basename2 } from "node:path";
-async function runCmuxSync() {
-  try {
-    if (!insideCmux()) {
-      process.exit(0);
-    }
-    const bin = resolveCmuxBin();
-    let branch = "";
-    try {
-      branch = execSync8("git rev-parse --abbrev-ref HEAD", {
-        encoding: "utf8"
-      }).trim();
-    } catch {
-    }
-    let folder = "";
-    let toplevel = "";
-    try {
-      toplevel = execSync8("git rev-parse --show-toplevel", {
-        encoding: "utf8"
-      }).trim();
-      folder = basename2(toplevel);
-    } catch {
-    }
-    if (branch) {
-      try {
-        execFileSync2(bin, [
-          "workspace-action",
-          "--action",
-          "rename",
-          "--title",
-          branch
-        ]);
-      } catch {
-      }
-    }
-    if (folder) {
-      try {
-        execFileSync2(bin, [
-          "workspace-action",
-          "--action",
-          "set-description",
-          "--description",
-          folder
-        ]);
-      } catch {
-      }
-    }
-    try {
-      const cmuxCfg = readCmuxConfig(toplevel || process.cwd());
-      if (typeof cmuxCfg.workspace_color === "string" && cmuxCfg.workspace_color !== "") {
-        try {
-          execFileSync2(bin, [
-            "workspace-action",
-            "--action",
-            "set-color",
-            "--color",
-            cmuxCfg.workspace_color
-          ]);
-        } catch {
-        }
-      } else {
-        process.stdout.write(
-          "cmux: no workspace color set \u2014 run /cbp-setup-cmux\n"
-        );
-      }
-    } catch {
-    }
-    process.exit(0);
-  } catch (err) {
-    if (err instanceof ProcessExitSignal) throw err;
-    process.exit(0);
-  }
-}
-var init_cmux_sync = __esm({
-  "src/cli/cmux-sync.ts"() {
-    "use strict";
-    init_process_exit_signal();
-    init_cmux();
-  }
-});
-
-// src/cli/cmux-status.ts
-var cmux_status_exports = {};
-__export(cmux_status_exports, {
-  normalizeProgress: () => normalizeProgress,
-  runCmuxStatus: () => runCmuxStatus
-});
-import { execSync as execSync9, execFileSync as execFileSync3 } from "node:child_process";
-function normalizeProgress(raw) {
-  if (raw.includes("/")) {
-    const [numStr, denStr] = raw.split("/", 2);
-    const num = parseInt(numStr ?? "", 10);
-    const den = parseInt(denStr ?? "", 10);
-    if (!Number.isFinite(num) || !Number.isFinite(den) || den === 0) return "0";
-    const ratio = num / den;
-    const clamped2 = Math.max(0, Math.min(1, ratio));
-    return String(clamped2);
-  }
-  const f = parseFloat(raw);
-  if (!Number.isFinite(f)) return null;
-  const clamped = Math.max(0, Math.min(1, f));
-  return String(clamped);
-}
-async function runCmuxStatus(args) {
-  try {
-    if (!insideCmux()) {
-      process.exit(0);
-    }
-    let toplevel = "";
-    try {
-      toplevel = execSync9("git rev-parse --show-toplevel", {
-        encoding: "utf8"
-      }).trim();
-    } catch {
-      toplevel = process.cwd();
-    }
-    const cfg = readCmuxConfig(toplevel);
-    if (cfg.auto_status === false) {
-      process.exit(0);
-    }
-    let checkpoint;
-    let task;
-    let qa;
-    let progress;
-    let clear = false;
-    for (let i = 0; i < args.length; i++) {
-      const flag = args[i];
-      if (flag === "--checkpoint" && i + 1 < args.length) {
-        checkpoint = args[++i];
-      } else if (flag === "--task" && i + 1 < args.length) {
-        task = args[++i];
-      } else if (flag === "--qa" && i + 1 < args.length) {
-        qa = args[++i];
-      } else if (flag === "--progress" && i + 1 < args.length) {
-        progress = args[++i];
-      } else if (flag === "--clear") {
-        clear = true;
-      }
-    }
-    const bin = resolveCmuxBin();
-    if (clear) {
-      try {
-        execFileSync3(bin, ["clear-status", "cbp-checkpoint"]);
-      } catch {
-      }
-      try {
-        execFileSync3(bin, ["clear-status", "cbp-task"]);
-      } catch {
-      }
-      try {
-        execFileSync3(bin, ["clear-status", "cbp-qa"]);
-      } catch {
-      }
-      try {
-        execFileSync3(bin, ["clear-progress"]);
-      } catch {
-      }
-    } else {
-      if (checkpoint !== void 0) {
-        try {
-          execFileSync3(bin, ["set-status", "cbp-checkpoint", checkpoint]);
-        } catch {
-        }
-      }
-      if (task !== void 0) {
-        try {
-          execFileSync3(bin, ["set-status", "cbp-task", task]);
-        } catch {
-        }
-      }
-      if (qa !== void 0) {
-        try {
-          execFileSync3(bin, ["set-status", "cbp-qa", qa]);
-        } catch {
-        }
-      }
-      if (progress !== void 0) {
-        const decimalStr = normalizeProgress(progress);
-        if (decimalStr !== null) {
-          try {
-            execFileSync3(bin, ["set-progress", decimalStr]);
-          } catch {
-          }
-        }
-      }
-    }
-    process.exit(0);
-  } catch (err) {
-    if (err instanceof ProcessExitSignal) throw err;
-    process.exit(0);
-  }
-}
-var init_cmux_status = __esm({
-  "src/cli/cmux-status.ts"() {
-    "use strict";
-    init_process_exit_signal();
-    init_cmux();
-  }
-});
-
-// src/cli/cmux-serve.ts
-var cmux_serve_exports = {};
-__export(cmux_serve_exports, {
-  probePort: () => probePort,
-  runCmuxServe: () => runCmuxServe
-});
-import { execSync as execSync10, execFileSync as execFileSync4 } from "node:child_process";
-import { readFileSync as readFileSync7 } from "node:fs";
-import * as net from "node:net";
-import { join as join23 } from "node:path";
-function resolveAppDir(allocation, toplevel) {
-  if (allocation.command !== null && allocation.working_dir !== null) {
-    const wd = allocation.working_dir;
-    const dir = wd.startsWith(toplevel + "/") ? wd.slice(toplevel.length + 1) : wd;
-    return { appDir: dir, devCommand: allocation.command };
-  }
-  const label = allocation.label ?? "";
-  if (label === "E2E Tests") return { skip: "skip-e2e" };
-  if (label.includes("Web Dev") && !label.toLowerCase().includes("desktop")) {
-    return { appDir: "apps/web", devCommand: null };
-  }
-  if (label.toLowerCase().includes("desktop")) {
-    return { appDir: "apps/desktop", devCommand: null };
-  }
-  const appDir = LABEL_APP_MAP[label];
-  if (appDir !== void 0) {
-    return { appDir, devCommand: null };
-  }
-  return { skip: "no-match" };
-}
-function probePort(port) {
-  return new Promise((resolve8) => {
-    const socket = new net.Socket();
-    let settled = false;
-    const settle = (result) => {
-      if (!settled) {
-        settled = true;
-        socket.destroy();
-        resolve8(result);
-      }
-    };
-    socket.setTimeout(500);
-    socket.on("connect", () => settle(true));
-    socket.on("error", () => settle(false));
-    socket.on("timeout", () => settle(false));
-    socket.connect({ port, host: "127.0.0.1" });
-  });
-}
-async function runCmuxServe(args) {
-  try {
-    if (!insideCmux()) {
-      process.exit(0);
-    }
-    let toplevel = "";
-    try {
-      toplevel = execSync10("git rev-parse --show-toplevel", {
-        encoding: "utf8"
-      }).trim();
-    } catch {
-      toplevel = process.cwd();
-    }
-    const cfg = readCmuxConfig(toplevel);
-    if (cfg.auto_dev_server === false) {
-      process.exit(0);
-    }
-    let filesArg;
-    let appArg;
-    for (let i = 0; i < args.length; i++) {
-      const flag = args[i];
-      if (flag === "--files" && i + 1 < args.length) {
-        filesArg = args[++i];
-      } else if (flag === "--app" && i + 1 < args.length) {
-        appArg = args[++i];
-      }
-    }
-    const changedFiles = filesArg !== void 0 ? filesArg.split(",").map((f) => f.trim()).filter(Boolean) : [];
-    let serverConfig = null;
-    try {
-      const raw = readFileSync7(
-        join23(toplevel, ".codebyplan", "server.json"),
-        "utf-8"
-      );
-      serverConfig = JSON.parse(raw);
-    } catch {
-      process.exit(0);
-    }
-    const allocations = serverConfig?.port_allocations ?? [];
-    if (allocations.length === 0) {
-      process.exit(0);
-    }
-    const bin = resolveCmuxBin();
-    for (const allocation of allocations) {
-      try {
-        const resolved = resolveAppDir(allocation, toplevel);
-        if ("skip" in resolved) {
-          if (resolved.skip === "no-match") {
-            process.stdout.write(
-              `cmux-serve: no app mapping for allocation "${allocation.label ?? ""}" \u2014 skipped
-`
-            );
-          }
-          continue;
-        }
-        const { appDir, devCommand } = resolved;
-        const appDirWithSlash = appDir + "/";
-        const intersects = appArg !== void 0 && (appArg === appDir || appArg.startsWith(appDirWithSlash)) || changedFiles.some(
-          (f) => f === appDir || f.startsWith(appDirWithSlash)
-        );
-        if (!intersects) {
-          continue;
-        }
-        const port = allocation.port;
-        const listening = await probePort(port);
-        if (!listening) {
-          let shellCommand = null;
-          if (devCommand !== null) {
-            shellCommand = `cd "${join23(toplevel, appDir)}" && ${devCommand}`;
-          } else {
-            let hasDev = false;
-            try {
-              const pkgRaw = readFileSync7(
-                join23(toplevel, appDir, "package.json"),
-                "utf-8"
-              );
-              const pkg = JSON.parse(pkgRaw);
-              hasDev = typeof pkg.scripts?.dev === "string";
-            } catch {
-            }
-            if (!hasDev) {
-              process.stdout.write(
-                `cmux-serve: no "dev" script in ${appDir}/package.json \u2014 skipped
-`
-              );
-              continue;
-            }
-            shellCommand = `cd "${join23(toplevel, appDir)}" && pnpm run dev`;
-          }
-          let splitSurfaceRef = null;
-          try {
-            const splitOut = execFileSync4(
-              bin,
-              ["new-split", "down", "--json"],
-              {
-                encoding: "utf8"
-              }
-            );
-            const parsed = JSON.parse(splitOut);
-            if (typeof parsed.surface_ref === "string" && parsed.surface_ref) {
-              splitSurfaceRef = parsed.surface_ref;
-            }
-          } catch {
-          }
-          if (splitSurfaceRef !== null) {
-            try {
-              execFileSync4(bin, [
-                "send",
-                "--surface",
-                splitSurfaceRef,
-                `${shellCommand}
-`
-              ]);
-            } catch {
-            }
-          } else {
-            process.stdout.write(
-              `cmux-serve: could not resolve new split surface for ${appDir} \u2014 dev server not auto-started (open it manually)
-`
-            );
-          }
-        }
-        try {
-          execFileSync4(bin, [
-            "new-pane",
-            "--type",
-            "browser",
-            "--url",
-            `http://localhost:${port}`
-          ]);
-        } catch {
-        }
-      } catch {
-      }
-    }
-    process.exit(0);
-  } catch (err) {
-    if (err instanceof ProcessExitSignal) throw err;
-    process.exit(0);
-  }
-}
-var LABEL_APP_MAP;
-var init_cmux_serve = __esm({
-  "src/cli/cmux-serve.ts"() {
-    "use strict";
-    init_process_exit_signal();
-    init_cmux();
-    LABEL_APP_MAP = {
-      "Backend Dev": "apps/backend",
-      "MCP Dev": "apps/mcp",
-      "Docs Ingest": "apps/docs-ingest"
-    };
-  }
-});
-
 // src/lib/worktree-port-resolver.ts
 async function resolveWorktreePortAllocations(repoId, projectPath) {
   let resolvedWorktreeId;
@@ -7119,8 +6673,8 @@ async function resolveWorktreePortAllocations(repoId, projectPath) {
     const deviceId = await getOrCreateDeviceId(projectPath);
     let branch = "main";
     try {
-      const { execSync: execSync11 } = await import("node:child_process");
-      branch = execSync11("git symbolic-ref --short HEAD", {
+      const { execSync: execSync9 } = await import("node:child_process");
+      branch = execSync9("git symbolic-ref --short HEAD", {
         cwd: projectPath,
         encoding: "utf-8"
       }).trim();
@@ -7202,18 +6756,18 @@ var init_worktree_port_resolver = __esm({
 
 // src/lib/migrate-local-config.ts
 import { mkdir as mkdir6, readFile as readFile16, unlink as unlink2, writeFile as writeFile12 } from "node:fs/promises";
-import { join as join24 } from "node:path";
+import { join as join22 } from "node:path";
 function legacySharedPath(projectPath) {
-  return join24(projectPath, ".codebyplan.json");
+  return join22(projectPath, ".codebyplan.json");
 }
 function legacyLocalPath(projectPath) {
-  return join24(projectPath, ".codebyplan.local.json");
+  return join22(projectPath, ".codebyplan.local.json");
 }
 function newDirPath(projectPath) {
-  return join24(projectPath, ".codebyplan");
+  return join22(projectPath, ".codebyplan");
 }
 function sentinelPath(projectPath) {
-  return join24(projectPath, ".codebyplan", "repo.json");
+  return join22(projectPath, ".codebyplan", "repo.json");
 }
 async function statSafe(p) {
   const { stat: stat2 } = await import("node:fs/promises");
@@ -7307,7 +6861,7 @@ async function runLocalMigration(projectPath) {
   if ("organization_id" in cfg) repoJson.organization_id = cfg.organization_id;
   if ("project_id" in cfg) repoJson.project_id = cfg.project_id;
   await writeFile12(
-    join24(projectPath, ".codebyplan", "repo.json"),
+    join22(projectPath, ".codebyplan", "repo.json"),
     JSON.stringify(repoJson, null, 2) + "\n",
     "utf-8"
   );
@@ -7320,7 +6874,7 @@ async function runLocalMigration(projectPath) {
   if ("port_allocations" in cfg)
     serverJson.port_allocations = cfg.port_allocations;
   await writeFile12(
-    join24(projectPath, ".codebyplan", "server.json"),
+    join22(projectPath, ".codebyplan", "server.json"),
     JSON.stringify(serverJson, null, 2) + "\n",
     "utf-8"
   );
@@ -7329,7 +6883,7 @@ async function runLocalMigration(projectPath) {
   if ("git_branch" in cfg) gitJson.git_branch = cfg.git_branch;
   if ("branch_config" in cfg) gitJson.branch_config = cfg.branch_config;
   await writeFile12(
-    join24(projectPath, ".codebyplan", "git.json"),
+    join22(projectPath, ".codebyplan", "git.json"),
     JSON.stringify(gitJson, null, 2) + "\n",
     "utf-8"
   );
@@ -7337,35 +6891,35 @@ async function runLocalMigration(projectPath) {
   const shipmentJson = {};
   if ("shipment" in cfg) shipmentJson.shipment = cfg.shipment;
   await writeFile12(
-    join24(projectPath, ".codebyplan", "shipment.json"),
+    join22(projectPath, ".codebyplan", "shipment.json"),
     JSON.stringify(shipmentJson, null, 2) + "\n",
     "utf-8"
   );
   filesChanged.push(".codebyplan/shipment.json");
   const vendorJson = {};
   await writeFile12(
-    join24(projectPath, ".codebyplan", "vendor.json"),
+    join22(projectPath, ".codebyplan", "vendor.json"),
     JSON.stringify(vendorJson, null, 2) + "\n",
     "utf-8"
   );
   filesChanged.push(".codebyplan/vendor.json");
   const e2eJson = {};
   await writeFile12(
-    join24(projectPath, ".codebyplan", "e2e.json"),
+    join22(projectPath, ".codebyplan", "e2e.json"),
     JSON.stringify(e2eJson, null, 2) + "\n",
     "utf-8"
   );
   filesChanged.push(".codebyplan/e2e.json");
   const eslintJson = {};
   await writeFile12(
-    join24(projectPath, ".codebyplan", "eslint.json"),
+    join22(projectPath, ".codebyplan", "eslint.json"),
     JSON.stringify(eslintJson, null, 2) + "\n",
     "utf-8"
   );
   filesChanged.push(".codebyplan/eslint.json");
   if (!deviceWrittenByHelper) {
     await writeFile12(
-      join24(projectPath, ".codebyplan", "device.local.json"),
+      join22(projectPath, ".codebyplan", "device.local.json"),
       JSON.stringify({ device_id: deviceId }, null, 2) + "\n",
       "utf-8"
     );
@@ -7377,7 +6931,7 @@ async function runLocalMigration(projectPath) {
       "Migration write incomplete: .codebyplan/repo.json was not persisted. Re-run migration to retry from a clean state."
     );
   }
-  const gitignorePath = join24(projectPath, ".gitignore");
+  const gitignorePath = join22(projectPath, ".gitignore");
   try {
     const gitignoreContent = await readFile16(gitignorePath, "utf-8");
     const legacyLine = ".codebyplan.local.json";
@@ -7440,7 +6994,7 @@ __export(config_exports, {
   runConfig: () => runConfig
 });
 import { mkdir as mkdir7, readFile as readFile17, writeFile as writeFile13 } from "node:fs/promises";
-import { join as join25 } from "node:path";
+import { join as join23 } from "node:path";
 async function runConfig() {
   const flags = parseFlags(3);
   const dryRun = hasFlag("dry-run", 3);
@@ -7473,7 +7027,7 @@ async function runConfig() {
   console.log("\n  Config complete.\n");
 }
 async function syncConfigToFile(repoId, projectPath, dryRun) {
-  const codebyplanDir = join25(projectPath, ".codebyplan");
+  const codebyplanDir = join23(projectPath, ".codebyplan");
   const {
     resolvedWorktreeId,
     portAllocations,
@@ -7541,7 +7095,6 @@ async function syncConfigToFile(repoId, projectPath, dryRun) {
   const vendorPayload = {};
   const e2ePayload = {};
   const eslintPayload = {};
-  const cmuxPayload = {};
   if (dryRun) {
     console.log("  Config would be updated (dry-run).");
     return;
@@ -7554,12 +7107,11 @@ async function syncConfigToFile(repoId, projectPath, dryRun) {
     { name: "shipment.json", payload: shipmentPayload },
     { name: "vendor.json", payload: vendorPayload },
     { name: "e2e.json", payload: e2ePayload, createOnly: true },
-    { name: "eslint.json", payload: eslintPayload, createOnly: true },
-    { name: "cmux.json", payload: cmuxPayload, createOnly: true }
+    { name: "eslint.json", payload: eslintPayload, createOnly: true }
   ];
   let anyUpdated = false;
   for (const { name, payload, createOnly } of files) {
-    const filePath = join25(codebyplanDir, name);
+    const filePath = join23(codebyplanDir, name);
     const newJson = JSON.stringify(payload, null, 2) + "\n";
     let currentJson = "";
     try {
@@ -7579,7 +7131,7 @@ async function syncConfigToFile(repoId, projectPath, dryRun) {
 async function readRepoConfig(projectPath) {
   try {
     const raw = await readFile17(
-      join25(projectPath, ".codebyplan", "repo.json"),
+      join23(projectPath, ".codebyplan", "repo.json"),
       "utf-8"
     );
     return JSON.parse(raw);
@@ -7590,7 +7142,7 @@ async function readRepoConfig(projectPath) {
 async function readServerConfig(projectPath) {
   try {
     const raw = await readFile17(
-      join25(projectPath, ".codebyplan", "server.json"),
+      join23(projectPath, ".codebyplan", "server.json"),
       "utf-8"
     );
     return JSON.parse(raw);
@@ -7601,7 +7153,7 @@ async function readServerConfig(projectPath) {
 async function readGitConfig(projectPath) {
   try {
     const raw = await readFile17(
-      join25(projectPath, ".codebyplan", "git.json"),
+      join23(projectPath, ".codebyplan", "git.json"),
       "utf-8"
     );
     return JSON.parse(raw);
@@ -7612,7 +7164,7 @@ async function readGitConfig(projectPath) {
 async function readShipmentConfig(projectPath) {
   try {
     const raw = await readFile17(
-      join25(projectPath, ".codebyplan", "shipment.json"),
+      join23(projectPath, ".codebyplan", "shipment.json"),
       "utf-8"
     );
     return JSON.parse(raw);
@@ -7623,7 +7175,7 @@ async function readShipmentConfig(projectPath) {
 async function readVendorConfig(projectPath) {
   try {
     const raw = await readFile17(
-      join25(projectPath, ".codebyplan", "vendor.json"),
+      join23(projectPath, ".codebyplan", "vendor.json"),
       "utf-8"
     );
     return JSON.parse(raw);
@@ -7634,7 +7186,7 @@ async function readVendorConfig(projectPath) {
 async function readE2eConfig2(projectPath) {
   try {
     const raw = await readFile17(
-      join25(projectPath, ".codebyplan", "e2e.json"),
+      join23(projectPath, ".codebyplan", "e2e.json"),
       "utf-8"
     );
     return JSON.parse(raw);
@@ -7645,7 +7197,7 @@ async function readE2eConfig2(projectPath) {
 async function readServerLocalConfig(projectPath) {
   try {
     const raw = await readFile17(
-      join25(projectPath, ".codebyplan", "server.local.json"),
+      join23(projectPath, ".codebyplan", "server.local.json"),
       "utf-8"
     );
     return JSON.parse(raw);
@@ -7821,7 +7373,7 @@ __export(ports_exports, {
   runPorts: () => runPorts
 });
 import { mkdir as mkdir8, readFile as readFile19, writeFile as writeFile14 } from "node:fs/promises";
-import { join as join26 } from "node:path";
+import { join as join24 } from "node:path";
 async function runPorts() {
   const flags = parseFlags(3);
   const dryRun = hasFlag("dry-run", 3);
@@ -7942,8 +7494,8 @@ async function writeServerLocalConfig(repoId, projectPath, dryRun) {
     // and ServerLocalConfig.port_allocations is typed the same — honest end-to-end.
     port_allocations: portAllocations
   };
-  const codebyplanDir = join26(projectPath, ".codebyplan");
-  const filePath = join26(codebyplanDir, "server.local.json");
+  const codebyplanDir = join24(projectPath, ".codebyplan");
+  const filePath = join24(codebyplanDir, "server.local.json");
   const newJson = JSON.stringify(payload, null, 2) + "\n";
   let currentJson = "";
   try {
@@ -7965,8 +7517,8 @@ async function writeServerLocalConfig(repoId, projectPath, dryRun) {
   );
 }
 async function provisionE2eEnv(projectPath, dryRun) {
-  const relSource = join26("apps", "web", ".env.local");
-  const sourcePath = join26(projectPath, relSource);
+  const relSource = join24("apps", "web", ".env.local");
+  const sourcePath = join24(projectPath, relSource);
   let sourceRaw;
   try {
     sourceRaw = await readFile19(sourcePath, "utf-8");
@@ -7998,8 +7550,8 @@ async function provisionE2eEnv(projectPath, dryRun) {
     );
     return;
   }
-  const codebyplanDir = join26(projectPath, ".codebyplan");
-  const filePath = join26(codebyplanDir, "e2e.env");
+  const codebyplanDir = join24(projectPath, ".codebyplan");
+  const filePath = join24(codebyplanDir, "e2e.env");
   const newContent = lines.join("\n") + "\n";
   let currentContent = "";
   try {
@@ -8127,10 +7679,10 @@ async function runTechStack() {
         );
       }
       try {
-        const { execSync: execSync11 } = await import("node:child_process");
+        const { execSync: execSync9 } = await import("node:child_process");
         let branch = "main";
         try {
-          branch = execSync11("git symbolic-ref --short HEAD", {
+          branch = execSync9("git symbolic-ref --short HEAD", {
             cwd: projectPath,
             encoding: "utf-8"
           }).trim();
@@ -8275,6 +7827,301 @@ var init_tech_stack = __esm({
   }
 });
 
+// src/lib/claude-plan.ts
+import * as fs5 from "node:fs";
+import * as path6 from "node:path";
+function buildDriftPlan(projectDir, templatesDir, manifest) {
+  const packaged = walkTemplates(templatesDir);
+  const packagedBySrc = new Map(packaged.map((f) => [f.src, f]));
+  const manifestBySrc = new Map(manifest.files.map((f) => [f.src, f]));
+  const plan = {
+    unchanged: [],
+    overwriteSafe: [],
+    overwriteHandEdited: [],
+    newOptIn: [],
+    removedFromPackage: []
+  };
+  for (const pkg of packaged) {
+    const inManifest = manifestBySrc.get(pkg.src);
+    const absDest = path6.join(projectDir, ".claude", pkg.dest);
+    const absSrc = path6.join(templatesDir, pkg.src);
+    if (!inManifest) {
+      plan.newOptIn.push({
+        packaged: { src: pkg.src, dest: pkg.dest, hash: pkg.hash },
+        absSrc
+      });
+      continue;
+    }
+    const onDiskExists = fs5.existsSync(absDest);
+    const onDiskContent = onDiskExists ? fs5.readFileSync(absDest) : Buffer.alloc(0);
+    const onDiskHash = onDiskExists ? sha256(onDiskContent) : null;
+    if (pkg.hash === inManifest.hash && onDiskHash === inManifest.hash) {
+      plan.unchanged.push(inManifest);
+      continue;
+    }
+    if (onDiskHash !== null && onDiskHash !== inManifest.hash) {
+      plan.overwriteHandEdited.push({
+        packaged: { src: pkg.src, dest: pkg.dest, hash: pkg.hash },
+        absSrc,
+        onDiskContent
+      });
+    } else {
+      plan.overwriteSafe.push({
+        packaged: { src: pkg.src, dest: pkg.dest, hash: pkg.hash },
+        absSrc
+      });
+    }
+  }
+  for (const m of manifest.files) {
+    if (!packagedBySrc.has(m.src)) {
+      plan.removedFromPackage.push(m);
+    }
+  }
+  return plan;
+}
+var init_claude_plan = __esm({
+  "src/lib/claude-plan.ts"() {
+    "use strict";
+    init_template_walker();
+    init_hash();
+  }
+});
+
+// src/cli/claude/status.ts
+var status_exports = {};
+__export(status_exports, {
+  runStatus: () => runStatus
+});
+import * as fs6 from "node:fs";
+import * as path7 from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { execSync as execSync8 } from "node:child_process";
+function makeFailSafe(checked_at) {
+  return {
+    installed: VERSION,
+    manifest_version: null,
+    latest: null,
+    newer: false,
+    version_skip: false,
+    drifted_files: [],
+    new_in_package: [],
+    removed_from_package: [],
+    settings_drift: false,
+    guarded: true,
+    guard_reason: "unknown",
+    in_sync: true,
+    action: null,
+    checked_at
+  };
+}
+function resolveTemplatesDirFromInstall() {
+  const here = path7.dirname(fileURLToPath2(import.meta.url));
+  const candidates = [
+    path7.resolve(here, "..", "templates"),
+    path7.resolve(here, "..", "..", "templates"),
+    path7.resolve(here, "..", "..", "..", "templates")
+  ];
+  for (const c of candidates) {
+    if (fs6.existsSync(c) && fs6.statSync(c).isDirectory()) {
+      return c;
+    }
+  }
+  throw new Error(
+    `codebyplan claude: could not locate templates/ directory. Probed:
+  ${candidates.join(
+      "\n  "
+    )}`
+  );
+}
+function resolveGitRoot2() {
+  try {
+    return execSync8("git rev-parse --show-toplevel", {
+      encoding: "utf-8"
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+function resolveCurrentBranch2() {
+  try {
+    return execSync8("git symbolic-ref --short HEAD", {
+      encoding: "utf-8"
+    }).trim();
+  } catch {
+    try {
+      return execSync8("git rev-parse --abbrev-ref HEAD", {
+        encoding: "utf-8"
+      }).trim();
+    } catch {
+      return "";
+    }
+  }
+}
+async function runStatus(argv) {
+  const checked_at = (/* @__PURE__ */ new Date()).toISOString();
+  const writeCache = argv.includes("--write-cache");
+  const quiet = argv.includes("--quiet");
+  try {
+    const projectDir = resolveGitRoot2() ?? process.cwd();
+    let templatesDir;
+    try {
+      templatesDir = resolveTemplatesDirFromInstall();
+    } catch {
+      const gitRoot2 = resolveGitRoot2();
+      const currentBranch2 = resolveCurrentBranch2();
+      const { guardReason: guardReason2 } = await resolveGuard(gitRoot2, currentBranch2);
+      const result2 = {
+        ...makeFailSafe(checked_at),
+        // Mirror the main path: only the canonical source repo hides the
+        // segment. A protected_branch consumer whose templates can't be
+        // resolved must still be guarded:false (segment visible).
+        guarded: guardReason2 === "canonical_source",
+        guard_reason: guardReason2 ?? "no_manifest",
+        in_sync: true
+      };
+      emitResult(result2, writeCache, quiet, projectDir);
+      process.exit(0);
+      return;
+    }
+    const gitRoot = resolveGitRoot2();
+    const currentBranch = resolveCurrentBranch2();
+    const { guardReason } = await resolveGuard(gitRoot, currentBranch);
+    const manifest = readManifest(projectDir);
+    if (manifest === null || guardReason === "canonical_source") {
+      const result2 = {
+        installed: VERSION,
+        manifest_version: manifest === null ? null : manifest.version,
+        latest: null,
+        newer: false,
+        version_skip: false,
+        drifted_files: [],
+        new_in_package: [],
+        removed_from_package: [],
+        settings_drift: false,
+        guarded: true,
+        // guarded:true must always pair with a non-null reason. canonical_source
+        // keeps its reason; the bare no-manifest case (never-installed consumer)
+        // gets the "no_manifest" sentinel instead of null.
+        guard_reason: guardReason ?? "no_manifest",
+        in_sync: true,
+        action: null,
+        checked_at
+      };
+      emitResult(result2, writeCache, quiet, projectDir);
+      process.exit(0);
+      return;
+    }
+    const installed = VERSION;
+    const manifest_version = manifest.version;
+    const version_skip = manifest_version != null && compareSemver(installed, manifest_version) > 0;
+    const driftPlan = buildDriftPlan(projectDir, templatesDir, manifest);
+    const drifted_files = driftPlan.overwriteHandEdited.map(
+      (e) => e.packaged.dest
+    );
+    const new_in_package = driftPlan.newOptIn.map((e) => e.packaged.dest);
+    const removed_from_package = driftPlan.removedFromPackage.map(
+      (e) => e.dest
+    );
+    const latest = fetchLatestVersion();
+    const newer = latest !== null && compareSemver(latest, installed) > 0;
+    let settings_drift = false;
+    const settingsPath = path7.join(projectDir, ".claude", "settings.json");
+    const baseSettingsPath = path7.join(
+      templatesDir,
+      "settings.project.base.json"
+    );
+    const hooksJsonPath = path7.join(templatesDir, "hooks", "hooks.json");
+    if (fs6.existsSync(settingsPath)) {
+      try {
+        const settingsRaw = fs6.readFileSync(settingsPath, "utf8");
+        const before = JSON.stringify(JSON.parse(settingsRaw));
+        const cloned = JSON.parse(settingsRaw);
+        if (fs6.existsSync(baseSettingsPath)) {
+          const base = JSON.parse(
+            fs6.readFileSync(baseSettingsPath, "utf8")
+          );
+          mergeBaseSettingsIntoSettings(cloned, base);
+        }
+        if (fs6.existsSync(hooksJsonPath)) {
+          const hooksJson = JSON.parse(
+            fs6.readFileSync(hooksJsonPath, "utf8")
+          );
+          mergeHooksIntoSettings(cloned, hooksJson);
+        }
+        const after = JSON.stringify(cloned);
+        settings_drift = before !== after;
+      } catch {
+        settings_drift = false;
+      }
+    }
+    const in_sync = !version_skip && drifted_files.length === 0 && new_in_package.length === 0 && removed_from_package.length === 0 && !settings_drift;
+    let action = null;
+    if (guardReason !== "protected_branch") {
+      action = !in_sync ? newer ? "newer available + drift: run npx codebyplan claude update" : "run npx codebyplan claude update" : newer ? "newer available: run npx codebyplan claude update" : null;
+    }
+    const result = {
+      installed,
+      manifest_version,
+      latest,
+      newer,
+      version_skip,
+      drifted_files,
+      new_in_package,
+      removed_from_package,
+      settings_drift,
+      // Always false in the full-detection path: a protected_branch consumer
+      // (the only guarded case that reaches here) must still SEE the segment;
+      // only canonical_source / no-manifest (Branch A) report guarded:true.
+      guarded: false,
+      guard_reason: guardReason,
+      in_sync,
+      action,
+      checked_at
+    };
+    emitResult(result, writeCache, quiet, projectDir);
+    process.exit(0);
+  } catch (err) {
+    const safe = makeFailSafe(checked_at);
+    if (!quiet) {
+      try {
+        process.stdout.write(JSON.stringify(safe) + "\n");
+      } catch {
+      }
+    }
+    void err;
+    process.exit(0);
+  }
+}
+function emitResult(result, writeCache, quiet, projectDir) {
+  const json = JSON.stringify(result, null, 2);
+  if (writeCache) {
+    try {
+      const cacheDir = path7.join(projectDir, ".codebyplan");
+      fs6.mkdirSync(cacheDir, { recursive: true });
+      fs6.writeFileSync(
+        path7.join(cacheDir, "claude-status.local.json"),
+        json + "\n",
+        "utf8"
+      );
+    } catch {
+    }
+  }
+  if (!quiet) {
+    process.stdout.write(json + "\n");
+  }
+}
+var init_status = __esm({
+  "src/cli/claude/status.ts"() {
+    "use strict";
+    init_version();
+    init_bump();
+    init_manifest();
+    init_claude_plan();
+    init_settings_merge();
+    init_version_status();
+  }
+});
+
 // src/lib/prompt.ts
 import * as readline from "node:readline";
 async function ask(q, opts) {
@@ -8293,11 +8140,11 @@ async function ask(q, opts) {
   try {
     while (true) {
       const choices = q.choices.map((c) => `[${c.key}] ${c.label}`).join("  ");
-      const answer = await new Promise((resolve8) => {
+      const answer = await new Promise((resolve9) => {
         rl.question(`${q.message}
   ${choices}
 > `, (input) => {
-          resolve8(input.trim().toLowerCase());
+          resolve9(input.trim().toLowerCase());
         });
       });
       const match = q.choices.find(
@@ -8391,10 +8238,10 @@ var update_exports = {};
 __export(update_exports, {
   runUpdate: () => runUpdate
 });
-import * as fs5 from "node:fs";
+import * as fs7 from "node:fs";
 import * as os3 from "node:os";
-import * as path6 from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import * as path8 from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 async function runUpdate(opts, deps = {}) {
   await Promise.resolve();
   const scope = opts.scope ?? "project";
@@ -8410,7 +8257,7 @@ async function runUpdate(opts, deps = {}) {
   const projectDir = deps.projectDir ?? process.cwd();
   let templatesDir;
   try {
-    templatesDir = deps.templatesDir ?? resolveTemplatesDirFromInstall();
+    templatesDir = deps.templatesDir ?? resolveTemplatesDirFromInstall2();
   } catch (err) {
     console.error(
       err instanceof Error ? err.message : `codebyplan claude update: ${String(err)}`
@@ -8424,16 +8271,16 @@ async function runUpdate(opts, deps = {}) {
       await runInstall(opts, { ...deps, templatesDir });
       return;
     }
-    const plan = buildPlan(projectDir, templatesDir, manifestBefore);
+    const plan = buildDriftPlan(projectDir, templatesDir, manifestBefore);
     const finalManifestEntries = [];
     for (const e of plan.unchanged) {
       finalManifestEntries.push(e);
     }
     for (const { packaged, absSrc } of plan.overwriteSafe) {
-      const absDest = path6.join(projectDir, ".claude", packaged.dest);
+      const absDest = path8.join(projectDir, ".claude", packaged.dest);
       if (!opts.dryRun) {
-        fs5.mkdirSync(path6.dirname(absDest), { recursive: true });
-        fs5.copyFileSync(absSrc, absDest);
+        fs7.mkdirSync(path8.dirname(absDest), { recursive: true });
+        fs7.copyFileSync(absSrc, absDest);
         if (opts.verbose) console.log(`updated ${packaged.dest}`);
       } else if (opts.verbose) {
         console.log(`[dry-run] would update ${packaged.dest}`);
@@ -8445,8 +8292,8 @@ async function runUpdate(opts, deps = {}) {
       absSrc,
       onDiskContent
     } of plan.overwriteHandEdited) {
-      const absDest = path6.join(projectDir, ".claude", packaged.dest);
-      const newContent = fs5.readFileSync(absSrc);
+      const absDest = path8.join(projectDir, ".claude", packaged.dest);
+      const newContent = fs7.readFileSync(absSrc);
       const showDiff = () => {
         console.log(
           renderDiff(
@@ -8458,8 +8305,8 @@ async function runUpdate(opts, deps = {}) {
       const answer = await promptOverwrite(packaged.dest, opts, showDiff);
       if (answer === "overwrite") {
         if (!opts.dryRun) {
-          fs5.mkdirSync(path6.dirname(absDest), { recursive: true });
-          fs5.copyFileSync(absSrc, absDest);
+          fs7.mkdirSync(path8.dirname(absDest), { recursive: true });
+          fs7.copyFileSync(absSrc, absDest);
         }
         finalManifestEntries.push(packaged);
       } else {
@@ -8474,10 +8321,10 @@ async function runUpdate(opts, deps = {}) {
     for (const { packaged, absSrc } of plan.newOptIn) {
       const answer = await promptOptIn(packaged.dest, opts);
       if (answer === "opt-in") {
-        const absDest = path6.join(projectDir, ".claude", packaged.dest);
+        const absDest = path8.join(projectDir, ".claude", packaged.dest);
         if (!opts.dryRun) {
-          fs5.mkdirSync(path6.dirname(absDest), { recursive: true });
-          fs5.copyFileSync(absSrc, absDest);
+          fs7.mkdirSync(path8.dirname(absDest), { recursive: true });
+          fs7.copyFileSync(absSrc, absDest);
         }
         finalManifestEntries.push(packaged);
         if (opts.verbose) console.log(`installed new file ${packaged.dest}`);
@@ -8488,25 +8335,25 @@ async function runUpdate(opts, deps = {}) {
     for (const e of plan.removedFromPackage) {
       const answer = await promptRemove(e.dest, opts);
       if (answer === "remove") {
-        const absDest = path6.join(projectDir, ".claude", e.dest);
-        if (!opts.dryRun && fs5.existsSync(absDest)) {
-          fs5.rmSync(absDest);
-          const claudeDir = path6.join(projectDir, ".claude");
-          let cur = path6.dirname(absDest);
-          while (cur !== claudeDir && cur !== path6.dirname(cur)) {
-            if (path6.dirname(cur) === claudeDir) break;
+        const absDest = path8.join(projectDir, ".claude", e.dest);
+        if (!opts.dryRun && fs7.existsSync(absDest)) {
+          fs7.rmSync(absDest);
+          const claudeDir = path8.join(projectDir, ".claude");
+          let cur = path8.dirname(absDest);
+          while (cur !== claudeDir && cur !== path8.dirname(cur)) {
+            if (path8.dirname(cur) === claudeDir) break;
             try {
-              fs5.rmdirSync(cur);
+              fs7.rmdirSync(cur);
               if (opts.verbose)
                 console.log(
-                  `pruned empty dir ${path6.relative(claudeDir, cur)}`
+                  `pruned empty dir ${path8.relative(claudeDir, cur)}`
                 );
-              cur = path6.dirname(cur);
+              cur = path8.dirname(cur);
             } catch (err) {
               const code = err.code;
               if (code !== "ENOTEMPTY" && code !== "ENOENT") {
                 console.warn(
-                  `codebyplan claude: could not prune empty dir ${path6.relative(claudeDir, cur)}: ${err.message}`
+                  `codebyplan claude: could not prune empty dir ${path8.relative(claudeDir, cur)}: ${err.message}`
                 );
               }
               break;
@@ -8518,28 +8365,28 @@ async function runUpdate(opts, deps = {}) {
         if (opts.verbose) console.log(`kept (untracked) ${e.dest}`);
       }
     }
-    const hooksJsonPath = path6.join(templatesDir, "hooks", "hooks.json");
-    const baseSettingsPath = path6.join(
+    const hooksJsonPath = path8.join(templatesDir, "hooks", "hooks.json");
+    const baseSettingsPath = path8.join(
       templatesDir,
       "settings.project.base.json"
     );
-    const settingsPath = path6.join(projectDir, ".claude", "settings.json");
-    const existingSettings = fs5.existsSync(settingsPath) ? JSON.parse(fs5.readFileSync(settingsPath, "utf8")) : {};
-    if (fs5.existsSync(baseSettingsPath)) {
+    const settingsPath = path8.join(projectDir, ".claude", "settings.json");
+    const existingSettings = fs7.existsSync(settingsPath) ? JSON.parse(fs7.readFileSync(settingsPath, "utf8")) : {};
+    if (fs7.existsSync(baseSettingsPath)) {
       const base = JSON.parse(
-        fs5.readFileSync(baseSettingsPath, "utf8")
+        fs7.readFileSync(baseSettingsPath, "utf8")
       );
       mergeBaseSettingsIntoSettings(existingSettings, base);
     }
-    if (fs5.existsSync(hooksJsonPath)) {
+    if (fs7.existsSync(hooksJsonPath)) {
       const hooksJson = JSON.parse(
-        fs5.readFileSync(hooksJsonPath, "utf8")
+        fs7.readFileSync(hooksJsonPath, "utf8")
       );
       mergeHooksIntoSettings(existingSettings, hooksJson);
     }
     if (!opts.dryRun) {
-      fs5.mkdirSync(path6.dirname(settingsPath), { recursive: true });
-      fs5.writeFileSync(
+      fs7.mkdirSync(path8.dirname(settingsPath), { recursive: true });
+      fs7.writeFileSync(
         settingsPath,
         JSON.stringify(existingSettings, null, 2) + "\n",
         "utf8"
@@ -8551,7 +8398,7 @@ async function runUpdate(opts, deps = {}) {
     );
     if (opts.verbose && gitignoreAction !== "unchanged") {
       console.log(
-        `${opts.dryRun ? "[dry-run] would " : ""}${gitignoreAction} managed .gitignore block in ${path6.relative(projectDir, path6.join(projectDir, ".gitignore"))}`
+        `${opts.dryRun ? "[dry-run] would " : ""}${gitignoreAction} managed .gitignore block in ${path8.relative(projectDir, path8.join(projectDir, ".gitignore"))}`
       );
     }
     if (!opts.dryRun) {
@@ -8577,7 +8424,7 @@ async function runUpdate(opts, deps = {}) {
 function runUpdateUser(opts, deps) {
   let templatesDir;
   try {
-    templatesDir = deps.templatesDir ?? resolveTemplatesDirFromInstall();
+    templatesDir = deps.templatesDir ?? resolveTemplatesDirFromInstall2();
   } catch (err) {
     console.error(
       err instanceof Error ? err.message : `codebyplan claude update: ${String(err)}`
@@ -8586,9 +8433,9 @@ function runUpdateUser(opts, deps) {
     return;
   }
   try {
-    const userDir = deps.userDir ?? path6.join(os3.homedir(), ".claude");
-    const settingsPath = path6.join(userDir, "settings.json");
-    const userBaseSettingsPath = path6.join(
+    const userDir = deps.userDir ?? path8.join(os3.homedir(), ".claude");
+    const settingsPath = path8.join(userDir, "settings.json");
+    const userBaseSettingsPath = path8.join(
       templatesDir,
       "settings.user.base.json"
     );
@@ -8600,7 +8447,7 @@ function runUpdateUser(opts, deps) {
       process.exitCode = 1;
       return;
     }
-    if (!fs5.existsSync(userBaseSettingsPath)) {
+    if (!fs7.existsSync(userBaseSettingsPath)) {
       console.error(
         "codebyplan claude update: settings.user.base.json not found in templates."
       );
@@ -8608,13 +8455,13 @@ function runUpdateUser(opts, deps) {
       return;
     }
     const userBase = JSON.parse(
-      fs5.readFileSync(userBaseSettingsPath, "utf8")
+      fs7.readFileSync(userBaseSettingsPath, "utf8")
     );
-    const existingSettings = fs5.existsSync(settingsPath) ? JSON.parse(fs5.readFileSync(settingsPath, "utf8")) : {};
+    const existingSettings = fs7.existsSync(settingsPath) ? JSON.parse(fs7.readFileSync(settingsPath, "utf8")) : {};
     mergeBaseSettingsIntoSettings(existingSettings, userBase);
     if (!opts.dryRun) {
-      fs5.mkdirSync(userDir, { recursive: true });
-      fs5.writeFileSync(
+      fs7.mkdirSync(userDir, { recursive: true });
+      fs7.writeFileSync(
         settingsPath,
         JSON.stringify(existingSettings, null, 2) + "\n",
         "utf8"
@@ -8637,64 +8484,15 @@ function runUpdateUser(opts, deps) {
     process.exitCode = 1;
   }
 }
-function buildPlan(projectDir, templatesDir, manifest) {
-  const packaged = walkTemplates(templatesDir);
-  const packagedBySrc = new Map(packaged.map((f) => [f.src, f]));
-  const manifestBySrc = new Map(manifest.files.map((f) => [f.src, f]));
-  const plan = {
-    unchanged: [],
-    overwriteSafe: [],
-    overwriteHandEdited: [],
-    newOptIn: [],
-    removedFromPackage: []
-  };
-  for (const pkg of packaged) {
-    const inManifest = manifestBySrc.get(pkg.src);
-    const absDest = path6.join(projectDir, ".claude", pkg.dest);
-    const absSrc = path6.join(templatesDir, pkg.src);
-    if (!inManifest) {
-      plan.newOptIn.push({
-        packaged: { src: pkg.src, dest: pkg.dest, hash: pkg.hash },
-        absSrc
-      });
-      continue;
-    }
-    const onDiskExists = fs5.existsSync(absDest);
-    const onDiskContent = onDiskExists ? fs5.readFileSync(absDest) : Buffer.alloc(0);
-    const onDiskHash = onDiskExists ? sha256(onDiskContent) : null;
-    if (pkg.hash === inManifest.hash && onDiskHash === inManifest.hash) {
-      plan.unchanged.push(inManifest);
-      continue;
-    }
-    if (onDiskHash !== null && onDiskHash !== inManifest.hash) {
-      plan.overwriteHandEdited.push({
-        packaged: { src: pkg.src, dest: pkg.dest, hash: pkg.hash },
-        absSrc,
-        onDiskContent
-      });
-    } else {
-      plan.overwriteSafe.push({
-        packaged: { src: pkg.src, dest: pkg.dest, hash: pkg.hash },
-        absSrc
-      });
-    }
-  }
-  for (const m of manifest.files) {
-    if (!packagedBySrc.has(m.src)) {
-      plan.removedFromPackage.push(m);
-    }
-  }
-  return plan;
-}
-function resolveTemplatesDirFromInstall() {
-  const here = path6.dirname(fileURLToPath2(import.meta.url));
+function resolveTemplatesDirFromInstall2() {
+  const here = path8.dirname(fileURLToPath3(import.meta.url));
   const candidates = [
-    path6.resolve(here, "..", "templates"),
-    path6.resolve(here, "..", "..", "templates"),
-    path6.resolve(here, "..", "..", "..", "templates")
+    path8.resolve(here, "..", "templates"),
+    path8.resolve(here, "..", "..", "templates"),
+    path8.resolve(here, "..", "..", "..", "templates")
   ];
   for (const c of candidates) {
-    if (fs5.existsSync(c) && fs5.statSync(c).isDirectory()) {
+    if (fs7.existsSync(c) && fs7.statSync(c).isDirectory()) {
       return c;
     }
   }
@@ -8708,14 +8506,14 @@ function resolveTemplatesDirFromInstall() {
 var init_update = __esm({
   "src/cli/claude/update.ts"() {
     "use strict";
-    init_template_walker();
     init_gitignore_block();
-    init_hash();
     init_manifest();
     init_settings_merge();
     init_prompt();
     init_install();
     init_statusline_config();
+    init_hash();
+    init_claude_plan();
   }
 });
 
@@ -8724,9 +8522,9 @@ var uninstall_exports = {};
 __export(uninstall_exports, {
   runUninstall: () => runUninstall
 });
-import * as fs6 from "node:fs";
+import * as fs8 from "node:fs";
 import * as os4 from "node:os";
-import * as path7 from "node:path";
+import * as path9 from "node:path";
 async function runUninstall(opts, deps = {}) {
   await Promise.resolve();
   const scope = opts.scope ?? "project";
@@ -8755,15 +8553,15 @@ async function runUninstall(opts, deps = {}) {
     let removed = 0;
     let warnings = 0;
     for (const entry of manifest.files) {
-      const abs = path7.join(projectDir, ".claude", entry.dest);
-      if (!fs6.existsSync(abs)) {
+      const abs = path9.join(projectDir, ".claude", entry.dest);
+      if (!fs8.existsSync(abs)) {
         console.warn(
           `codebyplan claude uninstall: ${entry.dest} already absent (skipping).`
         );
         warnings += 1;
         continue;
       }
-      const onDiskHash = sha256(fs6.readFileSync(abs));
+      const onDiskHash = sha256(fs8.readFileSync(abs));
       if (onDiskHash !== entry.hash) {
         console.warn(
           `codebyplan claude uninstall: ${entry.dest} has been modified locally; removing anyway.`
@@ -8771,7 +8569,7 @@ async function runUninstall(opts, deps = {}) {
         warnings += 1;
       }
       if (!opts.dryRun) {
-        fs6.rmSync(abs);
+        fs8.rmSync(abs);
       }
       removed += 1;
       if (opts.verbose) console.log(`removed ${entry.dest}`);
@@ -8779,15 +8577,15 @@ async function runUninstall(opts, deps = {}) {
     if (!opts.dryRun) {
       pruneEmptyManagedDirs(projectDir);
     }
-    const settingsPath = path7.join(projectDir, ".claude", "settings.json");
-    if (fs6.existsSync(settingsPath)) {
+    const settingsPath = path9.join(projectDir, ".claude", "settings.json");
+    if (fs8.existsSync(settingsPath)) {
       const settings = JSON.parse(
-        fs6.readFileSync(settingsPath, "utf8")
+        fs8.readFileSync(settingsPath, "utf8")
       );
-      const baseSettingsPath = templatesDir ? path7.join(templatesDir, "settings.project.base.json") : null;
-      if (baseSettingsPath && fs6.existsSync(baseSettingsPath)) {
+      const baseSettingsPath = templatesDir ? path9.join(templatesDir, "settings.project.base.json") : null;
+      if (baseSettingsPath && fs8.existsSync(baseSettingsPath)) {
         const base = JSON.parse(
-          fs6.readFileSync(baseSettingsPath, "utf8")
+          fs8.readFileSync(baseSettingsPath, "utf8")
         );
         stripBaseSettingsFromSettings(settings, base);
       }
@@ -8795,9 +8593,9 @@ async function runUninstall(opts, deps = {}) {
       if (!opts.dryRun) {
         const isEmpty = Object.keys(settings).length === 0;
         if (isEmpty) {
-          fs6.rmSync(settingsPath);
+          fs8.rmSync(settingsPath);
         } else {
-          fs6.writeFileSync(
+          fs8.writeFileSync(
             settingsPath,
             JSON.stringify(settings, null, 2) + "\n",
             "utf8"
@@ -8816,11 +8614,11 @@ async function runUninstall(opts, deps = {}) {
     }
     if (!opts.dryRun) {
       const m = manifestPath(projectDir);
-      if (fs6.existsSync(m)) fs6.rmSync(m);
+      if (fs8.existsSync(m)) fs8.rmSync(m);
       const mid = midManifestPath(projectDir);
-      if (fs6.existsSync(mid)) fs6.rmSync(mid);
+      if (fs8.existsSync(mid)) fs8.rmSync(mid);
       const legacy = oldManifestPath(projectDir);
-      if (fs6.existsSync(legacy)) fs6.rmSync(legacy);
+      if (fs8.existsSync(legacy)) fs8.rmSync(legacy);
     }
     console.log(
       `codebyplan claude uninstall${opts.dryRun ? " (dry-run)" : ""}: removed ${removed} files${warnings > 0 ? ` (${warnings} warnings)` : ""}.`
@@ -8842,7 +8640,7 @@ function runUninstallUser(opts, deps) {
     }
   }
   try {
-    const userDir = deps.userDir ?? path7.join(os4.homedir(), ".claude");
+    const userDir = deps.userDir ?? path9.join(os4.homedir(), ".claude");
     const existingManifest = readManifestForScope("user", userDir);
     if (!existingManifest) {
       console.error(
@@ -8851,24 +8649,24 @@ function runUninstallUser(opts, deps) {
       process.exitCode = 1;
       return;
     }
-    const settingsPath = path7.join(userDir, "settings.json");
-    if (fs6.existsSync(settingsPath)) {
+    const settingsPath = path9.join(userDir, "settings.json");
+    if (fs8.existsSync(settingsPath)) {
       const settings = JSON.parse(
-        fs6.readFileSync(settingsPath, "utf8")
+        fs8.readFileSync(settingsPath, "utf8")
       );
-      const userBaseSettingsPath = templatesDir != null ? path7.join(templatesDir, "settings.user.base.json") : null;
-      if (userBaseSettingsPath && fs6.existsSync(userBaseSettingsPath)) {
+      const userBaseSettingsPath = templatesDir != null ? path9.join(templatesDir, "settings.user.base.json") : null;
+      if (userBaseSettingsPath && fs8.existsSync(userBaseSettingsPath)) {
         const userBase = JSON.parse(
-          fs6.readFileSync(userBaseSettingsPath, "utf8")
+          fs8.readFileSync(userBaseSettingsPath, "utf8")
         );
         stripBaseSettingsFromSettings(settings, userBase);
       }
       if (!opts.dryRun) {
         const isEmpty = Object.keys(settings).length === 0;
         if (isEmpty) {
-          fs6.rmSync(settingsPath);
+          fs8.rmSync(settingsPath);
         } else {
-          fs6.writeFileSync(
+          fs8.writeFileSync(
             settingsPath,
             JSON.stringify(settings, null, 2) + "\n",
             "utf8"
@@ -8878,11 +8676,11 @@ function runUninstallUser(opts, deps) {
     }
     if (!opts.dryRun) {
       const m = userManifestPath(userDir);
-      if (fs6.existsSync(m)) fs6.rmSync(m);
+      if (fs8.existsSync(m)) fs8.rmSync(m);
       const midUser = userMidManifestPath(userDir);
-      if (fs6.existsSync(midUser)) fs6.rmSync(midUser);
+      if (fs8.existsSync(midUser)) fs8.rmSync(midUser);
       const oldUser = userOldManifestPath(userDir);
-      if (fs6.existsSync(oldUser)) fs6.rmSync(oldUser);
+      if (fs8.existsSync(oldUser)) fs8.rmSync(oldUser);
     }
     console.log(
       `codebyplan claude uninstall --scope user${opts.dryRun ? " (dry-run)" : ""}: user base settings stripped.`
@@ -8897,23 +8695,23 @@ function runUninstallUser(opts, deps) {
 function pruneEmptyManagedDirs(projectDir) {
   const managedRoots = ["skills", "agents", "hooks", "rules"];
   for (const root of managedRoots) {
-    const abs = path7.join(projectDir, ".claude", root);
-    if (!fs6.existsSync(abs)) continue;
+    const abs = path9.join(projectDir, ".claude", root);
+    if (!fs8.existsSync(abs)) continue;
     pruneLeafFirst(abs);
   }
 }
 function pruneLeafFirst(dir) {
-  if (!fs6.existsSync(dir)) return;
-  const stat2 = fs6.statSync(dir);
+  if (!fs8.existsSync(dir)) return;
+  const stat2 = fs8.statSync(dir);
   if (!stat2.isDirectory()) return;
-  for (const entry of fs6.readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of fs8.readdirSync(dir, { withFileTypes: true })) {
     if (entry.isDirectory()) {
-      pruneLeafFirst(path7.join(dir, entry.name));
+      pruneLeafFirst(path9.join(dir, entry.name));
     }
   }
-  const remaining = fs6.readdirSync(dir);
+  const remaining = fs8.readdirSync(dir);
   if (remaining.length === 0) {
-    fs6.rmdirSync(dir);
+    fs8.rmdirSync(dir);
   }
 }
 var init_uninstall = __esm({
@@ -8930,11 +8728,11 @@ var init_uninstall = __esm({
 // src/index.ts
 init_version();
 import { readFileSync as readFileSync10 } from "node:fs";
-import { resolve as resolve7 } from "node:path";
+import { resolve as resolve8 } from "node:path";
 void (async () => {
   if (!process.env.CODEBYPLAN_API_KEY) {
     try {
-      const envPath = resolve7(process.cwd(), ".env.local");
+      const envPath = resolve8(process.cwd(), ".env.local");
       const content = readFileSync10(envPath, "utf-8");
       for (const line of content.split("\n")) {
         const trimmed = line.trim();
@@ -9073,23 +8871,6 @@ void (async () => {
     await runUploadE2eImagesCommand2(rest);
     process.exit(0);
   }
-  if (arg === "cmux-sync") {
-    const { runCmuxSync: runCmuxSync2 } = await Promise.resolve().then(() => (init_cmux_sync(), cmux_sync_exports));
-    await runCmuxSync2();
-    process.exit(0);
-  }
-  if (arg === "cmux-status") {
-    const { runCmuxStatus: runCmuxStatus2 } = await Promise.resolve().then(() => (init_cmux_status(), cmux_status_exports));
-    const rest = process.argv.slice(3);
-    await runCmuxStatus2(rest);
-    process.exit(0);
-  }
-  if (arg === "cmux-serve") {
-    const { runCmuxServe: runCmuxServe2 } = await Promise.resolve().then(() => (init_cmux_serve(), cmux_serve_exports));
-    const rest = process.argv.slice(3);
-    await runCmuxServe2(rest);
-    process.exit(0);
-  }
   if (arg === "config") {
     const { runConfig: runConfig2 } = await Promise.resolve().then(() => (init_config(), config_exports));
     await runConfig2();
@@ -9109,6 +8890,11 @@ void (async () => {
     const subcommand = process.argv[3];
     const flagArgs = process.argv.slice(3);
     const parsed = parseClaudeFlags(flagArgs);
+    if (subcommand === "status") {
+      const { runStatus: runStatus2 } = await Promise.resolve().then(() => (init_status(), status_exports));
+      await runStatus2(process.argv.slice(4));
+      return;
+    }
     if (subcommand === "install") {
       if (parsed === null) {
         process.exit(1);
@@ -9149,6 +8935,9 @@ void (async () => {
     codebyplan claude install [flags]     Install skills/agents/hooks into ./.claude/
     codebyplan claude update  [flags]     Update installed assets to latest versions
     codebyplan claude uninstall [flags]   Remove installed assets from ./.claude/
+    codebyplan claude status              Check package-sync state (drift, version skip, settings drift)
+                                           --write-cache  Write result to .codebyplan/claude-status.local.json
+                                           --quiet        Suppress stdout output
 
   Flags (apply to install/update/uninstall):
     --yes, -y               Auto-accept every prompt with its recommended default
@@ -9193,9 +8982,6 @@ void (async () => {
     codebyplan statusline            Show or set the statusline renderer (bash/node/python)
     codebyplan resolve-worktree      Resolve active worktree UUID from device+path+branch tuple
     codebyplan version-status        Report installed vs latest version + update guard (JSON)
-    codebyplan cmux-sync             Sync cmux workspace title/description to current git branch and repo folder
-    codebyplan cmux-status           Push checkpoint/task/QA + progress to the cmux workspace sidebar
-    codebyplan cmux-serve            Auto-start dev server + browser pane for the round's app files (cmux)
     codebyplan help                  Show this help message
     codebyplan --version             Print version