@davideasden/pi-undo 0.2.21 → 0.2.24

package/README.md

@@ -314,7 +314,7 @@ Install the [Rust toolchain](https://rustup.rs/) before building or updating a n
 npm run build:native
 ```
 
-`npm run build:native` creates `pi-undo-fs` for the current build platform under `native/pi-undo-fs/target/release/`. The release workflow builds arm64 and x64 versions on macOS, Linux, and Windows runners, renames them consistently under `native/bin/`, and packages all six binaries in the npm package.
+`npm run build:native` creates `pi-undo-fs` for the current build platform under `native/pi-undo-fs/target/release/`. The `Native binaries` workflow builds arm64 and x64 versions on macOS, Linux, and Windows runners, verifies the full six-binary matrix, and uploads them as workflow artifacts. The `Publish to npm` workflow publishes the package when a `v*` tag is pushed, using the binaries committed under `native/bin/`.
 
 For local development on the current platform, copy the generated file into `native/bin/` and rename it for the platform. For example, a Windows build must use the corresponding `.exe` filename.
 
@@ -323,7 +323,7 @@ cp native/pi-undo-fs/target/release/pi-undo-fs native/bin/pi-undo-fs-darwin-arm6
 chmod +x native/bin/pi-undo-fs-darwin-arm64
 ```
 
-The published package must contain all six platform binaries listed under Requirements. CI verifies them before packaging and publishes the complete CI-built npm package when a `v*` tag is pushed. The npm package must configure Trusted Publishing (OIDC) for this GitHub Actions workflow. If no binary is available for the current platform, the extension automatically uses the TypeScript fallback.
+Every precompiled binary listed under Requirements must be committed under `native/bin/` to be part of a release. The `Native binaries` workflow verifies the complete six-binary matrix before uploading artifacts, and the `Publish to npm` workflow publishes the package on a `v*` tag push. The npm package must configure Trusted Publishing (OIDC) for the `Publish to npm` workflow. If no binary is available for the current platform, the extension automatically uses the TypeScript fallback.
 
 ### Project Layout
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@davideasden/pi-undo",
-	"version": "0.2.21",
+	"version": "0.2.24",
 	"description": "Persistent workspace undo and redo for Pi",
 	"license": "MIT",
 	"type": "module",

package/src/controller.ts

@@ -452,7 +452,9 @@ export class UndoControllerImpl implements UndoController {
 	}
 
 	async beforeTree(event: SessionBeforeTreeEvent): Promise<SessionBeforeTreeResult | undefined> {
-		if (!this.dependencies.isAgentIdle()) {
+		// Pi 0.86+ 在树导航期间也会让 isIdle() 暂时返回 false；只有 pi-undo
+		// 已经记录了尚未 settle 的 run 时，才需要中止并取消导航。
+		if (this.staged !== undefined) {
 			await this.dependencies.abortAgent();
 			return { cancel: true };
 		}

package/src/pi-runtime.ts

@@ -285,7 +285,13 @@ function rebuildControllerState(
 	identity: SessionFileIdentity,
 ): ControllerInitialState {
 	const state = sessionStateFor(manager);
-	const checkpoints = state.getCheckpoints(identity);
+	const branch = physicalBranch(manager, manager.getLeafId());
+	const checkpoints = checkpointFrontierAfterDetachedRun(
+		manager,
+		identity,
+		branch,
+		state.getCheckpoints(identity),
+	);
 	const cursor = state.getCursor(identity);
 	let undoStack = [...checkpoints];
 	if (cursor !== null) {
@@ -305,12 +311,34 @@ function rebuildControllerState(
 		if (sourceCursor === undefined) throw new Error("cursor redo safety manifest 缺失");
 		return { checkpoint, targetManifestId: sourceCursor.rollbackManifestId };
 	});
-	const branch = physicalBranch(manager, manager.getLeafId());
 	const lastBarrier = findLastIndex(branch, (entry) => entry.type === "custom" && entry.customType === "pi-undo:barrier");
 	const lastCheckpoint = findLastIndex(branch, (entry) => entry.type === "custom" && entry.customType === "pi-undo:checkpoint");
 	return { undoStack, redoStack, historyPaused: lastBarrier > lastCheckpoint };
 }
 
+/**
+ * redo 或树导航后的新 run 会挂在 cursor 后面，使前一个 checkpoint 脱离当前物理 branch。
+ * start entry 保存了 run 前的逻辑叶，利用它恢复可信的 checkpoint frontier，再接上当前 branch。
+ */
+function checkpointFrontierAfterDetachedRun(
+	manager: ReadonlySessionManager,
+	identity: SessionFileIdentity,
+	branch: readonly Record<string, unknown>[],
+	current: readonly CheckpointRecord[],
+): CheckpointRecord[] {
+	const start = [...branch].reverse().find((entry) => entry.type === "custom" && entry.customType === "pi-undo:start");
+	if (start === undefined || !isRecord(start.data)) return [...current];
+	const sourceLogicalLeaf = start.data.sourceLogicalLeaf;
+	if (typeof sourceLogicalLeaf !== "string") return [...current];
+	const sourceCheckpoint = findCheckpointByEndLeaf(manager, identity, sourceLogicalLeaf);
+	if (sourceCheckpoint === undefined) return [...current];
+	const inherited = checkpointFrontierById(manager, identity, sourceCheckpoint.checkpointId);
+	return [
+		...inherited,
+		...current.filter((checkpoint) => !inherited.some((candidate) => candidate.checkpointId === checkpoint.checkpointId)),
+	].filter((checkpoint, index, all) => all.findIndex((candidate) => candidate.checkpointId === checkpoint.checkpointId) === index);
+}
+
 function checkpointFrontierById(
 	manager: ReadonlySessionManager,
 	identity: SessionFileIdentity,