pisesh 0.1.10 → 0.1.12

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.12] - 2026-07-20
+
+### Fixed
+- Skip interrupted tool calls from assistant turns that ended with `error` or `aborted`, preventing OpenAI Responses from receiving an unmatched `function_call_output` after resume or fork.
+- Remove incompatible synthetic results previously written by pisesh and repair their child links when affected sessions are resumed.
+
+## [0.1.11] - 2026-07-14
+
+### Fixed
+- `/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
 
 ### Fixed

package/README.md

@@ -65,23 +65,22 @@ pisesh is a **single-file Node script** (no dependencies, ~900 LoC) that gives y
 
 ## Getting started
 
-### Quick install (recommended)
+### Install the `/sesh` command in pi (recommended)
 
 ```bash
-# Install both the CLI and the /sesh slash command in one go
 pi install npm:pisesh
 ```
 
-This registers pisesh as a pi extension. Inside any pi session, type `/sesh`.
+This registers pisesh as a pi extension. Inside any pi session, type `/sesh`. The extension runs its bundled CLI, so a global npm installation is not required.
 
-### Standalone CLI only
+### Install the standalone CLI
 
 ```bash
 npm install -g pisesh
 pisesh
 ```
 
-Use this if you want pisesh as a separate shell command and don't need the pi slash binding.
+The standalone `pisesh` shell command requires this global npm installation. It is separate from `pi install npm:pisesh`.
 
 ### From source (developers)
 
@@ -92,7 +91,7 @@ npm link            # symlink ./bin/pisesh into your global PATH
 pisesh --help
 ```
 
-Pi-extension side: drop `extensions/sesh.ts` into `~/.pi/agent/extensions/` and run `/reload` inside pi.
+For local pi testing, run `pi install .` from the cloned repository so the extension and its bundled CLI stay together.
 
 ## Keys
 
@@ -183,7 +182,7 @@ Korean / Chinese / Japanese / fullwidth characters render **2 cells wide** in te
 
 ## Requirements
 
-- **Node.js ≥ 18** (uses optional chaining and `for…of` on strings, so no transpile step)
+- **Node.js ≥ 18 on `PATH`** (the `/sesh` extension uses `node` to run its bundled CLI)
 - A terminal with ANSI escape and alternate screen buffer support, which covers basically every modern emulator:
   - Windows: **Windows Terminal**, **WezTerm**, **Alacritty** ✅
   - macOS: **iTerm2**, **Terminal.app**, **WezTerm**, **Alacritty**, **Kitty** ✅

package/bin/pisesh

@@ -843,25 +843,54 @@ function tryCopy(text) {
 // interrupted when the prior session hit a usage limit or was closed mid-tool.
 // Left unhealed, the spawned pi crashes (exit 1), which surfaces to the parent
 // as "pisesh exited with code N". We inject a synthetic "[interrupted]"
-// toolResult for every orphaned toolCall so the resumed history is always
-// well-formed and pi never re-fires a dead tool. Idempotent; never throws.
+// 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.
 function healOrphanedToolCalls(file) {
   try {
     const lines = fs.readFileSync(file, 'utf8').split('\n').filter(Boolean);
+    const entries = lines.map(raw => {
+      try { return { raw, value: JSON.parse(raw) }; } catch { return { raw, value: null }; }
+    });
+    const droppedToolCallIds = new Set();
+    for (const { value: o } of entries) {
+      const m = o && o.message;
+      if (m && m.role === 'assistant' && (m.stopReason === 'error' || m.stopReason === 'aborted')) {
+        for (const b of Array.isArray(m.content) ? m.content : []) {
+          if (b && b.type === 'toolCall' && b.id) droppedToolCallIds.add(b.id);
+        }
+      }
+    }
+
+    const removedParents = new Map();
+    const kept = entries.filter(({ value: o }) => {
+      const m = o && o.message;
+      const text = m && Array.isArray(m.content) && m.content.find(b => b && b.type === 'text');
+      const isBadSynthetic = m && m.role === 'toolResult'
+        && droppedToolCallIds.has(m.toolCallId)
+        && text && text.text.startsWith('[tool call interrupted');
+      if (isBadSynthetic) removedParents.set(o.id, o.parentId);
+      return !isBadSynthetic;
+    });
+    for (const { value: o } of kept) {
+      if (!o || typeof o.parentId === 'undefined') continue;
+      while (removedParents.has(o.parentId)) o.parentId = removedParents.get(o.parentId);
+    }
+
     const resultIds = new Set();
-    for (const l of lines) {
-      let o; try { o = JSON.parse(l); } catch { continue; }
+    for (const { value: o } of kept) {
       if (o && o.message && o.message.role === 'toolResult') resultIds.add(o.message.toolCallId);
     }
     const rnd = () => Math.random().toString(16).slice(2, 10);
     const out = [];
     let inserted = 0, prevSynthId = null;
-    for (const l of lines) {
-      let o; try { o = JSON.parse(l); } catch { out.push(l); continue; }
-      if (prevSynthId && o && typeof o.parentId !== 'undefined') { o.parentId = prevSynthId; prevSynthId = null; }
+    for (const { raw, value: o } of kept) {
+      if (!o) { out.push(raw); continue; }
+      if (prevSynthId && typeof o.parentId !== 'undefined') { o.parentId = prevSynthId; prevSynthId = null; }
       out.push(JSON.stringify(o));
-      const c = o && o.message && o.message.content;
-      if (o && o.message && o.message.role === 'assistant' && Array.isArray(c)) {
+      const m = o.message;
+      const c = m && m.content;
+      if (m && m.role === 'assistant' && m.stopReason !== 'error' && m.stopReason !== 'aborted' && Array.isArray(c)) {
         for (const b of c) {
           if (b && b.type === 'toolCall' && b.id && !resultIds.has(b.id)) {
             const synth = {
@@ -881,11 +910,12 @@ function healOrphanedToolCalls(file) {
         }
       }
     }
-    if (inserted > 0) {
+    const changed = removedParents.size + inserted;
+    if (changed > 0) {
       try { const bak = file + '.bak-orphanheal'; if (!fs.existsSync(bak)) fs.copyFileSync(file, bak); } catch {}
       fs.writeFileSync(file, out.join('\n') + '\n');
     }
-    return inserted;
+    return changed;
   } catch { return 0; }
 }
 
@@ -1010,4 +1040,5 @@ function main() {
   render();
 }
 
-main();
+if (require.main === module) main();
+else module.exports = { healOrphanedToolCalls };

package/extensions/sesh.ts

@@ -10,13 +10,17 @@
  *      or just pressed `q` — control returns to the original pi session and the
  *      TUI is restored.
  *
- * Companion CLI tool: ~/.pi/bin/pisesh   (single-file Node TUI, no deps)
+ * Bundled CLI tool: ../bin/pisesh   (single-file Node TUI, no deps)
  * Favorites file:     ~/.pi/agent/favorites.json
  */
 
 import { spawn } from "node:child_process";
+import path from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
+// Static package path, no user-controlled segments.
+const PISESH_CLI = path.resolve(__dirname, "../bin/pisesh"); // pi-lens-ignore: ts-path-traversal
+
 function runPisesh(
 	currentSessionId: string | undefined,
 ): Promise<number | null> {
@@ -25,7 +29,7 @@ function runPisesh(
 		// already detached so this is safe.
 		// PISESH_CURRENT_SESSION lets pisesh flag the row that belongs to the
 		// pi instance that just spawned it (rendered with a [NOW] badge).
-		const child = spawn("pisesh", [], {
+		const child = spawn("node", [PISESH_CLI], {
 			stdio: "inherit",
 			env: {
 				...process.env,
@@ -85,7 +89,7 @@ export default function (pi: ExtensionAPI) {
 			if (code === 0 || code === null) {
 				ctx.ui.notify("Returned from pisesh", "info");
 			} else if (code === 127) {
-				ctx.ui.notify("pisesh not found on PATH", "error");
+				ctx.ui.notify("pisesh failed to launch", "error");
 			} else {
 				ctx.ui.notify(`pisesh exited with code ${code}`, "warning");
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pisesh",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Bookmark, search, and resume pi coding-agent sessions with a fast keyboard-driven TUI.",
   "keywords": [
     "pi-package",
@@ -46,7 +46,7 @@
     "image": "https://raw.githubusercontent.com/Blue-B/pisesh/main/assets/preview.png"
   },
   "scripts": {
-    "test": "node --check bin/pisesh && echo 'pisesh: syntax OK'",
+    "test": "node --check bin/pisesh && node --test test/*.test.js",
     "prepublishOnly": "npm test"
   }
 }