brainclaw 1.9.0 → 1.10.0

package/dist/core/security-guard.js

@@ -12,216 +12,216 @@
  * a config change, no regeneration required.
  */
 export function generateBashGuard(brainclawBin) {
-    return `#!/usr/bin/env bash
-# brainclaw-guard — preinstall security gate
-# Generated by: brainclaw setup-security
-# Do not edit manually — regenerate with brainclaw setup-security
-
-BRAINCLAW_BIN="${brainclawBin}"
-ORIGINAL_CMD="\${BRAINCLAW_GUARD_ORIGINAL_CMD:-npm}"
-
-is_install_command() {
-  for arg in "$@"; do
-    case "$arg" in
-      install|add|i)       return 0 ;;
-      -*)                  continue  ;;
-      *)                   break     ;;
-    esac
-  done
-  return 1
-}
-
-is_local_or_url() {
-  case "$1" in
-    .|..|./*|../*|/*|*:/*|git+*|git@*|*.tgz|*.tar.gz|*.whl) return 0 ;;
-  esac
-  case "$1" in
-    [A-Za-z]:[\\\\/]*) return 0 ;;
-  esac
-  return 1
-}
-
-extract_packages() {
-  local packages=""
-  local req_file=""
-  local skip_next=false
-  local past_command=false
-  for arg in "$@"; do
-    if [ "$skip_next" = true ]; then
-      # The flag's value lands here; capture it for -r/--requirement.
-      case "$prev_flag" in
-        -r|--requirement) req_file="$arg" ;;
-      esac
-      skip_next=false
-      prev_flag=""
-      continue
-    fi
-    case "$arg" in
-      install|add|i)
-        past_command=true
-        continue
-        ;;
-      --save-dev|--save-peer|--save-optional|--save-exact|--save-prod|-D|-P|-O|-E|-S|-g|--global|--no-save|--user|--upgrade|-U|--break-system-packages|--no-deps|--pre|--force-reinstall|--ignore-installed)
-        continue
-        ;;
-      --registry|--prefix|--tag|--registry-url|--cache|--index-url|--extra-index-url|--find-links|--proxy|--cert|--client-cert|--trusted-host|--target|--root|--python|--platform|--abi|--implementation)
-        prev_flag="$arg"
-        skip_next=true
-        continue
-        ;;
-      -r|--requirement|-e|--editable|-c|--constraint)
-        prev_flag="$arg"
-        skip_next=true
-        continue
-        ;;
-      -*)
-        continue
-        ;;
-      *)
-        if [ "$past_command" = true ]; then
-          if is_local_or_url "$arg"; then
-            continue
-          fi
-          if [ -n "$packages" ]; then
-            packages="$packages,$arg"
-          else
-            packages="$arg"
-          fi
-        fi
-        ;;
-    esac
-  done
-  printf '%s\\t%s' "$packages" "$req_file"
-}
-
-# Main logic
-if is_install_command "$@"; then
-  extracted=$(extract_packages "$@")
-  packages="\${extracted%%	*}"
-  req_file="\${extracted##*	}"
-
-  if [ -n "$packages" ] || [ -n "$req_file" ]; then
-    ecosystem="npm"
-    if [ "$ORIGINAL_CMD" = "pip" ] || [ "$ORIGINAL_CMD" = "pip3" ]; then
-      ecosystem="pypi"
-    fi
-
-    args=(check-security --ecosystem "$ecosystem" --json)
-    if [ -n "$packages" ]; then args+=(--packages "$packages"); fi
-    if [ -n "$req_file" ]; then args+=(--requirements "$req_file"); fi
-
-    "$BRAINCLAW_BIN" "\${args[@]}" >/dev/null 2>&1
-    exit_code=$?
-
-    if [ $exit_code -eq 2 ]; then
-      echo "[brainclaw-guard] BLOCKED — supply chain risk detected (enforced mode)" >&2
-      details_pkgs="\${packages:-$req_file}"
-      echo "[brainclaw-guard] Details: $BRAINCLAW_BIN check-security --ecosystem $ecosystem --packages \\"$details_pkgs\\"" >&2
-      exit 1
-    elif [ $exit_code -eq 1 ]; then
-      echo "[brainclaw-guard] WARNING — potential supply chain risk (advisory or warn-threshold verdict)" >&2
-      details_pkgs="\${packages:-$req_file}"
-      echo "[brainclaw-guard] Details: $BRAINCLAW_BIN check-security --ecosystem $ecosystem --packages \\"$details_pkgs\\"" >&2
-    fi
-    # exit_code 0 = pass, continue silently
-  fi
-fi
-
-exec "$ORIGINAL_CMD" "$@"
+    return `#!/usr/bin/env bash
+# brainclaw-guard — preinstall security gate
+# Generated by: brainclaw setup-security
+# Do not edit manually — regenerate with brainclaw setup-security
+
+BRAINCLAW_BIN="${brainclawBin}"
+ORIGINAL_CMD="\${BRAINCLAW_GUARD_ORIGINAL_CMD:-npm}"
+
+is_install_command() {
+  for arg in "$@"; do
+    case "$arg" in
+      install|add|i)       return 0 ;;
+      -*)                  continue  ;;
+      *)                   break     ;;
+    esac
+  done
+  return 1
+}
+
+is_local_or_url() {
+  case "$1" in
+    .|..|./*|../*|/*|*:/*|git+*|git@*|*.tgz|*.tar.gz|*.whl) return 0 ;;
+  esac
+  case "$1" in
+    [A-Za-z]:[\\\\/]*) return 0 ;;
+  esac
+  return 1
+}
+
+extract_packages() {
+  local packages=""
+  local req_file=""
+  local skip_next=false
+  local past_command=false
+  for arg in "$@"; do
+    if [ "$skip_next" = true ]; then
+      # The flag's value lands here; capture it for -r/--requirement.
+      case "$prev_flag" in
+        -r|--requirement) req_file="$arg" ;;
+      esac
+      skip_next=false
+      prev_flag=""
+      continue
+    fi
+    case "$arg" in
+      install|add|i)
+        past_command=true
+        continue
+        ;;
+      --save-dev|--save-peer|--save-optional|--save-exact|--save-prod|-D|-P|-O|-E|-S|-g|--global|--no-save|--user|--upgrade|-U|--break-system-packages|--no-deps|--pre|--force-reinstall|--ignore-installed)
+        continue
+        ;;
+      --registry|--prefix|--tag|--registry-url|--cache|--index-url|--extra-index-url|--find-links|--proxy|--cert|--client-cert|--trusted-host|--target|--root|--python|--platform|--abi|--implementation)
+        prev_flag="$arg"
+        skip_next=true
+        continue
+        ;;
+      -r|--requirement|-e|--editable|-c|--constraint)
+        prev_flag="$arg"
+        skip_next=true
+        continue
+        ;;
+      -*)
+        continue
+        ;;
+      *)
+        if [ "$past_command" = true ]; then
+          if is_local_or_url "$arg"; then
+            continue
+          fi
+          if [ -n "$packages" ]; then
+            packages="$packages,$arg"
+          else
+            packages="$arg"
+          fi
+        fi
+        ;;
+    esac
+  done
+  printf '%s\\t%s' "$packages" "$req_file"
+}
+
+# Main logic
+if is_install_command "$@"; then
+  extracted=$(extract_packages "$@")
+  packages="\${extracted%%	*}"
+  req_file="\${extracted##*	}"
+
+  if [ -n "$packages" ] || [ -n "$req_file" ]; then
+    ecosystem="npm"
+    if [ "$ORIGINAL_CMD" = "pip" ] || [ "$ORIGINAL_CMD" = "pip3" ]; then
+      ecosystem="pypi"
+    fi
+
+    args=(check-security --ecosystem "$ecosystem" --json)
+    if [ -n "$packages" ]; then args+=(--packages "$packages"); fi
+    if [ -n "$req_file" ]; then args+=(--requirements "$req_file"); fi
+
+    "$BRAINCLAW_BIN" "\${args[@]}" >/dev/null 2>&1
+    exit_code=$?
+
+    if [ $exit_code -eq 2 ]; then
+      echo "[brainclaw-guard] BLOCKED — supply chain risk detected (enforced mode)" >&2
+      details_pkgs="\${packages:-$req_file}"
+      echo "[brainclaw-guard] Details: $BRAINCLAW_BIN check-security --ecosystem $ecosystem --packages \\"$details_pkgs\\"" >&2
+      exit 1
+    elif [ $exit_code -eq 1 ]; then
+      echo "[brainclaw-guard] WARNING — potential supply chain risk (advisory or warn-threshold verdict)" >&2
+      details_pkgs="\${packages:-$req_file}"
+      echo "[brainclaw-guard] Details: $BRAINCLAW_BIN check-security --ecosystem $ecosystem --packages \\"$details_pkgs\\"" >&2
+    fi
+    # exit_code 0 = pass, continue silently
+  fi
+fi
+
+exec "$ORIGINAL_CMD" "$@"
 `;
 }
 export function generatePowerShellGuard(brainclawBin) {
-    return `# brainclaw-guard — preinstall security gate (PowerShell)
-# Generated by: brainclaw setup-security
-# Do not edit manually — regenerate with brainclaw setup-security
-
-param([Parameter(ValueFromRemainingArguments)]$Args)
-
-$BrainclawBin = "${brainclawBin}"
-$OriginalCmd = if ($env:BRAINCLAW_GUARD_ORIGINAL_CMD) { $env:BRAINCLAW_GUARD_ORIGINAL_CMD } else { "npm" }
-
-function Is-InstallCommand($arguments) {
-    foreach ($arg in $arguments) {
-        if ($arg -match "^(install|add|i)$") { return $true }
-        if ($arg -notmatch "^-") { break }
-    }
-    return $false
-}
-
-function Is-LocalOrUrl($arg) {
-    if ($arg -eq "." -or $arg -eq "..") { return $true }
-    if ($arg -match "^(\\./|\\.\\./|/)") { return $true }
-    if ($arg -match "^[A-Za-z]:[\\\\/]") { return $true }
-    if ($arg -match "^[a-z]+://") { return $true }
-    if ($arg -match "^(git\\+|git@)") { return $true }
-    if ($arg -match "\\.(tgz|tar\\.gz|whl)$") { return $true }
-    return $false
-}
-
-function Extract-Packages($arguments) {
-    $packages = @()
-    $reqFile = ""
-    $pastCommand = $false
-    $skipNext = $false
-    $prevFlag = ""
-    foreach ($arg in $arguments) {
-        if ($skipNext) {
-            if ($prevFlag -match "^(-r|--requirement)$") { $reqFile = $arg }
-            $skipNext = $false
-            $prevFlag = ""
-            continue
-        }
-        if ($arg -match "^(install|add|i)$") { $pastCommand = $true; continue }
-        if ($arg -match "^(--save-dev|--save-peer|--save-optional|--save-exact|--save-prod|-D|-P|-O|-E|-S|-g|--global|--no-save|--user|--upgrade|-U|--break-system-packages|--no-deps|--pre|--force-reinstall|--ignore-installed)$") { continue }
-        if ($arg -match "^(--registry|--prefix|--tag|--registry-url|--cache|--index-url|--extra-index-url|--find-links|--proxy|--cert|--client-cert|--trusted-host|--target|--root|--python|--platform|--abi|--implementation)$") {
-            $prevFlag = $arg; $skipNext = $true; continue
-        }
-        if ($arg -match "^(-r|--requirement|-e|--editable|-c|--constraint)$") {
-            $prevFlag = $arg; $skipNext = $true; continue
-        }
-        if ($arg -match "^-") { continue }
-        if ($pastCommand) {
-            if (Is-LocalOrUrl $arg) { continue }
-            $packages += $arg
-        }
-    }
-    return [PSCustomObject]@{ Packages = ($packages -join ","); RequirementsFile = $reqFile }
-}
-
-if (Is-InstallCommand $Args) {
-    $extracted = Extract-Packages $Args
-    $packages = $extracted.Packages
-    $reqFile = $extracted.RequirementsFile
-
-    if ($packages -or $reqFile) {
-        $ecosystem = "npm"
-        if ($OriginalCmd -match "^pip") { $ecosystem = "pypi" }
-
-        $cliArgs = @("check-security", "--ecosystem", $ecosystem, "--json")
-        if ($packages) { $cliArgs += @("--packages", $packages) }
-        if ($reqFile) { $cliArgs += @("--requirements", $reqFile) }
-
-        try {
-            & $BrainclawBin @cliArgs *> $null
-            $exitCode = $LASTEXITCODE
-        } catch {
-            $exitCode = 0
-        }
-
-        $detailsPkgs = if ($packages) { $packages } else { $reqFile }
-        if ($exitCode -eq 2) {
-            Write-Error "[brainclaw-guard] BLOCKED - supply chain risk detected (enforced mode)"
-            Write-Error "[brainclaw-guard] Details: $BrainclawBin check-security --ecosystem $ecosystem --packages \`"$detailsPkgs\`""
-            exit 1
-        } elseif ($exitCode -eq 1) {
-            Write-Warning "[brainclaw-guard] WARNING - potential supply chain risk (advisory or warn-threshold verdict)"
-            Write-Warning "[brainclaw-guard] Details: $BrainclawBin check-security --ecosystem $ecosystem --packages \`"$detailsPkgs\`""
-        }
-    }
-}
-
-& $OriginalCmd @Args
-exit $LASTEXITCODE
+    return `# brainclaw-guard — preinstall security gate (PowerShell)
+# Generated by: brainclaw setup-security
+# Do not edit manually — regenerate with brainclaw setup-security
+
+param([Parameter(ValueFromRemainingArguments)]$Args)
+
+$BrainclawBin = "${brainclawBin}"
+$OriginalCmd = if ($env:BRAINCLAW_GUARD_ORIGINAL_CMD) { $env:BRAINCLAW_GUARD_ORIGINAL_CMD } else { "npm" }
+
+function Is-InstallCommand($arguments) {
+    foreach ($arg in $arguments) {
+        if ($arg -match "^(install|add|i)$") { return $true }
+        if ($arg -notmatch "^-") { break }
+    }
+    return $false
+}
+
+function Is-LocalOrUrl($arg) {
+    if ($arg -eq "." -or $arg -eq "..") { return $true }
+    if ($arg -match "^(\\./|\\.\\./|/)") { return $true }
+    if ($arg -match "^[A-Za-z]:[\\\\/]") { return $true }
+    if ($arg -match "^[a-z]+://") { return $true }
+    if ($arg -match "^(git\\+|git@)") { return $true }
+    if ($arg -match "\\.(tgz|tar\\.gz|whl)$") { return $true }
+    return $false
+}
+
+function Extract-Packages($arguments) {
+    $packages = @()
+    $reqFile = ""
+    $pastCommand = $false
+    $skipNext = $false
+    $prevFlag = ""
+    foreach ($arg in $arguments) {
+        if ($skipNext) {
+            if ($prevFlag -match "^(-r|--requirement)$") { $reqFile = $arg }
+            $skipNext = $false
+            $prevFlag = ""
+            continue
+        }
+        if ($arg -match "^(install|add|i)$") { $pastCommand = $true; continue }
+        if ($arg -match "^(--save-dev|--save-peer|--save-optional|--save-exact|--save-prod|-D|-P|-O|-E|-S|-g|--global|--no-save|--user|--upgrade|-U|--break-system-packages|--no-deps|--pre|--force-reinstall|--ignore-installed)$") { continue }
+        if ($arg -match "^(--registry|--prefix|--tag|--registry-url|--cache|--index-url|--extra-index-url|--find-links|--proxy|--cert|--client-cert|--trusted-host|--target|--root|--python|--platform|--abi|--implementation)$") {
+            $prevFlag = $arg; $skipNext = $true; continue
+        }
+        if ($arg -match "^(-r|--requirement|-e|--editable|-c|--constraint)$") {
+            $prevFlag = $arg; $skipNext = $true; continue
+        }
+        if ($arg -match "^-") { continue }
+        if ($pastCommand) {
+            if (Is-LocalOrUrl $arg) { continue }
+            $packages += $arg
+        }
+    }
+    return [PSCustomObject]@{ Packages = ($packages -join ","); RequirementsFile = $reqFile }
+}
+
+if (Is-InstallCommand $Args) {
+    $extracted = Extract-Packages $Args
+    $packages = $extracted.Packages
+    $reqFile = $extracted.RequirementsFile
+
+    if ($packages -or $reqFile) {
+        $ecosystem = "npm"
+        if ($OriginalCmd -match "^pip") { $ecosystem = "pypi" }
+
+        $cliArgs = @("check-security", "--ecosystem", $ecosystem, "--json")
+        if ($packages) { $cliArgs += @("--packages", $packages) }
+        if ($reqFile) { $cliArgs += @("--requirements", $reqFile) }
+
+        try {
+            & $BrainclawBin @cliArgs *> $null
+            $exitCode = $LASTEXITCODE
+        } catch {
+            $exitCode = 0
+        }
+
+        $detailsPkgs = if ($packages) { $packages } else { $reqFile }
+        if ($exitCode -eq 2) {
+            Write-Error "[brainclaw-guard] BLOCKED - supply chain risk detected (enforced mode)"
+            Write-Error "[brainclaw-guard] Details: $BrainclawBin check-security --ecosystem $ecosystem --packages \`"$detailsPkgs\`""
+            exit 1
+        } elseif ($exitCode -eq 1) {
+            Write-Warning "[brainclaw-guard] WARNING - potential supply chain risk (advisory or warn-threshold verdict)"
+            Write-Warning "[brainclaw-guard] Details: $BrainclawBin check-security --ecosystem $ecosystem --packages \`"$detailsPkgs\`""
+        }
+    }
+}
+
+& $OriginalCmd @Args
+exit $LASTEXITCODE
 `;
 }
 export function generatePipBashGuard(brainclawBin) {

package/dist/core/spawn-check.js

@@ -48,7 +48,14 @@ function initProbeGitRepo(root) {
 export async function checkAgentSpawn(agent, options = {}) {
     const start = Date.now();
     const profile = getCapabilityProfile(agent);
-    if (!profile?.invoke_template || !profile?.invoke_binary || !profile.runtime.canBeSpawnedCli) {
+    if (!profile) {
+        // Distinct from no_template: the name didn't resolve to any profile at all
+        // (resolution is case-insensitive, so this is a genuine typo/unknown agent,
+        // not a casing slip). Reported separately so the pre-flight reason points at
+        // the spelling instead of the misleading "IDE-only?" template message.
+        return { agent, status: 'unknown_agent', delivered: false, completed: false, duration_ms: 0, detail: `unknown agent '${agent}' — not a registered brainclaw profile` };
+    }
+    if (!profile.invoke_template || !profile.invoke_binary || !profile.runtime.canBeSpawnedCli) {
         return { agent, status: 'no_template', delivered: false, completed: false, duration_ms: 0, detail: 'no CLI invoke template' };
     }
     const binary = resolveBinaryOnPath(profile.invoke_binary);
@@ -120,7 +127,7 @@ export async function runSpawnCheck(options = {}) {
             });
         }
     }
-    const installed = entries.filter((e) => e.status !== 'not_installed' && e.status !== 'no_template');
+    const installed = entries.filter((e) => e.status !== 'not_installed' && e.status !== 'no_template' && e.status !== 'unknown_agent');
     const ok = installed.filter((e) => e.status === 'ok').length;
     const failures = installed.filter((e) => e.status === 'failed' || e.status === 'delivered_no_completion').length;
     const not_installed = entries.filter((e) => e.status === 'not_installed').length;
@@ -172,6 +179,13 @@ export function preflightResultFromEntry(entry) {
     if (entry.status === 'ok' || entry.status === 'delivered_no_completion') {
         return { agent, ok: true, status: entry.status, reason: entry.detail };
     }
+    if (entry.status === 'unknown_agent') {
+        return {
+            agent, ok: false, status: entry.status,
+            reason: `unknown agent '${agent}' — not a registered brainclaw profile (check spelling/case)`,
+            recommended_next_action: `Use a registered agent name (e.g. codex, claude-code, github-copilot). Names are case-insensitive — list installed agents with \`brainclaw doctor --spawn-check\`.`,
+        };
+    }
     if (entry.status === 'not_installed') {
         return {
             agent, ok: false, status: entry.status,

package/dist/core/staleness.js

@@ -108,7 +108,7 @@ const VERIFIED_STALE_DAYS = 30;
  * pln#530 — flag perishable memories (traps that opted in by carrying a
  * `verify_cmd` and/or `verified_at`) whose last empirical verification is stale
  * or never happened, so an agent re-probes the live system instead of trusting a
- * value that may have drifted (the LeaseUp `service_tier` trap that the API later
+ * value that may have drifted (the `service_tier` trap that the API later
  * rejected is the motivating case). Only traps with these fields are considered —
  * durable facts are untouched.
  */

package/dist/core/store-resolution.js

@@ -3,7 +3,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { loadActiveProject } from './active-project.js';
 import { loadConfig } from './config.js';
-import { loadCurrentSession } from './identity.js';
+import { loadCurrentSession, loadSessionById } from './identity.js';
 import { MEMORY_DIR } from './io.js';
 import { summarizeWorkspaceProjects } from './workspace-projects.js';
 /**
@@ -94,14 +94,24 @@ export function resolveTargetStore(cwd = process.cwd(), target = 'local', option
  * 2. BRAINCLAW_CWD env var → workspace anchor injected by MCP configs
  * 3. BRAINCLAW_PROJECT env var → resolved by name/path from workspace anchor
  * 4. Session-scoped active project (from .current-session under the anchor)
- * 5. Global active-project.json in workspace root
- * 6. Workspace anchor or process.cwd()
+ * 5. cwd_child — the child project the agent is physically inside, under the anchor
+ * 5b. cwd_child (no anchor) — same, ceiling = discovered workspace root (F2)
+ * 6. Global active-project.json in workspace root
+ * 7. Workspace anchor or process.cwd()
  */
 export function resolveEffectiveCwd(options = {}) {
+    return resolveEffectiveCwdInfo(options).cwd;
+}
+/**
+ * Resolve the effective cwd and explain which selector won. Use this for MCP
+ * facades that must echo their project scope to avoid silent cross-project reads.
+ */
+export function resolveEffectiveCwdInfo(options = {}) {
     const baseCwd = path.resolve(options.baseCwd ?? process.cwd());
     // 1. Explicit --cwd flag
     if (options.explicitCwd) {
-        return path.resolve(options.explicitCwd);
+        const cwd = path.resolve(options.explicitCwd);
+        return { cwd, active_source: 'explicit', resolved_project: projectInfo(cwd) };
     }
     // 2. BRAINCLAW_CWD env var — set by MCP configs to anchor resolution to the
     //    workspace regardless of the IDE's process.cwd() at launch time. It is a
@@ -118,26 +128,72 @@ export function resolveEffectiveCwd(options = {}) {
     if (envProject) {
         const resolved = resolveProjectRef(envProject, anchorCwd, options.storeChainOptions);
         if (resolved)
-            return resolved;
+            return { cwd: resolved, active_source: 'env_project', resolved_project: projectInfo(resolved) };
     }
     // 4. Session-scoped active project (per-agent, no cross-agent interference)
-    const session = loadCurrentSession(anchorCwd);
+    const session = options.sessionId
+        ? loadSessionById(options.sessionId, anchorCwd)
+        : loadCurrentSession(anchorCwd);
     if (session?.active_project) {
         const sp = session.active_project;
         if (fs.existsSync(path.join(sp.path, MEMORY_DIR, 'config.yaml'))) {
-            return sp.path;
+            return { cwd: sp.path, active_source: 'session', resolved_project: { path: sp.path, name: sp.name } };
         }
     }
-    // 5. Global active-project.json from workspace root
+    // 5. cwd_child — when anchored and the agent is physically inside a child store
+    //    STRICTLY under the anchor, resolve THAT child rather than the shared global
+    //    pointer or the anchor root. This is the independence rule: physical location
+    //    beats a shared/stale global (an agent working in apps/api resolves api, not the
+    //    monorepo root, and is not hijacked by another agent's global switch).
+    //
+    //    GUARD (Codex review): only fire when baseCwd differs from the anchor AND is
+    //    at/below it. `findClosestStoreBelow` walks UP to the ceiling but does NOT prove
+    //    baseCwd sits below it — without the `isAtOrBelow` guard a baseCwd OUTSIDE the
+    //    anchor could match an unrelated `.brainclaw` before hitting the filesystem root.
+    if (baseCwd !== anchorCwd && isAtOrBelow(baseCwd, anchorCwd)) {
+        const child = findClosestStoreBelow(baseCwd, anchorCwd);
+        if (child && path.resolve(child) !== path.resolve(anchorCwd)) {
+            return { cwd: child, active_source: 'cwd_child', resolved_project: projectInfo(child) };
+        }
+    }
+    // 5b. cwd_child (NO anchor) — F2 [trp_71accb07]: even without a BRAINCLAW_CWD
+    //     anchor, an agent physically inside a child project must resolve THAT
+    //     child rather than a stale/shared global pointer set by another agent.
+    //     Ceiling = the discovered workspace root via resolveWorkspaceRoot(baseCwd)
+    //     — NOT os.homedir() (that would revive the F6 boundary edge and could let
+    //     an unrelated home store influence a monorepo worker). Same containment
+    //     guard as the anchored case (isAtOrBelow + a child strictly below).
+    //     For a single-project repo this is a strict no-op: findClosestStoreBelow
+    //     walks UP to the ceiling EXCLUSIVELY, so it can never return the lone root
+    //     store (Codex cadrage non-regression proof, batch 2).
+    if (!hasEnvWorkspace) {
+        const physicalRoot = resolveWorkspaceRoot(baseCwd, options.storeChainOptions);
+        if (physicalRoot && isAtOrBelow(baseCwd, physicalRoot)) {
+            const child = findClosestStoreBelow(baseCwd, physicalRoot);
+            if (child && path.resolve(child) !== path.resolve(physicalRoot)) {
+                return { cwd: child, active_source: 'cwd_child', resolved_project: projectInfo(child) };
+            }
+        }
+    }
+    // 6. Global active-project.json from workspace root
     const wsRoot = hasEnvWorkspace ? anchorCwd : resolveWorkspaceRoot(anchorCwd, options.storeChainOptions);
     if (wsRoot) {
         const active = loadActiveProject(wsRoot);
         if (active && fs.existsSync(path.join(active.path, MEMORY_DIR, 'config.yaml'))) {
-            return active.path;
+            return { cwd: active.path, active_source: 'global', resolved_project: { path: active.path, name: active.name } };
         }
     }
-    // 6. Default
-    return anchorCwd;
+    // 7. Default
+    return { cwd: anchorCwd, active_source: 'cwd', resolved_project: projectInfo(anchorCwd) };
+}
+function projectInfo(cwd) {
+    try {
+        const config = loadConfig(cwd);
+        return { path: cwd, name: config.project_name };
+    }
+    catch {
+        return { path: cwd };
+    }
 }
 /**
  * Find the workspace root (farthest store in the chain, or the one with

package/dist/core/worktree.js

@@ -573,24 +573,24 @@ export const WORKTREE_HOOKS_DIRNAME = '.brainclaw-hooks';
  * blocking — a tooling gap must not trap a worker.
  */
 export function buildTypecheckPreCommitScript() {
-    return `#!/bin/sh
-# brainclaw worktree typecheck gate (pln#479) — do not edit manually.
-# Blocks the commit when 'tsc --noEmit' fails. Bypass: git commit --no-verify.
-exec node -e "
-const fs = require('fs');
-const { execSync } = require('child_process');
-if (!fs.existsSync('tsconfig.json')) process.exit(0);
-if (!fs.existsSync('node_modules/typescript/bin/tsc')) {
-  process.stderr.write('\\\\n[brainclaw] typecheck gate: typescript not found in worktree node_modules — skipping (commit allowed).\\\\n');
-  process.exit(0);
-}
-try {
-  execSync('node node_modules/typescript/bin/tsc --noEmit', { stdio: 'inherit' });
-} catch (e) {
-  process.stderr.write('\\\\n[brainclaw] commit blocked: tsc --noEmit reported type errors (above). Fix them, or bypass with: git commit --no-verify\\\\n\\\\n');
-  process.exit(1);
-}
-" 2>&1 || exit $?
+    return `#!/bin/sh
+# brainclaw worktree typecheck gate (pln#479) — do not edit manually.
+# Blocks the commit when 'tsc --noEmit' fails. Bypass: git commit --no-verify.
+exec node -e "
+const fs = require('fs');
+const { execSync } = require('child_process');
+if (!fs.existsSync('tsconfig.json')) process.exit(0);
+if (!fs.existsSync('node_modules/typescript/bin/tsc')) {
+  process.stderr.write('\\\\n[brainclaw] typecheck gate: typescript not found in worktree node_modules — skipping (commit allowed).\\\\n');
+  process.exit(0);
+}
+try {
+  execSync('node node_modules/typescript/bin/tsc --noEmit', { stdio: 'inherit' });
+} catch (e) {
+  process.stderr.write('\\\\n[brainclaw] commit blocked: tsc --noEmit reported type errors (above). Fix them, or bypass with: git commit --no-verify\\\\n\\\\n');
+  process.exit(1);
+}
+" 2>&1 || exit $?
 `;
 }
 /**