xtrm-tools 0.5.28 → 0.5.30

package/cli/package.json

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

package/config/instructions/agents-top.md

@@ -18,7 +18,7 @@
 | **Edit** | Write/Edit without active claim | `bd update <id> --claim` |
 | **Commit** | `git commit` while claim is open | `bd close <id>` first, then commit |
 | **Stop** | Session end with unclosed claim | `bd close <id>` |
-| **Memory** | Auto-fires at session end if issue closed | `bd remember "<insight>"` then `touch .beads/.memory-gate-done` |
+| **Memory** | Auto-fires at session end if issue closed | `bd remember "<insight>"` then run the `bd kv set` command shown in the gate message |
 
 > `bd close` auto-commits via `git commit -am`. Do not double-commit after closing.
 

package/config/instructions/claude-top.md

@@ -18,7 +18,7 @@
 | **Edit** | Write/Edit without active claim | `bd update <id> --claim` |
 | **Commit** | `git commit` while claim is open | `bd close <id>` first, then commit |
 | **Stop** | Session end with unclosed claim | `bd close <id>` |
-| **Memory** | Auto-fires at Stop if issue closed this session | `bd remember "<insight>"` then `touch .beads/.memory-gate-done` |
+| **Memory** | Auto-fires at Stop if issue closed this session | `bd remember "<insight>"` then run the `bd kv set` command shown in the gate message |
 
 > `bd close` auto-commits via `git commit -am`. Do not double-commit after closing.
 

package/config/pi/extensions/beads/index.ts

@@ -1,9 +1,62 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { isToolCallEventType, isBashToolResult } from "@mariozechner/pi-coding-agent";
-import { existsSync, unlinkSync } from "node:fs";
-import { join } from "node:path";
 import { SubprocessRunner, EventAdapter } from "../core/lib";
 
+// ─── Autocommit helpers (mirrors hooks/beads-claim-sync.mjs) ─────────────────
+
+async function hasGitChanges(cwd: string): Promise<boolean> {
+	const result = await SubprocessRunner.run("git", ["status", "--porcelain"], { cwd });
+	if (result.code !== 0) return false;
+	return result.stdout.trim().length > 0;
+}
+
+async function stageUntracked(cwd: string): Promise<void> {
+	const result = await SubprocessRunner.run("git", ["ls-files", "--others", "--exclude-standard"], { cwd });
+	if (result.code !== 0 || !result.stdout.trim()) return;
+	const untracked = result.stdout.trim().split("\n").filter(Boolean);
+	if (untracked.length > 0) {
+		await SubprocessRunner.run("git", ["add", "--", ...untracked], { cwd });
+	}
+}
+
+async function getCloseReason(cwd: string, issueId: string, command: string): Promise<string> {
+	// 1. Parse --reason "..." from the command itself
+	const reasonMatch = command.match(/--reason[=\s]+["']([^"']+)["']/);
+	if (reasonMatch) return reasonMatch[1].trim();
+
+	// 2. Fall back to bd show <id> --json
+	const show = await SubprocessRunner.run("bd", ["show", issueId, "--json"], { cwd });
+	if (show.code === 0 && show.stdout.trim()) {
+		try {
+			const parsed = JSON.parse(show.stdout);
+			const issue = Array.isArray(parsed) ? parsed[0] : parsed;
+			const reason = issue?.close_reason;
+			if (typeof reason === "string" && reason.trim()) return reason.trim();
+		} catch { /* fall through */ }
+	}
+
+	return `Close ${issueId}`;
+}
+
+async function autoCommit(cwd: string, issueId: string, command: string): Promise<{ ok: boolean; message: string }> {
+	if (!await hasGitChanges(cwd)) {
+		return { ok: true, message: "No changes detected — auto-commit skipped." };
+	}
+
+	await stageUntracked(cwd);
+
+	const reason = await getCloseReason(cwd, issueId, command);
+	const commitMessage = `${reason} (${issueId})`;
+	const result = await SubprocessRunner.run("git", ["commit", "--no-verify", "-am", commitMessage], { cwd });
+
+	if (result.code !== 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}\`` };
+}
+
 export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
 
@@ -141,11 +194,19 @@ export default function (pi: ExtensionAPI) {
 		if (/\bbd\s+close\b/.test(command) && !event.isError) {
 			const closeMatch = command.match(/\bbd\s+close\s+(\S+)/);
 			const closedIssueId = closeMatch?.[1] ?? null;
+
+			// Auto-commit staged changes (mirrors hooks/beads-claim-sync.mjs)
+			const commit = closedIssueId ? await autoCommit(cwd, closedIssueId, command) : null;
+
 			if (closedIssueId) {
 				await SubprocessRunner.run("bd", ["kv", "set", `closed-this-session:${sessionId}`, closedIssueId], { cwd });
 				memoryGateFired = false;
 			}
-			const reminder = "\n\n**Beads Insight**: Work completed. Consider if this session produced insights worth persisting via `bd remember`.";
+
+			const commitLine = commit
+				? `\n${commit.ok ? "✅" : "⚠️"} **Session Flow**: ${commit.message}`
+				: "";
+			const reminder = `\n\n**Beads Insight**: Work completed. Consider if this session produced insights worth persisting via \`bd remember\`.${commitLine}`;
 			return { content: [...event.content, { type: "text", text: reminder }] };
 		}
 
@@ -159,9 +220,9 @@ export default function (pi: ExtensionAPI) {
 		if (!EventAdapter.isBeadsProject(cwd)) return;
 		const sessionId = getSessionId(ctx);
 
-		const markerPath = join(cwd, ".beads", ".memory-gate-done");
-		if (existsSync(markerPath)) {
-			try { unlinkSync(markerPath); } catch { /* ignore */ }
+		const markerCheck = await SubprocessRunner.run("bd", ["kv", "get", `memory-gate-done:${sessionId}`], { cwd });
+		if (markerCheck.code === 0) {
+			await SubprocessRunner.run("bd", ["kv", "clear", `memory-gate-done:${sessionId}`], { cwd });
 			await clearSessionMarkers(sessionId, cwd);
 			memoryGateFired = false;
 			return;
@@ -178,7 +239,7 @@ export default function (pi: ExtensionAPI) {
 			`For each closed issue, worth persisting?\n` +
 			`  YES → \`bd remember "<insight>"\`\n` +
 			`  NO  → note "nothing to persist"\n` +
-			`  Then acknowledge: \`touch .beads/.memory-gate-done\``,
+			`  Then acknowledge: \`bd kv set "memory-gate-done:${sessionId}" 1\``,
 		);
 	};
 

package/config/pi/extensions/core/guard-rules.ts

@@ -64,8 +64,6 @@ export const SAFE_BASH_PREFIXES = [
 	"stat",
 	"du",
 	"tree",
-	// Allowed writes (specific paths)
-	"touch .beads/",
 ];
 
 export const DANGEROUS_BASH_PATTERNS = [

package/config/pi/extensions/custom-footer/index.ts

@@ -228,9 +228,10 @@ export default function (pi: ExtensionAPI) {
 	};
 
 	const buildIssueLine = (width: number, theme: any): string => {
-		const { shortId, claimTitle, openCount } = beadState;
-		if (shortId && claimTitle) {
-			const prefix = `◐ ${shortId} `;
+		const { shortId, claimTitle, status, openCount } = beadState;
+		if (shortId && claimTitle && status) {
+			const icon = STATUS_ICONS[status] ?? "◐";
+			const prefix = `${icon} ${shortId} `;
 			const title = theme.fg("muted", claimTitle);
 			return truncateToWidth(`${prefix}${title}`, width);
 		}
@@ -284,12 +285,10 @@ export default function (pi: ExtensionAPI) {
 					const hostStr = theme.fg("muted", runtimeState.host);
 					const cwdStr = `${BOLD}${runtimeState.displayDir}${BOLD_OFF}`;
 					const venvStr = runtimeState.venv ? theme.fg("muted", `(${runtimeState.venv})`) : "";
-					const beadChip = buildBeadChip();
 
 					const line1Parts = [brand, modelStr, hostStr, cwdStr];
 					if (branchStr) line1Parts.push(branchStr);
 					if (venvStr) line1Parts.push(venvStr);
-					if (beadChip) line1Parts.push(beadChip);
 
 					const line1 = truncateToWidth(line1Parts.join(" "), width);
 					const line2 = buildIssueLine(width, theme);
@@ -309,7 +308,7 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("session_start", async (_event, ctx) => {
 		capturedCtx = ctx;
-		sessionId = ctx.sessionManager?.getSessionId?.() ?? ctx.sessionId ?? ctx.session_id ?? process.pid.toString();
+		sessionId = ctx.sessionManager?.getSessionId?.() || ctx.sessionId || ctx.session_id || process.pid.toString();
 		runtimeState.lastFetch = 0;
 		beadState.lastFetch = 0;
 		applyCustomFooter(ctx);

package/hooks/beads-claim-sync.mjs

@@ -5,7 +5,7 @@
 
 import { spawnSync } from 'node:child_process';
 import { readFileSync, existsSync, writeFileSync, unlinkSync, mkdirSync } from 'node:fs';
-import { join } from 'node:path';
+import { join, dirname, isAbsolute } from 'node:path';
 import { resolveSessionId } from './beads-gate-utils.mjs';
 import { logEvent } from './xtrm-logger.mjs';
 
@@ -21,6 +21,18 @@ function isBeadsProject(cwd) {
   return existsSync(join(cwd, '.beads'));
 }
 
+// In a git worktree, --git-common-dir returns an absolute path to the main .git dir.
+// In a regular repo it returns '.git' (relative). Use this to find the canonical main root
+// so claim files are always written/deleted from the same location across sessions.
+function resolveMainRoot(cwd) {
+  const r = spawnSync('git', ['rev-parse', '--git-common-dir'], {
+    cwd, encoding: 'utf8', stdio: 'pipe',
+  });
+  const commonDir = r.stdout?.trim();
+  if (commonDir && isAbsolute(commonDir)) return dirname(commonDir);
+  return cwd;
+}
+
 function isShellTool(toolName) {
   return toolName === 'Bash' || toolName === 'bash' || toolName === 'execute_shell_command';
 }
@@ -97,7 +109,7 @@ function autoCommit(cwd, issueId, command) {
 
   const reason = getCloseReason(cwd, issueId, command);
   const commitMessage = `${reason} (${issueId})`;
-  const result = runGit(['commit', '-am', commitMessage], cwd, 15000);
+  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'}` };
@@ -135,9 +147,9 @@ function main() {
         process.exit(0);
       }
 
-      // Write claim state for statusline
+      // Write claim state for statusline — always at main repo root so all sessions share it.
       try {
-        const xtrmDir = join(cwd, '.xtrm');
+        const xtrmDir = join(resolveMainRoot(cwd), '.xtrm');
         mkdirSync(xtrmDir, { recursive: true });
         writeFileSync(join(xtrmDir, 'statusline-claim'), issueId);
       } catch { /* non-fatal */ }
@@ -168,8 +180,8 @@ function main() {
     // Auto-commit before marking the gate (no-op if clean)
     const commit = closedIssueId ? autoCommit(cwd, closedIssueId, command) : null;
 
-    // Clear claim state for statusline
-    try { unlinkSync(join(cwd, '.xtrm', 'statusline-claim')); } catch { /* ok if missing */ }
+    // 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 */ }
 
     // Mark this issue as closed this session (memory gate reads this)
     if (closedIssueId) {

package/hooks/beads-gate-messages.mjs

@@ -56,13 +56,16 @@ export function stopBlockMessage(summary, claimed) {
 
 // ── Memory gate messages ─────────────────────────────────────────
 
-export function memoryPromptMessage(claimId) {
+export function memoryPromptMessage(claimId, sessionId) {
   const claimLine = claimId ? `claim \`${claimId}\` was closed.\n` : '';
+  const ackCmd = sessionId
+    ? `bd kv set "memory-gate-done:${sessionId}" 1`
+    : 'touch .beads/.memory-gate-done';
   return (
     `\u25cf Memory gate: ${claimLine}` +
     'Ask: "Would this be useful in 14 days on a fresh session?"\n' +
     '  YES → `bd remember "<insight>"`\n' +
     '  NO  → note "nothing to persist"\n' +
-    '  Then: `touch .beads/.memory-gate-done`\n'
+    `  Then: \`${ackCmd}\`\n`
   );
 }

package/hooks/beads-memory-gate.mjs

@@ -8,8 +8,6 @@
 // Installed by: xtrm install
 
 import { execSync } from 'node:child_process';
-import { existsSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
 import { readHookInput } from './beads-gate-core.mjs';
 import { resolveCwd, resolveSessionId, isBeadsProject, getSessionClaim, clearSessionClaim } from './beads-gate-utils.mjs';
 import { memoryPromptMessage } from './beads-gate-messages.mjs';
@@ -23,10 +21,25 @@ if (!cwd || !isBeadsProject(cwd)) process.exit(0);
 
 const sessionId = resolveSessionId(input);
 
-// 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 */ }
+// Agent signals evaluation complete via bd kv (works across worktree redirects)
+let memoryGateDone = false;
+try {
+  execSync(`bd kv get "memory-gate-done:${sessionId}"`, {
+    cwd,
+    stdio: ['pipe', 'pipe', 'pipe'],
+    timeout: 5000,
+  });
+  memoryGateDone = true;
+} catch { /* key not set → not done */ }
+
+if (memoryGateDone) {
+  try {
+    execSync(`bd kv clear "memory-gate-done:${sessionId}"`, {
+      cwd,
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 5000,
+    });
+  } catch { /* ignore */ }
   // Clear the claim and closed-this-session marker
   clearSessionClaim(sessionId, cwd);
   try {
@@ -66,7 +79,7 @@ try {
 
 if (!closedIssueId) process.exit(0);
 
-const memoryMessage = memoryPromptMessage();
+const memoryMessage = memoryPromptMessage(closedIssueId, sessionId);
 logEvent({
   cwd,
   runtime: 'claude',

package/hooks/statusline.mjs

@@ -8,8 +8,8 @@
 // Cache: /tmp per cwd, 5s TTL
 
 import { execSync } from 'node:child_process';
-import { readFileSync, writeFileSync, existsSync } from 'node:fs';
-import { join, basename, relative } from 'node:path';
+import { readFileSync, writeFileSync, existsSync, unlinkSync } from 'node:fs';
+import { join, basename, relative, dirname, isAbsolute } from 'node:path';
 import { tmpdir, hostname } from 'node:os';
 import { createHash } from 'node:crypto';
 
@@ -48,18 +48,44 @@ const D  = '\x1b[2m';   // dim on
 const I  = '\x1b[3m';   // italic on
 const I_ = '\x1b[23m';  // italic off
 
+// True-color gradient for XTRM label: light blue (0%) → gold (50%) → orange-red (100%)
+// Two-segment interpolation avoids the gray dead-zone of direct blue↔orange RGB lerp.
+function xtrmColor(pct) {
+  if (pct == null) return null;
+  const t = Math.min(Math.max(pct, 0), 100) / 100;
+  let r, g, b;
+  if (t <= 0.5) {
+    const s = t * 2;
+    r = Math.round(60  + s * (255 - 60));
+    g = Math.round(160 + s * (210 - 160));
+    b = Math.round(255 * (1 - s));
+  } else {
+    const s = (t - 0.5) * 2;
+    r = 255;
+    g = Math.round(210 - s * 150);
+    b = 0;
+  }
+  return `\x1b[38;2;${r};${g};${b}m`;
+}
+
+// pct is always fresh from ctx (not cached) — needed for the color gradient on every render
+const pct = ctx?.context_window?.used_percentage;
+
 let data = getCached();
 if (!data) {
   // Model + token %
   const modelId = ctx?.model?.display_name ?? ctx?.model?.id ?? null;
-  const pct = ctx?.context_window?.used_percentage;
-  const modelStr = modelId ? `${modelId}${pct != null ? ` [${Math.round(pct)}%]` : ''}` : null;
+  const modelStr = modelId ?? null;
 
   // Short hostname
   const host = hostname().split('.')[0];
 
   // Directory — repo-relative like the global script
   const repoRoot = run('git rev-parse --show-toplevel');
+  // In a git worktree, --git-common-dir returns an absolute path to the main .git dir.
+  // In a regular repo it returns '.git' (relative). Use this to find the canonical main root.
+  const gitCommonDir = run('git rev-parse --git-common-dir');
+  const mainRoot = (gitCommonDir && isAbsolute(gitCommonDir)) ? dirname(gitCommonDir) : (repoRoot || cwd);
   let displayDir;
   if (repoRoot) {
     const rel = relative(repoRoot, cwd) || '.';
@@ -98,13 +124,21 @@ if (!data) {
   let claimId = null;
   let claimTitle = null;
   let openCount = 0;
-  if (existsSync(join(cwd, '.beads'))) {
-    const claimFile = join(cwd, '.xtrm', 'statusline-claim');
+  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');
     claimId = existsSync(claimFile) ? (readFileSync(claimFile, 'utf8').trim() || null) : null;
     if (claimId) {
       try {
         const raw = run(`bd show ${claimId} --json`);
-        claimTitle = raw ? (JSON.parse(raw)?.[0]?.title ?? null) : null;
+        const issue = raw ? JSON.parse(raw)?.[0] : null;
+        if (issue?.status === 'closed') {
+          // Self-heal: remove stale claim file left behind when bd close didn't clean up.
+          try { unlinkSync(claimFile); } catch {}
+          claimId = null;
+        } else {
+          claimTitle = issue?.title ?? null;
+        }
       } catch {}
     }
     if (!claimTitle) {
@@ -120,7 +154,9 @@ if (!data) {
 const { modelStr, host, displayDir, branch, gitStatus, venv, claimId, claimTitle, openCount } = data;
 
 // Line 1 — matches global format, XTRM prepended
-const parts = [`${B}XTRM${B_}`];
+const col = xtrmColor(pct);
+const dot = col ? `${col}●${R}` : '●';
+const parts = [`${dot} ${B}XTRM${B_}`];
 if (modelStr) parts.push(`${D}${modelStr}${R}`);
 parts.push(host);
 if (displayDir) parts.push(`${B}${displayDir}${B_}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-tools",
-  "version": "0.5.28",
+  "version": "0.5.30",
   "description": "Claude Code tools installer (skills, hooks, MCP servers)",
   "license": "MIT",
   "type": "module",
@@ -52,7 +52,8 @@
     "version": "npm run sync:cli-version && git add cli/package.json",
     "prepack": "node scripts/prepack-plugin.mjs",
     "postpack": "node scripts/postpack-plugin.mjs",
-    "prepublishOnly": "npm run sync:cli-version && npm run build"
+    "prepublishOnly": "npm run sync:cli-version && npm run build",
+    "release": "npm publish --tag latest"
   },
   "engines": {
     "node": ">=20.0.0"

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

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-tools",
-  "version": "0.5.28",
+  "version": "0.5.30",
   "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

@@ -5,7 +5,7 @@
 
 import { spawnSync } from 'node:child_process';
 import { readFileSync, existsSync, writeFileSync, unlinkSync, mkdirSync } from 'node:fs';
-import { join } from 'node:path';
+import { join, dirname, isAbsolute } from 'node:path';
 import { resolveSessionId } from './beads-gate-utils.mjs';
 import { logEvent } from './xtrm-logger.mjs';
 
@@ -21,6 +21,18 @@ function isBeadsProject(cwd) {
   return existsSync(join(cwd, '.beads'));
 }
 
+// In a git worktree, --git-common-dir returns an absolute path to the main .git dir.
+// In a regular repo it returns '.git' (relative). Use this to find the canonical main root
+// so claim files are always written/deleted from the same location across sessions.
+function resolveMainRoot(cwd) {
+  const r = spawnSync('git', ['rev-parse', '--git-common-dir'], {
+    cwd, encoding: 'utf8', stdio: 'pipe',
+  });
+  const commonDir = r.stdout?.trim();
+  if (commonDir && isAbsolute(commonDir)) return dirname(commonDir);
+  return cwd;
+}
+
 function isShellTool(toolName) {
   return toolName === 'Bash' || toolName === 'bash' || toolName === 'execute_shell_command';
 }
@@ -97,7 +109,7 @@ function autoCommit(cwd, issueId, command) {
 
   const reason = getCloseReason(cwd, issueId, command);
   const commitMessage = `${reason} (${issueId})`;
-  const result = runGit(['commit', '-am', commitMessage], cwd, 15000);
+  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'}` };
@@ -135,9 +147,9 @@ function main() {
         process.exit(0);
       }
 
-      // Write claim state for statusline
+      // Write claim state for statusline — always at main repo root so all sessions share it.
       try {
-        const xtrmDir = join(cwd, '.xtrm');
+        const xtrmDir = join(resolveMainRoot(cwd), '.xtrm');
         mkdirSync(xtrmDir, { recursive: true });
         writeFileSync(join(xtrmDir, 'statusline-claim'), issueId);
       } catch { /* non-fatal */ }
@@ -168,8 +180,8 @@ function main() {
     // Auto-commit before marking the gate (no-op if clean)
     const commit = closedIssueId ? autoCommit(cwd, closedIssueId, command) : null;
 
-    // Clear claim state for statusline
-    try { unlinkSync(join(cwd, '.xtrm', 'statusline-claim')); } catch { /* ok if missing */ }
+    // 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 */ }
 
     // Mark this issue as closed this session (memory gate reads this)
     if (closedIssueId) {

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

@@ -56,13 +56,16 @@ export function stopBlockMessage(summary, claimed) {
 
 // ── Memory gate messages ─────────────────────────────────────────
 
-export function memoryPromptMessage(claimId) {
+export function memoryPromptMessage(claimId, sessionId) {
   const claimLine = claimId ? `claim \`${claimId}\` was closed.\n` : '';
+  const ackCmd = sessionId
+    ? `bd kv set "memory-gate-done:${sessionId}" 1`
+    : 'touch .beads/.memory-gate-done';
   return (
     `\u25cf Memory gate: ${claimLine}` +
     'Ask: "Would this be useful in 14 days on a fresh session?"\n' +
     '  YES → `bd remember "<insight>"`\n' +
     '  NO  → note "nothing to persist"\n' +
-    '  Then: `touch .beads/.memory-gate-done`\n'
+    `  Then: \`${ackCmd}\`\n`
   );
 }

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

@@ -8,8 +8,6 @@
 // Installed by: xtrm install
 
 import { execSync } from 'node:child_process';
-import { existsSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
 import { readHookInput } from './beads-gate-core.mjs';
 import { resolveCwd, resolveSessionId, isBeadsProject, getSessionClaim, clearSessionClaim } from './beads-gate-utils.mjs';
 import { memoryPromptMessage } from './beads-gate-messages.mjs';
@@ -23,10 +21,25 @@ if (!cwd || !isBeadsProject(cwd)) process.exit(0);
 
 const sessionId = resolveSessionId(input);
 
-// 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 */ }
+// Agent signals evaluation complete via bd kv (works across worktree redirects)
+let memoryGateDone = false;
+try {
+  execSync(`bd kv get "memory-gate-done:${sessionId}"`, {
+    cwd,
+    stdio: ['pipe', 'pipe', 'pipe'],
+    timeout: 5000,
+  });
+  memoryGateDone = true;
+} catch { /* key not set → not done */ }
+
+if (memoryGateDone) {
+  try {
+    execSync(`bd kv clear "memory-gate-done:${sessionId}"`, {
+      cwd,
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 5000,
+    });
+  } catch { /* ignore */ }
   // Clear the claim and closed-this-session marker
   clearSessionClaim(sessionId, cwd);
   try {
@@ -66,7 +79,7 @@ try {
 
 if (!closedIssueId) process.exit(0);
 
-const memoryMessage = memoryPromptMessage();
+const memoryMessage = memoryPromptMessage(closedIssueId, sessionId);
 logEvent({
   cwd,
   runtime: 'claude',

package/plugins/xtrm-tools/hooks/statusline.mjs

@@ -8,8 +8,8 @@
 // Cache: /tmp per cwd, 5s TTL
 
 import { execSync } from 'node:child_process';
-import { readFileSync, writeFileSync, existsSync } from 'node:fs';
-import { join, basename, relative } from 'node:path';
+import { readFileSync, writeFileSync, existsSync, unlinkSync } from 'node:fs';
+import { join, basename, relative, dirname, isAbsolute } from 'node:path';
 import { tmpdir, hostname } from 'node:os';
 import { createHash } from 'node:crypto';
 
@@ -48,18 +48,44 @@ const D  = '\x1b[2m';   // dim on
 const I  = '\x1b[3m';   // italic on
 const I_ = '\x1b[23m';  // italic off
 
+// True-color gradient for XTRM label: light blue (0%) → gold (50%) → orange-red (100%)
+// Two-segment interpolation avoids the gray dead-zone of direct blue↔orange RGB lerp.
+function xtrmColor(pct) {
+  if (pct == null) return null;
+  const t = Math.min(Math.max(pct, 0), 100) / 100;
+  let r, g, b;
+  if (t <= 0.5) {
+    const s = t * 2;
+    r = Math.round(60  + s * (255 - 60));
+    g = Math.round(160 + s * (210 - 160));
+    b = Math.round(255 * (1 - s));
+  } else {
+    const s = (t - 0.5) * 2;
+    r = 255;
+    g = Math.round(210 - s * 150);
+    b = 0;
+  }
+  return `\x1b[38;2;${r};${g};${b}m`;
+}
+
+// pct is always fresh from ctx (not cached) — needed for the color gradient on every render
+const pct = ctx?.context_window?.used_percentage;
+
 let data = getCached();
 if (!data) {
   // Model + token %
   const modelId = ctx?.model?.display_name ?? ctx?.model?.id ?? null;
-  const pct = ctx?.context_window?.used_percentage;
-  const modelStr = modelId ? `${modelId}${pct != null ? ` [${Math.round(pct)}%]` : ''}` : null;
+  const modelStr = modelId ?? null;
 
   // Short hostname
   const host = hostname().split('.')[0];
 
   // Directory — repo-relative like the global script
   const repoRoot = run('git rev-parse --show-toplevel');
+  // In a git worktree, --git-common-dir returns an absolute path to the main .git dir.
+  // In a regular repo it returns '.git' (relative). Use this to find the canonical main root.
+  const gitCommonDir = run('git rev-parse --git-common-dir');
+  const mainRoot = (gitCommonDir && isAbsolute(gitCommonDir)) ? dirname(gitCommonDir) : (repoRoot || cwd);
   let displayDir;
   if (repoRoot) {
     const rel = relative(repoRoot, cwd) || '.';
@@ -98,13 +124,21 @@ if (!data) {
   let claimId = null;
   let claimTitle = null;
   let openCount = 0;
-  if (existsSync(join(cwd, '.beads'))) {
-    const claimFile = join(cwd, '.xtrm', 'statusline-claim');
+  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');
     claimId = existsSync(claimFile) ? (readFileSync(claimFile, 'utf8').trim() || null) : null;
     if (claimId) {
       try {
         const raw = run(`bd show ${claimId} --json`);
-        claimTitle = raw ? (JSON.parse(raw)?.[0]?.title ?? null) : null;
+        const issue = raw ? JSON.parse(raw)?.[0] : null;
+        if (issue?.status === 'closed') {
+          // Self-heal: remove stale claim file left behind when bd close didn't clean up.
+          try { unlinkSync(claimFile); } catch {}
+          claimId = null;
+        } else {
+          claimTitle = issue?.title ?? null;
+        }
       } catch {}
     }
     if (!claimTitle) {
@@ -120,7 +154,9 @@ if (!data) {
 const { modelStr, host, displayDir, branch, gitStatus, venv, claimId, claimTitle, openCount } = data;
 
 // Line 1 — matches global format, XTRM prepended
-const parts = [`${B}XTRM${B_}`];
+const col = xtrmColor(pct);
+const dot = col ? `${col}●${R}` : '●';
+const parts = [`${dot} ${B}XTRM${B_}`];
 if (modelStr) parts.push(`${D}${modelStr}${R}`);
 parts.push(host);
 if (displayDir) parts.push(`${B}${displayDir}${B_}`);