@stardustlc/dsh-docker 0.3.0 → 0.3.1

package/README.en.md

@@ -6,13 +6,13 @@
 
 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**.
 
-![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 source-run `@deepseek-ai/dsh@0.1.2-alpha.4` on 2026-09-02. Built for the cordis patch-bundle plugin model (`cordis.patch.yml` + `dsh.bundle.patch`). No runtime imports of `@deepseek-ai/*` internals.
 
 ## Installation
 
@@ -83,4 +83,4 @@ pnpm test       # build + 24 tests
 
 ## License
 
-MIT
+MIT

package/README.md

@@ -6,13 +6,13 @@
 
 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.2-alpha.4` 源码模式下验证（2026-09-02）。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。
 
 ## 安装
 
@@ -83,4 +83,4 @@ pnpm test       # 构建 + 24 个测试
 
 ## License
 
-MIT
+MIT

package/lib/index.d.ts

@@ -13,28 +13,33 @@ 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;
+};
+/** 审批策略需要读取的 alpha.4 工具执行字段。 */
+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 注入审批门。

package/lib/index.js

@@ -27,42 +27,27 @@ export function apply(ctx, 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 : {});
-                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（自行承担风险）。' };
+    if (cfg.execApproval) {
+        ctx.on('tools/pre-execute', async (exec, next) => {
+            if (exec.name !== 'docker_exec')
+                return next();
+            const args = (typeof exec.arguments === 'object' && exec.arguments !== null ? exec.arguments : {});
+            const command = typeof args.command === 'string' ? args.command : '';
+            const container = typeof args.container === 'string' ? args.container : '';
+            return {
+                kind: 'ask',
+                reason: 'docker_exec 需要确认：在容器 ' + (container || '（未指定）') + ' 内执行：' + command.slice(0, 200) + (command.length > 200 ? '…' : ''),
             };
-        }
-        disposers.push(ctx.tools.register(definition, { prepend: true }));
-    }
-    if (typeof ctx.on === 'function') {
-        ctx.on('dispose', () => {
-            for (const dispose of disposers)
-                dispose();
         });
     }
+    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,7 +17,6 @@ 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;
 }
 /** 构建五个工具定义。 */

package/lib/tools.js

@@ -209,9 +209,6 @@ export function buildDockerTools(config, runner) {
             const result = await runChecked(runner, execArgs(cfg.dockerPath, container, command), timeout, 'docker exec');
             return { container, exitCode: result.exitCode, stdout: result.stdout };
         },
-        gate(exec, next) {
-            return next();
-        },
         timeoutMs: timeout,
     };
     const dockerManage = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stardustlc/dsh-docker",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "DSH 容器管理插件：docker_ps/logs/images/inspect/exec/manage 六工具，走官方 subprocess 服务跑 docker CLI、argv 无 shell 注入、exec 审批门、零运行时依赖。",
   "type": "module",
   "main": "lib/index.js",