@bastani/atomic 0.9.5-alpha.5 → 0.9.5-alpha.6

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [0.9.5-alpha.6] - 2026-07-06
+
+### Fixed
+
+- Fixed deferred TUI extension loading so the editor keeps accepting and echoing keystrokes after first paint: startup now yields cooperatively between extension/resource-loading chunks, preserves text typed during completion, and safely queues Enter submissions made before the main prompt loop is ready.
+- Fixed a warm-start TUI first-paint regression where persisted `enabledModels` or `--models` patterns forced all extensions to load synchronously before the first frame. Interactive startup now keeps the deferred-extension fast path and reapplies the model scope after extensions finish loading, preserving extension-registered provider matches and unmatched-pattern warnings without blocking paint.
+- Fixed project trust prompts for bare projects that only create inert `.atomic/` or `.pi/` state: state-only directories such as `todos/` and `sessions/` no longer count as trust inputs or disable deferred extension startup, while trust-requiring config continues to prompt until the user makes an explicit persistent decision and implicit trust is persisted only by the `/reload` path.
+- Fixed a security regression that could silently persist project trust at shutdown or deferred-startup completion after trust-requiring config appeared mid-session; Atomic now preserves the startup trust prompt unless the user explicitly saves a decision or the existing `/reload` implicit-trust flow applies.
+- Fixed BOM-prefixed JSON state files being treated as parse failures: settings and project trust JSON readers now strip a leading UTF-8 BOM before parsing, so Windows-authored `settings.json` and `trust.json` files load the same as BOM-less files instead of silently ignoring user settings.
+- Fixed the bundled workflows documentation to reflect that attached workflow stage chats render live `subagent` widgets for single, parallel, and chain calls, keep them live across attach/re-attach cycles, and let Ctrl+O expand live detail for every child. ([#1643](https://github.com/bastani-inc/atomic/issues/1643))
+- Fixed a Windows `waitForChildProcess` exit-code race where the process-alive poll could report a fast-dying child as gone before Node emitted the real `exit` event, causing bash commands such as `exit 1` to be reported as successful with a fabricated exit code 0 ([#1647](https://github.com/bastani-inc/atomic/issues/1647)).
+
 ## [0.9.5-alpha.5] - 2026-07-06
 
 ### Added

package/dist/builtin/cursor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/cursor",
-  "version": "0.9.5-alpha.5",
+  "version": "0.9.5-alpha.6",
   "private": true,
   "description": "Experimental first-party Atomic extension for Cursor OAuth, model discovery, and streaming provider registration.",
   "contributors": [
@@ -40,7 +40,7 @@
     }
   },
   "dependencies": {
-    "@bastani/atomic-natives": "0.9.5-alpha.5",
+    "@bastani/atomic-natives": "0.9.5-alpha.6",
     "@bufbuild/protobuf": "^2.12.1",
     "@earendil-works/pi-ai": "^0.80.3"
   }

package/dist/builtin/intercom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/intercom",
-  "version": "0.9.5-alpha.5",
+  "version": "0.9.5-alpha.6",
   "private": true,
   "description": "Atomic extension providing a private coordination channel between parent and child agent sessions. Fork of: https://github.com/nicobailon/pi-intercom",
   "contributors": [

package/dist/builtin/mcp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/mcp",
-  "version": "0.9.5-alpha.5",
+  "version": "0.9.5-alpha.6",
   "private": true,
   "description": "Atomic extension that adapts MCP (Model Context Protocol) servers into the coding agent. Fork of: https://github.com/nicobailon/pi-mcp-adapter",
   "contributors": [

package/dist/builtin/subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/subagents",
-  "version": "0.9.5-alpha.5",
+  "version": "0.9.5-alpha.6",
   "private": true,
   "description": "Atomic extension for delegating tasks to subagents with chains, parallel execution, and TUI clarification. Fork of: https://github.com/nicobailon/pi-subagents",
   "contributors": [

package/dist/builtin/web-access/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/web-access",
-  "version": "0.9.5-alpha.5",
+  "version": "0.9.5-alpha.6",
   "private": true,
   "description": "Atomic extension for web search, URL fetching, GitHub repo cloning, PDF/video extraction. Fork of: https://github.com/nicobailon/pi-web-access",
   "contributors": [

package/dist/builtin/workflows/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+## [0.9.5-alpha.6] - 2026-07-06
+
+### Fixed
+
+- Fixed workflow stage chats so attach, exit, and re-attach cycles during an in-flight `subagent` call replay the latest live tool partial result immediately instead of collapsing single, parallel, or chain calls back to the bare `renderCall` title until the next update; stage chats also prefer renderers from the stage's own agent session before falling back to the host chat so nested workflow stages can render tools that the parent chat does not expose. ([#1643](https://github.com/bastani-inc/atomic/issues/1643))
+
 ## [0.9.5-alpha.5] - 2026-07-06
 
 ### Added

package/dist/builtin/workflows/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/workflows",
-  "version": "0.9.5-alpha.5",
+  "version": "0.9.5-alpha.6",
   "private": true,
   "description": "Atomic extension for multi-stage workflow authoring and execution.",
   "contributors": [

package/dist/builtin/workflows/src/runs/foreground/executor-stage-control.ts

@@ -1,6 +1,7 @@
 import type { StageControlHandle, AgentSessionEventListener } from "./stage-control-registry.js";
 import type { LiveStageRuntime } from "./executor-stage-types.js";
 import { isTerminalStage } from "./executor-scheduler.js";
+import { StageToolExecutionBuffer } from "./stage-tool-execution-buffer.js";
 
 export function createStageControlHandle(runtime: LiveStageRuntime): StageControlHandle {
   const ensureMessagingSession = async (): Promise<void> => {
@@ -15,6 +16,8 @@ export function createStageControlHandle(runtime: LiveStageRuntime): StageContro
       throw new Error(`atomic-workflows: cannot message stage "${runtime.name}" because no retained session metadata is available.`);
     }
   };
+  const toolExecutions = new StageToolExecutionBuffer();
+  const unsubscribeToolExecutions = runtime.innerCtx.subscribe((event) => toolExecutions.record(event));
 
   return {
     runId: runtime.runId,
@@ -41,6 +44,9 @@ export function createStageControlHandle(runtime: LiveStageRuntime): StageContro
     get agentSession() {
       return runtime.innerCtx.__agentSession();
     },
+    pendingToolExecutionEvents() {
+      return toolExecutions.replayEvents();
+    },
     async ensureAttached() {
       runtime.throwIfStageMutationBlocked();
       await ensureMessagingSession();
@@ -120,6 +126,8 @@ export function createStageControlHandle(runtime: LiveStageRuntime): StageContro
       return runtime.innerCtx.subscribe(listener);
     },
     async dispose() {
+      unsubscribeToolExecutions();
+      toolExecutions.clear();
       await runtime.releaseLiveHandle();
     },
   };

package/dist/builtin/workflows/src/runs/foreground/stage-control-registry.ts

@@ -59,6 +59,8 @@ export interface StageControlHandle {
   readonly messages: AgentSession["messages"];
   /** Live coding-agent session when available, used by embedded chat/footer UI. */
   readonly agentSession?: AgentSession;
+  /** Replayable in-flight tool starts/partial updates for stage-chat remounts. */
+  pendingToolExecutionEvents?(): readonly AgentSessionEvent[];
   /** Ensure the SDK session exists. Cheap when already attached. */
   ensureAttached(): Promise<void>;
   /** Send a prompt. Use only when the stage is idle / not streaming. */

package/dist/builtin/workflows/src/runs/foreground/stage-tool-execution-buffer.ts

@@ -0,0 +1,47 @@
+import type { AgentSessionEvent } from "@bastani/atomic";
+
+interface PendingToolExecution {
+  start: AgentSessionEvent;
+  update?: AgentSessionEvent;
+}
+
+function eventType(event: AgentSessionEvent): string {
+  return String((event as { type?: unknown }).type ?? "");
+}
+
+function toolCallId(event: AgentSessionEvent): string | undefined {
+  const value = (event as { toolCallId?: unknown }).toolCallId;
+  return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+
+export class StageToolExecutionBuffer {
+  private readonly pending = new Map<string, PendingToolExecution>();
+
+  record(event: AgentSessionEvent): void {
+    const type = eventType(event);
+    if (type === "agent_start" || type === "agent_end") {
+      this.pending.clear();
+      return;
+    }
+    const id = toolCallId(event);
+    if (id === undefined) return;
+    if (type === "tool_execution_start") {
+      this.pending.set(id, { start: event });
+      return;
+    }
+    if (type === "tool_execution_update") {
+      const existing = this.pending.get(id);
+      if (existing) existing.update = event;
+      return;
+    }
+    if (type === "tool_execution_end") this.pending.delete(id);
+  }
+
+  replayEvents(): readonly AgentSessionEvent[] {
+    return [...this.pending.values()].flatMap((entry) => entry.update ? [entry.start, entry.update] : [entry.start]);
+  }
+
+  clear(): void {
+    this.pending.clear();
+  }
+}

package/dist/builtin/workflows/src/tui/stage-chat-view-pending-tools.ts

@@ -0,0 +1,9 @@
+import type { AgentSessionEvent } from "@bastani/atomic";
+import type { StageChatViewContext } from "./stage-chat-view-types.js";
+
+export function replayPendingToolExecutions(ctx: StageChatViewContext): void {
+  const events = ctx.handle?.isDisposed === true
+    ? []
+    : ctx.handle?.pendingToolExecutionEvents?.() ?? [];
+  for (const event of events) ctx.chatHost.applyAgentEvent(event as AgentSessionEvent);
+}

package/dist/builtin/workflows/src/tui/stage-chat-view-render-settings.ts

@@ -0,0 +1,27 @@
+import type { ChatMessageRenderOptions } from "@bastani/atomic";
+import type { StageChatViewContext, StageChatViewOpts } from "./stage-chat-view-types.js";
+
+type StageChatRenderSettings = Partial<Omit<ChatMessageRenderOptions, "ui" | "cwd">>;
+
+type MessageRendererHost = {
+  extensionRunner?: {
+    getMessageRenderer?: (customType: string) => ReturnType<NonNullable<StageChatRenderSettings["getCustomMessageRenderer"]>>;
+  };
+};
+
+export function stageChatRenderSettings(
+  ctx: StageChatViewContext,
+  opts: StageChatViewOpts,
+): StageChatRenderSettings | undefined {
+  const inherited = opts.getChatRenderSettings?.();
+  const stageSession = ctx.handle?.isDisposed === true ? undefined : ctx.handle?.agentSession;
+  if (!stageSession) return inherited;
+  const rendererHost = stageSession as MessageRendererHost;
+  return {
+    ...inherited,
+    getToolDefinition: (toolName) =>
+      stageSession.getToolDefinition(toolName) ?? inherited?.getToolDefinition?.(toolName),
+    getCustomMessageRenderer: (customType) =>
+      rendererHost.extensionRunner?.getMessageRenderer?.(customType) ?? inherited?.getCustomMessageRenderer?.(customType),
+  };
+}

package/dist/builtin/workflows/src/tui/stage-chat-view-state.ts

@@ -4,11 +4,7 @@ import type { PendingPrompt, RunSnapshot, StageSnapshot } from "../shared/store-
 import { stageUiBroker } from "../shared/stage-ui-broker.js";
 import { resolveStageChatViewportRows } from "./stage-chat-layout.js";
 import { createPromptCardState } from "./prompt-card.js";
-import {
-  hideMountedCustomUi,
-  releaseMountedCustomUi,
-  showCustomUi,
-} from "./stage-chat-view-custom-ui.js";
+import { hideMountedCustomUi, releaseMountedCustomUi, showCustomUi } from "./stage-chat-view-custom-ui.js";
 import { editorRuleColor } from "./stage-chat-view-footer-status.js";
 import {
   blankLine,
@@ -30,6 +26,8 @@ import {
 } from "./stage-chat-view-types.js";
 import { noticeRow, noticeSummary } from "./stage-chat-view-transcript.js";
 import { applyStageChatLiveHandleEvent } from "./stage-chat-view-live-events.js";
+import { replayPendingToolExecutions } from "./stage-chat-view-pending-tools.js";
+import { stageChatRenderSettings } from "./stage-chat-view-render-settings.js";
 import { hexToAnsi, RESET } from "./color-utils.js";
 import {
   isTerminalOrNonStreamingStageChatStatus,
@@ -89,6 +87,7 @@ export function initializeStageChatView(
   });
 
   snapshotMessagesFromHandle(ctx);
+  replayPendingToolExecutions(ctx);
   const initialRun = currentRun(ctx);
   const initialStage = initialRun?.stages.find((s) => s.id === ctx.stageId);
   ctx.lastObservedRunStatus = initialRun?.status;
@@ -187,7 +186,7 @@ function createChatHost(
     keybindings: opts.piKeybindings,
     editorFactory: opts.piEditorFactory,
     editorTheme: editorThemeFromGraphTheme(ctx.theme),
-    getChatRenderSettings: opts.getChatRenderSettings,
+    getChatRenderSettings: () => stageChatRenderSettings(ctx, opts),
     footerData: opts.footerData,
     renderExtraEntry: (entry) => noticeRow(entry, ctx.theme),
   });

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

@@ -1 +1 @@
-{"version":3,"file":"loader-core.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader-core.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhE,OAAO,EAEL,KAAK,yCAAyC,EAC9C,KAAK,6BAA6B,EACnC,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAkEtG;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,EAC1B,wBAAwB,GAAE,6BAA6D,EACvF,yCAAyC,CAAC,EAAE,yCAAyC,GACpF,OAAO,CAAC,SAAS,CAAC,CAapB;AAmDD,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,wBAAwB,GAAE,6BAA6D,EACvF,OAAO,CAAC,EAAE,gBAAgB,EAC1B,yCAAyC,CAAC,EAAE,yCAAyC,GACpF,OAAO,CAAC,oBAAoB,CAAC,CAS/B;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,wBAAwB,GAAE,6BAA6D,EACvF,OAAO,CAAC,EAAE,gBAAgB,EAC1B,yCAAyC,CAAC,EAAE,yCAAyC,GACpF,OAAO,CAAC,oBAAoB,CAAC,CAU/B","sourcesContent":["import * as path from \"node:path\";\nimport { resolvePath } from \"../../utils/paths.ts\";\nimport { createEventBus, type EventBus } from \"../event-bus.ts\";\nimport { createSyntheticSourceInfo } from \"../source-info.ts\";\nimport { endTimingSpan, startTimingSpan } from \"../timings.ts\";\nimport { createExtensionAPI } from \"./loader-api.ts\";\nimport {\n  emptyWorkflowResourceProvider,\n  type ResourceLoaderInheritanceSnapshotProvider,\n  type WorkflowResourceProviderInput,\n} from \"./loader-resources.ts\";\nimport { createExtensionRuntime } from \"./loader-runtime.ts\";\nimport {\n  loadExtensionModule,\n  type ExtensionCacheToken,\n  useExtensionCacheCwd,\n} from \"./loader-virtual-modules.ts\";\nimport type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult } from \"./types.ts\";\n\n/**\n * Create an Extension object with empty collections.\n */\nfunction createExtension(extensionPath: string, resolvedPath: string): Extension {\n  const source = extensionPath.startsWith(\"<\") && extensionPath.endsWith(\">\")\n    ? extensionPath.slice(1, -1).split(\":\")[0] || \"temporary\"\n    : \"local\";\n  const baseDir = extensionPath.startsWith(\"<\") ? undefined : path.dirname(resolvedPath);\n\n  return {\n    path: extensionPath,\n    resolvedPath,\n    sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),\n    handlers: new Map(),\n    tools: new Map(),\n    messageRenderers: new Map(),\n    commands: new Map(),\n    flags: new Map(),\n    shortcuts: new Map(),\n  };\n}\n\nasync function loadExtension(\n  extensionPath: string,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  cacheToken?: ExtensionCacheToken,\n): Promise<{ extension: Extension | null; error: string | null }> {\n  const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });\n\n  try {\n    const moduleSpan = startTimingSpan(`loadExtensions.${extensionPath}.module`, \"extensions\");\n    const factory = await loadExtensionModule(resolvedPath, cacheToken);\n    endTimingSpan(moduleSpan);\n    if (!factory) {\n      return {\n        extension: null,\n        error: `Extension does not export a valid factory function: ${extensionPath}`,\n      };\n    }\n\n    const extension = createExtension(extensionPath, resolvedPath);\n    const api = createExtensionAPI(\n      extension,\n      runtime,\n      cwd,\n      eventBus,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n    );\n    const factorySpan = startTimingSpan(`loadExtensions.${extensionPath}.factory`, \"extensions\");\n    await factory(api);\n    endTimingSpan(factorySpan);\n\n    return { extension, error: null };\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    return { extension: null, error: `Failed to load extension: ${message}` };\n  }\n}\n\n/**\n * Create an Extension from an inline factory function.\n */\nexport async function loadExtensionFromFactory(\n  factory: ExtensionFactory,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  extensionPath = \"<inline>\",\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<Extension> {\n  const extension = createExtension(extensionPath, extensionPath);\n  const resolvedCwd = resolvePath(cwd);\n  const api = createExtensionAPI(\n    extension,\n    runtime,\n    resolvedCwd,\n    eventBus,\n    workflowResourceProvider,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n  await factory(api);\n  return extension;\n}\n\n/**\n * Load extensions from paths.\n */\nasync function loadExtensionsInternal(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  useCache = false,\n): Promise<LoadExtensionsResult> {\n  const extensions: Extension[] = [];\n  const errors: Array<{ path: string; error: string }> = [];\n  const cacheToken = useCache ? useExtensionCacheCwd(cwd) : undefined;\n  const resolvedCwd = cacheToken?.cwd ?? resolvePath(cwd);\n  const resolvedEventBus = eventBus ?? createEventBus();\n  const resolvedRuntime = runtime ?? createExtensionRuntime();\n\n  for (const extPath of paths) {\n    const extensionSpan = startTimingSpan(`loadExtensions.${extPath}.total`, \"extensions\");\n    const { extension, error } = await loadExtension(\n      extPath,\n      resolvedCwd,\n      resolvedEventBus,\n      resolvedRuntime,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n      cacheToken,\n    );\n    endTimingSpan(extensionSpan);\n\n    if (error) {\n      errors.push({ path: extPath, error });\n      continue;\n    }\n\n    if (extension) {\n      extensions.push(extension);\n    }\n  }\n\n  return {\n    extensions,\n    errors,\n    runtime: resolvedRuntime,\n  };\n}\n\nexport async function loadExtensions(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n}\n\nexport async function loadExtensionsCached(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n    true,\n  );\n}\n"]}
+{"version":3,"file":"loader-core.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader-core.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAKhE,OAAO,EAEL,KAAK,yCAAyC,EAC9C,KAAK,6BAA6B,EACnC,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAkEtG;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,EAC1B,wBAAwB,GAAE,6BAA6D,EACvF,yCAAyC,CAAC,EAAE,yCAAyC,GACpF,OAAO,CAAC,SAAS,CAAC,CAapB;AAuDD,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,wBAAwB,GAAE,6BAA6D,EACvF,OAAO,CAAC,EAAE,gBAAgB,EAC1B,yCAAyC,CAAC,EAAE,yCAAyC,GACpF,OAAO,CAAC,oBAAoB,CAAC,CAS/B;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,wBAAwB,GAAE,6BAA6D,EACvF,OAAO,CAAC,EAAE,gBAAgB,EAC1B,yCAAyC,CAAC,EAAE,yCAAyC,GACpF,OAAO,CAAC,oBAAoB,CAAC,CAU/B","sourcesContent":["import * as path from \"node:path\";\nimport { resolvePath } from \"../../utils/paths.ts\";\nimport { createEventBus, type EventBus } from \"../event-bus.ts\";\nimport { createSyntheticSourceInfo } from \"../source-info.ts\";\nimport { endTimingSpan, startTimingSpan } from \"../timings.ts\";\nimport { yieldToEventLoop } from \"../../utils/event-loop.ts\";\nimport { createExtensionAPI } from \"./loader-api.ts\";\nimport {\n  emptyWorkflowResourceProvider,\n  type ResourceLoaderInheritanceSnapshotProvider,\n  type WorkflowResourceProviderInput,\n} from \"./loader-resources.ts\";\nimport { createExtensionRuntime } from \"./loader-runtime.ts\";\nimport {\n  loadExtensionModule,\n  type ExtensionCacheToken,\n  useExtensionCacheCwd,\n} from \"./loader-virtual-modules.ts\";\nimport type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult } from \"./types.ts\";\n\n/**\n * Create an Extension object with empty collections.\n */\nfunction createExtension(extensionPath: string, resolvedPath: string): Extension {\n  const source = extensionPath.startsWith(\"<\") && extensionPath.endsWith(\">\")\n    ? extensionPath.slice(1, -1).split(\":\")[0] || \"temporary\"\n    : \"local\";\n  const baseDir = extensionPath.startsWith(\"<\") ? undefined : path.dirname(resolvedPath);\n\n  return {\n    path: extensionPath,\n    resolvedPath,\n    sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),\n    handlers: new Map(),\n    tools: new Map(),\n    messageRenderers: new Map(),\n    commands: new Map(),\n    flags: new Map(),\n    shortcuts: new Map(),\n  };\n}\n\nasync function loadExtension(\n  extensionPath: string,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  cacheToken?: ExtensionCacheToken,\n): Promise<{ extension: Extension | null; error: string | null }> {\n  const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });\n\n  try {\n    const moduleSpan = startTimingSpan(`loadExtensions.${extensionPath}.module`, \"extensions\");\n    const factory = await loadExtensionModule(resolvedPath, cacheToken);\n    endTimingSpan(moduleSpan);\n    if (!factory) {\n      return {\n        extension: null,\n        error: `Extension does not export a valid factory function: ${extensionPath}`,\n      };\n    }\n\n    const extension = createExtension(extensionPath, resolvedPath);\n    const api = createExtensionAPI(\n      extension,\n      runtime,\n      cwd,\n      eventBus,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n    );\n    const factorySpan = startTimingSpan(`loadExtensions.${extensionPath}.factory`, \"extensions\");\n    await factory(api);\n    endTimingSpan(factorySpan);\n\n    return { extension, error: null };\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    return { extension: null, error: `Failed to load extension: ${message}` };\n  }\n}\n\n/**\n * Create an Extension from an inline factory function.\n */\nexport async function loadExtensionFromFactory(\n  factory: ExtensionFactory,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  extensionPath = \"<inline>\",\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<Extension> {\n  const extension = createExtension(extensionPath, extensionPath);\n  const resolvedCwd = resolvePath(cwd);\n  const api = createExtensionAPI(\n    extension,\n    runtime,\n    resolvedCwd,\n    eventBus,\n    workflowResourceProvider,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n  await factory(api);\n  return extension;\n}\n\n/**\n * Load extensions from paths.\n */\nasync function loadExtensionsInternal(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  useCache = false,\n): Promise<LoadExtensionsResult> {\n  const extensions: Extension[] = [];\n  const errors: Array<{ path: string; error: string }> = [];\n  const cacheToken = useCache ? useExtensionCacheCwd(cwd) : undefined;\n  const resolvedCwd = cacheToken?.cwd ?? resolvePath(cwd);\n  const resolvedEventBus = eventBus ?? createEventBus();\n  const resolvedRuntime = runtime ?? createExtensionRuntime();\n\n  let processedExtensionCount = 0;\n  for (const extPath of paths) {\n    if (processedExtensionCount > 0) {\n      await yieldToEventLoop();\n    }\n    const extensionSpan = startTimingSpan(`loadExtensions.${extPath}.total`, \"extensions\");\n    const { extension, error } = await loadExtension(\n      extPath,\n      resolvedCwd,\n      resolvedEventBus,\n      resolvedRuntime,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n      cacheToken,\n    );\n    endTimingSpan(extensionSpan);\n    processedExtensionCount += 1;\n    if (error) {\n      errors.push({ path: extPath, error });\n      continue;\n    }\n\n    if (extension) {\n      extensions.push(extension);\n    }\n  }\n\n  return {\n    extensions,\n    errors,\n    runtime: resolvedRuntime,\n  };\n}\n\nexport async function loadExtensions(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n}\n\nexport async function loadExtensionsCached(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n    true,\n  );\n}\n"]}

package/dist/core/extensions/loader-core.js

@@ -3,6 +3,7 @@ import { resolvePath } from "../../utils/paths.js";
 import { createEventBus } from "../event-bus.js";
 import { createSyntheticSourceInfo } from "../source-info.js";
 import { endTimingSpan, startTimingSpan } from "../timings.js";
+import { yieldToEventLoop } from "../../utils/event-loop.js";
 import { createExtensionAPI } from "./loader-api.js";
 import { emptyWorkflowResourceProvider, } from "./loader-resources.js";
 import { createExtensionRuntime } from "./loader-runtime.js";
@@ -71,10 +72,15 @@ async function loadExtensionsInternal(paths, cwd, eventBus, workflowResourceProv
     const resolvedCwd = cacheToken?.cwd ?? resolvePath(cwd);
     const resolvedEventBus = eventBus ?? createEventBus();
     const resolvedRuntime = runtime ?? createExtensionRuntime();
+    let processedExtensionCount = 0;
     for (const extPath of paths) {
+        if (processedExtensionCount > 0) {
+            await yieldToEventLoop();
+        }
         const extensionSpan = startTimingSpan(`loadExtensions.${extPath}.total`, "extensions");
         const { extension, error } = await loadExtension(extPath, resolvedCwd, resolvedEventBus, resolvedRuntime, workflowResourceProvider, resourceLoaderInheritanceSnapshotProvider, cacheToken);
         endTimingSpan(extensionSpan);
+        processedExtensionCount += 1;
         if (error) {
             errors.push({ path: extPath, error });
             continue;

package/dist/core/extensions/loader-core.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader-core.js","sourceRoot":"","sources":["../../../src/core/extensions/loader-core.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from \"node:path\";\nimport { resolvePath } from \"../../utils/paths.ts\";\nimport { createEventBus, type EventBus } from \"../event-bus.ts\";\nimport { createSyntheticSourceInfo } from \"../source-info.ts\";\nimport { endTimingSpan, startTimingSpan } from \"../timings.ts\";\nimport { createExtensionAPI } from \"./loader-api.ts\";\nimport {\n  emptyWorkflowResourceProvider,\n  type ResourceLoaderInheritanceSnapshotProvider,\n  type WorkflowResourceProviderInput,\n} from \"./loader-resources.ts\";\nimport { createExtensionRuntime } from \"./loader-runtime.ts\";\nimport {\n  loadExtensionModule,\n  type ExtensionCacheToken,\n  useExtensionCacheCwd,\n} from \"./loader-virtual-modules.ts\";\nimport type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult } from \"./types.ts\";\n\n/**\n * Create an Extension object with empty collections.\n */\nfunction createExtension(extensionPath: string, resolvedPath: string): Extension {\n  const source = extensionPath.startsWith(\"<\") && extensionPath.endsWith(\">\")\n    ? extensionPath.slice(1, -1).split(\":\")[0] || \"temporary\"\n    : \"local\";\n  const baseDir = extensionPath.startsWith(\"<\") ? undefined : path.dirname(resolvedPath);\n\n  return {\n    path: extensionPath,\n    resolvedPath,\n    sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),\n    handlers: new Map(),\n    tools: new Map(),\n    messageRenderers: new Map(),\n    commands: new Map(),\n    flags: new Map(),\n    shortcuts: new Map(),\n  };\n}\n\nasync function loadExtension(\n  extensionPath: string,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  cacheToken?: ExtensionCacheToken,\n): Promise<{ extension: Extension | null; error: string | null }> {\n  const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });\n\n  try {\n    const moduleSpan = startTimingSpan(`loadExtensions.${extensionPath}.module`, \"extensions\");\n    const factory = await loadExtensionModule(resolvedPath, cacheToken);\n    endTimingSpan(moduleSpan);\n    if (!factory) {\n      return {\n        extension: null,\n        error: `Extension does not export a valid factory function: ${extensionPath}`,\n      };\n    }\n\n    const extension = createExtension(extensionPath, resolvedPath);\n    const api = createExtensionAPI(\n      extension,\n      runtime,\n      cwd,\n      eventBus,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n    );\n    const factorySpan = startTimingSpan(`loadExtensions.${extensionPath}.factory`, \"extensions\");\n    await factory(api);\n    endTimingSpan(factorySpan);\n\n    return { extension, error: null };\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    return { extension: null, error: `Failed to load extension: ${message}` };\n  }\n}\n\n/**\n * Create an Extension from an inline factory function.\n */\nexport async function loadExtensionFromFactory(\n  factory: ExtensionFactory,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  extensionPath = \"<inline>\",\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<Extension> {\n  const extension = createExtension(extensionPath, extensionPath);\n  const resolvedCwd = resolvePath(cwd);\n  const api = createExtensionAPI(\n    extension,\n    runtime,\n    resolvedCwd,\n    eventBus,\n    workflowResourceProvider,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n  await factory(api);\n  return extension;\n}\n\n/**\n * Load extensions from paths.\n */\nasync function loadExtensionsInternal(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  useCache = false,\n): Promise<LoadExtensionsResult> {\n  const extensions: Extension[] = [];\n  const errors: Array<{ path: string; error: string }> = [];\n  const cacheToken = useCache ? useExtensionCacheCwd(cwd) : undefined;\n  const resolvedCwd = cacheToken?.cwd ?? resolvePath(cwd);\n  const resolvedEventBus = eventBus ?? createEventBus();\n  const resolvedRuntime = runtime ?? createExtensionRuntime();\n\n  for (const extPath of paths) {\n    const extensionSpan = startTimingSpan(`loadExtensions.${extPath}.total`, \"extensions\");\n    const { extension, error } = await loadExtension(\n      extPath,\n      resolvedCwd,\n      resolvedEventBus,\n      resolvedRuntime,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n      cacheToken,\n    );\n    endTimingSpan(extensionSpan);\n\n    if (error) {\n      errors.push({ path: extPath, error });\n      continue;\n    }\n\n    if (extension) {\n      extensions.push(extension);\n    }\n  }\n\n  return {\n    extensions,\n    errors,\n    runtime: resolvedRuntime,\n  };\n}\n\nexport async function loadExtensions(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n}\n\nexport async function loadExtensionsCached(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n    true,\n  );\n}\n"]}
+{"version":3,"file":"loader-core.js","sourceRoot":"","sources":["../../../src/core/extensions/loader-core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAiB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EACL,6BAA6B,GAG9B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,mBAAmB,EAEnB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AAGrC;;GAEG;AACH,SAAS,eAAe,CAAC,aAAqB,EAAE,YAAoB;IAClE,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;QACzE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW;QACzD,CAAC,CAAC,OAAO,CAAC;IACZ,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAEvF,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,YAAY;QACZ,UAAU,EAAE,yBAAyB,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QACzE,QAAQ,EAAE,IAAI,GAAG,EAAE;QACnB,KAAK,EAAE,IAAI,GAAG,EAAE;QAChB,gBAAgB,EAAE,IAAI,GAAG,EAAE;QAC3B,QAAQ,EAAE,IAAI,GAAG,EAAE;QACnB,KAAK,EAAE,IAAI,GAAG,EAAE;QAChB,SAAS,EAAE,IAAI,GAAG,EAAE;KACrB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,aAAqB,EACrB,GAAW,EACX,QAAkB,EAClB,OAAyB,EACzB,wBAAwB,GAAkC,6BAA6B,EACvF,yCAAqF,EACrF,UAAgC;IAEhC,MAAM,YAAY,GAAG,WAAW,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,aAAa,SAAS,EAAE,YAAY,CAAC,CAAC;QAC3F,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACpE,aAAa,CAAC,UAAU,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;gBACL,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE,uDAAuD,aAAa,EAAE;aAC9E,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,eAAe,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,kBAAkB,CAC5B,SAAS,EACT,OAAO,EACP,GAAG,EACH,QAAQ,EACR,wBAAwB,EACxB,yCAAyC,CAC1C,CAAC;QACF,MAAM,WAAW,GAAG,eAAe,CAAC,kBAAkB,aAAa,UAAU,EAAE,YAAY,CAAC,CAAC;QAC7F,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;QACnB,aAAa,CAAC,WAAW,CAAC,CAAC;QAE3B,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,6BAA6B,OAAO,EAAE,EAAE,CAAC;IAC5E,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAAyB,EACzB,GAAW,EACX,QAAkB,EAClB,OAAyB,EACzB,aAAa,GAAG,UAAU,EAC1B,wBAAwB,GAAkC,6BAA6B,EACvF,yCAAqF;IAErF,MAAM,SAAS,GAAG,eAAe,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,kBAAkB,CAC5B,SAAS,EACT,OAAO,EACP,WAAW,EACX,QAAQ,EACR,wBAAwB,EACxB,yCAAyC,CAC1C,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,sBAAsB,CACnC,KAAe,EACf,GAAW,EACX,QAAmB,EACnB,wBAAwB,GAAkC,6BAA6B,EACvF,OAA0B,EAC1B,yCAAqF,EACrF,QAAQ,GAAG,KAAK;IAEhB,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,MAAM,MAAM,GAA2C,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,MAAM,WAAW,GAAG,UAAU,EAAE,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,QAAQ,IAAI,cAAc,EAAE,CAAC;IACtD,MAAM,eAAe,GAAG,OAAO,IAAI,sBAAsB,EAAE,CAAC;IAE5D,IAAI,uBAAuB,GAAG,CAAC,CAAC;IAChC,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC5B,IAAI,uBAAuB,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,gBAAgB,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,aAAa,GAAG,eAAe,CAAC,kBAAkB,OAAO,QAAQ,EAAE,YAAY,CAAC,CAAC;QACvF,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,aAAa,CAC9C,OAAO,EACP,WAAW,EACX,gBAAgB,EAChB,eAAe,EACf,wBAAwB,EACxB,yCAAyC,EACzC,UAAU,CACX,CAAC;QACF,aAAa,CAAC,aAAa,CAAC,CAAC;QAC7B,uBAAuB,IAAI,CAAC,CAAC;QAC7B,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACtC,SAAS;QACX,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO;QACL,UAAU;QACV,MAAM;QACN,OAAO,EAAE,eAAe;KACzB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAe,EACf,GAAW,EACX,QAAmB,EACnB,wBAAwB,GAAkC,6BAA6B,EACvF,OAA0B,EAC1B,yCAAqF;IAErF,OAAO,sBAAsB,CAC3B,KAAK,EACL,GAAG,EACH,QAAQ,EACR,wBAAwB,EACxB,OAAO,EACP,yCAAyC,CAC1C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,KAAe,EACf,GAAW,EACX,QAAmB,EACnB,wBAAwB,GAAkC,6BAA6B,EACvF,OAA0B,EAC1B,yCAAqF;IAErF,OAAO,sBAAsB,CAC3B,KAAK,EACL,GAAG,EACH,QAAQ,EACR,wBAAwB,EACxB,OAAO,EACP,yCAAyC,EACzC,IAAI,CACL,CAAC;AACJ,CAAC","sourcesContent":["import * as path from \"node:path\";\nimport { resolvePath } from \"../../utils/paths.ts\";\nimport { createEventBus, type EventBus } from \"../event-bus.ts\";\nimport { createSyntheticSourceInfo } from \"../source-info.ts\";\nimport { endTimingSpan, startTimingSpan } from \"../timings.ts\";\nimport { yieldToEventLoop } from \"../../utils/event-loop.ts\";\nimport { createExtensionAPI } from \"./loader-api.ts\";\nimport {\n  emptyWorkflowResourceProvider,\n  type ResourceLoaderInheritanceSnapshotProvider,\n  type WorkflowResourceProviderInput,\n} from \"./loader-resources.ts\";\nimport { createExtensionRuntime } from \"./loader-runtime.ts\";\nimport {\n  loadExtensionModule,\n  type ExtensionCacheToken,\n  useExtensionCacheCwd,\n} from \"./loader-virtual-modules.ts\";\nimport type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult } from \"./types.ts\";\n\n/**\n * Create an Extension object with empty collections.\n */\nfunction createExtension(extensionPath: string, resolvedPath: string): Extension {\n  const source = extensionPath.startsWith(\"<\") && extensionPath.endsWith(\">\")\n    ? extensionPath.slice(1, -1).split(\":\")[0] || \"temporary\"\n    : \"local\";\n  const baseDir = extensionPath.startsWith(\"<\") ? undefined : path.dirname(resolvedPath);\n\n  return {\n    path: extensionPath,\n    resolvedPath,\n    sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),\n    handlers: new Map(),\n    tools: new Map(),\n    messageRenderers: new Map(),\n    commands: new Map(),\n    flags: new Map(),\n    shortcuts: new Map(),\n  };\n}\n\nasync function loadExtension(\n  extensionPath: string,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  cacheToken?: ExtensionCacheToken,\n): Promise<{ extension: Extension | null; error: string | null }> {\n  const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });\n\n  try {\n    const moduleSpan = startTimingSpan(`loadExtensions.${extensionPath}.module`, \"extensions\");\n    const factory = await loadExtensionModule(resolvedPath, cacheToken);\n    endTimingSpan(moduleSpan);\n    if (!factory) {\n      return {\n        extension: null,\n        error: `Extension does not export a valid factory function: ${extensionPath}`,\n      };\n    }\n\n    const extension = createExtension(extensionPath, resolvedPath);\n    const api = createExtensionAPI(\n      extension,\n      runtime,\n      cwd,\n      eventBus,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n    );\n    const factorySpan = startTimingSpan(`loadExtensions.${extensionPath}.factory`, \"extensions\");\n    await factory(api);\n    endTimingSpan(factorySpan);\n\n    return { extension, error: null };\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    return { extension: null, error: `Failed to load extension: ${message}` };\n  }\n}\n\n/**\n * Create an Extension from an inline factory function.\n */\nexport async function loadExtensionFromFactory(\n  factory: ExtensionFactory,\n  cwd: string,\n  eventBus: EventBus,\n  runtime: ExtensionRuntime,\n  extensionPath = \"<inline>\",\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<Extension> {\n  const extension = createExtension(extensionPath, extensionPath);\n  const resolvedCwd = resolvePath(cwd);\n  const api = createExtensionAPI(\n    extension,\n    runtime,\n    resolvedCwd,\n    eventBus,\n    workflowResourceProvider,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n  await factory(api);\n  return extension;\n}\n\n/**\n * Load extensions from paths.\n */\nasync function loadExtensionsInternal(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n  useCache = false,\n): Promise<LoadExtensionsResult> {\n  const extensions: Extension[] = [];\n  const errors: Array<{ path: string; error: string }> = [];\n  const cacheToken = useCache ? useExtensionCacheCwd(cwd) : undefined;\n  const resolvedCwd = cacheToken?.cwd ?? resolvePath(cwd);\n  const resolvedEventBus = eventBus ?? createEventBus();\n  const resolvedRuntime = runtime ?? createExtensionRuntime();\n\n  let processedExtensionCount = 0;\n  for (const extPath of paths) {\n    if (processedExtensionCount > 0) {\n      await yieldToEventLoop();\n    }\n    const extensionSpan = startTimingSpan(`loadExtensions.${extPath}.total`, \"extensions\");\n    const { extension, error } = await loadExtension(\n      extPath,\n      resolvedCwd,\n      resolvedEventBus,\n      resolvedRuntime,\n      workflowResourceProvider,\n      resourceLoaderInheritanceSnapshotProvider,\n      cacheToken,\n    );\n    endTimingSpan(extensionSpan);\n    processedExtensionCount += 1;\n    if (error) {\n      errors.push({ path: extPath, error });\n      continue;\n    }\n\n    if (extension) {\n      extensions.push(extension);\n    }\n  }\n\n  return {\n    extensions,\n    errors,\n    runtime: resolvedRuntime,\n  };\n}\n\nexport async function loadExtensions(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n  );\n}\n\nexport async function loadExtensionsCached(\n  paths: string[],\n  cwd: string,\n  eventBus?: EventBus,\n  workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n  runtime?: ExtensionRuntime,\n  resourceLoaderInheritanceSnapshotProvider?: ResourceLoaderInheritanceSnapshotProvider,\n): Promise<LoadExtensionsResult> {\n  return loadExtensionsInternal(\n    paths,\n    cwd,\n    eventBus,\n    workflowResourceProvider,\n    runtime,\n    resourceLoaderInheritanceSnapshotProvider,\n    true,\n  );\n}\n"]}

package/dist/core/model-resolver-scope.d.ts

@@ -1,5 +1,13 @@
 import type { ModelRegistry } from "./model-registry.ts";
 import type { ScopedModel } from "./model-resolver-types.ts";
+export interface ModelScopeDiagnostic {
+    type: "warning";
+    message: string;
+}
+export interface ResolveModelScopeResult {
+    scopedModels: ScopedModel[];
+    diagnostics: ModelScopeDiagnostic[];
+}
 /**
  * Resolve model patterns to actual Model objects with optional thinking levels
  * Format: "pattern:level" where :level is optional
@@ -11,5 +19,6 @@ import type { ScopedModel } from "./model-resolver-types.ts";
  * The algorithm tries to match the full pattern first, then progressively
  * strips colon-suffixes to find a match.
  */
+export declare function resolveModelScopeWithDiagnostics(patterns: string[], modelRegistry: ModelRegistry): Promise<ResolveModelScopeResult>;
 export declare function resolveModelScope(patterns: string[], modelRegistry: ModelRegistry): Promise<ScopedModel[]>;
 //# sourceMappingURL=model-resolver-scope.d.ts.map

package/dist/core/model-resolver-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-resolver-scope.d.ts","sourceRoot":"","sources":["../../src/core/model-resolver-scope.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAoB7D;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CA0ChH","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport { modelsAreEqual } from \"@earendil-works/pi-ai/compat\";\nimport chalk from \"chalk\";\nimport { minimatch } from \"minimatch\";\nimport { isValidThinkingLevel } from \"../cli/args.ts\";\nimport type { ModelRegistry } from \"./model-registry.ts\";\nimport { parseModelPattern } from \"./model-resolver-patterns.ts\";\nimport type { ScopedModel } from \"./model-resolver-types.ts\";\n\nfunction hasGlobCharacters(pattern: string): boolean {\n  return pattern.includes(\"*\") || pattern.includes(\"?\") || pattern.includes(\"[\");\n}\n\nfunction parseGlobThinkingLevel(pattern: string): { globPattern: string; thinkingLevel?: ThinkingLevel } {\n  const colonIdx = pattern.lastIndexOf(\":\");\n  if (colonIdx === -1) {\n    return { globPattern: pattern };\n  }\n\n  const suffix = pattern.substring(colonIdx + 1);\n  if (!isValidThinkingLevel(suffix)) {\n    return { globPattern: pattern };\n  }\n\n  return { globPattern: pattern.substring(0, colonIdx), thinkingLevel: suffix };\n}\n\n/**\n * Resolve model patterns to actual Model objects with optional thinking levels\n * Format: \"pattern:level\" where :level is optional\n * For each pattern, finds all matching models and picks the best version:\n * 1. Prefer alias (e.g., claude-sonnet-4-5) over dated versions (claude-sonnet-4-5-20250929)\n * 2. If no alias, pick the latest dated version\n *\n * Supports models with colons in their IDs (e.g., OpenRouter's model:exacto).\n * The algorithm tries to match the full pattern first, then progressively\n * strips colon-suffixes to find a match.\n */\nexport async function resolveModelScope(patterns: string[], modelRegistry: ModelRegistry): Promise<ScopedModel[]> {\n  const availableModels = await modelRegistry.getAvailable();\n  const scopedModels: ScopedModel[] = [];\n\n  for (const pattern of patterns) {\n    if (hasGlobCharacters(pattern)) {\n      const { globPattern, thinkingLevel } = parseGlobThinkingLevel(pattern);\n      const matchingModels = availableModels.filter((m) => {\n        const fullId = `${m.provider}/${m.id}`;\n        return minimatch(fullId, globPattern, { nocase: true }) || minimatch(m.id, globPattern, { nocase: true });\n      });\n\n      if (matchingModels.length === 0) {\n        console.warn(chalk.yellow(`Warning: No models match pattern \"${pattern}\"`));\n        continue;\n      }\n\n      for (const model of matchingModels) {\n        if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n          scopedModels.push({ model, thinkingLevel });\n        }\n      }\n      continue;\n    }\n\n    const { model, thinkingLevel, warning } = parseModelPattern(pattern, availableModels);\n\n    if (warning) {\n      console.warn(chalk.yellow(`Warning: ${warning}`));\n    }\n\n    if (!model) {\n      console.warn(chalk.yellow(`Warning: No models match pattern \"${pattern}\"`));\n      continue;\n    }\n\n    if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n      scopedModels.push({ model, thinkingLevel });\n    }\n  }\n\n  return scopedModels;\n}\n"]}
+{"version":3,"file":"model-resolver-scope.d.ts","sourceRoot":"","sources":["../../src/core/model-resolver-scope.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACrC;AAoBD;;;;;;;;;;GAUG;AACH,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,EAAE,EAClB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,uBAAuB,CAAC,CA0ClC;AAED,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAMhH","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport { modelsAreEqual } from \"@earendil-works/pi-ai/compat\";\nimport chalk from \"chalk\";\nimport { minimatch } from \"minimatch\";\nimport { isValidThinkingLevel } from \"../cli/args.ts\";\nimport type { ModelRegistry } from \"./model-registry.ts\";\nimport { parseModelPattern } from \"./model-resolver-patterns.ts\";\nimport type { ScopedModel } from \"./model-resolver-types.ts\";\n\nexport interface ModelScopeDiagnostic {\n  type: \"warning\";\n  message: string;\n}\n\nexport interface ResolveModelScopeResult {\n  scopedModels: ScopedModel[];\n  diagnostics: ModelScopeDiagnostic[];\n}\n\nfunction hasGlobCharacters(pattern: string): boolean {\n  return pattern.includes(\"*\") || pattern.includes(\"?\") || pattern.includes(\"[\");\n}\n\nfunction parseGlobThinkingLevel(pattern: string): { globPattern: string; thinkingLevel?: ThinkingLevel } {\n  const colonIdx = pattern.lastIndexOf(\":\");\n  if (colonIdx === -1) {\n    return { globPattern: pattern };\n  }\n\n  const suffix = pattern.substring(colonIdx + 1);\n  if (!isValidThinkingLevel(suffix)) {\n    return { globPattern: pattern };\n  }\n\n  return { globPattern: pattern.substring(0, colonIdx), thinkingLevel: suffix };\n}\n\n/**\n * Resolve model patterns to actual Model objects with optional thinking levels\n * Format: \"pattern:level\" where :level is optional\n * For each pattern, finds all matching models and picks the best version:\n * 1. Prefer alias (e.g., claude-sonnet-4-5) over dated versions (claude-sonnet-4-5-20250929)\n * 2. If no alias, pick the latest dated version\n *\n * Supports models with colons in their IDs (e.g., OpenRouter's model:exacto).\n * The algorithm tries to match the full pattern first, then progressively\n * strips colon-suffixes to find a match.\n */\nexport async function resolveModelScopeWithDiagnostics(\n  patterns: string[],\n  modelRegistry: ModelRegistry,\n): Promise<ResolveModelScopeResult> {\n  const availableModels = await modelRegistry.getAvailable();\n  const scopedModels: ScopedModel[] = [];\n  const diagnostics: ModelScopeDiagnostic[] = [];\n  for (const pattern of patterns) {\n    if (hasGlobCharacters(pattern)) {\n      const { globPattern, thinkingLevel } = parseGlobThinkingLevel(pattern);\n      const matchingModels = availableModels.filter((m) => {\n        const fullId = `${m.provider}/${m.id}`;\n        return minimatch(fullId, globPattern, { nocase: true }) || minimatch(m.id, globPattern, { nocase: true });\n      });\n\n      if (matchingModels.length === 0) {\n        diagnostics.push({ type: \"warning\", message: `No models match pattern \"${pattern}\"` });\n        continue;\n      }\n\n      for (const model of matchingModels) {\n        if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n          scopedModels.push({ model, thinkingLevel });\n        }\n      }\n      continue;\n    }\n\n    const { model, thinkingLevel, warning } = parseModelPattern(pattern, availableModels);\n\n    if (warning) {\n      diagnostics.push({ type: \"warning\", message: warning });\n    }\n\n    if (!model) {\n      diagnostics.push({ type: \"warning\", message: `No models match pattern \"${pattern}\"` });\n      continue;\n    }\n\n    if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n      scopedModels.push({ model, thinkingLevel });\n    }\n  }\n\n  return { scopedModels, diagnostics };\n}\n\nexport async function resolveModelScope(patterns: string[], modelRegistry: ModelRegistry): Promise<ScopedModel[]> {\n  const { scopedModels, diagnostics } = await resolveModelScopeWithDiagnostics(patterns, modelRegistry);\n  for (const diagnostic of diagnostics) {\n    console.warn(chalk.yellow(`Warning: ${diagnostic.message}`));\n  }\n  return scopedModels;\n}\n"]}

package/dist/core/model-resolver-scope.js

@@ -28,9 +28,10 @@ function parseGlobThinkingLevel(pattern) {
  * The algorithm tries to match the full pattern first, then progressively
  * strips colon-suffixes to find a match.
  */
-export async function resolveModelScope(patterns, modelRegistry) {
+export async function resolveModelScopeWithDiagnostics(patterns, modelRegistry) {
     const availableModels = await modelRegistry.getAvailable();
     const scopedModels = [];
+    const diagnostics = [];
     for (const pattern of patterns) {
         if (hasGlobCharacters(pattern)) {
             const { globPattern, thinkingLevel } = parseGlobThinkingLevel(pattern);
@@ -39,7 +40,7 @@ export async function resolveModelScope(patterns, modelRegistry) {
                 return minimatch(fullId, globPattern, { nocase: true }) || minimatch(m.id, globPattern, { nocase: true });
             });
             if (matchingModels.length === 0) {
-                console.warn(chalk.yellow(`Warning: No models match pattern "${pattern}"`));
+                diagnostics.push({ type: "warning", message: `No models match pattern "${pattern}"` });
                 continue;
             }
             for (const model of matchingModels) {
@@ -51,16 +52,23 @@ export async function resolveModelScope(patterns, modelRegistry) {
         }
         const { model, thinkingLevel, warning } = parseModelPattern(pattern, availableModels);
         if (warning) {
-            console.warn(chalk.yellow(`Warning: ${warning}`));
+            diagnostics.push({ type: "warning", message: warning });
         }
         if (!model) {
-            console.warn(chalk.yellow(`Warning: No models match pattern "${pattern}"`));
+            diagnostics.push({ type: "warning", message: `No models match pattern "${pattern}"` });
             continue;
         }
         if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {
             scopedModels.push({ model, thinkingLevel });
         }
     }
+    return { scopedModels, diagnostics };
+}
+export async function resolveModelScope(patterns, modelRegistry) {
+    const { scopedModels, diagnostics } = await resolveModelScopeWithDiagnostics(patterns, modelRegistry);
+    for (const diagnostic of diagnostics) {
+        console.warn(chalk.yellow(`Warning: ${diagnostic.message}`));
+    }
     return scopedModels;
 }
 //# sourceMappingURL=model-resolver-scope.js.map

package/dist/core/model-resolver-scope.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-resolver-scope.js","sourceRoot":"","sources":["../../src/core/model-resolver-scope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGjE,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACjF,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;AAChF,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,QAAkB,EAAE,aAA4B;IACtF,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,YAAY,EAAE,CAAC;IAC3D,MAAM,YAAY,GAAkB,EAAE,CAAC;IAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YACvE,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClD,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;gBACvC,OAAO,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5G,CAAC,CAAC,CAAC;YAEH,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC,CAAC;gBAC5E,SAAS;YACX,CAAC;YAED,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;oBAChE,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;gBAC9C,CAAC;YACH,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAEtF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC,CAAC;YAC5E,SAAS;QACX,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YAChE,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport { modelsAreEqual } from \"@earendil-works/pi-ai/compat\";\nimport chalk from \"chalk\";\nimport { minimatch } from \"minimatch\";\nimport { isValidThinkingLevel } from \"../cli/args.ts\";\nimport type { ModelRegistry } from \"./model-registry.ts\";\nimport { parseModelPattern } from \"./model-resolver-patterns.ts\";\nimport type { ScopedModel } from \"./model-resolver-types.ts\";\n\nfunction hasGlobCharacters(pattern: string): boolean {\n  return pattern.includes(\"*\") || pattern.includes(\"?\") || pattern.includes(\"[\");\n}\n\nfunction parseGlobThinkingLevel(pattern: string): { globPattern: string; thinkingLevel?: ThinkingLevel } {\n  const colonIdx = pattern.lastIndexOf(\":\");\n  if (colonIdx === -1) {\n    return { globPattern: pattern };\n  }\n\n  const suffix = pattern.substring(colonIdx + 1);\n  if (!isValidThinkingLevel(suffix)) {\n    return { globPattern: pattern };\n  }\n\n  return { globPattern: pattern.substring(0, colonIdx), thinkingLevel: suffix };\n}\n\n/**\n * Resolve model patterns to actual Model objects with optional thinking levels\n * Format: \"pattern:level\" where :level is optional\n * For each pattern, finds all matching models and picks the best version:\n * 1. Prefer alias (e.g., claude-sonnet-4-5) over dated versions (claude-sonnet-4-5-20250929)\n * 2. If no alias, pick the latest dated version\n *\n * Supports models with colons in their IDs (e.g., OpenRouter's model:exacto).\n * The algorithm tries to match the full pattern first, then progressively\n * strips colon-suffixes to find a match.\n */\nexport async function resolveModelScope(patterns: string[], modelRegistry: ModelRegistry): Promise<ScopedModel[]> {\n  const availableModels = await modelRegistry.getAvailable();\n  const scopedModels: ScopedModel[] = [];\n\n  for (const pattern of patterns) {\n    if (hasGlobCharacters(pattern)) {\n      const { globPattern, thinkingLevel } = parseGlobThinkingLevel(pattern);\n      const matchingModels = availableModels.filter((m) => {\n        const fullId = `${m.provider}/${m.id}`;\n        return minimatch(fullId, globPattern, { nocase: true }) || minimatch(m.id, globPattern, { nocase: true });\n      });\n\n      if (matchingModels.length === 0) {\n        console.warn(chalk.yellow(`Warning: No models match pattern \"${pattern}\"`));\n        continue;\n      }\n\n      for (const model of matchingModels) {\n        if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n          scopedModels.push({ model, thinkingLevel });\n        }\n      }\n      continue;\n    }\n\n    const { model, thinkingLevel, warning } = parseModelPattern(pattern, availableModels);\n\n    if (warning) {\n      console.warn(chalk.yellow(`Warning: ${warning}`));\n    }\n\n    if (!model) {\n      console.warn(chalk.yellow(`Warning: No models match pattern \"${pattern}\"`));\n      continue;\n    }\n\n    if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n      scopedModels.push({ model, thinkingLevel });\n    }\n  }\n\n  return scopedModels;\n}\n"]}
+{"version":3,"file":"model-resolver-scope.js","sourceRoot":"","sources":["../../src/core/model-resolver-scope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAajE,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACjF,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;AAChF,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,QAAkB,EAClB,aAA4B;IAE5B,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,YAAY,EAAE,CAAC;IAC3D,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,MAAM,WAAW,GAA2B,EAAE,CAAC;IAC/C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YACvE,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClD,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;gBACvC,OAAO,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5G,CAAC,CAAC,CAAC;YAEH,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,4BAA4B,OAAO,GAAG,EAAE,CAAC,CAAC;gBACvF,SAAS;YACX,CAAC;YAED,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;oBAChE,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;gBAC9C,CAAC;YACH,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAEtF,IAAI,OAAO,EAAE,CAAC;YACZ,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,4BAA4B,OAAO,GAAG,EAAE,CAAC,CAAC;YACvF,SAAS;QACX,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YAChE,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,QAAkB,EAAE,aAA4B;IACtF,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,gCAAgC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACtG,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport { modelsAreEqual } from \"@earendil-works/pi-ai/compat\";\nimport chalk from \"chalk\";\nimport { minimatch } from \"minimatch\";\nimport { isValidThinkingLevel } from \"../cli/args.ts\";\nimport type { ModelRegistry } from \"./model-registry.ts\";\nimport { parseModelPattern } from \"./model-resolver-patterns.ts\";\nimport type { ScopedModel } from \"./model-resolver-types.ts\";\n\nexport interface ModelScopeDiagnostic {\n  type: \"warning\";\n  message: string;\n}\n\nexport interface ResolveModelScopeResult {\n  scopedModels: ScopedModel[];\n  diagnostics: ModelScopeDiagnostic[];\n}\n\nfunction hasGlobCharacters(pattern: string): boolean {\n  return pattern.includes(\"*\") || pattern.includes(\"?\") || pattern.includes(\"[\");\n}\n\nfunction parseGlobThinkingLevel(pattern: string): { globPattern: string; thinkingLevel?: ThinkingLevel } {\n  const colonIdx = pattern.lastIndexOf(\":\");\n  if (colonIdx === -1) {\n    return { globPattern: pattern };\n  }\n\n  const suffix = pattern.substring(colonIdx + 1);\n  if (!isValidThinkingLevel(suffix)) {\n    return { globPattern: pattern };\n  }\n\n  return { globPattern: pattern.substring(0, colonIdx), thinkingLevel: suffix };\n}\n\n/**\n * Resolve model patterns to actual Model objects with optional thinking levels\n * Format: \"pattern:level\" where :level is optional\n * For each pattern, finds all matching models and picks the best version:\n * 1. Prefer alias (e.g., claude-sonnet-4-5) over dated versions (claude-sonnet-4-5-20250929)\n * 2. If no alias, pick the latest dated version\n *\n * Supports models with colons in their IDs (e.g., OpenRouter's model:exacto).\n * The algorithm tries to match the full pattern first, then progressively\n * strips colon-suffixes to find a match.\n */\nexport async function resolveModelScopeWithDiagnostics(\n  patterns: string[],\n  modelRegistry: ModelRegistry,\n): Promise<ResolveModelScopeResult> {\n  const availableModels = await modelRegistry.getAvailable();\n  const scopedModels: ScopedModel[] = [];\n  const diagnostics: ModelScopeDiagnostic[] = [];\n  for (const pattern of patterns) {\n    if (hasGlobCharacters(pattern)) {\n      const { globPattern, thinkingLevel } = parseGlobThinkingLevel(pattern);\n      const matchingModels = availableModels.filter((m) => {\n        const fullId = `${m.provider}/${m.id}`;\n        return minimatch(fullId, globPattern, { nocase: true }) || minimatch(m.id, globPattern, { nocase: true });\n      });\n\n      if (matchingModels.length === 0) {\n        diagnostics.push({ type: \"warning\", message: `No models match pattern \"${pattern}\"` });\n        continue;\n      }\n\n      for (const model of matchingModels) {\n        if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n          scopedModels.push({ model, thinkingLevel });\n        }\n      }\n      continue;\n    }\n\n    const { model, thinkingLevel, warning } = parseModelPattern(pattern, availableModels);\n\n    if (warning) {\n      diagnostics.push({ type: \"warning\", message: warning });\n    }\n\n    if (!model) {\n      diagnostics.push({ type: \"warning\", message: `No models match pattern \"${pattern}\"` });\n      continue;\n    }\n\n    if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {\n      scopedModels.push({ model, thinkingLevel });\n    }\n  }\n\n  return { scopedModels, diagnostics };\n}\n\nexport async function resolveModelScope(patterns: string[], modelRegistry: ModelRegistry): Promise<ScopedModel[]> {\n  const { scopedModels, diagnostics } = await resolveModelScopeWithDiagnostics(patterns, modelRegistry);\n  for (const diagnostic of diagnostics) {\n    console.warn(chalk.yellow(`Warning: ${diagnostic.message}`));\n  }\n  return scopedModels;\n}\n"]}

package/dist/core/model-resolver.d.ts

@@ -5,6 +5,7 @@ export { defaultModelPerProvider } from "./model-resolver-defaults.ts";
 export { resolveCliModel } from "./model-resolver-cli.ts";
 export { findInitialModel, resolveSavedModelReference, restoreModelFromSession } from "./model-resolver-initial.ts";
 export { findExactModelReferenceMatch, parseModelPattern } from "./model-resolver-patterns.ts";
-export { resolveModelScope } from "./model-resolver-scope.ts";
-export type { InitialModelResult, ParsedModelResult, ResolveCliModelResult, ScopedModel, } from "./model-resolver-types.ts";
+export { resolveModelScope, resolveModelScopeWithDiagnostics } from "./model-resolver-scope.ts";
+export type { ModelScopeDiagnostic, ResolveModelScopeResult } from "./model-resolver-scope.ts";
+export type { InitialModelResult, ParsedModelResult, ResolveCliModelResult, ScopedModel } from "./model-resolver-types.ts";
 //# sourceMappingURL=model-resolver.d.ts.map

package/dist/core/model-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/core/model-resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACpH,OAAO,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,YAAY,EACV,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,WAAW,GACZ,MAAM,2BAA2B,CAAC","sourcesContent":["/**\n * Model resolution, scoping, and initial selection\n */\n\nexport { defaultModelPerProvider } from \"./model-resolver-defaults.ts\";\nexport { resolveCliModel } from \"./model-resolver-cli.ts\";\nexport { findInitialModel, resolveSavedModelReference, restoreModelFromSession } from \"./model-resolver-initial.ts\";\nexport { findExactModelReferenceMatch, parseModelPattern } from \"./model-resolver-patterns.ts\";\nexport { resolveModelScope } from \"./model-resolver-scope.ts\";\nexport type {\n  InitialModelResult,\n  ParsedModelResult,\n  ResolveCliModelResult,\n  ScopedModel,\n} from \"./model-resolver-types.ts\";\n"]}
+{"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/core/model-resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACpH,OAAO,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,gCAAgC,EAAE,MAAM,2BAA2B,CAAC;AAChG,YAAY,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAC/F,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC","sourcesContent":["/**\n * Model resolution, scoping, and initial selection\n */\n\nexport { defaultModelPerProvider } from \"./model-resolver-defaults.ts\";\nexport { resolveCliModel } from \"./model-resolver-cli.ts\";\nexport { findInitialModel, resolveSavedModelReference, restoreModelFromSession } from \"./model-resolver-initial.ts\";\nexport { findExactModelReferenceMatch, parseModelPattern } from \"./model-resolver-patterns.ts\";\nexport { resolveModelScope, resolveModelScopeWithDiagnostics } from \"./model-resolver-scope.ts\";\nexport type { ModelScopeDiagnostic, ResolveModelScopeResult } from \"./model-resolver-scope.ts\";\nexport type { InitialModelResult, ParsedModelResult, ResolveCliModelResult, ScopedModel } from \"./model-resolver-types.ts\";\n"]}

package/dist/core/model-resolver.js

@@ -5,5 +5,5 @@ export { defaultModelPerProvider } from "./model-resolver-defaults.js";
 export { resolveCliModel } from "./model-resolver-cli.js";
 export { findInitialModel, resolveSavedModelReference, restoreModelFromSession } from "./model-resolver-initial.js";
 export { findExactModelReferenceMatch, parseModelPattern } from "./model-resolver-patterns.js";
-export { resolveModelScope } from "./model-resolver-scope.js";
+export { resolveModelScope, resolveModelScopeWithDiagnostics } from "./model-resolver-scope.js";
 //# sourceMappingURL=model-resolver.js.map

package/dist/core/model-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/core/model-resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACpH,OAAO,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC","sourcesContent":["/**\n * Model resolution, scoping, and initial selection\n */\n\nexport { defaultModelPerProvider } from \"./model-resolver-defaults.ts\";\nexport { resolveCliModel } from \"./model-resolver-cli.ts\";\nexport { findInitialModel, resolveSavedModelReference, restoreModelFromSession } from \"./model-resolver-initial.ts\";\nexport { findExactModelReferenceMatch, parseModelPattern } from \"./model-resolver-patterns.ts\";\nexport { resolveModelScope } from \"./model-resolver-scope.ts\";\nexport type {\n  InitialModelResult,\n  ParsedModelResult,\n  ResolveCliModelResult,\n  ScopedModel,\n} from \"./model-resolver-types.ts\";\n"]}
+{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/core/model-resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACpH,OAAO,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,gCAAgC,EAAE,MAAM,2BAA2B,CAAC","sourcesContent":["/**\n * Model resolution, scoping, and initial selection\n */\n\nexport { defaultModelPerProvider } from \"./model-resolver-defaults.ts\";\nexport { resolveCliModel } from \"./model-resolver-cli.ts\";\nexport { findInitialModel, resolveSavedModelReference, restoreModelFromSession } from \"./model-resolver-initial.ts\";\nexport { findExactModelReferenceMatch, parseModelPattern } from \"./model-resolver-patterns.ts\";\nexport { resolveModelScope, resolveModelScopeWithDiagnostics } from \"./model-resolver-scope.ts\";\nexport type { ModelScopeDiagnostic, ResolveModelScopeResult } from \"./model-resolver-scope.ts\";\nexport type { InitialModelResult, ParsedModelResult, ResolveCliModelResult, ScopedModel } from \"./model-resolver-types.ts\";\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"resource-loader-extensions.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader-extensions.ts"],"names":[],"mappings":"AAEA,OAAO,EAGN,KAAK,wBAAwB,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE/F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,wCAAwC,EAAE,MAAM,4BAA4B,CAAC;AAM3F,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,qBAAqB,EAC7B,cAAc,EAAE,MAAM,EAAE,EACxB,kBAAkB,EAAE,oBAAoB,GAAG,SAAS,EACpD,wBAAwB,EAAE,wBAAwB,EAClD,2BAA2B,EAAE,MAAM,wCAAwC,GACzE,OAAO,CAAC,oBAAoB,CAAC,CAmE/B;AAED,wBAAsB,sBAAsB,CAC3C,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,gBAAgB,EACzB,wBAAwB,EAAE,wBAAwB,EAClD,2BAA2B,EAAE,MAAM,wCAAwC,GACzE,OAAO,CAAC;IACV,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/C,CAAC,CAyBD","sourcesContent":["import { resolvePath } from \"../utils/paths.ts\";\nimport { startTimingSpan, endTimingSpan } from \"./timings.ts\";\nimport {\n\tloadExtensionFromFactory,\n\tloadExtensionsCached,\n\ttype WorkflowResourceProvider,\n} from \"./extensions/loader.ts\";\nimport type { Extension, ExtensionRuntime, LoadExtensionsResult } from \"./extensions/types.ts\";\nimport { resourceInternals } from \"./resource-loader-internals.ts\";\nimport type { DefaultResourceLoader } from \"./resource-loader-core.ts\";\nimport type { DefaultResourceLoaderInheritanceSnapshot } from \"./resource-loader-types.ts\";\n\nfunction resolveExtensionLoadPath(loader: DefaultResourceLoader, path: string): string {\n\treturn resolvePath(path, resourceInternals(loader).cwd, { normalizeUnicodeSpaces: true });\n}\n\nexport async function loadFinalExtensionSet(\n\tloader: DefaultResourceLoader,\n\textensionPaths: string[],\n\tpreTrustExtensions: LoadExtensionsResult | undefined,\n\tworkflowResourceProvider: WorkflowResourceProvider,\n\tinheritanceSnapshotProvider: () => DefaultResourceLoaderInheritanceSnapshot,\n): Promise<LoadExtensionsResult> {\n\tconst state = resourceInternals(loader);\n\tif (!preTrustExtensions) {\n\t\tconst loadExtensionsSpan = startTimingSpan(\"DefaultResourceLoader.reload.loadExtensions\");\n\t\tconst extensionsResult = await loadExtensionsCached(\n\t\t\textensionPaths,\n\t\t\tstate.cwd,\n\t\t\tstate.eventBus,\n\t\t\tworkflowResourceProvider,\n\t\t\tundefined,\n\t\t\tinheritanceSnapshotProvider,\n\t\t);\n\t\tendTimingSpan(loadExtensionsSpan);\n\t\tconst inlineExtensionsSpan = startTimingSpan(\"DefaultResourceLoader.reload.loadInlineExtensionFactories\");\n\t\tconst inlineExtensions = await loadExtensionFactories(\n\t\t\tloader,\n\t\t\textensionsResult.runtime,\n\t\t\tworkflowResourceProvider,\n\t\t\tinheritanceSnapshotProvider,\n\t\t);\n\t\tendTimingSpan(inlineExtensionsSpan);\n\t\textensionsResult.extensions.push(...inlineExtensions.extensions);\n\t\textensionsResult.errors.push(...inlineExtensions.errors);\n\t\taddExtensionConflictDiagnostics(extensionsResult);\n\t\treturn extensionsResult;\n\t}\n\n\tconst preloadedByPath = new Map(\n\t\tpreTrustExtensions.extensions\n\t\t\t.filter((extension) => !extension.path.startsWith(\"<inline:\"))\n\t\t\t.map((extension) => [extension.resolvedPath, extension]),\n\t);\n\tconst failedPreloadPaths = new Set(\n\t\tpreTrustExtensions.errors.map((error) => resolveExtensionLoadPath(loader, error.path)),\n\t);\n\tconst remainingPaths = extensionPaths.filter((path) => {\n\t\tconst resolvedPath = resolveExtensionLoadPath(loader, path);\n\t\treturn !preloadedByPath.has(resolvedPath) && !failedPreloadPaths.has(resolvedPath);\n\t});\n\tconst loadExtensionsSpan = startTimingSpan(\"DefaultResourceLoader.reload.loadExtensions\");\n\tconst remainingExtensions = await loadExtensionsCached(\n\t\tremainingPaths,\n\t\tstate.cwd,\n\t\tstate.eventBus,\n\t\tworkflowResourceProvider,\n\t\tpreTrustExtensions.runtime,\n\t\tinheritanceSnapshotProvider,\n\t);\n\tendTimingSpan(loadExtensionsSpan);\n\tconst loadedByPath = new Map(preloadedByPath);\n\tfor (const extension of remainingExtensions.extensions) {\n\t\tloadedByPath.set(extension.resolvedPath, extension);\n\t}\n\n\tconst inlineExtensions = preTrustExtensions.extensions.filter((extension) => extension.path.startsWith(\"<inline:\"));\n\tconst orderedExtensions = extensionPaths\n\t\t.map((path) => loadedByPath.get(resolveExtensionLoadPath(loader, path)))\n\t\t.filter((extension): extension is Extension => extension !== undefined);\n\torderedExtensions.push(...inlineExtensions);\n\n\tconst extensionsResult: LoadExtensionsResult = {\n\t\textensions: orderedExtensions,\n\t\terrors: [...preTrustExtensions.errors, ...remainingExtensions.errors],\n\t\truntime: preTrustExtensions.runtime,\n\t};\n\taddExtensionConflictDiagnostics(extensionsResult);\n\treturn extensionsResult;\n}\n\nexport async function loadExtensionFactories(\n\tloader: DefaultResourceLoader,\n\truntime: ExtensionRuntime,\n\tworkflowResourceProvider: WorkflowResourceProvider,\n\tinheritanceSnapshotProvider: () => DefaultResourceLoaderInheritanceSnapshot,\n): Promise<{\n\textensions: Extension[];\n\terrors: Array<{ path: string; error: string }>;\n}> {\n\tconst state = resourceInternals(loader);\n\tconst extensions: Extension[] = [];\n\tconst errors: Array<{ path: string; error: string }> = [];\n\n\tfor (const [index, factory] of state.extensionFactories.entries()) {\n\t\tconst extensionPath = `<inline:${index + 1}>`;\n\t\ttry {\n\t\t\tconst extension = await loadExtensionFromFactory(\n\t\t\t\tfactory,\n\t\t\t\tstate.cwd,\n\t\t\t\tstate.eventBus,\n\t\t\t\truntime,\n\t\t\t\textensionPath,\n\t\t\t\tworkflowResourceProvider,\n\t\t\t\tinheritanceSnapshotProvider,\n\t\t\t);\n\t\t\textensions.push(extension);\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : \"failed to load extension\";\n\t\t\terrors.push({ path: extensionPath, error: message });\n\t\t}\n\t}\n\n\treturn { extensions, errors };\n}\n\nfunction addExtensionConflictDiagnostics(extensionsResult: LoadExtensionsResult): void {\n\t// Detect extension conflicts (tools, commands, flags with same names from different extensions)\n\t// Keep all extensions loaded. Conflicts are reported as diagnostics, and precedence is handled by load order.\n\tconst conflicts = detectExtensionConflicts(extensionsResult.extensions);\n\tfor (const conflict of conflicts) {\n\t\textensionsResult.errors.push({ path: conflict.path, error: conflict.message });\n\t}\n}\n\nfunction detectExtensionConflicts(extensions: Extension[]): Array<{ path: string; message: string }> {\n\tconst conflicts: Array<{ path: string; message: string }> = [];\n\n\t// Track which extension registered each tool and flag\n\tconst toolOwners = new Map<string, string>();\n\tconst flagOwners = new Map<string, string>();\n\n\tfor (const ext of extensions) {\n\t\t// Check tools\n\t\tfor (const toolName of ext.tools.keys()) {\n\t\t\tconst existingOwner = toolOwners.get(toolName);\n\t\t\tif (existingOwner && existingOwner !== ext.path) {\n\t\t\t\tconflicts.push({\n\t\t\t\t\tpath: ext.path,\n\t\t\t\t\tmessage: `Tool \"${toolName}\" conflicts with ${existingOwner}`,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\ttoolOwners.set(toolName, ext.path);\n\t\t\t}\n\t\t}\n\n\t\t// Check flags\n\t\tfor (const flagName of ext.flags.keys()) {\n\t\t\tconst existingOwner = flagOwners.get(flagName);\n\t\t\tif (existingOwner && existingOwner !== ext.path) {\n\t\t\t\tconflicts.push({\n\t\t\t\t\tpath: ext.path,\n\t\t\t\t\tmessage: `Flag \"--${flagName}\" conflicts with ${existingOwner}`,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tflagOwners.set(flagName, ext.path);\n\t\t\t}\n\t\t}\n\t}\n\n\treturn conflicts;\n}\n"]}
+{"version":3,"file":"resource-loader-extensions.d.ts","sourceRoot":"","sources":["../../src/core/resource-loader-extensions.ts"],"names":[],"mappings":"AAGA,OAAO,EAGN,KAAK,wBAAwB,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE/F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,wCAAwC,EAAE,MAAM,4BAA4B,CAAC;AAM3F,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,qBAAqB,EAC7B,cAAc,EAAE,MAAM,EAAE,EACxB,kBAAkB,EAAE,oBAAoB,GAAG,SAAS,EACpD,wBAAwB,EAAE,wBAAwB,EAClD,2BAA2B,EAAE,MAAM,wCAAwC,GACzE,OAAO,CAAC,oBAAoB,CAAC,CAmE/B;AAED,wBAAsB,sBAAsB,CAC3C,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,gBAAgB,EACzB,wBAAwB,EAAE,wBAAwB,EAClD,2BAA2B,EAAE,MAAM,wCAAwC,GACzE,OAAO,CAAC;IACV,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/C,CAAC,CA4BD","sourcesContent":["import { resolvePath } from \"../utils/paths.ts\";\nimport { yieldToEventLoop } from \"../utils/event-loop.ts\";\nimport { startTimingSpan, endTimingSpan } from \"./timings.ts\";\nimport {\n\tloadExtensionFromFactory,\n\tloadExtensionsCached,\n\ttype WorkflowResourceProvider,\n} from \"./extensions/loader.ts\";\nimport type { Extension, ExtensionRuntime, LoadExtensionsResult } from \"./extensions/types.ts\";\nimport { resourceInternals } from \"./resource-loader-internals.ts\";\nimport type { DefaultResourceLoader } from \"./resource-loader-core.ts\";\nimport type { DefaultResourceLoaderInheritanceSnapshot } from \"./resource-loader-types.ts\";\n\nfunction resolveExtensionLoadPath(loader: DefaultResourceLoader, path: string): string {\n\treturn resolvePath(path, resourceInternals(loader).cwd, { normalizeUnicodeSpaces: true });\n}\n\nexport async function loadFinalExtensionSet(\n\tloader: DefaultResourceLoader,\n\textensionPaths: string[],\n\tpreTrustExtensions: LoadExtensionsResult | undefined,\n\tworkflowResourceProvider: WorkflowResourceProvider,\n\tinheritanceSnapshotProvider: () => DefaultResourceLoaderInheritanceSnapshot,\n): Promise<LoadExtensionsResult> {\n\tconst state = resourceInternals(loader);\n\tif (!preTrustExtensions) {\n\t\tconst loadExtensionsSpan = startTimingSpan(\"DefaultResourceLoader.reload.loadExtensions\");\n\t\tconst extensionsResult = await loadExtensionsCached(\n\t\t\textensionPaths,\n\t\t\tstate.cwd,\n\t\t\tstate.eventBus,\n\t\t\tworkflowResourceProvider,\n\t\t\tundefined,\n\t\t\tinheritanceSnapshotProvider,\n\t\t);\n\t\tendTimingSpan(loadExtensionsSpan);\n\t\tconst inlineExtensionsSpan = startTimingSpan(\"DefaultResourceLoader.reload.loadInlineExtensionFactories\");\n\t\tconst inlineExtensions = await loadExtensionFactories(\n\t\t\tloader,\n\t\t\textensionsResult.runtime,\n\t\t\tworkflowResourceProvider,\n\t\t\tinheritanceSnapshotProvider,\n\t\t);\n\t\tendTimingSpan(inlineExtensionsSpan);\n\t\textensionsResult.extensions.push(...inlineExtensions.extensions);\n\t\textensionsResult.errors.push(...inlineExtensions.errors);\n\t\taddExtensionConflictDiagnostics(extensionsResult);\n\t\treturn extensionsResult;\n\t}\n\n\tconst preloadedByPath = new Map(\n\t\tpreTrustExtensions.extensions\n\t\t\t.filter((extension) => !extension.path.startsWith(\"<inline:\"))\n\t\t\t.map((extension) => [extension.resolvedPath, extension]),\n\t);\n\tconst failedPreloadPaths = new Set(\n\t\tpreTrustExtensions.errors.map((error) => resolveExtensionLoadPath(loader, error.path)),\n\t);\n\tconst remainingPaths = extensionPaths.filter((path) => {\n\t\tconst resolvedPath = resolveExtensionLoadPath(loader, path);\n\t\treturn !preloadedByPath.has(resolvedPath) && !failedPreloadPaths.has(resolvedPath);\n\t});\n\tconst loadExtensionsSpan = startTimingSpan(\"DefaultResourceLoader.reload.loadExtensions\");\n\tconst remainingExtensions = await loadExtensionsCached(\n\t\tremainingPaths,\n\t\tstate.cwd,\n\t\tstate.eventBus,\n\t\tworkflowResourceProvider,\n\t\tpreTrustExtensions.runtime,\n\t\tinheritanceSnapshotProvider,\n\t);\n\tendTimingSpan(loadExtensionsSpan);\n\tconst loadedByPath = new Map(preloadedByPath);\n\tfor (const extension of remainingExtensions.extensions) {\n\t\tloadedByPath.set(extension.resolvedPath, extension);\n\t}\n\n\tconst inlineExtensions = preTrustExtensions.extensions.filter((extension) => extension.path.startsWith(\"<inline:\"));\n\tconst orderedExtensions = extensionPaths\n\t\t.map((path) => loadedByPath.get(resolveExtensionLoadPath(loader, path)))\n\t\t.filter((extension): extension is Extension => extension !== undefined);\n\torderedExtensions.push(...inlineExtensions);\n\n\tconst extensionsResult: LoadExtensionsResult = {\n\t\textensions: orderedExtensions,\n\t\terrors: [...preTrustExtensions.errors, ...remainingExtensions.errors],\n\t\truntime: preTrustExtensions.runtime,\n\t};\n\taddExtensionConflictDiagnostics(extensionsResult);\n\treturn extensionsResult;\n}\n\nexport async function loadExtensionFactories(\n\tloader: DefaultResourceLoader,\n\truntime: ExtensionRuntime,\n\tworkflowResourceProvider: WorkflowResourceProvider,\n\tinheritanceSnapshotProvider: () => DefaultResourceLoaderInheritanceSnapshot,\n): Promise<{\n\textensions: Extension[];\n\terrors: Array<{ path: string; error: string }>;\n}> {\n\tconst state = resourceInternals(loader);\n\tconst extensions: Extension[] = [];\n\tconst errors: Array<{ path: string; error: string }> = [];\n\n\tfor (const [index, factory] of state.extensionFactories.entries()) {\n\t\tif (index > 0) {\n\t\t\tawait yieldToEventLoop();\n\t\t}\n\t\tconst extensionPath = `<inline:${index + 1}>`;\n\t\ttry {\n\t\t\tconst extension = await loadExtensionFromFactory(\n\t\t\t\tfactory,\n\t\t\t\tstate.cwd,\n\t\t\t\tstate.eventBus,\n\t\t\t\truntime,\n\t\t\t\textensionPath,\n\t\t\t\tworkflowResourceProvider,\n\t\t\t\tinheritanceSnapshotProvider,\n\t\t\t);\n\t\t\textensions.push(extension);\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : \"failed to load extension\";\n\t\t\terrors.push({ path: extensionPath, error: message });\n\t\t}\n\t}\n\n\treturn { extensions, errors };\n}\n\nfunction addExtensionConflictDiagnostics(extensionsResult: LoadExtensionsResult): void {\n\t// Detect extension conflicts (tools, commands, flags with same names from different extensions)\n\t// Keep all extensions loaded. Conflicts are reported as diagnostics, and precedence is handled by load order.\n\tconst conflicts = detectExtensionConflicts(extensionsResult.extensions);\n\tfor (const conflict of conflicts) {\n\t\textensionsResult.errors.push({ path: conflict.path, error: conflict.message });\n\t}\n}\n\nfunction detectExtensionConflicts(extensions: Extension[]): Array<{ path: string; message: string }> {\n\tconst conflicts: Array<{ path: string; message: string }> = [];\n\n\t// Track which extension registered each tool and flag\n\tconst toolOwners = new Map<string, string>();\n\tconst flagOwners = new Map<string, string>();\n\n\tfor (const ext of extensions) {\n\t\t// Check tools\n\t\tfor (const toolName of ext.tools.keys()) {\n\t\t\tconst existingOwner = toolOwners.get(toolName);\n\t\t\tif (existingOwner && existingOwner !== ext.path) {\n\t\t\t\tconflicts.push({\n\t\t\t\t\tpath: ext.path,\n\t\t\t\t\tmessage: `Tool \"${toolName}\" conflicts with ${existingOwner}`,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\ttoolOwners.set(toolName, ext.path);\n\t\t\t}\n\t\t}\n\n\t\t// Check flags\n\t\tfor (const flagName of ext.flags.keys()) {\n\t\t\tconst existingOwner = flagOwners.get(flagName);\n\t\t\tif (existingOwner && existingOwner !== ext.path) {\n\t\t\t\tconflicts.push({\n\t\t\t\t\tpath: ext.path,\n\t\t\t\t\tmessage: `Flag \"--${flagName}\" conflicts with ${existingOwner}`,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tflagOwners.set(flagName, ext.path);\n\t\t\t}\n\t\t}\n\t}\n\n\treturn conflicts;\n}\n"]}

package/dist/core/resource-loader-extensions.js

@@ -1,4 +1,5 @@
 import { resolvePath } from "../utils/paths.js";
+import { yieldToEventLoop } from "../utils/event-loop.js";
 import { startTimingSpan, endTimingSpan } from "./timings.js";
 import { loadExtensionFromFactory, loadExtensionsCached, } from "./extensions/loader.js";
 import { resourceInternals } from "./resource-loader-internals.js";
@@ -52,6 +53,9 @@ export async function loadExtensionFactories(loader, runtime, workflowResourcePr
     const extensions = [];
     const errors = [];
     for (const [index, factory] of state.extensionFactories.entries()) {
+        if (index > 0) {
+            await yieldToEventLoop();
+        }
         const extensionPath = `<inline:${index + 1}>`;
         try {
             const extension = await loadExtensionFromFactory(factory, state.cwd, state.eventBus, runtime, extensionPath, workflowResourceProvider, inheritanceSnapshotProvider);