xtrm-tools 2.1.21 → 2.1.23

package/cli/package.json

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

package/config/pi/extensions/beads.ts

@@ -2,7 +2,7 @@ import type { ExtensionAPI, ToolCallEvent, ToolResultEvent } from "@mariozechner
 import { isToolCallEventType, isBashToolResult } from "@mariozechner/pi-coding-agent";
 import * as path from "node:path";
 import * as fs from "node:fs";
-import { SubprocessRunner, EventAdapter, Logger } from "./core";
+import { SubprocessRunner, EventAdapter, Logger } from "./core/lib";
 
 const logger = new Logger({ namespace: "beads" });
 
@@ -16,24 +16,6 @@ export default function (pi: ExtensionAPI) {
 		return null;
 	};
 
-	const setSessionClaim = async (sessionId: string, issueId: string, cwd: string): Promise<boolean> => {
-		const result = await SubprocessRunner.run("bd", ["kv", "set", `claimed:${sessionId}`, issueId], { cwd });
-		return result.code === 0;
-	};
-
-	const clearSessionClaim = async (sessionId: string, cwd: string): Promise<boolean> => {
-		const result = await SubprocessRunner.run("bd", ["kv", "clear", `claimed:${sessionId}`], { cwd });
-		return result.code === 0;
-	};
-
-	const getInProgressSummary = async (cwd: string): Promise<string | null> => {
-		const result = await SubprocessRunner.run("bd", ["list", "--status=in_progress"], { cwd });
-		if (result.code === 0 && result.stdout.includes("Total:")) {
-			return result.stdout.trim();
-		}
-		return null;
-	};
-
 	const hasTrackableWork = async (cwd: string): Promise<boolean> => {
 		const result = await SubprocessRunner.run("bd", ["list"], { cwd });
 		if (result.code === 0 && result.stdout.includes("Total:")) {
@@ -47,83 +29,37 @@ export default function (pi: ExtensionAPI) {
 		return false;
 	};
 
-	// 0. Register Custom Commands
-	pi.registerCommand({
-		name: "claim",
-		description: "Claim a beads issue for this session",
-		async execute(args, ctx) {
-			const cwd = getCwd(ctx);
-			if (!isBeadsProject(cwd)) {
-				ctx.ui.notify("Not a beads project.", "error");
-				return;
-			}
-
-			const issueId = args[0];
-			if (!issueId) {
-				ctx.ui.notify("Usage: /claim <issue-id>", "warning");
-				return;
-			}
-
-			// Ensure issue is in_progress first
-			await SubprocessRunner.run("bd", ["update", issueId, "--status=in_progress"], { cwd });
-			
-			const ok = await setSessionClaim(ctx.sessionManager.sessionId, issueId, cwd);
-			if (ok) {
-				ctx.ui.notify(`Claimed issue: ${issueId}`, "info");
-			} else {
-				ctx.ui.notify(`Failed to claim issue: ${issueId}`, "error");
-			}
-		}
-	});
-
-	pi.registerCommand({
-		name: "unclaim",
-		description: "Clear the beads issue claim for this session",
-		async execute(_args, ctx) {
-			const cwd = getCwd(ctx);
-			if (!isBeadsProject(cwd)) return;
-
-			const ok = await clearSessionClaim(ctx.sessionManager.sessionId, cwd);
-			if (ok) {
-				ctx.ui.notify("Claim cleared.", "info");
-			}
-		}
-	});
-
-	// 1. Tool Call Interception (Edit Gate & Commit Gate)
 	pi.on("tool_call", async (event, ctx) => {
 		const cwd = getCwd(ctx);
 		if (!isBeadsProject(cwd)) return undefined;
 
 		const sessionId = ctx.sessionManager.sessionId;
 
-		// A. Edit Gate
 		if (EventAdapter.isMutatingFileTool(event)) {
 			const claim = await getSessionClaim(sessionId, cwd);
-			if (claim) return undefined;
-
-			const hasWork = await hasTrackableWork(cwd);
-			if (!hasWork) return undefined;
-
-			const reason = "No active issue claim for this session. Use `/claim <id>` to track your work.";
-			if (ctx.hasUI) {
-				ctx.ui.notify("Beads: Edit blocked. Claim an issue first.", "warning");
-			}
-			return { block: true, reason };
+			if (!claim) {
+			    const hasWork = await hasTrackableWork(cwd);
+			    if (hasWork) {
+			        if (ctx.hasUI) {
+				        ctx.ui.notify("Beads: Edit blocked. Claim an issue first.", "warning");
+			        }
+			        return {
+                        block: true,
+                        reason: `No active issue claim for this session (${sessionId}).\n  bd update <id> --claim\n  bd kv set "claimed:${sessionId}" "<id>"`,
+                    };
+                }
+            }
 		}
 
-		// B. Commit Gate
 		if (isToolCallEventType("bash", event)) {
 			const command = event.input.command;
-			if (/\bgit\s+commit\b/.test(command)) {
-				const claim = await getSessionClaim(sessionId, cwd);
+			if (command && /\bgit\s+commit\b/.test(command)) {
+                const claim = await getSessionClaim(sessionId, cwd);
 				if (claim) {
-					const inProgress = await getInProgressSummary(cwd);
-					const reason = `Resolve open claim [${claim}] before committing. Use \`bd close ${claim}\` first.\n\n${inProgress || ""}`;
-					if (ctx.hasUI) {
-						ctx.ui.notify("Beads: Commit blocked. Close active claim first.", "warning");
-					}
-					return { block: true, reason };
+					return {
+                        block: true,
+                        reason: `Resolve open claim [${claim}] before committing.`,
+                    };
 				}
 			}
 		}
@@ -131,55 +67,28 @@ export default function (pi: ExtensionAPI) {
 		return undefined;
 	});
 
-	// 2. Tool Result Interception (Memory Gate)
 	pi.on("tool_result", async (event, ctx) => {
-		const cwd = getCwd(ctx);
-		if (!isBeadsProject(cwd)) return undefined;
-
 		if (isBashToolResult(event)) {
 			const command = event.input.command;
-			// Also clear claim on bd close
-			if (/\bbd\s+close\b/.test(command) && !event.isError) {
-				await clearSessionClaim(ctx.sessionManager.sessionId, cwd);
 
+			if (command && /\bbd\s+update\b/.test(command) && /--claim\b/.test(command) && !event.isError) {
+				const issueMatch = command.match(/\bbd\s+update\s+(\S+)/);
+				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.`;
+					return { content: [...event.content, { type: "text", text: claimNotice }] };
+				}
+			}
+
+			if (command && /\bbd\s+close\b/.test(command) && !event.isError) {
 				const reminder = "\n\n**Beads Insight**: Work completed. Consider if this session produced insights worth persisting via `bd remember`.";
-				const newContent = [...event.content];
-				newContent.push({ type: "text", text: reminder });
+				const newContent = [...event.content, { type: "text", text: reminder }];
 				return { content: newContent };
 			}
 		}
 		return undefined;
 	});
-
-	// 3. Compaction Support
-	pi.on("session_before_compact", async (event, ctx) => {
-		const cwd = getCwd(ctx);
-		if (!isBeadsProject(cwd)) return undefined;
-
-		const sessionId = ctx.sessionManager.sessionId;
-		const claim = await getSessionClaim(sessionId, cwd);
-
-		if (claim) {
-			return {
-				compaction: {
-					summary: (event.compaction?.summary || "") + `\n\nActive Beads Claim: ${claim}`,
-					firstKeptEntryId: event.preparation.firstKeptEntryId,
-				}
-			};
-		}
-		return undefined;
-	});
-
-	// 4. Shutdown Warning
-	pi.on("session_shutdown", async (_event, ctx) => {
-		const cwd = getCwd(ctx);
-		if (!isBeadsProject(cwd)) return;
-
-		const sessionId = ctx.sessionManager.sessionId;
-		const claim = await getSessionClaim(sessionId, cwd);
-
-		if (claim && ctx.hasUI) {
-			ctx.ui.notify(`Warning: Exiting with active Beads claim [${claim}].`, "warning");
-		}
-	});
 }

package/config/pi/extensions/main-guard-post-push.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ToolResultEvent } from "@mariozechner/pi-coding-agent";
 import { isBashToolResult } from "@mariozechner/pi-coding-agent";
-import { SubprocessRunner, Logger } from "./core";
+import { SubprocessRunner, Logger } from "./core/lib";
 
 const logger = new Logger({ namespace: "main-guard-post-push" });
 

package/config/pi/extensions/main-guard.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ToolCallEvent } from "@mariozechner/pi-coding-agent";
 import { isToolCallEventType } from "@mariozechner/pi-coding-agent";
-import { SubprocessRunner, EventAdapter, Logger } from "./core";
+import { SubprocessRunner, EventAdapter, Logger } from "./core/lib";
 
 const logger = new Logger({ namespace: "main-guard" });
 

package/config/pi/extensions/quality-gates.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAPI, ToolResultEvent } from "@mariozechner/pi-coding-agent";
-import { SubprocessRunner, EventAdapter, Logger } from "./core";
+import { SubprocessRunner, EventAdapter, Logger } from "./core/lib";
 import * as path from "node:path";
 import * as fs from "node:fs";
 

package/config/pi/extensions/service-skills.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ToolCallEvent, ToolResultEvent } from "@mariozechner/pi-coding-agent";
 import { isToolCallEventType, isBashToolResult } from "@mariozechner/pi-coding-agent";
-import { SubprocessRunner, Logger } from "./core";
+import { SubprocessRunner, Logger } from "./core/lib";
 import * as path from "node:path";
 import * as fs from "node:fs";
 

package/config/pi/extensions/xtrm-loader.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { Logger } from "./core";
+import { Logger } from "./core/lib";
 
 const logger = new Logger({ namespace: "xtrm-loader" });
 

package/package.json

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