@deepseek-harness-tui/dsh-tui 0.11.1 → 0.11.2

package/lib/types/dsh-adapter/providerWizard.d.ts

@@ -1,6 +1,7 @@
 import type { ProviderSetupHost } from '../adapter/ports/channel-settings.js';
 export type { ProviderSetupHost, CatalogProviderCandidate, ConfiguredProvider, ProfilePathOp, OAuthSetupHost, OAuthProviderStatus, OAuthLoginResult } from '../adapter/ports/channel-settings.js';
 import { type AskUserQuestionAnswer, type AskUserQuestionRequest } from '@deepseek-ai/dsh-user-questions';
+import type { LlmDiscoveredModel } from '@deepseek-ai/dsh-llm';
 /** Route id rule shared with the dsh configuration surface (web Models page). */
 export declare const PROVIDER_ROUTE_ID: RegExp;
 /** Wire protocols dsh-llm-pi-ai can serve on a manually declared route. */
@@ -39,4 +40,20 @@ export type ProviderWizardOutcome = 'added' | 'updated' | 'deleted' | 'signed-ou
  * dismisses any question (Esc) — nothing has been written at that point.
  */
 export declare function runProviderWizard(deps: ProviderWizardDeps): Promise<ProviderWizardOutcome>;
+/** How the live endpoint probe of one discovery pass went. */
+export type RouteDiscoveryLive = 'fetched' | 'failed' | 'unavailable';
+export type RouteDiscoveryCatalog = 'fetched' | 'failed' | 'unavailable';
+export type RouteDiscoveryReason = 'no-base-url' | 'unsupported-catalog' | 'custom-headers';
+/** One route-model discovery pass, ready for the selection panel. */
+export interface RouteDiscovery {
+    /** Merged rows: installed-catalog rows first (rich metadata), then
+     *  endpoint-only ids in the order the endpoint advertised them. */
+    readonly rows: readonly LlmDiscoveredModel[];
+    /** Ids covered by the installed catalog (their rows carry catalog truth). */
+    readonly catalogIds: ReadonlySet<string>;
+    /** Whether the installed catalog lookup was authoritative. */
+    readonly catalog: RouteDiscoveryCatalog;
+    readonly live: RouteDiscoveryLive;
+    readonly reason?: RouteDiscoveryReason;
+}
 //# sourceMappingURL=providerWizard.d.ts.map

package/lib/types/dsh-adapter/providerWizard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providerWizard.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/providerWizard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAsH,MAAM,sCAAsC,CAAA;AACjM,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAsBjM,OAAO,EAEL,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAA;AAGxC,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,QAAoC,CAAA;AAElE,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,2EAIrB,CAAA;AAEV;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAChC,QAAQ,CAAC,GAAG,EAAE,CACZ,OAAO,EAAE,sBAAsB,EAC/B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,IAAI,CAAA;IACT,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;IACrE,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,QAAQ,CAAA;AA4D3G;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,qBAAqB,CAAC,CA8BhC"}
+{"version":3,"file":"providerWizard.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/providerWizard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAsH,MAAM,sCAAsC,CAAA;AACjM,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAsBjM,OAAO,EAEL,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,QAAoC,CAAA;AAElE,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,2EAIrB,CAAA;AAEV;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAChC,QAAQ,CAAC,GAAG,EAAE,CACZ,OAAO,EAAE,sBAAsB,EAC/B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,IAAI,CAAA;IACT,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;IACrE,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,QAAQ,CAAA;AA4D3G;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,qBAAqB,CAAC,CA8BhC;AAo3BD,8DAA8D;AAC9D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAA;AACrE,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAA;AACxE,MAAM,MAAM,oBAAoB,GAC5B,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,qEAAqE;AACrE,MAAM,WAAW,cAAc;IAC7B;uEACmE;IACnE,QAAQ,CAAC,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAA;IAC5C,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACxC,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAA;IACvC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAA;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAA;CACvC"}

package/lib/types/dsh-adapter/providerWizard.js

@@ -204,12 +204,14 @@ async function runAddFlow(deps) {
     }
     // ── 5. model discovery (draft credential, nothing persisted) ───────
     notify(t('provider-discovery-running'));
-    const discovered = await host.discoverModels({
+    const discovery = await discoverRouteModels(host, {
         ...(isCatalog ? { provider: route } : {}),
         ...(baseURL !== undefined && baseURL !== '' ? { baseURL } : {}),
         ...(api !== undefined ? { api } : {}),
-        apiKey: apiKey ?? '',
-    }).catch(() => []);
+        ...(apiKey !== undefined && apiKey !== '' ? { apiKey } : {}),
+    });
+    const discovered = discovery.rows;
+    notifyDiscoveryStatus(notify, discovery);
     // ── 6. model selection ─────────────────────────────────────────────
     let models = [];
     let discoveredById = new Map();
@@ -218,13 +220,15 @@ async function runAddFlow(deps) {
         const modelsAnswer = await ask({
             questions: [optionQuestion('models', t('provider-q-models'), discovered.map(model => ({
                     label: model.id,
-                    description: [
-                        model.name ?? '',
-                        model.contextWindow !== undefined ? `${model.contextWindow}` : '',
-                    ].filter(part => part !== '').join(' · ') || undefined,
-                })), { multiSelect: true })],
+                    description: modelRowDescription(model, isCatalog && discovery.catalog === 'fetched' && !discovery.catalogIds.has(model.id)),
+                })), {
+                    multiSelect: true,
+                    ...(isCatalog && discovery.reason === 'no-base-url'
+                        ? { detail: t('provider-catalog-snapshot-note', { n: discovered.length }) }
+                        : {}),
+                })],
         });
-        models = mergeModelIds(answerSelected(modelsAnswer, 'models'), answerText(modelsAnswer, 'models'));
+        models = mergeModelIds(answerSelected(modelsAnswer, 'models'), modelCustomInput(modelsAnswer, isCatalog, discovery, notify));
     }
     else {
         notify(t('provider-discovery-failed'), { color: 'warning' });
@@ -247,11 +251,14 @@ async function runAddFlow(deps) {
     }
     // ── 7. confirm ─────────────────────────────────────────────────────
     const summaryLines = buildSummaryLines({
-        route, ref, shadowed, baseURL, api, models, isCatalog, keyLine,
+        route, action: 'added', ref, shadowed, baseURL, api, models, isCatalog, keyLine,
+    });
+    const previewLines = buildSummaryLines({
+        route, action: 'preview', ref, shadowed, baseURL, api, models, isCatalog, keyLine,
     });
     const detail = host.routeExists(route)
-        ? `${summaryLines.join('\n')}\n${t('provider-route-exists-warning')}`
-        : summaryLines.join('\n');
+        ? `${previewLines.join('\n')}\n${t('provider-route-exists-warning')}`
+        : previewLines.join('\n');
     const confirmAnswer = await ask({
         questions: [optionQuestion('confirm', t('provider-q-confirm'), [
                 { label: t('provider-opt-confirm-write') },
@@ -273,7 +280,16 @@ async function runAddFlow(deps) {
         await host.writeCredential(ref, apiKey);
         wroteCredential = true;
     }
-    const profile = buildProfile({ isCatalog, ref, baseURL, api, models, discoveredById });
+    const profile = buildProfile({
+        isCatalog,
+        ref,
+        baseURL,
+        api,
+        models,
+        discoveredById,
+        catalogIds: discovery.catalogIds,
+        catalogDiscovery: discovery.catalog,
+    });
     try {
         await host.writeProfile(route, profile);
     }
@@ -444,6 +460,7 @@ async function editApiKey(deps, provider) {
     await host.writeCredential(provider.ref, value);
     pushLocal('/provider', buildSummaryLines({
         route: provider.route,
+        action: 'updated',
         ref: provider.ref,
         shadowed: provider.shadowed,
         baseURL: provider.baseURL,
@@ -466,6 +483,7 @@ change) {
     await host.mutateProfile(provider.route, [{ op: 'set', path, value }]);
     pushLocal('/provider', buildSummaryLines({
         route: provider.route,
+        action: 'updated',
         ref: provider.ref,
         shadowed: provider.shadowed,
         baseURL: change.baseURL ?? provider.baseURL,
@@ -527,16 +545,27 @@ async function editModelList(deps, provider) {
     const { host, ask, notify, pushLocal } = deps;
     const isCatalog = provider.isCatalog;
     const previous = provider.models ?? [];
-    const key = provider.ref !== ''
+    // The credential is read only when a live probe will use it: a catalog
+    // A route without a usable live probe (no endpoint, unsupported catalog
+    // protocol, or custom headers the upstream seam cannot carry) stays on the
+    // installed-catalog listing, so no secret is resolved for nothing.
+    const endpointKnown = provider.baseURL !== undefined && provider.baseURL !== '';
+    const liveProbePossible = endpointKnown
+        && !provider.hasCustomHeaders
+        && (!isCatalog || provider.api !== undefined || catalogLiveApi(provider.route) !== undefined);
+    const key = provider.ref !== '' && liveProbePossible
         ? (provider.shadowed ? host.envValue(provider.ref) : await host.readCredential(provider.ref))
         : undefined;
     notify(t('provider-discovery-running'));
-    const discovered = await host.discoverModels({
+    const discovery = await discoverRouteModels(host, {
         ...(isCatalog ? { provider: provider.route } : {}),
-        ...(provider.baseURL !== undefined && provider.baseURL !== '' ? { baseURL: provider.baseURL } : {}),
+        ...(provider.baseURL !== undefined ? { baseURL: provider.baseURL } : {}),
         ...(provider.api !== undefined ? { api: provider.api } : {}),
-        apiKey: key ?? '',
-    }).catch(() => []);
+        ...(provider.hasCustomHeaders ? { hasCustomHeaders: true } : {}),
+        ...(key !== undefined ? { apiKey: key } : {}),
+    });
+    const discovered = discovery.rows;
+    notifyDiscoveryStatus(notify, discovery);
     let models;
     let discoveredById = new Map();
     if (discovered.length === 0) {
@@ -552,18 +581,15 @@ async function editModelList(deps, provider) {
     }
     else {
         discoveredById = new Map(discovered.map(model => [model.id, model]));
-        // Existing models the endpoint no longer advertises (renamed, beta
-        // pulled, transient discovery gap) must still appear in the panel,
-        // pre-checked and marked: options built from `discovered` alone would
-        // silently drop them on an Enter-through confirm, destroying their
-        // stored entries and the unmodeled per-model fields. Only an explicit
-        // un-check removes one.
+        // Existing models neither the catalog nor the endpoint advertises
+        // (renamed, beta pulled, transient discovery gap) must still appear in
+        // the panel, pre-checked and marked: options built from `discovered`
+        // alone would silently drop them on an Enter-through confirm,
+        // destroying their stored entries and the unmodeled per-model fields.
+        // Only an explicit un-check removes one.
         const optionRows = discovered.map(model => ({
             label: model.id,
-            description: [
-                model.name ?? '',
-                model.contextWindow !== undefined ? `${model.contextWindow}` : '',
-            ].filter(part => part !== '').join(' · ') || undefined,
+            description: modelRowDescription(model, isCatalog && discovery.catalog === 'fetched' && !discovery.catalogIds.has(model.id)),
         }));
         const missingRows = previous
             .filter(id => !discoveredById.has(id))
@@ -572,9 +598,15 @@ async function editModelList(deps, provider) {
             description: t('provider-row-model-missing'),
         }));
         const modelsAnswer = await ask({
-            questions: [optionQuestion('models', t('provider-q-models'), [...optionRows, ...missingRows], { multiSelect: true, defaultSelected: previous })],
+            questions: [optionQuestion('models', t('provider-q-models'), [...optionRows, ...missingRows], {
+                    multiSelect: true,
+                    defaultSelected: previous,
+                    ...(isCatalog && discovery.reason === 'no-base-url'
+                        ? { detail: t('provider-catalog-snapshot-note', { n: discovered.length }) }
+                        : {}),
+                })],
         });
-        models = mergeModelIds(answerSelected(modelsAnswer, 'models'), answerText(modelsAnswer, 'models'));
+        models = mergeModelIds(answerSelected(modelsAnswer, 'models'), modelCustomInput(modelsAnswer, isCatalog, discovery, notify));
     }
     if (!isCatalog && models.length === 0) {
         // A manual route without models fails the adapter validation.
@@ -586,8 +618,11 @@ async function editModelList(deps, provider) {
         return 'cancelled';
     }
     // The new `models` value: a kept id re-enters its stored entry verbatim;
-    // a newly enabled one is built from the discovery row (plain `{id}` on a
-    // catalog route, where the catalog itself carries the capabilities).
+    // a newly enabled one is built from the discovery row. An id the installed
+    // catalog covers stays plain `{id}` (the catalog carries the capabilities
+    // and would be overridden by entry fields); an endpoint-only id takes the
+    // capacities the live listing disclosed, falling back to the route
+    // defaults upstream when the endpoint said nothing.
     const storedById = new Map((provider.modelEntries ?? [])
         .flatMap(entry => typeof entry['id'] === 'string' ? [[entry['id'], entry]] : []));
     const modelsValue = models.map(id => {
@@ -597,7 +632,7 @@ async function editModelList(deps, provider) {
         const discovered = discoveredById.get(id);
         return {
             id,
-            ...(isCatalog || discovered === undefined ? {} : {
+            ...((isCatalog && (discovery.catalog !== 'fetched' || discovery.catalogIds.has(id))) || discovered === undefined ? {} : {
                 ...(discovered.contextWindow !== undefined
                     ? { contextWindow: discovered.contextWindow }
                     : {}),
@@ -612,6 +647,7 @@ async function editModelList(deps, provider) {
     ]);
     pushLocal('/provider', buildSummaryLines({
         route: provider.route,
+        action: 'updated-models',
         ref: provider.ref,
         shadowed: provider.shadowed,
         baseURL: provider.baseURL,
@@ -621,6 +657,10 @@ async function editModelList(deps, provider) {
         keyLine: provider.ref !== ''
             ? t('provider-line-key-kept', { ref: provider.ref })
             : t('provider-line-key-none'),
+        delta: {
+            added: models.filter(id => !previous.includes(id)),
+            removed: previous.filter(id => !models.includes(id)),
+        },
     }));
     notify(t('provider-edit-success', { route: provider.route }), { color: 'success' });
     return 'updated';
@@ -654,7 +694,7 @@ async function deleteConfiguredProvider(deps, provider) {
     const sharers = provider.ref === ''
         ? []
         : host.listRefUsers(provider.ref, provider.route);
-    const lines = buildDeleteSummary(provider);
+    const previewLines = buildDeleteSummary(provider);
     let confirmAnswer;
     try {
         confirmAnswer = await ask({
@@ -663,8 +703,8 @@ async function deleteConfiguredProvider(deps, provider) {
                     { label: t('provider-opt-confirm-cancel') },
                 ], {
                     detail: sharers.length > 0
-                        ? `${lines.join('\n')}\n${t('provider-delete-shared-warning', { ref: provider.ref, routes: sharers.join(', ') })}`
-                        : lines.join('\n'),
+                        ? `${previewLines.join('\n')}\n${t('provider-delete-shared-warning', { ref: provider.ref, routes: sharers.join(', ') })}`
+                        : previewLines.join('\n'),
                     hideCustomInput: true,
                 })],
         });
@@ -690,7 +730,10 @@ async function deleteConfiguredProvider(deps, provider) {
     }
     // The catalog changed from here on: report 'deleted' whatever the
     // credential cleanup below does, so the caller invalidates completions.
-    const pushedLines = [...lines];
+    const pushedLines = [
+        t('provider-line-action-deleted', { route: provider.route }),
+        ...previewLines.slice(1),
+    ];
     let keyCleanupFailed = false;
     if (provider.ref !== '') {
         if (provider.shadowed) {
@@ -757,13 +800,13 @@ function providerRowDescription(provider) {
  *  and models lines; no credential values are ever rendered). */
 function buildDeleteSummary(provider) {
     const lines = [t('provider-line-route', { route: provider.route })];
-    if (provider.baseURL !== undefined)
-        lines.push(t('provider-line-baseurl', { url: provider.baseURL }));
-    if (provider.api !== undefined)
-        lines.push(t('provider-line-protocol', { api: provider.api }));
-    lines.push(provider.models !== undefined && provider.models.length > 0
-        ? t('provider-line-models', { models: provider.models.join(', ') })
-        : t('provider-line-models-catalog'));
+    if (provider.baseURL !== undefined && provider.baseURL !== '') {
+        const endpoint = t('provider-line-endpoint', { url: provider.baseURL });
+        lines.push(provider.api !== undefined && provider.api !== ''
+            ? `${endpoint} · ${provider.api}`
+            : endpoint);
+    }
+    lines.push(modelsSummaryLine(provider.models ?? [], undefined));
     if (provider.ref !== '') {
         lines.push(provider.shadowed
             ? t('provider-line-keyref-env', { ref: provider.ref })
@@ -868,21 +911,167 @@ function mergeModelIds(selected, custom) {
     }
     return ids;
 }
+function modelCustomInput(answer, isCatalog, discovery, notify) {
+    const custom = answerText(answer, 'models');
+    if (custom !== '' && isCatalog && discovery.reason === 'unsupported-catalog') {
+        notify(t('provider-catalog-models-only'), { color: 'warning' });
+        return '';
+    }
+    return custom;
+}
+/**
+ * Discover the models of one route or draft in two passes.
+ *
+ * The upstream discovery seam answers a request that names a catalog
+ * `provider` from the installed static catalog without touching the network.
+ * A live probe therefore omits `provider`, but only when this adapter can
+ * supply a stable protocol and the route has no custom headers (the upstream
+ * seam cannot carry the named route's headers into an anonymous request).
+ * The listings merge: an id present in both resolves to its catalog row,
+ * endpoint-only ids append — those are the new models the wizard can surface.
+ *
+ * The `apiKey` field is omitted rather than sent empty when no key is
+ * knowable: an empty string is a hard invalid-credential upstream, while an
+ * absent field probes anonymously (a local gateway that needs no auth still
+ * lists its models).
+ */
+async function discoverRouteModels(host, draft) {
+    const catalogResult = draft.provider !== undefined
+        ? await host.discoverModels({ provider: draft.provider }).then(rows => ({ rows, catalog: 'fetched' }), () => ({ rows: [], catalog: 'failed' }))
+        : { rows: [], catalog: 'unavailable' };
+    const catalogRows = catalogResult.rows;
+    const catalogIds = new Set(catalogRows.map(row => row.id));
+    if (draft.baseURL === undefined || draft.baseURL === '') {
+        return {
+            rows: catalogRows,
+            catalogIds,
+            catalog: catalogResult.catalog,
+            live: 'unavailable',
+            reason: 'no-base-url',
+        };
+    }
+    if (draft.hasCustomHeaders) {
+        return {
+            rows: catalogRows,
+            catalogIds,
+            catalog: catalogResult.catalog,
+            live: 'unavailable',
+            reason: 'custom-headers',
+        };
+    }
+    const api = draft.api ?? (draft.provider !== undefined
+        ? catalogLiveApi(draft.provider)
+        : undefined);
+    if (draft.provider !== undefined && api === undefined) {
+        return {
+            rows: catalogRows,
+            catalogIds,
+            catalog: catalogResult.catalog,
+            live: 'unavailable',
+            reason: 'unsupported-catalog',
+        };
+    }
+    const live = await host.discoverModels({
+        baseURL: draft.baseURL,
+        ...(api !== undefined && api !== '' ? { api } : {}),
+        ...(draft.apiKey !== undefined && draft.apiKey !== '' ? { apiKey: draft.apiKey } : {}),
+    }).then(rows => ({ rows, live: 'fetched' }), () => ({ rows: [], live: 'failed' }));
+    return {
+        rows: [...catalogRows, ...live.rows.filter(row => !catalogIds.has(row.id))],
+        catalogIds,
+        catalog: catalogResult.catalog,
+        live: live.live,
+    };
+}
+/** Catalog routes whose protocol is stable enough for an un-named live probe. */
+const CATALOG_LIVE_APIS = {
+    deepseek: 'openai-completions',
+    openai: 'openai-responses',
+    anthropic: 'anthropic-messages',
+};
+function catalogLiveApi(provider) {
+    return CATALOG_LIVE_APIS[provider];
+}
+function notifyDiscoveryStatus(notify, discovery) {
+    if (discovery.catalog === 'failed') {
+        notify(t('provider-catalog-fetch-failed'), { color: 'warning' });
+    }
+    if (discovery.live === 'failed') {
+        notify(t('provider-live-fetch-failed'), { color: 'warning' });
+    }
+    else if (discovery.reason === 'unsupported-catalog' || discovery.reason === 'custom-headers') {
+        notify(t('provider-live-fetch-unavailable'), { color: 'warning' });
+    }
+}
+/** Compact capacity rendering for picker rows: 1000000 → 1M, 384000 → 384k. */
+function formatCapacity(n) {
+    if (n >= 1_000_000 && n % 1_000_000 === 0)
+        return `${n / 1_000_000}M`;
+    if (n >= 1_000 && n % 1_000 === 0)
+        return `${n / 1_000}k`;
+    return `${n}`;
+}
+/**
+ * Picker-row description for one discovered model. `isNew` tags an id the
+ * installed catalog does not ship — it came from the live endpoint probe and
+ * is the thing the user is most likely looking for.
+ */
+function modelRowDescription(model, isNew) {
+    const parts = [
+        ...(isNew ? [t('provider-row-model-new')] : []),
+        ...(model.name !== undefined && model.name !== '' ? [model.name] : []),
+        ...(model.contextWindow !== undefined ? [formatCapacity(model.contextWindow)] : []),
+    ];
+    return parts.length > 0 ? parts.join(' · ') : undefined;
+}
 function buildSummaryLines(input) {
-    const lines = [t('provider-line-route', { route: input.route })];
-    lines.push(input.keyLine ?? (input.shadowed
+    const lines = [input.action === 'preview'
+            ? t('provider-line-route', { route: input.route })
+            : input.action === 'added'
+                ? t('provider-line-action-added', { route: input.route })
+                : input.action === 'updated-models'
+                    ? t('provider-line-action-updated-models', { route: input.route })
+                    : t('provider-line-action-updated', { route: input.route })];
+    lines.push((input.action === 'preview' && !input.shadowed && input.ref !== ''
+        ? t('provider-line-keyref-preview', { ref: input.ref })
+        : undefined) ?? input.keyLine ?? (input.shadowed
         ? t('provider-line-keyref-env', { ref: input.ref })
         : t('provider-line-keyref', { ref: input.ref })));
     if (input.baseURL !== undefined && input.baseURL !== '') {
-        lines.push(t('provider-line-baseurl', { url: input.baseURL }));
+        // The wire protocol rides the endpoint line: it only ever varies per
+        // endpoint, and a lone protocol row reads as filler.
+        const endpoint = t('provider-line-endpoint', { url: input.baseURL });
+        lines.push(input.api !== undefined && input.api !== ''
+            ? `${endpoint} · ${input.api}`
+            : endpoint);
     }
-    if (input.api !== undefined)
-        lines.push(t('provider-line-protocol', { api: input.api }));
-    lines.push(input.models.length > 0
-        ? t('provider-line-models', { models: input.models.join(', ') })
-        : t('provider-line-models-catalog'));
+    lines.push(modelsSummaryLine(input.models, input.delta));
     return lines;
 }
+/** `Models: …` line with an optional (added · removed) delta suffix. */
+function modelsSummaryLine(models, delta) {
+    const base = models.length > 0
+        ? t('provider-line-models', { models: models.join(', ') })
+        : t('provider-line-models-catalog');
+    if (delta === undefined)
+        return base;
+    const parts = [];
+    if (delta.added.length > 0)
+        parts.push(t('provider-models-delta-added', { n: delta.added.length }));
+    if (delta.removed.length > 0)
+        parts.push(t('provider-models-delta-removed', { n: delta.removed.length }));
+    return parts.length === 0 ? base
+        : `${base}${t('provider-models-delta-wrap', { parts: parts.join(' · ') })}`;
+}
+/** Capacity fields for one discovered row, when the listing disclosed them. */
+function capsOf(model) {
+    if (model === undefined)
+        return {};
+    return {
+        ...(model.contextWindow !== undefined ? { contextWindow: model.contextWindow } : {}),
+        ...(model.maxTokens !== undefined ? { maxTokens: model.maxTokens } : {}),
+    };
+}
 function buildProfile(input) {
     const profile = {};
     // Preserve the profile's credential shape: an empty ref (no apiKeyEnv)
@@ -893,24 +1082,23 @@ function buildProfile(input) {
         profile['baseURL'] = input.baseURL;
     if (input.isCatalog) {
         // `models` replaces the catalog when present; omit it to keep the whole
-        // catalog served.
+        // catalog served. An id the installed catalog covers stays plain `{id}`
+        // (the catalog carries versioned capabilities); an endpoint-only id
+        // carries what the live listing disclosed.
         if (input.models.length > 0) {
-            profile['models'] = input.models.map(id => ({ id }));
+            profile['models'] = input.models.map(id => ({
+                id,
+                ...((input.catalogDiscovery !== 'fetched' || input.catalogIds.has(id))
+                    ? {}
+                    : capsOf(input.discoveredById.get(id))),
+            }));
         }
         return profile;
     }
     profile['api'] = input.api;
-    profile['models'] = input.models.map(id => {
-        const discovered = input.discoveredById.get(id);
-        return {
-            id,
-            ...(discovered?.contextWindow !== undefined
-                ? { contextWindow: discovered.contextWindow }
-                : {}),
-            ...(discovered?.maxTokens !== undefined
-                ? { maxTokens: discovered.maxTokens }
-                : {}),
-        };
-    });
+    profile['models'] = input.models.map(id => ({
+        id,
+        ...capsOf(input.discoveredById.get(id)),
+    }));
     return profile;
 }

package/lib/types/dsh-adapter/questions.d.ts

@@ -10,6 +10,11 @@
  * Queue semantics mirror the official dsh-tui chat/questions machine: asks
  * arrive one at a time in practice (the tool blocks until answered), but
  * concurrent asks from subagents are drained FIFO.
+ *
+ * This store owns the INTERACTION only. The answered-questionnaire transcript
+ * record is a projection fact: it is folded from the persisted
+ * `tool/result` (`channel/question-record.ts`, issue #1009), never pushed from
+ * here, so it survives `/resume`, rewind and replay.
  */
 import { compositionRoot } from './host-access.js';
 import { type AdapterRuntimeOptions } from '../adapter/kernel/runtime.js';
@@ -39,13 +44,10 @@ export interface QuestionSnapshot {
     readonly answered: number;
     /** Previously saved answer or draft for the current question. */
     readonly draft?: QuestionDraft;
-    /** Whether Esc should navigate to the previous question. */
+    /** Whether Esc / ← should navigate to the previous question. */
     readonly canGoBack: boolean;
-}
-/** Completed batch summary, pushed into the transcript by the caller. */
-export interface QuestionSummary {
-    readonly title: string;
-    readonly lines: readonly string[];
+    /** Whether → should navigate to the next question without submitting. */
+    readonly canGoForward: boolean;
 }
 /** Host-only registration used by the TUI plugin bootstrap. */
 export declare function bindQuestionStore(ctx: Parameters<typeof compositionRoot>[0], store: QuestionStore): void;
@@ -64,8 +66,6 @@ export declare class QuestionStore {
     private active;
     private readonly listeners;
     private batchSeq;
-    /** Completed batch summaries, drained by the TUI into the transcript. */
-    private summaries;
     /**
      * Cached snapshot: useSyncExternalStore requires a stable reference while
      * nothing changed (a fresh object per call would loop re-renders).
@@ -83,10 +83,11 @@ export declare class QuestionStore {
      */
     getSnapshot(): QuestionSnapshot | null;
     /**
-     * Take (and clear) every completed batch summary for the transcript.
-     * @returns The summaries collected since the last take.
+     * Whether a panel callback still belongs to the question it was rendered
+     * for. One stdin batch can deliver → and then Enter to the panel that
+     * was mounted for the first key, after the store has already moved.
      */
-    takeSummaries(): QuestionSummary[];
+    stillCurrent(key: string): boolean;
     private emit;
     /** Rebuild the cached snapshot after any mutation of active/index. */
     private rebuildSnapshot;
@@ -95,8 +96,8 @@ export declare class QuestionStore {
      * model runs the `ask_user_question` tool, and by local wizards (e.g.
      * `/provider`) driving the same panel.
      * @param request - The ask request: questions plus optional abort signal.
-     * @param options - `redact` hides answer text from the transcript summary
-     *   (use for batches that collect secrets such as API keys).
+     * @param options - `redact` hides answer text from the answered-questionnaire
+     *   transcript record (use for batches that collect secrets such as API keys).
      * @returns A promise settling with the collected answers when the user
      *   submits the batch, or rejecting when the ask is interrupted.
      */
@@ -107,11 +108,17 @@ export declare class QuestionStore {
     private startNext;
     /**
      * The user submitted an answer for the current question; replaces any
-     * previous answer at that position, advances the batch, and settles it once
-     * every question is answered.
+     * previous answer at that position, advances to the next unanswered
+     * question, and settles the batch once every question is answered.
      * @param selection - Selected option labels plus optional custom text.
      */
     answerCurrent(selection: QuestionSelection): void;
+    /**
+     * Navigate to the next question without committing the current one. The
+     * caller supplies the panel's draft so a peek forward does not discard
+     * in-progress text. No-op on the last question — Enter still owns submit.
+     */
+    forwardCurrent(draft?: QuestionDraft): void;
     /**
      * Navigate to the previous question without cancelling the batch. The
      * caller supplies the panel's current draft so partially typed text can be

package/lib/types/dsh-adapter/questions.d.ts.map

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