pi-link 0.1.9 → 0.1.10

package/bin/pi-link.mjs

@@ -1,13 +1,10 @@
 #!/usr/bin/env node
 
-// pi-link CLI — resolve session by name and launch Pi with --link-name
+// pi-link CLI — launch Pi with session resume by name
 //
 // Usage:
-//   pi-link start <name> [pi-flags...]
-//
-// If a session named <name> exists, resumes it.
-// If not, creates a new session.
-// Always connects to the link as <name>.
+//   pi-link <name> [flags...]   Resume or create a named session, connected to link.
+//   pi-link resolve <name>      Print just the session path (machine-readable).
 
 import { readdir, stat } from "fs/promises";
 import { createReadStream } from "fs";
@@ -18,9 +15,7 @@ import { spawn } from "child_process";
 
 const SESSIONS_DIR = join(homedir(), ".pi", "agent", "sessions");
 
-// ── Session scanning ───────────────────────────────────────────────────────
-
-async function getSessionName(filePath) {
+async function getSessionMeta(filePath) {
   let name;
   let cwd;
   const rl = createInterface({ input: createReadStream(filePath, "utf-8"), crlfDelay: Infinity });
@@ -28,9 +23,9 @@ async function getSessionName(filePath) {
     if (!line) continue;
     try {
       const entry = JSON.parse(line);
-      if (entry.type === "session" && entry.cwd) cwd = entry.cwd;
-      if (entry.type === "session_info" && entry.name !== undefined) {
-        name = entry.name?.trim() || undefined;
+      if (entry.type === "session" && typeof entry.cwd === "string") cwd = entry.cwd;
+      if (entry.type === "session_info" && typeof entry.name === "string") {
+        name = entry.name.trim().replace(/\s+/g, " ") || undefined;
       }
     } catch {
       // skip malformed lines
@@ -64,7 +59,7 @@ async function findSessionsByName(targetName) {
       if (!file.endsWith(".jsonl")) continue;
       const filePath = join(dirPath, file);
       try {
-        const { name, cwd } = await getSessionName(filePath);
+        const { name, cwd } = await getSessionMeta(filePath);
         if (name === targetName) {
           const stats = await stat(filePath);
           matches.push({ path: filePath, cwd: cwd || "?", modified: stats.mtime });
@@ -88,67 +83,82 @@ async function findSessionsByName(targetName) {
 
 // ── CLI ────────────────────────────────────────────────────────────────────
 
-const args = process.argv.slice(2);
-const command = args[0];
-
-if (command !== "start" || args.length < 2) {
-  console.log(`Usage: pi-link start <name> [pi-flags...]
+const [command, ...args] = process.argv.slice(2);
 
-Start Pi connected to the link as <name>.
-Resumes a session named <name> if one exists, otherwise creates a new session.
-
-Examples:
-  pi-link start worker-1
-  pi-link start worker-1 --model sonnet
-  pi-link start worker-1 --model sonnet --thinking high`);
-  process.exit(command === "start" ? 1 : 0);
-}
-
-const name = args[1].trim().replace(/\s+/g, " ");
-if (!name) {
-  console.error("Error: name cannot be empty.");
+function printCandidates(name, matches) {
+  console.error(`Multiple sessions named "${name}":\n`);
+  for (const m of matches) {
+    console.error(`  ${m.modified.toISOString().slice(0, 19)}  cwd: ${m.cwd}`);
+    console.error(`  ${m.path}\n`);
+  }
+  console.error(`Use: pi --session <path> --link`);
   process.exit(1);
 }
 
-const extraFlags = args.slice(2);
-for (const flag of ["--session", "--link-name"]) {
-  if (extraFlags.includes(flag)) {
-    console.error(`Error: ${flag} is managed by pi-link start. Remove it.`);
+if (command === "resolve") {
+  const name = args[0]?.trim().replace(/\s+/g, " ");
+  if (!name) {
+    console.error("Usage: pi-link resolve <name>");
+    process.exit(1);
+  }
+  const matches = await findSessionsByName(name);
+  if (matches.length === 1) {
+    process.stdout.write(matches[0].path);
+  } else if (matches.length > 1) {
+    printCandidates(name, matches);
+  }
+} else if (command && command !== "--help" && command !== "-h") {
+  // pi-link <name> [flags...] — resolve and launch Pi
+  const name = command.trim().replace(/\s+/g, " ");
+  if (!name) {
+    console.error("Usage: pi-link <name> [pi flags...]");
     process.exit(1);
   }
-}
-
-console.log(`Searching for session "${name}"...`);
-const matches = await findSessionsByName(name);
-
-const piArgs = [];
 
-if (matches.length === 1) {
-  console.log(`Resuming session: ${matches[0].path}`);
-  piArgs.push("--session", matches[0].path);
-} else if (matches.length > 1) {
-  console.error(`\nMultiple sessions named "${name}":\n`);
-  for (const m of matches) {
-    console.error(`  ${m.modified.toISOString().slice(0, 19)}  cwd: ${m.cwd}`);
-    console.error(`  ${m.path}\n`);
+  // Reject conflicting flags
+  for (const flag of args) {
+    const key = flag.split("=")[0];
+    if (["--session", "--continue", "-c", "--resume", "-r", "--fork", "--no-session", "--session-dir"].includes(key)) {
+      console.error(`Error: ${key} is managed by pi-link. Remove it.`);
+      process.exit(1);
+    }
+    if (key === "--link-name") {
+      console.error("Error: --link-name was removed. Use: pi-link <name>");
+      process.exit(1);
+    }
   }
-  console.error(`Use pi --session <path> --link-name ${name} to pick one.`);
-  process.exit(1);
-} else {
-  console.log("No existing session found. Starting new session.");
-}
 
-piArgs.push("--link-name", name, ...extraFlags);
+  const matches = await findSessionsByName(name);
+  if (matches.length > 1) {
+    printCandidates(name, matches);
+  }
 
-// On Windows, resolve 'pi' through the shell so .cmd/.ps1 shims work
-const isWin = process.platform === "win32";
-const cmd = isWin ? "cmd" : "pi";
-const cmdArgs = isWin ? ["/c", "pi", ...piArgs] : piArgs;
+  const piArgs = [];
+  if (matches.length === 1) {
+    console.error(`Resuming session: ${matches[0].path}`);
+    piArgs.push("--session", matches[0].path);
+  } else {
+    console.error("No existing session found. Starting new session.");
+  }
+  piArgs.push("--link", ...args);
 
-const child = spawn(cmd, cmdArgs, { stdio: "inherit" });
+  const isWin = process.platform === "win32";
+  const cmd = isWin ? "cmd.exe" : "pi";
+  const cmdArgs = isWin ? ["/d", "/c", "pi", ...piArgs] : piArgs;
 
-child.on("exit", (code) => process.exit(code ?? 0));
-child.on("error", (err) => {
-  console.error(`Failed to start pi: ${err.message}`);
-  process.exit(1);
-});
+  const child = spawn(cmd, cmdArgs, {
+    stdio: "inherit",
+    env: { ...process.env, PI_LINK_NAME: name },
+  });
+  child.once("exit", (code, signal) => {
+    if (code !== null) process.exit(code);
+    process.exit(signal === "SIGINT" ? 130 : 1);
+  });
+  child.once("error", (err) => {
+    console.error(`Failed to start pi: ${err.message}`);
+    process.exit(1);
+  });
+} else {
+  console.error("Usage: pi-link <name> [pi flags...]\n       pi-link resolve <name>");
+  process.exit(0);
+}