@bastani/atomic 0.9.10 → 0.9.11-alpha.10

package/dist/core/runtime-credentials.js

@@ -0,0 +1,42 @@
+function getReloadableStore(store) {
+    const reloadable = store;
+    return typeof reloadable.reload === "function" ? reloadable : undefined;
+}
+/** Async credential store overlay for non-persistent runtime API keys. */
+export class RuntimeCredentials {
+    constructor(store) {
+        this.overrides = new Map();
+        this.store = store;
+    }
+    setRuntimeApiKey(providerId, apiKey) {
+        this.overrides.set(providerId, apiKey);
+    }
+    removeRuntimeApiKey(providerId) {
+        this.overrides.delete(providerId);
+    }
+    hasRuntimeApiKey(providerId) {
+        return this.overrides.has(providerId);
+    }
+    async reload() {
+        await getReloadableStore(this.store)?.reload();
+    }
+    async read(providerId) {
+        const override = this.overrides.get(providerId);
+        return override ? { type: "api_key", key: override } : this.store.read(providerId);
+    }
+    async list() {
+        const entries = new Map((await this.store.list()).map((entry) => [entry.providerId, entry]));
+        for (const providerId of this.overrides.keys()) {
+            entries.set(providerId, { providerId, type: "api_key" });
+        }
+        return [...entries.values()];
+    }
+    modify(providerId, fn) {
+        return this.store.modify(providerId, fn);
+    }
+    async delete(providerId) {
+        this.overrides.delete(providerId);
+        await this.store.delete(providerId);
+    }
+}
+//# sourceMappingURL=runtime-credentials.js.map

package/dist/core/runtime-credentials.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-credentials.js","sourceRoot":"","sources":["../../src/core/runtime-credentials.ts"],"names":[],"mappings":"AAMA,SAAS,kBAAkB,CAAC,KAAsB;IACjD,MAAM,UAAU,GAAG,KAA6D,CAAC;IACjF,OAAO,OAAO,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAE,UAAwC,CAAC,CAAC,CAAC,SAAS,CAAC;AACxG,CAAC;AAED,0EAA0E;AAC1E,MAAM,OAAO,kBAAkB;IAI9B,YAAY,KAAsB;QAFjB,cAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAGtD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,gBAAgB,CAAC,UAAkB,EAAE,MAAc;QAClD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,mBAAmB,CAAC,UAAkB;QACrC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,gBAAgB,CAAC,UAAkB;QAClC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,MAAM;QACX,MAAM,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,UAAkB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,IAAI;QACT,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7F,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CACL,UAAkB,EAClB,EAAwE;QAExE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACD","sourcesContent":["import type { Credential, CredentialInfo, CredentialStore } from \"@earendil-works/pi-ai\";\n\ninterface ReloadableCredentialStore {\n\treload(): void | Promise<void>;\n}\n\nfunction getReloadableStore(store: CredentialStore): ReloadableCredentialStore | undefined {\n\tconst reloadable = store as CredentialStore & Partial<ReloadableCredentialStore>;\n\treturn typeof reloadable.reload === \"function\" ? (reloadable as ReloadableCredentialStore) : undefined;\n}\n\n/** Async credential store overlay for non-persistent runtime API keys. */\nexport class RuntimeCredentials implements CredentialStore {\n\tprivate readonly store: CredentialStore;\n\tprivate readonly overrides = new Map<string, string>();\n\n\tconstructor(store: CredentialStore) {\n\t\tthis.store = store;\n\t}\n\n\tsetRuntimeApiKey(providerId: string, apiKey: string): void {\n\t\tthis.overrides.set(providerId, apiKey);\n\t}\n\n\tremoveRuntimeApiKey(providerId: string): void {\n\t\tthis.overrides.delete(providerId);\n\t}\n\n\thasRuntimeApiKey(providerId: string): boolean {\n\t\treturn this.overrides.has(providerId);\n\t}\n\n\tasync reload(): Promise<void> {\n\t\tawait getReloadableStore(this.store)?.reload();\n\t}\n\n\tasync read(providerId: string): Promise<Credential | undefined> {\n\t\tconst override = this.overrides.get(providerId);\n\t\treturn override ? { type: \"api_key\", key: override } : this.store.read(providerId);\n\t}\n\n\tasync list(): Promise<readonly CredentialInfo[]> {\n\t\tconst entries = new Map((await this.store.list()).map((entry) => [entry.providerId, entry]));\n\t\tfor (const providerId of this.overrides.keys()) {\n\t\t\tentries.set(providerId, { providerId, type: \"api_key\" });\n\t\t}\n\t\treturn [...entries.values()];\n\t}\n\n\tmodify(\n\t\tproviderId: string,\n\t\tfn: (current: Credential | undefined) => Promise<Credential | undefined>,\n\t): Promise<Credential | undefined> {\n\t\treturn this.store.modify(providerId, fn);\n\t}\n\n\tasync delete(providerId: string): Promise<void> {\n\t\tthis.overrides.delete(providerId);\n\t\tawait this.store.delete(providerId);\n\t}\n}\n"]}

package/dist/core/sdk-exports.d.ts

@@ -1,7 +1,7 @@
 export * from "./agent-session-runtime.ts";
-export type { ExtensionAPI, ExtensionCommandContext, ExtensionContext, ExtensionFactory, SlashCommandInfo, SlashCommandSource, ToolDefinition, } from "./extensions/index.ts";
+export type { AgentSettledEvent, BeforeProviderHeadersEvent, EntryRenderer, EntryRenderOptions, ExtensionAPI, ExtensionCommandContext, ExtensionContext, ExtensionFactory, InlineExtension, MessageEndEvent, MessageStartEvent, MessageUpdateEvent, SlashCommandInfo, SlashCommandSource, ToolDefinition, ToolExecutionEndEvent, ToolExecutionStartEvent, ToolExecutionUpdateEvent, } from "./extensions/index.ts";
 export type { PromptTemplate } from "./prompt-templates.ts";
 export type { Skill } from "./skills.ts";
 export type { JsonObject, JsonPrimitive, JsonValue, StructuredOutputCapture, StructuredOutputFileCapture, StructuredOutputToolOptions, Tool, } from "./tools/index.ts";
-export { withFileMutationQueue, STRUCTURED_OUTPUT_TOOL_NAME, createCodingTools, createReadOnlyTools, createReadTool, createBashTool, createEditTool, createWriteTool, createFindTool, createSearchTool, createLsTool, createStructuredOutputCapture, createStructuredOutputTool, } from "./tools/index.ts";
+export { createBashTool, createCodingTools, createEditTool, createFindTool, createLsTool, createReadOnlyTools, createReadTool, createSearchTool, createStructuredOutputCapture, createStructuredOutputTool, createWriteTool, STRUCTURED_OUTPUT_TOOL_NAME, withFileMutationQueue, } from "./tools/index.ts";
 //# sourceMappingURL=sdk-exports.d.ts.map

package/dist/core/sdk-exports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-exports.d.ts","sourceRoot":"","sources":["../../src/core/sdk-exports.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,YAAY,EACV,YAAY,EACZ,uBAAuB,EACvB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,YAAY,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,YAAY,EACV,UAAU,EACV,aAAa,EACb,SAAS,EACT,uBAAuB,EACvB,2BAA2B,EAC3B,2BAA2B,EAC3B,IAAI,GACL,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,qBAAqB,EACrB,2BAA2B,EAE3B,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,cAAc,EACd,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,6BAA6B,EAC7B,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"sdk-exports.d.ts","sourceRoot":"","sources":["../../src/core/sdk-exports.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,YAAY,EACX,iBAAiB,EACjB,0BAA0B,EAC1B,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,uBAAuB,EACvB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,uBAAuB,EACvB,wBAAwB,GACxB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,YAAY,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,YAAY,EACX,UAAU,EACV,aAAa,EACb,SAAS,EACT,uBAAuB,EACvB,2BAA2B,EAC3B,2BAA2B,EAC3B,IAAI,GACJ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,cAAc,EAEd,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,6BAA6B,EAC7B,0BAA0B,EAC1B,eAAe,EACf,2BAA2B,EAC3B,qBAAqB,GACrB,MAAM,kBAAkB,CAAC"}

package/dist/core/sdk-exports.js

@@ -1,5 +1,5 @@
 export * from "./agent-session-runtime.js";
-export { withFileMutationQueue, STRUCTURED_OUTPUT_TOOL_NAME, 
+export { createBashTool, 
 // Tool factories (for custom cwd)
-createCodingTools, createReadOnlyTools, createReadTool, createBashTool, createEditTool, createWriteTool, createFindTool, createSearchTool, createLsTool, createStructuredOutputCapture, createStructuredOutputTool, } from "./tools/index.js";
+createCodingTools, createEditTool, createFindTool, createLsTool, createReadOnlyTools, createReadTool, createSearchTool, createStructuredOutputCapture, createStructuredOutputTool, createWriteTool, STRUCTURED_OUTPUT_TOOL_NAME, withFileMutationQueue, } from "./tools/index.js";
 //# sourceMappingURL=sdk-exports.js.map

package/dist/core/sdk-exports.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-exports.js","sourceRoot":"","sources":["../../src/core/sdk-exports.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAsB3C,OAAO,EACL,qBAAqB,EACrB,2BAA2B;AAC3B,kCAAkC;AAClC,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,cAAc,EACd,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,6BAA6B,EAC7B,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC","sourcesContent":["export * from \"./agent-session-runtime.ts\";\nexport type {\n  ExtensionAPI,\n  ExtensionCommandContext,\n  ExtensionContext,\n  ExtensionFactory,\n  SlashCommandInfo,\n  SlashCommandSource,\n  ToolDefinition,\n} from \"./extensions/index.ts\";\nexport type { PromptTemplate } from \"./prompt-templates.ts\";\nexport type { Skill } from \"./skills.ts\";\nexport type {\n  JsonObject,\n  JsonPrimitive,\n  JsonValue,\n  StructuredOutputCapture,\n  StructuredOutputFileCapture,\n  StructuredOutputToolOptions,\n  Tool,\n} from \"./tools/index.ts\";\n\nexport {\n  withFileMutationQueue,\n  STRUCTURED_OUTPUT_TOOL_NAME,\n  // Tool factories (for custom cwd)\n  createCodingTools,\n  createReadOnlyTools,\n  createReadTool,\n  createBashTool,\n  createEditTool,\n  createWriteTool,\n  createFindTool,\n  createSearchTool,\n  createLsTool,\n  createStructuredOutputCapture,\n  createStructuredOutputTool,\n} from \"./tools/index.ts\";\n\n"]}
+{"version":3,"file":"sdk-exports.js","sourceRoot":"","sources":["../../src/core/sdk-exports.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAiC3C,OAAO,EACN,cAAc;AACd,kCAAkC;AAClC,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,6BAA6B,EAC7B,0BAA0B,EAC1B,eAAe,EACf,2BAA2B,EAC3B,qBAAqB,GACrB,MAAM,kBAAkB,CAAC","sourcesContent":["export * from \"./agent-session-runtime.ts\";\nexport type {\n\tAgentSettledEvent,\n\tBeforeProviderHeadersEvent,\n\tEntryRenderer,\n\tEntryRenderOptions,\n\tExtensionAPI,\n\tExtensionCommandContext,\n\tExtensionContext,\n\tExtensionFactory,\n\tInlineExtension,\n\tMessageEndEvent,\n\tMessageStartEvent,\n\tMessageUpdateEvent,\n\tSlashCommandInfo,\n\tSlashCommandSource,\n\tToolDefinition,\n\tToolExecutionEndEvent,\n\tToolExecutionStartEvent,\n\tToolExecutionUpdateEvent,\n} from \"./extensions/index.ts\";\nexport type { PromptTemplate } from \"./prompt-templates.ts\";\nexport type { Skill } from \"./skills.ts\";\nexport type {\n\tJsonObject,\n\tJsonPrimitive,\n\tJsonValue,\n\tStructuredOutputCapture,\n\tStructuredOutputFileCapture,\n\tStructuredOutputToolOptions,\n\tTool,\n} from \"./tools/index.ts\";\n\nexport {\n\tcreateBashTool,\n\t// Tool factories (for custom cwd)\n\tcreateCodingTools,\n\tcreateEditTool,\n\tcreateFindTool,\n\tcreateLsTool,\n\tcreateReadOnlyTools,\n\tcreateReadTool,\n\tcreateSearchTool,\n\tcreateStructuredOutputCapture,\n\tcreateStructuredOutputTool,\n\tcreateWriteTool,\n\tSTRUCTURED_OUTPUT_TOOL_NAME,\n\twithFileMutationQueue,\n} from \"./tools/index.ts\";\n"]}

package/dist/core/sdk-types.d.ts

@@ -1,31 +1,31 @@
 import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
 import type { Api, Model } from "@earendil-works/pi-ai/compat";
-import type { AuthStorage } from "./auth-storage.ts";
-import type { ModelRegistry } from "./model-registry.ts";
+import type { AgentSession } from "./agent-session.ts";
+import type { LoadExtensionsResult, OrchestrationContext, SessionStartEvent, ToolDefinition } from "./extensions/index.ts";
+import type { ModelFallbackReason } from "./model-resolver-types.ts";
+import type { ModelRuntime } from "./model-runtime.ts";
 import type { ResourceLoader } from "./resource-loader.ts";
 import type { SessionManager } from "./session-manager.ts";
 import type { SettingsManager } from "./settings-manager.ts";
-import type { AgentSession } from "./agent-session.ts";
-import type { LoadExtensionsResult, OrchestrationContext, SessionStartEvent, ToolDefinition } from "./extensions/index.ts";
 export interface CreateAgentSessionOptions {
     /** Working directory for project-local discovery. Default: process.cwd() */
     cwd?: string;
     /** Global config directory. Default: ~/.atomic/agent */
     agentDir?: string;
-    /** Auth storage for credentials. Default: AuthStorage.create(agentDir/auth.json) */
-    authStorage?: AuthStorage;
-    /** Model registry. Default: ModelRegistry.create(authStorage, agentDir/models.json) */
-    modelRegistry?: ModelRegistry;
+    /** Canonical model/auth runtime. Defaults to agentDir/auth.json and models.json. */
+    modelRuntime?: ModelRuntime;
     /** Model to use. Default: from settings, else first available */
     model?: Model<Api>;
     /** Thinking level. Default: from settings, else 'medium' (clamped to model capabilities) */
     thinkingLevel?: ThinkingLevel;
-    /** Ordered fallback models for main chat, as provider/model strings with optional :thinkingLevel suffix. Default: settings.fallbackModels */
+    /**
+     * Ordered fallback models as provider/model strings with optional :thinkingLevel suffix.
+     * Used by main-chat turns and borrowed, planner-only, for compaction range planning when
+     * the current model cannot produce a usable plan — so a configured candidate may receive
+     * the compaction transcript. Borrowing never changes the session model or thinking level.
+     * Default: settings.fallbackModels
+     */
     fallbackModels?: string[];
-    /** Context window token count. Default: model scalar contextWindow, or settings/session override when supported. */
-    contextWindow?: number;
-    /** Treat unsupported contextWindow as an error instead of a warning/fallback. */
-    contextWindowStrict?: boolean;
     /** Models available for cycling (Ctrl+P in interactive mode) */
     scopedModels?: Array<{
         model: Model<Api>;
@@ -75,11 +75,9 @@ export interface CreateAgentSessionResult {
     session: AgentSession;
     /** Extensions result (for UI context setup in interactive mode) */
     extensionsResult: LoadExtensionsResult;
-    /** Warning if session was restored with a different model than saved */
+    /** Warning when a restored or configured model cannot be selected. */
     modelFallbackMessage?: string;
-    /** Warning if a saved/default context window could not be applied to the selected model. */
-    contextWindowWarning?: string;
-    /** Error if an explicit strict context-window selection is unsupported. */
-    contextWindowError?: string;
+    /** Semantic reason for modelFallbackMessage; suitable for mode control flow. */
+    modelFallbackReason?: ModelFallbackReason;
 }
 //# sourceMappingURL=sdk-types.d.ts.map

package/dist/core/sdk-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-types.d.ts","sourceRoot":"","sources":["../../src/core/sdk-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE3H,MAAM,WAAW,yBAAyB;IACxC,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,oFAAoF;IACpF,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,uFAAuF;IACvF,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,iEAAiE;IACjE,KAAK,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,4FAA4F;IAC5F,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,6IAA6I;IAC7I,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,oHAAoH;IACpH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iFAAiF;IACjF,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gEAAgE;IAChE,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC;IAE3E;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAC5B;;;;;;;;OAQG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,gEAAgE;IAChE,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAE/B,oEAAoE;IACpE,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC,2DAA2D;IAC3D,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC,uEAAuE;IACvE,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,kEAAkE;IAClE,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,8EAA8E;IAC9E,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,qCAAqC;AACrC,MAAM,WAAW,wBAAwB;IACvC,0BAA0B;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,mEAAmE;IACnE,gBAAgB,EAAE,oBAAoB,CAAC;IACvC,wEAAwE;IACxE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,4FAA4F;IAC5F,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B"}
+{"version":3,"file":"sdk-types.d.ts","sourceRoot":"","sources":["../../src/core/sdk-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EACX,oBAAoB,EACpB,oBAAoB,EACpB,iBAAiB,EACjB,cAAc,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,WAAW,yBAAyB;IACzC,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,oFAAoF;IACpF,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,iEAAiE;IACjE,KAAK,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,4FAA4F;IAC5F,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,gEAAgE;IAChE,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC;IAE3E;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAC5B;;;;;;;;OAQG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,gEAAgE;IAChE,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAE/B,oEAAoE;IACpE,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC,2DAA2D;IAC3D,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC,uEAAuE;IACvE,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,kEAAkE;IAClE,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,8EAA8E;IAC9E,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC5C;AAED,qCAAqC;AACrC,MAAM,WAAW,wBAAwB;IACxC,0BAA0B;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,mEAAmE;IACnE,gBAAgB,EAAE,oBAAoB,CAAC;IACvC,sEAAsE;IACtE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gFAAgF;IAChF,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC1C"}

package/dist/core/sdk-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-types.js","sourceRoot":"","sources":["../../src/core/sdk-types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { Api, Model } from \"@earendil-works/pi-ai/compat\";\nimport type { AuthStorage } from \"./auth-storage.ts\";\nimport type { ModelRegistry } from \"./model-registry.ts\";\nimport type { ResourceLoader } from \"./resource-loader.ts\";\nimport type { SessionManager } from \"./session-manager.ts\";\nimport type { SettingsManager } from \"./settings-manager.ts\";\nimport type { AgentSession } from \"./agent-session.ts\";\nimport type { LoadExtensionsResult, OrchestrationContext, SessionStartEvent, ToolDefinition } from \"./extensions/index.ts\";\n\nexport interface CreateAgentSessionOptions {\n  /** Working directory for project-local discovery. Default: process.cwd() */\n  cwd?: string;\n  /** Global config directory. Default: ~/.atomic/agent */\n  agentDir?: string;\n\n  /** Auth storage for credentials. Default: AuthStorage.create(agentDir/auth.json) */\n  authStorage?: AuthStorage;\n  /** Model registry. Default: ModelRegistry.create(authStorage, agentDir/models.json) */\n  modelRegistry?: ModelRegistry;\n\n  /** Model to use. Default: from settings, else first available */\n  model?: Model<Api>;\n  /** Thinking level. Default: from settings, else 'medium' (clamped to model capabilities) */\n  thinkingLevel?: ThinkingLevel;\n  /** Ordered fallback models for main chat, as provider/model strings with optional :thinkingLevel suffix. Default: settings.fallbackModels */\n  fallbackModels?: string[];\n  /** Context window token count. Default: model scalar contextWindow, or settings/session override when supported. */\n  contextWindow?: number;\n  /** Treat unsupported contextWindow as an error instead of a warning/fallback. */\n  contextWindowStrict?: boolean;\n  /** Models available for cycling (Ctrl+P in interactive mode) */\n  scopedModels?: Array<{ model: Model<Api>; thinkingLevel?: ThinkingLevel }>;\n\n  /**\n   * Optional default tool suppression mode when no explicit allowlist is provided.\n   *\n   * - \"all\": start with no tools enabled\n   * - \"builtin\": disable the default built-in tools (read, bash, edit, write,\n   *   find, search, ask_user_question, todo) but keep extension/custom tools enabled\n   */\n  noTools?: \"all\" | \"builtin\";\n  /**\n   * Optional allowlist of tool names.\n   *\n   * When omitted, pi enables the default built-in tools (read, bash, edit, write,\n   * find, search, ask_user_question, todo) and leaves extension/custom tools enabled unless\n   * `noTools` changes that default.\n   * When provided, only the listed tool names are enabled, minus any names in\n   * `excludedTools`.\n   */\n  tools?: string[];\n  /**\n   * Optional blocklist of tool names.\n   *\n   * Matching built-in, extension, and SDK custom tools are omitted from the\n   * final session tool registry and active tool set. Unknown names are ignored.\n   */\n  excludedTools?: string[];\n  /** Custom tools to register (in addition to built-in tools). */\n  customTools?: ToolDefinition[];\n\n  /** Resource loader. When omitted, DefaultResourceLoader is used. */\n  resourceLoader?: ResourceLoader;\n\n  /** Session manager. Default: SessionManager.create(cwd) */\n  sessionManager?: SessionManager;\n\n  /** Settings manager. Default: SettingsManager.create(cwd, agentDir) */\n  settingsManager?: SettingsManager;\n  /** Session start event metadata for extension runtime startup. */\n  sessionStartEvent?: SessionStartEvent;\n  /** Session-scoped orchestration policy exposed to extension/tool handlers. */\n  orchestrationContext?: OrchestrationContext;\n}\n\n/** Result from createAgentSession */\nexport interface CreateAgentSessionResult {\n  /** The created session */\n  session: AgentSession;\n  /** Extensions result (for UI context setup in interactive mode) */\n  extensionsResult: LoadExtensionsResult;\n  /** Warning if session was restored with a different model than saved */\n  modelFallbackMessage?: string;\n  /** Warning if a saved/default context window could not be applied to the selected model. */\n  contextWindowWarning?: string;\n  /** Error if an explicit strict context-window selection is unsupported. */\n  contextWindowError?: string;\n}\n\n"]}
+{"version":3,"file":"sdk-types.js","sourceRoot":"","sources":["../../src/core/sdk-types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { Api, Model } from \"@earendil-works/pi-ai/compat\";\nimport type { AgentSession } from \"./agent-session.ts\";\nimport type {\n\tLoadExtensionsResult,\n\tOrchestrationContext,\n\tSessionStartEvent,\n\tToolDefinition,\n} from \"./extensions/index.ts\";\nimport type { ModelFallbackReason } from \"./model-resolver-types.ts\";\nimport type { ModelRuntime } from \"./model-runtime.ts\";\nimport type { ResourceLoader } from \"./resource-loader.ts\";\nimport type { SessionManager } from \"./session-manager.ts\";\nimport type { SettingsManager } from \"./settings-manager.ts\";\n\nexport interface CreateAgentSessionOptions {\n\t/** Working directory for project-local discovery. Default: process.cwd() */\n\tcwd?: string;\n\t/** Global config directory. Default: ~/.atomic/agent */\n\tagentDir?: string;\n\n\t/** Canonical model/auth runtime. Defaults to agentDir/auth.json and models.json. */\n\tmodelRuntime?: ModelRuntime;\n\n\t/** Model to use. Default: from settings, else first available */\n\tmodel?: Model<Api>;\n\t/** Thinking level. Default: from settings, else 'medium' (clamped to model capabilities) */\n\tthinkingLevel?: ThinkingLevel;\n\t/**\n\t * Ordered fallback models as provider/model strings with optional :thinkingLevel suffix.\n\t * Used by main-chat turns and borrowed, planner-only, for compaction range planning when\n\t * the current model cannot produce a usable plan — so a configured candidate may receive\n\t * the compaction transcript. Borrowing never changes the session model or thinking level.\n\t * Default: settings.fallbackModels\n\t */\n\tfallbackModels?: string[];\n\t/** Models available for cycling (Ctrl+P in interactive mode) */\n\tscopedModels?: Array<{ model: Model<Api>; thinkingLevel?: ThinkingLevel }>;\n\n\t/**\n\t * Optional default tool suppression mode when no explicit allowlist is provided.\n\t *\n\t * - \"all\": start with no tools enabled\n\t * - \"builtin\": disable the default built-in tools (read, bash, edit, write,\n\t *   find, search, ask_user_question, todo) but keep extension/custom tools enabled\n\t */\n\tnoTools?: \"all\" | \"builtin\";\n\t/**\n\t * Optional allowlist of tool names.\n\t *\n\t * When omitted, pi enables the default built-in tools (read, bash, edit, write,\n\t * find, search, ask_user_question, todo) and leaves extension/custom tools enabled unless\n\t * `noTools` changes that default.\n\t * When provided, only the listed tool names are enabled, minus any names in\n\t * `excludedTools`.\n\t */\n\ttools?: string[];\n\t/**\n\t * Optional blocklist of tool names.\n\t *\n\t * Matching built-in, extension, and SDK custom tools are omitted from the\n\t * final session tool registry and active tool set. Unknown names are ignored.\n\t */\n\texcludedTools?: string[];\n\t/** Custom tools to register (in addition to built-in tools). */\n\tcustomTools?: ToolDefinition[];\n\n\t/** Resource loader. When omitted, DefaultResourceLoader is used. */\n\tresourceLoader?: ResourceLoader;\n\n\t/** Session manager. Default: SessionManager.create(cwd) */\n\tsessionManager?: SessionManager;\n\n\t/** Settings manager. Default: SettingsManager.create(cwd, agentDir) */\n\tsettingsManager?: SettingsManager;\n\t/** Session start event metadata for extension runtime startup. */\n\tsessionStartEvent?: SessionStartEvent;\n\t/** Session-scoped orchestration policy exposed to extension/tool handlers. */\n\torchestrationContext?: OrchestrationContext;\n}\n\n/** Result from createAgentSession */\nexport interface CreateAgentSessionResult {\n\t/** The created session */\n\tsession: AgentSession;\n\t/** Extensions result (for UI context setup in interactive mode) */\n\textensionsResult: LoadExtensionsResult;\n\t/** Warning when a restored or configured model cannot be selected. */\n\tmodelFallbackMessage?: string;\n\t/** Semantic reason for modelFallbackMessage; suitable for mode control flow. */\n\tmodelFallbackReason?: ModelFallbackReason;\n}\n"]}

package/dist/core/sdk.d.ts

@@ -1,6 +1,7 @@
 import type { CreateAgentSessionOptions, CreateAgentSessionResult } from "./sdk-types.ts";
-export type { CreateAgentSessionOptions, CreateAgentSessionResult } from "./sdk-types.ts";
+export type { ModelFallbackReason } from "./model-resolver-types.ts";
 export * from "./sdk-exports.ts";
+export type { CreateAgentSessionOptions, CreateAgentSessionResult } from "./sdk-types.ts";
 /**
  * Create an AgentSession with the specified options.
  *

package/dist/core/sdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/core/sdk.ts"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1F,YAAY,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1F,cAAc,kBAAkB,CAAC;AAuBjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAuYnC"}
+{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/core/sdk.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAM1F,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,cAAc,kBAAkB,CAAC;AACjC,YAAY,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAY1F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,GAAE,yBAA8B,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAsTnH"}

package/dist/core/sdk.js

@@ -1,44 +1,32 @@
 import { join } from "node:path";
-import { Agent, } from "@earendil-works/pi-agent-core";
-import { clampThinkingLevel, streamSimple, } from "@earendil-works/pi-ai/compat";
+import { Agent, setDefaultStreamFn } from "@earendil-works/pi-agent-core";
+import { clampThinkingLevel, streamSimple } from "@earendil-works/pi-ai/compat";
 import { getAgentDir } from "../config.js";
 import { resolvePath } from "../utils/paths.js";
 import { AgentSession } from "./agent-session.js";
+import { restoreAnthropicReplayThinkingBlocks } from "./anthropic-thinking-guard.js";
 import { formatNoModelsAvailableMessage } from "./auth-guidance.js";
-import { AuthStorage } from "./auth-storage.js";
 import { shouldApplyCodexFastMode, streamWithCodexFastMode, withCodexFastModePayload, withCodexFastModeStreamOptions, } from "./codex-fast-mode.js";
-import { restoreAnthropicReplayThinkingBlocks } from "./anthropic-thinking-guard.js";
-import { sanitizeCopilotGeminiPayload } from "./copilot-gemini-payload-sanitizer.js";
-import { restoreCopilotGeminiReasoningOpaque } from "./copilot-gemini-reasoning.js";
-import { normalizeCopilotGeminiReplayToolArguments } from "./copilot-gemini-tool-arguments.js";
-import { getModelDefaultContextWindow, getSupportedContextWindows, selectContextWindow } from "./context-window.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
-import { convertToLlm } from "./messages.js";
-import { ModelRegistry } from "./model-registry.js";
+import { convertToLlm, repairOrphanToolResults } from "./messages.js";
 import { findInitialModel, resolveRestoredModelReference } from "./model-resolver.js";
+import { ModelRuntime } from "./model-runtime.js";
+import { sanitizeOpenAIResponsesPayload } from "./openai-responses-payload-sanitizer.js";
+import { mergeProviderAttributionHeaders } from "./provider-attribution.js";
+import { scrubPreCompactionAssistantUsage } from "./provider-context-usage.js";
 import { DefaultResourceLoader } from "./resource-loader.js";
 import { getDefaultSessionDir, SessionManager } from "./session-manager.js";
 import { SettingsManager } from "./settings-manager.js";
-import { mergeProviderAttributionHeaders } from "./provider-attribution.js";
-import { sanitizeOpenAIResponsesPayload } from "./openai-responses-payload-sanitizer.js";
-import { scrubPreCompactionAssistantUsage } from "./provider-context-usage.js";
 import { time } from "./timings.js";
 import { defaultToolNames } from "./tools/index.js";
 export * from "./sdk-exports.js";
+// Preserve the pre-0.81 fallback for extensions that construct Agent instances
+// or invoke low-level agent loops without supplying streamFn.
+setDefaultStreamFn(streamSimple);
 // Helper Functions
 function getDefaultAgentDir() {
     return getAgentDir();
 }
-const COPILOT_CONTEXT_WINDOW_SELECTION_OPTIONS = { allowCopilotLongContextFallback: true };
-function getAlreadyAppliedContextWindow(model) {
-    const defaultContextWindow = getModelDefaultContextWindow(model);
-    if (model.contextWindow === defaultContextWindow) {
-        return undefined;
-    }
-    return getSupportedContextWindows(model).includes(model.contextWindow)
-        ? model.contextWindow
-        : undefined;
-}
 /**
  * Create an AgentSession with the specified options.
  *
@@ -78,23 +66,12 @@ export async function createAgentSession(options = {}) {
     const cwd = resolvePath(options.cwd ?? options.sessionManager?.getCwd() ?? process.cwd());
     const agentDir = options.agentDir ? resolvePath(options.agentDir) : getDefaultAgentDir();
     let resourceLoader = options.resourceLoader;
-    // Use provided or create AuthStorage and ModelRegistry. When a modelRegistry
-    // is supplied (e.g. a workflow stage reusing one registry across model
-    // fallback candidates), do NOT also build a fresh AuthStorage: its
-    // constructor eagerly calls reload(), which acquires the auth.json file lock
-    // and, under contention, can fail and leave an empty credential set. Reusing
-    // the supplied registry's already-loaded auth avoids that race (issue #1431).
     const authPath = options.agentDir ? join(agentDir, "auth.json") : undefined;
-    const modelsPath = options.agentDir
-        ? join(agentDir, "models.json")
-        : undefined;
-    const modelRegistry = options.modelRegistry ??
-        ModelRegistry.create(options.authStorage ?? AuthStorage.create(authPath), modelsPath);
-    // Restore persisted provider-owned catalogs before any synchronous model reads.
-    await modelRegistry.refresh({ allowNetwork: false });
+    const modelsPath = options.agentDir ? join(agentDir, "models.json") : undefined;
+    const modelRuntime = options.modelRuntime ?? (await ModelRuntime.create({ authPath, modelsPath }));
+    await modelRuntime.refresh({ allowNetwork: false });
     const settingsManager = options.settingsManager ?? SettingsManager.create(cwd, agentDir);
-    const sessionManager = options.sessionManager ??
-        SessionManager.create(cwd, getDefaultSessionDir(cwd, agentDir));
+    const sessionManager = options.sessionManager ?? SessionManager.create(cwd, getDefaultSessionDir(cwd, agentDir));
     // Mark workflow-created sessions as internal so they are excluded from the
     // standard `/resume` history while remaining resumable via `/workflow resume`.
     // Only stamped when the orchestration context identifies a workflow stage;
@@ -118,23 +95,20 @@ export async function createAgentSession(options = {}) {
     }
     // Check if session has existing data to restore
     const existingSession = sessionManager.buildSessionContext();
-    const hasExistingSession = existingSession.messages.length > 0;
-    const hasThinkingEntry = sessionManager
-        .getBranch()
-        .some((entry) => entry.type === "thinking_level_change");
+    const existingMessages = repairOrphanToolResults(existingSession.messages, { repairTrailing: true });
+    const hasExistingSession = existingMessages.length > 0;
+    const hasThinkingEntry = sessionManager.getBranch().some((entry) => entry.type === "thinking_level_change");
     let model = options.model;
     let modelFallbackMessage;
+    let modelFallbackReason;
     // If session has data, try to restore model from it
     if (!model && hasExistingSession && existingSession.model) {
-        const restoredModel = await resolveRestoredModelReference(existingSession.model.provider, existingSession.model.modelId, modelRegistry);
-        if (restoredModel && modelRegistry.hasConfiguredAuth(restoredModel)) {
-            model = restoredModel;
-        }
+        model = await resolveRestoredModelReference(existingSession.model.provider, existingSession.model.modelId, modelRuntime);
         if (!model) {
             modelFallbackMessage = `Could not restore model ${existingSession.model.provider}/${existingSession.model.modelId}`;
+            modelFallbackReason = "session-restore";
         }
     }
-    // If still no model, use findInitialModel (checks settings default, then provider defaults)
     if (!model) {
         const result = await findInitialModel({
             scopedModels: [],
@@ -142,11 +116,18 @@ export async function createAgentSession(options = {}) {
             defaultProvider: settingsManager.getDefaultProvider(),
             defaultModelId: settingsManager.getDefaultModel(),
             defaultThinkingLevel: settingsManager.getDefaultThinkingLevel(),
-            modelRegistry,
+            modelRuntime,
         });
         model = result.model;
         if (!model) {
-            modelFallbackMessage = formatNoModelsAvailableMessage();
+            if (result.fallbackReason === "configured-provider-unsupported") {
+                modelFallbackMessage = result.fallbackMessage;
+                modelFallbackReason = result.fallbackReason;
+            }
+            else if (!modelFallbackMessage) {
+                modelFallbackMessage = result.fallbackMessage ?? formatNoModelsAvailableMessage();
+                modelFallbackReason = result.fallbackReason ?? "no-models-available";
+            }
         }
         else if (modelFallbackMessage) {
             modelFallbackMessage += `. Using ${model.provider}/${model.id}`;
@@ -161,8 +142,7 @@ export async function createAgentSession(options = {}) {
     }
     // Fall back to settings default
     if (thinkingLevel === undefined) {
-        thinkingLevel =
-            settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
+        thinkingLevel = settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
     }
     // Clamp to model capabilities
     if (!model) {
@@ -171,40 +151,6 @@ export async function createAgentSession(options = {}) {
     else {
         thinkingLevel = clampThinkingLevel(model, thinkingLevel);
     }
-    let selectedContextWindow;
-    let contextWindowWarning;
-    let contextWindowError;
-    const explicitContextWindowSelection = options.contextWindow !== undefined;
-    const incomingModelContextWindow = model && options.model ? getAlreadyAppliedContextWindow(model) : undefined;
-    const sessionContextWindow = hasExistingSession ? existingSession.contextWindow : undefined;
-    const modelSettingsContextWindow = model ? settingsManager.getDefaultContextWindowForModel(model.provider, model.id) : undefined;
-    const globalSettingsContextWindow = settingsManager.getDefaultContextWindow();
-    const contextWindowRequest = options.contextWindow !== undefined
-        ? { contextWindow: options.contextWindow, source: "explicit" }
-        : incomingModelContextWindow !== undefined
-            ? { contextWindow: incomingModelContextWindow, source: "incoming-model" }
-            : sessionContextWindow !== undefined
-                ? { contextWindow: sessionContextWindow, source: "session" }
-                : modelSettingsContextWindow !== undefined
-                    ? { contextWindow: modelSettingsContextWindow, source: "model-settings" }
-                    : globalSettingsContextWindow !== undefined
-                        ? { contextWindow: globalSettingsContextWindow, source: "global-settings" }
-                        : undefined;
-    if (model && contextWindowRequest !== undefined) {
-        const selected = selectContextWindow(model, contextWindowRequest.contextWindow, COPILOT_CONTEXT_WINDOW_SELECTION_OPTIONS);
-        if ("error" in selected) {
-            if (options.contextWindowStrict) {
-                contextWindowError = selected.error;
-            }
-            else if (contextWindowRequest.source !== "global-settings") {
-                contextWindowWarning = selected.error;
-            }
-        }
-        else {
-            model = selected.model;
-            selectedContextWindow = selected.contextWindow;
-        }
-    }
     const allowedToolNames = options.tools ?? (options.noTools === "all" ? [] : undefined);
     const initialActiveToolNames = options.tools
         ? [...options.tools]
@@ -241,8 +187,7 @@ export async function createAgentSession(options = {}) {
                             c.text === "Image reading is disabled." &&
                             i > 0 &&
                             arr[i - 1].type === "text" &&
-                            arr[i - 1].text ===
-                                "Image reading is disabled."));
+                            arr[i - 1].text === "Image reading is disabled."));
                         return { ...msg, content: filteredContent };
                     }
                 }
@@ -263,13 +208,17 @@ export async function createAgentSession(options = {}) {
         },
         convertToLlm: convertToLlmWithBlockImages,
         streamFn: async (model, context, streamOptions) => {
-            const auth = await modelRegistry.getApiKeyAndHeaders(model);
-            if (!auth.ok) {
-                throw new Error(auth.error);
+            const authResult = await modelRuntime.getAuth(model);
+            const compatibility = authResult ? undefined : modelRuntime.getCompatibilityRequestConfig(model);
+            if (!authResult && compatibility?.authHeader) {
+                throw new Error(`No API key found for "${model.provider}"`);
             }
-            const requestModel = auth.baseUrl !== undefined && auth.baseUrl !== model.baseUrl
-                ? { ...model, baseUrl: auth.baseUrl }
-                : model;
+            const auth = {
+                apiKey: authResult?.auth.apiKey,
+                headers: authResult?.auth.headers ?? compatibility?.headers,
+                baseUrl: authResult?.auth.baseUrl,
+            };
+            const requestModel = auth.baseUrl !== undefined && auth.baseUrl !== model.baseUrl ? { ...model, baseUrl: auth.baseUrl } : model;
             const providerRetrySettings = settingsManager.getProviderRetrySettings();
             const httpIdleTimeoutMs = settingsManager.getHttpIdleTimeoutMs();
             // SDKs treat timeout=0 as 0ms (immediate timeout), not "no timeout".
@@ -277,8 +226,17 @@ export async function createAgentSession(options = {}) {
             const effectiveTimeoutMs = httpIdleTimeoutMs === 0 ? 2147483647 : httpIdleTimeoutMs;
             const timeoutMs = streamOptions?.timeoutMs ?? providerRetrySettings.timeoutMs ?? effectiveTimeoutMs;
             const websocketConnectTimeoutMs = streamOptions?.websocketConnectTimeoutMs ?? settingsManager.getWebSocketConnectTimeoutMs();
-            const attributionHeaders = mergeProviderAttributionHeaders(model, settingsManager, streamOptions?.sessionId, auth.headers, streamOptions?.headers);
+            const mergedHeaders = mergeProviderAttributionHeaders(model, settingsManager, streamOptions?.sessionId, auth.headers, streamOptions?.headers);
+            const headerRunner = extensionRunnerRef.current;
+            const attributionHeaders = headerRunner?.hasHandlers("before_provider_headers")
+                ? await headerRunner.emitBeforeProviderHeaders(mergedHeaders ?? {})
+                : mergedHeaders;
             const fastModeEnabled = isCodexFastModeEnabled(model);
+            const extensionProvider = modelRuntime.getRegisteredProviderConfig(requestModel.provider);
+            const usesExtensionStream = extensionProvider?.streamSimple !== undefined && requestModel.api === extensionProvider.api;
+            if (fastModeEnabled && !usesExtensionStream && !authResult) {
+                throw new Error(`No API key found for "${model.provider}"`);
+            }
             const codexFastModeStreamOptions = withCodexFastModeStreamOptions({
                 ...streamOptions,
                 apiKey: auth.apiKey,
@@ -288,10 +246,12 @@ export async function createAgentSession(options = {}) {
                 maxRetryDelayMs: streamOptions?.maxRetryDelayMs ?? providerRetrySettings.maxRetryDelayMs,
                 headers: attributionHeaders,
             }, fastModeEnabled);
-            if (modelRegistry.hasRegisteredStreamSimpleForApi(requestModel.api)) {
-                return streamSimple(requestModel, context, codexFastModeStreamOptions);
+            if (usesExtensionStream) {
+                return modelRuntime.streamSimple(requestModel, context, codexFastModeStreamOptions);
             }
-            return streamWithCodexFastMode(requestModel, context, codexFastModeStreamOptions);
+            return fastModeEnabled
+                ? streamWithCodexFastMode(requestModel, context, codexFastModeStreamOptions)
+                : modelRuntime.streamSimple(requestModel, context, codexFastModeStreamOptions);
         },
         onPayload: async (payload, model) => {
             const fastModeEnabled = isCodexFastModeEnabled(model);
@@ -311,26 +271,7 @@ export async function createAgentSession(options = {}) {
                     ? restoreAnthropicReplayThinkingBlocks(extensionPayload, sourceMessages, model)
                     : extensionPayload;
             }
-            // GitHub Copilot Gemini models are served through CAPI, which translates
-            // the OpenAI request into Google GenAI and rejects tool schemas whose
-            // `anyOf`/`oneOf` wraps a complex object (HTTP 400 invalid request body).
-            // Sanitize tool JSON Schemas into Gemini's supported subset. No-op for
-            // every other provider/model, and runs last so it also covers tools
-            // injected by `before_provider_request` extensions.
-            const schemaSanitized = sanitizeCopilotGeminiPayload(finalPayload, model);
-            // Reconstruct flattened tool-call arguments on replayed assistant
-            // messages (for example `edits[0].newText` -> `edits: [{ newText }]`).
-            // CAPI parses replayed arguments straight into Gemini's FunctionCall,
-            // and a flattened/malformed prior call ends the next turn with
-            // `finish_reason: "error"`. No-op for well-formed args / other models.
-            const replayArgsNormalized = normalizeCopilotGeminiReplayToolArguments(schemaSanitized, model);
-            // CAPI carries Gemini thought signatures in a `reasoning_opaque` field it
-            // reads back off the assistant message on replay. Convert the
-            // `reasoning_details` the client re-emits (captured inbound by the SSE
-            // interceptor) into that field so multi-turn tool use keeps its thought
-            // signature instead of dying on an empty completion. No-op otherwise.
-            const reasoningRestored = restoreCopilotGeminiReasoningOpaque(replayArgsNormalized, model);
-            return sanitizeOpenAIResponsesPayload(reasoningRestored, model);
+            return sanitizeOpenAIResponsesPayload(finalPayload, model);
         },
         onResponse: async (response, _model) => {
             const runner = extensionRunnerRef.current;
@@ -357,14 +298,7 @@ export async function createAgentSession(options = {}) {
     });
     // Restore messages if session has existing data
     if (hasExistingSession) {
-        agent.state.messages = existingSession.messages;
-        const transcriptContextWindow = model
-            ? (existingSession.contextWindow ?? getModelDefaultContextWindow(model))
-            : undefined;
-        if (selectedContextWindow !== undefined &&
-            (explicitContextWindowSelection || selectedContextWindow !== transcriptContextWindow)) {
-            sessionManager.appendContextWindowChange(selectedContextWindow);
-        }
+        agent.state.messages = existingMessages;
         if (!hasThinkingEntry) {
             sessionManager.appendThinkingLevelChange(thinkingLevel);
         }
@@ -373,10 +307,6 @@ export async function createAgentSession(options = {}) {
         // Save initial model and thinking level for new sessions so they can be restored on resume
         if (model) {
             sessionManager.appendModelChange(model.provider, model.id);
-            if (selectedContextWindow !== undefined &&
-                (explicitContextWindowSelection || selectedContextWindow !== getModelDefaultContextWindow(model))) {
-                sessionManager.appendContextWindowChange(selectedContextWindow);
-            }
         }
         sessionManager.appendThinkingLevelChange(thinkingLevel);
     }
@@ -389,7 +319,7 @@ export async function createAgentSession(options = {}) {
         fallbackModels: options.fallbackModels ?? settingsManager.getFallbackModels(),
         resourceLoader,
         customTools: options.customTools,
-        modelRegistry,
+        modelRuntime,
         initialActiveToolNames,
         allowedToolNames,
         excludedToolNames: options.excludedTools,
@@ -402,8 +332,7 @@ export async function createAgentSession(options = {}) {
         session,
         extensionsResult,
         modelFallbackMessage,
-        contextWindowWarning,
-        contextWindowError,
+        modelFallbackReason,
     };
 }
 //# sourceMappingURL=sdk.js.map