@hyzyn/dsh-docker 0.5.0 → 0.6.0

package/lib/index.js

@@ -2,7 +2,7 @@ import z from '@deepseek-ai/schemastery';
 import { definePlugin } from '@hyzyn/dsh-kit';
 import { defineTool } from '@deepseek-ai/dsh-tools';
 import { DockerApi, assertBin, assertImageRef, assertRef, createRunner, parseImageHistoryJson, parseImageHistoryText, parseContainerEvent, parseEventsJson, parseImageInspectJson, parseInspectJson, parsePsJson, parseStatsJson, } from './docker.js';
-import { RemoteExec, sshTarget } from './ssh-exec.js';
+import { RemoteExec, setCredentialResolver, sshTarget } from './ssh-exec.js';
 const TARGET_SCHEMA = z.object({
     name: z.string().required(),
     kind: z.union([z.const('local'), z.const('ssh')]).default('local'),
@@ -13,7 +13,7 @@ const TARGET_SCHEMA = z.object({
     username: z.string().default(''),
     auth: z.union([z.const('agent'), z.const('key'), z.const('password')]).default('agent'),
     keyPath: z.string().default(''),
-    /** 建议写 `env:VAR` 引用（env 插件托管），避免明文落盘。 */
+    /** 建议写 `env:NAME` 凭据引用（官方凭据层解析），避免明文落盘。 */
     password: z.string().default(''),
     passphrase: z.string().default(''),
     agentForward: z.boolean().default(false),
@@ -679,6 +679,21 @@ const plugin = definePlugin({
                 return `\n- ${row.name} (${row.kind}) ${row.label}${state}`;
             }).join('');
         };
+        /**
+         * 容器行 → 一行文本。入参是**工具 schema 的扁平形状**（不是领域类型 `ContainerSummary`）：
+         * `ports` 已经是拼好的字符串、id 在 `id` 上、可省字段用 `undefined` 表示「无」。
+         *
+         * 这里踩过一次：渲染器按领域类型写（`row.ports.map(...)` / `row.shortId` /
+         * `row.health === null`），而工具返回的是扁平形状——于是 `ports.map is not a function`
+         * 直接崩、`id=undefined`。render 的入参是 `unknown` + 一个不受检查的 `as` 断言，
+         * 所以 tsc 抓不到。现在两侧共用下面这些 Tool*Row 类型，形状一变就编译报错。
+         */
+        const renderPsRow = (row) => {
+            const ports = row.ports === undefined || row.ports === '' ? '' : ' ports=' + row.ports;
+            const health = row.health === undefined ? '' : ` health=${row.health}`;
+            const compose = row.composeProject === undefined ? '' : ` compose=${row.composeProject}/${row.composeService ?? '-'}`;
+            return `\n- ${row.name} [${row.state}]${health} image=${row.image}${ports}${compose} id=${row.id}`;
+        };
         /** 跨目标容器渲染：按目标分组，失败的目标单独一行说明（部分成功也要可读）。 */
         const renderAggregatedContainers = (groups) => {
             if (groups.length === 0)
@@ -690,13 +705,7 @@ const plugin = definePlugin({
                 if (!group.ok)
                     return `\n\n■ ${group.target}（${group.label}）— 不可用：${group.error ?? '未知错误'}`;
                 const rows = group.containers ?? [];
-                return `\n\n■ ${group.target}（${group.label}）— ${String(rows.length)} 个容器` + rows.map((row) => {
-                    const ports = row.ports.length === 0
-                        ? ''
-                        : ' ports=' + row.ports.map((p) => (p.hostPort === undefined ? `${String(p.containerPort)}/${p.protocol}` : `${String(p.hostPort)}→${String(p.containerPort)}/${p.protocol}`)).join(',');
-                    const health = row.health === null ? '' : ` health=${row.health}`;
-                    return `\n- ${row.name} [${row.state}]${health} image=${row.image}${ports} id=${row.shortId}`;
-                }).join('');
+                return `\n\n■ ${group.target}（${group.label}）— ${String(rows.length)} 个容器` + rows.map(renderPsRow).join('');
             }).join('');
         };
         const ATTENTION_LABEL = {
@@ -706,7 +715,7 @@ const plugin = definePlugin({
             'exit-nonzero': '非零退出',
             dead: '僵死',
         };
-        /** 需关注列表渲染（单目标 / 跨目标共用）。 */
+        /** 需关注列表渲染（单目标 / 跨目标共用）。入参同样是**工具扁平形状**，不是 AttentionItem。 */
         const renderAttention = (groups) => {
             const total = groups.reduce((sum, group) => sum + (group.items?.length ?? 0), 0);
             if (total === 0 && groups.every((group) => group.ok))
@@ -720,38 +729,32 @@ const plugin = definePlugin({
                 return `\n\n■ ${group.target}（${group.label}）` + items.map((item) => {
                     const reasons = item.reasons.map((reason) => ATTENTION_LABEL[reason] ?? reason).join(' + ');
                     const extra = [
-                        item.exitCode === null ? '' : `exit=${String(item.exitCode)}`,
-                        item.restartCount === null ? '' : `restarts=${String(item.restartCount)}`,
+                        item.exitCode === undefined ? '' : `exit=${String(item.exitCode)}`,
+                        item.restartCount === undefined ? '' : `restarts=${String(item.restartCount)}`,
                         item.oomKilled ? 'OOMKilled=true' : '',
                     ].filter((part) => part !== '').join(' ');
-                    return `\n- ${item.name} [${item.state}${item.health === null ? '' : '/' + item.health}] ${reasons} image=${item.image}${extra === '' ? '' : ' ' + extra} id=${item.shortId}`;
+                    const health = item.health === undefined ? '' : '/' + item.health;
+                    return `\n- ${item.name} [${item.state}${health}] ${reasons} image=${item.image}${extra === '' ? '' : ' ' + extra} id=${item.id}`;
                 }).join('');
             }).join('');
         };
         const renderContainers = (target, rows) => {
             if (rows.length === 0)
                 return `目标 ${target}：没有容器。`;
-            return `目标 ${target} 的容器（${String(rows.length)} 个）：` + rows.map((row) => {
-                const ports = row.ports.length === 0
-                    ? ''
-                    : ' ports=' + row.ports.map((p) => (p.hostPort === undefined ? `${String(p.containerPort)}/${p.protocol}` : `${String(p.hostPort)}→${String(p.containerPort)}/${p.protocol}`)).join(',');
-                const health = row.health === null ? '' : ` health=${row.health}`;
-                const compose = row.composeProject === null ? '' : ` compose=${row.composeProject}/${row.composeService ?? '-'}`;
-                return `\n- ${row.name} [${row.state}]${health} image=${row.image}${ports}${compose} id=${row.shortId}`;
-            }).join('');
+            return `目标 ${target} 的容器（${String(rows.length)} 个）：` + rows.map(renderPsRow).join('');
         };
         const renderStats = (target, rows) => {
             if (rows.length === 0)
                 return `目标 ${target}：没有运行中的容器。`;
-            return `目标 ${target} 的资源占用：` + rows.map((row) => `\n- ${row.name} cpu=${row.cpuPercent === null ? '?' : String(row.cpuPercent) + '%'} mem=${row.memUsage} (${row.memPercent === null ? '?' : String(row.memPercent) + '%'}) net=${row.netIO} block=${row.blockIO} pids=${row.pids === null ? '?' : String(row.pids)}`).join('');
+            return `目标 ${target} 的资源占用：` + rows.map((row) => `\n- ${row.name} cpu=${row.cpuPercent === undefined ? '?' : String(row.cpuPercent) + '%'} mem=${row.memUsage} (${row.memPercent === undefined ? '?' : String(row.memPercent) + '%'}) net=${row.netIO} block=${row.blockIO} pids=${row.pids === undefined ? '?' : String(row.pids)}`).join('');
         };
         const renderEvents = (target, since, rows) => {
             if (rows.length === 0)
                 return `目标 ${target}：最近 ${since} 没有容器事件。`;
             return `目标 ${target} 的容器事件（最近 ${since}，${String(rows.length)} 条）：` + rows.map((row) => {
-                const at = row.time === null ? '--:--:--' : formatEventTime(row.time);
-                const exit = row.exitCode === null ? '' : ` exit=${String(row.exitCode)}`;
-                const compose = row.composeProject === null ? '' : ` compose=${row.composeProject}`;
+                const at = row.time === undefined ? '--:--:--' : formatEventTime(row.time);
+                const exit = row.exitCode === undefined ? '' : ` exit=${String(row.exitCode)}`;
+                const compose = row.composeProject === undefined ? '' : ` compose=${row.composeProject}`;
                 return `\n- ${at} ${row.name} ${row.action}${exit}${compose} image=${row.image}`;
             }).join('');
         };
@@ -775,22 +778,25 @@ const plugin = definePlugin({
             if (rows.length === 0)
                 return `目标 ${target}：没有网络。`;
             return `目标 ${target} 的网络（${String(rows.length)} 个）：` + rows.map((row) => {
-                const internal = row.internal ? ' internal=true' : '';
-                return `\n- ${row.name} driver=${row.driver} scope=${row.scope}${internal} id=${row.shortId}`;
+                const internal = row.internal === true ? ' internal=true' : '';
+                return `\n- ${row.name} driver=${row.driver} scope=${row.scope}${internal} id=${row.id}`;
             }).join('');
         };
         const renderVolumes = (target, rows) => {
             if (rows.length === 0)
                 return `目标 ${target}：没有卷。`;
             return `目标 ${target} 的卷（${String(rows.length)} 个）：` + rows.map((row) => {
-                const mount = row.mountpoint === '' ? '' : ` mount=${row.mountpoint}`;
+                const mount = row.mountpoint === undefined || row.mountpoint === '' ? '' : ` mount=${row.mountpoint}`;
                 return `\n- ${row.name} driver=${row.driver} scope=${row.scope}${mount}`;
             }).join('');
         };
         const renderImages = (target, rows) => {
             if (rows.length === 0)
                 return `目标 ${target}：没有镜像。`;
-            return `目标 ${target} 的镜像（${String(rows.length)} 个）：` + rows.map((row) => `\n- ${row.reference} ${row.sizeText}${row.createdSince === '' ? '' : ' (' + row.createdSince + ')'} id=${row.shortId}`).join('');
+            return `目标 ${target} 的镜像（${String(rows.length)} 个）：` + rows.map((row) => {
+                const created = row.createdSince === undefined || row.createdSince === '' ? '' : ' (' + row.createdSince + ')';
+                return `\n- ${row.reference} ${row.sizeText}${created} id=${row.id}`;
+            }).join('');
         };
         /** 镜像详情 + 构建历史（agent 工具 docker_image_inspect 的可读渲染）。 */
         const renderImageDetail = (payload) => {
@@ -1749,6 +1755,21 @@ const plugin = definePlugin({
             }
         };
         // tools 服务（可选）：拿到后注册一次，能力开关变化时 refreshTools 重注册
+        /*
+         * 官方凭据层（可选，`@deepseek-ai/dsh-credentials` 提供的 `ctx.credentials`）。
+         *
+         * 配置里的 `env:NAME` 是一个**引用**（这正是官方的模式：配置只持引用，值归 provider），
+         * 而 provider 会叠 `file`（`$DSH_HOME/.credentials.yaml`）/ `env` / `project-env` /
+         * `user-env` 各层，并保证「每次操作重新解析」——改完下一个操作即生效，不必重启宿主。
+         * 我们从前直接读 `process.env`，等于只认其中一层，而且拿的是进程启动时的快照。
+         *
+         * 服务缺失（老宿主 / 未装该 bundle）时不注册，`resolveSecret` 自己退回 `process.env`，
+         * 行为与从前一致——所以这是**可选**依赖，不抬高 engines 下限。
+         */
+        ctx.inject(['credentials'], (credCtx) => {
+            setCredentialResolver(credCtx.credentials ?? null);
+            return () => { setCredentialResolver(null); };
+        });
         ctx.inject(['tools'], (toolsCtx) => {
             toolsCtx.effect(() => {
                 toolsApi = toolsCtx.tools;