@openrig/cli 0.6.10 → 0.6.12

package/daemon/dist/adapters/claude-code-adapter.d.ts

@@ -35,6 +35,7 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     private collectorAssetPath;
     private autoDriveProviderPrompts;
     private listProcesses?;
+    private readinessTimeoutMs?;
     private autoLaunches;
     readonly claudeManagedLaunch?: ClaudeManagedLaunch;
     private activityRelayPath;
@@ -52,6 +53,8 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
         collectorAssetPath?: string;
         autoDriveProviderPrompts?: boolean;
         listProcesses?: NativeProcessLister;
+        /** Bound on a slow resume's wait, from the launch (default: runtime.readiness_timeout_seconds). */
+        readinessTimeoutMs?: number;
         claudeManagedLaunch?: ClaudeManagedLaunch;
         /** DI source of the activity-relay.cjs asset (parity with the Codex adapter). */
         activityRelayPath?: string;
@@ -84,6 +87,16 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
         permissionMode?: NodeBinding["permissionMode"];
     }): void;
     private assessManagedProbe;
+    /** tmux names a shell for every OpenRig launch (the launch script is `sh`), so its word alone can't say
+     *  Claude is gone. With a bound pane, the process tree must show the pane's shell holding the terminal with
+     *  nothing under it; Claude, or a launch script about to start it, is a slow resume. */
+    private paneReturnedToShell;
+    /** Who holds the pane, by the observations already there. "another": positively something other than this launch's own
+     *  start: a ready screen whose lineage failed the check (with a process list that could be read), a Claude naming
+     *  another conversation, or a stable Codex. Waiting won't make any of them this launch's, and its token is not recorded
+     *  as an attempt. "own": this launch's Claude. "unknown": nothing seen yet (the launch script is starting it) or a
+     *  process list that can't be read, whatever the screen shows. One process listing serves the Claude observations. */
+    private paneOccupant;
     private verifyResumeLaunch;
     private projectEntry;
     /**
@@ -96,7 +109,11 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     private preserveMode;
     private pluginAppliesToClaude;
     private resolveTargetDir;
+    /** true when applied, "skipped" when handled but not applied, false when this isn't a resource it handles. */
     private applyRuntimeResource;
+    /** Merge a JSON fragment into a project file. An existing target that can't be read, or isn't a JSON object (it
+     *  doesn't parse, or it holds an array or a single value), belongs to its owner: it's left as it is, nothing is
+     *  merged, and a warning says so. Returns whether the fragment was applied. */
     private mergeJsonFragment;
     /**
      * Merge a managed block into the target guidance file. Returns `true` when
@@ -106,25 +123,10 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
      * of claiming a merge that never landed.
      */
     private mergeGuidance;
-    /**
-     * Best-effort token capture from ~/.claude/sessions/*.json.
-     * Finds the session file whose name matches the expected session name.
-     * Returns the sessionId if found, undefined otherwise.
-     */
-    /**
-     * PL-016 hardening v0+1 — poll captureResumeToken on the
-     * verifyResumeLaunch cadence. Returns the token as soon as the
-     * session file appears, or undefined after attempts × delayMs ceiling.
-     * Used by the fork branch where the new session-name file appears
-     * 1-3s after the Enter key is sent (cold-start fork-file write).
-     */
-    private pollForResumeToken;
-    private captureResumeToken;
     private detectDeliveryHint;
     private provisionManagedBootstrap;
     private provisionClaudeState;
     private workspaceTrustKeys;
-    private readJsonObject;
     private readJsonObjectStrict;
     private readJsonObjectField;
     /**

package/daemon/dist/adapters/claude-code-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-code-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAElF,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;AAEvF,OAAO,EAAwD,KAAK,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAOrI,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAG9E,MAAM,WAAW,kBAAkB;IACjC,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,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACtC,sHAAsH;IACtH,QAAQ,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAChC,mGAAmG;IACnG,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,6DAA6D;IAC7D,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAWD;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IACtD,QAAQ,CAAC,OAAO,iBAAiB;IACjC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,qBAAqB,CAAC,CAAwB;IACtD,OAAO,CAAC,EAAE,CAAqB;IAC/B,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,wBAAwB,CAAU;IAC1C,OAAO,CAAC,aAAa,CAAC,CAAsB;IAC5C,OAAO,CAAC,YAAY,CAA0I;IAC9J,QAAQ,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IACnD,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,uBAAuB,CAAgB;IAC/C;6FACyF;IACzF,OAAO,CAAC,gBAAgB,CAAgD;gBAE5D,IAAI,EAAE;QAChB,IAAI,EAAE,WAAW,CAAC;QAClB,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;QAC9C,KAAK,EAAE,kBAAkB,CAAC;QAC1B,gBAAgB,CAAC,EAAE,MAAM,MAAM,CAAC;QAChC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,iFAAiF;QACjF,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B;sFAC8E;QAC9E,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC;+FACuF;QACvF,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;KAClE;IAgBK,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;IAoD9E,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA+DzJ,aAAa,CACjB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,8BAA8B,EAAE,UAAU,CAAA;KAAE,GAC3G,OAAO,CAAC,mBAAmB,CAAC;IA2HzB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;IAkBhE,8FAA8F;IAC9F,sBAAsB,CAAC,OAAO,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI;IAI3F,wFAAwF;IACxF,sBAAsB,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,cAAc,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAA;KAAE,GAAG,IAAI;YAM9I,kBAAkB;YAsClB,kBAAkB;IA2EhC,OAAO,CAAC,YAAY;IAgEpB;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,iBAAiB;IAQzB;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAoBrB;;;;OAIG;IACH;;;;;;OAMG;YACW,kBAAkB;IAgBhC,OAAO,CAAC,kBAAkB;IAqB1B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,yBAAyB;IAwCjC,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,mBAAmB;IAS3B;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,yBAAyB;IA2CjC;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,4BAA4B;CAkFrC;AA+HD,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAOD;;;;kDAIkD;AAClD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,oBAAoB,CAAC;CAC7B,GAAG,OAAO,gCAAgC,EAAE,gBAAgB,GAAG,IAAI,CAyCnE"}
+{"version":3,"file":"claude-code-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code-adapter.ts"],"names":[],"mappings":"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"}

package/daemon/dist/adapters/claude-code-adapter.js

@@ -5,21 +5,17 @@ import { createHash, randomUUID } from "node:crypto";
 import { claudePostureFlag, claudeClassicRendererEnvPrefix } from "./yolo-mode.js";
 import { resolveConcreteHint } from "../domain/runtime-adapter.js";
 import { assessNativeResumeProbe } from "../domain/native-resume-probe.js";
-import { observeClaudePaneProcess } from "../domain/native-process-lineage.js";
+import { resolveReadinessTimeoutMs } from "../domain/readiness-timeout.js";
+import { listNativeProcesses, observeClaudeDelivery, observeClaudePaneProcess, observeClaudePaneRuntime, observeCodexPaneProcess, verifyCodexPaneProcess, verifyPaneIdleShell } from "../domain/native-process-lineage.js";
 import { mergeManagedBlock, DEFAULT_CLAUDE_MANAGED_BLOCK_FILE } from "../domain/managed-blocks.js";
 import { claudeResumeLaunchEnv, claudeResumeLaunchPrefix } from "./claude-resume-launch.js";
 import { shellQuote } from "./shell-quote.js";
 import { validateClaudeActivityHookDelivery, claudeActivityRelayPath, CLAUDE_ACTIVITY_RELAY_RELATIVE_PATH } from "../domain/claude-activity-hooks.js";
+import { isFilesystemRoot } from "../domain/cwd-resolution.js";
 import { observeClaudePermission } from "../domain/permission-drift.js";
 import { unresolvedClaudePermissionModes } from "../domain/native-permission-selection.js";
 import { contextUsageDirectory, providerUsageDirectory } from "../domain/telemetry-state-paths.js";
 const SHELL_COMMANDS = new Set(["bash", "fish", "nu", "sh", "tmux", "zsh"]);
-// Real Claude Code binary needs 1-3s to write the new fork session-name
-// file under ~/.claude/sessions/. Poll instead of single-shot lookup.
-// 12 × 500ms = 6s ceiling — comfortably above the observed cold-start
-// fork-file write window without making a bad-token error feel slow.
-const FORK_POLL_ATTEMPTS = 12;
-const FORK_POLL_DELAY_MS = 500;
 /**
  * Claude Code runtime adapter. Projects resources to .claude/ targets
  * and delivers startup files via guidance merge, skill install, or tmux send-text.
@@ -35,6 +31,7 @@ export class ClaudeCodeAdapter {
     collectorAssetPath;
     autoDriveProviderPrompts;
     listProcesses;
+    readinessTimeoutMs;
     autoLaunches = new Map();
     claudeManagedLaunch;
     activityRelayPath;
@@ -52,6 +49,7 @@ export class ClaudeCodeAdapter {
         this.collectorAssetPath = deps.collectorAssetPath ?? null;
         this.autoDriveProviderPrompts = deps.autoDriveProviderPrompts ?? false;
         this.listProcesses = deps.listProcesses;
+        this.readinessTimeoutMs = deps.readinessTimeoutMs;
         this.claudeManagedLaunch = deps.claudeManagedLaunch;
         this.activityRelayPath = deps.activityRelayPath ?? null;
         this.claudeHooksManifestPath = deps.claudeHooksManifestPath ?? null;
@@ -100,7 +98,12 @@ export class ClaudeCodeAdapter {
             activityOutcome = this.reconcileClaudeActivityHooks(binding.cwd, activityEntries.length > 0);
         }
         catch (err) {
-            console.error(`[openrig] claude activity-hook reconcile warning: ${err.message}`);
+            // #226: delivery at '/' is still attempted (it works where '/' is writable); when it fails there, say why.
+            // A binding without a cwd (startup bootstraps the stored node's selection) gets the plain warning.
+            const atRoot = binding.cwd && isFilesystemRoot(binding.cwd)
+                ? ` (cwd '${binding.cwd}' resolves to the filesystem root, not a project workspace)`
+                : "";
+            console.error(`[openrig] claude activity-hook reconcile warning${atRoot}: ${err.message}`);
             activityOutcome = { changed: false, delivered: false, sourceMissing: false, manifestUnavailable: false, settingsUnparseable: false };
         }
         // Never claim a resource as PROJECTED when delivery could not happen (missing
@@ -225,9 +228,10 @@ export class ClaudeCodeAdapter {
         const modelArg = model ? ` --model ${shellQuote(model)}` : "";
         const effort = binding.effort?.trim();
         const effortArg = effort ? ` --effort ${shellQuote(effort)}` : "";
-        // Fork branch: build `claude --resume <parent> --fork-session --name <seat>`
-        // and capture the NEW post-fork session id. The parent token is NEVER
-        // persisted onto the new seat record (identity-honesty bedrock).
+        // Fork branch: `claude --resume <parent> --fork-session --session-id <fork> --name <seat>`
+        // (Claude Code 2.0.73 or later). The fork's own id is chosen here, like a fresh launch's,
+        // so the parent token is NEVER persisted onto the new seat record (identity-honesty
+        // bedrock) and the fork's argv names the conversation it runs.
         if (opts.forkSource) {
             if (opts.forkSource.kind !== "native_id") {
                 return {
@@ -239,12 +243,13 @@ export class ClaudeCodeAdapter {
             if (!parentId) {
                 return { ok: false, error: "claude-code fork: forkSource.value is required (parent native_id)" };
             }
+            const forkSessionId = this.sessionIdFactory();
             const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...operationalLaunchArgs(this.runtime, binding), ...(model ? ["--model", model] : []), ...(effort ? ["--effort", effort] : []),
-                "--resume", parentId, "--fork-session", "--name", opts.name])
+                "--resume", parentId, "--fork-session", "--session-id", forkSessionId, "--name", opts.name])
                 // The non-managed command text is parsed by the pane shell, so the
                 // parent id needs the same quoting as --model/--effort above (and as
                 // the codex fork path) — a hostile id must not leave --resume.
-                : `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg} --resume ${shellQuote(parentId)} --fork-session --name ${opts.name}`;
+                : `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg} --resume ${shellQuote(parentId)} --fork-session --session-id ${forkSessionId} --name ${opts.name}`;
             const textResult = managed ? await this.tmux.sendShellCommand(binding.tmuxSession, cmd, managed.assertCurrent)
                 : this.seatLaunchEnvironment
                     ? await this.tmux.sendShellCommand(binding.tmuxSession, await this.seatLaunchEnvironment.command(binding.tmuxSession, cmd, { nodeId: binding.nodeId, generation: binding.launchGeneration, runtime: this.runtime }), undefined, { sourceInPane: true })
@@ -256,19 +261,9 @@ export class ClaudeCodeAdapter {
             if (!enterResult.ok) {
                 return { ok: false, error: `Failed to send Enter: ${enterResult.message}` };
             }
-            // claude needs 1-3s to write the new fork session-name file under
-            // ~/.claude/sessions/. The original implementation captured the
-            // token IMMEDIATELY after Enter, which always returned undefined
-            // against a real binary. Poll on the
-            // verifyResumeLaunch cadence (12 × 500ms = 6s ceiling).
-            const newToken = await this.pollForResumeToken(opts.name, FORK_POLL_ATTEMPTS, FORK_POLL_DELAY_MS, managed?.configDir);
-            if (!newToken) {
-                return {
-                    ok: false,
-                    error: `claude-code fork: could not capture new post-fork session id from claude session storage after ${FORK_POLL_ATTEMPTS} polls (${(FORK_POLL_ATTEMPTS * FORK_POLL_DELAY_MS) / 1000}s ceiling)`,
-                };
-            }
-            return { ok: true, resumeToken: newToken, resumeType: "claude_id", appliedLaunch };
+            // As with a fresh launch, nothing is read back from Claude's session files: a same-name
+            // file can belong to an earlier occupant or another seat sharing the config directory.
+            return { ok: true, resumeToken: forkSessionId, resumeType: "claude_id", appliedLaunch };
         }
         const generatedSessionId = opts.resumeToken ? null : this.sessionIdFactory();
         const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...operationalLaunchArgs(this.runtime, binding), ...(model ? ["--model", model] : []), ...(effort ? ["--effort", effort] : []),
@@ -313,6 +308,16 @@ export class ClaudeCodeAdapter {
         const paneCommand = await this.tmux.getPaneCommand(binding.tmuxSession);
         const paneContent = (await this.tmux.capturePaneContent(binding.tmuxSession, 40)) ?? "";
         const probe = await this.assessManagedProbe(binding, paneCommand, paneContent);
+        // A script-launched Claude reads as `sh` until the script hands over the foreground, so the label alone
+        // is not a return to a shell. Say so only for a proven idle shell (the rule Codex's checkReady uses).
+        if (probe.code === "returned_to_shell"
+            && !await verifyPaneIdleShell({ target: binding.tmuxSession, tmux: this.tmux, listProcesses: this.listProcesses })) {
+            return {
+                ready: false,
+                reason: "The pane shows a shell that is not a proven idle shell; a launch script may still be starting Claude.",
+                code: "awaiting_runtime",
+            };
+        }
         if (probe.status === "resumed")
             return { ready: true };
         return { ready: false, reason: probe.detail, code: probe.code };
@@ -374,9 +379,54 @@ export class ClaudeCodeAdapter {
             return probe;
         }
     }
+    /** tmux names a shell for every OpenRig launch (the launch script is `sh`), so its word alone can't say
+     *  Claude is gone. With a bound pane, the process tree must show the pane's shell holding the terminal with
+     *  nothing under it; Claude, or a launch script about to start it, is a slow resume. */
+    async paneReturnedToShell(binding, paneCommand) {
+        if (!paneCommand || !SHELL_COMMANDS.has(paneCommand))
+            return false;
+        if (!binding.tmuxPane)
+            return true;
+        const observed = await observeClaudeDelivery({ target: binding.tmuxPane, tmux: this.tmux, listProcesses: this.listProcesses }, { unknownKeepsIdle: false });
+        return observed.state === "idle_shell";
+    }
+    /** Who holds the pane, by the observations already there. "another": positively something other than this launch's own
+     *  start: a ready screen whose lineage failed the check (with a process list that could be read), a Claude naming
+     *  another conversation, or a stable Codex. Waiting won't make any of them this launch's, and its token is not recorded
+     *  as an attempt. "own": this launch's Claude. "unknown": nothing seen yet (the launch script is starting it) or a
+     *  process list that can't be read, whatever the screen shows. One process listing serves the Claude observations. */
+    async paneOccupant(binding, looksReady) {
+        const launch = this.autoLaunches.get(binding.nodeId);
+        if (!binding.tmuxPane || !launch)
+            return looksReady ? "another" : "unknown";
+        let rows;
+        try {
+            rows = await (this.listProcesses ?? listNativeProcesses)();
+        }
+        catch {
+            return "unknown";
+        }
+        if (looksReady)
+            return "another";
+        const observation = { target: binding.tmuxPane, tmux: this.tmux, listProcesses: () => rows, selectedExecutable: launch.executable };
+        if (await observeClaudePaneProcess({ ...observation, expectedToken: launch.token }))
+            return "own";
+        if (await observeClaudePaneRuntime(observation))
+            return "another";
+        return await observeCodexPaneProcess(observation) && await verifyCodexPaneProcess({ ...observation, listProcesses: this.listProcesses })
+            ? "another" : "unknown";
+    }
     async verifyResumeLaunch(binding) {
         const tmuxSession = binding.tmuxSession;
-        const attempts = 16;
+        // A quick window, then a longer one only while the boot is still in progress, as the Codex adapter does it.
+        // The longer one is the readiness setting less the quick window, as a number of polls counted from here; it is per
+        // seat, nothing is shared across the seats of a restore. A setting no longer than the quick window adds no polls, but
+        // an unresolved boot is still kept (attention_required) rather than failed.
+        const pollMs = 200;
+        const windowAttempts = 16;
+        const checkEvery = 5;
+        let attempts = windowAttempts;
+        let slowStart = false;
         for (let attempt = 0; attempt < attempts; attempt++) {
             const paneCommand = await this.tmux.getPaneCommand(tmuxSession);
             const paneContent = (await this.tmux.capturePaneContent(tmuxSession, 40)) ?? "";
@@ -386,6 +436,7 @@ export class ClaudeCodeAdapter {
                     ok: false,
                     error: "Claude resume failed: no conversation found for the requested session",
                     recovery: "retry_fresh",
+                    missingConversation: true,
                 };
             }
             if (probe.status === "resumed") {
@@ -403,6 +454,12 @@ export class ClaudeCodeAdapter {
                 };
             }
             if (this.autoDriveProviderPrompts && probe.code === "trust_gate") {
+                // In the longer wait the occupant has not been looked at since the window ended: press Enter only for this launch's
+                // own Claude. Anything else keeps main's result, as if the loop had ended.
+                if (slowStart && await this.paneOccupant(binding, false) !== "own") {
+                    slowStart = false;
+                    break;
+                }
                 const enterResult = await this.tmux.sendKeys(tmuxSession, ["Enter"]);
                 if (!enterResult.ok) {
                     return { ok: false, error: `Claude trust prompt auto-drive failed: ${enterResult.message}` };
@@ -410,8 +467,48 @@ export class ClaudeCodeAdapter {
                 await this.sleep(200);
                 continue;
             }
+            // Only a boot in progress (no verdict, no gate, a label that proves nothing) is worth waiting for; a real
+            // gate (login, trust or MCP approval, auto-mode identity) won't clear itself.
+            const booting = probe.code === "awaiting_runtime" || probe.code === "returned_to_shell";
+            if (slowStart && !booting) {
+                slowStart = false;
+                break;
+            }
+            // A start in progress can't have drawn Claude's ready screen. One that has, with its lineage unproven, keeps
+            // main's result whenever it draws: at the window's end, or at any poll of the longer wait.
+            const looksReady = (attempt === windowAttempts - 1 || slowStart) && booting
+                && assessNativeResumeProbe({ runtime: "claude-code", paneCommand, paneContent,
+                    claudeAutoIdentityVerified: true, claudeResumeIdentityVerified: true }).status === "resumed";
+            if (slowStart && looksReady && await this.paneOccupant(binding, true) === "another") {
+                slowStart = false;
+                break;
+            }
+            // Checked where the window ends and then about once a second of the longer wait (two listings for the shell, one for
+            // the occupant), not on every poll. A shell label can't tell Claude having exited from the launch script not having
+            // started it yet, and the occupant can change while we wait, so the process tree decides.
+            const windowEnd = attempt === windowAttempts - 1;
+            if (booting && (windowEnd || (slowStart && (attempt - windowAttempts + 1) % checkEvery === 0))) {
+                if (await this.paneReturnedToShell(binding, await this.tmux.getPaneCommand(tmuxSession))) {
+                    // Provably back at its shell: the final check reports it. If it isn't by then, the seat is kept.
+                    if (slowStart) {
+                        attempts = attempt + 1;
+                        break;
+                    }
+                }
+                else if (await this.paneOccupant(binding, looksReady) === "another") {
+                    // Not this launch's start: keep main's result.
+                    slowStart = false;
+                    break;
+                }
+                else if (windowEnd) {
+                    // A boot in progress, or one we can't see: keep the launch past the window even when the readiness setting
+                    // leaves no room for more polls (1 to 3 s), so it ends as attention_required, not as the failure that loses the token.
+                    attempts = windowAttempts + Math.floor(Math.max(0, resolveReadinessTimeoutMs(this.readinessTimeoutMs) - windowAttempts * pollMs) / pollMs);
+                    slowStart = true;
+                }
+            }
             if (attempt < attempts - 1) {
-                await this.sleep(200);
+                await this.sleep(pollMs);
             }
         }
         const finalCommand = await this.tmux.getPaneCommand(tmuxSession);
@@ -428,19 +525,43 @@ export class ClaudeCodeAdapter {
                 evidence: finalContent.split("\n").slice(-12).join("\n"),
             };
         }
-        if (finalCommand && SHELL_COMMANDS.has(finalCommand)) {
+        // The wait can end on the read that first shows Claude's missing-conversation report.
+        if (finalProbe.code === "no_conversation_found") {
+            return {
+                ok: false,
+                error: "Claude resume failed: no conversation found for the requested session",
+                recovery: "retry_fresh",
+                missingConversation: true,
+            };
+        }
+        if (await this.paneReturnedToShell(binding, finalCommand)) {
             return {
                 ok: false,
                 error: "Claude resume failed: pane returned to shell instead of entering Claude",
                 recovery: "retry_fresh",
             };
         }
+        // The occupant can change after the last check in the loop, so the end of the wait looks once more, with the screen
+        // judged as in the loop: a different occupant (or a ready-looking screen on a readable list) keeps main's result.
+        if (slowStart && (finalProbe.code === "awaiting_runtime" || finalProbe.code === "returned_to_shell")
+            && await this.paneOccupant(binding, assessNativeResumeProbe({ runtime: "claude-code", paneCommand: finalCommand, paneContent: finalContent,
+                claudeAutoIdentityVerified: true, claudeResumeIdentityVerified: true }).status === "resumed") !== "another") {
+            // Claude, or the script about to start it, may still be coming up. Keep the launch and its resume token for
+            // a person (or the reconciler) rather than failing a seat that may be running. Never `resumed` from this.
+            return {
+                ok: false,
+                error: `Claude resume did not finish within ${Math.round(attempts * pollMs / 1000)}s; Claude may still be starting, so the launch was kept`,
+                recovery: "attention_required",
+                evidence: finalContent.split("\n").slice(-12).join("\n"),
+            };
+        }
         return { ok: false, error: "Claude resume failed: timed out waiting for Claude to become active" };
     }
     projectEntry(entry, cwd, managedBlockFile, warnings) {
-        if (entry.category === "runtime_resource" && this.applyRuntimeResource(entry, cwd)) {
-            return true;
-        }
+        // A skipped fragment is reported skipped; it never falls through to the generic extensions copy.
+        const handled = entry.category === "runtime_resource" ? this.applyRuntimeResource(entry, cwd, warnings) : false;
+        if (handled)
+            return handled === true;
         if (entry.category === "guidance" && entry.mergeStrategy === "managed_block") {
             const targetPath = nodePath.join(cwd, managedBlockFile);
             const content = this.fs.readFile(entry.absolutePath);
@@ -531,14 +652,13 @@ export class ClaudeCodeAdapter {
             default: return null;
         }
     }
-    applyRuntimeResource(entry, cwd) {
+    /** true when applied, "skipped" when handled but not applied, false when this isn't a resource it handles. */
+    applyRuntimeResource(entry, cwd, warnings) {
         switch (entry.resourceType) {
             case "claude_settings_fragment":
-                this.mergeJsonFragment(entry.absolutePath, nodePath.join(cwd, ".claude", "settings.local.json"));
-                return true;
+                return this.mergeJsonFragment(entry.absolutePath, nodePath.join(cwd, ".claude", "settings.local.json"), warnings) || "skipped";
             case "claude_mcp_fragment":
-                this.mergeJsonFragment(entry.absolutePath, nodePath.join(cwd, ".mcp.json"));
-                return true;
+                return this.mergeJsonFragment(entry.absolutePath, nodePath.join(cwd, ".mcp.json"), warnings) || "skipped";
             case "claude_activity_hooks":
                 // Handled (no generic .claude/extensions copy): the relay asset is
                 // delivered + the settings hooks reconciled by reconcileClaudeActivityHooks
@@ -548,12 +668,43 @@ export class ClaudeCodeAdapter {
                 return false;
         }
     }
-    mergeJsonFragment(sourcePath, targetPath) {
+    /** Merge a JSON fragment into a project file. An existing target that can't be read, or isn't a JSON object (it
+     *  doesn't parse, or it holds an array or a single value), belongs to its owner: it's left as it is, nothing is
+     *  merged, and a warning says so. Returns whether the fragment was applied. */
+    mergeJsonFragment(sourcePath, targetPath, warnings) {
         const fragment = this.readJsonObjectStrict(sourcePath);
-        const existing = this.readJsonObject(targetPath);
+        // The reasons are fixed text: a parser message can quote the file's content.
+        const leave = (reason) => {
+            warnings.push(`Left ${targetPath} as it is: ${reason}. The fragment ${sourcePath} wasn't applied; once the file is fixed, the next fresh launch applies it (resuming or restoring the session doesn't).`);
+            return false;
+        };
+        let existing = {};
+        if (this.fs.exists(targetPath)) {
+            let text;
+            try {
+                text = this.fs.readFile(targetPath);
+            }
+            catch {
+                return leave("it couldn't be read");
+            }
+            if (text.trim() !== "") {
+                let parsed;
+                try {
+                    parsed = JSON.parse(text);
+                }
+                catch {
+                    return leave("it isn't valid JSON");
+                }
+                if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+                    return leave(`it holds ${Array.isArray(parsed) ? "a JSON array" : parsed === null ? "JSON null" : `a JSON ${typeof parsed}`}, not an object`);
+                }
+                existing = parsed;
+            }
+        }
         const merged = mergeJsonObjects(existing, fragment);
         this.fs.mkdirp(nodePath.dirname(targetPath));
         this.fs.writeFile(targetPath, JSON.stringify(merged, null, 2));
+        return true;
     }
     /**
      * Merge a managed block into the target guidance file. Returns `true` when
@@ -579,54 +730,6 @@ export class ClaudeCodeAdapter {
         });
         return true;
     }
-    /**
-     * Best-effort token capture from ~/.claude/sessions/*.json.
-     * Finds the session file whose name matches the expected session name.
-     * Returns the sessionId if found, undefined otherwise.
-     */
-    /**
-     * PL-016 hardening v0+1 — poll captureResumeToken on the
-     * verifyResumeLaunch cadence. Returns the token as soon as the
-     * session file appears, or undefined after attempts × delayMs ceiling.
-     * Used by the fork branch where the new session-name file appears
-     * 1-3s after the Enter key is sent (cold-start fork-file write).
-     */
-    async pollForResumeToken(expectedName, attempts, delayMs, configDir) {
-        for (let attempt = 0; attempt < attempts; attempt++) {
-            const token = this.captureResumeToken(expectedName, configDir);
-            if (token)
-                return token;
-            if (attempt < attempts - 1) {
-                await this.sleep(delayMs);
-            }
-        }
-        return undefined;
-    }
-    captureResumeToken(expectedName, configDir) {
-        try {
-            const home = this.fs.homedir ?? (typeof process !== "undefined" ? process.env.HOME : undefined);
-            if ((!home && !configDir) || !this.fs.readdir)
-                return undefined;
-            const sessDir = nodePath.join(configDir ?? nodePath.join(home, ".claude"), "sessions");
-            if (!this.fs.exists(sessDir))
-                return undefined;
-            const files = this.fs.readdir(sessDir);
-            for (const file of files) {
-                if (!file.endsWith(".json"))
-                    continue;
-                try {
-                    const content = this.fs.readFile(nodePath.join(sessDir, file));
-                    const data = JSON.parse(content);
-                    if (data.name === expectedName && data.sessionId) {
-                        return data.sessionId;
-                    }
-                }
-                catch { /* skip malformed files */ }
-            }
-        }
-        catch { /* best-effort */ }
-        return undefined;
-    }
     detectDeliveryHint(path, content) {
         return resolveConcreteHint(path, content);
     }
@@ -723,19 +826,6 @@ export class ClaudeCodeAdapter {
         }
         return Array.from(keys);
     }
-    readJsonObject(path) {
-        try {
-            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 {
-            return {};
-        }
-    }
     readJsonObjectStrict(path) {
         const parsed = JSON.parse(this.fs.readFile(path));
         if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
@@ -780,9 +870,9 @@ export class ClaudeCodeAdapter {
         const settingsPath = nodePath.join(binding.cwd, ".claude", "settings.local.json");
         this.fs.mkdirp(nodePath.dirname(settingsPath));
         // The seat cwd can be a shared repo whose project-local settings other sessions read (#421).
-        // Like the activity hooks, never clobber text we cannot parse. An empty file holds no settings
-        // and is treated as `{}`. Valid JSON that is not an object (for example `[]`) is still
-        // replaced, as before.
+        // Like the activity hooks, never clobber text we cannot parse, nor valid JSON that isn't an
+        // object (for example `[]`): the status line isn't installed there. An empty file holds no
+        // settings and is treated as `{}`.
         let existing = {};
         if (this.fs.exists(settingsPath)) {
             const text = this.fs.readFile(settingsPath);
@@ -794,8 +884,9 @@ export class ClaudeCodeAdapter {
                 catch {
                     return;
                 }
-                if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed))
-                    existing = parsed;
+                if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed))
+                    return;
+                existing = parsed;
             }
         }
         const statusLine = typeof existing["statusLine"] === "object" && existing["statusLine"] !== null
@@ -807,6 +898,10 @@ export class ClaudeCodeAdapter {
         const current = statusLine["command"];
         if (typeof current === "string" && current.trim() !== "" && current !== collectorCmd && !isOwnedCollectorCommand(current))
             return;
+        // Already installed as wanted: no write. Compared by value, so another writer's key order or spacing isn't a
+        // change. This avoids rewriting on every poll; it doesn't make a needed write safe against a concurrent writer.
+        if (statusLine["type"] === "command" && current === collectorCmd)
+            return;
         existing["statusLine"] = { ...statusLine, type: "command", command: collectorCmd };
         this.fs.writeFile(settingsPath, JSON.stringify(existing, null, 2));
     }