pi-subagents 0.35.0 → 0.36.0

package/src/tui/render.ts

@@ -23,6 +23,7 @@ import { getDisplayItems, getSingleResultOutput } from "../shared/utils.ts";
 import { flatToLogicalStepIndex } from "../runs/background/parallel-groups.ts";
 import { formatNestedAggregate } from "../runs/shared/nested-render.ts";
 import { aggregateStepStatus, formatActivityLabel, formatAgentRunningLabel, formatParallelOutcome } from "../shared/status-format.ts";
+import { contextModeBadge, contextModePrefix } from "../runs/shared/context-mode.ts";
 
 type Theme = ExtensionContext["ui"]["theme"];
 
@@ -902,7 +903,7 @@ function foregroundStyleWidgetStepLines(
 	const status = widgetStepStatus(step.status, theme);
 	const stats = widgetStepStats(theme, step);
 	const modelDisplay = modelThinkingBadge(theme, step.model, step.thinking);
-	const lines = [`  ${widgetStepGlyph(step.status, theme, widgetStepRunningSeed(step, index - 1))} ${itemTitle} ${index}/${total}: ${themeBold(theme, step.agent)} ${theme.fg("dim", "·")} ${status}${modelDisplay}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`];
+	const lines = [`  ${widgetStepGlyph(step.status, theme, widgetStepRunningSeed(step, index - 1))} ${itemTitle} ${index}/${total}: ${themeBold(theme, step.agent)}${contextModeBadge(theme, step.context)} ${theme.fg("dim", "·")} ${status}${modelDisplay}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`];
 	const activity = widgetStepActivityLine(step, width, expanded, job.updatedAt);
 	if (activity) lines.push(`    ${theme.fg("dim", `⎿  ${activity}`)}`);
 	for (const nestedLine of formatNestedWidgetLines(step.children, theme, width, expanded, job.updatedAt)) {
@@ -955,7 +956,7 @@ function buildSingleWidgetLines(job: AsyncJobState, theme: Theme, width: number,
 	const title = `async subagent ${mode}${count && count > 1 ? ` (${count})` : ""}`;
 	return [
 		`${theme.fg("toolTitle", themeBold(theme, title))} ${theme.fg("dim", "· background")}`,
-		`${widgetStatusGlyph(job, theme)} ${themeBold(theme, mode)}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
+		`${widgetStatusGlyph(job, theme)} ${themeBold(theme, mode)}${contextModeBadge(theme, job.context)}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
 		...foregroundStyleWidgetDetails(job, theme, expanded, width),
 	].map((line) => truncLine(line, width));
 }
@@ -973,7 +974,7 @@ function compactSingleWidgetLines(job: AsyncJobState, theme: Theme, width: numbe
 		const stepStats = widgetStepStats(theme, step);
 		const activitySuffix = activity ? ` ${theme.fg("dim", "·")} ${theme.fg("dim", activity)}` : "";
 		const modelDisplay = modelThinkingBadge(theme, step.model, step.thinking);
-		lines.push(`  ${widgetStepGlyph(step.status, theme, widgetStepRunningSeed(step, index))} ${itemTitle} ${index + 1}/${total}: ${themeBold(theme, step.agent)} ${theme.fg("dim", "·")} ${status}${modelDisplay}${activitySuffix}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}`);
+		lines.push(`  ${widgetStepGlyph(step.status, theme, widgetStepRunningSeed(step, index))} ${itemTitle} ${index + 1}/${total}: ${themeBold(theme, step.agent)}${contextModeBadge(theme, step.context)} ${theme.fg("dim", "·")} ${status}${modelDisplay}${activitySuffix}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}`);
 		for (const nestedLine of formatNestedWidgetLines(step.children, theme, width, false, job.updatedAt)) lines.push(`    ${nestedLine}`);
 	}
 	if (job.steps.some((step) => step.status === "running")) lines.push(theme.fg("accent", `  ${liveDetailHintText()}`));
@@ -1113,7 +1114,7 @@ function progressiveJobLine(job: AsyncJobState, theme: Theme, width: number): st
 	const activity = widgetActivity(job);
 	const status = job.status === "complete" ? "done" : job.status;
 	const parts = [
-		themeBold(theme, widgetJobName(job)),
+		`${themeBold(theme, widgetJobName(job))}${contextModeBadge(theme, job.context)}`,
 		theme.fg("dim", status),
 		stats,
 		activity && activity.toLowerCase() !== status ? theme.fg("dim", activity) : "",
@@ -1248,7 +1249,7 @@ export function buildWidgetLines(jobs: AsyncJobState[], theme: Theme, width = ge
 		if (slots <= 0) { hiddenRunning++; continue; }
 		const stats = widgetStats(job, theme);
 		items.push([
-			`${widgetStatusGlyph(job, theme)} ${themeBold(theme, widgetJobName(job))}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
+			`${widgetStatusGlyph(job, theme)} ${themeBold(theme, widgetJobName(job))}${contextModeBadge(theme, job.context)}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
 			`  ${theme.fg("dim", `⎿  ${widgetActivity(job)}`)}`,
 			...widgetParallelAgentDetails(job, theme, expanded, width),
 		]);
@@ -1265,7 +1266,7 @@ export function buildWidgetLines(jobs: AsyncJobState[], theme: Theme, width = ge
 		if (slots <= 0) { hiddenFinished++; continue; }
 		const stats = widgetStats(job, theme);
 		items.push([
-			`${widgetStatusGlyph(job, theme)} ${themeBold(theme, widgetJobName(job))}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
+			`${widgetStatusGlyph(job, theme)} ${themeBold(theme, widgetJobName(job))}${contextModeBadge(theme, job.context)}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
 			`  ${theme.fg("dim", `⎿  ${widgetActivity(job)}`)}`,
 			...widgetParallelAgentDetails(job, theme, expanded, width),
 		]);
@@ -1313,7 +1314,7 @@ function renderSingleCompact(d: Details, r: Details["results"][number], theme: T
 	const output = r.truncation?.text || getSingleResultOutput(r);
 	const progress = r.progress || r.progressSummary;
 	const isRunning = r.progress?.status === "running";
-	const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
+	const contextBadge = contextModeBadge(theme, r.context ?? d.context);
 	const stats = statJoin(theme, [
 		r.usage?.turns ? `⟳ ${r.usage.turns}` : "",
 		formatProgressStats(theme, progress),
@@ -1387,7 +1388,7 @@ function renderMultiCompact(d: Details, theme: Theme, frame?: number): Component
 			: paused
 				? theme.fg("warning", "■")
 				: theme.fg("success", "✓");
-	const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
+	const contextBadge = contextModeBadge(theme, d.context);
 	const c = new Container();
 	const width = getTermWidth() - 4;
 	c.addChild(new Text(truncLine(`${glyph} ${theme.fg("toolTitle", theme.bold(d.mode))}${contextBadge}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`, width), 0, 0));
@@ -1430,7 +1431,7 @@ function renderMultiCompact(d: Details, theme: Theme, frame?: number): Component
 		const glyph = rPending ? theme.fg("dim", "◦") : resultGlyph(r, output, theme, rRunning, progressRunningSeed(rProg), frame);
 		const pendingLabel = rPending ? ` ${theme.fg("dim", "· pending")}` : "";
 		const stepLabel = resultRowLabel(d, multiLabel, i, stepNumber);
-		const line = `${glyph} ${stepLabel}: ${themeBold(theme, agentName)}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`;
+		const line = `${glyph} ${stepLabel}: ${themeBold(theme, agentName)}${contextModeBadge(theme, r.context)}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`;
 		c.addChild(new Text(truncLine(`  ${line}`, width), 0, 0));
 		if (rRunning && rProg && "status" in rProg) {
 			const activity = compactCurrentActivity(rProg);
@@ -1468,9 +1469,17 @@ export function renderSubagentResult(
 	if (!d || !d.results.length) {
 		const t = result.content[0];
 		const text = t?.type === "text" ? t.text : "(no output)";
-		const contextPrefix = d?.context === "fork" ? `${theme.fg("warning", "[fork]")} ` : "";
+		const contextPrefix = contextModePrefix(theme, d?.context);
 		const width = getTermWidth() - 4;
 		if (!text.includes("\n")) return new Text(truncLine(`${contextPrefix}${text}`, width), 0, 0);
+		if (d && !options.expanded && !result.isError) {
+			const lines = text.split(/\r?\n/);
+			const firstNonEmptyLine = lines.find((line) => line.trim())?.trim() || "(no output)";
+			const c = new Container();
+			c.addChild(new Text(truncLine(`${contextPrefix}${firstNonEmptyLine} · ${lines.length} lines`, width), 0, 0));
+			c.addChild(new Text(truncLine(theme.fg("accent", `  Press ${liveDetailKeyText()} for full output`), width), 0, 0));
+			return c;
+		}
 		const c = new Container();
 		const wrapped = wrapPlainText(`${contextPrefix}${text}`, width);
 		for (const line of wrapped) c.addChild(new Text(line, 0, 0));
@@ -1491,7 +1500,7 @@ export function renderSubagentResult(
 				: r.exitCode === 0
 					? theme.fg("success", "ok")
 					: theme.fg("error", "failed");
-		const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
+		const contextBadge = contextModeBadge(theme, r.context ?? d.context);
 		const output = r.truncation?.text || getSingleResultOutput(r);
 
 		const progressInfo = isRunning && r.progress
@@ -1638,7 +1647,7 @@ export function renderSubagentResult(
 	const summaryStr = summaryParts.length ? ` | ${summaryParts.join(", ")}` : "";
 
 	const modeLabel = d.mode;
-	const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
+	const contextBadge = contextModeBadge(theme, d.context);
 	const multiLabel = buildMultiProgressLabel(d, hasRunning);
 	const itemTitle = multiLabel.itemTitle;
 	
@@ -1661,7 +1670,7 @@ export function renderSubagentResult(
 								: isCurrent && hasRunning
 									? theme.fg("warning", "running")
 									: theme.fg("dim", "pending");
-					return `${stepIcon} ${agent}`;
+					return `${stepIcon} ${agent}${contextModeBadge(theme, result?.context)}`;
 				})
 				.join(theme.fg("dim", " → "))
 		: null;
@@ -1732,9 +1741,10 @@ export function renderSubagentResult(
 		const stats = rProg ? ` | ${rProg.toolCount} tools, ${formatDuration(rProg.durationMs)}` : "";
 		const modelDisplay = modelThinkingBadge(theme, r.model);
 		const stepLabel = resultRowLabel(d, multiLabel, i, stepNumber);
+		const contextBadge = contextModeBadge(theme, r.context);
 		const stepHeader = rRunning
-			? `${statusIcon} ${stepLabel}: ${theme.bold(theme.fg("warning", r.agent))}${modelDisplay}${stats}`
-			: `${statusIcon} ${stepLabel}: ${theme.bold(r.agent)}${modelDisplay}${stats}`;
+			? `${statusIcon} ${stepLabel}: ${theme.bold(theme.fg("warning", r.agent))}${contextBadge}${modelDisplay}${stats}`
+			: `${statusIcon} ${stepLabel}: ${theme.bold(r.agent)}${contextBadge}${modelDisplay}${stats}`;
 		const toolCallLines = getToolCallLines(r, expanded);
 		c.addChild(new Text(fit(stepHeader), 0, 0));
 

package/src/watchdog/change-signature.ts

@@ -5,6 +5,30 @@ import * as path from "node:path";
 
 const IGNORED_CHANGE_PREFIXES = [".pi-subagents/", "tmp/", "node_modules/"];
 const IGNORED_CHANGE_PATHS = new Set([".pi-subagents", "tmp", "node_modules"]);
+const IGNORED_CHANGE_SEGMENTS = new Set([".git", ".pi-subagents", "node_modules"]);
+
+const DEFAULT_MAX_HASH_FILE_BYTES = 64 * 1024 * 1024;
+const DEFAULT_MAX_HASH_TOTAL_BYTES = 64 * 1024 * 1024;
+const DEFAULT_MAX_HASH_ENTRIES = 2_000;
+
+function positiveEnvNumber(name: string, fallback: number): number {
+	const parsed = Number(process.env[name]);
+	return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+
+// Read at call time (not module load) so tests can override env guards after
+// this module is imported.
+function maxHashFileBytes(): number {
+	return positiveEnvNumber("PI_SUBAGENTS_MAX_HASH_FILE_BYTES", DEFAULT_MAX_HASH_FILE_BYTES);
+}
+
+function maxHashTotalBytes(): number {
+	return positiveEnvNumber("PI_SUBAGENTS_MAX_HASH_TOTAL_BYTES", DEFAULT_MAX_HASH_TOTAL_BYTES);
+}
+
+function maxHashEntries(): number {
+	return positiveEnvNumber("PI_SUBAGENTS_MAX_HASH_ENTRIES", DEFAULT_MAX_HASH_ENTRIES);
+}
 
 export interface WatchdogRepoChangeSignature {
 	root: string;
@@ -24,15 +48,69 @@ function normalizeRelPath(value: string): string {
 
 function ignoredRelPath(relPath: string): boolean {
 	const normalized = normalizeRelPath(relPath);
-	return IGNORED_CHANGE_PATHS.has(normalized) || IGNORED_CHANGE_PREFIXES.some((prefix) => normalized.startsWith(prefix));
+	return IGNORED_CHANGE_PATHS.has(normalized)
+		|| IGNORED_CHANGE_PREFIXES.some((prefix) => normalized.startsWith(prefix))
+		|| normalized.split("/").some((segment) => IGNORED_CHANGE_SEGMENTS.has(segment));
+}
+
+interface HashBudget {
+	entries: number;
+	bytes: number;
+	maxEntries: number;
+	maxBytes: number;
+}
+
+function useHashEntryBudget(budget: HashBudget): boolean {
+	if (budget.entries >= budget.maxEntries) return false;
+	budget.entries++;
+	return true;
 }
 
 function hashFile(filePath: string): string {
 	return createHash("sha256").update(fs.readFileSync(filePath)).digest("hex");
 }
 
-function hashPath(root: string, relPath: string): unknown {
+function largeFileHash(stat: fs.Stats): string {
+	return "large:" + stat.size + ":" + Math.floor(stat.mtimeMs);
+}
+
+function hashFileEntry(normalized: string, fullPath: string, stat: fs.Stats, budget: HashBudget): unknown {
+	let hash: string;
+	if (stat.size > maxHashFileBytes() || budget.bytes + stat.size > budget.maxBytes) {
+		hash = largeFileHash(stat);
+	} else {
+		try {
+			hash = hashFile(fullPath);
+			budget.bytes += stat.size;
+		} catch (error) {
+			const code = (error as NodeJS.ErrnoException).code;
+			// A file racing away between lstat and read: mirror the lstat ENOENT path.
+			if (code === "ENOENT") return { path: normalized, state: "deleted" };
+			// Any other read failure (too-large, EACCES, EISDIR, ...) degrades to the
+			// metadata marker so one unreadable file never discards the whole signature.
+			hash = largeFileHash(stat);
+			if (code !== "ERR_FS_FILE_TOO_LARGE") {
+				console.warn("[pi-subagents] watchdog hashFile fell back to metadata for", normalized + ":", (error as Error)?.message);
+			}
+		}
+	}
+	return { path: normalized, state: "file", mode: stat.mode & 0o777, size: stat.size, hash };
+}
+
+function gitWorktreeEntry(normalized: string, fullPath: string): unknown {
+	const status = git(fullPath, ["status", "--porcelain=v1", "-z", "--untracked-files=no"]);
+	return {
+		path: normalized,
+		state: "git-worktree",
+		head: git(fullPath, ["rev-parse", "HEAD"])?.trim(),
+		dirty: Boolean(status),
+		statusKey: status ? createHash("sha256").update(status).digest("hex") : undefined,
+	};
+}
+
+function hashPath(root: string, relPath: string, budget: HashBudget): unknown {
 	const normalized = normalizeRelPath(relPath);
+	if (!useHashEntryBudget(budget)) return { path: normalized, state: "skipped", reason: "entry-limit" };
 	const fullPath = path.join(root, normalized);
 	let stat: fs.Stats;
 	try {
@@ -45,15 +123,20 @@ function hashPath(root: string, relPath: string): unknown {
 		return { path: normalized, state: "symlink", target: fs.readlinkSync(fullPath) };
 	}
 	if (stat.isDirectory()) {
+		if (fs.existsSync(path.join(fullPath, ".git"))) return gitWorktreeEntry(normalized, fullPath);
 		const entries = fs.readdirSync(fullPath)
 			.map((entry) => normalizeRelPath(path.posix.join(normalized, entry)))
 			.filter((entry) => !ignoredRelPath(entry))
 			.sort();
-		return { path: normalized, state: "dir", entries: entries.map((entry) => hashPath(root, entry)) };
-	}
-	if (stat.isFile()) {
-		return { path: normalized, state: "file", mode: stat.mode & 0o777, size: stat.size, hash: hashFile(fullPath) };
+		const remainingEntries = Math.max(0, budget.maxEntries - budget.entries);
+		const selectedEntries = entries.slice(0, remainingEntries);
+		const childEntries = selectedEntries.map((entry) => hashPath(root, entry, budget));
+		if (selectedEntries.length < entries.length) {
+			childEntries.push({ path: normalized, state: "skipped-children", reason: "entry-limit", count: entries.length - selectedEntries.length });
+		}
+		return { path: normalized, state: "dir", entries: childEntries };
 	}
+	if (stat.isFile()) return hashFileEntry(normalized, fullPath, stat, budget);
 	return { path: normalized, state: "other", mode: stat.mode };
 }
 
@@ -75,11 +158,7 @@ function parsePorcelainZ(raw: string): Array<{ status: string; paths: string[] }
 	return entries;
 }
 
-export function computeWatchdogRepoChangeSignature(cwd: string): WatchdogRepoChangeSignature | undefined {
-	const root = git(cwd, ["rev-parse", "--show-toplevel"])?.trim();
-	if (!root) return undefined;
-	const statusOutput = git(root, ["status", "--porcelain=v1", "-z", "--untracked-files=all"]);
-	if (statusOutput === undefined) return undefined;
+function buildRepoChangeSignature(root: string, statusOutput: string): WatchdogRepoChangeSignature {
 	const entries = parsePorcelainZ(statusOutput)
 		.map((entry) => ({
 			status: entry.status,
@@ -88,15 +167,29 @@ export function computeWatchdogRepoChangeSignature(cwd: string): WatchdogRepoCha
 		.filter((entry) => entry.paths.length > 0)
 		.sort((a, b) => `${a.status} ${a.paths.join("\0")}`.localeCompare(`${b.status} ${b.paths.join("\0")}`));
 	const changedPaths = [...new Set(entries.flatMap((entry) => entry.paths))].sort();
+	const budget: HashBudget = { entries: 0, bytes: 0, maxEntries: maxHashEntries(), maxBytes: maxHashTotalBytes() };
 	const payload = entries.map((entry) => ({
 		status: entry.status,
 		paths: entry.paths,
-		content: entry.paths.map((relPath) => hashPath(root, relPath)),
+		content: entry.paths.map((relPath) => hashPath(root, relPath, budget)),
 	}));
 	const key = createHash("sha256").update(JSON.stringify(payload)).digest("hex");
 	return { root, key, changedPaths };
 }
 
+export function computeWatchdogRepoChangeSignature(cwd: string): WatchdogRepoChangeSignature | undefined {
+	const root = git(cwd, ["rev-parse", "--show-toplevel"])?.trim();
+	if (!root) return undefined;
+	const statusOutput = git(root, ["status", "--porcelain=v1", "-z", "--untracked-files=all"]);
+	if (statusOutput === undefined) return undefined;
+	try {
+		return buildRepoChangeSignature(root, statusOutput);
+	} catch (error) {
+		console.warn("[pi-subagents] watchdog repo change signature failed:", (error as Error)?.message);
+		return undefined;
+	}
+}
+
 function toolNameFromMessage(message: Record<string, unknown>): string {
 	const value = message.toolName ?? message.name;
 	return typeof value === "string" ? value : "";

package/src/watchdog/review.ts

@@ -252,7 +252,12 @@ export function createMainWatchdogReview(provider: WatchdogContextProvider, opti
 		});
 		if (ctx.signal?.aborted || request.signal?.aborted) return { stopReason: "aborted" };
 		const auth = selection.auth;
-		const baseStreamFn = options.streamFn ?? streamSimple;
+		const registeredProvider = (ctx.modelRegistry as {
+			getRegisteredProviderConfig?: (provider: string) => { api?: string; streamSimple?: StreamFn } | undefined;
+		}).getRegisteredProviderConfig?.(selection.model.provider);
+		const baseStreamFn = options.streamFn ?? (registeredProvider?.streamSimple && registeredProvider.api === selection.model.api
+			? registeredProvider.streamSimple
+			: streamSimple);
 		const streamFn: StreamFn = (model, context, streamOptions) => baseStreamFn(model, context, {
 			...streamOptions,
 			...(auth.apiKey ? { apiKey: auth.apiKey } : {}),
@@ -271,7 +276,7 @@ export function createMainWatchdogReview(provider: WatchdogContextProvider, opti
 				tools,
 			},
 			convertToLlm,
-			streamFn,
+			streamFunction: streamFn,
 			getApiKey: (providerName) => providerName === selection.model.provider ? auth.apiKey : undefined,
 			beforeToolCall: async ({ toolCall }) => WATCHDOG_ALLOWED_TOOL_NAMES.has(toolCall.name)
 				? undefined

package/src/watchdog/runtime.ts

@@ -79,6 +79,7 @@ interface MainWatchdogRuntimeOptions {
 	displayWarning?: (warning: WatchdogWarningDetails) => void;
 	reviewChangesOnly?: boolean;
 	lspDiagnostics?: WatchdogLspDiagnosticsFunction;
+	repoChangeSignature?: typeof computeWatchdogRepoChangeSignature;
 }
 
 type ContextLike = Pick<ExtensionContext, "cwd">;
@@ -113,6 +114,7 @@ export class MainWatchdogRuntime {
 	private readonly displayWarning: ((warning: WatchdogWarningDetails) => void) | undefined;
 	private readonly reviewChangesOnly: boolean;
 	private readonly lspDiagnostics: WatchdogLspDiagnosticsFunction;
+	private readonly repoChangeSignature: typeof computeWatchdogRepoChangeSignature;
 	private readonly lspLedger = new WatchdogLspDiagnosticsLedger();
 	private configResult: WatchdogSettingsResult;
 	private sessionOverrideEnabled: boolean | undefined;
@@ -155,6 +157,7 @@ export class MainWatchdogRuntime {
 		this.displayWarning = options.displayWarning;
 		this.reviewChangesOnly = options.reviewChangesOnly === true;
 		this.lspDiagnostics = options.lspDiagnostics ?? collectWatchdogLspDiagnostics;
+		this.repoChangeSignature = options.repoChangeSignature ?? computeWatchdogRepoChangeSignature;
 		this.configResult = this.resolveConfig(this.cwd);
 		this.guardMaxWarnings = this.configResult.config.maxWarnings;
 		this.guard = new WatchdogEmissionGuard({ maxWarnings: this.guardMaxWarnings });
@@ -166,9 +169,8 @@ export class MainWatchdogRuntime {
 		this.cwd = ctx.cwd;
 		this.sessionOverrideEnabled = undefined;
 		this.sessionModelOverride = undefined;
-		this.reset("session_start", { clearReviewInputSignature: true, resetChangeSignature: true, clearLspLedger: true });
 		this.refreshConfig(ctx.cwd);
-		this.resetRepoChangeBaseline();
+		this.reset("session_start", { clearReviewInputSignature: true, resetChangeSignature: true, clearLspLedger: true });
 	}
 
 	refreshConfig(cwd = this.cwd): WatchdogSettingsResult {
@@ -532,7 +534,7 @@ export class MainWatchdogRuntime {
 	}
 
 	private currentRepoChangeSignature(cwd = this.cwd): WatchdogRepoChangeSignature | undefined {
-		return this.reviewChangesOnly ? computeWatchdogRepoChangeSignature(cwd) : undefined;
+		return this.reviewChangesOnly && this.isEnabled() ? this.repoChangeSignature(cwd) : undefined;
 	}
 
 	private resetRepoChangeBaseline(options: { cwd?: string; reviewed?: boolean } = {}): void {

package/src/slash/subagents-editor.ts

@@ -1,86 +0,0 @@
-import { spawn } from "node:child_process";
-import * as path from "node:path";
-
-export interface EditorSpec {
-	command: string;
-	args: string[];
-}
-
-/** Resolve a blocking graphical editor command. Pi owns the terminal, so terminal editors are unsupported. */
-export function resolveEditorCommand(): EditorSpec | undefined {
-	const raw = (process.env.VISUAL || process.env.EDITOR || "").trim()
-		|| (process.platform === "darwin" ? "open -W -n -a MarkEdit" : "");
-	if (!raw) return undefined;
-
-	const parts: string[] = [];
-	let current = "";
-	let quote: "'" | '"' | undefined;
-	for (let index = 0; index < raw.length; index++) {
-		const char = raw[index]!;
-		if (quote) {
-			if (char === quote) quote = undefined;
-			else if (char === "\\" && raw[index + 1] === quote) current += raw[++index]!;
-			else current += char;
-		} else if (char === "'" || char === '"') {
-			quote = char;
-		} else if (/\s/.test(char)) {
-			if (current) {
-				parts.push(current);
-				current = "";
-			}
-		} else if (char === "\\" && raw[index + 1] && /[\s'"\\]/.test(raw[index + 1]!)) {
-			current += raw[++index]!;
-		} else {
-			current += char;
-		}
-	}
-	if (quote) throw new Error("The configured editor command contains an unmatched quote.");
-	if (current) parts.push(current);
-	if (parts.length === 0) return undefined;
-	return { command: parts[0]!, args: parts.slice(1) };
-}
-
-export function editorLabel(editor: EditorSpec): string {
-	const appIdx = editor.args.indexOf("-a");
-	if (editor.command === "open" && appIdx !== -1 && editor.args[appIdx + 1]) return editor.args[appIdx + 1]!;
-	return editor.command;
-}
-
-function escapeWindowsCommand(value: string): string {
-	return value.replace(/([()\][%!^"`<>&|;, *?])/g, "^$1");
-}
-
-function escapeWindowsArgument(value: string, doubleEscapeMetaChars: boolean): string {
-	let escaped = value
-		.replace(/(?=(\\+?)?)\1"/g, "$1$1\\\"")
-		.replace(/(?=(\\+?)?)\1$/, "$1$1");
-	escaped = `"${escaped}"`.replace(/([()\][%!^"`<>&|;, *?])/g, "^$1");
-	return doubleEscapeMetaChars
-		? escaped.replace(/([()\][%!^"`<>&|;, *?])/g, "^$1")
-		: escaped;
-}
-
-export function runEditorAndWait(editor: EditorSpec, filePath: string): Promise<void> {
-	return new Promise((resolve, reject) => {
-		const editorArgs = [...editor.args, filePath];
-		const child = process.platform === "win32" && !/\.(?:com|exe)$/i.test(editor.command)
-			? (() => {
-				const doubleEscape = /node_modules[\\/]\.bin[\\/][^\\/]+\.cmd$/i.test(editor.command);
-				const commandLine = [
-					escapeWindowsCommand(path.normalize(editor.command)),
-					...editorArgs.map((arg) => escapeWindowsArgument(arg, doubleEscape)),
-				].join(" ");
-				return spawn(process.env.ComSpec || process.env.COMSPEC || "cmd.exe", ["/d", "/s", "/c", `"${commandLine}"`], {
-					stdio: "ignore",
-					windowsVerbatimArguments: true,
-				});
-			})()
-			: spawn(editor.command, editorArgs, { stdio: "ignore" });
-		child.once("error", reject);
-		child.once("close", (code, signal) => {
-			if (code === 0) resolve();
-			else if (signal) reject(new Error(`${editor.command} terminated by ${signal}`));
-			else reject(new Error(`${editor.command} exited with code ${code ?? "unknown"}`));
-		});
-	});
-}