brainclaw 1.8.0 → 1.9.1

package/dist/commands/hooks.js

@@ -9,33 +9,33 @@ import { BRAINCLAW_SECTION_START, BRAINCLAW_SECTION_END, upsertBrainclawSection,
  * deterministically into every agent conversation.
  */
 export function generateCursorHook(projectName) {
-    return `---
-description: brainclaw session bootstrap for ${projectName}
-alwaysApply: true
----
-
-# Brainclaw session bootstrap
-
-Brainclaw is the shared coordination layer for this project. Use its MCP facades first — the CLI is only a fallback when MCP is unavailable.
-
-## At the start of every session
-
-Call \`bclaw_work(intent)\` — it handles session setup, context load, and scope claim in a single call.
-
-- \`bclaw_work(intent: "resume")\` when continuing an existing task.
-- \`bclaw_work(intent: "execute", scope: "<path>", task: "<text>")\` when starting new work on a specific scope.
-- \`bclaw_work(intent: "consult")\` to read context without claiming.
-
-## To coordinate with other agents
-
-\`bclaw_coordinate(intent)\` — \`assign\`, \`consult\`, \`review\`, or \`reroute\`.
-
-## Before finishing
-
-- Release your claims: \`bclaw_release_claim(id)\`.
-- Close out the session: \`bclaw_session_end\` (or let it auto-release via the session hook).
-
-CLI fallback only: \`brainclaw context\` / \`brainclaw session-end --auto-release\` if MCP is not reachable.
+    return `---
+description: brainclaw session bootstrap for ${projectName}
+alwaysApply: true
+---
+
+# Brainclaw session bootstrap
+
+Brainclaw is the shared coordination layer for this project. Use its MCP facades first — the CLI is only a fallback when MCP is unavailable.
+
+## At the start of every session
+
+Call \`bclaw_work(intent)\` — it handles session setup, context load, and scope claim in a single call.
+
+- \`bclaw_work(intent: "resume")\` when continuing an existing task.
+- \`bclaw_work(intent: "execute", scope: "<path>", task: "<text>")\` when starting new work on a specific scope.
+- \`bclaw_work(intent: "consult")\` to read context without claiming.
+
+## To coordinate with other agents
+
+\`bclaw_coordinate(intent)\` — \`assign\`, \`consult\`, \`review\`, or \`reroute\`.
+
+## Before finishing
+
+- Release your claims: \`bclaw_release_claim(id)\`.
+- Close out the session: \`bclaw_session_end\` (or let it auto-release via the session hook).
+
+CLI fallback only: \`brainclaw context\` / \`brainclaw session-end --auto-release\` if MCP is not reachable.
 `;
 }
 /**
@@ -44,58 +44,58 @@ CLI fallback only: \`brainclaw context\` / \`brainclaw session-end --auto-releas
  * delimited "SESSION START" block acts as a deterministic trigger.
  */
 export function generateWindsurfHook(projectName) {
-    return `# Brainclaw session trigger — ${projectName}
-# This block is always active. Windsurf Cascade reads .windsurfrules on every activation.
-
-## SESSION START (always run first)
-
-Call the Brainclaw MCP facade before responding to any request:
-
-- \`bclaw_work(intent: "resume")\` when continuing an existing task.
-- \`bclaw_work(intent: "execute", scope: "<path>", task: "<text>")\` when starting new work on a specific scope.
-- \`bclaw_work(intent: "consult")\` to read context without claiming.
-
-This returns active constraints, recent decisions, known traps, open plans, active claims, and the last handoff. Do not skip.
-
-## COORDINATION
-
-\`bclaw_coordinate(intent)\` to assign, consult, review, or reroute other agents.
-
-## SESSION END (before finishing)
-
-- \`bclaw_release_claim(id)\` for each claim you hold.
-- \`bclaw_session_end\` to close the session (auto-releases remaining claims).
-
-CLI fallback only when MCP is unavailable: \`brainclaw context\` / \`brainclaw session-end --auto-release\`.
+    return `# Brainclaw session trigger — ${projectName}
+# This block is always active. Windsurf Cascade reads .windsurfrules on every activation.
+
+## SESSION START (always run first)
+
+Call the Brainclaw MCP facade before responding to any request:
+
+- \`bclaw_work(intent: "resume")\` when continuing an existing task.
+- \`bclaw_work(intent: "execute", scope: "<path>", task: "<text>")\` when starting new work on a specific scope.
+- \`bclaw_work(intent: "consult")\` to read context without claiming.
+
+This returns active constraints, recent decisions, known traps, open plans, active claims, and the last handoff. Do not skip.
+
+## COORDINATION
+
+\`bclaw_coordinate(intent)\` to assign, consult, review, or reroute other agents.
+
+## SESSION END (before finishing)
+
+- \`bclaw_release_claim(id)\` for each claim you hold.
+- \`bclaw_session_end\` to close the session (auto-releases remaining claims).
+
+CLI fallback only when MCP is unavailable: \`brainclaw context\` / \`brainclaw session-end --auto-release\`.
 `;
 }
 /**
  * Generate a generic markdown session-trigger section.
  */
 export function generateMarkdownHook(agentName, projectName) {
-    return `# Brainclaw session trigger — ${projectName}
-# This block is always active. ${agentName} reads this file on every activation.
-
-## SESSION START (always run first)
-
-Call the Brainclaw MCP facade before responding to any request:
-
-- \`bclaw_work(intent: "resume")\` when continuing an existing task.
-- \`bclaw_work(intent: "execute", scope: "<path>", task: "<text>")\` when starting new work on a specific scope.
-- \`bclaw_work(intent: "consult")\` to read context without claiming.
-
-This returns active constraints, recent decisions, known traps, open plans, active claims, and the last handoff. Do not skip.
-
-## COORDINATION
-
-\`bclaw_coordinate(intent)\` to assign, consult, review, or reroute other agents.
-
-## SESSION END (before finishing)
-
-- \`bclaw_release_claim(id)\` for each claim you hold.
-- \`bclaw_session_end\` to close the session (auto-releases remaining claims).
-
-CLI fallback only when MCP is unavailable: \`brainclaw context\` / \`brainclaw session-end --auto-release\`.
+    return `# Brainclaw session trigger — ${projectName}
+# This block is always active. ${agentName} reads this file on every activation.
+
+## SESSION START (always run first)
+
+Call the Brainclaw MCP facade before responding to any request:
+
+- \`bclaw_work(intent: "resume")\` when continuing an existing task.
+- \`bclaw_work(intent: "execute", scope: "<path>", task: "<text>")\` when starting new work on a specific scope.
+- \`bclaw_work(intent: "consult")\` to read context without claiming.
+
+This returns active constraints, recent decisions, known traps, open plans, active claims, and the last handoff. Do not skip.
+
+## COORDINATION
+
+\`bclaw_coordinate(intent)\` to assign, consult, review, or reroute other agents.
+
+## SESSION END (before finishing)
+
+- \`bclaw_release_claim(id)\` for each claim you hold.
+- \`bclaw_session_end\` to close the session (auto-releases remaining claims).
+
+CLI fallback only when MCP is unavailable: \`brainclaw context\` / \`brainclaw session-end --auto-release\`.
 `;
 }
 export function writeHook(content, relativePath, cwd) {

package/dist/commands/init.js

@@ -16,8 +16,11 @@ import { BRAINCLAW_EXCLUSIVE_DIRECTORIES, describeAutoConfigWrite, ensureAgentFi
 import { detectAiAgent, detectWslEnvironment } from '../core/ai-agent-detection.js';
 import { buildAiSurfaceInventory, renderAiSurfaceUsageHints } from '../core/ai-surface-inventory.js';
 import { ensureUserStore, hasCompletedSetup } from '../core/setup-state.js';
+import { resolveEmptyMemoryRecommendation } from '../core/setup-flow.js';
 import { writeDetectedAgentExport } from './export.js';
 import { writeDetectedAgentHooks } from './hooks.js';
+import { checkGitPresence, runGlobalInstall } from './setup.js';
+import { createBackup, BackupError } from '../core/upgrades/backup.js';
 import { ConfigSchema } from '../core/schema.js';
 export async function runInit(options = {}) {
     const cwd = options.cwd ?? process.cwd();
@@ -29,6 +32,14 @@ export async function runInit(options = {}) {
     if (!hasCompletedSetup()) {
         ensureUserStore();
     }
+    // Git-presence gate, aligned with `brainclaw setup`: agent-first onboarding
+    // assumes git for memory versioning + post-merge hooks. Allow override via
+    // BRAINCLAW_SKIP_REPO_ANALYSIS=1 for tests that exercise non-git fixtures.
+    if (process.env.BRAINCLAW_SKIP_REPO_ANALYSIS !== '1' && !checkGitPresence()) {
+        console.error('brainclaw init needs git to work.');
+        console.error('Install git from https://git-scm.com and try again.');
+        process.exit(1);
+    }
     if (containingMemoryStore) {
         console.error(`Error: cannot run \`brainclaw init\` from inside an existing project memory store (${containingMemoryStore}).`);
         console.error('Run `brainclaw init` from the project root directory instead.');
@@ -61,6 +72,29 @@ export async function runInit(options = {}) {
     const storageDir = resolveStorageDir(options.storageDir);
     const projectMemoryExists = memoryExists(cwd);
     const existingConfig = projectMemoryExists ? loadExistingConfig(cwd, storageDir) : undefined;
+    // --force backup gate: feedback_no_init_force (June 2026) entered the code.
+    // Before rebuilding identity fields on top of an existing store, take a
+    // sibling backup so curator personalisations (redaction patterns, claim
+    // TTL, governance, sensitive_paths) can always be recovered even if the
+    // merge below regresses or the agent ran `init --force` by mistake.
+    let forceBackupPath;
+    if (options.force && projectMemoryExists) {
+        try {
+            const handle = createBackup({
+                storePath: path.join(cwd, storageDir),
+                note: 'init --force pre-reconstruction snapshot',
+                storeSchemaVersion: existingConfig ? String(existingConfig.schema_version) : null,
+            });
+            forceBackupPath = handle.backupPath;
+        }
+        catch (err) {
+            const reason = err instanceof BackupError
+                ? `${err.code}: ${err.message}`
+                : err instanceof Error ? err.message : String(err);
+            console.error(`Error: --force backup failed (${reason}). Aborting to preserve the existing store. Re-run without --force, or move the store aside manually.`);
+            process.exit(1);
+        }
+    }
     const topology = resolveTopology(options.topology, existingConfig?.topology);
     const ignoreStrategy = resolveIgnoreStrategy(topology, existingConfig?.ignore_strategy);
     const skipAgentBootstrap = options.skipAgentBootstrap === true || process.env.BRAINCLAW_SKIP_AGENT_BOOTSTRAP === '1';
@@ -83,11 +117,13 @@ export async function runInit(options = {}) {
     });
     // Auto-detect and register the AI coding agent running in this environment
     const detectedAi = skipAgentBootstrap ? undefined : detectAiAgent();
-    let registeredAiAgent = detectedAi
+    const registeredAiAgent = detectedAi
         ? registerAgentIdentity({
             agentName: detectedAi.name,
             kind: detectedAi.kind,
-            trustLevel: detectedAi.trust_level,
+            // pln#562 step 2 — auto-registration never exceeds contributor;
+            // elevation is an explicit curator act (set-trust / register-agent).
+            trustLevel: 'contributor',
             cwd,
             preferredDirName: storageDir,
         })
@@ -123,7 +159,15 @@ export async function runInit(options = {}) {
         storageDir,
         topology,
         ignoreStrategy,
-        existingConfig: options.force ? undefined : existingConfig,
+        // --force rebuilds identity (project_id, agent, topology, storage_dir)
+        // but merges through existingConfig so curator personalisations
+        // (redaction patterns, governance, claims TTL, sensitive_paths,
+        // cross_project_links, custom markdown caps) survive the reset.
+        // The original `force ? undefined` path wiped these silently —
+        // discovered when feedback_no_init_force was promoted from a memory
+        // habit to a tracked regression.
+        existingConfig,
+        defaultJournalMode: !projectMemoryExists,
         compact: options.compact === true,
     });
     if (detectedAi && isAgentIntegrationName(detectedAi.name)) {
@@ -141,6 +185,19 @@ export async function runInit(options = {}) {
                 .filter((hook) => hook.relativePath !== detectedExport?.relativePath))
         : [];
     const detectedAutoConfig = detectedAi ? writeDetectedAgentAutoConfig(detectedAi.name, cwd) : [];
+    // Per-agent slice of machine prerequisites (the same writes setup performs
+    // globally, but scoped to the detected agent). This makes `init` the single
+    // entry point for the carte-blanche / fresh-repo case: an agent-first
+    // bootstrap no longer needs a separate `brainclaw setup` shell-out + session
+    // reload. Idempotent — each ensure* function returns "skipped" when the
+    // agent's user-scope config doesn't exist.
+    const skipMachinePrereqs = options.skipMachinePrereqs === true
+        || skipAgentBootstrap
+        || testMode
+        || process.env.BRAINCLAW_INIT_SKIP_MACHINE_PREREQS === '1';
+    const machinePrereqsWritten = detectedAi && !skipMachinePrereqs
+        ? safeRunMachinePrereqs(detectedAi.name)
+        : [];
     // Register in global project registry
     try {
         const entry = scanProject(cwd);
@@ -177,7 +234,10 @@ export async function runInit(options = {}) {
     if (projectMemoryExists) {
         console.log(`✔ Refreshed existing project memory in ${storageDir}/`);
         if (options.force) {
-            console.log('✔ Existing memory preserved; rebuilt managed configuration and agent integration files from defaults');
+            if (forceBackupPath) {
+                console.log(`✔ Pre-reconstruction backup at ${forceBackupPath} (rollback: brainclaw upgrade --rollback)`);
+            }
+            console.log('✔ Existing memory preserved; rebuilt managed identity and refreshed agent integration files (customisations merged through)');
         }
         else {
             console.log('✔ Existing memory preserved; refreshed managed configuration and agent integration files');
@@ -192,6 +252,12 @@ export async function runInit(options = {}) {
     if (registeredAiAgent) {
         console.log(`✔ AI agent detected: ${registeredAiAgent.agent_name} [${detectedAi.detection_source}] (${registeredAiAgent.agent_id})`);
     }
+    if (machinePrereqsWritten.length > 0) {
+        console.log(`\u2714 Machine prerequisites for ${detectedAi.name}:`);
+        for (const filePath of machinePrereqsWritten) {
+            console.log(`  - ${filePath}`);
+        }
+    }
     if (detectedExport) {
         console.log(`\u2714 Agent instructions written to ${detectedExport.relativePath} (${detectedExport.created ? 'created' : 'updated'})`);
     }
@@ -265,25 +331,36 @@ export async function runInit(options = {}) {
     // Install post-merge hook for auto-release of claims after merge
     installPostMergeHookIfMissing(cwd);
     if (!testMode) {
-        const onboardingPreflight = runBootstrapProfile({ cwd, refresh: true });
+        // Shared empty-memory rule (see docs/concepts/workspace-bootstrapping.md):
+        // repo with content → bclaw_bootstrap extraction; greenfield → bootstrap
+        // loop. The brownfield preflight scan is skipped on greenfield — there is
+        // nothing to harvest yet.
+        const emptyMemoryRec = resolveEmptyMemoryRecommendation(cwd);
         console.log('');
-        console.log('Onboarding preflight:');
-        for (const line of renderBootstrapSummary(onboardingPreflight).split('\n')) {
-            console.log(`  ${line}`);
-        }
-        if (onboardingPreflight.importPlan.suggestion_count > 0) {
-            console.log('');
-            console.log(`Next step: run 'brainclaw bootstrap --apply' to import ${onboardingPreflight.importPlan.suggestion_count} suggested item(s) into canonical memory.`);
-            console.log(`Rollback: run 'brainclaw bootstrap --uninstall' to deactivate the last bootstrap-managed import.`);
-        }
-        if ((onboardingPreflight.importPlan.interview?.question_count ?? 0) > 0) {
-            console.log('');
-            console.log(`Interview: run 'brainclaw bootstrap --interview --audience cli' for terminal agents or '--audience ide_chat' for IDE chat agents.`);
-            console.log(`Apply confirmed answers: write a JSON answers file and run 'brainclaw bootstrap --answers-file <path> --apply'.`);
+        if (emptyMemoryRec.route === 'ideate') {
+            console.log(`Onboarding: ${emptyMemoryRec.text}`);
         }
-        else if ((onboardingPreflight.profile.gaps?.length ?? 0) > 0) {
-            console.log('');
-            console.log(`Next step: review the onboarding gaps, then use 'brainclaw bootstrap --json' as the basis for an interview/import flow.`);
+        else {
+            const onboardingPreflight = runBootstrapProfile({ cwd, refresh: true });
+            console.log('Onboarding preflight:');
+            console.log(`  ${emptyMemoryRec.text}`);
+            for (const line of renderBootstrapSummary(onboardingPreflight).split('\n')) {
+                console.log(`  ${line}`);
+            }
+            if (onboardingPreflight.importPlan.suggestion_count > 0) {
+                console.log('');
+                console.log(`Next step: run 'brainclaw bootstrap --apply' to import ${onboardingPreflight.importPlan.suggestion_count} suggested item(s) into canonical memory.`);
+                console.log(`Rollback: run 'brainclaw bootstrap --uninstall' to deactivate the last bootstrap-managed import.`);
+            }
+            if ((onboardingPreflight.importPlan.interview?.question_count ?? 0) > 0) {
+                console.log('');
+                console.log(`Interview: run 'brainclaw bootstrap --interview --audience cli' for terminal agents or '--audience ide_chat' for IDE chat agents.`);
+                console.log(`Apply confirmed answers: write a JSON answers file and run 'brainclaw bootstrap --answers-file <path> --apply'.`);
+            }
+            else if ((onboardingPreflight.profile.gaps?.length ?? 0) > 0) {
+                console.log('');
+                console.log(`Next step: review the onboarding gaps, then use 'brainclaw bootstrap --json' as the basis for an interview/import flow.`);
+            }
         }
     }
     console.log('');
@@ -293,7 +370,16 @@ export async function runInit(options = {}) {
     else {
         console.log(`Tip: run 'brainclaw init' again later to refresh the detected agent's integration files on this project.`);
     }
-    console.log(`Tip: run 'brainclaw context --json' to load the shared memory into your agent session.`);
+    console.log(`Tip: in an agent session, call the bclaw_work MCP tool (intent: "consult") to load the shared memory; from a terminal, 'brainclaw context --json' does the same.`);
+}
+function safeRunMachinePrereqs(agentName) {
+    try {
+        return runGlobalInstall([agentName]);
+    }
+    catch {
+        // Non-fatal: machine-scope writes are best-effort, never block init.
+        return [];
+    }
 }
 function installPostMergeHookIfMissing(cwd) {
     try {
@@ -483,6 +569,12 @@ function buildInitConfig(input) {
         storageDir: input.storageDir,
         topology: input.topology,
         ignoreStrategy: input.ignoreStrategy,
+        // Solo-agent fresh default: the human running init is the default curator.
+        // Without it, approval_policy=review + curators=[] = every candidate sits
+        // in pending forever — a surprise the 2026-06-10 front-door audit flagged.
+        // mergeConfigWithDefaults preserves any explicit curators list on an
+        // existing store, so this only takes effect on fresh installs.
+        curatorName: input.currentAgent.name,
     });
     const config = input.existingConfig
         ? mergeConfigWithDefaults(input.existingConfig, fallbackConfig)
@@ -512,6 +604,16 @@ function buildInitConfig(input) {
             max_items_per_section: Math.min(markdown.max_items_per_section, 20),
         };
     }
+    // pln#567 (decision A) — the event journal is ON by default for projects
+    // created through init. Set HERE, never in defaultConfig:
+    // createTestWorkspace builds its config straight from defaultConfig, so a dual
+    // default there would make the whole core suite dual-write (trp_65176454).
+    // Existing stores keep their current value, including unset legacy configs:
+    // `migrate --enable-journal` is the explicit path that turns them on and
+    // backfills genesis before future dual-writes depend on the journal.
+    if (input.defaultJournalMode === true && config.store?.journal?.mode === undefined) {
+        config.store = { ...config.store, journal: { ...config.store?.journal, mode: 'dual' } };
+    }
     return config;
 }
 function mergeConfigWithDefaults(existingConfig, fallbackConfig) {

package/dist/commands/install-hooks.js

@@ -40,63 +40,63 @@ export function runInstallHooks(options = {}) {
     }
 }
 function generateClaudePreToolScript() {
-    return `#!/bin/sh
-# brainclaw Claude Code preToolUse hook
-# Generated by: brainclaw install-hooks
-exec node -e "
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
-
-const toolName = process.env.CLAUDE_TOOL_NAME || process.argv[2] || process.env.TOOL_NAME || '';
-const isWrite = /edit|write|replace|bash|str_replace/i.test(toolName);
-
-if (!isWrite || !toolName) process.exit(0);
-
-try {
-  const BCLAW_CMD = fs.existsSync(path.join(process.cwd(), 'node_modules', '.bin', 'brainclaw')) 
-    ? 'npx brainclaw' : 'brainclaw';
-  const out = execSync(BCLAW_CMD + ' claim list --json', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] });
-  const claims = JSON.parse(out);
-  if (claims && claims.length > 0) process.exit(0);
-} catch (e) {
-  // ignore if brainclaw not found or fails
-  process.exit(0);
-}
-
-const sessionMark = path.join(process.cwd(), '.brainclaw', 'tmp', 'claude_warned');
-if (!fs.existsSync(path.dirname(sessionMark))) fs.mkdirSync(path.dirname(sessionMark), { recursive: true });
-
-if (fs.existsSync(sessionMark)) {
-  const mtime = fs.statSync(sessionMark).mtimeMs;
-  if (Date.now() - mtime < 2 * 60 * 60 * 1000) {
-    process.exit(0); // already warned this session
-  }
-}
-fs.writeFileSync(sessionMark, Date.now().toString());
-
-process.stderr.write('\\n[Brainclaw] ⚠️  WARNING: You are about to use an Edit/Write tool (' + toolName + ') but you have NO active claim.\\n');
-process.stderr.write('[Brainclaw] Consider running \\\`brainclaw claim create <scope>\\\` to lock your work and avoid conflicts.\\n\\n');
-" 2>&1 || exit 0
+    return `#!/bin/sh
+# brainclaw Claude Code preToolUse hook
+# Generated by: brainclaw install-hooks
+exec node -e "
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const toolName = process.env.CLAUDE_TOOL_NAME || process.argv[2] || process.env.TOOL_NAME || '';
+const isWrite = /edit|write|replace|bash|str_replace/i.test(toolName);
+
+if (!isWrite || !toolName) process.exit(0);
+
+try {
+  const BCLAW_CMD = fs.existsSync(path.join(process.cwd(), 'node_modules', '.bin', 'brainclaw')) 
+    ? 'npx brainclaw' : 'brainclaw';
+  const out = execSync(BCLAW_CMD + ' claim list --json', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] });
+  const claims = JSON.parse(out);
+  if (claims && claims.length > 0) process.exit(0);
+} catch (e) {
+  // ignore if brainclaw not found or fails
+  process.exit(0);
+}
+
+const sessionMark = path.join(process.cwd(), '.brainclaw', 'tmp', 'claude_warned');
+if (!fs.existsSync(path.dirname(sessionMark))) fs.mkdirSync(path.dirname(sessionMark), { recursive: true });
+
+if (fs.existsSync(sessionMark)) {
+  const mtime = fs.statSync(sessionMark).mtimeMs;
+  if (Date.now() - mtime < 2 * 60 * 60 * 1000) {
+    process.exit(0); // already warned this session
+  }
+}
+fs.writeFileSync(sessionMark, Date.now().toString());
+
+process.stderr.write('\\n[Brainclaw] ⚠️  WARNING: You are about to use an Edit/Write tool (' + toolName + ') but you have NO active claim.\\n');
+process.stderr.write('[Brainclaw] Consider running \\\`brainclaw claim create <scope>\\\` to lock your work and avoid conflicts.\\n\\n');
+" 2>&1 || exit 0
 `;
 }
 function generatePostMergeScript() {
-    return `#!/bin/sh
-# brainclaw post-merge hook
-# Auto-releases claims whose scope overlaps with files changed by the merge
-# Generated by: brainclaw install-hooks
-
-BCLAW_CMD=""
-if command -v brainclaw >/dev/null 2>&1; then
-  BCLAW_CMD="brainclaw"
-elif command -v bclaw >/dev/null 2>&1; then
-  BCLAW_CMD="bclaw"
-else
-  BCLAW_CMD="npx --no brainclaw"
-fi
-
-$BCLAW_CMD release-claims --from-git-diff 2>/dev/null || true
-$BCLAW_CMD worktree clean 2>/dev/null || true
+    return `#!/bin/sh
+# brainclaw post-merge hook
+# Auto-releases claims whose scope overlaps with files changed by the merge
+# Generated by: brainclaw install-hooks
+
+BCLAW_CMD=""
+if command -v brainclaw >/dev/null 2>&1; then
+  BCLAW_CMD="brainclaw"
+elif command -v bclaw >/dev/null 2>&1; then
+  BCLAW_CMD="bclaw"
+else
+  BCLAW_CMD="npx --no brainclaw"
+fi
+
+$BCLAW_CMD release-claims --from-git-diff 2>/dev/null || true
+$BCLAW_CMD worktree clean 2>/dev/null || true
 `;
 }
 function findGitRoot(cwd) {
@@ -113,30 +113,30 @@ function findGitRoot(cwd) {
 function generateHookScript() {
     // Use node directly to avoid sh.exe pipe issues on Windows (SIGPIPE).
     // The script is a self-contained node -e that runs both checks.
-    return `#!/bin/sh
-# brainclaw pre-commit hook — generated by brainclaw install-hooks
-# Runs via node to avoid sh.exe SIGPIPE issues on Windows.
-exec node -e "
-const { execSync } = require('child_process');
-const staged = execSync('git diff --cached --name-only', { encoding: 'utf-8' }).trim();
-if (!staged) process.exit(0);
-
-// Check 1: reject staged .brainclaw/ files
-const brainclawFiles = staged.split('\\\\n').filter(f => f.startsWith('.brainclaw/'));
-if (brainclawFiles.length > 0) {
-  process.stderr.write('\\\\nbrainclaw: .brainclaw/ files are staged — blocked.\\\\n');
-  brainclawFiles.forEach(f => process.stderr.write('  ' + f + '\\\\n'));
-  process.stderr.write('  Fix: git reset HEAD .brainclaw/\\\\n\\\\n');
-  process.exit(1);
-}
-
-// Check 2: active constraint violations
-try {
-  execSync('brainclaw check-constraints --staged', { stdio: 'inherit' });
-} catch (e) {
-  if (e.status) process.exit(e.status);
-}
-" 2>&1 || exit $?
+    return `#!/bin/sh
+# brainclaw pre-commit hook — generated by brainclaw install-hooks
+# Runs via node to avoid sh.exe SIGPIPE issues on Windows.
+exec node -e "
+const { execSync } = require('child_process');
+const staged = execSync('git diff --cached --name-only', { encoding: 'utf-8' }).trim();
+if (!staged) process.exit(0);
+
+// Check 1: reject staged .brainclaw/ files
+const brainclawFiles = staged.split('\\\\n').filter(f => f.startsWith('.brainclaw/'));
+if (brainclawFiles.length > 0) {
+  process.stderr.write('\\\\nbrainclaw: .brainclaw/ files are staged — blocked.\\\\n');
+  brainclawFiles.forEach(f => process.stderr.write('  ' + f + '\\\\n'));
+  process.stderr.write('  Fix: git reset HEAD .brainclaw/\\\\n\\\\n');
+  process.exit(1);
+}
+
+// Check 2: active constraint violations
+try {
+  execSync('brainclaw check-constraints --staged', { stdio: 'inherit' });
+} catch (e) {
+  if (e.status) process.exit(e.status);
+}
+" 2>&1 || exit $?
 `;
 }
 //# sourceMappingURL=install-hooks.js.map

package/dist/commands/loops-handlers.js

@@ -284,6 +284,7 @@ export function handleBclawLoop(options) {
                         input: req.input,
                         dispatch: req.dispatch,
                         assignment_id: req.assignment_id,
+                        claim_id: req.claim_id,
                         actor,
                     }, options.cwd);
                     const newEvents = findNewLoopEvents(loop.id, beforeEvents, options.cwd);
@@ -309,6 +310,9 @@ export function handleBclawLoop(options) {
                             : undefined,
                         actor,
                         caller_agent_id: req.agentId,
+                        // pln#562 step 4 — a dispatched instance proves itself via its
+                        // claim env; claim-bound slots reject same-named siblings.
+                        caller_claim_id: process.env.BRAINCLAW_CLAIM_ID?.trim() || undefined,
                     }, options.cwd);
                     const newEvents = findNewLoopEvents(loop.id, beforeEvents, options.cwd);
                     return successResponse('complete_turn', { loop, next_expected: computeNextExpected(loop) }, [loopArtifactEntry(loop.id), ...loopEventArtifacts(newEvents)], [sideEffectUpdate('loop', loop.id), ...loopEventSideEffects(newEvents)], [], Date.now() - startMs, summarizeLoop(loop));