xtrm-tools 2.1.23 → 2.1.25

package/cli/package.json

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

package/config/pi/extensions/beads.ts

@@ -71,7 +71,9 @@ export default function (pi: ExtensionAPI) {
 		if (isBashToolResult(event)) {
 			const command = event.input.command;
 
-			if (command && /\bbd\s+update\b/.test(command) && /--claim\b/.test(command) && !event.isError) {
+			// 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.
+			if (command && /\bbd\s+update\b/.test(command) && /--claim\b/.test(command)) {
 				const issueMatch = command.match(/\bbd\s+update\s+(\S+)/);
 				if (issueMatch) {
 					const issueId = issueMatch[1];

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

@@ -7,19 +7,99 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { truncateToWidth } from "@mariozechner/pi-tui";
 
-export default function (pi: ExtensionAPI) {
-	let turnCount = 0;
+import * as path from "node:path";
+import * as fs from "node:fs";
+import { SubprocessRunner } from "./core/lib";
 
+export default function (pi: ExtensionAPI) {
 	pi.on("session_start", async (_event, ctx) => {
+		const getCwd = () => (ctx as any).cwd || process.cwd();
+		const isBeadsProject = (cwd: string) => fs.existsSync(path.join(cwd, ".beads"));
+		const getShortId = (id: string) => id.split("-").pop() ?? id;
+
+		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",
+		};
+
+		interface BeadState {
+			claimId: string | null;
+			shortId: string | null;
+			status: string | null;
+			openCount: number;
+			lastFetch: number;
+		}
+
+		let beadState: BeadState = { claimId: null, shortId: null, status: null, openCount: 0, lastFetch: 0 };
+		let refreshing = false;
+		const CACHE_TTL = 5000;
+
+		const refreshBeadState = async () => {
+			if (refreshing || Date.now() - beadState.lastFetch < CACHE_TTL) return;
+			const cwd = getCwd();
+			if (!isBeadsProject(cwd)) return;
+			refreshing = true;
+			try {
+				const sessionId = ctx.sessionManager.sessionId;
+
+				const claimResult = await SubprocessRunner.run("bd", ["kv", "get", `claimed:${sessionId}`], { 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:${sessionId}`], { cwd });
+						beadState = { claimId: null, shortId: null, status: null, openCount: beadState.openCount, lastFetch: Date.now() };
+						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() };
+			} 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 "";
+		};
+
 		ctx.ui.setFooter((tui, theme, footerData) => {
 			const unsub = footerData.onBranchChange(() => tui.requestRender());
-			
+
 			return {
 				dispose() { unsub(); },
 				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,25 +117,18 @@ 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];
+
+					// Layout: XTRM | model | 10% | ⌂ dir | ⎇ branch | bd:xxx◐
+					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)];
 				},
 			};
 		});
 	});
-
-	pi.on("turn_start", async () => {
-		turnCount++;
-	});
-
-	pi.on("session_switch", async (event, _ctx) => {
-		if (event.reason === "new") {
-			turnCount = 0;
-		}
-	});
 }

package/package.json

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