@yejiming/dsh-data-agent 0.0.9 → 0.0.10

package/lib/types/client/DataAgentWorkbench.d.ts

@@ -16,7 +16,7 @@ export interface DataAgentWorkbenchInjected {
         };
     };
 }
-/** The workbench's full component props: the dock seat + the locale seat + the injected sessions hook. */
-export type DataAgentWorkbenchProps = PropsRuntime<'conversation.input.dock'> & PropsLocale<'data-agent'> & InjectFace<DataAgentWorkbenchInjected>;
+/** The workbench's full component props: the composer-right seat + locale + sessions hook. */
+export type DataAgentWorkbenchProps = PropsRuntime<'conversation.input.right'> & PropsLocale<'data-agent'> & InjectFace<DataAgentWorkbenchInjected>;
 /** The database workbench body. */
 export declare function DataAgentWorkbench({ sessionId, useSessions, t }: DataAgentWorkbenchProps): import("react").JSX.Element | null;

package/lib/types/client/index.d.ts

@@ -1,8 +1,7 @@
 /**
  * Data Agent browser half, plugin entry: registers the database workbench
- * into the composer input dock (the strip ABOVE the input bar) for
- * data-agent sessions, and the `data-agent` dictionaries. The old
- * conversation-view tab is gone — the workbench lives inside the session.
+ * as a compact context-row control for data-agent sessions, and the
+ * `data-agent` dictionaries. The workbench itself opens in one Modal.
  * Connection state lives in the server-side connection store, so layout and
  * session switches never lose it — the view only mirrors what
  * `/plugins/data-agent/status` reports.
@@ -20,7 +19,7 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 export declare const inject: string[];
 /**
  * Client plugin body: register the data-agent dictionaries and the database
- * workbench into the composer input dock. The registration rides the slot
+ * workbench trigger into the composer card's right control region. The registration rides the slot
  * service's effect wrapper, so plugin unload removes it.
  * @param ctx - client root context.
  */

package/lib/types/client/locales.d.ts

@@ -40,6 +40,15 @@ export declare const zh: {
     'state.disconnected': string;
     'state.checking': string;
     'state.reconnecting': string;
+    'workbench.open.connected': string;
+    'workbench.open.disconnected': string;
+    'workbench.open.checking': string;
+    'workbench.open.error': string;
+    'composer.placeholder.disconnected': string;
+    'composer.placeholder.connected': string;
+    'wb.workbench.title': string;
+    'wb.workbench.description': string;
+    'wb.workbench.tabs': string;
     'wb.schemas': string;
     'wb.tables': string;
     'wb.columns': string;
@@ -116,6 +125,15 @@ export declare const en: {
     'state.disconnected': string;
     'state.checking': string;
     'state.reconnecting': string;
+    'workbench.open.connected': string;
+    'workbench.open.disconnected': string;
+    'workbench.open.checking': string;
+    'workbench.open.error': string;
+    'composer.placeholder.disconnected': string;
+    'composer.placeholder.connected': string;
+    'wb.workbench.title': string;
+    'wb.workbench.description': string;
+    'wb.workbench.tabs': string;
     'wb.schemas': string;
     'wb.tables': string;
     'wb.columns': string;

package/lib/types/client-discovery.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Cross-platform database CLI discovery.
+ *
+ * The subprocess provider remains the authority for executable validation.
+ * This module only builds a bounded, platform-aware PATH fallback when the
+ * provider cannot resolve the configured/default bare command from its
+ * current execution environment. No shell, registry, or recursive scan is
+ * involved, and the exact discovery environment is returned for spawn.
+ * @module @yejiming/dsh-data-agent/client-discovery
+ */
+import type { ClientConfig } from './clients.ts';
+import type { DatabaseType } from './connections.ts';
+/** Host facts are injectable so all supported platforms can be tested on one CI host. */
+export interface ClientDiscoverySystem {
+    platform: NodeJS.Platform;
+    env: Readonly<Record<string, string | undefined>>;
+    homeDir: string;
+    cwd: string;
+    readDirectory(directory: string): Promise<readonly string[]>;
+}
+/** DSH subprocess executable resolver face. */
+export type ExecutableResolver = (command: string, env?: Readonly<Record<string, string>>, signal?: AbortSignal) => Promise<string>;
+/** A resolved executable plus the environment that must also be used for spawn. */
+export interface ClientExecutableResolution {
+    executable: string;
+    env: Readonly<Record<string, string>>;
+    searchedDirectories: readonly string[];
+}
+/** Input for one database client resolution attempt. */
+export interface ResolveClientExecutableOptions {
+    type: DatabaseType;
+    command: string;
+    config?: ClientConfig;
+    env: Readonly<Record<string, string>>;
+    signal: AbortSignal;
+    resolveExecutable: ExecutableResolver;
+    system?: ClientDiscoverySystem;
+}
+/** Build ordered fallback directories without recursively scanning the host. */
+export declare function buildClientSearchDirectories(type: DatabaseType, config: ClientConfig | undefined, signal: AbortSignal, system?: ClientDiscoverySystem): Promise<string[]>;
+/**
+ * Resolve one configured/default client. Current PATH (or an explicit path)
+ * always wins. Only a missing bare command activates bounded PATH discovery.
+ */
+export declare function resolveClientExecutable(options: ResolveClientExecutableOptions): Promise<ClientExecutableResolution>;

package/lib/types/clients.d.ts

@@ -45,25 +45,31 @@ export declare function sanitizeIdentifier(type: DatabaseType, identifier: strin
 /** One deployment override for a database type's CLI client. */
 export interface ClientConfig {
     /** Executable name (resolved through PATH) or absolute path. */
-    command: string;
+    command?: string;
     /** Extra flag arguments prepended before the built-in flags. */
     args?: readonly string[];
+    /** Absolute directories searched after the current subprocess PATH. */
+    searchPaths?: readonly string[];
 }
 /** Loader schema for one client override (all fields optional at input). */
 export declare const clientConfigSchema: z<Schemastery.ObjectS<{
     command: z<string, string>;
     args: z<string[], string[]>;
+    searchPaths: z<string[], string[]>;
 }>, Schemastery.ObjectT<{
     command: z<string, string>;
     args: z<string[], string[]>;
+    searchPaths: z<string[], string[]>;
 }>>;
 /** Loader schema for the whole `clients` config object (any type key). */
 export declare const clientsSchema: z<import("cosmokit").Dict<{
     command?: string | null | undefined;
     args?: string[] | null | undefined;
+    searchPaths?: string[] | null | undefined;
 } & import("@deepseek-ai/cosmokit").Dict, string>, import("cosmokit").Dict<Schemastery.ObjectT<{
     command: z<string, string>;
     args: z<string[], string[]>;
+    searchPaths: z<string[], string[]>;
 }>, string>>;
 /**
  * A fully constructed client invocation: argv (command + flags, no SQL),

package/lib/types/defaults.d.ts

@@ -14,6 +14,8 @@ export declare const DEFAULT_INTROSPECT_MAX_TABLES = 500;
 export declare const DEFAULT_QUERY_TIMEOUT_MS = 30000;
 /** In-memory cap on database-tool captured output (stdout and stderr each). */
 export declare const DEFAULT_MAX_RESULT_CHARS = 20000;
+/** Maximum structured rows returned by one database read tool call. */
+export declare const DEFAULT_MAX_ROWS = 100;
 /** Cap on one /query SQL text length (abuse guard; the wire body stays small). */
 export declare const DEFAULT_MAX_QUERY_CHARS = 65536;
 /** Grace period for the subprocess terminate escalation. */

package/lib/types/index.d.ts

@@ -1,19 +1,22 @@
 /**
- * Data Agent server half for the dsh web GUI. The host row provides the
+ * Data Agent profile entry. The host row provides the
  * `dataAgentConnections` service (shared non-secret profile/binding storage;
  * temporary passwords stay process-local), seeds config connections (`connections`, `'*'` =
- * wildcard default), and installs the `data-agent` agent preset into
- * `$DSH_HOME/.agent-presets/` (idempotent, never overwrites a user-edited
- * directory).
+ * wildcard default), installs the `data-agent` agent preset into
+ * `$DSH_HOME/.agent-presets/`, and preloads the preset-scoped database tools
+ * and command through this profile bundle entry.
  *
  * The HTTP routes live in the separate `./routes` entry
  * (`@yejiming/dsh-data-agent/routes`, cordis row `data-agent-routes`) so
- * this row keeps working in headless profiles without a webserver; the
- * database tools themselves live in the `./tool` entry and are mounted only
- * by the data-agent preset.
+ * this row keeps working in headless profiles without a webserver. The
+ * database implementations still have public `./tool` and `./command`
+ * exports, but the shipped preset does not dynamically import those package
+ * subpaths. Loading them here keeps Desktop on the same profile-startup path
+ * as other UI bundles and avoids Electron ASAR package-resolution drift.
  * @module @yejiming/dsh-data-agent
  */
 import type { Context } from '@deepseek-ai/cordis';
+import type { ScopeKey } from '@deepseek-ai/dsh-scope';
 /** The `dataAgentConnections` service face on the cordis context. */
 declare module '@deepseek-ai/cordis' {
     interface Context {
@@ -23,9 +26,10 @@ declare module '@deepseek-ai/cordis' {
 import z from 'schemastery';
 import { type DataAgentConnections, type DatabaseType } from './connections.ts';
 import { type ClientConfig } from './clients.ts';
+import { type Config as ToolConfig } from './tool.ts';
 /** Cordis plugin name (diagnostics only). */
 export declare const name = "data-agent";
-/** Services required before the store can serve. */
+/** Services required before the profile entry can mount its preset layer. */
 export declare const inject: string[];
 /** Deployment overrides for one database type's CLI client. */
 export type ClientsConfig = Partial<Record<DatabaseType, ClientConfig>>;
@@ -61,6 +65,8 @@ export interface Config {
     queryTimeoutMs: number;
     /** In-memory cap on database-tool captured output. */
     maxResultChars: number;
+    /** Maximum structured rows returned by one database read tool call. */
+    maxRows: number;
     /** Maximum SQL text accepted by the shared Web query adapter. */
     maxQueryChars: number;
     /** Default read-only guard: true rejects write statements in database tools and /query. */
@@ -80,15 +86,18 @@ export declare const Config: z<Schemastery.ObjectS<{
     introspectMaxTables: z<number, number>;
     queryTimeoutMs: z<number, number>;
     maxResultChars: z<number, number>;
+    maxRows: z<number, number>;
     maxQueryChars: z<number, number>;
     readonly: z<boolean, boolean>;
     persistConnections: z<boolean, boolean>;
     clients: z<import("cosmokit").Dict<{
         command?: string | null | undefined;
         args?: string[] | null | undefined;
+        searchPaths?: string[] | null | undefined;
     } & import("@deepseek-ai/cosmokit").Dict, string>, import("cosmokit").Dict<Schemastery.ObjectT<{
         command: z<string, string>;
         args: z<string[], string[]>;
+        searchPaths: z<string[], string[]>;
     }>, string>>;
     connections: z<import("cosmokit").Dict<{
         type?: "mysql" | "postgres" | "sqlite" | "oracle" | "hive" | "impala" | null | undefined;
@@ -116,15 +125,18 @@ export declare const Config: z<Schemastery.ObjectS<{
     introspectMaxTables: z<number, number>;
     queryTimeoutMs: z<number, number>;
     maxResultChars: z<number, number>;
+    maxRows: z<number, number>;
     maxQueryChars: z<number, number>;
     readonly: z<boolean, boolean>;
     persistConnections: z<boolean, boolean>;
     clients: z<import("cosmokit").Dict<{
         command?: string | null | undefined;
         args?: string[] | null | undefined;
+        searchPaths?: string[] | null | undefined;
     } & import("@deepseek-ai/cosmokit").Dict, string>, import("cosmokit").Dict<Schemastery.ObjectT<{
         command: z<string, string>;
         args: z<string[], string[]>;
+        searchPaths: z<string[], string[]>;
     }>, string>>;
     connections: z<import("cosmokit").Dict<{
         type?: "mysql" | "postgres" | "sqlite" | "oracle" | "hive" | "impala" | null | undefined;
@@ -153,21 +165,35 @@ export declare const Config: z<Schemastery.ObjectS<{
 export declare function resolveDshHome(env?: Record<string, string | undefined>): string;
 /**
  * Install the packaged `preset/data-agent/` directory into
- * `$DSH_HOME/.agent-presets/<presetId>/`. Idempotent: an existing target
- * directory is left untouched (user edits survive); `installPreset: false`
- * never calls this. Best-effort — a failure logs a warning with manual
- * install instructions instead of failing the boot.
+ * `$DSH_HOME/.agent-presets/<presetId>/`. Idempotent: an existing target is
+ * normally left untouched. The exact package-owned 0.0.9 composition is
+ * migrated once because its two dynamic package rows are incompatible with
+ * DSH Desktop's unpacked-ASAR loader; user-edited compositions are never
+ * overwritten. `installPreset: false` never calls this. Best-effort — a
+ * failure logs a warning with manual install instructions instead of failing
+ * the boot.
  */
-export declare function installPreset(ctx: Context, presetId: string): Promise<void>;
+export declare function installPreset(ctx: Context, presetId: string): Promise<boolean>;
+/** Public for regression tests of the non-destructive preset migration gate. */
+export declare function isLegacyManagedPreset(source: string): boolean;
 /** Exact profile-local package installation command used by diagnostics/docs. */
 export declare function profileInstallCommand(profile: string): string;
 /** Actionable diagnostic for a roster-visible preset whose profile lacks this package. */
 export declare function missingProfileDependencyMessage(profile: string): string;
+/** Tool configuration inherited by the profile-preloaded preset capabilities. */
+type PresetCapabilitiesConfig = Pick<ToolConfig, 'queryTimeoutMs' | 'maxResultChars' | 'maxRows' | 'maxQueryChars' | 'readonly' | 'clients'>;
 /**
- * Mount the data-agent host row: connection store, config-seeded
- * connections, and preset self-install. HTTP routes are the sibling
- * `data-agent-routes` row (`./routes`).
+ * Register the statically imported database tools and command under the exact
+ * standing key owned by the data-agent preset. Selecting the preset performs
+ * no package import and only links the agent scope to this key.
+ */
+export declare function mountPresetCapabilities(ctx: Context, key: ScopeKey, scopeTag: symbol, config: PresetCapabilitiesConfig): Promise<void>;
+/**
+ * Mount the data-agent profile row: connection store, config-seeded
+ * connections, preset installation, and profile-preloaded preset capabilities.
+ * HTTP routes are the sibling `data-agent-routes` row (`./routes`).
  * @param ctx - host cordis context.
  * @param config - validated loader configuration.
  */
 export declare function apply(ctx: Context, config: Config): Promise<void>;
+export {};

package/lib/types/routes.d.ts

@@ -6,22 +6,9 @@
  * in `DataAgentConnections`, which is also consumed by TUI commands/tools.
  * @module @yejiming/dsh-data-agent/routes
  */
-import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { Context } from '@deepseek-ai/cordis';
 import z from 'schemastery';
 import type { DatabaseConnectionInput } from './connections.ts';
-interface WebServerLike {
-    register(route: {
-        kind: 'exact' | 'prefix';
-        path: string;
-        handler: (req: IncomingMessage, res: ServerResponse) => void | Promise<void>;
-    }): () => void;
-}
-declare module '@deepseek-ai/cordis' {
-    interface Context {
-        webServer: WebServerLike;
-    }
-}
 export declare const name = "data-agent-routes";
 /** Headless profiles activate this row without waiting forever for webServer. */
 export declare const inject: string[];
@@ -57,4 +44,3 @@ export interface ConnectRequestBody extends DatabaseConnectionInput {
 export declare function validateConnectBody(value: unknown, cwd?: string): ConnectRequestBody;
 /** Register Web routes only when both the webserver and shared service exist. */
 export declare function apply(ctx: Context, _config: Config): void;
-export {};

package/lib/types/tool.d.ts

@@ -49,9 +49,11 @@ export declare const Config: z<Schemastery.ObjectS<{
     clients: z<import("cosmokit").Dict<{
         command?: string | null | undefined;
         args?: string[] | null | undefined;
+        searchPaths?: string[] | null | undefined;
     } & import("@deepseek-ai/cosmokit").Dict, string>, import("cosmokit").Dict<Schemastery.ObjectT<{
         command: z<string, string>;
         args: z<string[], string[]>;
+        searchPaths: z<string[], string[]>;
     }>, string>>;
 }>, Schemastery.ObjectT<{
     queryTimeoutMs: z<number, number>;
@@ -62,9 +64,11 @@ export declare const Config: z<Schemastery.ObjectS<{
     clients: z<import("cosmokit").Dict<{
         command?: string | null | undefined;
         args?: string[] | null | undefined;
+        searchPaths?: string[] | null | undefined;
     } & import("@deepseek-ai/cosmokit").Dict, string>, import("cosmokit").Dict<Schemastery.ObjectT<{
         command: z<string, string>;
         args: z<string[], string[]>;
+        searchPaths: z<string[], string[]>;
     }>, string>>;
 }>>;
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yejiming/dsh-data-agent",
   "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",
+  "version": "0.0.10",
   "publishConfig": {
     "access": "public"
   },
@@ -79,6 +79,7 @@
   "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",
@@ -89,6 +90,7 @@
     "@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",
@@ -129,6 +131,7 @@
   "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",
@@ -139,6 +142,7 @@
     "@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",

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

@@ -8,14 +8,13 @@
 # the registries themselves, the sandbox and approval stack, persistence, and
 # the model route.
 #
-# 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.
+# 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 four rows only CONSUME host services (the tools/commands registries,
-# filesystem, subprocess, and dataAgentConnections).
+# Both rows only consume host services and remain safe for standing mounting.
 
 # ── identity ────────────────────────────────────────────────────────────────
 
@@ -45,21 +44,3 @@
   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
-# 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/sql-cmd 与 DSH 原生 str_replace_editor 探查 schema、编写并执行 SQL；Web 界面还可由 Agent 自主调用 render-analysis 生成单图或多视图分析报告。
+description: 连接数据库，用自然语言完成数据探索、SQL编写与业务分析。
 order: 4