@caupulican/pi-adaptative 0.85.4 → 0.86.1

package/dist/core/extensions/loader.d.ts

@@ -3,22 +3,9 @@
  *
  */
 import { type EventBus } from "../event-bus.ts";
-import type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult } from "./types.ts";
-/**
- * Create a runtime with throwing stubs for action methods.
- * Runner.bindCore() replaces these with real implementations.
- */
-export declare function createExtensionRuntime(): ExtensionRuntime;
-/**
- * Unsubscribe a replaced extension generation's pi.events handlers from the shared
- * event bus and invoke cleanup callbacks. Without this, every hot reload leaves the
- * previous generation's handlers subscribed, pinning the old module graph in memory
- * and double-processing events.
- */
-export declare function disposeExtensionEventSubscriptions(extensions: Extension[], options?: {
-    deactivate?: boolean;
-    timeoutMs?: number;
-}): Promise<void>;
+import type { Extension, ExtensionRuntime, LoadExtensionsResult } from "./types.ts";
+export { createExtensionRuntime, loadExtensionFromFactory } from "./factory-runtime.ts";
+export { disposeExtensionEventSubscriptions } from "./lifecycle.ts";
 export declare function loadExtension(extensionPath: string, cwd: string, eventBus: EventBus, runtime: ExtensionRuntime, opts?: {
     fresh?: boolean;
     factoryTimeoutMs?: number;
@@ -28,13 +15,6 @@ export declare function loadExtension(extensionPath: string, cwd: string, eventB
     extension: Extension | null;
     error: string | null;
 }>;
-/**
- * Create an Extension from an inline factory function.
- */
-export declare function loadExtensionFromFactory(factory: ExtensionFactory, cwd: string, eventBus: EventBus, runtime: ExtensionRuntime, extensionPath?: string, options?: {
-    factoryTimeoutMs?: number;
-    agentDir?: string;
-}): Promise<Extension>;
 /**
  * Load extensions from paths.
  */
@@ -61,5 +41,4 @@ interface ExtensionLoadSpec {
  * Discover and load extensions from standard locations.
  */
 export declare function discoverAndLoadExtensions(configuredPaths: string[], cwd: string, agentDir?: string, eventBus?: EventBus): Promise<LoadExtensionsResult>;
-export {};
 //# sourceMappingURL=loader.d.ts.map

package/dist/core/extensions/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAwCH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAOhE,OAAO,KAAK,EACX,SAAS,EAET,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EAKpB,MAAM,YAAY,CAAC;AAqMpB;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAkEzD;AAmWD;;;;;GAKG;AACH,wBAAsB,kCAAkC,CACvD,UAAU,EAAE,SAAS,EAAE,EACvB,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAuCf;AA4CD,wBAAsB,aAAa,CAClC,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAChG,OAAO,CAAC;IAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CA2BhE;AA6GD;;GAEG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,EAC1B,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5D,OAAO,CAAC,SAAS,CAAC,CAcpB;AAED;;GAEG;AACH,wBAAsB,cAAc,CACnC,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,iBAAiB,CAAC,EACxC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GACjC,OAAO,CAAC,oBAAoB,CAAC,CA6D/B;AAED,UAAU,gBAAgB;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8FAA8F;IAC9F,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAaD,UAAU,iBAAiB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AA0ID;;GAEG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CA4C/B"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAahE,OAAO,KAAK,EAAE,SAAS,EAAoB,gBAAgB,EAAE,oBAAoB,EAAkB,MAAM,YAAY,CAAC;AAOtH,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,kCAAkC,EAAE,MAAM,gBAAgB,CAAC;AA0KpE,wBAAsB,aAAa,CAClC,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAChG,OAAO,CAAC;IAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CA2BhE;AA6GD;;GAEG;AACH,wBAAsB,cAAc,CACnC,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,iBAAiB,CAAC,EACxC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GACjC,OAAO,CAAC,oBAAoB,CAAC,CA6D/B;AAED,UAAU,gBAAgB;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8FAA8F;IAC9F,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAaD,UAAU,iBAAiB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AA0ID;;GAEG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CA4C/B"}

package/dist/core/extensions/loader.js

@@ -6,115 +6,17 @@ import * as fs from "node:fs";
 import { createRequire } from "node:module";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
-import * as _bundledPiAgentCore from "@caupulican/pi-agent-core";
-import * as _bundledPiAi from "@caupulican/pi-ai";
-import * as _bundledPiAiAbortSignals from "@caupulican/pi-ai/abort-signals";
-import * as _bundledPiAiBedrockProvider from "@caupulican/pi-ai/bedrock-provider";
-import * as _bundledPiAiEventStream from "@caupulican/pi-ai/event-stream";
-import * as _bundledPiAiJsonParse from "@caupulican/pi-ai/json-parse";
-import * as _bundledPiAiOauth from "@caupulican/pi-ai/oauth";
-import * as _bundledPiAiOverflow from "@caupulican/pi-ai/overflow";
-import * as _bundledPiAiProviderRetry from "@caupulican/pi-ai/provider-retry";
-import * as _bundledPiAiStream from "@caupulican/pi-ai/stream";
-import * as _bundledPiAiStreamingLines from "@caupulican/pi-ai/streaming-lines";
-import * as _bundledPiAiTextToolProtocol from "@caupulican/pi-ai/text-tool-protocol";
-import * as _bundledPiAiToolRepairRegistry from "@caupulican/pi-ai/tool-repair-registry";
-import * as _bundledPiAiTypeboxHelpers from "@caupulican/pi-ai/typebox-helpers";
-import * as _bundledPiAiTypes from "@caupulican/pi-ai/types";
-import * as _bundledPiAiUsage from "@caupulican/pi-ai/usage";
-import * as _bundledPiAiUuid from "@caupulican/pi-ai/uuid";
-import * as _bundledPiAiValidation from "@caupulican/pi-ai/validation";
-import * as _bundledPiAiValidationPath from "@caupulican/pi-ai/validation-path";
-import * as _bundledPiTui from "@caupulican/pi-tui";
 import { createJiti } from "jiti/static";
-// Static imports of packages that extensions may use.
-// These MUST be static so Bun bundles them into the compiled binary.
-// The virtualModules option then makes them available to extensions.
-import * as _bundledTypebox from "typebox";
-import * as _bundledTypeboxCompile from "typebox/compile";
-import * as _bundledTypeboxValue from "typebox/value";
 import { CONFIG_DIR_NAME, getAgentDir, isBunBinary } from "../../config.js";
-// NOTE: This import works because loader.ts exports are NOT re-exported from index.ts,
-// avoiding a circular dependency. Extensions can import from @caupulican/pi-adaptative.
-import * as _bundledPiCodingAgent from "../../index.js";
 import { resolvePath } from "../../utils/paths.js";
 import { cacheFile } from "../agent-paths.js";
 import { createEventBus } from "../event-bus.js";
-import { execCommand } from "../exec.js";
-import { createSyntheticSourceInfo } from "../source-info.js";
 import { resolveExtensionIndexEntry } from "./entry-resolution.js";
-import { DEFAULT_STALE_EXTENSION_CONTEXT_MESSAGE } from "./stale-context.js";
-import { createExtensionStorage } from "./storage.js";
-const EXTENSION_FACTORY_TIMEOUT_MS = 30_000;
-const EXTENSION_DISPOSAL_TIMEOUT_MS = 5_000;
-const inactiveExtensions = new WeakSet();
-class ExtensionFactoryTimeoutError extends Error {
-}
-const PI_AI_WORKSPACE_SUBPATHS = {
-    "abort-signals": "ai/src/utils/abort-signals.ts",
-    "bedrock-provider": "ai/src/bedrock-provider.ts",
-    "event-stream": "ai/src/utils/event-stream.ts",
-    "json-parse": "ai/src/utils/json-parse.ts",
-    oauth: "ai/src/oauth.ts",
-    overflow: "ai/src/utils/overflow.ts",
-    "provider-retry": "ai/src/utils/provider-retry.ts",
-    stream: "ai/src/stream.ts",
-    "streaming-lines": "ai/src/utils/streaming-lines.ts",
-    "text-tool-protocol": "ai/src/utils/tool-repair/text-protocol.ts",
-    "tool-repair-registry": "ai/src/utils/tool-repair/registry.ts",
-    "typebox-helpers": "ai/src/utils/typebox-helpers.ts",
-    types: "ai/src/types.ts",
-    usage: "ai/src/usage.ts",
-    uuid: "ai/src/utils/uuid.ts",
-    validation: "ai/src/utils/validation.ts",
-    "validation-path": "ai/src/utils/validation-path.ts",
-};
-const PI_AI_VIRTUAL_SUBPATHS = {
-    "abort-signals": _bundledPiAiAbortSignals,
-    "bedrock-provider": _bundledPiAiBedrockProvider,
-    "event-stream": _bundledPiAiEventStream,
-    "json-parse": _bundledPiAiJsonParse,
-    oauth: _bundledPiAiOauth,
-    overflow: _bundledPiAiOverflow,
-    "provider-retry": _bundledPiAiProviderRetry,
-    stream: _bundledPiAiStream,
-    "streaming-lines": _bundledPiAiStreamingLines,
-    "text-tool-protocol": _bundledPiAiTextToolProtocol,
-    "tool-repair-registry": _bundledPiAiToolRepairRegistry,
-    "typebox-helpers": _bundledPiAiTypeboxHelpers,
-    types: _bundledPiAiTypes,
-    usage: _bundledPiAiUsage,
-    uuid: _bundledPiAiUuid,
-    validation: _bundledPiAiValidation,
-    "validation-path": _bundledPiAiValidationPath,
-};
-function piAiVirtualModules(packageName) {
-    return Object.fromEntries([
-        [packageName, _bundledPiAi],
-        ...Object.entries(PI_AI_VIRTUAL_SUBPATHS).map(([subpath, module]) => [`${packageName}/${subpath}`, module]),
-    ]);
-}
-/** Modules available to extensions via virtualModules (for compiled Bun binary) */
-const VIRTUAL_MODULES = {
-    typebox: _bundledTypebox,
-    "typebox/compile": _bundledTypeboxCompile,
-    "typebox/value": _bundledTypeboxValue,
-    "@sinclair/typebox": _bundledTypebox,
-    "@sinclair/typebox/compile": _bundledTypeboxCompile,
-    "@sinclair/typebox/value": _bundledTypeboxValue,
-    "@caupulican/pi-agent-core": _bundledPiAgentCore,
-    "@caupulican/pi-tui": _bundledPiTui,
-    ...piAiVirtualModules("@caupulican/pi-ai"),
-    "@caupulican/pi-adaptative": _bundledPiCodingAgent,
-    "@earendil-works/pi-agent-core": _bundledPiAgentCore,
-    "@earendil-works/pi-tui": _bundledPiTui,
-    ...piAiVirtualModules("@earendil-works/pi-ai"),
-    "@earendil-works/pi-coding-agent": _bundledPiCodingAgent,
-    "@mariozechner/pi-agent-core": _bundledPiAgentCore,
-    "@mariozechner/pi-tui": _bundledPiTui,
-    ...piAiVirtualModules("@mariozechner/pi-ai"),
-    "@mariozechner/pi-coding-agent": _bundledPiCodingAgent,
-};
+import { createExtension, createExtensionAPI, createExtensionRuntime, EXTENSION_FACTORY_TIMEOUT_MS, ExtensionFactoryTimeoutError, restoreExtensionLoadRuntime, runExtensionFactory, snapshotExtensionLoadRuntime, } from "./factory-runtime.js";
+import { disposeExtensionEventSubscriptions, isExtensionGenerationInactive } from "./lifecycle.js";
+import { getBundledExtensionVirtualModules, PI_AGENT_CORE_EXTENSION_SUBPATHS, PI_AI_EXTENSION_SUBPATHS, } from "./virtual-modules.js";
+export { createExtensionRuntime, loadExtensionFromFactory } from "./factory-runtime.js";
+export { disposeExtensionEventSubscriptions } from "./lifecycle.js";
 function uniquePaths(paths) {
     return [...new Set(paths)];
 }
@@ -176,11 +78,13 @@ function getAliases() {
     };
     const piCodingAgentEntry = packageIndex;
     const piAgentCoreEntry = resolveWorkspaceOrImport("agent/src/index.ts", "@caupulican/pi-agent-core");
-    const piAgentCoreNodeEntry = resolveWorkspaceOrImport("agent/src/node.ts", "@caupulican/pi-agent-core/node");
-    const piAgentCorePathsEntry = resolveWorkspaceOrImport("agent/src/utils/paths.ts", "@caupulican/pi-agent-core/paths");
+    const piAgentCoreSubpathEntries = Object.fromEntries(Object.entries(PI_AGENT_CORE_EXTENSION_SUBPATHS).map(([subpath, workspacePath]) => [
+        subpath,
+        resolveWorkspaceOrImport(workspacePath, `@caupulican/pi-agent-core/${subpath}`),
+    ]));
     const piTuiEntry = resolveWorkspaceOrImport("tui/src/index.ts", "@caupulican/pi-tui");
     const piAiEntry = resolveWorkspaceOrImport("ai/src/index.ts", "@caupulican/pi-ai");
-    const piAiSubpathEntries = Object.fromEntries(Object.entries(PI_AI_WORKSPACE_SUBPATHS).map(([subpath, workspacePath]) => [
+    const piAiSubpathEntries = Object.fromEntries(Object.entries(PI_AI_EXTENSION_SUBPATHS).map(([subpath, workspacePath]) => [
         subpath,
         resolveWorkspaceOrImport(workspacePath, `@caupulican/pi-ai/${subpath}`),
     ]));
@@ -188,24 +92,22 @@ function getAliases() {
         ...Object.entries(piAiSubpathEntries).map(([subpath, entry]) => [`${packageName}/${subpath}`, entry]),
         [packageName, piAiEntry],
     ]);
+    const piAgentCoreAliases = (packageName) => Object.fromEntries([
+        ...Object.entries(piAgentCoreSubpathEntries).map(([subpath, entry]) => [`${packageName}/${subpath}`, entry]),
+        [packageName, piAgentCoreEntry],
+    ]);
     _aliases = {
-        "@caupulican/pi-agent-core/node": piAgentCoreNodeEntry,
-        "@caupulican/pi-agent-core/paths": piAgentCorePathsEntry,
+        ...piAgentCoreAliases("@caupulican/pi-agent-core"),
         ...piAiAliases("@caupulican/pi-ai"),
         "@caupulican/pi-adaptative": piCodingAgentEntry,
-        "@caupulican/pi-agent-core": piAgentCoreEntry,
         "@caupulican/pi-tui": piTuiEntry,
-        "@earendil-works/pi-agent-core/node": piAgentCoreNodeEntry,
-        "@earendil-works/pi-agent-core/paths": piAgentCorePathsEntry,
+        ...piAgentCoreAliases("@earendil-works/pi-agent-core"),
         ...piAiAliases("@earendil-works/pi-ai"),
         "@earendil-works/pi-coding-agent": piCodingAgentEntry,
-        "@earendil-works/pi-agent-core": piAgentCoreEntry,
         "@earendil-works/pi-tui": piTuiEntry,
-        "@mariozechner/pi-agent-core/node": piAgentCoreNodeEntry,
-        "@mariozechner/pi-agent-core/paths": piAgentCorePathsEntry,
+        ...piAgentCoreAliases("@mariozechner/pi-agent-core"),
         ...piAiAliases("@mariozechner/pi-ai"),
         "@mariozechner/pi-coding-agent": piCodingAgentEntry,
-        "@mariozechner/pi-agent-core": piAgentCoreEntry,
         "@mariozechner/pi-tui": piTuiEntry,
         typebox: typeboxEntry,
         "typebox/compile": typeboxCompileEntry,
@@ -219,294 +121,6 @@ function getAliases() {
 function yieldToEventLoop() {
     return new Promise((resolve) => setImmediate(resolve));
 }
-/**
- * Create a runtime with throwing stubs for action methods.
- * Runner.bindCore() replaces these with real implementations.
- */
-export function createExtensionRuntime() {
-    const notInitialized = () => {
-        throw new Error("Extension runtime not initialized. Action methods cannot be called during extension loading.");
-    };
-    const state = {};
-    const assertActive = () => {
-        if (state.staleMessage) {
-            throw new Error(state.staleMessage);
-        }
-    };
-    const providersByExtension = new Map();
-    const providerRegistrations = new Map();
-    const memoryProvidersByExtension = new Map();
-    const contextMemoryProvidersByExtension = new Map();
-    const extensionStorageOwners = new Map();
-    const runtime = {
-        sendMessage: notInitialized,
-        sendUserMessage: notInitialized,
-        appendEntry: notInitialized,
-        setSessionName: notInitialized,
-        getSessionName: notInitialized,
-        setLabel: notInitialized,
-        getActiveTools: notInitialized,
-        getAllTools: notInitialized,
-        setActiveTools: notInitialized,
-        // registerTool() is valid during extension load; refresh is only needed post-bind.
-        refreshTools: () => { },
-        getCommands: notInitialized,
-        setModel: notInitialized,
-        getThinkingLevel: notInitialized,
-        setThinkingLevel: notInitialized,
-        getExternalResourceRoots: notInitialized,
-        registerMemoryProvider: notInitialized,
-        registerContextMemoryProvider: notInitialized,
-        reportSpawnedUsage: notInitialized,
-        reportManagedLane: notInitialized,
-        flagValues: new Map(),
-        pendingProviderRegistrations: [],
-        assertActive,
-        invalidate: (message) => {
-            state.staleMessage ??= message ?? DEFAULT_STALE_EXTENSION_CONTEXT_MESSAGE;
-        },
-        // Pre-bind: queue registrations so bindCore() can flush them once the
-        // model registry is available. bindCore() replaces both with direct calls.
-        registerProvider: (name, config, extensionPath = "<unknown>") => {
-            runtime.pendingProviderRegistrations.push({ name, config, extensionPath });
-        },
-        unregisterProvider: (name) => {
-            runtime.pendingProviderRegistrations = runtime.pendingProviderRegistrations.filter((r) => r.name !== name);
-        },
-        providersByExtension,
-        providerRegistrations,
-        getProvidersForExtension: (extensionPath) => {
-            return [...(providersByExtension.get(extensionPath) ?? [])];
-        },
-        memoryProvidersByExtension,
-        contextMemoryProvidersByExtension,
-        extensionStorageOwners,
-    };
-    return runtime;
-}
-/**
- * Create the ExtensionAPI for an extension.
- * Registration methods write to the extension object.
- * Action methods delegate to the shared runtime.
- */
-function createExtensionAPI(extension, runtime, cwd, eventBus, agentDir) {
-    // A factory can time out while its promise continues running. Route every later API call through
-    // an extension-generation guard so stale async work cannot register tools, handlers, or providers.
-    const sharedRuntime = runtime;
-    runtime = new Proxy(sharedRuntime, {
-        get(target, property, receiver) {
-            if (property === "assertActive") {
-                return () => {
-                    target.assertActive();
-                    if (inactiveExtensions.has(extension)) {
-                        throw new Error(`Extension generation is no longer active: ${extension.path}`);
-                    }
-                };
-            }
-            return Reflect.get(target, property, receiver);
-        },
-    });
-    const api = {
-        getStorage(namespace) {
-            runtime.assertActive();
-            if (extension.storage) {
-                if (extension.storage.namespace !== namespace) {
-                    throw new Error(`Extension ${extension.path} already owns storage namespace ${extension.storage.namespace}; cannot also use ${namespace}`);
-                }
-                return extension.storage;
-            }
-            const storage = createExtensionStorage(agentDir, namespace, runtime.assertActive, (disposer) => extension.disposers.push(disposer));
-            const previousOwner = runtime.extensionStorageOwners.get(namespace);
-            if (previousOwner && previousOwner.path !== extension.path) {
-                throw new Error(`Extension storage namespace ${namespace} is already owned by ${previousOwner.path}; ${extension.path} cannot also use it`);
-            }
-            runtime.extensionStorageOwners.set(namespace, extension);
-            extension.disposers.push(() => {
-                if (runtime.extensionStorageOwners.get(namespace) !== extension)
-                    return;
-                if (previousOwner && !inactiveExtensions.has(previousOwner)) {
-                    runtime.extensionStorageOwners.set(namespace, previousOwner);
-                }
-                else {
-                    runtime.extensionStorageOwners.delete(namespace);
-                }
-            });
-            extension.storage = storage;
-            return storage;
-        },
-        // Registration methods - write to extension
-        on(event, handler) {
-            runtime.assertActive();
-            const list = extension.handlers.get(event) ?? [];
-            list.push(handler);
-            extension.handlers.set(event, list);
-        },
-        registerTool(tool) {
-            runtime.assertActive();
-            extension.tools.set(tool.name, {
-                definition: tool,
-                sourceInfo: extension.sourceInfo,
-            });
-            runtime.refreshTools();
-        },
-        registerCommand(name, options) {
-            runtime.assertActive();
-            extension.commands.set(name, {
-                name,
-                sourceInfo: extension.sourceInfo,
-                ...options,
-            });
-        },
-        registerShortcut(shortcut, options) {
-            runtime.assertActive();
-            extension.shortcuts.set(shortcut, { shortcut, extensionPath: extension.path, ...options });
-        },
-        registerFlag(name, options) {
-            runtime.assertActive();
-            extension.flags.set(name, { name, extensionPath: extension.path, ...options });
-            if (options.default !== undefined && !runtime.flagValues.has(name)) {
-                runtime.flagValues.set(name, options.default);
-            }
-        },
-        registerMessageRenderer(customType, renderer) {
-            runtime.assertActive();
-            extension.messageRenderers.set(customType, renderer);
-        },
-        // Flag access - checks extension registered it, reads from runtime
-        getFlag(name) {
-            runtime.assertActive();
-            if (!extension.flags.has(name))
-                return undefined;
-            return runtime.flagValues.get(name);
-        },
-        // Action methods - delegate to shared runtime
-        sendMessage(message, options) {
-            runtime.assertActive();
-            runtime.sendMessage(message, options);
-        },
-        sendUserMessage(content, options) {
-            runtime.assertActive();
-            runtime.sendUserMessage(content, options);
-        },
-        appendEntry(customType, data) {
-            runtime.assertActive();
-            runtime.appendEntry(customType, data);
-        },
-        setSessionName(name) {
-            runtime.assertActive();
-            runtime.setSessionName(name);
-        },
-        getSessionName() {
-            runtime.assertActive();
-            return runtime.getSessionName();
-        },
-        setLabel(entryId, label) {
-            runtime.assertActive();
-            runtime.setLabel(entryId, label);
-        },
-        exec(command, args, options) {
-            runtime.assertActive();
-            return execCommand(command, args, options?.cwd ?? cwd, options);
-        },
-        getActiveTools() {
-            runtime.assertActive();
-            return runtime.getActiveTools();
-        },
-        getAllTools() {
-            runtime.assertActive();
-            return runtime.getAllTools();
-        },
-        setActiveTools(toolNames) {
-            runtime.assertActive();
-            runtime.setActiveTools(toolNames);
-        },
-        getCommands() {
-            runtime.assertActive();
-            return runtime.getCommands();
-        },
-        getExternalResourceRoots() {
-            runtime.assertActive();
-            return runtime.getExternalResourceRoots();
-        },
-        registerMemoryProvider(provider) {
-            runtime.assertActive();
-            runtime.registerMemoryProvider(provider);
-            const providers = runtime.memoryProvidersByExtension.get(extension.path) ?? new Set();
-            providers.add(provider);
-            runtime.memoryProvidersByExtension.set(extension.path, providers);
-        },
-        registerContextMemoryProvider(provider) {
-            runtime.assertActive();
-            runtime.registerContextMemoryProvider(provider);
-            const providers = runtime.contextMemoryProvidersByExtension.get(extension.path) ?? new Set();
-            providers.add(provider);
-            runtime.contextMemoryProvidersByExtension.set(extension.path, providers);
-        },
-        reportSpawnedUsage(usage, opts) {
-            runtime.assertActive();
-            runtime.reportSpawnedUsage(usage, opts);
-        },
-        reportManagedLane(event) {
-            runtime.assertActive();
-            runtime.reportManagedLane(event);
-        },
-        setModel(model) {
-            runtime.assertActive();
-            return runtime.setModel(model);
-        },
-        getThinkingLevel() {
-            runtime.assertActive();
-            return runtime.getThinkingLevel();
-        },
-        setThinkingLevel(level) {
-            runtime.assertActive();
-            runtime.setThinkingLevel(level);
-        },
-        registerProvider(name, config) {
-            runtime.assertActive();
-            runtime.registerProvider(name, config, extension.path);
-        },
-        unregisterProvider(name) {
-            runtime.assertActive();
-            runtime.unregisterProvider(name, extension.path);
-        },
-        onDispose(fn) {
-            runtime.assertActive();
-            extension.disposers.push(fn);
-        },
-        // Track bus subscriptions per extension generation so hot reloads can
-        // unsubscribe replaced generations (see disposeExtensionEventSubscriptions).
-        events: {
-            emit: (channel, data) => {
-                runtime.assertActive();
-                eventBus.emit(channel, data);
-            },
-            on: (channel, handler) => {
-                runtime.assertActive();
-                const unsubscribe = eventBus.on(channel, handler);
-                extension.eventUnsubscribes.push(unsubscribe);
-                return unsubscribe;
-            },
-        },
-    };
-    return api;
-}
-async function runExtensionFactory(factory, api, timeoutMs = EXTENSION_FACTORY_TIMEOUT_MS) {
-    let timeout;
-    const completion = Promise.resolve().then(() => factory(api));
-    try {
-        await Promise.race([
-            completion,
-            new Promise((_resolve, reject) => {
-                timeout = setTimeout(() => reject(new ExtensionFactoryTimeoutError(`Extension factory timed out after ${timeoutMs}ms`)), Math.max(0, timeoutMs));
-            }),
-        ]);
-    }
-    finally {
-        if (timeout)
-            clearTimeout(timeout);
-    }
-}
 async function loadExtensionModule(extensionPath, transformCacheAgentDir, opts) {
     const jiti = createJiti(import.meta.url, {
         // A fresh jiti instance is created on every call and moduleCache is disabled so each load
@@ -527,7 +141,9 @@ async function loadExtensionModule(extensionPath, transformCacheAgentDir, opts)
         fsCache: transformCacheAgentDir ? cacheFile(transformCacheAgentDir, "jiti-transforms") : false,
         // In Bun binary: use virtualModules for bundled packages (no filesystem resolution)
         // In Node.js/dev: use aliases to resolve to node_modules paths
-        ...(isBunBinary ? { virtualModules: VIRTUAL_MODULES, tryNative: false } : { alias: getAliases() }),
+        ...(isBunBinary
+            ? { virtualModules: getBundledExtensionVirtualModules(), tryNative: false }
+            : { alias: getAliases() }),
     });
     // Every call gets a fresh jiti instance with moduleCache disabled. Do not append a query string:
     // jiti's Windows path resolver treats it as part of the .ts filename.
@@ -548,113 +164,6 @@ async function loadExtensionModule(extensionPath, transformCacheAgentDir, opts)
             clearTimeout(timeout);
     }
 }
-/**
- * Create an Extension object with empty collections.
- */
-function createExtension(extensionPath, resolvedPath) {
-    const source = extensionPath.startsWith("<") && extensionPath.endsWith(">")
-        ? extensionPath.slice(1, -1).split(":")[0] || "temporary"
-        : "local";
-    const baseDir = extensionPath.startsWith("<") ? undefined : path.dirname(resolvedPath);
-    return {
-        path: extensionPath,
-        resolvedPath,
-        sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),
-        handlers: new Map(),
-        tools: new Map(),
-        messageRenderers: new Map(),
-        commands: new Map(),
-        flags: new Map(),
-        shortcuts: new Map(),
-        eventUnsubscribes: [],
-        disposers: [],
-    };
-}
-/**
- * Unsubscribe a replaced extension generation's pi.events handlers from the shared
- * event bus and invoke cleanup callbacks. Without this, every hot reload leaves the
- * previous generation's handlers subscribed, pinning the old module graph in memory
- * and double-processing events.
- */
-export async function disposeExtensionEventSubscriptions(extensions, options = {}) {
-    const deadline = Date.now() + (options.timeoutMs ?? EXTENSION_DISPOSAL_TIMEOUT_MS);
-    for (const extension of extensions) {
-        if (options.deactivate ?? true)
-            inactiveExtensions.add(extension);
-        // Unsubscribe event listeners
-        for (const unsubscribe of extension.eventUnsubscribes) {
-            try {
-                unsubscribe();
-            }
-            catch {
-                // Disposal must never break a reload.
-            }
-        }
-        extension.eventUnsubscribes.length = 0;
-        // Invoke every cleanup callback, but never let one unresolved async disposer block reload or
-        // shutdown indefinitely. Late continuations retain rejection handlers and the inactive API guard.
-        for (const disposer of extension.disposers) {
-            try {
-                const result = disposer();
-                if (result !== undefined) {
-                    const completion = Promise.resolve(result).catch(() => undefined);
-                    const remainingMs = Math.max(0, deadline - Date.now());
-                    if (remainingMs > 0) {
-                        let timeout;
-                        await Promise.race([
-                            completion,
-                            new Promise((resolve) => {
-                                timeout = setTimeout(resolve, remainingMs);
-                            }),
-                        ]);
-                        if (timeout)
-                            clearTimeout(timeout);
-                    }
-                }
-            }
-            catch {
-                // Disposal must never break a reload.
-            }
-        }
-        extension.disposers.length = 0;
-    }
-}
-function snapshotExtensionLoadRuntime(runtime) {
-    return {
-        pendingProviderRegistrations: [...runtime.pendingProviderRegistrations],
-        flagValues: new Map(runtime.flagValues),
-        providerRegistrations: new Map(runtime.providerRegistrations),
-    };
-}
-function restoreExtensionLoadRuntime(runtime, snapshot) {
-    for (const [name, current] of runtime.providerRegistrations) {
-        const previous = snapshot.providerRegistrations.get(name);
-        if (!previous || previous.config !== current.config || previous.extensionPath !== current.extensionPath) {
-            try {
-                runtime.unregisterProvider(name, current.extensionPath);
-            }
-            catch {
-                // Preserve the original factory failure; reload rollback remains the outer safety net.
-            }
-        }
-    }
-    for (const [name, previous] of snapshot.providerRegistrations) {
-        const current = runtime.providerRegistrations.get(name);
-        if (current?.config === previous.config && current.extensionPath === previous.extensionPath)
-            continue;
-        try {
-            runtime.registerProvider(name, previous.config, previous.extensionPath);
-        }
-        catch {
-            // Preserve the original factory failure; reload rollback remains the outer safety net.
-        }
-    }
-    runtime.pendingProviderRegistrations = snapshot.pendingProviderRegistrations;
-    runtime.flagValues.clear();
-    for (const [name, value] of snapshot.flagValues) {
-        runtime.flagValues.set(name, value);
-    }
-}
 export async function loadExtension(extensionPath, cwd, eventBus, runtime, opts) {
     const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });
     const resolvedAgentDir = resolvePath(opts?.agentDir ?? getAgentDir());
@@ -714,7 +223,7 @@ function createLazyExtension(extensionPath, resolvedPath, cwd, eventBus, runtime
     const extension = createExtension(extensionPath, resolvedPath);
     let restoreLazyToolPlaceholders = () => { };
     const load = async () => {
-        if (inactiveExtensions.has(extension)) {
+        if (isExtensionGenerationInactive(extension)) {
             throw new Error(`Lazy extension generation is no longer active: ${extension.path}`);
         }
         if (extension.lazy?.loaded)
@@ -775,25 +284,6 @@ function createLazyExtension(extensionPath, resolvedPath, cwd, eventBus, runtime
     restoreLazyToolPlaceholders();
     return extension;
 }
-/**
- * Create an Extension from an inline factory function.
- */
-export async function loadExtensionFromFactory(factory, cwd, eventBus, runtime, extensionPath = "<inline>", options = {}) {
-    const extension = createExtension(extensionPath, extensionPath);
-    const resolvedCwd = resolvePath(cwd);
-    const resolvedAgentDir = resolvePath(options.agentDir ?? getAgentDir());
-    const api = createExtensionAPI(extension, runtime, resolvedCwd, eventBus, resolvedAgentDir);
-    const runtimeSnapshot = snapshotExtensionLoadRuntime(runtime);
-    try {
-        await runExtensionFactory(factory, api, options.factoryTimeoutMs);
-    }
-    catch (err) {
-        await disposeExtensionEventSubscriptions([extension]);
-        restoreExtensionLoadRuntime(runtime, runtimeSnapshot);
-        throw err;
-    }
-    return extension;
-}
 /**
  * Load extensions from paths.
  */