@dsh-plus/llm-pi 0.1.28 → 0.1.30

package/lib/client.js

@@ -72,6 +72,35 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region ../shared/src/client/config-slots.ts
+		/** dsh-plus 聚合 bundle 的包名（各插件 row 均经其补丁层插入 profile）。 */
+		const DSH_PLUS_BUNDLE = "@dsh-plus/bundle-main";
+		/**
+		* 把一张配置卡片同时注册进 legacy 与新版三个槽位。
+		* 任一槽位在当前 dsh 版本未声明时对应 inject 挂起等待，版本不命中即 no-op。
+		*/
+		function injectPluginConfigCard(slots, reg) {
+			const base = {
+				locale: reg.ns,
+				inject: reg.inject
+			};
+			slots.inject("settings.plugin.item", () => slots.register({
+				name: "settings.plugin.item",
+				key: reg.ns,
+				...base
+			}, reg.component));
+			slots.inject("plugins.row.config", () => slots.register({
+				name: "plugins.row.config",
+				key: `${DSH_PLUS_BUNDLE}#${reg.rowId}`,
+				...base
+			}, reg.component));
+			slots.inject("plugins.bundle.config", () => slots.register({
+				name: "plugins.bundle.config",
+				key: reg.pkg,
+				...base
+			}, reg.component));
+		}
+		//#endregion
 		//#region ../shared/src/client/fields.tsx
 		function TextField$1(props) {
 			const p = props.prefix ?? "dshp";
@@ -371,10 +400,10 @@ ${extra}
 		/**
 		* settings 命名空间字面量（纯常量，零依赖，浏览器半可安全引入）。
 		* 服务端直接以字面量注册（0.1.2-alpha.2 起 dsh-settings 对命名空间做编译期
-		* 语法校验，见 config.ts），浏览器半将其作为 settings.plugin.item keyed 槽位的
-		* key —— 同一字面量两处共用，防止漂移。
-		* 契约：该槽位按「卡片编辑的 settings 命名空间」作 key 分发，
-		* 官方配置页只渲染 key 命中 Host 已注册命名空间的卡片。
+		* 语法校验，见 config.ts）；浏览器半把它作为配置卡片的注册键
+		* （legacy settings.plugin.item keyed 槽位按「卡片编辑的 settings 命名空间」
+		* 分发；0.1.6-alpha.2 起改挂插件页 row/bundle config，见 shared/config-slots），
+		* 同一字面量两处共用，防止漂移。
 		* @module llm-pi/ns
 		*/
 		const SETTINGS_NS = "dsh-plus-llm-pi";
@@ -1725,7 +1754,9 @@ ${extra}
 		//#endregion
 		//#region src/client/card.tsx
 		/**
-		* 「LLM 路由」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
+		* 「LLM 路由」配置卡片：经 injectPluginConfigCard 注册（legacy settings.plugin.item
+		* 与 0.1.6-alpha.2 插件页 plugins.row.config / plugins.bundle.config，view 分发
+		* summary/page）。
 		* 顶部：enabled / catalogUrl / catalogRefreshHours / 只读状态行（kitSource、
 		* modelsDevStatus，来自模型目录端点）+ 保存（settings.update 全量深合并）与
 		* 错误/成功提示；下方为 providers 路由列表（新增/删除/字段编辑/compat/模型
@@ -1742,7 +1773,7 @@ ${extra}
 			const { t, scope, api } = props;
 			const snapshot = (0, react.useSyncExternalStore)((listener) => scope.subscribe(listener), () => scope.getSnapshot());
 			const value = snapshot.value;
-			const [open, setOpen] = (0, react.useState)(false);
+			const [open, setOpen] = (0, react.useState)(props.view === "page");
 			const [draft, setDraft] = (0, react.useState)(null);
 			const [epoch, setEpoch] = (0, react.useState)(0);
 			const [kitSource, setKitSource] = (0, react.useState)(null);
@@ -1771,6 +1802,7 @@ ${extra}
 				if (draft === null) return false;
 				return !numTextOk(draft.catalogRefreshHours) || Object.values(draft.providers).some((provider) => provider.models.some((model) => model.id.trim() === ""));
 			}, [draft]);
+			if (props.view === "summary") return t("summaryLine");
 			if (value === void 0 || draft === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", {
 				className: "lpc-card",
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -1990,6 +2022,7 @@ ${extra}
 		const ownZh = {
 			title: "LLM 路由（llm-pi）",
 			description: "自定义 LLM 路由：协议、compat、模型目录与 models.dev 目录兜底。",
+			summaryLine: "自定义 LLM 路由：协议、compat、模型目录与 models.dev 目录兜底。",
 			enabled: "启用插件",
 			catalogUrl: "models.dev 目录数据端点",
 			catalogUrlHint: "快照数据源；一般无需修改。",
@@ -2071,6 +2104,7 @@ ${extra}
 		const ownEn = {
 			title: "LLM routes (llm-pi)",
 			description: "Custom LLM routes: protocol, compat, model catalog and models.dev fallback.",
+			summaryLine: "Custom LLM routes: protocol, compat, model catalog and models.dev fallback.",
 			enabled: "Enable plugin",
 			catalogUrl: "models.dev catalog endpoint",
 			catalogUrlHint: "Snapshot data source; usually no change needed.",
@@ -2237,16 +2271,17 @@ ${extra}
 			}), "llm-pi: locale");
 			const scope = createSettingsScope(c, SETTINGS_NS, "llm-pi: settings scope");
 			const api = createNamespaceApi(c.get("remote").settings, SETTINGS_NS);
-			c.slots.inject("settings.plugin.item", () => c.slots.register({
-				name: "settings.plugin.item",
-				key: SETTINGS_NS,
-				locale: NS,
+			injectPluginConfigCard(c.slots, {
+				ns: SETTINGS_NS,
+				rowId: "dsh-plus-llm-pi",
+				pkg: "@dsh-plus/llm-pi",
+				component: LlmPiCard,
 				inject: () => ({
 					t: c.locale.bind(NS),
 					scope,
 					api
 				})
-			}, LlmPiCard));
+			});
 		}
 		//#endregion
 		exports.apply = apply;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/llm-pi",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "dsh-plus service+ui plugin: 基于 PiAiAdapter 的自定义 LLM 路由（全量 compat、模型继承、models.dev 目录兜底）",
   "type": "module",
   "main": "lib/index.js",
@@ -32,40 +32,40 @@
   },
   "dependencies": {
     "https-proxy-agent": "^9.1.0",
-    "@dsh-plus/shared": "0.1.17"
+    "@dsh-plus/shared": "0.1.19"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-anonymous-user-id": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-credentials": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-home-paths": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-launch-environment": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm-deepseek": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm-pi-ai": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-util-values": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-anonymous-user-id": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-credentials": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-launch-environment": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm-deepseek": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-util-values": "^0.1.6-alpha.2",
     "@deepseek-ai/schemastery": "^3.18.2",
     "@earendil-works/pi-ai": "^0.85.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-anonymous-user-id": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-atomic-write": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-attachment": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-credentials": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-home-paths": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-launch-environment": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm-deepseek": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-timeout": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-util-crypto": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-util-values": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-anonymous-user-id": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-atomic-write": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-attachment": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-credentials": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-launch-environment": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm-deepseek": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-timeout": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-util-crypto": "0.1.6-alpha.2",
+    "@deepseek-ai/dsh-util-values": "0.1.6-alpha.2",
     "@deepseek-ai/schemastery": "3.18.2",
     "@earendil-works/pi-ai": "0.85.1",
     "@types/react": "~18.3.31",

package/src/client/card.tsx

@@ -1,5 +1,7 @@
 /**
- * 「LLM 路由」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
+ * 「LLM 路由」配置卡片：经 injectPluginConfigCard 注册（legacy settings.plugin.item
+ * 与 0.1.6-alpha.2 插件页 plugins.row.config / plugins.bundle.config，view 分发
+ * summary/page）。
  * 顶部：enabled / catalogUrl / catalogRefreshHours / 只读状态行（kitSource、
  * modelsDevStatus，来自模型目录端点）+ 保存（settings.update 全量深合并）与
  * 错误/成功提示；下方为 providers 路由列表（新增/删除/字段编辑/compat/模型
@@ -13,6 +15,7 @@ import {
   CheckRow,
   IDLE_STATUS,
   type NamespaceSettingsApi,
+  type PluginConfigViewProps,
   type Scope,
   TextField,
 } from '@dsh-plus/shared/client'
@@ -30,7 +33,7 @@ import {
 import type { Translate } from './i18n.ts'
 import { ProvidersSection } from './views/providers.tsx'
 
-export interface CardProps {
+export interface CardProps extends PluginConfigViewProps {
   t: Translate
   scope: Scope
   api: NamespaceSettingsApi
@@ -43,14 +46,15 @@ function modelsDevText(status: WireModelsDevStatus | null, t: Translate): string
   return `${t('modelsDevStatusLine')}：${status.providers} 个 provider，快照 ${status.fetchedAt}`
 }
 
-export function LlmPiCard(props: CardProps): ReactElement | null {
+export function LlmPiCard(props: CardProps): ReactElement | string | null {
   const { t, scope, api } = props
   const snapshot = useSyncExternalStore(
     (listener: () => void) => scope.subscribe(listener),
     () => scope.getSnapshot(),
   )
   const value = snapshot.value as ConfigValue | undefined
-  const [open, setOpen] = useState(false)
+  // 0.1.6-alpha.2 插件页 page 视图为表单落地页，默认展开；旧槽位无 view，保持折叠。
+  const [open, setOpen] = useState(props.view === 'page')
   const [draft, setDraft] = useState<Draft | null>(null)
   const [epoch, setEpoch] = useState(0)
   const [kitSource, setKitSource] = useState<string | null>(null)
@@ -99,6 +103,9 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
     )
   }, [draft])
 
+  // 插件页 summary 视图只出一行简介（hooks 已全部落定，可安全提前返回）。
+  if (props.view === 'summary') return t('summaryLine')
+
   if (value === undefined || draft === null) {
     return (
       <li className="lpc-card">

package/src/client/client.ts

@@ -1,23 +1,24 @@
 /**
- * 浏览器半入口：注册 locale 字典 + 向 settings.plugin.item 插槽注册「LLM 路由」卡片。
+ * 浏览器半入口：注册 locale 字典 + 注册「LLM 路由」卡片
+ * （injectPluginConfigCard 三槽位：legacy settings.plugin.item 与 0.1.6-alpha.2
+ * 独立插件页的 plugins.row.config / plugins.bundle.config）。
  * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
  *
  * 类型说明：浏览器半只用到 slots/locale/remote 的很窄一面，
  * scope 与基础控件走 @dsh-plus/shared/client 套件（收编自本插件原实现）。
- * 该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
- * （即服务端注册的同一字面量，见 ../ns.ts），
- * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
  * 配置读写经 ctx.remote.settings 直连（0.1.2-alpha.1 起 connection.api.settings
  * 已移除；不复用 settingsScope 服务——非 loopback 页面下它固定 memory 模式无数据，
  * 见 @dsh-plus/shared/client scope.ts）；自定义端点仅剩「模型目录」
  * （api.ts，含 kitSource/models-dev 运行期诊断）。
+ * 卡片 key/rowId 约定见 @dsh-plus/shared/client/config-slots。
  * @module @dsh-plus/llm-pi/client
  */
 import type { Context } from '@deepseek-ai/cordis'
 import {
   createNamespaceApi,
   createSettingsScope,
+  injectPluginConfigCard,
   type PluginClientContext,
 } from '@dsh-plus/shared/client'
 import { SETTINGS_NS } from '../ns.ts'
@@ -45,15 +46,11 @@ export function apply(ctx: Context): void {
   c.effect(() => c.locale.register(NS, { zh, en }), 'llm-pi: locale')
   const scope = createSettingsScope(c, SETTINGS_NS, 'llm-pi: settings scope')
   const api = createNamespaceApi(c.get('remote').settings, SETTINGS_NS)
-  c.slots.inject('settings.plugin.item', () =>
-    c.slots.register(
-      {
-        name: 'settings.plugin.item',
-        key: SETTINGS_NS,
-        locale: NS,
-        inject: () => ({ t: c.locale.bind(NS), scope, api }),
-      },
-      LlmPiCard,
-    ),
-  )
+  injectPluginConfigCard(c.slots, {
+    ns: SETTINGS_NS,
+    rowId: 'dsh-plus-llm-pi',
+    pkg: '@dsh-plus/llm-pi',
+    component: LlmPiCard,
+    inject: () => ({ t: c.locale.bind(NS), scope, api }),
+  })
 }

package/src/client/i18n.ts

@@ -10,6 +10,7 @@ export const NS = 'dsh-plus-llm-pi'
 const ownZh = {
   title: 'LLM 路由（llm-pi）',
   description: '自定义 LLM 路由：协议、compat、模型目录与 models.dev 目录兜底。',
+  summaryLine: '自定义 LLM 路由：协议、compat、模型目录与 models.dev 目录兜底。',
   enabled: '启用插件',
   catalogUrl: 'models.dev 目录数据端点',
   catalogUrlHint: '快照数据源；一般无需修改。',
@@ -92,6 +93,7 @@ const ownZh = {
 const ownEn = {
   title: 'LLM routes (llm-pi)',
   description: 'Custom LLM routes: protocol, compat, model catalog and models.dev fallback.',
+  summaryLine: 'Custom LLM routes: protocol, compat, model catalog and models.dev fallback.',
   enabled: 'Enable plugin',
   catalogUrl: 'models.dev catalog endpoint',
   catalogUrlHint: 'Snapshot data source; usually no change needed.',

package/src/ns.ts

@@ -1,10 +1,10 @@
 /**
  * settings 命名空间字面量（纯常量，零依赖，浏览器半可安全引入）。
  * 服务端直接以字面量注册（0.1.2-alpha.2 起 dsh-settings 对命名空间做编译期
- * 语法校验，见 config.ts），浏览器半将其作为 settings.plugin.item keyed 槽位的
- * key —— 同一字面量两处共用，防止漂移。
- * 契约：该槽位按「卡片编辑的 settings 命名空间」作 key 分发，
- * 官方配置页只渲染 key 命中 Host 已注册命名空间的卡片。
+ * 语法校验，见 config.ts）；浏览器半把它作为配置卡片的注册键
+ * （legacy settings.plugin.item keyed 槽位按「卡片编辑的 settings 命名空间」
+ * 分发；0.1.6-alpha.2 起改挂插件页 row/bundle config，见 shared/config-slots），
+ * 同一字面量两处共用，防止漂移。
  * @module llm-pi/ns
  */
 export const SETTINGS_NS = 'dsh-plus-llm-pi'