@askdkc/dsh-cli 0.12.0 → 0.12.2

package/lib/types/modelGroups.js

@@ -1,10 +1,7 @@
 /**
- * Pure derivation for the two-level `/model` picker: providers as top-level
- * groups, their models one level down, with a pinned "recently used"
- * pseudo-group first. Kept free of React/channel/i18n state so
- * `scripts/verify-model-picker-groups.mjs` can drive it headless; the
- * recents row's localized label is resolved at render time (its `label`
- * field is the {@link RECENTS_LABEL_PLACEHOLDER} sentinel).
+ * Shared literal model filtering and the retained group-derivation helpers.
+ * The centered picker builds its display rows in modelPickerRows.ts;
+ * older group consumers and their regression tests still use the helpers here.
  *
  * @module dsh-tui/modelGroups
  */
@@ -23,7 +20,7 @@ export function filterModels(models, query, providers) {
         return models;
     return models.filter(model => {
         const providerName = providers.find(provider => provider.id === model.provider)?.name ?? '';
-        const fields = [model.name, model.id, model.provider, providerName].map(value => value.toLowerCase());
+        const fields = [model.name, model.id, model.provider, providerName, `${model.provider}/${model.id}`].map(value => value.toLowerCase());
         return terms.every(term => fields.some(field => field.includes(term)));
     });
 }

package/lib/types/modelPickerRows.d.ts

@@ -0,0 +1,19 @@
+import type { LlmModelInfo, LlmProviderInfo } from './adapter/ports/channel-view.js';
+import type { ModelRef } from './modelGroups.js';
+export type ModelPickerRow = {
+    kind: 'heading';
+    key: string;
+    label: string;
+} | {
+    kind: 'model';
+    key: string;
+    section: string;
+    model: LlmModelInfo;
+    providerName: string;
+};
+export declare function modelPickerRows(models: readonly LlmModelInfo[], providers: readonly LlmProviderInfo[], favorites: readonly ModelRef[], recents: readonly ModelRef[], query: string): readonly ModelPickerRow[];
+export declare function focusedModelRow(rows: readonly ModelPickerRow[], index: number): Extract<ModelPickerRow, {
+    kind: 'model';
+}> | undefined;
+export declare function moveModelFocus(rows: readonly ModelPickerRow[], index: number, delta: number): number;
+//# sourceMappingURL=modelPickerRows.d.ts.map

package/lib/types/modelPickerRows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelPickerRows.d.ts","sourceRoot":"","sources":["../../src/modelPickerRows.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAEpF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAA;AAE9F,wBAAgB,eAAe,CAC7B,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,SAAS,EAAE,SAAS,eAAe,EAAE,EACrC,SAAS,EAAE,SAAS,QAAQ,EAAE,EAC9B,OAAO,EAAE,SAAS,QAAQ,EAAE,EAC5B,KAAK,EAAE,MAAM,GACZ,SAAS,cAAc,EAAE,CAmC3B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG,SAAS,CAGtI;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQpG"}

package/lib/types/modelPickerRows.js

@@ -0,0 +1,54 @@
+import { filterModels } from './modelGroups.js';
+export function modelPickerRows(models, providers, favorites, recents, query) {
+    const names = new Map(providers.map(provider => [provider.id, provider.name]));
+    const seen = new Set();
+    const catalog = models.filter(model => {
+        const key = `${model.provider}\0${model.id}`;
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
+    const row = (section, model) => ({
+        kind: 'model', key: `${section}:${model.provider}/${model.id}`, section, model,
+        providerName: names.get(model.provider) ?? model.provider,
+    });
+    const filtered = filterModels(catalog, query, providers);
+    if (query.trim())
+        return filtered.map(model => row('search', model));
+    const result = [];
+    const lookup = (ref) => catalog.find(model => model.provider === ref.provider && model.id === ref.id);
+    const favoriteModels = favorites.map(lookup).filter((model) => model !== undefined);
+    if (favoriteModels.length) {
+        result.push({ kind: 'heading', key: 'heading:favorites', label: 'Favorites' });
+        result.push(...favoriteModels.map(model => row('favorites', model)));
+    }
+    const recentModels = recents
+        .filter(ref => !favorites.some(favorite => favorite.provider === ref.provider && favorite.id === ref.id))
+        .map(lookup).filter((model) => model !== undefined);
+    if (recentModels.length) {
+        result.push({ kind: 'heading', key: 'heading:recent', label: 'Recent' });
+        result.push(...recentModels.map(model => row('recent', model)));
+    }
+    const order = [...new Set(catalog.map(model => model.provider))];
+    for (const provider of order) {
+        result.push({ kind: 'heading', key: `heading:${provider}`, label: names.get(provider) ?? provider });
+        result.push(...catalog.filter(model => model.provider === provider).map(model => row(provider, model)));
+    }
+    return result;
+}
+export function focusedModelRow(rows, index) {
+    const row = rows[index];
+    return row?.kind === 'model' ? row : undefined;
+}
+export function moveModelFocus(rows, index, delta) {
+    if (!rows.length)
+        return 0;
+    let next = index;
+    for (let attempt = 0; attempt < rows.length; attempt++) {
+        next = (next + delta + rows.length) % rows.length;
+        if (rows[next]?.kind === 'model')
+            return next;
+    }
+    return 0;
+}

package/lib/types/screens/Chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AA8BzB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAE3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAwB,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAAE,aAAa,EAAe,MAAM,kCAAkC,CAAA;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAkB3D,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAEjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AAyNxE,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAkB,EAClB,cAAc,EAAE,kBAAkB,EAClC,mBAAmB,EACnB,mBAAmB,EAAE,uBAAuB,EAC5C,WAAW,EACX,cAAc,GACf,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAA;IAC/D,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,yDAAyD;IACzD,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,+EAA+E;IAC/E,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,uEAAuE;IACvE,SAAS,CAAC,EAAE,YAAY,CAAA;IACxB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;IAC9D;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CAC/D,4BAklJA"}
+{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AA0BzB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAE3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAwB,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAAE,aAAa,EAAe,MAAM,kCAAkC,CAAA;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAkB3D,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAEjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AAyNxE,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAkB,EAClB,cAAc,EAAE,kBAAkB,EAClC,mBAAmB,EACnB,mBAAmB,EAAE,uBAAuB,EAC5C,WAAW,EACX,cAAc,GACf,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAA;IAC/D,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,yDAAyD;IACzD,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,+EAA+E;IAC/E,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,uEAAuE;IACvE,SAAS,CAAC,EAAE,YAAY,CAAA;IACxB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;IAC9D;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CAC/D,4BAm/IA"}