@dsh-plus/actual 0.2.6 → 0.2.8

package/lib/client.js

@@ -208,6 +208,106 @@ window.__ModuleLoader__.load({
 			}, reg.component));
 		}
 		//#endregion
+		//#region ../shared/src/client/credentials.tsx
+		/**
+		* 凭据面（共享件）：官方 settings-controller 的 `remote.credentials` 命名空间
+		* （describe/set/unset/onChange），复用官方 credentials seam，不另开 HTTP 端点。
+		* **值只写不读**——describe 只回「已配置 / 来源 / 可写」，没有任何方法回传值。
+		*
+		* 凭据与 settings 草稿相互独立：不进命名空间、不参与脏判定，保存即落
+		* `$DSH_HOME/.credentials.yaml` 并热生效（宿主每次工具调用重新 resolve），
+		* 因此改口令不需要保存卡片、也不需要 /reload 或重启。
+		* @module @dsh-plus/shared/client/credentials
+		*/
+		/**
+		* 把官方 `remote.credentials` 收成窄面：只补一个把宿主事件包成订阅的方法，
+		* 让状态层不必认识 `$on` 的事件名与载荷形状。
+		*/
+		function credentialsFace(remote) {
+			const { credentials } = remote;
+			return {
+				describe: (refs) => credentials.describe(refs),
+				set: (ref, value) => credentials.set(ref, value),
+				unset: (ref) => credentials.unset(ref),
+				onChange: (listener) => remote.$on("credentials/reference-updated", (ref) => {
+					if (typeof ref === "string") listener(ref);
+				})
+			};
+		}
+		/** 未答（或应答缺项）时的视图：按「未配置、可写」呈现。 */
+		const ABSENT_VIEW = {
+			configured: false,
+			writable: true
+		};
+		/** 取某引用的视图；应答缺项回落为 {@link ABSENT_VIEW}。 */
+		function viewOf(views, ref) {
+			return views[ref] ?? ABSENT_VIEW;
+		}
+		/** 应答信封的错误文案（成功为空串）。 */
+		function failureOf(result) {
+			return result.ok ? "" : result.error.message ?? "";
+		}
+		function messageOf(error) {
+			return error instanceof Error ? error.message : String(error);
+		}
+		/**
+		* 凭据行状态：挂载即 describe 一次，写入后重新 describe；
+		* 外部改动经 `credentials/reference-updated` 触发同一路径刷新。
+		* @param face - 官方 credentials 远程面。
+		* @param refs - 本卡片关心的引用名（以换行拼接作为稳定依赖，避免数组身份抖动）。
+		*/
+		function useCredentials$1(face, refs) {
+			const key = refs.join("\n");
+			const [views, setViews] = (0, react.useState)({});
+			const [busy, setBusy] = (0, react.useState)(false);
+			const [error, setError] = (0, react.useState)("");
+			const read = (0, react.useCallback)(async () => {
+				const list = key === "" ? [] : key.split("\n");
+				const result = await face.describe(list);
+				if (!result.ok) {
+					setError(failureOf(result));
+					return;
+				}
+				setError("");
+				setViews(result.value);
+			}, [face, key]);
+			(0, react.useEffect)(() => {
+				read();
+			}, [read]);
+			(0, react.useEffect)(() => face.onChange((ref) => {
+				if ((key === "" ? [] : key.split("\n")).includes(ref)) read();
+			}), [
+				face,
+				key,
+				read
+			]);
+			const write = (0, react.useCallback)(async (run) => {
+				setBusy(true);
+				try {
+					const result = await run();
+					if (!result.ok) {
+						setError(failureOf(result));
+						return false;
+					}
+					setError("");
+					await read();
+					return true;
+				} catch (thrown) {
+					setError(messageOf(thrown));
+					return false;
+				} finally {
+					setBusy(false);
+				}
+			}, [read]);
+			return {
+				views,
+				busy,
+				error,
+				save: (0, react.useCallback)((ref, value) => write(() => face.set(ref, value)), [face, write]),
+				clear: (0, react.useCallback)((ref) => write(() => face.unset(ref)), [face, write])
+			};
+		}
+		//#endregion
 		//#region ../shared/src/client/draft.ts
 		/**
 		* 单命名空间 staged 草稿（简单配置卡片共用）：读 scope 快照、播种草稿、
@@ -606,78 +706,18 @@ ${extra}
 		];
 		//#endregion
 		//#region src/client/secrets.ts
-		/** 未答（或应答缺项）时的视图：按「未配置、可写」呈现。 */
-		const ABSENT_VIEW = {
-			configured: false,
-			writable: true
-		};
-		/** 取某引用的视图；应答缺项回落为 {@link ABSENT_VIEW}。 */
-		function viewOf(views, ref) {
-			return views[ref] ?? ABSENT_VIEW;
-		}
-		/** 应答信封的错误文案（成功为空串）。 */
-		function failureOf(result) {
-			return result.ok ? "" : result.error.message ?? "";
-		}
-		/** 提取异常文本。 */
-		function messageOf(error) {
-			return error instanceof Error ? error.message : String(error);
-		}
 		/**
-		* 订阅宿主凭据变更：只认本插件关心的引用，其余（别的插件写自己的密钥）
-		* 不触发重读。
-		*/
-		function useCredentialChanges(face, read) {
-			(0, react.useEffect)(() => face.onChange((ref) => {
-				if (CREDENTIAL_REFS.includes(ref)) read();
-			}), [face, read]);
-		}
-		/**
-		* 凭据行状态：挂载即 describe 一次，写入后重新 describe；
-		* 外部改动经 `credentials/reference-updated` 触发同一路径刷新。
+		* 浏览器半的凭据面：复用 `@dsh-plus/shared/client` 的凭据 hook（describe/set/unset，
+		* 支持多引用），此处只绑定本插件关心的引用清单。
+		*
+		* **值只写不读**——describe 只回「已配置 / 来源 / 可写」，没有任何方法回传值。
+		* 凭据与 settings 草稿相互独立：它不进命名空间、不参与脏判定，保存即落
+		* `$DSH_HOME/.credentials.yaml` 并热生效（宿主每次工具调用重新 resolve）。
+		* @module @dsh-plus/actual/client/secrets
 		*/
+		/** 本插件的凭据行状态（引用清单固定为 {@link CREDENTIAL_REFS}）。 */
 		function useCredentials(face) {
-			const [views, setViews] = (0, react.useState)({});
-			const [busy, setBusy] = (0, react.useState)(false);
-			const [error, setError] = (0, react.useState)("");
-			const read = (0, react.useCallback)(async () => {
-				const result = await face.describe([...CREDENTIAL_REFS]);
-				if (!result.ok) {
-					setError(failureOf(result));
-					return;
-				}
-				setError("");
-				setViews(result.value);
-			}, [face]);
-			(0, react.useEffect)(() => {
-				read();
-			}, [read]);
-			useCredentialChanges(face, read);
-			const write = (0, react.useCallback)(async (run) => {
-				setBusy(true);
-				try {
-					const result = await run();
-					if (!result.ok) {
-						setError(failureOf(result));
-						return false;
-					}
-					setError("");
-					await read();
-					return true;
-				} catch (thrown) {
-					setError(messageOf(thrown));
-					return false;
-				} finally {
-					setBusy(false);
-				}
-			}, [read]);
-			return {
-				views,
-				busy,
-				error,
-				save: (0, react.useCallback)((ref, value) => write(() => face.set(ref, value)), [face, write]),
-				clear: (0, react.useCallback)((ref) => write(() => face.unset(ref)), [face, write])
-			};
+			return useCredentials$1(face, CREDENTIAL_REFS);
 		}
 		//#endregion
 		//#region src/client/secrets-section.tsx
@@ -1132,22 +1172,6 @@ ${extra}
 			"remote.settings",
 			"remote.credentials"
 		];
-		/**
-		* 把官方 `remote.credentials` 收成窄面：只补一个把宿主事件包成订阅的方法，
-		* 让状态层不必认识 `$on` 的事件名与载荷形状。
-		*/
-		function credentialsFace(c) {
-			const remote = c.get("remote");
-			const { credentials } = remote;
-			return {
-				describe: (refs) => credentials.describe(refs),
-				set: (ref, value) => credentials.set(ref, value),
-				unset: (ref) => credentials.unset(ref),
-				onChange: (listener) => remote.$on("credentials/reference-updated", (ref) => {
-					if (typeof ref === "string") listener(ref);
-				})
-			};
-		}
 		function apply(ctx) {
 			const c = ctx;
 			const tag = injectStyle();
@@ -1160,7 +1184,7 @@ ${extra}
 			}), "actual: locale");
 			const scope = createSettingsScope(c, SETTINGS_NS, "actual: settings scope");
 			const api = createNamespaceApi(c.get("remote").settings, SETTINGS_NS);
-			const credentials = credentialsFace(c);
+			const credentials = credentialsFace(c.get("remote"));
 			injectPluginConfigCard(c.slots, {
 				ns: SETTINGS_NS,
 				rowId: "dsh-plus-actual",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/actual",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "dsh-plus service + UI plugin: Actual Budget 能力发现（@actual-app/cli help 树运行时派生 × 进程内 MCP tools/list）、actual agent 预设注册与配置卡片——零手工工具清单",
   "type": "module",
   "main": "lib/index.js",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@modelcontextprotocol/client": "2.3.0",
     "@dsh-plus/actual-mcp": "0.2.0",
-    "@dsh-plus/shared": "0.1.41"
+    "@dsh-plus/shared": "0.1.43"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.5-alpha.2",
-    "@deepseek-ai/dsh-agent-preset-registry": "^0.2.1-alpha.3",
-    "@deepseek-ai/schemastery": "^3.18.5-alpha.2"
+    "@deepseek-ai/cordis": "^4.0.5",
+    "@deepseek-ai/dsh-agent-preset-registry": "^0.2.1-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.5"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "4.0.5-alpha.2",
-    "@deepseek-ai/dsh-agent-preset-registry": "0.2.1-alpha.3",
-    "@deepseek-ai/schemastery": "3.18.5-alpha.2",
+    "@deepseek-ai/cordis": "4.0.5",
+    "@deepseek-ai/dsh-agent-preset-registry": "0.2.1-rc.2",
+    "@deepseek-ai/schemastery": "3.18.5",
     "@types/react": "~18.3.31",
     "react": "^18.2.0"
   },

package/src/client/client.ts

@@ -12,15 +12,15 @@ import type { Context } from '@deepseek-ai/cordis'
 import {
   createNamespaceApi,
   createSettingsScope,
+  credentialsFace,
   injectPluginConfigCard,
   type PluginClientContext,
-  type RemoteLike,
+  type RemoteWithCredentials,
 } from '@dsh-plus/shared/client'
 
 import { SETTINGS_NS } from '../ns.ts'
 import { ActualCard } from './card.tsx'
 import { type DictKey, en, NS, zh } from './i18n.ts'
-import type { CredentialsRemoteFace } from './secrets.ts'
 import { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-actual'
@@ -41,29 +41,6 @@ export const inject = [
 /** 宿主窄面收编在 @dsh-plus/shared/client；TKey 传入本包 DictKey 使键名受检。 */
 type ClientContext = PluginClientContext<DictKey>
 
-/** `remote` 服务加上凭据命名空间（inject 已声明，故按存在处理）。 */
-type RemoteWithCredentials = RemoteLike & {
-  credentials: Omit<CredentialsRemoteFace, 'onChange'>
-}
-
-/**
- * 把官方 `remote.credentials` 收成窄面：只补一个把宿主事件包成订阅的方法，
- * 让状态层不必认识 `$on` 的事件名与载荷形状。
- */
-function credentialsFace(c: ClientContext): CredentialsRemoteFace {
-  const remote = c.get('remote') as RemoteWithCredentials
-  const { credentials } = remote
-  return {
-    describe: (refs) => credentials.describe(refs),
-    set: (ref, value) => credentials.set(ref, value),
-    unset: (ref) => credentials.unset(ref),
-    onChange: (listener) =>
-      remote.$on('credentials/reference-updated', (ref) => {
-        if (typeof ref === 'string') listener(ref)
-      }),
-  }
-}
-
 export function apply(ctx: Context): void {
   const c = ctx as unknown as ClientContext
   const tag = injectStyle()
@@ -76,7 +53,7 @@ export function apply(ctx: Context): void {
   c.effect(() => c.locale.register(NS, { zh, en }), 'actual: locale')
   const scope = createSettingsScope(c, SETTINGS_NS, 'actual: settings scope')
   const api = createNamespaceApi(c.get('remote').settings, SETTINGS_NS)
-  const credentials = credentialsFace(c)
+  const credentials = credentialsFace(c.get('remote') as RemoteWithCredentials)
   injectPluginConfigCard(c.slots, {
     ns: SETTINGS_NS,
     rowId: 'dsh-plus-actual',

package/src/client/secrets.ts

@@ -1,132 +1,28 @@
 /**
- * 浏览器半的凭据面：官方 settings-controller 的 `remote.credentials` 命名空间
- * （describe/set/unset），复用官方 credentials seam，不另开 HTTP 端点。
- * **值只写不读**——describe 只回「已配置 / 来源 / 可写」，没有任何方法回传值。
+ * 浏览器半的凭据面：复用 `@dsh-plus/shared/client` 的凭据 hook（describe/set/unset，
+ * 支持多引用），此处只绑定本插件关心的引用清单。
  *
+ * **值只写不读**——describe 只回「已配置 / 来源 / 可写」，没有任何方法回传值。
  * 凭据与 settings 草稿相互独立：它不进命名空间、不参与脏判定，保存即落
- * `$DSH_HOME/.credentials.yaml` 并热生效（宿主每次工具调用重新 resolve），
- * 因此改口令不需要保存卡片、也不需要 /reload 或重启。
+ * `$DSH_HOME/.credentials.yaml` 并热生效（宿主每次工具调用重新 resolve）。
  * @module @dsh-plus/actual/client/secrets
  */
-import type { RemoteResult } from '@dsh-plus/shared/client'
-import { useCallback, useEffect, useState } from 'react'
+import {
+  type CredentialsRemoteFace,
+  type CredentialsState,
+  useCredentials as useSharedCredentials,
+} from '@dsh-plus/shared/client'
 
 import { CREDENTIAL_REFS } from '../refs.ts'
 
-/** 单个引用的安全视图：没有能承载值的字段。 */
-export interface CredentialView {
-  configured: boolean
-  source?: string
-  writable: boolean
-}
+export type {
+  CredentialsRemoteFace,
+  CredentialsState,
+  CredentialView,
+} from '@dsh-plus/shared/client'
+export { failureOf, viewOf } from '@dsh-plus/shared/client'
 
-/** 卡片用到的 `remote.credentials` 方法面。 */
-export interface CredentialsRemoteFace {
-  describe(refs: readonly string[]): Promise<RemoteResult<Record<string, CredentialView>>>
-  set(ref: string, value: string): Promise<RemoteResult<unknown>>
-  unset(ref: string): Promise<RemoteResult<unknown>>
-  /** 订阅引用变更（宿主提交写入或观察到凭据文件被外部编辑时触发）。 */
-  onChange(listener: (ref: string) => void): () => void
-}
-
-/** 未答（或应答缺项）时的视图：按「未配置、可写」呈现。 */
-export const ABSENT_VIEW: CredentialView = { configured: false, writable: true }
-
-/** 取某引用的视图；应答缺项回落为 {@link ABSENT_VIEW}。 */
-export function viewOf(views: Record<string, CredentialView>, ref: string): CredentialView {
-  return views[ref] ?? ABSENT_VIEW
-}
-
-/** 应答信封的错误文案（成功为空串）。 */
-export function failureOf(result: RemoteResult<unknown>): string {
-  return result.ok ? '' : (result.error.message ?? '')
-}
-
-/** 提取异常文本。 */
-function messageOf(error: unknown): string {
-  return error instanceof Error ? error.message : String(error)
-}
-
-/** 凭据读写的卡片状态。 */
-export interface CredentialsState {
-  views: Record<string, CredentialView>
-  /** 有写入在途（按钮禁用用）。 */
-  busy: boolean
-  /** 最近一次失败文案（空串 = 无）。 */
-  error: string
-  /** 写入成功返回 true（调用方据此决定是否清空输入框）。 */
-  save(ref: string, value: string): Promise<boolean>
-  clear(ref: string): Promise<boolean>
-}
-
-/**
- * 订阅宿主凭据变更：只认本插件关心的引用，其余（别的插件写自己的密钥）
- * 不触发重读。
- */
-function useCredentialChanges(face: CredentialsRemoteFace, read: () => void): void {
-  useEffect(
-    () =>
-      face.onChange((ref) => {
-        if ((CREDENTIAL_REFS as readonly string[]).includes(ref)) read()
-      }),
-    [face, read],
-  )
-}
-
-/**
- * 凭据行状态：挂载即 describe 一次，写入后重新 describe；
- * 外部改动经 `credentials/reference-updated` 触发同一路径刷新。
- */
+/** 本插件的凭据行状态（引用清单固定为 {@link CREDENTIAL_REFS}）。 */
 export function useCredentials(face: CredentialsRemoteFace): CredentialsState {
-  const [views, setViews] = useState<Record<string, CredentialView>>({})
-  const [busy, setBusy] = useState(false)
-  const [error, setError] = useState('')
-
-  const read = useCallback(async (): Promise<void> => {
-    const result = await face.describe([...CREDENTIAL_REFS])
-    if (!result.ok) {
-      setError(failureOf(result))
-      return
-    }
-    setError('')
-    setViews(result.value)
-  }, [face])
-
-  useEffect(() => {
-    void read()
-  }, [read])
-  useCredentialChanges(face, read)
-
-  const write = useCallback(
-    async (run: () => Promise<RemoteResult<unknown>>): Promise<boolean> => {
-      setBusy(true)
-      try {
-        const result = await run()
-        if (!result.ok) {
-          setError(failureOf(result))
-          return false
-        }
-        setError('')
-        await read()
-        return true
-      } catch (thrown: unknown) {
-        setError(messageOf(thrown))
-        return false
-      } finally {
-        setBusy(false)
-      }
-    },
-    [read],
-  )
-
-  const save = useCallback(
-    (ref: string, value: string): Promise<boolean> => write(() => face.set(ref, value)),
-    [face, write],
-  )
-  const clear = useCallback(
-    (ref: string): Promise<boolean> => write(() => face.unset(ref)),
-    [face, write],
-  )
-
-  return { views, busy, error, save, clear }
+  return useSharedCredentials(face, CREDENTIAL_REFS)
 }