dsh-neartoken 0.19.0 → 0.20.0

package/README.md

@@ -59,6 +59,8 @@
 
 分组路由按同一文档：请求头 `x-neartoken-group` 的值是 `/api/pricing` 的 `group_refs` 给出的 **`#<id>`**（纯 ASCII），分组名只用于展示；某分组没有 ref 时不发该头，按令牌自身分组路由。
 
+模型选择器里的分组是**显式选择**：换模型时先保留当前分组；新模型不在该分组时，按分组名上的档位标签（`[低价]` / `[满血]` / `[官key]` 等）就近匹配同一档位的分组，而不是落回站点目录里的第一个分组——那一个往往是倍率最高的。跨模型族（`[低价] DeepSeek` → GPT）也按标签匹配。
+
 ## 数据概览（消耗 / Token / 模型堆积）
 
 账户卡片下方是「数据概览」：窗口内的消耗金额（括注当前余额）、窗口内的 Token 数，以及按模型堆积的面积图。右上角的「日 / 周 / 月」切换整个窗口 —— 桶宽由站点给，插件不自己造桶：
@@ -218,7 +220,7 @@ location / {
 
 | 通道 | 判定 | 请求 | 响应 |
 |---|---|---|---|
-| `images` | 声明含 `image-generation`（gpt-image 系） | `POST /v1/images/generations` | `data[0].b64_json` 或临时 `url` |
+| `images` | 声明含 `image-generation`（gpt-image 系） | `POST /v1/images/tasks` 提交 → `GET /v1/images/tasks/<id>` 轮询 | 任务 `SUCCESS` 的 `data[0].url` / `b64_json`；站点回落同步时直接是 `data[0]` |
 | `genai` | 声明含 `gemini`（nano-banana、`gemini-*-image`） | `POST /v1beta/models/<model>:generateContent` | `candidates[0].content.parts[].inlineData`（结构化） |
 | `chat` | 其余（只有 `openai` 的，如 grok-imagine） | `POST /v1/chat/completions` | 回复文本里的 `data:image/...;base64,` 或图片链接 |
 
@@ -232,7 +234,7 @@ Gemini 系走原生 surface 而不是 openai 兼容层：同模型同提示词
 
 `images` 传工作区里的图片路径，工具读成 data URL 后按通道发送：
 
-- **images 通道**：作为 `image` 数组（data URL）发给 `/v1/images/generations`（站点 DTO 里没有可用的 `edits` 路由，参考图只能搭生成请求）
+- **images 通道**：作为 `image` 数组（data URL）随任务提交发给 `/v1/images/tasks`（站点 DTO 里没有可用的 `edits` 路由，参考图只能搭生成请求）
 - **genai 通道**：作为 `inlineData` part 与提示词一起进 `contents[0].parts`
 - **chat 通道**：作为 `image_url` content part 与提示词一起进 `messages`
 
@@ -249,13 +251,22 @@ Gemini 系走原生 surface 而不是 openai 兼容层：同模型同提示词
 
 限制：一次只出一张图（`n` 未暴露）；`mask` 局部重绘、`input_fidelity` 未暴露。
 
+### 异步任务
+
+`images` 通道的模型走站点的 **durable task**：`POST /v1/images/tasks` 立刻返回 `202 + task_id`，插件每 3 秒（退避到 5 秒）轮询 `GET /v1/images/tasks/<id>`，`SUCCESS` 后再取 `data[0].url` / `b64_json`。慢模型不再靠一条长 HTTP 撑时间 —— 连接断了，任务还在站点上跑。
+
+- **轮询只重读，不重提交**：轮询撞上 5xx、网关故障或断网，按同一 `task_id` 再来一次；任务没有幂等键，重复提交会重复计费，所以提交没拿到任务就原样报给模型，由模型决定要不要重试。
+- **取消只停轮询**：`exec.signal` 中止后本地不再查询，站点上的任务照常跑完并按站点规则计费。
+- **失败带站点原话**：`FAILURE` 的 `fail_reason`（例如 `DataInspectionFailed: …`）直接进错误消息，不用去站点后台翻。
+- **两种回落都能接**：站点没把该模型认领成任务时，同一端点直接回 `200 + data[]`；不认这个端点的老站点回 404，插件改用 `POST /v1/images/generations` 同步等一次。
+
 ### 超时
 
 生图是几十秒到几分钟的活，所以有两条时间线，故意错开：
 
 | 层 | 值 | 超时后模型看到什么 |
 |---|---|---|
-| 插件自己的预算 | `imageTimeoutMs`（默认 300 秒） | `the site did not return an image within 300s (imageTimeoutMs); … retry, raise imageTimeoutMs, or enable a faster image model` |
+| 插件自己的预算 | `imageTimeoutMs`（默认 300 秒），**从提交到拿到图的总预算**（含轮询） | `the site did not return an image within 300s (imageTimeoutMs); … a submitted task keeps running on the site and is billed when it finishes …` |
 | 工具调用截止时间 | `imageTimeoutMs + 30 秒`，声明给 harness 的 timeout policy | 通用的 `tool call timed out after …ms` |
 
 自己那条早 30 秒触发，所以正常情况模型拿到的是**能指路**的那条（等了多久、该调哪个旋钮）；harness 那条只兜住「工具无视 abort 继续跑」。预算耗尽和调用方取消是分开处理的（`AbortSignal.any` 里单独持有预算信号），取消原样向上传递，不会被写成超时。

package/lib/client.js

@@ -399,6 +399,32 @@ window.__ModuleLoader__.load({
 			}));
 		}
 		/**
+		* Fold one group name into the badge texts that spell its tier out.
+		* @param group - a group name, e.g. `[低价][备用] GPT Pro`.
+		* @returns the badge texts, trimmed and lowercased for comparison.
+		*/
+		function badgeTexts(group) {
+			return parseGroupLabel(group).badges.map((badge) => badge.text.trim().toLowerCase());
+		}
+		/**
+		* Score one candidate group against the tier the human already picked.
+		* The same badge SET is the closest thing to "the same group" when the site
+		* names each family's offering after its own family; otherwise the number of
+		* shared badges orders the candidates.
+		* @param current - badge texts of the group in use.
+		* @param candidate - the candidate's group name.
+		* @returns the sort keys, larger meaning closer.
+		*/
+		function tierRank(current, candidate) {
+			const texts = badgeTexts(candidate);
+			const set = new Set(texts);
+			const shared = current.filter((text) => set.has(text)).length;
+			return {
+				same: shared === current.length && set.size === current.length,
+				shared
+			};
+		}
+		/**
 		* Pick the variant a model row should route to.
 		* @param option - the row being chosen.
 		* @param preferredProvider - the currently selected provider, kept when it offers the model.
@@ -408,7 +434,15 @@ window.__ModuleLoader__.load({
 		function chooseVariant(option, preferredProvider, preferredGroup) {
 			const local = option.variants.filter((variant) => variant.provider === preferredProvider);
 			const pool = local.length > 0 ? local : option.variants;
-			return pool.find((variant) => variant.group === preferredGroup) ?? pool[0];
+			const exact = pool.find((variant) => variant.group === preferredGroup);
+			if (exact !== void 0) return exact;
+			const current = preferredGroup === void 0 ? [] : badgeTexts(preferredGroup);
+			if (current.length === 0) return pool[0];
+			return pool.map((variant, index) => ({
+				variant,
+				index,
+				rank: tierRank(current, variant.group ?? "")
+			})).toSorted((left, right) => Number(right.rank.same) - Number(left.rank.same) || right.rank.shared - left.rank.shared || left.index - right.index)[0]?.variant;
 		}
 		//#endregion
 		//#region \0dsh-css:D:\Projects\deepseek-harness\dsh-neartoken\src\client\group-tags.module.css.mjs
@@ -423,22 +457,22 @@ window.__ModuleLoader__.load({
 		}
 		var group_tags_module_css_default = {
 			"toneLime": "FotuUq_toneLime",
-			"ratioCheap": "FotuUq_ratioCheap",
-			"ratioPricey": "FotuUq_ratioPricey",
+			"tag": "FotuUq_tag",
+			"toneViolet": "FotuUq_toneViolet",
 			"toneRose": "FotuUq_toneRose",
+			"toneEmerald": "FotuUq_toneEmerald",
+			"toneTeal": "FotuUq_toneTeal",
+			"toneOrange": "FotuUq_toneOrange",
+			"ratioBase": "FotuUq_ratioBase",
+			"toneCyan": "FotuUq_toneCyan",
 			"toneIndigo": "FotuUq_toneIndigo",
+			"toneAmber": "FotuUq_toneAmber",
+			"ratioChip": "FotuUq_ratioChip",
+			"ratioCheap": "FotuUq_ratioCheap",
 			"tonePink": "FotuUq_tonePink",
 			"toneSky": "FotuUq_toneSky",
-			"toneTeal": "FotuUq_toneTeal",
-			"toneEmerald": "FotuUq_toneEmerald",
-			"toneAmber": "FotuUq_toneAmber",
-			"toneViolet": "FotuUq_toneViolet",
-			"tag": "FotuUq_tag",
 			"toneFuchsia": "FotuUq_toneFuchsia",
-			"ratioChip": "FotuUq_ratioChip",
-			"toneOrange": "FotuUq_toneOrange",
-			"ratioBase": "FotuUq_ratioBase",
-			"toneCyan": "FotuUq_toneCyan"
+			"ratioPricey": "FotuUq_ratioPricey"
 		};
 		//#endregion
 		//#region src/client/group-tags.tsx
@@ -493,39 +527,39 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var ModelGroupSelect_module_css_default = {
-			"check": "_2pt-bW_check",
-			"variantCount": "_2pt-bW_variantCount",
-			"optionCopy": "_2pt-bW_optionCopy",
-			"search": "_2pt-bW_search",
-			"groupOptionLabel": "_2pt-bW_groupOptionLabel",
-			"cell": "_2pt-bW_cell",
-			"chevron": "_2pt-bW_chevron",
+			"trigger": "_2pt-bW_trigger",
 			"menu": "_2pt-bW_menu",
-			"modelName": "_2pt-bW_modelName",
-			"searchRow": "_2pt-bW_searchRow",
-			"triggerLabel": "_2pt-bW_triggerLabel",
-			"cellChevron": "_2pt-bW_cellChevron",
-			"triggerEffort": "_2pt-bW_triggerEffort",
-			"status": "_2pt-bW_status",
-			"searchClear": "_2pt-bW_searchClear",
-			"selected": "_2pt-bW_selected",
-			"optionActive": "_2pt-bW_optionActive",
 			"groupInline": "_2pt-bW_groupInline",
+			"chevron": "_2pt-bW_chevron",
+			"search": "_2pt-bW_search",
 			"retry": "_2pt-bW_retry",
-			"triggerIcon": "_2pt-bW_triggerIcon",
-			"error": "_2pt-bW_error",
-			"root": "_2pt-bW_root",
+			"status": "_2pt-bW_status",
 			"warning": "_2pt-bW_warning",
-			"modelOption": "_2pt-bW_modelOption",
-			"option": "_2pt-bW_option",
+			"selected": "_2pt-bW_selected",
 			"optionTrailing": "_2pt-bW_optionTrailing",
-			"groupName": "_2pt-bW_groupName",
+			"modelOption": "_2pt-bW_modelOption",
+			"variantCount": "_2pt-bW_variantCount",
+			"searchClear": "_2pt-bW_searchClear",
 			"toast": "_2pt-bW_toast",
 			"empty": "_2pt-bW_empty",
-			"groups": "_2pt-bW_groups",
+			"optionActive": "_2pt-bW_optionActive",
+			"modelName": "_2pt-bW_modelName",
+			"optionCopy": "_2pt-bW_optionCopy",
 			"cellValue": "_2pt-bW_cellValue",
-			"trigger": "_2pt-bW_trigger",
-			"cellLabel": "_2pt-bW_cellLabel"
+			"cellLabel": "_2pt-bW_cellLabel",
+			"groups": "_2pt-bW_groups",
+			"searchRow": "_2pt-bW_searchRow",
+			"triggerLabel": "_2pt-bW_triggerLabel",
+			"cellChevron": "_2pt-bW_cellChevron",
+			"cell": "_2pt-bW_cell",
+			"root": "_2pt-bW_root",
+			"check": "_2pt-bW_check",
+			"groupName": "_2pt-bW_groupName",
+			"groupOptionLabel": "_2pt-bW_groupOptionLabel",
+			"triggerEffort": "_2pt-bW_triggerEffort",
+			"triggerIcon": "_2pt-bW_triggerIcon",
+			"option": "_2pt-bW_option",
+			"error": "_2pt-bW_error"
 		};
 		//#endregion
 		//#region src/client/ModelGroupSelect.tsx
@@ -1130,107 +1164,107 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var NearTokenSection_module_css_default = {
-			"metaTitle": "_02HI2q_metaTitle",
-			"handle": "_02HI2q_handle",
-			"linkRow": "_02HI2q_linkRow",
-			"topupBar": "_02HI2q_topupBar",
-			"topupChipActive": "_02HI2q_topupChipActive",
-			"topupInput": "_02HI2q_topupInput",
-			"voucherGroup": "_02HI2q_voucherGroup",
-			"hint": "_02HI2q_hint",
-			"tip": "_02HI2q_tip",
-			"plot": "_02HI2q_plot",
-			"tally": "_02HI2q_tally",
-			"segment": "_02HI2q_segment",
-			"voucherEmpty": "_02HI2q_voucherEmpty",
-			"label": "_02HI2q_label",
-			"plotRow": "_02HI2q_plotRow",
-			"series0": "_02HI2q_series0",
-			"hit": "_02HI2q_hit",
-			"topup": "_02HI2q_topup",
-			"metaBtn": "_02HI2q_metaBtn",
-			"rowMeta": "_02HI2q_rowMeta",
-			"legendName": "_02HI2q_legendName",
+			"fact": "_02HI2q_fact",
+			"tipGroupName": "_02HI2q_tipGroupName",
 			"chevron": "_02HI2q_chevron",
-			"title": "_02HI2q_title",
-			"badgeOn": "_02HI2q_badgeOn",
-			"name": "_02HI2q_name",
-			"rowName": "_02HI2q_rowName",
+			"segmentOn": "_02HI2q_segmentOn",
 			"axisRow": "_02HI2q_axisRow",
-			"metaHead": "_02HI2q_metaHead",
-			"metaChecks": "_02HI2q_metaChecks",
-			"toolbar": "_02HI2q_toolbar",
-			"voucherFact": "_02HI2q_voucherFact",
-			"axisLabel": "_02HI2q_axisLabel",
-			"series2": "_02HI2q_series2",
-			"form": "_02HI2q_form",
-			"topupChip": "_02HI2q_topupChip",
-			"metaActions": "_02HI2q_metaActions",
-			"topupChips": "_02HI2q_topupChips",
-			"metaIntro": "_02HI2q_metaIntro",
-			"chart": "_02HI2q_chart",
-			"search": "_02HI2q_search",
 			"swatch": "_02HI2q_swatch",
-			"fact": "_02HI2q_fact",
-			"voucherList": "_02HI2q_voucherList",
+			"series3": "_02HI2q_series3",
+			"voucherRow": "_02HI2q_voucherRow",
+			"link": "_02HI2q_link",
+			"rowMeta": "_02HI2q_rowMeta",
+			"gridLine": "_02HI2q_gridLine",
+			"axis": "_02HI2q_axis",
+			"list": "_02HI2q_list",
+			"topupChips": "_02HI2q_topupChips",
+			"topupInput": "_02HI2q_topupInput",
+			"topupChipActive": "_02HI2q_topupChipActive",
 			"count": "_02HI2q_count",
-			"legendCost": "_02HI2q_legendCost",
-			"code": "_02HI2q_code",
+			"title": "_02HI2q_title",
+			"countDot": "_02HI2q_countDot",
 			"chevronOpen": "_02HI2q_chevronOpen",
-			"gridLine": "_02HI2q_gridLine",
+			"plotPanel": "_02HI2q_plotPanel",
+			"legendItem": "_02HI2q_legendItem",
 			"metaEditor": "_02HI2q_metaEditor",
-			"countDot": "_02HI2q_countDot",
+			"code": "_02HI2q_code",
+			"metaIntro": "_02HI2q_metaIntro",
+			"voucherEmpty": "_02HI2q_voucherEmpty",
+			"cardHead": "_02HI2q_cardHead",
+			"buttonSmall": "_02HI2q_buttonSmall",
 			"card": "_02HI2q_card",
-			"refresh": "_02HI2q_refresh",
+			"legendName": "_02HI2q_legendName",
+			"invite": "_02HI2q_invite",
+			"button": "_02HI2q_button",
+			"plot": "_02HI2q_plot",
+			"factValue": "_02HI2q_factValue",
+			"legend": "_02HI2q_legend",
 			"valueRow": "_02HI2q_valueRow",
-			"select": "_02HI2q_select",
-			"intro": "_02HI2q_intro",
-			"metaBtnOn": "_02HI2q_metaBtnOn",
+			"metaHead": "_02HI2q_metaHead",
+			"cardToggle": "_02HI2q_cardToggle",
+			"badgeOn": "_02HI2q_badgeOn",
+			"topupBar": "_02HI2q_topupBar",
 			"buttonPrimary": "_02HI2q_buttonPrimary",
-			"tipTitle": "_02HI2q_tipTitle",
-			"factValue": "_02HI2q_factValue",
-			"autosave": "_02HI2q_autosave",
-			"actions": "_02HI2q_actions",
-			"tipGroup": "_02HI2q_tipGroup",
+			"voucherFact": "_02HI2q_voucherFact",
+			"metaBtnOn": "_02HI2q_metaBtnOn",
+			"intro": "_02HI2q_intro",
+			"linkLine": "_02HI2q_linkLine",
 			"row": "_02HI2q_row",
-			"series4": "_02HI2q_series4",
-			"codeRow": "_02HI2q_codeRow",
-			"badge": "_02HI2q_badge",
-			"cardHead": "_02HI2q_cardHead",
-			"metaField": "_02HI2q_metaField",
+			"select": "_02HI2q_select",
+			"factLabel": "_02HI2q_factLabel",
+			"countPicked": "_02HI2q_countPicked",
 			"section": "_02HI2q_section",
-			"metaInput": "_02HI2q_metaInput",
+			"tally": "_02HI2q_tally",
+			"metaField": "_02HI2q_metaField",
+			"chart": "_02HI2q_chart",
+			"axisLabel": "_02HI2q_axisLabel",
+			"series2": "_02HI2q_series2",
+			"topupChip": "_02HI2q_topupChip",
+			"metaBtn": "_02HI2q_metaBtn",
+			"metaTitle": "_02HI2q_metaTitle",
+			"topup": "_02HI2q_topup",
+			"metaLabel": "_02HI2q_metaLabel",
+			"name": "_02HI2q_name",
 			"metaHint": "_02HI2q_metaHint",
-			"list": "_02HI2q_list",
-			"axis": "_02HI2q_axis",
-			"series3": "_02HI2q_series3",
+			"tip": "_02HI2q_tip",
 			"segmented": "_02HI2q_segmented",
-			"voucherAmount": "_02HI2q_voucherAmount",
+			"segment": "_02HI2q_segment",
+			"plotRow": "_02HI2q_plotRow",
+			"series4": "_02HI2q_series4",
 			"series5": "_02HI2q_series5",
-			"factLabel": "_02HI2q_factLabel",
-			"countPicked": "_02HI2q_countPicked",
+			"handle": "_02HI2q_handle",
+			"series1": "_02HI2q_series1",
+			"voucherGroup": "_02HI2q_voucherGroup",
+			"metaActions": "_02HI2q_metaActions",
+			"tipGroup": "_02HI2q_tipGroup",
+			"yScale": "_02HI2q_yScale",
+			"tipRow": "_02HI2q_tipRow",
+			"codeRow": "_02HI2q_codeRow",
+			"toolbar": "_02HI2q_toolbar",
+			"label": "_02HI2q_label",
+			"facts": "_02HI2q_facts",
+			"tipTitle": "_02HI2q_tipTitle",
+			"hit": "_02HI2q_hit",
+			"refresh": "_02HI2q_refresh",
+			"linkRow": "_02HI2q_linkRow",
 			"notice": "_02HI2q_notice",
-			"plotPanel": "_02HI2q_plotPanel",
-			"invite": "_02HI2q_invite",
+			"voucherList": "_02HI2q_voucherList",
+			"form": "_02HI2q_form",
+			"search": "_02HI2q_search",
+			"rowName": "_02HI2q_rowName",
+			"yTick": "_02HI2q_yTick",
+			"legendCost": "_02HI2q_legendCost",
+			"series0": "_02HI2q_series0",
+			"actions": "_02HI2q_actions",
 			"rowRatio": "_02HI2q_rowRatio",
+			"voucherAmount": "_02HI2q_voucherAmount",
+			"metaChecks": "_02HI2q_metaChecks",
+			"autosave": "_02HI2q_autosave",
 			"gridBase": "_02HI2q_gridBase",
-			"legend": "_02HI2q_legend",
-			"voucherRow": "_02HI2q_voucherRow",
-			"buttonSmall": "_02HI2q_buttonSmall",
-			"segmentOn": "_02HI2q_segmentOn",
-			"tipGroupName": "_02HI2q_tipGroupName",
-			"metaLabel": "_02HI2q_metaLabel",
-			"facts": "_02HI2q_facts",
-			"yScale": "_02HI2q_yScale",
-			"legendItem": "_02HI2q_legendItem",
-			"button": "_02HI2q_button",
+			"metaInput": "_02HI2q_metaInput",
 			"metaCheck": "_02HI2q_metaCheck",
-			"linkLine": "_02HI2q_linkLine",
-			"link": "_02HI2q_link",
-			"tipRow": "_02HI2q_tipRow",
-			"series1": "_02HI2q_series1",
-			"yTick": "_02HI2q_yTick",
-			"cardToggle": "_02HI2q_cardToggle"
+			"hint": "_02HI2q_hint",
+			"badge": "_02HI2q_badge"
 		};
 		//#endregion
 		//#region src/client/NearTokenSection.tsx