xtrm-tools 2.4.3 → 2.4.6

package/cli/package.json

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

package/config/hooks.json

@@ -16,16 +16,6 @@
       }
     ],
     "PreToolUse": [
-      {
-        "matcher": "Write|Edit|MultiEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
-        "script": "main-guard.mjs",
-        "timeout": 5000
-      },
-      {
-        "matcher": "Bash",
-        "script": "main-guard.mjs",
-        "timeout": 5000
-      },
       {
         "matcher": "Edit|Write|MultiEdit|NotebookEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "script": "beads-edit-gate.mjs",
@@ -43,11 +33,6 @@
         "script": "beads-claim-sync.mjs",
         "timeout": 5000
       },
-      {
-        "matcher": "Bash",
-        "script": "main-guard-post-push.mjs",
-        "timeout": 5000
-      },
       {
         "matcher": "Write|Edit|MultiEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
         "script": "quality-check.cjs",

package/config/pi/extensions/beads.ts

@@ -78,7 +78,7 @@ export default function (pi: ExtensionAPI) {
 					if (inProgress) {
 						return {
 							block: true,
-							reason: `Active claim [${claim}] — close it first.\n  bd close ${claim}\n  git push -u origin <feature-branch>\n  gh pr create --fill && gh pr merge --squash\n`,
+							reason: `Active claim [${claim}] — close it first.\n  bd close ${claim}\n  (Pi workflow) publish/merge are external steps; do not rely on xtrm finish.\n`,
 						};
 					}
 				}

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

@@ -16,6 +16,7 @@ export const PI_MUTATING_FILE_TOOLS = [
 ];
 
 export const SAFE_BASH_PREFIXES = [
+	// Git read-only
 	"git status",
 	"git log",
 	"git diff",
@@ -30,10 +31,41 @@ export const SAFE_BASH_PREFIXES = [
 	"git worktree",
 	"git checkout -b",
 	"git switch -c",
+	// Tools
 	"gh",
 	"bd",
-	"touch .beads/",
 	"npx gitnexus",
+	"xtrm finish",
+	// Read-only filesystem
+	"cat",
+	"ls",
+	"head",
+	"tail",
+	"pwd",
+	"which",
+	"type",
+	"env",
+	"printenv",
+	"find",
+	"grep",
+	"rg",
+	"fd",
+	"wc",
+	"sort",
+	"uniq",
+	"cut",
+	"awk",
+	"jq",
+	"yq",
+	"bat",
+	"less",
+	"more",
+	"file",
+	"stat",
+	"du",
+	"tree",
+	// Allowed writes (specific paths)
+	"touch .beads/",
 ];
 
 export const DANGEROUS_BASH_PATTERNS = [
@@ -67,4 +99,4 @@ export const DANGEROUS_BASH_PATTERNS = [
 	"(?:^|\\s)python\\s+-c\\b",
 	"(?:^|\\s)perl\\s+-e\\b",
 	"(?:^|\\s)ruby\\s+-e\\b",
-];
+];

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

@@ -132,14 +132,14 @@ export default function (pi: ExtensionAPI) {
 					const modelId = ctx.model?.id || "no-model";
 					const modelChip = chip(modelId);
 
-					const sep = theme.fg("dim", " | ");
+					const sep = " ";
 
 					const brandModel = `${brand} ${modelChip}`;
-					const leftParts = [brandModel, usageStr, cwdStr];
-					
 					const beadChip = buildBeadChip();
-					const branchWithChip = branchStr ? `${branchStr} ${beadChip}`.trim() : beadChip;
-					if (branchWithChip) leftParts.push(branchWithChip);
+					const leftParts = [brandModel, usageStr];
+					if (beadChip) leftParts.push(beadChip);
+					leftParts.push(cwdStr);
+					if (branchStr) leftParts.push(branchStr);
 
 					const left = leftParts.join(sep);
 					return [truncateToWidth(left, width)];

package/config/pi/extensions/minimal-mode.ts

@@ -0,0 +1,201 @@
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import {
+	createBashTool,
+	createEditTool,
+	createFindTool,
+	createGrepTool,
+	createLsTool,
+	createReadTool,
+	createWriteTool,
+} from "@mariozechner/pi-coding-agent";
+import { Text } from "@mariozechner/pi-tui";
+
+function getTextContent(result: any): string {
+	if (!result?.content || !Array.isArray(result.content)) return "";
+	return result.content
+		.filter((c: any) => c?.type === "text" && typeof c.text === "string")
+		.map((c: any) => c.text)
+		.join("\n")
+		.trim();
+}
+
+function oneLine(s: string): string {
+	return (s || "").replace(/\s+/g, " ").trim();
+}
+
+function summarize(result: any): { text: string; isError: boolean } {
+	const raw = getTextContent(result);
+	if (!raw) return { text: "done", isError: false };
+	const line = oneLine(raw.split("\n").find((l) => l.trim()) || "");
+	const lower = line.toLowerCase();
+	const isError = lower.includes("error") || lower.includes("failed") || lower.includes("exception");
+	return { text: line.slice(0, 140) || "done", isError };
+}
+
+const toolCache = new Map<string, ReturnType<typeof createBuiltInTools>>();
+function createBuiltInTools(cwd: string) {
+	return {
+		read: createReadTool(cwd),
+		bash: createBashTool(cwd),
+		edit: createEditTool(cwd),
+		write: createWriteTool(cwd),
+		find: createFindTool(cwd),
+		grep: createGrepTool(cwd),
+		ls: createLsTool(cwd),
+	};
+}
+function getBuiltInTools(cwd: string) {
+	let tools = toolCache.get(cwd);
+	if (!tools) {
+		tools = createBuiltInTools(cwd);
+		toolCache.set(cwd, tools);
+	}
+	return tools;
+}
+
+export default function (pi: ExtensionAPI) {
+	let minimalEnabled = true;
+	let thinkingStatusEnabled = true;
+	let spinnerTimer: NodeJS.Timeout | null = null;
+	let spinnerIndex = 0;
+	const frames = ["thinking   ", "thinking.  ", "thinking.. ", "thinking..."];
+
+	const clearSpinner = (ctx: any) => {
+		if (spinnerTimer) {
+			clearInterval(spinnerTimer);
+			spinnerTimer = null;
+		}
+		if (ctx?.hasUI) {
+			ctx.ui.setStatus("thinking", undefined);
+			ctx.ui.setHeader(undefined);
+		}
+	};
+
+	const mountThinkingHeader = (ctx: any) => {
+		if (!ctx?.hasUI) return;
+		ctx.ui.setHeader((_tui: any, theme: any) => ({
+			invalidate() {},
+			render(width: number): string[] {
+				const text = frames[spinnerIndex];
+				return [oneLine(theme.fg("accent", text)).slice(0, width)];
+			},
+		}));
+	};
+
+	const startSpinner = (ctx: any) => {
+		if (!thinkingStatusEnabled || !ctx?.hasUI) return;
+		clearSpinner(ctx);
+		spinnerIndex = 0;
+		ctx.ui.setStatus("thinking", frames[spinnerIndex]);
+		mountThinkingHeader(ctx);
+		spinnerTimer = setInterval(() => {
+			spinnerIndex = (spinnerIndex + 1) % frames.length;
+			ctx.ui.setStatus("thinking", frames[spinnerIndex]);
+			mountThinkingHeader(ctx);
+		}, 220);
+	};
+
+	const renderCollapsedResult = (result: any, theme: any) => {
+		const s = summarize(result);
+		const icon = s.isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
+		const text = s.isError ? theme.fg("error", s.text) : theme.fg("muted", s.text);
+		if (minimalEnabled) return new Text(` ${icon} ${text}`, 0, 0);
+		return new Text(theme.fg("muted", ` → ${s.text}`), 0, 0);
+	};
+
+	const renderExpandedResult = (result: any, theme: any) => {
+		const text = getTextContent(result);
+		if (!text) return new Text("", 0, 0);
+		const output = text.split("\n").map((line) => theme.fg("toolOutput", line)).join("\n");
+		return new Text(`\n${output}`, 0, 0);
+	};
+
+	pi.registerTool({
+		name: "bash",
+		label: "bash",
+		description: getBuiltInTools(process.cwd()).bash.description,
+		parameters: getBuiltInTools(process.cwd()).bash.parameters,
+		async execute(toolCallId, params, signal, onUpdate, ctx) {
+			return getBuiltInTools(ctx.cwd).bash.execute(toolCallId, params, signal, onUpdate);
+		},
+		renderCall(args, theme) {
+			const cmd = oneLine(args.command || "");
+			return new Text(`${theme.fg("toolTitle", theme.bold("bash"))}(${theme.fg("accent", cmd || "...")})`, 0, 0);
+		},
+		renderResult(result, { expanded }, theme) {
+			return expanded ? renderExpandedResult(result, theme) : renderCollapsedResult(result, theme);
+		},
+	});
+
+	for (const name of ["read", "write", "edit", "find", "grep", "ls"] as const) {
+		pi.registerTool({
+			name,
+			label: name,
+			description: (getBuiltInTools(process.cwd()) as any)[name].description,
+			parameters: (getBuiltInTools(process.cwd()) as any)[name].parameters,
+			async execute(toolCallId, params, signal, onUpdate, ctx) {
+				return (getBuiltInTools(ctx.cwd) as any)[name].execute(toolCallId, params, signal, onUpdate);
+			},
+			renderCall(args, theme) {
+				const suffix = oneLine(args.path || args.pattern || "");
+				return new Text(`${theme.fg("toolTitle", theme.bold(name))}${suffix ? `(${theme.fg("accent", suffix)})` : ""}`, 0, 0);
+			},
+			renderResult(result, { expanded }, theme) {
+				return expanded ? renderExpandedResult(result, theme) : renderCollapsedResult(result, theme);
+			},
+		});
+	}
+
+	pi.registerCommand("minimal-on", {
+		description: "Enable minimal collapsed tool output",
+		handler: async (_args, ctx) => {
+			minimalEnabled = true;
+			ctx.ui.notify("Minimal mode enabled", "info");
+		},
+	});
+
+	pi.registerCommand("minimal-off", {
+		description: "Disable minimal collapsed tool output",
+		handler: async (_args, ctx) => {
+			minimalEnabled = false;
+			ctx.ui.notify("Minimal mode disabled", "info");
+		},
+	});
+
+	pi.registerCommand("minimal-toggle", {
+		description: "Toggle minimal collapsed tool output",
+		handler: async (_args, ctx) => {
+			minimalEnabled = !minimalEnabled;
+			ctx.ui.notify(`Minimal mode ${minimalEnabled ? "enabled" : "disabled"}`, "info");
+		},
+	});
+
+	pi.registerCommand("thinking-status-toggle", {
+		description: "Toggle flashing thinking status indicator",
+		handler: async (_args, ctx) => {
+			thinkingStatusEnabled = !thinkingStatusEnabled;
+			if (!thinkingStatusEnabled) clearSpinner(ctx);
+			ctx.ui.notify(`Thinking status ${thinkingStatusEnabled ? "enabled" : "disabled"}`, "info");
+		},
+	});
+
+	pi.on("turn_start", async (_event, ctx) => {
+		startSpinner(ctx);
+		return undefined;
+	});
+
+	pi.on("turn_end", async (_event, ctx) => {
+		clearSpinner(ctx);
+		return undefined;
+	});
+
+	pi.on("agent_end", async (_event, ctx) => {
+		clearSpinner(ctx);
+		return undefined;
+	});
+
+	pi.on("session_shutdown", async (_event, ctx) => {
+		clearSpinner(ctx);
+		return undefined;
+	});
+}

package/config/pi/extensions/plan-mode/index.ts

@@ -16,7 +16,17 @@ import type { AgentMessage } from "@mariozechner/pi-agent-core";
 import type { AssistantMessage, TextContent } from "@mariozechner/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { Key } from "@mariozechner/pi-tui";
-import { extractTodoItems, isSafeCommand, markCompletedSteps, type TodoItem } from "./utils.js";
+import {
+	extractTodoItems,
+	isSafeCommand,
+	markCompletedSteps,
+	type TodoItem,
+	getShortId,
+	isBeadsProject,
+	deriveEpicTitle,
+	createPlanIssues,
+	bdClaim,
+} from "./utils.js";
 
 // Tools
 const PLAN_MODE_TOOLS = ["read", "bash", "grep", "find", "ls", "questionnaire"];
@@ -39,6 +49,8 @@ export default function planModeExtension(pi: ExtensionAPI): void {
 	let planModeEnabled = false;
 	let executionMode = false;
 	let todoItems: TodoItem[] = [];
+	let epicId: string | null = null;
+	let issueIds: Map<number, string> = new Map(); // step -> issue ID
 
 	pi.registerFlag("plan", {
 		description: "Start in plan mode (read-only exploration)",
@@ -57,15 +69,17 @@ export default function planModeExtension(pi: ExtensionAPI): void {
 			ctx.ui.setStatus("plan-mode", undefined);
 		}
 
-		// Widget showing todo list
+		// Widget showing todo list with bd issue IDs
 		if (executionMode && todoItems.length > 0) {
 			const lines = todoItems.map((item) => {
+				const issueId = issueIds.get(item.step);
+				const idLabel = issueId ? `[${getShortId(issueId)}] ` : "";
 				if (item.completed) {
 					return (
-						ctx.ui.theme.fg("success", "☑ ") + ctx.ui.theme.fg("muted", ctx.ui.theme.strikethrough(item.text))
+						ctx.ui.theme.fg("success", "☑ ") + ctx.ui.theme.fg("muted", ctx.ui.theme.strikethrough(`${idLabel}${item.text}`))
 					);
 				}
-				return `${ctx.ui.theme.fg("muted", "☐ ")}${item.text}`;
+				return `${ctx.ui.theme.fg("muted", "☐ ")}${idLabel}${item.text}`;
 			});
 			ctx.ui.setWidget("plan-todos", lines);
 		} else {
@@ -77,6 +91,8 @@ export default function planModeExtension(pi: ExtensionAPI): void {
 		planModeEnabled = !planModeEnabled;
 		executionMode = false;
 		todoItems = [];
+		epicId = null;
+		issueIds.clear();
 
 		if (planModeEnabled) {
 			pi.setActiveTools(PLAN_MODE_TOOLS);
@@ -93,6 +109,8 @@ export default function planModeExtension(pi: ExtensionAPI): void {
 			enabled: planModeEnabled,
 			todos: todoItems,
 			executing: executionMode,
+			epicId,
+			issueIds: Object.fromEntries(issueIds),
 		});
 	}
 
@@ -108,7 +126,11 @@ export default function planModeExtension(pi: ExtensionAPI): void {
 				ctx.ui.notify("No todos. Create a plan first with /plan", "info");
 				return;
 			}
-			const list = todoItems.map((item, i) => `${i + 1}. ${item.completed ? "✓" : "○"} ${item.text}`).join("\n");
+			const list = todoItems.map((item, i) => {
+				const issueId = issueIds.get(item.step);
+				const idLabel = issueId ? `[${getShortId(issueId)}] ` : "";
+				return `${i + 1}. ${item.completed ? "✓" : "○"} ${idLabel}${item.text}`;
+			}).join("\n");
 			ctx.ui.notify(`Plan Progress:\n${list}`, "info");
 		},
 	});
@@ -187,7 +209,11 @@ Do NOT attempt to make changes - just describe what you would do.`,
 
 		if (executionMode && todoItems.length > 0) {
 			const remaining = todoItems.filter((t) => !t.completed);
-			const todoList = remaining.map((t) => `${t.step}. ${t.text}`).join("\n");
+			const todoList = remaining.map((t) => {
+				const issueId = issueIds.get(t.step);
+				const idLabel = issueId ? `[${getShortId(issueId)}] ` : "";
+				return `${t.step}. ${idLabel}${t.text}`;
+			}).join("\n");
 			return {
 				message: {
 					customType: "plan-execution-context",
@@ -221,13 +247,19 @@ After completing a step, include a [DONE:n] tag in your response.`,
 		// Check if execution is complete
 		if (executionMode && todoItems.length > 0) {
 			if (todoItems.every((t) => t.completed)) {
-				const completedList = todoItems.map((t) => `~~${t.text}~~`).join("\n");
+				const completedList = todoItems.map((t) => {
+					const issueId = issueIds.get(t.step);
+					const idLabel = issueId ? `[${getShortId(issueId)}] ` : "";
+					return `~~${idLabel}${t.text}~~`;
+				}).join("\n");
 				pi.sendMessage(
 					{ customType: "plan-complete", content: `**Plan Complete!** ✓\n\n${completedList}`, display: true },
 					{ triggerTurn: false },
 				);
 				executionMode = false;
 				todoItems = [];
+				epicId = null;
+				issueIds.clear();
 				pi.setActiveTools(NORMAL_MODE_TOOLS);
 				updateStatus(ctx);
 				persistState(); // Save cleared state so resume doesn't restore old execution mode
@@ -246,31 +278,72 @@ After completing a step, include a [DONE:n] tag in your response.`,
 			}
 		}
 
-		// Show plan steps and prompt for next action
+		// Auto-create epic + issues if in a beads project
+		const cwd = ctx.cwd || process.cwd();
+		if (todoItems.length > 0 && isBeadsProject(cwd) && !epicId) {
+			// Derive epic title from user prompt or first step
+			const epicTitle = deriveEpicTitle(event.messages);
+			
+			ctx.ui.notify("Creating epic and issues in bd...", "info");
+			const result = await createPlanIssues(epicTitle, todoItems, cwd);
+			
+			if (result) {
+				epicId = result.epic.id;
+				for (const issue of result.issues) {
+					// Match issue to todo by title similarity
+					const matchingTodo = todoItems.find(t => 
+						issue.title.toLowerCase().includes(t.text.toLowerCase().slice(0, 30)) ||
+						t.text.toLowerCase().includes(issue.title.toLowerCase().slice(0, 30))
+					);
+					if (matchingTodo) {
+						issueIds.set(matchingTodo.step, issue.id);
+					}
+				}
+				ctx.ui.notify(`Created epic ${getShortId(epicId)} with ${result.issues.length} issues`, "info");
+			}
+		}
+
+		// Show plan steps with bd issue IDs
 		if (todoItems.length > 0) {
-			const todoListText = todoItems.map((t, i) => `${i + 1}. ☐ ${t.text}`).join("\n");
+			const todoListText = todoItems.map((t, i) => {
+				const issueId = issueIds.get(t.step);
+				const idLabel = issueId ? `[${getShortId(issueId)}] ` : "";
+				return `${i + 1}. ☐ ${idLabel}${t.text}`;
+			}).join("\n");
+			
+			const epicLabel = epicId ? `\n\nEpic: ${getShortId(epicId)}` : "";
 			pi.sendMessage(
 				{
 					customType: "plan-todo-list",
-					content: `**Plan Steps (${todoItems.length}):**\n\n${todoListText}`,
+					content: `**Plan Steps (${todoItems.length}):**${epicLabel}\n\n${todoListText}`,
 					display: true,
 				},
 				{ triggerTurn: false },
 			);
 		}
 
-		const choice = await ctx.ui.select("Plan mode - what next?", [
-			todoItems.length > 0 ? "Execute the plan (track progress)" : "Execute the plan",
+		// Show "Start implementation?" prompt (no approval dialog for issue creation)
+		const choice = await ctx.ui.select("Start implementation?", [
+			todoItems.length > 0 ? "Yes, start with first step" : "Yes",
 			"Stay in plan mode",
 			"Refine the plan",
 		]);
 
-		if (choice?.startsWith("Execute")) {
+		if (choice?.startsWith("Yes")) {
+			// Auto-exit plan mode and start execution
 			planModeEnabled = false;
 			executionMode = todoItems.length > 0;
 			pi.setActiveTools(NORMAL_MODE_TOOLS);
 			updateStatus(ctx);
 
+			// Auto-claim first issue if available
+			if (todoItems.length > 0 && issueIds.size > 0) {
+				const firstIssueId = issueIds.get(todoItems[0].step);
+				if (firstIssueId) {
+					await bdClaim(firstIssueId, cwd);
+				}
+			}
+
 			const execMessage =
 				todoItems.length > 0
 					? `Execute the plan. Start with: ${todoItems[0].text}`
@@ -298,12 +371,16 @@ After completing a step, include a [DONE:n] tag in your response.`,
 		// Restore persisted state
 		const planModeEntry = entries
 			.filter((e: { type: string; customType?: string }) => e.type === "custom" && e.customType === "plan-mode")
-			.pop() as { data?: { enabled: boolean; todos?: TodoItem[]; executing?: boolean } } | undefined;
+			.pop() as { data?: { enabled: boolean; todos?: TodoItem[]; executing?: boolean; epicId?: string; issueIds?: Record<number, string> } } | undefined;
 
 		if (planModeEntry?.data) {
 			planModeEnabled = planModeEntry.data.enabled ?? planModeEnabled;
 			todoItems = planModeEntry.data.todos ?? todoItems;
 			executionMode = planModeEntry.data.executing ?? executionMode;
+			epicId = planModeEntry.data.epicId ?? null;
+			if (planModeEntry.data.issueIds) {
+				issueIds = new Map(Object.entries(planModeEntry.data.issueIds).map(([k, v]) => [Number(k), v]));
+			}
 		}
 
 		// On resume: re-scan messages to rebuild completion state

package/config/pi/extensions/plan-mode/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@xtrm/pi-plan-mode",
+  "version": "1.0.0",
+  "description": "Plan mode extension for Pi - read-only exploration with plan extraction and bd integration",
+  "type": "module",
+  "exports": {
+    ".": "./index.ts"
+  },
+  "keywords": ["pi", "extension", "plan-mode", "xtrm"],
+  "author": "xtrm",
+  "license": "MIT"
+}