@yejiming/dsh-data-agent 0.0.6 → 0.0.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yejiming/dsh-data-agent",
-  "description": "Data Agent for the dsh web GUI: session-scoped database connections (MySQL/PostgreSQL/SQLite), the sqlcmd tool, the data-agent agent preset, and the database conversation-view tab",
-  "version": "0.0.6",
+  "description": "Data Agent for DSH Web and TUI: shared database connections, a masked TUI form, secure credential references, SQL tools, and the data-agent preset",
+  "version": "0.0.9",
   "publishConfig": {
     "access": "public"
   },
@@ -28,6 +28,10 @@
       "types": "./lib/types/tool.d.ts",
       "default": "./lib/tool.js"
     },
+    "./command": {
+      "types": "./lib/types/command.d.ts",
+      "default": "./lib/command.js"
+    },
     "./invariant": {
       "types": "./lib/types/invariant.d.ts",
       "default": "./lib/invariant.js"
@@ -48,6 +52,7 @@
       "inject": [
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-tool",
         "@deepseek-ai/dsh-client-ui-conversation"
       ],
       "platform": "web"
@@ -67,36 +72,88 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "schemastery": "^3.18.0"
+    "echarts": "^6.1.0",
+    "schemastery": "^3.18.0",
+    "zod": "^4.4.3"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-tool": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-storage": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-storage-domain": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-storage-json": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-subprocess": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
-    "react": "^18.2.0"
+    "@deepseek-ai/dsh-user-questions": "^0.1.0-rc.6",
+    "react": "^18.2.0 || ^19.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-client-locale": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-runtime": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-conversation": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-primitives": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-host-webserver": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-user-questions": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-tool": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-storage": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-storage-domain": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-storage-json": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-subprocess": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-subprocess-local": "0.1.0-rc.6",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-user-questions": "^0.1.0-rc.6",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.2",
     "@types/node": "^25.0.0",
     "@types/react": "~18.3.1",
+    "jsdom": "^30.0.1",
     "lightningcss": "^1.32.0",
     "react": "^18.2.0",
+    "react-dom": "^18.3.1",
     "schemastery": "^3.18.0",
     "tsdown": "^0.22.2",
     "typescript": "^6.0.3",

package/preset/data-agent/agent.cordis.yml

@@ -8,15 +8,14 @@
 # the registries themselves, the sandbox and approval stack, persistence, and
 # the model route.
 #
-# A preset composes what an agent HAS instead of subtracting from a shared
-# default: every model-facing tool row absent from this file is simply not
-# registered for agents on this preset. The database row below registers
-# sql-query / sql-write / sqlcmd and the fs row registers read / write / edit;
-# bash, glob/grep, str_replace_editor, skill, todo, goal, plan, web, subagent,
-# workflow, tasks, and the rest are all absent, i.e. disabled.
+# The database row below registers sql-query / sql-write / sql-cmd and the
+# editor row registers DSH's native str_replace_editor. The final row installs
+# a deny restriction for the host/community tools visible at preset mount, so
+# describe_image, ssh_*, bash, web, etc. stay unavailable while the four/five
+# tools owned by this standing scope remain visible to joined agents.
 #
-# All three rows only CONSUME host services (the tools registry, subprocess,
-# the dataAgentConnections connection store), so no `isolate` realm is needed.
+# All four rows only CONSUME host services (the tools/commands registries,
+# filesystem, subprocess, and dataAgentConnections).
 
 # ── identity ────────────────────────────────────────────────────────────────
 
@@ -27,23 +26,40 @@
   config:
     text: >-
       你是数据工程师 Agent。工作目录 {{cwd}}。可用工具：sql-query（只读 SQL，返回结构化
-      JSON 结果）、sql-write（写/管理 SQL，单条自动提交）、sqlcmd（原始客户端输出，兼容
-      SHOW TABLES、DESCRIBE users 等命令）、read、write、edit（读写改本地文件）。工作流：
-      先用 sql-query 探查表结构与样例数据（禁止臆造表名与列名），把 SQL 写入 .sql 文件
-      （write/edit），再用 sql-query 执行只读查询或 sql-write 执行写入并核对结果；
-      结果可疑时缩小查询范围重试。每次数据库工具调用只允许一条 SQL 语句。
+      JSON 结果）、sql-write（写/管理 SQL，单条自动提交）、sql-cmd（原始客户端输出，兼容
+      SHOW TABLES、DESCRIBE users 等命令）、str_replace_editor（查看、创建和修改本地文件）。
+      Web 界面可用时另有 render-analysis：把一次调用渲染成一份版本化分析报告（1-6 个只读
+      数据集、1-8 个 metric/line/bar/pie/scatter/table 视图，同一数据集可被多个视图通过
+      datasetId 复用）。是否生成分析由你自主判断：先用 sql-query 探查表结构与样例数据并
+      核对事实（禁止臆造表名与列名）；schema 探查、单标量或原始明细等无视觉增益的查询
+      直接回答、不强制画图；简单关系可生成一个主图，涉及多指标、时间或分群的复杂问题可
+      生成 3-6 个互补视图。聚合、Top N、排序必须写在 SQL 中，line/time 数据需 ORDER BY。
+      工作流：先用 str_replace_editor 把 SQL 写入 .sql 文件，再用 sql-query 执行只读查询或
+      sql-write 执行写入并核对结果；结果可疑时缩小查询范围重试。每次数据库工具调用
+      只允许一条 SQL 语句。
 
 # ── filesystem ──────────────────────────────────────────────────────────────
 
-# The project's own fs tools: read / write / edit (no search tools here).
-- id: tool-fs
-  name: '@deepseek-ai/dsh-tool-fs'
+# DSH's native all-in-one file editor (no separate read/write/edit tools).
+- id: tool-str-replace-editor
+  name: '@deepseek-ai/dsh-tool-str-replace-editor'
+  config:
+    maxOutputChars: 16000
 
 # ── database ────────────────────────────────────────────────────────────────
 
 # This package's database tool half; injects the host's subprocess service and
 # the dataAgentConnections connection store (see the data-agent host row).
 # Registers sql-query (structured read), sql-write (explicit write), and the
-# legacy sqlcmd raw-terminal tool.
-- id: tool-sqlcmd
+# sql-cmd raw-terminal compatibility tool. When the host provides the webServer
+# service (Web profile), it additionally registers render-analysis directly
+# in this standing preset scope, so blank-session preset switches see it too.
+- id: tool-sql-cmd
   name: '@yejiming/dsh-data-agent/tool'
+
+# Human command surface consumed by dsh-tui and any other command adapter.
+# It is preset-scoped, recordInput=false, and adds no model-visible tools. It
+# also masks every host-global inherited model tool at the standing preset
+# scope. Sibling str_replace_editor/database registrations remain visible.
+- id: database-command
+  name: '@yejiming/dsh-data-agent/command'

package/preset/data-agent/preset.yml

@@ -1,3 +1,3 @@
 name: 数据模式
-description: 数据工程师 Agent：连接 MySQL/PostgreSQL/SQLite 数据库，用 sql-query/sql-write/sqlcmd 与 read/write/edit 工具探查 schema、编写并执行 SQL。
+description: 数据工程师 Agent：连接 MySQL/PostgreSQL/SQLite 数据库，用 sql-query/sql-write/sql-cmd 与 DSH 原生 str_replace_editor 探查 schema、编写并执行 SQL；Web 界面还可由 Agent 自主调用 render-analysis 生成单图或多视图分析报告。
 order: 4

package/lib/query-CmhTFklw.js

@@ -1,86 +0,0 @@
-import { c as buildIntrospectTemplate, l as buildStructuredQueryTemplate, s as buildClientTemplate } from "./defaults-Bac6QvNt.js";
-//#region src/query.ts
-/** Read one collected stream from offset 0. */
-function readCaptured(reader) {
-	if (reader === void 0) return {
-		text: "",
-		truncated: false
-	};
-	const read = reader.readFrom(0);
-	return {
-		text: read.text,
-		truncated: read.lossy
-	};
-}
-/**
-* Run one SQL text through the type's CLI client. The SQL is written to the
-* child's stdin (`{ data }` batch disposition) so it never appears in argv;
-* passwords travel in the env entries built by the template.
-*
-* Failure classification:
-* - the caller's external signal (e.g. the tool exec signal) aborts → the
-*   abort reason propagates;
-* - the internal timeout fires → an Error naming the deadline is thrown;
-* - the executable cannot be resolved → an Error naming the command is thrown;
-* - the process runs to completion → `{ exitCode, stdout, stderr, truncated }`
-*   is returned even for a non-zero exit (the caller decides what that means).
-* @param ctx - context exposing the subprocess service.
-* @param connection - the stored connection (password included).
-* @param sql - the SQL text (or client command) to run.
-* @param options - timeouts, caps, client overrides.
-* @param externalSignal - caller-owned cancellation (the tool exec signal).
-* @param introspect - use the machine-readable introspection flag set.
-* @returns the captured outcome.
-*/
-async function runClientQuery(ctx, connection, sql, options, externalSignal, introspect = false) {
-	const template = options.mode === "structured" ? buildStructuredQueryTemplate(connection.type, connection, options.clients[connection.type]) : options.mode === "introspect" || introspect ? buildIntrospectTemplate(connection.type, connection, options.clients[connection.type]) : buildClientTemplate(connection.type, connection, options.clients[connection.type]);
-	const controller = new AbortController();
-	const timer = setTimeout(() => controller.abort(/* @__PURE__ */ new Error(`查询超过 ${options.timeoutMs}ms 未完成，已终止客户端进程`)), options.timeoutMs);
-	const onExternalAbort = () => {
-		controller.abort(externalSignal.reason);
-	};
-	if (externalSignal.aborted) controller.abort(externalSignal.reason);
-	else externalSignal.addEventListener("abort", onExternalAbort, { once: true });
-	try {
-		let executable;
-		try {
-			executable = await ctx.subprocess.resolveExecutable(template.command, template.env, controller.signal);
-		} catch (error) {
-			controller.signal.throwIfAborted();
-			throw new Error(`无法解析数据库客户端 "${template.command}"（${error instanceof Error ? error.message : String(error)}）；请确认客户端已安装，或在 data-agent 插件配置的 clients 中覆盖命令名/路径`);
-		}
-		const handle = ctx.subprocess.spawn({
-			argv: [executable, ...template.args],
-			cwd: process.cwd(),
-			stdio: {
-				stdin: { data: `${template.stdinPrefix}${sql}\n` },
-				stdout: { maxBytes: options.maxResultChars },
-				stderr: { maxBytes: options.maxResultChars }
-			},
-			graceMs: options.graceMs ?? 5e3,
-			signal: controller.signal,
-			env: template.env
-		});
-		let outcome;
-		try {
-			outcome = await handle.done;
-		} catch (error) {
-			controller.signal.throwIfAborted();
-			throw new Error(`启动数据库客户端失败：${error instanceof Error ? error.message : String(error)}`);
-		}
-		if (controller.signal.aborted) controller.signal.throwIfAborted();
-		const stdout = readCaptured(handle.collected.stdout);
-		const stderr = readCaptured(handle.collected.stderr);
-		return {
-			exitCode: outcome.exitCode,
-			stdout: stdout.text,
-			stderr: stderr.text,
-			truncated: stdout.truncated || stderr.truncated
-		};
-	} finally {
-		clearTimeout(timer);
-		externalSignal.removeEventListener("abort", onExternalAbort);
-	}
-}
-//#endregion
-export { runClientQuery as t };