pi-resume 1.4.0 → 1.5.0

package/CHANGELOG.md

@@ -0,0 +1,40 @@
+# Changelog
+
+## 1.5.0
+- `/rn` / `/rp` position is shown in the footer status (`session 3/80`); the
+  transient notice was being replaced by pi's own "Resumed session".
+- `pi --rN` waits for the provider refresh at most 15 s before resuming.
+- Picker rows leave room for the duplicate suffix ` (N)` so it is never clipped.
+- New interactive e2e suite (`npm run test:tui`): a real pi TUI in tmux with an
+  isolated agent dir — startup flag, `/rn` `/rp` walk stability, `/r1`, `/rs`
+  picker (single-line rows at 80 cols, arrow navigation, Enter, duplicates),
+  `/rs set`, `/rds`. Runs in CI.
+
+## 1.4.0
+- Refactor only: `extensions/index.ts` split into `src/ext/*` (one module per
+  concern), shared `loadSessions()`, all user-facing strings in `messages.ts`,
+  pure `applySetting()` / `resolveStartupRank()` with unit tests.
+
+## 1.3.2
+- Fix: `pi --rN` / `--rn` never actually switched (startup context has no
+  `switchSession`). Now dispatches `/rN` as a command after the provider
+  refresh finishes (switching mid-refresh crashed pi with an AbortError).
+
+## 1.3.1
+- Fix: `/rn` `/rp` walk by creation time instead of mtime — resuming bumps
+  mtime and made the walk ping-pong between two sessions.
+
+## 1.3.0
+- Legacy subagent fork sessions migrated into `<parent>/forks/`.
+- Sessions open in another live pi are skipped by navigation and marked in
+  `/rs`; pid-reuse guard for the registry.
+
+## 1.2.x
+- `/r3`–`/r5` removed (`/rn` `/rp` cover it); docs fixes.
+
+## 1.1.0
+- `/rn` `/rp` step navigation; `pi --r N` / `--r1` / `--rn` startup flags.
+- Fix: picker rows wrapped on narrow terminals and broke cursor navigation.
+- Fix: duplicate picker rows resolved to the wrong session.
+- Session renames appended past the head window are picked up (tail read).
+- Metadata cache keyed by (file, mtime, size); CI.

package/README.md

@@ -72,8 +72,9 @@ 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.
+sessions. `/r1` and `/rs` still rank by last activity (mtime). The footer status
+shows your position (`session 3/80`) after each step. At the ends of the list a
+notice is shown and nothing is switched.
 
 ### `/rs` — Smart Resume
 
@@ -153,3 +154,11 @@ npm test
 ## License
 
 MIT
+
+## Development
+
+```bash
+npm test          # unit tests (pure modules)
+npm run test:tui  # interactive e2e: real pi TUI in tmux, isolated agent dir (needs tmux)
+docker build -f tests/e2e/Dockerfile -t e2e . && docker run --rm e2e   # install/CLI e2e
+```

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-resume",
-  "version": "1.4.0",
-  "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",
+  "version": "1.5.0",
+  "description": "Fast session resume for pi coding agent \u2014 /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",
   "keywords": [
@@ -19,6 +19,7 @@
     "extensions",
     "src",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "pi": {
@@ -42,6 +43,7 @@
     "typecheck": "tsc --noEmit",
     "test": "node --experimental-vm-modules --test tests/*.test.ts",
     "check": "npm run typecheck && npm pack --dry-run",
-    "prepublishOnly": "npm run check"
+    "prepublishOnly": "npm run check",
+    "test:tui": "node --experimental-vm-modules --test tests/tui/tui.test.ts"
   }
 }

package/src/ext/context.ts

@@ -54,12 +54,18 @@ export async function switchTo(
   ctx: ExtensionCommandContext,
   target: StatResult,
   announce: (label: string) => string = MSG.resumed,
+  status?: string,
 ): Promise<{ cancelled: boolean }> {
   const meta = await readSessionMeta(target.file, target);
   const label = truncate(sessionLabel(meta), LABEL_MAX);
   return ctx.switchSession(target.file, {
     withSession: async (newCtx) => {
+      // pi's own "Resumed session" notice lands right after ours and replaces
+      // it, so the durable part (position) goes to the footer status instead.
       newCtx.ui.notify(announce(label), "info");
+      newCtx.ui.setStatus(STATUS_KEY, status);
     },
   });
 }
+
+export const STATUS_KEY = "pi-resume";

package/src/ext/resume.ts

@@ -42,7 +42,7 @@ export async function resumeStep(dir: 1 | -1, ctx: ExtensionCommandContext): Pro
     ctx.ui.notify(dir === 1 ? MSG.atOldest : MSG.atNewest, "info");
     return;
   }
-  await switchTo(ctx, target, (label) => MSG.resumedAt(pos, total, label));
+  await switchTo(ctx, target, (label) => MSG.resumedAt(pos, total, label), `session ${pos}/${total}`);
 }
 
 export function registerResumeCommands(pi: ExtensionAPI): void {

package/src/ext/startup.ts

@@ -12,6 +12,9 @@ import { currentSessionFile, sessionDirFor } from "./context.ts";
 import { MAX_RANK, ordinal } from "./resume.ts";
 import { MSG } from "./messages.ts";
 
+/** Upper bound on waiting for the provider refresh before resuming anyway. */
+const REFRESH_WAIT_MAX_MS = 15_000;
+
 export type FlagReader = (name: string) => unknown;
 
 /**
@@ -62,9 +65,10 @@ async function resumeAtStartup(pi: ExtensionAPI, ctx: ExtensionContext): Promise
   // dispatch our own slash command to run with a command context. Switching
   // while a provider refresh is in flight aborts it and crashes pi (uncaught
   // AbortError from the provider), so let the refresh finish first.
-  try {
-    await ctx.modelRegistry.refresh();
-  } catch {}
+  await Promise.race([
+    ctx.modelRegistry.refresh().catch(() => {}),
+    new Promise((r) => setTimeout(r, REFRESH_WAIT_MAX_MS)),
+  ]);
   pi.sendUserMessage(`/r${wanted.rank}`, { expandPromptTemplates: true });
 }
 

package/src/format.ts

@@ -34,11 +34,12 @@ export function sessionLabel(e: SessionEntry): string {
  * Reserves space for the age/size columns and the picker's cursor/indent
  * so rows never wrap (wrapped rows break selection navigation in the TUI).
  */
-// Columns the TUI select list draws around each row (cursor arrow, indent,
-// uniquify suffix like " (12)"). Keeping rows shorter than
-// terminal width minus this margin prevents line wrapping, which would
-// break cursor navigation in the picker.
-const PICKER_ROW_MARGIN = 6;
+// Columns reserved at the end of each picker row: the select component's
+// cursor/indent (~4) plus the uniquify suffix " (NN)" (5) that
+// buildPickerItems() may append to duplicate rows. Rows longer than the
+// terminal width either wrap (breaking cursor navigation) or get clipped by
+// the component (hiding the suffix), so the label is truncated to fit.
+const PICKER_ROW_MARGIN = 10;
 
 /** Label marker for a session currently open in another pi process. */
 export const OPEN_ELSEWHERE_MARK = "⦿ ";