@integrity-labs/agt-cli 0.15.27 → 0.15.33

package/dist/lib/manager-worker.js

@@ -22,7 +22,7 @@ import {
   resolveChannels,
   resolveDmTarget,
   wrapScheduledTaskPrompt
-} from "../chunk-4DJTQWSS.js";
+} from "../chunk-6J5SG6JQ.js";
 import {
   findTaskByTemplate,
   getProjectDir,
@@ -42,11 +42,11 @@ import {
   startPersistentSession,
   stopAllSessionsAndWait,
   stopPersistentSession
-} from "../chunk-S3SFU5IM.js";
+} from "../chunk-AFUG4KD3.js";
 
 // src/lib/manager-worker.ts
 import { createHash } from "crypto";
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, appendFileSync, mkdirSync as mkdirSync2, chmodSync, existsSync as existsSync2, rmSync as rmSync2, readdirSync as readdirSync2, statSync, unlinkSync, copyFileSync } from "fs";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, chmodSync, existsSync as existsSync2, rmSync as rmSync2, readdirSync as readdirSync2, statSync, unlinkSync, copyFileSync } from "fs";
 import https from "https";
 import { execFileSync as syncExecFile } from "child_process";
 import { join as join3, dirname } from "path";
@@ -1435,6 +1435,7 @@ function clearAgentCaches(agentId, codeName) {
 var cachedFrameworkVersion = null;
 var lastVersionCheckAt = 0;
 var VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
+var agtCliVersion = true ? "0.15.33" : "dev";
 function resolveBrewPath(execFileSync2) {
   try {
     const out = execFileSync2("which", ["brew"], { timeout: 5e3 }).toString().trim();
@@ -1447,7 +1448,21 @@ function resolveBrewPath(execFileSync2) {
 }
 var toolkitCliEnsured = /* @__PURE__ */ new Set();
 var toolkitCliRetryAfter = /* @__PURE__ */ new Map();
+var toolkitCliFailureCount = /* @__PURE__ */ new Map();
 var TOOLKIT_INSTALL_RETRY_MS = 5 * 6e4;
+var TOOLKIT_INSTALL_MAX_FAILURES = 3;
+function recordToolkitFailure(toolkitSlug, reason) {
+  const count = (toolkitCliFailureCount.get(toolkitSlug) ?? 0) + 1;
+  toolkitCliFailureCount.set(toolkitSlug, count);
+  if (count >= TOOLKIT_INSTALL_MAX_FAILURES) {
+    log(`[toolkit-install] ${toolkitSlug}: ${reason} (giving up after ${count} attempts \u2014 restart the manager to retry)`);
+    toolkitCliEnsured.add(toolkitSlug);
+    toolkitCliRetryAfter.delete(toolkitSlug);
+  } else {
+    log(`[toolkit-install] ${toolkitSlug}: ${reason} (attempt ${count}/${TOOLKIT_INSTALL_MAX_FAILURES}, retrying in ${TOOLKIT_INSTALL_RETRY_MS / 6e4}m)`);
+    toolkitCliRetryAfter.set(toolkitSlug, Date.now() + TOOLKIT_INSTALL_RETRY_MS);
+  }
+}
 async function ensureToolkitCli(toolkitSlug) {
   if (toolkitCliEnsured.has(toolkitSlug)) return;
   const retryAfter = toolkitCliRetryAfter.get(toolkitSlug) ?? 0;
@@ -1464,6 +1479,7 @@ async function ensureToolkitCli(toolkitSlug) {
     execFileSync2("which", [binary], { timeout: 5e3, stdio: "pipe" });
     toolkitCliEnsured.add(toolkitSlug);
     toolkitCliRetryAfter.delete(toolkitSlug);
+    toolkitCliFailureCount.delete(toolkitSlug);
     return;
   } catch {
   }
@@ -1498,7 +1514,7 @@ async function ensureToolkitCli(toolkitSlug) {
       const isRoot = typeof process.getuid === "function" && process.getuid() === 0;
       log(`[toolkit-install] ${toolkitSlug}: installing via brew (${pkg})\u2026`);
       if (isRoot) {
-        execFileSync2("sudo", ["-u", "ec2-user", "-H", brewPath, "install", pkg], { timeout: 18e4, stdio: "pipe" });
+        execFileSync2("sudo", ["-u", "ec2-user", "-H", brewPath, "install", pkg], { timeout: 18e4, stdio: "pipe", cwd: "/tmp" });
       } else {
         execFileSync2(brewPath, ["install", pkg], { timeout: 18e4, stdio: "pipe" });
       }
@@ -1513,8 +1529,7 @@ async function ensureToolkitCli(toolkitSlug) {
     }
   } catch (err) {
     const msg = err.message.slice(0, 200);
-    log(`[toolkit-install] ${toolkitSlug}: installer=${resolvedInstaller} failed \u2014 ${msg} (retrying in ${TOOLKIT_INSTALL_RETRY_MS / 6e4}m)`);
-    toolkitCliRetryAfter.set(toolkitSlug, Date.now() + TOOLKIT_INSTALL_RETRY_MS);
+    recordToolkitFailure(toolkitSlug, `installer=${resolvedInstaller} failed \u2014 ${msg}`);
     return;
   }
   if (brewBinDir && !process.env.PATH?.split(":").includes(brewBinDir)) {
@@ -1525,15 +1540,15 @@ async function ensureToolkitCli(toolkitSlug) {
     log(`[toolkit-install] ${toolkitSlug}: installed \u2014 ${binary} now on PATH`);
     toolkitCliEnsured.add(toolkitSlug);
     toolkitCliRetryAfter.delete(toolkitSlug);
+    toolkitCliFailureCount.delete(toolkitSlug);
   } catch {
-    log(`[toolkit-install] ${toolkitSlug}: installer=${resolvedInstaller} completed but ${binary} still not on PATH (retrying in ${TOOLKIT_INSTALL_RETRY_MS / 6e4}m)`);
-    toolkitCliRetryAfter.set(toolkitSlug, Date.now() + TOOLKIT_INSTALL_RETRY_MS);
+    recordToolkitFailure(toolkitSlug, `installer=${resolvedInstaller} completed but ${binary} still not on PATH`);
   }
 }
 function runAsync(cmd, args, opts) {
   return new Promise((resolve, reject) => {
     import("child_process").then(({ spawn }) => {
-      const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"] });
+      const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"], cwd: opts.cwd });
       let stdout = "";
       let stderr = "";
       let settled = false;
@@ -1584,7 +1599,7 @@ async function ensureFrameworkBinary(frameworkId) {
   const isRoot = typeof process.getuid === "function" && process.getuid() === 0;
   const runBrew = (args, opts) => {
     if (isRoot) {
-      return runAsync("sudo", ["-u", "ec2-user", "-H", brewPath, ...args], opts);
+      return runAsync("sudo", ["-u", "ec2-user", "-H", brewPath, ...args], { ...opts, cwd: "/tmp" });
     }
     return runAsync(brewPath, args, opts);
   };
@@ -1812,19 +1827,15 @@ function log(msg) {
   const safeMsg = redactForDiskLog(msg);
   process.stderr.write(`[manager-worker ${ts}] ${safeMsg}
 `);
-  try {
-    if (!managerLogPath) {
+  if (!managerLogPath) {
+    try {
       managerLogPath = join3(homedir3(), ".augmented", "manager.log");
       mkdirSync2(dirname(managerLogPath), { recursive: true });
-      if (!existsSync2(managerLogPath)) {
-        appendFileSync(managerLogPath, "", { mode: 384 });
-      } else {
+      if (existsSync2(managerLogPath)) {
         chmodSync(managerLogPath, 384);
       }
+    } catch {
     }
-    appendFileSync(managerLogPath, `[manager-worker ${ts}] ${safeMsg}
-`);
-  } catch {
   }
 }
 function sha256(content) {
@@ -2206,7 +2217,7 @@ async function pollCycle() {
     }
     try {
       const { detectHostSecurity } = await import("../host-security-6PDFG7F5.js");
-      const { collectDiagnostics } = await import("../persistent-session-Q4X2KRS6.js");
+      const { collectDiagnostics } = await import("../persistent-session-VRS3MFQ3.js");
       const diagCodeNames = [...persistentSessionAgents];
       const agentDiagnostics = diagCodeNames.length > 0 ? collectDiagnostics(diagCodeNames) : void 0;
       let tailscaleHostname;
@@ -2242,6 +2253,7 @@ async function pollCycle() {
       await api.post("/host/heartbeat", {
         host_id: hostId,
         framework_version: cachedFrameworkVersion ?? void 0,
+        agt_version: agtCliVersion,
         host_security: detectHostSecurity() ?? void 0,
         agent_runtime_authenticated: agentRuntimeAuthenticated,
         agent_diagnostics: agentDiagnostics,
@@ -5244,19 +5256,32 @@ async function reportDeliveryStatus(agentId, taskId, payload) {
     log(`[delivery] Failed to report delivery status for ${agentId}/${taskId}: ${err.message}`);
   }
 }
+var spawnedPairIds = /* @__PURE__ */ new Set();
 async function processClaudePairSessions(agents) {
-  if (agents.length === 0) return;
+  if (agents.length === 0 && spawnedPairIds.size === 0) return;
   const agentIds = agents.map((a) => a.agentId);
   const codeNameByAgentId = new Map(agents.map((a) => [a.agentId, a.codeName]));
-  const pendingResp = await api.post("/host/claude-pair/pending", { agent_ids: agentIds });
-  if (!pendingResp.pending || pendingResp.pending.length === 0) return;
+  const pendingResp = await api.post("/host/claude-pair/pending", {
+    agent_ids: agentIds,
+    spawned_pair_ids: Array.from(spawnedPairIds)
+  });
   const {
     startClaudePair,
     submitClaudePairCode,
     spawnPairSession,
     killPairSession,
     pairTmuxSession
-  } = await import("../claude-pair-runtime-VXNC2VEX.js");
+  } = await import("../claude-pair-runtime-5ZZVGIR3.js");
+  for (const pairId of pendingResp.cancelled_pair_ids ?? []) {
+    log(`[claude-pair] sweeping orphan tmux session for pair ${pairId.slice(0, 8)}`);
+    const killed = await killPairSession(pairTmuxSession(pairId));
+    if (killed) {
+      spawnedPairIds.delete(pairId);
+    } else {
+      log(`[claude-pair] kill-session failed for pair ${pairId.slice(0, 8)} \u2014 will retry on next poll`);
+    }
+  }
+  if (!pendingResp.pending || pendingResp.pending.length === 0) return;
   const TERMINAL = /* @__PURE__ */ new Set([
     "success",
     "failure",
@@ -5266,7 +5291,13 @@ async function processClaudePairSessions(agents) {
   async function reportAndCleanup(pairId, body) {
     await api.post("/host/claude-pair/result", { pair_id: pairId, ...body });
     if (typeof body.status === "string" && TERMINAL.has(body.status)) {
-      await killPairSession(pairTmuxSession(pairId));
+      if (body.status === "success") {
+        await new Promise((r) => setTimeout(r, 3e3));
+      }
+      const killed = await killPairSession(pairTmuxSession(pairId));
+      if (killed) {
+        spawnedPairIds.delete(pairId);
+      }
     }
   }
   for (const session of pendingResp.pending) {
@@ -5284,6 +5315,7 @@ async function processClaudePairSessions(agents) {
           });
           continue;
         }
+        spawnedPairIds.add(session.pair_id);
         log(`[claude-pair] dispatching /login (pair ${session.pair_id.slice(0, 8)})`);
         const result = await startClaudePair({ session: pairSession });
         if (result.kind === "url") {