@vtxmacro/cli 2026.8.20 → 2026.8.21

package/bin/vtx.js

@@ -38,7 +38,7 @@ var init_agent_cli_release = __esm({
   "agent-cli-release.json"() {
     agent_cli_release_default = {
       package_name: "@vtxmacro/cli",
-      package_version: "2026.8.20",
+      package_version: "2026.8.21",
       codex_package_name: "@openai/codex",
       codex_version: "0.147.0",
       platforms: {
@@ -19837,6 +19837,9 @@ child.once('close', async () => {
         this.fatalListeners.add(listener);
         return () => this.fatalListeners.delete(listener);
       }
+      isUsable() {
+        return !this.closed && this.fatalError === null && this.process.exitCode === null;
+      }
       async readAccountSnapshot(deadlineAtMs, signal, refreshToken = false) {
         const result2 = await this.request("account/read", { refreshToken }, {
           timeoutMs: Math.max(1, deadlineAtMs - Date.now()),
@@ -20196,6 +20199,30 @@ child.once('close', async () => {
         });
         const startedAt = Date.now();
         const unsubscribe = this.subscribe(({ method, params }) => {
+          const eventThreadId = String(params.threadId || "");
+          const scopedMethod = method.startsWith("thread/") || method.startsWith("turn/") || method.startsWith("item/") || method.startsWith("rawResponse") || method === "model/rerouted";
+          if (scopedMethod && !eventThreadId) {
+            terminalReject(new CodexAppServerError({
+              message: "Codex notification omitted its thread scope.",
+              category: "adapter",
+              code: "missing_thread_notification_scope",
+              retryable: false,
+              dispatchOutcome: requestWritten ? turnId ? "confirmed_dispatched" : "outcome_unknown" : "not_dispatched"
+            }));
+            return;
+          }
+          if (scopedMethod && eventThreadId !== request.thread.threadId) {
+            if (!this.threads.has(eventThreadId)) {
+              terminalReject(new CodexAppServerError({
+                message: "Codex notification crossed thread scope.",
+                category: "adapter",
+                code: "cross_thread_notification",
+                retryable: false,
+                dispatchOutcome: turnId ? "confirmed_dispatched" : "outcome_unknown"
+              }));
+            }
+            return;
+          }
           if (forbiddenMethod(method)) {
             terminalReject(new CodexAppServerError({
               message: "Codex attempted to use forbidden child authority.",
@@ -20231,18 +20258,6 @@ child.once('close', async () => {
               return;
             }
           }
-          const eventThreadId = String(params.threadId || "");
-          const scopedMethod = method.startsWith("thread/") || method.startsWith("turn/") || method.startsWith("item/") || method.startsWith("rawResponse") || method === "model/rerouted";
-          if (scopedMethod && eventThreadId !== request.thread.threadId) {
-            terminalReject(new CodexAppServerError({
-              message: "Codex notification crossed thread scope.",
-              category: "adapter",
-              code: "cross_thread_notification",
-              retryable: false,
-              dispatchOutcome: turnId ? "confirmed_dispatched" : "outcome_unknown"
-            }));
-            return;
-          }
           const eventTurn = objectOrNull(params.turn);
           const eventTurnId = String(params.turnId || eventTurn?.id || "");
           const turnScopedMethod = method.startsWith("turn/") || method.startsWith("item/") || method.startsWith("rawResponse") || method === "model/rerouted";
@@ -20884,7 +20899,7 @@ var init_codex_adapter = __esm({
         context.addIssue({ code: "custom", message: "Codex recovery thread identity is incomplete." });
       }
       const guardianManaged = value.processToken !== null || value.processReceiptPath !== null;
-      if (value.processToken === null !== (value.processReceiptPath === null) || value.processState === "unmanaged" === guardianManaged || value.cleanupConfirmed && !["unmanaged", "terminated"].includes(value.processState)) {
+      if (value.processToken === null !== (value.processReceiptPath === null) || value.processState === "unmanaged" === guardianManaged || value.cleanupConfirmed && value.processState === "spawn_intent") {
         context.addIssue({ code: "custom", message: "Codex recovery process identity is invalid." });
       }
     });
@@ -21293,8 +21308,114 @@ var init_codex_adapter = __esm({
     CodexSubscriptionAdapter = class {
       constructor(dependencies = {}) {
         this.inFlightAttempts = /* @__PURE__ */ new Map();
+        this.durableSession = null;
+        this.durableSessionStart = null;
+        this.closing = false;
+        this.adapterClosePromise = null;
         this.dependencies = dependencies;
       }
+      async startDurableSession(codexHome, deadlineAtMs) {
+        const binary = await (this.dependencies.resolveBinary ?? resolvePinnedCodexBinary)();
+        const guardianManaged = Boolean(
+          this.dependencies.recoveryHooks && !this.dependencies.spawnProcess
+        );
+        const bootIdentity = guardianManaged ? await (this.dependencies.readBootIdentity ?? readInferenceSystemBootIdentity)() : null;
+        const processToken = guardianManaged ? randomBytes3(32).toString("hex") : null;
+        const guardianReceiptRoot = guardianManaged ? this.dependencies.guardianReceiptRoot ?? join4(tmpdir2(), "vtx-codex-guardian-receipts") : null;
+        if (guardianReceiptRoot) await ensureInferencePrivateDirectory(guardianReceiptRoot);
+        const processReceiptPath = guardianReceiptRoot && processToken ? join4(guardianReceiptRoot, `${processToken}.json`) : null;
+        const session = await CodexAppServerSession.start({
+          binary,
+          codexHome,
+          deadlineAtMs,
+          spawnProcess: this.dependencies.spawnProcess,
+          guardian: processToken && processReceiptPath ? { processToken, receiptPath: processReceiptPath, bootIdentity: bootIdentity ?? void 0 } : void 0
+        });
+        return {
+          session,
+          codexHome,
+          processToken,
+          processReceiptPath,
+          bootIdentity,
+          terminated: false,
+          closePromise: null
+        };
+      }
+      async acquireDurableSession(codexHome, deadlineAtMs, signal) {
+        if (this.closing) {
+          throw new CodexAppServerError({
+            message: "Codex adapter is closing.",
+            category: "transport",
+            code: "transport_closed",
+            retryable: true
+          });
+        }
+        if (this.durableSession && this.durableSession.codexHome === codexHome && this.durableSession.session.isUsable()) return this.durableSession;
+        if (this.durableSession && this.durableSession.codexHome !== codexHome) {
+          await this.invalidateDurableSession(this.durableSession);
+        }
+        if (this.durableSession && !this.durableSession.session.isUsable()) {
+          await this.invalidateDurableSession(this.durableSession);
+        }
+        if (!this.durableSessionStart) {
+          const start2 = this.startDurableSession(codexHome, deadlineAtMs);
+          this.durableSessionStart = start2;
+          void start2.then((session) => {
+            if (this.durableSessionStart === start2) this.durableSession = session;
+          }).finally(() => {
+            if (this.durableSessionStart === start2) this.durableSessionStart = null;
+          }).catch(() => void 0);
+        }
+        const start = this.durableSessionStart;
+        return await new Promise((resolveSession, reject) => {
+          let settled = false;
+          const finish = (callback) => {
+            if (settled) return;
+            settled = true;
+            clearTimeout(timer);
+            signal?.removeEventListener("abort", onAbort);
+            callback();
+          };
+          const onAbort = () => finish(() => reject(new CodexAppServerError({
+            message: "Codex session acquisition was cancelled.",
+            category: "cancelled",
+            code: "cancelled",
+            retryable: false
+          })));
+          const timer = setTimeout(() => finish(() => reject(new CodexAppServerError({
+            message: "Codex session acquisition exceeded the immutable deadline.",
+            category: "timeout",
+            code: "deadline_exceeded",
+            retryable: false
+          }))), Math.max(1, deadlineAtMs - Date.now()));
+          signal?.addEventListener("abort", onAbort, { once: true });
+          if (signal?.aborted) {
+            onAbort();
+            return;
+          }
+          void start.then(
+            (session) => finish(() => resolveSession(session)),
+            (error48) => finish(() => reject(error48))
+          );
+        });
+      }
+      async invalidateDurableSession(session) {
+        if (this.durableSession === session) this.durableSession = null;
+        if (!session.closePromise) {
+          session.closePromise = (async () => {
+            await session.session.close();
+            if (session.processToken && session.processReceiptPath) {
+              await waitForCodexGuardianState(
+                { processToken: session.processToken, receiptPath: session.processReceiptPath },
+                "terminated",
+                Date.now() + 5e3
+              );
+            }
+            session.terminated = true;
+          })();
+        }
+        await session.closePromise;
+      }
       runAttempt(input) {
         const active = this.inFlightAttempts.get(input.attemptId);
         if (active) {
@@ -21352,10 +21473,37 @@ var init_codex_adapter = __esm({
               dispatchOutcome: checkpoint.dispatchOutcome
             });
           }
-          await rm3(checkpoint.processReceiptPath, { force: true });
+          const receipt = await readCodexGuardianReceipt(checkpoint.processReceiptPath);
+          if (checkpoint.processState === "terminated" || receipt === null || receipt.state === "terminated") {
+            await rm3(checkpoint.processReceiptPath, { force: true });
+          }
         }
         await recoveryHooks.clear(attemptId);
       }
+      async close() {
+        if (!this.adapterClosePromise) {
+          this.closing = true;
+          this.adapterClosePromise = (async () => {
+            const sessions = /* @__PURE__ */ new Set();
+            if (this.durableSession) sessions.add(this.durableSession);
+            const starting = this.durableSessionStart;
+            if (starting) {
+              const started = await starting.catch(() => null);
+              if (started) sessions.add(started);
+            }
+            await Promise.all(
+              [...sessions].map((session) => this.invalidateDurableSession(session))
+            );
+            await Promise.allSettled(
+              [...this.inFlightAttempts.values()].map((attempt) => attempt.promise)
+            );
+            for (const session of sessions) {
+              if (session.processReceiptPath) await rm3(session.processReceiptPath, { force: true });
+            }
+          })();
+        }
+        await this.adapterClosePromise;
+      }
       async executeAttempt(input) {
         const validatedInput = validateAttemptInput(input);
         const recoveryHooks = this.dependencies.recoveryHooks;
@@ -21406,6 +21554,7 @@ var init_codex_adapter = __esm({
           });
         }
         let resources = null;
+        let sessionLease = null;
         let session = null;
         let threadId = null;
         let baseCheckpoint = null;
@@ -21413,22 +21562,20 @@ var init_codex_adapter = __esm({
         let currentDispatchOutcome = "not_dispatched";
         let completedResult = null;
         let caughtError = null;
+        let sessionInvalidationError = null;
         try {
-          const binary = await (this.dependencies.resolveBinary ?? resolvePinnedCodexBinary)();
           resources = await (this.dependencies.createAttemptResources ?? ((attemptId) => createIsolatedCodexAttemptResources(
             attemptId,
             this.dependencies.codexHome
           )))(input.attemptId);
           await access2(resources.codexHome, fsConstants2.R_OK | fsConstants2.W_OK);
           await access2(resources.workspacePath, fsConstants2.R_OK);
-          const guardianManaged = Boolean(recoveryHooks && !this.dependencies.spawnProcess);
-          const bootIdentity = guardianManaged ? await (this.dependencies.readBootIdentity ?? readInferenceSystemBootIdentity)() : null;
-          const processToken = guardianManaged ? randomBytes3(32).toString("hex") : null;
-          const guardianReceiptRoot = guardianManaged ? this.dependencies.guardianReceiptRoot ?? join4(tmpdir2(), "vtx-codex-guardian-receipts") : null;
-          if (guardianReceiptRoot) {
-            await ensureInferencePrivateDirectory(guardianReceiptRoot);
-          }
-          const processReceiptPath = guardianReceiptRoot && processToken ? join4(guardianReceiptRoot, `${processToken}.json`) : null;
+          sessionLease = await this.acquireDurableSession(
+            resources.codexHome,
+            input.deadlineAtMs,
+            input.signal
+          );
+          session = sessionLease.session;
           baseCheckpoint = {
             schemaVersion: "vtx_codex_attempt_recovery_v1",
             attemptId: input.attemptId,
@@ -21438,10 +21585,10 @@ var init_codex_adapter = __esm({
             workspacePath: resources.workspacePath,
             threadId: null,
             threadPath: null,
-            processToken,
-            processReceiptPath,
-            processState: guardianManaged ? "spawn_intent" : "unmanaged",
-            bootIdentity,
+            processToken: sessionLease.processToken,
+            processReceiptPath: sessionLease.processReceiptPath,
+            processState: sessionLease.processToken ? "running" : "unmanaged",
+            bootIdentity: sessionLease.bootIdentity,
             cleanupConfirmed: false,
             adapterRequestId: null,
             adapterResponseId: null,
@@ -21450,19 +21597,6 @@ var init_codex_adapter = __esm({
           };
           latestCheckpoint = baseCheckpoint;
           await recoveryHooks?.save(baseCheckpoint);
-          session = await CodexAppServerSession.start({
-            binary,
-            codexHome: resources.codexHome,
-            deadlineAtMs: input.deadlineAtMs,
-            signal: input.signal,
-            spawnProcess: this.dependencies.spawnProcess,
-            guardian: processToken && processReceiptPath ? { processToken, receiptPath: processReceiptPath, bootIdentity: bootIdentity ?? void 0 } : void 0
-          });
-          if (guardianManaged) {
-            baseCheckpoint = { ...baseCheckpoint, processState: "running" };
-            latestCheckpoint = baseCheckpoint;
-            await recoveryHooks?.save(baseCheckpoint);
-          }
           await session.requireManagedChatGptAuth(input.deadlineAtMs, input.signal);
           await session.requireModel(
             input.requestedModel,
@@ -21522,6 +21656,20 @@ var init_codex_adapter = __esm({
           return result2;
         } catch (error48) {
           caughtError = error48;
+          if (sessionLease && (!sessionLease.session.isUsable() || error48 instanceof CodexAppServerError && (error48.category === "transport" || [
+            "rpc_rejected",
+            "invalid_rpc_result",
+            "rpc_timeout",
+            "invalid_thread_provenance",
+            "thread_cleanup_identity_missing",
+            "thread_delete_unconfirmed"
+          ].includes(error48.code)))) {
+            try {
+              await this.invalidateDurableSession(sessionLease);
+            } catch (invalidationError) {
+              sessionInvalidationError = invalidationError;
+            }
+          }
           if (error48 instanceof CodexAppServerError) {
             const dispatchOutcome = error48.dispatchOutcome === "not_dispatched" ? currentDispatchOutcome : error48.dispatchOutcome;
             if (baseCheckpoint && !completedResult) {
@@ -21584,7 +21732,7 @@ var init_codex_adapter = __esm({
           }
           throw classified;
         } finally {
-          let cleanupError = null;
+          let cleanupError = sessionInvalidationError;
           if (session && threadId) {
             try {
               await session.deleteThread(threadId);
@@ -21592,23 +21740,9 @@ var init_codex_adapter = __esm({
               cleanupError = error48;
             }
           }
-          try {
-            await session?.close();
-          } catch (error48) {
-            cleanupError ??= error48;
-          }
-          if (latestCheckpoint && recoveryHooks) {
+          if (sessionLease && cleanupError) {
             try {
-              if (latestCheckpoint.processToken && latestCheckpoint.processReceiptPath) {
-                await waitForCodexGuardianState(
-                  {
-                    processToken: latestCheckpoint.processToken,
-                    receiptPath: latestCheckpoint.processReceiptPath
-                  },
-                  "terminated",
-                  Date.now() + 5e3
-                );
-              }
+              await this.invalidateDurableSession(sessionLease);
             } catch (error48) {
               cleanupError ??= error48;
             }
@@ -21623,7 +21757,7 @@ var init_codex_adapter = __esm({
           if (latestCheckpoint && recoveryHooks && cleanupError === null) {
             latestCheckpoint = {
               ...latestCheckpoint,
-              processState: latestCheckpoint.processToken ? "terminated" : "unmanaged",
+              processState: latestCheckpoint.processToken ? sessionLease?.terminated ? "terminated" : "running" : "unmanaged",
               cleanupConfirmed: true
             };
             try {
@@ -29377,7 +29511,11 @@ var init_runner = __esm({
         } finally {
           removeAbortListener();
           unregisterSignals();
-          await lock2.release();
+          try {
+            await this.dependencies.codexAdapter.close?.();
+          } finally {
+            await lock2.release();
+          }
         }
       }
       async persistReceipt(receipt, now) {
@@ -30382,11 +30520,18 @@ ${result2.stderr}`)) {
       const startedAt = Date.now();
       const log = createWriteStream(manifest.log_path, { flags: "a", mode: 384 });
       return await new Promise((resolvePromise, reject) => {
+        let stdout = "";
         const child = spawn5(manifest.executable, args, {
           env: { ...process.env, ...manifest.runtime_environment },
           windowsHide: true,
-          stdio: ["ignore", log, log]
+          stdio: ["ignore", "pipe", "pipe"]
         });
+        child.stdout.on("data", (chunk) => {
+          const text = chunk.toString("utf8");
+          log.write(text);
+          stdout = `${stdout}${text}`.slice(-65536);
+        });
+        child.stderr.on("data", (chunk) => log.write(chunk));
         const onAbort = () => child.kill("SIGTERM");
         signal.addEventListener("abort", onAbort, { once: true });
         child.once("error", (error48) => {
@@ -30397,7 +30542,24 @@ ${result2.stderr}`)) {
         child.once("exit", (code) => {
           signal.removeEventListener("abort", onAbort);
           log.end();
-          resolvePromise({ exitCode: code ?? 1, uptimeMs: Date.now() - startedAt });
+          let drainReason = null;
+          for (const line of stdout.trim().split("\n").reverse()) {
+            try {
+              const parsed = JSON.parse(line);
+              if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && typeof parsed.drain_reason === "string" && /^[a-z0-9_]{1,96}$/u.test(
+                parsed.drain_reason
+              )) {
+                drainReason = parsed.drain_reason;
+                break;
+              }
+            } catch {
+            }
+          }
+          resolvePromise({
+            exitCode: code ?? 1,
+            uptimeMs: Date.now() - startedAt,
+            drainReason
+          });
         });
       });
     };
@@ -30447,6 +30609,7 @@ ${result2.stderr}`)) {
           await appendServiceLog(manifest.log_path, "worker_exited", {
             exit_code: result2.exitCode,
             uptime_ms: result2.uptimeMs,
+            drain_reason: result2.drainReason ?? null,
             retry_after_ms: retryAfterMs
           });
           await sleep4(retryAfterMs);
@@ -31932,7 +32095,21 @@ Waiting for approval...
                   ...dependencies,
                   registerLifecycleSignalHandlers: unregister
                 }, warnings);
-                return { exitCode: result2.exitCode, uptimeMs: Date.now() - startedAt };
+                let drainReason = null;
+                try {
+                  const summary = JSON.parse(result2.stdout);
+                  if (summary && typeof summary === "object" && !Array.isArray(summary) && typeof summary.drain_reason === "string" && /^[a-z0-9_]{1,96}$/u.test(
+                    summary.drain_reason
+                  )) {
+                    drainReason = summary.drain_reason;
+                  }
+                } catch {
+                }
+                return {
+                  exitCode: result2.exitCode,
+                  uptimeMs: Date.now() - startedAt,
+                  drainReason
+                };
               }
             }
           );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtxmacro/cli",
-  "version": "2026.8.20",
+  "version": "2026.8.21",
   "description": "VTX Macro CLI, MCP server, and durable subscription inference host.",
   "type": "module",
   "license": "UNLICENSED",