@openrig/cli 0.1.12 → 0.3.0

package/daemon/assets/openrig-activity-hook-relay.cjs

@@ -0,0 +1,104 @@
+#!/usr/bin/env node
+"use strict";
+
+async function readStdin() {
+  return new Promise((resolve) => {
+    let data = "";
+    process.stdin.setEncoding("utf8");
+    process.stdin.on("data", (chunk) => {
+      data += chunk;
+    });
+    process.stdin.on("end", () => resolve(data));
+    process.stdin.on("error", () => resolve(""));
+  });
+}
+
+function parseJson(value) {
+  try {
+    const parsed = JSON.parse(value || "{}");
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+function firstString(...values) {
+  for (const value of values) {
+    if (typeof value === "string" && value.trim().length > 0) return value.trim();
+  }
+  return null;
+}
+
+function buildOpenRigPayload(providerPayload, env = process.env, now = () => new Date()) {
+  const sessionName = firstString(env.OPENRIG_SESSION_NAME, env.RIGGED_SESSION_NAME);
+  const nodeId = firstString(env.OPENRIG_NODE_ID, env.RIGGED_NODE_ID);
+  const runtime = firstString(env.OPENRIG_RUNTIME, env.RIGGED_RUNTIME);
+  const hookEvent = firstString(
+    providerPayload.hookEvent,
+    providerPayload.hookEventName,
+    providerPayload.hook_event_name,
+    providerPayload.event,
+    providerPayload.eventName
+  );
+
+  if ((!sessionName && !nodeId) || !runtime || !hookEvent) return null;
+
+  const subtype = firstString(
+    providerPayload.subtype,
+    providerPayload.notification_type,
+    providerPayload.notificationType,
+    providerPayload.tool_name,
+    providerPayload.toolName,
+    providerPayload.source,
+    providerPayload.matcher
+  );
+
+  return {
+    sessionName,
+    nodeId,
+    runtime,
+    hookEvent,
+    subtype,
+    occurredAt: now().toISOString(),
+  };
+}
+
+async function postHookPayload(payload, env = process.env) {
+  const baseUrl = firstString(env.OPENRIG_URL, env.RIGGED_URL);
+  const token = firstString(env.OPENRIG_ACTIVITY_HOOK_TOKEN, env.RIGGED_ACTIVITY_HOOK_TOKEN);
+  if (!baseUrl || !token || !payload || typeof fetch !== "function") return;
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 1500);
+  try {
+    await fetch(new URL("/api/activity/hooks", baseUrl).toString(), {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        "authorization": `Bearer ${token}`,
+      },
+      body: JSON.stringify(payload),
+      signal: controller.signal,
+    });
+  } catch {
+    // Provider hooks must not block the agent loop if OpenRig is unavailable.
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+async function main() {
+  const providerPayload = parseJson(await readStdin());
+  const payload = buildOpenRigPayload(providerPayload);
+  await postHookPayload(payload);
+}
+
+if (require.main === module) {
+  main().catch(() => {});
+}
+
+module.exports = {
+  buildOpenRigPayload,
+  parseJson,
+  postHookPayload,
+};

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

@@ -25,6 +25,8 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     private sleep;
     private stateDir;
     private collectorAssetPath;
+    private activityHookRelayAssetPath;
+    private autoDriveProviderPrompts;
     constructor(deps: {
         tmux: TmuxAdapter;
         fsOps: ClaudeAdapterFsOps;
@@ -32,6 +34,8 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
         sleep?: (ms: number) => Promise<void>;
         stateDir?: string;
         collectorAssetPath?: string;
+        activityHookRelayAssetPath?: string;
+        autoDriveProviderPrompts?: boolean;
     });
     listInstalled(binding: NodeBinding): Promise<InstalledResource[]>;
     project(plan: ProjectionPlan, binding: NodeBinding): Promise<ProjectionResult>;
@@ -39,6 +43,7 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     launchHarness(binding: NodeBinding, opts: {
         name: string;
         resumeToken?: string;
+        forkSource?: import("../domain/runtime-adapter.js").ForkSource;
     }): Promise<HarnessLaunchResult>;
     checkReady(binding: NodeBinding): Promise<ReadinessResult>;
     /** Best-effort public seam for tmux-bound Claude sessions adopted outside the launch path. */
@@ -54,6 +59,8 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
     private verifyResumeLaunch;
     private projectEntry;
     private resolveTargetDir;
+    private applyRuntimeResource;
+    private mergeJsonFragment;
     /**
      * Merge a managed block into the target guidance file. Returns `true` when
      * the merge happened, `false` when intentionally skipped (currently only the
@@ -67,14 +74,30 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
      * 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;
+    /** Managed rig command baseline.
+     *  Additive only; never removes existing entries. Uses `Bash(cmd:*)`
+     *  colon-form per Claude Code convention.
+     *
+     *  NOTE: this is not OpenRig's permission system. Harness-native
+     *  permissions should remain the primary control surface. */
+    static readonly CONVENIENCE_BASELINE: readonly string[];
     private provisionRigPermissions;
     private provisionWorkspaceTrust;
     private provisionOnboardingState;
     private workspaceTrustKeys;
     private readJsonObject;
+    private readJsonObjectStrict;
     private readJsonObjectField;
     private readStringArray;
     /**
@@ -83,11 +106,6 @@ export declare class ClaudeCodeAdapter implements RuntimeAdapter {
      * Idempotent: safe to call multiple times (merge preserves existing settings).
      */
     private provisionContextCollector;
-    /**
-     * Best-effort: provision permissions allowlist and MCP config for managed Claude sessions.
-     * Merges into .claude/settings.local.json (project-level, gitignored).
-     * Idempotent: merge preserves existing settings.
-     */
-    private provisionPermissionsAndMcps;
+    private provisionActivityHooks;
 }
 //# sourceMappingURL=claude-code-adapter.d.ts.map

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":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EACV,cAAc,EAAE,WAAW,EAAE,mBAAmB,EAChD,iBAAiB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,eAAe,EAC3E,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,cAAc,EAAmB,MAAM,iCAAiC,CAAC;AAIvF,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,6DAA6D;IAC7D,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAID;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IACtD,QAAQ,CAAC,OAAO,iBAAiB;IACjC,OAAO,CAAC,IAAI,CAAc;IAC1B,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;gBAE9B,IAAI,EAAE;QAChB,IAAI,EAAE,WAAW,CAAC;QAClB,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;KAC7B;IASK,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAWjE,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA0B9E,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA2DlG,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAiC/G,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBhE,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,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI;YAM7E,kBAAkB;IAoDhC,OAAO,CAAC,YAAY;IAiCpB,OAAO,CAAC,gBAAgB;IAWxB;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAmBrB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAqB1B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,uBAAuB;IAkB/B,OAAO,CAAC,uBAAuB;IAmB/B,OAAO,CAAC,wBAAwB;IAUhC,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,eAAe;IAIvB;;;;OAIG;IACH,OAAO,CAAC,yBAAyB;IA8BjC;;;;OAIG;IACH,OAAO,CAAC,2BAA2B;CA6DpC"}
+{"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,6 +5,12 @@ import { resolveConcreteHint } from "../domain/runtime-adapter.js";
 import { assessNativeResumeProbe } from "../domain/native-resume-probe.js";
 import { mergeManagedBlock } from "../domain/managed-blocks.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.
@@ -17,6 +23,8 @@ export class ClaudeCodeAdapter {
     sleep;
     stateDir;
     collectorAssetPath;
+    activityHookRelayAssetPath;
+    autoDriveProviderPrompts;
     constructor(deps) {
         this.tmux = deps.tmux;
         this.fs = deps.fsOps;
@@ -24,6 +32,8 @@ export class ClaudeCodeAdapter {
         this.sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
         this.stateDir = deps.stateDir ?? null;
         this.collectorAssetPath = deps.collectorAssetPath ?? null;
+        this.activityHookRelayAssetPath = deps.activityHookRelayAssetPath ?? null;
+        this.autoDriveProviderPrompts = deps.autoDriveProviderPrompts ?? false;
     }
     async listInstalled(binding) {
         const results = [];
@@ -74,12 +84,13 @@ export class ClaudeCodeAdapter {
             // Log but don't fail — collector provisioning is best-effort
             console.error(`[openrig] context collector provisioning warning: ${err.message}`);
         }
-        // Best-effort: provision permissions and MCP config for managed Claude sessions
+        // Best-effort: provision project-local activity hooks. The hook token is
+        // supplied through tmux session env, never written to provider settings.
         try {
-            this.provisionPermissionsAndMcps(binding);
+            this.provisionActivityHooks(binding);
         }
         catch (err) {
-            console.error(`[openrig] permissions/MCP provisioning warning: ${err.message}`);
+            console.error(`[openrig] claude activity hook provisioning warning: ${err.message}`);
         }
         let delivered = 0;
         const failed = [];
@@ -128,8 +139,48 @@ export class ClaudeCodeAdapter {
         if (!binding.tmuxSession) {
             return { ok: false, error: "No tmux session bound — cannot launch Claude Code harness" };
         }
-        const generatedSessionId = opts.resumeToken ? null : this.sessionIdFactory();
+        if (opts.resumeToken && opts.forkSource) {
+            return { ok: false, error: "resumeToken and forkSource are mutually exclusive — pick one" };
+        }
         const permissionMode = "--permission-mode acceptEdits";
+        // 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).
+        if (opts.forkSource) {
+            if (opts.forkSource.kind !== "native_id") {
+                return {
+                    ok: false,
+                    error: `claude-code fork: ref.kind="${opts.forkSource.kind}" is not supported in v1; use ref.kind="native_id" with the prior conversation's session id`,
+                };
+            }
+            const parentId = opts.forkSource.value?.trim();
+            if (!parentId) {
+                return { ok: false, error: "claude-code fork: forkSource.value is required (parent native_id)" };
+            }
+            const cmd = `claude ${permissionMode} --resume ${parentId} --fork-session --name ${opts.name}`;
+            const textResult = await this.tmux.sendText(binding.tmuxSession, cmd);
+            if (!textResult.ok) {
+                return { ok: false, error: `Failed to send launch command: ${textResult.message}` };
+            }
+            const enterResult = await this.tmux.sendKeys(binding.tmuxSession, ["Enter"]);
+            if (!enterResult.ok) {
+                return { ok: false, error: `Failed to send Enter: ${enterResult.message}` };
+            }
+            // 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);
+            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" };
+        }
+        const generatedSessionId = opts.resumeToken ? null : this.sessionIdFactory();
         const cmd = opts.resumeToken
             ? `claude ${permissionMode} --resume ${opts.resumeToken} --name ${opts.name}`
             : `claude ${permissionMode} --session-id ${generatedSessionId} --name ${opts.name}`;
@@ -201,6 +252,14 @@ export class ClaudeCodeAdapter {
             if (probe.status === "resumed") {
                 return { ok: true };
             }
+            if (this.autoDriveProviderPrompts && probe.code === "trust_gate") {
+                const enterResult = await this.tmux.sendKeys(tmuxSession, ["Enter"]);
+                if (!enterResult.ok) {
+                    return { ok: false, error: `Claude trust prompt auto-drive failed: ${enterResult.message}` };
+                }
+                await this.sleep(200);
+                continue;
+            }
             if (attempt < attempts - 1) {
                 await this.sleep(200);
             }
@@ -225,6 +284,9 @@ export class ClaudeCodeAdapter {
         return { ok: false, error: "Claude resume failed: timed out waiting for Claude to become active" };
     }
     projectEntry(entry, cwd) {
+        if (entry.category === "runtime_resource" && this.applyRuntimeResource(entry, cwd)) {
+            return true;
+        }
         if (entry.category === "guidance" && entry.mergeStrategy === "managed_block") {
             const targetPath = nodePath.join(cwd, "CLAUDE.md");
             const content = this.fs.readFile(entry.absolutePath);
@@ -267,6 +329,25 @@ export class ClaudeCodeAdapter {
             default: return null;
         }
     }
+    applyRuntimeResource(entry, cwd) {
+        switch (entry.resourceType) {
+            case "claude_settings_fragment":
+                this.mergeJsonFragment(entry.absolutePath, nodePath.join(cwd, ".claude", "settings.local.json"));
+                return true;
+            case "claude_mcp_fragment":
+                this.mergeJsonFragment(entry.absolutePath, nodePath.join(cwd, ".mcp.json"));
+                return true;
+            default:
+                return false;
+        }
+    }
+    mergeJsonFragment(sourcePath, targetPath) {
+        const fragment = this.readJsonObjectStrict(sourcePath);
+        const existing = this.readJsonObject(targetPath);
+        const merged = mergeJsonObjects(existing, fragment);
+        this.fs.mkdirp(nodePath.dirname(targetPath));
+        this.fs.writeFile(targetPath, JSON.stringify(merged, null, 2));
+    }
     /**
      * Merge a managed block into the target guidance file. Returns `true` when
      * the merge happened, `false` when intentionally skipped (currently only the
@@ -295,6 +376,24 @@ export class ClaudeCodeAdapter {
      * 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) {
+        for (let attempt = 0; attempt < attempts; attempt++) {
+            const token = this.captureResumeToken(expectedName);
+            if (token)
+                return token;
+            if (attempt < attempts - 1) {
+                await this.sleep(delayMs);
+            }
+        }
+        return undefined;
+    }
     captureResumeToken(expectedName) {
         try {
             const home = this.fs.homedir ?? (typeof process !== "undefined" ? process.env.HOME : undefined);
@@ -328,6 +427,15 @@ export class ClaudeCodeAdapter {
         this.provisionWorkspaceTrust(binding.cwd ?? null);
         this.provisionOnboardingState();
     }
+    /** Managed rig command baseline.
+     *  Additive only; never removes existing entries. Uses `Bash(cmd:*)`
+     *  colon-form per Claude Code convention.
+     *
+     *  NOTE: this is not OpenRig's permission system. Harness-native
+     *  permissions should remain the primary control surface. */
+    static CONVENIENCE_BASELINE = [
+        "Bash(rig:*)",
+    ];
     provisionRigPermissions() {
         const home = this.fs.homedir ?? (typeof process !== "undefined" ? process.env.HOME : undefined);
         if (!home)
@@ -337,9 +445,27 @@ export class ClaudeCodeAdapter {
         const settings = this.readJsonObject(settingsPath);
         const permissions = this.readJsonObjectField(settings, "permissions");
         const allow = new Set(this.readStringArray(permissions["allow"]));
-        allow.add("Bash(rig:*)");
+        // Bash convenience baseline — additive only; never removes existing entries.
+        // Track whether any new patterns were actually added to avoid redundant writes
+        // (preserves provenance timestamp + file content idempotency on re-runs).
+        let added = 0;
+        for (const pattern of ClaudeCodeAdapter.CONVENIENCE_BASELINE) {
+            if (!allow.has(pattern)) {
+                allow.add(pattern);
+                added++;
+            }
+        }
+        if (added === 0)
+            return; // All patterns already present; skip write
         permissions["allow"] = Array.from(allow);
         settings["permissions"] = permissions;
+        // Provenance marker so operators can distinguish rig-injected from human-authored
+        settings["_openrig_provenance"] = {
+            author: "openrig-at-spawn",
+            baseline: "convenience",
+            patterns_added: added,
+            ts: new Date().toISOString(),
+        };
         this.fs.writeFile(settingsPath, JSON.stringify(settings, null, 2));
     }
     provisionWorkspaceTrust(cwd) {
@@ -391,6 +517,13 @@ export class ClaudeCodeAdapter {
             return {};
         }
     }
+    readJsonObjectStrict(path) {
+        const parsed = JSON.parse(this.fs.readFile(path));
+        if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+            return parsed;
+        }
+        throw new Error(`${path} must be a JSON object`);
+    }
     readJsonObjectField(source, key) {
         const value = source[key];
         return typeof value === "object" && value !== null && !Array.isArray(value)
@@ -416,13 +549,7 @@ 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));
-        let existing = {};
-        try {
-            if (this.fs.exists(settingsPath)) {
-                existing = JSON.parse(this.fs.readFile(settingsPath));
-            }
-        }
-        catch { /* corrupt file — overwrite */ }
+        const existing = this.readJsonObject(settingsPath);
         const collectorCmd = `node ${collectorDest} ${contextDir}`;
         existing["statusLine"] = {
             ...(typeof existing["statusLine"] === "object" && existing["statusLine"] !== null ? existing["statusLine"] : {}),
@@ -431,65 +558,94 @@ export class ClaudeCodeAdapter {
         };
         this.fs.writeFile(settingsPath, JSON.stringify(existing, null, 2));
     }
-    /**
-     * Best-effort: provision permissions allowlist and MCP config for managed Claude sessions.
-     * Merges into .claude/settings.local.json (project-level, gitignored).
-     * Idempotent: merge preserves existing settings.
-     */
-    provisionPermissionsAndMcps(binding) {
-        if (!binding.cwd)
+    provisionActivityHooks(binding) {
+        if (!binding.cwd || !this.activityHookRelayAssetPath)
             return;
+        const relayDest = nodePath.join(binding.cwd, ".openrig", "activity-hook-relay.cjs");
+        this.fs.mkdirp(nodePath.dirname(relayDest));
+        this.fs.writeFile(relayDest, this.fs.readFile(this.activityHookRelayAssetPath));
         const settingsPath = nodePath.join(binding.cwd, ".claude", "settings.local.json");
         this.fs.mkdirp(nodePath.dirname(settingsPath));
-        const existing = this.readJsonObject(settingsPath);
-        const existingPermissions = this.readJsonObjectField(existing, "permissions");
-        const existingAllow = this.readStringArray(existingPermissions["allow"]);
-        const existingDeny = this.readStringArray(existingPermissions["deny"]);
-        const existingEnabledMcpjsonServers = this.readStringArray(existing["enabledMcpjsonServers"]);
-        const rigAllowRules = [
-            "Bash(rig:*)",
-            "Bash(cat *)", "Bash(ls *)", "Bash(find *)", "Bash(grep *)",
-            "Bash(head *)", "Bash(tail *)", "Bash(wc *)",
-            "Bash(mkdir *)", "Bash(cp *)", "Bash(mv *)",
-            "Bash(node *)", "Bash(npx *)", "Bash(npm *)",
-            "Read", "Edit",
-        ];
-        const rigDenyRules = [
-            "Bash(git push*)", "Bash(git commit*)",
-            "Bash(rm -rf *)",
-            "Bash(gh pr *)",
-        ];
-        // Merge without duplicating
-        const mergedAllow = [...new Set([...existingAllow, ...rigAllowRules])];
-        const mergedDeny = [...new Set([...existingDeny, ...rigDenyRules])];
-        existing["permissions"] = {
-            ...existingPermissions,
-            defaultMode: "acceptEdits", // Unconditional: managed sessions must not inherit restrictive modes
-            allow: mergedAllow,
-            deny: mergedDeny,
-        };
-        this.fs.writeFile(settingsPath, JSON.stringify(existing, null, 2));
-        // Merge MCP config: ensure Exa and Context7 are configured at project level
-        const mcpPath = nodePath.join(binding.cwd, ".mcp.json");
-        const mcpConfig = this.readJsonObject(mcpPath);
-        const mcpServers = this.readJsonObjectField(mcpConfig, "mcpServers");
-        // Add Exa and Context7 if not already configured
-        if (!mcpServers["exa"]) {
-            mcpServers["exa"] = { type: "http", url: "https://mcp.exa.ai/mcp" };
-        }
-        if (!mcpServers["context7"]) {
-            mcpServers["context7"] = { type: "http", url: "https://mcp.context7.com/mcp" };
-        }
-        existing["enabledMcpjsonServers"] = [...new Set([
-                ...existingEnabledMcpjsonServers,
-                ...Object.keys(mcpServers),
-            ])];
-        mcpConfig["mcpServers"] = mcpServers;
-        this.fs.writeFile(settingsPath, JSON.stringify(existing, null, 2));
-        this.fs.writeFile(mcpPath, JSON.stringify(mcpConfig, null, 2));
+        const settings = this.readJsonObject(settingsPath);
+        const hooks = this.readJsonObjectField(settings, "hooks");
+        const command = `node ${shellQuote(relayDest)}`;
+        for (const event of ["SessionStart", "UserPromptSubmit", "Stop", "Notification"]) {
+            upsertCommandHook(hooks, event, command);
+        }
+        settings["hooks"] = hooks;
+        this.fs.writeFile(settingsPath, JSON.stringify(settings, null, 2));
     }
 }
 function hashContent(content) {
     return createHash("sha256").update(content).digest("hex");
 }
+function mergeJsonObjects(base, fragment) {
+    const merged = { ...base };
+    for (const [key, value] of Object.entries(fragment)) {
+        merged[key] = mergeJsonValue(merged[key], value);
+    }
+    return merged;
+}
+function mergeJsonValue(base, fragment) {
+    if (isPlainObject(base) && isPlainObject(fragment)) {
+        return mergeJsonObjects(base, fragment);
+    }
+    if (Array.isArray(base) && Array.isArray(fragment)) {
+        return mergeJsonArrays(base, fragment);
+    }
+    return fragment;
+}
+function mergeJsonArrays(base, fragment) {
+    const result = [...base];
+    const seen = new Set(base.map(stableJsonKey));
+    for (const item of fragment) {
+        const key = stableJsonKey(item);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        result.push(item);
+    }
+    return result;
+}
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stableJsonKey(value) {
+    if (!isPlainObject(value))
+        return JSON.stringify(value);
+    const sorted = {};
+    for (const key of Object.keys(value).sort()) {
+        sorted[key] = value[key];
+    }
+    return JSON.stringify(sorted);
+}
+/** Shell-quote a string using single quotes (POSIX-safe). */
+function shellQuote(s) {
+    return "'" + s.replace(/'/g, "'\"'\"'") + "'";
+}
+function upsertCommandHook(hooks, event, command) {
+    const eventEntries = Array.isArray(hooks[event]) ? hooks[event] : [];
+    if (eventEntries.some((entry) => hookEntryContainsCommand(entry, command))) {
+        hooks[event] = eventEntries;
+        return;
+    }
+    eventEntries.push({
+        hooks: [
+            { type: "command", command, timeout: 5 },
+        ],
+    });
+    hooks[event] = eventEntries;
+}
+function hookEntryContainsCommand(entry, command) {
+    if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+        return false;
+    const hooks = entry["hooks"];
+    if (!Array.isArray(hooks))
+        return false;
+    return hooks.some((hook) => typeof hook === "object" &&
+        hook !== null &&
+        !Array.isArray(hook) &&
+        hook["type"] === "command" &&
+        hook["command"] === command);
+}
 //# sourceMappingURL=claude-code-adapter.js.map