@lynn123411/dsh-llm-agentrouter 0.3.0 → 0.3.1

package/README.md

@@ -1,6 +1,6 @@
 # @lynn123411/dsh-llm-agentrouter
 
-AgentRouter 中转聚合插件：把同一家中转的多个模型收拢为一条 pi-ai 路由（模型选择器只出现一个 AgentRouter 分组），国内 / 国际端点在「设置 - API中转 - AgentRouter 中转站」一键切换、下一请求即生效，外加出站请求的 User-Agent 改写与 402 配额耗尽提示围栏。分叉自 `aqiu817/dsh-llm-agentrouter`，适配 DSH `0.1.2-alpha.5` 起的新 settings/slots API，已在 `0.1.5-rc.1` 逐项实证兼容。
+AgentRouter 中转聚合插件：把同一家中转的多个模型收拢为一条 pi-ai 路由（模型选择器只出现一个 AgentRouter 分组），国内 / 国际端点在「设置 - API中转 - AgentRouter 中转站」一键切换、下一请求即生效，外加出站请求的 User-Agent 改写与 402 配额耗尽提示围栏。模型列表在卡片内直接编辑，写入内核「设置 - 模型」页所编辑的同一份 `llm-pi-ai` 路由数据。
 
 ## 特性
 
@@ -9,7 +9,7 @@ AgentRouter 中转聚合插件：把同一家中转的多个模型收拢为一
 - **端点一键切换**：设置卡片两个大选项（国内端点 / 国际端点，附带真实 host 展示），点击即写即生效，无需重启；API Key 只存 `$DSH_HOME/.credentials.yaml` 的 `AGENTROUTER_API_KEY` 引用。
 - **共享「API中转」设置页**：本插件的端点卡片与 `dsh-a6api` 的面板挂在同一个设置页里（`settings.section` id `relay` 的页内两个 tab，参与者可增删）。内核不允许一页被多个插件共同声明，因此每个参与者各持一份运行时逻辑一致的页壳，**先加载者当选页面宿主**、其余只注册卡片；当选者被卸载后下次启动自动改选。做法与约束见仓库 `docs/rules/shared-settings-page.md`。
 - **请求围栏**：重写 relay 要求的 `User-Agent`（适配器强制署名下沉到 `fetch` 层替换），哨兵 host（`.internal` 不可解析）兜底防裸奔，402 配额耗尽的 JSON 错误体改写为可读提示。
-- **alpha.5 兼容**：宿主沿用 `ctx.settings.installSection` + `ctx.inject(['settings'])`，客户端卡片改挂共享设置页的子 slot；沿用 `llm-agentrouter` 设置命名空间，老配置无缝继承。
+- **内核设置接入**：宿主用 `ctx.settings.installSection` 注册设置段（`ctx.inject(['settings'])`），客户端卡片挂在共享设置页的子 slot；设置命名空间为 `llm-agentrouter`。
 
 ## 安装
 

package/cordis.patch.yml

@@ -60,11 +60,11 @@
 #
 # WHOLE-OBJECT OVERWRITE, NOT A DEEP MERGE — RE-CHECK ON EVERY dsh-base BUMP
 # The loader applies a patch entry as `target[key] = value`
-# (applyEntryPatches, 0.1.5-rc.1), so the `config:` below REPLACES the
+# (applyEntryPatches, 0.1.6-alpha.2), so the `config:` below REPLACES the
 # llm-pi-ai row's whole config object: nothing a default config carried survives,
 # at any depth. That is safe today only because dsh-base mounts
 # `- id: llm-pi-ai` with a `name:` and no `config:` at all
-# (dsh-base/cordis.patch.yml:107), so there is nothing to lose. If a future
+# (dsh-base/cordis.patch.yml:114-115), so there is nothing to lose. If a future
 # dsh-base gives that row a default config, this patch swallows it SILENTLY —
 # diff the shipped llm-pi-ai row against this file on every dsh-base bump and
 # fold whatever it adds into the `providers:` map below.

package/lib/client.js

@@ -6,6 +6,7 @@ window.__ModuleLoader__.load({
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let jsx = require("react/jsx-runtime");
 		let react = require("react");
+		const { Button, Checkbox, Input } = require("@deepseek-ai/dsh-client-ui-primitives");
 
 		//#region styles
 		/*
@@ -16,44 +17,40 @@ window.__ModuleLoader__.load({
 		 */
 		const CSS = [
 			".dshAr_card{display:flex;flex-direction:column;gap:10px}",
-			".dshAr_lead{margin:0;color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}",
+			".dshAr_lead{margin:0;color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xs-13)}",
 			".dshAr_choices{display:flex;gap:10px;margin:0;padding:0;border:0;flex-wrap:wrap}",
-			".dshAr_choice{flex:1 1 200px;min-width:0;display:flex;gap:9px;align-items:flex-start;padding:11px 13px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-3);cursor:pointer}",
+			".dshAr_choice{flex:1 1 200px;min-width:0;display:flex;gap:9px;align-items:flex-start;padding:11px 13px;border:0.5px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-3);cursor:pointer;transition:background-color var(--ds-transition-duration) var(--ds-ease-in-out),border-color var(--ds-transition-duration) var(--ds-ease-in-out)}",
 			".dshAr_choice:hover{background:var(--dsw-alias-interactive-bg-hover)}",
 			".dshAr_choice[data-selected=true]{border-color:var(--dsw-alias-state-business-primary);box-shadow:0 0 0 1px var(--dsw-alias-state-business-primary) inset}",
 			".dshAr_choice[data-disabled=true]{cursor:default;opacity:.55}",
-			".dshAr_choice input{margin:3px 0 0}",
+			".dshAr_choice input{margin:3px 0 0;accent-color:var(--dsw-alias-brand-primary)}",
+			".dshAr_choice input:focus-visible{outline:none;box-shadow:0 0 0 2px var(--dsw-alias-state-business-primary)}",
 			".dshAr_choiceText{display:flex;flex-direction:column;gap:2px;min-width:0}",
-			".dshAr_choiceTitle{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:600;line-height:20px}",
-			".dshAr_choiceHost{overflow-wrap:anywhere;color:var(--dsw-alias-label-tertiary);font-family:var(--ds-font-family-code);font-size:12px;line-height:17px}",
-			".dshAr_choiceHint{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:17px}",
-			".dshAr_status{margin:0;min-height:18px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}",
+			".dshAr_choiceTitle{color:var(--dsw-alias-label-primary);font:var(--dsw-font-s-strong-14)}",
+			".dshAr_choiceHost{overflow-wrap:anywhere;color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxs-12);font-family:var(--ds-font-family-code)}",
+			".dshAr_choiceHint{color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxs-12)}",
+			".dshAr_status{margin:0;min-height:18px;color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxs-12)}",
 			".dshAr_status[data-kind=error]{color:var(--dsw-alias-state-error-primary)}",
-			".dshAr_models{display:flex;flex-direction:column;gap:8px;margin-top:4px;padding-top:12px;border-top:1px solid var(--dsw-alias-border-l2)}",
+			".dshAr_models{display:flex;flex-direction:column;gap:8px;margin-top:4px;padding-top:12px;border-top:0.5px solid var(--dsw-alias-border-l2)}",
 			".dshAr_modelsHead{display:flex;align-items:center;gap:10px;flex-wrap:wrap}",
-			".dshAr_modelsHead h4{margin:0;color:var(--dsw-alias-label-primary);font-size:14px;font-weight:600;line-height:20px}",
+			".dshAr_modelsHead h4{margin:0;color:var(--dsw-alias-label-primary);font:var(--dsw-font-s-strong-14)}",
 			".dshAr_actions{display:flex;gap:8px;flex-wrap:wrap}",
 			".dshAr_modelsHead .dshAr_actions{margin-left:auto}",
-			".dshAr_button{appearance:none;padding:5px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;line-height:18px;cursor:pointer}",
-			".dshAr_button:hover:enabled{background:var(--dsw-alias-interactive-bg-hover)}",
-			".dshAr_button:disabled{cursor:default;opacity:.5}",
 			".dshAr_modelsList{display:flex;flex-direction:column;gap:6px;margin:0;padding:0;list-style:none}",
-			".dshAr_model{margin:0;padding:8px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-3)}",
-			".dshAr_modelHead{display:flex;gap:8px;align-items:baseline;cursor:pointer;color:var(--dsw-alias-label-primary);font-size:13px;line-height:19px}",
+			".dshAr_model{margin:0;padding:8px 10px;border:0.5px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-3)}",
+			".dshAr_modelHead{display:flex;gap:8px;align-items:baseline;cursor:pointer;color:var(--dsw-alias-label-primary);font:var(--dsw-font-xs-13)}",
 			".dshAr_modelName{font-weight:600}",
-			".dshAr_modelId{overflow-wrap:anywhere;color:var(--dsw-alias-label-tertiary);font-family:var(--ds-font-family-code);font-size:11px;line-height:17px}",
+			".dshAr_modelId{overflow-wrap:anywhere;color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-xxxs-11);font-family:var(--ds-font-family-code)}",
 			".dshAr_fields{display:grid;grid-template-columns:repeat(auto-fit,minmax(120px,1fr));gap:8px;margin-top:10px}",
 			".dshAr_field{display:flex;flex-direction:column;gap:3px;min-width:0}",
-			".dshAr_fieldLabel{color:var(--dsw-alias-label-secondary);font-size:11px;line-height:15px}",
-			".dshAr_input{min-width:0;padding:4px 7px;border:1px solid var(--dsw-alias-border-l2);border-radius:7px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;line-height:18px}",
-			".dshAr_input:disabled{opacity:.55}",
+			".dshAr_fieldLabel{color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xxxs-11)}",
 			".dshAr_inputs{display:flex;gap:10px;align-items:center;flex-wrap:wrap;margin-top:10px}",
-			".dshAr_toggle{display:flex;gap:5px;align-items:center;color:var(--dsw-alias-label-primary);font-size:12px;line-height:18px}",
 			".dshAr_efforts{display:grid;grid-template-columns:repeat(auto-fit,minmax(160px,1fr));gap:6px;margin-top:10px}",
-			".dshAr_effort{display:flex;gap:6px;align-items:center;color:var(--dsw-alias-label-primary);font-size:12px;line-height:18px}",
-			".dshAr_effortLevel{min-width:38px;color:var(--dsw-alias-label-secondary)}",
-			".dshAr_effortWire{flex:1 1 60px}",
+			".dshAr_effort{display:flex;gap:6px;align-items:center;min-width:0}",
+			".dshAr_effortLevel{min-width:76px}",
+			".dshAr_effortWire{flex:1 1 60px;min-width:0}",
 			".dshAr_modelActions{display:flex;justify-content:flex-end;margin-top:10px}",
+			"@media (prefers-reduced-motion: reduce){.dshAr_choice{transition:none}}",
 		].join("");
 		const CSS_TAG_ID = "dsh-llm-agentrouter/EndpointCard.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(CSS_TAG_ID) + "]") === null) {
@@ -108,6 +105,7 @@ window.__ModuleLoader__.load({
 			modalityText: "文本",
 			modalityImage: "图片",
 			wireNone: "留空 = 不发送",
+			wireLabel: "「%s」档位发送给中转站的取值",
 			levelOff: "off",
 			levelMinimal: "minimal",
 			levelLow: "low",
@@ -164,6 +162,7 @@ window.__ModuleLoader__.load({
 			modalityText: "Text",
 			modalityImage: "Image",
 			wireNone: "empty = send nothing",
+			wireLabel: "Wire value sent for the %s level",
 			levelOff: "off",
 			levelMinimal: "minimal",
 			levelLow: "low",
@@ -560,8 +559,7 @@ window.__ModuleLoader__.load({
 					className: "dshAr_field",
 					children: [
 						jsx.jsx("span", { className: "dshAr_fieldLabel", children: t(label) }),
-						jsx.jsx("input", {
-							className: "dshAr_input",
+						jsx.jsx(Input, {
 							type: "text",
 							value: row[name],
 							disabled: readOnly,
@@ -605,25 +603,21 @@ window.__ModuleLoader__.load({
 									className: "dshAr_inputs",
 									children: [
 										jsx.jsx("span", { className: "dshAr_fieldLabel", children: t("fieldInput") }),
-										...MODALITIES.map((modality) => jsx.jsxs(
-											"label",
+										...MODALITIES.map((modality) => jsx.jsx(
+											"span",
 											{
-												className: "dshAr_toggle",
-												children: [
-													jsx.jsx("input", {
-														type: "checkbox",
-														checked: row.input.includes(modality),
-														disabled: readOnly,
-														"data-model": String(index),
-														"data-modality": modality,
-														onChange: () => onPatch(index, {
-															input: row.input.includes(modality)
-																? row.input.filter((entry) => entry !== modality)
-																: [...row.input, modality],
-														}),
+												"data-modality": modality,
+												"data-model": String(index),
+												children: jsx.jsx(Checkbox, {
+													checked: row.input.includes(modality),
+													disabled: readOnly,
+													label: t(MODALITY_LABELS[modality]),
+													onChange: (next) => onPatch(index, {
+														input: next
+															? [...row.input, modality]
+															: row.input.filter((entry) => entry !== modality),
 													}),
-													jsx.jsx("span", { children: t(MODALITY_LABELS[modality]) }),
-												],
+												}),
 											},
 											modality,
 										)),
@@ -635,30 +629,28 @@ window.__ModuleLoader__.load({
 									children: EFFORT_LEVELS.map((level) => {
 										const entry = row.efforts.find((candidate) => candidate.level === level)
 											?? { level, on: false, wire: "" };
+										const levelKey = "level" + level.charAt(0).toUpperCase() + level.slice(1);
 										return jsx.jsxs(
-											"label",
+											"div",
 											{
 												className: "dshAr_effort",
 												"data-level": level,
+												"data-model": String(index),
 												children: [
-													jsx.jsx("input", {
-														type: "checkbox",
+													jsx.jsx(Checkbox, {
 														checked: entry.on,
 														disabled: readOnly,
-														"data-model": String(index),
-														"data-effort": level,
-														onChange: () => onEffort(index, level, { on: !entry.on }),
-													}),
-													jsx.jsx("span", {
 														className: "dshAr_effortLevel",
-														children: t("level" + level.charAt(0).toUpperCase() + level.slice(1)),
+														label: t(levelKey),
+														onChange: (next) => onEffort(index, level, { on: next }),
 													}),
-													jsx.jsx("input", {
-														className: "dshAr_input dshAr_effortWire",
+													jsx.jsx(Input, {
+														className: "dshAr_effortWire",
 														type: "text",
 														value: entry.wire,
 														placeholder: level === "off" ? t("wireNone") : level,
 														disabled: readOnly || !entry.on,
+														"aria-label": fill(t("wireLabel"), [t(levelKey)]),
 														"data-model": String(index),
 														"data-wire": level,
 														onChange: (event) => onEffort(index, level, { wire: event.target.value }),
@@ -671,9 +663,9 @@ window.__ModuleLoader__.load({
 								}),
 								jsx.jsx("div", {
 									className: "dshAr_modelActions",
-									children: jsx.jsx("button", {
-										type: "button",
-										className: "dshAr_button",
+									children: jsx.jsx(Button, {
+										variant: "ghost",
+										size: "sm",
 										"data-action": "remove",
 										disabled: readOnly,
 										onClick: () => onRemove(index),
@@ -869,9 +861,9 @@ window.__ModuleLoader__.load({
 			const shown = status === null
 				? { kind: "info", text: "" }
 				: { kind: status.kind, text: fill(t(status.key), status.values) };
-			const action = (name, label, disabled, onClick) => jsx.jsx("button", {
-				type: "button",
-				className: "dshAr_button",
+			const action = (name, label, disabled, onClick) => jsx.jsx(Button, {
+				variant: name === "save" ? "primary" : "outline",
+				size: "sm",
 				"data-action": name,
 				disabled,
 				onClick,
@@ -985,13 +977,11 @@ window.__ModuleLoader__.load({
 			position: "relative",
 			padding: "7px 1px 11px",
 			cursor: "pointer",
-			font: "inherit",
-			fontSize: "13px",
-			lineHeight: "20px",
-			color: "var(--dsw-alias-label-tertiary, inherit)",
+			font: "var(--dsw-font-xs-13)",
+			color: "var(--dsw-alias-label-tertiary)",
 		};
 		const TAB_ACTIVE_STYLE = Object.assign({}, TAB_STYLE, {
-			color: "var(--dsw-alias-label-primary, inherit)",
+			color: "var(--dsw-alias-label-primary)",
 		});
 		/** The kernel's own tab marker: a 2px rounded bar under the active label. */
 		const TAB_MARKER_STYLE = {
@@ -1001,7 +991,7 @@ window.__ModuleLoader__.load({
 			bottom: 0,
 			height: "2px",
 			borderRadius: "2px 2px 0 0",
-			background: "var(--dsw-alias-label-primary, currentColor)",
+			background: "var(--dsw-alias-label-primary)",
 		};
 		/**
 		 * Panels stay mounted (hidden) so each card keeps its local state. `display:

package/lib/index.js

@@ -293,7 +293,7 @@ function apply(ctx, config) {
   if (config.announce) {
     const table = routingTable(config)
     ctx.logger.info(
-      'llm-agentrouter: endpoint %c (%c), sending %c',
+      'llm-agentrouter: endpoint %s (%s), sending %s',
       config.endpoint,
       table.get(config.sentinel.trim().toLowerCase()) ?? 'unrouted',
       config.userAgent,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lynn123411/dsh-llm-agentrouter",
-  "version": "0.3.0",
-  "description": "AgentRouter 中转聚合：一条 pi-ai 路由承载多模型（设置卡片内可从中转站拉取、逐个编辑模型与参数）+ 国内/国际端点一键切换 + 出站请求 User-Agent/402-配额改写围栏。aqiu817/dsh-llm-agentrouter 分叉，适配 0.1.2-alpha.5 起新 settings/slots API，已在 0.1.5-rc.1 逐项实证兼容。",
+  "version": "0.3.1",
+  "description": "AgentRouter 中转聚合：一条 pi-ai 路由承载多模型（设置卡片内可从中转站拉取、逐个编辑模型与参数）+ 国内/国际端点一键切换 + 出站请求 User-Agent/402-配额改写围栏。模型列表写入内核「设置 - 模型」页所编辑的同一份 llm-pi-ai 路由数据。",
   "keywords": [
     "deepseek-harness",
     "dsh-plugin",
@@ -33,6 +33,7 @@
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-primitives",
         "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
@@ -41,7 +42,6 @@
   "files": [
     "lib/",
     "cordis.patch.yml",
-    "LICENSE",
     "README.md"
   ],
   "publishConfig": {
@@ -51,7 +51,8 @@
     "test": "node --test test/*.test.mjs"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=22",
+    "dsh": "0.1.6-alpha.2"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.2"

package/LICENSE

@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2026 aqiu817
-Copyright (c) 2026 lynn123411 (alpha.5 compatibility fork: settings/slots API migration, package rename)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.