@dsh-plus/subagent-model 0.1.7 → 0.1.8

package/lib/client.js

@@ -28,6 +28,42 @@ window.__ModuleLoader__.load({
 			return parse(await fetch(ROUTE_CATALOG, { credentials: "same-origin" }));
 		}
 		//#endregion
+		//#region src/client/draft.ts
+		const EMPTY_ROW = {
+			enabled: false,
+			provider: "",
+			model: "",
+			reasoningEffort: "inherit"
+		};
+		/** 行集 = 目录 subagentProviders ∪ 已配置条目；目录行缺省为空行。 */
+		function draftFrom(value, catalog) {
+			const rows = {};
+			const names = /* @__PURE__ */ new Set();
+			for (const name of catalog?.subagentProviders ?? []) names.add(name);
+			for (const name of Object.keys(value.entries).sort()) names.add(name);
+			for (const name of names) {
+				const entry = value.entries[name];
+				rows[name] = entry === void 0 ? { ...EMPTY_ROW } : {
+					enabled: entry.enabled,
+					provider: entry.provider,
+					model: entry.model,
+					reasoningEffort: entry.reasoningEffort
+				};
+			}
+			return {
+				enabled: value.enabled,
+				rows
+			};
+		}
+		function toPatch(draft) {
+			const entries = {};
+			for (const name of Object.keys(draft.rows).sort()) entries[name] = draft.rows[name];
+			return {
+				enabled: draft.enabled,
+				entries
+			};
+		}
+		//#endregion
 		//#region src/client/fields.tsx
 		function CheckRow(props) {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -91,39 +127,8 @@ window.__ModuleLoader__.load({
 			kind: "idle",
 			text: ""
 		};
-		const EMPTY_ROW = {
-			enabled: false,
-			provider: "",
-			model: "",
-			reasoningEffort: "inherit"
-		};
 		const EFFORT_INHERIT = "inherit";
 		const EFFORT_DEFAULT = "default";
-		function draftFrom(value, catalog) {
-			const rows = {};
-			const names = /* @__PURE__ */ new Set();
-			for (const name of catalog?.subagentProviders ?? []) names.add(name);
-			for (const name of Object.keys(value.entries).sort()) names.add(name);
-			for (const name of names) {
-				const entry = value.entries[name];
-				rows[name] = entry === void 0 ? { ...EMPTY_ROW } : {
-					enabled: entry.enabled,
-					provider: entry.provider,
-					model: entry.model,
-					reasoningEffort: entry.reasoningEffort
-				};
-			}
-			return {
-				enabled: value.enabled,
-				rows
-			};
-		}
-		function toPatch(draft) {
-			return {
-				enabled: draft.enabled,
-				entries: draft.rows
-			};
-		}
 		function unknownOption(value, label) {
 			return {
 				value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/subagent-model",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "dsh-plus service+ui plugin: 为 subagent/subagent_fork 等子代理按提供商配置模型与思考程度（或继承主代理）",
   "type": "module",
   "main": "lib/index.js",

package/src/client/card.tsx

@@ -11,6 +11,14 @@ import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore }
 
 import { SETTINGS_NS } from '../ns.ts'
 import { type CatalogProvider, fetchCatalog, type ModelCatalog } from './api.ts'
+import {
+  type ConfigValue,
+  type Draft,
+  type DraftRow,
+  draftFrom,
+  EMPTY_ROW,
+  toPatch,
+} from './draft.ts'
 import { CheckRow, SelectField, type SelectOption } from './fields.tsx'
 import type { Scope, SettingsApi } from './scope.ts'
 
@@ -20,70 +28,15 @@ export interface CardProps {
   api: SettingsApi
 }
 
-/** settings 命名空间的解析值（无 secret 字段）。 */
-export interface ConfigValue {
-  enabled: boolean
-  entries: Record<string, WireEntry>
-}
-
-export interface WireEntry {
-  enabled: boolean
-  provider: string
-  model: string
-  reasoningEffort: string
-}
-
-interface DraftRow {
-  enabled: boolean
-  provider: string
-  model: string
-  reasoningEffort: string
-}
-
-interface Draft {
-  enabled: boolean
-  rows: Record<string, DraftRow>
-}
-
 interface Status {
   kind: 'idle' | 'ok' | 'error'
   text: string
 }
 
 const IDLE_STATUS: Status = { kind: 'idle', text: '' }
-const EMPTY_ROW: DraftRow = {
-  enabled: false,
-  provider: '',
-  model: '',
-  reasoningEffort: 'inherit',
-}
 const EFFORT_INHERIT = 'inherit'
 const EFFORT_DEFAULT = 'default'
 
-function draftFrom(value: ConfigValue, catalog: ModelCatalog | null): Draft {
-  const rows: Record<string, DraftRow> = {}
-  const names = new Set<string>()
-  for (const name of catalog?.subagentProviders ?? []) names.add(name)
-  for (const name of Object.keys(value.entries).sort()) names.add(name)
-  for (const name of names) {
-    const entry = value.entries[name]
-    rows[name] =
-      entry === undefined
-        ? { ...EMPTY_ROW }
-        : {
-            enabled: entry.enabled,
-            provider: entry.provider,
-            model: entry.model,
-            reasoningEffort: entry.reasoningEffort,
-          }
-  }
-  return { enabled: value.enabled, rows }
-}
-
-function toPatch(draft: Draft): Record<string, unknown> {
-  return { enabled: draft.enabled, entries: draft.rows }
-}
-
 function unknownOption(value: string, label: string): SelectOption {
   return { value, label: `${value}（${label}）` }
 }

package/src/client/client.ts

@@ -20,7 +20,7 @@ import type { Context } from '@deepseek-ai/cordis'
 import { SETTINGS_NS } from '../ns.ts'
 import { SubagentModelCard } from './card.tsx'
 import { en, NS, zh } from './i18n.ts'
-import type { Scope, SettingsApi } from './scope.ts'
+import type { Scope, ScopeSnapshot, SettingsApi } from './scope.ts'
 import { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-subagent-model'

package/src/client/draft.ts

@@ -0,0 +1,69 @@
+/**
+ * 配置卡片的可编辑草稿模型：ConfigValue ↔ Draft 转换与提交补丁（纯函数，
+ * 与渲染分离以便单测）。行集合 = 目录返回的已注册子代理 provider ∪ 已配置条目；
+ * 未配置的新 provider 行以默认空值落盘（自文档化）。
+ * @module subagent-model/client/draft
+ */
+import type { ModelCatalog } from './api.ts'
+
+/** settings 命名空间的解析值（无 secret 字段）。 */
+export interface ConfigValue {
+  enabled: boolean
+  entries: Record<string, WireEntry>
+}
+
+export interface WireEntry {
+  enabled: boolean
+  provider: string
+  model: string
+  reasoningEffort: string
+}
+
+export interface DraftRow {
+  enabled: boolean
+  provider: string
+  model: string
+  reasoningEffort: string
+}
+
+export interface Draft {
+  enabled: boolean
+  rows: Record<string, DraftRow>
+}
+
+export const EMPTY_ROW: DraftRow = {
+  enabled: false,
+  provider: '',
+  model: '',
+  reasoningEffort: 'inherit',
+}
+
+/** 行集 = 目录 subagentProviders ∪ 已配置条目；目录行缺省为空行。 */
+export function draftFrom(value: ConfigValue, catalog: ModelCatalog | null): Draft {
+  const rows: Record<string, DraftRow> = {}
+  const names = new Set<string>()
+  for (const name of catalog?.subagentProviders ?? []) names.add(name)
+  for (const name of Object.keys(value.entries).sort()) names.add(name)
+  for (const name of names) {
+    const entry = value.entries[name]
+    rows[name] =
+      entry === undefined
+        ? { ...EMPTY_ROW }
+        : {
+            enabled: entry.enabled,
+            provider: entry.provider,
+            model: entry.model,
+            reasoningEffort: entry.reasoningEffort,
+          }
+  }
+  return { enabled: value.enabled, rows }
+}
+
+export function toPatch(draft: Draft): Record<string, unknown> {
+  // entries 按键排序物化：dirty 比较走 JSON.stringify，而草稿的播种路径
+  // （先 entries 后补目录空行）与 draftFrom（先目录后 entries）键序不同，
+  // 不排序会出现「未改动却永久 dirty」的假阳性。
+  const entries: Record<string, DraftRow> = {}
+  for (const name of Object.keys(draft.rows).sort()) entries[name] = draft.rows[name]
+  return { enabled: draft.enabled, entries }
+}

package/src/client/scope.ts

@@ -35,8 +35,11 @@ export interface SettingsApi {
     result: {
       ok: boolean
       value?: {
+        writable: boolean
         namespaces: Array<{
           ns: string
+          value: unknown
+          revision: number
           secrets: Array<{ path: string[]; set: boolean }>
         }>
       }