@episoda/cli 0.2.195 → 0.2.197

package/dist/daemon/daemon-process.js

@@ -3046,7 +3046,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@episoda/cli",
-      version: "0.2.195",
+      version: "0.2.197",
       description: "CLI tool for Episoda local development workflow orchestration",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -12891,12 +12891,13 @@ async function handlePtySpawn(payload, client) {
   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;
+    return { success: false, error: "PTY session already exists for this agent run." };
   }
   console.log(`[PTY] Spawning PTY for ${moduleUid} / ${agent_run_id}: ${command} ${args.join(" ")}`);
-  const bootstrap = createCredentialBootstrap(payload, agent_run_id);
+  let bootstrap = null;
   let proc;
   try {
+    bootstrap = createCredentialBootstrap(payload, agent_run_id);
     proc = pty.spawn(command, args, {
       name: "xterm-256color",
       cols,
@@ -12909,7 +12910,9 @@ async function handlePtySpawn(payload, client) {
       }
     });
   } catch (err) {
-    cleanupCredentialDirs(bootstrap.cleanupDirs);
+    if (bootstrap) {
+      cleanupCredentialDirs(bootstrap.cleanupDirs);
+    }
     console.error(`[PTY] Failed to spawn PTY for ${agent_run_id}:`, err);
     await client.send({
       type: "pty_exit",
@@ -12918,7 +12921,10 @@ async function handlePtySpawn(payload, client) {
       code: -1,
       durationMs: 0
     });
-    return;
+    return {
+      success: false,
+      error: err?.message || `Failed to spawn PTY command '${command}'`
+    };
   }
   const session = {
     pty: proc,
@@ -12927,7 +12933,8 @@ async function handlePtySpawn(payload, client) {
     startedAt: Date.now(),
     lastOutputAt: Date.now(),
     watchdogTimer: null,
-    credentialDirs: bootstrap.cleanupDirs
+    credentialDirs: bootstrap.cleanupDirs,
+    credentialAuthPath: bootstrap.authPath
   };
   sessions.set(agent_run_id, session);
   const resetWatchdog = () => {
@@ -12961,7 +12968,6 @@ async function handlePtySpawn(payload, client) {
     if (session.watchdogTimer) clearTimeout(session.watchdogTimer);
     console.log(`[PTY] Process exited for ${agent_run_id} with code ${exitCode} after ${durationMs}ms`);
     sessions.delete(agent_run_id);
-    cleanupCredentialDirs(session.credentialDirs);
     client.send({
       type: "pty_exit",
       moduleUid,
@@ -12971,7 +12977,9 @@ async function handlePtySpawn(payload, client) {
     }).catch((err) => {
       console.error(`[PTY] Failed to send pty_exit for ${agent_run_id}:`, err.message);
     });
+    syncCredentialUpdateAfterExit(session, agent_run_id, client);
   });
+  return { success: true };
 }
 function handlePtyResize(payload) {
   const { agent_run_id, cols, rows } = payload;
@@ -12995,11 +13003,13 @@ function handlePtyKill(payload) {
   }
   try {
     session.pty.kill();
+    console.log(`[PTY] Kill signal sent for session ${agent_run_id}`);
   } catch {
+    if (session.watchdogTimer) clearTimeout(session.watchdogTimer);
+    cleanupCredentialDirs(session.credentialDirs);
+    sessions.delete(agent_run_id);
+    console.warn(`[PTY] Kill failed for ${agent_run_id}; performed fallback cleanup`);
   }
-  cleanupCredentialDirs(session.credentialDirs);
-  sessions.delete(agent_run_id);
-  console.log(`[PTY] Killed session ${agent_run_id}`);
 }
 function createCredentialBootstrap(payload, agentRunId) {
   const bootstrap = payload.credential_bootstrap;
@@ -13040,9 +13050,65 @@ function createCredentialBootstrap(payload, agentRunId) {
   fs30.writeFileSync(authPath, JSON.stringify(authPayload, null, 2), { mode: 384 });
   return {
     env: { CODEX_HOME: codexHome },
-    cleanupDirs
+    cleanupDirs,
+    authPath
   };
 }
+function syncCredentialUpdateAfterExit(session, agent_run_id, client) {
+  const authPath = session.credentialAuthPath;
+  if (!authPath) {
+    cleanupCredentialDirs(session.credentialDirs);
+    return;
+  }
+  void fs30.promises.readFile(authPath, "utf8").then((raw) => {
+    const tokens = extractCredentialTokens(raw);
+    if (!tokens.access_token) {
+      console.warn(`[PTY] EP1472: No access_token in auth.json for ${agent_run_id}, skipping credential update`);
+      return;
+    }
+    return client.send({
+      type: "pty_credential_update",
+      agent_run_id,
+      provider: "codex",
+      access_token: tokens.access_token,
+      refresh_token: tokens.refresh_token,
+      id_token: tokens.id_token,
+      account_id: tokens.account_id
+    }).then(() => {
+      console.log(`[PTY] EP1472: pty_credential_update sent for ${agent_run_id}`);
+    }).catch((err) => {
+      console.warn(`[PTY] Failed to send pty_credential_update for ${agent_run_id}:`, err.message);
+    });
+  }).catch((err) => {
+    console.warn(`[PTY] EP1472: Failed to read auth.json for ${agent_run_id}:`, getErrorMessage(err));
+  }).finally(() => {
+    cleanupCredentialDirs(session.credentialDirs);
+  });
+}
+function extractCredentialTokens(raw) {
+  const parsed = JSON.parse(raw);
+  const authRecord = asRecord(parsed);
+  if (!authRecord) return {};
+  const nestedTokens = asRecord(authRecord.tokens);
+  const source = nestedTokens ?? authRecord;
+  return {
+    access_token: pickString(source, "access_token"),
+    refresh_token: pickString(source, "refresh_token"),
+    id_token: pickString(source, "id_token"),
+    account_id: pickString(source, "account_id")
+  };
+}
+function asRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  return value;
+}
+function pickString(record, key) {
+  const value = record[key];
+  return typeof value === "string" ? value : void 0;
+}
+function getErrorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
 function cleanupCredentialDirs(dirs) {
   for (const dirPath of dirs) {
     try {
@@ -15091,18 +15157,35 @@ var ProjectMessageRouter = class {
       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
-            };
+        let result = { success: false, error: "PTY spawn failed" };
+        try {
+          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();
+          result = await handlePtySpawn(resolvedPayload, client);
+        } catch (error) {
+          result = {
+            success: false,
+            error: error instanceof Error ? error.message : String(error)
+          };
+          console.error(`[Daemon] EP1471: PTY spawn failed for ${payload.agent_run_id}:`, error);
         }
-        console.log(`[Daemon] EP1441: Received pty_spawn for ${projectId}: ${payload.agent_run_id}`);
-        client.updateActivity();
-        await handlePtySpawn(resolvedPayload, client);
+        await client.send({
+          type: "pty_spawn_ack",
+          requestId: message.id,
+          moduleUid: resolvedPayload.moduleUid,
+          agent_run_id: resolvedPayload.agent_run_id,
+          success: result.success,
+          error: result.error
+        });
       }
     });
     client.on("pty_resize", (message) => {