dsh-cindy-host 0.1.20 → 0.1.22

package/CHANGELOG.md

@@ -3,6 +3,34 @@
 本文件记录**用户可见**的变化与**每次发布验证过的 DSH 版本**。格式遵循
 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循语义化版本。
 
+## [0.1.22] - 2026-10-03
+
+### Fixed
+
+- 补齐桌面模型选择入口要求的真实上下文容量：Host 在请求级按精确 provider/model 从 DSH llm.resolveModelInfo 获取 context.contextWindow，不再仅转发省略容量的 catalog。三 alias 共用同一结果，查询去重、最多4路并发、总期限3秒，不修改模型路由或默认选择。
+- 保留手机依赖的 routing 存在标记与未知容量0；单模型元数据失败不删除模型、不清空其它模型，不用 defaultMaxTokens 或硬编码数值冒充容量。真正未知容量在旧桌面的 >0 校验下仍会被过滤，需要客户端明确支持未知合同；本补丁不声称修复旧客户端这一固有限制。
+- 双端回归现在经过真实桌面 parseDeviceProvidersPayload 和手机 deviceProvidersCache，再进入共享选择器。保留0.1.21响应“手机可见、桌面全被过滤”的红例；之前仅测共享筛选不构成完整桌面入口验收。
+
+### 验证
+
+- 完整测试：768 通过 / 1 跳过 / 0 失败；通道审计 54 served / 142 declined / 0 unclassified。
+- 重启后的真实 HTTP 响应经过桌面解析器与手机缓存入口：新建及已有会话均 Host 7 / Desktop 7 / Mobile 7，2 个供应商、未知容量 0 项。此为本次安装环境观测，不是固定模型数量。
+- 用户已确认当前双端界面测试通过。安装目录补丁与源码一致；本修复由 0.1.22 发布，0.1.21 不包含真实容量补齐。
+
+## [0.1.21] - 2026-10-02
+
+### Fixed
+
+- 修复桌面供应商目录上线后手机模型选择器为空：`maker:provider:list` 为每个已广告的 DSH agent 别名补齐 `routing[agent]: {}` 可用性标记。仍只由 DSH catalog 决定 connected 和模型清单，不发送 endpoint、认证信息或 headers，不臆造 wireProtocol。
+- 补充投影/通道回归与可选的真实 Cindy registry、分段列表、统一选择器跨仓契约测试；设置 `CINDY_SOURCE_ROOT` 后运行 `node --test test/host-models-cindy-contract.test.js`（需支持 registerHooks/TypeScript stripping 的 Node）。覆盖旧响应复现空列表、新建/已有会话、多来源、不可连接/禁用 runtime 和目录读取失败。
+- 运行期补证：当前 DSH `buildModelCatalog` 不输出 `contextWindow`，旧投影把所有缺失窗口的模型丢弃，导致能力列表有模型而 provider 列表为空。缺失/无效窗口现在以 `0` 表示未知展示容量，不作为模型准入条件；跨仓测试改为真实的无窗口目录结构。
+
+### 验证
+
+- 完整单元与契约测试：**759 通过 / 1 跳过 / 0 失败**，包含真实 Cindy 消费端及无 contextWindow 的 DSH 目录结构。
+- 运行中的 desktop Host 返回 **2 个供应商 / 7 个模型**；真实 HTTP 响应经过 Cindy 新建/已有会话筛选均得到 7 个可选项。用户已确认手机端模型列表恢复。
+- 保留桌面供应商目录和真实 DSH 模型路由；不增加客户端专用模型表。
+
 ## [0.1.20] - 2026-10-01
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cindy-host",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "private": false,
   "description": "Cindy 手机客户端连接 DSH 的 Host 侧插件：会话/消息/审批/todo/goal 的手机通道，以及配套的设置卡片",
   "license": "MIT",

package/src/dsh-plugin.js

@@ -12,6 +12,7 @@ import { createAttachmentMaterializer } from './host-attachments.js';
 import { createGoalWriter } from './host-goals.js';
 import { startHost } from './host.js';
 import { refusalError } from './cindy-channels.js';
+import { enrichModelCatalog } from './host-model-catalog.js';
 import { hydrateImageAttachments } from './cindy-message-row.js';
 import { API_PREFIX, createHostRoutes } from './host-routes.js';
 
@@ -957,7 +958,19 @@ export function buildDshSource(ctx, serviceName, options = {}) {
        * asks once per device: an empty catalog does not look like a missing
        * feature, it looks like a Host with nothing to offer.
        */
-      modelCatalog: () => sessionController.modelCatalog(),
+      modelCatalog: async () => {
+        const catalog = await sessionController.modelCatalog();
+        const llm = controls.llm;
+        const enriched = await enrichModelCatalog(catalog,
+          typeof llm?.resolveModelInfo === 'function' ? llm.resolveModelInfo.bind(llm) : undefined);
+        if (enriched?.contextFailures?.length) {
+          ctx.logger?.warn?.('Cindy model context metadata unavailable', {
+            count: enriched.contextFailures.length,
+            codes: [...new Set(enriched.contextFailures.map((item) => item.code))],
+          });
+        }
+        return enriched;
+      },
       /**
        * Make sure a session has a live agent, and say whether it does.
        *

package/src/host-model-catalog.js

@@ -0,0 +1,78 @@
+/**
+ * Request-scoped display enrichment, not a second model registry.
+ * DSH's catalog owns membership/defaults; llm.resolveModelInfo owns exact-route
+ * context capacity. Keep metadata failures separate from catalog failures.
+ */
+export const MODEL_CONTEXT_CONCURRENCY = 4;
+// Mobile device-link uses a 15s invoke deadline. Spend at most 3s of that on
+// optional enrichment, leaving the existing catalog/transport their own budget.
+export const MODEL_CONTEXT_TIMEOUT_MS = 3_000;
+const positiveWindow = (value) => Number.isSafeInteger(value) && value > 0;
+
+export async function enrichModelCatalog(catalog, resolveModelInfo, {
+  timeoutMs = MODEL_CONTEXT_TIMEOUT_MS, signal,
+} = {}) {
+  if (!Array.isArray(catalog?.groups)) return catalog;
+  const groups = catalog.groups.map((group) => ({ ...group,
+    models: (Array.isArray(group?.models) ? group.models : []).map((model) => ({ ...model })),
+  }));
+  const routes = new Map();
+  for (const group of groups) {
+    if (typeof group.id !== 'string' || !group.id) continue;
+    for (const model of group.models) {
+      if (typeof model.id !== 'string' || !model.id || positiveWindow(model.contextWindow)) continue;
+      const key = JSON.stringify([group.id, model.id]);
+      if (!routes.has(key)) routes.set(key, { provider: group.id, id: model.id, models: [] });
+      routes.get(key).models.push(model);
+    }
+  }
+  const pending = [...routes.values()];
+  const contextFailures = [];
+  const failed = (route, code) => contextFailures.push({ provider: route.provider, model: route.id, code });
+  if (typeof resolveModelInfo !== 'function') {
+    for (const route of pending) failed(route, 'metadata-service-unavailable');
+    return { ...catalog, groups, contextFailures };
+  }
+  if (!pending.length) return { ...catalog, groups, contextFailures };
+  const controller = new AbortController();
+  const cancel = () => controller.abort();
+  if (signal?.aborted) cancel();
+  else signal?.addEventListener('abort', cancel, { once: true });
+  let expire;
+  const expired = new Promise((resolve) => { expire = resolve; });
+  const aborted = () => expire({ code: signal?.aborted ? 'metadata-cancelled' : 'metadata-deadline' });
+  controller.signal.addEventListener('abort', aborted, { once: true });
+  if (controller.signal.aborted) aborted();
+  const timer = setTimeout(cancel, timeoutMs);
+  let cursor = 0;
+  async function worker() {
+    while (cursor < pending.length) {
+      const route = pending[cursor++];
+      if (controller.signal.aborted) {
+        failed(route, signal?.aborted ? 'metadata-cancelled' : 'metadata-deadline');
+        continue;
+      }
+      // Observe rejection even if a non-cooperative resolver outlives the deadline.
+      const lookup = Promise.resolve()
+        .then(() => resolveModelInfo(route.provider, route.id, controller.signal))
+        .then((value) => ({ value }), () => ({ code: 'metadata-read-failed' }));
+      const result = await Promise.race([lookup, expired]);
+      if (result.code) { failed(route, result.code); continue; }
+      const info = result.value;
+      if (info?.provider !== route.provider || info?.id !== route.id) {
+        failed(route, 'metadata-identity-mismatch'); continue;
+      }
+      const window = info?.context?.contextWindow;
+      if (!positiveWindow(window)) { failed(route, 'metadata-unknown'); continue; }
+      for (const model of route.models) model.contextWindow = window;
+    }
+  }
+  try {
+    await Promise.all(Array.from({ length: Math.min(MODEL_CONTEXT_CONCURRENCY, pending.length) }, worker));
+    return { ...catalog, groups, contextFailures };
+  } finally {
+    clearTimeout(timer);
+    signal?.removeEventListener('abort', cancel);
+    controller.signal.removeEventListener('abort', aborted);
+  }
+}

package/src/host-models.js

@@ -160,7 +160,7 @@ export function toPermissionOptions(names) {
 }
 
 /**
- * Project DSH's provider-grouped catalog into Cindy desktop's ProviderView wire shape.
+ * Project DSH's provider-grouped catalog into Cindy desktop/mobile ProviderView wire shape.
  * Routing credentials never cross this boundary; every Cindy harness alias reaches the
  * same DSH catalog, so each provider exposes the same models under all aliases.
  */
@@ -173,8 +173,11 @@ export function toProviderList(catalog, agentKinds = []) {
     const models = [];
     for (const model of Array.isArray(group.models) ? group.models : []) {
       if (typeof model?.id !== 'string' || model.id === '') continue;
-      const contextWindow = Number(model.contextWindow);
-      if (!Number.isFinite(contextWindow) || contextWindow <= 0) continue;
+      // Current DSH catalogs omit contextWindow. It is display metadata, not
+      // route eligibility: 0 means unknown in Cindy and hides the capacity label.
+      // Never discard a routable model or invent a positive capacity for it.
+      const window = Number(model.contextWindow);
+      const contextWindow = Number.isFinite(window) && window > 0 ? window : 0;
       const efforts = Array.isArray(model?.reasoning?.efforts)
         ? model.reasoning.efforts.map((effort) => effort?.id).filter((id) => typeof id === 'string' && id !== '')
         : [];
@@ -198,6 +201,10 @@ export function toProviderList(catalog, agentKinds = []) {
       name: typeof group.name === 'string' && group.name !== '' ? group.name : group.id,
       agents,
       connected: routable.has(group.id),
+      // Cindy registry requires routing[agent] to exist before a runtime is selectable.
+      // Empty markers advertise our aliases without inventing a wire protocol or
+      // exposing DSH execution details (endpoints, credentials, or headers).
+      routing: Object.fromEntries(agents.map((agent) => [agent, {}])),
       models: Object.fromEntries(agents.map((agent) => [agent, models.map((model) => ({ ...model }))])),
     });
   }