@dsh-plus/subagent-model 0.1.6 → 0.1.8

package/lib/index.d.ts

@@ -1,9 +1,6 @@
-import "@deepseek-ai/dsh-settings";
 import z from "@deepseek-ai/schemastery";
 import { Context, Service } from "@deepseek-ai/cordis";
-
 //#region src/config.d.ts
-
 /** 一条条目的规范输出形态。 */
 interface EntryConfig {
   enabled: boolean;

package/lib/index.js

@@ -1,31 +1,33 @@
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import z from "@deepseek-ai/schemastery";
 import { Context, Service } from "@deepseek-ai/cordis";
-
-//#region src/ns.ts
-/**
-* settings 命名空间字面量（纯常量，零依赖，浏览器半可安全引入）。
-* 服务端经 settingsNamespace() 品牌化后使用（config.ts），浏览器半将其作为
-* settings.plugin.item keyed 槽位的 key —— 同一字面量两处共用，防止漂移。
-* 契约：dsh rc7 起该槽位按「卡片编辑的 settings 命名空间」作 key 分发，
-* 官方配置页只渲染 key 命中 Host 已注册命名空间的卡片。
-* @module subagent-model/ns
-*/
-const SETTINGS_NS$1 = "dsh-plus-subagent-model";
-
 //#endregion
 //#region src/config.ts
+/**
+* 配置单一事实源：cordis 行级 Config（组合默认值，dev/prod patch 层可覆盖）
+* 与 settings namespace（用户层，经 dsh-settings-file 持久化到 $DSH_HOME/settings.yaml）
+* 共用同一 schemastery schema。条目按【子代理 provider 名】键控
+* （standard preset 事实映射：subagent↔spawn、subagent_fork↔fork）。
+*
+* 运行时语义（详见 delegation.ts）：
+* - provider/model 显式时注入子代理 `agentOptions`（覆盖"继承主代理"快照）；
+* - reasoningEffort 显式时经私有字段随 agentOptions 抵达子代理，再由
+*   `agent/request` 瀑布监听器应用（dsh 原生 AgentOptions 不含 effort 字段）。
+*
+* 类型说明：z.dict 的推断类型引用 cosmokit 的 Dict，直接导出会触发
+* dts 的 TS2742（不可具名引用）；按官方 dsh-permission-presets 模式，
+* 显式声明输入/输出接口并注解 schema（输出为规范型，输入为可空宽松型）。
+* @module subagent-model/config
+*/
 /** settings 命名空间；webui 配置卡片与插件运行期读取同一份（字面量见 ./ns.ts）。 */
-const SETTINGS_NS = settingsNamespace(SETTINGS_NS$1);
+const SETTINGS_NS = settingsNamespace("dsh-plus-subagent-model");
 /** 思考程度哨兵值：继承主代理（不注入 effort 字段）。 */
 const EFFORT_INHERIT = "inherit";
-/** 思考程度哨兵值：跟随模型默认（显式剥离任何继承/推导出的 effort）。 */
-const EFFORT_DEFAULT = "default";
 const EntrySchema = z.object({
 	enabled: z.boolean().description("该子代理 provider 行的开关").default(false),
 	provider: z.string().description("LLM 提供商 id；留空 = 继承主代理").default(""),
 	model: z.string().description("模型 id；留空 = 继承主代理").default(""),
-	reasoningEffort: z.string().description(`思考程度：${EFFORT_INHERIT}（继承主代理）/ ${EFFORT_DEFAULT}（跟随模型默认）/ 提供商目录档位 id`).default(EFFORT_INHERIT)
+	reasoningEffort: z.string().description(`思考程度：${EFFORT_INHERIT}（继承主代理）/ default（跟随模型默认）/ 提供商目录档位 id`).default(EFFORT_INHERIT)
 });
 const Config = z.object({
 	enabled: z.boolean().description("总开关").default(false),
@@ -40,7 +42,7 @@ function resolveEntry(entry) {
 	const out = {};
 	if (entry.provider.length > 0) out.provider = entry.provider;
 	if (entry.model.length > 0) out.model = entry.model;
-	if (entry.reasoningEffort !== EFFORT_INHERIT) out.reasoningEffort = entry.reasoningEffort;
+	if (entry.reasoningEffort !== "inherit") out.reasoningEffort = entry.reasoningEffort;
 	return out.provider !== void 0 || out.model !== void 0 || out.reasoningEffort !== void 0 ? out : void 0;
 }
 /**
@@ -61,8 +63,8 @@ function mergeAgentOptions(injected, existing) {
 */
 function applyEffort(resolved, effort) {
 	if (effort === void 0) return resolved;
-	if (effort === EFFORT_DEFAULT) {
-		const { reasoningEffort: _dropped,...rest } = resolved;
+	if (effort === "default") {
+		const { reasoningEffort: _dropped, ...rest } = resolved;
 		return rest;
 	}
 	return {
@@ -81,13 +83,12 @@ function validateEntry(entry) {
 }
 /** 校验整组条目（settings 写入的 validate 钩子用）；返回首个错误消息，合法时返回 null。 */
 function validateEntries(entries) {
-	for (const [name$1, entry] of Object.entries(entries)) {
+	for (const [name, entry] of Object.entries(entries)) {
 		const error = validateEntry(entry);
-		if (error !== null) return `条目 ${name$1}: ${error}`;
+		if (error !== null) return `条目 ${name}: ${error}`;
 	}
 	return null;
 }
-
 //#endregion
 //#region src/catalog.ts
 function toEffort(effort) {
@@ -154,7 +155,6 @@ function subagentProvidersOf(ctx) {
 	const subagents = ctx.get("subagents");
 	return subagents === void 0 ? [] : [...subagents.list()];
 }
-
 //#endregion
 //#region src/config-api.ts
 const ROUTE_CATALOG = "/dsh-plus/subagent-model/catalog";
@@ -192,13 +192,12 @@ function registerCatalogApi(ctx) {
 		})
 	});
 }
-
 //#endregion
 //#region src/delegation.ts
 const WRAPPED = Symbol("dsh-plus-subagent-model.wrapped");
-function entryFor(current, name$1) {
-	if (name$1 === void 0) return void 0;
-	const entry = current().entries[name$1];
+function entryFor(current, name) {
+	if (name === void 0) return void 0;
+	const entry = current().entries[name];
 	return entry === void 0 ? void 0 : resolveEntry(entry);
 }
 /**
@@ -220,10 +219,10 @@ function installDelegationHook(ctx, current) {
 	}
 	const originalStart = subagents.start.bind(subagents);
 	const originalContinuable = subagents.startContinuable.bind(subagents);
-	subagents.start = async (name$1, request) => {
-		const injected = entryFor(current, name$1);
-		if (injected === void 0) return originalStart(name$1, request);
-		return originalStart(name$1, {
+	subagents.start = async (name, request) => {
+		const injected = entryFor(current, name);
+		if (injected === void 0) return originalStart(name, request);
+		return originalStart(name, {
 			...request,
 			agentOptions: mergeAgentOptions(injected, request.agentOptions)
 		});
@@ -268,9 +267,19 @@ function installChildRoute(ctx) {
 		return applyEffort(resolved, effort);
 	});
 }
-
 //#endregion
 //#region src/service.ts
+/**
+* SubagentModelService：子代理模型配置中枢。
+* - 配置：installSettingsSection 接入 settings 用户层（$DSH_HOME/settings.yaml，热生效），
+*   无 settings provider 时退化为 cordis 行级 config；写入经 validate 钩子
+*   走 validateEntries 规则（model 不能脱离 provider 等），非法即拒。
+* - 委托挂钩：包装 ctx.subagents.start/startContinuable，按 provider 名注入
+*   agentOptions（provider/model/effort 私有标记），未命中条目完全直通。
+* - 子代理路由：根 ctx 的 agent/request 瀑布监听，把条目 effort 应用到子代理请求。
+* - 自定义端点：ctx.webServer 仅注册模型目录路由（配置读写已走官方 settings RPC）。
+* @module @dsh-plus/subagent-model
+*/
 var SubagentModelService = class extends Service {
 	static [Context.inject] = ["subagents", "llm"];
 	current;
@@ -303,7 +312,6 @@ var SubagentModelService = class extends Service {
 		return subagents === void 0 ? [] : [...subagents.list()];
 	}
 };
-
 //#endregion
 //#region src/index.ts
 const name = "dsh-plus-subagent-model";
@@ -311,6 +319,5 @@ const inject = ["subagents", "llm"];
 function apply(ctx, config) {
 	ctx.plugin(SubagentModelService, config);
 }
-
 //#endregion
-export { Config, SubagentModelService, apply, inject, name };
+export { Config, SubagentModelService, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/subagent-model",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "dsh-plus service+ui plugin: 为 subagent/subagent_fork 等子代理按提供商配置模型与思考程度（或继承主代理）",
   "type": "module",
   "main": "lib/index.js",
@@ -40,12 +40,12 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
     "@deepseek-ai/cosmokit": "1.8.2",
-    "@deepseek-ai/dsh-agent": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-session": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-subagent": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-subagent": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
     "@types/react": "~18.3.1",
     "react": "^18.2.0"

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 }>
         }>
       }