dsh-connect-modelscope-token-plan 0.4.0 → 0.6.1

package/client.js

@@ -46,24 +46,65 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		return slash >= 0 ? id.slice(0, slash) : id;
 	}
 	/**
-	* 徽章用的窗口短标注（tokens → "128K" / "1M"）。
+	* 清单行要显示的名字：组头已经把 owner 说过一次，名字若还带着 `owner/` 前缀就切掉
+	* ——行宽还给名字本身。
 	*
-	* K=1024、M=1024²，与档位值（131072…1048576）同一把尺。**不美化**：目录声明的
-	* 128000 显示成 "125K" 而不是 "128K"——标签必须能从数值反推出来，四舍五入到
-	* 好看的整数是撒谎。≥1M 用 M（`1.25M` 保留至多一位小数，去掉尾随 .0），
-	* ≥1024 用 K，更小的原样显示。
+	* 为什么需要它：魔搭目录**只回 id**，没有单独的 name 字段，所以 Host 侧
+	* `str(entry.name, id)` 的兜底让每一行的 name 就等于 id（见 llm-models.ts）。分组
+	* 之后那些前缀与组头逐字重复，一个 34 个模型的清单里同一个 owner 要说十几遍。
+	*
+	* 只切**与 owner 逐字相同**的前缀：name 若是目录给的人话名字（`DeepSeek V4 Pro`）
+	* 或来自别的 owner，原样返回——不按位置硬切，免得把真正的名字切坏。行的 `title`
+	* 与复选框的 `aria-label` 仍然用完整 id，所以切掉的信息没有丢。
+	* @param {string} id - 完整模型 id（`owner/model`）。
+	* @param {string} name - 目录给的名字（通常等于 id）。
+	* @returns {string} 行内显示的名字。
+	*/
+	function trimOwnerPrefix(id, name) {
+		const prefix = `${catalogOwner(id)}/`;
+		return name.startsWith(prefix) ? name.slice(prefix.length) : name;
+	}
+	/**
+	* 徽章用的窗口短标注（tokens → "128K" / "1M"）——按**这个数被写出来时用的那个
+	* 进制**渲染，不把它换算到另一把尺上。
+	*
+	* 为什么不「一律除以 1024」：上游自己混用两种写法。档位表与模型的出厂规格是 2 的
+	* 幂（131072、262144、1048576），而目录声明与 models.dev / 策展表报的是十进制
+	* （128000、200000、256000、1000000——见 `context-catalog.ts` 里逐条抄下来的那些
+	* 数）。一律除 1024 会把后一类印成 125K / 195K / 250K / 977K：与上游自己写的名字
+	* 全都对不上。LongCat-Flash-Lite 上游就叫 256K，面板印 250K 是另一种撒谎；
+	* GLM-5.2 的 1M 印成 977K，读起来像「比档位里的 1M 小一截」——而档位里那个 1M 是
+	* 1048576，跟 1000000 差 4.6%，本来就是同一个市场叫法。
+	*
+	* 判据（与姊妹插件 Agnes 的 `tokenSize` 同一条规则，她那份头注记着同一个坑）：
+	*   1. ≥ 1M 走 M——十进制的 1,000,000 与二进制的 1,048,576 都读 "1M"；
+	*   2. 能整除 1000 的按十进制（128000 → "128K"、200000 → "200K"）；
+	*   3. 能整除 1024 的按二进制（131072 → "128K"、262144 → "256K"）；
+	*   4. 两者都不整除的零散声明按十进制取整（123456 → "123K"）；取整进位到四位数
+	*      就交给 M 档（999,999 读 "1M"，不读 "1000K"）。
+	*
+	* 代价说在明处：第 2、3 条会**撞车**——128000（两个进制都整除，走十进制）与
+	* 131072 都印 "128K"。这是有意的：窗口徽章回答的是「大概能放多少上下文」，而
+	* 128K / 256K / 1M 是上游与市场共用的叫法，跟它一致比区分那 2.4% 更有用。
+	*
+	* `tokens` 由调用方保证是正的有限数（`providerOf` 已挡），所以这里不再兜一次底。
 	* @param {number} tokens - 窗口大小（tokens）。
 	* @returns {string} 短标注。
 	*/
 	function formatWindow(tokens) {
-		if (tokens >= 1048576) {
-			const m = tokens / 1048576;
-			return `${m >= 10 || Number.isInteger(m) ? Math.round(m) : Math.round(m * 10) / 10}M`;
+		if (tokens >= 1e6) return millionLabel(tokens);
+		if (tokens >= 1024) {
+			const k = tokens % 1e3 === 0 ? tokens / 1e3 : tokens % 1024 === 0 ? tokens / 1024 : Math.round(tokens / 1e3);
+			return k >= 1e3 ? millionLabel(tokens) : `${k}K`;
 		}
-		if (tokens >= 1024) return `${Math.round(tokens / 1024)}K`;
 		return String(tokens);
 	}
-	var NS, PANEL_ID, SNAPSHOT_PATH, MODELS_PATH, TOKEN_PATH, TOKEN_FORGET_PATH, PROBE_PATH, PROVIDER_PATH, PROVIDER_ROSTER_PATH, PROVIDER_CONTEXT_PATH, PROVIDER_RESET_PATH, DRAW_PATH, DRAW_RESET_PATH, MODELSCOPE_TOKEN_URL, MODELSCOPE_USAGE_URL, MODELSCOPE_MODEL_URL_BASE, FEATURED_OWNERS;
+	/** M 档读数：≥10 只留整数，否则至多一位小数（`1048576` → "1M"、`2500000` → "2.5M"）。 */
+	function millionLabel(tokens) {
+		const m = tokens / 1e6;
+		return `${m >= 10 || Number.isInteger(m) ? Math.round(m) : Math.round(m * 10) / 10}M`;
+	}
+	var NS, PANEL_ID, SNAPSHOT_PATH, MODELS_PATH, TOKEN_PATH, TOKEN_FORGET_PATH, PROBE_PATH, PROVIDER_PATH, PROVIDER_ROSTER_PATH, PROVIDER_CONTEXT_PATH, PROVIDER_RESET_PATH, DRAW_PATH, DRAW_RESET_PATH, TREND_WINDOW_PATH, MODELSCOPE_TOKEN_URL, MODELSCOPE_USAGE_URL, MODELSCOPE_MODEL_URL_BASE, FEATURED_OWNERS;
 	var init_const = __esmMin((() => {
 		init_wire();
 		NS = "dsh-connect-modelscope-token-plan";
@@ -79,6 +120,7 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		PROVIDER_RESET_PATH = `/api/${NS}/provider/reset`;
 		DRAW_PATH = `/api/${NS}/draw`;
 		DRAW_RESET_PATH = `/api/${NS}/draw/reset`;
+		TREND_WINDOW_PATH = `/api/${NS}/trend/window`;
 		MODELSCOPE_TOKEN_URL = "https://modelscope.cn/my/myaccesstoken";
 		MODELSCOPE_USAGE_URL = "https://modelscope.cn/magicube/usage?tab=consume";
 		MODELSCOPE_MODEL_URL_BASE = "https://www.modelscope.cn/models";
@@ -115,7 +157,7 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			"tab.models": "模型",
 			"tab.access": "接入",
 			"section.balance": "魔粒余额（官方数据）",
-			"section.local": "本地调用（仅经本插件的调用）",
+			"section.local": "本地调用（本客户端 · 仅经本插件）",
 			"section.trend": "近 {days} 天本地调用趋势",
 			"section.events": "限流与错误事件",
 			"section.token": "访问令牌",
@@ -129,14 +171,16 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			"balance.usagePage": "官方用量明细（网页）→",
 			"balance.unavailable": "魔粒余额暂不可读：{error}",
 			"quota.headline": "今日 {calls} 次 · {models} 个模型",
-			"quota.note": "本地口径：只统计经本插件的调用，直连魔搭的其它客户端不计入；消耗总量以官方魔粒余额为准。",
+			"quota.rowCalls": "{calls} 次",
+			"quota.rowTokens": "{tokens} token",
+			"quota.note": "本地口径：只统计本客户端经本插件的调用（桌面端与 Web 端各记各的）；直连魔搭的其它客户端不计入。消耗总量以官方魔粒余额为准。",
 			"quota.unavailable": "本地计数本次读不到（原因见上方提示）",
 			"probe.validity": "验令牌（零额度）",
 			"probe.validOk": "令牌有效（HTTP {status}）",
 			"probe.fail": "失败：{error}",
 			"models.viewOnSite": "在魔搭查看 →",
 			"models.viewOnSiteTitle": "打开模型详情页（魔粒单价等只在网页展示）",
-			"models.featuredTitle": "推荐系列（深度求索 / 智谱 / 通义千问）",
+			"models.featuredTitle": "推荐厂商（深度求索 / 智谱 / 通义千问）——它们的模型置顶显示",
 			"provider.featured": "推荐",
 			"section.provider": "接入为 DSH 模型",
 			"provider.enable": "把魔搭模型接入 DSH 模型选择器",
@@ -154,38 +198,67 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			"provider.reset": "回到默认",
 			"provider.enabledCount": "已启用 {count} / {total}",
 			"provider.rosterHint": "勾选要进入 DSH 模型选择器的模型；不勾 = 全部提供",
+			"provider.search": "搜索模型名或 ID",
+			"provider.noMatch": "没有匹配的模型。",
+			"provider.groupCount": "{count} 个",
+			"provider.groupSelected": "已选 {count}",
 			"provider.quotaExhausted": "额度耗尽",
 			"provider.vision": "视觉",
 			"provider.notConfigured": "还没有访问令牌，先到「接入」tab 配置",
 			"provider.source.panel": "面板",
 			"provider.source.config": "配置",
 			"provider.contextWindow": "上下文窗口",
-			"provider.contextDefault": "默认（跟随目录）",
-			"provider.contextHint": "目录没声明窗口的模型按此值生效；保存后立即重新注册",
+			"provider.contextWindowOverride": "上下文窗口覆盖",
+			"provider.contextDefault": "不覆盖（默认）",
+			"provider.contextHint": "目录未声明窗口时套用此值（会盖过内置策展表）；保存后立即重新注册",
 			"provider.contextCuratedTitle": "窗口来自内置策展表（models.dev 交叉真值），平台未亲口声明；带 * 标记",
+			"provider.maxOutput": "最大输出",
+			"provider.maxOutputOverrideTitle": "最大输出：来自 maxTokensOverrides 里你写的值（盖过目录声明）",
+			"provider.maxOutputHint": "魔搭目录不返回输出上限，未覆盖的模型按 harness 默认（32768）截断；要更大就在 maxTokensOverrides 里逐模型写实测值（面板徽章用「最大输出」显示生效值）",
 			"section.draw": "出图工具",
-			"draw.enable": "给 agent 注册 modelscope_draw_image 工具",
+			"draw.enable": "开启后，agent 可在对话里用 modelscope_draw_image 生成或编辑图片",
 			"draw.on": "已开启",
 			"draw.off": "未开启",
 			"draw.busy": "切换中…",
 			"draw.mounted": "已注册：{tool}",
-			"draw.notMounted": "未注册——勾选上方开关即可开启。",
-			"draw.restartHint": "开关立即保存，但工具的挂载发生在**下次 Host 启动**（工具注册无法撤销）。",
-			"draw.models": "出图将使用以下模型",
+			"draw.notMounted": "未注册——打开上方开关即可开启。",
+			"draw.restartHint": "开关立即保存；工具要到下次启动 DSH 才挂载（挂载后无法撤销）。",
+			"draw.currentNone": "当前目录里没有可出图的模型——出图会失败（先确认访问令牌已配置、目录已拉到）。",
+			"draw.currentSrc.declaredTextToImage": "平台声明为文生图",
+			"draw.currentSrc.knownTextToImage": "已知可纯文生图",
+			"draw.currentSrc.catalogFirst": "目录里的第一个出图模型",
+			"draw.autoHint": "由插件按能力挑；当前会选 {model}",
+			"draw.autoHintReason": "由插件按能力挑；当前会选 {model}（{reason}）",
+			"draw.models": "出图模型",
 			"draw.badge": "出图",
-			"draw.noCandidates": "当前目录里没有出图模型（平台声明 image-to-image / text-to-image 的条目为空）；出图不可用。",
+			"draw.badge.textToImage": "文生图",
+			"draw.badge.imageToImage": "图生图",
+			"draw.imageOnlyTitle": "该模型只能图生图/改图：必须通过 imageUrl 传一张输入图，不能纯文生图。",
+			"draw.auto": "自动选择",
+			"draw.noCandidates": "当前目录里没有可出图的模型，这个工具暂时用不了。",
 			"draw.needsKey": "还没有访问令牌，先到「接入」tab 配置。",
 			"draw.reset": "回到默认",
 			"draw.error": "出图设置保存失败：{error}",
 			"draw.source.panel": "面板",
 			"draw.source.config": "配置",
-			"draw.absent.noTools": "开关已开，但本机 Host 未提供 agent tools 服务，出图工具缺席（Host 侧限制，非配置问题）。",
+			"draw.absent.noTools": "开关已开，但本机没有 tools 服务，工具没挂上（Host 侧限制，不是配置问题）。",
 			"draw.absent.peerLoad": "开关已开，但 tools 模块加载失败，出图工具缺席（Host 问题，非配置）。",
 			"draw.absent.registry": "开关已开，但工具注册被 Host 拒绝，出图工具缺席（Host 问题，非配置）。",
 			"draw.absent.unknown": "开关已开，但出图工具未挂载，原因未知。",
+			"draw.preferredGone": "已保存的默认模型 {model} 已不在当前目录（下架或改名）——出图会用它失败，请在下面重选。",
 			"trend.none": "还没有本地调用记录。",
+			"trend.unreadable": "本地计数读不到，趋势图无法显示（不是 0 次）。",
 			"trend.legend": "柱长相对区间内最大值，仅本地口径。",
+			"trend.metric": "趋势指标",
+			"trend.metricCalls": "调用次数",
+			"trend.metricTokens": "token 数",
+			"trend.legendTokens": "按 token 数相对区间内最大值画柱，仅本地口径；失败调用没有用量记录，与「该日无数据」一样显示为 0。",
+			"trend.window": "显示天数",
+			"trend.windowDefault": "默认（跟随配置）",
+			"trend.windowDays": "{days} 天",
+			"trend.windowHint": "只决定画多少天；能回看多久另有一个保留窗口（留得比画得多才画得出更远）。",
 			"events.none": "暂无事件。",
+			"events.unreadable": "本地计数读不到，事件流无法显示（不是没有事件）。",
 			"events.quota": "额度",
 			"events.rate_limit": "限频",
 			"events.error": "错误",
@@ -236,7 +309,7 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			"tab.models": "Models",
 			"tab.access": "Access",
 			"section.balance": "Magicube balance (official)",
-			"section.local": "Local calls (only through this plugin)",
+			"section.local": "Local calls (this client · only through this plugin)",
 			"section.trend": "Local call trend, last {days} days",
 			"section.events": "Rate-limit and error events",
 			"section.token": "Access token",
@@ -250,14 +323,16 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			"balance.usagePage": "Official usage details (web) →",
 			"balance.unavailable": "Magicube balance temporarily unreadable: {error}",
 			"quota.headline": "Today {calls} calls · {models} models",
-			"quota.note": "Local scope: only calls through this plugin are counted; clients calling ModelScope directly are not. Total consumption is governed by the official Magicube balance.",
+			"quota.rowCalls": "{calls} calls",
+			"quota.rowTokens": "{tokens} tokens",
+			"quota.note": "Local scope: only calls this client made through this plugin are counted (desktop and web keep separate ledgers); clients calling ModelScope directly are not. Total consumption is governed by the official Magicube balance.",
 			"quota.unavailable": "Local counters could not be read this time (reason in the notices above)",
 			"probe.validity": "Verify token (free)",
 			"probe.validOk": "Token valid (HTTP {status})",
 			"probe.fail": "Failed: {error}",
 			"models.viewOnSite": "View on ModelScope →",
 			"models.viewOnSiteTitle": "Open the model page (per-model Magicube price is web-only)",
-			"models.featuredTitle": "Recommended family (DeepSeek / Zhipu / Qwen)",
+			"models.featuredTitle": "Recommended vendors (DeepSeek / Zhipu / Qwen) — their models are pinned to the top",
 			"provider.featured": "Recommended",
 			"section.provider": "Register as a DSH model",
 			"provider.enable": "Register ModelScope models in the DSH model picker",
@@ -275,38 +350,67 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			"provider.reset": "Reset",
 			"provider.enabledCount": "{count} / {total} enabled",
 			"provider.rosterHint": "Tick the models to offer; unticked = offer all",
+			"provider.search": "Search model name or ID",
+			"provider.noMatch": "No matching models.",
+			"provider.groupCount": "{count}",
+			"provider.groupSelected": "{count} selected",
 			"provider.quotaExhausted": "Quota exhausted",
 			"provider.vision": "vision",
 			"provider.notConfigured": "No token yet — configure it in the Access tab",
 			"provider.source.panel": "panel",
 			"provider.source.config": "config",
 			"provider.contextWindow": "Context window",
-			"provider.contextDefault": "Default (catalog)",
-			"provider.contextHint": "Applies to models whose catalog entry declares no window; re-registers immediately",
+			"provider.contextWindowOverride": "Context window override",
+			"provider.contextDefault": "No override (default)",
+			"provider.contextHint": "Applied when the catalog declares no window (it overrides the built-in curated table); re-registers immediately",
 			"provider.contextCuratedTitle": "Window from the built-in curated table (models.dev cross-check), not declared by the platform; marked with *",
+			"provider.maxOutput": "Max output",
+			"provider.maxOutputOverrideTitle": "Max output: the value you wrote in maxTokensOverrides (it wins over the catalogue)",
+			"provider.maxOutputHint": "The ModelScope catalogue returns no output ceiling, so models without an override are cut off at the harness default (32768); write per-model measured values in maxTokensOverrides for more (the badge shows the effective value)",
 			"section.draw": "Draw tool",
-			"draw.enable": "Register the modelscope_draw_image tool for the agent",
+			"draw.enable": "Once on, the agent can generate or edit images with modelscope_draw_image",
 			"draw.on": "On",
 			"draw.off": "Off",
 			"draw.busy": "Switching…",
 			"draw.mounted": "Registered: {tool}",
-			"draw.notMounted": "Not registered — tick the switch above.",
-			"draw.restartHint": "The switch saves at once, but the tool mounts at the NEXT Host start (a tool registration cannot be undone).",
-			"draw.models": "Draw calls will use the models below",
+			"draw.notMounted": "Not registered — turn the switch above on.",
+			"draw.restartHint": "The switch saves at once; the tool mounts the next time DSH starts (a mount cannot be undone).",
+			"draw.currentNone": "No image model in the catalogue right now — drawing will fail (check the access token and that the catalogue has loaded).",
+			"draw.currentSrc.declaredTextToImage": "platform-declared text-to-image",
+			"draw.currentSrc.knownTextToImage": "known to accept text-to-image",
+			"draw.currentSrc.catalogFirst": "first image model in the catalogue",
+			"draw.autoHint": "Chosen by the plugin for capability; it would pick {model}",
+			"draw.autoHintReason": "Chosen by the plugin for capability; it would pick {model} ({reason})",
+			"draw.models": "Image model",
 			"draw.badge": "image",
-			"draw.noCandidates": "This catalogue declares no image model (no entry with image-to-image / text-to-image); drawing is unavailable.",
+			"draw.badge.textToImage": "text-to-image",
+			"draw.badge.imageToImage": "image-to-image",
+			"draw.imageOnlyTitle": "Image-to-image only: an input image must be passed via imageUrl; pure text-to-image is not supported.",
+			"draw.auto": "Auto",
+			"draw.noCandidates": "No image model in the catalogue right now, so this tool cannot work yet.",
 			"draw.needsKey": "No token yet — configure it in the Access tab.",
 			"draw.reset": "Reset",
 			"draw.error": "Saving the draw settings failed: {error}",
 			"draw.source.panel": "panel",
 			"draw.source.config": "config",
-			"draw.absent.noTools": "The switch is on, but this Host exposes no agent tools service; the draw tool is absent (a Host limitation, not config).",
+			"draw.absent.noTools": "The switch is on, but this Host has no tools service, so the tool is not mounted (a Host limitation, not a config problem).",
 			"draw.absent.peerLoad": "The switch is on, but the tools module failed to load; the draw tool is absent (a Host fault, not config).",
 			"draw.absent.registry": "The switch is on, but the Host refused the tool registration; the draw tool is absent (a Host fault, not config).",
 			"draw.absent.unknown": "The switch is on, but the draw tool is not mounted; the reason is unknown.",
+			"draw.preferredGone": "The saved default model {model} is no longer in the catalogue (delisted or renamed) — drawing with it will fail. Pick another one below.",
 			"trend.none": "No local call records yet.",
+			"trend.unreadable": "Local counts could not be read; the trend chart is unavailable (this is not zero calls).",
 			"trend.legend": "Bar lengths are relative to the maximum in the range (local scope only).",
+			"trend.metric": "Trend metric",
+			"trend.metricCalls": "Calls",
+			"trend.metricTokens": "Tokens",
+			"trend.legendTokens": "Bar lengths are relative to the largest token count in the range (local scope only). Failed calls record no usage, and days with no data also read as 0.",
+			"trend.window": "Days shown",
+			"trend.windowDefault": "Default (follow config)",
+			"trend.windowDays": "{days} days",
+			"trend.windowHint": "Only sets how many days are drawn; how far back history is kept is a separate retention window.",
 			"events.none": "No events.",
+			"events.unreadable": "Local counters unreadable; event stream cannot be shown (not \"no events\").",
 			"events.quota": "Quota",
 			"events.rate_limit": "Rate limit",
 			"events.error": "Error",
@@ -371,6 +475,36 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		if (number >= 1e4) return Math.round(number).toLocaleString();
 		return String(Math.round(number * 100) / 100);
 	}
+	/**
+	* 大数字的紧凑文本：`< 1000` 原样，`< 1e6` 用 `k`，`≥ 1e6` 用 `m`（各留 1~2 位小数，
+	* 去尾零）。**只给 token 这类会自然到百万级的读数用**——调用次数一天几十上百，千分位
+	* 逗号反而更好读，那条路径继续走 `count()`。
+	*
+	* 单位用小写 k/m：视觉上与 SI 前缀一致，也避开「兆」的歧义（`M` 在中文语境里常被读成
+	* 万亿）。负值与 NaN 分别返回 `-1.2k` 与 `NaN`——不做掩饰，异常值该在面板上现形。
+	*
+	* **与 `const.ts` 的 `formatWindow()` 刻意不同，不是漏统一**：那个印的是**上下文窗口
+	* 规格**（`128K` / `256K` / `1M`，按上游与市场的叫法、K=1024 口径），回答「大概能放
+	* 多少上下文」；这里印的是**实测用量读数**（`1.2k` / `3.4m`，十进制、小写），回答
+	* 「实际用了多少」。同一数字在两处印法不同，是因为它们量纲不同（规格 vs 读数）。
+	*/
+	function compactCount(value) {
+		if (typeof value !== "number" || !Number.isFinite(value)) return String(value);
+		const trim = (number) => String(Number(number.toFixed(number >= 100 ? 0 : number >= 10 ? 1 : 2)));
+		const sign = value < 0 ? "-" : "";
+		const abs = Math.abs(value);
+		if (abs < 1e3) return `${sign}${trim(abs)}`;
+		const tiers = [
+			[1e3, "k"],
+			[1e6, "m"],
+			[1e9, "b"]
+		];
+		for (const [i, [divisor, unit]] of tiers.entries()) {
+			const shown = trim(abs / divisor);
+			if (i === tiers.length - 1 || Number(shown) < 1e3) return `${sign}${shown}${unit}`;
+		}
+		return `${sign}${trim(abs)}b`;
+	}
 	/** 填 `{key}` 模板：vars 的每个键对应模板里的同名占位符。 */
 	function format(template, vars) {
 		let text = template;
@@ -636,6 +770,68 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 				lineHeight: "16px",
 				color: "var(--dsw-alias-label-secondary)"
 			},
+			trendChartBars: {
+				display: "flex",
+				alignItems: "flex-end",
+				gap: 2,
+				height: 96,
+				padding: "0 1px"
+			},
+			trendChartBar: {
+				flex: 1,
+				minWidth: 2,
+				height: "100%",
+				display: "flex",
+				alignItems: "flex-end",
+				position: "relative"
+			},
+			trendChartFill: {
+				width: "100%",
+				minHeight: 2,
+				borderRadius: 2,
+				background: BRAND
+			},
+			trendChartValue: {
+				position: "absolute",
+				left: 0,
+				right: 0,
+				fontSize: 9,
+				lineHeight: 1,
+				textAlign: "center",
+				color: "var(--dsw-alias-label-secondary)",
+				fontVariantNumeric: "tabular-nums",
+				pointerEvents: "none"
+			},
+			trendChartAxis: {
+				display: "flex",
+				justifyContent: "space-between",
+				gap: 12,
+				marginTop: 6,
+				fontSize: 11,
+				color: "var(--dsw-alias-label-secondary)"
+			},
+			trendMetricBar: {
+				display: "flex",
+				gap: 2,
+				marginBottom: 6,
+				alignItems: "center"
+			},
+			trendMetricBtn: {
+				appearance: "none",
+				background: "none",
+				border: "none",
+				borderBottom: "1px solid transparent",
+				padding: "2px 8px",
+				fontSize: 11,
+				color: "var(--dsw-alias-label-secondary)",
+				cursor: "pointer",
+				outlineOffset: -2
+			},
+			trendMetricBtnActive: {
+				color: "var(--dsw-alias-label-primary)",
+				fontWeight: 600,
+				borderBottom: `1px solid ${BRAND}`
+			},
 			muted: { color: "var(--dsw-alias-label-secondary)" },
 			error: { color: "var(--dsw-alias-state-error-primary)" },
 			empty: {
@@ -673,6 +869,22 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 				fontSize: 12,
 				margin: "10px 0 0"
 			},
+			dotSep: {
+				color: "var(--dsw-alias-label-secondary)",
+				opacity: .55,
+				fontSize: 11
+			},
+			advancedBlock: {
+				marginTop: 14,
+				paddingTop: 12,
+				borderTop: "1px solid var(--dsw-alias-border-l1)"
+			},
+			advancedHint: {
+				marginTop: 6,
+				fontSize: 11,
+				lineHeight: "16px",
+				color: "var(--dsw-alias-label-secondary)"
+			},
 			rosterTools: {
 				display: "flex",
 				gap: 8,
@@ -710,6 +922,27 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 				gap: 8
 			},
 			modelRowOff: { opacity: .55 },
+			modelGroup: {
+				display: "flex",
+				alignItems: "center",
+				gap: 6,
+				width: "100%",
+				padding: "10px 4px 2px",
+				background: "none",
+				border: "none",
+				textAlign: "left",
+				cursor: "pointer",
+				fontSize: 12,
+				fontWeight: 600,
+				color: "var(--dsw-alias-label-secondary)"
+			},
+			modelGroupOwner: { fontFamily: "ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" },
+			modelGroupCount: {
+				fontWeight: 400,
+				opacity: .75,
+				fontVariantNumeric: "tabular-nums"
+			},
+			modelRowGrouped: { paddingLeft: 22 },
 			modelCheck: {
 				flex: "none",
 				width: 15,
@@ -860,13 +1093,15 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			};
 			case "quota": return {
 				daily: { usedLocal: null },
-				perModel: [],
+				perModel: null,
 				countingNote: "local-counting"
 			};
-			case "events": return [];
+			case "events": return null;
 			case "trend": return {
 				days: 0,
-				buckets: []
+				windowDays: null,
+				maxDays: 0,
+				buckets: null
 			};
 			case "models": return {
 				available: false,
@@ -940,6 +1175,8 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			const id = String(row.id ?? "");
 			const w = row.contextWindow;
 			const contextSource = row.contextSource === "override" || row.contextSource === "curated" ? row.contextSource : "catalog";
+			const maxOutputSource = row.maxOutputSource === "override" ? "override" : "catalog";
+			const out = row.maxOutputLength;
 			return {
 				id,
 				name: typeof row.name === "string" && row.name !== "" ? row.name : id,
@@ -947,7 +1184,9 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 				available: row.available !== false,
 				quotaExhausted: row.quotaExhausted === true,
 				contextSource,
-				...typeof w === "number" && Number.isFinite(w) && w > 0 ? { contextWindow: w } : {}
+				maxOutputSource,
+				...typeof w === "number" && Number.isFinite(w) && w > 0 ? { contextWindow: w } : {},
+				...typeof out === "number" && Number.isFinite(out) && out > 0 ? { maxOutputLength: out } : {}
 			};
 		}).filter((entry) => entry.id !== "") : [];
 		return {
@@ -987,15 +1226,28 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		const candidates = Array.isArray(d.candidateIds) ? d.candidateIds.map((id) => String(id ?? "")).filter((id) => id !== "") : [];
 		const reason = d.absentReason;
 		const absentReason = reason === "no-tools-service" || reason === "peer-load-failed" || reason === "registry-refused" ? reason : null;
+		const rawCandidates = Array.isArray(d.candidates) ? d.candidates.map((entry) => {
+			const row = entry ?? {};
+			return {
+				id: String(row.id ?? ""),
+				capability: row.capability === "text-to-image" ? "text-to-image" : row.capability === "image-to-image" ? "image-to-image" : "other",
+				textToImage: row.textToImage === true
+			};
+		}).filter((row) => row.id !== "") : null;
+		const effectiveSource = d.effectiveSource === "preferred" || d.effectiveSource === "declared-text-to-image" || d.effectiveSource === "known-text-to-image" || d.effectiveSource === "catalog-first" ? d.effectiveSource : null;
 		return {
 			enabled: d.enabled === true,
 			source: d.source === "panel" ? "panel" : "config",
 			candidateIds: candidates,
 			candidateCount: typeof d.candidateCount === "number" && Number.isFinite(d.candidateCount) ? d.candidateCount : candidates.length,
+			...rawCandidates !== null ? { candidates: rawCandidates } : {},
 			preferredModel: typeof d.preferredModel === "string" && d.preferredModel !== "" ? d.preferredModel : null,
 			preferredSource: d.preferredSource === "panel" ? "panel" : "config",
+			..."effectiveModel" in d ? { effectiveModel: typeof d.effectiveModel === "string" && d.effectiveModel !== "" ? d.effectiveModel : null } : {},
+			..."effectiveSource" in d ? { effectiveSource } : {},
 			absentReason,
 			mountPending: d.mountPending === true,
+			preferredInCatalog: d.preferredInCatalog === true ? true : d.preferredInCatalog === false ? false : null,
 			toolName: typeof d.toolName === "string" && d.toolName !== "" ? d.toolName : "modelscope_draw_image"
 		};
 	}
@@ -1048,10 +1300,14 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			source: "config",
 			candidateIds: [],
 			candidateCount: 0,
+			candidates: [],
 			preferredModel: null,
 			preferredSource: "config",
+			effectiveModel: null,
+			effectiveSource: null,
 			absentReason: null,
 			mountPending: false,
+			preferredInCatalog: null,
 			toolName: "modelscope_draw_image"
 		});
 		GUIDANCE_BY_CODE = Object.freeze({
@@ -1277,17 +1533,19 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 	function LocalDailyCard({ snapshot, tt }) {
 		const quota = snapshot.quota;
 		const daily = quota?.daily ?? { usedLocal: null };
-		const perModel = Array.isArray(quota?.perModel) ? quota.perModel : [];
+		const perModel = quota?.perModel;
+		const perModelRows = Array.isArray(perModel) ? perModel : perModel === null ? null : [];
 		const unknownUsed = !(typeof daily.usedLocal === "number" && Number.isFinite(daily.usedLocal));
 		const usedText = unknownUsed ? "—" : count(daily.usedLocal);
+		const perModelUnknown = perModelRows === null;
 		return h("div", { style: S.card }, h("div", { style: S.poolName }, format(tt("quota.headline"), {
 			calls: usedText,
-			models: count(perModel.length)
-		})), unknownUsed ? h("div", { style: {
+			models: perModelUnknown ? "—" : count(perModelRows.length)
+		})), unknownUsed || perModelUnknown ? h("div", { style: {
 			...S.formNote,
 			color: "var(--dsw-alias-state-warn-primary)"
-		} }, tt("quota.unavailable")) : null, h(ModelUsageTable, {
-			rows: perModel,
+		} }, tt("quota.unavailable")) : null, perModelUnknown ? null : h(ModelUsageTable, {
+			rows: perModelRows,
 			tt
 		}), h("div", { style: S.trendLegend }, tt("quota.note")));
 	}
@@ -1303,7 +1561,7 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			}, h("div", { style: S.trendRowHead }, h("span", {
 				style: S.trendModel,
 				title: row.modelId
-			}, row.modelId), h("span", { style: S.trendCredits }, count(row.calls) + (row.tokens !== null ? ` · ${count(row.tokens)}t` : ""))), pct >= 1 ? h("div", {
+			}, row.modelId), h("span", { style: S.trendCredits }, format(tt("quota.rowCalls"), { calls: count(row.calls) }) + (row.tokens !== null ? ` · ${format(tt("quota.rowTokens"), { tokens: compactCount(row.tokens) })}` : ""))), pct >= 1 ? h("div", {
 				style: S.trendBar,
 				role: "progressbar",
 				"aria-valuenow": Math.round(pct),
@@ -1315,31 +1573,170 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			} })) : null);
 		}), h("div", { style: S.trendLegend }, tt("trend.legend")));
 	}
-	/** 近 N 天本地调用趋势（天桶；缺桶 = 该日 0 次，真实零）。 */
+	/**
+	* 轴上的日期短标注：砍掉年份与补零（`2026-09-18` → `9-18`）。
+	*
+	* 轴的跨度最多 trendDays（默认 14，多在同年内），年份在刻度间重复出现，占掉的
+	* 宽度全是从图的呼吸里匀来的；补零的 `09` 同样多占一格而没多给信息。不是
+	* `YYYY-MM-DD` 形状时原样返回——宁可显示一个陌生字符串，也不按位置硬切。
+	* @param {string} key - 天桶 dateKey（本地日期 YYYY-MM-DD）。
+	* @returns {string} 短标注。
+	*/
+	function shortDateKey(key) {
+		const value = typeof key === "string" ? key : "";
+		const match = /^\d{4}-(\d{2})-(\d{2})$/.exec(value);
+		return match === null ? value : `${Number(match[1])}-${Number(match[2])}`;
+	}
+	/**
+	* 轴刻度落在哪些桶上（返回下标）。
+	*
+	* 桶数 ≤ {@link MAX_TICKS} 时逐日都标；否则按 `(n-1)/(MAX_TICKS-1)` 等距取点、
+	* 首尾必含——与姊妹插件 Agnes 的用量图同一取法（它 30 天标 7 个）。等距取点是
+	* 对**下标**取整而不是对像素分均，所以刻度与其柱子所属的区间大体对齐，只是轴
+	* 用 `space-between` 铺开；两端的日期恒为真实首末日。
+	* @param {number} count - 桶数。
+	* @returns {number[]} 升序下标。
+	*/
+	function tickIndices(count) {
+		if (!Number.isFinite(count) || count <= 0) return [];
+		if (count <= MAX_TICKS) return Array.from({ length: count }, (_, index) => index);
+		const step = (count - 1) / 6;
+		const out = [];
+		for (let tick = 0; tick < MAX_TICKS; tick += 1) {
+			const index = Math.round(tick * step);
+			if (index > (out[out.length - 1] ?? -1)) out.push(index);
+		}
+		return out;
+	}
+	/**
+	* 近 N 天本地调用趋势（天桶；缺桶 = 该日 0 次，真实零）——**竖向柱状图**。
+	*
+	* token 与调用次数共用同一根柱子但**各自归一化**（`max` 按当前指标现算）：两者量级
+	* 差三四个数量级，若共用一把尺，次数柱会被 token 柱压成贴地的一条线——那图就撒谎了。
+	* 一次只画一个指标（不放双柱），窄容器里双柱既挤又难读，且对比还得再解释一遍。
+	*
+	* 切换态活在组件内的 useState：它是纯显示偏好，不落盘——与「显示天数」不同，那个
+	* 会改变 Host 的取数窗口（真要持久化就该走 usage-prefs，别混进这里）。
+	*/
 	function TrendBars({ buckets, tt }) {
+		const [metric, setMetric] = useState("calls");
+		if (buckets === null) return h("div", { style: S.trendLegend }, tt("trend.unreadable"));
 		if (!Array.isArray(buckets) || buckets.length === 0) return h("div", { style: S.trendLegend }, tt("trend.none"));
 		const rows = buckets.map((bucket) => ({
 			dateKey: bucket.dateKey,
-			calls: Number.isFinite(bucket.calls) ? Math.max(0, bucket.calls) : 0
+			calls: Number.isFinite(bucket.calls) ? Math.max(0, bucket.calls) : 0,
+			tokens: Number.isFinite(bucket.tokens) ? Math.max(0, bucket.tokens) : 0
 		}));
-		const max = Math.max(0, ...rows.map((row) => row.calls));
-		return h("div", null, rows.map((row) => h("div", {
-			key: row.dateKey,
-			style: S.trendRowHead
-		}, h("span", { style: S.trendModel }, row.dateKey), h("div", {
+		const tokenMode = metric === "tokens";
+		const values = rows.map((row) => tokenMode ? row.tokens : row.calls);
+		const max = Math.max(0, ...values);
+		/** 读数文本：次数走 count（千分位），token 走 compactCount（`1.2k` / `3.4m`）。 */
+		const readout = (value) => tokenMode ? compactCount(value) : count(value);
+		return h("div", null, h("div", {
+			style: S.trendMetricBar,
+			role: "group",
+			"aria-label": tt("trend.metric")
+		}, ...[["calls", "trend.metricCalls"], ["tokens", "trend.metricTokens"]].map(([key, labelKey]) => h("button", {
+			key,
+			type: "button",
+			"aria-pressed": metric === key,
+			style: metric === key ? {
+				...S.trendMetricBtn,
+				...S.trendMetricBtnActive
+			} : S.trendMetricBtn,
+			onClick: () => setMetric(key)
+		}, tt(labelKey)))), h("div", { style: S.trendChartBars }, rows.map((row, index) => {
+			const value = values[index] ?? 0;
+			const pct = max > 0 ? value / max * 100 : 0;
+			return h("div", {
+				key: row.dateKey,
+				style: S.trendChartBar,
+				title: `${row.dateKey}: ${readout(value)}`
+			}, value > 0 ? h("span", {
+				style: {
+					...S.trendChartValue,
+					bottom: `calc(${pct}% + 3px)`
+				},
+				"aria-hidden": "true"
+			}, readout(value)) : null, h("div", {
+				style: {
+					...S.trendChartFill,
+					height: `${pct}%`
+				},
+				role: "progressbar",
+				"aria-label": `${row.dateKey} ${readout(value)}`,
+				"aria-valuenow": Math.round(pct),
+				"aria-valuemin": 0,
+				"aria-valuemax": 100
+			}));
+		})), h("div", { style: S.trendChartAxis }, tickIndices(rows.length).map((index) => {
+			const key = rows[index]?.dateKey ?? "";
+			return h("span", {
+				key,
+				title: key,
+				style: { whiteSpace: "nowrap" }
+			}, shortDateKey(key));
+		})), h("div", { style: S.trendLegend }, tt(tokenMode ? "trend.legendTokens" : "trend.legend")));
+	}
+	/**
+	* 趋势显示窗口选择器：默认（跟随 `trendDays` 配置）/ 7 / 14 / 30 / 90 天。
+	*
+	* 它改的是**画多少天**，不是**留多少天**（保留窗口是 host-config 的
+	* `retentionDays`）——所以档位只列到 `trend.maxDays` 为止：画得比留得多会把已剪的
+	* 日子画成 0，那个组合在 Host 侧已被夹掉，这里也不给它入口。
+	*
+	* 保存成功后由调用方 `load()` 回显 Host 落盘的值（不做乐观更新，与 provider /
+	* draw 的写路径同一纪律）。当前值不在档位里（例如手动改过 usage-prefs.json）时
+	* value 与任何 option 都不匹配 → 浏览器显示第一项，但下一发 onChange 仍发正确的
+	* 值——与上下文窗口选择器同一处可接受的边缘表现，不为它造「自定义」档位。
+	*/
+	function TrendWindowPicker({ trend, busy, error, onChange, tt }) {
+		if (trend === void 0) return null;
+		const maxDays = typeof trend.maxDays === "number" && Number.isFinite(trend.maxDays) && trend.maxDays > 0 ? Math.floor(trend.maxDays) : 0;
+		const tiers = TREND_WINDOW_TIERS.filter((tier) => maxDays === 0 || tier <= maxDays);
+		const current = trend.windowDays;
+		return h("div", { style: {
+			display: "flex",
+			gap: 8,
+			alignItems: "center",
+			flexWrap: "wrap",
+			marginBottom: 10
+		} }, h("label", {
 			style: {
-				...S.trendBar,
-				flex: "1",
-				marginLeft: 10
+				fontSize: 12,
+				color: "var(--dsw-alias-label-secondary)"
 			},
-			"aria-hidden": "true"
-		}, max > 0 && row.calls > 0 ? h("div", { style: {
-			...S.barFill,
-			width: `${row.calls / max * 100}%`
-		} }) : null), h("span", { style: S.quotaUsed }, String(row.calls)))), h("div", { style: S.trendLegend }, tt("trend.legend")));
+			htmlFor: "trend-window"
+		}, tt("trend.window")), h("select", {
+			id: "trend-window",
+			style: {
+				...S.rosterBulk,
+				height: 28,
+				width: "auto"
+			},
+			disabled: busy,
+			value: current === null || current === void 0 ? "" : String(current),
+			onChange: (event) => {
+				const value = String(event.target?.value ?? "");
+				onChange(value === "" ? null : Number(value));
+			}
+		}, h("option", {
+			value: "",
+			key: "default"
+		}, tt("trend.windowDefault")), tiers.map((tier) => h("option", {
+			value: String(tier),
+			key: String(tier)
+		}, format(tt("trend.windowDays"), { days: tier })))), h("span", { style: {
+			...S.muted,
+			fontSize: 11
+		} }, tt("trend.windowHint")), error !== null ? h("span", {
+			style: S.formError,
+			role: "alert"
+		}, error) : null);
 	}
-	/** 事件流（429/错误），Newest-first。 */
+	/** 事件流（429/错误），Newest-first。`events` 为 null = 读不到，渲染「—」（读不到 ≠ 0）。 */
 	function EventsList({ events, tt }) {
+		if (events === null) return h("div", { style: S.trendLegend }, tt("events.unreadable"));
 		if (!Array.isArray(events) || events.length === 0) return h("div", { style: S.trendLegend }, tt("events.none"));
 		return h("div", null, events.map((event, index) => h("div", {
 			key: `${event.at}-${index}`,
@@ -1402,6 +1799,33 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		}, tt("token.link")));
 	}
 	/**
+	* 按 owner 把清单分组，**推荐的三家置顶**（组内保持目录首见序）。
+	*
+	* 分组的理由只有一个：`owner/model` 的 owner 前缀在每一行里重复，而面板一屏能放
+	* 十几行——同一个 owner 说十几遍既占宽度又不提供任何信息。置顶沿用「推荐」徽章的
+	* 同一份 `FEATURED_OWNERS`，两处不可能对「哪三家值得置顶」说两套话。
+	* @param {RosterRow[]} rows - 归一后的清单行。
+	* @returns {{owner: string, rows: RosterRow[]}[]} 分组（置顶 owner 在前）。
+	*/
+	function groupByOwner(rows) {
+		const order = [];
+		const byOwner = /* @__PURE__ */ new Map();
+		for (const row of rows) {
+			const owner = catalogOwner(row.id);
+			const bucket = byOwner.get(owner);
+			if (bucket === void 0) {
+				byOwner.set(owner, [row]);
+				order.push(owner);
+			} else bucket.push(row);
+		}
+		const featured = FEATURED_OWNERS.filter((owner) => byOwner.has(owner));
+		const rest = order.filter((owner) => !FEATURED_OWNERS.includes(owner));
+		return [...featured, ...rest].map((owner) => ({
+			owner,
+			rows: byOwner.get(owner) ?? []
+		}));
+	}
+	/**
 	* 接入为 DSH 模型的区块（开关 + 注册状态 + 允许清单）。
 	*
 	* 这是 M4 把抽象「试调」升级成真接入的落点：开关翻转即 POST provider 路由，
@@ -1432,6 +1856,8 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		const hostIds = status.enabledIds;
 		const hostKey = useMemo(() => JSON.stringify(hostIds), [hostIds]);
 		const [draft, setDraft] = useState(() => hostIds.slice());
+		const [search, setSearch] = useState("");
+		const [collapsed, setCollapsed] = useState([]);
 		const hideAllMode = parseAllowedList(draft).mode === "none";
 		useEffect(() => {
 			setDraft(normalizeRosterSave(hostIds));
@@ -1444,30 +1870,20 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			return kept.includes(id) ? kept.filter((x) => x !== id) : [...kept, id];
 		});
 		const ticked = hideAllMode ? 0 : roster.filter((row) => draft.includes(row.id)).length;
-		const degraded = status.error === "unavailable";
-		let statusNode;
-		if (!degraded && typeof status.error === "string" && status.error !== "") statusNode = h("div", {
+		const alertNode = !(status.error === "unavailable") && typeof status.error === "string" && status.error !== "" ? h("div", {
 			style: S.formError,
 			role: "alert"
-		}, format(tt("provider.error"), { error: status.error }));
-		else if (status.registered === true) statusNode = h("div", {
-			style: {
-				fontSize: 12,
-				color: "var(--dsw-alias-label-secondary)"
-			},
-			role: "status"
-		}, tt("provider.registered"));
-		else if (status.llmAvailable !== true) statusNode = h("div", { style: {
-			...S.formNote,
-			color: "var(--dsw-alias-state-warn-primary)"
-		} }, tt("provider.llmMissing"));
-		else statusNode = h("div", {
-			style: {
-				...S.muted,
-				fontSize: 12
-			},
-			role: "status"
-		}, tt("provider.notRegistered"));
+		}, format(tt("provider.error"), { error: status.error })) : null;
+		const statusPhrase = alertNode !== null ? null : status.registered === true ? {
+			key: "provider.registered",
+			warn: false
+		} : status.llmAvailable !== true ? {
+			key: "provider.llmMissing",
+			warn: true
+		} : {
+			key: "provider.notRegistered",
+			warn: false
+		};
 		const tokenHint = enabled && tokenPresent === false ? h("div", { style: {
 			...S.formNote,
 			color: "var(--dsw-alias-state-warn-primary)"
@@ -1491,19 +1907,18 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 				label: "1M"
 			}
 		];
-		const contextNode = onSaveContextWindow === void 0 ? null : h("div", { style: {
+		const contextNode = onSaveContextWindow === void 0 ? null : h("div", { style: S.advancedBlock }, h("div", { style: {
 			display: "flex",
 			gap: 8,
 			alignItems: "center",
-			flexWrap: "wrap",
-			margin: "0 0 8px"
+			flexWrap: "wrap"
 		} }, h("label", {
 			style: {
 				fontSize: 12,
 				color: "var(--dsw-alias-label-secondary)"
 			},
 			htmlFor: "provider-context-window"
-		}, tt("provider.contextWindow")), h("select", {
+		}, tt("provider.contextWindowOverride")), h("select", {
 			id: "provider-context-window",
 			style: {
 				...S.rosterBulk,
@@ -1521,13 +1936,7 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		}, tt("provider.contextDefault")), CONTEXT_TIERS.map((tier) => h("option", {
 			value: String(tier.value),
 			key: String(tier.value)
-		}, tier.label))), h("span", {
-			style: {
-				...S.muted,
-				fontSize: 11
-			},
-			title: tt("provider.contextHint")
-		}, tt("provider.contextHint")));
+		}, tier.label)))), h("div", { style: S.advancedHint }, tt("provider.contextHint")));
 		const switchRow = h("div", { style: {
 			display: "flex",
 			gap: 10,
@@ -1541,57 +1950,35 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			label: tt(enabled ? "provider.on" : "provider.off"),
 			busyLabel: tt("provider.busy"),
 			title: tt("provider.enable")
-		}), h("span", { style: {
+		}), statusPhrase === null ? null : h("span", {
+			style: S.dotSep,
+			"aria-hidden": "true"
+		}, "·"), statusPhrase === null ? null : h("span", {
+			role: "status",
+			style: {
+				fontSize: 12,
+				color: statusPhrase.warn ? "var(--dsw-alias-state-warn-primary)" : "var(--dsw-alias-label-secondary)"
+			}
+		}, tt(statusPhrase.key)), h("span", {
+			style: S.dotSep,
+			"aria-hidden": "true"
+		}, "·"), h("span", { style: {
 			fontSize: 11,
 			color: "var(--dsw-alias-label-secondary)"
 		} }, tt(sourceKey)));
-		const rosterBlock = roster.length === 0 ? h("div", { style: {
-			...S.muted,
-			fontSize: 12,
-			marginTop: 6
-		} }, tt("provider.rosterHint")) : h("div", { style: S.modelPanel }, h("div", { style: S.rosterTools }, h("span", {
-			style: S.rosterCount,
-			title: format(tt("provider.enabledCount"), {
-				count: ticked,
-				total: roster.length
-			})
-		}, format(tt("provider.enabledCount"), {
-			count: ticked,
-			total: roster.length
-		})), h("button", {
-			type: "button",
-			style: S.rosterBulk,
-			disabled: busy,
-			onClick: () => {
-				setDraft(rosterIds.slice());
-				onSaveList(rosterIds.slice());
-			}
-		}, tt("provider.allowAll")), h("button", {
-			type: "button",
-			style: S.rosterBulk,
-			disabled: busy,
-			onClick: () => {
-				const none = hideAllRoster();
-				setDraft(none);
-				onSaveList(none);
-			}
-		}, tt("provider.hideAll")), h("button", {
-			type: "button",
-			style: S.primary,
-			disabled: busy,
-			onClick: () => onSaveList(draft.slice())
-		}, tt("provider.saveList"))), h("ul", {
-			style: S.modelList,
-			role: "list"
-		}, roster.map((row) => {
+		const renderRosterRow = (row) => {
 			const id = row.id;
 			const unusable = row.available === false || row.quotaExhausted === true;
 			return h("li", {
 				key: id,
 				style: unusable ? {
 					...S.modelRow,
+					...S.modelRowGrouped,
 					...S.modelRowOff
-				} : S.modelRow
+				} : {
+					...S.modelRow,
+					...S.modelRowGrouped
+				}
 			}, h("div", { style: S.modelRowHead }, h("label", { style: {
 				display: "flex",
 				alignItems: "center",
@@ -1609,39 +1996,131 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			}), h("span", {
 				style: S.modelName,
 				title: id
-			}, row.name)), row.vision === true ? h("span", { style: S.modelBadge }, tt("provider.vision")) : null, typeof row.contextWindow === "number" ? h("span", {
+			}, trimOwnerPrefix(id, row.name))), row.vision === true ? h("span", { style: S.modelBadge }, tt("provider.vision")) : null, typeof row.contextWindow === "number" ? h("span", {
 				style: row.contextSource === "curated" ? {
 					...S.modelBadge,
 					color: "var(--dsw-alias-label-secondary)"
 				} : S.modelBadge,
 				title: row.contextSource === "curated" ? tt("provider.contextCuratedTitle") : tt("provider.contextWindow")
-			}, row.contextSource === "curated" ? formatWindow(row.contextWindow) + " *" : formatWindow(row.contextWindow)) : null, FEATURED_OWNERS.includes(catalogOwner(row.id)) ? h("span", {
-				style: S.modelBadgeFeatured,
-				title: tt("models.featuredTitle")
-			}, tt("provider.featured")) : null, row.quotaExhausted === true ? h("span", { style: {
+			}, row.contextSource === "curated" ? formatWindow(row.contextWindow) + " *" : formatWindow(row.contextWindow)) : null, typeof row.maxOutputLength === "number" ? h("span", {
+				style: S.modelBadge,
+				title: row.maxOutputSource === "override" ? tt("provider.maxOutputOverrideTitle") : tt("provider.maxOutput")
+			}, formatWindow(row.maxOutputLength)) : null, row.quotaExhausted === true ? h("span", { style: {
 				...S.modelBadge,
 				color: "var(--dsw-alias-state-error-primary)"
 			} }, tt("provider.quotaExhausted")) : null, h("a", {
 				style: {
 					...S.formNote,
 					margin: 0,
-					marginLeft: "auto"
+					marginLeft: "auto",
+					whiteSpace: "nowrap"
 				},
 				href: modelscopeModelUrl(row.id),
 				target: "_blank",
 				rel: "noreferrer",
 				title: tt("models.viewOnSiteTitle")
 			}, tt("models.viewOnSite"))));
-		})), h("div", { style: S.rosterFoot }, h("button", {
+		};
+		const query = search.trim().toLowerCase();
+		const visibleRows = query === "" ? roster : roster.filter((row) => `${row.id} ${String(row.name ?? "")}`.toLowerCase().includes(query));
+		const ownerGroups = groupByOwner(visibleRows);
+		const rosterBlock = roster.length === 0 ? h("div", { style: {
+			...S.muted,
+			fontSize: 12,
+			marginTop: 6
+		} }, tt("provider.rosterHint")) : h("div", { style: S.modelPanel }, h("div", { style: S.rosterTools }, h("input", {
+			type: "search",
+			name: "provider-model-search",
+			autoComplete: "off",
+			style: {
+				...S.input,
+				flex: "1 1 160px",
+				minWidth: 0
+			},
+			placeholder: tt("provider.search"),
+			"aria-label": tt("provider.search"),
+			value: search,
+			disabled: busy,
+			onChange: (event) => setSearch(String(event.target?.value ?? ""))
+		}), h("span", {
+			style: S.rosterCount,
+			title: format(tt("provider.enabledCount"), {
+				count: ticked,
+				total: roster.length
+			})
+		}, format(tt("provider.enabledCount"), {
+			count: ticked,
+			total: roster.length
+		})), h("button", {
+			type: "button",
+			style: S.rosterBulk,
+			disabled: busy,
+			onClick: () => {
+				setDraft(rosterIds.slice());
+				onSaveList(rosterIds.slice());
+			}
+		}, tt("provider.allowAll")), h("button", {
+			type: "button",
+			style: S.rosterBulk,
+			disabled: busy,
+			onClick: () => {
+				const none = hideAllRoster();
+				setDraft(none);
+				onSaveList(none);
+			}
+		}, tt("provider.hideAll")), h("button", {
+			type: "button",
+			style: S.primary,
+			disabled: busy,
+			onClick: () => onSaveList(draft.slice())
+		}, tt("provider.saveList"))), h("div", { style: S.advancedHint }, tt("provider.maxOutputHint")), visibleRows.length === 0 ? h("div", { style: {
+			...S.muted,
+			fontSize: 12,
+			padding: "10px 4px"
+		} }, tt("provider.noMatch")) : h("ul", {
+			style: S.modelList,
+			role: "list"
+		}, ownerGroups.map((group) => {
+			const isCollapsed = query === "" && collapsed.includes(group.owner);
+			const groupTicked = hideAllMode ? 0 : group.rows.filter((row) => draft.includes(row.id)).length;
+			return h("li", { key: group.owner }, h("button", {
+				type: "button",
+				style: S.modelGroup,
+				"aria-expanded": !isCollapsed,
+				"aria-label": `${tt(isCollapsed ? "section.expand" : "section.collapse")}: ${group.owner}`,
+				onClick: () => setCollapsed((current) => current.includes(group.owner) ? current.filter((owner) => owner !== group.owner) : [...current, group.owner])
+			}, h("svg", {
+				viewBox: "0 0 16 16",
+				width: 12,
+				height: 12,
+				fill: "none",
+				stroke: "currentColor",
+				strokeWidth: "1.5",
+				strokeLinecap: "round",
+				strokeLinejoin: "round",
+				"aria-hidden": "true",
+				style: isCollapsed ? {
+					...S.chevron,
+					transform: "rotate(-90deg)"
+				} : S.chevron
+			}, h("path", { d: "M3 6l5 5 5-5" })), h("span", { style: S.modelGroupOwner }, group.owner), FEATURED_OWNERS.includes(group.owner) ? h("span", {
+				style: S.modelBadgeFeatured,
+				title: tt("models.featuredTitle")
+			}, tt("provider.featured")) : null, h("span", { style: S.modelGroupCount }, format(tt("provider.groupCount"), { count: group.rows.length })), groupTicked > 0 ? h("span", { style: S.modelGroupCount }, format(tt("provider.groupSelected"), { count: groupTicked })) : null), isCollapsed ? null : h("ul", {
+				style: S.modelList,
+				role: "list"
+			}, group.rows.map(renderRosterRow)));
+		})));
+		const resetRow = h("div", { style: S.rosterFoot }, h("button", {
 			type: "button",
 			style: S.button,
 			disabled: busy,
 			onClick: onReset
-		}, tt("provider.reset"))));
-		return h("div", null, switchRow, statusNode, tokenHint, contextNode, h("div", { style: {
+		}, tt("provider.reset")));
+		return h("div", null, switchRow, alertNode, tokenHint, h("div", { style: {
 			...S.sectionTitle,
 			margin: "18px 0 8px"
-		} }, tt("provider.models")), rosterBlock, error !== null ? h("div", {
+		} }, tt("provider.models")), rosterBlock, contextNode, resetRow, error !== null ? h("div", {
 			style: S.formError,
 			role: "alert"
 		}, error) : null);
@@ -1660,11 +2139,15 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 	* @param {object} props - 渲染参数。
 	* @returns {unknown} 卡片节点。
 	*/
-	function DrawCard({ draw, busy, error, onToggle, onReset, tokenPresent, tt }) {
+	function DrawCard({ draw, busy, error, onToggle, onReset, onSelectModel, onAutoModel, tokenPresent, tt }) {
 		const status = drawOf(draw);
 		const enabled = status.enabled === true;
 		const candidates = status.candidateIds;
 		const sourceKey = status.source === "panel" ? "draw.source.panel" : "draw.source.config";
+		const effectiveModel = status.effectiveModel;
+		const hasEffectiveKey = effectiveModel !== void 0;
+		const candidateDetails = status.candidates;
+		const autoReasonKey = status.effectiveSource === "declared-text-to-image" ? "draw.currentSrc.declaredTextToImage" : status.effectiveSource === "known-text-to-image" ? "draw.currentSrc.knownTextToImage" : status.effectiveSource === "catalog-first" ? "draw.currentSrc.catalogFirst" : null;
 		const switchRow = h("div", { style: {
 			display: "flex",
 			gap: 10,
@@ -1707,7 +2190,7 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			},
 			role: "status"
 		}, tt("draw.notMounted"));
-		const restartHint = enabled ? h("div", { style: {
+		const restartHint = enabled && status.mountPending === true ? h("div", { style: {
 			...S.formNote,
 			color: "var(--dsw-alias-state-warn-primary)"
 		} }, tt("draw.restartHint")) : null;
@@ -1715,32 +2198,120 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			...S.formNote,
 			color: "var(--dsw-alias-state-warn-primary)"
 		} }, tt("draw.needsKey")) : null;
-		const candidateBlock = candidates.length === 0 ? h("div", { style: {
+		const preferredGoneHint = status.preferredModel !== null && status.preferredInCatalog === false ? h("div", {
+			style: {
+				...S.formNote,
+				color: "var(--dsw-alias-state-warn-primary)"
+			},
+			role: "status"
+		}, format(tt("draw.preferredGone"), { model: status.preferredModel })) : null;
+		const autoDescription = !hasEffectiveKey || status.preferredModel !== null ? null : effectiveModel === null || effectiveModel === "" ? h("div", { style: {
 			...S.muted,
-			fontSize: 12,
-			marginTop: 6
-		} }, tt("draw.noCandidates")) : h("div", { style: {
+			fontSize: 11,
+			lineHeight: "16px",
+			paddingLeft: 25
+		} }, tt("draw.currentNone")) : h("div", { style: {
+			...S.muted,
+			fontSize: 11,
+			lineHeight: "16px",
+			paddingLeft: 25
+		} }, autoReasonKey === null ? format(tt("draw.autoHint"), { model: effectiveModel }) : format(tt("draw.autoHintReason"), {
+			model: effectiveModel,
+			reason: tt(autoReasonKey)
+		}));
+		const RADIO_NAME = "modelscope-draw-model";
+		/**
+		* 一个候选的能力徽章（**正向各给一枚**，不是「能力减项 + 警告」）。
+		*
+		* 之前写成「平台能力档一枚 + 不能纯文生图时再加警告」是不对称的：能吃纯文生图
+		* 是**加项优势**，却在 UI 上完全不可见，于是两个 Qwen-Image-Edit 看起来一样，
+		* 其中一个还莫名带着警告。现在两个事实各画一枚：
+		*   - `图生图`——平台声明的 image-to-image（改图/图生图）；
+		*   - `文生图`——能吃纯文生图（平台声明的 text-to-image，或实测已知的那个 id）。
+		* 只给「图生图」的模型，徽章上挂 title 说明它必须给输入图（把警告从第二枚
+		* 徽章降级成悬停说明，列表不再被警告噪声占满）。
+		* 旧 Host 没有候选明细时退化为通用「出图」徽章——不猜能力。
+		*/
+		const capabilityBadges = (row) => {
+			if (row.capability === null) return [h("span", {
+				key: "badge",
+				style: S.modelBadge
+			}, tt("draw.badge"))];
+			const badges = [];
+			if (row.capability === "image-to-image") badges.push(h("span", {
+				key: "badge-i2i",
+				style: S.modelBadge,
+				title: row.textToImage === true ? void 0 : tt("draw.imageOnlyTitle")
+			}, tt("draw.badge.imageToImage")));
+			if (row.textToImage === true) badges.push(h("span", {
+				key: "badge-t2i",
+				style: S.modelBadge
+			}, tt("draw.badge.textToImage")));
+			if (badges.length === 0) badges.push(h("span", {
+				key: "badge",
+				style: S.modelBadge
+			}, tt("draw.badge")));
+			return badges;
+		};
+		const candidateRows = Array.isArray(candidateDetails) ? candidateDetails.map((row) => ({
+			id: row.id,
+			capability: row.capability,
+			textToImage: row.textToImage
+		})) : candidates.map((id) => ({
+			id,
+			capability: null,
+			textToImage: null
+		}));
+		/**
+		* 一行广播的骨架：单选框 + 名字（+ 其余徽章由调用方给），可选第二行说明。
+		*
+		* `description` 是「这一项是什么」的地方（只有「自动选择」需要），缩进对齐到
+		* 文字起点（复选框 15px + gap 10px = 25px），读起来是该项的注脚而不是新一行。
+		*/
+		const radioRow = (key, checked, label, labelText, disabled, onChange, extra, description) => h("li", {
+			key,
+			style: S.modelRow
+		}, h("div", { style: S.modelRowHead }, h("label", { style: {
 			display: "flex",
-			flexDirection: "column",
-			gap: 4
-		} }, candidates.map((id) => h("div", {
-			key: id,
-			style: S.modelRowHead
-		}, h("code", {
+			alignItems: "center",
+			gap: 10,
+			flex: "1 1 auto",
+			minWidth: 0,
+			cursor: disabled ? "default" : "pointer"
+		} }, h("input", {
+			type: "radio",
+			name: RADIO_NAME,
+			checked,
+			disabled,
+			onChange,
+			style: S.modelCheck,
+			"aria-label": label
+		}), h("span", {
 			style: S.modelName,
-			title: id
-		}, id), h("span", { style: S.modelBadge }, tt("draw.badge")), h("a", {
+			title: label
+		}, labelText)), ...extra), ...description === void 0 ? [] : [description]);
+		const candidateBlock = candidateRows.length === 0 ? h("div", { style: {
+			...S.muted,
+			fontSize: 12,
+			marginTop: 6
+		} }, tt("draw.noCandidates")) : h("div", { style: S.modelPanel }, h("ul", {
+			style: S.modelList,
+			role: "radiogroup",
+			"aria-label": tt("draw.models")
+		}, radioRow("__auto__", status.preferredModel === null, tt("draw.auto"), tt("draw.auto"), busy, () => onAutoModel(), [], autoDescription === null ? void 0 : autoDescription), ...candidateRows.map((row) => radioRow(row.id, status.preferredModel === row.id, row.id, row.id, busy, () => onSelectModel(row.id), [...capabilityBadges(row), h("a", {
+			key: "link",
 			style: {
 				...S.formNote,
 				margin: 0,
-				marginLeft: "auto"
+				marginLeft: "auto",
+				whiteSpace: "nowrap"
 			},
-			href: modelscopeModelUrl(id),
+			href: modelscopeModelUrl(row.id),
 			target: "_blank",
 			rel: "noreferrer",
 			title: tt("models.viewOnSiteTitle")
-		}, tt("models.viewOnSite")))));
-		return h("div", null, switchRow, statusNode, restartHint, tokenHint, h("div", { style: {
+		}, tt("models.viewOnSite"))]))));
+		return h("div", null, switchRow, statusNode, h("div", { style: {
 			...S.sectionTitle,
 			margin: "18px 0 8px"
 		} }, tt("draw.models")), candidateBlock, h("div", { style: S.rosterFoot }, h("button", {
@@ -1751,9 +2322,9 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		}, tt("draw.reset"))), error !== null ? h("div", {
 			style: S.formError,
 			role: "alert"
-		}, error) : null);
+		}, error) : null, restartHint, tokenHint, preferredGoneHint);
 	}
-	var EVENT_KIND_KEY, DRAW_ABSENT_KEY;
+	var MAX_TICKS, TREND_WINDOW_TIERS, EVENT_KIND_KEY, DRAW_ABSENT_KEY;
 	var init_cards = __esmMin((() => {
 		init_format();
 		init_runtime();
@@ -1762,6 +2333,13 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		init_snapshot();
 		init_toggle_switch();
 		init_allow_list();
+		MAX_TICKS = 7;
+		TREND_WINDOW_TIERS = [
+			7,
+			14,
+			30,
+			90
+		];
 		EVENT_KIND_KEY = {
 			quota: "events.quota",
 			rate_limit: "events.rate_limit",
@@ -2100,6 +2678,25 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 		]);
 		const toggleDraw = useCallback((enabled) => void runDrawWrite(DRAW_PATH, { enabled }), [runDrawWrite]);
 		const resetDraw = useCallback(() => void runDrawWrite(DRAW_RESET_PATH, {}), [runDrawWrite]);
+		const saveDrawModel = useCallback((modelId) => void runDrawWrite(DRAW_PATH, { modelId }), [runDrawWrite]);
+		const [trendBusy, setTrendBusy] = useState(false);
+		const [trendError, setTrendError] = useState(null);
+		const saveTrendWindow = useCallback(async (windowDays) => {
+			setTrendBusy(true);
+			setTrendError(null);
+			try {
+				await postWrite(TREND_WINDOW_PATH, { windowDays });
+				load();
+			} catch (reason) {
+				setTrendError(writeErrorText(reason, tt));
+			} finally {
+				setTrendBusy(false);
+			}
+		}, [
+			load,
+			postWrite,
+			tt
+		]);
 		const [tokenBusy, setTokenBusy] = useState(false);
 		const [tokenError, setTokenError] = useState(null);
 		const saveToken = useCallback(async (value) => {
@@ -2181,8 +2778,14 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 				open: openSections.trend,
 				onToggle: () => toggleSection("trend"),
 				tt
-			}, h(TrendBars, {
-				buckets: snap.trend?.buckets ?? [],
+			}, h(TrendWindowPicker, {
+				trend: snap.trend,
+				busy: trendBusy,
+				error: trendError,
+				onChange: (windowDays) => void saveTrendWindow(windowDays),
+				tt
+			}), h(TrendBars, {
+				buckets: snap.trend?.buckets ?? null,
 				tt
 			})), h(SectionCard, {
 				title: tt("section.events"),
@@ -2190,7 +2793,7 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 				onToggle: () => toggleSection("events"),
 				tt
 			}, h(EventsList, {
-				events: snap.events ?? [],
+				events: snap.events ?? null,
 				tt
 			})));
 		};
@@ -2220,6 +2823,8 @@ var dsh_connect_modelscope_token_plan_client = (function() {
 			error: drawError,
 			onToggle: toggleDraw,
 			onReset: resetDraw,
+			onSelectModel: (id) => saveDrawModel(id),
+			onAutoModel: () => saveDrawModel(null),
 			tokenPresent: data?.token?.present === true,
 			tt
 		})));