@openrig/cli 0.6.4 → 0.6.5

package/daemon/context-packs/skills/session-compaction-and-restore/SKILL.md

@@ -8,16 +8,11 @@ metadata:
     stage: factory-approved
     sibling_skills:
       - claude-compaction-restore
-      - mental-model-ha
-      - scope-recovery
       - agent-startup-and-context-ingestion
       - agent-starters
-      - composable-priming-packs
       - session-source-fork
       - seat-continuity-and-handover
       - retiring-and-inheriting-a-seat
-      - claude-compact-in-place
-      - pre-maintenance-agent-preservation
 ---
 
 # Session Compaction and Restore
@@ -108,6 +103,11 @@ stay durable-substrate-first (the packet/artifacts are the truth; the CLI is the
 3. **A runtime resume is mistaken for a seat handover or fork.** These have different continuity outcomes and provenance — don't conflate.
 4. **A rebuilt seat starts with stale instructions that conflict with current workflow mode.** Restore must include current state, not just historical state.
 
+**Re-entering project context, on any runtime.** A restore packet carries the work in flight, not the project's
+declared intent and context files. `rig context work-install` lists what the project declares; read the pieces the
+restored task needs. `--deliver` prints them all, and when several projects are declared (`--json` lists the
+ids), select one with `--project <id>` instead of guessing.
+
 ## Proof standard
 
 Proof should include a deliberate compaction/restart of a seat with
@@ -155,7 +155,6 @@ restoration; measure the resumed seat against the proof standard above.
 ## See also
 
 - `claude-compaction-restore` skill — the Claude Code restore SOP (PreCompact hook + JSONL restore script for post-compaction recovery)
-- `mental-model-ha` skill — HA-pair compaction recovery (different scenario; sister primitive)
 - `session-source-fork` skill — `fork` mode for native-runtime-continuity-based restoration
 - `seat-continuity-and-handover` skill — occupant-creation primitives (resume/fork/rebuild/fresh) that this primitive instantiates
 - `openrig-operating-model` skill — placement and authority of durable context

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.4"
+version: "0.6.5"
 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.4"
+version: "0.6.5"
 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.4"
+version: "0.6.5"
 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.4"
+version: "0.6.5"
 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,4 +1,5 @@
 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 { ProjectionPlan } from "../domain/projection-planner.js";
 import { type NativeProcessLister } from "../domain/native-process-lineage.js";
@@ -26,6 +27,7 @@ export interface ClaudeAdapterFsOps {
 export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     readonly runtime = "claude-code";
     private tmux;
+    private seatLaunchEnvironment?;
     private fs;
     private sessionIdFactory;
     private sleep;
@@ -42,6 +44,7 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     private recordProjection;
     constructor(deps: {
         tmux: TmuxAdapter;
+        seatLaunchEnvironment?: SeatLaunchEnvironment;
         fsOps: ClaudeAdapterFsOps;
         sessionIdFactory?: () => string;
         sleep?: (ms: number) => Promise<void>;
@@ -75,8 +78,10 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     }): void;
     /** Best-effort public seam for user-scope Claude bootstrap used by managed sessions. */
     ensureManagedBootstrap(binding: {
+        nodeId?: string;
         cwd?: string | null;
         tmuxSession?: string | null;
+        permissionMode?: NodeBinding["permissionMode"];
     }): void;
     private assessManagedProbe;
     private verifyResumeLaunch;
@@ -117,8 +122,7 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     private captureResumeToken;
     private detectDeliveryHint;
     private provisionManagedBootstrap;
-    private provisionWorkspaceTrust;
-    private provisionOnboardingState;
+    private provisionClaudeState;
     private workspaceTrustKeys;
     private readJsonObject;
     private readJsonObjectStrict;
@@ -126,7 +130,17 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     /**
      * Best-effort: provision the OpenRig context collector for managed Claude sessions.
      * Writes a collector script and merges status line config into .claude/settings.local.json.
-     * Idempotent: safe to call multiple times (merge preserves existing settings).
+     * Idempotent: safe to call multiple times (merge preserves existing settings). A user's own
+     * status line command (anything but the exact command written below), or a file that does not
+     * parse, is left as it is. The collector then never runs for that seat. While a valid sidecar
+     * from an earlier collector is retained, context usage (shown as stale once it ages) and Claude
+     * resume-token capture keep using it. That sidecar's session id may belong to an earlier Claude
+     * session, so capture can record an older session id for such a seat. Once none exists:
+     * - context usage reads unknown (`missing_sidecar`);
+     * - resume-token capture at adoption or handover is skipped (`missing_sidecar`);
+     * - its provider-usage row is an explicit unknown (`no_statusline_cache_yet`) unless an earlier
+     *   cache for that seat is retained.
+     * The read-modify-write below is not safe against a concurrent writer of the same file.
      */
     private provisionContextCollector;
     /**

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

@@ -25,6 +25,7 @@ const FORK_POLL_DELAY_MS = 500;
 export class ClaudeCodeAdapter {
     runtime = "claude-code";
     tmux;
+    seatLaunchEnvironment;
     fs;
     sessionIdFactory;
     sleep;
@@ -41,6 +42,7 @@ export class ClaudeCodeAdapter {
     recordProjection;
     constructor(deps) {
         this.tmux = deps.tmux;
+        this.seatLaunchEnvironment = deps.seatLaunchEnvironment;
         this.fs = deps.fsOps;
         this.sessionIdFactory = deps.sessionIdFactory ?? randomUUID;
         this.sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -157,7 +159,7 @@ export class ClaudeCodeAdapter {
                             if (!textResult.ok)
                                 throw new Error(textResult.message);
                             await this.sleep(200);
-                            const submitResult = await this.tmux.sendKeys(binding.tmuxSession, ["C-m"]);
+                            const submitResult = await this.tmux.sendKeys(binding.tmuxSession, ["Enter"]);
                             if (!submitResult.ok)
                                 throw new Error(submitResult.message);
                         }
@@ -212,6 +214,8 @@ export class ClaudeCodeAdapter {
         // resume-cmd builder are the named A2 restore-parity follow-on, not this atom.
         const model = binding.model?.trim();
         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).
@@ -226,15 +230,17 @@ export class ClaudeCodeAdapter {
             if (!parentId) {
                 return { ok: false, error: "claude-code fork: forkSource.value is required (parent native_id)" };
             }
-            const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...(model ? ["--model", model] : []),
+            const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...(model ? ["--model", model] : []), ...(effort ? ["--effort", effort] : []),
                 "--resume", parentId, "--fork-session", "--name", opts.name])
-                : `${rendererPrefix}claude ${permissionMode}${modelArg} --resume ${parentId} --fork-session --name ${opts.name}`;
+                : `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg} --resume ${parentId} --fork-session --name ${opts.name}`;
             const textResult = managed ? await this.tmux.sendShellCommand(binding.tmuxSession, cmd, managed.assertCurrent)
-                : await this.tmux.sendText(binding.tmuxSession, cmd);
+                : 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 })
+                    : await this.tmux.sendText(binding.tmuxSession, cmd);
             if (!textResult.ok) {
                 return { ok: false, error: `Failed to send launch command: ${textResult.message}` };
             }
-            const enterResult = managed ? { ok: true } : await this.tmux.sendKeys(binding.tmuxSession, ["Enter"]);
+            const enterResult = managed || this.seatLaunchEnvironment ? { ok: true } : await this.tmux.sendKeys(binding.tmuxSession, ["Enter"]);
             if (!enterResult.ok) {
                 return { ok: false, error: `Failed to send Enter: ${enterResult.message}` };
             }
@@ -253,17 +259,19 @@ export class ClaudeCodeAdapter {
             return { ok: true, resumeToken: newToken, resumeType: "claude_id", appliedLaunch };
         }
         const generatedSessionId = opts.resumeToken ? null : this.sessionIdFactory();
-        const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...(model ? ["--model", model] : []),
+        const cmd = managed ? managed.command(["--permission-mode", binding.permissionMode, ...(model ? ["--model", model] : []), ...(effort ? ["--effort", effort] : []),
             ...(opts.resumeToken ? ["--resume", opts.resumeToken] : ["--session-id", generatedSessionId]), "--name", opts.name]) : opts.resumeToken
-            ? `${rendererPrefix}claude ${permissionMode}${modelArg} --resume ${opts.resumeToken} --name ${opts.name}`
-            : `${rendererPrefix}claude ${permissionMode}${modelArg} --session-id ${generatedSessionId} --name ${opts.name}`;
+            ? `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg} --resume ${opts.resumeToken} --name ${opts.name}`
+            : `${rendererPrefix}claude ${permissionMode}${modelArg}${effortArg} --session-id ${generatedSessionId} --name ${opts.name}`;
         const textResult = managed ? await this.tmux.sendShellCommand(binding.tmuxSession, cmd, managed.assertCurrent)
-            : await this.tmux.sendText(binding.tmuxSession, cmd);
+            : 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 })
+                : await this.tmux.sendText(binding.tmuxSession, cmd);
         if (!textResult.ok) {
             return { ok: false, error: `Failed to send launch command: ${textResult.message}` };
         }
         // Send Enter to execute
-        const enterResult = managed ? { ok: true } : await this.tmux.sendKeys(binding.tmuxSession, ["Enter"]);
+        const enterResult = managed || this.seatLaunchEnvironment ? { ok: true } : await this.tmux.sendKeys(binding.tmuxSession, ["Enter"]);
         if (!enterResult.ok) {
             return { ok: false, error: `Failed to send Enter: ${enterResult.message}` };
         }
@@ -274,10 +282,9 @@ export class ClaudeCodeAdapter {
                 return verification;
             return { ok: true, resumeToken: opts.resumeToken, resumeType: "claude_id", appliedLaunch };
         }
-        // Belt-and-suspenders: prefer an immediately discoverable persisted session,
-        // but fall back to the UUID we assigned explicitly at launch time.
-        const token = this.captureResumeToken(opts.name, managed?.configDir);
-        return { ok: true, resumeToken: token ?? generatedSessionId ?? undefined, resumeType: "claude_id", appliedLaunch };
+        // Fresh launches already have an explicit --session-id. A same-name file
+        // can belong to another seat sharing the Claude config directory.
+        return { ok: true, resumeToken: generatedSessionId, resumeType: "claude_id", appliedLaunch };
     }
     async checkReady(binding) {
         binding = { ...binding };
@@ -307,9 +314,12 @@ export class ClaudeCodeAdapter {
     async assessManagedProbe(binding, paneCommand, paneContent) {
         const input = { runtime: "claude-code", paneCommand, paneContent };
         const probe = assessNativeResumeProbe(input);
-        // Only the new headerless auto-mode case needs this additional observation.
-        // Screen-only callers cannot opt themselves into managed launch readiness.
-        if (probe.code !== "claude_auto_identity_required")
+        // Headerless managed launches (including bypass mode) use the same readiness
+        // precedence as resume. This candidate result is returned only after the
+        // exact launch identity below is proved; screen text alone is insufficient.
+        const verifiedProbe = assessNativeResumeProbe({ ...input,
+            claudeAutoIdentityVerified: true, claudeResumeIdentityVerified: true });
+        if (probe.status === "resumed" || verifiedProbe.status !== "resumed")
             return probe;
         const launch = this.autoLaunches.get(binding.nodeId);
         if (!launch || !binding.tmuxPane || !binding.tmuxSession
@@ -338,7 +348,7 @@ export class ClaudeCodeAdapter {
                 || currentPanes[0]?.id !== binding.tmuxPane
                 || await this.tmux.getPanePid(binding.tmuxSession) !== native.panePid)
                 return probe;
-            return assessNativeResumeProbe({ ...input, claudeAutoIdentityVerified: true });
+            return verifiedProbe;
         }
         catch {
             return probe;
@@ -602,40 +612,86 @@ export class ClaudeCodeAdapter {
     provisionManagedBootstrap(binding) {
         // OPR.0.4.8.2 agnostic rip-out: provisionRigPermissions (C2) removed — OpenRig no longer
         // authors any config-file permission policy. Trust/onboarding (C3/C4) are neutral plumbing, kept.
-        this.provisionWorkspaceTrust(binding.cwd ?? null);
-        this.provisionOnboardingState();
+        const home = this.fs.homedir ?? (typeof process !== "undefined" ? process.env.HOME : undefined);
+        // Match launchHarness: an explicit permission mode exports the selected home to the child, so
+        // only that home is provisioned.
+        const managed = binding.permissionMode !== undefined ? this.claudeManagedLaunch : undefined;
+        const cwd = binding.cwd === undefined && managed && binding.nodeId
+            ? managed.boundCwd(binding.nodeId) : binding.cwd;
+        const statePaths = [];
+        const failures = [];
+        if (managed) {
+            if (cwd)
+                statePaths.push(managed.configPaths(cwd).statePath);
+        }
+        else {
+            if (home)
+                statePaths.push(nodePath.join(home, ".claude.json"));
+            // A classic seat types `claude` into its pane's shell, which inherits the tmux server's
+            // environment, not the daemon's, so the bootstrap cannot see which home that child reads.
+            // When the daemon selects CLAUDE_CONFIG_DIR, provision that home too. This deliberately
+            // replaces #565's rule that classic bootstrap writes exactly one file and leaves the
+            // selected home untouched: a child that inherits the daemon's selection read neither.
+            try {
+                const selectedCwd = cwd ?? (binding.nodeId ? this.claudeManagedLaunch?.boundCwd(binding.nodeId) : undefined);
+                const selected = selectedCwd ? this.claudeManagedLaunch?.selectedStatePath(selectedCwd) : undefined;
+                if (selected && !statePaths.includes(selected))
+                    statePaths.push(selected);
+            }
+            catch (err) {
+                failures.push(err.message);
+            }
+        }
+        // Each file is merged on its own: unmergeable state in one is preserved and reported,
+        // and never stops the other from being provisioned.
+        for (const statePath of statePaths) {
+            try {
+                this.provisionClaudeState(statePath, cwd);
+            }
+            catch (err) {
+                failures.push(`${statePath}: ${err.message}`);
+            }
+        }
+        if (failures.length > 0)
+            throw new Error(failures.join("; "));
+    }
+    provisionClaudeState(statePath, cwd) {
+        // Preserve every existing field. Unreadable/malformed/non-object state is
+        // left untouched and reported through the caller's best-effort bootstrap boundary.
+        const state = this.fs.exists(statePath) ? this.readJsonObjectStrict(statePath) : {};
+        // Running Claude processes read and write this file, so it is rewritten only when a flag is
+        // missing: an already-provisioned file (every relaunch, resume and post-launch delivery) is left alone.
+        let changed = false;
+        if (cwd) {
+            const projects = this.readJsonObjectField(state, "projects");
+            if (Object.hasOwn(state, "projects") && projects !== state["projects"])
+                throw new Error("Claude bootstrap projects must be a JSON object; existing state preserved.");
+            for (const trustKey of this.workspaceTrustKeys(cwd)) {
+                const projectState = this.readJsonObjectField(projects, trustKey);
+                if (Object.hasOwn(projects, trustKey) && projectState !== projects[trustKey])
+                    throw new Error("Claude bootstrap project state must be a JSON object; existing state preserved.");
+                if (projectState["hasTrustDialogAccepted"] === true)
+                    continue;
+                projectState["hasTrustDialogAccepted"] = true;
+                projects[trustKey] = projectState;
+                changed = true;
+            }
+            state["projects"] = projects;
+        }
+        if (state["hasCompletedOnboarding"] !== true) {
+            state["hasCompletedOnboarding"] = true;
+            changed = true;
+        }
+        if (!changed)
+            return;
+        this.fs.mkdirp(nodePath.dirname(statePath));
+        this.fs.writeFile(statePath, JSON.stringify(state, null, 2));
     }
     // OPR.0.4.8.2 agnostic rip-out: the CONVENIENCE_BASELINE (global `Bash(rig:*)` allow) and its
     // provisionRigPermissions writer (assessment row C2 — wrote into ~/.claude/settings.json with an
     // `_openrig_provenance` marker) are DELETED. OpenRig no longer authors any config-file permission
     // policy; the harness-native permission surface is the control surface. Existing provenance-marked
     // user files are NOT retro-scrubbed — the new code simply never touches settings.json.
-    provisionWorkspaceTrust(cwd) {
-        if (!cwd)
-            return;
-        const home = this.fs.homedir ?? (typeof process !== "undefined" ? process.env.HOME : undefined);
-        if (!home)
-            return;
-        const statePath = nodePath.join(home, ".claude.json");
-        const state = this.readJsonObject(statePath);
-        const projects = this.readJsonObjectField(state, "projects");
-        for (const trustKey of this.workspaceTrustKeys(cwd)) {
-            const projectState = this.readJsonObjectField(projects, trustKey);
-            projectState["hasTrustDialogAccepted"] = true;
-            projects[trustKey] = projectState;
-        }
-        state["projects"] = projects;
-        this.fs.writeFile(statePath, JSON.stringify(state, null, 2));
-    }
-    provisionOnboardingState() {
-        const home = this.fs.homedir ?? (typeof process !== "undefined" ? process.env.HOME : undefined);
-        if (!home)
-            return;
-        const statePath = nodePath.join(home, ".claude.json");
-        const state = this.readJsonObject(statePath);
-        state["hasCompletedOnboarding"] = true;
-        this.fs.writeFile(statePath, JSON.stringify(state, null, 2));
-    }
     workspaceTrustKeys(cwd) {
         const keys = new Set([nodePath.resolve(cwd)]);
         try {
@@ -676,7 +732,17 @@ export class ClaudeCodeAdapter {
     /**
      * Best-effort: provision the OpenRig context collector for managed Claude sessions.
      * Writes a collector script and merges status line config into .claude/settings.local.json.
-     * Idempotent: safe to call multiple times (merge preserves existing settings).
+     * Idempotent: safe to call multiple times (merge preserves existing settings). A user's own
+     * status line command (anything but the exact command written below), or a file that does not
+     * parse, is left as it is. The collector then never runs for that seat. While a valid sidecar
+     * from an earlier collector is retained, context usage (shown as stale once it ages) and Claude
+     * resume-token capture keep using it. That sidecar's session id may belong to an earlier Claude
+     * session, so capture can record an older session id for such a seat. Once none exists:
+     * - context usage reads unknown (`missing_sidecar`);
+     * - resume-token capture at adoption or handover is skipped (`missing_sidecar`);
+     * - its provider-usage row is an explicit unknown (`no_statusline_cache_yet`) unless an earlier
+     *   cache for that seat is retained.
+     * The read-modify-write below is not safe against a concurrent writer of the same file.
      */
     provisionContextCollector(binding) {
         if (!this.stateDir || !this.collectorAssetPath || !binding.cwd)
@@ -692,13 +758,35 @@ export class ClaudeCodeAdapter {
         // 2. Merge status line config into .claude/settings.local.json
         const settingsPath = nodePath.join(binding.cwd, ".claude", "settings.local.json");
         this.fs.mkdirp(nodePath.dirname(settingsPath));
-        const existing = this.readJsonObject(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.
+        let existing = {};
+        if (this.fs.exists(settingsPath)) {
+            const text = this.fs.readFile(settingsPath);
+            if (text.trim() !== "") {
+                let parsed;
+                try {
+                    parsed = JSON.parse(text);
+                }
+                catch {
+                    return;
+                }
+                if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed))
+                    existing = parsed;
+            }
+        }
+        const statusLine = typeof existing["statusLine"] === "object" && existing["statusLine"] !== null
+            ? existing["statusLine"] : {};
+        // A user's own status line command wins; only OpenRig's collector command is installed or refreshed.
+        // If this command's shape changes, keep the old shape recognised in isOwnedCollectorCommand, or
+        // seats holding it will never be refreshed.
         const collectorCmd = `node ${collectorDest} ${contextDir} ${providerUsageDir}`;
-        existing["statusLine"] = {
-            ...(typeof existing["statusLine"] === "object" && existing["statusLine"] !== null ? existing["statusLine"] : {}),
-            type: "command",
-            command: collectorCmd,
-        };
+        const current = statusLine["command"];
+        if (typeof current === "string" && current.trim() !== "" && current !== collectorCmd && !isOwnedCollectorCommand(current))
+            return;
+        existing["statusLine"] = { ...statusLine, type: "command", command: collectorCmd };
         this.fs.writeFile(settingsPath, JSON.stringify(existing, null, 2));
     }
     /**
@@ -814,6 +902,22 @@ const OWNED_RELAY_SUFFIX = "/.openrig/hooks/scripts/activity-relay.cjs";
 function hookCommand(hook) {
     return isPlainObject(hook) && typeof hook["command"] === "string" ? hook["command"] : undefined;
 }
+// OpenRig-owned context collector. provisionContextCollector writes exactly
+// `node <cwd>/.openrig/context-collector.cjs <contextDir> <providerUsageDir>`, unquoted; older
+// releases wrote the same command without `<providerUsageDir>`. Ownership is either shape with any
+// (possibly stale) paths, on one line. A command that merely contains the path, composed with `;`,
+// `&&`, a pipe or a newline, or naming another file such as `.cjs.backup`, is the user's.
+const OWNED_COLLECTOR_SUFFIX = nodePath.sep + nodePath.join(".openrig", "context-collector.cjs");
+function isOwnedCollectorCommand(cmd) {
+    if (/[\r\n]/.test(cmd))
+        return false;
+    const tokens = cmd.trim().split(/\s+/);
+    if ((tokens.length !== 3 && tokens.length !== 4) || tokens[0] !== "node")
+        return false;
+    if (tokens.some((token) => /[;&|<>`$()'"\\]/.test(token)))
+        return false;
+    return tokens[1].endsWith(OWNED_COLLECTOR_SUFFIX);
+}
 function isOwnedRelayCommand(cmd) {
     if (!cmd)
         return false;