@qduc/term2 0.19.0 → 0.21.0

package/dist/services/model-service.js

@@ -1,14 +1,128 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import envPaths from 'env-paths';
 import { scoreSubsequence } from '../utils/subsequence-filter.js';
 import { getProvider } from '../providers/index.js';
 import { getModelContextWindow } from '../providers/model-catalog/catalog.js';
+export const MODEL_CACHE_TTL_MS = 60 * 60 * 1000; // 1 hour
 const cache = new Map();
+let testCacheDir = null;
+let testClock = null;
+export function setModelCacheDirForTest(dir) {
+    testCacheDir = dir;
+}
+export function setModelCacheClockForTest(clock) {
+    testClock = clock;
+}
+export function clearModelMemoryCacheForTest() {
+    cache.clear();
+}
+export function getModelCacheDir(customDir) {
+    const baseDir = customDir || testCacheDir || process.env.TERM2_CACHE_DIR || envPaths('term2').cache;
+    return path.join(baseDir, 'models');
+}
+export function getModelCacheFilePath(provider, customDir) {
+    const safeName = provider.replace(/[^a-zA-Z0-9-]/g, (c) => `_${c.charCodeAt(0).toString(16).padStart(2, '0')}_`);
+    return path.join(getModelCacheDir(customDir), `${safeName}.json`);
+}
+function readDiskCache(provider, cacheDir, nowFn, ttlMs = MODEL_CACHE_TTL_MS, loggingService) {
+    try {
+        const filePath = getModelCacheFilePath(provider, cacheDir);
+        if (!fs.existsSync(filePath)) {
+            return null;
+        }
+        const raw = fs.readFileSync(filePath, 'utf-8');
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== 'object') {
+            return null;
+        }
+        if (parsed.version !== 1) {
+            return null;
+        }
+        if (parsed.provider !== provider) {
+            return null;
+        }
+        if (typeof parsed.timestamp !== 'number' || !Number.isFinite(parsed.timestamp)) {
+            return null;
+        }
+        const now = nowFn ?? testClock ?? Date.now;
+        const currentTime = now();
+        const age = currentTime - parsed.timestamp;
+        if (age < 0 || age >= ttlMs) {
+            return null;
+        }
+        if (!Array.isArray(parsed.models)) {
+            return null;
+        }
+        for (const m of parsed.models) {
+            if (!m || typeof m !== 'object' || typeof m.id !== 'string') {
+                return null;
+            }
+        }
+        return parsed.models;
+    }
+    catch (error) {
+        loggingService?.debug?.('Failed to read model disk cache', { provider, error: String(error) });
+        return null;
+    }
+}
+function writeDiskCache(provider, models, cacheDir, nowFn, loggingService) {
+    const dir = getModelCacheDir(cacheDir);
+    const targetFile = getModelCacheFilePath(provider, cacheDir);
+    const baseName = path.basename(targetFile, '.json');
+    const tempFile = path.join(dir, `.${baseName}.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2)}.tmp`);
+    let tempCreated = false;
+    try {
+        fs.mkdirSync(dir, { recursive: true });
+        const now = nowFn ?? testClock ?? Date.now;
+        const payload = {
+            version: 1,
+            provider,
+            timestamp: now(),
+            models,
+        };
+        const content = JSON.stringify(payload);
+        const fd = fs.openSync(tempFile, 'wx');
+        tempCreated = true;
+        try {
+            fs.writeFileSync(fd, content, 'utf-8');
+            fs.fsyncSync(fd);
+        }
+        finally {
+            fs.closeSync(fd);
+        }
+        fs.renameSync(tempFile, targetFile);
+        tempCreated = false;
+    }
+    catch (error) {
+        loggingService?.warn('Failed to write model disk cache', { provider, error: String(error) });
+    }
+    finally {
+        if (tempCreated) {
+            try {
+                fs.unlinkSync(tempFile);
+            }
+            catch {
+                // Best-effort cleanup of temp file
+            }
+        }
+    }
+}
 export async function fetchModels(deps, providerOverride, fetchImpl = fetch) {
     const { settingsService, loggingService } = deps;
     const provider = providerOverride || settingsService.get('agent.provider');
     const cacheKey = provider;
+    // 1. In-memory cache hit
     if (cache.has(cacheKey)) {
         return cache.get(cacheKey);
     }
+    // 2. Disk cache hit
+    const diskCached = readDiskCache(provider, deps.cacheDir, deps.now, deps.ttlMs, loggingService);
+    if (diskCached) {
+        cache.set(cacheKey, diskCached);
+        return diskCached;
+    }
+    // 3. Cache miss: fetch from provider
     try {
         const providerDef = getProvider(provider);
         if (!providerDef) {
@@ -21,6 +135,7 @@ export async function fetchModels(deps, providerOverride, fetchImpl = fetch) {
             contextWindow: getModelContextWindow(provider, m.id),
         }));
         cache.set(cacheKey, models);
+        writeDiskCache(provider, models, deps.cacheDir, deps.now, loggingService);
         return models;
     }
     catch (error) {
@@ -42,13 +157,45 @@ export async function fetchModels(deps, providerOverride, fetchImpl = fetch) {
         throw error;
     }
 }
-export function clearModelCache(provider) {
+export function clearModelCache(provider, opts) {
     if (provider) {
         cache.delete(provider);
     }
     else {
         cache.clear();
     }
+    try {
+        const dir = getModelCacheDir(opts?.cacheDir);
+        if (provider) {
+            const targetFile = getModelCacheFilePath(provider, opts?.cacheDir);
+            if (fs.existsSync(targetFile)) {
+                try {
+                    fs.unlinkSync(targetFile);
+                }
+                catch {
+                    // ignore
+                }
+            }
+        }
+        else {
+            if (fs.existsSync(dir)) {
+                const files = fs.readdirSync(dir);
+                for (const file of files) {
+                    if (file.endsWith('.json') || file.endsWith('.tmp')) {
+                        try {
+                            fs.unlinkSync(path.join(dir, file));
+                        }
+                        catch {
+                            // ignore
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch {
+        // Disk cache clearing is best-effort and must not throw
+    }
 }
 export function getModelDefaultReasoningLevel(provider, modelId) {
     const models = cache.get(provider);

package/dist/services/model-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-service.js","sourceRoot":"","sources":["../../source/services/model-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-service.js","sourceRoot":"","sources":["../../source/services/model-service.ts"],"names":[],"mappings":"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"}

package/dist/services/models/model-catalog-session.d.ts

@@ -1,6 +1,8 @@
 import { type ModelInfo } from '../model-service.js';
 import type { ILoggingService, ISettingsService } from '../service-interfaces.js';
 export type ModelFetcher = (provider: string) => Promise<ModelInfo[]>;
+/** Provider ids that have credentials, ordered by providerOrder (then registry order). */
+export declare const orderedProviderIds: (settingsService: ISettingsService, providerIds: string[]) => string[];
 /** Owns model-catalog traversal, per-open caching, failed-provider suppression, and stale loads. */
 export declare class ModelCatalogSession {
     #private;
@@ -8,6 +10,10 @@ export declare class ModelCatalogSession {
         settingsService: ISettingsService;
         loggingService: ILoggingService;
         fetcher?: ModelFetcher;
+        signal?: AbortSignal;
+        cacheDir?: string;
+        now?: () => number;
+        ttlMs?: number;
     });
     getCached(provider: string): ModelInfo[] | undefined;
     load(provider: string): Promise<{

package/dist/services/models/model-catalog-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-catalog-session.d.ts","sourceRoot":"","sources":["../../../source/services/models/model-catalog-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEnF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAGlF,MAAM,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AAEtE,oGAAoG;AACpG,qBAAa,mBAAmB;;IAQ9B,YAAY,IAAI,EAAE;QAAE,eAAe,EAAE,gBAAgB,CAAC;QAAC,cAAc,EAAE,eAAe,CAAC;QAAC,OAAO,CAAC,EAAE,YAAY,CAAA;KAAE,EAI/G;IAED,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,SAAS,CAEnD;IAEK,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;QAAC,MAAM,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC,CAgBlG;IAED,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,OAAO,CAE3D;IAED,KAAK,IAAI,IAAI,CAGZ;IAED,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE9B;IAED,gFAAgF;IAChF,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAKjC;IAED,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAUnF;IAED,KAAK,IAAI,IAAI,CAIZ;CACF"}
+{"version":3,"file":"model-catalog-session.d.ts","sourceRoot":"","sources":["../../../source/services/models/model-catalog-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEnF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAGlF,MAAM,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AAEtE,0FAA0F;AAC1F,eAAO,MAAM,kBAAkB,oBAAqB,gBAAgB,eAAe,MAAM,EAAE,KAAG,MAAM,EAInG,CAAC;AAEF,oGAAoG;AACpG,qBAAa,mBAAmB;;IAQ9B,YAAY,IAAI,EAAE;QAChB,eAAe,EAAE,gBAAgB,CAAC;QAClC,cAAc,EAAE,eAAe,CAAC;QAChC,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,EAIA;IAED,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,SAAS,CAEnD;IAEK,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;QAAC,MAAM,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC,CAgBlG;IAED,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,OAAO,CAE3D;IAED,KAAK,IAAI,IAAI,CAGZ;IAED,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE9B;IAED,gFAAgF;IAChF,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAKjC;IAED,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAQnF;IAED,KAAK,IAAI,IAAI,CAIZ;CACF"}

package/dist/services/models/model-catalog-session.js

@@ -1,6 +1,12 @@
 import { clearModelCache, fetchModels } from '../model-service.js';
 import { getProviderIds, sortProvidersByOrder } from '../../providers/index.js';
 import { getAvailableProviderIds } from '../../utils/ai/provider-credentials.js';
+/** Provider ids that have credentials, ordered by providerOrder (then registry order). */
+export const orderedProviderIds = (settingsService, providerIds) => {
+    const ids = getAvailableProviderIds(settingsService, providerIds);
+    const order = settingsService.getDynamic('providerOrder') ?? [];
+    return order.length > 0 ? sortProvidersByOrder(ids, order) : ids;
+};
 /** Owns model-catalog traversal, per-open caching, failed-provider suppression, and stale loads. */
 export class ModelCatalogSession {
     #settingsService;
@@ -56,9 +62,7 @@ export class ModelCatalogSession {
         clearModelCache(provider);
     }
     nextProvider(current, direction) {
-        const ids = getAvailableProviderIds(this.#settingsService, getProviderIds());
-        const order = this.#settingsService.getDynamic('providerOrder') ?? [];
-        const ordered = order.length > 0 ? sortProvidersByOrder(ids, order) : ids;
+        const ordered = orderedProviderIds(this.#settingsService, getProviderIds());
         if (ordered.length === 0)
             return undefined;
         const currentIndex = ordered.indexOf(current ?? '');

package/dist/services/models/model-catalog-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-catalog-session.js","sourceRoot":"","sources":["../../../source/services/models/model-catalog-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-catalog-session.js","sourceRoot":"","sources":["../../../source/services/models/model-catalog-session.ts"],"names":[],"mappings":"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"}

package/dist/services/models/model-listing.d.ts

@@ -0,0 +1,57 @@
+import { type ModelInfo } from '../model-service.js';
+import type { ILoggingService, ISettingsService } from '../service-interfaces.js';
+import { type ModelFetcher } from './model-catalog-session.js';
+/** One provider's selectable models, as the /model picker would load them. */
+export type ProviderModelGroup = {
+    provider: string;
+    label?: string;
+    models: ModelInfo[];
+    /** Present when the provider's model listing could not be loaded. */
+    error?: string;
+};
+/**
+ * Collect each provider's model listing sequentially through
+ * ModelCatalogSession, the same loader the interactive /model picker uses, so
+ * a standalone listing agrees with what the picker offers. One unreachable
+ * provider degrades to an error group instead of failing the whole listing;
+ * loads stay sequential because the session marks overlapping loads stale.
+ */
+export declare function collectProviderModels(deps: {
+    settingsService: ISettingsService;
+    loggingService: ILoggingService;
+    fetcher?: ModelFetcher;
+    signal?: AbortSignal;
+    cacheDir?: string;
+    now?: () => number;
+    ttlMs?: number;
+}, providerIds?: string[]): Promise<ProviderModelGroup[]>;
+/**
+ * Keep groups whose provider id fuzzy-matches the search (whole provider), and
+ * within the rest filter models with the picker's own fuzzy match. Groups left
+ * without models are dropped.
+ */
+export declare function filterModelGroups(groups: ProviderModelGroup[], search: string): ProviderModelGroup[];
+/** Plain-text listing: `provider (label):` headers, two-space-indented models. */
+export declare function formatModelGroups(groups: ProviderModelGroup[]): string;
+export type ListModelsOutcome = {
+    exitCode: number;
+    /** Plain-text listing for stdout; null when nothing is available. */
+    output: string | null;
+    /** Single-line no-results explanation for stderr. */
+    error: string | null;
+    /** Per-provider listing failures, for stderr. */
+    warnings: string[];
+};
+/** Build the `--list-models` output without touching stdout/stderr. */
+export declare function runListModels(deps: {
+    settingsService: ISettingsService;
+    loggingService: ILoggingService;
+    search?: string;
+    fetcher?: ModelFetcher;
+    providerIds?: string[];
+    signal?: AbortSignal;
+    cacheDir?: string;
+    now?: () => number;
+    ttlMs?: number;
+}): Promise<ListModelsOutcome>;
+//# sourceMappingURL=model-listing.d.ts.map

package/dist/services/models/model-listing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-listing.d.ts","sourceRoot":"","sources":["../../../source/services/models/model-listing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEnE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAA2C,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAGxG,8EAA8E;AAC9E,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE;IACJ,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;IAChC,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EACD,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAwB/B;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,kBAAkB,EAAE,CASpG;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAatE;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,qDAAqD;IACrD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,uEAAuE;AACvE,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA2B7B"}

package/dist/services/models/model-listing.js

@@ -0,0 +1,96 @@
+import { filterModels } from '../model-service.js';
+import { getProvider, getProviderIds } from '../../providers/index.js';
+import { ModelCatalogSession, orderedProviderIds } from './model-catalog-session.js';
+import { scoreSubsequence } from '../../utils/subsequence-filter.js';
+/**
+ * Collect each provider's model listing sequentially through
+ * ModelCatalogSession, the same loader the interactive /model picker uses, so
+ * a standalone listing agrees with what the picker offers. One unreachable
+ * provider degrades to an error group instead of failing the whole listing;
+ * loads stay sequential because the session marks overlapping loads stale.
+ */
+export async function collectProviderModels(deps, providerIds) {
+    const session = new ModelCatalogSession({
+        settingsService: deps.settingsService,
+        loggingService: deps.loggingService,
+        fetcher: deps.fetcher,
+        signal: deps.signal,
+        cacheDir: deps.cacheDir,
+        now: deps.now,
+        ttlMs: deps.ttlMs,
+    });
+    const ids = providerIds ?? orderedProviderIds(deps.settingsService, getProviderIds());
+    session.begin();
+    const groups = [];
+    for (const provider of ids) {
+        const label = getProvider(provider)?.label;
+        try {
+            const { models } = await session.load(provider);
+            groups.push({ provider, ...(label ? { label } : {}), models });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            groups.push({ provider, ...(label ? { label } : {}), models: [], error: message });
+        }
+    }
+    return groups;
+}
+/**
+ * Keep groups whose provider id fuzzy-matches the search (whole provider), and
+ * within the rest filter models with the picker's own fuzzy match. Groups left
+ * without models are dropped.
+ */
+export function filterModelGroups(groups, search) {
+    const trimmed = search.trim();
+    if (!trimmed)
+        return groups;
+    return groups
+        .map((group) => {
+        if (scoreSubsequence(trimmed, group.provider) !== -Infinity)
+            return group;
+        return { ...group, models: filterModels(group.models, trimmed) };
+    })
+        .filter((group) => group.models.length > 0);
+}
+/** Plain-text listing: `provider (label):` headers, two-space-indented models. */
+export function formatModelGroups(groups) {
+    const lines = [];
+    for (const group of groups) {
+        if (group.models.length === 0)
+            continue;
+        const header = group.label && group.label !== group.provider ? `${group.provider} (${group.label})` : group.provider;
+        lines.push(`${header}:`);
+        for (const model of group.models) {
+            const name = model.name && model.name !== model.id ? `  ${model.name}` : '';
+            lines.push(`  ${model.id}${name}`);
+        }
+    }
+    return lines.join('\n');
+}
+/** Build the `--list-models` output without touching stdout/stderr. */
+export async function runListModels(deps) {
+    const groups = await collectProviderModels({
+        settingsService: deps.settingsService,
+        loggingService: deps.loggingService,
+        fetcher: deps.fetcher,
+        signal: deps.signal,
+        cacheDir: deps.cacheDir,
+        now: deps.now,
+        ttlMs: deps.ttlMs,
+    }, deps.providerIds);
+    const warnings = groups
+        .filter((group) => group.error !== undefined)
+        .map((group) => `warning: ${group.provider}: ${group.error}`);
+    const printable = filterModelGroups(groups, deps.search ?? '').filter((group) => group.models.length > 0);
+    if (printable.length === 0) {
+        const search = deps.search?.trim();
+        return {
+            exitCode: 1,
+            output: null,
+            error: search ? `No models match "${search}".` : 'No models available.',
+            warnings,
+        };
+    }
+    return { exitCode: 0, output: formatModelGroups(printable), error: null, warnings };
+}
+//# sourceMappingURL=model-listing.js.map

package/dist/services/models/model-listing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-listing.js","sourceRoot":"","sources":["../../../source/services/models/model-listing.ts"],"names":[],"mappings":"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"}

package/dist/services/models/model-resolution.d.ts

@@ -0,0 +1,88 @@
+import { type ModelInfo } from '../model-service.js';
+import type { ILoggingService, ISettingsService } from '../service-interfaces.js';
+import { type ProviderModelGroup } from './model-listing.js';
+import type { ModelFetcher } from './model-catalog-session.js';
+export declare const VALID_REASONING_EFFORTS: readonly ['default', 'none', 'minimal', 'low', 'medium', 'high', 'xhigh'];
+export type ModelSettingsReasoningEffort = (typeof VALID_REASONING_EFFORTS)[number];
+export type ParsedModelFlag = {
+    provider?: string;
+    pattern: string;
+    reasoningEffort?: ModelSettingsReasoningEffort;
+    rawPattern: string;
+};
+export type ModelMatch = {
+    provider: string;
+    model: ModelInfo;
+};
+export type ModelResolutionResult = {
+    status: 'resolved';
+    modelId: string;
+    provider?: string;
+    reasoningEffort?: ModelSettingsReasoningEffort;
+    /** Provider catalogs that failed to load while resolution still proceeded. */
+    warnings?: string[];
+} | {
+    status: 'no_match';
+    error: string;
+} | {
+    status: 'cancelled';
+    error: string;
+} | {
+    status: 'passthrough';
+    modelId: string;
+    provider?: string;
+    reasoningEffort?: ModelSettingsReasoningEffort;
+    /** Provider catalogs that failed to load while resolution still proceeded. */
+    warnings?: string[];
+};
+/**
+ * Parse a raw `--model` flag string, separating optional thinking suffix
+ * (":<thinking>") and optional provider prefix ("<provider>/<id>").
+ */
+export declare function parseModelFlag(rawModelFlag: string, options?: {
+    providerFlag?: string;
+    knownProviders?: string[];
+}): ParsedModelFlag;
+/**
+ * Match parsed model pattern against loaded provider model groups.
+ * Exact matches take strict precedence over partial/fuzzy matches, and an
+ * exact match of the flag exactly as typed (including any provider-style
+ * prefix) takes precedence over the split provider+pattern reading, so a
+ * literal aggregator id like `anthropic/claude-3.5-sonnet` is never
+ * reinterpreted when the vendor name collides with a provider id.
+ */
+export declare function matchModels(groups: ProviderModelGroup[], parsed: ParsedModelFlag): {
+    exact: boolean;
+    matches: ModelMatch[];
+};
+/**
+ * Format matching models as a numbered list grouped by provider,
+ * matching `--list-models` style with sequential 1-based numbering.
+ */
+export declare function formatDisambiguationPrompt(matches: ModelMatch[], groups: ProviderModelGroup[]): string;
+/**
+ * Interactive prompt for disambiguating multiple matching models.
+ */
+export declare function promptForDisambiguation(matches: ModelMatch[], groups: ProviderModelGroup[], pattern: string, prompter?: (question: string) => Promise<string | null>, streams?: {
+    input?: NodeJS.ReadableStream;
+    output?: NodeJS.WritableStream;
+}): Promise<ModelMatch | null>;
+/**
+ * Resolves `--model <pattern>` against the model catalog with exact match
+ * precedence, partial/fuzzy matching, and interactive disambiguation when needed.
+ */
+export declare function resolveModelFlag(deps: {
+    modelFlag: string;
+    providerFlag?: string;
+    settingsService: ISettingsService;
+    loggingService: ILoggingService;
+    fetcher?: ModelFetcher;
+    prompter?: (question: string) => Promise<string | null>;
+    streams?: {
+        input?: NodeJS.ReadableStream;
+        output?: NodeJS.WritableStream;
+    };
+    knownProviders?: string[];
+    providerIds?: string[];
+}): Promise<ModelResolutionResult>;
+//# sourceMappingURL=model-resolution.d.ts.map

package/dist/services/models/model-resolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-resolution.d.ts","sourceRoot":"","sources":["../../../source/services/models/model-resolution.ts"],"names":[],"mappings":"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"}