@jingyi0605/codingns4dsh 0.2.1-beta.4 → 0.2.1-beta.6

package/data/build/dist/host/cli-adapters/registry.d.ts

@@ -17,19 +17,12 @@ export declare class CodingNsCliAdapterRegistry {
     private readonly probes;
     private readonly executingSessions;
     private readonly archivingSessions;
-    private readonly installedCacheTtlMs;
-    private readonly uninstalledCacheTtlMs;
-    private readonly modelCacheTtlMs;
-    private readonly modelRetryTtlMs;
     private readonly detectionCache;
     private readonly detectionRefreshes;
-    private readonly detectionTimers;
     private readonly modelCache;
     private readonly modelFailures;
     private readonly modelRefreshes;
-    private readonly modelTimers;
     private readonly modelGenerations;
-    private readonly requestedModelCatalogs;
     /**
      * 上次构建目录时驱动声明的 Provider 配置指纹。
      *
@@ -47,6 +40,11 @@ export declare class CodingNsCliAdapterRegistry {
      */
     private readonly segmentedTurns;
     private cacheGeneration;
+    private startupTimer;
+    private readonly lifetime;
+    private readonly originalDetections;
+    private readonly detectionStates;
+    private readonly detectionTimes;
     private disposed;
     constructor(drivers: readonly CodingNsCliDriver[], enabled?: Readonly<Record<string, boolean>>, options?: {
         readonly sessionStore?: CodingNsCliSessionStore;
@@ -55,6 +53,7 @@ export declare class CodingNsCliAdapterRegistry {
         readonly missingConfirmationDelayMs?: number;
         readonly providerProbeTimeoutMs?: number;
         readonly providerProbeConcurrency?: number;
+        /** @deprecated 检测已改为启动一次和手动刷新，旧 TTL 参数仅兼容调用方。 */
         readonly installedCacheTtlMs?: number;
         readonly uninstalledCacheTtlMs?: number;
         readonly modelCacheTtlMs?: number;
@@ -68,17 +67,14 @@ export declare class CodingNsCliAdapterRegistry {
     private readonly preferences;
     /** 设置服务更新必须按选择顺序落盘；并发 update 会让旧快照覆盖新模型/档位。 */
     private preferenceWriteTail;
-    /**
-     * Host 启动后预热安装状态，并按驱动声明后台预热模型目录。
-     *
-     * 模型探测可能启动完整外部服务，必须留在后台；只有调用方显式请求
-     * `models()` 时才等待结果。未声明预热的驱动保持原有按需加载，避免启动时
-     * 同时拉起所有外部 CLI。
-     */
+    /** 启动让出首屏，只检测一次；模型目录留到首次使用时异步加载。 */
     warmCatalog(): void;
-    /** 等安装探测完成后再刷新模型，避免为同一个 CLI 启动两次检测进程。 */
-    private warmModelCatalog;
+    /** 普通目录查询只读内存，不等待 CLI，也不触发过期刷新。 */
     catalog(): Promise<CodingNsCliAdapterDescriptor[]>;
+    /** 真正执行用户选择时，只等待这些目标的首轮检测，避免把 pending 误判成未安装。 */
+    catalogForUse(adapterIds: readonly CodingNsCliAdapterId[]): Promise<CodingNsCliAdapterDescriptor[]>;
+    /** 仅设置页显式重新检测；并发请求合并，已有模型在重新检测后按需刷新。 */
+    refreshCatalog(adapterId?: CodingNsCliAdapterId): Promise<CodingNsCliAdapterDescriptor[]>;
     models(adapterId: CodingNsCliAdapterId): Promise<CodingNsCliModelCatalog>;
     /** 读取当前外部会话绑定 Agent 的 Skill 目录；不把路径或文件内容暴露给 Client。 */
     listSkills(sessionId: string, options?: Omit<CodingNsCliSkillListInput, 'sessionId'>): Promise<readonly CodingNsCliSkillDescriptor[]>;
@@ -158,10 +154,8 @@ export declare class CodingNsCliAdapterRegistry {
     private readDetection;
     /** 同一适配器只允许一个探测；刷新失败时保留最后一次可用状态。 */
     private refreshDetection;
-    /** 模型目录使用 stale-while-revalidate；空结果和失败只缩短重试间隔。 */
+    /** 模型目录合并并发请求；缓存由手动检测或配置变化失效，不后台定时重跑。 */
     private refreshModels;
-    private scheduleDetectionRefresh;
-    private scheduleModelRefresh;
     private invalidateModelCache;
     /**
      * 比对驱动的 Provider 配置指纹，变化时立即作废该适配器的目录缓存。
@@ -174,8 +168,6 @@ export declare class CodingNsCliAdapterRegistry {
      * 原行为，不把「无法判断」当成「已变化」，避免目录退化成每次都重新探测。
      */
     private invalidateOnCatalogFingerprintChange;
-    private clearTimer;
-    private clearAllTimers;
     private refreshProviderState;
     private runProviderProbe;
     private probeWithTimeout;

package/data/build/dist/host/cli-adapters/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/registry.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/registry.js

@@ -1,12 +1,10 @@
+import { invalidateCommandEnvironment, withCommandSignal } from './process-utils.js';
+import { failedDetection } from './binary-detection.js';
 import { CodingNsRpcError } from '../rpc-table.js';
 import { debugInfo } from '../../shared/debug.js';
 import { CodingNsCliSessionStore } from './session-store.js';
 import { readLegacyImportedAdapterPreferences } from './legacy-session-settings.js';
 import { knownAntigravityContextWindow, knownCodexContextWindow, knownCommandCodeContextWindow } from './model-catalog.js';
-const DEFAULT_INSTALLED_CACHE_TTL_MS = 5 * 60_000;
-const DEFAULT_UNINSTALLED_CACHE_TTL_MS = 30_000;
-const DEFAULT_MODEL_CACHE_TTL_MS = 10 * 60_000;
-const DEFAULT_MODEL_RETRY_TTL_MS = 15_000;
 export class CodingNsCliAdapterRegistry {
     drivers = new Map();
     sessions = new Map();
@@ -19,19 +17,12 @@ export class CodingNsCliAdapterRegistry {
     probes = new Map();
     executingSessions = new Set();
     archivingSessions = new Set();
-    installedCacheTtlMs;
-    uninstalledCacheTtlMs;
-    modelCacheTtlMs;
-    modelRetryTtlMs;
     detectionCache = new Map();
     detectionRefreshes = new Map();
-    detectionTimers = new Map();
     modelCache = new Map();
     modelFailures = new Map();
     modelRefreshes = new Map();
-    modelTimers = new Map();
     modelGenerations = new Map();
-    requestedModelCatalogs = new Set();
     /**
      * 上次构建目录时驱动声明的 Provider 配置指纹。
      *
@@ -49,6 +40,11 @@ export class CodingNsCliAdapterRegistry {
      */
     segmentedTurns = new Map();
     cacheGeneration = 0;
+    startupTimer;
+    lifetime = new AbortController();
+    originalDetections = new Map();
+    detectionStates = new Map();
+    detectionTimes = new Map();
     disposed = false;
     constructor(drivers, enabled = {}, options = {}) {
         this.sessionStore = options.sessionStore;
@@ -58,10 +54,6 @@ export class CodingNsCliAdapterRegistry {
         this.missingConfirmationDelayMs = options.missingConfirmationDelayMs ?? 2_000;
         this.providerProbeTimeoutMs = Math.max(1, options.providerProbeTimeoutMs ?? 10_000);
         this.providerProbeConcurrency = Math.max(1, Math.floor(options.providerProbeConcurrency ?? 4));
-        this.installedCacheTtlMs = positiveTtl(options.installedCacheTtlMs, DEFAULT_INSTALLED_CACHE_TTL_MS);
-        this.uninstalledCacheTtlMs = positiveTtl(options.uninstalledCacheTtlMs, DEFAULT_UNINSTALLED_CACHE_TTL_MS);
-        this.modelCacheTtlMs = positiveTtl(options.modelCacheTtlMs, DEFAULT_MODEL_CACHE_TTL_MS);
-        this.modelRetryTtlMs = positiveTtl(options.modelRetryTtlMs, DEFAULT_MODEL_RETRY_TTL_MS);
         const configuredPreferences = options.settings?.get().agentAdapterPreferences;
         const legacyPreferences = options.settings === undefined ? {} : readLegacyImportedAdapterPreferences();
         const mergedPreferences = mergePreferenceRecords(legacyPreferences, configuredPreferences);
@@ -75,6 +67,9 @@ export class CodingNsCliAdapterRegistry {
             if (this.drivers.has(driver.descriptor.id))
                 throw new Error(`重复 Agent: ${driver.descriptor.id}`);
             this.drivers.set(driver.descriptor.id, driver);
+            // 驱动在模型查询和执行前的自检也必须复用同一缓存，不能绕过注册表反复启动 CLI。
+            this.originalDetections.set(driver.descriptor.id, driver.detect);
+            driver.detect = () => this.readDetection(driver);
             this.enabled.set(driver.descriptor.id, enabled[driver.descriptor.id] !== false);
         }
         for (const record of this.sessionStore?.list({ includeArchived: true }) ?? []) {
@@ -88,47 +83,51 @@ export class CodingNsCliAdapterRegistry {
     preferences = new Map();
     /** 设置服务更新必须按选择顺序落盘；并发 update 会让旧快照覆盖新模型/档位。 */
     preferenceWriteTail = Promise.resolve();
-    /**
-     * Host 启动后预热安装状态，并按驱动声明后台预热模型目录。
-     *
-     * 模型探测可能启动完整外部服务，必须留在后台；只有调用方显式请求
-     * `models()` 时才等待结果。未声明预热的驱动保持原有按需加载，避免启动时
-     * 同时拉起所有外部 CLI。
-     */
+    /** 启动让出首屏，只检测一次；模型目录留到首次使用时异步加载。 */
     warmCatalog() {
-        for (const driver of this.drivers.values()) {
-            const adapterId = driver.descriptor.id;
-            this.scheduleDetectionRefresh(adapterId, 0);
-            if (driver.warmModelCatalog !== true || !this.isEnabled(adapterId))
-                continue;
-            this.requestedModelCatalogs.add(adapterId);
-            // 定时器把第一次 detect 也移出当前调用栈；某些 CLI 的版本探测仍是同步
-            // 子进程调用，不能让 warmCatalog() 本身承担这段启动时间。
-            const timer = setTimeout(() => {
-                if (!this.disposed)
-                    void this.warmModelCatalog(driver).catch(() => undefined);
-            }, 0);
-            unrefTimer(timer);
-        }
-    }
-    /** 等安装探测完成后再刷新模型，避免为同一个 CLI 启动两次检测进程。 */
-    async warmModelCatalog(driver) {
-        if (this.disposed)
-            return;
-        const detection = await this.readDetection(driver);
-        if (this.disposed || !this.isEnabled(driver.descriptor.id) || !detection.installed)
+        if (this.disposed || this.startupTimer !== undefined)
             return;
-        await this.refreshModels(driver);
+        this.startupTimer = setTimeout(() => {
+            for (const driver of this.drivers.values())
+                void this.readDetection(driver);
+        }, 1_000);
+        unrefTimer(this.startupTimer);
     }
+    /** 普通目录查询只读内存，不等待 CLI，也不触发过期刷新。 */
     async catalog() {
-        return Promise.all([...this.drivers.values()].map(async (driver) => {
-            const detection = await this.readDetection(driver);
-            return { ...driver.descriptor, enabled: this.isEnabled(driver.descriptor.id), ...detection };
+        return [...this.drivers.values()].map((driver) => {
+            const id = driver.descriptor.id;
+            const checkedAt = this.detectionTimes.get(id);
+            return {
+                ...driver.descriptor, enabled: this.isEnabled(id),
+                ...(this.detectionCache.get(id)?.value ?? { installed: false, version: null, command: null }),
+                detectionState: this.detectionStates.get(id) ?? 'pending',
+                ...(checkedAt === undefined ? {} : { checkedAt }),
+            };
+        });
+    }
+    /** 真正执行用户选择时，只等待这些目标的首轮检测，避免把 pending 误判成未安装。 */
+    async catalogForUse(adapterIds) {
+        await Promise.all([...new Set(adapterIds)].map((id) => {
+            const driver = this.drivers.get(id);
+            return driver === undefined || !this.isEnabled(id) ? undefined : this.readDetection(driver);
+        }));
+        return this.catalog();
+    }
+    /** 仅设置页显式重新检测；并发请求合并，已有模型在重新检测后按需刷新。 */
+    async refreshCatalog(adapterId) {
+        if (this.disposed)
+            throw new Error('Agent 注册表已关闭');
+        const drivers = adapterId === undefined ? [...this.drivers.values()] : [this.requireDriver(adapterId)];
+        invalidateCommandEnvironment();
+        await Promise.all(drivers.map(async (driver) => {
+            await this.refreshDetection(driver);
+            this.invalidateModelCache(driver.descriptor.id);
         }));
+        return this.catalog();
     }
     async models(adapterId) {
         const driver = this.requireEnabledDriver(adapterId);
-        this.requestedModelCatalogs.add(adapterId);
         // Provider 配置（供应商、登录方式、默认档位）变化时必须先作废目录，否则
         // 账号级判定会跟着 10 分钟 TTL 一起被沿用，界面上的档位开关等控件长期缺失。
         if (this.invalidateOnCatalogFingerprintChange(adapterId, driver)) {
@@ -136,14 +135,10 @@ export class CodingNsCliAdapterRegistry {
         }
         const cached = this.modelCache.get(adapterId);
         if (cached !== undefined) {
-            if (cached.expiresAt <= Date.now())
-                void this.refreshModels(driver).catch(() => undefined);
             return cached.value;
         }
         const failure = this.modelFailures.get(adapterId);
         if (failure !== undefined) {
-            if (failure.expiresAt <= Date.now())
-                void this.refreshModels(driver).catch(() => undefined);
             throw failure.error;
         }
         return this.refreshModels(driver);
@@ -173,10 +168,6 @@ export class CodingNsCliAdapterRegistry {
         this.enabled.set(adapterId, enabled);
         if (previous === enabled)
             return enabled;
-        if (!enabled)
-            this.clearTimer(this.modelTimers, adapterId);
-        else if (this.requestedModelCatalogs.has(adapterId))
-            this.scheduleModelRefresh(adapterId, 0);
         return enabled;
     }
     applyEnabledSettings(settings) {
@@ -428,6 +419,9 @@ export class CodingNsCliAdapterRegistry {
         // 除了 Client 的 session/set，Host 内部和未来的调用方也可能直接执行一轮。
         // 最近使用应由真实执行参数更新，不能依赖某个 UI 一定先发 RPC。
         this.rememberPreference(input.adapterId, input);
+        // 手动 next() 不会自动转发外层的 return()；本轮持有的迭代器必须在 finally 关闭。
+        // 只有显式交给 segmentedTurns 的流才能跨 DSH step 保留。
+        let iterator;
         try {
             const stored = this.sessionStore?.get(input.sessionId);
             if (stored?.status === 'archived') {
@@ -487,7 +481,6 @@ export class CodingNsCliAdapterRegistry {
                 catch { /* 切换适配器不能被旧驱动清理失败阻断 */ }
             }
             // 通用切分要在复用时立刻撤销登记，否则耗尽后的旧迭代器会被下一条用户消息再次消费。
-            let iterator;
             if (resumingSegmentedTurn && suspended !== undefined && suspended.iterator !== null) {
                 this.segmentedTurns.delete(input.sessionId);
                 iterator = suspended.iterator;
@@ -497,8 +490,10 @@ export class CodingNsCliAdapterRegistry {
             }
             while (true) {
                 const next = await iterator.next();
-                if (next.done)
+                if (next.done) {
+                    iterator = undefined;
                     break;
+                }
                 const event = next.value;
                 if (event.type === 'usage')
                     this.lastUsages.set(input.sessionId, usageSnapshot(event));
@@ -522,6 +517,9 @@ export class CodingNsCliAdapterRegistry {
                         providerState: 'available',
                         providerCheckedAt: new Date().toISOString(),
                     });
+                    // 首次或重绑的 Provider ID 必须先落盘，避免崩溃后丢失续接身份。
+                    if (providerIdentityChanged)
+                        await this.sessionStore?.flush();
                 }
                 if (event.type === 'finish') {
                     this.segmentedTurns.delete(input.sessionId);
@@ -531,6 +529,7 @@ export class CodingNsCliAdapterRegistry {
                 // 直接交给 Feature，不能再次按工具完成事件切一遍。
                 if (event.type === 'step-boundary') {
                     await closeAgentIterator(iterator);
+                    iterator = undefined;
                     // 驱动自己持有 Provider 进程与段状态：这里只登记续段意图，下一次
                     // llm/stream 再显式要求驱动恢复；注入失败时 discardSegmentedTurn
                     // 会同时丢弃 Registry 意图和驱动内的进程。
@@ -545,6 +544,8 @@ export class CodingNsCliAdapterRegistry {
                     // 先保存迭代器再 yield。即使调用方在工具事件后提前关闭流，
                     // 下一次 DSH step 仍能从同一个 Provider 进程继续读取正文。
                     this.segmentedTurns.set(input.sessionId, { adapterId: input.adapterId, iterator });
+                    // 所有权交给续段表，当前调用结束不得关闭需要继续消费的 Provider 流。
+                    iterator = undefined;
                     yield event;
                     yield { type: 'step-boundary' };
                     return;
@@ -562,6 +563,8 @@ export class CodingNsCliAdapterRegistry {
             throw error;
         }
         finally {
+            if (iterator !== undefined)
+                await closeAgentIterator(iterator);
             this.executingSessions.delete(input.sessionId);
             try {
                 await this.nativeSessions?.flush(input.sessionId);
@@ -711,15 +714,16 @@ export class CodingNsCliAdapterRegistry {
         if (this.disposed)
             return;
         this.disposed = true;
+        this.lifetime.abort();
         this.cacheGeneration += 1;
-        this.clearAllTimers(this.detectionTimers);
-        this.clearAllTimers(this.modelTimers);
+        clearTimeout(this.startupTimer);
+        for (const [id, detect] of this.originalDetections)
+            this.drivers.get(id).detect = detect;
         this.detectionCache.clear();
         this.modelCache.clear();
         this.modelFailures.clear();
         this.modelGenerations.clear();
         this.catalogFingerprints.clear();
-        this.requestedModelCatalogs.clear();
         await Promise.all([...this.segmentedTurns.values()].map(({ iterator }) => iterator === null ? Promise.resolve() : closeAgentIterator(iterator)));
         this.segmentedTurns.clear();
         this.lastUsages.clear();
@@ -730,9 +734,11 @@ export class CodingNsCliAdapterRegistry {
         const adapterId = driver.descriptor.id;
         const cached = this.detectionCache.get(adapterId);
         if (cached !== undefined) {
-            if (cached.expiresAt <= Date.now())
-                void this.refreshDetection(driver);
-            return cached.value;
+            // 仅实际使用时重试失败状态，列表仍然只读；确实未安装的 Agent 不后台轮询。
+            const checkedAt = this.detectionTimes.get(adapterId);
+            const retry = this.detectionStates.get(adapterId) === 'error' && checkedAt !== undefined && Date.now() - Date.parse(checkedAt) >= 30_000;
+            if (!retry)
+                return cached.value;
         }
         return this.refreshDetection(driver);
     }
@@ -742,36 +748,36 @@ export class CodingNsCliAdapterRegistry {
         const running = this.detectionRefreshes.get(adapterId);
         if (running !== undefined)
             return running;
-        this.clearTimer(this.detectionTimers, adapterId);
+        if (this.disposed)
+            return Promise.resolve(this.detectionCache.get(adapterId)?.value ?? { installed: false, version: null, command: null });
+        this.detectionStates.set(adapterId, 'running');
         const generation = this.cacheGeneration;
         const previous = this.detectionCache.get(adapterId);
         const refresh = (async () => {
             let detection;
             let failed = false;
             try {
-                const detected = await driver.detect();
+                const detected = await withCommandSignal(this.lifetime.signal, () => this.originalDetections.get(adapterId).call(driver));
                 const getDiagnostic = driver.getDiscoveryDiagnostic;
                 const diagnostic = getDiagnostic === undefined ? undefined : getDiagnostic.call(driver);
                 detection = diagnostic === undefined ? detected : { ...detected, diagnostic };
+                const failure = detected.detectionFailure ?? driver.getDiscoveryFailure?.();
+                if (!detected.installed && failure !== undefined) {
+                    failed = true;
+                    detection = detectionError(failure, previous?.value, diagnostic);
+                }
             }
             catch {
                 failed = true;
-                detection = previous?.value ?? { installed: false, version: null, command: null };
+                detection = detectionError('launch', previous?.value);
             }
             if (this.disposed || generation !== this.cacheGeneration)
                 return detection;
-            const ttl = failed
-                ? this.uninstalledCacheTtlMs
-                : detection.installed
-                    ? this.installedCacheTtlMs
-                    : this.uninstalledCacheTtlMs;
-            this.detectionCache.set(adapterId, { value: detection, expiresAt: Date.now() + ttl });
-            this.scheduleDetectionRefresh(adapterId, ttl);
+            this.detectionCache.set(adapterId, { value: detection });
+            this.detectionStates.set(adapterId, failed ? 'error' : 'ready');
+            this.detectionTimes.set(adapterId, new Date().toISOString());
             if (previous !== undefined && detectionFingerprint(previous.value) !== detectionFingerprint(detection)) {
                 this.invalidateModelCache(adapterId);
-                if (detection.installed && this.requestedModelCatalogs.has(adapterId) && this.isEnabled(adapterId)) {
-                    this.scheduleModelRefresh(adapterId, 0);
-                }
             }
             return detection;
         })().finally(() => {
@@ -781,27 +787,26 @@ export class CodingNsCliAdapterRegistry {
         this.detectionRefreshes.set(adapterId, refresh);
         return refresh;
     }
-    /** 模型目录使用 stale-while-revalidate；空结果和失败只缩短重试间隔。 */
+    /** 模型目录合并并发请求；缓存由手动检测或配置变化失效，不后台定时重跑。 */
     refreshModels(driver) {
         const adapterId = driver.descriptor.id;
         const running = this.modelRefreshes.get(adapterId);
         if (running !== undefined)
             return running;
-        this.clearTimer(this.modelTimers, adapterId);
         const generation = this.cacheGeneration;
         const modelGeneration = this.modelGenerations.get(adapterId) ?? 0;
         const previous = this.modelCache.get(adapterId);
         const refresh = (async () => {
+            const probeFingerprint = readCatalogFingerprint(driver);
             try {
                 // 指纹必须在探测开始前捕获：若在 listModels() 返回后再读，探测期间发生的
                 // 第二次供应商切换会被记成“已应用”，而目录其实来自切换前的配置，之后
                 // 指纹比对会一直命中，旧判定又被锁进缓存。
-                const probeFingerprint = readCatalogFingerprint(driver);
-                const catalog = await driver.listModels();
+                const catalog = await withCommandSignal(this.lifetime.signal, () => driver.listModels());
                 if (this.disposed || generation !== this.cacheGeneration)
                     return previous?.value ?? catalog;
                 if (modelGeneration !== (this.modelGenerations.get(adapterId) ?? 0))
-                    return this.refreshModels(driver);
+                    return this.models(adapterId);
                 this.modelFailures.delete(adapterId);
                 const hasModels = catalogHasModels(catalog);
                 const keepPrevious = !hasModels && previous !== undefined && catalogHasModels(previous.value);
@@ -809,9 +814,7 @@ export class CodingNsCliAdapterRegistry {
                 // 指纹与目录一起落库：只有真正代表这份目录的配置才会在下次比对时命中。
                 if (probeFingerprint !== undefined)
                     this.catalogFingerprints.set(adapterId, probeFingerprint);
-                const ttl = hasModels ? this.modelCacheTtlMs : this.modelRetryTtlMs;
-                this.modelCache.set(adapterId, { value, expiresAt: Date.now() + ttl });
-                this.scheduleModelRefresh(adapterId, ttl);
+                this.modelCache.set(adapterId, { value });
                 return value;
             }
             catch (error) {
@@ -821,14 +824,14 @@ export class CodingNsCliAdapterRegistry {
                     throw error;
                 }
                 if (modelGeneration !== (this.modelGenerations.get(adapterId) ?? 0))
-                    return this.refreshModels(driver);
+                    return this.models(adapterId);
+                if (probeFingerprint !== undefined)
+                    this.catalogFingerprints.set(adapterId, probeFingerprint);
                 if (previous !== undefined) {
-                    this.modelCache.set(adapterId, { value: previous.value, expiresAt: Date.now() + this.modelRetryTtlMs });
-                    this.scheduleModelRefresh(adapterId, this.modelRetryTtlMs);
+                    this.modelCache.set(adapterId, { value: previous.value });
                     return previous.value;
                 }
-                this.modelFailures.set(adapterId, { error, expiresAt: Date.now() + this.modelRetryTtlMs });
-                this.scheduleModelRefresh(adapterId, this.modelRetryTtlMs);
+                this.modelFailures.set(adapterId, { error });
                 throw error;
             }
         })().finally(() => {
@@ -838,38 +841,12 @@ export class CodingNsCliAdapterRegistry {
         this.modelRefreshes.set(adapterId, refresh);
         return refresh;
     }
-    scheduleDetectionRefresh(adapterId, delayMs) {
-        if (this.disposed)
-            return;
-        this.clearTimer(this.detectionTimers, adapterId);
-        const timer = setTimeout(() => {
-            this.detectionTimers.delete(adapterId);
-            const driver = this.drivers.get(adapterId);
-            if (driver !== undefined && !this.disposed)
-                void this.refreshDetection(driver);
-        }, delayMs);
-        unrefTimer(timer);
-        this.detectionTimers.set(adapterId, timer);
-    }
-    scheduleModelRefresh(adapterId, delayMs) {
-        if (this.disposed || !this.isEnabled(adapterId) || !this.requestedModelCatalogs.has(adapterId))
-            return;
-        this.clearTimer(this.modelTimers, adapterId);
-        const timer = setTimeout(() => {
-            this.modelTimers.delete(adapterId);
-            const driver = this.drivers.get(adapterId);
-            if (driver !== undefined && this.isEnabled(adapterId) && !this.disposed)
-                void this.refreshModels(driver).catch(() => undefined);
-        }, delayMs);
-        unrefTimer(timer);
-        this.modelTimers.set(adapterId, timer);
-    }
     invalidateModelCache(adapterId) {
-        this.clearTimer(this.modelTimers, adapterId);
         this.modelGenerations.set(adapterId, (this.modelGenerations.get(adapterId) ?? 0) + 1);
         this.modelRefreshes.delete(adapterId);
         this.modelCache.delete(adapterId);
         this.modelFailures.delete(adapterId);
+        this.catalogFingerprints.delete(adapterId);
     }
     /**
      * 比对驱动的 Provider 配置指纹，变化时立即作废该适配器的目录缓存。
@@ -893,17 +870,6 @@ export class CodingNsCliAdapterRegistry {
         this.invalidateModelCache(adapterId);
         return true;
     }
-    clearTimer(timers, adapterId) {
-        const timer = timers.get(adapterId);
-        if (timer !== undefined)
-            clearTimeout(timer);
-        timers.delete(adapterId);
-    }
-    clearAllTimers(timers) {
-        for (const timer of timers.values())
-            clearTimeout(timer);
-        timers.clear();
-    }
     async refreshProviderState(record, force) {
         if (record.status === 'archived')
             return;
@@ -1054,9 +1020,6 @@ async function forEachConcurrent(values, concurrency, task) {
     });
     await Promise.all(workers);
 }
-function positiveTtl(value, fallback) {
-    return Math.max(1, Math.floor(value ?? fallback));
-}
 function detectionFingerprint(detection) {
     return JSON.stringify([detection.installed, detection.command, detection.version, detection.diagnostic]);
 }
@@ -1190,4 +1153,12 @@ function unrefTimer(timer) {
     const nodeTimer = timer;
     nodeTimer.unref?.();
 }
+/** 短暂探测失败保留最后一次成功入口，失败原因始终来自本次探测。 */
+function detectionError(reason, previous, diagnostic) {
+    return {
+        ...failedDetection(reason),
+        ...(previous?.installed ? { installed: true, version: previous.version, command: previous.command } : {}),
+        ...(diagnostic === undefined ? {} : { diagnostic }),
+    };
+}
 //# sourceMappingURL=registry.js.map