xtrm-tools 0.5.45 → 0.5.47

package/config/pi/extensions/xtrm-ui/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "xtrm-ui",
+  "version": "1.0.0",
+  "description": "XTRM UI: pi-dex theme/header + custom XTRM footer",
+  "license": "MIT",
+  "pi": {
+    "extensions": ["./index.ts"],
+    "themes": ["./themes"]
+  }
+}

package/config/pi/extensions/xtrm-ui/themes/pidex-dark.json

@@ -0,0 +1,85 @@
+{
+  "$schema": "https://raw.githubusercontent.com/badlogic/pi-mono/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "name": "pidex-dark",
+  "vars": {
+    "accentBlue": "#b8d3ff",
+    "accentCyan": "#b8d3ff",
+    "accentTeal": "#c7d2e0",
+    "successGreen": "#9fd59f",
+    "errorRed": "#ff9a9a",
+    "warningAmber": "#d2b48c",
+    "surface": "#000000",
+    "surfaceAlt": "#111111",
+    "surfaceMuted": "#1a1a1a",
+    "surfaceUser": "#1f1f1f",
+    "surfaceCustom": "#161616",
+    "gray": "#a7a7a7",
+    "dimGray": "#8a8a8a",
+    "borderGray": "#666666",
+    "borderBright": "#9a9a9a"
+  },
+  "colors": {
+    "accent": "accentBlue",
+    "border": "borderGray",
+    "borderAccent": "borderBright",
+    "borderMuted": "borderGray",
+    "success": "successGreen",
+    "error": "errorRed",
+    "warning": "warningAmber",
+    "muted": "gray",
+    "dim": "dimGray",
+    "text": "",
+    "thinkingText": "gray",
+
+    "selectedBg": "surfaceMuted",
+    "userMessageBg": "surfaceUser",
+    "userMessageText": "",
+    "customMessageBg": "surfaceCustom",
+    "customMessageText": "",
+    "customMessageLabel": "accentBlue",
+    "toolPendingBg": "surfaceAlt",
+    "toolSuccessBg": "surfaceAlt",
+    "toolErrorBg": "surfaceAlt",
+    "toolTitle": "",
+    "toolOutput": "gray",
+
+    "mdHeading": "warningAmber",
+    "mdLink": "accentBlue",
+    "mdLinkUrl": "dimGray",
+    "mdCode": "accentCyan",
+    "mdCodeBlock": "gray",
+    "mdCodeBlockBorder": "borderGray",
+    "mdQuote": "gray",
+    "mdQuoteBorder": "borderGray",
+    "mdHr": "borderGray",
+    "mdListBullet": "accentTeal",
+
+    "toolDiffAdded": "successGreen",
+    "toolDiffRemoved": "errorRed",
+    "toolDiffContext": "gray",
+
+    "syntaxComment": "#6b7280",
+    "syntaxKeyword": "#7aa2f7",
+    "syntaxFunction": "#c0caf5",
+    "syntaxVariable": "#a9b1d6",
+    "syntaxString": "#9ece6a",
+    "syntaxNumber": "#ff9e64",
+    "syntaxType": "#73daca",
+    "syntaxOperator": "#c0caf5",
+    "syntaxPunctuation": "#8f9bb3",
+
+    "thinkingOff": "borderGray",
+    "thinkingMinimal": "#707070",
+    "thinkingLow": "#7a7a7a",
+    "thinkingMedium": "#858585",
+    "thinkingHigh": "#8f8f8f",
+    "thinkingXhigh": "#999999",
+
+    "bashMode": "accentTeal"
+  },
+  "export": {
+    "pageBg": "#12161d",
+    "cardBg": "#171b22",
+    "infoBg": "#28230f"
+  }
+}

package/config/pi/extensions/xtrm-ui/themes/pidex-light.json

@@ -0,0 +1,85 @@
+{
+  "$schema": "https://raw.githubusercontent.com/badlogic/pi-mono/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "name": "pidex-light",
+  "vars": {
+    "accentBlue": "#44546a",
+    "accentCyan": "#5f6b7a",
+    "accentTeal": "#5f6b7a",
+    "successGreen": "#587558",
+    "errorRed": "#a85f5f",
+    "warningAmber": "#8e7348",
+    "surface": "#ffffff",
+    "surfaceAlt": "#f1f1f1",
+    "surfaceMuted": "#e6e6e6",
+    "surfaceUser": "#f0f0f0",
+    "surfaceCustom": "#f5f5f5",
+    "gray": "#5f5f5f",
+    "dimGray": "#7a7a7a",
+    "borderGray": "#b9b9b9",
+    "borderBright": "#9f9f9f"
+  },
+  "colors": {
+    "accent": "accentBlue",
+    "border": "borderGray",
+    "borderAccent": "borderBright",
+    "borderMuted": "borderGray",
+    "success": "successGreen",
+    "error": "errorRed",
+    "warning": "warningAmber",
+    "muted": "gray",
+    "dim": "dimGray",
+    "text": "",
+    "thinkingText": "gray",
+
+    "selectedBg": "surfaceMuted",
+    "userMessageBg": "surfaceUser",
+    "userMessageText": "",
+    "customMessageBg": "surfaceCustom",
+    "customMessageText": "",
+    "customMessageLabel": "accentBlue",
+    "toolPendingBg": "surfaceAlt",
+    "toolSuccessBg": "surfaceAlt",
+    "toolErrorBg": "surfaceAlt",
+    "toolTitle": "",
+    "toolOutput": "gray",
+
+    "mdHeading": "warningAmber",
+    "mdLink": "accentBlue",
+    "mdLinkUrl": "dimGray",
+    "mdCode": "accentCyan",
+    "mdCodeBlock": "gray",
+    "mdCodeBlockBorder": "borderGray",
+    "mdQuote": "gray",
+    "mdQuoteBorder": "borderGray",
+    "mdHr": "borderGray",
+    "mdListBullet": "accentTeal",
+
+    "toolDiffAdded": "successGreen",
+    "toolDiffRemoved": "errorRed",
+    "toolDiffContext": "gray",
+
+    "syntaxComment": "#6b7280",
+    "syntaxKeyword": "#3569c8",
+    "syntaxFunction": "#3b4351",
+    "syntaxVariable": "#364152",
+    "syntaxString": "#3f7d3d",
+    "syntaxNumber": "#b06500",
+    "syntaxType": "#2c7a7b",
+    "syntaxOperator": "#3b4351",
+    "syntaxPunctuation": "#55606f",
+
+    "thinkingOff": "borderGray",
+    "thinkingMinimal": "#9d9d9d",
+    "thinkingLow": "#979797",
+    "thinkingMedium": "#919191",
+    "thinkingHigh": "#8b8b8b",
+    "thinkingXhigh": "#858585",
+
+    "bashMode": "accentTeal"
+  },
+  "export": {
+    "pageBg": "#f5f7fa",
+    "cardBg": "#ffffff",
+    "infoBg": "#fff5e6"
+  }
+}

package/config/pi/install-schema.json

@@ -34,7 +34,6 @@
     }
   ],
   "packages": [
-    "npm:pi-dex",
     "npm:pi-gitnexus",
     "npm:pi-serena-tools",
     "npm:lsp-pi",

package/hooks/beads-claim-sync.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // beads-claim-sync — PostToolUse hook
 // bd update --claim → set kv claim
-// bd close         → auto-commit staged changes, set closed-this-session kv for memory gate
+// bd close         → set closed-this-session kv for memory gate
 
 import { spawnSync } from 'node:child_process';
 import { readFileSync, existsSync, writeFileSync, unlinkSync, mkdirSync } from 'node:fs';
@@ -33,6 +33,14 @@ function resolveMainRoot(cwd) {
   return cwd;
 }
 
+// Returns a per-session claim filename: 'statusline-claim' for the main session,
+// 'statusline-claim-<worktreeName>' for worktree sessions.
+// Prevents cross-session contamination when multiple worktrees run simultaneously.
+function resolveClaimFileName(cwd) {
+  const m = cwd.match(/\/\.xtrm\/worktrees\/([^/]+)/);
+  return m ? `statusline-claim-${m[1]}` : 'statusline-claim';
+}
+
 function isShellTool(toolName) {
   return toolName === 'Bash' || toolName === 'bash' || toolName === 'execute_shell_command';
 }
@@ -50,73 +58,7 @@ function commandSucceeded(payload) {
   return true;
 }
 
-function runGit(args, cwd, timeout = 8000) {
-  return spawnSync('git', args, {
-    cwd,
-    stdio: ['pipe', 'pipe', 'pipe'],
-    encoding: 'utf8',
-    timeout,
-  });
-}
-
-function runBd(args, cwd, timeout = 5000) {
-  return spawnSync('bd', args, {
-    cwd,
-    stdio: ['pipe', 'pipe', 'pipe'],
-    encoding: 'utf8',
-    timeout,
-  });
-}
-
-function hasGitChanges(cwd) {
-  const result = runGit(['status', '--porcelain'], cwd);
-  if (result.status !== 0) return false;
-  return result.stdout.trim().length > 0;
-}
-
-function getCloseReason(cwd, issueId, command) {
-  // 1. Parse --reason "..." from the command itself (fastest, no extra call)
-  const reasonMatch = command.match(/--reason[=\s]+["']([^"']+)["']/);
-  if (reasonMatch) return reasonMatch[1].trim();
-
-  // 2. Fall back to bd show <id> --json
-  const show = runBd(['show', issueId, '--json'], cwd);
-  if (show.status === 0 && show.stdout) {
-    try {
-      const parsed = JSON.parse(show.stdout);
-      const reason = parsed?.[0]?.close_reason;
-      if (typeof reason === 'string' && reason.trim().length > 0) return reason.trim();
-    } catch { /* fall through */ }
-  }
-
-  return `Close ${issueId}`;
-}
-
-function stageUntracked(cwd) {
-  const result = runGit(['ls-files', '--others', '--exclude-standard'], cwd);
-  if (result.status !== 0) return;
-  const untracked = result.stdout.trim().split('\n').filter(Boolean);
-  if (untracked.length === 0) return;
-  runGit(['add', '--', ...untracked], cwd);
-}
-
-function autoCommit(cwd, issueId, command) {
-  if (!hasGitChanges(cwd)) {
-    return { ok: true, message: 'No changes detected — auto-commit skipped.' };
-  }
-
-  stageUntracked(cwd);
-
-  const reason = getCloseReason(cwd, issueId, command);
-  const commitMessage = `${reason} (${issueId})`;
-  const result = runGit(['commit', '--no-verify', '-am', commitMessage], cwd, 15000);
-  if (result.status !== 0) {
-    const err = (result.stderr || result.stdout || '').trim();
-    return { ok: false, message: `Auto-commit failed: ${err || 'unknown error'}` };
-  }
 
-  return { ok: true, message: `Auto-committed: \`${commitMessage}\`` };
-}
 
 
 function main() {
@@ -147,11 +89,11 @@ function main() {
         process.exit(0);
       }
 
-      // Write claim state for statusline — always at main repo root so all sessions share it.
+      // Write claim state for statusline — per-worktree file under main root.
       try {
         const xtrmDir = join(resolveMainRoot(cwd), '.xtrm');
         mkdirSync(xtrmDir, { recursive: true });
-        writeFileSync(join(xtrmDir, 'statusline-claim'), issueId);
+        writeFileSync(join(xtrmDir, resolveClaimFileName(cwd)), issueId);
       } catch { /* non-fatal */ }
 
       logEvent({
@@ -172,16 +114,13 @@ function main() {
     }
   }
 
-  // On bd close: auto-commit staged changes, then mark closed-this-session for memory gate
+  // On bd close: mark closed-this-session for memory gate
   if (/\bbd\s+close\b/.test(command) && commandSucceeded(input)) {
     const match = command.match(/\bbd\s+close\s+(\S+)/);
     const closedIssueId = match?.[1];
 
-    // Auto-commit before marking the gate (no-op if clean)
-    const commit = closedIssueId ? autoCommit(cwd, closedIssueId, command) : null;
-
-    // Clear claim state for statusline — use main root so worktree and main sessions agree.
-    try { unlinkSync(join(resolveMainRoot(cwd), '.xtrm', 'statusline-claim')); } catch { /* ok if missing */ }
+    // Clear claim state for statusline — per-worktree file under main root.
+    try { unlinkSync(join(resolveMainRoot(cwd), '.xtrm', resolveClaimFileName(cwd))); } catch { /* ok if missing */ }
 
     // Mark this issue as closed this session (memory gate reads this)
     if (closedIssueId) {
@@ -190,10 +129,7 @@ function main() {
         stdio: ['pipe', 'pipe', 'pipe'],
         timeout: 5000,
       });
-    }
 
-    // Log bd lifecycle events
-    if (closedIssueId) {
       logEvent({
         cwd,
         runtime: 'claude',
@@ -204,26 +140,9 @@ function main() {
         issueId: closedIssueId,
       });
     }
-    if (commit) {
-      logEvent({
-        cwd,
-        runtime: 'claude',
-        sessionId,
-        layer: 'bd',
-        kind: 'bd.committed',
-        outcome: commit.ok ? 'allow' : 'block',
-        issueId: closedIssueId ?? null,
-        data: { msg: commit.message },
-        extra: { ok: commit.ok },
-      });
-    }
-
-    const commitLine = commit
-      ? `\n${commit.ok ? '✅' : '⚠️'} **Session Flow**: ${commit.message}`
-      : '';
 
     process.stdout.write(JSON.stringify({
-      additionalContext: `\n🔓 **Beads**: Issue closed.${commitLine}\nEvaluate insights, then acknowledge:\n  \`bd remember "<insight>"\` (or note "nothing")\n  \`touch .beads/.memory-gate-done\``,
+      additionalContext: `\n🔓 **Beads**: Issue closed. Evaluate insights, then acknowledge:\n  \`bd remember "<insight>"\` (or note "nothing to persist")`,
     }));
     process.stdout.write('\n');
     process.exit(0);

package/hooks/beads-gate-messages.mjs

@@ -12,7 +12,7 @@ export const SESSION_CLOSE_PROTOCOL =
   '  xt end\n';
 
 export const COMMIT_NEXT_STEPS =
-  '  bd close <id> --reason="..."   ← closes issue + auto-commits\n' +
+  '  bd close <id> --reason="..."   ← closes issue\n' +
   '  xt end                          ← push, PR, merge, worktree cleanup\n';
 
 // ── Edit gate messages ───────────────────────────────────────────
@@ -58,9 +58,7 @@ export function stopBlockMessage(summary, claimed) {
 
 export function memoryPromptMessage(claimId, sessionId) {
   const claimLine = claimId ? `claim \`${claimId}\` was closed.\n` : '';
-  const ackCmd = sessionId
-    ? `bd kv set "memory-gate-done:${sessionId}"`
-    : 'touch .beads/.memory-gate-done';
+  const ackCmd = `bd kv set "memory-gate-done:${sessionId}"`;
   return (
     `\u25cf Memory gate: ${claimLine}` +
     'For each candidate insight, check ALL 4:\n' +

package/hooks/beads-gate-utils.mjs

@@ -133,24 +133,6 @@ export function getClosedThisSession(sessionId, cwd) {
   }
 }
 
-/**
- * Return true if the memory gate is pending acknowledgment for this session.
- * Pending = closed-this-session kv is set AND .beads/.memory-gate-done marker is absent.
- */
-export function isMemoryGatePending(sessionId, cwd) {
-  if (existsSync(join(cwd, '.beads', '.memory-gate-done'))) return false;
-  const closed = getClosedThisSession(sessionId, cwd);
-  return !!closed; // null (unavailable) is falsy → fail open
-}
-
-/**
- * Return true if a Bash command is a memory-gate acknowledgment command.
- * These commands are allowed even while the memory gate is pending.
- */
-export function isMemoryAckCommand(command) {
-  return /\bbd\s+remember\b/.test(command) || /\btouch\s+\.beads\/\.memory-gate-done\b/.test(command);
-}
-
 /**
  * If cwd is inside a .xtrm/worktrees/<name> directory, return the worktree root path.
  * Returns null if not in a worktree.

package/hooks/statusline.mjs

@@ -4,7 +4,7 @@
 // Line 2: ◐ italic(claim title)  OR  ○ bold(N) open  — no background
 //
 // Colors: bold/dim/italic only — no explicit fg/bg, adapts to dark & light themes.
-// State: .xtrm/statusline-claim (written by beads-claim-sync.mjs)
+// State: .xtrm/statusline-claim[-<worktreeName>] (written by beads-claim-sync.mjs)
 // Cache: /tmp per cwd, 5s TTL
 
 import { execSync } from 'node:child_process';
@@ -125,8 +125,10 @@ if (!data) {
   let claimTitle = null;
   let openCount = 0;
   if (existsSync(join(cwd, '.beads')) || existsSync(join(mainRoot, '.beads'))) {
-    // Use mainRoot so all sessions (main + worktrees) share one canonical claim file.
-    const claimFile = join(mainRoot, '.xtrm', 'statusline-claim');
+    // Per-worktree claim file — prevents cross-session contamination.
+    const worktreeMatch = cwd.match(/\/\.xtrm\/worktrees\/([^/]+)/);
+    const claimFileName = worktreeMatch ? `statusline-claim-${worktreeMatch[1]}` : 'statusline-claim';
+    const claimFile = join(mainRoot, '.xtrm', claimFileName);
     claimId = existsSync(claimFile) ? (readFileSync(claimFile, 'utf8').trim() || null) : null;
     if (claimId) {
       try {

package/package.json

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

package/plugins/xtrm-tools/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-tools",
-  "version": "0.5.45",
+  "version": "0.5.47",
   "description": "xtrm-tools: dual-runtime workflow enforcement (Claude Code + Pi) — hooks, extensions, skills, and MCP servers",
   "author": {
     "name": "jaggers"

package/plugins/xtrm-tools/hooks/beads-claim-sync.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // beads-claim-sync — PostToolUse hook
 // bd update --claim → set kv claim
-// bd close         → auto-commit staged changes, set closed-this-session kv for memory gate
+// bd close         → set closed-this-session kv for memory gate
 
 import { spawnSync } from 'node:child_process';
 import { readFileSync, existsSync, writeFileSync, unlinkSync, mkdirSync } from 'node:fs';
@@ -33,6 +33,14 @@ function resolveMainRoot(cwd) {
   return cwd;
 }
 
+// Returns a per-session claim filename: 'statusline-claim' for the main session,
+// 'statusline-claim-<worktreeName>' for worktree sessions.
+// Prevents cross-session contamination when multiple worktrees run simultaneously.
+function resolveClaimFileName(cwd) {
+  const m = cwd.match(/\/\.xtrm\/worktrees\/([^/]+)/);
+  return m ? `statusline-claim-${m[1]}` : 'statusline-claim';
+}
+
 function isShellTool(toolName) {
   return toolName === 'Bash' || toolName === 'bash' || toolName === 'execute_shell_command';
 }
@@ -50,73 +58,7 @@ function commandSucceeded(payload) {
   return true;
 }
 
-function runGit(args, cwd, timeout = 8000) {
-  return spawnSync('git', args, {
-    cwd,
-    stdio: ['pipe', 'pipe', 'pipe'],
-    encoding: 'utf8',
-    timeout,
-  });
-}
-
-function runBd(args, cwd, timeout = 5000) {
-  return spawnSync('bd', args, {
-    cwd,
-    stdio: ['pipe', 'pipe', 'pipe'],
-    encoding: 'utf8',
-    timeout,
-  });
-}
-
-function hasGitChanges(cwd) {
-  const result = runGit(['status', '--porcelain'], cwd);
-  if (result.status !== 0) return false;
-  return result.stdout.trim().length > 0;
-}
-
-function getCloseReason(cwd, issueId, command) {
-  // 1. Parse --reason "..." from the command itself (fastest, no extra call)
-  const reasonMatch = command.match(/--reason[=\s]+["']([^"']+)["']/);
-  if (reasonMatch) return reasonMatch[1].trim();
-
-  // 2. Fall back to bd show <id> --json
-  const show = runBd(['show', issueId, '--json'], cwd);
-  if (show.status === 0 && show.stdout) {
-    try {
-      const parsed = JSON.parse(show.stdout);
-      const reason = parsed?.[0]?.close_reason;
-      if (typeof reason === 'string' && reason.trim().length > 0) return reason.trim();
-    } catch { /* fall through */ }
-  }
-
-  return `Close ${issueId}`;
-}
-
-function stageUntracked(cwd) {
-  const result = runGit(['ls-files', '--others', '--exclude-standard'], cwd);
-  if (result.status !== 0) return;
-  const untracked = result.stdout.trim().split('\n').filter(Boolean);
-  if (untracked.length === 0) return;
-  runGit(['add', '--', ...untracked], cwd);
-}
-
-function autoCommit(cwd, issueId, command) {
-  if (!hasGitChanges(cwd)) {
-    return { ok: true, message: 'No changes detected — auto-commit skipped.' };
-  }
-
-  stageUntracked(cwd);
-
-  const reason = getCloseReason(cwd, issueId, command);
-  const commitMessage = `${reason} (${issueId})`;
-  const result = runGit(['commit', '--no-verify', '-am', commitMessage], cwd, 15000);
-  if (result.status !== 0) {
-    const err = (result.stderr || result.stdout || '').trim();
-    return { ok: false, message: `Auto-commit failed: ${err || 'unknown error'}` };
-  }
 
-  return { ok: true, message: `Auto-committed: \`${commitMessage}\`` };
-}
 
 
 function main() {
@@ -147,11 +89,11 @@ function main() {
         process.exit(0);
       }
 
-      // Write claim state for statusline — always at main repo root so all sessions share it.
+      // Write claim state for statusline — per-worktree file under main root.
       try {
         const xtrmDir = join(resolveMainRoot(cwd), '.xtrm');
         mkdirSync(xtrmDir, { recursive: true });
-        writeFileSync(join(xtrmDir, 'statusline-claim'), issueId);
+        writeFileSync(join(xtrmDir, resolveClaimFileName(cwd)), issueId);
       } catch { /* non-fatal */ }
 
       logEvent({
@@ -172,16 +114,13 @@ function main() {
     }
   }
 
-  // On bd close: auto-commit staged changes, then mark closed-this-session for memory gate
+  // On bd close: mark closed-this-session for memory gate
   if (/\bbd\s+close\b/.test(command) && commandSucceeded(input)) {
     const match = command.match(/\bbd\s+close\s+(\S+)/);
     const closedIssueId = match?.[1];
 
-    // Auto-commit before marking the gate (no-op if clean)
-    const commit = closedIssueId ? autoCommit(cwd, closedIssueId, command) : null;
-
-    // Clear claim state for statusline — use main root so worktree and main sessions agree.
-    try { unlinkSync(join(resolveMainRoot(cwd), '.xtrm', 'statusline-claim')); } catch { /* ok if missing */ }
+    // Clear claim state for statusline — per-worktree file under main root.
+    try { unlinkSync(join(resolveMainRoot(cwd), '.xtrm', resolveClaimFileName(cwd))); } catch { /* ok if missing */ }
 
     // Mark this issue as closed this session (memory gate reads this)
     if (closedIssueId) {
@@ -190,10 +129,7 @@ function main() {
         stdio: ['pipe', 'pipe', 'pipe'],
         timeout: 5000,
       });
-    }
 
-    // Log bd lifecycle events
-    if (closedIssueId) {
       logEvent({
         cwd,
         runtime: 'claude',
@@ -204,26 +140,9 @@ function main() {
         issueId: closedIssueId,
       });
     }
-    if (commit) {
-      logEvent({
-        cwd,
-        runtime: 'claude',
-        sessionId,
-        layer: 'bd',
-        kind: 'bd.committed',
-        outcome: commit.ok ? 'allow' : 'block',
-        issueId: closedIssueId ?? null,
-        data: { msg: commit.message },
-        extra: { ok: commit.ok },
-      });
-    }
-
-    const commitLine = commit
-      ? `\n${commit.ok ? '✅' : '⚠️'} **Session Flow**: ${commit.message}`
-      : '';
 
     process.stdout.write(JSON.stringify({
-      additionalContext: `\n🔓 **Beads**: Issue closed.${commitLine}\nEvaluate insights, then acknowledge:\n  \`bd remember "<insight>"\` (or note "nothing")\n  \`touch .beads/.memory-gate-done\``,
+      additionalContext: `\n🔓 **Beads**: Issue closed. Evaluate insights, then acknowledge:\n  \`bd remember "<insight>"\` (or note "nothing to persist")`,
     }));
     process.stdout.write('\n');
     process.exit(0);

package/plugins/xtrm-tools/hooks/beads-gate-messages.mjs

@@ -12,7 +12,7 @@ export const SESSION_CLOSE_PROTOCOL =
   '  xt end\n';
 
 export const COMMIT_NEXT_STEPS =
-  '  bd close <id> --reason="..."   ← closes issue + auto-commits\n' +
+  '  bd close <id> --reason="..."   ← closes issue\n' +
   '  xt end                          ← push, PR, merge, worktree cleanup\n';
 
 // ── Edit gate messages ───────────────────────────────────────────
@@ -58,9 +58,7 @@ export function stopBlockMessage(summary, claimed) {
 
 export function memoryPromptMessage(claimId, sessionId) {
   const claimLine = claimId ? `claim \`${claimId}\` was closed.\n` : '';
-  const ackCmd = sessionId
-    ? `bd kv set "memory-gate-done:${sessionId}"`
-    : 'touch .beads/.memory-gate-done';
+  const ackCmd = `bd kv set "memory-gate-done:${sessionId}"`;
   return (
     `\u25cf Memory gate: ${claimLine}` +
     'For each candidate insight, check ALL 4:\n' +

package/plugins/xtrm-tools/hooks/beads-gate-utils.mjs

@@ -133,24 +133,6 @@ export function getClosedThisSession(sessionId, cwd) {
   }
 }
 
-/**
- * Return true if the memory gate is pending acknowledgment for this session.
- * Pending = closed-this-session kv is set AND .beads/.memory-gate-done marker is absent.
- */
-export function isMemoryGatePending(sessionId, cwd) {
-  if (existsSync(join(cwd, '.beads', '.memory-gate-done'))) return false;
-  const closed = getClosedThisSession(sessionId, cwd);
-  return !!closed; // null (unavailable) is falsy → fail open
-}
-
-/**
- * Return true if a Bash command is a memory-gate acknowledgment command.
- * These commands are allowed even while the memory gate is pending.
- */
-export function isMemoryAckCommand(command) {
-  return /\bbd\s+remember\b/.test(command) || /\btouch\s+\.beads\/\.memory-gate-done\b/.test(command);
-}
-
 /**
  * If cwd is inside a .xtrm/worktrees/<name> directory, return the worktree root path.
  * Returns null if not in a worktree.