@dsh-plus/actual 0.2.7 → 0.2.9

package/lib/index.d.ts

@@ -5,7 +5,6 @@ import { Context, Service } from "@deepseek-ai/cordis";
 import { PresetDefinition } from "@deepseek-ai/dsh-agent-preset-registry";
 //#region src/config.d.ts
 declare const Config: z<Schemastery.ObjectS<NoInfer<{
-  enabled: z<boolean, boolean, "volatile-defined">;
   name: z<string, string, "volatile-defined">;
   description: z<string, string, "volatile-defined">;
   order: z<number, number, "volatile-defined">;
@@ -31,7 +30,6 @@ declare const Config: z<Schemastery.ObjectS<NoInfer<{
   toolCallTimeoutMs: z<number, number, "volatile-defined">;
   namePrefix: z<string, string, "volatile-defined">;
 }>>, Schemastery.ObjectT<NoInfer<{
-  enabled: z<boolean, boolean, "volatile-defined">;
   name: z<string, string, "volatile-defined">;
   description: z<string, string, "volatile-defined">;
   order: z<number, number, "volatile-defined">;

package/lib/index.js

@@ -35,7 +35,6 @@ const SETTINGS_NS = "dsh-plus-actual";
 * @module @dsh-plus/actual/config
 */
 const Config = z.object({
-	enabled: z.boolean().description("总开关（false = 不注册 actual 预设，等价插件未安装）").default(true).volatile(),
 	name: z.string().description("预设显示名（设置 → Agent 预设卡片标题）").default("Actual Budget").volatile(),
 	description: z.string().description("预设说明（设置 → Agent 预设卡片描述）").default("专注操作 Actual Budget：仅暴露从本机 Actual CLI 自动派生的工具（help 树 × MCP tools/list），另配 web 检索/提问/待办辅助工具，写操作需确认。").volatile(),
 	order: z.number().description("预设名册排序位").default(11).volatile(),
@@ -790,7 +789,6 @@ const inject = [];
 */
 function apply(ctx, config) {
 	const plain = () => unwrapVolatile(config);
-	if (plain().enabled !== true) return;
 	const logger = ctx.logger("actual");
 	ctx.plugin(ActualService, config);
 	ctx.inject(["agentPresets"], (scope) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/actual",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "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.42"
+    "@dsh-plus/shared": "0.1.44"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.5-alpha.2",
-    "@deepseek-ai/dsh-agent-preset-registry": "^0.2.1-alpha.4",
-    "@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.4",
-    "@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/card.tsx

@@ -12,10 +12,11 @@
  */
 
 import {
-  CardChrome,
   CardLoading,
   CheckRow,
+  ConfigShell,
   type NamespaceSettingsApi,
+  Note,
   type PluginConfigViewProps,
   type Scope,
   SelectField,
@@ -72,16 +73,6 @@ function violationProps(
   return active ? { invalid: true, invalidLabel: label } : { invalid: false }
 }
 
-/** 说明段落（无编辑器的字段在此交代落点）。 */
-function Note(props: { title: string; body: string }): ReactElement {
-  return (
-    <div className="act-note">
-      <p className="act-noteTitle">{props.title}</p>
-      <p className="act-noteBody">{props.body}</p>
-    </div>
-  )
-}
-
 /** 连接小节：服务器地址、预算、CLI 命令与版本策略。 */
 function ConnectionSection(props: SectionProps): ReactElement {
   const { t, draft, disabled, violation, onEdit } = props
@@ -146,7 +137,7 @@ function PolicySection(props: SectionProps): ReactElement {
         disabled={disabled}
         onEdit={(value) => onEdit({ confirmWrites: value })}
       />
-      <p className="act-noteBody">{t('confirmWritesHint')}</p>
+      <p className="act-hint">{t('confirmWritesHint')}</p>
       <CheckRow
         prefix="act"
         id="act-aux-tools"
@@ -155,7 +146,7 @@ function PolicySection(props: SectionProps): ReactElement {
         disabled={disabled}
         onEdit={(value) => onEdit({ auxTools: value })}
       />
-      <p className="act-noteBody">{t('auxToolsHint')}</p>
+      <p className="act-hint">{t('auxToolsHint')}</p>
       <TextField
         prefix="act"
         id="act-name-prefix"
@@ -184,11 +175,10 @@ export function ActualCard(props: CardProps): ReactElement | string | null {
   const section: SectionProps = { t, draft, disabled, violation, onEdit: edit }
 
   return (
-    <CardChrome
+    <ConfigShell
       prefix="act"
       title={t('title')}
       description={t('description')}
-      statusBadge={{ text: t(draft.enabled ? 'enabledOn' : 'enabledOff'), on: draft.enabled }}
       dirty={dirty}
       dirtyLabel={t('unsaved')}
       readOnlyNotice={disabled ? t('readOnly') : undefined}
@@ -204,19 +194,10 @@ export function ActualCard(props: CardProps): ReactElement | string | null {
         },
       ]}
     >
-      <CheckRow
-        prefix="act"
-        id="act-enabled"
-        label={t('enabled')}
-        checked={draft.enabled}
-        disabled={disabled}
-        onEdit={(value) => edit({ enabled: value })}
-      />
-      <p className="act-noteBody">{t('enabledHint')}</p>
       <ConnectionSection {...section} />
       <SecretsSection t={t} face={credentials} />
       <PolicySection {...section} />
-      <Note title={t('advancedTitle')} body={t('advancedBody')} />
-    </CardChrome>
+      <Note prefix="act" title={t('advancedTitle')} body={t('advancedBody')} />
+    </ConfigShell>
   )
 }

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/draft.ts

@@ -13,7 +13,6 @@ export type CliVersionPolicy = 'warn' | 'strict'
 
 /** settings 命名空间里本卡片负责的字段（其余字段不出现在卡片中）。 */
 export interface ConfigValue {
-  enabled: boolean
   serverUrl: string
   syncId: string
   cliCommand: string[]
@@ -25,7 +24,6 @@ export interface ConfigValue {
 
 /** 编辑草稿：`cliCommand` 以文本承载（空格分隔的 argv）。 */
 export interface Draft {
-  enabled: boolean
   serverUrl: string
   syncId: string
   cliCommand: string
@@ -55,7 +53,6 @@ export function textToArgv(text: string): string[] {
 /** 命名空间解析值 → 草稿。 */
 export function draftFromValue(value: ConfigValue): Draft {
   return {
-    enabled: value.enabled,
     serverUrl: value.serverUrl,
     syncId: value.syncId,
     cliCommand: argvToText(value.cliCommand),
@@ -69,7 +66,6 @@ export function draftFromValue(value: ConfigValue): Draft {
 /** 草稿 → 命名空间补丁（仅本卡片负责的字段）。 */
 export function patchFromDraft(draft: Draft): Record<string, unknown> {
   return {
-    enabled: draft.enabled,
     serverUrl: draft.serverUrl.trim(),
     syncId: draft.syncId.trim(),
     cliCommand: textToArgv(draft.cliCommand),

package/src/client/i18n.ts

@@ -16,9 +16,6 @@ const ownZh = {
     '配置本机 Actual 同步服务器与 CLI 行为。改动热生效，无需重载：连接相关字段会触发能力重新发现。',
   summaryLine: 'Actual 服务器地址、预算 Sync ID、CLI 与工具策略。',
 
-  enabled: '启用 actual 预设',
-  enabledHint: '关闭即不注册该预设（等价插件未安装）；已开的会话保持原组合，新会话起不再出现。',
-
   serverUrl: '同步服务器地址',
   serverUrlHint:
     '自托管默认 http://127.0.0.1:5006。服务端版本从 <地址>/info 读取，用于版本一致性告警。',
@@ -78,10 +75,6 @@ const ownEn = {
     'Configure the local Actual sync server and CLI behaviour. Changes apply hot — connection fields trigger a fresh capability discovery.',
   summaryLine: 'Actual server address, budget sync ID, CLI and tool policy.',
 
-  enabled: 'Enable the actual preset',
-  enabledHint:
-    'Off stops registering the preset (equivalent to not installed). Live sessions keep their composition; new ones will not see it.',
-
   serverUrl: 'Sync server URL',
   serverUrlHint:
     'Self-hosted default is http://127.0.0.1:5006. The server version is read from <url>/info for the version-mismatch warning.',

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

package/src/config.ts

@@ -28,11 +28,6 @@ import { SETTINGS_NS as NS_LITERAL } from './ns.ts'
 export const SETTINGS_NS = NS_LITERAL
 
 export const Config = z.object({
-  enabled: z
-    .boolean()
-    .description('总开关（false = 不注册 actual 预设，等价插件未安装）')
-    .default(true)
-    .volatile(),
   name: z
     .string()
     .description('预设显示名（设置 → Agent 预设卡片标题）')

package/src/index.ts

@@ -71,8 +71,8 @@ declare module '@deepseek-ai/cordis' {
  */
 export function apply(ctx: Context, config: ActualConfig | ActualConfigFields): void {
   // 活动引用现取即热；预设声明在注册时定格，之后的改动经工具行策略热取。
+  // 整行开关由官方行开关承担（profile patch `disabled`），插件内不再有第二套总开关。
   const plain = (): ActualConfig => unwrapVolatile(config) as ActualConfig
-  if (plain().enabled !== true) return
   const logger = ctx.logger('actual')
 
   // 服务先行：子插件行 inject `actual`，预设激活即能接线。