xtrm-tools 2.4.4 → 2.4.6

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-cli",
-  "version": "2.4.4",
+  "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/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/settings.json.template

@@ -12,5 +12,5 @@
   ],
   "steeringMode": "all",
   "followUpMode": "all",
-  "hideThinkingBlock": false
+  "hideThinkingBlock": true
 }

package/hooks/branch-state.mjs

@@ -5,9 +5,7 @@
 // Output: { hookSpecificOutput: { additionalSystemPrompt } }
 
 import { execSync } from 'node:child_process';
-import { readFileSync, existsSync } from 'node:fs';
-import { join } from 'node:path';
-import { resolveSessionId } from './beads-gate-utils.mjs';
+import { readFileSync } from 'node:fs';
 
 function readInput() {
   try { return JSON.parse(readFileSync(0, 'utf-8')); } catch { return null; }
@@ -17,36 +15,25 @@ function getBranch(cwd) {
   try {
     return execSync('git branch --show-current', {
       encoding: 'utf8', cwd,
-      stdio: ['pipe', 'pipe', 'pipe'], timeout: 3000,
+      stdio: ['pipe', 'pipe', 'pipe'], timeout: 2000,
     }).trim() || null;
   } catch { return null; }
 }
 
-function getSessionClaim(sessionId, cwd) {
-  try {
-    const out = execSync(`bd kv get "claimed:${sessionId}"`, {
-      encoding: 'utf8', cwd,
-      stdio: ['pipe', 'pipe', 'pipe'], timeout: 3000,
-    }).trim();
-    return out || null;
-  } catch { return null; }
-}
+try {
+  const input = readInput();
+  if (!input) process.exit(0);
 
-const input = readInput();
-if (!input) process.exit(0);
+  const cwd = input.cwd || process.cwd();
+  const branch = getBranch(cwd);
 
-const cwd = input.cwd || process.cwd();
-const sessionId = resolveSessionId(input);
-const branch = getBranch(cwd);
-const isBeads = existsSync(join(cwd, '.beads'));
-const claim = isBeads && sessionId ? getSessionClaim(sessionId, cwd) : null;
+  if (!branch) process.exit(0);
 
-if (!branch && !claim) process.exit(0);
-
-const context = `[Context: branch=${branch ?? 'unknown'}${claim ? ', claim=' + claim : ''}]`;
-
-process.stdout.write(JSON.stringify({
-  hookSpecificOutput: { additionalSystemPrompt: context },
-}));
-process.stdout.write('\n');
-process.exit(0);
+  process.stdout.write(JSON.stringify({
+    hookSpecificOutput: { additionalSystemPrompt: `[Context: branch=${branch}]` },
+  }));
+  process.stdout.write('\n');
+  process.exit(0);
+} catch {
+  process.exit(0);
+}

package/package.json

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