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

package/dist/types/extensibility/hooks/index.d.ts

@@ -1,6 +1,6 @@
-export type { UsageStatistics } from "../../session/session-entries";
-export type { ReadonlySessionManager } from "../../session/session-manager";
-export * from "./loader";
-export * from "./runner";
-export * from "./tool-wrapper";
-export * from "./types";
+export type { UsageStatistics } from "../../session/session-entries.js";
+export type { ReadonlySessionManager } from "../../session/session-manager.js";
+export * from "./loader.js";
+export * from "./runner.js";
+export * from "./tool-wrapper.js";
+export * from "./types.js";

package/dist/types/extensibility/hooks/loader.d.ts

@@ -1,5 +1,5 @@
-import type { HookMessage } from "../../session/messages";
-import type { HookMessageRenderer, RegisteredCommand } from "./types";
+import type { CustomMessagePayload } from "../../session/messages.js";
+import type { HookMessageRenderer, RegisteredCommand } from "./types.js";
 /**
  * Generic handler function type.
  */
@@ -7,7 +7,7 @@ type HandlerFn = (...args: unknown[]) => Promise<unknown>;
 /**
  * Send message handler type for pi.sendMessage().
  */
-export type SendMessageHandler = <T = unknown>(message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details" | "attribution">, options?: {
+export type SendMessageHandler = <T = unknown>(message: CustomMessagePayload<T>, options?: {
     triggerTurn?: boolean;
     deliverAs?: "steer" | "followUp";
 }) => void;
@@ -15,7 +15,7 @@ export type SendMessageHandler = <T = unknown>(message: Pick<HookMessage<T>, "cu
  * Append entry handler type for pi.appendEntry().
  */
 export type AppendEntryHandler = <T = unknown>(customType: string, data?: T) => void;
-export type { BranchHandler, NavigateTreeHandler, NewSessionHandler } from "../session-handler-types";
+export type { BranchHandler, NavigateTreeHandler, NewSessionHandler } from "../session-handler-types.js";
 /**
  * Registered handlers for a loaded hook.
  */

package/dist/types/extensibility/hooks/runner.d.ts

@@ -3,15 +3,15 @@
  */
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "../../config/model-registry";
-import type { SessionManager } from "../../session/session-manager";
-import type { AppendEntryHandler, BranchHandler, LoadedHook, NavigateTreeHandler, NewSessionHandler, SendMessageHandler } from "./loader";
-import type { BeforeAgentStartEventResult, HookCommandContext, HookError, HookEvent, HookMessageRenderer, HookUIContext, RegisteredCommand, SessionBeforeCompactResult, SessionBeforeTreeResult, SessionCompactingResult, ToolCallEvent, ToolCallEventResult, ToolResultEventResult } from "./types";
+import type { ModelRegistry } from "../../config/model-registry.js";
+import type { SessionManager } from "../../session/session-manager.js";
+import type { AppendEntryHandler, BranchHandler, LoadedHook, NavigateTreeHandler, NewSessionHandler, SendMessageHandler } from "./loader.js";
+import type { BeforeAgentStartEventResult, HookCommandContext, HookError, HookEvent, HookMessageRenderer, HookUIContext, RegisteredCommand, SessionBeforeCompactResult, SessionBeforeTreeResult, SessionCompactingResult, ToolCallEvent, ToolCallEventResult, ToolResultEventResult } from "./types.js";
 /**
  * Listener for hook errors.
  */
 export type HookErrorListener = (error: HookError) => void;
-export { execCommand } from "../../exec/exec";
+export { execCommand } from "../../exec/exec.js";
 /**
  * HookRunner executes hooks and manages event emission.
  */

package/dist/types/extensibility/hooks/tool-wrapper.d.ts

@@ -3,7 +3,7 @@
  */
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Static, TSchema } from "@oh-my-pi/pi-ai";
-import type { HookRunner } from "./runner";
+import type { HookRunner } from "./runner.js";
 /**
  * Wraps an AgentTool with hook callbacks for interception.
  *

package/dist/types/extensibility/hooks/types.d.ts

@@ -3,17 +3,17 @@ import type { Component, TUI } from "@oh-my-pi/pi-tui";
 import type { logger as PiLogger } from "@oh-my-pi/pi-utils";
 import type { Type } from "arktype";
 import type * as zod from "zod/v4";
-import type { ModelRegistry } from "../../config/model-registry";
-import type { EditToolDetails } from "../../edit";
-import type { ExecOptions, ExecResult } from "../../exec/exec";
-import type * as PiCodingAgent from "../../index";
-import type { Theme } from "../../modes/theme/theme";
-import type { HookMessage } from "../../session/messages";
-import type { ReadonlySessionManager, SessionManager } from "../../session/session-manager";
-import type { BashToolDetails, GlobToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools";
-import type { AgentEndEvent, AgentStartEvent, AutoCompactionEndEvent, AutoCompactionStartEvent, AutoRetryEndEvent, AutoRetryStartEvent, ContextEvent, SessionBeforeBranchEvent, SessionBeforeBranchResult, SessionBeforeCompactEvent, SessionBeforeCompactResult, SessionBeforeSwitchEvent, SessionBeforeSwitchResult, SessionBeforeTreeEvent, SessionBeforeTreeResult, SessionBranchEvent, SessionCompactEvent, SessionCompactingEvent, SessionCompactingResult, SessionEvent, SessionShutdownEvent, SessionStartEvent, SessionSwitchEvent, SessionTreeEvent, TodoReminderEvent, ToolCallEventResult, ToolResultEventResult, TtsrTriggeredEvent, TurnEndEvent, TurnStartEvent } from "../shared-events";
-import type * as TypeBox from "../typebox";
-export type { ExecOptions, ExecResult } from "../../exec/exec";
+import type { ModelRegistry } from "../../config/model-registry.js";
+import type { EditToolDetails } from "../../edit/index.js";
+import type { ExecOptions, ExecResult } from "../../exec/exec.js";
+import type * as PiCodingAgent from "../../index.js";
+import type { Theme } from "../../modes/theme/theme.js";
+import type { CustomMessagePayload, HookMessage } from "../../session/messages.js";
+import type { ReadonlySessionManager, SessionManager } from "../../session/session-manager.js";
+import type { BashToolDetails, GlobToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools/index.js";
+import type { AgentEndEvent, AgentStartEvent, AutoCompactionEndEvent, AutoCompactionStartEvent, AutoRetryEndEvent, AutoRetryStartEvent, ContextEvent, SessionBeforeBranchEvent, SessionBeforeBranchResult, SessionBeforeCompactEvent, SessionBeforeCompactResult, SessionBeforeSwitchEvent, SessionBeforeSwitchResult, SessionBeforeTreeEvent, SessionBeforeTreeResult, SessionBranchEvent, SessionCompactEvent, SessionCompactingEvent, SessionCompactingResult, SessionEvent, SessionShutdownEvent, SessionStartEvent, SessionSwitchEvent, SessionTreeEvent, TodoReminderEvent, ToolCallEventResult, ToolResultEventResult, TtsrTriggeredEvent, TurnEndEvent, TurnStartEvent } from "../shared-events.js";
+import type * as TypeBox from "../typebox.js";
+export type { ExecOptions, ExecResult } from "../../exec/exec.js";
 /**
  * UI context for hooks to request interactive UI from the harness.
  * Each mode (interactive, RPC, print) provides its own implementation.
@@ -193,7 +193,7 @@ export interface HookCommandContext extends HookContext {
         cancelled: boolean;
     }>;
 }
-export type { ContextEvent, SessionBeforeBranchEvent, SessionBeforeCompactEvent, SessionBeforeSwitchEvent, SessionBeforeTreeEvent, SessionBranchEvent, SessionCompactEvent, SessionCompactingEvent, SessionEvent, SessionShutdownEvent, SessionStartEvent, SessionSwitchEvent, SessionTreeEvent, TreePreparation, } from "../shared-events";
+export type { ContextEvent, SessionBeforeBranchEvent, SessionBeforeCompactEvent, SessionBeforeSwitchEvent, SessionBeforeTreeEvent, SessionBranchEvent, SessionCompactEvent, SessionCompactingEvent, SessionEvent, SessionShutdownEvent, SessionStartEvent, SessionSwitchEvent, SessionTreeEvent, TreePreparation, } from "../shared-events.js";
 /**
  * Event data for before_agent_start event.
  * Fired after user submits a prompt but before the agent loop starts.
@@ -206,7 +206,7 @@ export interface BeforeAgentStartEvent {
     /** Any images attached to the prompt */
     images?: ImageContent[];
 }
-export type { AgentEndEvent, AgentStartEvent, AutoCompactionEndEvent, AutoCompactionStartEvent, AutoRetryEndEvent, AutoRetryStartEvent, TodoReminderEvent, TtsrTriggeredEvent, TurnEndEvent, TurnStartEvent, } from "../shared-events";
+export type { AgentEndEvent, AgentStartEvent, AutoCompactionEndEvent, AutoCompactionStartEvent, AutoRetryEndEvent, AutoRetryStartEvent, TodoReminderEvent, TtsrTriggeredEvent, TurnEndEvent, TurnStartEvent, } from "../shared-events.js";
 /**
  * Event data for tool_call event.
  * Fired before a tool is executed. Hooks can block execution.
@@ -287,16 +287,16 @@ export interface ContextEventResult {
     /** Modified messages to send instead of the original */
     messages?: Message[];
 }
-export type { ToolCallEventResult, ToolResultEventResult } from "../shared-events";
+export type { ToolCallEventResult, ToolResultEventResult } from "../shared-events.js";
 /**
  * Return type for before_agent_start event handlers.
  * Allows hooks to inject context before the agent runs.
  */
 export interface BeforeAgentStartEventResult {
     /** Message to inject into context (persisted to session, visible in TUI) */
-    message?: Pick<HookMessage, "customType" | "content" | "display" | "details" | "attribution">;
+    message?: CustomMessagePayload;
 }
-export type { SessionBeforeBranchResult, SessionBeforeCompactResult, SessionBeforeSwitchResult, SessionBeforeTreeResult, SessionCompactingResult, } from "../shared-events";
+export type { SessionBeforeBranchResult, SessionBeforeCompactResult, SessionBeforeSwitchResult, SessionBeforeTreeResult, SessionCompactingResult, } from "../shared-events.js";
 /**
  * Handler function type for each event.
  * Handlers can return R, undefined, or void (bare return statements).
@@ -356,7 +356,7 @@ export interface HookAPI {
      * Use this when you want the LLM to see the message content.
      * For hook state that should NOT be sent to the LLM, use appendEntry() instead.
      *
-     * @param message - The message to send
+     * @param message - The message object to send, or a string shorthand for visible message content
      * @param message.customType - Identifier for your hook (used for filtering on reload)
      * @param message.content - Message content (string or TextContent/ImageContent array)
      * @param message.display - Whether to show in TUI (true = styled display, false = hidden)
@@ -366,7 +366,7 @@ export interface HookAPI {
      *                              If agent is streaming, message is queued and triggerTurn is ignored.
      * @param options.deliverAs - How to deliver the message: "steer" or "followUp".
      */
-    sendMessage<T = unknown>(message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details" | "attribution">, options?: {
+    sendMessage<T = unknown>(message: CustomMessagePayload<T>, options?: {
         triggerTurn?: boolean;
         deliverAs?: "steer" | "followUp";
     }): void;

package/dist/types/extensibility/legacy-pi-ai-shim.d.ts

@@ -19,8 +19,8 @@
  * `types.ts` via the `export *` below — pi-ai still exports both as types,
  * only the runtime `Type` builder and `StringEnum()` helper were removed.
  */
-import { getBundledModel, getBundledModels } from "@oh-my-pi/pi-catalog/models";
-import { type TSchema, Type } from "./typebox";
+import { calculateCost, getBundledModel, getBundledModels, getBundledProviders, modelsAreEqual } from "@oh-my-pi/pi-catalog/models";
+import { type TSchema, Type } from "./typebox.js";
 export interface StringEnumOptions<T extends string> {
     description?: string;
     default?: T;
@@ -29,7 +29,15 @@ export interface StringEnumOptions<T extends string> {
 }
 export declare function StringEnum<T extends string | number>(values: readonly T[] | Record<string, T>, options?: StringEnumOptions<any>): TSchema;
 export * from "@oh-my-pi/pi-ai";
-export { Type };
-/** Compatibility aliases for renamed catalog functions */
+/**
+ * Compatibility re-exports for catalog symbols that pi-ai historically exposed
+ * from its own barrel prior to the `refactor(catalog)!: split model catalog
+ * from pi-ai` change. Legacy extensions still import these from the pi-ai
+ * root, so the shim bridges them through to their new home in
+ * `@oh-my-pi/pi-catalog/models`. `getModel`/`getModels` are the historical
+ * pi-ai names for `getBundledModel`/`getBundledModels`; the remaining symbols
+ * kept their names across the move.
+ */
+export { calculateCost, getBundledModel, getBundledModels, getBundledProviders, modelsAreEqual, Type };
 export declare const getModel: typeof getBundledModel;
 export declare const getModels: typeof getBundledModels;

package/dist/types/extensibility/legacy-pi-coding-agent-shim.d.ts

@@ -12,8 +12,12 @@
  * the same module identity as a direct `@oh-my-pi/pi-coding-agent` import.
  */
 import type { TSchema } from "@oh-my-pi/pi-ai";
-import { Settings } from "../config/settings";
-import type { ToolDefinition } from "./extensions/types";
+import type { PromptTemplate } from "../config/prompt-templates.js";
+import { Settings } from "../config/settings.js";
+import type { CreateAgentSessionOptions, CreateAgentSessionResult, LoadExtensionsResult } from "../sdk.js";
+import { EventBus } from "../utils/event-bus.js";
+import type { ExtensionFactory, ToolDefinition } from "./extensions/types.js";
+import type { Skill } from "./skills.js";
 export interface BashSpawnContext {
     command: string;
     cwd: string;
@@ -110,6 +114,191 @@ export declare const SettingsManager: {
     readonly create: (cwd: string, agentDir?: string) => Promise<Settings>;
     readonly inMemory: () => Settings;
 };
-export * from "../index";
-export { formatBytes as formatSize } from "../tools/render-utils";
-export { Type } from "./typebox";
+/**
+ * Resource-loader compatibility layer for legacy pi extensions.
+ *
+ * Upstream `@earendil-works/pi-coding-agent` centralizes extension / skill /
+ * prompt / theme / AGENTS.md discovery inside a `DefaultResourceLoader`
+ * instance that the caller constructs, `reload()`s, and hands to
+ * `createAgentSession({ resourceLoader })`. Every published version of
+ * pi-schedule-prompt (≥0.2.0) and other pi extensions that spawn subagents
+ * import the class at module scope; a missing export takes the whole
+ * extension down at parse time (issue #4567).
+ *
+ * OMP does the same discovery inline inside `createAgentSession()`, so this
+ * shim intentionally does NOT re-implement pi's ResourceLoader plumbing.
+ * Instead the loader captures the caller's intent (`no*` flags, `*Override`
+ * callbacks, `additional*Paths`, `extensionFactories`, `settingsManager`,
+ * `eventBus`) plus the discovery results, and the sibling `createAgentSession`
+ * override below translates them into OMP's native session options
+ * (`disableExtensionDiscovery`, `preloadedExtensionPaths`, `extensions`,
+ * `skills`, `promptTemplates`, `contextFiles`, `settings`, `eventBus`,
+ * `systemPrompt`) before delegating to `../sdk`.
+ *
+ * The pi surface it emulates is the intersection actually used by real
+ * extensions in the wild — themes are silently dropped (OMP has no
+ * session-level themes surface); `extendResources`, `loadProjectTrustExtensions`,
+ * and provider-trust hooks are omitted.
+ */
+export type ResourceDiagnostic = {
+    type: "error" | "warning" | "info";
+    message: string;
+    path?: string;
+};
+export interface AgentsFile {
+    path: string;
+    content: string;
+}
+/** Marker interface preserved for pi extensions that type against upstream. */
+export interface Theme {
+    name: string;
+}
+export interface DefaultResourceLoaderOptions {
+    cwd?: string;
+    agentDir?: string;
+    settingsManager?: Settings | Promise<Settings>;
+    eventBus?: EventBus;
+    additionalExtensionPaths?: string[];
+    additionalSkillPaths?: string[];
+    additionalPromptTemplatePaths?: string[];
+    additionalThemePaths?: string[];
+    extensionFactories?: ExtensionFactory[];
+    noExtensions?: boolean;
+    noSkills?: boolean;
+    noPromptTemplates?: boolean;
+    noThemes?: boolean;
+    noContextFiles?: boolean;
+    systemPrompt?: string;
+    appendSystemPrompt?: string | string[];
+    extensionsOverride?: (base: LoadExtensionsResult) => LoadExtensionsResult;
+    skillsOverride?: (base: {
+        skills: Skill[];
+        diagnostics: ResourceDiagnostic[];
+    }) => {
+        skills: Skill[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    promptsOverride?: (base: {
+        prompts: PromptTemplate[];
+        diagnostics: ResourceDiagnostic[];
+    }) => {
+        prompts: PromptTemplate[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    themesOverride?: (base: {
+        themes: Theme[];
+        diagnostics: ResourceDiagnostic[];
+    }) => {
+        themes: Theme[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    agentsFilesOverride?: (base: {
+        agentsFiles: AgentsFile[];
+    }) => {
+        agentsFiles: AgentsFile[];
+    };
+    systemPromptOverride?: (base: string | undefined) => string | undefined;
+    appendSystemPromptOverride?: (base: string[]) => string[];
+}
+/**
+ * The subset of {@link DefaultResourceLoader} state consumed by the
+ * {@link createAgentSession} adapter. Kept as an explicit interface so tests
+ * (and any future third-party ResourceLoader passed to `createAgentSession`)
+ * only need to satisfy the read surface — not the reload lifecycle.
+ */
+export interface ResourceLoader {
+    getExtensions(): LoadExtensionsResult;
+    getSkills(): {
+        skills: Skill[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    getPrompts(): {
+        prompts: PromptTemplate[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    getThemes(): {
+        themes: Theme[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    getAgentsFiles(): {
+        agentsFiles: AgentsFile[];
+    };
+    getSystemPrompt(): string | undefined;
+    getAppendSystemPrompt(): string[];
+    reload(): Promise<void>;
+    /** @internal — used by the shim's createAgentSession to detect its own loaders. */
+    readonly __ompLegacyPiLoader?: true;
+}
+export declare class DefaultResourceLoader implements ResourceLoader {
+    #private;
+    readonly __ompLegacyPiLoader: true;
+    constructor(options?: DefaultResourceLoaderOptions);
+    getExtensions(): LoadExtensionsResult;
+    getSkills(): {
+        skills: Skill[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    getPrompts(): {
+        prompts: PromptTemplate[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    getThemes(): {
+        themes: Theme[];
+        diagnostics: ResourceDiagnostic[];
+    };
+    getAgentsFiles(): {
+        agentsFiles: AgentsFile[];
+    };
+    getSystemPrompt(): string | undefined;
+    getAppendSystemPrompt(): string[];
+    /**
+     * Discovery snapshot used to seed the session. Emulates upstream pi's
+     * `reload()` lifecycle: run every enabled discovery arm against the
+     * resolved cwd/agentDir, then thread each result through the caller's
+     * `*Override` callback. Discovery arms guarded by an `no*` flag start from
+     * an empty base — callers that flipped the flag off still get the override
+     * hook, so overrides can inject synthetic entries without triggering a
+     * filesystem scan they explicitly opted out of.
+     */
+    reload(): Promise<void>;
+    /** Test seam: whether `reload()` has completed at least once. */
+    get loaded(): boolean;
+    /** @internal — used by the shim's createAgentSession to translate options. */
+    __getResolverState(): {
+        cwd: string;
+        agentDir: string;
+        settingsPromise?: Promise<Settings>;
+        eventBus: EventBus;
+        extensionsResult: LoadExtensionsResult;
+        skills: Skill[];
+        prompts: PromptTemplate[];
+        agentsFiles: AgentsFile[];
+        systemPrompt: string | undefined;
+        appendSystemPrompt: string[];
+        extensionFactories: ExtensionFactory[];
+    };
+}
+/**
+ * Legacy pi extensions call `createAgentSession({ resourceLoader })`. OMP's
+ * native option surface has no such field — extension / skill / prompt /
+ * context-file discovery are configured directly on the session options — so
+ * an untranslated call would silently ignore the loader (including its
+ * `noExtensions`/`noSkills` opt-outs), re-run OMP's own discovery, and
+ * happily re-load the calling extension into the subagent. That's exactly
+ * the recursion the caller passed the loader to prevent.
+ *
+ * Translate the loader's captured state into OMP's option fields, then
+ * delegate to the underlying SDK. Explicit fields on `options` override the
+ * loader (matches upstream pi semantics — a caller can partially override a
+ * shared loader).
+ *
+ * `resourceLoader` is not part of {@link CreateAgentSessionOptions}, so it's
+ * accepted through a widened alias and stripped before the underlying call.
+ */
+export type LegacyPiCreateAgentSessionOptions = CreateAgentSessionOptions & {
+    resourceLoader?: ResourceLoader;
+};
+export declare function createAgentSession(options?: LegacyPiCreateAgentSessionOptions): Promise<CreateAgentSessionResult>;
+export * from "../index.js";
+export { formatBytes as formatSize } from "../tools/render-utils.js";
+export { Type } from "./typebox.js";

package/dist/types/extensibility/plugins/doctor.d.ts

@@ -1,3 +1,3 @@
-import type { DoctorCheck } from "./types";
+import type { DoctorCheck } from "./types.js";
 export declare function runDoctorChecks(): Promise<DoctorCheck[]>;
 export declare function formatDoctorResults(checks: DoctorCheck[]): string;

package/dist/types/extensibility/plugins/index.d.ts

@@ -1,7 +1,7 @@
-export * from "./doctor";
-export * from "./git-url";
-export * from "./loader";
-export * from "./manager";
-export * from "./marketplace";
-export * from "./parser";
-export type * from "./types";
+export * from "./doctor.js";
+export * from "./git-url.js";
+export * from "./loader.js";
+export * from "./manager.js";
+export * from "./marketplace/index.js";
+export * from "./parser.js";
+export type * from "./types.js";

package/dist/types/extensibility/plugins/installer.d.ts

@@ -1,4 +1,4 @@
-import type { InstalledPlugin } from "./types";
+import type { InstalledPlugin } from "./types.js";
 export declare function installPlugin(packageName: string): Promise<InstalledPlugin>;
 export declare function uninstallPlugin(name: string): Promise<void>;
 export declare function listPlugins(): Promise<InstalledPlugin[]>;

package/dist/types/extensibility/plugins/legacy-pi-compat.d.ts

@@ -62,7 +62,7 @@ export declare function __validateLegacyPiPackageRootOverrides(candidates: Recor
  */
 export declare function __buildLegacyPiPackageRootOverrides(isCompiled: boolean): Record<string, string>;
 /** Test seam for compiled-binary legacy extension source rewriting. */
-export declare function __rewriteLegacyExtensionSourceForTests(source: string, importerPath: string): Promise<string>;
+export declare function __rewriteLegacyExtensionSourceForTests(source: string, importerPath: string, mtimeTag?: string | null): Promise<string>;
 /**
  * Load a legacy Pi extension module from its real on-disk location.
  *

package/dist/types/extensibility/plugins/loader.d.ts

@@ -1,4 +1,4 @@
-import type { InstalledPlugin } from "./types";
+import type { InstalledPlugin } from "./types.js";
 /** Installed plugin plus the root scope that supplied its runtime metadata. */
 export interface ScopedInstalledPlugin extends InstalledPlugin {
     scope: "user" | "project";

package/dist/types/extensibility/plugins/manager.d.ts

@@ -1,4 +1,4 @@
-import type { DoctorCheck, DoctorOptions, InstalledPlugin, InstallOptions, PluginSettingSchema } from "./types";
+import type { DoctorCheck, DoctorOptions, InstalledPlugin, InstallOptions, PluginSettingSchema } from "./types.js";
 export declare class PluginManager {
     #private;
     constructor(cwd?: string);

package/dist/types/extensibility/plugins/marketplace/fetcher.d.ts

@@ -3,7 +3,7 @@
  *
  * Classifies a source string, resolves it, and loads the catalog.
  */
-import type { MarketplaceCatalog, MarketplaceSourceType } from "./types";
+import type { MarketplaceCatalog, MarketplaceSourceType } from "./types.js";
 export interface FetchResult {
     catalog: MarketplaceCatalog;
     /** For git sources: path to the cloned marketplace directory. */

package/dist/types/extensibility/plugins/marketplace/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./cache";
-export * from "./fetcher";
-export * from "./manager";
-export * from "./registry";
-export * from "./source-resolver";
-export * from "./types";
+export * from "./cache.js";
+export * from "./fetcher.js";
+export * from "./manager.js";
+export * from "./registry.js";
+export * from "./source-resolver.js";
+export * from "./types.js";

package/dist/types/extensibility/plugins/marketplace/manager.d.ts

@@ -5,7 +5,7 @@
  * The `clearPluginRootsCache` dependency is injected so callers can provide
  * the real `clearClaudePluginRootsCache` while tests supply a counter stub.
  */
-import type { InstalledPluginEntry, InstalledPluginSummary, MarketplacePluginEntry, MarketplaceRegistryEntry } from "./types";
+import type { InstalledPluginEntry, InstalledPluginSummary, MarketplacePluginEntry, MarketplaceRegistryEntry } from "./types.js";
 export interface MarketplaceManagerOptions {
     marketplacesRegistryPath: string;
     installedRegistryPath: string;

package/dist/types/extensibility/plugins/marketplace/registry.d.ts

@@ -11,7 +11,7 @@
  * Both use atomic write (tmp + rename). On Windows, rename over existing file
  * can fail with EPERM — fallback: unlink target then rename.
  */
-import type { InstalledPluginEntry, InstalledPluginsRegistry, MarketplaceRegistryEntry, MarketplacesRegistry } from "./types";
+import type { InstalledPluginEntry, InstalledPluginsRegistry, MarketplaceRegistryEntry, MarketplacesRegistry } from "./types.js";
 export declare function getMarketplacesRegistryPath(): string;
 export declare function getInstalledPluginsRegistryPath(): string;
 export declare function getMarketplacesCacheDir(): string;

package/dist/types/extensibility/plugins/marketplace/source-resolver.d.ts

@@ -8,7 +8,7 @@
  *   - { source: "git-subdir", url: "...", path: "sub/dir" } → git clone + subdir
  *   - { source: "npm", ... } → not yet supported
  */
-import type { MarketplaceCatalogMetadata, MarketplacePluginEntry } from "./types";
+import type { MarketplaceCatalogMetadata, MarketplacePluginEntry } from "./types.js";
 export interface ResolveContext {
     /** Absolute path to the cloned/local marketplace directory. Required for relative sources. */
     marketplaceClonePath?: string;

package/dist/types/extensibility/plugins/runtime-config.d.ts

@@ -1,3 +1,3 @@
-import type { PluginRuntimeConfig } from "./types";
+import type { PluginRuntimeConfig } from "./types.js";
 /** Normalizes persisted plugin runtime config across legacy lockfile shapes. */
 export declare function normalizePluginRuntimeConfig(config: Partial<PluginRuntimeConfig>): PluginRuntimeConfig;

package/dist/types/extensibility/session-handler-types.d.ts

@@ -3,7 +3,7 @@
  * loader/runner. Both surfaces wire the same new-session / branch / navigate
  * handlers into their command contexts; this is the single source of truth.
  */
-import type { SessionManager } from "../session/session-manager";
+import type { SessionManager } from "../session/session-manager.js";
 /** Handler for `ctx.newSession()` — creates (and optionally seeds) a session. */
 export type NewSessionHandler = (options?: {
     parentSession?: string;

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

@@ -14,11 +14,11 @@
  */
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { CompactionPreparation, CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
-import type { ImageContent, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
-import type { Rule } from "../capability/rule";
-import type { Goal, GoalModeState } from "../goals/state";
-import type { BranchSummaryEntry, CompactionEntry, SessionEntry } from "../session/session-entries";
-import type { TodoItem } from "../tools/todo";
+import type { AssistantRetryRecovery, ImageContent, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
+import type { Rule } from "../capability/rule.js";
+import type { Goal, GoalModeState } from "../goals/state.js";
+import type { BranchSummaryEntry, CompactionEntry, SessionEntry } from "../session/session-entries.js";
+import type { TodoItem } from "../tools/todo.js";
 /** Fired on initial session load */
 export interface SessionStartEvent {
     type: "session_start";
@@ -192,12 +192,19 @@ export interface AutoRetryStartEvent {
     errorMessage: string;
     errorId?: number;
 }
+export interface RecoveredRetryError {
+    entryId: string;
+    persistenceKey?: string;
+    note: string;
+    retryRecovery: AssistantRetryRecovery;
+}
 /** Fired when auto-retry ends */
 export interface AutoRetryEndEvent {
     type: "auto_retry_end";
     success: boolean;
     attempt: number;
     finalError?: string;
+    recoveredErrors?: RecoveredRetryError[];
 }
 /** Fired when TTSR rule matching interrupts generation */
 export interface TtsrTriggeredEvent {

package/dist/types/extensibility/skills.d.ts

@@ -1,6 +1,6 @@
-import type { SourceMeta } from "../capability/types";
-import type { SkillsSettings } from "../config/settings";
-import type { SkillPromptDetails } from "../session/messages";
+import type { SourceMeta } from "../capability/types.js";
+import type { SkillsSettings } from "../config/settings.js";
+import type { SkillPromptDetails } from "../session/messages.js";
 export interface Skill {
     name: string;
     description: string;

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

@@ -7,7 +7,7 @@ export interface SlashCommandInfo {
     location?: SlashCommandLocation;
     path?: string;
 }
-export type { BuiltinSlashCommand, SubcommandDef } from "../slash-commands/types";
+export type { BuiltinSlashCommand, SubcommandDef } from "../slash-commands/types.js";
 /**
  * Represents a custom slash command loaded from a file
  */

package/dist/types/extensibility/typebox.d.ts

@@ -145,7 +145,7 @@ export declare const Type: {
     readonly Composite: typeof tComposite;
 };
 export type TypeBuilder = typeof Type;
-/** Default namespace export so `import * as typebox from "./typebox"` still resolves the `Type` key. */
+/** Default namespace export so `import * as typebox from "./typebox.js"` still resolves the `Type` key. */
 declare const _default: {
     Type: {
         readonly String: typeof tString;

package/dist/types/extensibility/utils.d.ts

@@ -1,4 +1,4 @@
-import type { HookUIContext } from "./hooks/types";
+import type { HookUIContext } from "./hooks/types.js";
 /**
  * Resolve a file path:
  * - Absolute paths used as-is

package/dist/types/goals/guided-setup.d.ts

@@ -1,4 +1,4 @@
-import type { AgentSession } from "../session/agent-session";
+import type { AgentSession } from "../session/agent-session.js";
 export interface GuidedGoalMessage {
     role: "user" | "assistant";
     content: string;

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

@@ -1,3 +1,3 @@
-export * from "./runtime";
-export * from "./state";
-export * from "./tools/goal-tool";
+export * from "./runtime.js";
+export * from "./state.js";
+export * from "./tools/goal-tool.js";

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

@@ -1,4 +1,4 @@
-import type { Goal, GoalBudgetSteering, GoalModeState, GoalRuntimeEvent, GoalTokenUsage } from "./state";
+import type { Goal, GoalBudgetSteering, GoalModeState, GoalRuntimeEvent, GoalTokenUsage } from "./state.js";
 export interface GoalRuntimeHost {
     getState(): GoalModeState | undefined;
     setState(state: GoalModeState | undefined): void;

package/dist/types/goals/state.d.ts

@@ -1,4 +1,4 @@
-import type { UsageStatistics } from "../session/session-entries";
+import type { UsageStatistics } from "../session/session-entries.js";
 export type GoalStatus = "active" | "paused" | "budget-limited" | "complete" | "dropped";
 export interface Goal {
     id: string;