@episoda/cli 0.2.184 → 0.2.189

package/dist/daemon/daemon-process.js

@@ -1937,7 +1937,7 @@ var require_git_executor = __commonJS({
       async executeCloneBare(command, options) {
         try {
           const fs35 = await Promise.resolve().then(() => __importStar(require("fs"))).then((m) => m.promises);
-          const path35 = await Promise.resolve().then(() => __importStar(require("path")));
+          const path37 = await Promise.resolve().then(() => __importStar(require("path")));
           try {
             await fs35.access(command.path);
             return {
@@ -1948,7 +1948,7 @@ var require_git_executor = __commonJS({
             };
           } catch {
           }
-          const parentDir = path35.dirname(command.path);
+          const parentDir = path37.dirname(command.path);
           try {
             await fs35.mkdir(parentDir, { recursive: true });
           } catch {
@@ -1999,13 +1999,13 @@ var require_git_executor = __commonJS({
       async executeProjectInfo(cwd, options) {
         try {
           const fs35 = await Promise.resolve().then(() => __importStar(require("fs"))).then((m) => m.promises);
-          const path35 = await Promise.resolve().then(() => __importStar(require("path")));
+          const path37 = await Promise.resolve().then(() => __importStar(require("path")));
           let currentPath = cwd;
           let projectPath = cwd;
           let bareRepoPath;
           for (let i = 0; i < 10; i++) {
-            const bareDir = path35.join(currentPath, ".bare");
-            const episodaDir = path35.join(currentPath, ".episoda");
+            const bareDir = path37.join(currentPath, ".bare");
+            const episodaDir = path37.join(currentPath, ".episoda");
             try {
               await fs35.access(bareDir);
               await fs35.access(episodaDir);
@@ -2013,7 +2013,7 @@ var require_git_executor = __commonJS({
               bareRepoPath = bareDir;
               break;
             } catch {
-              const parentPath = path35.dirname(currentPath);
+              const parentPath = path37.dirname(currentPath);
               if (parentPath === currentPath) {
                 break;
               }
@@ -2236,7 +2236,7 @@ var require_websocket_client = __commonJS({
           clearTimeout(this.reconnectTimeout);
           this.reconnectTimeout = void 0;
         }
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           const connectionTimeout = setTimeout(() => {
             if (this.ws) {
               this.ws.terminate();
@@ -2267,7 +2267,7 @@ var require_websocket_client = __commonJS({
                 daemonPid: this.daemonPid
               });
               this.startHeartbeat();
-              resolve7();
+              resolve8();
             });
             this.ws.on("pong", () => {
               if (this.heartbeatTimeoutTimer) {
@@ -2411,13 +2411,13 @@ var require_websocket_client = __commonJS({
           console.warn("[EpisodaClient] Cannot send - WebSocket not connected");
           return false;
         }
-        return new Promise((resolve7) => {
+        return new Promise((resolve8) => {
           this.ws.send(JSON.stringify(message), (error) => {
             if (error) {
               console.error("[EpisodaClient] Failed to send message:", error);
-              resolve7(false);
+              resolve8(false);
             } else {
-              resolve7(true);
+              resolve8(true);
             }
           });
         });
@@ -2725,29 +2725,29 @@ var require_auth = __commonJS({
     exports2.saveConfig = saveConfig4;
     exports2.validateToken = validateToken;
     var fs35 = __importStar(require("fs"));
-    var path35 = __importStar(require("path"));
+    var path37 = __importStar(require("path"));
     var os16 = __importStar(require("os"));
     var child_process_1 = require("child_process");
     var DEFAULT_CONFIG_FILE = "config.json";
     var hasWarnedMissingProjectId = false;
     var hasWarnedMissingRequiredFields = false;
     function getConfigDir10() {
-      return process.env.EPISODA_CONFIG_DIR || path35.join(os16.homedir(), ".episoda");
+      return process.env.EPISODA_CONFIG_DIR || path37.join(os16.homedir(), ".episoda");
     }
     function getConfigPath(configPath) {
       if (configPath) {
         return configPath;
       }
-      return path35.join(getConfigDir10(), DEFAULT_CONFIG_FILE);
+      return path37.join(getConfigDir10(), DEFAULT_CONFIG_FILE);
     }
     function ensureConfigDir(configPath) {
-      const dir = path35.dirname(configPath);
+      const dir = path37.dirname(configPath);
       const isNew = !fs35.existsSync(dir);
       if (isNew) {
         fs35.mkdirSync(dir, { recursive: true, mode: 448 });
       }
       if (process.platform === "darwin") {
-        const nosyncPath = path35.join(dir, ".nosync");
+        const nosyncPath = path37.join(dir, ".nosync");
         if (isNew || !fs35.existsSync(nosyncPath)) {
           try {
             fs35.writeFileSync(nosyncPath, "", { mode: 384 });
@@ -3046,7 +3046,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@episoda/cli",
-      version: "0.2.184",
+      version: "0.2.189",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -3362,10 +3362,10 @@ var IPCServer = class {
     this.server = net.createServer((socket) => {
       this.handleConnection(socket);
     });
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       this.server.listen(socketPath, () => {
         fs3.chmodSync(socketPath, 384);
-        resolve7();
+        resolve8();
       });
       this.server.on("error", reject);
     });
@@ -3376,12 +3376,12 @@ var IPCServer = class {
   async stop() {
     if (!this.server) return;
     const socketPath = getSocketPath();
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       this.server.close(() => {
         if (fs3.existsSync(socketPath)) {
           fs3.unlinkSync(socketPath);
         }
-        resolve7();
+        resolve8();
       });
     });
   }
@@ -3626,7 +3626,7 @@ function getDownloadUrl() {
   return platformUrls[arch4] || null;
 }
 async function downloadFile(url, destPath) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const followRedirect = (currentUrl, redirectCount = 0) => {
       if (redirectCount > 5) {
         reject(new Error("Too many redirects"));
@@ -3656,7 +3656,7 @@ async function downloadFile(url, destPath) {
         response.pipe(file);
         file.on("finish", () => {
           file.close();
-          resolve7();
+          resolve8();
         });
         file.on("error", (err) => {
           fs4.unlinkSync(destPath);
@@ -4070,10 +4070,10 @@ var TunnelManager = class extends import_events.EventEmitter {
       const isTracked = Array.from(this.tunnelStates.values()).some((s) => s.info.pid === pid);
       console.log(`[Tunnel] EP904: Found cloudflared PID ${pid} on port ${port} (tracked: ${isTracked})`);
       this.killByPid(pid, "SIGTERM");
-      await new Promise((resolve7) => setTimeout(resolve7, 500));
+      await new Promise((resolve8) => setTimeout(resolve8, 500));
       if (this.isProcessRunning(pid)) {
         this.killByPid(pid, "SIGKILL");
-        await new Promise((resolve7) => setTimeout(resolve7, 200));
+        await new Promise((resolve8) => setTimeout(resolve8, 200));
       }
       killed.push(pid);
     }
@@ -4107,7 +4107,7 @@ var TunnelManager = class extends import_events.EventEmitter {
           if (!this.tunnelStates.has(moduleUid)) {
             console.log(`[Tunnel] EP877: Found orphaned process PID ${pid} for ${moduleUid}, killing...`);
             this.killByPid(pid, "SIGTERM");
-            await new Promise((resolve7) => setTimeout(resolve7, 1e3));
+            await new Promise((resolve8) => setTimeout(resolve8, 1e3));
             if (this.isProcessRunning(pid)) {
               this.killByPid(pid, "SIGKILL");
             }
@@ -4122,7 +4122,7 @@ var TunnelManager = class extends import_events.EventEmitter {
         if (!trackedPids.includes(pid) && !cleaned.includes(pid)) {
           console.log(`[Tunnel] EP877: Found untracked cloudflared process PID ${pid}, killing...`);
           this.killByPid(pid, "SIGTERM");
-          await new Promise((resolve7) => setTimeout(resolve7, 500));
+          await new Promise((resolve8) => setTimeout(resolve8, 500));
           if (this.isProcessRunning(pid)) {
             this.killByPid(pid, "SIGKILL");
           }
@@ -4212,7 +4212,7 @@ var TunnelManager = class extends import_events.EventEmitter {
         return { success: false, error: `Failed to get cloudflared: ${errorMessage}` };
       }
     }
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       const tunnelInfo = {
         moduleUid,
         url: previewUrl || "",
@@ -4278,7 +4278,7 @@ var TunnelManager = class extends import_events.EventEmitter {
             moduleUid,
             url: tunnelInfo.url
           });
-          resolve7({ success: true, url: tunnelInfo.url });
+          resolve8({ success: true, url: tunnelInfo.url });
         }
       };
       process2.stderr?.on("data", (data) => {
@@ -4305,7 +4305,7 @@ var TunnelManager = class extends import_events.EventEmitter {
             onStatusChange?.("error", errorMsg);
             this.emitEvent({ type: "error", moduleUid, error: errorMsg });
           }
-          resolve7({ success: false, error: errorMsg });
+          resolve8({ success: false, error: errorMsg });
         } else if (wasConnected) {
           if (currentState && !currentState.intentionallyStopped) {
             console.log(`[Tunnel] EP948: Named tunnel ${moduleUid} crashed unexpectedly, attempting reconnect...`);
@@ -4336,7 +4336,7 @@ var TunnelManager = class extends import_events.EventEmitter {
           this.emitEvent({ type: "error", moduleUid, error: error.message });
         }
         if (!connected) {
-          resolve7({ success: false, error: error.message });
+          resolve8({ success: false, error: error.message });
         }
       });
       setTimeout(() => {
@@ -4359,7 +4359,7 @@ var TunnelManager = class extends import_events.EventEmitter {
             onStatusChange?.("error", errorMsg);
             this.emitEvent({ type: "error", moduleUid, error: errorMsg });
           }
-          resolve7({ success: false, error: errorMsg });
+          resolve8({ success: false, error: errorMsg });
         }
       }, TUNNEL_TIMEOUTS.NAMED_TUNNEL_CONNECT);
     });
@@ -4420,7 +4420,7 @@ var TunnelManager = class extends import_events.EventEmitter {
     if (orphanPid && this.isProcessRunning(orphanPid)) {
       console.log(`[Tunnel] EP877: Killing orphaned process ${orphanPid} for ${moduleUid} before starting new tunnel`);
       this.killByPid(orphanPid, "SIGTERM");
-      await new Promise((resolve7) => setTimeout(resolve7, 500));
+      await new Promise((resolve8) => setTimeout(resolve8, 500));
       if (this.isProcessRunning(orphanPid)) {
         this.killByPid(orphanPid, "SIGKILL");
       }
@@ -4429,7 +4429,7 @@ var TunnelManager = class extends import_events.EventEmitter {
     const killedOnPort = await this.killCloudflaredOnPort(port);
     if (killedOnPort.length > 0) {
       console.log(`[Tunnel] EP904: Pre-start port cleanup killed ${killedOnPort.length} process(es) on port ${port}`);
-      await new Promise((resolve7) => setTimeout(resolve7, 1e3));
+      await new Promise((resolve8) => setTimeout(resolve8, 1e3));
     }
     const cleanup = await this.cleanupOrphanedProcesses();
     if (cleanup.cleaned > 0) {
@@ -4469,7 +4469,7 @@ var TunnelManager = class extends import_events.EventEmitter {
       if (orphanPid && this.isProcessRunning(orphanPid)) {
         console.log(`[Tunnel] EP877: Stopping orphaned process ${orphanPid} for ${moduleUid} via PID file`);
         this.killByPid(orphanPid, "SIGTERM");
-        await new Promise((resolve7) => setTimeout(resolve7, 1e3));
+        await new Promise((resolve8) => setTimeout(resolve8, 1e3));
         if (this.isProcessRunning(orphanPid)) {
           this.killByPid(orphanPid, "SIGKILL");
         }
@@ -4485,16 +4485,16 @@ var TunnelManager = class extends import_events.EventEmitter {
     const tunnel = state.info;
     if (tunnel.process && !tunnel.process.killed) {
       tunnel.process.kill("SIGTERM");
-      await new Promise((resolve7) => {
+      await new Promise((resolve8) => {
         const timeout = setTimeout(() => {
           if (tunnel.process && !tunnel.process.killed) {
             tunnel.process.kill("SIGKILL");
           }
-          resolve7();
+          resolve8();
         }, 3e3);
         tunnel.process.once("exit", () => {
           clearTimeout(timeout);
-          resolve7();
+          resolve8();
         });
       });
     }
@@ -4781,15 +4781,15 @@ async function writeToStdinWithBackpressure(process2, data, drainTimeoutMs, labe
   if (!stdin || stdin.destroyed) {
     throw new Error(`[${label}] stdin not available. session=${sessionId}`);
   }
-  await new Promise((resolve7, reject) => {
+  await new Promise((resolve8, reject) => {
     const ok = stdin.write(data);
     if (ok) {
-      resolve7();
+      resolve8();
       return;
     }
     const onDrain = () => {
       cleanup();
-      resolve7();
+      resolve8();
     };
     const onError = (err) => {
       cleanup();
@@ -4810,18 +4810,18 @@ async function writeToStdinWithBackpressure(process2, data, drainTimeoutMs, labe
   });
 }
 function waitForProcessExit(process2, alive, timeoutMs) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     if (!process2 || !alive) {
-      resolve7(true);
+      resolve8(true);
       return;
     }
     const onExit = () => {
       clearTimeout(timer);
-      resolve7(true);
+      resolve8(true);
     };
     const timer = setTimeout(() => {
       process2.removeListener("exit", onExit);
-      resolve7(false);
+      resolve8(false);
     }, timeoutMs);
     process2.once("exit", onExit);
   });
@@ -5817,10 +5817,10 @@ var CodexPersistentRuntime = class {
   }
   waitForThreadId(timeoutMs) {
     if (this._agentSessionId) return Promise.resolve(this._agentSessionId);
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       const onId = (id) => {
         clearTimeout(timer);
-        resolve7(id);
+        resolve8(id);
       };
       const timer = setTimeout(() => {
         this.threadIdWaiters = this.threadIdWaiters.filter((w) => w !== onId);
@@ -5851,12 +5851,12 @@ var CodexPersistentRuntime = class {
   sendRequest(method, params, timeoutMs = INIT_TIMEOUT_MS) {
     const id = this.nextId++;
     const msg = { jsonrpc: "2.0", id, method, params };
-    return new Promise(async (resolve7, reject) => {
+    return new Promise(async (resolve8, reject) => {
       const timeout = setTimeout(() => {
         this.pending.delete(id);
         reject(new Error(`JSON-RPC timeout: ${method}`));
       }, timeoutMs);
-      this.pending.set(id, { resolve: resolve7, reject, timeout });
+      this.pending.set(id, { resolve: resolve8, reject, timeout });
       try {
         await this.writeToStdin(JSON.stringify(msg) + "\n");
       } catch (err) {
@@ -6006,11 +6006,11 @@ var UnifiedAgentRuntime = class {
     if (!this.currentTurn && this.impl.turnState === "idle") {
       return this.dispatchTurn(message, callbacks);
     }
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       this.queuedTurns.push({
         message,
         callbacks,
-        resolve: resolve7,
+        resolve: resolve8,
         reject
       });
     });
@@ -7523,13 +7523,13 @@ async function getChildProcessRssMb(pid) {
   if (!pid || pid <= 0) return null;
   try {
     if (typeof import_child_process9.execFile !== "function") return null;
-    const stdout = await new Promise((resolve7, reject) => {
+    const stdout = await new Promise((resolve8, reject) => {
       (0, import_child_process9.execFile)("ps", ["-o", "rss=", "-p", String(pid)], { timeout: 1e3 }, (err, out) => {
         if (err) {
           reject(err);
           return;
         }
-        resolve7(String(out));
+        resolve8(String(out));
       });
     });
     const kb = Number(String(stdout).trim());
@@ -7632,8 +7632,8 @@ var AgentControlPlane = class {
   async withConfigLock(fn) {
     const previousLock = this.configWriteLock;
     let releaseLock;
-    this.configWriteLock = new Promise((resolve7) => {
-      releaseLock = resolve7;
+    this.configWriteLock = new Promise((resolve8) => {
+      releaseLock = resolve8;
     });
     try {
       await previousLock;
@@ -8862,7 +8862,7 @@ var WorktreeManager = class _WorktreeManager {
                 const lockContent = fs14.readFileSync(lockPath, "utf-8").trim();
                 const lockPid = parseInt(lockContent, 10);
                 if (!isNaN(lockPid) && this.isProcessRunning(lockPid)) {
-                  await new Promise((resolve7) => setTimeout(resolve7, retryInterval));
+                  await new Promise((resolve8) => setTimeout(resolve8, retryInterval));
                   continue;
                 }
               } catch {
@@ -8876,7 +8876,7 @@ var WorktreeManager = class _WorktreeManager {
           } catch {
             continue;
           }
-          await new Promise((resolve7) => setTimeout(resolve7, retryInterval));
+          await new Promise((resolve8) => setTimeout(resolve8, retryInterval));
           continue;
         }
         throw err;
@@ -9666,6 +9666,7 @@ function getInstallCommand(cwd) {
 var fs34 = __toESM(require("fs"));
 var http2 = __toESM(require("http"));
 var os15 = __toESM(require("os"));
+var path36 = __toESM(require("path"));
 var import_child_process19 = require("child_process");
 
 // src/daemon/ipc-router.ts
@@ -10400,7 +10401,7 @@ async function handleExec(command, projectPath) {
     env = {}
   } = command;
   const effectiveTimeout = Math.min(Math.max(timeout, 1e3), MAX_TIMEOUT);
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     let stdout = "";
     let stderr = "";
     let timedOut = false;
@@ -10408,7 +10409,7 @@ async function handleExec(command, projectPath) {
     const done = (result) => {
       if (resolved) return;
       resolved = true;
-      resolve7(result);
+      resolve8(result);
     };
     try {
       const proc = (0, import_child_process11.spawn)(cmd, {
@@ -10512,18 +10513,18 @@ var import_core12 = __toESM(require_dist());
 // src/utils/port-check.ts
 var net2 = __toESM(require("net"));
 async function isPortInUse(port) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const server = net2.createServer();
     server.once("error", (err) => {
       if (err.code === "EADDRINUSE") {
-        resolve7(true);
+        resolve8(true);
       } else {
-        resolve7(false);
+        resolve8(false);
       }
     });
     server.once("listening", () => {
       server.close();
-      resolve7(false);
+      resolve8(false);
     });
     server.listen(port);
   });
@@ -10926,7 +10927,7 @@ var DevServerRegistry = class {
     return killed;
   }
   wait(ms) {
-    return new Promise((resolve7) => setTimeout(resolve7, ms));
+    return new Promise((resolve8) => setTimeout(resolve8, ms));
   }
   killWsServerOnPort(wsPort, worktreePath) {
     const killed = [];
@@ -11500,7 +11501,7 @@ var DevServerRunner = class extends import_events2.EventEmitter {
     return Math.min(delay, DEV_SERVER_CONSTANTS.MAX_RESTART_DELAY_MS);
   }
   async checkHealth(port) {
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       const req = http.request(
         {
           hostname: "localhost",
@@ -11509,18 +11510,18 @@ var DevServerRunner = class extends import_events2.EventEmitter {
           method: "HEAD",
           timeout: DEV_SERVER_CONSTANTS.HEALTH_CHECK_TIMEOUT_MS
         },
-        () => resolve7(true)
+        () => resolve8(true)
       );
-      req.on("error", () => resolve7(false));
+      req.on("error", () => resolve8(false));
       req.on("timeout", () => {
         req.destroy();
-        resolve7(false);
+        resolve8(false);
       });
       req.end();
     });
   }
   async checkWsHealth(wsPort) {
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       const req = http.request(
         {
           hostname: "127.0.0.1",
@@ -11530,14 +11531,14 @@ var DevServerRunner = class extends import_events2.EventEmitter {
           timeout: DEV_SERVER_CONSTANTS.HEALTH_CHECK_TIMEOUT_MS
         },
         (res) => {
-          resolve7(res.statusCode === 200);
+          resolve8(res.statusCode === 200);
           res.resume();
         }
       );
-      req.on("error", () => resolve7(false));
+      req.on("error", () => resolve8(false));
       req.on("timeout", () => {
         req.destroy();
-        resolve7(false);
+        resolve8(false);
       });
       req.end();
     });
@@ -11565,7 +11566,7 @@ var DevServerRunner = class extends import_events2.EventEmitter {
     return false;
   }
   wait(ms) {
-    return new Promise((resolve7) => setTimeout(resolve7, ms));
+    return new Promise((resolve8) => setTimeout(resolve8, ms));
   }
   getLogsDir() {
     const logsDir = path25.join((0, import_core12.getConfigDir)(), "logs");
@@ -11764,7 +11765,7 @@ var PreviewManager = class extends import_events3.EventEmitter {
       for (let attempt = 1; attempt <= MAX_TUNNEL_RETRIES; attempt++) {
         if (attempt > 1) {
           console.log(`[PreviewManager] Retrying tunnel for ${moduleUid} (attempt ${attempt}/${MAX_TUNNEL_RETRIES})...`);
-          await new Promise((resolve7) => setTimeout(resolve7, 2e3));
+          await new Promise((resolve8) => setTimeout(resolve8, 2e3));
         }
         tunnelResult = await this.tunnel.startTunnel({
           moduleUid,
@@ -11896,7 +11897,7 @@ var PreviewManager = class extends import_events3.EventEmitter {
     }
     console.log(`[PreviewManager] Restarting preview for ${moduleUid}`);
     await this.stopPreview(moduleUid);
-    await new Promise((resolve7) => setTimeout(resolve7, 1e3));
+    await new Promise((resolve8) => setTimeout(resolve8, 1e3));
     return this.startPreview({
       moduleUid,
       worktreePath: state.worktreePath,
@@ -12875,7 +12876,7 @@ var pty = __toESM(require("@lydell/node-pty"));
 var INACTIVITY_TIMEOUT_MS3 = 30 * 60 * 1e3;
 var sessions = /* @__PURE__ */ new Map();
 async function handlePtySpawn(payload, client) {
-  const { moduleUid, agent_run_id, command, args, env, cwd, cols = 220, rows = 50 } = payload;
+  const { moduleUid, agent_run_id, command, args, stdin, env, cwd, cols = 220, rows = 50 } = payload;
   if (sessions.has(agent_run_id)) {
     console.warn(`[PTY] Session already exists for agent_run_id ${agent_run_id}, ignoring spawn`);
     return;
@@ -12933,6 +12934,9 @@ async function handlePtySpawn(payload, client) {
       console.error(`[PTY] Failed to send pty_data for ${agent_run_id}:`, err.message);
     });
   });
+  if (typeof stdin === "string" && stdin.trim().length > 0) {
+    proc.write(`${stdin.replace(/\n/g, "\r")}\r`);
+  }
   proc.onExit(({ exitCode }) => {
     const durationMs = Date.now() - session.startedAt;
     if (session.watchdogTimer) clearTimeout(session.watchdogTimer);
@@ -13041,7 +13045,7 @@ async function killProcessOnPort(port) {
       } catch {
       }
     }
-    await new Promise((resolve7) => setTimeout(resolve7, 1e3));
+    await new Promise((resolve8) => setTimeout(resolve8, 1e3));
     for (const pid of pids) {
       try {
         (0, import_child_process15.execSync)(`kill -0 ${pid} 2>/dev/null`, { encoding: "utf8" });
@@ -13050,7 +13054,7 @@ async function killProcessOnPort(port) {
       } catch {
       }
     }
-    await new Promise((resolve7) => setTimeout(resolve7, 500));
+    await new Promise((resolve8) => setTimeout(resolve8, 500));
     const stillInUse = await isPortInUse(port);
     if (stillInUse) {
       console.error(`[DevServer] EP929: Port ${port} still in use after kill attempts`);
@@ -13070,7 +13074,7 @@ async function waitForPort(port, timeoutMs = 3e4) {
     if (await isPortInUse(port)) {
       return true;
     }
-    await new Promise((resolve7) => setTimeout(resolve7, checkInterval));
+    await new Promise((resolve8) => setTimeout(resolve8, checkInterval));
   }
   return false;
 }
@@ -13142,7 +13146,7 @@ async function handleProcessExit(moduleUid, code, signal) {
   const delay = calculateRestartDelay(serverInfo.restartCount);
   console.log(`[DevServer] EP932: Restarting ${moduleUid} in ${delay}ms (attempt ${serverInfo.restartCount + 1}/${MAX_RESTART_ATTEMPTS})`);
   writeToLog(serverInfo.logFile || "", `Scheduling restart in ${delay}ms (attempt ${serverInfo.restartCount + 1})`, false);
-  await new Promise((resolve7) => setTimeout(resolve7, delay));
+  await new Promise((resolve8) => setTimeout(resolve8, delay));
   if (!activeServers.has(moduleUid)) {
     console.log(`[DevServer] EP932: Server ${moduleUid} was removed during restart delay, aborting restart`);
     return;
@@ -13267,7 +13271,7 @@ async function stopDevServer(moduleUid) {
       writeToLog(serverInfo.logFile, `Stopping server (manual stop)`, false);
     }
     serverInfo.process.kill("SIGTERM");
-    await new Promise((resolve7) => setTimeout(resolve7, 2e3));
+    await new Promise((resolve8) => setTimeout(resolve8, 2e3));
     if (!serverInfo.process.killed) {
       serverInfo.process.kill("SIGKILL");
     }
@@ -13285,7 +13289,7 @@ async function restartDevServer(moduleUid) {
     writeToLog(logFile, `Manual restart requested`, false);
   }
   await stopDevServer(moduleUid);
-  await new Promise((resolve7) => setTimeout(resolve7, 1e3));
+  await new Promise((resolve8) => setTimeout(resolve8, 1e3));
   if (await isPortInUse(port)) {
     await killProcessOnPort(port);
   }
@@ -13367,7 +13371,7 @@ var IPCRouter = class {
           if (attempt < MAX_RETRIES) {
             const delay = INITIAL_DELAY * Math.pow(2, attempt - 1);
             console.log(`[Daemon] Retrying in ${delay / 1e3}s...`);
-            await new Promise((resolve7) => setTimeout(resolve7, delay));
+            await new Promise((resolve8) => setTimeout(resolve8, delay));
             await this.host.disconnectProject(projectPath);
           }
         }
@@ -14643,7 +14647,7 @@ var ConnectionManager = class {
    * handlers are removed deterministically on every exit path.
    */
   async waitForAuthentication(client, timeoutMs = 3e4) {
-    await new Promise((resolve7, reject) => {
+    await new Promise((resolve8, reject) => {
       let settled = false;
       const cleanup = () => {
         clearTimeout(timeout);
@@ -14662,7 +14666,7 @@ var ConnectionManager = class {
         if (settled) return;
         settled = true;
         cleanup();
-        resolve7();
+        resolve8();
       };
       const authErrorHandler = (message) => {
         if (settled) return;
@@ -15012,9 +15016,19 @@ var ProjectMessageRouter = class {
     client.on("pty_spawn", async (message) => {
       if (message.type === "pty_spawn") {
         const payload = message.payload;
+        let resolvedPayload = payload;
+        if (!payload.cwd && payload.moduleUid) {
+          const worktreeInfo = await getWorktreeInfoForModule(payload.moduleUid);
+          if (worktreeInfo?.path) {
+            resolvedPayload = {
+              ...payload,
+              cwd: worktreeInfo.path
+            };
+          }
+        }
         console.log(`[Daemon] EP1441: Received pty_spawn for ${projectId}: ${payload.agent_run_id}`);
         client.updateActivity();
-        await handlePtySpawn(payload, client);
+        await handlePtySpawn(resolvedPayload, client);
       }
     });
     client.on("pty_resize", (message) => {
@@ -15269,6 +15283,36 @@ async function cacheMachineUuid(machineUuid, machineId) {
   }
 }
 
+// src/daemon/reconciliation-utils.ts
+var path35 = __toESM(require("path"));
+function isPathUnderRoot(candidatePath, projectRoot) {
+  const relative4 = path35.relative(projectRoot, candidatePath);
+  return relative4 !== "" && !relative4.startsWith("..") && !path35.isAbsolute(relative4);
+}
+function collectUnexpectedWorktrees(params) {
+  const projectRootResolved = path35.resolve(params.projectRoot);
+  const bareRepoPathResolved = path35.resolve(params.bareRepoPath);
+  const unexpectedWorktrees = [];
+  for (const worktree of params.worktrees) {
+    const worktreePathResolved = path35.resolve(worktree.path);
+    if (worktreePathResolved === bareRepoPathResolved) continue;
+    if (worktree.prunable || worktree.locked) continue;
+    if (!isPathUnderRoot(worktreePathResolved, projectRootResolved)) continue;
+    const moduleUid = path35.basename(worktreePathResolved);
+    if (!validateModuleUid(moduleUid)) continue;
+    if (!/^EP\d+$/.test(moduleUid)) continue;
+    if (params.expectedModuleUids.has(moduleUid)) continue;
+    const branch = worktree.branch || "unknown";
+    if (branch === "HEAD (detached)") continue;
+    unexpectedWorktrees.push({
+      moduleUid,
+      path: worktreePathResolved,
+      branch
+    });
+  }
+  return unexpectedWorktrees;
+}
+
 // src/daemon/daemon-process.ts
 var packageJson = require_package();
 var Daemon = class _Daemon {
@@ -15471,9 +15515,9 @@ var Daemon = class _Daemon {
       this.healthServer = http2.createServer((req, res) => {
         if (req.url === "/health" || req.url === "/") {
           const isConnected = this.connectionManager.liveConnectionCount() > 0;
-          const projects = Array.from(this.connectionManager.entries()).map(([path35, conn]) => ({
-            path: path35,
-            connected: this.connectionManager.hasLiveConnection(path35)
+          const projects = Array.from(this.connectionManager.entries()).map(([path37, conn]) => ({
+            path: path37,
+            connected: this.connectionManager.hasLiveConnection(path37)
           }));
           const status = {
             status: isConnected ? "healthy" : "degraded",
@@ -15610,8 +15654,8 @@ var Daemon = class _Daemon {
       }
     }
     let releaseLock;
-    const lockPromise = new Promise((resolve7) => {
-      releaseLock = resolve7;
+    const lockPromise = new Promise((resolve8) => {
+      releaseLock = resolve8;
     });
     this.tunnelOperationLocks.set(moduleUid, lockPromise);
     try {
@@ -15657,7 +15701,7 @@ var Daemon = class _Daemon {
         const maxWait = 35e3;
         const startTime = Date.now();
         while (this.connectionManager.hasPendingConnection(projectPath) && Date.now() - startTime < maxWait) {
-          await new Promise((resolve7) => setTimeout(resolve7, 500));
+          await new Promise((resolve8) => setTimeout(resolve8, 500));
         }
         if (this.connectionManager.hasLiveConnection(projectPath)) {
           console.log(`[Daemon] Pending connection succeeded for ${projectPath}`);
@@ -16476,6 +16520,7 @@ var Daemon = class _Daemon {
       await tunnelManager.initialize();
       const moduleStatuses = [];
       const expectedModuleUids = new Set(modules.map((m) => m.uid));
+      const bareRepoPath = path36.join(projectPath, ".bare");
       for (const mod of modules) {
         const moduleUid = mod.uid;
         const worktree = await getWorktreeInfoForModule(moduleUid);
@@ -16506,11 +16551,36 @@ var Daemon = class _Daemon {
       if (orphanTunnels.length > 0) {
         console.log(`[Daemon] EP1003: Reporting ${orphanTunnels.length} orphan tunnel(s) for server cleanup`);
       }
+      let unexpectedWorktrees;
+      try {
+        const listResult = await new import_core22.GitExecutor().execute(
+          { action: "worktree_list" },
+          { cwd: bareRepoPath }
+        );
+        if (listResult.success) {
+          const localWorktrees = listResult.details?.worktrees || [];
+          const discoveredUnexpectedWorktrees = collectUnexpectedWorktrees({
+            worktrees: localWorktrees,
+            expectedModuleUids,
+            projectRoot: projectPath,
+            bareRepoPath
+          });
+          if (discoveredUnexpectedWorktrees.length > 0) {
+            unexpectedWorktrees = discoveredUnexpectedWorktrees;
+            console.log(`[Daemon] EP1446: Reporting ${discoveredUnexpectedWorktrees.length} unexpected worktree(s) for recovery`);
+          }
+        } else {
+          console.warn("[Daemon] EP1446: Failed to list local worktrees for reconciliation");
+        }
+      } catch (error) {
+        console.warn("[Daemon] EP1446: Error while scanning local worktrees:", error instanceof Error ? error.message : error);
+      }
       const report = {
         projectId,
         machineId: this.machineUuid,
         modules: moduleStatuses,
-        orphanTunnels: orphanTunnels.length > 0 ? orphanTunnels : void 0
+        orphanTunnels: orphanTunnels.length > 0 ? orphanTunnels : void 0,
+        unexpectedWorktrees
       };
       console.log(`[Daemon] EP1003: Sending reconciliation report with ${moduleStatuses.length} module(s)`);
       await client.send({
@@ -16757,7 +16827,7 @@ var Daemon = class _Daemon {
     console.log(`[Daemon] EP1002: Worktree setup complete for ${moduleUid}`);
   }
   async runForegroundCommand(command, args, cwd, env, timeoutMs) {
-    await new Promise((resolve7, reject) => {
+    await new Promise((resolve8, reject) => {
       const commandLabel = `${command} ${args.join(" ")}`.trim();
       const child = (0, import_child_process19.spawn)(command, args, {
         cwd,
@@ -16780,7 +16850,7 @@ var Daemon = class _Daemon {
           reject(error);
           return;
         }
-        resolve7();
+        resolve8();
       };
       termTimer = setTimeout(() => {
         timedOut = true;