@openrig/cli 0.1.12 → 0.2.0

package/daemon/dist/adapters/claude-resume.js

@@ -56,6 +56,19 @@ export class ClaudeResumeAdapter {
                     message: "Claude resume failed: no conversation found for the requested session",
                 };
             }
+            // L3: Claude resume-selection prompt → attention_required (not failed).
+            // The runtime is alive and recoverable but blocked on operator selection.
+            // Decision 2 forbids auto-answering; surface evidence and let the
+            // operator/UI act, then later reconciliation may upgrade to
+            // operator_recovered when the pane reaches usable state.
+            if (probe.status === "attention_required") {
+                return {
+                    ok: false,
+                    code: "attention_required",
+                    message: probe.detail,
+                    evidence: paneContent.split("\n").slice(-12).join("\n"),
+                };
+            }
             if (probe.status === "resumed") {
                 return { ok: true };
             }

package/daemon/dist/adapters/claude-resume.js.map

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

package/daemon/dist/adapters/codex-resume.d.ts

@@ -1,10 +1,17 @@
 import type { TmuxAdapter } from "./tmux.js";
 import type { ResumeResult } from "./claude-resume.js";
 export { type ResumeResult };
+interface CodexResumeOptions {
+    pollMs?: number;
+    maxWaitMs?: number;
+    sleep?: (ms: number) => Promise<void>;
+}
 export declare class CodexResumeAdapter {
     private tmux;
-    constructor(tmux: TmuxAdapter);
+    private options;
+    constructor(tmux: TmuxAdapter, options?: CodexResumeOptions);
     canResume(resumeType: string | null, resumeToken: string | null): boolean;
     resume(tmuxSessionName: string, resumeType: string | null, resumeToken: string | null, _cwd: string): Promise<ResumeResult>;
+    private verifyResume;
 }
 //# sourceMappingURL=codex-resume.d.ts.map

package/daemon/dist/adapters/codex-resume.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-resume.d.ts","sourceRoot":"","sources":["../../src/adapters/codex-resume.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKvD,OAAO,EAAE,KAAK,YAAY,EAAE,CAAC;AAE7B,qBAAa,kBAAkB;IACjB,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,WAAW;IAErC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO;IAYnE,MAAM,CACV,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,YAAY,CAAC;CAyBzB"}
+{"version":3,"file":"codex-resume.d.ts","sourceRoot":"","sources":["../../src/adapters/codex-resume.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOvD,OAAO,EAAE,KAAK,YAAY,EAAE,CAAC;AAE7B,UAAU,kBAAkB;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;gBADP,IAAI,EAAE,WAAW,EACjB,OAAO,GAAE,kBAAuB;IAG1C,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO;IASnE,MAAM,CACV,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,YAAY,CAAC;YA+BV,YAAY;CAuE3B"}

package/daemon/dist/adapters/codex-resume.js

@@ -1,9 +1,14 @@
+import { setTimeout as sleep } from "node:timers/promises";
 import { shellQuote } from "./shell-quote.js";
+import { assessNativeResumeProbe } from "../domain/native-resume-probe.js";
 const CODEX_TYPES = new Set(["codex_id", "codex_last"]);
+const SHELL_COMMANDS = new Set(["bash", "fish", "nu", "sh", "tmux", "zsh"]);
 export class CodexResumeAdapter {
     tmux;
-    constructor(tmux) {
+    options;
+    constructor(tmux, options = {}) {
         this.tmux = tmux;
+        this.options = options;
     }
     canResume(resumeType, resumeToken) {
         if (!resumeType || !CODEX_TYPES.has(resumeType))
@@ -16,9 +21,6 @@ export class CodexResumeAdapter {
             return false;
         return true;
     }
-    // NOTE: Resume success is fire-and-forget. sendText succeeding means the
-    // command was typed into the tmux pane, NOT that the harness actually resumed.
-    // TODO(Phase 3): Add resume verification (e.g., poll harness status endpoint).
     async resume(tmuxSessionName, resumeType, resumeToken, _cwd) {
         if (!this.canResume(resumeType, resumeToken)) {
             return { ok: false, code: "no_resume", message: "Codex resume not available" };
@@ -38,7 +40,74 @@ export class CodexResumeAdapter {
             await this.tmux.sendKeys(tmuxSessionName, ["C-c"]);
             return { ok: false, code: "resume_failed", message: keyResult.message };
         }
-        return { ok: true };
+        return this.verifyResume(tmuxSessionName);
+    }
+    // Mirrors ClaudeResumeAdapter.verifyResume: poll the pane, run the native
+    // probe, return resumed / retry_fresh / attention_required / resume_failed
+    // based on observable runtime state. The `attention_required` outcome
+    // (Codex auth refusal — stored OAuth token can no longer be refreshed)
+    // closes the deferral recorded by the lifecycle scenario matrix slice.
+    async verifyResume(tmuxSessionName) {
+        const pollMs = this.options.pollMs ?? 200;
+        const maxWaitMs = this.options.maxWaitMs ?? 5_000;
+        const sleepFn = this.options.sleep ?? sleep;
+        const attempts = Math.max(1, Math.floor(maxWaitMs / Math.max(pollMs, 1)) + 1);
+        for (let attempt = 0; attempt < attempts; attempt++) {
+            const paneCommand = await this.tmux.getPaneCommand(tmuxSessionName);
+            const paneContent = (await this.tmux.capturePaneContent(tmuxSessionName, 40)) ?? "";
+            const probe = assessNativeResumeProbe({
+                runtime: "codex",
+                paneCommand,
+                paneContent,
+            });
+            if (probe.code === "no_saved_session") {
+                return {
+                    ok: false,
+                    code: "retry_fresh",
+                    message: "Codex resume failed: no saved session found for the requested token",
+                };
+            }
+            // Codex auth-refusal is alive-but-recoverable: the stored access token
+            // can no longer be refreshed. Surface evidence (last 12 pane lines) so
+            // the operator/UI can decide whether to `codex login` and continue, or
+            // mark the seat permanently rebuilt. Mirror Claude's evidence shape.
+            if (probe.status === "attention_required") {
+                return {
+                    ok: false,
+                    code: "attention_required",
+                    message: probe.detail,
+                    evidence: paneContent.split("\n").slice(-12).join("\n"),
+                };
+            }
+            if (probe.status === "resumed") {
+                return { ok: true };
+            }
+            if (attempt < attempts - 1) {
+                await sleepFn(pollMs);
+            }
+        }
+        const finalCommand = await this.tmux.getPaneCommand(tmuxSessionName);
+        const finalContent = (await this.tmux.capturePaneContent(tmuxSessionName, 40)) ?? "";
+        const finalProbe = assessNativeResumeProbe({
+            runtime: "codex",
+            paneCommand: finalCommand,
+            paneContent: finalContent,
+        });
+        if (finalProbe.status === "resumed") {
+            return { ok: true };
+        }
+        if (finalCommand && SHELL_COMMANDS.has(finalCommand)) {
+            return {
+                ok: false,
+                code: "retry_fresh",
+                message: "Codex resume failed: pane returned to shell instead of entering Codex",
+            };
+        }
+        return {
+            ok: false,
+            code: "resume_failed",
+            message: "Codex resume failed: timed out waiting for Codex to become active",
+        };
     }
 }
 //# sourceMappingURL=codex-resume.js.map

package/daemon/dist/adapters/codex-resume.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-resume.js","sourceRoot":"","sources":["../../src/adapters/codex-resume.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;AAIxD,MAAM,OAAO,kBAAkB;IACT;IAApB,YAAoB,IAAiB;QAAjB,SAAI,GAAJ,IAAI,CAAa;IAAG,CAAC;IAEzC,SAAS,CAAC,UAAyB,EAAE,WAA0B;QAC7D,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,OAAO,KAAK,CAAC;QAC9D,mCAAmC;QACnC,IAAI,UAAU,KAAK,YAAY;YAAE,OAAO,IAAI,CAAC;QAC7C,yBAAyB;QACzB,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yEAAyE;IACzE,+EAA+E;IAC/E,+EAA+E;IAC/E,KAAK,CAAC,MAAM,CACV,eAAuB,EACvB,UAAyB,EACzB,WAA0B,EAC1B,IAAY;QAEZ,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC;YAC7C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;QACjF,CAAC;QAED,MAAM,GAAG,GAAG,UAAU,KAAK,YAAY;YACrC,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,gBAAgB,UAAU,CAAC,WAAY,CAAC,EAAE,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,6DAA6D;YAC7D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;QAC3E,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;YAClB,mEAAmE;YACnE,4DAA4D;YAC5D,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YACnD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1E,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;CACF"}
+{"version":3,"file":"codex-resume.js","sourceRoot":"","sources":["../../src/adapters/codex-resume.ts"],"names":[],"mappings":"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"}

package/daemon/dist/adapters/codex-runtime-adapter.d.ts

@@ -22,6 +22,7 @@ export declare class CodexRuntimeAdapter implements RuntimeAdapter {
     private readThreadIdByPid;
     private sleep;
     private resolveHomeDirByPid;
+    private activityHookRelayAssetPath;
     constructor(deps: {
         tmux: TmuxAdapter;
         fsOps: CodexAdapterFsOps;
@@ -33,6 +34,7 @@ export declare class CodexRuntimeAdapter implements RuntimeAdapter {
         readThreadIdByPid?: (pid: number) => string | undefined;
         resolveHomeDirByPid?: ResolveHomeDirByPid;
         sleep?: (ms: number) => Promise<void>;
+        activityHookRelayAssetPath?: string;
     });
     listInstalled(binding: NodeBinding): Promise<InstalledResource[]>;
     project(plan: ProjectionPlan, binding: NodeBinding): Promise<ProjectionResult>;
@@ -40,13 +42,17 @@ export declare class CodexRuntimeAdapter implements RuntimeAdapter {
     launchHarness(binding: NodeBinding, opts: {
         name: string;
         resumeToken?: string;
+        forkSource?: import("../domain/runtime-adapter.js").ForkSource;
     }): Promise<HarnessLaunchResult>;
+    private buildQueueStateAddDirArg;
     checkReady(binding: NodeBinding): Promise<ReadinessResult>;
+    private dismissSkippableCodexUpdatePrompt;
     ensureManagedBootstrap(binding: {
         cwd?: string | null;
     }): void;
     private projectEntry;
     private resolveTargetDir;
+    private applyRuntimeResource;
     /**
      * Merge a managed block into the target guidance file. Returns `true` when
      * the merge happened, `false` when intentionally skipped (rig-role). Callers
@@ -56,11 +62,9 @@ export declare class CodexRuntimeAdapter implements RuntimeAdapter {
     private mergeGuidance;
     private detectDeliveryHint;
     private provisionWorkspaceTrust;
-    /**
-     * Best-effort: ensure Exa and Context7 MCPs are configured for Codex.
-     * Appends to ~/.codex/config.toml if the MCP entries don't already exist.
-     */
-    private provisionMcps;
+    private provisionActivityHooks;
+    private readJsonObject;
+    private readJsonObjectField;
     private workspaceTrustKeys;
     private captureFreshThreadId;
     private verifyResumeLaunch;

package/daemon/dist/adapters/codex-runtime-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-runtime-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/codex-runtime-adapter.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EACV,cAAc,EAAE,WAAW,EAAE,mBAAmB,EAChD,iBAAiB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,eAAe,EAC3E,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,cAAc,EAAmB,MAAM,iCAAiC,CAAC;AACvF,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,8BAA8B,CAAC;AAKtC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC9B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,qBAAa,mBAAoB,YAAW,cAAc;IACxD,QAAQ,CAAC,OAAO,WAAW;IAC3B,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,aAAa,CAA8D;IACnF,OAAO,CAAC,iBAAiB,CAAsC;IAC/D,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,mBAAmB,CAAsB;gBAErC,IAAI,EAAE;QAChB,IAAI,EAAE,WAAW,CAAC;QAClB,KAAK,EAAE,iBAAiB,CAAC;QACzB,aAAa,CAAC,EAAE,MAAM,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAC5E,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;QACxD,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACvC;IASK,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAWjE,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA0B9E,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAqDlG,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAgC/G,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBhE,sBAAsB,CAAC,OAAO,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI;IAI9D,OAAO,CAAC,YAAY;IA+BpB,OAAO,CAAC,gBAAgB;IAWxB;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,uBAAuB;IAsB/B;;;OAGG;IACH,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,kBAAkB;YAUZ,oBAAoB;YAmBpB,kBAAkB;IA4ChC,OAAO,CAAC,uBAAuB;IAK/B,OAAO,CAAC,oBAAoB;CAO7B"}
+{"version":3,"file":"codex-runtime-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/codex-runtime-adapter.ts"],"names":[],"mappings":"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"}

package/daemon/dist/adapters/codex-runtime-adapter.js

@@ -20,6 +20,7 @@ export class CodexRuntimeAdapter {
     readThreadIdByPid;
     sleep;
     resolveHomeDirByPid;
+    activityHookRelayAssetPath;
     constructor(deps) {
         this.tmux = deps.tmux;
         this.fs = deps.fsOps;
@@ -27,6 +28,7 @@ export class CodexRuntimeAdapter {
         this.readThreadIdByPid = deps.readThreadIdByPid ?? ((pid) => this.readThreadIdFromLogs(pid));
         this.resolveHomeDirByPid = deps.resolveHomeDirByPid ?? defaultResolveHomeDirByPid;
         this.sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+        this.activityHookRelayAssetPath = deps.activityHookRelayAssetPath ?? null;
     }
     async listInstalled(binding) {
         const results = [];
@@ -69,12 +71,13 @@ export class CodexRuntimeAdapter {
         catch (err) {
             console.error(`[openrig] codex bootstrap warning: ${err.message}`);
         }
-        // Best-effort: provision MCPs for managed Codex sessions
+        // Best-effort: provision project-local provider hooks. The hook token is
+        // supplied through tmux session env, never written to provider config.
         try {
-            this.provisionMcps();
+            this.provisionActivityHooks(binding);
         }
         catch (err) {
-            console.error(`[openrig] codex MCP provisioning warning: ${err.message}`);
+            console.error(`[openrig] codex activity hook provisioning warning: ${err.message}`);
         }
         let delivered = 0;
         const failed = [];
@@ -123,9 +126,53 @@ export class CodexRuntimeAdapter {
         if (!binding.tmuxSession) {
             return { ok: false, error: "No tmux session bound — cannot launch Codex harness" };
         }
+        if (opts.resumeToken && opts.forkSource) {
+            return { ok: false, error: "resumeToken and forkSource are mutually exclusive — pick one" };
+        }
+        const model = binding.model?.trim();
+        const modelArg = model ? ` -m ${shellQuote(model)}` : "";
+        const profile = binding.codexConfigProfile?.trim();
+        const profileArg = profile ? ` -p ${shellQuote(profile)}` : "";
+        const gitDirArg = ` --add-dir ${shellQuote(nodePath.join(binding.cwd, ".git"))}`;
+        const queueStateDirArg = this.buildQueueStateAddDirArg(opts.name);
+        // Fork branch: `codex fork <parent_thread_id>`. Captures the NEW thread id
+        // post-fork. Parent thread id is NOT persisted onto the new seat record
+        // (identity-honesty bedrock).
+        if (opts.forkSource) {
+            if (opts.forkSource.kind !== "native_id") {
+                return {
+                    ok: false,
+                    error: `codex fork: ref.kind="${opts.forkSource.kind}" is not supported in v1; use ref.kind="native_id" with the prior conversation's thread id`,
+                };
+            }
+            const parentId = opts.forkSource.value?.trim();
+            if (!parentId) {
+                return { ok: false, error: "codex fork: forkSource.value is required (parent native_id)" };
+            }
+            const cmd = `codex${profileArg} fork${queueStateDirArg} ${shellQuote(parentId)}`;
+            const textResult = await this.tmux.sendText(binding.tmuxSession, cmd);
+            if (!textResult.ok) {
+                return { ok: false, error: `Failed to send launch command: ${textResult.message}` };
+            }
+            const enterResult = await this.tmux.sendKeys(binding.tmuxSession, ["Enter"]);
+            if (!enterResult.ok) {
+                return { ok: false, error: `Failed to send Enter: ${enterResult.message}` };
+            }
+            await this.dismissSkippableCodexUpdatePrompt(binding.tmuxSession);
+            const threadId = await this.captureFreshThreadId(binding);
+            if (!threadId) {
+                return {
+                    ok: false,
+                    error: "codex fork: could not capture new post-fork thread id",
+                };
+            }
+            return { ok: true, resumeToken: threadId, resumeType: "codex_id" };
+        }
         const cmd = opts.resumeToken
-            ? `codex resume ${opts.resumeToken}`
-            : `codex -C ${shellQuote(binding.cwd)} -a never -s workspace-write`;
+            ? `codex${profileArg} resume${queueStateDirArg} ${shellQuote(opts.resumeToken)}`
+            : profile
+                ? `codex${profileArg} -C ${shellQuote(binding.cwd)}${gitDirArg}${queueStateDirArg}${modelArg}`
+                : `codex -C ${shellQuote(binding.cwd)}${gitDirArg}${queueStateDirArg}${modelArg} -a on-request -s danger-full-access`;
         const textResult = await this.tmux.sendText(binding.tmuxSession, cmd);
         if (!textResult.ok) {
             return { ok: false, error: `Failed to send launch command: ${textResult.message}` };
@@ -134,6 +181,7 @@ export class CodexRuntimeAdapter {
         if (!enterResult.ok) {
             return { ok: false, error: `Failed to send Enter: ${enterResult.message}` };
         }
+        await this.dismissSkippableCodexUpdatePrompt(binding.tmuxSession);
         if (opts.resumeToken) {
             const verification = await this.verifyResumeLaunch(binding.tmuxSession);
             if (!verification.ok)
@@ -146,6 +194,15 @@ export class CodexRuntimeAdapter {
         }
         return { ok: true };
     }
+    buildQueueStateAddDirArg(sessionName) {
+        const identity = parseCanonicalSessionName(sessionName);
+        if (!identity)
+            return "";
+        const sharedDocsRoot = process.env.OPENRIG_SHARED_DOCS_ROOT?.trim()
+            || nodePath.join(this.fs.homedir ?? os.homedir(), "code", "substrate", "shared-docs");
+        const queueStateRoot = nodePath.join(sharedDocsRoot, "rigs", identity.rig, "state", identity.pod);
+        return ` --add-dir ${shellQuote(queueStateRoot)}`;
+    }
     async checkReady(binding) {
         if (!binding.tmuxSession) {
             return { ready: false, reason: "No tmux session bound" };
@@ -165,10 +222,43 @@ export class CodexRuntimeAdapter {
             return { ready: true };
         return { ready: false, reason: probe.detail, code: probe.code };
     }
+    async dismissSkippableCodexUpdatePrompt(tmuxSession, attempts = 6) {
+        for (let attempt = 0; attempt < attempts; attempt++) {
+            const paneCommand = await this.tmux.getPaneCommand(tmuxSession);
+            const paneContent = (await this.tmux.capturePaneContent(tmuxSession, 40)) ?? "";
+            const probe = assessNativeResumeProbe({
+                runtime: "codex",
+                paneCommand,
+                paneContent,
+            });
+            if (probe.code === "update_gate") {
+                if (!isSkippableCodexUpdatePrompt(paneContent))
+                    return false;
+                const textResult = await this.tmux.sendText(tmuxSession, "3");
+                if (!textResult.ok)
+                    return false;
+                const enterResult = await this.tmux.sendKeys(tmuxSession, ["Enter"]);
+                if (!enterResult.ok)
+                    return false;
+                await this.sleep(500);
+                return true;
+            }
+            if (probe.status === "resumed" || probe.code === "trust_gate") {
+                return false;
+            }
+            if (attempt < attempts - 1) {
+                await this.sleep(200);
+            }
+        }
+        return false;
+    }
     ensureManagedBootstrap(binding) {
         this.provisionWorkspaceTrust(binding.cwd ?? null);
     }
     projectEntry(entry, cwd) {
+        if (entry.category === "runtime_resource" && this.applyRuntimeResource(entry)) {
+            return true;
+        }
         if (entry.category === "guidance" && entry.mergeStrategy === "managed_block") {
             const targetPath = nodePath.join(cwd, "AGENTS.md");
             const content = this.fs.readFile(entry.absolutePath);
@@ -209,6 +299,18 @@ export class CodexRuntimeAdapter {
             default: return null;
         }
     }
+    applyRuntimeResource(entry) {
+        if (entry.resourceType !== "codex_config_fragment") {
+            return false;
+        }
+        const home = this.fs.homedir ?? os.homedir();
+        const configPath = nodePath.join(home, ".codex", "config.toml");
+        this.fs.mkdirp(nodePath.dirname(configPath));
+        const existing = this.fs.exists(configPath) ? this.fs.readFile(configPath) : "";
+        const fragment = this.fs.readFile(entry.absolutePath);
+        this.fs.writeFile(configPath, upsertManagedCodexConfigFragment(existing, entry.effectiveId, fragment));
+        return true;
+    }
     /**
      * Merge a managed block into the target guidance file. Returns `true` when
      * the merge happened, `false` when intentionally skipped (rig-role). Callers
@@ -254,33 +356,45 @@ export class CodexRuntimeAdapter {
         }
         this.fs.writeFile(configPath, content);
     }
-    /**
-     * Best-effort: ensure Exa and Context7 MCPs are configured for Codex.
-     * Appends to ~/.codex/config.toml if the MCP entries don't already exist.
-     */
-    provisionMcps() {
-        const home = this.fs.homedir ?? os.homedir();
-        if (!home)
+    provisionActivityHooks(binding) {
+        if (!binding.cwd || !this.activityHookRelayAssetPath)
             return;
-        const configPath = nodePath.join(home, ".codex", "config.toml");
-        this.fs.mkdirp(nodePath.dirname(configPath));
-        let content = "";
+        const relayDest = nodePath.join(binding.cwd, ".openrig", "activity-hook-relay.cjs");
+        this.fs.mkdirp(nodePath.dirname(relayDest));
+        this.fs.writeFile(relayDest, this.fs.readFile(this.activityHookRelayAssetPath));
+        const codexDir = nodePath.join(binding.cwd, ".codex");
+        this.fs.mkdirp(codexDir);
+        const hooksPath = nodePath.join(codexDir, "hooks.json");
+        const hooksConfig = this.readJsonObject(hooksPath);
+        const hooks = this.readJsonObjectField(hooksConfig, "hooks");
+        const command = `node ${shellQuote(relayDest)}`;
+        for (const event of ["SessionStart", "UserPromptSubmit", "Stop"]) {
+            upsertCommandHook(hooks, event, command);
+        }
+        hooksConfig["hooks"] = hooks;
+        this.fs.writeFile(hooksPath, `${JSON.stringify(hooksConfig, null, 2)}\n`);
+        const configPath = nodePath.join(codexDir, "config.toml");
+        const existingConfig = this.fs.exists(configPath) ? this.fs.readFile(configPath) : "";
+        this.fs.writeFile(configPath, upsertCodexHooksFeature(existingConfig));
+    }
+    readJsonObject(path) {
         try {
-            if (this.fs.exists(configPath))
-                content = this.fs.readFile(configPath);
+            if (!this.fs.exists(path))
+                return {};
+            const parsed = JSON.parse(this.fs.readFile(path));
+            return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)
+                ? parsed
+                : {};
         }
         catch {
-            content = "";
-        }
-        // Add Exa if not present
-        if (!content.includes('[mcp_servers.exa]')) {
-            content += '\n[mcp_servers.exa]\nurl = "https://mcp.exa.ai/mcp"\n';
-        }
-        // Add Context7 if not present
-        if (!content.includes('[mcp_servers.context7]')) {
-            content += '\n[mcp_servers.context7]\nurl = "https://mcp.context7.com/mcp"\n';
+            return {};
         }
-        this.fs.writeFile(configPath, content);
+    }
+    readJsonObjectField(source, key) {
+        const value = source[key];
+        return typeof value === "object" && value !== null && !Array.isArray(value)
+            ? value
+            : {};
     }
     workspaceTrustKeys(cwd) {
         const keys = new Set([nodePath.resolve(cwd)]);
@@ -306,6 +420,9 @@ export class CodexRuntimeAdapter {
                         return threadId;
                 }
             }
+            if (binding.tmuxSession) {
+                await this.dismissSkippableCodexUpdatePrompt(binding.tmuxSession, 1);
+            }
             await this.sleep(250);
         }
         return undefined;
@@ -334,10 +451,33 @@ export class CodexRuntimeAdapter {
                     recovery: "retry_fresh",
                 };
             }
+            // Codex auth-refusal: stored OAuth token can no longer be refreshed.
+            // Recoverable — operator runs `codex login` and the seat continues.
+            // Mirror Claude's evidence shape (last 12 pane lines per
+            // claude-resume.ts:97). Closes the guard-blocked pod-aware-path gap
+            // alongside the legacy CodexResumeAdapter path patched at 63ee206.
+            if (probe.status === "attention_required") {
+                return {
+                    ok: false,
+                    error: probe.detail,
+                    recovery: "attention_required",
+                    evidence: paneContent.split("\n").slice(-12).join("\n"),
+                };
+            }
             if (probe.status === "resumed") {
                 return { ok: true };
             }
-            if (probe.code === "trust_gate" || probe.code === "update_gate") {
+            if (probe.code === "update_gate") {
+                const dismissed = await this.dismissSkippableCodexUpdatePrompt(tmuxSession, 1);
+                if (dismissed) {
+                    if (attempt < attempts - 1) {
+                        await this.sleep(200);
+                    }
+                    continue;
+                }
+                return { ok: true };
+            }
+            if (probe.code === "trust_gate") {
                 return { ok: true };
             }
             if (attempt < attempts - 1) {
@@ -382,6 +522,89 @@ function upsertCodexProjectTrust(content, projectPath) {
     }
     return `${lines.join("\n").replace(/\n*$/, "\n")}`;
 }
+function parseCanonicalSessionName(sessionName) {
+    const trimmed = sessionName.trim();
+    const atIndex = trimmed.indexOf("@");
+    if (atIndex <= 0 || atIndex !== trimmed.lastIndexOf("@") || atIndex === trimmed.length - 1)
+        return null;
+    const local = trimmed.slice(0, atIndex);
+    const rig = trimmed.slice(atIndex + 1);
+    const separatorIndex = local.indexOf("-");
+    if (separatorIndex <= 0 || separatorIndex === local.length - 1)
+        return null;
+    const pod = local.slice(0, separatorIndex);
+    const member = local.slice(separatorIndex + 1);
+    if (!isSafeQueueSegment(pod) || !isSafeQueueSegment(member) || !isSafeQueueSegment(rig))
+        return null;
+    return { pod, member, rig };
+}
+function isSafeQueueSegment(segment) {
+    return /^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(segment);
+}
+function upsertCodexHooksFeature(content) {
+    const lines = content.length > 0 ? content.replace(/\n*$/, "").split("\n") : [];
+    const featuresIndex = lines.findIndex((line) => line.trim() === "[features]");
+    if (featuresIndex === -1) {
+        const prefix = lines.length > 0 ? `${lines.join("\n")}\n\n` : "";
+        return `${prefix}[features]\ncodex_hooks = true\n`;
+    }
+    let nextSectionIndex = lines.length;
+    for (let i = featuresIndex + 1; i < lines.length; i++) {
+        if (lines[i].trim().startsWith("[")) {
+            nextSectionIndex = i;
+            break;
+        }
+    }
+    const flagIndex = lines.findIndex((line, index) => index > featuresIndex &&
+        index < nextSectionIndex &&
+        line.trim().startsWith("codex_hooks"));
+    if (flagIndex >= 0) {
+        lines[flagIndex] = "codex_hooks = true";
+    }
+    else {
+        lines.splice(featuresIndex + 1, 0, "codex_hooks = true");
+    }
+    return `${lines.join("\n")}\n`;
+}
+function upsertManagedCodexConfigFragment(content, id, fragment) {
+    const start = `# BEGIN OPENRIG MANAGED CODEX CONFIG FRAGMENT: ${id}`;
+    const end = `# END OPENRIG MANAGED CODEX CONFIG FRAGMENT: ${id}`;
+    const block = `${start}\n${fragment.replace(/\n*$/, "")}\n${end}\n`;
+    const pattern = new RegExp(`${escapeRegExp(start)}[\\s\\S]*?${escapeRegExp(end)}\\n?`, "m");
+    if (pattern.test(content)) {
+        return content.replace(pattern, block);
+    }
+    const prefix = content.replace(/\n*$/, "");
+    return prefix.length > 0 ? `${prefix}\n\n${block}` : block;
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function upsertCommandHook(hooks, event, command) {
+    const eventEntries = Array.isArray(hooks[event]) ? hooks[event] : [];
+    if (eventEntries.some((entry) => hookEntryContainsCommand(entry, command))) {
+        hooks[event] = eventEntries;
+        return;
+    }
+    eventEntries.push({
+        hooks: [
+            { type: "command", command, timeout: 5 },
+        ],
+    });
+    hooks[event] = eventEntries;
+}
+function hookEntryContainsCommand(entry, command) {
+    if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+        return false;
+    const hooks = entry["hooks"];
+    if (!Array.isArray(hooks))
+        return false;
+    return hooks.some((hook) => typeof hook === "object" &&
+        hook !== null &&
+        !Array.isArray(hook) &&
+        hook["type"] === "command" &&
+        hook["command"] === command);
+}
 function defaultListProcesses() {
     try {
         const output = execFileSync("ps", ["-Ao", "pid,ppid,command"], { encoding: "utf-8" });
@@ -433,4 +656,8 @@ function commandLooksLikeCodex(command) {
         return base === "codex";
     });
 }
+function isSkippableCodexUpdatePrompt(paneContent) {
+    return paneContent.includes("Update available!")
+        && paneContent.includes("Skip until next version");
+}
 //# sourceMappingURL=codex-runtime-adapter.js.map