@hyzyn/dsh-docker 0.7.1 → 0.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyzyn/dsh-docker",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "DSH Web GUI 的 Docker 容器面板插件：本机或 SSH 主机上的容器列表 / 启停删 / 日志 / 统计 / 镜像 / 一次性 exec，默认只读，配套只读优先的 agent 工具。",
   "keywords": [
     "dsh",
@@ -31,26 +31,28 @@
     "./package.json": "./package.json"
   },
   "dsh": {
+    "manifestVersion": 1,
     "bundle": {
       "patch": "./cordis.patch.yml"
     },
     "engines": {
-      "dsh": ">=0.1.2-rc.1"
+      "dsh": ">=0.1.7-rc.1"
     },
     "client": {
       "platform": "web"
     }
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.2",
-    "@hyzyn/dsh-kit": "0.4.1",
+    "@deepseek-ai/schemastery": "^3.18.4",
+    "@hyzyn/dsh-kit": "0.4.2",
     "ssh2": "^1.17.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-tools": "^0.1.2-rc.1"
+    "@deepseek-ai/dsh": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.1.7-rc.1"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/cordis": "^4.0.4",
     "@deepseek-ai/dsh-host-webserver": "0.1.2-rc.1",
     "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
     "@types/node": "^22.20.0",
@@ -79,6 +81,11 @@
   "publishConfig": {
     "access": "public"
   },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "tsc -p tsconfig.json && node scripts/build-client.mjs",
     "typecheck": "tsc --noEmit && node ../../scripts/client-lint.mjs",

package/scripts/route-smoke.mjs

@@ -173,19 +173,26 @@ function makeCtx(config, options = {}) {
     settingsStored: {},
     ttyConfig: options.ttyConfig,
     disposers: [],
+    /**
+     * 本插件 entry 的安装级配置（= apply 拿到的 config）。DSH ≥0.1.7 的
+     * `settings.describe()` 返回的是「默认值 ← 组合 base ← 用户层」的 resolved 值，
+     * 这里用 base ∪ settingsStored 模拟同一件事。
+     */
+    baseConfig: config,
   }
 
-  const scopeFor = (base) => ({
-    get: () => ({ ...base, ...state.settingsStored }),
-    update: async (patch) => {
-      Object.assign(state.settingsStored, patch)
-      // 真实实现会 emit settings/updated；这里同步触发，验证热更新路径
-      const listeners = state.listeners.get('settings/updated') ?? []
-      for (const listener of listeners) listener('docker', { ...base, ...state.settingsStored }, undefined, 'update')
-    },
-  })
+  /** loader 检出 volatile-only 变更后发的事件（测试里同步发，验证热更新路径）。 */
+  const emitVolatile = () => {
+    for (const listener of state.listeners.get('loader/volatile-update') ?? []) listener()
+  }
 
   const makeChild = (names) => {
+    const on = (name, listener) => {
+      const list = state.listeners.get(name) ?? []
+      list.push(listener)
+      state.listeners.set(name, list)
+      return () => {}
+    }
     const child = {
       logger: { info: () => {}, warn: () => {} },
       effect: (callback, _name) => {
@@ -198,14 +205,8 @@ function makeCtx(config, options = {}) {
         cb(grand)
         return () => {}
       },
-      events: {
-        on: (name, listener) => {
-          const list = state.listeners.get(name) ?? []
-          list.push(listener)
-          state.listeners.set(name, list)
-          return () => {}
-        },
-      },
+      on,
+      events: { on },
     }
     if (names.includes('tools')) {
       child.tools = {
@@ -227,9 +228,19 @@ function makeCtx(config, options = {}) {
       }
     }
     if (names.includes('settings')) {
+      // DSH ≥0.1.7 的 settings 服务（SettingsForms）：describe / update / configure。
+      // describe 里额外放一个 tty entry，模拟「tty 已安装、连接簿可读」。
       child.settings = {
-        register: (ns, schema, options_) => scopeFor(options_?.base ?? {}),
-        get: (ns) => (ns === 'tty' ? state.ttyConfig : undefined),
+        describe: () => [
+          { ns: 'docker', value: { ...state.baseConfig, ...state.settingsStored } },
+          ...(state.ttyConfig === undefined ? [] : [{ ns: 'tty', value: state.ttyConfig }]),
+        ],
+        update: async (ns, patch) => {
+          if (ns !== 'docker') throw new Error('未知的 entry: ' + ns)
+          Object.assign(state.settingsStored, patch)
+          emitVolatile()
+        },
+        configure: () => () => {},
       }
     }
     if (names.includes('systemPrompt')) {

package/scripts/smoke.mjs

@@ -662,6 +662,13 @@ test('resolveTarget：本机 / 连接簿命中 / 连接簿缺失 / 内联', () =
   const missing = host.resolveTarget({ name: 'prod', kind: 'ssh', book: 'nope' }, books)
   assert.equal(missing.resolved, undefined)
   assert.match(missing.error, /连接簿条目不存在：nope/)
+  /*
+   * 指引必须指向用户**真能做的动作**：旧文案让用户"去 tty 终端面板的设置卡片里添加"，
+   * 但那张卡片管的是 tty 自己的连接簿条目，改不了 docker 目标引用的名字——照着找只会扑空
+   * （实测：目标引用 HS-248、连接簿里只有 HS_248_ADMIN）。真正要改的是本卡片的「连接簿」下拉。
+   */
+  assert.match(missing.error, /本卡片/, '缺失引用时该指回本卡片的「连接簿」下拉')
+  assert.doesNotMatch(missing.error, /请在 tty 终端面板的设置卡片里添加/, '不该再让人去 tty 卡片做它做不到的事')
 
   const inline = host.resolveTarget({ name: 'inline', kind: 'ssh', host: 'h', username: 'u' }, books)
   assert.deepEqual(inline.resolved, { name: 'inline', kind: 'ssh', spec: { host: 'h', port: 22, username: 'u', auth: 'agent', keyPath: '', password: '', passphrase: '', agentForward: false } })