@oh-my-pi/pi-coding-agent 16.3.6 → 16.3.7

package/dist/types/modes/utils/ui-helpers.d.ts

@@ -1,8 +1,8 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message } from "@oh-my-pi/pi-ai";
 import { type Component } from "@oh-my-pi/pi-tui";
-import type { InteractiveModeContext } from "../../modes/types";
-import type { SessionContext } from "../../session/session-context";
+import type { InteractiveModeContext } from "../../modes/types.js";
+import type { SessionContext } from "../../session/session-context.js";
 interface RenderInitialMessagesOptions {
     preserveExistingChat?: boolean;
     clearTerminalHistory?: boolean;

package/dist/types/modes/workflow.d.ts

@@ -1,4 +1,4 @@
-import { type KeywordHighlighter } from "./gradient-highlight";
+import { type KeywordHighlighter } from "./gradient-highlight.js";
 /** Hidden system notice appended after a user message that mentions "workflowz". */
 export declare const WORKFLOW_NOTICE: string;
 /**

package/dist/types/plan-mode/plan-handoff.d.ts

@@ -1,4 +1,4 @@
-import { type LocalProtocolOptions } from "../internal-urls";
+import { type LocalProtocolOptions } from "../internal-urls/index.js";
 /** The session's active plan, resolved for handoff into a subagent's context. */
 export interface OverallPlanReference {
     /** The `local://` reference path (e.g. `local://my-feature.md`), kept for display. */

package/dist/types/registry/agent-lifecycle.d.ts

@@ -9,8 +9,8 @@
  * {@link AgentLifecycleManager.ensureLive}. Only this manager flips
  * `parked` ↔ `idle`.
  */
-import type { AgentSession } from "../session/agent-session";
-import { type AgentRef, AgentRegistry } from "./agent-registry";
+import type { AgentSession } from "../session/agent-session.js";
+import { type AgentRef, AgentRegistry } from "./agent-registry.js";
 export type AgentReviver = () => Promise<AgentSession>;
 /**
  * Builds a reviver for a `parked` ref restored from disk (Agent Hub scan,

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

@@ -8,7 +8,7 @@
  * `idle` (live) or `parked` (session disposed, ref + sessionFile retained for
  * revival) and are only removed on explicit release/teardown.
  */
-import type { AgentSession } from "../session/agent-session";
+import type { AgentSession } from "../session/agent-session.js";
 export declare const MAIN_AGENT_ID = "Main";
 /**
  * - `running`: a turn is in flight.

package/dist/types/sdk.d.ts

@@ -1,30 +1,30 @@
 import { type AgentTelemetryConfig, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 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";
-import { type PromptTemplate } from "./config/prompt-templates";
-import { Settings, type SkillsSettings } from "./config/settings";
-import "./discovery";
-import { type CustomCommandsLoadResult } from "./extensibility/custom-commands";
-import { type ToolPathWithSource } from "./extensibility/custom-tools";
-import type { CustomTool } from "./extensibility/custom-tools/types";
-import { type ExtensionFactory, type ExtensionUIContext, type LoadExtensionsResult, type ToolDefinition } from "./extensibility/extensions";
-import { type Skill, type SkillWarning } from "./extensibility/skills";
-import { type FileSlashCommand } from "./extensibility/slash-commands";
-import type { HindsightSessionState } from "./hindsight/state";
-import { type LocalProtocolOptions } from "./internal-urls";
-import { MCPManager, type MCPToolsLoadResult } from "./mcp";
-import type { MnemopiSessionState } from "./mnemopi/state";
-import { AgentRegistry } from "./registry/agent-registry";
-import { AgentSession } from "./session/agent-session";
-import type { AuthStorage } from "./session/auth-storage";
-import { SessionManager } from "./session/session-manager";
-import { type BuildSystemPromptResult } from "./system-prompt";
-import { type ConfiguredThinkingLevel } from "./thinking";
-import { BashTool, BUILTIN_TOOLS, createTools, EditTool, EvalTool, GlobTool, GrepTool, HIDDEN_TOOLS, type LspStartupServerInfo, loadSshTool, ReadTool, ResolveTool, type Tool, type ToolSession, WebSearchTool, WriteTool } from "./tools";
-import { EventBus } from "./utils/event-bus";
-import { type WorkspaceTree } from "./workspace-tree";
+import { type Rule } from "./capability/rule.js";
+import { ModelRegistry } from "./config/model-registry.js";
+import { type PromptTemplate } from "./config/prompt-templates.js";
+import { Settings, type SkillsSettings } from "./config/settings.js";
+import "./discovery/index.js";
+import { type CustomCommandsLoadResult } from "./extensibility/custom-commands/index.js";
+import { type ToolPathWithSource } from "./extensibility/custom-tools/index.js";
+import type { CustomTool } from "./extensibility/custom-tools/types.js";
+import { type ExtensionFactory, type ExtensionUIContext, type LoadExtensionsResult, type ToolDefinition } from "./extensibility/extensions/index.js";
+import { type Skill, type SkillWarning } from "./extensibility/skills.js";
+import { type FileSlashCommand } from "./extensibility/slash-commands.js";
+import type { HindsightSessionState } from "./hindsight/state.js";
+import { type LocalProtocolOptions } from "./internal-urls/index.js";
+import { MCPManager, type MCPToolsLoadResult } from "./mcp/index.js";
+import type { MnemopiSessionState } from "./mnemopi/state.js";
+import { AgentRegistry } from "./registry/agent-registry.js";
+import { AgentSession } from "./session/agent-session.js";
+import type { AuthStorage } from "./session/auth-storage.js";
+import { SessionManager } from "./session/session-manager.js";
+import { type BuildSystemPromptResult } from "./system-prompt.js";
+import { type ConfiguredThinkingLevel } from "./thinking.js";
+import { BashTool, BUILTIN_TOOLS, createTools, EditTool, EvalTool, GlobTool, GrepTool, HIDDEN_TOOLS, type LspStartupServerInfo, loadSshTool, ReadTool, ResolveTool, type Tool, type ToolSession, WebSearchTool, WriteTool } from "./tools/index.js";
+import { EventBus } from "./utils/event-bus.js";
+import { type WorkspaceTree } from "./workspace-tree.js";
 export interface CreateAgentSessionOptions {
     /** Working directory for project-local discovery. Default: getProjectDir() */
     cwd?: string;
@@ -38,9 +38,13 @@ export interface CreateAgentSessionOptions {
     modelRegistry?: ModelRegistry;
     /** Model to use. Default: from settings, else first available */
     model?: Model;
-    /** Raw model pattern string (e.g. from --model CLI flag) to resolve after extensions load.
+    /** Raw model pattern(s) (e.g. from --model CLI flag) to resolve after extensions load.
      * Used when model lookup is deferred because extension-provided models aren't registered yet. */
-    modelPattern?: string;
+    modelPattern?: string | string[];
+    /** Authenticated fallback selector for deferred subagent model patterns. */
+    modelPatternAuthFallback?: string;
+    /** Role name used to install retry fallbacks after deferred subagent patterns resolve. */
+    modelPatternFallbackRole?: string;
     /** Thinking selector. Default: from settings, else unset */
     thinkingLevel?: ConfiguredThinkingLevel;
     /** Models available for cycling (Ctrl+P in interactive mode) */
@@ -223,16 +227,16 @@ export interface CreateAgentSessionResult {
 }
 export type DialectFormat = "auto" | "native" | Dialect;
 export declare function resolveDialect(format: DialectFormat, model: (Pick<Model, "supportsTools"> & Partial<Pick<Model, "id">>) | undefined): Dialect | undefined;
-export type { PromptTemplate } from "./config/prompt-templates";
-export { Settings, type SkillsSettings } from "./config/settings";
-export type { CustomCommand, CustomCommandFactory } from "./extensibility/custom-commands/types";
-export type { CustomTool, CustomToolFactory } from "./extensibility/custom-tools/types";
-export type * from "./extensibility/extensions";
-export type { Skill } from "./extensibility/skills";
-export type { FileSlashCommand } from "./extensibility/slash-commands";
-export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp";
-export type { Tool } from "./tools";
-export { buildDirectoryTree, buildWorkspaceTree, type DirectoryTree, type WorkspaceTree } from "./workspace-tree";
+export type { PromptTemplate } from "./config/prompt-templates.js";
+export { Settings, type SkillsSettings } from "./config/settings.js";
+export type { CustomCommand, CustomCommandFactory } from "./extensibility/custom-commands/types.js";
+export type { CustomTool, CustomToolFactory } from "./extensibility/custom-tools/types.js";
+export type * from "./extensibility/extensions/index.js";
+export type { Skill } from "./extensibility/skills.js";
+export type { FileSlashCommand } from "./extensibility/slash-commands.js";
+export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp/index.js";
+export type { Tool } from "./tools/index.js";
+export { buildDirectoryTree, buildWorkspaceTree, type DirectoryTree, type WorkspaceTree } from "./workspace-tree.js";
 export { BashTool, BUILTIN_TOOLS, createTools, EditTool, EvalTool, GlobTool, GrepTool, HIDDEN_TOOLS, loadSshTool, ReadTool, ResolveTool, type ToolSession, WebSearchTool, WriteTool, };
 /**
  * Create an AuthStorage instance.

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

@@ -1,5 +1,5 @@
-import type { SecretEntry } from "./obfuscator";
-export { deobfuscateSessionContext, deobfuscateToolArguments, obfuscateMessages, obfuscateProviderContext, type SecretEntry, SecretObfuscator, } from "./obfuscator";
+import type { SecretEntry } from "./obfuscator.js";
+export { deobfuscateSessionContext, deobfuscateToolArguments, obfuscateMessages, obfuscateProviderContext, type SecretEntry, SecretObfuscator, } from "./obfuscator.js";
 /**
  * Load secrets from project-local and global secrets.yml files.
  * Project-local entries override global entries with matching content.

package/dist/types/secrets/obfuscator.d.ts

@@ -1,6 +1,6 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Context, Message } from "@oh-my-pi/pi-ai";
-import type { SessionContext } from "../session/session-context";
+import type { SessionContext } from "../session/session-context.js";
 export interface SecretEntry {
     type: "plain" | "regex";
     content: string;

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

@@ -18,43 +18,43 @@ import { type CompactionResult, type ShakeConfig } from "@oh-my-pi/pi-agent-core
 import type { AssistantMessage, Context, ImageContent, Message, MessageAttribution, Model, ProviderSessionState, ResetCreditAccountStatus, ResetCreditRedeemOutcome, ResetCreditTarget, ServiceTier, ServiceTierByFamily, ServiceTierFamily, SimpleStreamOptions, TextContent, ToolChoice, UsageReport } from "@oh-my-pi/pi-ai";
 import { Effort } from "@oh-my-pi/pi-ai";
 import { postmortem } from "@oh-my-pi/pi-utils";
-import { type AdvisorConfig } from "../advisor";
-import { type AsyncJob, type AsyncJobDeliveryState, AsyncJobManager } from "../async";
-import type { Rule } from "../capability/rule";
-import type { ModelRegistry } from "../config/model-registry";
-import { type ResolvedModelRoleValue } from "../config/model-resolver";
-import { type PromptTemplate } from "../config/prompt-templates";
-import type { Settings, SkillsSettings } from "../config/settings";
-import { RawSseDebugBuffer } from "../debug/raw-sse-buffer";
-import { type PythonResult } from "../eval/py/executor";
-import { type BashResult } from "../exec/bash-executor";
-import type { TtsrManager } from "../export/ttsr";
-import type { LoadedCustomCommand } from "../extensibility/custom-commands";
-import type { CustomTool } from "../extensibility/custom-tools/types";
-import type { ExtensionRunner } from "../extensibility/extensions";
-import type { CompactOptions, ContextUsage } from "../extensibility/extensions/types";
-import type { RecoveredRetryError } from "../extensibility/shared-events";
-import type { Skill, SkillWarning } from "../extensibility/skills";
-import { type FileSlashCommand } from "../extensibility/slash-commands";
-import { GoalRuntime } from "../goals/runtime";
-import type { Goal, GoalModeState } from "../goals/state";
-import type { HindsightSessionState } from "../hindsight/state";
-import { type IrcMessage } from "../irc/bus";
-import { type MnemopiSessionState } from "../mnemopi/state";
-import type { PlanModeState } from "../plan-mode/state";
-import { type SecretObfuscator } from "../secrets/obfuscator";
-import { type ConfiguredThinkingLevel } from "../thinking";
-import { type DiscoverableTool, type DiscoverableToolSearchIndex } from "../tool-discovery/tool-index";
-import type { CheckpointState, CompletedRewindState } from "../tools/checkpoint";
-import { type TodoItem, type TodoPhase } from "../tools/todo";
-import type { ClientBridge } from "./client-bridge";
-import { type CustomMessage } from "./messages";
-import type { BuildSessionContextOptions, SessionContext } from "./session-context";
-import type { BranchSummaryEntry, NewSessionOptions } from "./session-entries";
-import { type SessionManager } from "./session-manager";
-import type { ShakeMode, ShakeResult } from "./shake-types";
-import { ToolChoiceQueue } from "./tool-choice-queue";
-import { YieldQueue } from "./yield-queue";
+import { type AdvisorConfig } from "../advisor/index.js";
+import { type AsyncJob, type AsyncJobDeliveryState, AsyncJobManager } from "../async/index.js";
+import type { Rule } from "../capability/rule.js";
+import type { ModelRegistry } from "../config/model-registry.js";
+import { type ResolvedModelRoleValue } from "../config/model-resolver.js";
+import { type PromptTemplate } from "../config/prompt-templates.js";
+import type { Settings, SkillsSettings } from "../config/settings.js";
+import { RawSseDebugBuffer } from "../debug/raw-sse-buffer.js";
+import { type PythonResult } from "../eval/py/executor.js";
+import { type BashResult } from "../exec/bash-executor.js";
+import type { TtsrManager } from "../export/ttsr.js";
+import type { LoadedCustomCommand } from "../extensibility/custom-commands/index.js";
+import type { CustomTool } from "../extensibility/custom-tools/types.js";
+import type { ExtensionRunner } from "../extensibility/extensions/index.js";
+import type { CompactOptions, ContextUsage } from "../extensibility/extensions/types.js";
+import type { RecoveredRetryError } from "../extensibility/shared-events.js";
+import type { Skill, SkillWarning } from "../extensibility/skills.js";
+import { type FileSlashCommand } from "../extensibility/slash-commands.js";
+import { GoalRuntime } from "../goals/runtime.js";
+import type { Goal, GoalModeState } from "../goals/state.js";
+import type { HindsightSessionState } from "../hindsight/state.js";
+import { type IrcMessage } from "../irc/bus.js";
+import { type MnemopiSessionState } from "../mnemopi/state.js";
+import type { PlanModeState } from "../plan-mode/state.js";
+import { type SecretObfuscator } from "../secrets/obfuscator.js";
+import { type ConfiguredThinkingLevel } from "../thinking.js";
+import { type DiscoverableTool, type DiscoverableToolSearchIndex } from "../tool-discovery/tool-index.js";
+import type { CheckpointState, CompletedRewindState } from "../tools/checkpoint.js";
+import { type TodoItem, type TodoPhase } from "../tools/todo.js";
+import type { ClientBridge } from "./client-bridge.js";
+import { type CustomMessage, type CustomMessagePayload } from "./messages.js";
+import type { BuildSessionContextOptions, SessionContext } from "./session-context.js";
+import type { BranchSummaryEntry, NewSessionOptions } from "./session-entries.js";
+import { type SessionManager } from "./session-manager.js";
+import type { ShakeMode, ShakeResult } from "./shake-types.js";
+import { ToolChoiceQueue } from "./tool-choice-queue.js";
+import { YieldQueue } from "./yield-queue.js";
 /** Session-specific events that extend the core AgentEvent */
 export type AgentSessionEvent = AgentEvent | {
     type: "auto_compaction_start";
@@ -349,6 +349,15 @@ export interface PromptOptions {
     /** Skip pre-send compaction checks for this prompt (internal use for maintenance flows). */
     skipCompactionCheck?: boolean;
 }
+/** Options for AgentSession.followUp() */
+export interface FollowUpOptions {
+    /** Enqueue as a hidden developer message (agent-attributed by default) instead of a user follow-up. */
+    synthetic?: boolean;
+    /** Whether to expand file-based prompt templates (default: true). */
+    expandPromptTemplates?: boolean;
+    /** Explicit billing/initiator attribution. Defaults to `agent` for synthetic follow-ups. */
+    attribution?: MessageAttribution;
+}
 /** Result from a handoff operation. */
 export interface HandoffResult {
     document: string;
@@ -772,8 +781,12 @@ export declare class AgentSession {
     steer(text: string, images?: ImageContent[]): Promise<void>;
     /**
      * Queue a follow-up message to process after the agent would otherwise stop.
+     * Set `options.synthetic` to enqueue a hidden developer message (agent-attributed
+     * by default) instead of a user-attributed follow-up; the plan-approval flow
+     * uses this to land its execution directive behind a queued user turn without
+     * flipping advisor auto-resume.
      */
-    followUp(text: string, images?: ImageContent[]): Promise<void>;
+    followUp(text: string, images?: ImageContent[], options?: FollowUpOptions): Promise<void>;
     queueDeferredMessage(message: CustomMessage): void;
     /**
      * Send a custom message to the session. Creates a CustomMessageEntry.
@@ -789,7 +802,7 @@ export declare class AgentSession {
      * agent-initiated turns. Callers that must mirror the resulting `agent_end`
      * use this to avoid acting on a turn that never ran.
      */
-    sendCustomMessage<T = unknown>(message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">, options?: {
+    sendCustomMessage<T = unknown>(message: CustomMessagePayload<T>, options?: {
         triggerTurn?: boolean;
         deliverAs?: "steer" | "followUp" | "nextTurn";
         queueChipText?: string;
@@ -976,10 +989,11 @@ export declare class AgentSession {
     setServiceTierFamily(family: ServiceTierFamily, tier: ServiceTier | undefined): void;
     /**
      * `/fast on|off` targets the family of the currently selected model: it sets
-     * (or clears) that family's `priority` tier. Models without a service-tier
-     * family (Fireworks, or providers with no tier knob) have nothing to toggle.
+     * (or clears) that family's `priority` tier. Returns `false` when the model
+     * has no service-tier family, so callers can report that fast mode is
+     * unavailable instead of claiming success.
      */
-    setFastMode(enabled: boolean): void;
+    setFastMode(enabled: boolean): boolean;
     toggleFastMode(): boolean;
     /**
      * Get available thinking levels for current model.

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

@@ -1,5 +1,5 @@
 import { type AuthCredential, type AuthCredentialStore, type StoredAuthCredential } from "@oh-my-pi/pi-ai";
-import type { RawSettings as Settings } from "../config/settings";
+import type { RawSettings as Settings } from "../config/settings.js";
 /**
  * Unified SQLite storage for agent settings, model usage, and auth credentials.
  * Delegates auth credential operations to AuthCredentialStore from @oh-my-pi/pi-ai.

package/dist/types/session/auth-broker-config.d.ts

@@ -21,7 +21,7 @@
  * boot without forcing a startup reorder.
  */
 import { type AuthBrokerClientConfig, type DiscoverAuthStorageOptions, getAuthBrokerTokenFilePath } from "@oh-my-pi/pi-ai/auth-broker/discover";
-import type { AuthStorage } from "./auth-storage";
+import type { AuthStorage } from "./auth-storage.js";
 export { type AuthBrokerClientConfig, getAuthBrokerTokenFilePath };
 /**
  * Read broker configuration. Returns null when the URL is missing

package/dist/types/session/codex-auto-reset.d.ts

@@ -38,7 +38,7 @@
  * read-only views are passed in so the predicate itself stays deterministic.
  */
 import type { OAuthAccountIdentity, ResetCreditTarget, UsageReport } from "@oh-my-pi/pi-ai";
-import type { CodexAutoRedeemMode } from "../config/settings-schema";
+import type { CodexAutoRedeemMode } from "../config/settings-schema.js";
 /** Weekly window counts as exhausted at `usedFraction >= 0.999` (used_percent >= 99.9). */
 export declare const WEEKLY_EXHAUSTED_MIN_FRACTION = 0.999;
 /** A weekly reset can never be more than one window length (7d) away; +1h slack for skew. */

package/dist/types/session/exit-diagnostics.d.ts

@@ -1,4 +1,4 @@
-import type { SessionEntry } from "./session-entries";
+import type { SessionEntry } from "./session-entries.js";
 export declare const TOOL_EXECUTION_START_CUSTOM_TYPE = "tool_execution_start";
 export declare const SESSION_EXIT_CUSTOM_TYPE = "session_exit";
 /**

package/dist/types/session/indexed-session-storage.d.ts

@@ -1,5 +1,5 @@
-import type { SessionStorage, SessionStorageStat, SessionStorageWriter, WriteTextAtomicOptions } from "./session-storage";
-import { type SessionTitleUpdate } from "./session-title-slot";
+import type { SessionStorage, SessionStorageStat, SessionStorageWriter, WriteTextAtomicOptions } from "./session-storage.js";
+import { type SessionTitleUpdate } from "./session-title-slot.js";
 export interface SessionStorageIndexEntry {
     path: string;
     size: number;

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

@@ -8,10 +8,18 @@ import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { type BranchSummaryMessage, type CompactionSummaryMessage } from "@oh-my-pi/pi-agent-core/compaction/messages";
 import type { AssistantMessage, ImageContent, Message, MessageAttribution, TextContent } from "@oh-my-pi/pi-ai";
 export { type BranchSummaryMessage, type CompactionSummaryMessage, createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "@oh-my-pi/pi-agent-core/compaction/messages";
-import type { OutputMeta } from "../tools/output-meta";
+import type { OutputMeta } from "../tools/output-meta.js";
 export declare const SKILL_PROMPT_MESSAGE_TYPE = "skill-prompt";
 export declare const LSP_LATE_DIAGNOSTIC_MESSAGE_TYPE = "lsp-late-diagnostic";
 export declare const BACKGROUND_TAN_DISPATCH_MESSAGE_TYPE = "background-tan-dispatch";
+/** Fallback type for extension-injected messages that omit a custom type. */
+export declare const DEFAULT_CUSTOM_MESSAGE_TYPE = "custom-message";
+/** Content shape accepted for extension-injected messages. */
+export type CustomMessageContent = string | (TextContent | ImageContent)[];
+/** Public input accepted by `pi.sendMessage` and `AgentSession.sendCustomMessage`. */
+export type CustomMessagePayload<T = unknown> = string | Partial<Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">>;
+/** Custom message payload after applying runtime defaults. */
+export type NormalizedCustomMessagePayload<T = unknown> = Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">;
 /** Custom message type for hidden interrupted-thinking continuity context. */
 export declare const INTERRUPTED_THINKING_MESSAGE_TYPE = "interrupted-thinking";
 /** Metadata persisted with a hidden interrupted-thinking continuity message. */
@@ -80,6 +88,13 @@ export declare function isSilentAbort(message: Pick<AssistantMessage, "errorId"
 export declare const USER_INTERRUPT_LABEL = "Interrupted by user";
 export declare function isUserInterruptAbort(message: Pick<AssistantMessage, "errorId" | "errorMessage">): boolean;
 export declare function shouldRenderAbortReason(message: Pick<AssistantMessage, "errorId" | "errorMessage">): boolean;
+/** A provider-rejection turn carrying nothing but the error flag: stopReason
+ *  "error" with no text, thinking, or tool calls — e.g. a request the provider
+ *  rejected before any output (an oversized 413 payload). Persisting it writes an
+ *  empty assistant turn that replays on reload and re-sends the rejected context;
+ *  the error is surfaced live (pinned) instead. A turn that streamed partial text,
+ *  reasoning, or tool calls is NOT empty and stays in history. */
+export declare function isEmptyErrorTurn(message: Pick<AssistantMessage, "stopReason" | "content">): 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";
@@ -104,6 +119,10 @@ export declare const INTERNAL_DETAILS_FIELDS: readonly ["__queueChipText"];
  *  (null/non-object, or no listed fields present) so callers don't pay a
  *  clone cost on the common path. */
 export declare function stripInternalDetailsFields<T>(details: T | undefined): T | undefined;
+/** True when a persisted or extension-supplied value can be sent as custom-message content. */
+export declare function isCustomMessageContent(content: unknown): content is CustomMessageContent;
+/** Normalizes extension-provided custom message input before it reaches session state or disk. */
+export declare function normalizeCustomMessagePayload<T = unknown>(payload: CustomMessagePayload<T> | unknown): NormalizedCustomMessagePayload<T>;
 export declare function wrapSteeringForModel(messages: AgentMessage[]): AgentMessage[];
 /**
  * Strip image content blocks from `message` in place. Returns the count of
@@ -152,7 +171,7 @@ export interface PythonExecutionMessage {
 export interface CustomMessage<T = unknown> {
     role: "custom";
     customType: string;
-    content: string | (TextContent | ImageContent)[];
+    content: CustomMessageContent;
     display: boolean;
     details?: T;
     /** Who initiated this message for billing/attribution semantics. */
@@ -165,7 +184,7 @@ export interface CustomMessage<T = unknown> {
 export interface HookMessage<T = unknown> {
     role: "hookMessage";
     customType: string;
-    content: string | (TextContent | ImageContent)[];
+    content: CustomMessageContent;
     display: boolean;
     details?: T;
     /** Who initiated this message for billing/attribution semantics. */

package/dist/types/session/redis-session-storage.d.ts

@@ -1,4 +1,4 @@
-import { IndexedSessionStorage } from "./indexed-session-storage";
+import { IndexedSessionStorage } from "./indexed-session-storage.js";
 /**
  * Minimal subset of the `bun:redis` `RedisClient` surface used by
  * {@link RedisSessionStorage}. Keeping the contract narrow (and accepting any

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

@@ -1,6 +1,6 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { type ServiceTierByFamily } from "@oh-my-pi/pi-ai";
-import { type CompactionEntry, type SessionEntry } from "./session-entries";
+import { type CompactionEntry, type SessionEntry } from "./session-entries.js";
 export interface SessionContext {
     messages: AgentMessage[];
     thinkingLevel?: string;

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

@@ -192,6 +192,10 @@ export interface UsageStatistics {
     output: number;
     cacheRead: number;
     cacheWrite: number;
+    totalTokens: number;
+    orchestrationInput: number;
+    orchestrationOutput: number;
+    orchestrationCacheRead: number;
     premiumRequests: number;
     cost: number;
 }

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

@@ -1,4 +1,4 @@
-import { type SessionStorage } from "./session-storage";
+import { type SessionStorage } from "./session-storage.js";
 /**
  * Coarse lifecycle status of a session, derived from its last persisted message.
  *

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

@@ -1,8 +1,8 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import { BlobStore } from "./blob-store";
-import { type FileEntry, type SessionTitleSlotEntry } from "./session-entries";
-import { type SessionStorage } from "./session-storage";
-import { type SessionTitleUpdate } from "./session-title-slot";
+import { BlobStore } from "./blob-store.js";
+import { type FileEntry, type SessionTitleSlotEntry } from "./session-entries.js";
+import { type SessionStorage } from "./session-storage.js";
+import { type SessionTitleUpdate } from "./session-title-slot.js";
 /** Parse session JSONL while stripping and folding the optional fixed title slot. */
 export declare function parseSessionContent(content: string): {
     entries: FileEntry[];

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

@@ -1,11 +1,11 @@
 import type { ImageContent, Message, MessageAttribution, ServiceTierByFamily, TextContent } from "@oh-my-pi/pi-ai";
-import { ArtifactManager } from "./artifacts";
-import { type BlobPutOptions, type BlobPutResult } from "./blob-store";
-import { type BashExecutionMessage, type CustomMessage, type FileMentionMessage, type HookMessage, type PythonExecutionMessage } from "./messages";
-import { type BuildSessionContextOptions, type SessionContext } from "./session-context";
-import { type NewSessionOptions, type SessionEntry, type SessionHeader, type SessionTitleSource, type SessionTreeNode, type UsageStatistics } from "./session-entries";
-import { type SessionInfo } from "./session-listing";
-import { type SessionStorage } from "./session-storage";
+import { ArtifactManager } from "./artifacts.js";
+import { type BlobPutOptions, type BlobPutResult } from "./blob-store.js";
+import { type BashExecutionMessage, type CustomMessage, type FileMentionMessage, type HookMessage, type PythonExecutionMessage } from "./messages.js";
+import { type BuildSessionContextOptions, type SessionContext } from "./session-context.js";
+import { type NewSessionOptions, type SessionEntry, type SessionHeader, type SessionTitleSource, type SessionTreeNode, type UsageStatistics } from "./session-entries.js";
+import { type SessionInfo } from "./session-listing.js";
+import { type SessionStorage } from "./session-storage.js";
 export type ReadonlySessionManager = Pick<SessionManager, "getCwd" | "getSessionDir" | "getSessionId" | "getSessionFile" | "getSessionName" | "getArtifactsDir" | "getArtifactManager" | "allocateArtifactPath" | "saveArtifact" | "getArtifactPath" | "getLeafId" | "getLeafEntry" | "getEntry" | "getLabel" | "getBranch" | "getHeader" | "getEntries" | "getTree" | "getUsageStatistics" | "putBlob" | "putBlobSync">;
 interface SessionManagerStateSnapshot {
     cwd: string;
@@ -18,6 +18,7 @@ interface SessionManagerStateSnapshot {
     hasTitleSlot: boolean;
     onDisk: boolean;
     needsRewrite: boolean;
+    draftOnlySessionCleanupArmed: boolean;
     header: SessionHeader;
     entries: SessionEntry[];
 }
@@ -172,7 +173,7 @@ export declare class SessionManager {
      * @param details Optional extension-specific metadata (not sent to LLM)
      * @param attribution Who initiated this message for billing/attribution semantics
      */
-    appendCustomMessageEntry<T = unknown>(customType: string, content: string | (TextContent | ImageContent)[], display: boolean, details?: T, attribution?: MessageAttribution): string;
+    appendCustomMessageEntry<T = unknown>(customType: string | undefined, content: string | (TextContent | ImageContent)[] | undefined, display: boolean | undefined, details?: T, attribution?: MessageAttribution | undefined): string;
     /**
      * Append an MCP tool selection entry recording the discovery-selected MCP tools.
      */

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

@@ -1,4 +1,4 @@
-import { type FileEntry } from "./session-entries";
+import { type FileEntry } from "./session-entries.js";
 /** Generate a unique short ID (8 hex chars, collision-checked) */
 export declare function generateId(byId: {
     has(id: string): boolean;

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

@@ -1,4 +1,4 @@
-import type { SessionStorage } from "./session-storage";
+import type { SessionStorage } from "./session-storage.js";
 export declare function resolveManagedSessionRoot(sessionDir: string, cwd: string): string | undefined;
 /**
  * Compute the default session directory for a cwd.

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

@@ -1,5 +1,5 @@
-import { type BlobStore } from "./blob-store";
-import type { FileEntry } from "./session-entries";
+import { type BlobStore } from "./blob-store.js";
+import type { FileEntry } from "./session-entries.js";
 export declare function isImageBlock(value: unknown): value is {
     type: "image";
     data: string;

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

@@ -1,4 +1,4 @@
-import { type SessionTitleUpdate } from "./session-title-slot";
+import { type SessionTitleUpdate } from "./session-title-slot.js";
 export interface SessionStorageStat {
     size: number;
     mtimeMs: number;

package/dist/types/session/session-title-slot.d.ts

@@ -1,4 +1,4 @@
-import { type SessionTitleSlotEntry, type SessionTitleSource } from "./session-entries";
+import { type SessionTitleSlotEntry, type SessionTitleSource } from "./session-entries.js";
 /** Semantic title update persisted by session storage backends. */
 export interface SessionTitleUpdate {
     title?: string;

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

@@ -11,7 +11,7 @@
  * and OpenRouter response-cache hits across advisor calls.
  */
 import type { StreamFn } from "@oh-my-pi/pi-agent-core";
-import { type Settings } from "../config/settings";
+import { type Settings } from "../config/settings.js";
 /**
  * Build a {@link StreamFn} that reads provider routing/guard settings from
  * `settings` per call and forwards to `base` (defaults to `streamSimple`).

package/dist/types/session/sql-session-storage.d.ts

@@ -1,4 +1,4 @@
-import { IndexedSessionStorage, type SessionStorageBackend } from "./indexed-session-storage";
+import { IndexedSessionStorage, type SessionStorageBackend } from "./indexed-session-storage.js";
 /**
  * Supported `bun:sql` adapter dialects. `Bun.SQL` reports this string on
  * `client.options.adapter`; we detect it once at construction and pick the

package/dist/types/session/unexpected-stop-classifier.d.ts

@@ -1,6 +1,6 @@
 import { type AssistantMessage } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "../config/model-registry";
-import type { Settings } from "../config/settings";
+import type { ModelRegistry } from "../config/model-registry.js";
+import type { Settings } from "../config/settings.js";
 export interface ClassifyUnexpectedStopDeps {
     settings: Settings;
     registry: ModelRegistry;

package/dist/types/slash-commands/acp-builtins.d.ts

@@ -1,6 +1,6 @@
 import type { AvailableCommand } from "@agentclientprotocol/sdk";
-import type { AcpBuiltinSlashCommandResult, SlashCommandRuntime } from "./types";
-export type { AcpBuiltinSlashCommandResult } from "./types";
+import type { AcpBuiltinSlashCommandResult, SlashCommandRuntime } from "./types.js";
+export type { AcpBuiltinSlashCommandResult } from "./types.js";
 /**
  * All names (primary + aliases) that are reserved by ACP builtins. Used to
  * filter out extension commands that would shadow a builtin or its alias at

package/dist/types/slash-commands/available-commands.d.ts

@@ -1,9 +1,9 @@
 import type { AvailableCommand } from "@agentclientprotocol/sdk";
-import type { SkillsSettings } from "../config/settings";
-import type { LoadedCustomCommand } from "../extensibility/custom-commands";
-import type { ExtensionRunner } from "../extensibility/extensions";
-import { type Skill } from "../extensibility/skills";
-import { type FileSlashCommand } from "../extensibility/slash-commands";
+import type { SkillsSettings } from "../config/settings.js";
+import type { LoadedCustomCommand } from "../extensibility/custom-commands/index.js";
+import type { ExtensionRunner } from "../extensibility/extensions/index.js";
+import { type Skill } from "../extensibility/skills.js";
+import { type FileSlashCommand } from "../extensibility/slash-commands.js";
 export type AvailableSlashCommandSource = "builtin" | "skill" | "extension" | "custom" | "mcp_prompt" | "file";
 export interface InternalAvailableSlashCommand {
     name: string;

package/dist/types/slash-commands/builtin-registry.d.ts

@@ -1,6 +1,6 @@
 import { type AutocompleteItem } from "@oh-my-pi/pi-tui";
-import type { BuiltinSlashCommand, ParsedSlashCommand, SlashCommandResult, SlashCommandRuntime, SlashCommandSpec, TuiSlashCommandRuntime } from "./types";
-export type { BuiltinSlashCommand, SubcommandDef } from "./types";
+import type { BuiltinSlashCommand, ParsedSlashCommand, SlashCommandResult, SlashCommandRuntime, SlashCommandSpec, TuiSlashCommandRuntime } from "./types.js";
+export type { BuiltinSlashCommand, SubcommandDef } from "./types.js";
 /** TUI-specific runtime accepted by `executeBuiltinSlashCommand`. */
 export type BuiltinSlashCommandRuntime = TuiSlashCommandRuntime;
 export interface TuiBuiltinSlashCommand extends BuiltinSlashCommand {