@aiden-ade/sandbox-agent 0.1.84 → 0.1.86

package/dist/index.cjs

@@ -15240,7 +15240,7 @@ function describeError(error61) {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.1.84";
+var AGENT_VERSION = "0.1.86";
 
 // src/daemon-worktree.ts
 var import_node_child_process3 = require("child_process");
@@ -35303,6 +35303,8 @@ var activeRunSlotSchema = external_exports.object({
   providerPid: external_exports.number().int().positive().nullable().optional(),
   acceptedAtMs: external_exports.number().int().nonnegative().optional(),
   lastActivityAtMs: external_exports.number().int().nonnegative().optional(),
+  /** A live interactive prompt still owns capacity even without stream activity. */
+  awaitingUser: external_exports.boolean().optional(),
   stale: external_exports.boolean().optional()
 });
 var RUNNER_CAPACITY_SOURCES = ["default", "config", "provider_limit"];
@@ -35409,7 +35411,7 @@ function countNonStaleActiveRuns(activeRuns, nowMs = Date.now(), graceMs = RUNNE
   let staleRunCount = 0;
   for (const run of activeRuns) {
     const lastActivity = run.lastActivityAtMs ?? run.acceptedAtMs ?? 0;
-    const stale = run.stale === true || lastActivity > 0 && nowMs - lastActivity >= graceMs;
+    const stale = run.stale === true || run.awaitingUser !== true && lastActivity > 0 && nowMs - lastActivity >= graceMs;
     if (stale)
       staleRunCount += 1;
     else
@@ -38898,7 +38900,9 @@ function mapProviderApiError(errorCode2, apiStatus) {
       return "model_mismatch";
     }
     if (code.includes("authentication") || code.includes("permission_error")) return "auth_invalid";
-    if (code.includes("rate_limit")) return "rate_limited";
+    if (code.includes("rate_limit") || code.includes("resource_exhausted")) {
+      return "rate_limited";
+    }
     if (code.includes("overloaded")) return "overloaded";
     if (code.includes("insufficient_quota") || code.includes("billing")) return "quota_exceeded";
   }
@@ -38955,7 +38959,7 @@ function classifyCliErrorDetailed(stderr, _exitCode, opts) {
   if (has("datapolicyerror", "requires explicit opt in")) return specForErrorKind("model_mismatch");
   if (has("no chat found", "chat not found", "session not found", "could not resume"))
     return specForErrorKind("resume_failed");
-  if (has("rate_limit", "rate limit") || /\b429\b/.test(haystack))
+  if (has("rate_limit", "rate limit", "resource_exhausted", "resource exhausted") || /\b429\b/.test(haystack))
     return specForErrorKind("rate_limited");
   if (has("authentication_failed", "authentication error", "authentication failed") || isLikelyProviderAuthError(haystack))
     return specForErrorKind("auth_invalid");
@@ -39027,7 +39031,7 @@ function classifyCliErrorDetailed(stderr, _exitCode, opts) {
 }
 function isTransientError(errorMessage) {
   const lower = errorMessage.toLowerCase();
-  return lower.includes("rate limit") || lower.includes("overloaded") || /(?:http|status)\s*500\b|\[500\]|\b500 internal server error\b/.test(lower) || lower.includes("502") || lower.includes("503") || lower.includes("504") || lower.includes("524") || lower.includes("429") || lower.includes("service unavailable") || // Node's generic fetch() network-layer failure (opencode_serve's SSE/HTTP calls).
+  return lower.includes("rate limit") || lower.includes("resource_exhausted") || lower.includes("resource exhausted") || lower.includes("overloaded") || /(?:http|status)\s*500\b|\[500\]|\b500 internal server error\b/.test(lower) || lower.includes("502") || lower.includes("503") || lower.includes("504") || lower.includes("524") || lower.includes("429") || lower.includes("service unavailable") || // Node's generic fetch() network-layer failure (opencode_serve's SSE/HTTP calls).
   lower.includes("fetch failed") || lower.includes("etimedout") || lower.includes("econnreset") || lower.includes("econnrefused") || // DNS resolution blips (e.g. "getaddrinfo ENOTFOUND api2.cursor.sh") are
   // transient connectivity failures — the machine briefly can't resolve the
   // provider host and recovers seconds later. Retry with backoff instead of
@@ -39891,8 +39895,10 @@ function createGenericCliBackend(options) {
       }
       const stderrText = (stderrLines.join("\n") || stderrChunks.join("")).trim();
       const hasStructuredError = exitCode === 0 && !!state.error?.trim();
+      const cursorRetrievalResourceExhaustedBeforeTurn = options.kind === "cursor_agent_cli" && state.iterations === 0 && !state.resultReceived && !state.summary.trim() && stderrText.toLowerCase().includes("cursor-retrieval") && /resource[_ ]exhausted/i.test(stderrText);
+      const exitedWithoutResponse = options.kind === "codex_app_server" && exitCode === 0 && exitSignal === null && !state.resultReceived && !hasRenderableTurn && !midSubagentParentExit;
       const expectedExitGraceKill = state.exitGraceKillTriggered === true && !state.error?.trim() && !midSubagentParentExit && (state.summary.trim().length > 0 || state.iterations > 0 || Boolean(state.resultReceived));
-      const failed = !expectedExitGraceKill && (exitCode !== 0 || exitSignal !== null) || hasStructuredError || midSubagentParentExit;
+      const failed = !expectedExitGraceKill && (exitCode !== 0 || exitSignal !== null) || hasStructuredError || midSubagentParentExit || exitedWithoutResponse;
       if (cursorResumeSilentlyFailed && !failed) {
         const problem = createCliProblem(
           {
@@ -39945,6 +39951,10 @@ function createGenericCliBackend(options) {
           classifiedError = midExit.message;
           classifiedErrorKind = midExit.errorKind;
           classifiedRecoveryClass = midExit.recoveryClass;
+        } else if (exitedWithoutResponse) {
+          classifiedError = "The agent exited without producing a response. Send your message again to retry.";
+          classifiedErrorKind = "provider_error";
+          classifiedRecoveryClass = "retry";
         } else {
           const detailed = classifyCliErrorDetailed(
             state.error?.trim() || stderrText || "",
@@ -39967,7 +39977,7 @@ function createGenericCliBackend(options) {
           harness: options.kind,
           phase: classifiedErrorKind === "resume_failed" ? "resume" : "shutdown",
           finality: "terminal",
-          outcomeCertainty: "effect_unknown",
+          outcomeCertainty: cursorRetrievalResourceExhaustedBeforeTurn ? "no_effect" : "effect_unknown",
           scope: {
             ...context.config.conversationId ? { conversationId: context.config.conversationId } : {}
           },
@@ -48847,16 +48857,40 @@ var DurablePendingRunStarts = class extends Map {
   }
   startedAtByRunId = /* @__PURE__ */ new Map();
   set(runId, conversationId) {
-    if (!this.startedAtByRunId.has(runId)) this.startedAtByRunId.set(runId, Date.now());
+    const previousConversationId = super.get(runId);
+    const previousStartedAt = this.startedAtByRunId.get(runId);
+    if (previousStartedAt === void 0) this.startedAtByRunId.set(runId, Date.now());
     super.set(runId, conversationId);
-    this.persist();
+    try {
+      this.persist();
+    } catch (error61) {
+      if (previousConversationId === void 0) {
+        super.delete(runId);
+      } else {
+        super.set(runId, previousConversationId);
+      }
+      if (previousStartedAt === void 0) {
+        this.startedAtByRunId.delete(runId);
+      } else {
+        this.startedAtByRunId.set(runId, previousStartedAt);
+      }
+      throw error61;
+    }
     return this;
   }
   delete(runId) {
+    const previousConversationId = super.get(runId);
+    const previousStartedAt = this.startedAtByRunId.get(runId);
     const deleted = super.delete(runId);
     if (deleted) {
       this.startedAtByRunId.delete(runId);
-      this.persist();
+      try {
+        this.persist();
+      } catch (error61) {
+        if (previousConversationId !== void 0) super.set(runId, previousConversationId);
+        if (previousStartedAt !== void 0) this.startedAtByRunId.set(runId, previousStartedAt);
+        throw error61;
+      }
     }
     return deleted;
   }
@@ -48917,10 +48951,10 @@ function buildAbortResult(reason) {
 }
 function abortActiveAgent(entry, options) {
   const awaitingAsk = (entry.presenter.pendingAskUserToolIds?.size ?? 0) > 0;
-  if (awaitingAsk && !options?.userInitiated) {
+  const reason = options?.reason ?? (options?.userInitiated ? "user" : "runner_stalled");
+  if (awaitingAsk && !options?.userInitiated && reason !== "runtime_shutdown") {
     return;
   }
-  const reason = options?.reason ?? (options?.userInitiated ? "user" : "runner_stalled");
   entry.presenter.onComplete(buildAbortResult(reason));
   entry.agent.kill();
 }
@@ -48937,7 +48971,8 @@ function buildActiveRunSlots(activeAgents, nowMs = Date.now()) {
   return [...activeAgents.entries()].map(([runId, entry]) => {
     const staleByGrace = nowMs - entry.lastActivityAtMs >= RUNNER_RECOVERY_GRACE_MS_LOCAL;
     const staleByDeadPid = entry.providerPid !== null && !isProviderProcessAlive(entry.providerPid);
-    const stale = staleByGrace || staleByDeadPid;
+    const awaitingAsk = (entry.presenter.pendingAskUserToolIds?.size ?? 0) > 0;
+    const stale = staleByDeadPid || staleByGrace && !awaitingAsk;
     return {
       runId,
       conversationId: entry.conversationId,
@@ -48945,6 +48980,7 @@ function buildActiveRunSlots(activeAgents, nowMs = Date.now()) {
       providerPid: entry.providerPid,
       acceptedAtMs: entry.acceptedAtMs,
       lastActivityAtMs: entry.lastActivityAtMs,
+      awaitingUser: awaitingAsk,
       stale
     };
   });
@@ -48980,7 +49016,8 @@ function buildRunnerStatusPayload(input2) {
     providerAvailable: input2.providerAvailable,
     protocolCompatible: true
   });
-  const computerReady = isComputerReady(computerReadiness, { allowWarn: true });
+  const admissionReadiness = computerReadiness.filter((check3) => check3.key !== "workspace_ready");
+  const computerReady = isComputerReady(admissionReadiness, { allowWarn: true });
   const pastDisconnectGrace = input2.disconnectedSinceMs !== null && nowMs - input2.disconnectedSinceMs >= RUNNER_RECOVERY_GRACE_MS_LOCAL;
   const restartRecommended = !input2.connected && activeRunCount === 0 && staleRunCount === 0 && pastDisconnectGrace;
   const recovering = !input2.connected && !restartRecommended;
@@ -49139,6 +49176,9 @@ async function collectRuntimeMetadataWithProviderLimits() {
 }
 
 // src/daemon-local-control.ts
+function isNativeTaskLinkingEnabled(config2) {
+  return config2.nativeTaskLinkingEnabled === true;
+}
 var LOCAL_SERVICE_OWNER_VERSION = 1;
 var LOCAL_SERVICE_CHALLENGE_TTL_MS = 5e3;
 function localServiceOwnerPayload(owner) {
@@ -55539,13 +55579,13 @@ function ensureProviderCliInstalled(backendKind, options) {
 }
 
 // src/core-agent.ts
-var import_node_os10 = require("os");
+var import_node_os11 = require("os");
 
 // src/mcp-registration.ts
 var import_node_crypto8 = require("crypto");
-var import_node_fs16 = require("fs");
-var import_node_os9 = require("os");
-var import_node_path14 = require("path");
+var import_node_fs17 = require("fs");
+var import_node_os10 = require("os");
+var import_node_path15 = require("path");
 
 // ../../node_modules/smol-toml/dist/error.js
 function getLineColFromPtr(string4, ptr) {
@@ -56378,6 +56418,72 @@ function stringify(obj, { maxDepth = 1e3, numbersAsFloat = false } = {}) {
   return str;
 }
 
+// src/provider-startup-isolation.ts
+var import_node_fs16 = require("fs");
+var import_node_os9 = require("os");
+var import_node_path14 = require("path");
+function resolveProviderStartupIsolation(backendKind, _runtimePlatform) {
+  switch (backendKind) {
+    case "claude_cli":
+      return { mode: "shared_config", lockKey: "claude_cli" };
+    case "supatest_cli":
+      return { mode: "shared_config", lockKey: "supatest_cli" };
+    case "codex_app_server":
+      return {
+        mode: "run_scoped_home",
+        envForRunRoot: (runRoot) => ({
+          CODEX_HOME: (0, import_node_path14.join)(runRoot, ".codex")
+        }),
+        // Keep host authentication and session history visible inside the
+        // per-run CODEX_HOME while leaving Alan's MCP config run-scoped.
+        hostStateLinks: [".codex/auth.json", ".codex/.credentials.json", ".codex/sessions"]
+      };
+    case "opencode_cli":
+    case "opencode_serve":
+      return { mode: "shared_config", lockKey: backendKind };
+    default: {
+      const key = backendKind?.trim() || "unknown";
+      return { mode: "shared_config", lockKey: key };
+    }
+  }
+}
+function runScopedHomePath(runId, baseDir = (0, import_node_os9.tmpdir)()) {
+  return (0, import_node_path14.join)(baseDir, "alan-runs", runId);
+}
+function prepareRunScopedProviderHome(input2) {
+  const hostHome = input2.hostHome ?? (0, import_node_os9.homedir)();
+  const runRoot = runScopedHomePath(input2.runId, input2.baseDir);
+  (0, import_node_fs16.mkdirSync)(runRoot, { recursive: true, mode: 448 });
+  for (const relative6 of input2.isolation.hostStateLinks) {
+    const hostPath = (0, import_node_path14.join)(hostHome, relative6);
+    const linkPath = (0, import_node_path14.join)(runRoot, relative6);
+    if (!(0, import_node_fs16.existsSync)(hostPath)) {
+      if (relative6 !== ".codex/sessions") continue;
+      try {
+        (0, import_node_fs16.mkdirSync)(hostPath, { recursive: true, mode: 448 });
+      } catch {
+        continue;
+      }
+    }
+    (0, import_node_fs16.mkdirSync)((0, import_node_path14.dirname)(linkPath), { recursive: true, mode: 448 });
+    if ((0, import_node_fs16.existsSync)(linkPath)) continue;
+    try {
+      const hostStat = (0, import_node_fs16.lstatSync)(hostPath);
+      (0, import_node_fs16.symlinkSync)(hostPath, linkPath, hostStat.isDirectory() ? "dir" : "file");
+    } catch {
+    }
+  }
+  const mcpHome = runRoot;
+  return {
+    runRoot,
+    mcpHome,
+    env: input2.isolation.envForRunRoot(mcpHome),
+    cleanup: () => {
+      (0, import_node_fs16.rmSync)(runRoot, { recursive: true, force: true });
+    }
+  };
+}
+
 // src/mcp-registration.ts
 var CONFIG_LOCK_STALE_MS = 3e4;
 var CONFIG_LOCK_WAIT_MS = 2e3;
@@ -56402,10 +56508,10 @@ var inspectAlanMcpThroughProviderCli = async (backendKind, expectedUrl, home) =>
   if (cached2 && cached2.expiresAt > Date.now()) {
     return cached2.result;
   }
+  const startupIsolation = resolveProviderStartupIsolation(backendKind);
   const env = {
     ...getDaemonCliEnvironment(),
-    HOME: home,
-    USERPROFILE: home
+    ...startupIsolation.mode === "run_scoped_home" ? startupIsolation.envForRunRoot(home) : { HOME: home, USERPROFILE: home }
   };
   const executable = resolveBackendRuntimeCommand(backendKind, env);
   const command = [plan.command, ...plan.args].join(" ");
@@ -56486,18 +56592,18 @@ var inspectAlanMcpThroughProviderCli = async (backendKind, expectedUrl, home) =>
   return result;
 };
 async function waitForConfigLock(lockPath) {
-  (0, import_node_fs16.mkdirSync)((0, import_node_path14.dirname)(lockPath), { recursive: true });
+  (0, import_node_fs17.mkdirSync)((0, import_node_path15.dirname)(lockPath), { recursive: true });
   const startedAt = Date.now();
   while (true) {
     try {
-      (0, import_node_fs16.mkdirSync)(lockPath);
-      return () => (0, import_node_fs16.rmSync)(lockPath, { recursive: true, force: true });
+      (0, import_node_fs17.mkdirSync)(lockPath);
+      return () => (0, import_node_fs17.rmSync)(lockPath, { recursive: true, force: true });
     } catch (error61) {
       const code = error61 && typeof error61 === "object" && "code" in error61 ? error61.code : void 0;
       if (code !== "EEXIST") throw error61;
       try {
-        if (Date.now() - (0, import_node_fs16.statSync)(lockPath).mtimeMs > CONFIG_LOCK_STALE_MS) {
-          (0, import_node_fs16.rmSync)(lockPath, { recursive: true, force: true });
+        if (Date.now() - (0, import_node_fs17.statSync)(lockPath).mtimeMs > CONFIG_LOCK_STALE_MS) {
+          (0, import_node_fs17.rmSync)(lockPath, { recursive: true, force: true });
           continue;
         }
       } catch {
@@ -56513,7 +56619,7 @@ async function waitForConfigLock(lockPath) {
 function saveMalformedBackup(path2, content) {
   const hash2 = (0, import_node_crypto8.createHash)("sha256").update(content).digest("hex").slice(0, 12);
   const backupPath = `${path2}.alan-backup-${hash2}`;
-  if (!(0, import_node_fs16.existsSync)(backupPath)) (0, import_node_fs16.copyFileSync)(path2, backupPath);
+  if (!(0, import_node_fs17.existsSync)(backupPath)) (0, import_node_fs17.copyFileSync)(path2, backupPath);
   return backupPath;
 }
 function parseJsonObject2(path2, content) {
@@ -56561,17 +56667,17 @@ function mergeCodexAlanSection(path2, existingContent, desiredContent) {
 function atomicWriteManagedConfig(path2, content) {
   const pendingPath = `${path2}.alan-pending-${process.pid}-${(0, import_node_crypto8.randomBytes)(6).toString("hex")}`;
   try {
-    (0, import_node_fs16.writeFileSync)(pendingPath, content, { encoding: "utf8", mode: 384, flag: "wx" });
-    (0, import_node_fs16.renameSync)(pendingPath, path2);
+    (0, import_node_fs17.writeFileSync)(pendingPath, content, { encoding: "utf8", mode: 384, flag: "wx" });
+    (0, import_node_fs17.renameSync)(pendingPath, path2);
   } finally {
-    (0, import_node_fs16.rmSync)(pendingPath, { force: true });
+    (0, import_node_fs17.rmSync)(pendingPath, { force: true });
   }
 }
-async function configureAntigravityApiKeyMode(home = (0, import_node_os9.homedir)()) {
-  const path2 = (0, import_node_path14.join)(home, ".gemini", "antigravity-cli", "settings.json");
+async function configureAntigravityApiKeyMode(home = (0, import_node_os10.homedir)()) {
+  const path2 = (0, import_node_path15.join)(home, ".gemini", "antigravity-cli", "settings.json");
   const releaseLock = await waitForConfigLock(`${path2}.alan-lock`);
   try {
-    const existingContent = (0, import_node_fs16.existsSync)(path2) ? (0, import_node_fs16.readFileSync)(path2, "utf8") : "";
+    const existingContent = (0, import_node_fs17.existsSync)(path2) ? (0, import_node_fs17.readFileSync)(path2, "utf8") : "";
     const settings = existingContent.trim() ? parseJsonObject2(path2, existingContent) : {};
     if (settings.modelProvider === "gemini") return false;
     settings.modelProvider = "gemini";
@@ -56581,16 +56687,16 @@ async function configureAntigravityApiKeyMode(home = (0, import_node_os9.homedir
     releaseLock();
   }
 }
-async function ensureAlanMcpRegistered(backendKind, registration, home = (0, import_node_os9.homedir)(), inspectCli = inspectAlanMcpThroughProviderCli) {
+async function ensureAlanMcpRegistered(backendKind, registration, home = (0, import_node_os10.homedir)(), inspectCli = inspectAlanMcpThroughProviderCli) {
   try {
     const mcpServers = buildAlanMcpServers(registration);
     const files = alanMcpConfigFilesForBackend(backendKind, mcpServers, home);
     const paths = [];
     for (const file2 of files) {
-      (0, import_node_fs16.mkdirSync)((0, import_node_path14.dirname)(file2.path), { recursive: true });
+      (0, import_node_fs17.mkdirSync)((0, import_node_path15.dirname)(file2.path), { recursive: true });
       const releaseLock = await waitForConfigLock(`${file2.path}.alan-lock`);
       try {
-        const current = (0, import_node_fs16.existsSync)(file2.path) ? (0, import_node_fs16.readFileSync)(file2.path, "utf8") : null;
+        const current = (0, import_node_fs17.existsSync)(file2.path) ? (0, import_node_fs17.readFileSync)(file2.path, "utf8") : null;
         const content = file2.path.endsWith(".toml") ? mergeCodexAlanSection(file2.path, current, file2.content) : mergeJsonConfig(file2.path, current, file2.content);
         if (current !== content) atomicWriteManagedConfig(file2.path, content);
         paths.push(file2.path);
@@ -56652,7 +56758,7 @@ async function ensureAlanMcpRegistered(backendKind, registration, home = (0, imp
     return { ok: false, paths: [], error: err instanceof Error ? err.message : String(err) };
   }
 }
-async function restoreStaticAlanMcp(backendKind, apiUrl, home = (0, import_node_os9.homedir)()) {
+async function restoreStaticAlanMcp(backendKind, apiUrl, home = (0, import_node_os10.homedir)()) {
   let url3;
   try {
     url3 = new URL("/mcp", apiUrl).toString();
@@ -56668,13 +56774,13 @@ async function restoreStaticAlanMcp(backendKind, apiUrl, home = (0, import_node_
     verification: { method: "file" }
   }));
 }
-async function verifyAlanMcpRegistered(backendKind, home = (0, import_node_os9.homedir)(), inspectCli = inspectAlanMcpThroughProviderCli) {
+async function verifyAlanMcpRegistered(backendKind, home = (0, import_node_os10.homedir)(), inspectCli = inspectAlanMcpThroughProviderCli) {
   const files = alanMcpConfigFilesForBackend(backendKind, {}, home);
-  const missing = files.map((f) => f.path).filter((p) => !(0, import_node_fs16.existsSync)(p));
+  const missing = files.map((f) => f.path).filter((p) => !(0, import_node_fs17.existsSync)(p));
   const presentEntries = files.map((file2) => ({
     path: file2.path,
-    registration: (0, import_node_fs16.existsSync)(file2.path) ? readAlanMcpRegistration(file2.path) : null
-  })).filter((entry) => (0, import_node_fs16.existsSync)(entry.path));
+    registration: (0, import_node_fs17.existsSync)(file2.path) ? readAlanMcpRegistration(file2.path) : null
+  })).filter((entry) => (0, import_node_fs17.existsSync)(entry.path));
   let invalid = presentEntries.filter(
     (entry) => !entry.registration || !hasUsableRegistrationCredential(entry.registration.headers)
   ).map((entry) => entry.path);
@@ -56775,7 +56881,7 @@ function hasUsableRegistrationCredential(headers) {
   return Boolean(normalized.get("x-alan-run-reference") || normalized.get("authorization"));
 }
 function readAlanMcpRegistration(path2) {
-  return parseAlanMcpRegistration(path2, (0, import_node_fs16.readFileSync)(path2, "utf8"));
+  return parseAlanMcpRegistration(path2, (0, import_node_fs17.readFileSync)(path2, "utf8"));
 }
 function parseAlanMcpRegistration(path2, content) {
   if (path2.endsWith(".toml")) {
@@ -56985,7 +57091,7 @@ var CoreAgent = class _CoreAgent extends BaseMachineAgent {
     if (backendKind === "antigravity_cli" && augmented.GEMINI_API_KEY?.trim()) {
       await configureAntigravityApiKeyMode(augmented.HOME ?? augmented.USERPROFILE);
     }
-    if ((0, import_node_os10.platform)() !== "win32") {
+    if ((0, import_node_os11.platform)() !== "win32") {
       const home = augmented.HOME ?? "/home/user";
       const extraPaths = [`${home}/.local/node/bin`, `${home}/.local/bin`];
       const separator = ":";
@@ -73874,90 +73980,6 @@ async function prepareAlanMcpForRun(backendKind, registration, options = {}) {
   return { ...probed, providerLoadStatus: registered.providerLoadStatus };
 }
 
-// src/provider-startup-isolation.ts
-var import_node_fs17 = require("fs");
-var import_node_os11 = require("os");
-var import_node_path15 = require("path");
-function resolveProviderStartupIsolation(backendKind, runtimePlatform = (0, import_node_os11.platform)()) {
-  switch (backendKind) {
-    case "claude_cli":
-      if (runtimePlatform === "darwin") {
-        return { mode: "shared_config", lockKey: "claude_cli" };
-      }
-      return {
-        mode: "run_scoped_home",
-        envForRunRoot: (runRoot) => ({
-          HOME: runRoot,
-          USERPROFILE: runRoot
-        }),
-        // Auth + session state live under ~/.claude; MCP is ~/.claude.json in the run root.
-        hostStateLinks: [".claude"]
-      };
-    case "supatest_cli":
-      return {
-        mode: "run_scoped_home",
-        envForRunRoot: (runRoot) => ({
-          HOME: runRoot,
-          USERPROFILE: runRoot
-        }),
-        // Auth + session state live under ~/.claude; MCP is ~/.claude.json in the run root.
-        hostStateLinks: [".claude"]
-      };
-    case "codex_app_server":
-      return {
-        mode: "run_scoped_home",
-        envForRunRoot: (runRoot) => ({
-          CODEX_HOME: (0, import_node_path15.join)(runRoot, ".codex")
-        }),
-        // Auth tokens stay in the host Codex home; only config.toml is run-scoped.
-        hostStateLinks: [".codex/auth.json", ".codex/.credentials.json"]
-      };
-    case "opencode_cli":
-    case "opencode_serve":
-      return {
-        mode: "run_scoped_home",
-        envForRunRoot: (runRoot) => ({
-          HOME: runRoot,
-          USERPROFILE: runRoot,
-          XDG_CONFIG_HOME: (0, import_node_path15.join)(runRoot, ".config")
-        }),
-        hostStateLinks: []
-      };
-    default: {
-      const key = backendKind?.trim() || "unknown";
-      return { mode: "shared_config", lockKey: key };
-    }
-  }
-}
-function runScopedHomePath(runId, baseDir = (0, import_node_os11.tmpdir)()) {
-  return (0, import_node_path15.join)(baseDir, "alan-runs", runId);
-}
-function prepareRunScopedProviderHome(input2) {
-  const hostHome = input2.hostHome ?? (0, import_node_os11.homedir)();
-  const runRoot = runScopedHomePath(input2.runId, input2.baseDir);
-  (0, import_node_fs17.mkdirSync)(runRoot, { recursive: true, mode: 448 });
-  for (const relative6 of input2.isolation.hostStateLinks) {
-    const hostPath = (0, import_node_path15.join)(hostHome, relative6);
-    const linkPath = (0, import_node_path15.join)(runRoot, relative6);
-    if (!(0, import_node_fs17.existsSync)(hostPath)) continue;
-    (0, import_node_fs17.mkdirSync)((0, import_node_path15.dirname)(linkPath), { recursive: true, mode: 448 });
-    if ((0, import_node_fs17.existsSync)(linkPath)) continue;
-    try {
-      const hostStat = (0, import_node_fs17.lstatSync)(hostPath);
-      (0, import_node_fs17.symlinkSync)(hostPath, linkPath, hostStat.isDirectory() ? "dir" : "file");
-    } catch {
-    }
-  }
-  return {
-    runRoot,
-    mcpHome: runRoot,
-    env: input2.isolation.envForRunRoot(runRoot),
-    cleanup: () => {
-      (0, import_node_fs17.rmSync)(runRoot, { recursive: true, force: true });
-    }
-  };
-}
-
 // src/run-start-gate.ts
 var DEFAULT_STARTUP_CONFIG_LOCK_TIMEOUT_MS = 5e3;
 function startupConfigLockTimeoutMs() {
@@ -74636,7 +74658,16 @@ async function handleAgentExecute(ctx, payload) {
     runtimeCommand = revalidateBackendRuntimeCommand(backendKind);
   }
   if (!runtimeCommand && backendKind && canInstallProviderCli(backendKind)) {
-    pendingRunStarts.set(payload.runId, payload.conversationId);
+    try {
+      pendingRunStarts.set(payload.runId, payload.conversationId);
+    } catch (error61) {
+      socket.emit("agent.rejected", {
+        runId: payload.runId,
+        message: `Unable to reserve local runtime capacity: ${error61 instanceof Error ? error61.message : String(error61)}`,
+        code: "runner_reservation_failed"
+      });
+      return;
+    }
     try {
       const installed = await ensureProviderCliInstalled(backendKind, {
         notify: (message) => {
@@ -74777,7 +74808,16 @@ async function handleAgentExecute(ctx, payload) {
     });
     return;
   }
-  pendingRunStarts.set(payload.runId, payload.conversationId);
+  try {
+    pendingRunStarts.set(payload.runId, payload.conversationId);
+  } catch (error61) {
+    socket.emit("agent.rejected", {
+      runId: payload.runId,
+      message: `Unable to reserve local runtime capacity: ${error61 instanceof Error ? error61.message : String(error61)}`,
+      code: "runner_reservation_failed"
+    });
+    return;
+  }
   publishCapacityChange();
   const releaseCapacity = () => {
     if (!pendingRunStarts.delete(payload.runId)) return;
@@ -76969,7 +77009,7 @@ var LocalSkillSource = class {
     try {
       entries = await (0, import_promises2.readdir)(resolvedRoot.directory, { withFileTypes: true });
     } catch (error61) {
-      if (isMissingPath(error61)) return { candidates: [], diagnostics: [], incomplete: false };
+      if (isAbsentDirectory(error61)) return { candidates: [], diagnostics: [], incomplete: false };
       return {
         candidates: [],
         diagnostics: [
@@ -77305,8 +77345,8 @@ async function isDirectory(path2) {
     return false;
   }
 }
-function isMissingPath(error61) {
-  return typeof error61 === "object" && error61 !== null && "code" in error61 && error61.code === "ENOENT";
+function isAbsentDirectory(error61) {
+  return typeof error61 === "object" && error61 !== null && "code" in error61 && ["ENOENT", "ENOTDIR"].includes(String(error61.code));
 }
 function isAlreadyPresent(error61) {
   return typeof error61 === "object" && error61 !== null && "code" in error61 && error61.code === "EEXIST";
@@ -77499,7 +77539,7 @@ var ManagedSkillStore = class _ManagedSkillStore {
       const parsed = JSON.parse(await (0, import_promises3.readFile)((0, import_node_path22.join)(baseDirectory, "state.json"), "utf8"));
       return new _ManagedSkillStore(baseDirectory, parseState(parsed), "verified");
     } catch (error61) {
-      if (isMissingPath2(error61)) {
+      if (isMissingPath(error61)) {
         return new _ManagedSkillStore(baseDirectory, EMPTY_STATE, "verified");
       }
       return new _ManagedSkillStore(baseDirectory, EMPTY_STATE, "rebuilt");
@@ -77621,7 +77661,7 @@ function isSha256(value2) {
 function isRecord5(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
-function isMissingPath2(error61) {
+function isMissingPath(error61) {
   return typeof error61 === "object" && error61 !== null && "code" in error61 && error61.code === "ENOENT";
 }
 
@@ -78688,7 +78728,7 @@ async function pathExists2(path2) {
     await (0, import_promises5.lstat)(path2);
     return true;
   } catch (error61) {
-    if (isMissingPath3(error61)) return false;
+    if (isMissingPath2(error61)) return false;
     throw error61;
   }
 }
@@ -78714,7 +78754,7 @@ function errorCode(error61) {
   }
   return "SKILL_RECONCILE_FAILED";
 }
-function isMissingPath3(error61) {
+function isMissingPath2(error61) {
   return typeof error61 === "object" && error61 !== null && "code" in error61 && error61.code === "ENOENT";
 }
 function isAlreadyPresent2(error61) {
@@ -78786,7 +78826,7 @@ async function startDaemon(args) {
   const runtimeId = argValue(args, "--runtime-id") ?? process.env.ALAN_RUNTIME_ID ?? stored.runtimeId;
   const runtimeTokenOverride = argValue(args, "--token") ?? process.env.ALAN_RUNTIME_TOKEN;
   let runtimeToken = runtimeTokenOverride ?? stored.runtimeToken;
-  const runtimeRenewalToken = runtimeTokenOverride ? void 0 : stored.runtimeRenewalToken;
+  let runtimeRenewalToken = runtimeTokenOverride ? void 0 : stored.runtimeRenewalToken;
   const wsUrlOverride = argValue(args, "--ws-url") ?? process.env.ALAN_WS_URL;
   const endpointMismatch = wsUrlOverride ? null : checkStoredEndpointConsistency(stored, readEndpointDefaults());
   let wsUrl = wsUrlOverride ?? stored.wsUrl;
@@ -78920,6 +78960,24 @@ async function startDaemon(args) {
   let disconnectedSinceMs = null;
   let lastConnectError = null;
   let lastConnectErrorCode = null;
+  const TERMINAL_RUNTIME_AUTH_CODES = /* @__PURE__ */ new Set([
+    "invalid_runtime_token",
+    "runtime_renewal_rejected",
+    "runtime_deleted",
+    "runtime_disabled"
+  ]);
+  let terminalAuthFailureCode = null;
+  const rememberConnectErrorCode = (code) => {
+    if (code && TERMINAL_RUNTIME_AUTH_CODES.has(code)) {
+      terminalAuthFailureCode = code;
+    }
+    lastConnectErrorCode = terminalAuthFailureCode ?? code;
+  };
+  const clearConnectErrors = () => {
+    lastConnectError = null;
+    lastConnectErrorCode = null;
+    terminalAuthFailureCode = null;
+  };
   const pendingDeliveryLost = [];
   const currentCapabilities = () => discoverCapabilities();
   const currentMetadata = async () => ({
@@ -79135,7 +79193,29 @@ async function startDaemon(args) {
   const renewRuntimeLease = () => {
     if (runtimeRenewalInFlight) return runtimeRenewalInFlight;
     const attempt = (async () => {
-      if (!stored.apiUrl || !runtimeRenewalToken) return false;
+      const adoptRewrittenCredentials = () => {
+        const current2 = readConfig();
+        if (current2.runtimeId !== runtimeId) return false;
+        const nextToken = current2.runtimeToken;
+        const nextRenewal = current2.runtimeRenewalToken;
+        if (typeof nextToken !== "string" || !nextToken.startsWith("alan_runtime_") || typeof nextRenewal !== "string" || !nextRenewal.startsWith("alan_runtime_renew_")) {
+          return false;
+        }
+        if (nextToken === runtimeToken && nextRenewal === runtimeRenewalToken) {
+          return false;
+        }
+        runtimeToken = nextToken;
+        runtimeRenewalToken = nextRenewal;
+        socket.auth = { token: nextToken };
+        clearConnectErrors();
+        pushLog("runtime-credentials-reloaded-from-config");
+        socket.connect();
+        return true;
+      };
+      if (!stored.apiUrl || !runtimeRenewalToken) {
+        if (adoptRewrittenCredentials()) return true;
+        return false;
+      }
       let response = null;
       let transportError = null;
       for (let retry = 1; retry <= 3; retry += 1) {
@@ -79159,27 +79239,32 @@ async function startDaemon(args) {
         await sleep(retry * 250);
       }
       if (!response) {
-        lastConnectErrorCode = "backend_unreachable";
+        rememberConnectErrorCode("backend_unreachable");
         lastConnectError = `Runtime renewal could not reach Alan: ${transportError instanceof Error ? transportError.message : String(transportError)}`;
         pushLog(`runtime-renewal-transport-failed ${lastConnectError}`);
         return false;
       }
       if (!response.ok) {
-        lastConnectErrorCode = response.status === 401 ? "runtime_renewal_rejected" : response.status === 403 ? "runtime_disabled" : response.status === 410 ? "runtime_deleted" : response.status >= 500 ? "backend_unreachable" : "runtime_renewal_failed";
+        if (response.status === 401 && adoptRewrittenCredentials()) {
+          return true;
+        }
+        const code = response.status === 401 ? "runtime_renewal_rejected" : response.status === 403 ? "runtime_disabled" : response.status === 410 ? "runtime_deleted" : response.status >= 500 ? "backend_unreachable" : "runtime_renewal_failed";
+        rememberConnectErrorCode(code);
         lastConnectError = `Runtime renewal failed: ${response.status} ${await response.text()}`;
         pushLog(`runtime-renewal-rejected ${lastConnectError}`);
         return false;
       }
       const body = await response.json();
       if (typeof body.runtimeToken !== "string" || !body.runtimeToken.startsWith("alan_runtime_")) {
-        lastConnectErrorCode = "runtime_renewal_failed";
+        rememberConnectErrorCode("runtime_renewal_failed");
         lastConnectError = "Runtime renewal returned an invalid access token";
         pushLog("runtime-renewal-invalid-response");
         return false;
       }
       const current = readConfig();
       if (current.runtimeId !== runtimeId || current.runtimeRenewalToken !== runtimeRenewalToken) {
-        lastConnectErrorCode = "runtime_renewal_superseded";
+        if (adoptRewrittenCredentials()) return true;
+        rememberConnectErrorCode("runtime_renewal_superseded");
         lastConnectError = "Runtime credentials changed while renewal was in progress";
         pushLog("runtime-renewal-superseded");
         return false;
@@ -79187,15 +79272,14 @@ async function startDaemon(args) {
       try {
         writeConfig({ ...current, runtimeToken: body.runtimeToken });
       } catch (error61) {
-        lastConnectErrorCode = "config_write_failed";
+        rememberConnectErrorCode("config_write_failed");
         lastConnectError = `Runtime renewal could not save its replacement: ${error61.message}`;
         pushLog(`runtime-renewal-config-write-failed ${error61.message}`);
         return false;
       }
       runtimeToken = body.runtimeToken;
       socket.auth = { token: body.runtimeToken };
-      lastConnectError = null;
-      lastConnectErrorCode = null;
+      clearConnectErrors();
       pushLog("runtime-renewal-succeeded");
       socket.connect();
       return true;
@@ -79346,8 +79430,7 @@ async function startDaemon(args) {
   workspaceLeaseMonitor.unref?.();
   socket.on("connect", () => {
     disconnectedSinceMs = null;
-    lastConnectError = null;
-    lastConnectErrorCode = null;
+    clearConnectErrors();
     setConnectedRuntimeSocket(socket);
     pushLog(`connected runtime=${runtimeId}`);
     console.info("[alan-agent] Daemon connected", { runtimeId, wsUrl, version: AGENT_VERSION });
@@ -79395,13 +79478,15 @@ async function startDaemon(args) {
     if (!socket.connected && disconnectedSinceMs === null) disconnectedSinceMs = Date.now();
     lastConnectError = error61.message;
     const errorCode2 = error61?.data?.code;
-    lastConnectErrorCode = typeof errorCode2 === "string" ? errorCode2 : classifyTransportFailure(error61);
+    rememberConnectErrorCode(
+      typeof errorCode2 === "string" ? errorCode2 : classifyTransportFailure(error61)
+    );
     pushLog(
       `connect_error ${error61.message}${lastConnectErrorCode ? ` code=${lastConnectErrorCode}` : ""}`
     );
-    if (lastConnectErrorCode === "invalid_runtime_token" && runtimeRenewalToken) {
+    if ((lastConnectErrorCode === "invalid_runtime_token" || terminalAuthFailureCode === "invalid_runtime_token") && runtimeRenewalToken) {
       void renewRuntimeLease().catch((renewalError) => {
-        lastConnectErrorCode = "runtime_renewal_failed";
+        rememberConnectErrorCode("runtime_renewal_failed");
         lastConnectError = `Runtime renewal failed unexpectedly: ${renewalError.message}`;
         pushLog(`runtime-renewal-unexpected-failure ${renewalError.message}`);
       });
@@ -79620,7 +79705,11 @@ async function startDaemon(args) {
         lastConnectError = v;
       },
       setLastConnectErrorCode: (v) => {
-        lastConnectErrorCode = v;
+        if (v === null) {
+          lastConnectErrorCode = terminalAuthFailureCode;
+          return;
+        }
+        rememberConnectErrorCode(v);
       },
       workspaceAccessTracker,
       recentLogs,
@@ -79722,6 +79811,7 @@ async function startDaemon(args) {
   const stop = async () => {
     if (stopped) return;
     stopped = true;
+    let providersExited = true;
     try {
       clearInterval(heartbeat);
       clearInterval(versionRefresh);
@@ -79730,9 +79820,16 @@ async function startDaemon(args) {
       clearInterval(skillAuditInterval);
       clearInterval(nativeHookDrainInterval);
       suspensionDetector.stop();
-      for (const entry of activeAgents.values()) {
+      const stoppingEntries = [...activeAgents.values()];
+      for (const entry of stoppingEntries) {
         abortActiveAgent(entry, { reason: "runtime_shutdown" });
       }
+      const providerPids = stoppingEntries.map((entry) => entry.providerPid).filter((pid) => pid !== null && pid > 0 && pid !== process.pid);
+      const gracefulDeadline = Date.now() + 250;
+      while (providerPids.some((pid) => isProviderProcessAlive(pid)) && Date.now() < gracefulDeadline) {
+        await new Promise((resolve15) => setTimeout(resolve15, 25));
+      }
+      providersExited = providerPids.every((pid) => !isProviderProcessAlive(pid));
       activeAgents.clear();
       socket.disconnect();
       await new Promise((resolve15) => {
@@ -79740,7 +79837,7 @@ async function startDaemon(args) {
       });
     } finally {
       sleepInhibitor.dispose();
-      releaseOwnerLease();
+      if (providersExited) releaseOwnerLease();
     }
   };
   const controller = {
@@ -81231,7 +81328,7 @@ function nativeHookCommand(input2) {
     timeout: 5
   };
 }
-function nativeShellCommand(runtime, provider, event, platform7 = runtime.platform) {
+function nativeShellCommand(runtime, provider, event, platform6 = runtime.platform) {
   const args = hookArgs({
     configPath: runtime.configPath,
     cliEntry: runtime.cliEntry,
@@ -81239,7 +81336,7 @@ function nativeShellCommand(runtime, provider, event, platform7 = runtime.platfo
     event
   });
   const environment = checkedEnvironment(runtime.environment);
-  if (platform7 === "win32") {
+  if (platform6 === "win32") {
     const prefix2 = environment.map(([key, value2]) => `$env:${key}=${powershellQuote(value2)}`).join("; ");
     const command2 = `& ${[runtime.nodeExecutable, ...args].map(powershellQuote).join(" ")}`;
     return prefix2 ? `${prefix2}; ${command2}` : command2;
@@ -82273,10 +82370,12 @@ function enqueueNativeHookFromConfig(input2) {
 function runNativeHookCommand(args) {
   try {
     const payload = readBoundedHookPayload();
-    const enqueued = enqueueNativeHookFromConfig({ args, payload });
+    bindConfigPath(args);
+    const config2 = readConfig();
+    const enqueued = enqueueNativeHookFromConfig({ args, payload, config: config2 });
     const hookEvent = argumentValue(args, "--event");
     const normalizedEvent = normalizeHookEvent(hookEvent ?? "notification");
-    if (enqueued && (normalizedEvent === "user_prompt" || normalizedEvent === "session_start")) {
+    if (enqueued && isNativeTaskLinkingEnabled(config2) && (normalizedEvent === "user_prompt" || normalizedEvent === "session_start")) {
       const providerKind = argumentValue(args, "--provider");
       const externalSessionId = stringField4(
         payload,
@@ -84178,10 +84277,12 @@ WantedBy=default.target
     environmentPrefix ? `-NoProfile -NonInteractive -WindowStyle Hidden -Command "${environmentPrefix}; & ${powershellLiteral(input2.nodeExecutable)} ${powershellLiteral(input2.cliEntry)} daemon --profile ${input2.profile}"` : directArgument
   );
   const registerScript = [
+    "$currentUser = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name",
     `$action = New-ScheduledTaskAction -Execute ${executable} -Argument ${argument}`,
-    "$trigger = New-ScheduledTaskTrigger -AtLogOn",
+    "$trigger = New-ScheduledTaskTrigger -AtLogOn -User $currentUser",
+    "$principal = New-ScheduledTaskPrincipal -UserId $currentUser -LogonType Interactive -RunLevel Limited",
     "$settings = New-ScheduledTaskSettingsSet -RestartCount 3 -RestartInterval (New-TimeSpan -Minutes 1) -ExecutionTimeLimit ([TimeSpan]::Zero)",
-    `Register-ScheduledTask -TaskName ${powershellLiteral(WINDOWS_TASK)} -Action $action -Trigger $trigger -Settings $settings -Force | Out-Null`
+    `Register-ScheduledTask -TaskName ${powershellLiteral(WINDOWS_TASK)} -Action $action -Trigger $trigger -Principal $principal -Settings $settings -Force | Out-Null`
   ].join("; ");
   return {
     platform: "win32",
@@ -84319,8 +84420,14 @@ function defaultSleep(ms) {
   });
 }
 function parseServiceHostState(servicePlatform, result) {
-  if (result.status !== 0) return "unknown";
   const output2 = result.output;
+  if (servicePlatform === "linux") {
+    const trimmed = output2.trim().toLowerCase();
+    if (trimmed === "inactive" || trimmed === "failed" || trimmed === "dead" || /\binactive\b/i.test(output2) || /\bfailed\b/i.test(output2)) {
+      return "stopped";
+    }
+  }
+  if (result.status !== 0) return "unknown";
   if (servicePlatform === "darwin") {
     if (/\bstate\s*=\s*running\b/i.test(output2)) return "running";
     if (/\bstate\s*=\s*(not running|waiting|stopped)\b/i.test(output2)) return "stopped";
@@ -84332,9 +84439,6 @@ function parseServiceHostState(servicePlatform, result) {
     const trimmed = output2.trim().toLowerCase();
     if (trimmed === "active" || /\bactive\s*\(running\)/i.test(output2)) return "running";
     if (trimmed === "activating" || trimmed === "reloading") return "starting";
-    if (trimmed === "inactive" || trimmed === "failed" || trimmed === "dead" || /\binactive\b/i.test(output2) || /\bfailed\b/i.test(output2)) {
-      return "stopped";
-    }
     return "unknown";
   }
   const stateMatch = output2.match(/\b(?:State|state)\s*[:=]\s*(\w+)/);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiden-ade/sandbox-agent",
-  "version": "0.1.84",
+  "version": "0.1.86",
   "type": "module",
   "description": "Alan agent runtime — cloud sandbox and local daemon (alan-agent CLI)",
   "bin": {