autodev-cli 1.4.192 → 1.4.194

package/out/providers/grok/leader.js

@@ -0,0 +1,390 @@
+"use strict";
+// ---------------------------------------------------------------------------
+// grok LEADER daemon — "always open, reconnect-never-reload" (Layer B, 1.4.193).
+//
+// GOAL: the grok backend OUTLIVES loop/app restarts so a restarted loop
+// RECONNECTS to the live in-memory session with NO `session/load` replay (the
+// office-feed spam Layer A only quieted). GATED behind env AUTODEV_GROK_LEADER,
+// DEFAULT OFF — when off, the existing non-leader ACP path (1.4.188/1.4.191) is
+// used UNCHANGED.
+//
+// ARCHITECTURE (verified live on grok 1.0.41; see memory `grok-leader-always-open`
+// + the 1.4.193 re-spike):
+//   • A per-agent grok LEADER daemon (`grok agent --always-approve leader
+//     --no-exit-on-disconnect --relay-on-demand --no-auto-update --leader-socket
+//     <per-agent .sock>`) is a shared backend that survives client disconnects.
+//   • CRITICAL grok-1.0.41 fact: the leader EVICTS a session's in-memory context
+//     when its LAST client disconnects (the session persists on disk, but a fresh
+//     client then gets "unknown session id" and must `session/load` = the replay).
+//     So a bare leader is NOT enough for attach-without-load across a loop restart.
+//   • Fix: a detached KEEPALIVE client holds the session warm in the leader's
+//     memory forever. Loop clients then attach as a SECOND concurrent client and
+//     `session/prompt {sessionId}` DIRECTLY — context intact, NO session/load —
+//     across any number of loop-process restarts (proven: codeword recalled,
+//     zero session/load).
+//   • The ONE `session/load` (cold recovery from disk) happens inside the
+//     keepalive at cold start when it is seeded with the persisted id; every
+//     subsequent loop restart is a warm attach. No live keepalive ⇒ degrade to
+//     Layer A (session/load), never data-loss.
+//
+// REAP BY PID (critical): `grok leader list/kill` CANNOT see a per-socket
+// `--relay-on-demand` leader (verified: list→[], "No leader candidates found").
+// So we track the leader + keepalive PIDs in `.autodev/leader.json` and reap the
+// pid-trees ourselves. `autodev leader-stop <root>` (hidden) is what the app calls
+// on office stop/remove/quit. The loop's own SIGINT/exit reaper kills ONLY the
+// thin client (leader/keepalive are DETACHED, so they survive a loop restart).
+// ---------------------------------------------------------------------------
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runKeepalive = void 0;
+exports.leaderModeEnabled = leaderModeEnabled;
+exports.leaderSocketPath = leaderSocketPath;
+exports.leaderJsonPath = leaderJsonPath;
+exports.leaderSidPath = leaderSidPath;
+exports.readLeaderInfo = readLeaderInfo;
+exports.writeLeaderInfo = writeLeaderInfo;
+exports.removeLeaderInfo = removeLeaderInfo;
+exports.isPidAlive = isPidAlive;
+exports.decideLeaderAction = decideLeaderAction;
+exports.leaderHealthy = leaderHealthy;
+exports.keepaliveEntryPath = keepaliveEntryPath;
+exports.ensureLeader = ensureLeader;
+exports.stopLeader = stopLeader;
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const crypto = __importStar(require("crypto"));
+const child_process = __importStar(require("child_process"));
+const killProcessTree_1 = require("../../core/killProcessTree");
+const sessionState_1 = require("../../sessionState");
+// Re-export the keepalive runner + its options so existing importers keep working.
+var keepalive_1 = require("./keepalive");
+Object.defineProperty(exports, "runKeepalive", { enumerable: true, get: function () { return keepalive_1.runKeepalive; } });
+/** Env gate — leader mode is OPT-IN and DEFAULT OFF. Pure (env injectable). */
+function leaderModeEnabled(env = process.env) {
+    const raw = String(env['AUTODEV_GROK_LEADER'] ?? '').toLowerCase().trim();
+    return raw === '1' || raw === 'true' || raw === 'on' || raw === 'yes';
+}
+/** Per-agent AF_UNIX socket. Prefer `.autodev/grok-leader.sock`; fall back to a
+ *  hashed path under tmp when the workspace path would blow the ~108-byte sun_path
+ *  limit (a deterministic function of the root either way). */
+function leaderSocketPath(root) {
+    const inAutodev = path.join(root, '.autodev', 'grok-leader.sock');
+    if (Buffer.byteLength(inAutodev) <= 100) {
+        return inAutodev;
+    }
+    const h = crypto.createHash('sha1').update(path.resolve(root)).digest('hex').slice(0, 16);
+    return path.join(os.tmpdir(), `autodev-grok-${h}.sock`);
+}
+function leaderJsonPath(root) { return path.join(root, '.autodev', 'leader.json'); }
+function leaderSidPath(root) { return path.join(root, '.autodev', 'grok-leader.sid'); }
+function readLeaderInfo(root) {
+    try {
+        const raw = fs.readFileSync(leaderJsonPath(root), 'utf8');
+        const info = JSON.parse(raw);
+        if (info && typeof info.pid === 'number' && typeof info.socket === 'string') {
+            return info;
+        }
+    }
+    catch { /* absent / malformed */ }
+    return null;
+}
+function writeLeaderInfo(root, info) {
+    try {
+        (0, sessionState_1.autodevDir)(root);
+        fs.writeFileSync(leaderJsonPath(root), JSON.stringify(info, null, 2), 'utf8');
+    }
+    catch { /* best effort */ }
+}
+function removeLeaderInfo(root) {
+    try {
+        fs.unlinkSync(leaderJsonPath(root));
+    }
+    catch { /* already gone */ }
+}
+/** `process.kill(pid, 0)` liveness probe — true iff the pid exists (and is ours
+ *  or EPERM, which still means alive). */
+function isPidAlive(pid) {
+    if (!pid || !Number.isInteger(pid) || pid <= 1) {
+        return false;
+    }
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (err) {
+        return err?.code === 'EPERM';
+    }
+}
+/**
+ * PURE orphan-sweep decision. Given the persisted info and the observed liveness
+ * of its pieces, decide whether to reuse a still-live leader ('adopt'), reap a
+ * stale/dead one ('reap-stale'), or spawn fresh ('spawn'). Unit-tested.
+ */
+function decideLeaderAction(info, alive) {
+    if (!info) {
+        return 'spawn';
+    }
+    const keepaliveOk = info.keepalivePid ? alive.keepalive : true;
+    if (alive.leader && keepaliveOk && alive.socket) {
+        return 'adopt';
+    }
+    return 'reap-stale';
+}
+/** Is the persisted leader fully healthy right now (adoptable)? */
+function leaderHealthy(info) {
+    if (!info) {
+        return false;
+    }
+    const alive = { leader: isPidAlive(info.pid), keepalive: isPidAlive(info.keepalivePid), socket: (() => { try {
+            return fs.existsSync(info.socket);
+        }
+        catch {
+            return false;
+        } })() };
+    return decideLeaderAction(info, alive) === 'adopt';
+}
+function readSidFile(sidFile) {
+    try {
+        const s = fs.readFileSync(sidFile, 'utf8').trim();
+        return s || null;
+    }
+    catch {
+        return null;
+    }
+}
+async function waitUntil(pred, ms, stepMs = 100) {
+    const end = Date.now() + ms;
+    while (Date.now() < end) {
+        if (pred()) {
+            return true;
+        }
+        await new Promise((r) => setTimeout(r, stepMs));
+    }
+    return pred();
+}
+function openLogFd(file) {
+    try {
+        return fs.openSync(file, 'a');
+    }
+    catch {
+        return 'ignore';
+    }
+}
+/** Resolve the minimal keepalive entry (out/providers/grok/keepaliveMain.js) so a
+ *  detached keepalive loads with NO commander/CLI graph. Overridable for odd
+ *  packagings via AUTODEV_KEEPALIVE_ENTRY. */
+function keepaliveEntryPath() {
+    const override = process.env['AUTODEV_KEEPALIVE_ENTRY'];
+    if (override && fs.existsSync(override)) {
+        return override;
+    }
+    return path.join(__dirname, 'keepaliveMain.js');
+}
+/** Reap the leader + keepalive pid-trees named in `info` (best-effort). */
+function reapLeaderProcs(info) {
+    if (info.keepalivePid) {
+        try {
+            (0, killProcessTree_1.killProcessTree)(info.keepalivePid);
+        }
+        catch { /* ignore */ }
+    }
+    if (info.pid) {
+        try {
+            (0, killProcessTree_1.killProcessTree)(info.pid);
+        }
+        catch { /* ignore */ }
+    }
+}
+/**
+ * ORPHAN-SWEEP + ensure a live leader+keepalive for this root. Adopts a still-live
+ * one (no second leader), reaps a stale/dead one, else spawns both DETACHED so they
+ * survive the loop process exiting. Returns the LeaderInfo (with the warm session
+ * id) or null when the backend could not be established (caller falls back to the
+ * non-leader ACP path). Never throws.
+ */
+async function ensureLeader(opts) {
+    const { root, bin, providerId, model, log } = opts;
+    const existing = readLeaderInfo(root);
+    if (existing && leaderHealthy(existing)) {
+        log(`grok leader: adopting live backend (leader=${existing.pid} keepalive=${existing.keepalivePid ?? '?'} sid=${(existing.sessionId ?? '').slice(0, 8)}…)`);
+        return existing;
+    }
+    if (existing) {
+        log(`grok leader: reaping stale backend (leader=${existing.pid} keepalive=${existing.keepalivePid ?? '?'})`);
+        reapLeaderProcs(existing);
+        removeLeaderInfo(existing.root ?? root);
+    }
+    const socket = leaderSocketPath(root);
+    try {
+        fs.unlinkSync(socket);
+    }
+    catch { /* no stale socket */ }
+    (0, sessionState_1.autodevDir)(root);
+    // 1) Spawn the LEADER daemon, detached.
+    const leaderArgs = ['agent', '--always-approve', 'leader', '--no-exit-on-disconnect', '--relay-on-demand', '--no-auto-update', '--leader-socket', socket];
+    const leaderErrFd = openLogFd(path.join(root, '.autodev', 'grok-leader.err'));
+    let leaderChild;
+    try {
+        leaderChild = child_process.spawn(bin, leaderArgs, {
+            cwd: root, detached: true,
+            stdio: ['ignore', 'ignore', leaderErrFd],
+            env: { ...process.env, TERM: process.env['TERM'] || 'xterm-256color' },
+        });
+    }
+    catch (err) {
+        log(`grok leader: spawn failed (${err?.message ?? err})`);
+        return null;
+    }
+    leaderChild.unref();
+    const leaderPid = leaderChild.pid;
+    if (!leaderPid) {
+        log('grok leader: no pid after spawn');
+        return null;
+    }
+    const sockOk = await waitUntil(() => { try {
+        return fs.existsSync(socket);
+    }
+    catch {
+        return false;
+    } }, 15_000);
+    if (!sockOk) {
+        log('grok leader: socket never appeared — reaping');
+        try {
+            (0, killProcessTree_1.killProcessTree)(leaderPid);
+        }
+        catch { /* ignore */ }
+        return null;
+    }
+    // 2) Spawn the KEEPALIVE client, detached — it holds the session warm. Seed it
+    //    with the persisted id so a cold start does its ONE session/load here.
+    const sidFile = leaderSidPath(root);
+    try {
+        fs.unlinkSync(sidFile);
+    }
+    catch { /* ignore */ }
+    const seed = (0, sessionState_1.getSessionId)(root, providerId) || undefined;
+    const kaArgs = [keepaliveEntryPath(), '--socket', socket, '--cwd', root, '--sid-file', sidFile, '--bin', bin];
+    if (seed) {
+        kaArgs.push('--seed', seed);
+    }
+    let kaChild;
+    try {
+        kaChild = child_process.spawn(process.execPath, kaArgs, {
+            cwd: root, detached: true, stdio: 'ignore',
+            // ELECTRON_RUN_AS_NODE so an Electron-bundled CLI runs the keepalive as pure
+            // node (no window) — the inverse of the app's ELECTRON_RUN_AS_NODE trap.
+            env: { ...process.env, ELECTRON_RUN_AS_NODE: '1', TERM: process.env['TERM'] || 'xterm-256color' },
+        });
+    }
+    catch (err) {
+        log(`grok leader: keepalive spawn failed (${err?.message ?? err})`);
+        try {
+            (0, killProcessTree_1.killProcessTree)(leaderPid);
+        }
+        catch { /* ignore */ }
+        return null;
+    }
+    kaChild.unref();
+    const keepalivePid = kaChild.pid;
+    const gotSid = await waitUntil(() => readSidFile(sidFile) !== null, 25_000);
+    const sessionId = readSidFile(sidFile) || undefined;
+    if (!keepalivePid || !gotSid || !sessionId) {
+        log('grok leader: keepalive failed to establish a session — reaping');
+        if (keepalivePid) {
+            try {
+                (0, killProcessTree_1.killProcessTree)(keepalivePid);
+            }
+            catch { /* ignore */ }
+        }
+        try {
+            (0, killProcessTree_1.killProcessTree)(leaderPid);
+        }
+        catch { /* ignore */ }
+        return null;
+    }
+    const info = { pid: leaderPid, socket, startedAt: new Date().toISOString(), keepalivePid, sessionId, root };
+    writeLeaderInfo(root, info);
+    try {
+        (0, sessionState_1.saveSessionId)(root, providerId, sessionId);
+    }
+    catch { /* ignore */ }
+    log(`grok leader: backend up (leader=${leaderPid} keepalive=${keepalivePid} sid=${sessionId.slice(0, 8)}…)`);
+    return info;
+}
+/**
+ * `autodev leader-stop <root>` — kill the leader + keepalive pid-trees named in
+ * `.autodev/leader.json` and clean up the socket / sid / json. This is what the
+ * app calls on office stop / remove / quit. Best-effort; returns whether anything
+ * was reaped.
+ */
+function stopLeader(root, log) {
+    const info = readLeaderInfo(root);
+    let killed = false;
+    if (info) {
+        if (info.keepalivePid && isPidAlive(info.keepalivePid)) {
+            try {
+                (0, killProcessTree_1.killProcessTree)(info.keepalivePid);
+                killed = true;
+            }
+            catch { /* ignore */ }
+        }
+        if (info.pid && isPidAlive(info.pid)) {
+            try {
+                (0, killProcessTree_1.killProcessTree)(info.pid);
+                killed = true;
+            }
+            catch { /* ignore */ }
+        }
+        try {
+            if (info.socket) {
+                fs.unlinkSync(info.socket);
+            }
+        }
+        catch { /* ignore */ }
+    }
+    try {
+        fs.unlinkSync(leaderSocketPath(root));
+    }
+    catch { /* ignore */ }
+    try {
+        fs.unlinkSync(leaderSidPath(root));
+    }
+    catch { /* ignore */ }
+    removeLeaderInfo(root);
+    log(killed ? `leader-stop: reaped grok leader backend for ${root}` : `leader-stop: no live grok leader for ${root}`);
+    return killed;
+}
+//# sourceMappingURL=leader.js.map

package/out/providers/grok/leader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"leader.js","sourceRoot":"","sources":["../../../src/providers/grok/leader.ts"],"names":[],"mappings":"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"}

package/out/providers/grok/tui.js

@@ -111,6 +111,8 @@ const grokEvents_1 = require("../../core/grokEvents");
 const sessions_1 = require("./sessions");
 const redactSecrets_1 = require("../../core/redactSecrets");
 const GrokAcpSession_1 = require("./GrokAcpSession");
+const AcpSession_1 = require("../acp/AcpSession");
+const leader_1 = require("./leader");
 // ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
@@ -2378,20 +2380,10 @@ function sendGrokCliPrompt(root, promptFilePath, resolvedSessionId, stdoutFile,
 // ---------------------------------------------------------------------------
 // PERSISTENT-PROCESS (ACP) path — one long-lived `grok agent stdio` per root.
 // ---------------------------------------------------------------------------
-/** Get (or lazily create) the persistent ACP session for a root. */
-function getOrCreateAcpSession(root, providerId, model, log, resolvedSessionId) {
-    let sess = _acpSessions.get(root);
-    if (sess) {
-        return sess;
-    }
-    // Resume-on-(re)start: seed the id to session/load from the persisted id, else
-    // the newest grok session on disk for this cwd (works whether that session was
-    // created by a prior ACP run or the legacy headless `--continue`).
-    // Layer A.2: PREFER the persisted id (session-state.json) over the disk-latest
-    // fallback — disk-latest can resume the WRONG session (a stray/newer dir). Use
-    // disk-latest ONLY when there is no persisted id.
-    const seedId = (0, sessionState_1.getSessionId)(root, providerId) || resolvedSessionId || (0, sessions_1.getGrokLatestSessionId)(root) || undefined;
-    const hooks = {
+/** Redaction-aware AcpHostHooks that append to this root's hook feed. Shared by
+ *  the non-leader and leader ACP paths so hook emission stays in one place. */
+function makeAcpHooks(root, log) {
+    return {
         emitHook: (name, extra) => {
             if (name === 'Notification' && typeof extra['message'] === 'string') {
                 const msg = (0, redactSecrets_1.redactSecrets)(String(extra['message'])).slice(0, 1200);
@@ -2406,10 +2398,88 @@ function getOrCreateAcpSession(root, providerId, model, log, resolvedSessionId)
         },
         log,
     };
-    sess = new GrokAcpSession_1.GrokAcpSession({ root, model, bin: GROK_BIN, hooks, initialSessionId: seedId });
+}
+/** Get (or lazily create) the NON-LEADER persistent ACP session for a root. */
+function getOrCreateAcpSession(root, providerId, model, log, resolvedSessionId) {
+    let sess = _acpSessions.get(root);
+    if (sess) {
+        return sess;
+    }
+    // Resume-on-(re)start: seed the id to session/load from the persisted id, else
+    // the newest grok session on disk for this cwd (works whether that session was
+    // created by a prior ACP run or the legacy headless `--continue`).
+    // Layer A.2: PREFER the persisted id (session-state.json) over the disk-latest
+    // fallback — disk-latest can resume the WRONG session (a stray/newer dir). Use
+    // disk-latest ONLY when there is no persisted id.
+    const seedId = (0, sessionState_1.getSessionId)(root, providerId) || resolvedSessionId || (0, sessions_1.getGrokLatestSessionId)(root) || undefined;
+    sess = new GrokAcpSession_1.GrokAcpSession({ root, model, bin: GROK_BIN, hooks: makeAcpHooks(root, log), initialSessionId: seedId });
     _acpSessions.set(root, sess);
     return sess;
 }
+/**
+ * LEADER-AWARE ensure (Layer B, 1.4.193). When AUTODEV_GROK_LEADER is ON, ensure a
+ * per-agent leader + keepalive backend (orphan-sweeping/adopting/spawning as
+ * needed) and return a LEADER-CLIENT ACP session that ATTACHES to the warm session
+ * WITHOUT session/load. When the flag is OFF — or the leader backend can't be
+ * established — this returns the existing non-leader session UNCHANGED. Async
+ * because ensuring the leader spawns detached processes on a cold start.
+ */
+async function ensureAcpSession(root, providerId, model, log, resolvedSessionId) {
+    if ((0, leader_1.leaderModeEnabled)()) {
+        const cached = _acpSessions.get(root);
+        if (cached && cached.isAlive()) {
+            return cached;
+        }
+        if (cached) {
+            try {
+                cached.close();
+            }
+            catch { /* ignore */ }
+            _acpSessions.delete(root);
+        }
+        const info = await (0, leader_1.ensureLeader)({ root, bin: GROK_BIN, providerId, model, log });
+        if (info) {
+            const sess = new GrokAcpSession_1.GrokAcpSession({
+                root, model, bin: GROK_BIN, hooks: makeAcpHooks(root, log),
+                initialSessionId: info.sessionId, leaderSocket: info.socket, attachWithoutLoad: true,
+            });
+            _acpSessions.set(root, sess);
+            return sess;
+        }
+        log('grok leader: backend unavailable — falling back to the non-leader ACP path');
+    }
+    return getOrCreateAcpSession(root, providerId, model, log, resolvedSessionId);
+}
+/**
+ * Leader POISON-ESCAPE: the attached session id was rejected by the leader
+ * ("unknown session id" — the keepalive died / a wrong id). Reap the leader
+ * backend, clear the persisted id, drop the thin client — the caller then
+ * re-ensures a FRESH leader with session/new.
+ */
+function recoverLeaderPoison(root, providerId, log) {
+    try {
+        (0, leader_1.stopLeader)(root, log);
+    }
+    catch { /* ignore */ }
+    try {
+        (0, sessionState_1.clearSessionId)(root, providerId);
+    }
+    catch { /* ignore */ }
+    const s = _acpSessions.get(root);
+    if (s) {
+        if (s.pid) {
+            try {
+                (0, killProcessTree_1.killProcessTree)(s.pid);
+            }
+            catch { /* ignore */ }
+        }
+        try {
+            s.close();
+        }
+        catch { /* ignore */ }
+        _acpSessions.delete(root);
+    }
+}
 /**
  * Fire-and-forget: run ONE turn through the persistent ACP session. Streams
  * assistant text to stdoutFile and writes the exit code to exitFile exactly once
@@ -2443,7 +2513,6 @@ function sendGrokAcpPrompt(root, promptFilePath, resolvedSessionId, stdoutFile,
         catch { /* ignore */ }
         return;
     }
-    const sess = getOrCreateAcpSession(root, providerId, model, log, resolvedSessionId);
     _busyRoots.add(root);
     if (showOutput) {
         try {
@@ -2456,23 +2525,29 @@ function sendGrokAcpPrompt(root, promptFilePath, resolvedSessionId, stdoutFile,
     }
     catch { /* ignore */ } };
     void (async () => {
+        let sess;
         try {
+            sess = await ensureAcpSession(root, providerId, model, log, resolvedSessionId);
             await sess.ensureReady();
         }
         catch (err) {
-            const startupErr = `${err?.message ?? err} ${sess.stderrSnapshot}`;
-            log(`Grok ACP: startup failed (${err?.message ?? err}); stderr="${sess.stderrSnapshot.slice(0, 200)}" — falling back to headless one-shot`);
-            try {
-                sess.close();
+            const cur = _acpSessions.get(root);
+            const stderr = cur?.stderrSnapshot ?? '';
+            const startupErr = `${err?.message ?? err} ${stderr}`;
+            log(`Grok ACP: startup failed (${err?.message ?? err}); stderr="${stderr.slice(0, 200)}" — falling back to headless one-shot`);
+            if (cur) {
+                try {
+                    cur.close();
+                }
+                catch { /* ignore */ }
             }
-            catch { /* ignore */ }
             _acpSessions.delete(root);
             _busyRoots.delete(root);
             // AUTH failure at ACP startup (grok not signed in): the headless fallback
             // would just re-hit the same logged-out gate, so short-circuit to
             // reauth_required (non-retryable) instead of falling through.
             if ((0, authClassify_1.isGrokAuthFailure)(startupErr)) {
-                _emitGrokReauthHook(root, stdoutFile, log, 'ACP startup (not signed in)', providerId, sess.stderrSnapshot.slice(0, 160));
+                _emitGrokReauthHook(root, stdoutFile, log, 'ACP startup (not signed in)', providerId, stderr.slice(0, 160));
                 try {
                     fs.writeFileSync(exitFile, '1\n', 'utf8');
                 }
@@ -2491,12 +2566,34 @@ function sendGrokAcpPrompt(root, promptFilePath, resolvedSessionId, stdoutFile,
             }
             catch { /* ignore */ }
         }
-        let res;
-        try {
-            res = await sess.runTurn(promptText, sink);
-        }
-        catch (err) {
-            res = { clean: false, stopReason: 'exception', error: err?.message ?? String(err) };
+        const runTurnSafe = async (s) => {
+            try {
+                return await s.runTurn(promptText, sink);
+            }
+            catch (err) {
+                return { clean: false, stopReason: 'exception', error: err?.message ?? String(err) };
+            }
+        };
+        let res = await runTurnSafe(sess);
+        // Leader POISON-ESCAPE: the warm session was rejected (keepalive died / stale
+        // id). Reap the leader + session/new on a FRESH leader, then retry ONCE.
+        if ((0, leader_1.leaderModeEnabled)() && sess.attachMode && !res.clean && AcpSession_1.AcpSession.isUnknownSessionError(res.error)) {
+            log('Grok leader: attach rejected (poison) — reaping leader, starting a fresh session, retrying once');
+            recoverLeaderPoison(root, providerId, log);
+            try {
+                sess = await ensureAcpSession(root, providerId, model, log, undefined);
+                await sess.ensureReady();
+                if (sess.sessionId) {
+                    try {
+                        (0, sessionState_1.saveSessionId)(root, providerId, sess.sessionId);
+                    }
+                    catch { /* ignore */ }
+                }
+                res = await runTurnSafe(sess);
+            }
+            catch (err) {
+                res = { clean: false, stopReason: 'poison-recover-failed', error: err?.message ?? String(err) };
+            }
         }
         if (!res.clean && res.error) {
             try {
@@ -2572,7 +2669,7 @@ async function ensureGrokAcpSteer(root, providerId, model, text, log) {
     if (!grokAcpEnabled()) {
         return null;
     }
-    const sess = getOrCreateAcpSession(root, providerId, model, log, undefined);
+    const sess = await ensureAcpSession(root, providerId, model, log, undefined);
     try {
         await sess.ensureReady();
     }
@@ -2835,6 +2932,10 @@ function closeGrokTuiSession(root, _log) {
     if (acp) {
         // Reap grok's whole worker subtree (grok forks a per-turn worker child), then
         // close — SIGKILL of just the parent would orphan the worker to init.
+        // LEADER-AWARE (Layer B): acp.pid here is the THIN CLIENT. The leader + keepalive
+        // are DETACHED (their own process groups, not in the client's tree), so this
+        // reaps ONLY the client — the leader survives the loop restart, exactly as
+        // intended. The app reaps the leader itself via `autodev leader-stop <root>`.
         if (acp.pid) {
             try {
                 (0, killProcessTree_1.killProcessTree)(acp.pid);