xtrm-tools 0.5.26 → 0.5.27

package/cli/package.json

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

package/config/hooks.json

@@ -1,18 +1,19 @@
 {
   "hooks": {
     "SessionStart": [
+      {
+        "script": "using-xtrm-reminder.mjs"
+      },
       {
         "script": "beads-compact-restore.mjs",
         "timeout": 5000
       },
       {
-        "script": "xtrm-session-logger.mjs",
-        "timeout": 3000
-      }
-    ],
-    "UserPromptSubmit": [
+        "script": "quality-check-env.mjs",
+        "timeout": 5000
+      },
       {
-        "script": "branch-state.mjs",
+        "script": "xtrm-session-logger.mjs",
         "timeout": 3000
       }
     ],
@@ -40,17 +41,17 @@
         "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",
+        "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": "quality-check.cjs",
         "timeout": 30000
       },
       {
-        "matcher": "Write|Edit|MultiEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
+        "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": "quality-check.py",
         "timeout": 30000
       },
       {
-        "matcher": "Bash|mcp__serena__find_symbol|mcp__serena__get_symbols_overview|mcp__serena__search_for_pattern|mcp__serena__find_referencing_symbols|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol|mcp__serena__rename_symbol",
+        "matcher": "Bash|Grep|Read|Glob|mcp__serena__find_symbol|mcp__serena__get_symbols_overview|mcp__serena__search_for_pattern|mcp__serena__find_referencing_symbols|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol|mcp__serena__rename_symbol",
         "script": "gitnexus/gitnexus-hook.cjs",
         "timeout": 10000
       },
@@ -77,6 +78,6 @@
     ]
   },
   "statusLine": {
-    "script": "statusline-starship.sh"
+    "script": "statusline.mjs"
   }
 }

package/config/pi/extensions/beads/index.ts

@@ -1,8 +1,8 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { isToolCallEventType, isBashToolResult } from "@mariozechner/pi-coding-agent";
-import { SubprocessRunner, EventAdapter, Logger } from "../core/lib";
-
-const logger = new Logger({ namespace: "beads" });
+import { existsSync, unlinkSync } from "node:fs";
+import { join } from "node:path";
+import { SubprocessRunner, EventAdapter } from "../core/lib";
 
 export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
@@ -21,8 +21,51 @@ export default function (pi: ExtensionAPI) {
 
 	const getSessionClaim = async (sessionId: string, cwd: string): Promise<string | null> => {
 		const result = await SubprocessRunner.run("bd", ["kv", "get", `claimed:${sessionId}`], { cwd });
-		if (result.code === 0) return result.stdout.trim();
-		return null;
+		if (result.code !== 0) return null;
+		const claim = result.stdout.trim();
+		return claim.length > 0 ? claim : null;
+	};
+
+	const clearClaimMarker = async (sessionId: string, cwd: string) => {
+		await SubprocessRunner.run("bd", ["kv", "clear", `claimed:${sessionId}`], { cwd });
+	};
+
+	const isIssueInProgress = async (issueId: string, cwd: string): Promise<boolean | null> => {
+		const result = await SubprocessRunner.run("bd", ["show", issueId, "--json"], { cwd });
+		if (result.code !== 0 || !result.stdout.trim()) return null;
+		try {
+			const parsed = JSON.parse(result.stdout);
+			const issue = Array.isArray(parsed) ? parsed[0] : parsed;
+			if (!issue?.status) return null;
+			return issue.status === "in_progress";
+		} catch {
+			return null;
+		}
+	};
+
+	const getActiveClaim = async (sessionId: string, cwd: string): Promise<string | null> => {
+		const claim = await getSessionClaim(sessionId, cwd);
+		if (!claim) return null;
+
+		const inProgress = await isIssueInProgress(claim, cwd);
+		if (inProgress === false) {
+			await clearClaimMarker(sessionId, cwd);
+			return null;
+		}
+
+		return claim;
+	};
+
+	const getClosedThisSession = async (sessionId: string, cwd: string): Promise<string | null> => {
+		const result = await SubprocessRunner.run("bd", ["kv", "get", `closed-this-session:${sessionId}`], { cwd });
+		if (result.code !== 0) return null;
+		const issue = result.stdout.trim();
+		return issue.length > 0 ? issue : null;
+	};
+
+	const clearSessionMarkers = async (sessionId: string, cwd: string) => {
+		await SubprocessRunner.run("bd", ["kv", "clear", `claimed:${sessionId}`], { cwd });
+		await SubprocessRunner.run("bd", ["kv", "clear", `closed-this-session:${sessionId}`], { cwd });
 	};
 
 	const hasTrackableWork = async (cwd: string): Promise<boolean> => {
@@ -34,15 +77,6 @@ export default function (pi: ExtensionAPI) {
 		return false;
 	};
 
-	const hasInProgressWork = async (cwd: string): Promise<boolean> => {
-		const result = await SubprocessRunner.run("bd", ["list"], { cwd });
-		if (result.code === 0 && result.stdout.includes("Total:")) {
-			const m = result.stdout.match(/Total:\s*\d+\s+issues?\s*\((\d+)\s+open,\s*(\d+)\s+in progress\)/);
-			if (m) return parseInt(m[2], 10) > 0;
-		}
-		return false;
-	};
-
 	pi.on("session_start", async (_event, ctx) => {
 		cachedSessionId = ctx?.sessionManager?.getSessionId?.() ?? ctx?.sessionId ?? ctx?.session_id ?? cachedSessionId;
 		return undefined;
@@ -54,33 +88,30 @@ export default function (pi: ExtensionAPI) {
 		const sessionId = getSessionId(ctx);
 
 		if (EventAdapter.isMutatingFileTool(event)) {
-			const claim = await getSessionClaim(sessionId, cwd);
+			const claim = await getActiveClaim(sessionId, cwd);
 			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 claim for session ${sessionId}.\n  bd update <id> --claim\n`,
-                    };
-                }
-            }
+				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 claim for session ${sessionId}.\n  bd update <id> --claim\n`,
+					};
+				}
+			}
 		}
 
 		if (isToolCallEventType("bash", event)) {
 			const command = event.input.command;
 			if (command && /\bgit\s+commit\b/.test(command)) {
-				const claim = await getSessionClaim(sessionId, cwd);
+				const claim = await getActiveClaim(sessionId, cwd);
 				if (claim) {
-					const inProgress = await hasInProgressWork(cwd);
-					if (inProgress) {
-						return {
-							block: true,
-							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`,
-						};
-					}
+					return {
+						block: true,
+						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`,
+					};
 				}
 			}
 		}
@@ -89,65 +120,61 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	pi.on("tool_result", async (event, ctx) => {
-		if (isBashToolResult(event)) {
-			const command = event.input.command;
-			const sessionId = getSessionId(ctx);
-
-			// 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];
-					const cwd = getCwd(ctx);
-					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 (!isBashToolResult(event)) return undefined;
+
+		const command = event.input.command || "";
+		const sessionId = getSessionId(ctx);
+		const cwd = getCwd(ctx);
+
+		// Auto-claim on bd update --claim regardless of exit code.
+		if (/\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];
+				await SubprocessRunner.run("bd", ["kv", "set", `claimed:${sessionId}`, issueId], { cwd });
+				memoryGateFired = false;
+				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, { type: "text", text: reminder }];
-				return { content: newContent };
+		if (/\bbd\s+close\b/.test(command) && !event.isError) {
+			const closeMatch = command.match(/\bbd\s+close\s+(\S+)/);
+			const closedIssueId = closeMatch?.[1] ?? null;
+			if (closedIssueId) {
+				await SubprocessRunner.run("bd", ["kv", "set", `closed-this-session:${sessionId}`, closedIssueId], { cwd });
+				memoryGateFired = false;
 			}
+			const reminder = "\n\n**Beads Insight**: Work completed. Consider if this session produced insights worth persisting via `bd remember`.";
+			return { content: [...event.content, { type: "text", text: reminder }] };
 		}
+
 		return undefined;
 	});
 
-	// Dual safety net: warn about unclosed claims when session ends (non-blocking)
-	const notifySessionEnd = async (ctx: any) => {
+	// Memory gate: if this session closed an issue, prompt for insight persistence.
+	// Uses sendUserMessage to trigger a new turn in Pi (non-blocking alternative to Claude Stop hook).
+	const triggerMemoryGateIfNeeded = async (ctx: any) => {
 		const cwd = getCwd(ctx);
 		if (!EventAdapter.isBeadsProject(cwd)) return;
 		const sessionId = getSessionId(ctx);
-		const claim = await getSessionClaim(sessionId, cwd);
-		if (!claim) return;
 
-		const message = `Beads: session ending with active claim [${claim}]`;
-		if (ctx.hasUI) {
-			ctx.ui.notify(message, "warning");
-		} else {
-			logger.warn(message);
+		const markerPath = join(cwd, ".beads", ".memory-gate-done");
+		if (existsSync(markerPath)) {
+			try { unlinkSync(markerPath); } catch { /* ignore */ }
+			await clearSessionMarkers(sessionId, cwd);
+			memoryGateFired = false;
+			return;
 		}
-	};
 
-	// Memory gate: if the session's claimed issue was closed, prompt for insights.
-	// Uses sendUserMessage to trigger a new agent turn (Pi has no blocking stop hook).
-	// memoryGateFired prevents re-triggering on the follow-up agent_end.
-	const triggerMemoryGateIfNeeded = async (ctx: any) => {
 		if (memoryGateFired) return;
-		const cwd = getCwd(ctx);
-		if (!EventAdapter.isBeadsProject(cwd)) return;
-		const sessionId = getSessionId(ctx);
-		const claimId = await getSessionClaim(sessionId, cwd);
-		if (!claimId) return;
 
-		const result = await SubprocessRunner.run("bd", ["list", "--status=closed"], { cwd });
-		if (result.code !== 0 || !result.stdout.includes(claimId)) return;
+		const closedIssueId = await getClosedThisSession(sessionId, cwd);
+		if (!closedIssueId) return;
 
 		memoryGateFired = true;
 		pi.sendUserMessage(
-			`🧠 Memory gate: claim \`${claimId}\` was closed this session.\n` +
+			`🧠 Memory gate: claim \`${closedIssueId}\` was closed this session.\n` +
 			`For each closed issue, worth persisting?\n` +
 			`  YES → \`bd remember "<insight>"\`\n` +
 			`  NO  → note "nothing to persist"\n` +
@@ -156,13 +183,12 @@ export default function (pi: ExtensionAPI) {
 	};
 
 	pi.on("agent_end", async (_event, ctx) => {
-		await notifySessionEnd(ctx);
 		await triggerMemoryGateIfNeeded(ctx);
 		return undefined;
 	});
 
 	pi.on("session_shutdown", async (_event, ctx) => {
-		await notifySessionEnd(ctx);
+		await triggerMemoryGateIfNeeded(ctx);
 		return undefined;
 	});
 }

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

@@ -99,11 +99,10 @@ export default function (pi: ExtensionAPI) {
 		return "";
 	};
 
-	pi.on("session_start", async (_event, ctx) => {
-		capturedCtx = ctx;
-		// Get session ID from sessionManager/context (prefer UUID, consistent with hooks)
-		sessionId = ctx.sessionManager?.getSessionId?.() ?? ctx.sessionId ?? ctx.session_id ?? process.pid.toString();
+	let footerReapplyTimer: ReturnType<typeof setTimeout> | null = null;
 
+	const applyCustomFooter = (ctx: any) => {
+		capturedCtx = ctx;
 		ctx.ui.setFooter((tui, theme, footerData) => {
 			requestRender = () => tui.requestRender();
 			const unsub = footerData.onBranchChange(() => tui.requestRender());
@@ -133,7 +132,6 @@ export default function (pi: ExtensionAPI) {
 					const modelChip = chip(modelId);
 
 					const sep = " ";
-
 					const brandModel = `${brand} ${modelChip}`;
 					const beadChip = buildBeadChip();
 					const leftParts = [brandModel, usageStr];
@@ -141,11 +139,46 @@ export default function (pi: ExtensionAPI) {
 					leftParts.push(cwdStr);
 					if (branchStr) leftParts.push(branchStr);
 
-					const left = leftParts.join(sep);
-					return [truncateToWidth(left, width)];
+					return [truncateToWidth(leftParts.join(sep), width)];
 				},
 			};
 		});
+	};
+
+	const scheduleFooterReapply = (ctx: any, delayMs = 40) => {
+		if (footerReapplyTimer) clearTimeout(footerReapplyTimer);
+		footerReapplyTimer = setTimeout(() => {
+			applyCustomFooter(ctx);
+			footerReapplyTimer = null;
+		}, delayMs);
+	};
+
+	pi.on("session_start", async (_event, ctx) => {
+		capturedCtx = ctx;
+		// Get session ID from sessionManager/context (prefer UUID, consistent with hooks)
+		sessionId = ctx.sessionManager?.getSessionId?.() ?? ctx.sessionId ?? ctx.session_id ?? process.pid.toString();
+		applyCustomFooter(ctx);
+		// pi-dex reapplies footer on session start with setTimeout(0); reclaim after that pass.
+		scheduleFooterReapply(ctx);
+	});
+
+	pi.on("session_switch", async (_event, ctx) => {
+		scheduleFooterReapply(ctx);
+	});
+
+	pi.on("session_fork", async (_event, ctx) => {
+		scheduleFooterReapply(ctx);
+	});
+
+	pi.on("model_select", async (_event, ctx) => {
+		scheduleFooterReapply(ctx);
+	});
+
+	pi.on("session_shutdown", async () => {
+		if (footerReapplyTimer) {
+			clearTimeout(footerReapplyTimer);
+			footerReapplyTimer = null;
+		}
 	});
 
 	// Bust the bead cache immediately after any bd write

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

@@ -1,9 +1,19 @@
-import type { ExtensionAPI, ToolResultEvent } from "@mariozechner/pi-coding-agent";
-import { SubprocessRunner, EventAdapter, Logger } from "../core/lib";
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { SubprocessRunner, EventAdapter } from "../core/lib";
 import * as path from "node:path";
 import * as fs from "node:fs";
 
-const logger = new Logger({ namespace: "quality-gates" });
+function resolveQualityHook(cwd: string, ext: string): { runner: string; scriptPath: string } | null {
+	if ([".ts", ".tsx", ".js", ".jsx", ".cjs", ".mjs"].includes(ext)) {
+		const scriptPath = path.join(cwd, ".claude", "hooks", "quality-check.cjs");
+		return { runner: "node", scriptPath };
+	}
+	if (ext === ".py") {
+		const scriptPath = path.join(cwd, ".claude", "hooks", "quality-check.py");
+		return { runner: "python3", scriptPath };
+	}
+	return null;
+}
 
 export default function (pi: ExtensionAPI) {
 	pi.on("tool_result", async (event, ctx) => {
@@ -15,27 +25,17 @@ export default function (pi: ExtensionAPI) {
 
 		const fullPath = path.isAbsolute(filePath) ? filePath : path.join(cwd, filePath);
 		const ext = path.extname(fullPath);
-
-		let scriptPath: string | null = null;
-		let runner: string = "node";
-
-		if ([".ts", ".tsx", ".js", ".jsx"].includes(ext)) {
-			scriptPath = path.join(cwd, ".claude", "hooks", "quality-check.cjs");
-			runner = "node";
-		} else if (ext === ".py") {
-			scriptPath = path.join(cwd, ".claude", "hooks", "quality-check.py");
-			runner = "python3";
-		}
-
-		if (!scriptPath || !fs.existsSync(scriptPath)) return undefined;
+		const resolved = resolveQualityHook(cwd, ext);
+		if (!resolved) return undefined;
+		if (!fs.existsSync(resolved.scriptPath)) return undefined;
 
 		const hookInput = JSON.stringify({
 			tool_name: event.toolName,
 			tool_input: event.input,
-			cwd: cwd,
+			cwd,
 		});
 
-		const result = await SubprocessRunner.run(runner, [scriptPath], {
+		const result = await SubprocessRunner.run(resolved.runner, [resolved.scriptPath], {
 			cwd,
 			input: hookInput,
 			env: { ...process.env, CLAUDE_PROJECT_DIR: cwd },
@@ -43,23 +43,22 @@ export default function (pi: ExtensionAPI) {
 		});
 
 		if (result.code === 0) {
-			if (result.stderr && result.stderr.trim()) {
-				const newContent = [...event.content];
-				newContent.push({ type: "text", text: `\n\n**Quality Gate**: ${result.stderr.trim()}` });
-				return { content: newContent };
-			}
-			return undefined;
+			const details = (result.stdout || result.stderr || "").trim();
+			if (!details) return undefined;
+			return {
+				content: [...event.content, { type: "text", text: `\n\n**Quality Gate**: ${details}` }],
+			};
 		}
 
 		if (result.code === 2) {
-			const newContent = [...event.content];
-			newContent.push({ type: "text", text: `\n\n**Quality Gate FAILED**:\n${result.stderr || result.stdout || "Unknown error"}` });
-			
+			const details = (result.stderr || result.stdout || "Unknown error").trim();
 			if (ctx.hasUI) {
 				ctx.ui.notify(`Quality Gate failed for ${path.basename(fullPath)}`, "error");
 			}
-
-			return { isError: true, content: newContent };
+			return {
+				isError: true,
+				content: [...event.content, { type: "text", text: `\n\n**Quality Gate FAILED**:\n${details}` }],
+			};
 		}
 
 		return undefined;

package/config/pi/extensions/session-flow/index.ts

@@ -14,8 +14,39 @@ function isWorktree(cwd: string): boolean {
 	return cwd.includes("/.xtrm/worktrees/") || cwd.includes("/.claude/worktrees/");
 }
 
+function getSessionId(ctx: any): string {
+	return ctx?.sessionManager?.getSessionId?.() ?? ctx?.sessionId ?? ctx?.session_id ?? process.pid.toString();
+}
+
+async function getSessionClaim(cwd: string, sessionId: string): Promise<string | null> {
+	const claimResult = await SubprocessRunner.run("bd", ["kv", "get", `claimed:${sessionId}`], { cwd });
+	if (claimResult.code !== 0) return null;
+	const claimId = claimResult.stdout.trim();
+	return claimId.length > 0 ? claimId : null;
+}
+
+async function isClaimStillInProgress(cwd: string, issueId: string): Promise<boolean> {
+	const showResult = await SubprocessRunner.run("bd", ["show", issueId, "--json"], { cwd });
+	if (showResult.code === 0 && showResult.stdout.trim()) {
+		try {
+			const parsed = JSON.parse(showResult.stdout);
+			const record = Array.isArray(parsed) ? parsed[0] : parsed;
+			if (record?.status) return record.status === "in_progress";
+		} catch {
+			// fall back to text parsing below
+		}
+	}
+
+	const listResult = await SubprocessRunner.run("bd", ["list", "--status=in_progress"], { cwd });
+	if (listResult.code !== 0) return false;
+	const issuePattern = new RegExp(`^\\s*[◐●]?\\s*${issueId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`, "m");
+	return issuePattern.test(listResult.stdout);
+}
+
 export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
+	let lastStopNoticeIssue: string | null = null;
+	let lastWorktreeReminderCwd: string | null = null;
 
 	// Claim sync: notify when a bd update --claim command is run.
 	pi.on("tool_result", async (event, ctx) => {
@@ -31,35 +62,33 @@ export default function (pi: ExtensionAPI) {
 		return { content: [...event.content, { type: "text", text }] };
 	});
 
-	// Stop gate: block agent end if there is an in_progress claimed issue.
-	// Also remind to run `xt end` when session ends inside a worktree.
+	// Stop gate: warn (non-blocking) if this session's claimed issue is still in progress.
+	// IMPORTANT: never call sendUserMessage() from agent_end, it always triggers a new turn.
 	pi.on("agent_end", async (_event, ctx) => {
 		const cwd = getCwd(ctx);
 		if (!EventAdapter.isBeadsProject(cwd)) return undefined;
 
-		const inProgressResult = await SubprocessRunner.run(
-			"bd",
-			["list", "--status=in_progress"],
-			{ cwd },
-		);
-		if (inProgressResult.code === 0 && inProgressResult.stdout) {
-			const output = inProgressResult.stdout;
-			const m = output.match(/Total:\s*\d+\s+issues?\s*\((\d+)\s+open,\s*(\d+)\s+in progress\)/);
-			const inProgressCount = m ? parseInt(m[2], 10) : 0;
-			if (inProgressCount > 0) {
-				const idMatch = output.match(/^\s*([a-zA-Z0-9._-]+)\s+in_progress/m);
-				const issueId = idMatch ? idMatch[1] : "<id>";
-				pi.sendUserMessage(
-					`Stop blocked: close your issue first: bd close ${issueId}`,
-				);
+		const sessionId = getSessionId(ctx);
+		const claimId = await getSessionClaim(cwd, sessionId);
+
+		if (claimId) {
+			const inProgress = await isClaimStillInProgress(cwd, claimId);
+			if (inProgress) {
+				if (lastStopNoticeIssue !== claimId && ctx.hasUI) {
+					ctx.ui.notify(`Stop blocked: close your issue first: bd close ${claimId}`, "warning");
+					lastStopNoticeIssue = claimId;
+				}
 				return undefined;
 			}
+
+			if (lastStopNoticeIssue === claimId) {
+				lastStopNoticeIssue = null;
+			}
 		}
 
-		if (isWorktree(cwd)) {
-			pi.sendUserMessage(
-				"Run `xt end` to create a PR and clean up this worktree.",
-			);
+		if (isWorktree(cwd) && ctx.hasUI && lastWorktreeReminderCwd !== cwd) {
+			ctx.ui.notify("Run `xt end` to create a PR and clean up this worktree.", "info");
+			lastWorktreeReminderCwd = cwd;
 		}
 
 		return undefined;