@stardustlc/dsh-docker 0.4.1 → 0.4.3

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 [返回简介](README.md) · [使用说明](docs/USAGE.md) · [验证记录](docs/VALIDATION.md)
 
+## 0.4.3（2026-10-26）
+
+- 确认门读取宿主当前会话的真实审批策略；never 模式不再被误报为用户拒绝，自检明确显示无法询问的原因与解决选项。默认确认保护保持启用。
+- Windows 回归 41 项通过、0 项跳过；宿主与未验收范围见[本次记录](docs/validation-0.4.3.md)。
+
+## 0.4.2（2026-10-17）
+
+- 补 `publishConfig.access: "public"`：与其余 scoped 包保持一致，避免发布时因默认 restricted 访问级别失败（不影响运行时行为）。
 ## 0.4.1 (2026-10-05)
 
 - 修复旧版 DSH 生成 PTC SDK 时不支持的数组约束；仍在执行前严格限制 argv 的 128 项与总长度，保留精确参数和审批。

package/README.en.md

@@ -8,6 +8,8 @@ Inspect and manage local Docker containers and images from DSH.
 
 [![npm](https://img.shields.io/npm/v/@stardustlc/dsh-docker)](https://www.npmjs.com/package/@stardustlc/dsh-docker) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-docker-downloads.svg)](https://www.npmjs.com/package/@stardustlc/dsh-docker)
 
+Feedback and contributions are welcome: report [issues](https://github.com/STARDUSTLC666/dsh-docker/issues) or submit [pull requests](https://github.com/STARDUSTLC666/dsh-docker/pulls).
+
 ## What it does
 
 - Inspect containers, images, logs and resource status.

package/README.md

@@ -8,6 +8,8 @@
 
 [![npm](https://img.shields.io/npm/v/@stardustlc/dsh-docker)](https://www.npmjs.com/package/@stardustlc/dsh-docker) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-docker-downloads.svg)](https://www.npmjs.com/package/@stardustlc/dsh-docker)
 
+欢迎使用，遇到问题或有改进建议，请提交 [issues](https://github.com/STARDUSTLC666/dsh-docker/issues) 和 [PR](https://github.com/STARDUSTLC666/dsh-docker/pulls)。
+
 ## 功能
 
 - 查看容器、镜像、日志和资源状态。

package/docs/USAGE.en.md

@@ -2,6 +2,10 @@
 
 [Overview](../README.en.md) · [Changelog](../CHANGELOG.md) · [Validation](VALIDATION.md)
 
+## Confirmation and never policy
+
+execApproval and manageApproval stay enabled by default. The host never policy rejects requests that require asking; it does not grant all actions. Select an asking policy, or explicitly disable the relevant plugin gate if the user chooses to do so. docker_health reports the effective policy and still probes the daemon.
+
 ## Current improvements
 
 Prefer docker_exec with container="web" and argv=["printf","%s","a b"]. Supply exactly one of command or argv. The host performs no variable, pipe or command-substitution expansion. Explicit container shell calls such as ["sh","-c","..."] remain approval-gated.

package/docs/USAGE.md

@@ -2,6 +2,10 @@
 
 [返回简介](../README.md) · [更新记录](../CHANGELOG.md) · [验证记录](VALIDATION.md)
 
+## 确认与 never 策略
+
+execApproval 和 manageApproval 默认开启。宿主 never 策略会拒绝所有需要询问的请求；它不代表允许全部执行。若需要确认，切换至可询问策略；只有用户明确接受风险时，才分别关闭对应的插件确认门。docker_health 会显示实际策略，且继续检测 Docker daemon。
+
 ## 本次改进
 
 推荐 docker_exec { container: "web", argv: ["printf", "%s", "a b"] }。command 与 argv 二选一；宿主不执行变量、管道或命令替换。确需容器 Shell 时显式使用 ["sh", "-c", "..."]，仍需审批。

package/docs/VALIDATION.md

@@ -1,5 +1,9 @@
 # dsh-docker 验证记录
 
+## 2026-10-26：0.4.3
+
+[本次修复、回归与未验收范围](validation-0.4.3.md)。
+
 本页整理原 README 的历史验证说明，保留当时的版本、日期与范围。自动测试、启动检查、浏览器操作和真实服务验收分别记录，不能相互替代。更详细的版本验收文件仍保留在仓库中。
 
 ## 原中文记录

package/docs/validation-0.4.3.md

@@ -0,0 +1,19 @@
+# 0.4.3 验证记录
+
+日期：2026-10-26。官方 Windows 宿主：DSH 0.2.1-rc.3。
+
+## 行为变化
+
+确认门读取宿主当前会话的真实审批策略；never 模式不再被误报为用户拒绝，自检明确显示无法询问的原因与解决选项。默认确认保护保持启用。
+
+## 验证与限制
+
+- Windows 本地：41 项，41 通过、0 跳过；没有把跳过计为通过。
+- 官方 RC.3 的 tools.execute 实际调用确认 never 拒绝与健康诊断；Docker 引擎未运行，容器生命周期未验收。
+- GitHub 的跨平台 CI 和 npm 发布完整性以该版本工作流及 registry 为准；本记录不把本地测试等同于已发布。
+
+## English
+
+Confirmation gates read the effective host session policy. Under never, execution is denied with actionable settings instead of reporting a user rejection; health reports the same state. Default gates remain enabled.
+
+Runtime/account limits are listed above. Synthetic peers and model adapters do not establish live account delivery or model quality.

package/lib/approval.d.ts

@@ -0,0 +1,13 @@
+/** Match the host policy without importing another copy of its services. */
+export type DockerApprovalPolicy = 'ask' | 'never' | 'unknown';
+export interface DockerApprovalService {
+    config?: {
+        policy?: unknown;
+    };
+    overrideOf?(session: unknown): unknown;
+}
+export declare function dockerApprovalPolicy(service: DockerApprovalService | undefined, execution: unknown): DockerApprovalPolicy;
+export declare function dockerApprovalCheck(enabled: boolean, policy: DockerApprovalPolicy, setting: string): {
+    ok: boolean;
+    detail: string;
+};

package/lib/approval.js

@@ -0,0 +1,19 @@
+export function dockerApprovalPolicy(service, execution) {
+    try {
+        const session = execution?.agent?.session;
+        const policy = (session === undefined ? undefined : service?.overrideOf?.(session)) ?? service?.config?.policy;
+        return policy === 'ask' || policy === 'never' ? policy : 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+}
+export function dockerApprovalCheck(enabled, policy, setting) {
+    if (!enabled)
+        return { ok: true, detail: setting + '=false；本插件不要求单独确认，其它宿主策略仍生效' };
+    if (policy === 'never')
+        return { ok: false, detail: '插件要求确认，但当前审批策略 never 不允许询问；请切换为可询问模式，或由用户明确设置 ' + setting + '=false' };
+    if (policy === 'ask')
+        return { ok: true, detail: '开启；当前策略 ask，经宿主询问（无人回答时拒绝）' };
+    return { ok: false, detail: '开启；无法读取当前会话审批策略，尚未确认可用' };
+}

package/lib/index.d.ts

@@ -10,6 +10,7 @@
 import { type DockerConfig } from './config.js';
 import { type SubprocessSpawnLike } from './exec.js';
 import { type DockerToolDefinition } from './tools.js';
+import { type DockerApprovalService } from './approval.js';
 /** cordis 服务注入：apply 里要用 ctx.subprocess 与 ctx.tools。 */
 export declare const name = "docker";
 export declare const inject: string[];
@@ -32,6 +33,8 @@ interface DockerToolExecution {
 type DockerPreExecuteListener = (exec: DockerToolExecution, next: () => Promise<DockerPreToolDecision>) => Promise<DockerPreToolDecision>;
 /** 插件所需的最小 ctx 面。 */
 export interface DockerPluginContext {
+    approval?: DockerApprovalService;
+    get?(name: string): unknown;
     subprocess: {
         spawn: SubprocessSpawnLike;
     };
@@ -50,3 +53,4 @@ export * from './config.js';
 export * from './exec.js';
 export * from './parse.js';
 export * from './tools.js';
+export * from './approval.js';

package/lib/index.js

@@ -10,6 +10,7 @@
 import { resolveConfig } from './config.js';
 import { createSubprocessRunner } from './exec.js';
 import { buildDockerTools } from './tools.js';
+import { dockerApprovalPolicy, dockerApprovalCheck } from './approval.js';
 /** cordis 服务注入：apply 里要用 ctx.subprocess 与 ctx.tools。 */
 export const name = 'docker';
 export const inject = ['subprocess', 'tools'];
@@ -19,11 +20,19 @@ export const inject = ['subprocess', 'tools'];
 export function apply(ctx, config) {
     const cfg = resolveConfig(config);
     const runner = createSubprocessRunner((spec) => ctx.subprocess.spawn(spec), cfg.graceMs, cfg.timeoutMs);
-    const tools = buildDockerTools(cfg, runner);
+    const policyOf = (execution) => dockerApprovalPolicy((ctx.get ? ctx.get('approval') : ctx.approval), execution);
+    const tools = buildDockerTools(cfg, runner, policyOf);
     if (cfg.execApproval || cfg.manageApproval) {
         ctx.on('tools/pre-execute', async (exec, next) => {
+            // Preserve denials from the remaining host waterfall before adding a question.
+            const downstream = await next();
+            if (downstream.kind === 'deny')
+                return downstream;
             const args = (typeof exec.arguments === 'object' && exec.arguments !== null ? exec.arguments : {});
             if (exec.name === 'docker_exec' && cfg.execApproval) {
+                const policy = policyOf(exec);
+                if (policy === 'never')
+                    return { kind: 'deny', reason: dockerApprovalCheck(true, policy, 'execApproval').detail };
                 const command = Array.isArray(args.argv) ? JSON.stringify(args.argv) : typeof args.command === 'string' ? args.command : '';
                 const container = typeof args.container === 'string' ? args.container : '';
                 return {
@@ -34,6 +43,9 @@ export function apply(ctx, config) {
             if (exec.name === 'docker_manage' && cfg.manageApproval) {
                 const action = typeof args.action === 'string' ? args.action : '';
                 if (action === 'stop' || action === 'restart' || action === 'rm') {
+                    const policy = policyOf(exec);
+                    if (policy === 'never')
+                        return { kind: 'deny', reason: dockerApprovalCheck(true, policy, 'manageApproval').detail };
                     const container = typeof args.container === 'string' ? args.container : '';
                     return {
                         kind: 'ask',
@@ -41,7 +53,7 @@ export function apply(ctx, config) {
                     };
                 }
             }
-            return next();
+            return downstream;
         });
     }
     const disposers = [];
@@ -58,3 +70,4 @@ export * from './config.js';
 export * from './exec.js';
 export * from './parse.js';
 export * from './tools.js';
+export * from './approval.js';

package/lib/tools.d.ts

@@ -1,5 +1,6 @@
 import { type ResolvedDockerConfig } from './config.js';
 import { type ProcessRunner } from './exec.js';
+import { type DockerApprovalPolicy } from './approval.js';
 export interface ContentBlock {
     type: 'text';
     text: string;
@@ -20,4 +21,4 @@ export interface DockerToolDefinition {
     timeoutMs?: number;
 }
 /** 构建七个工具定义。 */
-export declare function buildDockerTools(config: ResolvedDockerConfig, runner: ProcessRunner): DockerToolDefinition[];
+export declare function buildDockerTools(config: ResolvedDockerConfig, runner: ProcessRunner, policyOf?: (execution: unknown) => DockerApprovalPolicy): DockerToolDefinition[];

package/lib/tools.js

@@ -7,6 +7,7 @@
 import { imagesArgs, inspectArgs, logsArgs, manageArgs, execArgs, psArgs, splitCommand } from './args.js';
 import { assertContainerRef } from './config.js';
 import { parseImagesJson, parseInspectJson, parsePsJson } from './parse.js';
+import { dockerApprovalCheck } from './approval.js';
 function compileParameters(spec) {
     const properties = {};
     const required = [];
@@ -89,7 +90,7 @@ const manageSchema = {
     additionalProperties: true,
 };
 /** 构建七个工具定义。 */
-export function buildDockerTools(config, runner) {
+export function buildDockerTools(config, runner, policyOf = () => 'unknown') {
     const cfg = config;
     const timeout = cfg.timeoutMs;
     const dockerPs = {
@@ -262,7 +263,7 @@ export function buildDockerTools(config, runner) {
                 const lines = ['dsh-docker 自检' + (rec.ok === true ? '：正常。' : '：发现问题。')];
                 for (const item of checks) {
                     const c = asRecord(item);
-                    lines.push('- ' + c.name + '：' + (c.ok === true ? '✅' : '❌ ' + String(c.detail ?? '')));
+                    lines.push('- ' + c.name + '：' + (c.ok === true ? '✅ ' : '❌ ') + String(c.detail ?? ''));
                 }
                 return [{ type: 'text', text: lines.join('\n') }];
             },
@@ -280,10 +281,11 @@ export function buildDockerTools(config, runner) {
                 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 ? '开启' : '关闭' });
+            const policy = policyOf(exec);
+            checks.push({ name: 'exec 审批门', ...dockerApprovalCheck(cfg.execApproval, policy, 'execApproval') });
+            checks.push({ name: 'manage 审批门', ...dockerApprovalCheck(cfg.manageApproval, policy, 'manageApproval') });
             checks.push({ name: '超时配置', ok: true, detail: 'timeoutMs=' + cfg.timeoutMs + ', graceMs=' + cfg.graceMs });
-            return { ok, plugin: 'dsh-docker', checks };
+            return { ok: ok && checks.every(check => check.ok === true), plugin: 'dsh-docker', approvalPolicy: policy, checks };
         },
         timeoutMs: 20000,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stardustlc/dsh-docker",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "在 DSH 中查看和管理本机 Docker 容器与镜像。",
   "type": "module",
   "main": "lib/index.js",
@@ -57,5 +57,8 @@
   },
   "homepage": "https://github.com/STARDUSTLC666/dsh-docker#readme",
   "author": "stardustlc",
-  "packageManager": "pnpm@11.7.0"
+  "packageManager": "pnpm@11.7.0",
+  "publishConfig": {
+    "access": "public"
+  }
 }