@stardustlc/dsh-docker 0.3.0 → 0.3.2

package/README.en.md

@@ -2,17 +2,17 @@
 
 # dsh-docker
 
-> **Your agent can manage containers now**: five tools covering container listing, logs, inspection, in-container exec, and lifecycle management.
+> **Your agent can manage containers now**: seven tools covering containers, images, logs, inspection, in-container exec, lifecycle management, and health checks.
 
-DSH (DeepSeek Harness) container-management plugin: runs the docker CLI through the official subprocess service with shell-free argv arrays, six tools including image listing, an approval gate on `docker_exec`, and **zero runtime dependencies**.
+DSH (DeepSeek Harness) container-management plugin: runs the docker CLI through the official subprocess service with shell-free argv arrays, approval gates on `docker_exec` and destructive lifecycle actions, and **zero runtime dependencies**.
 
-![npm version](https://img.shields.io/npm/v/dsh-docker?label=npm&color=blue) ![npm downloads](https://img.shields.io/npm/dm/dsh-docker) ![license](https://img.shields.io/npm/l/dsh-docker) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-docker?style=social)
+![npm version](https://img.shields.io/npm/v/@stardustlc/dsh-docker?label=npm&color=blue) ![npm downloads](https://img.shields.io/npm/dm/@stardustlc/dsh-docker) ![license](https://img.shields.io/npm/l/@stardustlc/dsh-docker) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-docker?style=social)
 
 [![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
 
 ## Compatibility
 
-Verified against `@deepseek-ai/dsh@0.1.1-rc.2` on 2026-08-26. Built for the cordis patch-bundle plugin model (`cordis.patch.yml` + `dsh.bundle.patch`). No runtime imports of `@deepseek-ai/*` internals.
+Verified against the official `@deepseek-ai/dsh@0.1.3-alpha.2` on 2026-09-08, including an 18-component co-load and the full tool registration/invocation contract. Built for the cordis patch-bundle model (`cordis.patch.yml` + `dsh.bundle.patch`) with no runtime imports of `@deepseek-ai/*` internals.
 
 ## Installation
 
@@ -41,6 +41,7 @@ Then restart the web service. To clean up fully, also remove the plugin entry fr
     dockerPath: docker     # optional; or use the DSH_DOCKER_PATH env var
     timeoutMs: 60000       # per-operation timeout (default 60s, 5s - 10min)
     # execApproval: false  # disable the docker_exec approval gate (default true)
+    # manageApproval: false # disable approval for stop/restart/rm (default true; not recommended)
 ```
 
 ## Tools
@@ -52,7 +53,8 @@ Then restart the web service. To clean up fully, also remove the plugin entry fr
 | `docker_logs` | Tail container logs (line clamp, short follow) | — |
 | `docker_inspect` | Container details (image/state/ports) | — |
 | `docker_exec` | Run a command inside a container | Approval gate + container-name validation |
-| `docker_manage` | start / stop / restart / rm | Destructive actions clearly labeled |
+| `docker_manage` | start / stop / restart / rm | Approval gate for stop/restart/rm |
+| `docker_health` | Check Docker daemon and safety settings | — |
 
 ### Examples
 
@@ -69,7 +71,7 @@ docker_manage { container: web, action: restart }
 ## Safety
 
 - **No shell**: every argument is its own argv element — command injection is impossible
-- **Approval gate**: docker_exec asks first (mirroring dsh-email / dsh-sql); headless environments without an approval channel are denied
+- **Approval gates**: docker_exec and docker_manage stop/restart/rm ask first; headless environments without an approval channel are denied
 - **Container-name validation**: only `[A-Za-z0-9][A-Za-z0-9_.:-]*` accepted — no argument injection
 - **Timeout clamps**: 5s - 10min per operation; follow mode capped at an extra 30s
 - **Log clamping**: tail 1-2000 lines
@@ -78,9 +80,9 @@ docker_manage { container: web, action: restart }
 
 ```bash
 pnpm install
-pnpm test       # build + 24 tests
+pnpm test       # build + 35 tests
 ```
 
 ## License
 
-MIT
+MIT

package/README.md

@@ -2,17 +2,17 @@
 
 # dsh-docker
 
-> **你的 agent 会管容器了**：六个工具覆盖容器/镜像列表、日志、详情、容器内执行与生命周期管理。
+> **你的 agent 会管容器了**：七个工具覆盖容器/镜像列表、日志、详情、容器内执行、生命周期管理与健康检查。
 
-DSH（DeepSeek Harness）容器管理插件：走官方 subprocess 服务跑 docker CLI，argv 数组无 shell 注入，`docker_exec` 默认审批门，**零运行时依赖**。
+DSH（DeepSeek Harness）容器管理插件：走官方 subprocess 服务跑 docker CLI，argv 数组无 shell 注入，`docker_exec` 与破坏性生命周期操作默认审批门，**零运行时依赖**。
 
-![npm version](https://img.shields.io/npm/v/dsh-docker?label=npm&color=blue) ![npm downloads](https://img.shields.io/npm/dm/dsh-docker) ![license](https://img.shields.io/npm/l/dsh-docker) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-docker?style=social)
+![npm version](https://img.shields.io/npm/v/@stardustlc/dsh-docker?label=npm&color=blue) ![npm downloads](https://img.shields.io/npm/dm/@stardustlc/dsh-docker) ![license](https://img.shields.io/npm/l/@stardustlc/dsh-docker) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-docker?style=social)
 
 [![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
 
 ## 兼容性
 
-在 `@deepseek-ai/dsh@0.1.1-rc.2` 上验证（2026-08-26）。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。
+已在官方 `@deepseek-ai/dsh@0.1.3-alpha.2` 下验证（2026-09-08）：18 个组件同载，工具注册与调用契约全部通过。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。
 
 ## 安装
 
@@ -41,6 +41,7 @@ dsh plugin --profile web remove @stardustlc/dsh-docker
     dockerPath: docker     # 可选；也可用环境变量 DSH_DOCKER_PATH
     timeoutMs: 60000       # 单次操作超时（默认 60 秒，5 秒 - 10 分钟）
     # execApproval: false  # 关闭 docker_exec 审批门（默认 true）
+    # manageApproval: false # 关闭 stop/restart/rm 审批门（默认 true，不推荐）
 ```
 
 ## 工具一览
@@ -52,7 +53,8 @@ dsh plugin --profile web remove @stardustlc/dsh-docker
 | `docker_logs` | 查看日志尾部（行数钳制，可短时 follow）| — |
 | `docker_inspect` | 容器详情（镜像/状态/端口）| — |
 | `docker_exec` | 容器内执行命令 | 审批门 + 容器名白名单校验 |
-| `docker_manage` | start / stop / restart / rm | 明确提示破坏性 |
+| `docker_manage` | start / stop / restart / rm | stop/restart/rm 审批门 |
+| `docker_health` | Docker daemon 与安全配置自检 | — |
 
 ### 示例
 
@@ -69,7 +71,7 @@ docker_manage { container: web, action: restart }
 ## 安全设计
 
 - **无 shell**：全部参数独立 argv 数组，命令注入不可能
-- **审批门**：docker_exec 默认弹审批（对齐 dsh-email / dsh-sql），headless 无审批通道时拒绝
+- **审批门**：docker_exec 与 docker_manage 的 stop/restart/rm 默认弹审批；headless 无审批通道时拒绝
 - **容器名校验**：只允许 `[A-Za-z0-9][A-Za-z0-9_.:-]*`，杜绝参数注入
 - **超时钳制**：单次操作 5 秒 - 10 分钟；follow 模式额外限 30 秒
 - **日志钳制**：tail 1-2000 行
@@ -78,9 +80,9 @@ docker_manage { container: web, action: restart }
 
 ```bash
 pnpm install
-pnpm test       # 构建 + 24 个测试
+pnpm test       # 构建 + 35 个测试
 ```
 
 ## License
 
-MIT
+MIT

package/cordis.patch.yml

@@ -9,6 +9,7 @@
 #       # dockerPath: C:\Program Files\Docker\Docker\resources\bin\docker.exe
 #       timeoutMs: 60000       # 单次操作超时（默认 60 秒，5 秒 - 10 分钟）
 #       # execApproval: false  # 关闭 docker_exec 的审批门（默认 true）
+#       # manageApproval: false # 关闭 stop/restart/rm 审批门（默认 true，不推荐）
 #
 - insert:
     - id: docker

package/lib/config.d.ts

@@ -9,6 +9,7 @@ export interface DockerConfig {
     timeoutMs?: number;
     graceMs?: number;
     execApproval?: boolean;
+    manageApproval?: boolean;
 }
 /** 解析后的配置。 */
 export interface ResolvedDockerConfig {
@@ -16,6 +17,7 @@ export interface ResolvedDockerConfig {
     timeoutMs: number;
     graceMs: number;
     execApproval: boolean;
+    manageApproval: boolean;
 }
 /**
  * 解析并校验配置。

package/lib/config.js

@@ -22,7 +22,8 @@ export function resolveConfig(config, env = process.env) {
         graceMs = Math.min(120000, Math.max(1000, Math.round(cfg.graceMs)));
     }
     const execApproval = cfg.execApproval !== false;
-    return { dockerPath, timeoutMs, graceMs, execApproval };
+    const manageApproval = cfg.manageApproval !== false;
+    return { dockerPath, timeoutMs, graceMs, execApproval, manageApproval };
 }
 /** 校验容器名/ID，防参数注入（只允许字母数字与 _-.:/ 之外的拒绝）。 */
 export function assertContainerRef(value) {

package/lib/exec.d.ts

@@ -13,6 +13,7 @@ export interface RunResult {
 export interface ProcessRunner {
     run(argv: readonly string[], options?: {
         timeoutMs?: number;
+        signal?: AbortSignal;
     }): Promise<RunResult>;
 }
 export interface SubprocessHandleLike {

package/lib/exec.js

@@ -12,6 +12,9 @@ export function createSubprocessRunner(spawn, graceMs, defaultTimeoutMs) {
             const timeoutMs = options?.timeoutMs ?? defaultTimeoutMs;
             const controller = new AbortController();
             const timer = setTimeout(() => controller.abort(new Error('docker operation timed out')), timeoutMs);
+            const signal = options?.signal === undefined
+                ? controller.signal
+                : AbortSignal.any([options.signal, controller.signal]);
             let handle;
             try {
                 handle = spawn({
@@ -23,7 +26,7 @@ export function createSubprocessRunner(spawn, graceMs, defaultTimeoutMs) {
                         stderr: { maxBytes: COLLECT_BYTES },
                     },
                     graceMs,
-                    signal: controller.signal,
+                    signal,
                 });
                 const outcome = await handle.done;
                 const stdout = handle.collected.stdout?.readFrom(0).text ?? '';

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 /**
  * dsh-docker —— 容器管理工具插件（node 半身，配置走 cordis.patch.yml）。
  *
- * 插件导出 apply(ctx, config)：注册六个面向模型的工具（docker_ps / docker_logs /
- * docker_images / docker_inspect / docker_exec / docker_manage）。进程执行走 DSH 官方 subprocess 服务
- * （argv 数组、无 shell），docker_exec 默认走宿主审批门。零运行时依赖。
+ * 插件导出 apply(ctx, config)：注册七个面向模型的工具（docker_ps / docker_logs /
+ * docker_images / docker_inspect / docker_exec / docker_manage / docker_health）。进程执行走 DSH 官方 subprocess 服务
+ * （argv 数组、无 shell），docker_exec 与破坏性 docker_manage 默认走宿主审批门。零运行时依赖。
  *
  * @module dsh-docker
  */
@@ -13,31 +13,36 @@ import { type DockerToolDefinition } from './tools.js';
 /** cordis 服务注入：apply 里要用 ctx.subprocess 与 ctx.tools。 */
 export declare const name = "docker";
 export declare const inject: string[];
-/** 审批服务最小面。 */
-export interface DockerApproval {
-    request(options: {
-        agent?: unknown;
-        toolName?: unknown;
-        callId?: unknown;
-        reason: string;
-        signal?: unknown;
-    }): Promise<'allowed-once' | 'cancelled' | 'unavailable' | string>;
+/** Harness `tools/pre-execute` 的决策结果。 */
+type DockerPreToolDecision = {
+    kind: 'allow';
+} | {
+    kind: 'deny';
+    reason: string;
+} | {
+    kind: 'ask';
+    reason?: string;
+};
+/** 审批策略需要读取的工具执行字段。 */
+interface DockerToolExecution {
+    readonly name: string;
+    readonly arguments: unknown;
 }
+/** Harness `tools/pre-execute` waterfall 监听器。 */
+type DockerPreExecuteListener = (exec: DockerToolExecution, next: () => Promise<DockerPreToolDecision>) => Promise<DockerPreToolDecision>;
 /** 插件所需的最小 ctx 面。 */
 export interface DockerPluginContext {
     subprocess: {
         spawn: SubprocessSpawnLike;
     };
     tools: {
-        register(definition: DockerToolDefinition, options?: {
-            prepend?: boolean;
-        }): () => void;
+        register(definition: DockerToolDefinition): () => void;
     };
-    get?(name: 'approval'): DockerApproval | undefined;
-    on?(event: string, listener: () => void): () => void;
+    on(event: 'tools/pre-execute', listener: DockerPreExecuteListener): () => void;
+    on(event: 'dispose', listener: () => void): () => void;
 }
 /**
- * 插件入口：解析配置、封装执行器、注册六工具；docker_exec 注入审批门。
+ * 插件入口：解析配置、封装执行器、注册七工具；为 docker_exec 与破坏性 docker_manage 注入审批门。
  */
 export declare function apply(ctx: DockerPluginContext, config?: DockerConfig | null): void;
 export * from './args.js';

package/lib/index.js

@@ -1,9 +1,9 @@
 /**
  * dsh-docker —— 容器管理工具插件（node 半身，配置走 cordis.patch.yml）。
  *
- * 插件导出 apply(ctx, config)：注册六个面向模型的工具（docker_ps / docker_logs /
- * docker_images / docker_inspect / docker_exec / docker_manage）。进程执行走 DSH 官方 subprocess 服务
- * （argv 数组、无 shell），docker_exec 默认走宿主审批门。零运行时依赖。
+ * 插件导出 apply(ctx, config)：注册七个面向模型的工具（docker_ps / docker_logs /
+ * docker_images / docker_inspect / docker_exec / docker_manage / docker_health）。进程执行走 DSH 官方 subprocess 服务
+ * （argv 数组、无 shell），docker_exec 与破坏性 docker_manage 默认走宿主审批门。零运行时依赖。
  *
  * @module dsh-docker
  */
@@ -14,55 +14,44 @@ import { buildDockerTools } from './tools.js';
 export const name = 'docker';
 export const inject = ['subprocess', 'tools'];
 /**
- * 插件入口：解析配置、封装执行器、注册六工具；docker_exec 注入审批门。
+ * 插件入口：解析配置、封装执行器、注册七工具；为 docker_exec 与破坏性 docker_manage 注入审批门。
  */
 export function apply(ctx, config) {
-    let cfg;
-    try {
-        cfg = resolveConfig(config);
-    }
-    catch (error) {
-        console.warn('[dsh-docker] ' + (error instanceof Error ? error.message : String(error)));
-        cfg = resolveConfig(null);
-    }
+    const cfg = resolveConfig(config);
     const runner = createSubprocessRunner(ctx.subprocess.spawn, cfg.graceMs, cfg.timeoutMs);
     const tools = buildDockerTools(cfg, runner);
-    const disposers = [];
-    for (const definition of tools) {
-        if (definition.name === 'docker_exec' && cfg.execApproval) {
-            definition.gate = async (exec, next) => {
-                const approval = ctx.get?.('approval');
-                if (approval === undefined) {
-                    return { kind: 'deny', reason: 'docker_exec 需要确认，但当前环境没有审批通道（如 headless）。如确定安全，可在配置中设置 execApproval: false 后直接执行。' };
-                }
-                const record = (typeof exec === 'object' && exec !== null ? exec : {});
-                const args = (typeof record.args === 'object' && record.args !== null ? record.args : {});
+    if (cfg.execApproval || cfg.manageApproval) {
+        ctx.on('tools/pre-execute', async (exec, next) => {
+            const args = (typeof exec.arguments === 'object' && exec.arguments !== null ? exec.arguments : {});
+            if (exec.name === 'docker_exec' && cfg.execApproval) {
                 const command = typeof args.command === 'string' ? args.command : '';
                 const container = typeof args.container === 'string' ? args.container : '';
-                const outcome = await approval.request({
-                    agent: record.agent,
-                    toolName: record.name,
-                    callId: record.callId,
-                    reason: '在容器 ' + container + ' 内执行：' + command.slice(0, 200),
-                    signal: record.signal,
-                });
-                if (outcome === 'allowed-once')
-                    return next();
-                if (outcome === 'cancelled')
-                    return { kind: 'deny', reason: '容器内执行确认被取消，命令未执行。' };
-                if (outcome === 'unavailable')
-                    return { kind: 'deny', reason: '容器内执行确认不可用（没有可用的审批界面），命令未执行。' };
-                return { kind: 'deny', reason: '容器内执行未获批准：要么你拒绝了，要么当前会话处于 Full Access（审批策略 never）。若在 Full Access：切到 Read Only / Write 再执行，或关闭 execApproval（自行承担风险）。' };
-            };
-        }
-        disposers.push(ctx.tools.register(definition, { prepend: true }));
-    }
-    if (typeof ctx.on === 'function') {
-        ctx.on('dispose', () => {
-            for (const dispose of disposers)
-                dispose();
+                return {
+                    kind: 'ask',
+                    reason: 'docker_exec 需要确认：在容器 ' + (container || '（未指定）') + ' 内执行：' + command.slice(0, 200) + (command.length > 200 ? '…' : ''),
+                };
+            }
+            if (exec.name === 'docker_manage' && cfg.manageApproval) {
+                const action = typeof args.action === 'string' ? args.action : '';
+                if (action === 'stop' || action === 'restart' || action === 'rm') {
+                    const container = typeof args.container === 'string' ? args.container : '';
+                    return {
+                        kind: 'ask',
+                        reason: 'docker_manage 需要确认：对容器 ' + (container || '（未指定）') + ' 执行破坏性操作 ' + action + '。',
+                    };
+                }
+            }
+            return next();
         });
     }
+    const disposers = [];
+    for (const definition of tools) {
+        disposers.push(ctx.tools.register(definition));
+    }
+    ctx.on('dispose', () => {
+        for (const dispose of disposers)
+            dispose();
+    });
 }
 export * from './args.js';
 export * from './config.js';

package/lib/tools.d.ts

@@ -17,8 +17,7 @@ export interface DockerToolDefinition {
         render(args: unknown, value: unknown): ContentBlock[];
     };
     execute(args: unknown, exec: unknown): Promise<unknown>;
-    gate?(exec: unknown, next: () => Promise<unknown>): Promise<unknown>;
     timeoutMs?: number;
 }
-/** 构建五个工具定义。 */
+/** 构建七个工具定义。 */
 export declare function buildDockerTools(config: ResolvedDockerConfig, runner: ProcessRunner): DockerToolDefinition[];

package/lib/tools.js

@@ -1,5 +1,6 @@
 /**
- * 五个面向模型的容器工具：docker_ps / docker_logs / docker_inspect / docker_exec / docker_manage。
+ * 七个面向模型的容器工具：docker_ps / docker_logs / docker_images / docker_inspect /
+ * docker_exec / docker_manage / docker_health。
  *
  * @module dsh-docker/tools
  */
@@ -34,8 +35,14 @@ function requiredString(args, key, label) {
         throw new Error(label + '（参数 ' + key + '）为必填，请提供非空字符串。');
     return value;
 }
-async function runChecked(runner, argv, timeoutMs, label) {
-    const result = await runner.run(argv, { timeoutMs });
+function executionSignal(exec) {
+    if (typeof exec !== 'object' || exec === null)
+        return undefined;
+    const signal = exec.signal;
+    return signal instanceof AbortSignal ? signal : undefined;
+}
+async function runChecked(runner, argv, timeoutMs, label, signal) {
+    const result = await runner.run(argv, { timeoutMs, ...(signal === undefined ? {} : { signal }) });
     if (result.exitCode !== 0) {
         const tail = result.stderr.trim().split(/\r?\n/).slice(-6).join(' | ');
         throw new Error(label + '失败（退出码 ' + String(result.exitCode ?? 'null') + '）：' + (tail || '无错误输出') + '。请确认 docker 可用（docker version）。');
@@ -77,7 +84,7 @@ const manageSchema = {
     properties: { container: { type: 'string' }, action: { type: 'string' }, output: { type: 'string' } },
     additionalProperties: true,
 };
-/** 构建五个工具定义。 */
+/** 构建七个工具定义。 */
 export function buildDockerTools(config, runner) {
     const cfg = config;
     const timeout = cfg.timeoutMs;
@@ -101,10 +108,10 @@ export function buildDockerTools(config, runner) {
                 return [{ type: 'text', text: lines.join('\n') }];
             },
         },
-        async execute(rawArgs) {
+        async execute(rawArgs, exec) {
             const args = asRecord(rawArgs);
             const all = args.all === true;
-            const result = await runChecked(runner, psArgs(cfg.dockerPath, all, optionalString(args, 'name')), timeout, 'docker ps');
+            const result = await runChecked(runner, psArgs(cfg.dockerPath, all, optionalString(args, 'name')), timeout, 'docker ps', executionSignal(exec));
             const containers = parsePsJson(result.stdout);
             return { count: containers.length, all, containers };
         },
@@ -125,13 +132,13 @@ export function buildDockerTools(config, runner) {
                 return [{ type: 'text', text: '容器 ' + rec.container + ' 最近日志：\n' + rec.text }];
             },
         },
-        async execute(rawArgs) {
+        async execute(rawArgs, exec) {
             const args = asRecord(rawArgs);
             const container = assertContainerRef(requiredString(args, 'container', '容器名'));
             const tailRaw = args.tail;
             const tail = typeof tailRaw === 'number' && Number.isInteger(tailRaw) ? Math.min(2000, Math.max(1, tailRaw)) : 100;
             const follow = args.follow === true;
-            const result = await runChecked(runner, logsArgs(cfg.dockerPath, container, tail, follow), follow ? Math.min(timeout, 30000) : timeout, 'docker logs');
+            const result = await runChecked(runner, logsArgs(cfg.dockerPath, container, tail, follow), follow ? Math.min(timeout, 30000) : timeout, 'docker logs', executionSignal(exec));
             return { container, tail, text: result.stdout };
         },
         timeoutMs: timeout,
@@ -155,10 +162,10 @@ export function buildDockerTools(config, runner) {
                 return [{ type: 'text', text: lines.join('\n') }];
             },
         },
-        async execute(rawArgs) {
+        async execute(rawArgs, exec) {
             const args = asRecord(rawArgs);
             const dangling = args.dangling === true;
-            const result = await runChecked(runner, imagesArgs(cfg.dockerPath, dangling), timeout, 'docker images');
+            const result = await runChecked(runner, imagesArgs(cfg.dockerPath, dangling), timeout, 'docker images', executionSignal(exec));
             const images = parseImagesJson(result.stdout);
             return { count: images.length, dangling, images };
         },
@@ -178,10 +185,10 @@ export function buildDockerTools(config, runner) {
                 return [{ type: 'text', text: '容器 ' + info.name + '（' + info.image + '）：' + (info.running === true ? '运行中' : '已停止') + '，端口：' + (Array.isArray(info.ports) ? info.ports.join(', ') : '无') }];
             },
         },
-        async execute(rawArgs) {
+        async execute(rawArgs, exec) {
             const args = asRecord(rawArgs);
             const container = assertContainerRef(requiredString(args, 'container', '容器名'));
-            const result = await runChecked(runner, inspectArgs(cfg.dockerPath, container), timeout, 'docker inspect');
+            const result = await runChecked(runner, inspectArgs(cfg.dockerPath, container), timeout, 'docker inspect', executionSignal(exec));
             return { container, info: parseInspectJson(result.stdout) };
         },
         timeoutMs: timeout,
@@ -200,23 +207,20 @@ export function buildDockerTools(config, runner) {
                 return [{ type: 'text', text: '容器 ' + rec.container + ' 执行完成（退出码 ' + rec.exitCode + '）：\n' + rec.stdout }];
             },
         },
-        async execute(rawArgs) {
+        async execute(rawArgs, exec) {
             const args = asRecord(rawArgs);
             const container = assertContainerRef(requiredString(args, 'container', '容器名'));
             const command = splitCommand(requiredString(args, 'command', '命令'));
             if (command.length === 0)
                 throw new Error('command 不能为空。');
-            const result = await runChecked(runner, execArgs(cfg.dockerPath, container, command), timeout, 'docker exec');
+            const result = await runChecked(runner, execArgs(cfg.dockerPath, container, command), timeout, 'docker exec', executionSignal(exec));
             return { container, exitCode: result.exitCode, stdout: result.stdout };
         },
-        gate(exec, next) {
-            return next();
-        },
         timeoutMs: timeout,
     };
     const dockerManage = {
         name: 'docker_manage',
-        description: '容器生命周期管理：start / stop / restart / rm（rm 强制删除）。注意 stop/restart/rm 会中断容器，谨慎使用。',
+        description: '容器生命周期管理：start / stop / restart / rm（rm 强制删除）。stop/restart/rm 默认进入审批门，批准后才执行。',
         parameters: compileParameters({
             container: { type: 'string', required: true, description: '容器名或 ID（必填）。' },
             action: { type: 'string', required: true, description: '操作：start / stop / restart / rm（必填）。' },
@@ -228,20 +232,20 @@ export function buildDockerTools(config, runner) {
                 return [{ type: 'text', text: '容器 ' + rec.container + ' 已执行 ' + rec.action + '。' }];
             },
         },
-        async execute(rawArgs) {
+        async execute(rawArgs, exec) {
             const args = asRecord(rawArgs);
             const container = assertContainerRef(requiredString(args, 'container', '容器名'));
             const action = requiredString(args, 'action', '操作');
             if (!['start', 'stop', 'restart', 'rm'].includes(action))
                 throw new Error('action 必须是 start / stop / restart / rm 之一（当前：' + action + '）。');
-            const result = await runChecked(runner, manageArgs(cfg.dockerPath, action, container), timeout, 'docker ' + action);
+            const result = await runChecked(runner, manageArgs(cfg.dockerPath, action, container), timeout, 'docker ' + action, executionSignal(exec));
             return { container, action, output: result.stdout.trim() };
         },
         timeoutMs: timeout,
     };
     const dockerHealth = {
         name: 'docker_health',
-        description: 'dsh-docker 自检：验证 docker CLI 与守护进程是否可用（执行 docker version），并汇总安全配置（exec 审批门、超时）。遇到问题时先运行本工具定位。',
+        description: 'dsh-docker 自检：验证 docker CLI 与守护进程是否可用（执行 docker version），并汇总安全配置（exec/破坏性 manage 审批门、超时）。遇到问题时先运行本工具定位。',
         parameters: compileParameters({}),
         output: {
             schema: { type: 'object', additionalProperties: true },
@@ -256,18 +260,21 @@ export function buildDockerTools(config, runner) {
                 return [{ type: 'text', text: lines.join('\n') }];
             },
         },
-        async execute() {
+        async execute(_rawArgs, exec) {
             const checks = [];
             let ok = true;
             try {
-                const result = await runChecked(runner, [cfg.dockerPath, 'version', '--format', '{{.Server.Version}}'], 15000, 'docker version');
+                const result = await runChecked(runner, [cfg.dockerPath, 'version', '--format', '{{.Server.Version}}'], 15000, 'docker version', executionSignal(exec));
                 checks.push({ name: 'docker daemon', ok: true, detail: 'server ' + result.stdout.trim() });
             }
             catch (error) {
+                if (executionSignal(exec)?.aborted === true)
+                    throw error;
                 ok = false;
                 checks.push({ name: 'docker daemon', ok: false, detail: error instanceof Error ? error.message : String(error) });
             }
             checks.push({ name: 'exec 审批门', ok: true, detail: cfg.execApproval === true ? '开启' : '关闭' });
+            checks.push({ name: 'manage 审批门', ok: true, detail: cfg.manageApproval === true ? '开启' : '关闭' });
             checks.push({ name: '超时配置', ok: true, detail: 'timeoutMs=' + cfg.timeoutMs + ', graceMs=' + cfg.graceMs });
             return { ok, plugin: 'dsh-docker', checks };
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stardustlc/dsh-docker",
-  "version": "0.3.0",
-  "description": "DSH 容器管理插件：docker_ps/logs/images/inspect/exec/manage 六工具，走官方 subprocess 服务跑 docker CLI、argv 无 shell 注入、exec 审批门、零运行时依赖。",
+  "version": "0.3.2",
+  "description": "DSH 容器管理插件：七工具覆盖容器与镜像管理，走官方 subprocess 服务、argv 无 shell 注入，exec 与破坏性 manage 默认审批。",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",