brainclaw 1.20.3 → 1.20.4

package/dist/commands/mcp-write-claims.js

@@ -12,8 +12,10 @@
  *
  * @module
  */
+import { spawnSync } from 'node:child_process';
 import { getTriggeredItems, renderTriggeredItems } from '../core/lifecycle.js';
 import { buildContext } from '../core/context.js';
+import { detectCommitsBehindMainDetailed } from '../core/execution-context.js';
 import { checkBrainclawInstallableUpdate, renderBrainclawInstallableUpdateNotice } from '../core/brainclaw-version.js';
 import { loadConfig } from '../core/config.js';
 import { generateClaimId, loadClaim, saveClaim, adoptClaimSession, releaseClaimWithCascade, claimBaselineFields } from '../core/claims.js';
@@ -44,6 +46,22 @@ export function parseTtl(ttl) {
     const ms = unit === 'm' ? value * 60_000 : unit === 'h' ? value * 3_600_000 : value * 86_400_000;
     return new Date(Date.now() + ms).toISOString();
 }
+/**
+ * Current git branch via an argv invocation — never a shell string (pln#618).
+ * Returns undefined when git is unavailable, cwd is not a repo, or HEAD is
+ * detached (`--show-current` prints nothing there).
+ */
+function currentGitBranch(cwd) {
+    const result = spawnSync('git', ['branch', '--show-current'], {
+        cwd,
+        encoding: 'utf-8',
+        timeout: 5000,
+        windowsHide: true,
+    });
+    if (result.error || result.status !== 0)
+        return undefined;
+    return result.stdout.trim() || undefined;
+}
 export async function handleBclawClaim(payload, ctx) {
     const { name, args, cwd, connectionSessionId } = payload;
     // project=X naming a workspace sibling auto-localizes (session+switch then
@@ -156,37 +174,21 @@ export async function handleBclawClaim(payload, ctx) {
         : '';
     // Branch guardrail: warn if on master/main without a worktree
     let branchWarn = '';
-    if (!worktreePath) {
-        try {
-            const { execSync } = await import('node:child_process');
-            const branch = execSync('git branch --show-current', { cwd: claimCwd, encoding: 'utf-8' }).trim();
-            if (branch === 'master' || branch === 'main') {
-                const branchSlug = sanitizeBranchComponent(claimScope);
-                branchWarn = `\n⚠️ You are on ${branch}. Create a feature branch before editing: git checkout -b feat/${branchSlug}`;
-            }
-        }
-        catch { /* git not available, skip warning */ }
+    const currentBranch = currentGitBranch(claimCwd);
+    if (!worktreePath && (currentBranch === 'master' || currentBranch === 'main')) {
+        const branchSlug = sanitizeBranchComponent(claimScope);
+        branchWarn = `\n⚠️ You are on ${currentBranch}. Create a feature branch before editing: git checkout -b feat/${branchSlug}`;
     }
-    // Stale-branch detection: warn if behind master
+    // Stale-branch detection: warn if behind master/main. Branch names may
+    // legally contain shell metacharacters — the revspec goes through an argv
+    // invocation, never a shell string (pln#618).
     let staleBranchWarn = '';
-    try {
-        const { execSync: execSyncSB } = await import('node:child_process');
-        const currentBranch = execSyncSB('git branch --show-current', { cwd: claimCwd, encoding: 'utf-8' }).trim();
-        if (currentBranch && currentBranch !== 'master' && currentBranch !== 'main') {
-            for (const mainBranch of ['master', 'main']) {
-                try {
-                    const behind = execSyncSB(`git rev-list --count ${currentBranch}..${mainBranch}`, { cwd: claimCwd, encoding: 'utf-8' }).trim();
-                    const count = parseInt(behind, 10);
-                    if (count > 0) {
-                        staleBranchWarn = `\n⚠ Branch is ${count} commit(s) behind ${mainBranch}. Consider rebasing before editing.`;
-                    }
-                    break;
-                }
-                catch { /* branch doesn't exist, try next */ }
-            }
+    if (currentBranch && currentBranch !== 'master' && currentBranch !== 'main') {
+        const behind = detectCommitsBehindMainDetailed(claimCwd, currentBranch);
+        if (behind && behind.count > 0) {
+            staleBranchWarn = `\n⚠ Branch is ${behind.count} commit(s) behind ${behind.branch}. Consider rebasing before editing.`;
         }
     }
-    catch { /* git not available */ }
     const worktreeNote = worktreePath ? `\n  Worktree: ${worktreePath}` : '';
     const expiryNote = claimExpiresAt ? `\n  Expires: ${claimExpiresAt.slice(0, 16).replace('T', ' ')} UTC` : '';
     const handoffNote = handoffMode ? `\n  Handoff: ${handoffMode} (another agent will review and merge)` : '';

package/dist/core/execution-context.js

@@ -150,27 +150,34 @@ function detectGitRemote(cwd, runner) {
     return result.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).length > 0;
 }
 /**
- * Detect how many commits the current branch is behind the main branch.
- * Tries master then main as the reference branch.
+ * Detect how many commits the current branch is behind the main branch,
+ * reporting which reference branch (master/main) produced the count.
+ * Tries both and keeps the highest — handles repos where both branches
+ * exist but only one is the real reference.
  * Returns undefined if not in a git repo or on the main branch itself.
+ *
+ * Branch names may legally contain shell metacharacters (`;`, `&`, `$()`,
+ * backticks…), so the revspec MUST stay a single argv element — never
+ * assemble it into a shell string (pln#618).
  */
-function detectCommitsBehindMain(cwd, currentBranch, runner) {
+export function detectCommitsBehindMainDetailed(cwd, currentBranch, runner = defaultRunner) {
     // Don't check if already on main branch
     if (currentBranch === 'master' || currentBranch === 'main')
         return undefined;
-    // Try both master and main, return the highest count found.
-    // This handles repos where both branches exist but only one is the real reference.
-    let maxBehind;
+    let best;
     for (const mainBranch of ['master', 'main']) {
         const result = runner('git', ['rev-list', '--count', `${currentBranch}..${mainBranch}`], cwd);
         if (result.status === 0) {
             const count = parseInt(result.stdout.trim(), 10);
-            if (!isNaN(count) && (maxBehind === undefined || count > maxBehind)) {
-                maxBehind = count;
+            if (!isNaN(count) && (best === undefined || count > best.count)) {
+                best = { branch: mainBranch, count };
             }
         }
     }
-    return maxBehind;
+    return best;
+}
+function detectCommitsBehindMain(cwd, currentBranch, runner) {
+    return detectCommitsBehindMainDetailed(cwd, currentBranch, runner)?.count;
 }
 function detectToolchains(cwd, runner) {
     if (runner === defaultRunner && cachedToolchains) {

package/dist/facts.js

@@ -1,8 +1,8 @@
 // Generated by scripts/emit-site-facts.mjs at build time. Do not edit manually.
-// Source: brainclaw v1.20.3 on 2026-08-03T12:57:46.375Z
+// Source: brainclaw v1.20.4 on 2026-08-03T17:19:03.147Z
 export const FACTS = {
-  "version": "1.20.3",
-  "generated_at": "2026-08-03T12:57:46.375Z",
+  "version": "1.20.4",
+  "generated_at": "2026-08-03T17:19:03.147Z",
   "tools": {
     "count": 67,
     "published_count": 65,
@@ -474,7 +474,7 @@ export const FACTS = {
   },
   "bench": {
     "schema": "brainclaw.bench.v1",
-    "generated_at": "2026-08-03T12:57:44.250Z",
+    "generated_at": "2026-08-03T17:19:00.995Z",
     "node_version": "v24.18.0",
     "platform": "linux-x64",
     "repeats": 3,
@@ -483,7 +483,7 @@ export const FACTS = {
         "name": "cold_onboard",
         "volume": "empty",
         "description": "fresh machine → init → first useful context. Baseline for time-to-first-value.",
-        "duration_ms_median": 79,
+        "duration_ms_median": 77,
         "payload_chars_median": 1640,
         "payload_tokens_est_median": 410
       },
@@ -491,7 +491,7 @@ export const FACTS = {
         "name": "warm_work",
         "volume": "medium",
         "description": "bclaw_work consult over a real-shaped store (~200 plans / 500 handoffs / 450 claims).",
-        "duration_ms_median": 129,
+        "duration_ms_median": 130,
         "payload_chars_median": 2626,
         "payload_tokens_est_median": 657
       },
@@ -499,7 +499,7 @@ export const FACTS = {
         "name": "first_edit",
         "volume": "medium",
         "description": "code_find + code_brief on the fresh-agent path (missing index, first touch).",
-        "duration_ms_median": 13,
+        "duration_ms_median": 12,
         "payload_chars_median": 499,
         "payload_tokens_est_median": 125
       }

package/dist/facts.json

@@ -1,6 +1,6 @@
 {
-  "version": "1.20.3",
-  "generated_at": "2026-08-03T12:57:46.375Z",
+  "version": "1.20.4",
+  "generated_at": "2026-08-03T17:19:03.147Z",
   "tools": {
     "count": 67,
     "published_count": 65,
@@ -472,7 +472,7 @@
   },
   "bench": {
     "schema": "brainclaw.bench.v1",
-    "generated_at": "2026-08-03T12:57:44.250Z",
+    "generated_at": "2026-08-03T17:19:00.995Z",
     "node_version": "v24.18.0",
     "platform": "linux-x64",
     "repeats": 3,
@@ -481,7 +481,7 @@
         "name": "cold_onboard",
         "volume": "empty",
         "description": "fresh machine → init → first useful context. Baseline for time-to-first-value.",
-        "duration_ms_median": 79,
+        "duration_ms_median": 77,
         "payload_chars_median": 1640,
         "payload_tokens_est_median": 410
       },
@@ -489,7 +489,7 @@
         "name": "warm_work",
         "volume": "medium",
         "description": "bclaw_work consult over a real-shaped store (~200 plans / 500 handoffs / 450 claims).",
-        "duration_ms_median": 129,
+        "duration_ms_median": 130,
         "payload_chars_median": 2626,
         "payload_tokens_est_median": 657
       },
@@ -497,7 +497,7 @@
         "name": "first_edit",
         "volume": "medium",
         "description": "code_find + code_brief on the fresh-agent path (missing index, first touch).",
-        "duration_ms_median": 13,
+        "duration_ms_median": 12,
         "payload_chars_median": 499,
         "payload_tokens_est_median": 125
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brainclaw",
-  "version": "1.20.3",
+  "version": "1.20.4",
   "description": "Shared project memory for humans and coding agents.",
   "type": "module",
   "repository": {