@astralyn/pi 1.2.0 → 1.3.0

package/dist/core/export-html/template.js

@@ -575,15 +575,7 @@
         switch (name) {
           case 'read': {
             const path = shortenPath(String(args.path || args.file_path || ''));
-            const offset = args.offset;
-            const limit = args.limit;
-            let display = path;
-            if (offset !== undefined || limit !== undefined) {
-              const start = offset ?? 1;
-              const end = limit !== undefined ? start + limit - 1 : '';
-              display += `:${start}${end ? `-${end}` : ''}`;
-            }
-            return `[read: ${display}]`;
+            return `[read: ${path}${formatReadLineRange(args.offset, args.limit)}]`;
           }
           case 'write':
             return `[write: ${shortenPath(String(args.path || args.file_path || ''))}]`;
@@ -825,6 +817,23 @@
         return null;
       }
 
+      // Mirrors ../tools/render-utils.ts.
+      function parseLineNumber(value) {
+        if (typeof value === 'string' && value.trim() !== '') value = Number(value);
+        return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+      }
+
+      function formatReadLineRange(offset, limit) {
+        if (offset == null && limit == null) return '';
+        const start = offset == null ? 1 : parseLineNumber(offset);
+        if (start === undefined) return '';
+        if (limit == null) return `:${start}`;
+        const count = parseLineNumber(limit);
+        if (count === undefined) return '';
+        const end = start + count - 1;
+        return `:${start}${end ? `-${end}` : ''}`;
+      }
+
       function getLanguageFromPath(filePath) {
         const ext = filePath.split('.').pop()?.toLowerCase();
         const extToLang = {
@@ -965,14 +974,10 @@
           }
           case 'read': {
             const filePath = str(args.file_path ?? args.path);
-            const offset = args.offset;
-            const limit = args.limit;
-
+            const readLineRange = formatReadLineRange(args.offset, args.limit);
             let pathHtml = filePath === null ? invalidArg : escapeHtml(shortenPath(filePath || ''));
-            if (filePath !== null && (offset !== undefined || limit !== undefined)) {
-              const startLine = offset ?? 1;
-              const endLine = limit !== undefined ? startLine + limit - 1 : '';
-              pathHtml += `<span class="line-numbers">:${startLine}${endLine ? '-' + endLine : ''}</span>`;
+            if (filePath !== null && readLineRange) {
+              pathHtml += `<span class="line-numbers">${escapeHtml(readLineRange)}</span>`;
             }
 
             html += `<div class="tool-header"><span class="tool-name">read</span> <span class="tool-path">${pathHtml}</span></div>`;

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

@@ -142,6 +142,7 @@ declare const ModelDefinitionSchema: Type.TObject<{
         supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
         supportsToolSearch: Type.TOptional<Type.TBoolean>;
         supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
     } & {
         supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -177,10 +178,11 @@ declare const ModelDefinitionSchema: Type.TObject<{
         supportsStrictMode: Type.TOptional<Type.TBoolean>;
     } & {
         supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-    }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+    }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
         supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
         supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
         supportsStrictMode: Type.TOptional<Type.TBoolean>;
         supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
@@ -323,6 +325,7 @@ declare const ModelOverrideSchema: Type.TObject<{
         supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
         supportsToolSearch: Type.TOptional<Type.TBoolean>;
         supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
     } & {
         supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -358,10 +361,11 @@ declare const ModelOverrideSchema: Type.TObject<{
         supportsStrictMode: Type.TOptional<Type.TBoolean>;
     } & {
         supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-    }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+    }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
         supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
         supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
         supportsStrictMode: Type.TOptional<Type.TBoolean>;
         supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
@@ -455,6 +459,7 @@ declare const ProviderConfigSchema: Type.TObject<{
         supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
         supportsToolSearch: Type.TOptional<Type.TBoolean>;
         supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
     } & {
         supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -490,10 +495,11 @@ declare const ProviderConfigSchema: Type.TObject<{
         supportsStrictMode: Type.TOptional<Type.TBoolean>;
     } & {
         supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-    }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+    }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
         supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
         supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
         sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+        supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
         supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
         supportsStrictMode: Type.TOptional<Type.TBoolean>;
         supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
@@ -639,6 +645,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
             supportsToolSearch: Type.TOptional<Type.TBoolean>;
             supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
         } & {
             supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -674,10 +681,11 @@ declare const ProviderConfigSchema: Type.TObject<{
             supportsStrictMode: Type.TOptional<Type.TBoolean>;
         } & {
             supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-        }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+        }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
             supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
             supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
             sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
             supportsStrictMode: Type.TOptional<Type.TBoolean>;
             supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
@@ -820,6 +828,7 @@ declare const ProviderConfigSchema: Type.TObject<{
             supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
             supportsToolSearch: Type.TOptional<Type.TBoolean>;
             supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
         } & {
             supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -855,10 +864,11 @@ declare const ProviderConfigSchema: Type.TObject<{
             supportsStrictMode: Type.TOptional<Type.TBoolean>;
         } & {
             supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-        }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+        }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
             supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
             supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
             sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
             supportsStrictMode: Type.TOptional<Type.TBoolean>;
             supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
@@ -954,6 +964,7 @@ export declare const ModelsConfigSchema: Type.TObject<{
             supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
             supportsToolSearch: Type.TOptional<Type.TBoolean>;
             supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
         } & {
             supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -989,10 +1000,11 @@ export declare const ModelsConfigSchema: Type.TObject<{
             supportsStrictMode: Type.TOptional<Type.TBoolean>;
         } & {
             supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-        }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+        }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
             supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
             supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
             sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+            supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
             supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
             supportsStrictMode: Type.TOptional<Type.TBoolean>;
             supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
@@ -1138,6 +1150,7 @@ export declare const ModelsConfigSchema: Type.TObject<{
                 supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
                 supportsToolSearch: Type.TOptional<Type.TBoolean>;
                 supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+                supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
                 supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
             } & {
                 supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -1173,10 +1186,11 @@ export declare const ModelsConfigSchema: Type.TObject<{
                 supportsStrictMode: Type.TOptional<Type.TBoolean>;
             } & {
                 supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-            }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+            }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
                 supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
                 supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
                 sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+                supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
                 supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
                 supportsStrictMode: Type.TOptional<Type.TBoolean>;
                 supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;
@@ -1319,6 +1333,7 @@ export declare const ModelsConfigSchema: Type.TObject<{
                 supportsAdditionalTools: Type.TOptional<Type.TBoolean>;
                 supportsToolSearch: Type.TOptional<Type.TBoolean>;
                 supportsExplicitPromptCacheMode: Type.TOptional<Type.TBoolean>;
+                supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
                 supportsMaxOutputTokens: Type.TOptional<Type.TBoolean>;
             } & {
                 supportsEagerToolInputStreaming: Type.TOptional<Type.TBoolean>;
@@ -1354,10 +1369,11 @@ export declare const ModelsConfigSchema: Type.TObject<{
                 supportsStrictMode: Type.TOptional<Type.TBoolean>;
             } & {
                 supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
-            }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention"> & {
+            }, "supportsDeveloperRole" | "supportsOpenAIGrammarTools" | "supportsMidConvoSystemMessages" | "supportsStrictMode" | "sendSessionAffinityHeaders" | "sessionAffinityFormat" | "supportsLongCacheRetention" | "supportsMidConvoEffort"> & {
                 supportsDeveloperRole: Type.TOptional<Type.TBoolean>;
                 supportsMidConvoSystemMessages: Type.TOptional<Type.TBoolean>;
                 sessionAffinityFormat: Type.TOptional<Type.TUnion<[Type.TLiteral<"openai">, Type.TLiteral<"openai-nosession">, Type.TLiteral<"openrouter">]>>;
+                supportsMidConvoEffort: Type.TOptional<Type.TBoolean>;
                 supportsLongCacheRetention: Type.TOptional<Type.TBoolean>;
                 supportsStrictMode: Type.TOptional<Type.TBoolean>;
                 supportsOpenAIGrammarTools: Type.TOptional<Type.TBoolean>;

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

@@ -1 +1 @@
-{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/core/model-config.ts"],"names":[],"mappings":"AAAA,wDAAwD;AAGxD,OAAO,EAAE,6BAA6B,EAAwB,MAAM,+CAA+C,CAAC;AAQpH,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAkB5C,oHAAoH;AACpH,OAAO,EAAE,6BAA6B,EAAE,CAAC;AAIzC,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBzB,CAAC;AAEH,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcvB,CAAC;AAEH,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWxB,CAAC;AAMH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG7B,CAAC;AAIH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACnE,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AACzE,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAqBrE,yCAAyC;AACzC,qBAAa,WAAW;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0C;IACpE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAE3C,OAAO;WAKM,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAwC3E,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI/D,cAAc,IAAI,SAAS,MAAM,EAAE;IAInC,QAAQ,IAAI,MAAM,GAAG,SAAS;CAG9B"}
+{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/core/model-config.ts"],"names":[],"mappings":"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"}

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

@@ -11,48 +11,57 @@ export interface ScopedModel {
     /** Thinking level if explicitly specified in pattern (e.g., "model:high"), undefined otherwise */
     thinkingLevel?: ThinkingLevel;
 }
-/**
- * Find an exact model reference match.
- * Supports either a bare model id or a canonical provider/modelId reference.
- * When matching by bare id, ambiguous matches across providers are rejected.
- */
-export declare function findExactModelReferenceMatch(modelReference: string, availableModels: Model<Api>[]): Model<Api> | undefined;
-export interface ParsedModelResult {
-    model: Model<Api> | undefined;
-    /** Thinking level if explicitly specified in pattern, undefined otherwise */
+export interface ModelReferenceRequest {
+    /** Bare model id or `provider/id`, optionally followed by `:<thinking>`. */
+    text: string;
+    /** Only consider models from this provider. */
+    provider?: string;
+    /**
+     * A trailing `:<suffix>` is only considered when the full text matches no model, since ids such as
+     * OpenRouter's `qwen/qwen3-coder:exacto` contain colons.
+     * - `none`: the suffix stays part of the id
+     * - `strict`: a valid thinking level is parsed; any other suffix stays part of the id
+     * - `lenient`: like `strict`, but an invalid suffix is dropped with a warning
+     */
+    thinkingSuffix: "none" | "strict" | "lenient";
+    /** Match id and name substrings when no exact match exists. */
+    fuzzy: boolean;
+}
+export type ModelReferenceResult = {
+    status: "resolved";
+    model: Model<Api>;
+    thinkingLevel?: ThinkingLevel;
+    warning?: string;
+} | {
+    status: "ambiguous";
+    candidates: Model<Api>[];
+    usableCount: number;
+    thinkingLevel?: ThinkingLevel;
+    warning?: string;
+} | {
+    status: "not-found";
+    /** Set when a provider is explicit or named by a `provider/` prefix, for building a custom model id. */
+    target?: ModelReferenceTarget;
+};
+export interface ModelReferenceTarget {
+    provider: string;
+    providerModels: [Model<Api>, ...Model<Api>[]];
+    /** Text after the provider prefix as typed, including any `:<suffix>`. */
+    modelText: string;
+    /** `modelText` without a valid thinking suffix (unless `thinkingSuffix` is `none`). */
+    modelId: string;
     thinkingLevel?: ThinkingLevel;
-    warning: string | undefined;
 }
 /**
- * Parse a pattern to extract model and thinking level.
- * Handles models with colons in their IDs (e.g., OpenRouter's :exacto suffix).
- *
- * Algorithm:
- * 1. Try to match full pattern as a model
- * 2. If found, return it with "off" thinking level
- * 3. If not found and has colons, split on last colon:
- *    - If suffix is valid thinking level, use it and recurse on prefix
- *    - If suffix is invalid, warn and recurse on prefix with "off"
- *
- * @internal Exported for testing
- */
-export declare function parseModelPattern(pattern: string, availableModels: Model<Api>[], options?: {
-    allowInvalidThinkingLevelFallback?: boolean;
-}): ParsedModelResult;
-/**
- * Resolve model patterns to actual Model objects with optional thinking levels
- * Format: "pattern:level" where :level is optional
- * For each pattern, finds all matching models and picks the best version:
- * 1. Prefer alias (e.g., claude-sonnet-4-5) over dated versions (claude-sonnet-4-5-20250929)
- * 2. If no alias, pick the latest dated version
- *
- * Supports models with colons in their IDs (e.g., OpenRouter's model:exacto).
- * The algorithm tries to match the full pattern first, then progressively
- * strips colon-suffixes to find a match.
+ * `usable` only breaks ties between providers, so a unique match resolves even without credentials
+ * (`--api-key` first-time setup).
  */
+export declare function resolveModelReference(request: ModelReferenceRequest, models: readonly Model<Api>[], usable: (provider: string) => boolean): ModelReferenceResult;
+/** Exact `provider/id` or bare id lookup without thinking suffixes or fuzzy matching. */
+export declare function findExactModelReferenceMatch(modelReference: string, models: readonly Model<Api>[]): Model<Api> | undefined;
 export interface ModelScopeDiagnostic {
     type: "warning";
-    code: "no-match" | "invalid-thinking-level";
+    code: "no-match" | "invalid-thinking-level" | "ambiguous";
     message: string;
     pattern: string;
 }
@@ -60,6 +69,12 @@ export interface ResolveModelScopeResult {
     scopedModels: ScopedModel[];
     diagnostics: ModelScopeDiagnostic[];
 }
+/**
+ * Resolve scope patterns (`--models`, `enabledModels`) to models with optional thinking levels.
+ *
+ * Every model in `models` is usable, so credentials cannot choose between providers offering the same
+ * id. All of them are added, with a warning so the user can pick one with `provider/id`.
+ */
 export declare function resolveModelScopeFromModels(patterns: string[], models: readonly Model<Api>[]): ResolveModelScopeResult;
 export declare function resolveModelScopeWithDiagnostics(patterns: string[], modelRuntime: ModelRuntime, options?: AuthOperationOptions): Promise<ResolveModelScopeResult>;
 export declare function resolveModelScope(patterns: string[], modelRuntime: ModelRuntime, options?: AuthOperationOptions): Promise<ScopedModel[]>;
@@ -88,6 +103,8 @@ export declare function resolveCliModel(options: {
     cliProvider?: string;
     cliModel?: string;
     cliThinking?: ThinkingLevel;
+    /** `--api-key` was supplied for the selected provider. */
+    inlineApiKey?: boolean;
     modelRuntime: ModelRuntime;
 }): ResolveCliModelResult;
 export interface InitialModelResult {
@@ -97,15 +114,11 @@ export interface InitialModelResult {
 }
 /**
  * Find the initial model to use based on priority:
- * 1. CLI args (provider + model)
- * 2. First model from scoped models (if not continuing/resuming)
- * 3. Restored from session (if continuing/resuming)
- * 4. Saved default from settings
- * 5. First available model with valid API key
+ * 1. First model from scoped models (if not continuing/resuming)
+ * 2. Saved default from settings
+ * 3. First available model with valid API key
  */
 export declare function findInitialModel(options: {
-    cliProvider?: string;
-    cliModel?: string;
     scopedModels: ScopedModel[];
     isContinuing: boolean;
     defaultProvider?: string;

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":"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"}
+{"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/core/model-resolver.ts"],"names":[],"mappings":"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"}