xtrm-tools 0.5.28 → 0.5.30

package/cli/dist/index.cjs

@@ -30319,10 +30319,10 @@ var require_stringify = __commonJS({
       replacer = null;
       indent2 = EMPTY;
     };
-    var join6 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + LF + gap : two ? two.trimRight() + LF + gap : EMPTY;
+    var join7 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + LF + gap : two ? two.trimRight() + LF + gap : EMPTY;
     var join_content = (inside, value, gap) => {
       const comment = process_comments(value, PREFIX_BEFORE, gap + indent2, true);
-      return join6(comment, inside, gap);
+      return join7(comment, inside, gap);
     };
     var array_stringify = (value, gap) => {
       const deeper_gap = gap + indent2;
@@ -30333,7 +30333,7 @@ var require_stringify = __commonJS({
         if (i !== 0) {
           inside += COMMA;
         }
-        const before = join6(
+        const before = join7(
           after_comma,
           process_comments(value, BEFORE(i), deeper_gap),
           deeper_gap
@@ -30343,7 +30343,7 @@ var require_stringify = __commonJS({
         inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
         after_comma = process_comments(value, AFTER(i), deeper_gap);
       }
-      inside += join6(
+      inside += join7(
         after_comma,
         process_comments(value, PREFIX_AFTER, deeper_gap),
         deeper_gap
@@ -30368,7 +30368,7 @@ var require_stringify = __commonJS({
           inside += COMMA;
         }
         first = false;
-        const before = join6(
+        const before = join7(
           after_comma,
           process_comments(value, BEFORE(key), deeper_gap),
           deeper_gap
@@ -30378,7 +30378,7 @@ var require_stringify = __commonJS({
         after_comma = process_comments(value, AFTER(key), deeper_gap);
       };
       keys.forEach(iteratee);
-      inside += join6(
+      inside += join7(
         after_comma,
         process_comments(value, PREFIX_AFTER, deeper_gap),
         deeper_gap
@@ -33827,8 +33827,8 @@ var init_boxen = __esm({
 });
 
 // src/index.ts
-var import_node_fs6 = require("fs");
-var import_node_path7 = require("path");
+var import_node_fs7 = require("fs");
+var import_node_path8 = require("path");
 
 // ../node_modules/commander/esm.mjs
 var import_index = __toESM(require_commander(), 1);
@@ -40806,12 +40806,111 @@ var import_path12 = __toESM(require("path"), 1);
 // src/commands/pi-install.ts
 var import_fs_extra11 = __toESM(require_lib2(), 1);
 var import_path11 = __toESM(require("path"), 1);
-var import_node_child_process = require("child_process");
+var import_node_child_process2 = require("child_process");
 var import_node_os4 = require("os");
 
 // src/utils/pi-extensions.ts
 var import_fs_extra10 = __toESM(require_lib2(), 1);
 var import_path10 = __toESM(require("path"), 1);
+var import_node_child_process = require("child_process");
+async function listExtensionDirs(baseDir) {
+  if (!await import_fs_extra10.default.pathExists(baseDir)) return [];
+  const entries = await import_fs_extra10.default.readdir(baseDir, { withFileTypes: true });
+  const extDirs = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const extPath = import_path10.default.join(baseDir, entry.name);
+    const pkgPath = import_path10.default.join(extPath, "package.json");
+    if (await import_fs_extra10.default.pathExists(pkgPath)) {
+      extDirs.push(entry.name);
+    }
+  }
+  return extDirs.sort();
+}
+async function fileSha256(filePath) {
+  const crypto2 = await import("crypto");
+  const content = await import_fs_extra10.default.readFile(filePath);
+  return crypto2.createHash("sha256").update(content).digest("hex");
+}
+async function extensionHash(extDir) {
+  const pkgPath = import_path10.default.join(extDir, "package.json");
+  const indexPath = import_path10.default.join(extDir, "index.ts");
+  const hashes = [];
+  if (await import_fs_extra10.default.pathExists(pkgPath)) {
+    hashes.push(await fileSha256(pkgPath));
+  }
+  if (await import_fs_extra10.default.pathExists(indexPath)) {
+    hashes.push(await fileSha256(indexPath));
+  }
+  return hashes.join(":");
+}
+async function diffPiExtensions(sourceDir, targetDir) {
+  const sourceAbs = import_path10.default.resolve(sourceDir);
+  const targetAbs = import_path10.default.resolve(targetDir);
+  const sourceExts = await listExtensionDirs(sourceAbs);
+  const missing = [];
+  const stale = [];
+  const upToDate = [];
+  for (const extName of sourceExts) {
+    const srcExtPath = import_path10.default.join(sourceAbs, extName);
+    const dstExtPath = import_path10.default.join(targetAbs, extName);
+    if (!await import_fs_extra10.default.pathExists(dstExtPath)) {
+      missing.push(extName);
+      continue;
+    }
+    const dstPkgPath = import_path10.default.join(dstExtPath, "package.json");
+    if (!await import_fs_extra10.default.pathExists(dstPkgPath)) {
+      missing.push(extName);
+      continue;
+    }
+    const [srcHash, dstHash] = await Promise.all([
+      extensionHash(srcExtPath),
+      extensionHash(dstExtPath)
+    ]);
+    if (srcHash !== dstHash) {
+      stale.push(extName);
+    } else {
+      upToDate.push(extName);
+    }
+  }
+  return { missing, stale, upToDate };
+}
+function getInstalledPiPackages() {
+  const result = (0, import_node_child_process.spawnSync)("pi", ["list"], { encoding: "utf8", stdio: "pipe" });
+  if (result.status !== 0) return [];
+  const output = result.stdout;
+  const packages = [];
+  let inUserPackages = false;
+  for (const line of output.split("\n")) {
+    if (line.includes("User packages:")) {
+      inUserPackages = true;
+      continue;
+    }
+    if (line.includes("Project packages:")) {
+      inUserPackages = false;
+      continue;
+    }
+    if (inUserPackages) {
+      const match = line.match(/^\s+(npm:[\w\-/@]+)/);
+      if (match) {
+        packages.push(match[1]);
+      }
+    }
+  }
+  return packages.sort();
+}
+async function piPreCheck(sourceExtDir, targetExtDir, requiredPackages) {
+  const extensions = await diffPiExtensions(sourceExtDir, targetExtDir);
+  const installedPkgs = getInstalledPiPackages();
+  const needed = requiredPackages.filter((pkg) => !installedPkgs.includes(pkg));
+  return {
+    extensions,
+    packages: {
+      installed: installedPkgs,
+      needed
+    }
+  };
+}
 async function syncManagedPiExtensions({
   sourceDir,
   targetDir,
@@ -40819,25 +40918,40 @@ async function syncManagedPiExtensions({
   log
 }) {
   if (!await import_fs_extra10.default.pathExists(sourceDir)) return 0;
+  const diff = await diffPiExtensions(sourceDir, targetDir);
+  const toSync = [...diff.missing, ...diff.stale];
+  if (toSync.length === 0) {
+    if (log) {
+      log(`  \u2713 All ${diff.upToDate.length} extensions up-to-date, skipping sync`);
+    }
+    return diff.upToDate.length;
+  }
   if (!dryRun) {
-    await import_fs_extra10.default.ensureDir(import_path10.default.dirname(targetDir));
-    await import_fs_extra10.default.copy(sourceDir, targetDir, { overwrite: true });
+    await import_fs_extra10.default.ensureDir(targetDir);
+    for (const extName of toSync) {
+      const srcPath = import_path10.default.join(sourceDir, extName);
+      const dstPath = import_path10.default.join(targetDir, extName);
+      await import_fs_extra10.default.copy(srcPath, dstPath, { overwrite: true });
+      if (log) {
+        log(`  ${diff.missing.includes(extName) ? "+" : "\u21BB"} ${extName}`);
+      }
+    }
+  } else {
+    if (log) {
+      log(`  [DRY RUN] would sync ${toSync.length} extensions: ${toSync.join(", ")}`);
+    }
   }
-  const entries = await import_fs_extra10.default.readdir(sourceDir, { withFileTypes: true });
-  const managedPackages = entries.filter((entry) => entry.isDirectory()).length;
   if (log) {
-    if (dryRun) {
-      log(`  [DRY RUN] sync extensions ${sourceDir} -> ${targetDir}`);
-    }
-    log(`  Pi will auto-discover ${managedPackages} extension package(s) from ${targetDir}`);
+    const action = dryRun ? "would sync" : "synced";
+    log(`  ${action} ${toSync.length} extension(s), skipped ${diff.upToDate.length} up-to-date`);
   }
-  return managedPackages;
+  return diff.upToDate.length + toSync.length;
 }
 
 // src/commands/pi-install.ts
 var PI_AGENT_DIR = process.env.PI_AGENT_DIR || import_path11.default.join((0, import_node_os4.homedir)(), ".pi", "agent");
 function isPiInstalled() {
-  const r = (0, import_node_child_process.spawnSync)("pi", ["--version"], { encoding: "utf8", stdio: "pipe" });
+  const r = (0, import_node_child_process2.spawnSync)("pi", ["--version"], { encoding: "utf8", stdio: "pipe" });
   return r.status === 0;
 }
 async function runPiInstall(dryRun = false) {
@@ -40848,7 +40962,7 @@ async function runPiInstall(dryRun = false) {
   if (!isPiInstalled()) {
     console.log(kleur_default.yellow("  pi not found \u2014 installing oh-pi globally..."));
     if (!dryRun) {
-      const r = (0, import_node_child_process.spawnSync)("npm", ["install", "-g", "oh-pi"], { stdio: "inherit" });
+      const r = (0, import_node_child_process2.spawnSync)("npm", ["install", "-g", "oh-pi"], { stdio: "inherit" });
       if (r.status !== 0) {
         console.error(kleur_default.red("  \u2717 Failed to install oh-pi. Run: npm install -g oh-pi\n"));
         return;
@@ -40858,35 +40972,46 @@ async function runPiInstall(dryRun = false) {
     }
     console.log(t.success("  \u2713 pi installed"));
   } else {
-    const v = (0, import_node_child_process.spawnSync)("pi", ["--version"], { encoding: "utf8" });
+    const v = (0, import_node_child_process2.spawnSync)("pi", ["--version"], { encoding: "utf8" });
     console.log(t.success(`  \u2713 pi ${v.stdout.trim()} already installed`));
   }
+  let packages = [];
+  if (await import_fs_extra11.default.pathExists(schemaPath)) {
+    const schema = await import_fs_extra11.default.readJson(schemaPath);
+    packages = schema.packages;
+  }
   const extensionsSrc = import_path11.default.join(piConfigDir, "extensions");
   const extensionsDst = import_path11.default.join(PI_AGENT_DIR, "extensions");
+  const preCheck = await piPreCheck(extensionsSrc, extensionsDst, packages);
+  const extTotal = preCheck.extensions.missing.length + preCheck.extensions.stale.length + preCheck.extensions.upToDate.length;
+  const pkgTotal = packages.length;
+  console.log(kleur_default.dim(`
+  Pre-check:`));
+  console.log(kleur_default.dim(`    Extensions: ${preCheck.extensions.upToDate.length}/${extTotal} up-to-date, ${preCheck.extensions.stale.length} stale, ${preCheck.extensions.missing.length} missing`));
+  console.log(kleur_default.dim(`    Packages:   ${preCheck.packages.installed.length}/${pkgTotal} installed, ${preCheck.packages.needed.length} needed`));
   const managedPackages = await syncManagedPiExtensions({
     sourceDir: extensionsSrc,
     targetDir: extensionsDst,
     dryRun,
-    log: (message) => console.log(kleur_default.dim(message))
+    log: (message) => console.log(kleur_default.dim(`    ${message}`))
   });
-  if (managedPackages > 0) {
-    console.log(t.success(`  ${sym.ok} extensions synced (${managedPackages} packages)`));
-  }
-  if (!await import_fs_extra11.default.pathExists(schemaPath)) {
-    console.log(kleur_default.dim("  No install-schema.json found, skipping packages"));
-    return;
-  }
-  const schema = await import_fs_extra11.default.readJson(schemaPath);
-  for (const pkg of schema.packages) {
-    if (dryRun) {
-      console.log(kleur_default.cyan(`  [DRY RUN] pi install ${pkg}`));
-      continue;
-    }
-    const r = (0, import_node_child_process.spawnSync)("pi", ["install", pkg], { stdio: "pipe", encoding: "utf8" });
-    if (r.status === 0) {
-      console.log(t.success(`  ${sym.ok} ${pkg}`));
+  if (packages.length > 0) {
+    console.log(t.bold("\n  npm Packages"));
+    if (preCheck.packages.needed.length === 0) {
+      console.log(kleur_default.dim(`    \u2713 All ${packages.length} packages already installed`));
     } else {
-      console.log(kleur_default.yellow(`  \u26A0 ${pkg} \u2014 install failed (run manually: pi install ${pkg})`));
+      for (const pkg of preCheck.packages.needed) {
+        if (dryRun) {
+          console.log(kleur_default.cyan(`    [DRY RUN] pi install ${pkg}`));
+          continue;
+        }
+        const r = (0, import_node_child_process2.spawnSync)("pi", ["install", pkg], { stdio: "pipe", encoding: "utf8" });
+        if (r.status === 0) {
+          console.log(t.success(`    ${sym.ok} ${pkg}`));
+        } else {
+          console.log(kleur_default.yellow(`    \u26A0 ${pkg} \u2014 install failed (run manually: pi install ${pkg})`));
+        }
+      }
     }
   }
   console.log("");
@@ -41113,8 +41238,30 @@ async function cleanStalePrePluginFiles(repoRoot, dryRun) {
     console.log(t.success("  \u2713 No stale pre-plugin files found"));
   }
 }
+function warnIfOutdated() {
+  try {
+    const localPkg = JSON.parse(import_fs_extra12.default.readFileSync(import_path12.default.resolve(__dirname, "../package.json"), "utf8"));
+    const result = (0, import_child_process3.spawnSync)("npm", ["show", "xtrm-tools", "version", "--json"], {
+      encoding: "utf8",
+      stdio: "pipe",
+      timeout: 5e3
+    });
+    if (result.status !== 0 || !result.stdout) return;
+    const npmVersion = JSON.parse(result.stdout.trim());
+    const parse4 = (v) => v.split(".").map(Number);
+    const [lMaj, lMin, lPat] = parse4(localPkg.version);
+    const [rMaj, rMin, rPat] = parse4(npmVersion);
+    const isNewer = rMaj > lMaj || rMaj === lMaj && rMin > lMin || rMaj === lMaj && rMin === lMin && rPat > lPat;
+    if (isNewer) {
+      console.log(t.warning(`  \u26A0  npm has a newer version (${npmVersion} > ${localPkg.version})`));
+      console.log(t.label("     Run: npm install -g xtrm-tools@latest"));
+    }
+  } catch {
+  }
+}
 async function installPlugin(repoRoot, dryRun) {
   console.log(t.bold("\n  \u2699  xtrm-tools  (Claude Code plugin)"));
+  warnIfOutdated();
   if (dryRun) {
     console.log(t.accent("  [DRY RUN] Would register xtrm-tools marketplace and install plugin\n"));
     await cleanStalePrePluginFiles(repoRoot, true);
@@ -41132,6 +41279,23 @@ async function installPlugin(repoRoot, dryRun) {
   console.log(t.warning("  \u21BB Restart Claude Code for the new plugin hooks to take effect"));
   await cleanStalePrePluginFiles(repoRoot, dryRun);
   await installOfficialClaudePlugins(false);
+  installUserStatusLine(dryRun);
+}
+function installUserStatusLine(dryRun) {
+  try {
+    const scriptPath = import_path12.default.resolve(__dirname, "..", "..", "hooks", "statusline.mjs");
+    if (!import_fs_extra12.default.existsSync(scriptPath)) return;
+    const settingsPath = import_path12.default.join(import_os5.default.homedir(), ".claude", "settings.json");
+    const settings = import_fs_extra12.default.existsSync(settingsPath) ? JSON.parse(import_fs_extra12.default.readFileSync(settingsPath, "utf8")) : {};
+    if (dryRun) {
+      console.log(t.accent(`  [DRY RUN] Would write statusLine \u2192 ${scriptPath}`));
+      return;
+    }
+    settings.statusLine = { type: "command", command: `node ${scriptPath}`, padding: 1 };
+    import_fs_extra12.default.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+    console.log(t.success(`  \u2713 statusLine registered in ~/.claude/settings.json`));
+  } catch {
+  }
 }
 function createInstallAllCommand() {
   return new Command("all").description("[deprecated] Use xtrm install").option("--dry-run", "Preview changes without making any modifications", false).option("-y, --yes", "Skip confirmation prompts", false).option("--no-mcp", "Skip MCP server registration", false).option("--force", "Overwrite locally drifted files", false).action(async (_opts) => {
@@ -41314,18 +41478,18 @@ function createInstallCommand() {
 }
 
 // src/commands/claude.ts
-var import_node_child_process3 = require("child_process");
+var import_node_child_process4 = require("child_process");
 
 // src/utils/worktree-session.ts
 var import_node_path5 = __toESM(require("path"), 1);
-var import_node_child_process2 = require("child_process");
+var import_node_child_process3 = require("child_process");
 var import_node_fs4 = require("fs");
 var import_node_os5 = require("os");
 function randomSlug(len = 4) {
   return Math.random().toString(36).slice(2, 2 + len);
 }
 function gitRepoRoot(cwd) {
-  const r = (0, import_node_child_process2.spawnSync)("git", ["rev-parse", "--show-toplevel"], {
+  const r = (0, import_node_child_process3.spawnSync)("git", ["rev-parse", "--show-toplevel"], {
     cwd,
     stdio: "pipe",
     encoding: "utf8"
@@ -41364,7 +41528,7 @@ async function launchWorktreeSession(opts) {
   console.log(kleur_default.dim(`  worktree: ${worktreePath}`));
   console.log(kleur_default.dim(`  branch:   ${branchName}
 `));
-  const bdResult = (0, import_node_child_process2.spawnSync)("bd", ["worktree", "create", worktreePath, "--branch", branchName], {
+  const bdResult = (0, import_node_child_process3.spawnSync)("bd", ["worktree", "create", worktreePath, "--branch", branchName], {
     cwd: repoRoot,
     stdio: "inherit"
   });
@@ -41372,12 +41536,12 @@ async function launchWorktreeSession(opts) {
     if (bdResult.status !== 0 && !bdResult.error) {
       console.log(kleur_default.dim("  beads: no database found, creating worktree without redirect"));
     }
-    const branchExists = (0, import_node_child_process2.spawnSync)("git", ["rev-parse", "--verify", branchName], {
+    const branchExists = (0, import_node_child_process3.spawnSync)("git", ["rev-parse", "--verify", branchName], {
       cwd: repoRoot,
       stdio: "pipe"
     }).status === 0;
     const gitArgs = branchExists ? ["worktree", "add", worktreePath, branchName] : ["worktree", "add", "-b", branchName, worktreePath];
-    const gitResult = (0, import_node_child_process2.spawnSync)("git", gitArgs, { cwd: repoRoot, stdio: "inherit" });
+    const gitResult = (0, import_node_child_process3.spawnSync)("git", gitArgs, { cwd: repoRoot, stdio: "inherit" });
     if (gitResult.status !== 0) {
       console.error(kleur_default.red(`
   \u2717 Failed to create worktree at ${worktreePath}
@@ -41404,7 +41568,7 @@ async function launchWorktreeSession(opts) {
   }
   const runtimeCmd = runtime === "claude" ? "claude" : "pi";
   const runtimeArgs = runtime === "claude" ? ["--dangerously-skip-permissions"] : [];
-  const launchResult = (0, import_node_child_process2.spawnSync)(runtimeCmd, runtimeArgs, {
+  const launchResult = (0, import_node_child_process3.spawnSync)(runtimeCmd, runtimeArgs, {
     cwd: worktreePath,
     stdio: "inherit"
   });
@@ -41427,14 +41591,14 @@ function createClaudeCommand() {
   cmd.command("status").description("Show Claude CLI version, plugin status, and hook wiring").action(async () => {
     console.log(t.bold("\n  Claude Code Status\n"));
     try {
-      const version3 = (0, import_node_child_process3.execSync)("claude --version", { encoding: "utf8", stdio: "pipe" }).trim();
+      const version3 = (0, import_node_child_process4.execSync)("claude --version", { encoding: "utf8", stdio: "pipe" }).trim();
       console.log(t.success(`  \u2713 claude CLI: ${version3}`));
     } catch {
       console.log(kleur_default.red("  \u2717 claude CLI not found"));
       console.log("");
       return;
     }
-    const listResult = (0, import_node_child_process3.spawnSync)("claude", ["plugin", "list"], { encoding: "utf8", stdio: "pipe" });
+    const listResult = (0, import_node_child_process4.spawnSync)("claude", ["plugin", "list"], { encoding: "utf8", stdio: "pipe" });
     const pluginOutput = listResult.stdout ?? "";
     if (pluginOutput.includes("xtrm-tools")) {
       console.log(t.success("  \u2713 xtrm-tools plugin installed"));
@@ -41442,7 +41606,7 @@ function createClaudeCommand() {
       console.log(kleur_default.yellow("  \u26A0 xtrm-tools plugin not installed \u2014 run: xt claude install"));
     }
     try {
-      (0, import_node_child_process3.execSync)("bd --version", { stdio: "ignore" });
+      (0, import_node_child_process4.execSync)("bd --version", { stdio: "ignore" });
       console.log(t.success("  \u2713 beads (bd) available"));
     } catch {
       console.log(kleur_default.dim("  \u25CB beads (bd) not installed"));
@@ -41453,13 +41617,13 @@ function createClaudeCommand() {
     console.log(t.bold("\n  Claude Code Doctor\n"));
     let allOk = true;
     try {
-      (0, import_node_child_process3.execSync)("claude --version", { stdio: "ignore" });
+      (0, import_node_child_process4.execSync)("claude --version", { stdio: "ignore" });
       console.log(t.success("  \u2713 claude CLI available"));
     } catch {
       console.log(kleur_default.red("  \u2717 claude CLI not found \u2014 install Claude Code"));
       allOk = false;
     }
-    const listResult = (0, import_node_child_process3.spawnSync)("claude", ["plugin", "list"], { encoding: "utf8", stdio: "pipe" });
+    const listResult = (0, import_node_child_process4.spawnSync)("claude", ["plugin", "list"], { encoding: "utf8", stdio: "pipe" });
     if (listResult.stdout?.includes("xtrm-tools")) {
       console.log(t.success("  \u2713 xtrm-tools plugin installed"));
     } else {
@@ -41467,21 +41631,21 @@ function createClaudeCommand() {
       allOk = false;
     }
     try {
-      (0, import_node_child_process3.execSync)("bd --version", { stdio: "ignore" });
+      (0, import_node_child_process4.execSync)("bd --version", { stdio: "ignore" });
       console.log(t.success("  \u2713 beads (bd) installed"));
     } catch {
       console.log(kleur_default.yellow("  \u26A0 beads not installed \u2014 run: npm install -g @beads/bd"));
       allOk = false;
     }
     try {
-      (0, import_node_child_process3.execSync)("dolt version", { stdio: "ignore" });
+      (0, import_node_child_process4.execSync)("dolt version", { stdio: "ignore" });
       console.log(t.success("  \u2713 dolt installed"));
     } catch {
       console.log(kleur_default.yellow("  \u26A0 dolt not installed \u2014 required for beads storage"));
       allOk = false;
     }
     try {
-      (0, import_node_child_process3.execSync)("gitnexus --version", { stdio: "ignore" });
+      (0, import_node_child_process4.execSync)("gitnexus --version", { stdio: "ignore" });
       console.log(t.success("  \u2713 gitnexus installed"));
     } catch {
       console.log(kleur_default.dim("  \u25CB gitnexus not installed (optional) \u2014 npm install -g gitnexus"));
@@ -41498,7 +41662,7 @@ function createClaudeCommand() {
 
 // src/commands/pi.ts
 var import_path14 = __toESM(require("path"), 1);
-var import_node_child_process5 = require("child_process");
+var import_node_child_process6 = require("child_process");
 var import_node_os7 = require("os");
 var import_fs_extra14 = __toESM(require_lib2(), 1);
 
@@ -41506,7 +41670,7 @@ var import_fs_extra14 = __toESM(require_lib2(), 1);
 var import_prompts2 = __toESM(require_prompts3(), 1);
 var import_fs_extra13 = __toESM(require_lib2(), 1);
 var import_path13 = __toESM(require("path"), 1);
-var import_node_child_process4 = require("child_process");
+var import_node_child_process5 = require("child_process");
 var import_node_os6 = require("os");
 var PI_AGENT_DIR2 = process.env.PI_AGENT_DIR || import_path13.default.join((0, import_node_os6.homedir)(), ".pi", "agent");
 function fillTemplate(template, values) {
@@ -41530,69 +41694,7 @@ function readExistingPiValues(piAgentDir) {
   return values;
 }
 function isPiInstalled2() {
-  return (0, import_node_child_process4.spawnSync)("pi", ["--version"], { encoding: "utf8" }).status === 0;
-}
-async function listExtensionDirs(baseDir) {
-  if (!await import_fs_extra13.default.pathExists(baseDir)) return [];
-  const entries = await import_fs_extra13.default.readdir(baseDir, { withFileTypes: true });
-  const extDirs = [];
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    const extPath = import_path13.default.join(baseDir, entry.name);
-    const pkgPath = import_path13.default.join(extPath, "package.json");
-    if (await import_fs_extra13.default.pathExists(pkgPath)) {
-      extDirs.push(entry.name);
-    }
-  }
-  return extDirs.sort();
-}
-async function fileSha256(filePath) {
-  const crypto2 = await import("crypto");
-  const content = await import_fs_extra13.default.readFile(filePath);
-  return crypto2.createHash("sha256").update(content).digest("hex");
-}
-async function extensionHash(extDir) {
-  const pkgPath = import_path13.default.join(extDir, "package.json");
-  const indexPath = import_path13.default.join(extDir, "index.ts");
-  const hashes = [];
-  if (await import_fs_extra13.default.pathExists(pkgPath)) {
-    hashes.push(await fileSha256(pkgPath));
-  }
-  if (await import_fs_extra13.default.pathExists(indexPath)) {
-    hashes.push(await fileSha256(indexPath));
-  }
-  return hashes.join(":");
-}
-async function diffPiExtensions(sourceDir, targetDir) {
-  const sourceAbs = import_path13.default.resolve(sourceDir);
-  const targetAbs = import_path13.default.resolve(targetDir);
-  const sourceExts = await listExtensionDirs(sourceAbs);
-  const missing = [];
-  const stale = [];
-  const upToDate = [];
-  for (const extName of sourceExts) {
-    const srcExtPath = import_path13.default.join(sourceAbs, extName);
-    const dstExtPath = import_path13.default.join(targetAbs, extName);
-    if (!await import_fs_extra13.default.pathExists(dstExtPath)) {
-      missing.push(extName);
-      continue;
-    }
-    const dstPkgPath = import_path13.default.join(dstExtPath, "package.json");
-    if (!await import_fs_extra13.default.pathExists(dstPkgPath)) {
-      missing.push(extName);
-      continue;
-    }
-    const [srcHash, dstHash] = await Promise.all([
-      extensionHash(srcExtPath),
-      extensionHash(dstExtPath)
-    ]);
-    if (srcHash !== dstHash) {
-      stale.push(extName);
-    } else {
-      upToDate.push(extName);
-    }
-  }
-  return { missing, stale, upToDate };
+  return (0, import_node_child_process5.spawnSync)("pi", ["--version"], { encoding: "utf8" }).status === 0;
 }
 function printPiCheckSummary(diff) {
   const totalDiff = diff.missing.length + diff.stale.length;
@@ -41632,14 +41734,14 @@ function createInstallPiCommand() {
     console.log(t.bold("\n  Pi Coding Agent Setup\n"));
     if (!isPiInstalled2()) {
       console.log(kleur_default.yellow("  pi not found \u2014 installing oh-pi globally...\n"));
-      const r = (0, import_node_child_process4.spawnSync)("npm", ["install", "-g", "oh-pi"], { stdio: "inherit" });
+      const r = (0, import_node_child_process5.spawnSync)("npm", ["install", "-g", "oh-pi"], { stdio: "inherit" });
       if (r.status !== 0) {
         console.error(kleur_default.red("\n  Failed to install oh-pi. Run: npm install -g oh-pi\n"));
         process.exit(1);
       }
       console.log(t.success("  pi installed\n"));
     } else {
-      const v = (0, import_node_child_process4.spawnSync)("pi", ["--version"], { encoding: "utf8" });
+      const v = (0, import_node_child_process5.spawnSync)("pi", ["--version"], { encoding: "utf8" });
       console.log(t.success(`  pi ${v.stdout.trim()} already installed
 `));
     }
@@ -41675,9 +41777,17 @@ function createInstallPiCommand() {
       await import_fs_extra13.default.writeFile(destPath, fillTemplate(raw, values), "utf8");
       console.log(t.success(`    ${sym.ok} ${name}`));
     }
+    const extensionsSrc = import_path13.default.join(piConfigDir, "extensions");
+    const extensionsDst = import_path13.default.join(PI_AGENT_DIR2, "extensions");
+    const preCheck = await piPreCheck(extensionsSrc, extensionsDst, schema.packages);
+    const extTotal = preCheck.extensions.missing.length + preCheck.extensions.stale.length + preCheck.extensions.upToDate.length;
+    console.log(kleur_default.dim(`
+  Pre-check:`));
+    console.log(kleur_default.dim(`    Extensions: ${preCheck.extensions.upToDate.length}/${extTotal} up-to-date, ${preCheck.extensions.stale.length} stale, ${preCheck.extensions.missing.length} missing`));
+    console.log(kleur_default.dim(`    Packages:   ${preCheck.packages.installed.length}/${schema.packages.length} installed, ${preCheck.packages.needed.length} needed`));
     const managedPackages = await syncManagedPiExtensions({
-      sourceDir: import_path13.default.join(piConfigDir, "extensions"),
-      targetDir: import_path13.default.join(PI_AGENT_DIR2, "extensions"),
+      sourceDir: extensionsSrc,
+      targetDir: extensionsDst,
       dryRun: false,
       log: (message) => console.log(kleur_default.dim(`    ${message}`))
     });
@@ -41685,10 +41795,14 @@ function createInstallPiCommand() {
       console.log(t.success(`    ${sym.ok} extensions/ (${managedPackages} packages)`));
     }
     console.log(t.bold("\n  npm Packages\n"));
-    for (const pkg of schema.packages) {
-      const r = (0, import_node_child_process4.spawnSync)("pi", ["install", pkg], { stdio: "inherit" });
-      if (r.status === 0) console.log(t.success(`    ${sym.ok} ${pkg}`));
-      else console.log(kleur_default.yellow(`    ${pkg} \u2014 failed, run manually: pi install ${pkg}`));
+    if (preCheck.packages.needed.length === 0) {
+      console.log(kleur_default.dim(`    \u2713 All ${schema.packages.length} packages already installed`));
+    } else {
+      for (const pkg of preCheck.packages.needed) {
+        const r = (0, import_node_child_process5.spawnSync)("pi", ["install", pkg], { stdio: "inherit" });
+        if (r.status === 0) console.log(t.success(`    ${sym.ok} ${pkg}`));
+        else console.log(kleur_default.yellow(`    ${pkg} \u2014 failed, run manually: pi install ${pkg}`));
+      }
     }
     console.log(t.bold("\n  OAuth (manual steps)\n"));
     for (const provider of schema.oauth_providers) {
@@ -41714,7 +41828,7 @@ function createPiCommand() {
   cmd.addCommand(piSetup);
   cmd.command("status").description("Check Pi version and extension deployment drift").action(async () => {
     console.log(t.bold("\n  Pi Runtime Status\n"));
-    const piResult = (0, import_node_child_process5.spawnSync)("pi", ["--version"], { encoding: "utf8", stdio: "pipe" });
+    const piResult = (0, import_node_child_process6.spawnSync)("pi", ["--version"], { encoding: "utf8", stdio: "pipe" });
     if (piResult.status === 0) {
       console.log(t.success(`  \u2713 pi ${piResult.stdout.trim()} installed`));
     } else {
@@ -41738,7 +41852,7 @@ function createPiCommand() {
   cmd.command("doctor").description("Diagnostic checks: pi installed, extensions deployed, packages present").action(async () => {
     console.log(t.bold("\n  Pi Doctor\n"));
     let allOk = true;
-    const piResult = (0, import_node_child_process5.spawnSync)("pi", ["--version"], { encoding: "utf8", stdio: "pipe" });
+    const piResult = (0, import_node_child_process6.spawnSync)("pi", ["--version"], { encoding: "utf8", stdio: "pipe" });
     if (piResult.status === 0) {
       console.log(t.success(`  \u2713 pi ${piResult.stdout.trim()} installed`));
     } else {
@@ -41759,9 +41873,9 @@ function createPiCommand() {
     const schemaPath = import_path14.default.join(piConfigDir, "install-schema.json");
     if (await import_fs_extra14.default.pathExists(schemaPath)) {
       try {
-        (0, import_node_child_process5.execSync)("pi --version", { stdio: "ignore" });
+        (0, import_node_child_process6.execSync)("pi --version", { stdio: "ignore" });
         const schema = await import_fs_extra14.default.readJson(schemaPath);
-        const listResult = (0, import_node_child_process5.spawnSync)("pi", ["list"], { encoding: "utf8", stdio: "pipe" });
+        const listResult = (0, import_node_child_process6.spawnSync)("pi", ["list"], { encoding: "utf8", stdio: "pipe" });
         const installed = listResult.stdout ?? "";
         const missing = schema.packages.filter((p) => !installed.includes(p.replace("npm:", "")));
         if (missing.length === 0) {
@@ -56389,13 +56503,13 @@ function createCleanCommand() {
 
 // src/commands/end.ts
 var import_prompts4 = __toESM(require_prompts3(), 1);
-var import_node_child_process6 = require("child_process");
+var import_node_child_process7 = require("child_process");
 function git(args, cwd) {
-  const r = (0, import_node_child_process6.spawnSync)("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
+  const r = (0, import_node_child_process7.spawnSync)("git", args, { cwd, encoding: "utf8", stdio: "pipe" });
   return { ok: r.status === 0, out: (r.stdout ?? "").trim(), err: (r.stderr ?? "").trim() };
 }
 function bd(args, cwd) {
-  const r = (0, import_node_child_process6.spawnSync)("bd", args, { cwd, encoding: "utf8", stdio: "pipe" });
+  const r = (0, import_node_child_process7.spawnSync)("bd", args, { cwd, encoding: "utf8", stdio: "pipe" });
   return { ok: r.status === 0, out: (r.stdout ?? "").trim() };
 }
 function extractIssueIds(commitLog) {
@@ -56442,7 +56556,7 @@ function buildPrBody(issues, commitLog, diffStat, branch) {
   return lines.join("\n");
 }
 function createEndCommand() {
-  return new Command("end").description("Close session: rebase, push, open PR, link beads issues, clean up worktree").option("--draft", "Open PR as draft", false).option("--keep", "Keep worktree after PR creation (default: prompt)", false).option("-y, --yes", "Skip confirmation prompts", false).action(async (opts) => {
+  return new Command("end").description("Close session: rebase, push, open PR, link beads issues, clean up worktree").option("--draft", "Open PR as draft", false).option("--keep", "Keep worktree after PR creation (default: prompt)", false).option("-y, --yes", "Skip confirmation prompts", false).option("--dry-run", "Preview PR title, body, and linked issues without pushing or creating PR", false).action(async (opts) => {
     const cwd = process.cwd();
     const branchResult = git(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
     const branch = branchResult.out;
@@ -56466,7 +56580,14 @@ function createEndCommand() {
     console.log(t.bold(`
   xt end \u2014 closing session on ${branch}
 `));
-    const logResult = git(["log", "origin/main..HEAD", "--oneline"], cwd);
+    let defaultBranch = "main";
+    const symRef = git(["symbolic-ref", "refs/remotes/origin/HEAD", "--short"], cwd);
+    if (symRef.ok && symRef.out) {
+      defaultBranch = symRef.out.replace("origin/", "");
+    } else if (git(["rev-parse", "--verify", "origin/master"], cwd).ok) {
+      defaultBranch = "master";
+    }
+    const logResult = git(["log", `origin/${defaultBranch}..HEAD`, "--oneline"], cwd);
     const issueIds = extractIssueIds(logResult.out);
     const issues = [];
     for (const id of issueIds) {
@@ -56490,10 +56611,28 @@ function createEndCommand() {
     } else {
       console.log(kleur_default.dim("  \u25CB No beads issues found in commit log"));
     }
-    console.log(kleur_default.dim("  Fetching origin/main..."));
-    git(["fetch", "origin", "main"], cwd);
-    console.log(kleur_default.dim("  Rebasing onto origin/main..."));
-    const rebaseResult = git(["rebase", "origin/main"], cwd);
+    if (opts.dryRun) {
+      const fullLog2 = git(["log", `origin/${defaultBranch}..HEAD`, "--oneline"], cwd).out;
+      const diffStat2 = git(["diff", `origin/${defaultBranch}`, "--stat"], cwd).out;
+      const prTitle2 = buildPrTitle(issues);
+      const prBody2 = buildPrBody(issues, fullLog2, diffStat2, branch);
+      console.log(t.bold("\n  [DRY RUN] PR preview\n"));
+      console.log(`  ${kleur_default.bold("Title:")} ${prTitle2}`);
+      if (issues.length > 0) {
+        console.log(`  ${kleur_default.bold("Issues:")} ${issueIds.join(", ")}`);
+      }
+      console.log(`
+  ${kleur_default.bold("Body:")}`);
+      for (const line of prBody2.split("\n")) {
+        console.log(`  ${kleur_default.dim(line)}`);
+      }
+      console.log(t.accent("\n  [DRY RUN] No changes made \u2014 re-run without --dry-run to push and create PR\n"));
+      return;
+    }
+    console.log(kleur_default.dim(`  Fetching origin/${defaultBranch}...`));
+    git(["fetch", "origin", defaultBranch], cwd);
+    console.log(kleur_default.dim(`  Rebasing onto origin/${defaultBranch}...`));
+    const rebaseResult = git(["rebase", `origin/${defaultBranch}`], cwd);
     if (!rebaseResult.ok) {
       const conflicts = git(["diff", "--name-only", "--diff-filter=U"], cwd).out;
       console.error(kleur_default.red("\n  \u2717 Rebase conflicts detected:\n"));
@@ -56505,7 +56644,7 @@ function createEndCommand() {
       ));
       process.exit(1);
     }
-    console.log(t.success("  \u2713 Rebased onto origin/main"));
+    console.log(t.success(`  \u2713 Rebased onto origin/${defaultBranch}`));
     console.log(kleur_default.dim("  Pushing branch..."));
     const pushResult = git(["push", "origin", branch, "--force-with-lease"], cwd);
     if (!pushResult.ok) {
@@ -56516,14 +56655,14 @@ function createEndCommand() {
       process.exit(1);
     }
     console.log(t.success(`  \u2713 Pushed ${branch}`));
-    const fullLog = git(["log", "origin/main..HEAD", "--oneline"], cwd).out;
-    const diffStat = git(["diff", "origin/main", "--stat"], cwd).out;
+    const fullLog = git(["log", `origin/${defaultBranch}..HEAD`, "--oneline"], cwd).out;
+    const diffStat = git(["diff", `origin/${defaultBranch}`, "--stat"], cwd).out;
     const prTitle = buildPrTitle(issues);
     const prBody = buildPrBody(issues, fullLog, diffStat, branch);
     console.log(kleur_default.dim("  Creating PR..."));
     const prArgs = ["pr", "create", "--title", prTitle, "--body", prBody];
     if (opts.draft) prArgs.push("--draft");
-    const prResult = (0, import_node_child_process6.spawnSync)("gh", prArgs, { cwd, encoding: "utf8", stdio: "pipe" });
+    const prResult = (0, import_node_child_process7.spawnSync)("gh", prArgs, { cwd, encoding: "utf8", stdio: "pipe" });
     if (prResult.status !== 0) {
       console.error(kleur_default.red(`
   \u2717 PR creation failed:
@@ -56553,7 +56692,7 @@ function createEndCommand() {
       if (doRemove) {
         try {
           const repoRoot = git(["rev-parse", "--show-toplevel"], cwd).out;
-          const removeResult = (0, import_node_child_process6.spawnSync)(
+          const removeResult = (0, import_node_child_process7.spawnSync)(
             "git",
             ["worktree", "remove", cwd, "--force"],
             { cwd: repoRoot, encoding: "utf8", stdio: "pipe" }
@@ -56577,9 +56716,11 @@ function createEndCommand() {
 
 // src/commands/worktree.ts
 var import_prompts5 = __toESM(require_prompts3(), 1);
-var import_node_child_process7 = require("child_process");
+var import_node_child_process8 = require("child_process");
+var import_node_fs5 = require("fs");
+var import_node_path6 = require("path");
 function listXtWorktrees(repoRoot) {
-  const r = (0, import_node_child_process7.spawnSync)("git", ["worktree", "list", "--porcelain"], {
+  const r = (0, import_node_child_process8.spawnSync)("git", ["worktree", "list", "--porcelain"], {
     cwd: repoRoot,
     encoding: "utf8",
     stdio: "pipe"
@@ -56608,7 +56749,7 @@ function listXtWorktrees(repoRoot) {
 }
 function isMergedIntoMain(branch, repoRoot) {
   const branchShort = branch.replace("refs/heads/", "");
-  const r = (0, import_node_child_process7.spawnSync)("git", ["branch", "--merged", "origin/main", "--list", branchShort], {
+  const r = (0, import_node_child_process8.spawnSync)("git", ["branch", "--merged", "origin/main", "--list", branchShort], {
     cwd: repoRoot,
     encoding: "utf8",
     stdio: "pipe"
@@ -56616,7 +56757,7 @@ function isMergedIntoMain(branch, repoRoot) {
   return (r.stdout ?? "").includes(branchShort);
 }
 function getRepoRoot(cwd) {
-  const r = (0, import_node_child_process7.spawnSync)("git", ["rev-parse", "--show-toplevel"], { cwd, encoding: "utf8", stdio: "pipe" });
+  const r = (0, import_node_child_process8.spawnSync)("git", ["rev-parse", "--show-toplevel"], { cwd, encoding: "utf8", stdio: "pipe" });
   return r.ok ? r.stdout.trim() : cwd;
 }
 function createWorktreeCommand() {
@@ -56670,13 +56811,14 @@ function createWorktreeCommand() {
       return;
     }
     for (const wt of merged) {
-      const r = (0, import_node_child_process7.spawnSync)("git", ["worktree", "remove", wt.path, "--force"], {
+      const r = (0, import_node_child_process8.spawnSync)("git", ["worktree", "remove", wt.path, "--force"], {
         cwd: repoRoot,
         encoding: "utf8",
         stdio: "pipe"
       });
       if (r.status === 0) {
         console.log(t.success(`  \u2713 Removed ${wt.path}`));
+        clearStatuslineClaim(repoRoot);
       } else {
         console.log(kleur_default.yellow(`  \u26A0 Could not remove ${wt.path}: ${(r.stderr ?? "").trim()}`));
       }
@@ -56710,12 +56852,13 @@ function createWorktreeCommand() {
       console.log(kleur_default.dim("  Cancelled\n"));
       return;
     }
-    const r = (0, import_node_child_process7.spawnSync)("git", ["worktree", "remove", target.path, "--force"], {
+    const r = (0, import_node_child_process8.spawnSync)("git", ["worktree", "remove", target.path, "--force"], {
       cwd: repoRoot,
       encoding: "utf8",
       stdio: "pipe"
     });
     if (r.status === 0) {
+      clearStatuslineClaim(repoRoot);
       console.log(t.success(`
   \u2713 Removed ${target.path}
 `));
@@ -56728,6 +56871,13 @@ function createWorktreeCommand() {
   });
   return cmd;
 }
+function clearStatuslineClaim(repoRoot) {
+  try {
+    const claimFile = (0, import_node_path6.join)(repoRoot, ".xtrm", "statusline-claim");
+    if ((0, import_node_fs5.existsSync)(claimFile)) (0, import_node_fs5.unlinkSync)(claimFile);
+  } catch {
+  }
+}
 
 // src/commands/docs.ts
 var import_fs_extra19 = __toESM(require_lib2(), 1);
@@ -56858,9 +57008,9 @@ function createDocsCommand() {
 }
 
 // src/commands/debug.ts
-var import_node_child_process8 = require("child_process");
-var import_node_fs5 = require("fs");
-var import_node_path6 = require("path");
+var import_node_child_process9 = require("child_process");
+var import_node_fs6 = require("fs");
+var import_node_path7 = require("path");
 var KIND_LABELS = {
   "session.start": { label: "SESS+", color: kleur_default.green },
   "session.end": { label: "SESS-", color: kleur_default.white },
@@ -56960,14 +57110,14 @@ function buildDetail(event) {
   }
   if (event.kind === "tool.call") {
     if (d?.cmd) parts.push(kleur_default.dim(d.cmd.slice(0, 72)));
-    if (d?.file) parts.push(kleur_default.dim((0, import_node_path6.basename)(d.file)));
+    if (d?.file) parts.push(kleur_default.dim((0, import_node_path7.basename)(d.file)));
     if (d?.pattern) parts.push(kleur_default.dim(`/${d.pattern}/`));
     if (d?.url) parts.push(kleur_default.dim(d.url.slice(0, 72)));
     if (d?.query) parts.push(kleur_default.dim(d.query.slice(0, 72)));
     if (d?.prompt) parts.push(kleur_default.dim(d.prompt.slice(0, 72)));
   } else {
     if (event.issue_id) parts.push(kleur_default.yellow(event.issue_id));
-    if (d?.file) parts.push(kleur_default.dim((0, import_node_path6.basename)(d.file)));
+    if (d?.file) parts.push(kleur_default.dim((0, import_node_path7.basename)(d.file)));
     if (d?.reason_code) parts.push(kleur_default.dim(`[${d.reason_code}]`));
     if (event.worktree) parts.push(kleur_default.dim(`wt:${event.worktree}`));
   }
@@ -56984,8 +57134,8 @@ function formatLine(event, colorMap) {
 function findDbPath(cwd) {
   let dir = cwd;
   for (let i = 0; i < 10; i++) {
-    if ((0, import_node_fs5.existsSync)((0, import_node_path6.join)(dir, ".beads"))) return (0, import_node_path6.join)(dir, ".xtrm", "debug.db");
-    const parent = (0, import_node_path6.join)(dir, "..");
+    if ((0, import_node_fs6.existsSync)((0, import_node_path7.join)(dir, ".beads"))) return (0, import_node_path7.join)(dir, ".xtrm", "debug.db");
+    const parent = (0, import_node_path7.join)(dir, "..");
     if (parent === dir) break;
     dir = parent;
   }
@@ -57006,7 +57156,7 @@ function buildWhere(opts, base) {
 }
 function queryEvents(dbPath, where, limit) {
   const sql = `SELECT id,ts,session_id,runtime,worktree,kind,tool_name,outcome,issue_id,duration_ms,data FROM events${where ? ` WHERE ${where}` : ""} ORDER BY id ASC LIMIT ${limit}`;
-  const result = (0, import_node_child_process8.spawnSync)("sqlite3", [dbPath, "-json", sql], {
+  const result = (0, import_node_child_process9.spawnSync)("sqlite3", [dbPath, "-json", sql], {
     stdio: ["pipe", "pipe", "pipe"],
     encoding: "utf8",
     timeout: 5e3
@@ -57046,7 +57196,7 @@ function createDebugCommand() {
   return new Command("debug").description("Watch xtrm events: tool calls, gate decisions, bd lifecycle").option("-f, --follow", "Follow new events (default)", false).option("--all", "Show full history and exit", false).option("--session <id>", "Filter by session ID (prefix match)").option("--type <domain>", "Filter by domain: tool | gate | bd | session").option("--json", "Output raw JSON lines", false).action((opts) => {
     const cwd = process.cwd();
     const dbPath = findDbPath(cwd);
-    if (!dbPath || !(0, import_node_fs5.existsSync)(dbPath)) return;
+    if (!dbPath || !(0, import_node_fs6.existsSync)(dbPath)) return;
     if (opts.all) {
       const events = queryEvents(dbPath, buildWhere(opts, ""), 1e3);
       const colorMap = buildColorMap(events);
@@ -57231,7 +57381,7 @@ async function printBanner(version3) {
 // src/index.ts
 var version2 = "0.0.0";
 try {
-  version2 = JSON.parse((0, import_node_fs6.readFileSync)((0, import_node_path7.resolve)(__dirname, "../package.json"), "utf8")).version;
+  version2 = JSON.parse((0, import_node_fs7.readFileSync)((0, import_node_path8.resolve)(__dirname, "../package.json"), "utf8")).version;
 } catch {
 }
 var program2 = new Command();