@oh-my-pi/pi-coding-agent 16.2.1 → 16.2.2

package/dist/types/advisor/runtime.d.ts

@@ -1,12 +1,24 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { type SecretObfuscator } from "../secrets/obfuscator";
-/** Minimal slice of `Agent` the runtime drives — satisfied by pi-agent-core `Agent`. */
+/**
+ * Minimal slice of `Agent` the runtime drives — satisfied by pi-agent-core
+ * `Agent`. `state.error` mirrors `Agent.state.error`: provider/stream failures
+ * the loop catches internally never reject `prompt()`, so the runtime reads
+ * this field after every prompt to detect a failed turn.
+ */
 export interface AdvisorAgent {
     prompt(input: string): Promise<void>;
     abort(reason?: unknown): void;
     reset(): void;
+    /**
+     * Drop messages appended past `count`. Called after a failed `prompt()` so a
+     * retry doesn't replay the failed user batch + synthetic assistant-error
+     * turn `Agent.#runLoop` records on its internal state.
+     */
+    rollbackTo?(count: number): void;
     readonly state: {
         messages: AgentMessage[];
+        error?: string;
     };
 }
 export interface AdvisorRuntimeHost {
@@ -33,6 +45,8 @@ export interface AdvisorRuntimeHost {
      * one that routes `advise()` results back to the primary.
      */
     beginAdvisorUpdate?(): void;
+    /** Surface a non-recovering advisor failure to the host UI without adding model-visible context. */
+    notifyFailure?(error: unknown): void;
 }
 export declare class AdvisorRuntime {
     #private;

package/dist/types/config/model-roles.d.ts

@@ -3,7 +3,7 @@
  */
 import { type ThemeColor } from "../modes/theme/theme";
 import type { Settings } from "./settings";
-export type ModelRole = "default" | "smol" | "slow" | "vision" | "plan" | "designer" | "commit" | "title" | "task" | "advisor";
+export type ModelRole = "default" | "smol" | "slow" | "vision" | "plan" | "designer" | "commit" | "tiny" | "task" | "advisor";
 export interface ModelRoleInfo {
     tag?: string;
     name: string;

package/dist/types/config/settings-schema.d.ts

@@ -1198,6 +1198,30 @@ export declare const SETTINGS_SCHEMA: {
             }];
         };
     };
+    readonly textVerbosity: {
+        readonly type: "enum";
+        readonly values: readonly ["low", "medium", "high"];
+        readonly default: "high";
+        readonly ui: {
+            readonly tab: "model";
+            readonly group: "Sampling";
+            readonly label: "Text Verbosity";
+            readonly description: "OpenAI Responses and Codex response verbosity (low, medium, or high)";
+            readonly options: readonly [{
+                readonly value: "low";
+                readonly label: "Low";
+                readonly description: "Prefer concise responses";
+            }, {
+                readonly value: "medium";
+                readonly label: "Medium";
+                readonly description: "Balance brevity and detail";
+            }, {
+                readonly value: "high";
+                readonly label: "High";
+                readonly description: "Prefer detailed responses (default)";
+            }];
+        };
+    };
     readonly serviceTier: {
         readonly type: "enum";
         readonly values: readonly ["none", "auto", "default", "flex", "scale", "priority", "openai-only", "claude-only"];
@@ -2080,7 +2104,7 @@ export declare const SETTINGS_SCHEMA: {
     };
     readonly "tools.format": {
         readonly type: "enum";
-        readonly values: readonly ["auto", "native", "glm", "hermes", "kimi", "xml", "anthropic", "deepseek", "harmony", "pi", "qwen3", "gemini", "gemma", "minimax"];
+        readonly values: readonly ["auto", "native", "glm", "hermes", "kimi", "xml", "anthropic", "deepseek", "harmony", "qwen3", "gemini", "gemma", "minimax"];
         readonly default: "auto";
         readonly ui: {
             readonly tab: "context";
@@ -2123,10 +2147,6 @@ export declare const SETTINGS_SCHEMA: {
                 readonly value: "harmony";
                 readonly label: "Harmony";
                 readonly description: "Use Harmony-style in-band tool calls.";
-            }, {
-                readonly value: "pi";
-                readonly label: "Pi";
-                readonly description: "Use the Pi owned dialect (compact sigil-delimited tool calls).";
             }, {
                 readonly value: "qwen3";
                 readonly label: "Qwen3";
@@ -2532,7 +2552,7 @@ export declare const SETTINGS_SCHEMA: {
             readonly tab: "memory";
             readonly group: "Mnemopi";
             readonly label: "Mnemopi LLM Mode";
-            readonly description: "Use no LLM, the configured smol model, or a remote OpenAI-compatible endpoint";
+            readonly description: "Use no LLM, the online tiny model (the TINY role from /models, else pi/smol), or a remote OpenAI-compatible endpoint";
             readonly condition: "mnemopiActive";
             readonly options: readonly [{
                 readonly value: "none";
@@ -2540,8 +2560,8 @@ export declare const SETTINGS_SCHEMA: {
                 readonly description: "Disable Mnemopi LLM-backed extraction";
             }, {
                 readonly value: "smol";
-                readonly label: "Smol";
-                readonly description: "Use the configured pi-ai smol model";
+                readonly label: "Online (tiny)";
+                readonly description: "Use the online tiny model (the TINY role from /models, else pi/smol)";
             }, {
                 readonly value: "remote";
                 readonly label: "Remote";
@@ -4607,7 +4627,7 @@ export declare const SETTINGS_SCHEMA: {
             readonly tab: "providers";
             readonly group: "Tiny Model";
             readonly label: "Tiny Model";
-            readonly description: "Session-title model: online pi/smol by default, or a local on-device model";
+            readonly description: "Session-title model: online (the TINY role from /models, else pi/smol) by default, or a local on-device model";
             readonly options: ({
                 value: "online";
                 label: string;
@@ -4763,7 +4783,7 @@ export declare const SETTINGS_SCHEMA: {
             readonly tab: "memory";
             readonly group: "General";
             readonly label: "Memory Model";
-            readonly description: "Mnemopi LLM for fact extraction + consolidation: online (smol/remote) by default, or a local on-device model";
+            readonly description: "Mnemopi LLM for fact extraction + consolidation: online (the TINY role from /models, else smol/remote) by default, or a local on-device model";
             readonly condition: "mnemopiActive";
             readonly options: ({
                 value: "online";
@@ -4784,7 +4804,7 @@ export declare const SETTINGS_SCHEMA: {
             readonly tab: "model";
             readonly group: "Thinking";
             readonly label: "Auto Thinking Model";
-            readonly description: "Difficulty classifier for the `auto` thinking level: online smol by default, or a local on-device model";
+            readonly description: "Difficulty classifier for the `auto` thinking level: online (the TINY role from /models, else smol) by default, or a local on-device model";
             readonly condition: "autoThinkingActive";
             readonly options: ({
                 value: "online";
@@ -4815,7 +4835,7 @@ export declare const SETTINGS_SCHEMA: {
             readonly tab: "providers";
             readonly group: "Tiny Model";
             readonly label: "Unexpected Stop Model";
-            readonly description: "Classifier for unexpected-stop detection: online smol by default, or a local on-device model.";
+            readonly description: "Classifier for unexpected-stop detection: online (the TINY role from /models, else smol) by default, or a local on-device model.";
             readonly condition: "unexpectedStopDetection";
             readonly options: ({
                 value: "online";

package/dist/types/discovery/omp-extension-roots.d.ts

@@ -31,9 +31,9 @@ export declare function getInjectedOmpExtensionCliRoots(): readonly OmpExtension
  * 1. CLI roots injected via {@link injectOmpExtensionCliRoots}
  * 2. Project `<cwd>/.omp/settings.json#extensions`
  * 3. User `~/.omp/agent/settings.json#extensions`
- * 4. Enabled plugins installed under `<plugins>/node_modules/` (e.g. via
- *    `omp install <pkg>` / `omp plugin install` / `omp plugin link`)
- *
+ * 4. Enabled npm/link plugins installed under `<plugins>/node_modules/` (for
+ *    `omp install <pkg>` / `omp plugin install` / `omp plugin link`). Marketplace
+ *    installs are loaded by the `claude-plugins` provider and are excluded here.
  * Only entries that resolve to a directory on disk are returned; file
  * entrypoints contribute zero sub-discovery surface and are filtered out.
  * Installed-plugin enumeration failures (missing lockfile, unreadable

package/dist/types/edit/index.d.ts

@@ -60,5 +60,23 @@ export declare class EditTool implements AgentTool<TInput> {
      * mode-specific patch grammar.
      */
     matcherDigest(args: unknown): string | undefined;
+    /**
+     * Project the streamed args onto their target file paths so path-scoped
+     * stream matchers (e.g. TTSR `tool:edit(*.ts)` globs) match hashline and
+     * apply_patch edits even though the path lives in the wire payload (a
+     * section header / envelope marker) rather than a top-level argument.
+     */
+    matcherPaths(args: unknown): readonly string[] | undefined;
+    /**
+     * Per-file projection of the streamed args, splitting multi-section
+     * hashline / multi-hunk apply_patch payloads into one (path, digest) entry
+     * per touched file. Path-scoped stream matchers (TTSR) then evaluate each
+     * file in isolation, so a `tool:edit(*.ts)` rule never fires on text that
+     * actually belongs to a sibling Markdown hunk.
+     */
+    matcherEntries(args: unknown): readonly {
+        path: string;
+        digest: string;
+    }[] | undefined;
     execute(_toolCallId: string, params: EditParams, signal?: AbortSignal, onUpdate?: AgentToolUpdateCallback<EditToolDetails, TInput>, context?: AgentToolContext): Promise<AgentToolResult<EditToolDetails, TInput>>;
 }

package/dist/types/edit/streaming.d.ts

@@ -35,6 +35,16 @@ export interface StreamingDiffContext {
      */
     isStreaming?: boolean;
 }
+/**
+ * Per-file projection of a streamed edit payload. Pairs one target file path
+ * with the digest of only the lines added to that file, so path-scoped stream
+ * matchers (TTSR) evaluate each file in isolation — a `tool:edit(*.ts)` rule
+ * never fires on text that actually belongs to a sibling `README.md` hunk.
+ */
+export interface EditMatcherEntry {
+    readonly path: string;
+    readonly digest: string;
+}
 export interface EditStreamingStrategy<Args = unknown> {
     /**
      * Return the args restricted to edits that are "complete enough" to
@@ -60,6 +70,26 @@ export interface EditStreamingStrategy<Args = unknown> {
      * args don't yet carry any content.
      */
     matcherDigest(args: Args): string | undefined;
+    /**
+     * Surface the target file paths a (potentially partial) call would touch,
+     * so path-scoped stream matchers (e.g. TTSR `tool:edit(*.ts)` globs) match
+     * even when the path is not a top-level argument but lives inside the wire
+     * payload — `hashline` section headers, `apply_patch` envelope markers.
+     * Returns `undefined` (or an empty list) when no paths are recoverable.
+     */
+    matcherPaths(args: Args): readonly string[] | undefined;
+    /**
+     * Per-file projection of the (potentially partial) args: one entry per
+     * touched file pairing the path with the digest of only the lines added to
+     * that file. Multi-file payloads (multi-section hashline / multi-hunk
+     * apply_patch) MUST split here so callers can evaluate each file under its
+     * own path scope instead of leaking added lines from one file into the
+     * other's match context. Same-path sections / hunks are merged into one
+     * entry. Returns `undefined` (or empty) when no per-file split is
+     * recoverable yet — the caller falls back to {@link matcherDigest} +
+     * {@link matcherPaths}.
+     */
+    matcherEntries(args: Args): readonly EditMatcherEntry[] | undefined;
 }
 /**
  * Given an edits array parsed from partial JSON, drop the last entry when the

package/dist/types/extensibility/custom-tools/types.d.ts

@@ -109,6 +109,7 @@ export type CustomToolSessionEvent = {
     maxAttempts: number;
     delayMs: number;
     errorMessage: string;
+    errorId?: number;
 } | {
     reason: "auto_retry_end";
     success: boolean;

package/dist/types/extensibility/shared-events.d.ts

@@ -190,6 +190,7 @@ export interface AutoRetryStartEvent {
     maxAttempts: number;
     delayMs: number;
     errorMessage: string;
+    errorId?: number;
 }
 /** Fired when auto-retry ends */
 export interface AutoRetryEndEvent {

package/dist/types/mcp/oauth-discovery.d.ts

@@ -1,9 +1,3 @@
-/**
- * MCP OAuth Auto-Discovery
- *
- * Automatically detects OAuth requirements from MCP server responses
- * and extracts authentication endpoints.
- */
 import type { FetchImpl } from "@oh-my-pi/pi-ai/types";
 export interface OAuthEndpoints {
     authorizationUrl: string;
@@ -21,11 +15,6 @@ export interface AuthDetectionResult {
     message?: string;
 }
 export declare function extractMcpAuthServerUrl(error: Error, serverUrl?: string): string | undefined;
-/**
- * Detect if an error indicates authentication is required.
- * Checks for common auth error patterns.
- */
-export declare function detectAuthError(error: Error): boolean;
 /**
  * Extract OAuth endpoints from error response.
  * Looks for WWW-Authenticate header format or JSON error bodies.

package/dist/types/modes/components/status-line/component.d.ts

@@ -14,8 +14,6 @@ export declare class StatusLineComponent implements Component {
     getEffectiveSettingsForTest(): EffectiveStatusLineSettings;
     setAutoCompactEnabled(enabled: boolean): void;
     setSubagentCount(count: number): void;
-    /** Hub key label shown in the forced running-subagents badge. */
-    setSubagentHubHint(hint: string | undefined): void;
     /** Active subagent count as currently displayed (collab state mirroring). */
     get subagentCount(): number;
     setSessionStartTime(time: number): void;

package/dist/types/sdk.d.ts

@@ -1,5 +1,5 @@
 import { type AgentTelemetryConfig, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import { type Model } from "@oh-my-pi/pi-ai";
+import type { Model } from "@oh-my-pi/pi-ai";
 import type { Dialect } from "@oh-my-pi/pi-ai/dialect";
 import { type Rule } from "./capability/rule";
 import { ModelRegistry } from "./config/model-registry";

package/dist/types/session/agent-session.d.ts

@@ -13,9 +13,9 @@
  * Modes use this class and add their own I/O layer on top.
  */
 import type { InMemorySnapshotStore } from "@oh-my-pi/hashline";
-import { Agent, type AgentEvent, type AgentMessage, type AgentState, type AgentTool, ThinkingLevel, type ToolChoiceDirective } from "@oh-my-pi/pi-agent-core";
+import { Agent, type AgentEvent, type AgentMessage, type AgentState, type AgentTool, type StreamFn, ThinkingLevel, type ToolChoiceDirective } from "@oh-my-pi/pi-agent-core";
 import { type CompactionResult, type ShakeConfig } from "@oh-my-pi/pi-agent-core/compaction";
-import type { AssistantMessage, ImageContent, Message, MessageAttribution, Model, ProviderSessionState, ResetCreditAccountStatus, ResetCreditRedeemOutcome, ResetCreditTarget, ServiceTier, SimpleStreamOptions, TextContent, ToolChoice, UsageReport } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage, Context, ImageContent, Message, MessageAttribution, Model, ProviderSessionState, ResetCreditAccountStatus, ResetCreditRedeemOutcome, ResetCreditTarget, ServiceTier, SimpleStreamOptions, TextContent, ToolChoice, UsageReport } from "@oh-my-pi/pi-ai";
 import { Effort } from "@oh-my-pi/pi-ai";
 import { type AsyncJob, type AsyncJobDeliveryState, AsyncJobManager } from "../async";
 import type { Rule } from "../capability/rule";
@@ -72,6 +72,7 @@ export type AgentSessionEvent = AgentEvent | {
     maxAttempts: number;
     delayMs: number;
     errorMessage: string;
+    errorId?: number;
 } | {
     type: "auto_retry_end";
     success: boolean;
@@ -160,6 +161,21 @@ export interface AgentSessionConfig {
     builtInToolNames?: Iterable<string>;
     /** Current session pre-LLM message transform pipeline */
     transformContext?: (messages: AgentMessage[], signal?: AbortSignal) => AgentMessage[] | Promise<AgentMessage[]>;
+    /**
+     * Per-request transform applied after `convertToLlm` and before the
+     * provider call. Used for snapcompact, secret obfuscation, and image
+     * clamping. When supplied via {@link createAgentSession}, the advisor agent
+     * inherits this so its requests undergo the same shaping as the main turn.
+     */
+    transformProviderContext?: (context: Context, model: Model) => Context | Promise<Context>;
+    /**
+     * Stream wrapper passed to the advisor agent so its requests apply the
+     * session's `providers.openrouterVariant`, `providers.antigravityEndpoint`,
+     * `providers.maxInFlightRequests`, and `model.loopGuard.*` settings —
+     * keeping OpenRouter sticky-routing / response caching consistent with the
+     * main agent. Defaults to plain `streamSimple` when omitted.
+     */
+    advisorStreamFn?: StreamFn;
     /** Provider payload hook used by the active session request path */
     onPayload?: SimpleStreamOptions["onPayload"];
     /** Provider response hook used by the active session request path */
@@ -1253,6 +1269,14 @@ export declare class AgentSession {
      * not merely the setting. Drives the status-line badge and `/dump advisor`.
      */
     isAdvisorActive(): boolean;
+    /**
+     * The live advisor `Agent`, or `undefined` when no advisor runtime is
+     * attached. Surfaced for diagnostics (`/dump advisor` already serializes
+     * its transcript via {@link formatAdvisorHistoryAsText}) and so callers can
+     * verify the advisor inherits the session's provider-shaping options
+     * (`streamFn`, `promptCacheKey`, `providerSessionState`, ...).
+     */
+    getAdvisorAgent(): Agent | undefined;
     /**
      * Return structured advisor stats for the status command and TUI panel.
      */

package/dist/types/session/messages.d.ts

@@ -43,18 +43,17 @@ export interface SkillPromptDetails {
  *  #buildTranscriptLines`, `runPrintMode`, and `AcpAgent#replayAssistantMessage`
  *  (fallback error emission) read it via `isSilentAbort`. */
 export declare const SILENT_ABORT_MARKER = "__omp.silent_abort__";
-/** Type-guard for `SILENT_ABORT_MARKER`. Renderers MUST branch on this rather
- *  than string-comparing inline so refactors to the marker constant (e.g.,
- *  namespacing changes) propagate through every consumer in lockstep. */
-export declare function isSilentAbort(errorMessage: string | undefined): boolean;
+/** Type-guard for silent aborts. Renderers MUST call this helper so structured
+ *  `errorId` and legacy persisted marker messages stay in lockstep. */
+export declare function isSilentAbort(message: Pick<AssistantMessage, "errorId" | "errorMessage">): boolean;
 /** Reason threaded through `AbortController.abort(reason)` when the user aborts
  *  the turn with Esc (see `AgentSession.abort`). The agent keeps it on the
  *  aborted assistant message's `errorMessage` so queued follow-ups/tool-result
  *  placeholders can distinguish a deliberate interrupt from a bare lifecycle
  *  abort, but interactive renderers suppress this redundant transcript line. */
 export declare const USER_INTERRUPT_LABEL = "Interrupted by user";
-export declare function isUserInterruptAbort(errorMessage: string | undefined): boolean;
-export declare function shouldRenderAbortReason(errorMessage: string | undefined): boolean;
+export declare function isUserInterruptAbort(message: Pick<AssistantMessage, "errorId" | "errorMessage">): boolean;
+export declare function shouldRenderAbortReason(message: Pick<AssistantMessage, "errorId" | "errorMessage">): boolean;
 /** Sentinel `errorMessage` the agent stamps on any abort that carried no custom
  *  reason (bare `abort()`). Renderers treat it as "no specific reason given". */
 export declare const GENERIC_ABORT_SENTINEL = "Request was aborted";
@@ -63,7 +62,7 @@ export declare const GENERIC_ABORT_SENTINEL = "Request was aborted";
  *  no threaded reason fall back to the retry-aware generic label. Call
  *  `shouldRenderAbortReason` before rendering when user interrupts should stay
  *  visually quiet. */
-export declare function resolveAbortLabel(errorMessage: string | undefined, retryAttempt?: number): string;
+export declare function resolveAbortLabel(message: Pick<AssistantMessage, "errorId" | "errorMessage">, retryAttempt?: number): string;
 /** Extract the optional `__queueChipText` field from a CustomMessage's
  *  `details` blob. Safe over `unknown`; returns undefined when the field is
  *  absent or non-string. */

package/dist/types/session/settings-stream-fn.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Settings-aware stream wrapper shared by the main agent (sdk.ts) and the
+ * advisor agent (AgentSession.#buildAdvisorRuntime).
+ *
+ * Reads OpenRouter / Antigravity routing variants, Responses-family text
+ * verbosity, per-provider in-flight caps, and the loop guard out of `Settings`
+ * per request, layering them onto whatever options the caller passed. Before
+ * this helper existed, advisor turns called bare `streamSimple` while the main
+ * turn went through an inline closure that read these settings — so an advisor on
+ * OpenRouter never saw `providers.openrouterVariant`, breaking sticky routing
+ * and OpenRouter response-cache hits across advisor calls.
+ */
+import type { StreamFn } from "@oh-my-pi/pi-agent-core";
+import { type Settings } from "../config/settings";
+/**
+ * Build a {@link StreamFn} that reads provider routing/guard settings from
+ * `settings` per call and forwards to `base` (defaults to `streamSimple`).
+ *
+ * Caller-supplied `streamOptions` always win — the helper only fills holes.
+ */
+export declare function createSettingsAwareStreamFn(settings: Settings, base?: StreamFn): StreamFn;

package/dist/types/session/turn-persistence.d.ts

@@ -0,0 +1,88 @@
+/**
+ * Helpers that share one cheap, structural identity for messages — both during
+ * incremental persistence and for the mid-run-compaction ordering check.
+ *
+ * Previously `AgentSession` carried two near-duplicate routines
+ * (`#sessionMessagesReferToSameTurn` + `#messageValueSignature`) that
+ * reconstructed the branch path on every check (O(n²) `unshift`) and
+ * `JSON.stringify`-compared the full message content on every pairwise hit.
+ * Long-running sessions with many subagents fired this thousands of times per
+ * minute and froze the TUI loop (see issue #3629). The persistence key already
+ * encodes a stable logical identity — timestamp + role-specific discriminators
+ * — so the structural compare is now the rare collision tiebreaker (e.g. two
+ * provider responses at the same millisecond with `undefined` responseId),
+ * not the load-bearing check.
+ *
+ * The helpers here keep that identity in one place and expose the planner so
+ * the persistence-ordering logic is unit-testable without standing up an
+ * `AgentSession`.
+ */
+import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+/**
+ * Stable identity for messages that pass through {@link AgentSession}'s
+ * incremental persistence path.
+ *
+ * The discriminators chosen per role are precisely the fields that uniquely
+ * identify a single logical message instance:
+ *
+ * - `assistant` — timestamp + provider + model + responseId + stopReason
+ *   (responseId is the canonical provider-side id when available; the rest
+ *   disambiguate when it is not, e.g. local/dev models).
+ * - `toolResult` — timestamp + toolCallId + toolName (toolCallId is unique
+ *   per execution; toolName guards against synthetic reuse).
+ * - `user` / `developer` — timestamp + attribution (attribution distinguishes
+ *   user-typed vs hook-injected at the same wall-clock millisecond).
+ * - `fileMention` — timestamp.
+ *
+ * Returns `undefined` for message roles that are not persisted through this
+ * path (e.g. `hookMessage`, `custom`, `bashExecution`) — those follow other
+ * append paths in `SessionManager`.
+ */
+export declare function sessionMessagePersistenceKey(message: AgentMessage): string | undefined;
+/**
+ * Slow-path content equality check used when two messages collide on
+ * {@link sessionMessagePersistenceKey}. Only the role's content fields are
+ * compared (no timestamps, no metadata) because the key already pinned all of
+ * those down.
+ *
+ * Most calls into the persistence path never reach this — keys are unique
+ * enough in production that the snapshot lookup short-circuits at the key
+ * level. Restoring the structural compare here preserves the pre-#3629
+ * contract that two messages with the same metadata BUT different content are
+ * distinct (e.g. two assistant turns with `undefined` responseId emitted in
+ * the same wall-clock millisecond, which is exactly how the in-memory test
+ * harness crafts streamed responses).
+ */
+export declare function sameMessageContent(left: AgentMessage, right: AgentMessage): boolean;
+/**
+ * Outcome of {@link planTurnPersistence}.
+ *
+ * `ok` lists the turn-message indices that still need to be appended (in
+ * order). `out-of-order` reports the first message whose later sibling is
+ * already persisted — the caller bails so it does not silently splice a
+ * stale message between newer entries on the live branch.
+ */
+export type TurnPersistencePlan = {
+    kind: "ok";
+    toPersist: readonly number[];
+} | {
+    kind: "out-of-order";
+    messageIndex: number;
+};
+/**
+ * Decide what to do with a turn's messages relative to what's already on the
+ * branch, in a single pass over the pre-computed keys.
+ *
+ * @param turnKeys persistence keys for each turn message, in the order the
+ *   agent loop emitted them. `undefined` slots represent messages with no
+ *   persistence key (skipped silently).
+ * @param persistedKeys the snapshot of persistence keys currently on the
+ *   branch (built once per call from {@link sessionMessagePersistenceKey} for
+ *   each persisted message entry).
+ *
+ * The check is O(n²) over turn messages — but `n` here is the size of one
+ * turn (a handful of tool results), not the size of the branch. That's the
+ * point of this refactor: the expensive O(branch) work happens exactly once,
+ * inside the caller's snapshot loop, not per-comparison.
+ */
+export declare function planTurnPersistence(turnKeys: readonly (string | undefined)[], persistedKeys: ReadonlySet<string>): TurnPersistencePlan;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "16.2.1",
+	"version": "16.2.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -55,17 +55,17 @@
 		"@agentclientprotocol/sdk": "0.25.0",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "16.2.1",
-		"@oh-my-pi/omp-stats": "16.2.1",
-		"@oh-my-pi/pi-agent-core": "16.2.1",
-		"@oh-my-pi/pi-ai": "16.2.1",
-		"@oh-my-pi/pi-catalog": "16.2.1",
-		"@oh-my-pi/pi-mnemopi": "16.2.1",
-		"@oh-my-pi/pi-natives": "16.2.1",
-		"@oh-my-pi/pi-tui": "16.2.1",
-		"@oh-my-pi/pi-utils": "16.2.1",
-		"@oh-my-pi/pi-wire": "16.2.1",
-		"@oh-my-pi/snapcompact": "16.2.1",
+		"@oh-my-pi/hashline": "16.2.2",
+		"@oh-my-pi/omp-stats": "16.2.2",
+		"@oh-my-pi/pi-agent-core": "16.2.2",
+		"@oh-my-pi/pi-ai": "16.2.2",
+		"@oh-my-pi/pi-catalog": "16.2.2",
+		"@oh-my-pi/pi-mnemopi": "16.2.2",
+		"@oh-my-pi/pi-natives": "16.2.2",
+		"@oh-my-pi/pi-tui": "16.2.2",
+		"@oh-my-pi/pi-utils": "16.2.2",
+		"@oh-my-pi/pi-wire": "16.2.2",
+		"@oh-my-pi/snapcompact": "16.2.2",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",