@openrig/cli 0.6.14 → 0.7.1

package/daemon/context-packs/skills/queue-handoff/SKILL.md

@@ -29,8 +29,9 @@ without an owner.
   with the rig appearing dormant.
 - **Finishing a slice that has a clear next step.** Default-nudge:
   receiver gets a wake-ping plus the durable queue item.
-- **Blocked on another agent's work.** Park the qitem with
-  `closure_reason: blocked_on` and the blocker qitem id.
+- **Blocked on another agent's work.** Use `rig queue block <id> --on <child>`
+  (or `rig queue update <id> --state blocked --blocked-on <child>`). The item
+  stays active and returns to pending when its blocker completes.
 - **Escalating to the human.** Make the escalation a durable attention
   item, not just a chat message.
 
@@ -53,16 +54,20 @@ human. The qitem state machine enforces this:
 `pending → in-progress → done` requires `closure_reason` from one of:
 
 - `handed_off_to` — work continues at a different seat (target = new owner)
-- `blocked_on` — parked pending another qitem (target = blocker qitem id)
 - `denied` — receiver rejected the work
 - `canceled` — sender or receiver withdrew
 - `no-follow-on` — terminal completion, nothing else needed
 - `escalation` — kicked up to a higher tier (target = escalation target)
+- `superseded` — replaced by another qitem (target = successor qitem id)
 
-Three of those (`handed_off_to`, `blocked_on`, `escalation`) additionally
+Two of those (`handed_off_to`, `escalation`) additionally
 require `closure_target`. The daemon enforces this at the domain layer;
 every surface (CLI, MCP, future UI) inherits the same guarantee.
 
+`done` is terminal. `closure_reason: blocked_on` is valid only on an active
+`state=blocked` park record, as used by workflow writers; combining it with
+`state=done` is rejected. Use the block command above to wait on another qitem.
+
 **The drafted-park failure (draft ≠ throw).** The rule is about the *actual* pass, not the
 intention to pass. A turn that ends with a self-instruction **typed into your own prompt but left
 unsent** — a drafted go-ahead, a next-atom note you never sent — has **not** handed off; it has
@@ -120,6 +125,7 @@ inverted the default-nudge polarity.
 - **Scope tags `project:<id>`, `mission:<id>`, `slice:<id>`** on project work, set when you create the row (`--tags`; `create` also takes `--mission` and `--slice`). Tags can't be edited afterwards. A handoff keeps the source row's tags unless you pass `--tags` or `--gate`, either of which replaces them; repeat the scope tags in `--tags` when you use `--gate`.
 - **Pass work on with `handoff-and-complete`.** It closes your row as done and records the next row as its successor in one step. A `create` followed by `update --state done --closure-reason handed_off_to` records no successor, and the stuck sweep raises a recovery item for it.
 - **Close what you hold.** A row you claimed ends in a handoff or an `update --state done --closure-reason …`; `rig queue overdue` lists claimed rows past their deadline.
+- **Use the write's response.** Read the row back only when the response doesn't show what you need (an indeterminate outcome, a field the compact output left out, downstream wake or pickup, a team custody rule): openrig-user, "After a queue write".
 - **Brief for the model that will read it.** Before handing a peer open-ended work, check which model it runs: `delegating-work`, "Check what kind of agent you're handing it to".
 
 ## Queue-body hygiene (token + parse safety)

package/daemon/context-packs/skills/queue-handoff/manifest.yaml

@@ -1,7 +1,7 @@
 # GENERATED by scripts/generate-context-packs.mjs — DO NOT EDIT.
 # Package-time projection of a canonical skill; regenerated every build.
 name: "queue-handoff"
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: "skills"
 purpose: "Use when ending a turn, finishing a slice, blocked on another agent's work, or escalating to a human — durable work handoff via queue items so the system keeps moving across compactions, missed messages, and interruptions. Covers the hot-potato terminal-turn-rule (active work ends by passing the ball, not by going idle), default-nudge semantics, and when `--no-nudge` is appropriate for intentional cold park or human gate."
 files:

package/daemon/context-packs/skills/refocusing/manifest.yaml

@@ -1,7 +1,7 @@
 # GENERATED by scripts/generate-context-packs.mjs — DO NOT EDIT.
 # Package-time projection of a canonical skill; regenerated every build.
 name: "refocusing"
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: "skills"
 purpose: "Use when a long-running agent may have lost the product outcome, when context was compacted, when work has crossed a major boundary, or when a fresh path-based trace is needed before the next consequential action. Not for fresh-session orientation, waking an idle seat, or checkpoints."
 files:

package/daemon/context-packs/skills/retiring-and-inheriting-a-seat/manifest.yaml

@@ -1,7 +1,7 @@
 # GENERATED by scripts/generate-context-packs.mjs — DO NOT EDIT.
 # Package-time projection of a canonical skill; regenerated every build.
 name: "retiring-and-inheriting-a-seat"
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: "skills"
 purpose: "Use when you are a sitting agent near your context threshold (~85%) and a PLANNED seat transition is due — retire deliberately and hand your seat to a fresh successor primed from a packet, rather than let compaction degrade you. Covers the handover packet, the append-only lineage ledger (one row per tenure), physical-seat continuity, the do-not-over-inherit framing, the optional warm-handoff window, and wake-v0 (consulting a retired predecessor). NOT for unplanned compaction/crash recovery (sess"
 files:

package/daemon/context-packs/skills/seat-continuity-and-handover/manifest.yaml

@@ -1,7 +1,7 @@
 # GENERATED by scripts/generate-context-packs.mjs — DO NOT EDIT.
 # Package-time projection of a canonical skill; regenerated every build.
 name: "seat-continuity-and-handover"
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: "skills"
 purpose: "Use when replacing a seat's occupant (rebuild/handover/swap), reasoning about stable-seat-identity vs fluid-occupant-identity, choosing an old-occupant disposition (retire/advise/shadow), or recording provenance for an occupant change. Two independent outcomes (continuityOutcome + seatBindingOutcome) and the 5 failure modes that prevent silent dishonesty."
 files:

package/daemon/context-packs/skills/session-compaction-and-restore/manifest.yaml

@@ -1,7 +1,7 @@
 # GENERATED by scripts/generate-context-packs.mjs — DO NOT EDIT.
 # Package-time projection of a canonical skill; regenerated every build.
 name: "session-compaction-and-restore"
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: "skills"
 purpose: "Use when reasoning about what survives compaction/context-loss/restart/seat-refresh, designing a high-fidelity restore packet, or distinguishing native runtime resume vs fork vs artifact-backed mental-model rebuild. Covers the 4 failure modes that prevent honest restore (compacted seat drops hot potato; restore packet preserves details but loses product intent; runtime resume mistaken for handover or fork; rebuilt seat starts with stale instructions)."
 files:

package/daemon/context-packs/skills/software-for-agents/manifest.yaml

@@ -1,7 +1,7 @@
 # GENERATED by scripts/generate-context-packs.mjs — DO NOT EDIT.
 # Package-time projection of a canonical skill; regenerated every build.
 name: "software-for-agents"
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: "skills"
 purpose: "Use when older OpenRig instructions name software-for-agents or describe agent-in-the-middle or studio software under the former skill name."
 files:

package/daemon/context-packs/world-example/manifest.yaml

@@ -1,5 +1,5 @@
 name: world-example
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: world
 purpose: "A fill-in template showing the anatomy of an OpenRig world pack."
 files:

package/daemon/context-packs/world-public/manifest.yaml

@@ -1,5 +1,5 @@
 name: world-public
-version: "0.6.14"
+version: "0.7.1"
 taxonomy: world
 purpose: "A portable operating-world primer that derives volatile facts and teaches agents to author their own world."
 files:

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

@@ -1,6 +1,6 @@
 import type { TmuxAdapter } from "./tmux.js";
 import type { SeatLaunchEnvironment } from "../domain/seat-launch-environment.js";
-import type { RuntimeAdapter, NodeBinding, ResolvedStartupFile, InstalledResource, ProjectionResult, StartupDeliveryResult, ReadinessResult, HarnessLaunchResult } from "../domain/runtime-adapter.js";
+import type { RuntimeAdapter, NodeBinding, ResolvedStartupFile, InstalledResource, ProjectionResult, StartupDeliveryResult, ReadinessResult, ReadinessOptions, HarnessLaunchResult } from "../domain/runtime-adapter.js";
 import type { ProjectionPlan } from "../domain/projection-planner.js";
 import { type NativeProcessLister } from "../domain/native-process-lineage.js";
 import type { ClaudeManagedLaunch } from "../domain/claude-managed-launch.js";
@@ -77,7 +77,7 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
         forkSource?: import("../domain/runtime-adapter.js").ForkSource;
         freshInPlace?: boolean;
     }): Promise<HarnessLaunchResult>;
-    checkReady(binding: NodeBinding): Promise<ReadinessResult>;
+    checkReady(binding: NodeBinding, options?: ReadinessOptions): Promise<ReadinessResult>;
     /** Best-effort public seam for tmux-bound Claude sessions adopted outside the launch path. */
     ensureContextCollector(binding: {
         cwd?: string | null;
@@ -95,6 +95,10 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
      * retain the old admission (including its ambiguity); visible gates and conflicting identity do not. */
     private assessFreshInPlaceProbe;
     private assessManagedProbe;
+    /** The observation `rig seat clear-attention` uses: the pane's one foreground Claude names exactly `resumeToken`, the
+     *  same process in two samples, with no frozen executable, in the session's only pane with an unchanged PID. Reads
+     *  only. Anything missing or inconclusive is not proof. */
+    private proveWithoutLaunch;
     /** 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. */

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":"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"}
+{"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,9 +5,10 @@ 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 { resumeProbeEvidence } from "../domain/native-resume-probe-evidence.js";
 import { resolveReadinessTimeoutMs } from "../domain/readiness-timeout.js";
-import { subtreeNamesClaudeExecutable, claudeCommandSessionToken, 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 { subtreeNamesClaudeExecutable, claudeCommandSessionToken, listNativeProcesses, observeClaudeDelivery, observeClaudePaneProcess, observeClaudePaneRuntime, observeCodexPaneProcess, verifyClaudePaneProcess, verifyCodexPaneProcess, verifyPaneIdleShell } from "../domain/native-process-lineage.js";
+import { isPerSeatRoleGuidance, mergeManagedBlock, perSeatRoleSkipWarning, 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, parseManagedClaudeNodeCommand } from "../domain/claude-activity-hooks.js";
@@ -15,6 +16,8 @@ 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";
+import { seatLaunchAdditionArgs } from "../domain/seat-launch-additions.js";
+import { recordSeatSkillWrite, seatPluginSkillsLossNote, seatProjectionComplete, seatSkillWriteRefusal } from "../domain/seat-skill-storage.js";
 const SHELL_COMMANDS = new Set(["bash", "fish", "nu", "sh", "tmux", "zsh"]);
 /**
  * Claude Code runtime adapter. Projects resources to .claude/ targets
@@ -59,7 +62,7 @@ export class ClaudeCodeAdapter {
     }
     async listInstalled(binding) {
         const results = [];
-        const skillsDir = nodePath.join(binding.cwd, ".claude", "skills");
+        const skillsDir = binding.seatSkillsRoot ?? nodePath.join(binding.cwd, ".claude", "skills");
         if (this.fs.exists(skillsDir) && this.fs.listFiles) {
             for (const file of this.fs.listFiles(skillsDir)) {
                 results.push({ effectiveId: file, category: "skill", installedPath: nodePath.join(skillsDir, file) });
@@ -78,7 +81,7 @@ export class ClaudeCodeAdapter {
                 continue;
             }
             try {
-                const didProject = this.projectEntry(entry, binding.cwd, binding.claudeManagedBlockFile ?? DEFAULT_CLAUDE_MANAGED_BLOCK_FILE, warnings);
+                const didProject = this.projectEntry(entry, binding.cwd, binding.claudeManagedBlockFile ?? DEFAULT_CLAUDE_MANAGED_BLOCK_FILE, warnings, binding.seatSkillsRoot, binding.seatSkillsRefused);
                 if (didProject) {
                     projected.push(entry.effectiveId);
                 }
@@ -143,7 +146,7 @@ export class ClaudeCodeAdapter {
         for (const file of files) {
             try {
                 const content = this.fs.readFile(file.absolutePath);
-                const hint = file.deliveryHint === "auto" ? this.detectDeliveryHint(file.path, content) : file.deliveryHint;
+                const hint = file.deliveryHint === "auto" ? this.detectDeliveryHint(file.path, content, file.orientation) : file.deliveryHint;
                 switch (hint) {
                     case "guidance_merge": {
                         const targetPath = nodePath.join(binding.cwd, binding.claudeManagedBlockFile ?? DEFAULT_CLAUDE_MANAGED_BLOCK_FILE);
@@ -153,10 +156,18 @@ export class ClaudeCodeAdapter {
                         break;
                     }
                     case "skill_install": {
-                        const targetDir = nodePath.join(binding.cwd, ".claude", "skills", nodePath.basename(nodePath.dirname(file.absolutePath)));
-                        this.fs.mkdirp(targetDir);
+                        const targetDir = nodePath.join(binding.seatSkillsRoot ?? nodePath.join(binding.cwd, ".claude", "skills"), nodePath.basename(nodePath.dirname(file.absolutePath)));
                         const skillTarget = nodePath.join(targetDir, nodePath.basename(file.path));
+                        // OPR.0.7.0.13: never write through a link out of the seat's storage.
+                        const refusal = binding.seatSkillsRoot ? binding.seatSkillsRefused ?? seatSkillWriteRefusal(binding.seatSkillsRoot, skillTarget) : undefined;
+                        if (refusal) {
+                            warnings.push(`skill_install: ${refusal}`);
+                            continue;
+                        }
+                        this.fs.mkdirp(targetDir);
                         this.fs.writeFile(skillTarget, content);
+                        if (binding.seatSkillsRoot)
+                            recordSeatSkillWrite(binding.seatSkillsRoot, skillTarget, file.absolutePath, content);
                         // P20 — record what we just wrote so the next projection can tell a
                         // stale re-projection (safe overwrite) from an operator edit (protect).
                         this.recordProjection(skillTarget, content);
@@ -230,6 +241,11 @@ export class ClaudeCodeAdapter {
         const modelArg = model ? ` --model ${shellQuote(model)}` : "";
         const effort = binding.effort?.trim();
         const effortArg = effort ? ` --effort ${shellQuote(effort)}` : "";
+        const advisor = binding.advisor?.trim();
+        const advisorArg = advisor ? ` --advisor ${shellQuote(advisor)}` : "";
+        // OPR.0.7.0.9: the seat's own additions, after the model, effort and Advisor and before the identity options.
+        const additionArgs = seatLaunchAdditionArgs(binding.launchAdditions);
+        const additionArg = additionArgs.map((arg, index) => ` ${index % 2 === 0 ? arg : shellQuote(arg)}`).join(""); // flag, value pairs
         // 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
@@ -246,12 +262,12 @@ export class ClaudeCodeAdapter {
                 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] : []),
+            const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...operationalLaunchArgs(this.runtime, binding), ...(model ? ["--model", model] : []), ...(effort ? ["--effort", effort] : []), ...(advisor ? ["--advisor", advisor] : []), ...additionArgs,
                 "--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 --session-id ${forkSessionId} --name ${opts.name}`;
+                : `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg}${advisorArg}${additionArg} --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 })
@@ -268,10 +284,10 @@ export class ClaudeCodeAdapter {
             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] : []),
+        const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...operationalLaunchArgs(this.runtime, binding), ...(model ? ["--model", model] : []), ...(effort ? ["--effort", effort] : []), ...(advisor ? ["--advisor", advisor] : []), ...additionArgs,
             ...(opts.resumeToken ? ["--resume", opts.resumeToken] : ["--session-id", generatedSessionId]), "--name", opts.name], opts.resumeToken ? claudeResumeLaunchEnv(opts.resumeToken) : undefined) : opts.resumeToken
-            ? `${claudeResumeLaunchPrefix(opts.resumeToken)}${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg} --resume ${shellQuote(opts.resumeToken)} --name ${opts.name}`
-            : `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg} --session-id ${generatedSessionId} --name ${opts.name}`;
+            ? `${claudeResumeLaunchPrefix(opts.resumeToken)}${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg}${advisorArg}${additionArg} --resume ${shellQuote(opts.resumeToken)} --name ${opts.name}`
+            : `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg}${advisorArg}${additionArg} --session-id ${generatedSessionId} --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 })
@@ -300,7 +316,7 @@ export class ClaudeCodeAdapter {
         // can belong to another seat sharing the Claude config directory.
         return { ok: true, resumeToken: generatedSessionId, resumeType: "claude_id", appliedLaunch };
     }
-    async checkReady(binding) {
+    async checkReady(binding, options) {
         binding = { ...binding };
         if (!binding.tmuxSession) {
             return { ready: false, reason: "No tmux session bound" };
@@ -311,7 +327,7 @@ export class ClaudeCodeAdapter {
         }
         const paneCommand = await this.tmux.getPaneCommand(binding.tmuxSession);
         const paneContent = (await this.tmux.capturePaneContent(binding.tmuxSession, 40)) ?? "";
-        const historyProbe = await this.assessManagedProbe(binding, paneCommand, paneContent);
+        const historyProbe = await this.assessManagedProbe(binding, paneCommand, paneContent, options);
         const probe = await this.assessFreshInPlaceProbe(binding, paneCommand, historyProbe);
         // 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).
@@ -324,7 +340,7 @@ export class ClaudeCodeAdapter {
             };
         }
         if (probe.status === "resumed")
-            return { ready: true };
+            return "provedWithoutLaunch" in probe ? { ready: true, provedWithoutLaunch: true } : { ready: true };
         return { ready: false, reason: probe.detail, code: probe.code };
     }
     /** Best-effort public seam for tmux-bound Claude sessions adopted outside the launch path. */
@@ -380,7 +396,7 @@ export class ClaudeCodeAdapter {
             claudeAutoIdentityVerified: true, claudeResumeIdentityVerified: true });
         return withIdentity.status === "resumed" && occupant !== "absent" ? historyProbe : current;
     }
-    async assessManagedProbe(binding, paneCommand, paneContent) {
+    async assessManagedProbe(binding, paneCommand, paneContent, options) {
         const input = { runtime: "claude-code", paneCommand, paneContent };
         const probe = assessNativeResumeProbe(input);
         // Headerless managed launches (including bypass mode) use the same readiness
@@ -391,7 +407,11 @@ export class ClaudeCodeAdapter {
         if (probe.status === "resumed" || verifiedProbe.status !== "resumed")
             return probe;
         const launch = this.autoLaunches.get(binding.nodeId);
-        if (!launch || !binding.tmuxPane || !binding.tmuxSession
+        // No launch record (this daemon did not launch the seat): the caller's real binding and the seat's recorded
+        // conversation are the proof's inputs. A record for another launch keeps today's result below.
+        if (!launch)
+            return await this.proveWithoutLaunch(binding, options) ? { ...verifiedProbe, provedWithoutLaunch: true } : probe;
+        if (!binding.tmuxPane || !binding.tmuxSession
             || launch.binding.id !== binding.id || launch.binding.tmuxPane !== binding.tmuxPane
             || launch.binding.tmuxSession !== binding.tmuxSession
             || launch.binding.launchGeneration !== binding.launchGeneration)
@@ -438,6 +458,29 @@ export class ClaudeCodeAdapter {
             return probe;
         }
     }
+    /** The observation `rig seat clear-attention` uses: the pane's one foreground Claude names exactly `resumeToken`, the
+     *  same process in two samples, with no frozen executable, in the session's only pane with an unchanged PID. Reads
+     *  only. Anything missing or inconclusive is not proof. */
+    async proveWithoutLaunch(binding, options) {
+        const token = options?.resumeToken?.trim();
+        if (!token || !binding.tmuxPane || !binding.tmuxSession)
+            return false;
+        try {
+            const panes = await this.tmux.listPanes(binding.tmuxSession);
+            if (panes.length !== 1 || panes[0]?.id !== binding.tmuxPane)
+                return false;
+            const native = await verifyClaudePaneProcess({ target: binding.tmuxPane, tmux: this.tmux,
+                listProcesses: this.listProcesses, expectedToken: token, rotation: options?.resumeRotation ?? null });
+            if (!native)
+                return false;
+            const currentPanes = await this.tmux.listPanes(binding.tmuxSession);
+            return currentPanes.length === 1 && currentPanes[0]?.id === binding.tmuxPane
+                && await this.tmux.getPanePid(binding.tmuxSession) === native.panePid;
+        }
+        catch {
+            return false;
+        }
+    }
     /** 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. */
@@ -509,6 +552,7 @@ export class ClaudeCodeAdapter {
             if (probe.code === "no_conversation_found") {
                 return {
                     ok: false,
+                    probe: await resumeProbeEvidence(probe, paneContent, this.tmux, tmuxSession),
                     error: "Claude resume failed: no conversation found for the requested session",
                     recovery: "retry_fresh",
                     missingConversation: true,
@@ -523,6 +567,7 @@ export class ClaudeCodeAdapter {
             if (probe.status === "attention_required") {
                 return {
                     ok: false,
+                    probe: await resumeProbeEvidence(probe, paneContent, this.tmux, tmuxSession),
                     error: probe.detail,
                     recovery: "attention_required",
                     evidence: paneContent.split("\n").slice(-12).join("\n"),
@@ -537,7 +582,8 @@ export class ClaudeCodeAdapter {
                 }
                 const enterResult = await this.tmux.sendKeys(tmuxSession, ["Enter"]);
                 if (!enterResult.ok) {
-                    return { ok: false, error: `Claude trust prompt auto-drive failed: ${enterResult.message}` };
+                    return { ok: false, error: `Claude trust prompt auto-drive failed: ${enterResult.message}`,
+                        probe: await resumeProbeEvidence(probe, paneContent, this.tmux, tmuxSession) };
                 }
                 await this.sleep(200);
                 continue;
@@ -592,9 +638,11 @@ export class ClaudeCodeAdapter {
         if (finalProbe.status === "resumed") {
             return { ok: true };
         }
+        const probeEvidence = await resumeProbeEvidence(finalProbe, finalContent, this.tmux, tmuxSession);
         if (finalProbe.status === "attention_required" || finalProbe.code === "claude_auto_identity_required") {
             return {
                 ok: false,
+                probe: probeEvidence,
                 error: finalProbe.detail,
                 recovery: "attention_required",
                 evidence: finalContent.split("\n").slice(-12).join("\n"),
@@ -604,6 +652,7 @@ export class ClaudeCodeAdapter {
         if (finalProbe.code === "no_conversation_found") {
             return {
                 ok: false,
+                probe: probeEvidence,
                 error: "Claude resume failed: no conversation found for the requested session",
                 recovery: "retry_fresh",
                 missingConversation: true,
@@ -612,6 +661,7 @@ export class ClaudeCodeAdapter {
         if (await this.paneReturnedToShell(binding, finalCommand)) {
             return {
                 ok: false,
+                probe: probeEvidence,
                 error: "Claude resume failed: pane returned to shell instead of entering Claude",
                 recovery: "retry_fresh",
             };
@@ -626,13 +676,14 @@ export class ClaudeCodeAdapter {
             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`,
+                probe: probeEvidence,
                 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" };
+        return { ok: false, error: "Claude resume failed: timed out waiting for Claude to become active", probe: probeEvidence };
     }
-    projectEntry(entry, cwd, managedBlockFile, warnings) {
+    projectEntry(entry, cwd, managedBlockFile, warnings, seatSkillsRoot, seatSkillsRefused) {
         // 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)
@@ -640,7 +691,7 @@ export class ClaudeCodeAdapter {
         if (entry.category === "guidance" && entry.mergeStrategy === "managed_block") {
             const targetPath = nodePath.join(cwd, managedBlockFile);
             const content = this.fs.readFile(entry.absolutePath);
-            return this.mergeGuidance(targetPath, entry.effectiveId, content, warnings);
+            return this.mergeGuidance(targetPath, entry.effectiveId, content, warnings, entry.absolutePath);
         }
         // HG-1.3 plugin runtime applicability filter (per DESIGN.md §5.1):
         // explicit pluginType="codex" → skip Claude projection;
@@ -649,9 +700,17 @@ export class ClaudeCodeAdapter {
         if (entry.category === "plugin" && !this.pluginAppliesToClaude(entry)) {
             return false;
         }
-        const targetDir = this.resolveTargetDir(entry, cwd);
+        const targetDir = this.resolveTargetDir(entry, cwd, seatSkillsRoot);
         if (!targetDir)
             return true;
+        // OPR.0.7.0.13: never write through a link out of the seat's storage.
+        // A refused seat storage refuses every skill meant for it, named; otherwise each destination is checked.
+        const refusal = seatSkillsRoot && entry.category === "skill"
+            ? seatSkillsRefused ?? seatSkillWriteRefusal(seatSkillsRoot, nodePath.join(targetDir, "SKILL.md")) : undefined;
+        if (refusal) {
+            warnings.push(`${entry.effectiveId}: ${refusal}`);
+            return false;
+        }
         this.fs.mkdirp(targetDir);
         let isDir = false;
         if (this.fs.listFiles) {
@@ -664,12 +723,35 @@ export class ClaudeCodeAdapter {
                 isDir = false;
             }
         }
+        // OPR.0.7.0.13: destinations refused below (a link on the way); an entry with any is reported incomplete, not projected.
+        const notProjected = [];
+        // OPR.0.7.0.13: a skill written to the seat's own storage is recorded (hash and source), identical copies too,
+        // so `rig down` removes only what OpenRig wrote and a restore can put it back.
+        const record = seatSkillsRoot && entry.category === "skill"
+            ? (dest, src, content) => recordSeatSkillWrite(seatSkillsRoot, dest, src, content)
+            : () => { };
         if (isDir && this.fs.listFiles) {
             // Directory-shaped: recursive copy
+            let skippedPluginSkills = 0;
             for (const file of this.fs.listFiles(entry.absolutePath)) {
+                // OPR.0.7.0.13: a seat with its own storage gets a selected plugin's bundled skills there, through its loadout, so
+                // the project's copy of the plugin leaves its skills out; its manifest, hooks and settings are copied as before.
+                if (seatSkillsRoot && entry.category === "plugin" && file.split(/[\\/]/)[0] === "skills") {
+                    skippedPluginSkills++;
+                    continue;
+                }
                 const src = nodePath.join(entry.absolutePath, file);
                 const dest = nodePath.join(targetDir, file);
+                // OPR.0.7.0.13: each destination in a seat's storage is checked before it's recorded, written or re-moded, so a
+                // helper folder or file found to be a link is not written through (the identical-content, mode-only branch included).
+                const refusedDest = seatSkillsRoot && entry.category === "skill" ? seatSkillWriteRefusal(seatSkillsRoot, dest) : undefined;
+                if (refusedDest) {
+                    warnings.push(`${entry.effectiveId}: ${refusedDest}`);
+                    notProjected.push(dest);
+                    continue;
+                }
                 const content = this.fs.readFile(src);
+                record(dest, src, content);
                 // Reconcile mode even when the content write is skipped: a byte-identical dest
                 // projected earlier may still carry the wrong (default) mode.
                 if (this.fs.exists(dest) && hashContent(content) === hashContent(this.fs.readFile(dest))) {
@@ -680,11 +762,20 @@ export class ClaudeCodeAdapter {
                 this.fs.writeFile(dest, content);
                 this.preserveMode(src, dest);
             }
+            const pluginLoss = seatSkillsRefused ? seatPluginSkillsLossNote(entry.effectiveId, skippedPluginSkills, seatSkillsRefused) : undefined;
+            if (pluginLoss)
+                warnings.push(pluginLoss);
         }
         else {
             // File-shaped: single file copy (subagents, hooks as YAML files)
-            const content = this.fs.readFile(entry.absolutePath);
             const destFile = nodePath.join(targetDir, nodePath.basename(entry.absolutePath));
+            const refusedFile = seatSkillsRoot && entry.category === "skill" ? seatSkillWriteRefusal(seatSkillsRoot, destFile) : undefined;
+            if (refusedFile) {
+                warnings.push(`${entry.effectiveId}: ${refusedFile}`);
+                return false;
+            }
+            const content = this.fs.readFile(entry.absolutePath);
+            record(destFile, entry.absolutePath, content);
             if (this.fs.exists(destFile) && hashContent(content) === hashContent(this.fs.readFile(destFile))) {
                 this.preserveMode(entry.absolutePath, destFile);
                 return true;
@@ -692,7 +783,7 @@ export class ClaudeCodeAdapter {
             this.fs.writeFile(destFile, content);
             this.preserveMode(entry.absolutePath, destFile);
         }
-        return true;
+        return seatProjectionComplete(entry.effectiveId, notProjected, warnings);
     }
     /**
      * Reapply the source file's permission bits to the projected dest. Plain
@@ -717,9 +808,9 @@ export class ClaudeCodeAdapter {
         // auto: detect via .claude-plugin/plugin.json presence in the source tree
         return this.fs.exists(nodePath.join(entry.absolutePath, ".claude-plugin", "plugin.json"));
     }
-    resolveTargetDir(entry, cwd) {
+    resolveTargetDir(entry, cwd, seatSkillsRoot) {
         switch (entry.category) {
-            case "skill": return nodePath.join(cwd, ".claude", "skills", entry.effectiveId);
+            case "skill": return nodePath.join(seatSkillsRoot ?? nodePath.join(cwd, ".claude", "skills"), entry.effectiveId);
             case "guidance": return null; // handled via merge
             case "subagent": return nodePath.join(cwd, ".claude", "agents");
             case "plugin": return nodePath.join(cwd, ".claude", "plugins", entry.effectiveId);
@@ -788,15 +879,18 @@ export class ClaudeCodeAdapter {
      * ProjectionResult and StartupDeliveryResult report honest counts instead
      * of claiming a merge that never landed.
      */
-    mergeGuidance(targetPath, blockId, content, warnings) {
+    mergeGuidance(targetPath, blockId, content, warnings, sourcePath) {
         // The `rig-role` managed block is authored per seat but delivered through a
         // projection path that pairs (target-file × spec) without seat correlation,
         // so multiple pod-mates' role bodies collide into one CLAUDE.md. The fix
         // is to route per-seat content through the `send_text` startup path
         // instead, which preserves seat identity. Here we refuse the merge loudly
         // so the collision can't land silently. See ADR-0006.
-        if (blockId === "rig-role") {
-            console.log(`[openrig] skip: effectiveId is rig-role, per-seat delivery via send_text path required (target=${targetPath})`);
+        if (isPerSeatRoleGuidance(blockId, sourcePath)) {
+            console.log(`[openrig] skip: effectiveId is ${blockId}, a seat's own role; per-seat delivery via send_text path required (target=${targetPath})`);
+            const warning = perSeatRoleSkipWarning(blockId, targetPath);
+            if (warning)
+                warnings.push(warning);
             return false;
         }
         mergeManagedBlock(this.fs, targetPath, blockId, content, {
@@ -805,8 +899,8 @@ export class ClaudeCodeAdapter {
         });
         return true;
     }
-    detectDeliveryHint(path, content) {
-        return resolveConcreteHint(path, content);
+    detectDeliveryHint(path, content, orientation) {
+        return resolveConcreteHint(path, content, orientation);
     }
     provisionManagedBootstrap(binding) {
         // OPR.0.4.8.2 agnostic rip-out: provisionRigPermissions (C2) removed — OpenRig no longer
@@ -1127,7 +1221,8 @@ function isOwnedRelayCommand(cmd) {
     if (!parsed || parsed.args.length !== 1)
         return false;
     const relay = parsed.args[0];
-    return relay.endsWith(LEGACY_OWNED_RELAY_SUFFIX)
+    return relay.endsWith("/plugins/openrig-core/hooks/scripts/activity-relay.cjs")
+        || relay.endsWith(LEGACY_OWNED_RELAY_SUFFIX)
         || relay.endsWith(`/${CLAUDE_ACTIVITY_RELAY_RELATIVE_PATH}`);
 }
 function hashContent(content) {