@dsh-plus/subagent-model 0.1.2 → 0.1.4

package/lib/client.js

@@ -611,9 +611,78 @@ const name = "dsh-plus-subagent-model";
 const inject = [
 	"slots",
 	"locale",
-	"settingsScope",
-	"connection"
+	"connection",
+	"remote"
 ];
+/**
+* api 直连实现的命名空间 scope（官方配置页 tab 同款模式）。
+* 读：describe 取命名空间视图（脱敏 value/revision + 顶层 writable）；
+* 刷新：remote `settings/document-updated`（按命名空间过滤）与
+* `connection/reset`；generation 防旧读覆盖新发布。任何页面 origin
+* （loopback 或 tailnet 信任域名）下行为一致。
+*/
+function createApiScope(api, ns, c) {
+	let state = {
+		status: "loading",
+		value: void 0,
+		revision: void 0,
+		writable: false
+	};
+	const listeners = /* @__PURE__ */ new Set();
+	let generation = 0;
+	const publish = (next) => {
+		state = next;
+		for (const listener of [...listeners]) listener();
+	};
+	const load = async () => {
+		const gen = ++generation;
+		let response;
+		try {
+			response = await api.describe({});
+		} catch {
+			return;
+		}
+		if (gen !== generation || !response.result.ok) return;
+		const writable = response.result.value?.writable ?? false;
+		const view = response.result.value?.namespaces.find((candidate) => candidate.ns === ns);
+		if (view === void 0) {
+			publish({
+				status: "unavailable",
+				value: void 0,
+				revision: void 0,
+				writable
+			});
+			return;
+		}
+		publish({
+			status: "ready",
+			value: view.value,
+			revision: view.revision,
+			writable
+		});
+	};
+	const refresh = (namespace) => {
+		if (namespace !== void 0 && namespace !== ns) return;
+		load();
+	};
+	const disposers = [c.get("remote").$on("settings/document-updated", refresh), c.on("connection/reset", () => {
+		load();
+	})];
+	c.effect(() => () => {
+		for (const dispose of disposers) dispose();
+	}, "subagent-model: settings scope");
+	load();
+	return {
+		getSnapshot: () => state,
+		subscribe: (listener) => {
+			listeners.add(listener);
+			return () => {
+				listeners.delete(listener);
+			};
+		},
+		load
+	};
+}
 function apply(ctx) {
 	const c = ctx;
 	const tag = injectStyle();
@@ -624,8 +693,8 @@ function apply(ctx) {
 		zh,
 		en
 	}), "subagent-model: locale");
-	const scope = c.settingsScope.bind({ namespace: SETTINGS_NS });
 	const api = c.get("connection").api.settings;
+	const scope = createApiScope(api, SETTINGS_NS, c);
 	c.slots.inject("settings.plugin.item", () => c.slots.register({
 		name: "settings.plugin.item",
 		key: SETTINGS_NS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/subagent-model",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "dsh-plus service+ui plugin: 为 subagent/subagent_fork 等子代理按提供商配置模型与思考程度（或继承主代理）",
   "type": "module",
   "main": "lib/index.js",
@@ -26,24 +26,24 @@
         "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-connection",
-        "@deepseek-ai/dsh-client-ui-settings"
+        "@deepseek-ai/dsh-api-remotes"
       ],
       "platform": "web"
     }
   },
   "dependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
     "@deepseek-ai/schemastery": "3.18.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
     "@deepseek-ai/cosmokit": "1.8.2",
-    "@deepseek-ai/dsh-agent": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-session": "0.1.0-rc.7",
-    "@deepseek-ai/dsh-subagent": "0.1.0-rc.7",
+    "@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-subagent": "0.1.0-rc.8",
     "@types/react": "~18.3.1",
     "react": "^18.2.0"
   },

package/src/client/client.ts

@@ -3,15 +3,16 @@
  * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
  *
- * 类型说明：浏览器半只用到 slots/locale/settingsScope/connection 的很窄一面，
+ * 类型说明：浏览器半只用到 slots/locale/connection/remote 的很窄一面，
  * 此处以最小本地接口声明（见 ./scope.ts），避免为构建期类型引入整条官方
  * client 依赖树；运行时契约以官方 dsh-client-ui-settings-plugins 的
- * settings.plugin.item 插槽与 dsh-client-ui-settings 的 settingsScope 服务为准。
+ * settings.plugin.item 插槽与 dsh-client-connection 的 settings RPC 面为准。
  * rc7 起该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
  * （即服务端 settingsNamespace() 注册的同一字面量，见 ../ns.ts），
  * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
- * 配置读写经官方 settingsScope 传输（rc7 起第三方命名空间对 settings RPC
- * 全量开放）；自定义端点仅剩「模型目录」（api.ts）。
+ * 配置读写经官方 settings RPC 直连（rc7 起第三方命名空间全量开放；
+ * 不复用 settingsScope 服务——非 loopback 页面下它无数据，见 scope.ts）；
+ * 自定义端点仅剩「模型目录」（api.ts）。
  * @module @dsh-plus/subagent-model/client
  */
 import type { Context } from '@deepseek-ai/cordis'
@@ -25,7 +26,7 @@ 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', 'settingsScope', 'connection'] as const
+export const inject = ['slots', 'locale', 'connection', 'remote'] as const
 
 interface SlotsLike {
   inject(key: string, callback: () => unknown): unknown
@@ -37,23 +38,86 @@ interface LocaleLike {
   bind(ns: string): (key: string) => string
 }
 
-interface SettingsScopeServiceLike {
-  bind(spec: { namespace: string }): Scope
+interface RemoteLike {
+  $on(event: string, listener: (payload?: unknown) => void): () => void
 }
 
 interface ConnectionLike {
-  settings: SettingsApi
+  api: { settings: SettingsApi }
 }
 
 interface ClientContext {
   slots: SlotsLike
   locale: LocaleLike
-  settingsScope: SettingsScopeServiceLike
   get(key: 'connection'): ConnectionLike
+  get(key: 'remote'): RemoteLike
+  on(event: string, listener: () => void): () => void
   effect(execute: () => () => void, label?: string): unknown
 }
 
+/**
+ * api 直连实现的命名空间 scope（官方配置页 tab 同款模式）。
+ * 读：describe 取命名空间视图（脱敏 value/revision + 顶层 writable）；
+ * 刷新：remote `settings/document-updated`（按命名空间过滤）与
+ * `connection/reset`；generation 防旧读覆盖新发布。任何页面 origin
+ * （loopback 或 tailnet 信任域名）下行为一致。
+ */
+function createApiScope(api: SettingsApi, ns: string, c: ClientContext): Scope {
+  let state: ScopeSnapshot = { status: 'loading', value: undefined, revision: undefined, writable: false }
+  const listeners = new Set<() => void>()
+  let generation = 0
+  const publish = (next: ScopeSnapshot): void => {
+    state = next
+    for (const listener of [...listeners]) listener()
+  }
+  const load = async (): Promise<void> => {
+    const gen = ++generation
+    let response
+    try {
+      response = await api.describe({})
+    } catch {
+      return
+    }
+    if (gen !== generation || !response.result.ok) return
+    const writable = response.result.value?.writable ?? false
+    const view = response.result.value?.namespaces.find((candidate) => candidate.ns === ns)
+    if (view === undefined) {
+      publish({ status: 'unavailable', value: undefined, revision: undefined, writable })
+      return
+    }
+    publish({ status: 'ready', value: view.value, revision: view.revision, writable })
+  }
+  const refresh = (namespace?: unknown): void => {
+    if (namespace !== undefined && namespace !== ns) return
+    void load()
+  }
+  const disposers = [
+    c.get('remote').$on('settings/document-updated', refresh),
+    c.on('connection/reset', () => {
+      void load()
+    }),
+  ]
+  c.effect(
+    () => () => {
+      for (const dispose of disposers) dispose()
+    },
+    'subagent-model: settings scope',
+  )
+  void load()
+  return {
+    getSnapshot: () => state,
+    subscribe: (listener: () => void) => {
+      listeners.add(listener)
+      return () => {
+        listeners.delete(listener)
+      }
+    },
+    load,
+  }
+}
+
 export function apply(ctx: Context): void {
+
   const c = ctx as unknown as ClientContext
   const tag = injectStyle()
   c.effect(
@@ -66,8 +130,8 @@ 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
+  const scope = createApiScope(api, SETTINGS_NS, c)
   c.slots.inject('settings.plugin.item', () =>
     c.slots.register(
       {

package/src/client/scope.ts

@@ -1,10 +1,14 @@
 /**
  * 浏览器半 settingsScope/connection 的最小本地接口声明。
  * 只声明本插件用到的窄面，避免为构建期类型引入整条官方 client 依赖树；
- * 运行时契约以官方 dsh-client-ui-settings 的 settingsScope 服务与
- * dsh-client-connection 的 settings RPC 面为准（rc7：白名单已移除，
- * 任何已注册命名空间均可 describe/update/replace）。
- * @module subagent-model/client/scope
+ * 运行时契约以官方 dsh-client-connection 的 settings RPC 面为准
+ * （rc7：白名单已移除，任何已注册命名空间均可 describe/update/replace）。
+ *
+ * 实现说明：本插件不复用 settingsScope 服务的 bind()——它在非 loopback
+ * 页面（如经 tailnet 域名访问）下走 memory 模式、永远无数据；这里按官方
+ * 配置页 tab 的同款模式用 `api.settings` 直连实现 Scope（describe 读 +
+ * remote `settings/document-updated` / `connection/reset` 刷新，见 client.ts）。
+ * @module {pkg}/client/scope
  */
 
 /** settings 命名空间 scope 的快照（官方 SettingsScopeSnapshot 的最小投影）。 */
@@ -27,7 +31,7 @@ export interface Scope {
 
 /** 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 } } }>
+  describe(payload?: Record<string, never>): 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 } } }>
 }