@herbertgao/pi-extensions 2026.9.19 → 2026.10.0

package/node_modules/{@herbertgao/resume-from/dist/adapters/pi → resume-from/dist/adapters/codex}/redaction.js

@@ -40,8 +40,14 @@ const USER_CREDENTIAL_PATTERN = /(^|[\s;&|])(-u|--user)(=|\s+)("[^"\r\n]*"|'[^'\
 const URI_USERINFO_PATTERN = /\b([a-z][a-z0-9+.-]*:\/\/)([^\s/:@]+):([^\s/@]+)@/gi;
 // Unquoted value requires a structural delimiter or line/string end following it, OR a digit
 // somewhere in the token (C-RED-1: "token: expired" is plain English and stays, while
-// "password: hunter2 # prod" carries a credential that must not cross even mid-line).
-const JSON_LIKE_PATTERN = /(["']?)([A-Za-z_][A-Za-z0-9_-]*)\1(\s*:\s*)("[^"\r\n]*"|'[^'\r\n]*'|[^\s,;}]+(?=[,;}]|[\r\n]|$)|[^\s,;}]*\d[^\s,;}]*)/g;
+// "password: hunter2 # prod" carries a credential that must not cross even mid-line). The value is
+// taken whole, however long it is, so a credential can never be left half-redacted (FR-28).
+// A quoted key is matched whole and an unquoted one up to 64 characters: an unbounded identifier run
+// makes the engine backtrack over the whole run at every start position, which is quadratic on a
+// long unbroken line (measured: 50 KB of one word took 11.8 s and 100 KB never finished). A longer
+// unquoted run still matches through its last 64 characters, and `isSensitiveKey` decides by the
+// name's tail as well as by its whole text, so nothing the unbounded name found is hidden.
+const JSON_LIKE_PATTERN = /(?:(?<quote>["'])(?<quoted>[A-Za-z_][A-Za-z0-9_-]*)\k<quote>|(?<bare>[A-Za-z_][A-Za-z0-9_-]{0,63}))(\s*:\s*)("[^"\r\n]*"|'[^'\r\n]*'|[^\s,;}]+(?=[,;}]|[\r\n]|$)|[^\s,;}]*\d[^\s,;}]*)/g;
 function normalizedKey(key) {
     return key.toLowerCase().replaceAll(/[^a-z0-9]/g, "");
 }
@@ -118,7 +124,14 @@ export function redactSensitiveText(text) {
         .replace(USER_CREDENTIAL_PATTERN, `$1$2$3${REDACTED_VALUE}`)
         .replace(URI_USERINFO_PATTERN, `$1$2:${REDACTED_VALUE}@`)
         .replace(ASSIGNMENT_PATTERN, (match, key, separator) => isSensitiveKey(key) ? `${key}${separator}${REDACTED_VALUE}` : match)
-        .replace(JSON_LIKE_PATTERN, (match, quote, key, separator) => isSensitiveKey(key) ? `${quote}${key}${quote}${separator}${REDACTED_VALUE}` : match)
+        .replace(JSON_LIKE_PATTERN, (match, quote, quoted, bare, separator) => {
+        const key = quoted ?? bare;
+        if (key === undefined || !isSensitiveKey(key))
+            return match;
+        // Only the value is replaced; the quoting and the separator stay as they were recorded.
+        const name = quote === undefined ? key : `${quote}${key}${quote}`;
+        return `${name}${separator}${REDACTED_VALUE}`;
+    })
         .replace(CREDENTIAL_PATTERN, REDACTED_VALUE);
 }
 /** Redact a source-recorded argument string, preserving valid JSON when it is JSON. */

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/codex/rollout.d.ts

@@ -1,10 +1,11 @@
 /**
  * What a Codex rollout file is: where it lives, how it is named, and which entries it holds.
  *
- * Every fact here was confirmed against codex-cli 0.146.0 (Constraints: "Facts about Codex are
- * verified against the installed version, never assumed"). The entry names below are the ones
- * C-7 and C-8 measured: `event_msg` drives the visible history and the picker preview,
- * `response_item` drives the model history only.
+ * Every fact here was confirmed against codex-cli 0.146.0, and the `item_completed` schema below
+ * against codex-cli 0.151.0-alpha and again against 0.157.1, 0.158.0 and 0.159.2 (Constraints:
+ * "Facts about Codex are verified against the installed version, never assumed"). The entry names
+ * are the ones C-7, C-8 and C-12 measured: `event_msg` drives the visible history and the picker
+ * preview, `response_item` drives the model history only.
  */
 import type { HomePath, SessionId } from "./contract.js";
 /** Codex reads this variable to find its home; so does this adapter (FR-2, FR-3). */
@@ -21,6 +22,32 @@ export declare const CODEX_ENTRY_RESPONSE_ITEM = "response_item";
 export declare const CODEX_ENTRY_COMPACTED = "compacted";
 export declare const CODEX_EVENT_USER_MESSAGE = "user_message";
 export declare const CODEX_EVENT_AGENT_MESSAGE = "agent_message";
+/**
+ * The second dialogue schema (C-12): one `event_msg` per turn, whose kind is `payload.item.type`
+ * rather than `payload.type`. A rollout that speaks it has no `user_message`/`agent_message`
+ * entries at all, so reading only those two names yields zero dialogue.
+ */
+export declare const CODEX_EVENT_ITEM_COMPLETED = "item_completed";
+/** `payload.item.type` values that carry a turn this module can use (C-12). */
+export declare const CODEX_THREAD_ITEM_USER_MESSAGE = "UserMessage";
+export declare const CODEX_THREAD_ITEM_AGENT_MESSAGE = "AgentMessage";
+export declare const CODEX_THREAD_ITEM_COMMAND_EXECUTION = "CommandExecution";
+export declare const CODEX_THREAD_ITEM_FILE_CHANGE = "FileChange";
+export declare const CODEX_THREAD_ITEM_EXTENSION = "Extension";
+export declare const CODEX_THREAD_ITEM_IMAGE_VIEW = "ImageView";
+/** A call to a server tool, named by `server` and `tool` rather than by a model-visible name. */
+export declare const CODEX_THREAD_ITEM_MCP_TOOL_CALL = "McpToolCall";
+/** An action on another agent of the same client, named by its own `tool` field. */
+export declare const CODEX_THREAD_ITEM_COLLAB_AGENT_TOOL_CALL = "CollabAgentToolCall";
+/**
+ * Item kinds that carry no turn: reasoning cannot move (C-4), a compaction has no text, and a
+ * subagent activity marker reports progress that its own tool call already records.
+ */
+export declare const CODEX_THREAD_ITEM_REASONING = "Reasoning";
+export declare const CODEX_THREAD_ITEM_CONTEXT_COMPACTION = "ContextCompaction";
+export declare const CODEX_THREAD_ITEM_SUB_AGENT_ACTIVITY = "SubAgentActivity";
+/** The one `Extension.kind` measured to be a read: a web search (C-12). */
+export declare const CODEX_EXTENSION_KIND_WEB_SEARCH = "web.search";
 export declare const CODEX_ITEM_FUNCTION_CALL = "function_call";
 export declare const CODEX_ITEM_FUNCTION_CALL_OUTPUT = "function_call_output";
 export declare const CODEX_ITEM_CUSTOM_TOOL_CALL = "custom_tool_call";
@@ -65,6 +92,19 @@ export declare function parseRolloutText(text: string): {
     truncated: boolean;
 };
 export declare function stringifyRollout(entries: RolloutEntry[]): string;
+/** State a consumer and `streamRolloutEntries` share (C-13). */
+export interface RolloutStreamState {
+    /** Set by the reader when a line could not be read. */
+    truncated: boolean;
+    /** Set by the consumer to end the stream at the next line, without abandoning it mid-read. */
+    stop: boolean;
+}
+/**
+ * Yields the entries of a rollout without ever holding the file (C-13). A line that is not one whole
+ * JSON object marks the file truncated, exactly as `parseRolloutText` does; a line longer than any
+ * Codex entry is dropped whole instead of being materialized as one string.
+ */
+export declare function streamRolloutEntries(filePath: string, state: RolloutStreamState): AsyncGenerator<RolloutEntry>;
 export declare function payloadType(entry: RolloutEntry): string;
 /** The entries Codex renders as history, and the only ones this module writes (C-7, C-8). */
 export declare function isMessageEvent(entry: RolloutEntry): boolean;

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/codex/rollout.js

@@ -1,11 +1,13 @@
 /**
  * What a Codex rollout file is: where it lives, how it is named, and which entries it holds.
  *
- * Every fact here was confirmed against codex-cli 0.146.0 (Constraints: "Facts about Codex are
- * verified against the installed version, never assumed"). The entry names below are the ones
- * C-7 and C-8 measured: `event_msg` drives the visible history and the picker preview,
- * `response_item` drives the model history only.
+ * Every fact here was confirmed against codex-cli 0.146.0, and the `item_completed` schema below
+ * against codex-cli 0.151.0-alpha and again against 0.157.1, 0.158.0 and 0.159.2 (Constraints:
+ * "Facts about Codex are verified against the installed version, never assumed"). The entry names
+ * are the ones C-7, C-8 and C-12 measured: `event_msg` drives the visible history and the picker
+ * preview, `response_item` drives the model history only.
  */
+import { createReadStream } from "node:fs";
 import { lstat, readdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
@@ -23,6 +25,32 @@ export const CODEX_ENTRY_RESPONSE_ITEM = "response_item";
 export const CODEX_ENTRY_COMPACTED = "compacted";
 export const CODEX_EVENT_USER_MESSAGE = "user_message";
 export const CODEX_EVENT_AGENT_MESSAGE = "agent_message";
+/**
+ * The second dialogue schema (C-12): one `event_msg` per turn, whose kind is `payload.item.type`
+ * rather than `payload.type`. A rollout that speaks it has no `user_message`/`agent_message`
+ * entries at all, so reading only those two names yields zero dialogue.
+ */
+export const CODEX_EVENT_ITEM_COMPLETED = "item_completed";
+/** `payload.item.type` values that carry a turn this module can use (C-12). */
+export const CODEX_THREAD_ITEM_USER_MESSAGE = "UserMessage";
+export const CODEX_THREAD_ITEM_AGENT_MESSAGE = "AgentMessage";
+export const CODEX_THREAD_ITEM_COMMAND_EXECUTION = "CommandExecution";
+export const CODEX_THREAD_ITEM_FILE_CHANGE = "FileChange";
+export const CODEX_THREAD_ITEM_EXTENSION = "Extension";
+export const CODEX_THREAD_ITEM_IMAGE_VIEW = "ImageView";
+/** A call to a server tool, named by `server` and `tool` rather than by a model-visible name. */
+export const CODEX_THREAD_ITEM_MCP_TOOL_CALL = "McpToolCall";
+/** An action on another agent of the same client, named by its own `tool` field. */
+export const CODEX_THREAD_ITEM_COLLAB_AGENT_TOOL_CALL = "CollabAgentToolCall";
+/**
+ * Item kinds that carry no turn: reasoning cannot move (C-4), a compaction has no text, and a
+ * subagent activity marker reports progress that its own tool call already records.
+ */
+export const CODEX_THREAD_ITEM_REASONING = "Reasoning";
+export const CODEX_THREAD_ITEM_CONTEXT_COMPACTION = "ContextCompaction";
+export const CODEX_THREAD_ITEM_SUB_AGENT_ACTIVITY = "SubAgentActivity";
+/** The one `Extension.kind` measured to be a read: a web search (C-12). */
+export const CODEX_EXTENSION_KIND_WEB_SEARCH = "web.search";
 export const CODEX_ITEM_FUNCTION_CALL = "function_call";
 export const CODEX_ITEM_FUNCTION_CALL_OUTPUT = "function_call_output";
 export const CODEX_ITEM_CUSTOM_TOOL_CALL = "custom_tool_call";
@@ -136,6 +164,62 @@ export function parseRolloutText(text) {
 export function stringifyRollout(entries) {
     return entries.map((entry) => `${JSON.stringify(entry)}\n`).join("");
 }
+/**
+ * A Codex entry is kilobytes; a longer line is damage, not a turn. Such a line is dropped whole and
+ * the file counts as truncated, so no rollout can exhaust memory or the maximum string length (C-13).
+ */
+const MAX_ENTRY_LINE_CHARS = 16 * 1024 * 1024;
+/**
+ * Yields the entries of a rollout without ever holding the file (C-13). A line that is not one whole
+ * JSON object marks the file truncated, exactly as `parseRolloutText` does; a line longer than any
+ * Codex entry is dropped whole instead of being materialized as one string.
+ */
+export async function* streamRolloutEntries(filePath, state) {
+    const stream = createReadStream(filePath, { encoding: "utf8", highWaterMark: 1 << 20 });
+    let pending = "";
+    let droppingLine = false;
+    try {
+        for await (const chunk of stream) {
+            pending += chunk;
+            for (;;) {
+                const end = pending.indexOf("\n");
+                if (end === -1)
+                    break;
+                const line = pending.slice(0, end);
+                pending = pending.slice(end + 1);
+                if (droppingLine) {
+                    // The tail of an over-long line: its newline is the last of it.
+                    droppingLine = false;
+                    continue;
+                }
+                const entry = line.trim() === "" ? null : parseEntry(line);
+                if (entry !== null) {
+                    yield entry;
+                    if (state.stop === true)
+                        return;
+                }
+                else if (line.trim() !== "") {
+                    state.truncated = true;
+                }
+            }
+            if (pending.length > MAX_ENTRY_LINE_CHARS) {
+                pending = "";
+                droppingLine = true;
+                state.truncated = true;
+            }
+        }
+        if (!droppingLine && pending.trim() !== "") {
+            const entry = parseEntry(pending);
+            if (entry !== null)
+                yield entry;
+            else
+                state.truncated = true;
+        }
+    }
+    finally {
+        stream.destroy();
+    }
+}
 export function payloadType(entry) {
     const type = entry.payload.type;
     return typeof type === "string" ? type : "";

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/codex/write.d.ts

@@ -6,10 +6,10 @@
  * does: a file with session metadata and one `event_msg` entry per turn is listed, previewed and
  * resumed with native turns. This module writes that file, and never calls that API.
  */
-import type { CanonicalSession, ProvenanceMarker, SerializedSession, TargetProfile, ValidationDefect } from "./contract.js";
+import type { CanonicalSession, ProvenanceMarker, SerializationContext, SerializedSession, TargetProfile, ValidationDefect } from "./contract.js";
 export type { CodexSerializeDeps } from "./contract.js";
 import type { CodexSerializeDeps } from "./contract.js";
-export declare function serializeCodex(session: CanonicalSession, target: TargetProfile, marker: ProvenanceMarker, deps: CodexSerializeDeps): SerializedSession;
+export declare function serializeCodex(session: CanonicalSession, target: TargetProfile, marker: ProvenanceMarker, context: SerializationContext, deps: CodexSerializeDeps): SerializedSession;
 /**
  * FR-50, read against C-7's symptoms: a thread without metadata or without a non-empty first
  * user message is invisible to the picker, and a `response_item` entry is the shape C-8 replaced.

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/codex/write.js

@@ -9,11 +9,11 @@
 import { basename, isAbsolute } from "node:path";
 import { CODEX_CLI_VERSION, CODEX_ENTRY_EVENT_MSG, CODEX_ENTRY_SESSION_META, CODEX_EVENT_AGENT_MESSAGE, CODEX_EVENT_USER_MESSAGE, CODEX_ORIGINATOR, CODEX_SOURCE_CLI, isMessageEvent, rolloutFilePath, sessionIdFromRolloutFileName, stringifyRollout, } from "./rollout.js";
 import { inspectCodexRollout } from "./validation.js";
-export function serializeCodex(session, target, marker, deps) {
+export function serializeCodex(session, target, marker, context, deps) {
     const importedAt = resolveStamp(marker.importedAt, session.provenance);
     const sessionId = deps.newSessionId();
     const stamp = importedAt.toISOString();
-    const entries = [sessionMetaEntry(sessionId, stamp, deps.cwd(), session)];
+    const entries = [sessionMetaEntry(sessionId, stamp, context.cwd, session)];
     // Codex has no verified durable, out-of-context transcript entry. Do not encode
     // provenance as an agent message: that would make imported metadata look like
     // conversation and could send it back to the model on resume.

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/contract.d.ts

@@ -34,6 +34,10 @@ export interface ValidationDefect {
     /** What is missing or malformed, and why the agent would fail on it. */
     message: string;
 }
+/** The host-supplied absolute destination, preserving native subdirectory and symlink spelling. */
+export interface SerializationContext {
+    cwd: string;
+}
 /** What serializing a canonical session into the target format produced. */
 export interface SerializedSession {
     sessionId: SessionId;
@@ -64,7 +68,7 @@ export interface AgentAdapter {
     /** Source role. Reads one session into the neutral vocabulary. Drops every result body. */
     loadSession(descriptor: SessionDescriptor): Promise<CanonicalSession>;
     /** Target role. Produces bytes only. It never creates a file (FR-49, FR-53). */
-    serialize(session: CanonicalSession, target: TargetProfile, marker: ProvenanceMarker): SerializedSession;
+    serialize(session: CanonicalSession, target: TargetProfile, marker: ProvenanceMarker, context: SerializationContext): SerializedSession;
     /** Target role. Checks the structure before placement. Empty means valid (FR-50). */
     validate(serialized: SerializedSession): ValidationDefect[];
     /** Target role. Reads the committed session back, to compare item counts (FR-51, FR-52). */

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/pi/adapter.js

@@ -8,13 +8,12 @@
  */
 import { randomUUID } from "node:crypto";
 import { readdir, readFile, stat } from "node:fs/promises";
-import { basename, join } from "node:path";
+import { basename, isAbsolute, join } from "node:path";
 import { DEFAULT_WINDOW_TOKENS, defaultPiHome, sessionIdFromFileName, sessionsRoot, shortTitle, toIsoUtc, UNREADABLE_TITLE_PREFIX, } from "./format.js";
 import { changedPathsFromEntries, entriesToTurns, lastTimestamp, parseSessionText, resolveActiveEntries, titleFromEntries, } from "./parse.js";
 import { serializeSession } from "./serialize.js";
 import { validateSerialized } from "./validate.js";
 const DEFAULT_DEPS = {
-    cwd: () => process.cwd(),
     now: () => new Date(),
     newSessionId: () => randomUUID(),
     newEntryId: () => randomUUID().slice(0, 8),
@@ -68,6 +67,7 @@ function describe(home, filePath, text, fileTime) {
     const ref = { agent: "pi", home, id };
     const startedAt = toIsoUtc(parsed.header?.timestamp) ?? fileTime;
     const resolved = resolveActiveEntries(parsed.entries);
+    const repoPaths = parsed.header !== null && isAbsolute(parsed.header.cwd) ? [parsed.header.cwd] : [];
     if (!parsed.header || parsed.truncated || resolved.unreadable !== null) {
         return {
             ref,
@@ -75,7 +75,9 @@ function describe(home, filePath, text, fileTime) {
             startedAt,
             updatedAt: lastTimestamp(resolved.activePath) ?? fileTime,
             turnCount: 0,
-            repoPath: null,
+            repoPath: repoPaths[0] ?? null,
+            repoPaths,
+            startDirectory: repoPaths[0] ?? null,
             filePath,
         };
     }
@@ -87,7 +89,9 @@ function describe(home, filePath, text, fileTime) {
         startedAt,
         updatedAt: lastTimestamp(resolved.activePath) ?? startedAt,
         turnCount: loaded.turns.length,
-        repoPath: parsed.header.cwd.length > 0 ? parsed.header.cwd : null,
+        repoPath: repoPaths[0] ?? null,
+        repoPaths,
+        startDirectory: repoPaths[0] ?? null,
         filePath,
     };
 }
@@ -163,8 +167,8 @@ export function createPiAdapter(overrides = {}) {
                 turns: loaded.turns,
             };
         },
-        serialize(session, target, marker) {
-            return serializeSession(session, target, marker, deps);
+        serialize(session, target, marker, context) {
+            return serializeSession(session, target, marker, context, deps);
         },
         validate(serialized) {
             return validateSerialized(serialized);

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/pi/contract.d.ts

@@ -1,5 +1,5 @@
-import type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, Bytes, LandingLevel, PendingFile, ProvenanceSupport, SelectionLevel, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect } from "../contract.js";
-export type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, Bytes, LandingLevel, PendingFile, ProvenanceSupport, SelectionLevel, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect, };
+import type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, Bytes, LandingLevel, PendingFile, ProvenanceSupport, SelectionLevel, SerializationContext, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect } from "../contract.js";
+export type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, Bytes, LandingLevel, PendingFile, ProvenanceSupport, SelectionLevel, SerializationContext, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect, };
 import type { AgentId, CanonicalSession, CanonicalTurn, HomePath, ProvenanceMarker, RepoSnapshot, SessionDescriptor, SessionId, SessionRef, SourceProvenance, TargetProfile, ToolCallRecord, ToolEffect, TurnKind, TurnRole } from "../../session/contract.js";
 export type { AgentId, CanonicalSession, CanonicalTurn, HomePath, ProvenanceMarker, RepoSnapshot, SessionDescriptor, SessionId, SessionRef, SourceProvenance, TargetProfile, ToolCallRecord, ToolEffect, TurnKind, TurnRole, };
 /** The options Pi's switchSession takes (C-10). */

package/node_modules/{@herbertgao/resume-from/dist/adapters/claude-code → resume-from/dist/adapters/pi}/redaction.js

@@ -40,8 +40,14 @@ const USER_CREDENTIAL_PATTERN = /(^|[\s;&|])(-u|--user)(=|\s+)("[^"\r\n]*"|'[^'\
 const URI_USERINFO_PATTERN = /\b([a-z][a-z0-9+.-]*:\/\/)([^\s/:@]+):([^\s/@]+)@/gi;
 // Unquoted value requires a structural delimiter or line/string end following it, OR a digit
 // somewhere in the token (C-RED-1: "token: expired" is plain English and stays, while
-// "password: hunter2 # prod" carries a credential that must not cross even mid-line).
-const JSON_LIKE_PATTERN = /(["']?)([A-Za-z_][A-Za-z0-9_-]*)\1(\s*:\s*)("[^"\r\n]*"|'[^'\r\n]*'|[^\s,;}]+(?=[,;}]|[\r\n]|$)|[^\s,;}]*\d[^\s,;}]*)/g;
+// "password: hunter2 # prod" carries a credential that must not cross even mid-line). The value is
+// taken whole, however long it is, so a credential can never be left half-redacted (FR-28).
+// A quoted key is matched whole and an unquoted one up to 64 characters: an unbounded identifier run
+// makes the engine backtrack over the whole run at every start position, which is quadratic on a
+// long unbroken line (measured: 50 KB of one word took 11.8 s and 100 KB never finished). A longer
+// unquoted run still matches through its last 64 characters, and `isSensitiveKey` decides by the
+// name's tail as well as by its whole text, so nothing the unbounded name found is hidden.
+const JSON_LIKE_PATTERN = /(?:(?<quote>["'])(?<quoted>[A-Za-z_][A-Za-z0-9_-]*)\k<quote>|(?<bare>[A-Za-z_][A-Za-z0-9_-]{0,63}))(\s*:\s*)("[^"\r\n]*"|'[^'\r\n]*'|[^\s,;}]+(?=[,;}]|[\r\n]|$)|[^\s,;}]*\d[^\s,;}]*)/g;
 function normalizedKey(key) {
     return key.toLowerCase().replaceAll(/[^a-z0-9]/g, "");
 }
@@ -118,7 +124,14 @@ export function redactSensitiveText(text) {
         .replace(USER_CREDENTIAL_PATTERN, `$1$2$3${REDACTED_VALUE}`)
         .replace(URI_USERINFO_PATTERN, `$1$2:${REDACTED_VALUE}@`)
         .replace(ASSIGNMENT_PATTERN, (match, key, separator) => isSensitiveKey(key) ? `${key}${separator}${REDACTED_VALUE}` : match)
-        .replace(JSON_LIKE_PATTERN, (match, quote, key, separator) => isSensitiveKey(key) ? `${quote}${key}${quote}${separator}${REDACTED_VALUE}` : match)
+        .replace(JSON_LIKE_PATTERN, (match, quote, quoted, bare, separator) => {
+        const key = quoted ?? bare;
+        if (key === undefined || !isSensitiveKey(key))
+            return match;
+        // Only the value is replaced; the quoting and the separator stay as they were recorded.
+        const name = quote === undefined ? key : `${quote}${key}${quote}`;
+        return `${name}${separator}${REDACTED_VALUE}`;
+    })
         .replace(CREDENTIAL_PATTERN, REDACTED_VALUE);
 }
 /** Redact a source-recorded argument string, preserving valid JSON when it is JSON. */

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/pi/serialize.d.ts

@@ -11,12 +11,10 @@
  *   An imported tool call is therefore one assistant text entry carrying its outcome line,
  *   which also gives T-PI-4 its "one message entry per canonical turn".
  */
-import type { CanonicalSession, ProvenanceMarker, SerializedSession, TargetProfile } from "./contract.js";
+import type { CanonicalSession, ProvenanceMarker, SerializationContext, SerializedSession, TargetProfile } from "./contract.js";
 export interface PiSerializeDeps {
-    /** The repository the new session belongs to. Pi buckets its sessions by it. */
-    cwd(): string;
     now(): Date;
     newSessionId(): string;
     newEntryId(): string;
 }
-export declare function serializeSession(session: CanonicalSession, target: TargetProfile, marker: ProvenanceMarker, deps: PiSerializeDeps): SerializedSession;
+export declare function serializeSession(session: CanonicalSession, target: TargetProfile, marker: ProvenanceMarker, context: SerializationContext, deps: PiSerializeDeps): SerializedSession;

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/pi/serialize.js

@@ -19,8 +19,8 @@ function turnText(turn) {
     const text = turn.kind === "tool-call" ? (turn.toolCall?.outcomeLine ?? "") : turn.text;
     return text.trim().length > 0 ? text : EMPTY_TURN_TEXT;
 }
-export function serializeSession(session, target, marker, deps) {
-    const cwd = deps.cwd();
+export function serializeSession(session, target, marker, context, deps) {
+    const cwd = context.cwd;
     const sessionId = deps.newSessionId();
     const createdAt = deps.now().toISOString();
     const fallbackTime = toIsoUtc(session.provenance.updatedAt) ?? createdAt;

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/host/cli/render.d.ts

@@ -1,3 +1,3 @@
 import type { LandingResult, Listing } from "./contract.js";
-export declare function renderListing(listing: Listing, repoRoot: string): string[];
+export declare function renderListing(listing: Listing, destinationCwd: string): string[];
 export declare function renderLanding(result: LandingResult): string[];

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/host/cli/render.js

@@ -2,14 +2,14 @@
 // Nothing here decides anything: it prints what the pipeline returned.
 import { safeText } from "./presentation.js";
 const COLUMN_GAP = "  ";
-export function renderListing(listing, repoRoot) {
+export function renderListing(listing, destinationCwd) {
     const lines = listing.rows.length === 0
-        ? [`No session of ${safeText(repoRoot)} was found.`]
+        ? [`No session of ${safeText(destinationCwd)} was found.`]
         : renderRows(listing.rows);
-    // Homes that could not be read are printed, never hidden.
+    // Skipped homes and sessions are printed, never hidden.
     if (listing.failures.length > 0) {
         const count = listing.failures.length;
-        lines.push("", `${count} home${count === 1 ? "" : "s"} could not be read:`);
+        lines.push("", `${count} ${count === 1 ? "entry" : "entries"} skipped:`);
         for (const failure of listing.failures) {
             lines.push(`  ${safeText(failure.agent)}${COLUMN_GAP}${safeText(failure.home)}${COLUMN_GAP}${safeText(failure.message)}`);
         }

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/host/cli/runner.js

@@ -35,7 +35,7 @@ async function run(invocation, pipeline, fallback) {
     };
     if (selection === null) {
         const request = {
-            repoRoot: invocation.cwd,
+            destinationCwd: invocation.cwd,
             target,
             onlyAgent,
             onlyHome,
@@ -53,7 +53,7 @@ async function run(invocation, pipeline, fallback) {
         }
     }
     const request = {
-        repoRoot: invocation.cwd,
+        destinationCwd: invocation.cwd,
         target,
         selection,
         onlyAgent,

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/host/contract.d.ts

@@ -1,5 +1,5 @@
-import type { AdapterRole, AgentAdapter, AgentCapabilities, LandingLevel, ProvenanceSupport, SelectionLevel, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect } from "../adapters/contract.js";
-export type { AdapterRole, AgentAdapter, AgentCapabilities, LandingLevel, ProvenanceSupport, SelectionLevel, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect, };
+import type { AdapterRole, AgentAdapter, AgentCapabilities, LandingLevel, ProvenanceSupport, SelectionLevel, SerializationContext, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect } from "../adapters/contract.js";
+export type { AdapterRole, AgentAdapter, AgentCapabilities, LandingLevel, ProvenanceSupport, SelectionLevel, SerializationContext, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect, };
 import type { CliExit, CliInvocation, CliOutcome, CliRunner } from "./cli/contract.js";
 export type { CliExit, CliInvocation, CliOutcome, CliRunner };
 import type { PiCommandContext, PiResumeFromCommand, PiSwitchContext, PiSwitchOptions, PiSwitchResult } from "./pi-extension/contract.js";

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/host/pi-extension/command.js

@@ -1,3 +1,4 @@
+import { safeText } from "./presentation.js";
 /** The name Pi shows for the command (FR-7). */
 export const RESUME_FROM_COMMAND_NAME = "resume-from";
 const CONFIRM_QUESTION = "Import this session? (y/N)";
@@ -20,7 +21,7 @@ export function createResumeFromCommand(deps) {
 }
 async function runResumeFrom(deps, ctx, args, pipeline) {
     const scope = {
-        repoRoot: ctx.cwd,
+        destinationCwd: ctx.cwd,
         target: targetOf(deps, ctx),
         onlyAgent: null,
         onlyHome: null,
@@ -29,7 +30,9 @@ async function runResumeFrom(deps, ctx, args, pipeline) {
     if (selection === null)
         return;
     const request = { ...scope, selection };
-    const report = await pipeline.preview(request);
+    const report = await withDiagnostic(deps.ui, "preview", () => pipeline.preview(request));
+    if (report === null)
+        return;
     deps.ui.show(report.lines); // Verbatim and unreordered (FR-21).
     if (report.blocked) {
         deps.ui.show([report.blockedReason ?? BLOCKED_FALLBACK]);
@@ -40,10 +43,28 @@ async function runResumeFrom(deps, ctx, args, pipeline) {
         return; // Nothing is written before the user confirms (FR-16, FR-20).
     }
     // Pi's own context is the runtime handle the Pi adapter switches with (FR-44).
-    const landing = await pipeline.commit(request, ctx, report.confirmationToken);
-    if (!landing.switched)
+    const landing = await withDiagnostic(deps.ui, "import", () => pipeline.commit(request, ctx, report.confirmationToken));
+    if (landing !== null && !landing.switched)
         present(deps.ui, landing);
 }
+/** Catch only pipeline failures, not UI errors or presentation after a successful switch. */
+async function withDiagnostic(ui, stage, operation) {
+    try {
+        return await operation();
+    }
+    catch (error) {
+        // Pipeline errors may wrap an abort; preserve cancellation rather than relabel it.
+        const seen = new Set();
+        for (let cause = error; cause instanceof Error && !seen.has(cause); cause = cause.cause) {
+            if (cause.name === "AbortError")
+                throw error;
+            seen.add(cause);
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        ui.show([`The ${stage} failed: ${safeText(message)}`]);
+        return null;
+    }
+}
 /** The import target is always the Pi home the user is in (FR-1, FR-2). */
 function targetOf(deps, ctx) {
     return { agent: "pi", home: ctx.home, windowTokens: deps.windowTokens };
@@ -62,12 +83,14 @@ async function resolveSelection(deps, args, pipeline, scope) {
     const [only] = given;
     if (only !== undefined)
         return parseArgument(only); // An argument skips the picker (FR-12).
-    const listing = await pipeline.list(scope);
+    const listing = await withDiagnostic(deps.ui, "listing", () => pipeline.list(scope));
+    if (listing === null)
+        return null;
     if (listing.failures.length > 0) {
-        deps.ui.show(listing.failures.map(formatFailure)); // Skipped homes are never silent.
+        deps.ui.show(listing.failures.map(formatFailure)); // Home and session failures are never silent.
     }
     if (listing.rows.length === 0) {
-        deps.ui.show([`No sessions to import for ${scope.repoRoot}.`]);
+        deps.ui.show([`No sessions to import for ${scope.destinationCwd}.`]);
         return null; // A picker over nothing is a trap.
     }
     const picked = await deps.picker.pick(listing);
@@ -86,7 +109,7 @@ function parseArgument(argument) {
         : { by: "session-id", id: argument };
 }
 function formatFailure(failure) {
-    return `Skipped ${failure.agent} home ${failure.home}: ${failure.message}`;
+    return `${failure.agent} ${failure.home}: ${failure.message}`;
 }
 /**
  * Shows the marker and handover when the switch did not happen (FR-45, FR-47).

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/host/wiring.d.ts

@@ -22,7 +22,7 @@ export interface HostDeps {
     createEstimators?: () => EstimatorFactory;
     createRepo?: () => RepoReader;
     createCommitter?: () => FileCommitter;
-    /** The directory the command runs in. The repository reader reads git state from it (FR-13). */
+    /** Host invocation directory. Each pipeline request independently supplies its destination. */
     cwd?: string;
     /** The import time written into the marker (FR-47). Injected so a preview and a commit agree. */
     now?: () => string;

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/host/wiring.js

@@ -26,9 +26,8 @@ export async function createHost(deps = {}) {
     // Step 1. It rejects before anything else exists, which is what FR-56 asks for.
     const config = await (deps.configLoader ?? createConfigLoader()).load();
     // Step 2.
-    const cwd = deps.cwd ?? process.cwd();
     const estimators = (deps.createEstimators ?? (() => estimatorFactory))();
-    const repo = (deps.createRepo ?? (() => createRepoReader(cwd)))();
+    const repo = (deps.createRepo ?? createRepoReader)();
     const committer = (deps.createCommitter ?? createFileCommitter)();
     // Step 3. The list is the only place that knows which implementations exist. Each adapter
     // names itself, so the family is keyed by what it declares and never by what the list assumed.

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/import/confirmation.d.ts

@@ -2,5 +2,8 @@ import type { SessionDescriptor } from "../session/contract.js";
 import type { PreviewContent } from "./preview/contract.js";
 import type { TransferPlan } from "./transfer/contract.js";
 /** Binds confirmation to every input that can affect the imported session or its preview. */
-export declare function confirmationToken(descriptor: SessionDescriptor, plan: TransferPlan, report: PreviewContent): string;
+export declare function confirmationToken(descriptor: SessionDescriptor, plan: TransferPlan, report: PreviewContent, destination: {
+    canonicalCwd: string;
+    commonDir: string | null;
+}): string;
 export declare function confirmationMatches(expected: string, supplied: string): boolean;

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/import/confirmation.js

@@ -2,8 +2,8 @@ import { createHash, timingSafeEqual } from "node:crypto";
 const TOKEN_PREFIX = "v1-sha256-";
 const TOKEN_PATTERN = /^v1-sha256-[0-9a-f]{64}$/;
 /** Binds confirmation to every input that can affect the imported session or its preview. */
-export function confirmationToken(descriptor, plan, report) {
-    const payload = stableJson({ descriptor, plan, report });
+export function confirmationToken(descriptor, plan, report, destination) {
+    const payload = stableJson({ descriptor, plan, report, destination });
     return `${TOKEN_PREFIX}${createHash("sha256").update(payload).digest("hex")}`;
 }
 export function confirmationMatches(expected, supplied) {

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/import/contract.d.ts

@@ -1,7 +1,7 @@
-import type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, LandingLevel, ProvenanceSupport, SelectionLevel, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect } from "../adapters/contract.js";
-export type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, LandingLevel, ProvenanceSupport, SelectionLevel, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect, };
-import type { HomeFailure, Listing, SearchScope, SelectionError, SelectionInput, SessionFinder } from "./discovery/contract.js";
-export type { HomeFailure, Listing, SearchScope, SelectionError, SelectionInput, SessionFinder };
+import type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, LandingLevel, ProvenanceSupport, SelectionLevel, SerializationContext, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect } from "../adapters/contract.js";
+export type { AdapterRole, AgentAdapter, AgentCapabilities, AgentRuntime, LandingLevel, ProvenanceSupport, SelectionLevel, SerializationContext, SerializedSession, StoredSessionFacts, SwitchOutcome, ValidationDefect, };
+import type { DiscoveryDestination, HomeFailure, Listing, SearchScope, SelectionError, SelectionInput, SessionFinder } from "./discovery/contract.js";
+export type { DiscoveryDestination, HomeFailure, Listing, SearchScope, SelectionError, SelectionInput, SessionFinder, };
 import type { HandoverInstruction, LandingError, LandingResult, LandingStage, SessionLander } from "./landing/contract.js";
 export type { HandoverInstruction, LandingError, LandingResult, LandingStage, SessionLander };
 import type { PreviewBuilder, PreviewContent, PreviewReport, PreviewWarning, WarningKind } from "./preview/contract.js";
@@ -18,14 +18,16 @@ import type { AgentId, CanonicalSession, CanonicalTurn, HomePath, ProvenanceMark
 export type { AgentId, CanonicalSession, CanonicalTurn, HomePath, ProvenanceMarker, RepoSnapshot, SessionDescriptor, SessionId, SessionRef, SourceProvenance, TargetProfile, ToolCallRecord, ToolEffect, TurnKind, TurnRole, };
 /** What to list (FR-10, FR-15). */
 export interface ListRequest {
-    repoRoot: string;
+    /** Host-supplied absolute working directory; preserve native subdirectory and symlink spelling. */
+    destinationCwd: string;
     target: TargetProfile;
     onlyAgent: AgentId | null;
     onlyHome: HomePath | null;
 }
 /** What to preview, and later what to commit (FR-16, FR-20). */
 export interface ImportRequest {
-    repoRoot: string;
+    /** Host-supplied absolute working directory; preserve native subdirectory and symlink spelling. */
+    destinationCwd: string;
     target: TargetProfile;
     selection: SelectionInput;
     onlyAgent: AgentId | null;