xtrm-tools 2.1.12 → 2.1.13

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-cli",
-  "version": "2.1.12",
+  "version": "2.1.13",
   "description": "Claude Code tools installer (skills, hooks, MCP servers)",
   "main": "./dist/index.js",
   "type": "module",

package/config/hooks.json

@@ -17,6 +17,11 @@
         "script": "main-guard.mjs",
         "timeout": 5000
       },
+      {
+        "matcher": "Bash",
+        "script": "main-guard.mjs",
+        "timeout": 5000
+      },
       {
         "matcher": "Read|Edit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "script": "serena-workflow-reminder.py"
@@ -51,17 +56,16 @@
         "matcher": "Bash",
         "script": "main-guard-post-push.mjs",
         "timeout": 5000
-      },
-      {
-        "matcher": "Bash",
-        "script": "beads-close-memory-prompt.mjs",
-        "timeout": 5000
       }
     ],
     "Stop": [
       {
         "script": "beads-stop-gate.mjs",
         "timeout": 5000
+      },
+      {
+        "script": "beads-memory-gate.mjs",
+        "timeout": 8000
       }
     ]
   },

package/hooks/beads-memory-gate.mjs

@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+// beads-memory-gate — Claude Code Stop hook
+// At session end, forces the agent to evaluate whether this session's work
+// produced insights worth persisting via `bd remember`.
+// Runs after beads-stop-gate (all issues already closed by that point).
+// Exit 0: allow stop  |  Exit 2: block stop (stderr shown to Claude)
+//
+// Installed by: xtrm install
+
+import { execSync } from 'node:child_process';
+import { readFileSync, existsSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+
+let input;
+try {
+  input = JSON.parse(readFileSync(0, 'utf8'));
+} catch {
+  process.exit(0);
+}
+
+const cwd = input.cwd ?? process.env.CLAUDE_PROJECT_DIR ?? process.cwd();
+if (!existsSync(join(cwd, '.beads'))) process.exit(0);
+
+// Agent signals evaluation complete by touching this marker, then stops again
+const marker = join(cwd, '.beads', '.memory-gate-done');
+if (existsSync(marker)) {
+  try { unlinkSync(marker); } catch { /* ignore */ }
+  process.exit(0);
+}
+
+// Only block if there are closed issues — don't fire on empty projects
+let hasClosed = false;
+try {
+  const out = execSync('bd list --status=closed', {
+    encoding: 'utf8',
+    cwd,
+    stdio: ['pipe', 'pipe', 'pipe'],
+    timeout: 8000,
+  });
+  hasClosed = /^✓/m.test(out);
+} catch {
+  process.exit(0); // fail open
+}
+
+if (!hasClosed) process.exit(0);
+
+process.stderr.write(
+  '🧠 MEMORY GATE: Before ending the session, evaluate this session\'s work.\n\n' +
+  'For each issue you worked on and closed, ask:\n' +
+  '  Is this a stable pattern, key decision, or solution I\'ll encounter again?\n\n' +
+  '  YES → bd remember "<precise, durable insight>"\n' +
+  '  NO  → explicitly note "nothing worth persisting" and continue\n\n' +
+  'When done, signal completion and stop again:\n' +
+  '  touch .beads/.memory-gate-done\n'
+);
+process.exit(2);

package/hooks/main-guard-post-push.mjs

@@ -64,7 +64,7 @@ process.stdout.write(JSON.stringify({
     `✅ Pushed '${branch}'. Next workflow steps:\n\n` +
     '  1. gh pr create --fill\n' +
     '  2. gh pr merge --squash\n' +
-    '  3. git checkout main && git pull --ff-only\n\n' +
+    '  3. git checkout main && git reset --hard origin/main\n\n' +
     'Before/after merge, ensure beads state is updated (e.g. bd close <id>).',
 }));
 process.stdout.write('\n');

package/hooks/main-guard.mjs

@@ -96,6 +96,8 @@ if (tool === 'Bash') {
     /^git\s+worktree\b/,
     /^git\s+checkout\s+-b\s+\S+/,
     /^git\s+switch\s+-c\s+\S+/,
+    // Allow post-merge sync to protected branch only (not arbitrary origin refs)
+    ...protectedBranches.map(b => new RegExp(`^git\\s+reset\\s+--hard\\s+origin/${b}\\b`)),
     /^gh\s+/,
     /^bd\s+/,
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-tools",
-  "version": "2.1.12",
+  "version": "2.1.13",
   "description": "Claude Code tools installer (skills, hooks, MCP servers)",
   "license": "MIT",
   "type": "module",

package/hooks/beads-close-memory-prompt.mjs

@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-// beads-close-memory-prompt — Claude Code PostToolUse hook
-// After `bd close`: clears session claim from bd kv, then injects a short
-// reminder into Claude's context to capture knowledge and consider underused
-// beads features.
-// Output to stdout is shown to Claude as additional context.
-//
-// Installed by: xtrm install
-
-import { readFileSync } from 'node:fs';
-import {
-  resolveCwd, isBeadsProject, clearSessionClaim, withSafeBdContext,
-} from './beads-gate-utils.mjs';
-
-let input;
-try {
-  input = JSON.parse(readFileSync(0, 'utf8'));
-} catch {
-  process.exit(0);
-}
-
-if (input.tool_name !== 'Bash') process.exit(0);
-if (!/\bbd\s+close\b/.test(input.tool_input?.command ?? '')) process.exit(0);
-
-withSafeBdContext(() => {
-  const cwd = resolveCwd(input);
-  if (!isBeadsProject(cwd)) process.exit(0);
-
-  if (input.session_id) {
-    clearSessionClaim(input.session_id, cwd);
-  }
-
-  process.stdout.write(
-    '\n[beads] Issue(s) closed. Before moving on:\n\n' +
-    '  Knowledge worth keeping?\n' +
-    '    bd remember "key insight from this work"\n' +
-    '    bd memories <keyword>   -- search what is already stored\n\n' +
-    '  Discovered related work while implementing?\n' +
-    '    bd create --title="..." --deps=discovered-from:<id>\n\n' +
-    '  Underused features to consider:\n' +
-    '    bd dep add <a> <b>   -- link blocking relationships between issues\n' +
-    '    bd graph             -- visualize issue dependency graph\n' +
-    '    bd orphans           -- issues referenced in commits but still open\n' +
-    '    bd preflight         -- PR readiness checklist before gh pr create\n' +
-    '    bd stale             -- issues not touched recently\n'
-  );
-
-  process.exit(0);
-});