@qduc/term2 0.20.0 → 0.22.0

package/dist/services/mode-notices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mode-notices.d.ts","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,sBAAsB,QAOb,CAAC;AAEvB,eAAO,MAAM,qBAAqB,QAMd,CAAC;AAErB,eAAO,MAAM,wBAAwB,QAIf,CAAC;AAEvB,eAAO,MAAM,uBAAuB,QAGhB,CAAC;AAErB,eAAO,MAAM,8BAA8B,QAIrB,CAAC;AAEvB,eAAO,MAAM,6BAA6B,QAGtB,CAAC;AAErB,eAAO,MAAM,cAAc,aAAc,OAAO,KAAG,MACQ,CAAC;AAE5D,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,cAAc,CAAC;AAE1E,eAAO,MAAM,iBAAiB,SAAU,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,YAAY,OAAO,KAAG,MAI7F,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC/E,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC5B,IAAI,CAIN;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAElG"}
+{"version":3,"file":"mode-notices.d.ts","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAIhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAwB3D,qEAAqE;AACrE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;AAC5E,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAkCrE,iEAAiE;AACjE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;AAC3E,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AA+BpE,eAAO,MAAM,sBAAsB,QAAsD,CAAC;AAC1F,eAAO,MAAM,qBAAqB,QAAqD,CAAC;AACxF,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAC9F,eAAO,MAAM,uBAAuB,QAAuD,CAAC;AAC5F,eAAO,MAAM,8BAA8B,QAA8D,CAAC;AAC1G,eAAO,MAAM,6BAA6B,QAA6D,CAAC;AAExG,iFAAiF;AACjF,wBAAgB,gCAAgC,CAC9C,eAAe,EAAE,gBAAgB,EACjC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC5B,IAAI,CASN"}

package/dist/services/mode-notices.js

@@ -1,5 +1,6 @@
-import fs from 'node:fs';
-import path from 'node:path';
+import { resolveActiveProfile } from './profiles/active-profile.js';
+import { resolveProfile } from './profiles/resolver.js';
+import { ProfileResolutionError } from './profiles/types.js';
 /**
  * Canonical mode-change notices injected into the next user message when the
  * user toggles a runtime mode. Prefixing the next real turn avoids a
@@ -9,59 +10,87 @@ import path from 'node:path';
  * The workflow body lives here, not in the instruction prefix, so a toggle
  * cannot change developer instructions on chained Responses-Lite HTTP turns.
  */
-const PLAN_MODE_WORKFLOW = fs
-    .readFileSync(path.join(import.meta.dirname, '../prompts/plan-mode-info.md'), 'utf8')
-    .trim();
-const MENTOR_MODE_WORKFLOW = fs
-    .readFileSync(path.join(import.meta.dirname, '../prompts/mentor-addon.md'), 'utf8')
-    .trim();
-const ORCHESTRATOR_MODE_WORKFLOW = fs
-    .readFileSync(path.join(import.meta.dirname, '../prompts/orchestrator.md'), 'utf8')
-    .trim();
-export const PLAN_MODE_ENTER_NOTICE = '<system-notice>\n' +
-    'Plan Mode is ON: the workspace is read-only. Do not create or modify files, run ' +
-    'state-changing commands, or spawn write-capable subagents. Investigate with read-only ' +
-    'tools and deliver a concrete, ordered implementation plan; tell the user to exit Plan ' +
-    'Mode to execute it.\n\n' +
-    PLAN_MODE_WORKFLOW +
-    '\n</system-notice>';
-export const PLAN_MODE_EXIT_NOTICE = '<system-notice>\n' +
-    'Plan Mode is now ' +
-    'OFF: the read-only restriction is lifted. You may again create and ' +
-    'modify files, run state-changing commands, and spawn write-capable subagents to execute ' +
-    'the plan.\n' +
-    '</system-notice>';
-export const MENTOR_MODE_ENTER_NOTICE = '<system-notice>\n' +
-    'Mentor Mode is ON. Work collaboratively with the configured mentor model and follow the mentor workflow below.\n\n' +
-    MENTOR_MODE_WORKFLOW +
-    '\n</system-notice>';
-export const MENTOR_MODE_EXIT_NOTICE = '<system-notice>\n' +
-    'Mentor Mode is now OFF. Return to the normal workflow and do not treat the mentor-specific workflow as active.\n' +
-    '</system-notice>';
-export const ORCHESTRATOR_MODE_ENTER_NOTICE = '<system-notice>\n' +
-    'Orchestrator Mode is ON. Follow the orchestrator workflow below while retaining end-to-end ownership of the user outcome.\n\n' +
-    ORCHESTRATOR_MODE_WORKFLOW +
-    '\n</system-notice>';
-export const ORCHESTRATOR_MODE_EXIT_NOTICE = '<system-notice>\n' +
-    'Orchestrator Mode is now OFF. Return to the normal workflow; you may work directly when appropriate instead of following orchestrator-only delegation policy.\n' +
-    '</system-notice>';
-export const planModeNotice = (entering) => entering ? PLAN_MODE_ENTER_NOTICE : PLAN_MODE_EXIT_NOTICE;
-export const runtimeModeNotice = (mode, entering) => {
-    if (mode === 'plan')
-        return planModeNotice(entering);
-    if (mode === 'mentor')
-        return entering ? MENTOR_MODE_ENTER_NOTICE : MENTOR_MODE_EXIT_NOTICE;
-    return entering ? ORCHESTRATOR_MODE_ENTER_NOTICE : ORCHESTRATOR_MODE_EXIT_NOTICE;
+const NOTICE_PROFILE_IDS = new Set(['builtin:plan', 'builtin:mentor', 'builtin:orchestrator']);
+const resolveNoticeProfile = (profile) => {
+    if (typeof profile !== 'string')
+        return profile;
+    if (!NOTICE_PROFILE_IDS.has(profile))
+        return null;
+    return resolveProfile(profile);
 };
-export function primeActiveModeNoticeIfActive(modes, queue) {
-    if (modes.orchestratorMode)
-        queue(ORCHESTRATOR_MODE_ENTER_NOTICE);
-    else if (modes.planMode)
-        queue(PLAN_MODE_ENTER_NOTICE);
-    else if (modes.mentorMode)
-        queue(MENTOR_MODE_ENTER_NOTICE);
+const workflowText = (profile) => {
+    const workflow = profile.instructions.workflow;
+    return workflow?.kind === 'markdown' ? workflow.content : null;
+};
+export function profileEnterNotice(profile) {
+    const resolved = resolveNoticeProfile(profile);
+    if (!resolved)
+        return null;
+    const workflow = workflowText(resolved);
+    if (!workflow)
+        return null;
+    if (resolved.identity.id === 'builtin:plan')
+        return ('<system-notice>\n' +
+            'Plan Mode is ON: the workspace is read-only. Do not create or modify files, run ' +
+            'state-changing commands, or spawn write-capable subagents. Investigate with read-only ' +
+            'tools and deliver a concrete, ordered implementation plan; tell the user to exit Plan ' +
+            'Mode to execute it.\n\n' +
+            workflow +
+            '\n</system-notice>');
+    if (resolved.identity.id === 'builtin:mentor')
+        return ('<system-notice>\n' +
+            'Mentor Mode is ON. Work collaboratively with the configured mentor model and follow the mentor workflow below.\n\n' +
+            workflow +
+            '\n</system-notice>');
+    if (resolved.identity.id === 'builtin:orchestrator')
+        return ('<system-notice>\n' +
+            'Orchestrator Mode is ON. Follow the orchestrator workflow below while retaining end-to-end ownership of the user outcome.\n\n' +
+            workflow +
+            '\n</system-notice>');
+    return null;
+}
+export function profileExitNotice(profile) {
+    const resolved = resolveNoticeProfile(profile);
+    if (!resolved)
+        return null;
+    if (resolved.identity.id === 'builtin:plan')
+        return ('<system-notice>\n' +
+            'Plan Mode is now ' +
+            'OFF: the read-only restriction is lifted. You may again create and ' +
+            'modify files, run state-changing commands, and spawn write-capable subagents to execute ' +
+            'the plan.\n' +
+            '</system-notice>');
+    if (resolved.identity.id === 'builtin:mentor')
+        return ('<system-notice>\n' +
+            'Mentor Mode is now OFF. Return to the normal workflow and do not treat the mentor-specific workflow as active.\n' +
+            '</system-notice>');
+    if (resolved.identity.id === 'builtin:orchestrator')
+        return ('<system-notice>\n' +
+            'Orchestrator Mode is now OFF. Return to the normal workflow; you may work directly when appropriate instead of following orchestrator-only delegation policy.\n' +
+            '</system-notice>');
+    return null;
 }
-export function primePlanModeNoticeIfActive(planMode, queue) {
-    primeActiveModeNoticeIfActive({ planMode }, queue);
+// Keep the historical constants available to compatibility callers. Their
+// content is produced through Profile resolution rather than a second prompt
+// file-loading path in this module.
+export const PLAN_MODE_ENTER_NOTICE = profileEnterNotice(resolveProfile('builtin:plan'));
+export const PLAN_MODE_EXIT_NOTICE = profileExitNotice(resolveProfile('builtin:plan'));
+export const MENTOR_MODE_ENTER_NOTICE = profileEnterNotice(resolveProfile('builtin:mentor'));
+export const MENTOR_MODE_EXIT_NOTICE = profileExitNotice(resolveProfile('builtin:mentor'));
+export const ORCHESTRATOR_MODE_ENTER_NOTICE = profileEnterNotice(resolveProfile('builtin:orchestrator'));
+export const ORCHESTRATOR_MODE_EXIT_NOTICE = profileExitNotice(resolveProfile('builtin:orchestrator'));
+/** Prime the active Profile's workflow once, without consulting legacy flags. */
+export function primeActiveProfileNoticeIfActive(settingsService, queue) {
+    try {
+        const notice = profileEnterNotice(resolveActiveProfile(settingsService));
+        if (notice)
+            queue(notice);
+    }
+    catch (error) {
+        // Startup priming should not make an otherwise recoverable settings state
+        // unusable. Activation itself remains strict and reports this error.
+        if (!(error instanceof ProfileResolutionError))
+            throw error;
+    }
 }
 //# sourceMappingURL=mode-notices.js.map

package/dist/services/mode-notices.js.map

@@ -1 +1 @@
-{"version":3,"file":"mode-notices.js","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;;;;;;;GAQG;AACH,MAAM,kBAAkB,GAAG,EAAE;KAC1B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,EAAE,MAAM,CAAC;KACpF,IAAI,EAAE,CAAC;AACV,MAAM,oBAAoB,GAAG,EAAE;KAC5B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,4BAA4B,CAAC,EAAE,MAAM,CAAC;KAClF,IAAI,EAAE,CAAC;AACV,MAAM,0BAA0B,GAAG,EAAE;KAClC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,4BAA4B,CAAC,EAAE,MAAM,CAAC;KAClF,IAAI,EAAE,CAAC;AAEV,MAAM,CAAC,MAAM,sBAAsB,GACjC,mBAAmB;IACnB,kFAAkF;IAClF,wFAAwF;IACxF,wFAAwF;IACxF,yBAAyB;IACzB,kBAAkB;IAClB,oBAAoB,CAAC;AAEvB,MAAM,CAAC,MAAM,qBAAqB,GAChC,mBAAmB;IACnB,mBAAmB;IACnB,qEAAqE;IACrE,0FAA0F;IAC1F,aAAa;IACb,kBAAkB,CAAC;AAErB,MAAM,CAAC,MAAM,wBAAwB,GACnC,mBAAmB;IACnB,oHAAoH;IACpH,oBAAoB;IACpB,oBAAoB,CAAC;AAEvB,MAAM,CAAC,MAAM,uBAAuB,GAClC,mBAAmB;IACnB,kHAAkH;IAClH,kBAAkB,CAAC;AAErB,MAAM,CAAC,MAAM,8BAA8B,GACzC,mBAAmB;IACnB,+HAA+H;IAC/H,0BAA0B;IAC1B,oBAAoB,CAAC;AAEvB,MAAM,CAAC,MAAM,6BAA6B,GACxC,mBAAmB;IACnB,iKAAiK;IACjK,kBAAkB,CAAC;AAErB,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAiB,EAAU,EAAE,CAC1D,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,qBAAqB,CAAC;AAI5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAsC,EAAE,QAAiB,EAAU,EAAE;IACrG,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,uBAAuB,CAAC;IAC5F,OAAO,QAAQ,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,6BAA6B,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,UAAU,6BAA6B,CAC3C,KAA+E,EAC/E,KAA6B;IAE7B,IAAI,KAAK,CAAC,gBAAgB;QAAE,KAAK,CAAC,8BAA8B,CAAC,CAAC;SAC7D,IAAI,KAAK,CAAC,QAAQ;QAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;SAClD,IAAI,KAAK,CAAC,UAAU;QAAE,KAAK,CAAC,wBAAwB,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,QAAiB,EAAE,KAA6B;IAC1F,6BAA6B,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"mode-notices.js","sourceRoot":"","sources":["../../source/services/mode-notices.ts"],"names":[],"mappings":"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"}

package/dist/services/model-service.d.ts

@@ -8,13 +8,53 @@ export type ModelInfo = {
     /** Context window in tokens from the vendored model catalog, when known. */
     contextWindow?: number;
 };
-type FetchFn = typeof fetch;
-export declare function fetchModels(deps: {
+export type DiskModelCacheEntry = {
+    version: 1;
+    provider: string;
+    timestamp: number;
+    models: ModelInfo[];
+};
+export declare const MODEL_CACHE_TTL_MS: number;
+export declare const MODEL_CACHE_STALE_GRACE_MS: number;
+export type FetchModelsDeps = {
     settingsService: ISettingsService;
     loggingService: ILoggingService;
     signal?: AbortSignal;
-}, providerOverride?: string, fetchImpl?: FetchFn): Promise<ModelInfo[]>;
-export declare function clearModelCache(provider?: string): void;
+    cacheDir?: string;
+    now?: () => number;
+    ttlMs?: number;
+};
+type FetchFn = typeof fetch;
+export declare function setModelCacheDirForTest(dir: string | null): void;
+export declare function setModelCacheClockForTest(clock: (() => number) | null): void;
+export declare function clearModelMemoryCacheForTest(): void;
+export declare function getModelCacheDir(customDir?: string): string;
+export declare function getModelCacheFilePath(provider: string, customDir?: string): string;
+/**
+ * Determines whether candidate models list represents a strict subset of previous models.
+ * An empty list or a list with strictly fewer models containing only IDs from previous is degraded.
+ */
+export declare function isStrictSubsetModels(candidates: ModelInfo[], previous: ModelInfo[]): boolean;
+/**
+ * Read-only peek at whatever model listing is already warm for a provider:
+ * the in-memory cache if still fresh, else a non-expired disk cache entry.
+ * Never fetches, and never populates, refreshes, or evicts either cache
+ * layer — a cold or expired cache costs nothing beyond a Map lookup and, on
+ * a miss, one `fs.existsSync` check. Intended for opportunistic
+ * cross-provider exact-match collision detection after a fast, single-
+ * provider resolution (see `resolveModelFlag`); deliberately not a
+ * substitute for `fetchModels`, which is the only thing allowed to touch
+ * the network or write the cache.
+ */
+export declare function peekCachedModels(provider: string, opts?: {
+    cacheDir?: string;
+    now?: () => number;
+    ttlMs?: number;
+}): ModelInfo[] | undefined;
+export declare function fetchModels(deps: FetchModelsDeps, providerOverride?: string, fetchImpl?: FetchFn): Promise<ModelInfo[]>;
+export declare function clearModelCache(provider?: string, opts?: {
+    cacheDir?: string;
+}): void;
 export declare function getModelDefaultReasoningLevel(provider: string, modelId: string): string | undefined;
 /**
  * Effort to use for a provider when the user's `agent.reasoningEffort` is
@@ -22,6 +62,26 @@ export declare function getModelDefaultReasoningLevel(provider: string, modelId:
  * API choose", which for these providers means no reasoning at all.
  */
 export declare function getProviderDefaultReasoningLevel(provider: string): string | undefined;
+export type ModelMatchRank = {
+    /** Weighted subsequence score (id matches are weighted 2x over name matches). */
+    score: number;
+    /** 0 = query is a literal prefix of the matched text; 1 = query occurs right after a
+     * word boundary (`/`, `.`, `-`, `_`, or a case change); 2 = plain subsequence match. */
+    tier: number;
+};
+/**
+ * Classify how strongly `query` matches `text`, independent of score magnitude.
+ * Used to rank id-prefix and word-boundary hits above a merely-plausible
+ * subsequence match, before falling back to the continuous score as a tiebreaker.
+ */
+export declare function matchTier(query: string, text: string): number;
+/**
+ * Score a model against a search query the way `filterModels` does internally
+ * (id matches weighted 2x over name matches, higher of the two wins), but
+ * surface the result instead of discarding it. Returns null when neither the
+ * id nor the name is a subsequence match.
+ */
+export declare function rankModelMatch(model: ModelInfo, query: string): ModelMatchRank | null;
 export declare function filterModels(models: ModelInfo[], query: string): ModelInfo[];
 export {};
 //# sourceMappingURL=model-service.d.ts.map

package/dist/services/model-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-service.d.ts","sourceRoot":"","sources":["../../source/services/model-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEjF,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,GAAG,oBAAoB,CAAC;IACzF,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,4EAA4E;IAC5E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,OAAO,GAAG,OAAO,KAAK,CAAC;AAI5B,wBAAsB,WAAW,CAC/B,IAAI,EAAE;IACJ,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,EACD,gBAAgB,CAAC,EAAE,MAAM,EACzB,SAAS,GAAE,OAAe,GACzB,OAAO,CAAC,SAAS,EAAE,CAAC,CAgDtB;AAED,wBAAgB,eAAe,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAMvD;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKnG;AAgBD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErF;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,CAoB5E"}
+{"version":3,"file":"model-service.d.ts","sourceRoot":"","sources":["../../source/services/model-service.ts"],"names":[],"mappings":"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"}

package/dist/services/model-service.js

@@ -1,26 +1,244 @@
-import { scoreSubsequence } from '../utils/subsequence-filter.js';
+import fs from 'node:fs';
+import path from 'node:path';
+import envPaths from 'env-paths';
+import { BOUNDARY_REGEX, 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 = 24 * 60 * 60 * 1000; // 24 hours
+export const MODEL_CACHE_STALE_GRACE_MS = 7 * 24 * 60 * 60 * 1000; // 7 days fallback ceiling for last-known-good
 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`);
+}
+/**
+ * Determines whether candidate models list represents a strict subset of previous models.
+ * An empty list or a list with strictly fewer models containing only IDs from previous is degraded.
+ */
+export function isStrictSubsetModels(candidates, previous) {
+    if (previous.length === 0)
+        return false;
+    if (candidates.length === 0)
+        return true;
+    if (candidates.length >= previous.length)
+        return false;
+    const previousIds = new Set(previous.map((m) => m.id));
+    return candidates.every((m) => previousIds.has(m.id));
+}
+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) || parsed.models.length === 0) {
+            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;
+    }
+}
+/**
+ * Read-only peek at whatever model listing is already warm for a provider:
+ * the in-memory cache if still fresh, else a non-expired disk cache entry.
+ * Never fetches, and never populates, refreshes, or evicts either cache
+ * layer — a cold or expired cache costs nothing beyond a Map lookup and, on
+ * a miss, one `fs.existsSync` check. Intended for opportunistic
+ * cross-provider exact-match collision detection after a fast, single-
+ * provider resolution (see `resolveModelFlag`); deliberately not a
+ * substitute for `fetchModels`, which is the only thing allowed to touch
+ * the network or write the cache.
+ */
+export function peekCachedModels(provider, opts) {
+    const now = opts?.now ?? testClock ?? Date.now;
+    const ttlMs = opts?.ttlMs ?? MODEL_CACHE_TTL_MS;
+    const memCached = cache.get(provider);
+    if (memCached) {
+        const age = now() - memCached.timestamp;
+        if (age >= 0 && age < ttlMs && memCached.models.length > 0) {
+            return memCached.models;
+        }
+    }
+    const diskCached = readDiskCache(provider, opts?.cacheDir, opts?.now, ttlMs);
+    return diskCached ?? undefined;
+}
+function writeDiskCache(provider, models, cacheDir, nowFn, loggingService) {
+    if (!models || models.length === 0) {
+        return;
+    }
+    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;
-    if (cache.has(cacheKey)) {
-        return cache.get(cacheKey);
+    const now = deps.now ?? testClock ?? Date.now;
+    const ttlMs = deps.ttlMs ?? MODEL_CACHE_TTL_MS;
+    // 1. In-memory cache hit
+    const memCached = cache.get(cacheKey);
+    if (memCached) {
+        const age = now() - memCached.timestamp;
+        if (age >= 0 && age < ttlMs && memCached.models.length > 0) {
+            return memCached.models;
+        }
+        cache.delete(cacheKey);
+    }
+    // 2. Disk cache hit
+    const diskCached = readDiskCache(provider, deps.cacheDir, deps.now, deps.ttlMs, loggingService);
+    if (diskCached && diskCached.length > 0) {
+        cache.set(cacheKey, { models: diskCached, timestamp: now() });
+        return diskCached;
     }
+    // 3. Cache miss: read previous disk cache within fallback grace period as last-known-good
+    const previous = readDiskCache(provider, deps.cacheDir, deps.now, MODEL_CACHE_STALE_GRACE_MS, loggingService);
+    const startTime = now();
     try {
         const providerDef = getProvider(provider);
         if (!providerDef) {
             throw new Error(`Provider '${provider}' is not registered`);
         }
         const rawModels = await providerDef.fetchModels({ settingsService, loggingService, signal: deps.signal }, fetchImpl);
-        const models = rawModels.map((m) => ({
+        let models = rawModels.map((m) => ({
             ...m,
             provider,
             contextWindow: getModelContextWindow(provider, m.id),
         }));
-        cache.set(cacheKey, models);
+        let isDegraded = previous !== null && previous.length > 0 && isStrictSubsetModels(models, previous);
+        if (isDegraded) {
+            loggingService.warn('Suspect degraded model list received from provider; attempting immediate retry', {
+                provider,
+                receivedCount: models.length,
+                previousCount: previous.length,
+            });
+            try {
+                const retryRaw = await providerDef.fetchModels({ settingsService, loggingService, signal: deps.signal }, fetchImpl);
+                const retryModels = retryRaw.map((m) => ({
+                    ...m,
+                    provider,
+                    contextWindow: getModelContextWindow(provider, m.id),
+                }));
+                if (!isStrictSubsetModels(retryModels, previous)) {
+                    models = retryModels;
+                    isDegraded = false;
+                    loggingService.info?.('Model listing recovered on retry', {
+                        provider,
+                        recoveredCount: models.length,
+                    });
+                }
+            }
+            catch (retryError) {
+                loggingService.warn('Model listing retry failed', {
+                    provider,
+                    error: String(retryError),
+                });
+            }
+        }
+        if (isDegraded && previous && previous.length > 0) {
+            loggingService.warn('Provider returned degraded model list; preserving last-known-good catalog', {
+                provider,
+                receivedCount: models.length,
+                previousCount: previous.length,
+            });
+            // Do not write degraded models to disk cache.
+            // Retain expired disk cache file so subsequent sessions retry upstream.
+            cache.set(cacheKey, { models: previous, timestamp: now() });
+            return previous;
+        }
+        if (models.length > 0) {
+            cache.set(cacheKey, { models, timestamp: now() });
+            writeDiskCache(provider, models, deps.cacheDir, deps.now, loggingService);
+        }
+        else {
+            loggingService.warn('Provider returned empty model catalog; skipping disk cache write', { provider });
+        }
+        loggingService.debug?.('Fetched models from provider', {
+            provider,
+            count: models.length,
+            durationMs: now() - startTime,
+            degraded: isDegraded,
+        });
         return models;
     }
     catch (error) {
@@ -42,19 +260,51 @@ 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);
-    if (!models)
+    const entry = cache.get(provider);
+    if (!entry)
         return undefined;
-    const model = models.find((m) => m.id === modelId);
+    const model = entry.models.find((m) => m.id === modelId);
     return model?.default_reasoning_level;
 }
 // Providers that reason only when the request explicitly asks them to, and that
@@ -78,22 +328,54 @@ const PROVIDER_DEFAULT_REASONING_LEVEL = {
 export function getProviderDefaultReasoningLevel(provider) {
     return PROVIDER_DEFAULT_REASONING_LEVEL[provider.toLowerCase()];
 }
+/**
+ * Classify how strongly `query` matches `text`, independent of score magnitude.
+ * Used to rank id-prefix and word-boundary hits above a merely-plausible
+ * subsequence match, before falling back to the continuous score as a tiebreaker.
+ */
+export function matchTier(query, text) {
+    const q = query.toLowerCase();
+    const t = text.toLowerCase();
+    if (!q)
+        return 2;
+    if (t.startsWith(q))
+        return 0;
+    let idx = t.indexOf(q);
+    while (idx !== -1) {
+        const prevChar = idx > 0 ? t[idx - 1] : undefined;
+        if (prevChar !== undefined && BOUNDARY_REGEX.test(prevChar)) {
+            return 1;
+        }
+        idx = t.indexOf(q, idx + 1);
+    }
+    return 2;
+}
+/**
+ * Score a model against a search query the way `filterModels` does internally
+ * (id matches weighted 2x over name matches, higher of the two wins), but
+ * surface the result instead of discarding it. Returns null when neither the
+ * id nor the name is a subsequence match.
+ */
+export function rankModelMatch(model, query) {
+    const idScore = scoreSubsequence(query, model.id);
+    const nameScore = model.name ? scoreSubsequence(query, model.name) : -Infinity;
+    // Reward ID match more than Name match
+    const weightedId = idScore === -Infinity ? -Infinity : idScore * 2;
+    const weightedName = nameScore === -Infinity ? -Infinity : nameScore;
+    if (weightedId === -Infinity && weightedName === -Infinity) {
+        return null;
+    }
+    const useId = weightedId >= weightedName;
+    return {
+        score: useId ? weightedId : weightedName,
+        tier: matchTier(query, useId ? model.id : model.name),
+    };
+}
 export function filterModels(models, query) {
     const trimmed = query.trim();
     if (!trimmed) {
         return models;
     }
-    return models
-        .map((model) => {
-        const idScore = scoreSubsequence(trimmed, model.id);
-        const nameScore = model.name ? scoreSubsequence(trimmed, model.name) : -Infinity;
-        // Reward ID match more than Name match
-        const weightedId = idScore === -Infinity ? -Infinity : idScore * 2;
-        const weightedName = nameScore === -Infinity ? -Infinity : nameScore;
-        const score = Math.max(weightedId, weightedName);
-        return { model, score };
-    })
-        .filter(({ score }) => score !== -Infinity)
-        .map(({ model }) => model);
+    return models.filter((model) => rankModelMatch(model, trimmed) !== null);
 }
 //# sourceMappingURL=model-service.js.map