pi-resume 1.3.0 → 1.3.2

package/README.md

@@ -55,6 +55,10 @@ pi --r 2   # same, numeric form
 Same ranking as `/r1`/`/r2`. Invalid values show an error and start a normal
 new session. Interactive mode only (ignored with `-p`).
 
+Under the hood the flag waits for the provider/model refresh to finish and then
+dispatches `/rN` as a command (session switching is only available to commands,
+and switching mid-refresh would abort it).
+
 ### `/rn` / `/rp` — Step Navigation
 
 Walk the mtime-sorted session list relative to the **current** session:
@@ -63,7 +67,12 @@ Walk the mtime-sorted session list relative to the **current** session:
 - `/rp` — previous session (one step **newer**)
 
 Useful after `/r1` lands on the wrong session: keep pressing `/rn` to walk back
-in time instead of recalculating ranks. A `(pos/total)` indicator is shown on
+in time instead of recalculating ranks.
+
+`/rn` / `/rp` walk by **creation time** (the timestamp in the session filename),
+not by mtime: resuming a session makes extensions append to it, which bumps its
+mtime and would otherwise reshuffle the list into a ping-pong between two
+sessions. `/r1` and `/rs` still rank by last activity (mtime). A `(pos/total)` indicator is shown on
 each switch. At the ends of the list a notice is shown and nothing is switched.
 
 ### `/rs` — Smart Resume

package/extensions/index.ts

@@ -37,7 +37,7 @@ import {
 import { formatEntry, truncate, sessionLabel, formatSize } from "../src/format.ts";
 import { loadConfig, saveConfig, clampPage, clampDays } from "../src/config.ts";
 import { getSessionDir } from "../src/session-dir.ts";
-import { rankTarget, navTarget, parseRankFlag, type Hidden } from "../src/nav.ts";
+import { rankTarget, navTarget, sortByCreated, parseRankFlag, type Hidden } from "../src/nav.ts";
 import { buildPickerItems, resolveChoice } from "../src/picker.ts";
 import { markActive, unmarkActive, activeElsewhere } from "../src/active.ts";
 import { findLegacyForks, migrateLegacyForks } from "../src/migrate.ts";
@@ -188,7 +188,19 @@ export default function (pi: ExtensionAPI) {
     if (event.reason !== "startup") return;
     void migrateForksInBackground(ctx).catch(() => {});
     const rank = startupRank(ctx);
-    if (rank !== undefined) await resumeRank(rank, ctx);
+    if (rank === undefined) return;
+    if (!ctx.hasUI) {
+      ctx.ui.notify("--r/--rn: session resume needs interactive mode", "error");
+      return;
+    }
+    // session_start only gets a plain ExtensionContext (no switchSession);
+    // dispatch our own slash command so it runs with a command context.
+    // Switching while a provider refresh is in flight aborts it and crashes
+    // pi (uncaught AbortError from the provider), so wait for it to settle.
+    try {
+      await ctx.modelRegistry.refresh();
+    } catch {}
+    pi.sendUserMessage(`/r${rank}`, { expandPromptTemplates: true });
   });
 
   // Fires on switch (followed by session_start) and on exit.
@@ -214,7 +226,9 @@ export default function (pi: ExtensionAPI) {
 
         const currentFile = ctx.sessionManager.getSessionFile() ?? undefined;
         const hidden = await hiddenPredicate();
-        const { target, pos, total } = await navTarget(files, currentFile, dir, hidden);
+        // Walk by creation time: resuming bumps mtime, which would reshuffle
+        // an mtime-ordered walk into a ping-pong between two sessions.
+        const { target, pos, total } = await navTarget(sortByCreated(files), currentFile, dir, hidden);
 
         if (!target) {
           ctx.ui.notify(edge, "info");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-resume",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Fast session resume for pi coding agent — /r1,/r2 ranked resume, /rn and /rp step navigation, pi --r1/--rn startup flags, /rs paginated picker, /rds subagent session cleanup; skips sessions open in other pi instances, tidies legacy subagent forks",
   "type": "module",
   "license": "MIT",
@@ -34,8 +34,8 @@
     "@earendil-works/pi-tui": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
+    "@earendil-works/pi-coding-agent": "^0.84.4",
+    "@earendil-works/pi-tui": "^0.84.4",
     "typescript": "^5.0.0"
   },
   "scripts": {

package/src/nav.ts

@@ -16,6 +16,36 @@ export type Hidden<T extends FileRef> = (f: T) => Promise<boolean>;
 
 const never = async () => false;
 
+// pi session filenames: `<ISO timestamp with '-' instead of ':' and '.'>_<uuid>.jsonl`
+// e.g. 2026-08-10T14-31-05-921Z_019fec15-....jsonl
+const FILENAME_TS_RE = /(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})Z_/;
+
+/**
+ * Session creation time from the filename (immutable), or undefined if the
+ * name doesn't follow pi's pattern.
+ */
+export function createdAtFromName(file: string): number | undefined {
+  const base = file.slice(file.lastIndexOf("/") + 1);
+  const m = FILENAME_TS_RE.exec(base);
+  if (!m) return undefined;
+  const t = Date.parse(`${m[1]}T${m[2]}:${m[3]}:${m[4]}.${m[5]}Z`);
+  return isNaN(t) ? undefined : t;
+}
+
+/**
+ * Stable order for step navigation: newest-created first.
+ *
+ * mtime is NOT stable for walking: resuming a session makes extensions append
+ * entries (e.g. state on session_start), which bumps its mtime to "now" and
+ * reshuffles the list, so /rn, /rn, /rn ping-pongs between two sessions.
+ * Creation time never changes, so a walk over it is predictable. Files
+ * without a parseable timestamp fall back to mtime.
+ */
+export function sortByCreated<T extends FileRef & { mtime: Date }>(files: T[]): T[] {
+  const key = (f: T) => createdAtFromName(f.file) ?? f.mtime.getTime();
+  return [...files].sort((a, b) => key(b) - key(a));
+}
+
 /**
  * Rank-th most recent visible session, current excluded (rank 1 = latest).
  * Returns the target or undefined, plus how many visible candidates were seen.
@@ -36,8 +66,8 @@ export async function rankTarget<T extends FileRef>(
 }
 
 /**
- * Step relative to the current session in the mtime-sorted list, skipping
- * hidden files. dir = 1 → older, dir = -1 → newer. An unsaved current session
+ * Step relative to the current session in the given list (callers pass
+ * sortByCreated() output for a stable walk), skipping hidden files. dir = 1 → older, dir = -1 → newer. An unsaved current session
  * (not in the list) is treated as the newest. `pos`/`total` are raw list
  * indices (1-based) for the on-screen indicator.
  */