xtrm-tools 2.1.24 → 2.1.26

package/cli/package.json

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

package/config/pi/extensions/beads.ts

@@ -10,7 +10,10 @@ export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
 	const isBeadsProject = (cwd: string) => fs.existsSync(path.join(cwd, ".beads"));
 
-	const getSessionClaim = async (sessionId: string, cwd: string): Promise<string | null> => {
+	// Pin session to PID — stable for the life of the Pi process, consistent across all extension handlers
+	const sessionId = process.pid.toString();
+
+	const getSessionClaim = async (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;
@@ -33,10 +36,8 @@ export default function (pi: ExtensionAPI) {
 		const cwd = getCwd(ctx);
 		if (!isBeadsProject(cwd)) return undefined;
 
-		const sessionId = ctx.sessionManager.sessionId;
-
 		if (EventAdapter.isMutatingFileTool(event)) {
-			const claim = await getSessionClaim(sessionId, cwd);
+			const claim = await getSessionClaim(cwd);
 			if (!claim) {
 			    const hasWork = await hasTrackableWork(cwd);
 			    if (hasWork) {
@@ -45,7 +46,7 @@ export default function (pi: ExtensionAPI) {
 			        }
 			        return {
                         block: true,
-                        reason: `No active issue claim for this session (${sessionId}).\n  bd update <id> --claim\n  bd kv set "claimed:${sessionId}" "<id>"`,
+                        reason: `No active issue claim for this session (pid:${sessionId}).\n  bd update <id> --claim\n  bd kv set "claimed:${sessionId}" "<id>"`,
                     };
                 }
             }
@@ -54,7 +55,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(sessionId, cwd);
+                const claim = await getSessionClaim(cwd);
 				if (claim) {
 					return {
                         block: true,
@@ -78,9 +79,8 @@ export default function (pi: ExtensionAPI) {
 				if (issueMatch) {
 					const issueId = issueMatch[1];
 					const cwd = getCwd(ctx);
-					const sessionId = ctx.sessionManager.sessionId;
 					await SubprocessRunner.run("bd", ["kv", "set", `claimed:${sessionId}`, issueId], { cwd });
-					const claimNotice = `\n\n✅ **Beads**: Session \`${sessionId}\` claimed issue \`${issueId}\`. File edits are now unblocked.`;
+					const claimNotice = `\n\n✅ **Beads**: Session \`pid:${sessionId}\` claimed issue \`${issueId}\`. File edits are now unblocked.`;
 					return { content: [...event.content, { type: "text", text: claimNotice }] };
 				}
 			}

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

@@ -7,19 +7,107 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { truncateToWidth } from "@mariozechner/pi-tui";
 
+import * as path from "node:path";
+import * as fs from "node:fs";
+import { SubprocessRunner } from "./core/lib";
+
 export default function (pi: ExtensionAPI) {
-	let turnCount = 0;
+	// Pin session to PID — stable for the life of the Pi process, matches beads.ts
+	const SESSION_KEY = process.pid.toString();
+
+	interface BeadState {
+		claimId: string | null;
+		shortId: string | null;
+		status: string | null;
+		openCount: number;
+		lastFetch: number;
+	}
+
+	const STATUS_ICONS: Record<string, string> = {
+		open: "○",
+		in_progress: "◐",
+		blocked: "●",
+		closed: "✓",
+	};
+	const STATUS_BG: Record<string, string> = {
+		open: "\x1b[48;5;238m",
+		in_progress: "\x1b[48;5;28m",
+		blocked: "\x1b[48;5;88m",
+	};
+
+	let capturedCtx: any = null;
+	let beadState: BeadState = { claimId: null, shortId: null, status: null, openCount: 0, lastFetch: 0 };
+	let refreshing = false;
+	let requestRender: (() => void) | null = null;
+	const CACHE_TTL = 5000;
+
+	const getCwd = () => capturedCtx?.cwd || process.cwd();
+	const isBeadsProject = (cwd: string) => fs.existsSync(path.join(cwd, ".beads"));
+	const getShortId = (id: string) => id.split("-").pop() ?? id;
+
+	const refreshBeadState = async () => {
+		if (refreshing || Date.now() - beadState.lastFetch < CACHE_TTL) return;
+		const cwd = getCwd();
+		if (!isBeadsProject(cwd)) return;
+		refreshing = true;
+		try {
+			const claimResult = await SubprocessRunner.run("bd", ["kv", "get", `claimed:${SESSION_KEY}`], { cwd });
+			const claimId = claimResult.code === 0 ? claimResult.stdout.trim() || null : null;
+
+			let status: string | null = null;
+			if (claimId) {
+				const showResult = await SubprocessRunner.run("bd", ["show", claimId, "--json"], { cwd });
+				if (showResult.code === 0) {
+					try { status = JSON.parse(showResult.stdout).status ?? null; } catch {}
+				}
+				if (status === "closed") {
+					await SubprocessRunner.run("bd", ["kv", "clear", `claimed:${SESSION_KEY}`], { cwd });
+					beadState = { claimId: null, shortId: null, status: null, openCount: beadState.openCount, lastFetch: Date.now() };
+					requestRender?.();
+					return;
+				}
+			}
+
+			let openCount = 0;
+			const listResult = await SubprocessRunner.run("bd", ["list"], { cwd });
+			if (listResult.code === 0) {
+				const m = listResult.stdout.match(/\((\d+)\s+open/);
+				if (m) openCount = parseInt(m[1], 10);
+			}
+
+			beadState = { claimId, shortId: claimId ? getShortId(claimId) : null, status, openCount, lastFetch: Date.now() };
+			requestRender?.();
+		} catch {}
+		finally { refreshing = false; }
+	};
+
+	const buildBeadChip = (): string => {
+		const { claimId, shortId, status, openCount } = beadState;
+		if (claimId && shortId && status) {
+			const icon = STATUS_ICONS[status] ?? "?";
+			const bg = STATUS_BG[status] ?? "\x1b[48;5;238m";
+			return `${bg}\x1b[38;5;15m bd:${shortId}${icon} \x1b[0m`;
+		}
+		if (openCount > 0) {
+			return `\x1b[48;5;238m\x1b[38;5;15m bd:${openCount}${STATUS_ICONS.open} \x1b[0m`;
+		}
+		return "";
+	};
 
 	pi.on("session_start", async (_event, ctx) => {
+		capturedCtx = ctx;
+
 		ctx.ui.setFooter((tui, theme, footerData) => {
+			requestRender = () => tui.requestRender();
 			const unsub = footerData.onBranchChange(() => tui.requestRender());
-			
+
 			return {
-				dispose() { unsub(); },
+				dispose() { unsub(); requestRender = null; },
 				invalidate() {},
 				render(width: number): string[] {
-					const brand = theme.fg("accent", "XTRM");
-					const turns = theme.fg("dim", `[Turn ${turnCount}]`);
+					refreshBeadState().catch(() => {});
+
+					const brand = "\x1b[1m" + theme.fg("accent", "XTRM") + "\x1b[22m";
 
 					const usage = ctx.getContextUsage();
 					const pct = usage?.percent ?? 0;
@@ -37,11 +125,13 @@ export default function (pi: ExtensionAPI) {
 					const modelStr = theme.fg("accent", modelId);
 
 					const sep = theme.fg("dim", " | ");
-					
-					// Layout: XTRM [Turn 1] | model | 10% | ⌂ dir | ⎇ branch
-					const leftParts = [`${brand} ${turns}`, modelStr, usageStr, cwdStr];
+
+					const leftParts = [brand, modelStr, usageStr, cwdStr];
 					if (branchStr) leftParts.push(branchStr);
-					
+
+					const beadChip = buildBeadChip();
+					if (beadChip) leftParts.push(beadChip);
+
 					const left = leftParts.join(sep);
 					return [truncateToWidth(left, width)];
 				},
@@ -49,13 +139,13 @@ export default function (pi: ExtensionAPI) {
 		});
 	});
 
-	pi.on("turn_start", async () => {
-		turnCount++;
-	});
-
-	pi.on("session_switch", async (event, _ctx) => {
-		if (event.reason === "new") {
-			turnCount = 0;
+	// Bust the bead cache immediately after any bd write so the chip reflects the new state
+	pi.on("tool_result", async (event: any) => {
+		const cmd = event?.input?.command;
+		if (cmd && /\bbd\s+(close|update|create|claim)\b/.test(cmd)) {
+			beadState.lastFetch = 0;
+			setTimeout(() => refreshBeadState().catch(() => {}), 200);
 		}
+		return undefined;
 	});
 }

package/package.json

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