pisesh 0.1.12 → 0.1.13

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.13] - 2026-08-01
+
+### Added
+- Press `o` to resume with the model and thinking recorded in the session while `Enter` uses current defaults.
+- Show the current-default and original-session resume modes in the session details view.
+- Support `PI_AGENT_DIR` and `PI_SESSION_DIR`, including flat custom session directories.
+- Add `pisesh --version` and `pisesh --clean-favorites`; press `x` in the TUI to remove stale favorites.
+- Report successful orphan-call repairs and stop with a visible error when a session cannot be repaired safely.
+
+### Fixed
+- Resume favorite sessions with the current default provider, model, and thinking level instead of restoring stale values recorded in the session.
+- Fall back to pi's native session restore when the settings file is unavailable or invalid.
+
 ## [0.1.12] - 2026-07-20
 
 ### Fixed
@@ -14,39 +27,39 @@ All notable changes to this project will be documented in this file.
 - `/sesh` now launches the CLI bundled with the pi package instead of requiring `pisesh` on the user's `PATH`.
 - Clarified that the standalone `pisesh` shell command requires `npm install -g pisesh`.
 
-## [0.1.10] — 2026-06-09
+## [0.1.10] - 2026-06-09
 
 ### Fixed
-- **Resume no longer crashes on sessions interrupted mid-tool-call.** If a session ended while a tool call was still in flight (e.g. an image generation cut off by a usage limit or a closed window), its transcript held a tool call with no recorded result. On resume, pi would re-fire that dead tool and the spawned process could exit non-zero — surfacing as `pisesh exited with code 1`, repeatedly. `resumeSession` now heals the target session first: every orphaned tool call gets a synthetic `[interrupted]` result injected before pi is spawned, so the resumed history is always well-formed and no dead tool is re-run. Idempotent, never throws, and writes a one-time `.bak-orphanheal` backup of the session before modifying it.
+- **Resume no longer crashes on sessions interrupted mid-tool-call.** If a session ended while a tool call was still in flight (e.g. an image generation cut off by a usage limit or a closed window), its transcript held a tool call with no recorded result. On resume, pi would re-fire that dead tool and the spawned process could exit non-zero, surfacing as `pisesh exited with code 1`, repeatedly. `resumeSession` now heals the target session first: every orphaned tool call gets a synthetic `[interrupted]` result injected before pi is spawned, so the resumed history is always well-formed and no dead tool is re-run. Idempotent, never throws, and writes a one-time `.bak-orphanheal` backup of the session before modifying it.
 
-## [0.1.9] — 2026-06-03
+## [0.1.9] - 2026-06-03
 
 ### Fixed
 - Name / cwd editor (`e`) now has a real caret. Arrow keys (and `Home` / `End`) move inside the text you already typed, so you can insert or delete in the middle instead of only at the end. Backspace, forward `Delete`, and inserts all act at the caret. Cursor moves by whole code points, so CJK and emoji never get split.
 
-## [0.1.4] — 2026-06-03
+## [0.1.4] - 2026-06-03
 
 ### Added
-- **`Here` tab** — filters the list to sessions whose effective cwd matches the directory pisesh was launched from. Tab order is now **★ Favorites → Today → Here → All**.
-- **Inline rename (`e`)** — set a custom display title that overrides the first-prompt label; renamed sessions are marked with a cyan `✎` in the list.
-- **Edit cwd (`p`)** — arrow-key directory browser to re-point the working directory pi resumes into (also drives the `Here` filter).
+- **`Here` tab** filters the list to sessions whose effective cwd matches the directory pisesh was launched from. Tab order is now **★ Favorites → Today → Here → All**.
+- **Inline rename (`e`)** sets a custom display title that overrides the first-prompt label; renamed sessions are marked with a cyan `✎` in the list.
+- **Edit cwd (`p`)** provides an arrow-key directory browser to re-point the working directory pi resumes into (also drives the `Here` filter).
 - Per-session overrides (custom title / cwd) persist to `~/.pi/agent/pisesh-meta.json`, keyed by session id. Session jsonl files remain read-only.
 - README terminal screenshots for the list view, rename panel, and cwd browser.
 
-## [0.1.0] — 2026-05-31
+## [0.1.0] - 2026-05-31
 
 Initial release.
 
 ### Added
-- `pisesh` CLI binary — keyboard-driven TUI that lists every pi session under `~/.pi/agent/sessions/`
+- `pisesh` CLI binary with a keyboard-driven TUI that lists every pi session under `~/.pi/agent/sessions/`
 - Tabs: **★ Favorites**, **Today**, **All**
 - Star / unstar with `f` or Space; favorites persist to `~/.pi/agent/favorites.json`
 - Search across id / project / first user prompt with `/`
 - Session details view (`d`): full prompt, file path, byte size, timestamps
 - `Enter` resumes the selected session via `pi --session <id> --session-dir <dir>` in the original cwd
 - `[NOW]` badge marks the session belonging to the pi instance that spawned pisesh (set via `PISESH_CURRENT_SESSION` env var)
-- Alternate screen buffer (`\x1b[?1049h`) — exit restores terminal byte-for-byte; no scrollback pollution
+- Alternate screen buffer (`\x1b[?1049h`) so exit restores terminal byte-for-byte; no scrollback pollution
 - CJK-aware truncation and padding (Hangul / CJK ideographs / emoji counted as 2 cells)
 - Signal handlers (`SIGINT`, `SIGTERM`, `exit`) restore cursor + main buffer on unexpected exit
 - Non-TUI CLI: `--list`, `--json`, `--star <id>`, `--unstar <id>`, `--help`
-- Pi extension at `extensions/sesh.ts` — registers `/sesh` slash command which spawns pisesh inside pi via `ui.custom` + `tui.stop()`
+- Pi extension at `extensions/sesh.ts` registers `/sesh` slash command which spawns pisesh inside pi via `ui.custom` + `tui.stop()`

package/README.md

@@ -45,7 +45,7 @@ Pi accumulates sessions across many working directories: your home, several proj
 - You re-open the wrong session and pollute it with unrelated context
 - You waste time searching by timestamp guessing
 
-pisesh is a **single-file Node script** (no dependencies, ~900 LoC) that gives you everything `pi --resume` doesn't.
+pisesh is a **single-file Node script** (no dependencies, ~1,100 LoC) that gives you everything `pi --resume` doesn't.
 
 ### Value at a glance
 
@@ -61,7 +61,7 @@ pisesh is a **single-file Node script** (no dependencies, ~900 LoC) that gives y
 | Read Korean / Chinese / Japanese prompts   | Display-width-aware truncation; columns never blow up on CJK                 |
 | Open from anywhere                         | Run as standalone `pisesh` shell command, or `/sesh` inside pi               |
 | Zero install pain                          | No build step, no native deps, runs on Node 18+ everywhere                   |
-| Trust it with your history                 | pisesh writes only two small JSON files (favorites + overrides); session jsonl files are read-only |
+| Trust it with your history                 | favorites and overrides stay in sidecar JSON; session history changes only for orphan-call repair |
 
 ## Getting started
 
@@ -100,7 +100,9 @@ For local pi testing, run `pi install .` from the cloned repository so the exten
 | `↑` `↓` / `j` `k`            | move cursor                                                  |
 | `Tab` / `h` / `l`            | switch tab (`★ Favorites` → `Today` → `Here` → `All`)         |
 | `f` / `Space`                | star / unstar the selected session                           |
-| `Enter`                      | resume the session; runs `pi --session <id>` in its (or the overridden) cwd |
+| `x`                          | remove favorites whose session files no longer exist         |
+| `Enter`                      | resume using the current default model and thinking settings  |
+| `o`                          | resume using the model and thinking recorded in the session   |
 | `e`                          | edit name: set a custom display title, shown with `✎` in the list |
 | `p`                          | edit cwd with an arrow-key directory browser; sets the resume / `Here` dir |
 | `d`                          | session details (full prompt, file, byte size, timestamps)   |
@@ -120,6 +122,8 @@ pisesh --list                  # print starred session IDs (one per line)
 pisesh --json                  # full favorites file as JSON
 pisesh --star <partial-uuid>   # star a session from a script
 pisesh --unstar <partial-uuid> # unstar
+pisesh --clean-favorites       # remove favorites whose sessions are gone
+pisesh --version               # print installed version
 pisesh --help
 ```
 
@@ -138,6 +142,8 @@ pisesh --help
 | Storage             | Two JSON files: `~/.pi/agent/favorites.json` (starred ids) + `~/.pi/agent/pisesh-meta.json` (per-session title / cwd overrides) |
 | Session discovery   | Direct filesystem scan of `~/.pi/agent/sessions/<projectSlug>/*.jsonl`; first 96 KB parsed       |
 | Process model       | Slash command pauses pi's TUI, spawns pisesh with inherited stdio, restarts pi on exit           |
+| Resume settings     | `Enter` uses current defaults; `o` preserves the model and thinking recorded in the session         |
+| Custom paths        | Honors `PI_AGENT_DIR` and `PI_SESSION_DIR`, including a flat custom session directory                |
 
 ### What it explicitly does **not** depend on
 
@@ -150,9 +156,9 @@ pisesh --help
 
 | What       | Where                                                       |
 | ---------- | ----------------------------------------------------------- |
-| Favorites  | `~/.pi/agent/favorites.json`                                |
-| Overrides  | `~/.pi/agent/pisesh-meta.json` (per-session custom title / cwd, keyed by session id) |
-| Sessions   | `~/.pi/agent/sessions/<projectSlug>/<timestamp>_<uuid>.jsonl` (pi's native layout; pisesh never writes here) |
+| Favorites  | `$PI_AGENT_DIR/favorites.json` (defaults to `~/.pi/agent/favorites.json`) |
+| Overrides  | `$PI_AGENT_DIR/pisesh-meta.json` (per-session custom title / cwd, keyed by session id) |
+| Sessions   | `$PI_SESSION_DIR`, or `$PI_AGENT_DIR/sessions` by default (repaired only when an orphaned tool call would break resume) |
 
 Favorites file shape:
 

package/bin/pisesh

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 // pisesh — pi session bookmark & resume TUI
 // Tabs: ★ Favorites / Today / Here / All
-// Storage: ~/.pi/agent/favorites.json   (starred session ids)
-//          ~/.pi/agent/pisesh-meta.json (per-session title / cwd overrides)
-// Sessions: ~/.pi/agent/sessions/<projectSlug>/<ts>_<uuid>.jsonl
+// Storage: $PI_AGENT_DIR/favorites.json   (starred session ids)
+//          $PI_AGENT_DIR/pisesh-meta.json (per-session title / cwd overrides)
+// Sessions: $PI_SESSION_DIR or $PI_AGENT_DIR/sessions
 
 'use strict';
 
@@ -15,9 +15,20 @@ const readline = require('readline');
 
 // ── Paths ─────────────────────────────────────────────
 const HOME = os.homedir();
-const SESSIONS_ROOT = path.join(HOME, '.pi/agent/sessions');
-const FAV_FILE = path.join(HOME, '.pi/agent/favorites.json');
-const META_FILE = path.join(HOME, '.pi/agent/pisesh-meta.json');
+const AGENT_DIR = path.resolve(process.env.PI_AGENT_DIR || path.join(HOME, '.pi/agent'));
+const SESSIONS_ROOT = path.resolve(process.env.PI_SESSION_DIR || path.join(AGENT_DIR, 'sessions'));
+const FAV_FILE = path.join(AGENT_DIR, 'favorites.json');
+const META_FILE = path.join(AGENT_DIR, 'pisesh-meta.json');
+const SETTINGS_FILE = path.join(AGENT_DIR, 'settings.json');
+const VERSION = (() => {
+  for (const file of [
+    path.resolve(__dirname, '../package.json'),
+    path.join(AGENT_DIR, 'npm/node_modules/pisesh/package.json'),
+  ]) {
+    try { return JSON.parse(fs.readFileSync(file, 'utf8')).version; } catch {}
+  }
+  return 'unknown';
+})();
 
 // Current session id (set by the /sesh extension before spawning). Lets us
 // flag the currently-attached session in the list with a [NOW] badge.
@@ -177,16 +188,29 @@ function readSessionMeta(file) {
 }
 
 function scanSessions() {
-  let projectDirs;
-  try {
-    projectDirs = fs.readdirSync(SESSIONS_ROOT, { withFileTypes: true })
-      .filter(d => d.isDirectory());
-  } catch { return []; }
+  let rootEntries;
+  try { rootEntries = fs.readdirSync(SESSIONS_ROOT, { withFileTypes: true }); }
+  catch { return []; }
+
+  const projectDirs = rootEntries
+    .filter(entry => entry.isDirectory())
+    .map(entry => ({
+      name: entry.name,
+      path: path.join(SESSIONS_ROOT, entry.name),
+      label: decodeProjectSlug(entry.name),
+    }));
+  if (rootEntries.some(entry => entry.isFile() && entry.name.endsWith('.jsonl'))) {
+    projectDirs.unshift({
+      name: path.basename(SESSIONS_ROOT),
+      path: SESSIONS_ROOT,
+      label: CURRENT_CWD || SESSIONS_ROOT,
+    });
+  }
 
   const results = [];
   for (const d of projectDirs) {
-    const projectPath = path.join(SESSIONS_ROOT, d.name);
-    const projectLabel = decodeProjectSlug(d.name);
+    const projectPath = d.path;
+    const projectLabel = d.label;
     let files;
     try { files = fs.readdirSync(projectPath).filter(f => f.endsWith('.jsonl')); }
     catch { continue; }
@@ -225,12 +249,23 @@ function scanSessions() {
   return results;
 }
 
+function cleanStaleFavorites(knownSessions = sessions) {
+  const knownIds = new Set(knownSessions.map(session => session.id));
+  const stale = [...favorites].filter(id => !knownIds.has(id));
+  if (stale.length > 0) {
+    for (const id of stale) favorites.delete(id);
+    saveFavorites(favorites);
+  }
+  return stale;
+}
+
 // ── State ─────────────────────────────────────────────
 let sessions = [];
 let tabs = ['★ Favorites', 'Today', 'Here', 'All'];
 let tabIdx = 0;
 let cursor = 0;
 let filter = '';
+let notice = '';
 let mode = 'list';      // list | filter | details | edit | browse
 // edit mode state (title text editor)
 let editField = '';     // 'title' | 'cwd'
@@ -450,12 +485,15 @@ function renderList() {
   out += ' ' + A.D + '↑↓' + A.R + ' move  '
       + A.D + 'Tab' + A.R + ' tab  '
       + A.D + 'f' + A.R + ' star  '
-      + A.D + 'Enter' + A.R + ' resume  '
+      + A.D + 'x' + A.R + ' clean  '
+      + A.D + 'Enter' + A.R + ' current  '
+      + A.D + 'o' + A.R + ' original  '
       + A.D + 'e' + A.R + ' edit name  '
       + A.D + 'p' + A.R + ' edit cwd  '
       + A.D + 'd' + A.R + ' details  '
       + A.D + '/' + A.R + ' search  '
       + A.D + 'q' + A.R + ' quit' + A.R + '\n';
+  if (notice) out += ' ' + A.cyn + notice + A.R + '\n';
 
   process.stdout.write(out);
 }
@@ -524,6 +562,11 @@ function renderDetails() {
   out += row('cwd', s.effectiveCwd + (s.cwdOverride ? A.cyn + '  (custom)' + A.R : ''), A.mag);
   if (s.cwdOverride) out += row('recorded', s.cwd, A.gry);
   out += row('project', s.project);
+  const defaults = loadResumeDefaults();
+  out += row('Enter uses', defaults
+    ? `${defaults.model || 'session model'} / thinking ${defaults.thinking || 'session value'}`
+    : 'session model and thinking', A.grn);
+  out += row('o uses', 'session-recorded model and thinking', A.gry);
   out += row('size', fmtSize(s.size));
   out += row('file', s.file, A.gry);
   out += '\n ' + A.D + 'first prompt:' + A.R + '\n';
@@ -532,7 +575,8 @@ function renderDetails() {
   for (const line of wrapped) out += '   ' + line + '\n';
 
   out += '\n' + A.gry + '─'.repeat(Math.max(1, W - 1)) + A.R + '\n';
-  out += ' ' + A.D + 'Enter' + A.R + ' resume  '
+  out += ' ' + A.D + 'Enter' + A.R + ' current defaults  '
+      + A.D + 'o' + A.R + ' original settings  '
       + A.D + 'f' + A.R + ' star  '
       + A.D + 'e' + A.R + ' edit name  '
       + A.D + 'p' + A.R + ' edit cwd  '
@@ -618,7 +662,12 @@ function handleList(str, key) {
       saveFavorites(favorites);
     }
   }
-  else if (k === 'return') resumeSession(list[cursor]);
+  else if (k === 'return') resumeSession(list[cursor], true);
+  else if (k === 'o') resumeSession(list[cursor], false);
+  else if (k === 'x') {
+    const removed = cleanStaleFavorites(sessions).length;
+    notice = removed ? `removed ${removed} stale favorite${removed === 1 ? '' : 's'}` : 'no stale favorites';
+  }
   else if (k === 'd') { if (list[cursor]) mode = 'details'; }
   else if (k === 'e') startEdit(list[cursor], 'title');
   else if (k === 'p') startBrowse(list[cursor]);
@@ -644,7 +693,8 @@ function handleDetails(str, key) {
   const s = visibleSessions()[cursor];
   if (k === 'escape' || k === 'q' || k === 'd') { mode = 'list'; return; }
   if (key.ctrl && k === 'c') return quit();
-  if (k === 'return') return resumeSession(s);
+  if (k === 'return') return resumeSession(s, true);
+  if (k === 'o') return resumeSession(s, false);
   if (k === 'f' && s) {
     if (s.favored) favorites.delete(s.id); else favorites.add(s.id);
     saveFavorites(favorites);
@@ -845,7 +895,7 @@ function tryCopy(text) {
 // as "pisesh exited with code N". We inject a synthetic "[interrupted]"
 // toolResult for unfinished valid turns, but not errored/aborted assistant turns
 // that pi omits during replay. Old incompatible synthetic results are removed.
-// Idempotent; never throws.
+// Idempotent. Throws when the session cannot be read, backed up, or written.
 function healOrphanedToolCalls(file) {
   try {
     const lines = fs.readFileSync(file, 'utf8').split('\n').filter(Boolean);
@@ -912,29 +962,61 @@ function healOrphanedToolCalls(file) {
     }
     const changed = removedParents.size + inserted;
     if (changed > 0) {
-      try { const bak = file + '.bak-orphanheal'; if (!fs.existsSync(bak)) fs.copyFileSync(file, bak); } catch {}
+      const bak = file + '.bak-orphanheal';
+      if (!fs.existsSync(bak)) fs.copyFileSync(file, bak);
       fs.writeFileSync(file, out.join('\n') + '\n');
     }
     return changed;
-  } catch { return 0; }
+  } catch (error) {
+    throw new Error(`session repair failed: ${error.message}`);
+  }
 }
 
-function resumeSession(s) {
+function loadResumeDefaults(settingsFile = SETTINGS_FILE) {
+  try {
+    const settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8'));
+    return {
+      model: settings.defaultProvider && settings.defaultModel
+        ? `${settings.defaultProvider}/${settings.defaultModel}`
+        : '',
+      thinking: settings.defaultThinkingLevel || '',
+    };
+  } catch { return null; }
+}
+
+function buildResumeArgs(s, useCurrentDefaults = true, settingsFile = SETTINGS_FILE) {
+  const args = ['--session', s.id, '--session-dir', path.dirname(s.file)];
+  const defaults = useCurrentDefaults && loadResumeDefaults(settingsFile);
+  if (defaults?.model) args.push('--model', defaults.model);
+  if (defaults?.thinking) args.push('--thinking', defaults.thinking);
+  return args;
+}
+
+function resumeSession(s, useCurrentDefaults = true) {
   if (!s) return;
   // Heal orphaned tool calls before handing off, so resume can't crash the
   // spawned pi (see healOrphanedToolCalls).
-  try { healOrphanedToolCalls(s.file); } catch {}
+  let repaired;
+  try { repaired = healOrphanedToolCalls(s.file); }
+  catch (error) {
+    process.stdout.write(A.exitAlt + A.showC);
+    if (process.stdin.isTTY) process.stdin.setRawMode(false);
+    console.error(`pisesh: ${error.message}`);
+    process.exit(1);
+  }
   // Leave alt screen + show cursor so the spawned pi takes over a clean
   // main-buffer terminal (it will manage its own alt screen).
   process.stdout.write(A.exitAlt + A.showC);
   if (process.stdin.isTTY) process.stdin.setRawMode(false);
   process.stdin.pause();
+  if (repaired > 0) {
+    console.log(`pisesh: repaired ${repaired} orphaned session entr${repaired === 1 ? 'y' : 'ies'}; backup: ${s.file}.bak-orphanheal`);
+  }
 
-  const projectDir = path.dirname(s.file);
   // Resume in the session's effective cwd (user override wins over recorded),
   // falling back to pisesh's own cwd if that directory no longer exists.
   const targetCwd = s.effectiveCwd;
-  const child = spawn('pi', ['--session', s.id, '--session-dir', projectDir], {
+  const child = spawn('pi', buildResumeArgs(s, useCurrentDefaults), {
     stdio: 'inherit',
     cwd: targetCwd && fs.existsSync(targetCwd) ? targetCwd : process.cwd(),
   });
@@ -964,13 +1046,17 @@ Usage:
   pisesh --json          Dump favorites file as JSON
   pisesh --star <id>     Add a session id (partial UUID ok) to favorites
   pisesh --unstar <id>   Remove a session id from favorites
+  pisesh --clean-favorites  Remove favorites whose sessions no longer exist
+  pisesh --version, -v   Print the installed version
   pisesh --help, -h      This help
 
 TUI keys:
   ↑↓ / j k         move cursor
   Tab / h l        switch tab  (★ Favorites → Today → Here → All)
   f / Space        toggle favorite
-  Enter            resume session (spawns 'pi --session …' in its cwd)
+  x                remove favorites whose sessions no longer exist
+  Enter            resume with current default model and thinking settings
+  o                resume with the session-recorded model and thinking settings
   e                edit name (custom display title)
   p                edit cwd — arrow-key directory browser
                    (↑↓ move, →/Enter open dir, ← parent, s select, Esc cancel)
@@ -1000,6 +1086,13 @@ function main() {
   const argv = process.argv.slice(2);
 
   if (argv.includes('-h') || argv.includes('--help')) { printHelp(); return; }
+  if (argv.includes('-v') || argv.includes('--version')) { console.log(VERSION); return; }
+  if (argv.includes('--clean-favorites')) {
+    sessions = scanSessions();
+    const stale = cleanStaleFavorites(sessions);
+    console.log(`removed ${stale.length} stale favorite${stale.length === 1 ? '' : 's'}`);
+    return;
+  }
   if (argv.includes('-l') || argv.includes('--list')) {
     [...favorites].forEach(id => console.log(id));
     return;
@@ -1041,4 +1134,4 @@ function main() {
 }
 
 if (require.main === module) main();
-else module.exports = { healOrphanedToolCalls };
+else module.exports = { buildResumeArgs, cleanStaleFavorites, healOrphanedToolCalls, loadResumeDefaults };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pisesh",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Bookmark, search, and resume pi coding-agent sessions with a fast keyboard-driven TUI.",
   "keywords": [
     "pi-package",