pi-rewind-hook 1.8.0 → 1.8.1

package/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.8.1] - 2026-04-05
+
+### Fixed
+- Migrated lifecycle handling to pi v0.65+ by replacing removed `session_switch`/`session_fork` usage with `session_start` reason-based handling
+- Persisted fork rewind state through `session_start` (`reason: "fork"`) using hidden `rewind-fork-pending` entries so undo/current state is restored in the child session after extension reload
+- Fixed install completion hint to use `/fork` (not deprecated `/branch`)
+- Fixed installer cleanup for Windows-style extension paths when removing explicit rewind entries from `settings.json`
+- Added explicit installer error for redirect responses missing a `location` header
+- Preserved non-`Error` failure messages in installer warning/fatal error output
+
+### Changed
+- Updated README minimum supported pi version to v0.65.0+
+- Clarified README installation flow around auto-discovery and optional legacy settings cleanup
+
 ## [1.8.0] - 2026-04-03
 
 ### Changed

package/README.md

@@ -12,24 +12,24 @@ Rewind metadata lives in the session itself as hidden entries, so rewind history
 
 ## Requirements
 
-- Pi agent v0.35.0+
+- Pi agent v0.65.0+
 - Node.js (for installation)
 - Git repository
 
 ## Installation
 
 ```bash
-npx pi-rewind-hook
+pi install npm:pi-rewind-hook
 ```
 
 This will:
 1. Create `~/.pi/agent/extensions/rewind/`
 2. Download the extension files
-3. Add the extension to your `~/.pi/agent/settings.json`
-4. Migrate any existing hooks config to extensions (if upgrading from an older version)
+3. Auto-discover the extension from the extensions directory (no `settings.json` extension entry required)
+4. Remove legacy hooks/explicit rewind extension entries from `settings.json` if present
 5. Clean up old `hooks/rewind` directory (if present)
 
-Or clone the repo into `~/.pi/agent/extensions/rewind/` — Pi discovers extensions in that directory automatically.
+You can also install with `npx pi-rewind-hook`.
 
 ## Configuration
 

package/index.test.ts

@@ -327,11 +327,12 @@ test("/fork undo restores files into a child session instead of cancelling the f
     const currentSessionRewindOps = harness.currentSession.getEntries().filter((entry) => entry.type === "custom" && entry.customType === "rewind-op");
     assert.equal(currentSessionRewindOps.length, 1);
 
+    const previousSessionFile = harness.currentSession.getSessionFile();
     const childSession = harness.createSession({
       id: "session-2",
-      parentSession: harness.currentSession.getSessionFile(),
+      parentSession: previousSessionFile,
     });
-    await harness.invoke("session_fork", {}, childSession);
+    await harness.invoke("session_start", { reason: "fork", previousSessionFile }, childSession);
 
     const childRewindOps = childSession.getEntries().filter((entry) => entry.type === "custom" && entry.customType === "rewind-op");
     assert.equal(childRewindOps.length, 1);

package/index.ts

@@ -58,6 +58,12 @@ interface RewindOpData {
   undo?: number;
 }
 
+interface RewindForkPendingData {
+  v: 2;
+  current: string;
+  undo?: string;
+}
+
 interface ActivePromptCollector {
   snapshots: string[];
   bindings: BindingTuple[];
@@ -98,6 +104,7 @@ interface ParsedSessionLedger {
   references: ParsedLedgerReference[];
   latestCurrentCommitSha?: string;
   latestUndoCommitSha?: string;
+  latestForkPending?: RewindForkPendingData;
 }
 
 interface SessionLikeMessageEntry {
@@ -212,6 +219,12 @@ function isRewindOpData(value: unknown): value is RewindOpData {
   return data.v === 2 && Array.isArray(data.snapshots);
 }
 
+function isRewindForkPendingData(value: unknown): value is RewindForkPendingData {
+  if (!value || typeof value !== "object") return false;
+  const data = value as Partial<RewindForkPendingData>;
+  return data.v === 2 && typeof data.current === "string" && data.current.length > 0;
+}
+
 function canonicalizePath(value: string): string {
   const resolvedValue = resolve(value);
   try {
@@ -377,12 +390,11 @@ export default function rewindExtension(pi: ExtensionAPI) {
   let lastExact: ExactState | null = null;
   let activeBranchState: ActiveBranchState = {};
   let promptCollector: ActivePromptCollector | null = null;
-  let pendingForkState: PendingResultingState | null = null;
   let pendingTreeState: PendingResultingState | null = null;
   let activePromptText: string | null = null;
-    let newSnapshotsSinceSweep = 0;
-    let sweepRunning = false;
-    let sweepCompletedThisSession = false;
+  let newSnapshotsSinceSweep = 0;
+  let sweepRunning = false;
+  let sweepCompletedThisSession = false;
   let forceConversationOnlyOnNextFork = false;
   let forceConversationOnlySource: string | null = null;
 
@@ -419,11 +431,10 @@ export default function rewindExtension(pi: ExtensionAPI) {
     lastExact = null;
     activeBranchState = {};
     promptCollector = null;
-    pendingForkState = null;
     pendingTreeState = null;
-      activePromptText = null;
-      newSnapshotsSinceSweep = 0;
-      sweepCompletedThisSession = false;
+    activePromptText = null;
+    newSnapshotsSinceSweep = 0;
+    sweepCompletedThisSession = false;
     forceConversationOnlyOnNextFork = false;
     forceConversationOnlySource = null;
     cachedSettings = null;
@@ -672,6 +683,19 @@ export default function rewindExtension(pi: ExtensionAPI) {
     updateStatus(ctx);
   }
 
+  function appendForkPendingState(data: PendingResultingState) {
+    const forkPending: RewindForkPendingData = {
+      v: RETENTION_VERSION,
+      current: data.currentCommitSha,
+    };
+
+    if (data.undoCommitSha) {
+      forkPending.undo = data.undoCommitSha;
+    }
+
+    pi.appendEntry("rewind-fork-pending", forkPending);
+  }
+
   function buildCurrentSessionLedger(ctx: ExtensionContext): ParsedSessionLedger {
     const ledger: ParsedSessionLedger = {
       sessionFile: currentSessionFile ?? "",
@@ -700,6 +724,11 @@ export default function rewindExtension(pi: ExtensionAPI) {
         continue;
       }
 
+      if (rawEntry.type === "custom" && rawEntry.customType === "rewind-fork-pending" && isRewindForkPendingData(rawEntry.data)) {
+        ledger.latestForkPending = rawEntry.data;
+        continue;
+      }
+
       if (rawEntry.type === "label") {
         updateLabelSet(ledger.labeledEntryIds, rawEntry);
       }
@@ -785,6 +814,11 @@ export default function rewindExtension(pi: ExtensionAPI) {
           continue;
         }
 
+        if (entry?.type === "custom" && entry?.customType === "rewind-fork-pending" && isRewindForkPendingData(entry.data)) {
+          ledger.latestForkPending = entry.data;
+          continue;
+        }
+
         if (entry?.type === "label") {
           updateLabelSet(ledger.labeledEntryIds, entry);
         }
@@ -1093,31 +1127,32 @@ export default function rewindExtension(pi: ExtensionAPI) {
     activePromptText = event.prompt;
   });
 
-  pi.on("session_start", async (_event, ctx) => {
+  pi.on("session_start", async (event, ctx) => {
     await initializeForSession(ctx);
-  });
 
-  pi.on("session_switch", async (_event, ctx) => {
-    await initializeForSession(ctx);
-  });
+    if (event.reason !== "fork" || !event.previousSessionFile || !isGitRepo) {
+      return;
+    }
 
-  pi.on("session_fork", async (_event, ctx) => {
-    syncSessionIdentity(ctx);
-    if (!isGitRepo || !pendingForkState) {
-      await reconstructState(ctx);
-      updateStatus(ctx);
+    const previousLedger = await parseSessionLedgerFile(event.previousSessionFile);
+    const pendingFork = previousLedger?.latestForkPending;
+    if (!pendingFork) {
       return;
     }
 
-    const snapshots = [pendingForkState.currentCommitSha];
+    if (!(await commitExists(pendingFork.current))) {
+      return;
+    }
+
+    const snapshots = [pendingFork.current];
     const data: RewindOpData = { v: RETENTION_VERSION, snapshots, current: 0 };
-    if (pendingForkState.undoCommitSha) {
-      data.snapshots.push(pendingForkState.undoCommitSha);
+
+    if (pendingFork.undo && (await commitExists(pendingFork.undo))) {
+      data.snapshots.push(pendingFork.undo);
       data.undo = 1;
     }
 
     appendRewindOp(ctx, data);
-    pendingForkState = null;
     await reconstructState(ctx);
     updateStatus(ctx);
   });
@@ -1238,7 +1273,8 @@ export default function rewindExtension(pi: ExtensionAPI) {
 
     try {
       if (!ctx.hasUI) {
-        pendingForkState = { currentCommitSha: await ensureSnapshotForCurrentWorktree() };
+        const nextState = { currentCommitSha: await ensureSnapshotForCurrentWorktree() };
+        appendForkPendingState(nextState);
         return;
       }
 
@@ -1246,7 +1282,8 @@ export default function rewindExtension(pi: ExtensionAPI) {
       const hasUndo = Boolean(activeBranchState.undoCommitSha && (await commitExists(activeBranchState.undoCommitSha)));
 
       if (shouldForceConversationOnly) {
-        pendingForkState = { currentCommitSha: await ensureSnapshotForCurrentWorktree() };
+        const nextState = { currentCommitSha: await ensureSnapshotForCurrentWorktree() };
+        appendForkPendingState(nextState);
         notify(ctx, `Rewind: using conversation-only fork (keep current files)${forcedBySource ? ` (${forcedBySource})` : ""}`);
         return;
       }
@@ -1267,16 +1304,18 @@ export default function rewindExtension(pi: ExtensionAPI) {
 
       if (choice === "Undo last file rewind") {
         const restore = await restoreCommitExactly(activeBranchState.undoCommitSha!);
-        pendingForkState = {
+        const nextState = {
           currentCommitSha: activeBranchState.undoCommitSha!,
           undoCommitSha: restore.undoCommitSha,
         };
+        appendForkPendingState(nextState);
         notify(ctx, "Files restored to before last rewind");
         return;
       }
 
       if (choice === "Conversation only (keep current files)") {
-        pendingForkState = { currentCommitSha: await ensureSnapshotForCurrentWorktree() };
+        const nextState = { currentCommitSha: await ensureSnapshotForCurrentWorktree() };
+        appendForkPendingState(nextState);
         return;
       }
 
@@ -1286,17 +1325,17 @@ export default function rewindExtension(pi: ExtensionAPI) {
       }
 
       const restore = await restoreCommitExactly(targetCommitSha);
-      pendingForkState = {
+      const nextState = {
         currentCommitSha: targetCommitSha,
         undoCommitSha: restore.undoCommitSha,
       };
+      appendForkPendingState(nextState);
       notify(ctx, "Files restored from rewind point");
 
       if (choice === "Code only (restore files, keep conversation)") {
         return { skipConversationRestore: true };
       }
     } catch (error) {
-      pendingForkState = null;
       notify(ctx, `Rewind failed before fork: ${error instanceof Error ? error.message : String(error)}`, "error");
       return { cancel: true };
     }

package/install.js

@@ -14,6 +14,9 @@ function download(url) {
   return new Promise((resolve, reject) => {
     https.get(url, (res) => {
       if (res.statusCode === 301 || res.statusCode === 302) {
+        if (!res.headers.location) {
+          return reject(new Error(`Redirect response missing location header for ${url}`));
+        }
         return download(res.headers.location).then(resolve).catch(reject);
       }
       if (res.statusCode !== 200) {
@@ -61,9 +64,10 @@ async function main() {
       // Remove rewind from explicit extensions (auto-discovery handles it now)
       if (Array.isArray(settings.extensions)) {
         const before = settings.extensions.length;
-        settings.extensions = settings.extensions.filter(p => 
-          !p.includes("/extensions/rewind")
-        );
+        settings.extensions = settings.extensions.filter((p) => {
+          const normalizedPath = String(p).replace(/\\/g, "/");
+          return !normalizedPath.includes("/extensions/rewind");
+        });
         if (settings.extensions.length < before) {
           console.log("Removed rewind from explicit extensions (auto-discovery handles it)");
           modified = true;
@@ -79,7 +83,8 @@ async function main() {
         fs.writeFileSync(SETTINGS_FILE, JSON.stringify(settings, null, 2) + "\n");
       }
     } catch (err) {
-      console.error(`Warning: Could not update settings.json: ${err.message}`);
+      const message = err instanceof Error ? err.message : String(err);
+      console.error(`Warning: Could not update settings.json: ${message}`);
     }
   }
 
@@ -92,10 +97,11 @@ async function main() {
 
   console.log("\nInstallation complete!");
   console.log("\nThe extension is auto-discovered from ~/.pi/agent/extensions/rewind/");
-  console.log("Restart pi to load the extension. Use /branch to rewind to a checkpoint.");
+  console.log("Restart pi to load the extension. Use /fork to rewind to a checkpoint.");
 }
 
 main().catch((err) => {
-  console.error(`\nInstallation failed: ${err.message}`);
+  const message = err instanceof Error ? err.message : String(err);
+  console.error(`\nInstallation failed: ${message}`);
   process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-rewind-hook",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Rewind extension for Pi agent - automatic git checkpoints with file/conversation restore",
   "bin": {
     "pi-rewind-hook": "./install.js"