cli-remote-agent 1.0.7 → 1.0.10

package/dist/cli.js

@@ -472,6 +472,60 @@ var init_pty_helper_fix = __esm({
   }
 });
 
+// src/single-instance.ts
+function isRunningAgent(pid) {
+  try {
+    process.kill(pid, 0);
+  } catch {
+    return false;
+  }
+  if (process.platform === "win32") return true;
+  try {
+    const out = (0, import_child_process.execFileSync)("ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8" });
+    return /crc-agent|cli-remote-agent|agent[\/\\](dist|src)[\/\\](cli|index)/.test(out);
+  } catch {
+    return true;
+  }
+}
+function acquireSingleInstanceLock() {
+  if (process.env.CRC_ALLOW_MULTIPLE === "1") return { ok: true };
+  try {
+    if (import_fs5.default.existsSync(LOCK_FILE)) {
+      const prev = parseInt(import_fs5.default.readFileSync(LOCK_FILE, "utf8").trim(), 10);
+      if (prev && prev !== process.pid && isRunningAgent(prev)) {
+        return { ok: false, pid: prev };
+      }
+    }
+    import_fs5.default.mkdirSync(CONFIG_DIR, { recursive: true });
+    import_fs5.default.writeFileSync(LOCK_FILE, String(process.pid));
+    const release = () => {
+      try {
+        if (parseInt(import_fs5.default.readFileSync(LOCK_FILE, "utf8").trim(), 10) === process.pid) {
+          import_fs5.default.unlinkSync(LOCK_FILE);
+        }
+      } catch {
+      }
+    };
+    process.on("exit", release);
+    return { ok: true };
+  } catch (err) {
+    logger.warn({ error: err?.message }, "Could not manage single-instance lock");
+    return { ok: true };
+  }
+}
+var import_fs5, import_path4, import_child_process, LOCK_FILE;
+var init_single_instance = __esm({
+  "src/single-instance.ts"() {
+    "use strict";
+    import_fs5 = __toESM(require("fs"));
+    import_path4 = __toESM(require("path"));
+    import_child_process = require("child_process");
+    init_config();
+    init_logger();
+    LOCK_FILE = import_path4.default.join(CONFIG_DIR, "agent.lock");
+  }
+});
+
 // src/claude-live.ts
 function isAlive(pid) {
   try {
@@ -484,18 +538,19 @@ function isAlive(pid) {
 function getLiveClaudeSessions() {
   let files;
   try {
-    files = import_fs5.default.readdirSync(LIVE_SESSIONS_DIR).filter((f) => f.endsWith(".json"));
+    files = import_fs6.default.readdirSync(LIVE_SESSIONS_DIR).filter((f) => f.endsWith(".json"));
   } catch {
     return [];
   }
   const out = [];
   for (const f of files) {
     try {
-      const obj = JSON.parse(import_fs5.default.readFileSync(import_path4.default.join(LIVE_SESSIONS_DIR, f), "utf-8"));
+      const obj = JSON.parse(import_fs6.default.readFileSync(import_path5.default.join(LIVE_SESSIONS_DIR, f), "utf-8"));
       if (typeof obj?.pid !== "number" || !isAlive(obj.pid)) continue;
       out.push({
         pid: obj.pid,
         cwd: typeof obj.cwd === "string" ? obj.cwd : "",
+        sessionId: typeof obj.sessionId === "string" ? obj.sessionId : void 0,
         name: typeof obj.name === "string" ? obj.name : void 0,
         status: typeof obj.status === "string" ? obj.status : void 0,
         updatedAt: typeof obj.updatedAt === "number" ? obj.updatedAt : void 0
@@ -526,31 +581,40 @@ function isDescendantOf(pid, ancestor, parents) {
   }
   return false;
 }
-var import_fs5, import_path4, import_os2, import_child_process, import_util, execFileAsync, LIVE_SESSIONS_DIR;
+async function findClaudeSessionForPtyPid(ptyPid) {
+  const live = getLiveClaudeSessions().filter((s) => s.sessionId);
+  if (live.length === 0) return null;
+  const parents = await getPidParents();
+  for (let i = live.length - 1; i >= 0; i--) {
+    if (isDescendantOf(live[i].pid, ptyPid, parents)) return live[i].sessionId;
+  }
+  return null;
+}
+var import_fs6, import_path5, import_os2, import_child_process2, import_util, execFileAsync, LIVE_SESSIONS_DIR;
 var init_claude_live = __esm({
   "src/claude-live.ts"() {
     "use strict";
-    import_fs5 = __toESM(require("fs"));
-    import_path4 = __toESM(require("path"));
+    import_fs6 = __toESM(require("fs"));
+    import_path5 = __toESM(require("path"));
     import_os2 = __toESM(require("os"));
-    import_child_process = require("child_process");
+    import_child_process2 = require("child_process");
     import_util = require("util");
-    execFileAsync = (0, import_util.promisify)(import_child_process.execFile);
-    LIVE_SESSIONS_DIR = import_path4.default.join(import_os2.default.homedir(), ".claude", "sessions");
+    execFileAsync = (0, import_util.promisify)(import_child_process2.execFile);
+    LIVE_SESSIONS_DIR = import_path5.default.join(import_os2.default.homedir(), ".claude", "sessions");
   }
 });
 
 // src/tmux.ts
 function resolveTmuxPath() {
   if (cachedTmuxPath !== void 0) return cachedTmuxPath;
-  const dirs = (process.env.PATH || "").split(import_path5.default.delimiter).filter(Boolean);
+  const dirs = (process.env.PATH || "").split(import_path6.default.delimiter).filter(Boolean);
   for (const extra of ["/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin", "/opt/local/bin"]) {
     if (!dirs.includes(extra)) dirs.push(extra);
   }
   for (const dir of dirs) {
-    const candidate = import_path5.default.join(dir, "tmux");
+    const candidate = import_path6.default.join(dir, "tmux");
     try {
-      import_fs6.default.accessSync(candidate, import_fs6.default.constants.X_OK);
+      import_fs7.default.accessSync(candidate, import_fs7.default.constants.X_OK);
       cachedTmuxPath = candidate;
       return candidate;
     } catch {
@@ -600,8 +664,8 @@ async function enrichWithPanesAndClaude(sessions2) {
     const { file, args } = tmuxCmd(["list-panes", "-a", "-F", paneFmt]);
     const { stdout } = await execFileAsync2(file, args, { timeout: 6e3 });
     const panes = stdout.split("\n").map((line) => line.replace(/\r$/, "").trim()).filter(Boolean).map((line) => {
-      const [session, pid, path10, activeFlags] = line.split("	");
-      return { session, pid: parseInt(pid, 10) || 0, path: path10 || "", active: activeFlags === "11" };
+      const [session, pid, path11, activeFlags] = line.split("	");
+      return { session, pid: parseInt(pid, 10) || 0, path: path11 || "", active: activeFlags === "11" };
     });
     const byName = new Map(sessions2.map((s) => [s.name, s]));
     for (const pane of panes) {
@@ -640,16 +704,16 @@ function buildTmuxLaunch(name, launch) {
   if (trimmed) args.push(trimmed);
   return { file: tmuxBin, args };
 }
-var import_child_process2, import_util2, import_fs6, import_path5, execFileAsync2, IS_WIN, cachedTmuxPath;
+var import_child_process3, import_util2, import_fs7, import_path6, execFileAsync2, IS_WIN, cachedTmuxPath;
 var init_tmux = __esm({
   "src/tmux.ts"() {
     "use strict";
-    import_child_process2 = require("child_process");
+    import_child_process3 = require("child_process");
     import_util2 = require("util");
-    import_fs6 = __toESM(require("fs"));
-    import_path5 = __toESM(require("path"));
+    import_fs7 = __toESM(require("fs"));
+    import_path6 = __toESM(require("path"));
     init_claude_live();
-    execFileAsync2 = (0, import_util2.promisify)(import_child_process2.execFile);
+    execFileAsync2 = (0, import_util2.promisify)(import_child_process3.execFile);
     IS_WIN = process.platform === "win32";
   }
 });
@@ -659,7 +723,7 @@ function detectShell(preference) {
   if (preference !== "auto") return preference;
   if (process.platform === "win32") {
     try {
-      (0, import_child_process3.execSync)("where pwsh", { stdio: "ignore" });
+      (0, import_child_process4.execSync)("where pwsh", { stdio: "ignore" });
       return "pwsh.exe";
     } catch {
       return "powershell.exe";
@@ -667,25 +731,25 @@ function detectShell(preference) {
   }
   return process.env.SHELL || "/bin/bash";
 }
-var import_child_process3;
+var import_child_process4;
 var init_shell = __esm({
   "src/shell.ts"() {
     "use strict";
-    import_child_process3 = require("child_process");
+    import_child_process4 = require("child_process");
   }
 });
 
 // src/pty-session.ts
 function ensureInitFiles() {
-  const versionFile = (0, import_path6.join)(INIT_DIR, ".version");
-  if ((0, import_fs7.existsSync)(versionFile)) {
+  const versionFile = (0, import_path7.join)(INIT_DIR, ".version");
+  if ((0, import_fs8.existsSync)(versionFile)) {
     try {
-      if ((0, import_fs7.readFileSync)(versionFile, "utf-8").trim() === INIT_VERSION) return;
+      if ((0, import_fs8.readFileSync)(versionFile, "utf-8").trim() === INIT_VERSION) return;
     } catch {
     }
   }
-  (0, import_fs7.mkdirSync)(ZSH_DIR, { recursive: true });
-  (0, import_fs7.writeFileSync)(BASH_INIT, [
+  (0, import_fs8.mkdirSync)(ZSH_DIR, { recursive: true });
+  (0, import_fs8.writeFileSync)(BASH_INIT, [
     "[ -f ~/.bash_profile ] && source ~/.bash_profile",
     "[ -f ~/.bashrc ] && source ~/.bashrc",
     "__crc_s=$SECONDS",
@@ -696,11 +760,11 @@ function ensureInitFiles() {
     `PROMPT_COMMAND='[ "$__crc_armed" = 1 ] && [ \${__crc_elapsed:-0} -ge ${THRESHOLD} ] && printf "\\a"; __crc_armed=1; eval "$__crc_orig_pc"'`,
     ""
   ].join("\n"), "utf-8");
-  (0, import_fs7.writeFileSync)(ZSH_ENV, [
+  (0, import_fs8.writeFileSync)(ZSH_ENV, [
     '[ -f "${ZDOTDIR_ORIG:-$HOME}/.zshenv" ] && source "${ZDOTDIR_ORIG:-$HOME}/.zshenv"',
     ""
   ].join("\n"), "utf-8");
-  (0, import_fs7.writeFileSync)(ZSH_RC, [
+  (0, import_fs8.writeFileSync)(ZSH_RC, [
     '[ -f "${ZDOTDIR_ORIG:-$HOME}/.zshrc" ] && source "${ZDOTDIR_ORIG:-$HOME}/.zshrc"',
     "__crc_s=$SECONDS",
     "__crc_armed=0",
@@ -713,36 +777,36 @@ function ensureInitFiles() {
     "fi",
     ""
   ].join("\n"), "utf-8");
-  (0, import_fs7.writeFileSync)(versionFile, INIT_VERSION, "utf-8");
+  (0, import_fs8.writeFileSync)(versionFile, INIT_VERSION, "utf-8");
 }
 function resolveCwd(cwd) {
   const candidates = process.platform === "win32" ? [cwd, (0, import_os3.homedir)(), process.env.USERPROFILE, process.env.HOME] : [cwd, (0, import_os3.homedir)(), process.env.HOME, process.env.USERPROFILE];
   for (const c of candidates) {
     if (c) {
       try {
-        if ((0, import_fs7.existsSync)(c)) return c;
+        if ((0, import_fs8.existsSync)(c)) return c;
       } catch {
       }
     }
   }
   return (0, import_os3.homedir)();
 }
-var pty, import_fs7, import_path6, import_os3, THRESHOLD, INIT_DIR, BASH_INIT, ZSH_DIR, ZSH_RC, ZSH_ENV, INIT_VERSION, PtySession;
+var pty, import_fs8, import_path7, import_os3, THRESHOLD, INIT_DIR, BASH_INIT, ZSH_DIR, ZSH_RC, ZSH_ENV, INIT_VERSION, PtySession;
 var init_pty_session = __esm({
   "src/pty-session.ts"() {
     "use strict";
     pty = __toESM(require("node-pty"));
-    import_fs7 = require("fs");
-    import_path6 = require("path");
+    import_fs8 = require("fs");
+    import_path7 = require("path");
     import_os3 = require("os");
     init_src();
     init_shell();
     THRESHOLD = 3;
-    INIT_DIR = (0, import_path6.join)((0, import_os3.tmpdir)(), "crc-shell-init");
-    BASH_INIT = (0, import_path6.join)(INIT_DIR, "bashrc");
-    ZSH_DIR = (0, import_path6.join)(INIT_DIR, "zsh");
-    ZSH_RC = (0, import_path6.join)(ZSH_DIR, ".zshrc");
-    ZSH_ENV = (0, import_path6.join)(ZSH_DIR, ".zshenv");
+    INIT_DIR = (0, import_path7.join)((0, import_os3.tmpdir)(), "crc-shell-init");
+    BASH_INIT = (0, import_path7.join)(INIT_DIR, "bashrc");
+    ZSH_DIR = (0, import_path7.join)(INIT_DIR, "zsh");
+    ZSH_RC = (0, import_path7.join)(ZSH_DIR, ".zshrc");
+    ZSH_ENV = (0, import_path7.join)(ZSH_DIR, ".zshenv");
     INIT_VERSION = "2";
     PtySession = class {
       id;
@@ -791,6 +855,9 @@ var init_pty_session = __esm({
           });
         }
       }
+      get pid() {
+        return this.pty.pid;
+      }
       write(data) {
         this.pty.write(data);
       }
@@ -857,6 +924,9 @@ function createTerminalSession(sessionId, cols, rows, shellPreference, cwd, onDa
   sessions.set(sessionId, session);
   logger.info({ sessionId, cols, rows }, "PTY session created");
 }
+function getSessionPid(sessionId) {
+  return sessions.get(sessionId)?.pid;
+}
 function writeToSession(sessionId, data) {
   sessions.get(sessionId)?.write(data);
 }
@@ -953,7 +1023,7 @@ function getCpuUsage() {
 function getRootPaths() {
   if (process.platform === "win32") {
     try {
-      const output = (0, import_child_process4.execSync)("wmic logicaldisk get name", { encoding: "utf-8" });
+      const output = (0, import_child_process5.execSync)("wmic logicaldisk get name", { encoding: "utf-8" });
       return output.split("\n").map((l) => l.trim()).filter((l) => /^[A-Z]:$/.test(l)).map((l) => l + "\\");
     } catch {
       return ["C:\\"];
@@ -972,19 +1042,19 @@ function buildHeartbeat(homeDir) {
     memoryUsage: Math.round((totalMem - freeMem) / totalMem * 100),
     uptime: Math.round(import_os4.default.uptime()),
     activeSessions: getActiveSessionCount(),
-    pathSeparator: import_path7.default.sep,
+    pathSeparator: import_path8.default.sep,
     homeDirectory: homeDir || import_os4.default.homedir(),
     rootPaths: getRootPaths(),
     capabilities: { terminal: true, fileTransfer: false }
   };
 }
-var import_os4, import_path7, import_child_process4, prevCpu;
+var import_os4, import_path8, import_child_process5, prevCpu;
 var init_heartbeat = __esm({
   "src/heartbeat.ts"() {
     "use strict";
     import_os4 = __toESM(require("os"));
-    import_path7 = __toESM(require("path"));
-    import_child_process4 = require("child_process");
+    import_path8 = __toESM(require("path"));
+    import_child_process5 = require("child_process");
     init_terminal_manager();
     prevCpu = null;
   }
@@ -992,28 +1062,28 @@ var init_heartbeat = __esm({
 
 // src/file-explorer.ts
 function isInSecretDir(resolved) {
-  const rel = import_path8.default.relative(SECRET_DIR, resolved);
-  return rel === "" || !rel.startsWith(".." + import_path8.default.sep) && rel !== ".." && !import_path8.default.isAbsolute(rel);
+  const rel = import_path9.default.relative(SECRET_DIR, resolved);
+  return rel === "" || !rel.startsWith(".." + import_path9.default.sep) && rel !== ".." && !import_path9.default.isAbsolute(rel);
 }
 function listDirectory(dirPath) {
   try {
-    const resolved = import_path8.default.resolve(dirPath);
+    const resolved = import_path9.default.resolve(dirPath);
     if (isInSecretDir(resolved)) {
       return { entries: [], error: "Access denied" };
     }
-    if (!import_fs8.default.existsSync(resolved)) {
+    if (!import_fs9.default.existsSync(resolved)) {
       return { entries: [], error: "Path does not exist" };
     }
-    const stat = import_fs8.default.statSync(resolved);
+    const stat = import_fs9.default.statSync(resolved);
     if (!stat.isDirectory()) {
       return { entries: [], error: "Not a directory" };
     }
-    const dirents = import_fs8.default.readdirSync(resolved, { withFileTypes: true });
+    const dirents = import_fs9.default.readdirSync(resolved, { withFileTypes: true });
     const entries = [];
     for (const dirent of dirents) {
       try {
-        const fullPath = import_path8.default.join(resolved, dirent.name);
-        const s = import_fs8.default.statSync(fullPath);
+        const fullPath = import_path9.default.join(resolved, dirent.name);
+        const s = import_fs9.default.statSync(fullPath);
         entries.push({
           name: dirent.name,
           isDirectory: dirent.isDirectory(),
@@ -1035,22 +1105,22 @@ function listDirectory(dirPath) {
 }
 async function downloadFile(filePath, serverUrl, secret, agentId) {
   try {
-    const resolved = import_path8.default.resolve(filePath);
+    const resolved = import_path9.default.resolve(filePath);
     if (isInSecretDir(resolved)) {
       return { error: "Access denied" };
     }
-    if (!import_fs8.default.existsSync(resolved)) {
+    if (!import_fs9.default.existsSync(resolved)) {
       return { error: "File does not exist" };
     }
-    const stat = import_fs8.default.statSync(resolved);
+    const stat = import_fs9.default.statSync(resolved);
     if (stat.isDirectory()) {
       return { error: "Cannot download a directory" };
     }
     if (stat.size > FILE_MAX_SIZE) {
       return { error: `File too large (max ${FILE_MAX_SIZE} bytes)` };
     }
-    const fileName = import_path8.default.basename(resolved);
-    const fileStream = import_fs8.default.createReadStream(resolved);
+    const fileName = import_path9.default.basename(resolved);
+    const fileStream = import_fs9.default.createReadStream(resolved);
     const baseUrl = serverUrl.replace("wss://", "https://").replace("ws://", "http://");
     const url = `${baseUrl}/api/files/receive`;
     const res = await fetch(url, {
@@ -1079,16 +1149,16 @@ async function downloadFile(filePath, serverUrl, secret, agentId) {
     return { error: err.message };
   }
 }
-var import_fs8, import_path8, import_os5, SECRET_DIR;
+var import_fs9, import_path9, import_os5, SECRET_DIR;
 var init_file_explorer = __esm({
   "src/file-explorer.ts"() {
     "use strict";
-    import_fs8 = __toESM(require("fs"));
-    import_path8 = __toESM(require("path"));
+    import_fs9 = __toESM(require("fs"));
+    import_path9 = __toESM(require("path"));
     import_os5 = __toESM(require("os"));
     init_logger();
     init_src();
-    SECRET_DIR = import_path8.default.join(import_os5.default.homedir(), ".crc-agent");
+    SECRET_DIR = import_path9.default.join(import_os5.default.homedir(), ".crc-agent");
   }
 });
 
@@ -1111,8 +1181,8 @@ async function runCmd(cmd2, shell) {
 }
 function getConfigPath(profile) {
   const file = profile.configFile || `${profile.id}.conf`;
-  if (import_path9.default.isAbsolute(file)) return file;
-  return import_path9.default.join(VPN_DIR, file);
+  if (import_path10.default.isAbsolute(file)) return file;
+  return import_path10.default.join(VPN_DIR, file);
 }
 async function getScutilStatus(serviceName) {
   const { stdout } = await runCmd(`scutil --nc status '${shq(serviceName)}'`);
@@ -1228,7 +1298,7 @@ async function connectWireGuard(profile) {
   const tunnelName = profile.tunnelName || profile.id;
   if (isWindows) {
     const confPath2 = getConfigPath(profile);
-    if (!import_fs9.default.existsSync(confPath2)) {
+    if (!import_fs10.default.existsSync(confPath2)) {
       return `Config file not found: ${confPath2}`;
     }
     const script = `
@@ -1254,7 +1324,7 @@ async function connectWireGuard(profile) {
 async function connectOpenVpn(profile) {
   if (isWindows) {
     const confPath2 = getConfigPath(profile);
-    if (!import_fs9.default.existsSync(confPath2)) {
+    if (!import_fs10.default.existsSync(confPath2)) {
       return `Config file not found: ${confPath2}`;
     }
     const connector = "C:\\Program Files\\OpenVPN Connect\\ovpnconnector.exe";
@@ -1281,7 +1351,7 @@ async function connectOpenVpn(profile) {
     return scutilStart(profile.serviceName);
   }
   const confPath = getConfigPath(profile);
-  if (!import_fs9.default.existsSync(confPath)) {
+  if (!import_fs10.default.existsSync(confPath)) {
     return `Config file not found: ${confPath}`;
   }
   const { stderr } = await runCmd(`sudo openvpn --config '${shq(confPath)}' --daemon`);
@@ -1290,7 +1360,7 @@ async function connectOpenVpn(profile) {
 async function connectAzure(profile) {
   if (isWindows) {
     const confPath = getConfigPath(profile);
-    if (!import_fs9.default.existsSync(confPath)) {
+    if (!import_fs10.default.existsSync(confPath)) {
       return `Config file not found: ${confPath}`;
     }
     await runCmd(`& 'AzureVpn.exe' -i '${psq(confPath)}' 2>&1`);
@@ -1410,19 +1480,19 @@ async function disconnectVpn(configs, profileId) {
   }
   return profiles;
 }
-var import_child_process5, import_util3, import_fs9, import_path9, import_os6, execAsync, isWindows, VPN_DIR;
+var import_child_process6, import_util3, import_fs10, import_path10, import_os6, execAsync, isWindows, VPN_DIR;
 var init_vpn_manager = __esm({
   "src/vpn-manager.ts"() {
     "use strict";
-    import_child_process5 = require("child_process");
+    import_child_process6 = require("child_process");
     import_util3 = require("util");
-    import_fs9 = __toESM(require("fs"));
-    import_path9 = __toESM(require("path"));
+    import_fs10 = __toESM(require("fs"));
+    import_path10 = __toESM(require("path"));
     import_os6 = __toESM(require("os"));
     init_logger();
-    execAsync = (0, import_util3.promisify)(import_child_process5.exec);
+    execAsync = (0, import_util3.promisify)(import_child_process6.exec);
     isWindows = process.platform === "win32";
-    VPN_DIR = import_path9.default.join(import_os6.default.homedir(), ".crc-agent", "vpn");
+    VPN_DIR = import_path10.default.join(import_os6.default.homedir(), ".crc-agent", "vpn");
   }
 });
 
@@ -1457,7 +1527,7 @@ var init_claude_path = __esm({
 // src/claude-sessions.ts
 async function parseSessionFile(filePath) {
   try {
-    const stream = import_fs10.default.createReadStream(filePath, { encoding: "utf-8" });
+    const stream = import_fs11.default.createReadStream(filePath, { encoding: "utf-8" });
     const rl = import_readline2.default.createInterface({ input: stream, crlfDelay: Infinity });
     let firstMessage = "";
     let lastTimestamp = "";
@@ -1505,17 +1575,17 @@ async function parseSessionFile(filePath) {
 }
 async function listClaudeSessions(filterProjectPath) {
   const sessions2 = [];
-  if (!import_fs10.default.existsSync(CLAUDE_PROJECTS_DIR)) return sessions2;
+  if (!import_fs11.default.existsSync(CLAUDE_PROJECTS_DIR)) return sessions2;
   const isDirSafe = (d) => {
     try {
-      return import_fs10.default.statSync(import_path10.default.join(CLAUDE_PROJECTS_DIR, d)).isDirectory();
+      return import_fs11.default.statSync(import_path11.default.join(CLAUDE_PROJECTS_DIR, d)).isDirectory();
     } catch {
       return false;
     }
   };
   let allEntries;
   try {
-    allEntries = import_fs10.default.readdirSync(CLAUDE_PROJECTS_DIR);
+    allEntries = import_fs11.default.readdirSync(CLAUDE_PROJECTS_DIR);
   } catch {
     return sessions2;
   }
@@ -1528,16 +1598,16 @@ async function listClaudeSessions(filterProjectPath) {
     projectDirs = allEntries.filter((d) => isDirSafe(d) && !d.startsWith("-private-"));
   }
   for (const dirName of projectDirs) {
-    const dirPath = import_path10.default.join(CLAUDE_PROJECTS_DIR, dirName);
+    const dirPath = import_path11.default.join(CLAUDE_PROJECTS_DIR, dirName);
     let files;
     try {
-      files = import_fs10.default.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl"));
+      files = import_fs11.default.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl"));
     } catch {
       continue;
     }
     for (const file of files) {
       const sessionId = file.replace(".jsonl", "");
-      const parsed = await parseSessionFile(import_path10.default.join(dirPath, file));
+      const parsed = await parseSessionFile(import_path11.default.join(dirPath, file));
       if (!parsed) continue;
       const projectPath = parsed.cwd || dirName.replace(/^-/, "/").replace(/-/g, "/");
       sessions2.push({
@@ -1555,31 +1625,31 @@ async function listClaudeSessions(filterProjectPath) {
   sessions2.sort((a, b) => b.lastTimestamp > a.lastTimestamp ? 1 : -1);
   return sessions2;
 }
-var import_fs10, import_path10, import_os7, import_readline2, CLAUDE_PROJECTS_DIR;
+var import_fs11, import_path11, import_os7, import_readline2, CLAUDE_PROJECTS_DIR;
 var init_claude_sessions = __esm({
   "src/claude-sessions.ts"() {
     "use strict";
-    import_fs10 = __toESM(require("fs"));
-    import_path10 = __toESM(require("path"));
+    import_fs11 = __toESM(require("fs"));
+    import_path11 = __toESM(require("path"));
     import_os7 = __toESM(require("os"));
     import_readline2 = __toESM(require("readline"));
     init_logger();
     init_claude_path();
-    CLAUDE_PROJECTS_DIR = import_path10.default.join(import_os7.default.homedir(), ".claude", "projects");
+    CLAUDE_PROJECTS_DIR = import_path11.default.join(import_os7.default.homedir(), ".claude", "projects");
   }
 });
 
 // src/claude-conversation.ts
 function findProjectDir(projectPath) {
   const encoded = encodeProjectPath(projectPath);
-  const dirPath = import_path11.default.join(CLAUDE_PROJECTS_DIR2, encoded);
-  if (import_fs11.default.existsSync(dirPath)) return dirPath;
-  if (!import_fs11.default.existsSync(CLAUDE_PROJECTS_DIR2)) return null;
+  const dirPath = import_path12.default.join(CLAUDE_PROJECTS_DIR2, encoded);
+  if (import_fs12.default.existsSync(dirPath)) return dirPath;
+  if (!import_fs12.default.existsSync(CLAUDE_PROJECTS_DIR2)) return null;
   let allDirs;
   try {
-    allDirs = import_fs11.default.readdirSync(CLAUDE_PROJECTS_DIR2).filter((d) => {
+    allDirs = import_fs12.default.readdirSync(CLAUDE_PROJECTS_DIR2).filter((d) => {
       try {
-        return import_fs11.default.statSync(import_path11.default.join(CLAUDE_PROJECTS_DIR2, d)).isDirectory();
+        return import_fs12.default.statSync(import_path12.default.join(CLAUDE_PROJECTS_DIR2, d)).isDirectory();
       } catch {
         return false;
       }
@@ -1589,23 +1659,23 @@ function findProjectDir(projectPath) {
   }
   const matches = findProjectDirs(allDirs, projectPath);
   if (matches.length > 0) {
-    return import_path11.default.join(CLAUDE_PROJECTS_DIR2, matches[0]);
+    return import_path12.default.join(CLAUDE_PROJECTS_DIR2, matches[0]);
   }
   return null;
 }
 function findSessionFileById(sessionId) {
   if (!/^[A-Za-z0-9._-]+$/.test(sessionId)) return null;
-  if (!import_fs11.default.existsSync(CLAUDE_PROJECTS_DIR2)) return null;
+  if (!import_fs12.default.existsSync(CLAUDE_PROJECTS_DIR2)) return null;
   let dirs;
   try {
-    dirs = import_fs11.default.readdirSync(CLAUDE_PROJECTS_DIR2);
+    dirs = import_fs12.default.readdirSync(CLAUDE_PROJECTS_DIR2);
   } catch {
     return null;
   }
   for (const dir of dirs) {
-    const candidate = import_path11.default.join(CLAUDE_PROJECTS_DIR2, dir, `${sessionId}.jsonl`);
+    const candidate = import_path12.default.join(CLAUDE_PROJECTS_DIR2, dir, `${sessionId}.jsonl`);
     try {
-      if (import_fs11.default.statSync(candidate).isFile()) return candidate;
+      if (import_fs12.default.statSync(candidate).isFile()) return candidate;
     } catch {
     }
   }
@@ -1616,20 +1686,20 @@ function findLatestSessionFile(projectPath) {
   if (!dirPath) return null;
   let entries;
   try {
-    entries = import_fs11.default.readdirSync(dirPath);
+    entries = import_fs12.default.readdirSync(dirPath);
   } catch {
     return null;
   }
   const files = entries.filter((f) => f.endsWith(".jsonl") && !f.includes("/")).map((f) => {
     try {
-      return { name: f, mtime: import_fs11.default.statSync(import_path11.default.join(dirPath, f)).mtimeMs };
+      return { name: f, mtime: import_fs12.default.statSync(import_path12.default.join(dirPath, f)).mtimeMs };
     } catch {
       return null;
     }
   }).filter((f) => f !== null).sort((a, b) => b.mtime - a.mtime);
   if (files.length === 0) return null;
   return {
-    filePath: import_path11.default.join(dirPath, files[0].name),
+    filePath: import_path12.default.join(dirPath, files[0].name),
     sessionId: files[0].name.replace(".jsonl", "")
   };
 }
@@ -1639,8 +1709,8 @@ async function readConversation(projectPath, afterLine = 0, specificSessionId) {
   if (specificSessionId) {
     sessionId = specificSessionId;
     const dirPath = findProjectDir(projectPath);
-    const direct = dirPath ? import_path11.default.join(dirPath, `${specificSessionId}.jsonl`) : null;
-    if (direct && import_fs11.default.existsSync(direct)) {
+    const direct = dirPath ? import_path12.default.join(dirPath, `${specificSessionId}.jsonl`) : null;
+    if (direct && import_fs12.default.existsSync(direct)) {
       filePath = direct;
     } else {
       const byId = findSessionFileById(specificSessionId);
@@ -1654,7 +1724,7 @@ async function readConversation(projectPath, afterLine = 0, specificSessionId) {
     sessionId = found.sessionId;
   }
   try {
-    const stream = import_fs11.default.createReadStream(filePath, { encoding: "utf-8" });
+    const stream = import_fs12.default.createReadStream(filePath, { encoding: "utf-8" });
     const rl = import_readline3.default.createInterface({ input: stream, crlfDelay: Infinity });
     const messages = [];
     let lineNum = 0;
@@ -1735,23 +1805,23 @@ async function readConversation(projectPath, afterLine = 0, specificSessionId) {
     return null;
   }
 }
-var import_fs11, import_path11, import_os8, import_readline3, CLAUDE_PROJECTS_DIR2;
+var import_fs12, import_path12, import_os8, import_readline3, CLAUDE_PROJECTS_DIR2;
 var init_claude_conversation = __esm({
   "src/claude-conversation.ts"() {
     "use strict";
-    import_fs11 = __toESM(require("fs"));
-    import_path11 = __toESM(require("path"));
+    import_fs12 = __toESM(require("fs"));
+    import_path12 = __toESM(require("path"));
     import_os8 = __toESM(require("os"));
     import_readline3 = __toESM(require("readline"));
     init_logger();
     init_claude_path();
-    CLAUDE_PROJECTS_DIR2 = import_path11.default.join(import_os8.default.homedir(), ".claude", "projects");
+    CLAUDE_PROJECTS_DIR2 = import_path12.default.join(import_os8.default.homedir(), ".claude", "projects");
   }
 });
 
 // src/index.ts
 var index_exports = {};
-var import_socket, config, socket, SESSION_MAX_IDLE_MS, reaperInterval, vpnProfiles;
+var import_socket, config, lock, socket, SESSION_MAX_IDLE_MS, reaperInterval, vpnProfiles;
 var init_index = __esm({
   "src/index.ts"() {
     "use strict";
@@ -1762,6 +1832,7 @@ var init_index = __esm({
     init_claude_plugin_installer();
     init_local_control();
     init_pty_helper_fix();
+    init_single_instance();
     init_tmux();
     init_heartbeat();
     init_file_explorer();
@@ -1769,12 +1840,20 @@ var init_index = __esm({
     init_claude_sessions();
     init_claude_conversation();
     init_terminal_manager();
+    init_claude_live();
     if (!isConfigured()) {
       console.error("No agent configured. Run: crc-agent setup");
       process.exit(1);
     }
     config = loadConfig();
     logger.info({ agentId: config.agentId, serverUrl: config.serverUrl }, "Starting agent");
+    lock = acquireSingleInstanceLock();
+    if (!lock.ok) {
+      console.error(
+        `Another crc-agent is already running on this machine (PID ${lock.pid}). Stop it first, or set CRC_ALLOW_MULTIPLE=1 to override.`
+      );
+      process.exit(1);
+    }
     ensurePtyHelperExecutable();
     process.on("unhandledRejection", (reason) => {
       logger.error({ reason }, "Unhandled promise rejection (agent kept alive)");
@@ -1963,7 +2042,17 @@ var init_index = __esm({
     });
     socket.on(CLAUDE_CONV_READ, async (payload) => {
       try {
-        const result = await readConversation(payload.projectPath, payload.afterLine || 0, payload.sessionId);
+        let sessionId = payload.sessionId;
+        if (!sessionId && payload.terminalSessionId) {
+          const ptyPid = getSessionPid(payload.terminalSessionId);
+          const resolved = ptyPid ? await findClaudeSessionForPtyPid(ptyPid) : null;
+          if (!resolved) {
+            socket.emit(CLAUDE_CONV_DATA, { sessionId: "", messages: [], totalLines: 0 });
+            return;
+          }
+          sessionId = resolved;
+        }
+        const result = await readConversation(payload.projectPath, payload.afterLine || 0, sessionId);
         if (result) {
           socket.emit(CLAUDE_CONV_DATA, {
             sessionId: result.sessionId,