dsh-sql 0.4.0 → 0.4.1

package/README.en.md

@@ -12,7 +12,7 @@ DSH (DeepSeek Harness) engineer-grade database plugin: four tools covering conne
 
 ## 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
 
@@ -100,4 +100,4 @@ pnpm test       # build + 35 tests, including a real SQLite integration suite
 
 ## License
 
-MIT
+MIT

package/README.md

@@ -12,7 +12,7 @@ DSH（DeepSeek Harness）工程师级数据库插件：四个工具覆盖连接
 
 ## 兼容性
 
-在 `@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/*` 内部模块。
 
 ## 安装
 
@@ -100,4 +100,4 @@ pnpm test       # 构建 + 35 个测试（含真实 SQLite 集成）
 
 ## License
 
-MIT
+MIT

package/lib/index.d.ts

@@ -12,25 +12,30 @@ import { type SqlToolDefinition } from './tools.js';
 /** cordis 服务注入：apply 里要用 ctx.tools，必须显式声明。 */
 export declare const name = "sql";
 export declare const inject: string[];
-/** 审批服务最小面（对齐 dsh-email）。 */
-export interface SqlApproval {
-    request(options: {
-        agent?: unknown;
-        toolName?: unknown;
-        callId?: unknown;
-        reason: string;
-        signal?: unknown;
-    }): Promise<'allowed-once' | 'cancelled' | 'unavailable' | string>;
+/** Harness `tools/pre-execute` 的决策结果。 */
+type SqlPreToolDecision = {
+    kind: 'allow';
+} | {
+    kind: 'deny';
+    reason: string;
+} | {
+    kind: 'ask';
+    reason?: string;
+};
+/** 审批策略需要读取的 alpha.4 工具执行字段。 */
+interface SqlToolExecution {
+    readonly name: string;
+    readonly arguments: unknown;
 }
+/** Harness `tools/pre-execute` waterfall 监听器。 */
+type SqlPreExecuteListener = (exec: SqlToolExecution, next: () => Promise<SqlPreToolDecision>) => Promise<SqlPreToolDecision>;
 /** 插件所需的最小 ctx 面。 */
 export interface SqlPluginContext {
     tools: {
-        register(definition: SqlToolDefinition, options?: {
-            prepend?: boolean;
-        }): () => void;
+        register(definition: SqlToolDefinition): () => void;
     };
-    get?(name: 'approval'): SqlApproval | undefined;
-    on?(event: string, listener: () => void): () => void;
+    on(event: 'tools/pre-execute', listener: SqlPreExecuteListener): () => void;
+    on(event: 'dispose', listener: () => void): () => void;
 }
 /**
  * 插件入口：解析配置、构建四工具、给 sql_exec 注入审批门。

package/lib/index.js

@@ -25,50 +25,28 @@ export function apply(ctx, config) {
         cfg = resolveConfig(null);
     }
     const { tools, adapters } = buildSqlTools(cfg);
-    const disposers = [];
-    for (const definition of tools) {
-        if (definition.name === 'sql_exec' && cfg.writeApproval) {
-            const originalGate = definition.gate;
-            definition.gate = async (exec, next) => {
-                const approval = ctx.get?.('approval');
-                if (approval === undefined) {
-                    return {
-                        kind: 'deny',
-                        reason: 'sql_exec 需要确认，但当前环境没有审批通道（如 headless）。如确定安全，可在配置中设置 writeApproval: false 后直接执行。',
-                    };
-                }
-                const execRecord = (typeof exec === 'object' && exec !== null ? exec : {});
-                const args = (typeof execRecord.args === 'object' && execRecord.args !== null ? execRecord.args : {});
-                const sql = typeof args.sql === 'string' ? args.sql : '';
-                const outcome = await approval.request({
-                    agent: execRecord.agent,
-                    toolName: execRecord.name,
-                    callId: execRecord.callId,
-                    reason: '执行数据库写操作：' + sql.slice(0, 200) + (sql.length > 200 ? '…' : ''),
-                    signal: execRecord.signal,
-                });
-                if (outcome === 'allowed-once')
-                    return originalGate ? originalGate(exec, next) : next();
-                if (outcome === 'cancelled')
-                    return { kind: 'deny', reason: '写操作确认被取消，SQL 未执行。' };
-                if (outcome === 'unavailable')
-                    return { kind: 'deny', reason: '写操作确认不可用（没有可用的审批界面），SQL 未执行。' };
-                return {
-                    kind: 'deny',
-                    reason: '写操作未获批准：要么你拒绝了，要么当前会话处于 Full Access（审批策略 never，不会弹框）。若在 Full Access：切到 Read Only / Write 再执行，或关闭 writeApproval（自行承担风险）。',
-                };
+    if (cfg.writeApproval) {
+        ctx.on('tools/pre-execute', async (exec, next) => {
+            if (exec.name !== 'sql_exec')
+                return next();
+            const args = (typeof exec.arguments === 'object' && exec.arguments !== null ? exec.arguments : {});
+            const sql = typeof args.sql === 'string' ? args.sql : '';
+            return {
+                kind: 'ask',
+                reason: 'sql_exec 写操作需要确认：' + sql.slice(0, 200) + (sql.length > 200 ? '…' : ''),
             };
-        }
-        disposers.push(ctx.tools.register(definition, { prepend: true }));
-    }
-    if (typeof ctx.on === 'function') {
-        ctx.on('dispose', () => {
-            for (const dispose of disposers)
-                dispose();
-            for (const adapter of adapters.values())
-                void adapter.close();
         });
     }
+    const disposers = [];
+    for (const definition of tools) {
+        disposers.push(ctx.tools.register(definition));
+    }
+    ctx.on('dispose', () => {
+        for (const dispose of disposers)
+            dispose();
+        for (const adapter of adapters.values())
+            void adapter.close();
+    });
 }
 export * from './adapters.js';
 export * from './config.js';

package/lib/tools.d.ts

@@ -24,7 +24,6 @@ export interface SqlToolDefinition {
         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

@@ -418,9 +418,6 @@ export function buildSqlTools(config) {
             const changes = await adapter.exec(sql);
             return { connection: name, changes, readOnly: false };
         },
-        gate(exec, next) {
-            return next(); // 审批门由 index.ts 注入（需要宿主 ctx）
-        },
         timeoutMs: cfg.execTimeoutMs,
     };
     const sqlSchema = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sql",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "DSH 工程师级数据库插件：sql_list/query/exec/schema 四工具，SQLite/MySQL/PostgreSQL 三引擎、多连接、只读模式与写操作审批门、词法级只读保护、流式行数钳制与可配置查询/写超时。",
   "type": "module",
   "main": "lib/index.js",