@dsh-plus/subagent-model 0.1.1 → 0.1.2

package/lib/client.js

@@ -45,24 +45,12 @@ const SETTINGS_NS = "dsh-plus-subagent-model";
 
 //#endregion
 //#region src/client/api.ts
-const ROUTE_CONFIG = "/dsh-plus/subagent-model/config";
 const ROUTE_CATALOG = "/dsh-plus/subagent-model/catalog";
 async function parse(res) {
 	const body = await res.json();
 	if (!res.ok) throw new Error(body.error ?? `HTTP ${res.status}`);
 	return body;
 }
-async function fetchConfig() {
-	return parse(await fetch(ROUTE_CONFIG, { credentials: "same-origin" }));
-}
-async function saveConfig(patch) {
-	return parse(await fetch(ROUTE_CONFIG, {
-		method: "PUT",
-		credentials: "same-origin",
-		headers: { "content-type": "application/json" },
-		body: JSON.stringify(patch)
-	}));
-}
 async function fetchCatalog() {
 	return parse(await fetch(ROUTE_CATALOG, { credentials: "same-origin" }));
 }
@@ -131,11 +119,13 @@ const EMPTY_ROW = {
 };
 const EFFORT_INHERIT = "inherit";
 const EFFORT_DEFAULT = "default";
-function draftFromWire(wire) {
+function draftFrom(value, catalog) {
 	const rows = {};
-	const names = [...wire.subagentProviders, ...Object.keys(wire.entries).sort()];
+	const names = /* @__PURE__ */ new Set();
+	for (const name$1 of catalog?.subagentProviders ?? []) names.add(name$1);
+	for (const name$1 of Object.keys(value.entries).sort()) names.add(name$1);
 	for (const name$1 of names) {
-		const entry = wire.entries[name$1];
+		const entry = value.entries[name$1];
 		rows[name$1] = entry === void 0 ? { ...EMPTY_ROW } : {
 			enabled: entry.enabled,
 			provider: entry.provider,
@@ -144,7 +134,7 @@ function draftFromWire(wire) {
 		};
 	}
 	return {
-		enabled: wire.enabled,
+		enabled: value.enabled,
 		rows
 	};
 }
@@ -154,12 +144,6 @@ function toPatch(draft) {
 		entries: draft.rows
 	};
 }
-function rowNamesOf(wire, draft) {
-	const names = /* @__PURE__ */ new Set();
-	for (const name$1 of wire.subagentProviders) names.add(name$1);
-	for (const name$1 of Object.keys(draft.rows).sort()) names.add(name$1);
-	return [...names];
-}
 function unknownOption(value, label) {
 	return {
 		value,
@@ -275,28 +259,33 @@ function RowBlock(props) {
 	});
 }
 function SubagentModelCard(props) {
-	const { t } = props;
+	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 [wire, setWire] = (0, react.useState)(null);
 	const [draft, setDraft] = (0, react.useState)(null);
 	const [catalog, setCatalog] = (0, react.useState)(null);
 	const [catalogFailed, setCatalogFailed] = (0, react.useState)(false);
-	const [loadFailed, setLoadFailed] = (0, react.useState)(false);
 	const [saving, setSaving] = (0, react.useState)(false);
 	const [status, setStatus] = (0, react.useState)(IDLE_STATUS);
 	(0, react.useEffect)(() => {
-		let alive = true;
-		fetchConfig().then((loaded) => {
-			if (!alive) return;
-			setWire(loaded);
-			setDraft(draftFromWire(loaded));
-		}).catch(() => {
-			if (alive) setLoadFailed(true);
+		if (value === void 0) return;
+		setDraft((current) => {
+			if (current === null) return draftFrom(value, catalog);
+			if (catalog === null) return current;
+			const rows = { ...current.rows };
+			let changed = false;
+			for (const name$1 of catalog.subagentProviders) {
+				if (name$1 in rows) continue;
+				rows[name$1] = { ...EMPTY_ROW };
+				changed = true;
+			}
+			return changed ? {
+				...current,
+				rows
+			} : current;
 		});
-		return () => {
-			alive = false;
-		};
-	}, []);
+	}, [value, catalog]);
 	(0, react.useEffect)(() => {
 		if (!open || catalog !== null) return;
 		let alive = true;
@@ -311,20 +300,23 @@ function SubagentModelCard(props) {
 			alive = false;
 		};
 	}, [open, catalog]);
-	const dirty = (0, react.useMemo)(() => wire !== null && draft !== null && JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFromWire(wire))), [wire, draft]);
+	const dirty = (0, react.useMemo)(() => value !== void 0 && draft !== null && JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFrom(value, catalog))), [
+		value,
+		draft,
+		catalog
+	]);
 	const invalid = (0, react.useMemo)(() => draft !== null && Object.values(draft.rows).some((row) => row.model.length > 0 && row.provider.length === 0), [draft]);
-	if (loadFailed) return null;
-	if (wire === null || draft === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", {
+	if (value === void 0 || draft === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", {
 		className: "dsm-card",
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 			className: "dsm-empty",
 			children: t("loading")
 		})
 	});
-	const edit = (key, value) => {
+	const edit = (key, editValue) => {
 		setDraft({
 			...draft,
-			[key]: value
+			[key]: editValue
 		});
 		setStatus(IDLE_STATUS);
 	};
@@ -340,9 +332,16 @@ function SubagentModelCard(props) {
 	};
 	const onSave = () => {
 		setSaving(true);
-		saveConfig(toPatch(draft)).then((saved) => {
-			setWire(saved);
-			setDraft(draftFromWire(saved));
+		const revision = scope.getSnapshot().revision;
+		api.update({
+			ns: SETTINGS_NS,
+			patch: toPatch(draft),
+			...revision !== void 0 ? { expectedRevision: revision } : {}
+		}).then(async (response) => {
+			if (!response.result.ok) throw new Error(response.result.error?.message ?? t("saveFailed"));
+			await scope.load();
+			const next = scope.getSnapshot().value;
+			if (next !== void 0) setDraft(draftFrom(next, catalog));
 			setStatus(IDLE_STATUS);
 		}).catch((error) => {
 			setStatus({
@@ -355,8 +354,8 @@ function SubagentModelCard(props) {
 		setCatalog(null);
 		setCatalogFailed(false);
 	};
-	const disabled = !wire.writable;
-	const rowNames = rowNamesOf(wire, draft);
+	const disabled = !snapshot.writable;
+	const rowNames = Object.keys(draft.rows).sort();
 	const providerCount = (catalog?.providers ?? []).length;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
 		className: `dsm-card${open ? " dsm-cardOpen" : ""}`,
@@ -446,7 +445,7 @@ function SubagentModelCard(props) {
 							className: "dsm-btn dsm-btnGhost",
 							disabled: !dirty || saving,
 							onClick: () => {
-								setDraft(draftFromWire(wire));
+								setDraft(draftFrom(value, catalog));
 								setStatus(IDLE_STATUS);
 							},
 							children: t("discard")
@@ -609,7 +608,12 @@ function injectStyle() {
 //#region src/client/client.ts
 const name = "dsh-plus-subagent-model";
 /** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
-const inject = ["slots", "locale"];
+const inject = [
+	"slots",
+	"locale",
+	"settingsScope",
+	"connection"
+];
 function apply(ctx) {
 	const c = ctx;
 	const tag = injectStyle();
@@ -620,12 +624,17 @@ function apply(ctx) {
 		zh,
 		en
 	}), "subagent-model: locale");
+	const scope = c.settingsScope.bind({ namespace: SETTINGS_NS });
+	const api = c.get("connection").api.settings;
 	c.slots.inject("settings.plugin.item", () => c.slots.register({
 		name: "settings.plugin.item",
 		key: SETTINGS_NS,
-		order: 100,
 		locale: NS,
-		inject: () => ({ t: c.locale.bind(NS) })
+		inject: () => ({
+			t: c.locale.bind(NS),
+			scope,
+			api
+		})
 	}, SubagentModelCard));
 }
 

package/lib/index.js

@@ -79,28 +79,13 @@ function validateEntry(entry) {
 	if (effort.length === 0) return "reasoningEffort 不能为空（inherit / default / 档位 id）";
 	return null;
 }
-function toWire(cfg, subagentProviders, writable) {
-	const entries = {};
-	for (const [name$1, entry] of Object.entries(cfg.entries)) entries[name$1] = {
-		enabled: entry.enabled,
-		provider: entry.provider,
-		model: entry.model,
-		reasoningEffort: entry.reasoningEffort
-	};
-	return {
-		enabled: cfg.enabled,
-		entries,
-		subagentProviders: [...subagentProviders],
-		writable
-	};
-}
-const WirePatch = z.object({
-	enabled: z.boolean(),
-	entries: z.dict(EntrySchema)
-});
-/** 把卡片提交的 patch 规整为 settings.update 的用户层 patch（entries 整体替换）。 */
-function toUserPatch(input) {
-	return { ...input };
+/** 校验整组条目（settings 写入的 validate 钩子用）；返回首个错误消息，合法时返回 null。 */
+function validateEntries(entries) {
+	for (const [name$1, entry] of Object.entries(entries)) {
+		const error = validateEntry(entry);
+		if (error !== null) return `条目 ${name$1}: ${error}`;
+	}
+	return null;
 }
 
 //#endregion
@@ -172,76 +157,16 @@ function subagentProvidersOf(ctx) {
 
 //#endregion
 //#region src/config-api.ts
-const ROUTE_CONFIG = "/dsh-plus/subagent-model/config";
 const ROUTE_CATALOG = "/dsh-plus/subagent-model/catalog";
-const MAX_BODY_BYTES = 256 * 1024;
 function sendJson(res, status, body) {
 	res.writeHead(status, { "content-type": "application/json; charset=utf-8" });
 	res.end(JSON.stringify(body));
 }
-function readBody(req) {
-	return new Promise((resolve, reject) => {
-		const chunks = [];
-		let size = 0;
-		req.on("data", (chunk) => {
-			size += chunk.length;
-			if (size > MAX_BODY_BYTES) {
-				reject(/* @__PURE__ */ new Error("request body too large"));
-				req.destroy();
-				return;
-			}
-			chunks.push(chunk);
-		});
-		req.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
-		req.on("error", reject);
-	});
-}
-async function readPatch(req) {
-	const raw = await readBody(req);
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch {
-		throw new Error("request body is not valid JSON");
-	}
-	return WirePatch(parsed);
-}
-/** 校验用户提交的 entries（model 不能脱离 provider 等）；返回首个错误消息或 null。 */
-function firstEntryError(patch) {
-	for (const [name$1, entry] of Object.entries(patch.entries)) {
-		const error = validateEntry(entry);
-		if (error !== null) return `条目 ${name$1}: ${error}`;
-	}
-	return null;
-}
-async function handleConfig(ctx, service, req, res) {
-	const settings = ctx.get("settings");
-	if (req.method === "GET") {
-		sendJson(res, 200, toWire(service.currentConfig(), service.subagentProviders(), settings !== void 0));
-		return;
-	}
-	if (req.method !== "PUT") {
-		sendJson(res, 405, { error: "method not allowed" });
-		return;
-	}
-	if (settings === void 0) {
-		sendJson(res, 503, { error: "settings provider 不可用，无法在线保存；请编辑 settings.yaml" });
-		return;
-	}
-	const patch = await readPatch(req);
-	const entryError = firstEntryError(patch);
-	if (entryError !== null) {
-		sendJson(res, 400, { error: entryError });
-		return;
-	}
-	await settings.update(SETTINGS_NS, toUserPatch(patch));
-	sendJson(res, 200, toWire(service.currentConfig(), service.subagentProviders(), true));
-}
 async function handleCatalog(ctx, res) {
 	sendJson(res, 200, await buildModelCatalog(ctx));
 }
-/** 注册配置读写与目录路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
-function registerConfigApi(ctx, service) {
+/** 注册目录路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
+function registerCatalogApi(ctx) {
 	const logger = ctx.logger("subagent-model");
 	const guard = (handler) => {
 		return async (req, res) => {
@@ -249,17 +174,12 @@ function registerConfigApi(ctx, service) {
 				await handler(req, res);
 			} catch (error) {
 				const message = error instanceof Error ? error.message : String(error);
-				logger.warn(`config api ${req.method ?? "?"} ${req.url ?? "?"} failed: ${message}`);
+				logger.warn(`catalog api ${req.method ?? "?"} ${req.url ?? "?"} failed: ${message}`);
 				if (!res.headersSent) sendJson(res, 400, { error: message });
 				else res.end();
 			}
 		};
 	};
-	ctx.webServer.register({
-		kind: "exact",
-		path: ROUTE_CONFIG,
-		handler: guard((req, res) => handleConfig(ctx, service, req, res))
-	});
 	ctx.webServer.register({
 		kind: "exact",
 		path: ROUTE_CATALOG,
@@ -358,6 +278,10 @@ var SubagentModelService = class extends Service {
 		super(ctx, "subagentModel");
 		this.current = () => config;
 		installSettingsSection(ctx, SETTINGS_NS, Config, config, {
+			validate: (cfg) => {
+				const error = validateEntries(cfg.entries);
+				if (error !== null) throw new Error(`subagent-model: ${error}`);
+			},
 			setSource: (source) => {
 				this.current = source;
 			},
@@ -366,7 +290,7 @@ var SubagentModelService = class extends Service {
 		installDelegationHook(ctx, () => this.current());
 		installChildRoute(ctx);
 		ctx.inject(["webServer"], (webCtx) => {
-			registerConfigApi(webCtx, this);
+			registerCatalogApi(webCtx);
 		});
 	}
 	/** 当前生效配置（settings 用户层解析结果或 cordis 行级 config）。 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/subagent-model",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "dsh-plus service+ui plugin: 为 subagent/subagent_fork 等子代理按提供商配置模型与思考程度（或继承主代理）",
   "type": "module",
   "main": "lib/index.js",
@@ -24,7 +24,9 @@
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale"
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
     }

package/src/client/api.ts

@@ -1,28 +1,9 @@
 /**
- * 配置卡片数据通道：同源 fetch 调自建 webServer 路由。
- * （官方 settings.* RPC 白名单硬编码不含第三方 namespace，见 config-api.ts 注释。）
+ * 自定义端点通道：仅剩「模型目录」（配置读写已迁移到官方 settingsScope
+ * 传输，见 scope.ts 与 card.tsx）。
  * @module subagent-model/client/api
  */
 
-export interface WireEntry {
-  enabled: boolean
-  provider: string
-  model: string
-  reasoningEffort: string
-}
-
-export interface WireConfig {
-  enabled: boolean
-  entries: Record<string, WireEntry>
-  subagentProviders: string[]
-  writable: boolean
-}
-
-export interface WirePatch {
-  enabled: boolean
-  entries: Record<string, WireEntry>
-}
-
 export interface CatalogEffort {
   id: string
   name: string
@@ -51,7 +32,6 @@ export interface ModelCatalog {
   subagentProviders: string[]
 }
 
-const ROUTE_CONFIG = '/dsh-plus/subagent-model/config'
 const ROUTE_CATALOG = '/dsh-plus/subagent-model/catalog'
 
 async function parse<T>(res: Response): Promise<T> {
@@ -60,21 +40,6 @@ async function parse<T>(res: Response): Promise<T> {
   return body
 }
 
-export async function fetchConfig(): Promise<WireConfig> {
-  return parse<WireConfig>(await fetch(ROUTE_CONFIG, { credentials: 'same-origin' }))
-}
-
-export async function saveConfig(patch: WirePatch): Promise<WireConfig> {
-  return parse<WireConfig>(
-    await fetch(ROUTE_CONFIG, {
-      method: 'PUT',
-      credentials: 'same-origin',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(patch),
-    }),
-  )
-}
-
 export async function fetchCatalog(): Promise<ModelCatalog> {
   return parse<ModelCatalog>(await fetch(ROUTE_CATALOG, { credentials: 'same-origin' }))
 }

package/src/client/card.tsx

@@ -1,20 +1,38 @@
 /**
  * 「子代理模型配置」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
- * 交互对齐官方卡片：折叠/展开、staged draft、未保存标记、保存/放弃；
- * 数据走自建同源路由（api.ts）。行集合 = 已注册子代理 provider ∪ 已配置条目，
- * 保存时全量写回 entries（未配置的新 provider 行以默认空值落盘，自文档化）。
+ * 交互对齐官方卡片：折叠/展开、staged draft、未保存标记、保存/放弃。
+ * 配置读写走官方 settingsScope 传输（scope.ts）：value 为 schema 解析后的
+ * 命名空间值（enabled + entries），行集合 = 目录返回的已注册子代理 provider
+ * ∪ 已配置条目，保存时全量写回 entries（未配置的新 provider 行以默认空值
+ * 落盘，自文档化）；「模型目录」为唯一保留的自定义端点。
  * @module subagent-model/client/card
  */
-import { useEffect, useMemo, useState, type ReactElement } from 'react'
+import { useEffect, useMemo, useSyncExternalStore, useState, type ReactElement } from 'react'
 
+import { SETTINGS_NS } from '../ns.ts'
 import {
-  fetchCatalog, fetchConfig, saveConfig,
-  type CatalogProvider, type ModelCatalog, type WireConfig, type WireEntry, type WirePatch,
+  fetchCatalog, type CatalogProvider, type ModelCatalog,
 } from './api.ts'
 import { CheckRow, SelectField, type SelectOption } from './fields.tsx'
+import type { Scope, SettingsApi } from './scope.ts'
 
 export interface CardProps {
   t(key: string): string
+  scope: Scope
+  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 {
@@ -39,11 +57,13 @@ const EMPTY_ROW: DraftRow = { enabled: false, provider: '', model: '', reasoning
 const EFFORT_INHERIT = 'inherit'
 const EFFORT_DEFAULT = 'default'
 
-function draftFromWire(wire: WireConfig): Draft {
+function draftFrom(value: ConfigValue, catalog: ModelCatalog | null): Draft {
   const rows: Record<string, DraftRow> = {}
-  const names = [...wire.subagentProviders, ...Object.keys(wire.entries).sort()]
+  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 = wire.entries[name]
+    const entry = value.entries[name]
     rows[name] = entry === undefined
       ? { ...EMPTY_ROW }
       : {
@@ -53,20 +73,13 @@ function draftFromWire(wire: WireConfig): Draft {
           reasoningEffort: entry.reasoningEffort,
         }
   }
-  return { enabled: wire.enabled, rows }
+  return { enabled: value.enabled, rows }
 }
 
-function toPatch(draft: Draft): WirePatch {
+function toPatch(draft: Draft): Record<string, unknown> {
   return { enabled: draft.enabled, entries: draft.rows }
 }
 
-function rowNamesOf(wire: WireConfig, draft: Draft): string[] {
-  const names = new Set<string>()
-  for (const name of wire.subagentProviders) names.add(name)
-  for (const name of Object.keys(draft.rows).sort()) names.add(name)
-  return [...names]
-}
-
 function unknownOption(value: string, label: string): SelectOption {
   return { value, label: `${value}（${label}）` }
 }
@@ -139,31 +152,36 @@ function RowBlock(props: RowBlockProps): ReactElement {
 }
 
 export function SubagentModelCard(props: CardProps): ReactElement | null {
-  const { t } = props
+  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)
-  const [wire, setWire] = useState<WireConfig | null>(null)
   const [draft, setDraft] = useState<Draft | null>(null)
   const [catalog, setCatalog] = useState<ModelCatalog | null>(null)
   const [catalogFailed, setCatalogFailed] = useState(false)
-  const [loadFailed, setLoadFailed] = useState(false)
   const [saving, setSaving] = useState(false)
   const [status, setStatus] = useState<Status>(IDLE_STATUS)
 
+  // 播种草稿（行集 = 已配置条目）；catalog 到达后只补缺失的 provider 空行，
+  // 不覆盖在途编辑；后续 Host 更新同样不覆盖。
   useEffect(() => {
-    let alive = true
-    fetchConfig()
-      .then((loaded) => {
-        if (!alive) return
-        setWire(loaded)
-        setDraft(draftFromWire(loaded))
-      })
-      .catch(() => {
-        if (alive) setLoadFailed(true)
-      })
-    return () => {
-      alive = false
-    }
-  }, [])
+    if (value === undefined) return
+    setDraft((current) => {
+      if (current === null) return draftFrom(value, catalog)
+      if (catalog === null) return current
+      const rows = { ...current.rows }
+      let changed = false
+      for (const name of catalog.subagentProviders) {
+        if (name in rows) continue
+        rows[name] = { ...EMPTY_ROW }
+        changed = true
+      }
+      return changed ? { ...current, rows } : current
+    })
+  }, [value, catalog])
 
   useEffect(() => {
     if (!open || catalog !== null) return
@@ -183,9 +201,10 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
   }, [open, catalog])
 
   const dirty = useMemo(
-    () => wire !== null && draft !== null &&
-      JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFromWire(wire))),
-    [wire, draft],
+    () =>
+      value !== undefined && draft !== null &&
+      JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFrom(value, catalog))),
+    [value, draft, catalog],
   )
   const invalid = useMemo(
     () => draft !== null && Object.values(draft.rows).some((row) =>
@@ -193,12 +212,11 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
     [draft],
   )
 
-  if (loadFailed) return null
-  if (wire === null || draft === null) {
+  if (value === undefined || draft === null) {
     return <li className="dsm-card"><p className="dsm-empty">{t('loading')}</p></li>
   }
-  const edit = <K extends keyof Draft>(key: K, value: Draft[K]): void => {
-    setDraft({ ...draft, [key]: value })
+  const edit = <K extends keyof Draft>(key: K, editValue: Draft[K]): void => {
+    setDraft({ ...draft, [key]: editValue })
     setStatus(IDLE_STATUS)
   }
   const editRow = (name: string, row: DraftRow): void => {
@@ -207,10 +225,19 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
   }
   const onSave = (): void => {
     setSaving(true)
-    saveConfig(toPatch(draft))
-      .then((saved) => {
-        setWire(saved)
-        setDraft(draftFromWire(saved))
+    const revision = scope.getSnapshot().revision
+    api.update({
+      ns: SETTINGS_NS,
+      patch: toPatch(draft),
+      ...(revision !== undefined ? { expectedRevision: revision } : {}),
+    })
+      .then(async (response) => {
+        if (!response.result.ok) {
+          throw new Error(response.result.error?.message ?? t('saveFailed'))
+        }
+        await scope.load()
+        const next = scope.getSnapshot().value as ConfigValue | undefined
+        if (next !== undefined) setDraft(draftFrom(next, catalog))
         setStatus(IDLE_STATUS)
       })
       .catch((error: unknown) => {
@@ -223,8 +250,8 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
     setCatalogFailed(false)
   }
 
-  const disabled = !wire.writable
-  const rowNames = rowNamesOf(wire, draft)
+  const disabled = !snapshot.writable
+  const rowNames = Object.keys(draft.rows).sort()
   const providerCount = (catalog?.providers ?? []).length
   return (
     <li className={`dsm-card${open ? ' dsm-cardOpen' : ''}`}>
@@ -276,7 +303,7 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
               </p>
             ) : null}
             <button type="button" className="dsm-btn dsm-btnGhost" disabled={!dirty || saving}
-              onClick={() => { setDraft(draftFromWire(wire)); setStatus(IDLE_STATUS) }}>
+              onClick={() => { setDraft(draftFrom(value, catalog)); setStatus(IDLE_STATUS) }}>
               {t('discard')}
             </button>
             <button type="button" className="dsm-btn dsm-btnPrimary" disabled={!dirty || invalid || saving || disabled}

package/src/client/client.ts

@@ -3,12 +3,15 @@
  * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
  *
- * 类型说明：浏览器半只用到 slots/locale 的很窄一面，此处以最小本地接口声明，
- * 避免为构建期类型引入整条官方 client 依赖树；运行时契约以官方
- * dsh-client-ui-settings-plugins 的 settings.plugin.item 插槽为准。
+ * 类型说明：浏览器半只用到 slots/locale/settingsScope/connection 的很窄一面，
+ * 此处以最小本地接口声明（见 ./scope.ts），避免为构建期类型引入整条官方
+ * client 依赖树；运行时契约以官方 dsh-client-ui-settings-plugins 的
+ * settings.plugin.item 插槽与 dsh-client-ui-settings 的 settingsScope 服务为准。
  * rc7 起该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
  * （即服务端 settingsNamespace() 注册的同一字面量，见 ../ns.ts），
  * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
+ * 配置读写经官方 settingsScope 传输（rc7 起第三方命名空间对 settings RPC
+ * 全量开放）；自定义端点仅剩「模型目录」（api.ts）。
  * @module @dsh-plus/subagent-model/client
  */
 import type { Context } from '@deepseek-ai/cordis'
@@ -16,12 +19,13 @@ 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 { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-subagent-model'
 
 /** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
-export const inject = ['slots', 'locale'] as const
+export const inject = ['slots', 'locale', 'settingsScope', 'connection'] as const
 
 interface SlotsLike {
   inject(key: string, callback: () => unknown): unknown
@@ -33,9 +37,19 @@ interface LocaleLike {
   bind(ns: string): (key: string) => string
 }
 
+interface SettingsScopeServiceLike {
+  bind(spec: { namespace: string }): Scope
+}
+
+interface ConnectionLike {
+  settings: SettingsApi
+}
+
 interface ClientContext {
   slots: SlotsLike
   locale: LocaleLike
+  settingsScope: SettingsScopeServiceLike
+  get(key: 'connection'): ConnectionLike
   effect(execute: () => () => void, label?: string): unknown
 }
 
@@ -52,14 +66,15 @@ export function apply(ctx: Context): void {
     () => c.locale.register(NS, { zh, en }),
     'subagent-model: locale',
   )
+  const scope = c.settingsScope.bind({ namespace: SETTINGS_NS })
+  const api = c.get('connection').api.settings
   c.slots.inject('settings.plugin.item', () =>
     c.slots.register(
       {
         name: 'settings.plugin.item',
         key: SETTINGS_NS,
-        order: 100,
         locale: NS,
-        inject: () => ({ t: c.locale.bind(NS) }),
+        inject: () => ({ t: c.locale.bind(NS), scope, api }),
       },
       SubagentModelCard,
     ),

package/src/client/scope.ts

@@ -0,0 +1,33 @@
+/**
+ * 浏览器半 settingsScope/connection 的最小本地接口声明。
+ * 只声明本插件用到的窄面，避免为构建期类型引入整条官方 client 依赖树；
+ * 运行时契约以官方 dsh-client-ui-settings 的 settingsScope 服务与
+ * dsh-client-connection 的 settings RPC 面为准（rc7：白名单已移除，
+ * 任何已注册命名空间均可 describe/update/replace）。
+ * @module subagent-model/client/scope
+ */
+
+/** settings 命名空间 scope 的快照（官方 SettingsScopeSnapshot 的最小投影）。 */
+export interface ScopeSnapshot {
+  status: 'loading' | 'ready' | 'unavailable'
+  /** schema 解析后的配置值（secret 字段已脱敏剥除）。 */
+  value: unknown
+  /** 命名空间 revision，写操作 fencing 用；首次 Host 应答前为 undefined。 */
+  revision: number | undefined
+  /** Host 文档是否可写。 */
+  writable: boolean
+}
+
+/** settingsScope.bind({namespace}) 返回的控制器面。 */
+export interface Scope {
+  getSnapshot(): ScopeSnapshot
+  subscribe(listener: () => void): () => void
+  load(): Promise<void>
+}
+
+/** connection api.settings 的 RPC 面（本插件用到的三个方法）。 */
+export interface SettingsApi {
+  describe(): Promise<{ result: { ok: boolean; value?: { namespaces: Array<{ ns: string; secrets: Array<{ path: string[]; set: boolean }> }> }; error?: { message?: string } } }>
+  update(request: { ns: string; patch: Record<string, unknown>; expectedRevision?: number }): Promise<{ result: { ok: boolean; error?: { message?: string } } }>
+  replace(request: { ns: string; section: Record<string, unknown>; expectedRevision?: number }): Promise<{ result: { ok: boolean; error?: { message?: string } } }>
+}

package/src/config-api.ts

@@ -1,8 +1,6 @@
 /**
- * 配置 HTTP 通道：webui 插件配置卡片的后端。
- * 背景：官方 apiproxy 的 settings.* RPC 对 namespace 有硬编码白名单，第三方
- * namespace 一律 settings-not-exposed；故卡片数据走自建 webServer 路由，
- * 读写仍经 ctx.settings 用户层（持久化 $DSH_HOME/settings.yaml）。
+ * 自定义端点 HTTP 通道：配置读写已迁移到官方 settings RPC（rc7 起第三方
+ * 命名空间全量开放），这里只保留官方传输没有的「模型目录」端点。
  * 仅监听 dsh web 同源（webserver 默认 127.0.0.1），与 GUI 其余面同等暴露面。
  * @module subagent-model/config-api
  */
@@ -11,94 +9,21 @@ import type { IncomingMessage, ServerResponse } from 'node:http'
 import type { Context } from '@deepseek-ai/cordis'
 
 import { buildModelCatalog, type ModelCatalog } from './catalog.ts'
-import {
-  SETTINGS_NS, toUserPatch, toWire, validateEntry, WirePatch, type WirePatchOutput,
-} from './config.ts'
-import type { SubagentModelService } from './service.ts'
 
-const ROUTE_CONFIG = '/dsh-plus/subagent-model/config'
 const ROUTE_CATALOG = '/dsh-plus/subagent-model/catalog'
-const MAX_BODY_BYTES = 256 * 1024
 
 function sendJson(res: ServerResponse, status: number, body: unknown): void {
   res.writeHead(status, { 'content-type': 'application/json; charset=utf-8' })
   res.end(JSON.stringify(body))
 }
 
-function readBody(req: IncomingMessage): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const chunks: Buffer[] = []
-    let size = 0
-    req.on('data', (chunk: Buffer) => {
-      size += chunk.length
-      if (size > MAX_BODY_BYTES) {
-        reject(new Error('request body too large'))
-        req.destroy()
-        return
-      }
-      chunks.push(chunk)
-    })
-    req.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')))
-    req.on('error', reject)
-  })
-}
-
-async function readPatch(req: IncomingMessage): Promise<WirePatchOutput> {
-  const raw = await readBody(req)
-  let parsed: unknown
-  try {
-    parsed = JSON.parse(raw)
-  } catch {
-    throw new Error('request body is not valid JSON')
-  }
-  return WirePatch(parsed)
-}
-
-/** 校验用户提交的 entries（model 不能脱离 provider 等）；返回首个错误消息或 null。 */
-function firstEntryError(patch: WirePatchOutput): string | null {
-  for (const [name, entry] of Object.entries(patch.entries)) {
-    const error = validateEntry(entry)
-    if (error !== null) return `条目 ${name}: ${error}`
-  }
-  return null
-}
-
-async function handleConfig(
-  ctx: Context,
-  service: SubagentModelService,
-  req: IncomingMessage,
-  res: ServerResponse,
-): Promise<void> {
-  const settings = ctx.get('settings')
-  if (req.method === 'GET') {
-    sendJson(res, 200, toWire(service.currentConfig(), service.subagentProviders(), settings !== undefined))
-    return
-  }
-  if (req.method !== 'PUT') {
-    sendJson(res, 405, { error: 'method not allowed' })
-    return
-  }
-  if (settings === undefined) {
-    sendJson(res, 503, { error: 'settings provider 不可用，无法在线保存；请编辑 settings.yaml' })
-    return
-  }
-  const patch = await readPatch(req)
-  const entryError = firstEntryError(patch)
-  if (entryError !== null) {
-    sendJson(res, 400, { error: entryError })
-    return
-  }
-  await settings.update(SETTINGS_NS, toUserPatch(patch))
-  sendJson(res, 200, toWire(service.currentConfig(), service.subagentProviders(), true))
-}
-
 async function handleCatalog(ctx: Context, res: ServerResponse): Promise<void> {
   const catalog: ModelCatalog = await buildModelCatalog(ctx)
   sendJson(res, 200, catalog)
 }
 
-/** 注册配置读写与目录路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
-export function registerConfigApi(ctx: Context, service: SubagentModelService): void {
+/** 注册目录路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
+export function registerCatalogApi(ctx: Context): void {
   const logger = ctx.logger('subagent-model')
   const guard = (
     handler: (req: IncomingMessage, res: ServerResponse) => Promise<void>,
@@ -108,17 +33,12 @@ export function registerConfigApi(ctx: Context, service: SubagentModelService):
         await handler(req, res)
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error)
-        logger.warn(`config api ${req.method ?? '?'} ${req.url ?? '?'} failed: ${message}`)
+        logger.warn(`catalog api ${req.method ?? '?'} ${req.url ?? '?'} failed: ${message}`)
         if (!res.headersSent) sendJson(res, 400, { error: message })
         else res.end()
       }
     }
   }
-  ctx.webServer.register({
-    kind: 'exact',
-    path: ROUTE_CONFIG,
-    handler: guard((req, res) => handleConfig(ctx, service, req, res)),
-  })
   ctx.webServer.register({
     kind: 'exact',
     path: ROUTE_CATALOG,

package/src/config.ts

@@ -144,58 +144,11 @@ export function validateEntry(entry: EntryValidationInput): string | null {
   return null
 }
 
-/** 配置卡片读取用的传输对象（writable 表示是否存在可写的 settings provider）。 */
-export interface WireEntry {
-  enabled: boolean
-  provider: string
-  model: string
-  reasoningEffort: string
-}
-
-export interface WireConfig {
-  enabled: boolean
-  entries: Record<string, WireEntry>
-  /** 当前已注册的子代理 provider 名（spawn/fork/…），供卡片合成空行。 */
-  subagentProviders: string[]
-  writable: boolean
-}
-
-export function toWire(cfg: SubagentModelConfig, subagentProviders: string[], writable: boolean): WireConfig {
-  const entries: Record<string, WireEntry> = {}
-  for (const [name, entry] of Object.entries(cfg.entries)) {
-    entries[name] = {
-      enabled: entry.enabled,
-      provider: entry.provider,
-      model: entry.model,
-      reasoningEffort: entry.reasoningEffort,
-    }
+/** 校验整组条目（settings 写入的 validate 钩子用）；返回首个错误消息，合法时返回 null。 */
+export function validateEntries(entries: Record<string, EntryValidationInput>): string | null {
+  for (const [name, entry] of Object.entries(entries)) {
+    const error = validateEntry(entry)
+    if (error !== null) return `条目 ${name}: ${error}`
   }
-  return { enabled: cfg.enabled, entries, subagentProviders: [...subagentProviders], writable }
-}
-
-/** 配置卡片写回用的宽松输入形态（字段全部可选，无默认值，深合并进用户层）。 */
-export interface WirePatchInput {
-  enabled?: boolean | null
-  entries?: Record<string, {
-    enabled?: boolean | null
-    provider?: string | null
-    model?: string | null
-    reasoningEffort?: string | null
-  }> | null
-}
-
-/** 配置卡片写回用的规范输出形态（校验后条目已填默认）。 */
-export interface WirePatchOutput {
-  enabled: boolean
-  entries: Record<string, EntryConfig>
-}
-
-export const WirePatch: z<WirePatchInput, WirePatchOutput> = z.object({
-  enabled: z.boolean(),
-  entries: z.dict(EntrySchema),
-})
-
-/** 把卡片提交的 patch 规整为 settings.update 的用户层 patch（entries 整体替换）。 */
-export function toUserPatch(input: WirePatchInput): Record<string, unknown> {
-  return { ...input }
+  return null
 }

package/src/service.ts

@@ -1,19 +1,19 @@
 /**
  * SubagentModelService：子代理模型配置中枢。
  * - 配置：installSettingsSection 接入 settings 用户层（$DSH_HOME/settings.yaml，热生效），
- *   无 settings provider 时退化为 cordis 行级 config。
+ *   无 settings provider 时退化为 cordis 行级 config；写入经 validate 钩子
+ *   走 validateEntries 规则（model 不能脱离 provider 等），非法即拒。
  * - 委托挂钩：包装 ctx.subagents.start/startContinuable，按 provider 名注入
  *   agentOptions（provider/model/effort 私有标记），未命中条目完全直通。
  * - 子代理路由：根 ctx 的 agent/request 瀑布监听，把条目 effort 应用到子代理请求。
- * - 配置通道：ctx.webServer 注册 config/catalog 同源路由（官方 settings RPC
- *   白名单不含第三方 namespace）。
+ * - 自定义端点：ctx.webServer 仅注册模型目录路由（配置读写已走官方 settings RPC）。
  * @module @dsh-plus/subagent-model
  */
 import { Context, Service } from '@deepseek-ai/cordis'
 import { installSettingsSection } from '@deepseek-ai/dsh-settings'
 
-import { registerConfigApi } from './config-api.ts'
-import { Config, SETTINGS_NS, type SubagentModelConfig } from './config.ts'
+import { registerCatalogApi } from './config-api.ts'
+import { Config, SETTINGS_NS, validateEntries, type SubagentModelConfig } from './config.ts'
 import { installChildRoute, installDelegationHook } from './delegation.ts'
 
 declare module '@deepseek-ai/cordis' {
@@ -31,6 +31,10 @@ export class SubagentModelService extends Service {
     super(ctx, 'subagentModel')
     this.current = () => config
     installSettingsSection(ctx, SETTINGS_NS, Config, config, {
+      validate: (cfg: SubagentModelConfig) => {
+        const error = validateEntries(cfg.entries)
+        if (error !== null) throw new Error(`subagent-model: ${error}`)
+      },
       setSource: (source) => {
         this.current = source
       },
@@ -39,7 +43,7 @@ export class SubagentModelService extends Service {
     installDelegationHook(ctx, () => this.current())
     installChildRoute(ctx)
     ctx.inject(['webServer'], (webCtx) => {
-      registerConfigApi(webCtx, this)
+      registerCatalogApi(webCtx)
     })
   }