@yejiming/dsh-data-agent 0.0.6 → 0.0.10

package/lib/types/tui-connection-form.d.ts

@@ -0,0 +1,98 @@
+/**
+ * Short-lived ANSI connection form used by `/database connect` in dsh-tui.
+ *
+ * dsh-tui 0.6.x exposes commands but no public custom-form/sensitive-input
+ * slot. This adapter therefore owns a small terminal form and only activates
+ * for an interactive `dsh-tui` profile. It snapshots the host's `readable`
+ * listeners, consumes input for the lifetime of the form, then restores the
+ * listeners exactly. It never imports dsh-tui, React, or Ink.
+ * @module @yejiming/dsh-data-agent/tui-connection-form
+ */
+import type { ConnectionFormDraft, DatabaseConnectionInput, DatabaseType } from './connections.ts';
+export declare const TUI_DATABASE_TYPES: readonly ["mysql", "postgres", "sqlite", "oracle", "hive", "impala"];
+export type TuiConnectionField = 'type' | 'host' | 'port' | 'user' | 'database' | 'password' | 'readonly' | 'confirm' | 'cancel';
+export interface TuiConnectionFormState {
+    type: DatabaseType;
+    host: string;
+    port: string;
+    user: string;
+    database: string;
+    password: string;
+    readonly: boolean;
+    focus: TuiConnectionField;
+    cursor: number;
+    selector?: {
+        field: 'type' | 'readonly';
+        index: number;
+    };
+    error?: string;
+}
+export type TuiFormKey = {
+    name: 'text';
+    text: string;
+} | {
+    name: 'tab' | 'backtab' | 'enter' | 'escape' | 'backspace' | 'delete';
+} | {
+    name: 'left' | 'right' | 'up' | 'down' | 'home' | 'end' | 'space';
+};
+export type TuiFormTransition = {
+    kind: 'editing';
+    state: TuiConnectionFormState;
+} | {
+    kind: 'submitted';
+    state: TuiConnectionFormState;
+    input: DatabaseConnectionInput;
+} | {
+    kind: 'cancelled';
+    state: TuiConnectionFormState;
+};
+type StreamListener = (...args: unknown[]) => void;
+export interface TuiFormInput {
+    isTTY?: boolean;
+    isRaw?: boolean;
+    read(): unknown;
+    listeners(event: string): Function[];
+    on(event: string, listener: StreamListener): unknown;
+    emit?(event: string): unknown;
+    push?(value: string): unknown;
+    removeListener(event: string, listener: StreamListener): unknown;
+    setRawMode?(mode: boolean): unknown;
+    ref?(): unknown;
+}
+export interface TuiFormOutput {
+    isTTY?: boolean;
+    columns?: number;
+    write(value: string): unknown;
+    on?(event: string, listener: StreamListener): unknown;
+    removeListener?(event: string, listener: StreamListener): unknown;
+    emit?(event: string): unknown;
+}
+export interface RunTuiConnectionFormOptions {
+    input?: TuiFormInput;
+    output?: TuiFormOutput;
+    signal?: AbortSignal;
+    initialDraft?: ConnectionFormDraft;
+    persistDraft?: (draft: ConnectionFormDraft) => void | Promise<void>;
+}
+/** Initial form intentionally leaves host/port empty so placeholders are real defaults. */
+export declare function createTuiConnectionFormState(initialDraft?: ConnectionFormDraft): TuiConnectionFormState;
+/** Project form state onto the only values allowed to cross the durable seam. */
+export declare function connectionFormDraft(state: TuiConnectionFormState): ConnectionFormDraft;
+/** Relevant focus order for the selected database kind. */
+export declare function tuiConnectionFields(type: DatabaseType): readonly TuiConnectionField[];
+/** Default network port shown as a placeholder and applied only at submit time. */
+export declare function defaultDatabasePort(type: Exclude<DatabaseType, 'sqlite'>): number;
+/** Detect the supported host without coupling to dsh-tui modules. */
+export declare function isDshTuiTerminal(argv?: readonly string[], input?: Pick<TuiFormInput, 'isTTY'>, output?: Pick<TuiFormOutput, 'isTTY'>): boolean;
+/** Pure keyboard reducer, kept separate from terminal ownership for regression tests. */
+export declare function updateTuiConnectionForm(current: TuiConnectionFormState, key: TuiFormKey): TuiFormTransition;
+/** Rendered value is masked before it reaches the ANSI string. */
+export declare function renderTuiConnectionForm(state: TuiConnectionFormState, columns?: number): string;
+/**
+ * Own the terminal only for the form lifetime. `undefined` means user cancel.
+ * The returned password has never crossed stdout, argv, env, or a DSH event.
+ */
+export declare function runTuiConnectionForm(options?: RunTuiConnectionFormOptions): Promise<DatabaseConnectionInput | undefined>;
+/** Decode the keyboard subset owned by the form; unknown terminal reports are ignored. */
+export declare function decodeTuiFormInput(value: string): TuiFormKey[];
+export {};

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.10",
   "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,92 @@
   ],
   "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-agent-presets": "^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-scope": "^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-agent-presets": "^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-scope": "^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,13 @@
 # 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 editor row registers DSH's native str_replace_editor. The database tools,
+# /database command, and inherited-tool restriction are statically imported by
+# the profile's `@yejiming/dsh-data-agent` bundle entry and registered under
+# this preset's standing key. Selecting the preset therefore performs no
+# dynamic import of this package (important for DSH Desktop's ASAR runtime).
 #
-# All three rows only CONSUME host services (the tools registry, subprocess,
-# the dataAgentConnections connection store), so no `isolate` realm is needed.
+# Both rows only consume host services and remain safe for standing mounting.
 
 # ── identity ────────────────────────────────────────────────────────────────
 
@@ -27,23 +25,22 @@
   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'
-
-# ── 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
-  name: '@yejiming/dsh-data-agent/tool'
+# 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

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: 连接数据库，用自然语言完成数据探索、SQL编写与业务分析。
 order: 4