@dsh-plus/llm-pi 0.1.1 → 0.1.2

package/lib/client.js

@@ -45,24 +45,12 @@ const SETTINGS_NS = "dsh-plus-llm-pi";
 
 //#endregion
 //#region src/client/api.ts
-const ROUTE_CONFIG = "/dsh-plus/llm-pi/config";
 const ROUTE_CATALOG = "/dsh-plus/llm-pi/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)
-	}));
-}
 /** 目录查询：provider 为空时只返回该源的 provider 列表。 */
 async function fetchCatalog(provider, source) {
 	const url = `${ROUTE_CATALOG}?provider=${encodeURIComponent(provider)}&source=${source}`;
@@ -284,13 +272,13 @@ function emptyModelDraft() {
 		compat: {}
 	};
 }
-function draftFromWire(wire) {
+function draftFromValue(value) {
 	return {
-		enabled: wire.enabled,
-		catalogUrl: wire.catalogUrl,
-		catalogRefreshHours: String(wire.catalogRefreshHours),
-		catalogProxy: wire.catalogProxy,
-		providers: Object.fromEntries(Object.entries(wire.providers).map(([route, provider]) => [route, providerDraftFromWire(provider)]))
+		enabled: value.enabled,
+		catalogUrl: value.catalogUrl,
+		catalogRefreshHours: String(value.catalogRefreshHours),
+		catalogProxy: value.catalogProxy,
+		providers: Object.fromEntries(Object.entries(value.providers).map(([route, provider]) => [route, providerDraftFromWire(provider)]))
 	};
 }
 /** 提交补丁：完整配置对象，providers 全量替换；空值一律剔除。 */
@@ -1344,35 +1332,38 @@ function modelsDevText(status, t) {
 	return `${t("modelsDevStatusLine")}：${status.providers} 个 provider，快照 ${status.fetchedAt}`;
 }
 function LlmPiCard(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 [epoch, setEpoch] = (0, react.useState)(0);
-	const [failed, setFailed] = (0, react.useState)(false);
+	const [kitSource, setKitSource] = (0, react.useState)(null);
+	const [modelsDevStatus, setModelsDevStatus] = (0, react.useState)(null);
 	const [saving, setSaving] = (0, react.useState)(false);
 	const [refreshing, setRefreshing] = (0, react.useState)(false);
 	const [status, setStatus] = (0, react.useState)(IDLE_STATUS);
+	(0, react.useEffect)(() => {
+		if (value === void 0 || draft !== null) return;
+		setDraft(draftFromValue(value));
+	}, [value, draft]);
 	(0, react.useEffect)(() => {
 		let alive = true;
-		fetchConfig().then((loaded) => {
+		fetchCatalog("", "models-dev").then((result) => {
 			if (!alive) return;
-			setWire(loaded);
-			setDraft(draftFromWire(loaded));
-		}).catch(() => {
-			if (alive) setFailed(true);
-		});
+			setKitSource(result.kitSource ?? null);
+			setModelsDevStatus(result.status ?? null);
+		}).catch(() => {});
 		return () => {
 			alive = false;
 		};
 	}, []);
-	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(draftFromValue(value))), [value, draft]);
 	const invalid = (0, react.useMemo)(() => {
 		if (draft === null) return false;
 		return !numTextOk(draft.catalogRefreshHours) || Object.values(draft.providers).some((provider) => provider.models.some((model) => model.id.trim() === ""));
 	}, [draft]);
-	if (failed) 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: "lpc-card",
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 			className: "lpc-readOnly",
@@ -1414,10 +1405,17 @@ function LlmPiCard(props) {
 	};
 	const onSave = () => {
 		setSaving(true);
-		saveConfig(toPatch(draft)).then((saved) => {
-			setWire(saved);
-			setDraft(draftFromWire(saved));
-			setEpoch((value) => value + 1);
+		const revision = scope.getSnapshot().revision;
+		api.replace({
+			ns: SETTINGS_NS,
+			section: 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(draftFromValue(next));
+			setEpoch((value$1) => value$1 + 1);
 			setStatus({
 				kind: "ok",
 				text: t("saveOk")
@@ -1431,17 +1429,14 @@ function LlmPiCard(props) {
 		}).finally(() => setSaving(false));
 	};
 	const onDiscard = () => {
-		setDraft(draftFromWire(wire));
-		setEpoch((value) => value + 1);
+		setDraft(draftFromValue(value));
+		setEpoch((value$1) => value$1 + 1);
 		setStatus(IDLE_STATUS);
 	};
 	const onRefreshCatalog = () => {
 		setRefreshing(true);
 		refreshCatalog().then((result) => {
-			setWire({
-				...wire,
-				modelsDevStatus: result.status
-			});
+			setModelsDevStatus(result.status);
 			setStatus({
 				kind: "ok",
 				text: t("refreshOk")
@@ -1454,7 +1449,7 @@ function LlmPiCard(props) {
 			});
 		}).finally(() => setRefreshing(false));
 	};
-	const disabled = !wire.writable;
+	const disabled = !snapshot.writable;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
 		className: `lpc-card${open ? " lpc-cardOpen" : ""}`,
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
@@ -1496,10 +1491,10 @@ function LlmPiCard(props) {
 					label: t("enabled"),
 					checked: draft.enabled,
 					disabled,
-					onEdit: (value) => {
+					onEdit: (value$1) => {
 						setDraft({
 							...draft,
-							enabled: value
+							enabled: value$1
 						});
 						setStatus(IDLE_STATUS);
 					}
@@ -1510,10 +1505,10 @@ function LlmPiCard(props) {
 					hint: t("catalogUrlHint"),
 					value: draft.catalogUrl,
 					disabled,
-					onEdit: (value) => {
+					onEdit: (value$1) => {
 						setDraft({
 							...draft,
-							catalogUrl: value
+							catalogUrl: value$1
 						});
 						setStatus(IDLE_STATUS);
 					}
@@ -1527,10 +1522,10 @@ function LlmPiCard(props) {
 					disabled,
 					invalid: !numTextOk(draft.catalogRefreshHours),
 					invalidLabel: t("invalidNumber"),
-					onEdit: (value) => {
+					onEdit: (value$1) => {
 						setDraft({
 							...draft,
-							catalogRefreshHours: value
+							catalogRefreshHours: value$1
 						});
 						setStatus(IDLE_STATUS);
 					}
@@ -1541,10 +1536,10 @@ function LlmPiCard(props) {
 					hint: t("catalogProxyHint"),
 					value: draft.catalogProxy,
 					disabled,
-					onEdit: (value) => {
+					onEdit: (value$1) => {
 						setDraft({
 							...draft,
-							catalogProxy: value
+							catalogProxy: value$1
 						});
 						setStatus(IDLE_STATUS);
 					}
@@ -1554,7 +1549,7 @@ function LlmPiCard(props) {
 					children: [
 						t("kitSource"),
 						"：",
-						wire.kitSource
+						kitSource ?? ""
 					]
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1562,7 +1557,7 @@ function LlmPiCard(props) {
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
 						t("modelsDevStatus"),
 						"：",
-						modelsDevText(wire.modelsDevStatus, t)
+						modelsDevText(modelsDevStatus, t)
 					] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						className: "lpc-btn lpc-btnGhost lpc-btnSmall lpc-refreshBtn",
@@ -1887,7 +1882,12 @@ function injectStyle() {
 //#region src/client/client.ts
 const name = "dsh-plus-llm-pi";
 /** 浏览器半需要的 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();
@@ -1898,12 +1898,17 @@ function apply(ctx) {
 		zh,
 		en
 	}), "llm-pi: 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: 110,
 		locale: NS,
-		inject: () => ({ t: c.locale.bind(NS) })
+		inject: () => ({
+			t: c.locale.bind(NS),
+			scope,
+			api
+		})
 	}, LlmPiCard));
 }
 

package/lib/index.d.ts

@@ -62,29 +62,10 @@ interface LlmPiConfig {
   providers: Record<string, ProviderProfileConfig>;
 }
 declare const Config: z<LlmPiConfig>;
-/** 配置卡片读取用的传输对象：配置无密钥字段，原样传输；附运行期元信息。 */
-interface WireConfig {
-  enabled: boolean;
-  catalogUrl: string;
-  catalogRefreshHours: number;
-  catalogProxy: string;
-  providers: Record<string, ProviderProfileConfig>;
-  /** 是否存在可写的 settings provider（决定卡片是否允许编辑）。 */
-  writable: boolean;
-  /** 模块解析来源与自检结果（dsh 树 / vendored 兜底）。 */
-  kitSource: string;
-  /** models.dev 快照状态（fetchedAt/模型数/错误），供卡片展示。 */
-  modelsDevStatus: {
-    fetchedAt: string | null;
-    providers: number;
-    models: number;
-    error: string | null;
-  } | null;
-}
 //#endregion
 //#region src/index.d.ts
 declare const name = "dsh-plus-llm-pi";
 declare const inject: readonly ["llm"];
 declare function apply(ctx: Context, config: LlmPiConfig): Promise<void>;
 //#endregion
-export { Config, type LlmPiConfig, type ModelEntryConfig, type ProviderProfileConfig, SETTINGS_NS, type WireConfig, apply, inject, name };
+export { Config, type LlmPiConfig, type ModelEntryConfig, type ProviderProfileConfig, SETTINGS_NS, apply, inject, name };

package/lib/index.js

@@ -115,25 +115,6 @@ const Config = z.object({
 	catalogProxy: z.string().description("拉取 models.dev 目录时的 HTTP 代理地址（如 http://127.0.0.1:7890）；留空直连").default(""),
 	providers: z.dict(providerProfile).description("provider 路由表，键即 route 名").default({})
 });
-function toWire(cfg, writable, kitSource, modelsDevStatus) {
-	return {
-		enabled: cfg.enabled,
-		catalogUrl: cfg.catalogUrl,
-		catalogRefreshHours: cfg.catalogRefreshHours,
-		catalogProxy: cfg.catalogProxy ?? "",
-		providers: cfg.providers ?? {},
-		writable,
-		kitSource,
-		modelsDevStatus
-	};
-}
-const WirePatch = z.object({
-	enabled: z.boolean(),
-	catalogUrl: z.string(),
-	catalogRefreshHours: z.number(),
-	catalogProxy: z.string(),
-	providers: z.dict(providerProfile)
-});
 
 //#endregion
 //#region src/catalog/builtin.ts
@@ -183,63 +164,14 @@ function inheritedCatalogEntries(kit, provider) {
 
 //#endregion
 //#region src/config-api.ts
-const ROUTE_CONFIG = "/dsh-plus/llm-pi/config";
 const ROUTE_CATALOG = "/dsh-plus/llm-pi/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);
-}
-function wireOf(runtime, writable) {
-	return toWire(runtime.currentConfig(), writable, runtime.kitInfo().source, runtime.modelsDev.status());
-}
-async function handleConfig(ctx, runtime, req, res) {
-	const settings = ctx.get("settings");
-	if (req.method === "GET") {
-		sendJson(res, 200, wireOf(runtime, 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);
-	await settings.replace(SETTINGS_NS, patch);
-	sendJson(res, 200, wireOf(runtime, true));
-}
 /** 目录查询/手动拉取：GET ?provider=&source= → 该源模型 id 列表；POST /refresh → 立即拉取。 */
 function handleCatalog(runtime, req, res) {
+	const kitSource = runtime.kitInfo().source;
 	if (req.method === "POST" && req.url?.endsWith("/refresh")) {
 		runtime.modelsDev.refresh().then(() => {
 			sendJson(res, 200, { status: runtime.modelsDev.status() });
@@ -252,17 +184,19 @@ function handleCatalog(runtime, req, res) {
 		sendJson(res, 200, {
 			providers: runtime.modelsDev.providerIds(),
 			models: provider.length > 0 ? runtime.modelsDev.modelIds(provider) : [],
-			status: runtime.modelsDev.status()
+			status: runtime.modelsDev.status(),
+			kitSource
 		});
 		return;
 	}
 	sendJson(res, 200, {
 		providers: runtime.kit.getBuiltinProviders(),
-		models: provider.length > 0 ? builtinModelIds(runtime.kit, provider) : []
+		models: provider.length > 0 ? builtinModelIds(runtime.kit, provider) : [],
+		kitSource
 	});
 }
-/** 注册配置读写与目录查询路由（webServer 缺失时由调用方保证不调用）。 */
-function registerConfigApi(ctx, runtime) {
+/** 注册目录路由（webServer 缺失时由调用方保证不调用）。 */
+function registerCatalogApi(ctx, runtime) {
 	const logger = ctx.logger("llm-pi");
 	const guard = (handler) => {
 		return async (req, res) => {
@@ -270,17 +204,12 @@ function registerConfigApi(ctx, runtime) {
 				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, runtime, req, res))
-	});
 	ctx.webServer.register({
 		kind: "prefix",
 		path: ROUTE_CATALOG,
@@ -1251,7 +1180,7 @@ const inject = ["llm"];
 async function apply(ctx, config) {
 	const runtime = await startRuntime(ctx, config);
 	ctx.inject(["webServer"], (webCtx) => {
-		registerConfigApi(webCtx, runtime);
+		registerCatalogApi(webCtx, runtime);
 	});
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/llm-pi",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "dsh-plus service+ui plugin: 基于 PiAiAdapter 的自定义 LLM 路由（全量 compat、模型继承、models.dev 目录兜底）",
   "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,6 +1,7 @@
 /**
- * 配置卡片数据通道：同源 fetch 调自建 webServer 路由（notify-email 同款模式；
- * 官方 settings.* RPC 白名单硬编码不含第三方 namespace）。
+ * 自定义端点通道：仅剩「模型目录」（配置读写已迁移到官方 settingsScope
+ * 传输，见 scope.ts 与 card.tsx）。目录响应附带 kitSource 与 models-dev
+ * 状态，供卡片的状态行展示（运行期诊断，非配置数据）。
  * @module llm-pi/client/api
  */
 
@@ -43,35 +44,26 @@ export interface WireModel {
   compat?: Record<string, unknown>
 }
 
-/** GET /config 返回（config.ts WireConfig）。 */
-export interface WireConfig {
+/** settings 命名空间的解析值（llm-pi 无 secret 字段，value 即完整配置）。 */
+export interface ConfigValue {
   enabled: boolean
   catalogUrl: string
   catalogRefreshHours: number
   catalogProxy: string
   providers: Record<string, WireProvider>
-  writable: boolean
-  kitSource: string
-  modelsDevStatus: WireModelsDevStatus | null
 }
 
-/** PUT /config 提交形状（config.ts WirePatchInput；providers 全量替换）。 */
-export interface WirePatchInput {
-  enabled?: boolean
-  catalogUrl?: string
-  catalogRefreshHours?: number
-  catalogProxy?: string
-  providers?: Record<string, WireProvider>
-}
+/** 保存提交形状：完整配置对象，providers 全量替换（settings.replace 语义）。 */
+export type ConfigPatch = ConfigValue
 
-/** GET /catalog?provider=&source= 返回。 */
+/** GET /catalog?provider=&source= 返回（kitSource 为运行期套件来源诊断）。 */
 export interface CatalogResult {
   providers: string[]
   models: string[]
   status?: WireModelsDevStatus
+  kitSource?: string
 }
 
-const ROUTE_CONFIG = '/dsh-plus/llm-pi/config'
 const ROUTE_CATALOG = '/dsh-plus/llm-pi/catalog'
 
 async function parse<T>(res: Response): Promise<T> {
@@ -80,21 +72,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: WirePatchInput): Promise<WireConfig> {
-  return parse<WireConfig>(
-    await fetch(ROUTE_CONFIG, {
-      method: 'PUT',
-      credentials: 'same-origin',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(patch),
-    }),
-  )
-}
-
 /** 目录查询：provider 为空时只返回该源的 provider 列表。 */
 export async function fetchCatalog(provider: string, source: 'builtin' | 'models-dev'): Promise<CatalogResult> {
   const url = `${ROUTE_CATALOG}?provider=${encodeURIComponent(provider)}&source=${source}`

package/src/client/card.tsx

@@ -1,20 +1,25 @@
 /**
  * 「LLM 路由」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
  * 顶部：enabled / catalogUrl / catalogRefreshHours / 只读状态行（kitSource、
- * modelsDevStatus）+ 保存（PUT 全量）与错误/成功提示；下方为 providers 路由
- * 列表（新增/删除/字段编辑/compat/模型目录，见 views/）。
+ * modelsDevStatus，来自模型目录端点）+ 保存（settings.replace 全量）与
+ * 错误/成功提示；下方为 providers 路由列表（新增/删除/字段编辑/compat/模型
+ * 目录，见 views/）。配置读写走官方 settingsScope 传输（scope.ts）。
  * 交互对齐官方卡片与 notify-email：折叠/展开、staged draft、未保存标记。
  * @module llm-pi/client/card
  */
-import { useEffect, useMemo, useState, type ReactElement } from 'react'
+import { useEffect, useMemo, useSyncExternalStore, useState, type ReactElement } from 'react'
 
-import { fetchConfig, refreshCatalog, saveConfig, type WireConfig, type WireModelsDevStatus } from './api.ts'
-import { draftFromWire, emptyProviderDraft, numTextOk, toPatch, type Draft, type ProviderDraft } from './draft.ts'
+import { SETTINGS_NS } from '../ns.ts'
+import { fetchCatalog, refreshCatalog, type ConfigValue, type WireModelsDevStatus } from './api.ts'
+import { draftFromValue, emptyProviderDraft, numTextOk, toPatch, type Draft, type ProviderDraft } from './draft.ts'
 import { CheckRow, TextField } from './fields.tsx'
+import type { Scope, SettingsApi } from './scope.ts'
 import { ProvidersSection } from './views/providers.tsx'
 
 export interface CardProps {
   t(key: string): string
+  scope: Scope
+  api: SettingsApi
 }
 
 interface Status {
@@ -32,27 +37,37 @@ function modelsDevText(status: WireModelsDevStatus | null, t: (key: string) => s
 }
 
 export function LlmPiCard(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 [epoch, setEpoch] = useState(0)
-  const [failed, setFailed] = useState(false)
+  const [kitSource, setKitSource] = useState<string | null>(null)
+  const [modelsDevStatus, setModelsDevStatus] = useState<WireModelsDevStatus | null>(null)
   const [saving, setSaving] = useState(false)
   const [refreshing, setRefreshing] = useState(false)
   const [status, setStatus] = useState<Status>(IDLE_STATUS)
 
+  // 首次拿到解析值后播种草稿；后续 Host 更新不覆盖在途编辑（与官方 staged 表单一致）。
+  useEffect(() => {
+    if (value === undefined || draft !== null) return
+    setDraft(draftFromValue(value))
+  }, [value, draft])
+
+  // 运行期诊断行（kitSource / models-dev 状态）来自模型目录端点，非配置数据。
   useEffect(() => {
     let alive = true
-    fetchConfig()
-      .then((loaded) => {
+    fetchCatalog('', 'models-dev')
+      .then((result) => {
         if (!alive) return
-        setWire(loaded)
-        setDraft(draftFromWire(loaded))
-      })
-      .catch(() => {
-        if (alive) setFailed(true)
+        setKitSource(result.kitSource ?? null)
+        setModelsDevStatus(result.status ?? null)
       })
+      .catch(() => {})
     return () => {
       alive = false
     }
@@ -60,10 +75,9 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
 
   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(draftFromValue(value))),
+    [value, draft],
   )
   const invalid = useMemo(() => {
     if (draft === null) return false
@@ -75,8 +89,7 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
     )
   }, [draft])
 
-  if (failed) return null
-  if (wire === null || draft === null) {
+  if (value === undefined || draft === null) {
     return <li className="lpc-card"><p className="lpc-readOnly">{t('loading')}</p></li>
   }
 
@@ -97,10 +110,19 @@ export function LlmPiCard(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.replace({
+      ns: SETTINGS_NS,
+      section: toPatch(draft) as unknown as Record<string, unknown>,
+      ...(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(draftFromValue(next))
         setEpoch((value) => value + 1)
         setStatus({ kind: 'ok', text: t('saveOk') })
       })
@@ -111,7 +133,7 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
       .finally(() => setSaving(false))
   }
   const onDiscard = (): void => {
-    setDraft(draftFromWire(wire))
+    setDraft(draftFromValue(value))
     setEpoch((value) => value + 1)
     setStatus(IDLE_STATUS)
   }
@@ -119,7 +141,7 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
     setRefreshing(true)
     refreshCatalog()
       .then((result) => {
-        setWire({ ...wire, modelsDevStatus: result.status })
+        setModelsDevStatus(result.status)
         setStatus({ kind: 'ok', text: t('refreshOk') })
       })
       .catch((error: unknown) => {
@@ -129,7 +151,7 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
       .finally(() => setRefreshing(false))
   }
 
-  const disabled = !wire.writable
+  const disabled = !snapshot.writable
   return (
     <li className={`lpc-card${open ? ' lpc-cardOpen' : ''}`}>
       <button
@@ -195,9 +217,9 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
               setStatus(IDLE_STATUS)
             }}
           />
-          <p className="lpc-statusRow">{t('kitSource')}：{wire.kitSource}</p>
+          <p className="lpc-statusRow">{t('kitSource')}：{kitSource ?? ''}</p>
           <div className="lpc-statusRow">
-            <span>{t('modelsDevStatus')}：{modelsDevText(wire.modelsDevStatus, t)}</span>
+            <span>{t('modelsDevStatus')}：{modelsDevText(modelsDevStatus, t)}</span>
             <button
               type="button"
               className="lpc-btn lpc-btnGhost lpc-btnSmall lpc-refreshBtn"

package/src/client/client.ts

@@ -3,12 +3,16 @@
  * 构建产物为 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，含 kitSource/models-dev
+ * 运行期诊断）。
  * @module @dsh-plus/llm-pi/client
  */
 import type { Context } from '@deepseek-ai/cordis'
@@ -16,12 +20,13 @@ import type { Context } from '@deepseek-ai/cordis'
 import { SETTINGS_NS } from '../ns.ts'
 import { LlmPiCard } 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-llm-pi'
 
 /** 浏览器半需要的 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 +38,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 +67,15 @@ export function apply(ctx: Context): void {
     () => c.locale.register(NS, { zh, en }),
     'llm-pi: 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: 110,
         locale: NS,
-        inject: () => ({ t: c.locale.bind(NS) }),
+        inject: () => ({ t: c.locale.bind(NS), scope, api }),
       },
       LlmPiCard,
     ),

package/src/client/draft.ts

@@ -1,10 +1,10 @@
 /**
- * 可编辑草稿模型与 WireConfig ↔ Draft 双向转换。
+ * 可编辑草稿模型与 ConfigValue ↔ Draft 双向转换。
  * 设计：数值字段用字符串承载（'' = 未设置/不写入），多选枚举用布尔 map，
  * 转换时剔除空值，保证 dirty 比较（toPatch 双侧）与保存形状稳定。
  * @module llm-pi/client/draft
  */
-import type { WireConfig, WireModel, WirePatchInput, WireProvider } from './api.ts'
+import type { ConfigPatch, ConfigValue, WireModel, WireProvider } from './api.ts'
 
 export interface HeaderPair {
   key: string
@@ -267,20 +267,20 @@ export function emptyModelDraft(): ModelDraft {
   }
 }
 
-export function draftFromWire(wire: WireConfig): Draft {
+export function draftFromValue(value: ConfigValue): Draft {
   return {
-    enabled: wire.enabled,
-    catalogUrl: wire.catalogUrl,
-    catalogRefreshHours: String(wire.catalogRefreshHours),
-    catalogProxy: wire.catalogProxy,
+    enabled: value.enabled,
+    catalogUrl: value.catalogUrl,
+    catalogRefreshHours: String(value.catalogRefreshHours),
+    catalogProxy: value.catalogProxy,
     providers: Object.fromEntries(
-      Object.entries(wire.providers).map(([route, provider]) => [route, providerDraftFromWire(provider)]),
+      Object.entries(value.providers).map(([route, provider]) => [route, providerDraftFromWire(provider)]),
     ),
   }
 }
 
 /** 提交补丁：完整配置对象，providers 全量替换；空值一律剔除。 */
-export function toPatch(draft: Draft): WirePatchInput {
+export function toPatch(draft: Draft): ConfigPatch {
   return {
     enabled: draft.enabled,
     catalogUrl: draft.catalogUrl.trim(),

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 llm-pi/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,10 +1,8 @@
 /**
- * 配置 HTTP 通道：webui 配置卡片的后端（notify-email 同款模式）。
- * 背景：官方 apiproxy 的 settings.* RPC 对 namespace 有硬编码白名单，第三方
- * namespace 一律 settings-not-exposed；卡片数据走自建 webServer 同源路由，
- * 写回经 ctx.settings.replace 整段覆盖用户层（providers dict 的删除语义
- * 无法经深合并表达）。写入先过 settings 校验钩子（完整解析试跑），
- * 非法配置在写入处拒绝并返回错误明细。
+ * 自定义端点 HTTP 通道：配置读写已迁移到官方 settings RPC（rc7 起第三方
+ * 命名空间全量开放），这里只保留官方传输没有的「模型目录」端点（含
+ * kitSource / models-dev 运行期诊断，供卡片状态行展示）。
+ * 仅监听 dsh web 同源（webserver 默认 127.0.0.1），与 GUI 其余面同等暴露面。
  * @module llm-pi/config-api
  */
 import type { IncomingMessage, ServerResponse } from 'node:http'
@@ -12,78 +10,18 @@ import type { IncomingMessage, ServerResponse } from 'node:http'
 import type { Context } from '@deepseek-ai/cordis'
 
 import { builtinModelIds } from './catalog/builtin.ts'
-import { SETTINGS_NS, toWire, WirePatch, type WirePatchInput } from './config.ts'
 import type { LlmPiRuntime } from './service.ts'
 
-const ROUTE_CONFIG = '/dsh-plus/llm-pi/config'
 const ROUTE_CATALOG = '/dsh-plus/llm-pi/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<WirePatchInput> {
-  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) as WirePatchInput
-}
-
-function wireOf(runtime: LlmPiRuntime, writable: boolean) {
-  // 状态始终上报（含未拉取/失败），由卡片区分文案；不再用 enabled 做 null 开关。
-  return toWire(runtime.currentConfig(), writable, runtime.kitInfo().source, runtime.modelsDev.status())
-}
-
-async function handleConfig(
-  ctx: Context,
-  runtime: LlmPiRuntime,
-  req: IncomingMessage,
-  res: ServerResponse,
-): Promise<void> {
-  const settings = ctx.get('settings')
-  if (req.method === 'GET') {
-    sendJson(res, 200, wireOf(runtime, 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)
-  await settings.replace(SETTINGS_NS, patch)
-  sendJson(res, 200, wireOf(runtime, true))
-}
-
 /** 目录查询/手动拉取：GET ?provider=&source= → 该源模型 id 列表；POST /refresh → 立即拉取。 */
 function handleCatalog(runtime: LlmPiRuntime, req: IncomingMessage, res: ServerResponse): void {
+  const kitSource = runtime.kitInfo().source
   if (req.method === 'POST' && req.url?.endsWith('/refresh')) {
     void runtime.modelsDev.refresh().then(() => {
       sendJson(res, 200, { status: runtime.modelsDev.status() })
@@ -98,17 +36,19 @@ function handleCatalog(runtime: LlmPiRuntime, req: IncomingMessage, res: ServerR
       providers: runtime.modelsDev.providerIds(),
       models: provider.length > 0 ? runtime.modelsDev.modelIds(provider) : [],
       status: runtime.modelsDev.status(),
+      kitSource,
     })
     return
   }
   sendJson(res, 200, {
     providers: runtime.kit.getBuiltinProviders(),
     models: provider.length > 0 ? builtinModelIds(runtime.kit, provider) : [],
+    kitSource,
   })
 }
 
-/** 注册配置读写与目录查询路由（webServer 缺失时由调用方保证不调用）。 */
-export function registerConfigApi(ctx: Context, runtime: LlmPiRuntime): void {
+/** 注册目录路由（webServer 缺失时由调用方保证不调用）。 */
+export function registerCatalogApi(ctx: Context, runtime: LlmPiRuntime): void {
   const logger = ctx.logger('llm-pi')
   const guard = (handler: (req: IncomingMessage, res: ServerResponse) => Promise<void> | void) => {
     return async (req: IncomingMessage, res: ServerResponse) => {
@@ -116,17 +56,12 @@ export function registerConfigApi(ctx: Context, runtime: LlmPiRuntime): void {
         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, runtime, req, res)),
-  })
   ctx.webServer.register({
     kind: 'prefix',
     path: ROUTE_CATALOG,

package/src/config.ts

@@ -156,57 +156,5 @@ export const Config: z<LlmPiConfig> = z.object({
   providers: z.dict(providerProfile).description('provider 路由表，键即 route 名').default({}),
 })
 
-/** 配置卡片读取用的传输对象：配置无密钥字段，原样传输；附运行期元信息。 */
-export interface WireConfig {
-  enabled: boolean
-  catalogUrl: string
-  catalogRefreshHours: number
-  catalogProxy: string
-  providers: Record<string, ProviderProfileConfig>
-  /** 是否存在可写的 settings provider（决定卡片是否允许编辑）。 */
-  writable: boolean
-  /** 模块解析来源与自检结果（dsh 树 / vendored 兜底）。 */
-  kitSource: string
-  /** models.dev 快照状态（fetchedAt/模型数/错误），供卡片展示。 */
-  modelsDevStatus: { fetchedAt: string | null; providers: number; models: number; error: string | null } | null
-}
-
-export function toWire(
-  cfg: LlmPiConfig,
-  writable: boolean,
-  kitSource: string,
-  modelsDevStatus: WireConfig['modelsDevStatus'],
-): WireConfig {
-  return {
-    enabled: cfg.enabled,
-    catalogUrl: cfg.catalogUrl,
-    catalogRefreshHours: cfg.catalogRefreshHours,
-    catalogProxy: cfg.catalogProxy ?? '',
-    providers: cfg.providers ?? {},
-    writable,
-    kitSource,
-    modelsDevStatus,
-  }
-}
-
-/**
- * 配置卡片写回：卡片总是提交完整配置对象（含 providers 全量），
- * 后端经 settings.replace 整段覆盖用户层——providers dict 的删除语义
- * 无法经深合并表达，整段替换是唯一正确语义。
- */
-/** 卡片提交的形状：字段全可选（无默认值），只携带用户编辑过的字段。 */
-export interface WirePatchInput {
-  enabled?: boolean
-  catalogUrl?: string
-  catalogRefreshHours?: number
-  catalogProxy?: string
-  providers?: Record<string, ProviderProfileConfig>
-}
-
-export const WirePatch: z<WirePatchInput> = z.object({
-  enabled: z.boolean(),
-  catalogUrl: z.string(),
-  catalogRefreshHours: z.number(),
-  catalogProxy: z.string(),
-  providers: z.dict(providerProfile),
-})
+/** 卡片提交的形状：完整配置对象（含 providers 全量），settings.replace 整段覆盖。 */
+export type LlmPiPatch = LlmPiConfig

package/src/index.ts

@@ -13,7 +13,7 @@
 import type { Context } from '@deepseek-ai/cordis'
 
 import { Config, type LlmPiConfig } from './config.ts'
-import { registerConfigApi } from './config-api.ts'
+import { registerCatalogApi } from './config-api.ts'
 import { startRuntime } from './service.ts'
 
 export const name = 'dsh-plus-llm-pi'
@@ -22,12 +22,12 @@ export const inject = ['llm'] as const
 
 export { Config }
 
-export type { LlmPiConfig, ProviderProfileConfig, ModelEntryConfig, WireConfig } from './config.ts'
+export type { LlmPiConfig, ProviderProfileConfig, ModelEntryConfig } from './config.ts'
 export { SETTINGS_NS } from './config.ts'
 
 export async function apply(ctx: Context, config: LlmPiConfig): Promise<void> {
   const runtime = await startRuntime(ctx, config)
   ctx.inject(['webServer'], (webCtx) => {
-    registerConfigApi(webCtx, runtime)
+    registerCatalogApi(webCtx, runtime)
   })
 }