xtrm-tools 2.1.26 → 2.1.29

package/cli/package.json

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

package/config/hooks.json

@@ -36,6 +36,11 @@
       }
     ],
     "PostToolUse": [
+      {
+        "matcher": "Bash",
+        "script": "beads-claim-sync.mjs",
+        "timeout": 5000
+      },
       {
         "matcher": "Bash",
         "script": "main-guard-post-push.mjs",

package/config/instructions/agents-top.md

@@ -0,0 +1,30 @@
+# XTRM Agent Workflow (Short)
+
+This file is an **agent operating manual** (not a project overview).
+
+1. **Start with scope**
+   - Clarify task intent if ambiguous.
+   - Prefer semantic discovery (Serena + GitNexus) over broad grep-first exploration.
+
+2. **Track work in `bd`**
+   - Use `bd ready --json` / `bd update <id> --claim --json` before edits.
+   - Create discovered follow-ups with `--deps discovered-from:<id>`.
+
+3. **Branch per issue (strict)**
+   - Create a **new branch for each issue** from latest `main`.
+   - Do **not** continue new work on a previously used branch.
+   - Branch format: `feature/<issue-id>-<short-description>` (or `fix/...`, `chore/...`).
+
+4. **Edit safely**
+   - Use Serena symbol tools for code changes when possible.
+   - Run GitNexus impact checks before symbol changes and detect-changes before commit.
+
+5. **PR merge + return to main**
+   - Always merge via PR (squash merge preferred).
+   - After merge: switch to `main` and sync (`git reset --hard origin/main`).
+   - Delete merged branch locally and remotely (`git branch -d <branch>` and `git push origin --delete <branch>`).
+
+6. **Before finishing**
+   - Run relevant tests/linters.
+   - Close/update bead state.
+   - Ensure changes are committed and pushed.

package/config/instructions/claude-top.md

@@ -0,0 +1,30 @@
+# XTRM Agent Workflow (Short)
+
+This file is an **agent operating manual** (not a project overview).
+
+1. **Start with scope**
+   - Clarify task intent if ambiguous.
+   - Prefer semantic discovery (Serena + GitNexus) over broad grep-first exploration.
+
+2. **Track work in `bd`**
+   - Use `bd ready --json` / `bd update <id> --claim --json` before edits.
+   - Create discovered follow-ups with `--deps discovered-from:<id>`.
+
+3. **Branch per issue (strict)**
+   - Create a **new branch for each issue** from latest `main`.
+   - Do **not** continue new work on a previously used branch.
+   - Branch format: `feature/<issue-id>-<short-description>` (or `fix/...`, `chore/...`).
+
+4. **Edit safely**
+   - Use Serena symbol tools for code changes when possible.
+   - Run GitNexus impact checks before symbol changes and detect-changes before commit.
+
+5. **PR merge + return to main**
+   - Always merge via PR (squash merge preferred).
+   - After merge: switch to `main` and sync (`git reset --hard origin/main`).
+   - Delete merged branch locally and remotely (`git branch -d <branch>` and `git push origin --delete <branch>`).
+
+6. **Before finishing**
+   - Run relevant tests/linters.
+   - Close/update bead state.
+   - Ensure changes are committed and pushed.

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

@@ -1,7 +1,7 @@
 /**
  * XTRM Custom Footer Extension
  *
- * Displays: XTRM brand, Turn count, Model, Context%, CWD, Git branch
+ * Displays: XTRM brand, Model, Context%, CWD, Git branch, Beads chip
  */
 
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
@@ -12,9 +12,6 @@ import * as fs from "node:fs";
 import { SubprocessRunner } from "./core/lib";
 
 export default function (pi: ExtensionAPI) {
-	// 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;
@@ -31,11 +28,12 @@ export default function (pi: ExtensionAPI) {
 	};
 	const STATUS_BG: Record<string, string> = {
 		open: "\x1b[48;5;238m",
-		in_progress: "\x1b[48;5;28m",
+		in_progress: "\x1b[48;5;39m",
 		blocked: "\x1b[48;5;88m",
 	};
 
 	let capturedCtx: any = null;
+	let sessionId: string = "";
 	let beadState: BeadState = { claimId: null, shortId: null, status: null, openCount: 0, lastFetch: 0 };
 	let refreshing = false;
 	let requestRender: (() => void) | null = null;
@@ -49,19 +47,20 @@ export default function (pi: ExtensionAPI) {
 		if (refreshing || Date.now() - beadState.lastFetch < CACHE_TTL) return;
 		const cwd = getCwd();
 		if (!isBeadsProject(cwd)) return;
+		if (!sessionId) return;
 		refreshing = true;
 		try {
-			const claimResult = await SubprocessRunner.run("bd", ["kv", "get", `claimed:${SESSION_KEY}`], { cwd });
+			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 {}
+					try { status = JSON.parse(showResult.stdout)[0]?.status ?? null; } catch {}
 				}
 				if (status === "closed") {
-					await SubprocessRunner.run("bd", ["kv", "clear", `claimed:${SESSION_KEY}`], { cwd });
+					await SubprocessRunner.run("bd", ["kv", "clear", `claimed:${sessionId}`], { cwd });
 					beadState = { claimId: null, shortId: null, status: null, openCount: beadState.openCount, lastFetch: Date.now() };
 					requestRender?.();
 					return;
@@ -96,6 +95,8 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("session_start", async (_event, ctx) => {
 		capturedCtx = ctx;
+		// Get session ID from sessionManager (UUID, consistent with hooks)
+		sessionId = ctx.sessionManager?.getSessionId?.() ?? process.pid.toString();
 
 		ctx.ui.setFooter((tui, theme, footerData) => {
 			requestRender = () => tui.requestRender();
@@ -122,15 +123,16 @@ export default function (pi: ExtensionAPI) {
 					const branchStr = branch ? theme.fg("accent", `⎇ ${branch}`) : "";
 
 					const modelId = ctx.model?.id || "no-model";
-					const modelStr = theme.fg("accent", modelId);
+					const modelChip = `\x1b[48;5;238m\x1b[38;5;15m ${modelId} \x1b[0m`;
 
 					const sep = theme.fg("dim", " | ");
 
-					const leftParts = [brand, modelStr, usageStr, cwdStr];
-					if (branchStr) leftParts.push(branchStr);
-
+					const brandModel = `${brand} ${modelChip}`;
+					const leftParts = [brandModel, usageStr, cwdStr];
+					
 					const beadChip = buildBeadChip();
-					if (beadChip) leftParts.push(beadChip);
+					const branchWithChip = branchStr ? `${branchStr} ${beadChip}`.trim() : beadChip;
+					if (branchWithChip) leftParts.push(branchWithChip);
 
 					const left = leftParts.join(sep);
 					return [truncateToWidth(left, width)];
@@ -139,7 +141,7 @@ export default function (pi: ExtensionAPI) {
 		});
 	});
 
-	// Bust the bead cache immediately after any bd write so the chip reflects the new state
+	// Bust the bead cache immediately after any bd write
 	pi.on("tool_result", async (event: any) => {
 		const cmd = event?.input?.command;
 		if (cmd && /\bbd\s+(close|update|create|claim)\b/.test(cmd)) {

package/config/pi/pi-worktrees-settings.json

@@ -0,0 +1,6 @@
+{
+  "worktree": {
+    "parentDir": "../{{project}}.worktrees",
+    "onCreate": "npm install 2>/dev/null || true"
+  }
+}

package/config/pi/settings.json.template

@@ -7,7 +7,8 @@
   "packages": [
     "npm:@aliou/pi-guardrails",
     "npm:pi-gitnexus",
-    "npm:pi-serena-tools"
+    "npm:pi-serena-tools",
+    "npm:@zenobius/pi-worktrees"
   ],
   "steeringMode": "all",
   "followUpMode": "all",

package/hooks/beads-claim-sync.mjs

@@ -0,0 +1,65 @@
+#!/usr/bin/env node
+// beads-claim-sync — PostToolUse hook
+// Auto-sets bd kv claim when bd update --claim is detected.
+// Uses session_id from hook input (UUID, matches Pi's sessionManager.getSessionId())
+
+import { spawnSync } from 'node:child_process';
+import { readFileSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+
+function readInput() {
+  try {
+    return JSON.parse(readFileSync(0, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+
+function isBeadsProject(cwd) {
+  return existsSync(join(cwd, '.beads'));
+}
+
+function main() {
+  const input = readInput();
+  if (!input || input.hook_event_name !== 'PostToolUse') process.exit(0);
+  if (input.tool_name !== 'Bash') process.exit(0);
+
+  const cwd = input.cwd || process.cwd();
+  if (!isBeadsProject(cwd)) process.exit(0);
+
+  const command = input.tool_input?.command || '';
+  if (!/\bbd\s+update\b/.test(command) || !/--claim\b/.test(command)) {
+    process.exit(0);
+  }
+
+  // Extract issue ID from command
+  const match = command.match(/\bbd\s+update\s+(\S+)/);
+  if (!match) process.exit(0);
+
+  const issueId = match[1];
+  // Use session_id from hook input (UUID from Pi/Claude Code)
+  const sessionId = input.session_id;
+
+  if (!sessionId) {
+    process.stderr.write('Beads claim sync: no session_id in hook input\n');
+    process.exit(0);
+  }
+
+  try {
+    spawnSync('bd', ['kv', 'set', `claimed:${sessionId}`, issueId], {
+      cwd,
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 5000,
+    });
+    process.stdout.write(JSON.stringify({
+      additionalContext: `\n✅ **Beads**: Session \`${sessionId}\` claimed issue \`${issueId}\`.`,
+    }));
+    process.stdout.write('\n');
+  } catch (err) {
+    process.stderr.write(`Beads claim sync warning: ${err.message}\n`);
+  }
+
+  process.exit(0);
+}
+
+main();

package/package.json

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