@fastagent-sh/fastagent 0.21.1 → 0.22.1

package/dist/engines/pi/session-store.js

@@ -1,36 +1,13 @@
-/**
- * Session persistence for the `AgentSession` L0 — open-or-create a durable record by the Caller's
- * opaque session id, on pi-coding-agent's `SessionManager` (the v3 jsonl every pi surface reads).
- */
+/** Session persistence for the `AgentSession` L0. */
 import { existsSync, mkdirSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
+import { contentText } from "@earendil-works/pi-ai";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 import { log } from "../../log.js";
-import { LEAF_ANCHOR, publishedLeaf, stampProvenance } from "./session-markers.js";
+import { LEAF_ANCHOR, isConversationMessage, publishedLeaf, stampProvenance } from "./session-markers.js";
 import { activePath } from "./session-settings.js";
 import { copyBranchForInheritance, copyBranchInto, inheritanceCut, } from "./session-inheritance.js";
-/**
- * A Caller's session id, as a name pi will accept.
- *
- * `SessionManager` enforces `^[A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?$` — which no built-in
- * channel satisfies: telegram's `-1001234567890` leads with a dash, feishu and slack keys carry
- * `:` and `/`, and any custom `route()` may mint anything at all.
- *
- * The mapping is INJECTIVE, because two conversations resolving to one record is two rooms sharing a
- * memory. `s` prefix (the pattern demands an alphanumeric head, and prefixing unconditionally is what
- * keeps it injective — a conditional one would map `-a` and `s-a` alike), then each character
- * outside `[A-Za-z0-9.-]` becomes `_XX` / `_uXXXX`, self-describing widths so no two inputs can
- * produce one output. `_` escapes itself for the same reason. A trailing `.` or `-` is legal
- * mid-name but not at the end, so it escapes too.
- *
- * Injective within this encoding — which is only sufficient because this store's records live in
- * their own directory. A name this store did not write draws from the same character set and can
- * still decode: a file called `s42` is also this encoding of `42`, so one directory would make some
- * names ambiguous no matter how this side spells them.
- *
- * Readability is deliberate: `-1001234567890` becomes `s-1001234567890`, so an operator can still
- * tell which room a file belongs to.
- */
+/** A Caller's session id, as a name pi will accept. */
 export function piSessionId(sessionId) {
     const hex = (c) => {
         const code = c.charCodeAt(0);
@@ -42,11 +19,8 @@ export function piSessionId(sessionId) {
     return `s${body}`;
 }
 /**
- * {@link piSessionId} backwards — what `list()` needs, because a session id belongs to the CALLER and
- * a record name is storage detail. The encoding is self-describing (fixed widths, `_` escapes
- * itself), so this is a decode rather than a guess; a name this store did not write (no `s` head, a
- * truncated escape) answers undefined and is left out of the listing rather than reported under a
- * name nobody can dial.
+ * {@link piSessionId} backwards — what `list()` needs, because a session id belongs to the CALLER and a record name is
+ * storage detail.
  */
 export function callerSessionId(recordId) {
     if (!recordId.startsWith("s"))
@@ -69,61 +43,27 @@ export function callerSessionId(recordId) {
     }
     return out;
 }
-/**
- * Disk-backed store under `dir`: restart the process, conversations continue.
- *
- * Lookup is a directory scan of THIS store's own directory, reading ids out of the filenames pi
- * writes (`<timestamp>_<id>.jsonl`) — not `SessionManager.list`, which filters by the cwd recorded in
- * each header and would make a renamed agent directory look like an empty store (see
- * {@link recordFiles}).
- *
- * Records live in a subdirectory of their own, because a name this store did not write can still
- * decode to a Caller id: a file called `s42` beside them is also this encoding of `42`, so a shared
- * directory would answer `42` with a record it does not own. Only this directory is scanned, which
- * makes this encoding's own injectivity sufficient — a record written before this store existed
- * lies outside it and is never read.
- *
- * SCOPE OF "open-or-create": idempotent against a store that is serialized per session, which is what
- * the serving path provides — the single-writer lease is taken before any store call, so no two
- * turns of one conversation reach this at once. What it does NOT do is arbitrate a FIRST open racing
- * across processes: two instances that scan before either writes will both create, and the
- * conversation forks into two records. A horizontally-scaled deployment that wants more owes a lease
- * that spans its instances — an in-process one cannot arbitrate between them, and a file lock here
- * would only look like it could.
- */
+/** Disk-backed store under `dir`: restart the process, conversations continue. */
 export function piSessionRecordStore(options) {
     const cwd = options.cwd ?? process.cwd();
-    // Resolved against the workspace this store serves, not against wherever the process happens to
-    // have been started: a relative `dir` means "inside this agent", and a serving process may chdir.
+    // Resolved against the workspace this store serves, not against wherever the process happens to have been started.
     const root = resolve(cwd, options.dir);
     const own = join(root, OWN_RECORDS_DIR);
-    /** Where a forked record is finished before it becomes discoverable. A SUBDIRECTORY of the store,
-     *  so `list()` (one level, `*.jsonl`) never sees a record that is still being prepared. */
+    /** Where a forked record is finished before it becomes discoverable. */
     const staging = join(own, ".staging");
-    /** An empty record under `id`, ON DISK (see {@link materialize}) and not yet discoverable. Copying
-     *  into it appends immediately, so a crash leaves a partial record in staging rather than a
-     *  complete-looking one under the id. */
+    /** An empty record under `id`, ON DISK (see {@link materialize}) and not yet discoverable. */
     const stage = (id) => {
         mkdirSync(staging, { recursive: true });
         return materialize(SessionManager.create(cwd, staging, { id }), staging);
     };
-    /** Fill a staged record and move it in — or leave nothing behind. The partial file is deleted on
-     *  the way out and the failure is rethrown untouched: `fork` turns it into a coded result and
-     *  inheritance falls back to an empty session, but neither can see `.staging`, which would
-     *  otherwise accumulate a file per failed attempt (ENOSPC being the realistic repeat offender) in
-     *  a directory nothing ever reads. */
+    /** Fill a staged record and move it in — or leave nothing behind. */
     const fillStaged = (id, fill) => {
         const staged = stage(id);
-        // WHERE the record is, so cleanup deletes the file that exists rather than the path it used to
-        // have: after the rename, removing the staging path succeeds against nothing while the record it
-        // was supposed to undo sits in the store.
+        // WHERE the record is, so cleanup deletes the file that exists rather than the path it used to have.
         let published;
         try {
             fill(staged);
-            // Publishing is a mkdir + rename, and both can fail (EACCES, a store root on another
-            // filesystem) — a finished record stranded in staging is the same accumulation as a partial
-            // one. NOT covered by a test: the tests reach a fill failure by making a copy throw, and there
-            // is no equivalent injection point for rename without mocking node:fs for the whole file.
+            // Publishing is a mkdir + rename, and both can fail (EACCES, a store root on another filesystem).
             published = publishStaged(staged);
             return SessionManager.open(published, own);
         }
@@ -132,8 +72,10 @@ export function piSessionRecordStore(options) {
             throw error;
         }
     };
-    /** Move a finished record into the store: one same-filesystem rename, so a reader sees the whole
-     *  thing or nothing at all. Answers WHERE it landed — the caller opens it, and can undo it. */
+    /**
+     * Move a finished record into the store: one same-filesystem rename, so a reader sees the whole thing or nothing at
+     * all.
+     */
     const publishStaged = (staged) => {
         const file = staged.getSessionFile();
         if (!file)
@@ -143,8 +85,7 @@ export function piSessionRecordStore(options) {
         renameSync(file, target);
         return target;
     };
-    /** Fork the named parent into `id`, or answer undefined so the caller starts empty. Every failure
-     *  is a warn: a thread must not lose its first turn to an inheritance edge. */
+    /** Fork the named parent into `id`, or answer undefined so the caller starts empty. */
     const inheritInto = async (sessionId, inherit) => {
         const found = locate(inherit.parentSession);
         if (!found) {
@@ -152,9 +93,7 @@ export function piSessionRecordStore(options) {
             return undefined;
         }
         try {
-            // A parent that crashed mid tool-execution would otherwise pass its dangling tool_use down
-            // to the child, whose very first request the provider then rejects.
-            const parent = reconcileInterruptedToolCalls(SessionManager.open(found.path, found.dir));
+            const parent = SessionManager.open(found.path, found.dir);
             const cut = inheritanceCut(parent, inherit.branchHints);
             if (!cut)
                 return undefined;
@@ -166,17 +105,20 @@ export function piSessionRecordStore(options) {
             return undefined;
         }
     };
-    /** The unreadable records the last listing reported, so a polled endpoint states the condition
-     *  once rather than once a second. */
+    /**
+     * The unreadable records the last listing reported, so a polled endpoint states the condition once rather than once
+     * a second.
+     */
     let lastUnreadable = "";
-    /** WHERE a session's record is — the one lookup every caller shares, so a fix to it (this store's
-     *  own directory rather than pi's cwd-filtered listing) cannot reach three of the four. */
+    /**
+     * WHERE a session's record is — the one lookup every caller shares, so a fix to it (this store's own directory
+     * rather than pi's cwd-filtered listing) cannot reach three of the four.
+     */
     const locate = (sessionId) => {
-        const mine = recordFiles(own).find((f) => f.id === piSessionId(sessionId));
-        return mine ? { path: mine.path, dir: own } : undefined;
+        const path = recordPathIn(own, sessionId);
+        return path ? { path, dir: own } : undefined;
     };
-    /** Open an existing record, or undefined. A closure rather than a method call, so `fork` cannot be
-     *  broken by a caller that spreads this object into another one. */
+    /** Open an existing record, or undefined. */
     const openExisting = async (sessionId) => {
         const found = locate(sessionId);
         return found ? SessionManager.open(found.path, found.dir) : undefined;
@@ -185,10 +127,10 @@ export function piSessionRecordStore(options) {
         async openOrCreate(sessionId, inherit) {
             const found = locate(sessionId);
             if (found)
-                return reconcileInterruptedToolCalls(SessionManager.open(found.path, found.dir));
+                return SessionManager.open(found.path, found.dir);
             mkdirSync(own, { recursive: true });
-            // Inheritance is a CREATE-path decision: an existing session above ignores it entirely, which
-            // is what makes it one-time by construction.
+            // Inheritance is a CREATE-path decision: an existing session above ignores it entirely, which is what makes it
+            // one-time by construction.
             if (inherit) {
                 const inherited = await inheritInto(sessionId, inherit);
                 if (inherited)
@@ -204,8 +146,8 @@ export function piSessionRecordStore(options) {
             const rows = [];
             const unreadable = [];
             for (const file of files) {
-                // A name this store did not write cannot be decoded back to a Caller id, and a row nobody
-                // can dial is worse than a row that is missing.
+                // A name this store did not write cannot be decoded back to a Caller id, and a row nobody can dial is worse
+                // than a row that is missing.
                 const session = callerSessionId(file.id);
                 if (!session)
                     continue;
@@ -213,26 +155,17 @@ export function piSessionRecordStore(options) {
                     rows.push(summarize(session, SessionManager.open(file.path, own)));
                 }
                 catch (error) {
-                    // ONE unreadable record must not take the listing down — the other conversations are fine,
-                    // and a GUI that shows nothing is worse than one missing a row. But it must not vanish
-                    // silently either: that is the same conflation `sessions_unavailable` prevents one level
-                    // up, just per record. Named, with its reason, every time it is polled: a record that
-                    // cannot be read is a condition someone has to act on.
+                    // ONE unreadable record must not take the listing down — the other conversations are fine, and a GUI that
+                    // shows nothing is worse than one missing a row.
                     unreadable.push(`${basename(file.path)} (${String(error)})`);
                 }
-                // A TURN for everything else. Reading a record is synchronous (pi parses the whole file and
-                // builds its index), and this endpoint is POLLED — so without a yield the process stops for
-                // the length of the whole listing, once a second, while SSE heartbeats and in-flight turns
-                // wait. pi's own listing streamed and interleaved; this reads faster and must not take that
-                // away.
+                // A TURN for everything else.
                 await new Promise((resolve) => setImmediate(resolve));
             }
-            // NEWEST ACTIVITY first. The filenames sort by CREATION, so an old conversation that just
-            // received a message would otherwise sit below a newer idle one — the wrong answer for the
-            // column a conversation list is read by.
+            // NEWEST ACTIVITY first.
             rows.sort((a, b) => b.updatedAt - a.updatedAt);
-            // Said when the SET changes, not on every poll: this endpoint is polled once a second or so,
-            // and an unreadable record stays unreadable until someone acts on it.
+            // Said when the SET changes, not on every poll: this endpoint is polled once a second or so, and an unreadable
+            // record stays unreadable until someone acts on it.
             const reported = unreadable.join("; ");
             if (reported !== lastUnreadable) {
                 lastUnreadable = reported;
@@ -246,25 +179,18 @@ export function piSessionRecordStore(options) {
             const parent = await openExisting(from);
             if (!parent)
                 throw new Error(`session "${from}" has no record`);
-            // The port promises a NEW record, so the guarantee belongs here rather than in the one caller
-            // that happens to check: two records under one id makes which one a lookup finds a matter of
-            // directory order.
+            // The port promises a NEW record, so the guarantee belongs here rather than in the one caller that happens to
+            // check.
             if (await openExisting(into))
                 throw new Error(`session "${into}" already exists`);
             fillStaged(piSessionId(into), (staged) => {
-                // METADATA FIRST, history last. pi has one leaf pointer and every append advances it, so
-                // whatever is written last becomes the fork's `leafEntryId` — and a client opening a fresh
-                // fork would find its head on an empty `custom` record instead of on the exchange it forked
-                // at. The name and the provenance describe the record; the history is what the session IS.
+                // METADATA FIRST, history last. pi has one leaf pointer and every append advances it, so whatever is written
+                // last becomes the fork's `leafEntryId`.
                 const name = parent.getSessionName();
-                // The name travels: a fork of "Deploy notes" that lists as untitled is a row a user cannot
-                // place. A client that wants "(copy)" calls `update({ name })`.
+                // The name travels: a fork of "Deploy notes" that lists as untitled is a row a user cannot place.
                 if (name)
                     staged.appendSessionInfo(name);
                 stampProvenance(staged, provenance);
-                // NOT reconciled: the repair appends at the parent's LEAF, which a copy stopping at `at` can
-                // never reach — it would only write to the record being copied FROM. The child is reconciled
-                // on its own first open, like every other record.
                 copyBranchInto(parent, staged, at);
             });
         },
@@ -272,23 +198,14 @@ export function piSessionRecordStore(options) {
             const found = locate(sessionId);
             if (!found)
                 return false;
-            // A record that cannot be deleted must not report success — the caller turns the throw into a
-            // coded failure, and the session is still there for the next attempt.
+            // A record that cannot be deleted must not report success — the caller turns the throw into a coded failure,
+            // and the session is still there for the next attempt.
             rmSync(found.path);
             return true;
         },
     };
 }
-/**
- * The property write, for both backends: the ONE place that knows how pi records a property.
- *
- * ORDER IS THE POINT. pi has a single leaf pointer and every append advances it, so the leaf ends up
- * wherever the last write landed — which is why the move goes FIRST (the properties below it must
- * hang off the branch the caller asked for, not the one it left) and why a fork writes its metadata
- * before its history (session-store's `fork`). The handle is opened HERE, inside the caller's lease:
- * one taken earlier could be a snapshot of a run that finished in the window, and appending to it
- * would hang the property off a stale leaf.
- */
+/** The property write, for both backends: the ONE place that knows how pi records a property. */
 async function applyProperties(open, writes) {
     const record = await open();
     if (!record)
@@ -298,9 +215,8 @@ async function applyProperties(open, writes) {
     let failure;
     try {
         if (writes.leafEntryId !== undefined) {
-            // A move to where the head ALREADY is asks for nothing: a client retry, or a UI firing on
-            // every selection, must not grow the session. Compared against the PUBLISHED head, because
-            // pi's leaf may be the anchor a previous move left there.
+            // A move to where the head ALREADY is asks for nothing: a client retry, or a UI firing on every selection, must
+            // not grow the session.
             if (publishedLeaf(record) !== writes.leafEntryId) {
                 record.branch(writes.leafEntryId);
                 moved = true;
@@ -321,41 +237,34 @@ async function applyProperties(open, writes) {
         }
     }
     catch (error) {
-        // Held, not rethrown: what already landed still has to be reported, and the report is the only
-        // way a caller learns the record moved.
+        // Held, not rethrown: what already landed still has to be reported, and the report is the only way a caller
+        // learns the record moved.
         failure = error;
     }
-    // THE ANCHOR, outside the try so a failed property write cannot skip it — that is precisely the
-    // case reporting a MOVE as landed. pi's `branch()` writes nothing (the leaf is runtime state, and
-    // `open()` puts it back on the file's last entry), so a move nothing followed is forgotten the
-    // moment anything reopens the record. Appending anything pins it; this appends only when nothing
-    // else in the patch already did.
+    // THE ANCHOR, outside the try so a failed property write cannot skip it.
     if (moved && record.getLeafId() === writes.leafEntryId) {
         try {
             record.appendCustomEntry(LEAF_ANCHOR, {});
         }
         catch (error) {
-            // The move is runtime-only and will not survive the next open, so it did NOT land: saying it
-            // did is the one thing a partial report cannot afford. A first failure keeps its place — it is
-            // what stopped the patch — and this one is reported when nothing else went wrong.
+            // The move is runtime-only and will not survive the next open, so it did NOT land: saying it did is the one
+            // thing a partial report cannot afford.
             landed.splice(landed.indexOf("leafEntryId"), 1);
             failure ??= error;
         }
     }
-    // READ BACK, never echo: pi rewrites a name (newlines collapse, ends trim), and the settings a
-    // path resolves to can change under a moved leaf. The caller reports THIS, so `state()` and
-    // `list()` cannot disagree with what it said.
+    // READ BACK, never echo: pi rewrites a name (newlines collapse, ends trim), and the settings a path resolves to can
+    // change under a moved leaf.
     const name = record.getSessionName();
-    // The PUBLISHED head, not pi's: the anchor above is ours, and a client must be told the position
-    // it asked for — the one it can find in `entries()`.
+    // The PUBLISHED head, not pi's: the anchor above is ours, and a client must be told the position it asked for — the
+    // one it can find in `entries()`.
     const leafEntryId = publishedLeaf(record);
     let path;
     try {
         path = activePath(record);
     }
     catch (error) {
-        // An unreadable chain is the caller's decision (design §7), not a silent short path. The writes
-        // are already durable either way.
+        // An unreadable chain is the caller's decision (design §7), not a silent short path.
         log.warn(`[fastagent] session ${record.getSessionId()}: written, active path unreadable: ${String(error)}`);
     }
     return {
@@ -367,19 +276,13 @@ async function applyProperties(open, writes) {
     };
 }
 /**
- * The record files in a directory, newest first — pi names them `<ISO timestamp>_<id>.jsonl`, so the
- * name sorts by time and carries the id without opening anything.
- *
- * OUR readdir, not pi's `SessionManager.list`, and the difference is the reason this exists: that one
- * filters by the cwd recorded in each header — right for a TUI showing "this project's sessions",
- * wrong for a repository, where renaming the agent directory made every conversation vanish from the
- * listing AND from lookup, so the next turn started an empty session on top of the old one. It also
- * swallows per-file faults, which a listing needs to see.
- *
- * ENOENT is the one condition that is not a fault: a store nobody has written to holds no records.
- * Anything else — an unreadable ancestor, a file where the directory should be — travels with its
- * code, because "this deployment has no conversations" is not an answer for a store we cannot read.
+ * The record files in a directory, newest first — pi names them `<ISO timestamp>_<id>.jsonl`, so the name sorts by
+ * time and carries the id without opening anything.
  */
+/** WHERE a session's record file is, WITHOUT opening it. */
+function recordPathIn(own, sessionId) {
+    return recordFiles(own).find((f) => f.id === piSessionId(sessionId))?.path;
+}
 function recordFiles(dir) {
     let names;
     try {
@@ -390,29 +293,25 @@ function recordFiles(dir) {
             throw error;
         return [];
     }
-    // UNORDERED. Lookup does not care, and `list()` sorts its rows by activity — a filename order kept
-    // here would be one nobody consumes and the next reader has to prove is unused.
+    // UNORDERED.
     return names
         .filter((name) => name.endsWith(RECORD_SUFFIX))
         .flatMap((name) => {
-        // The FIRST underscore: the timestamp holds none, and an encoded id may hold several
-        // (`piSessionId` escapes with `_`).
+        // The FIRST underscore: the timestamp holds none, and an encoded id may hold several (`piSessionId` escapes
+        // with `_`).
         const cut = name.indexOf("_");
         return cut < 0 ? [] : [{ path: join(dir, name), id: name.slice(cut + 1, -RECORD_SUFFIX.length) }];
     });
 }
-/** One record as a conversation-list row. Read out of the record itself rather than from pi's
- *  listing, which is not asked for one — so the fields mean exactly what they say: no sentinel
- *  standing in for "no first message", and `updatedAt` floored at the record's own creation (a
- *  fork's entries carry the SOURCE's timestamps, so a branch made today would otherwise sort into
- *  whenever the original was written — the one column a conversation list orders by). */
+/** One record as a conversation-list row. */
 function summarize(session, record) {
     const entries = record.getEntries();
     const createdAt = Date.parse(record.getHeader()?.timestamp ?? "") || 0;
-    // `|| 0` on both: an unparseable timestamp is NaN, and NaN in `updatedAt` serializes to `null` —
-    // which the contract types as a number and a client sorts by.
+    // `|| 0` on both: an unparseable timestamp is NaN, and NaN in `updatedAt` serializes to `null` — which the contract
+    // types as a number and a client sorts by.
     const lastAt = Date.parse(entries.at(-1)?.timestamp ?? "") || 0;
-    const messages = entries.filter((e) => e.type === "message");
+    // A list row counts turns in the conversation, not the engine's system bookkeeping (`isConversationMessage`).
+    const messages = entries.filter(isConversationMessage);
     const name = record.getSessionName();
     const preview = firstUserText(messages);
     return {
@@ -424,26 +323,20 @@ function summarize(session, record) {
         ...(preview ? { preview } : {}),
     };
 }
-/** The first user message with text in it, truncated by CODE POINT (a cut through a surrogate pair
- *  would put a lone half in the row, which renders as U+FFFD). A session opened with a caption-less
- *  photo has none, and answers undefined — a row without a preview, not a row claiming one. */
+/**
+ * The first user message with text in it, truncated by CODE POINT (a cut through a surrogate pair would put a lone
+ * half in the row, which renders as U+FFFD).
+ */
 function firstUserText(messages) {
     for (const entry of messages) {
         const message = entry.message;
         if (message?.role !== "user")
             continue;
-        const content = message.content;
-        const text = typeof content === "string"
-            ? content
-            : Array.isArray(content)
-                ? content
-                    .filter((block) => block.type === "text")
-                    .map((block) => block.text ?? "")
-                    .join(" ")
-                : "";
-        // Cut to UTF-16 units FIRST: a pasted megabyte would otherwise become a million-element array
-        // on the way to keeping 200 of them. Two units per code point is the ceiling, so this cannot
-        // take fewer characters than the slice below wants.
+        // The engine's own reading of message text, on a SPACE: this is a one-line preview, where adjacent
+        // blocks running together would read as one word.
+        const text = contentText(message.content, " ");
+        // Cut to UTF-16 units FIRST: a pasted megabyte would otherwise become a million-element array on the way to
+        // keeping 200 of them.
         if (text.trim())
             return [...text.slice(0, PREVIEW_CHARS * 2)].slice(0, PREVIEW_CHARS).join("");
     }
@@ -451,103 +344,11 @@ function firstUserText(messages) {
 }
 /** What pi names a record file. */
 const RECORD_SUFFIX = ".jsonl";
-/** How much of the first message a list row carries. A row, not a transcript. */
+/** How much of the first message a list row carries. */
 const PREVIEW_CHARS = 200;
-/**
- * Crash-safety reconciliation, run on every OPEN of an existing record.
- *
- * A turn that dies mid tool-execution leaves an assistant `tool_use` with no matching result (the
- * assistant message is persisted before the tool runs). The next turn would then hand the provider
- * an `assistant(tool_use) -> user` sequence that Anthropic and OpenAI reject — the session is
- * poisoned. An honest "interrupted" error result is appended for each dangling call, restoring a
- * valid transcript. Tool side-effect idempotency stays the tool's responsibility (SPEC §6); this
- * restores transcript validity, not exactly-once execution.
- *
- * Pairing is TURN-LOCAL: a tool_use is paired only by a toolResult that immediately follows it (up
- * to the next non-toolResult). Tool-call ids are not unique across turns — a local model may restart
- * them each response — so matching against the whole transcript could falsely settle a leaf call
- * against an earlier turn's identical id. An append-only log can only repair a gap AT THE LEAF; an
- * earlier one is surfaced via log.warn rather than "fixed" with an orphaned result.
- *
- * The synthetic result splits its audiences: `content` (read by the model, may reach the end user)
- * stays neutral — it must NOT say "aborted" (pi's word for a user cancellation) or leak infra
- * detail; `details` carries the operational marker for developers and never reaches the provider.
- */
-function reconcileInterruptedToolCalls(record) {
-    const messages = record.getBranch().flatMap((entry) => {
-        const message = entry.message;
-        return entry.type === "message" && message ? [message] : [];
-    });
-    let leafIdx = -1;
-    for (let i = messages.length - 1; i >= 0; i--) {
-        if (messages[i]?.role === "assistant") {
-            leafIdx = i;
-            break;
-        }
-    }
-    if (leafIdx === -1)
-        return record; // no assistant turn yet
-    const leafReparable = messages.slice(leafIdx + 1).every((m) => m.role === "toolResult");
-    const toRepair = [];
-    const orphaned = [];
-    messages.forEach((m, idx) => {
-        if (m.role !== "assistant")
-            return;
-        const paired = new Set();
-        for (let j = idx + 1; j < messages.length; j++) {
-            const next = messages[j];
-            if (next?.role !== "toolResult")
-                break;
-            paired.add(next.toolCallId);
-        }
-        for (const block of m.content) {
-            if (block.type !== "toolCall" || paired.has(block.id))
-                continue;
-            if (idx === leafIdx && leafReparable)
-                toRepair.push({ id: block.id, name: block.name });
-            else
-                orphaned.push(block.id);
-        }
-    });
-    if (orphaned.length > 0) {
-        log.warn(`[fastagent] unmatched tool_use is not at the session leaf; leaving it unreconciled ` +
-            `(an append-only log cannot repair a mid-history gap): toolCallIds=${orphaned.join(",")}`);
-    }
-    for (const { id, name } of toRepair) {
-        record.appendMessage({
-            role: "toolResult",
-            toolCallId: id,
-            toolName: name,
-            content: [
-                {
-                    type: "text",
-                    text: "This tool call did not complete and its result is unavailable. Re-run it if the result is still needed.",
-                },
-            ],
-            details: { fastagent: "interrupted-tool-call" },
-            isError: true,
-            timestamp: Date.now(),
-        });
-    }
-    return record;
-}
 /** Where the records live, under the sessions directory the store is pointed at. */
 const OWN_RECORDS_DIR = "agent-session";
-/**
- * Make a NEW record exist on disk before anyone can act on it.
- *
- * `SessionManager` buffers a new session in memory and writes nothing until the first ASSISTANT
- * message arrives (`_persist` returns early while no assistant entry exists). Two consequences, and
- * the second is why this cannot be left to the engine:
- *
- * - a crash between "the user asked" and "the model answered" loses the question, while the record
- *   pi-agent-core's storage wrote it immediately (conformance-levels.md §5 named this gap);
- * - **open-or-create stops being idempotent**: the second call cannot find the first call's record,
- *   so one conversation forks into two files, each with half the history.
- *
- * Writing pi's OWN header (`getHeader()`, not a hand-built literal) and reopening puts the manager
- * on its normal "file exists" path, where every append lands immediately.
- */
+/** Make a NEW record exist on disk before anyone can act on it. */
 function materialize(session, dir) {
     const file = session.getSessionFile();
     if (!file || existsSync(file))
@@ -565,19 +366,14 @@ export function piInMemorySessionRecordStore(options = {}) {
     const live = new Map();
     return {
         async openOrCreate(sessionId, inherit) {
-            // Keyed by the CALLER's id: the encoding exists to satisfy pi's filename rule, and in memory
-            // there are no filenames — two rooms whose encodings collide must still not share a map slot.
+            // Keyed by the CALLER's id: the encoding exists to satisfy pi's filename rule, and in memory there are no
+            // filenames.
             const existing = live.get(sessionId);
             if (existing)
-                return reconcileInterruptedToolCalls(existing);
+                return existing;
             const fresh = () => SessionManager.inMemory(cwd, { id: piSessionId(sessionId) });
-            // Same semantics as the durable store, different mechanism: with no file to fork, the parent's
-            // path is copied entry by entry. Inheritance is a property of the CONTRACT, not of the medium —
-            // a caller must not get a thread that forgot its room because the store is in memory.
-            //
-            // And the same atomicity: the session is REGISTERED only once it is complete. Registering
-            // first and copying after would leave a half-inherited thread in place on any failure, while
-            // the log claimed it started empty — the disk path stages a fork for exactly this reason.
+            // Same semantics as the durable store, different mechanism: with no file to fork, the parent's path is copied
+            // entry by entry.
             const parent = inherit ? live.get(inherit.parentSession) : undefined;
             if (inherit && !parent) {
                 log.warn(`[fastagent] session "${sessionId}" names parent "${inherit.parentSession}", which has no record — starting empty`);
@@ -586,7 +382,7 @@ export function piInMemorySessionRecordStore(options = {}) {
             if (inherit && parent) {
                 try {
                     const staged = fresh();
-                    const cut = inheritanceCut(reconcileInterruptedToolCalls(parent), inherit.branchHints);
+                    const cut = inheritanceCut(parent, inherit.branchHints);
                     if (cut)
                         copyBranchForInheritance(parent, staged, cut.at);
                     created = staged;
@@ -607,29 +403,19 @@ export function piInMemorySessionRecordStore(options = {}) {
         },
         applyProperties: (sessionId, writes) => applyProperties(async () => live.get(sessionId), writes),
         async list() {
-            // The SAME row builder the disk store uses, ordered the same way: a backend difference here is
-            // one an embedder discovers as a missing field (this one had no `preview` for exactly that
-            // reason). Nothing to read from disk, so nothing can be unreadable.
+            // The SAME row builder the disk store uses, ordered the same way.
             return [...live].map(([session, record]) => summarize(session, record)).sort((a, b) => b.updatedAt - a.updatedAt);
         },
         async fork(from, at, into, provenance) {
             const parent = live.get(from);
             if (!parent)
                 throw new Error(`session "${from}" has no record`);
-            // The port's promise, not the caller's: registering over a live session would replace its
-            // history outright.
+            // The port's promise, not the caller's: registering over a live session would replace its history outright.
             if (live.has(into))
                 throw new Error(`session "${into}" already exists`);
-            // Entry-by-entry, like the in-memory inheritance path: there is no file to fork. Registered
-            // only once complete, so a failure leaves no half-copied session behind. NO inheritance
-            // window: this is the same user keeping their own history, not a new thread bounded from a
-            // parent's.
+            // Entry-by-entry, like the in-memory inheritance path: there is no file to fork.
             const staged = SessionManager.inMemory(cwd, { id: piSessionId(into) });
-            // METADATA FIRST, history last — the same order the disk store writes in, and for the same
-            // reason: pi has one leaf pointer, so whatever is appended last is where a client opening this
-            // fork finds its head. That should be the exchange it was forked at, not a metadata record.
-            // The name travels so a fork of "Deploy notes" is not an untitled row a user cannot place; a
-            // client that wants "(copy)" calls `update({ name })`.
+            // METADATA FIRST, history last — the same order the disk store writes in, and for the same reason.
             const name = parent.getSessionName();
             if (name)
                 staged.appendSessionInfo(name);