xtrm-tools 2.1.29 → 2.1.30

package/cli/package.json

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

package/config/hooks.json

@@ -37,7 +37,7 @@
     ],
     "PostToolUse": [
       {
-        "matcher": "Bash",
+        "matcher": "Bash|execute_shell_command|bash",
         "script": "beads-claim-sync.mjs",
         "timeout": 5000
       },

package/config/pi/extensions/beads.ts

@@ -10,10 +10,18 @@ export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
 	const isBeadsProject = (cwd: string) => fs.existsSync(path.join(cwd, ".beads"));
 
-	// Pin session to PID — stable for the life of the Pi process, consistent across all extension handlers
-	const sessionId = process.pid.toString();
+	let cachedSessionId: string | null = null;
 
-	const getSessionClaim = async (cwd: string): Promise<string | null> => {
+	// Resolve a stable session ID across event types.
+	const getSessionId = (ctx: any): string => {
+		const fromManager = ctx?.sessionManager?.getSessionId?.();
+		const fromContext = ctx?.sessionId ?? ctx?.session_id;
+		const resolved = fromManager || fromContext || cachedSessionId || process.pid.toString();
+		if (resolved && !cachedSessionId) cachedSessionId = resolved;
+		return resolved;
+	};
+
+	const getSessionClaim = async (sessionId: string, cwd: string): Promise<string | null> => {
 		const result = await SubprocessRunner.run("bd", ["kv", "get", `claimed:${sessionId}`], { cwd });
 		if (result.code === 0) return result.stdout.trim();
 		return null;
@@ -32,12 +40,18 @@ export default function (pi: ExtensionAPI) {
 		return false;
 	};
 
+	pi.on("session_start", async (_event, ctx) => {
+		cachedSessionId = ctx?.sessionManager?.getSessionId?.() ?? ctx?.sessionId ?? ctx?.session_id ?? cachedSessionId;
+		return undefined;
+	});
+
 	pi.on("tool_call", async (event, ctx) => {
 		const cwd = getCwd(ctx);
 		if (!isBeadsProject(cwd)) return undefined;
+		const sessionId = getSessionId(ctx);
 
 		if (EventAdapter.isMutatingFileTool(event)) {
-			const claim = await getSessionClaim(cwd);
+			const claim = await getSessionClaim(sessionId, cwd);
 			if (!claim) {
 			    const hasWork = await hasTrackableWork(cwd);
 			    if (hasWork) {
@@ -46,7 +60,7 @@ export default function (pi: ExtensionAPI) {
 			        }
 			        return {
                         block: true,
-                        reason: `No active issue claim for this session (pid:${sessionId}).\n  bd update <id> --claim\n  bd kv set "claimed:${sessionId}" "<id>"`,
+                        reason: `No active issue claim for this session (${sessionId}).\n  bd update <id> --claim\n  bd kv set "claimed:${sessionId}" "<id>"`,
                     };
                 }
             }
@@ -55,7 +69,7 @@ export default function (pi: ExtensionAPI) {
 		if (isToolCallEventType("bash", event)) {
 			const command = event.input.command;
 			if (command && /\bgit\s+commit\b/.test(command)) {
-                const claim = await getSessionClaim(cwd);
+                const claim = await getSessionClaim(sessionId, cwd);
 				if (claim) {
 					return {
                         block: true,
@@ -71,6 +85,7 @@ export default function (pi: ExtensionAPI) {
 	pi.on("tool_result", async (event, ctx) => {
 		if (isBashToolResult(event)) {
 			const command = event.input.command;
+			const sessionId = getSessionId(ctx);
 
 			// Auto-claim on bd update --claim regardless of exit code.
 			// bd returns exit 1 with "already in_progress" when status unchanged — still a valid claim intent.
@@ -80,7 +95,7 @@ export default function (pi: ExtensionAPI) {
 					const issueId = issueMatch[1];
 					const cwd = getCwd(ctx);
 					await SubprocessRunner.run("bd", ["kv", "set", `claimed:${sessionId}`, issueId], { cwd });
-					const claimNotice = `\n\n✅ **Beads**: Session \`pid:${sessionId}\` claimed issue \`${issueId}\`. File edits are now unblocked.`;
+					const claimNotice = `\n\n✅ **Beads**: Session \`${sessionId}\` claimed issue \`${issueId}\`. File edits are now unblocked.`;
 					return { content: [...event.content, { type: "text", text: claimNotice }] };
 				}
 			}

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

@@ -95,8 +95,8 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("session_start", async (_event, ctx) => {
 		capturedCtx = ctx;
-		// Get session ID from sessionManager (UUID, consistent with hooks)
-		sessionId = ctx.sessionManager?.getSessionId?.() ?? process.pid.toString();
+		// Get session ID from sessionManager/context (prefer UUID, consistent with hooks)
+		sessionId = ctx.sessionManager?.getSessionId?.() ?? ctx.sessionId ?? ctx.session_id ?? process.pid.toString();
 
 		ctx.ui.setFooter((tui, theme, footerData) => {
 			requestRender = () => tui.requestRender();

package/hooks/beads-claim-sync.mjs

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 // beads-claim-sync — PostToolUse hook
 // Auto-sets bd kv claim when bd update --claim is detected.
-// Uses session_id from hook input (UUID, matches Pi's sessionManager.getSessionId())
 
 import { spawnSync } from 'node:child_process';
 import { readFileSync, existsSync } from 'node:fs';
@@ -19,10 +18,28 @@ function isBeadsProject(cwd) {
   return existsSync(join(cwd, '.beads'));
 }
 
+function isShellTool(toolName) {
+  return toolName === 'Bash' || toolName === 'bash' || toolName === 'execute_shell_command';
+}
+
+function commandSucceeded(payload) {
+  const tr = payload?.tool_response ?? payload?.tool_result ?? payload?.result;
+  if (!tr || typeof tr !== 'object') return true;
+
+  if (tr.success === false) return false;
+  if (tr.error) return false;
+
+  const numeric = [tr.exit_code, tr.exitCode, tr.status, tr.returncode].find((v) => Number.isInteger(v));
+  if (typeof numeric === 'number' && numeric !== 0) return false;
+
+  return true;
+}
+
 function main() {
   const input = readInput();
   if (!input || input.hook_event_name !== 'PostToolUse') process.exit(0);
-  if (input.tool_name !== 'Bash') process.exit(0);
+  if (!isShellTool(input.tool_name)) process.exit(0);
+  if (!commandSucceeded(input)) process.exit(0);
 
   const cwd = input.cwd || process.cwd();
   if (!isBeadsProject(cwd)) process.exit(0);
@@ -32,33 +49,33 @@ function main() {
     process.exit(0);
   }
 
-  // Extract issue ID from command
   const match = command.match(/\bbd\s+update\s+(\S+)/);
   if (!match) process.exit(0);
 
   const issueId = match[1];
-  // Use session_id from hook input (UUID from Pi/Claude Code)
-  const sessionId = input.session_id;
+  const sessionId = input.session_id ?? input.sessionId;
 
   if (!sessionId) {
     process.stderr.write('Beads claim sync: no session_id in hook input\n');
     process.exit(0);
   }
 
-  try {
-    spawnSync('bd', ['kv', 'set', `claimed:${sessionId}`, issueId], {
-      cwd,
-      stdio: ['pipe', 'pipe', 'pipe'],
-      timeout: 5000,
-    });
-    process.stdout.write(JSON.stringify({
-      additionalContext: `\n✅ **Beads**: Session \`${sessionId}\` claimed issue \`${issueId}\`.`,
-    }));
-    process.stdout.write('\n');
-  } catch (err) {
-    process.stderr.write(`Beads claim sync warning: ${err.message}\n`);
+  const result = spawnSync('bd', ['kv', 'set', `claimed:${sessionId}`, issueId], {
+    cwd,
+    stdio: ['pipe', 'pipe', 'pipe'],
+    timeout: 5000,
+  });
+
+  if (result.status !== 0) {
+    const err = (result.stderr || result.stdout || '').toString().trim();
+    if (err) process.stderr.write(`Beads claim sync warning: ${err}\n`);
+    process.exit(0);
   }
 
+  process.stdout.write(JSON.stringify({
+    additionalContext: `\n✅ **Beads**: Session \`${sessionId}\` claimed issue \`${issueId}\`.`,
+  }));
+  process.stdout.write('\n');
   process.exit(0);
 }
 

package/package.json

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