@davideasden/pi-undo 0.2.22 → 0.2.25

package/src/snapshot-store.ts

@@ -22,8 +22,9 @@ import type {
 } from "./model.ts";
 import type { NativeMetadataEntry, NativeMetadataPort } from "./native-metadata.ts";
 import { NativeMetadataInspector } from "./native-metadata.ts";
+import { allCompleted, checkOperation, configuredTimeout, OperationError, operationProcessOptions, rethrowOperationFailure } from "./operation-context.ts";
 import { assertNoSymlinkEscape, assertNoSymlinkParents, pathSetsOverlap, relativeSafePath } from "./path-safety.ts";
-import { RootDiscovery, type RootTopology } from "./root-discovery.ts";
+import { RootDiscovery, type RootDiscoveryReason, type RootTopology } from "./root-discovery.ts";
 import { WorkspaceLock } from "./workspace-lock.ts";
 
 const SCHEMA_VERSION = 1;
@@ -147,7 +148,10 @@ export interface SnapshotStoreOptions {
 
 export interface CaptureOptions {
 	readonly excludePaths?: readonly string[];
-	/** 调用方刚完成 topology discovery 时跳过重复的捕获前校验。捕获后校验仍然执行。 */
+	/**
+	 * 调用方刚完成 topology discovery 时跳过重复的入口校验；枚举或捕获结束后的校验仍然执行，
+	 * 因此校验窗口内出现的漂移依然会被拒绝。仅限调用方与本次枚举之间没有文件变更时使用。
+	 */
 	readonly topologyAlreadyValidated?: boolean;
 }
 
@@ -280,7 +284,7 @@ export class SnapshotStore {
 			const coverage = captureCoverage(topology.workspaceIdentity, scope);
 			const artifactExclusions = captureExclusions(topology.workspaceIdentity, options.excludePaths);
 			if (options.topologyAlreadyValidated !== true) {
-				await this.assertTopology(topology, "捕获前 topology 已变化");
+				await this.assertTopology(topology, "捕获前 topology 已变化", "safety-snapshot");
 			}
 			const brokenRoots = brokenRootPaths(topology);
 			if (brokenRoots.length > 0) {
@@ -329,7 +333,7 @@ export class SnapshotStore {
 			const cacheUpdates = capturedRoots.flatMap((captured) =>
 				captured.cacheUpdate === undefined ? [] : [captured.cacheUpdate]);
 
-			await this.assertTopology(topology, "捕获期间 topology 已变化");
+			await this.assertTopology(topology, "捕获期间 topology 已变化", "safety-snapshot");
 			const content = {
 				schemaVersion: SCHEMA_VERSION as 1,
 				workspaceIdentity: topology.workspaceIdentity,
@@ -388,14 +392,14 @@ export class SnapshotStore {
 				throw new SnapshotStoreError("capture_failed", "topology fingerprint 与 roots 不匹配");
 			}
 			if (options.topologyAlreadyValidated !== true) {
-				await this.assertTopology(topology, "捕获前 topology 已变化");
+				await this.assertTopology(topology, "捕获前 topology 已变化", "safety-snapshot");
 			}
 			const brokenRoots = brokenRootPaths(topology);
 			if (brokenRoots.length > 0) {
 				throw new SnapshotStoreError("capture_failed", `broken root 不能静默进入 baseline 校验: ${brokenRoots.join(", ")}`);
 			}
 			if (await this.isBaselineFresh(topology, baseline, scope, options)) {
-				await this.assertTopology(topology, "捕获期间 topology 已变化");
+				await this.assertTopology(topology, "捕获期间 topology 已变化", "safety-snapshot");
 				await this.touchStore(this.storeDirectory(topology));
 				return baseline;
 			}
@@ -537,7 +541,8 @@ export class SnapshotStore {
 				await this.assertVisibleLeavesUnchanged(absoluteRoot, leaves, transactionDirectory);
 			}
 			return true;
-		} catch {
+		} catch (error) {
+			rethrowOperationFailure(error);
 			// baseline 证据读取失败时不复用旧快照；完整 capture 会重新建立对象和缓存。
 			return false;
 		} finally {
@@ -564,7 +569,9 @@ export class SnapshotStore {
 				throw new SnapshotStoreError("capture_failed", "topology fingerprint 与 roots 不匹配");
 			}
 			const artifactExclusions = captureExclusions(topology.workspaceIdentity, options.excludePaths);
-			await this.assertTopology(topology, "可见路径枚举前 topology 已变化");
+			if (options.topologyAlreadyValidated !== true) {
+				await this.assertTopology(topology, "可见路径枚举前 topology 已变化", "visible-paths-pre");
+			}
 			const brokenRoots = brokenRootPaths(topology);
 			if (brokenRoots.length > 0) {
 				throw new SnapshotStoreError("capture_failed", `broken root 不能静默进入可见路径枚举: ${brokenRoots.join(", ")}`);
@@ -601,7 +608,7 @@ export class SnapshotStore {
 					result.add(workspaceRelativePath(root.relativeRoot, relativePath));
 				}
 			}
-			await this.assertTopology(topology, "可见路径枚举期间 topology 已变化");
+			await this.assertTopology(topology, "可见路径枚举期间 topology 已变化", "visible-paths-post");
 			return [...result].sort(comparePaths);
 		} catch (error) {
 			if (error instanceof SnapshotStoreError) throw error;
@@ -1358,7 +1365,7 @@ export class SnapshotStore {
 		const pathspecs = inclusions.length === 0 ? ["."] : inclusions.map(literalPathspec);
 		for (const excluded of exclusions) pathspecs.push(excludeLiteralPathspec(excluded));
 		const queryEnvironment = gitBacked ? sourceGitEnvironment() : environment;
-		const [output, deletedOutput] = await Promise.all([
+		const [output, deletedOutput] = await allCompleted([
 			this.runGitBytes([
 				...(gitBacked ? ["-c", "core.fsmonitor=false"] : []),
 				"ls-files",
@@ -1668,23 +1675,27 @@ export class SnapshotStore {
 	}
 
 	private async runGit(args: readonly string[], options: GitRunOptions = {}): Promise<string> {
-		const result = await this.git.run(args, options);
+		const result = await this.git.run(args, injectOperationBudget(options));
 		if (result.killed) {
-			throw new SnapshotStoreError("capture_failed", "Git 命令未正常结束");
+			throw new OperationError(result.timedOut ? "operation_timeout" : "operation_cancelled", "Git 命令已停止");
 		}
 		return result.stdout;
 	}
 
 	private async runGitBytes(args: readonly string[], options: GitRunOptions = {}): Promise<Uint8Array> {
-		const result = await this.git.run(args, options);
+		const result = await this.git.run(args, injectOperationBudget(options));
 		if (result.killed) {
-			throw new SnapshotStoreError("capture_failed", "Git 命令未正常结束");
+			throw new OperationError(result.timedOut ? "operation_timeout" : "operation_cancelled", "Git 命令已停止");
 		}
 		return result.stdoutBytes;
 	}
 
-	private async assertTopology(expected: RootTopology, message: string): Promise<void> {
-		const actual = await this.discovery.discover(expected.workspaceIdentity);
+	private async assertTopology(
+		expected: RootTopology,
+		message: string,
+		reason: RootDiscoveryReason,
+	): Promise<void> {
+		const actual = await this.discovery.discover(expected.workspaceIdentity, reason);
 		const rootKindsMatch = actual.roots.length === expected.roots.length && actual.roots.every((root, index) => {
 			const expectedRoot = expected.roots[index];
 			return expectedRoot !== undefined &&
@@ -1966,6 +1977,17 @@ function rootStoreId(root: RootTopologyIdentity): string {
 	}));
 }
 
+/** 为 GitRunner 调用注入 operation 预算：调用方 budget 优先，否则取当前 context 的剩余预算。 */
+function injectOperationBudget(options: GitRunOptions): GitRunOptions {
+	if (options.timeoutMs !== undefined) return options;
+	const budget = operationProcessOptions(configuredTimeout("PI_UNDO_GIT_TIMEOUT_MS", 120_000));
+	return {
+		...options,
+		timeoutMs: budget.timeoutMs,
+		...(options.signal === undefined && budget.signal !== undefined ? { signal: budget.signal } : {}),
+	};
+}
+
 function privateGitEnvironment(
 	gitDirectory: string,
 	workTree: string,
@@ -2242,6 +2264,7 @@ async function mapConcurrentOrdered<T, R>(
 			const index = nextIndex;
 			nextIndex += 1;
 			try {
+				checkOperation();
 				result[index] = await operation(values[index]!);
 			} catch (error) {
 				if (!failed) failure = error;

package/src/status-reporter.ts

@@ -15,11 +15,40 @@ export interface StatusContext {
 /** 统一管理 footer、通知与 prompt 回填，避免状态文本泄露运行时细节。 */
 export class StatusReporter {
 	private readonly context: StatusContext;
+	private progress: { opId: string; phase: string; started: number } | undefined;
+	private progressTimer: ReturnType<typeof setInterval> | undefined;
 
 	constructor(context: StatusContext) {
 		this.context = context;
 	}
 
+	startOperation(opId: string): void {
+		this.endOperation();
+		this.progress = { opId, phase: "等待检查点", started: Date.now() };
+		this.progressTimer = setInterval(() => this.renderProgress(), 1_000);
+		this.progressTimer.unref();
+	}
+
+	setOperationPhase(phase: string): void {
+		if (this.progress === undefined) return;
+		this.progress.phase = phase;
+	}
+
+	endOperation(): void {
+		if (this.progressTimer !== undefined) clearInterval(this.progressTimer);
+		this.progressTimer = undefined;
+		this.progress = undefined;
+	}
+
+	private renderProgress(): void {
+		const progress = this.progress;
+		if (progress === undefined) return;
+		const scanned = /^scan_directories:(\d+)$/.exec(progress.phase)?.[1];
+		const label = scanned !== undefined ? `扫描目录 ${scanned}`
+			: progress.phase.startsWith("discover_roots") ? "扫描目录" : phaseLabels[progress.phase] ?? progress.phase;
+		this.setStatus(`${label} ${Math.floor((Date.now() - progress.started) / 1_000)}s op:${progress.opId}`);
+	}
+
 	setReady(undoCount: number, redoCount: number): void {
 		this.setStatus(`ready undo:${undoCount} redo:${redoCount}`);
 	}
@@ -41,15 +70,19 @@ export class StatusReporter {
 	}
 
 	clear(): void {
+		this.endOperation();
 		this.context.ui.setStatus("pi-undo", undefined);
 	}
 
 	result(result: OperationResult, totalMs?: number): void {
+		const opId = this.progress?.opId;
+		this.endOperation();
 		const details = result.message === undefined ? "" : ` ${sanitize(result.message)}`;
 		const timing = totalMs !== undefined && totalMs >= 1_000
 			? formatTiming(totalMs, result.timings)
 			: "";
-		const message = sanitize(`${result.code} files:${result.changedFiles}${details}${timing}`);
+		const diagnostic = opId !== undefined && (result.code !== "ok" || (totalMs ?? 0) >= 1_000) ? ` op:${opId}` : "";
+		const message = sanitize(`${result.code} files:${result.changedFiles}${details}${timing}${diagnostic}`);
 		const type = result.code === "ok" || result.code === "noop"
 			? "info"
 			: result.code === "recovery_required" ? "error" : "warning";
@@ -72,6 +105,13 @@ export class StatusReporter {
 	}
 }
 
+const phaseLabels: Record<string, string> = {
+	idle: "等待 Agent 停止", checkpoint: "等待检查点", lock: "等待工作区锁",
+	capture: "捕获安全快照", load: "读取快照", plan: "准备恢复", journal: "记录事务",
+	navigate: "切换会话", apply: "恢复文件", cursor: "提交历史", commit: "完成持久化",
+	compensate: "恢复操作前状态", unlock: "释放工作区锁", discover_gitlinks: "检查子模块", scan_directories: "扫描目录",
+};
+
 function formatTiming(totalMs: number, timings: OperationResult["timings"]): string {
 	const phases = [...(timings ?? [])]
 		.filter((timing) => timing.durationMs >= 5)

package/src/workspace-lock.ts

@@ -3,6 +3,8 @@ import { mkdir, readFile, readdir, rename, rm, rmdir, stat, unlink, writeFile }
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
+import { checkOperation, operationHasUnconfirmedExit } from "./operation-context.ts";
+
 const LEGACY_OWNER_FILE = "owner.json";
 const OWNER_PREFIX = "owner.";
 const OWNER_SUFFIX = ".json";
@@ -86,7 +88,7 @@ export class WorkspaceLock {
 			try {
 				return await fn();
 			} finally {
-				await lease.release();
+				if (!operationHasUnconfirmedExit()) await lease.release();
 			}
 		});
 	}
@@ -100,6 +102,7 @@ export class WorkspaceLock {
 		const deadline = this.clock() + this.acquireTimeoutMs;
 
 		while (true) {
+			checkOperation();
 			const owner: LockOwner = {
 				pid: process.pid,
 				processStartedAt: currentProcessStartedAt(this.clock()),