@yejiming/dsh-data-agent 0.0.10 → 0.0.11

package/lib/{command-LFgLb6el.js → command-DuCpwVbl.js}

@@ -1,4 +1,4 @@
-import { r as redactSecretText } from "./connections-WmjuUrDj.js";
+import { r as redactSecretText } from "./connections-5sfdEDsG.js";
 import { RUN_CODE_NAME } from "@deepseek-ai/dsh-tools";
 //#region src/tui-connection-form.ts
 const TUI_DATABASE_TYPES = [
@@ -691,7 +691,7 @@ function formatConnectionStatus(summary) {
 	if (summary === void 0) return "数据库状态：未连接。";
 	const endpoint = summary.type === "sqlite" ? summary.database : `${summary.host ?? "localhost"}${summary.port !== void 0 ? `:${summary.port}` : ""}`;
 	const lines = [
-		"数据库状态：已连接",
+		summary.reconnectRequired === true ? "数据库状态：需要重新认证" : "数据库状态：已连接",
 		`类型：${summary.type}`,
 		`地址：${endpoint}`,
 		`数据库：${summary.database}`,

package/lib/command.js

@@ -1,2 +1,2 @@
-import { a as formatConnectionStatus, c as parseConnectArguments, i as executeDatabaseCommand, l as parseDatabaseAction, n as DATA_AGENT_TOOL_NAMES, o as inject, r as apply, s as name, t as DATABASE_COMMAND_USAGE } from "./command-LFgLb6el.js";
+import { a as formatConnectionStatus, c as parseConnectArguments, i as executeDatabaseCommand, l as parseDatabaseAction, n as DATA_AGENT_TOOL_NAMES, o as inject, r as apply, s as name, t as DATABASE_COMMAND_USAGE } from "./command-DuCpwVbl.js";
 export { DATABASE_COMMAND_USAGE, DATA_AGENT_TOOL_NAMES, apply, executeDatabaseCommand, formatConnectionStatus, inject, name, parseConnectArguments, parseDatabaseAction };

package/lib/{connections-WmjuUrDj.js → connections-5sfdEDsG.js}

@@ -1305,7 +1305,8 @@ function normalizeConnectionInput(input, cwd = process.cwd()) {
 	if (input.name !== void 0 && input.name.trim().length === 0) throw new Error("name 不能为空");
 	const connection = {
 		type: input.type,
-		database: input.type === "sqlite" ? resolve(cwd, input.database) : input.database
+		database: input.type === "sqlite" ? resolve(cwd, input.database) : input.database,
+		credentialMode: input.type === "sqlite" ? "none" : input.passwordRef !== void 0 ? "reference" : input.password !== void 0 && input.password.length > 0 ? "password" : "none"
 	};
 	if (input.type !== "sqlite") {
 		if (input.host !== void 0 && input.host.length > 0) connection.host = input.host;
@@ -1346,16 +1347,21 @@ function createConnectionService(ctx, options, persistence) {
 		return ctx;
 	};
 	const resolveCredential = async (connection) => {
-		if (connection.passwordRef === void 0) return {
-			...connection,
-			tables: copyTables(connection.tables)
-		};
-		const ref = validatedCredentialRef(connection.passwordRef);
-		const hit = await requireContext().credentials.resolve(ref);
-		if (hit === void 0 || hit.value.length === 0) throw new Error(`凭据引用 "${connection.passwordRef}" 未配置`);
+		const mode = credentialModeOf(connection);
+		if (mode === "reference") {
+			if (connection.passwordRef === void 0) throw new Error("数据库凭据引用缺失，请重新配置连接");
+			const ref = validatedCredentialRef(connection.passwordRef);
+			const hit = await requireContext().credentials.resolve(ref);
+			if (hit === void 0 || hit.value.length === 0) throw new Error(`凭据引用 "${connection.passwordRef}" 未配置`);
+			return {
+				...connection,
+				password: hit.value,
+				tables: copyTables(connection.tables)
+			};
+		}
+		if (mode === "password" && connection.password === void 0) throw new Error("数据库凭据需要重新输入；请打开数据库配置并重新连接");
 		return {
 			...connection,
-			password: hit.value,
 			tables: copyTables(connection.tables)
 		};
 	};
@@ -1400,18 +1406,29 @@ function createConnectionService(ctx, options, persistence) {
 		}
 	};
 	const credentialSummary = async (connection) => {
-		if (connection.type === "sqlite") return void 0;
-		if (connection.password !== void 0) return {
+		const mode = credentialModeOf(connection);
+		if (connection.type === "sqlite" || mode === "none") return void 0;
+		if (mode === "password") return connection.password === void 0 ? { configured: false } : {
 			configured: true,
 			source: "memory"
 		};
-		if (connection.passwordRef === void 0) return { configured: false };
+		if (mode !== "reference" || connection.passwordRef === void 0) return { configured: false };
 		const info = await requireContext().credentials.describe(validatedCredentialRef(connection.passwordRef));
 		return {
 			configured: info.configured,
 			...info.source !== void 0 ? { source: info.source } : {}
 		};
 	};
+	const statusSummary = async (connection) => {
+		const summary = summarize(connection);
+		const mode = credentialModeOf(connection);
+		summary.credentialMode = mode;
+		summary.credential = await credentialSummary(connection);
+		const ready = mode === "none" || summary.credential?.configured === true;
+		summary.ready = ready;
+		summary.reconnectRequired = !ready;
+		return summary;
+	};
 	const service = {
 		set(sessionId, connection) {
 			if (connection.password !== void 0 && connection.passwordRef !== void 0) throw new Error("password 与 passwordRef 不能同时提供");
@@ -1454,9 +1471,7 @@ function createConnectionService(ctx, options, persistence) {
 		async status(sessionId) {
 			const connection = rawConnection(sessionId);
 			if (connection === void 0) return void 0;
-			const summary = summarize(connection);
-			summary.credential = await credentialSummary(connection);
-			return summary;
+			return statusSummary(connection);
 		},
 		async connect(sessionId, input, signal) {
 			if (sessionId.length === 0) throw new Error("sessionId 必须是非空字符串");
@@ -1472,11 +1487,9 @@ function createConnectionService(ctx, options, persistence) {
 				tables
 			};
 			runtime.set(sessionId, published);
-			const summary = summarize(published);
-			summary.credential = await credentialSummary(published);
 			return {
 				tables,
-				summary
+				summary: await statusSummary(published)
 			};
 		},
 		async disconnect(sessionId) {
@@ -1491,11 +1504,9 @@ function createConnectionService(ctx, options, persistence) {
 				tables
 			};
 			runtime.set(sessionId, published);
-			const summary = summarize(published);
-			summary.credential = await credentialSummary(published);
 			return {
 				tables,
-				summary
+				summary: await statusSummary(published)
 			};
 		},
 		async resolveForExecution(sessionId) {
@@ -1583,7 +1594,8 @@ function connectionFromProfile(profileId, profile) {
 		...profile.port !== void 0 ? { port: profile.port } : {},
 		...profile.user !== void 0 ? { user: profile.user } : {},
 		...profile.readonly !== void 0 ? { readonly: profile.readonly } : {},
-		...profile.passwordRef !== void 0 ? { passwordRef: profile.passwordRef } : {}
+		...profile.passwordRef !== void 0 ? { passwordRef: profile.passwordRef } : {},
+		credentialMode: profile.credentialMode ?? (profile.type === "sqlite" ? "none" : profile.passwordRef !== void 0 ? "reference" : "password")
 	};
 }
 function profileFromConnection(connection, updatedAt) {
@@ -1596,9 +1608,18 @@ function profileFromConnection(connection, updatedAt) {
 		...connection.port !== void 0 ? { port: connection.port } : {},
 		...connection.user !== void 0 ? { user: connection.user } : {},
 		...connection.readonly !== void 0 ? { readonly: connection.readonly } : {},
-		...connection.passwordRef !== void 0 ? { passwordRef: connection.passwordRef } : {}
+		...connection.passwordRef !== void 0 ? { passwordRef: connection.passwordRef } : {},
+		...connection.credentialMode !== void 0 ? { credentialMode: connection.credentialMode } : {}
 	};
 }
+/** Infer legacy records while leaving ambiguous secret-less SQL profiles conservative. */
+function credentialModeOf(connection) {
+	if (connection.credentialMode !== void 0) return connection.credentialMode;
+	if (connection.type === "sqlite") return "none";
+	if (connection.passwordRef !== void 0) return "reference";
+	if (connection.password !== void 0) return "password";
+	return "none";
+}
 function requireIdentifier(type, value, label) {
 	if (value === void 0 || value.length === 0) throw new Error(`${label} 不能为空`);
 	sanitizeIdentifier(type, value);

package/lib/index.js

@@ -1,7 +1,7 @@
-import { o as clientsSchema, t as createConnectionService } from "./connections-WmjuUrDj.js";
+import { o as clientsSchema, t as createConnectionService } from "./connections-5sfdEDsG.js";
 import { a as DEFAULT_PRESET_ID, i as DEFAULT_MAX_RESULT_CHARS, o as DEFAULT_QUERY_TIMEOUT_MS, r as DEFAULT_MAX_QUERY_CHARS, t as DEFAULT_CONNECT_TIMEOUT_MS } from "./defaults-DP4RyRh1.js";
-import { r as apply$1 } from "./command-LFgLb6el.js";
-import { n as apply$2 } from "./tool-Dka6RyEp.js";
+import { r as apply$1 } from "./command-DuCpwVbl.js";
+import { n as apply$2 } from "./tool-DVh61An-.js";
 import { createHash } from "node:crypto";
 import { access, cp, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -43,6 +43,11 @@ const persistedConnectionProfileSchema = z$1.object({
 	database: z$1.string().min(1),
 	readonly: z$1.boolean().optional(),
 	passwordRef: z$1.string().regex(/^[A-Za-z_][A-Za-z0-9_]*$/).optional(),
+	credentialMode: z$1.enum([
+		"none",
+		"password",
+		"reference"
+	]).optional(),
 	updatedAt: z$1.string().min(1)
 }).strict();
 /** Durable session-to-profile binding schema. */

package/lib/routes.js

@@ -90,8 +90,12 @@ function apply(ctx, _config) {
 						if (req.method === "GET" && routeIs(segments, "status")) {
 							const sessionId = requireString(url.searchParams.get("sessionId"), "sessionId");
 							const summary = await scope.dataAgentConnections.status(sessionId);
-							writeJson(200, summary === void 0 ? { connected: false } : {
-								connected: true,
+							writeJson(200, summary === void 0 ? {
+								connected: false,
+								reconnectRequired: false
+							} : {
+								connected: summary.ready === true,
+								reconnectRequired: summary.reconnectRequired === true,
 								summary
 							});
 							return;

package/lib/{tool-Dka6RyEp.js → tool-DVh61An-.js}

@@ -1,4 +1,4 @@
-import { a as classifyStatement, c as assertSingleStatement, i as runClientQuery, n as redactQueryResult, o as clientsSchema, r as redactSecretText, s as enforceReadRowLimit } from "./connections-WmjuUrDj.js";
+import { a as classifyStatement, c as assertSingleStatement, i as runClientQuery, n as redactQueryResult, o as clientsSchema, r as redactSecretText, s as enforceReadRowLimit } from "./connections-5sfdEDsG.js";
 import { i as DEFAULT_MAX_RESULT_CHARS, o as DEFAULT_QUERY_TIMEOUT_MS, r as DEFAULT_MAX_QUERY_CHARS } from "./defaults-DP4RyRh1.js";
 import z from "schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";

package/lib/tool.js

@@ -1,2 +1,2 @@
-import { i as name, n as apply, r as inject, t as Config } from "./tool-Dka6RyEp.js";
+import { i as name, n as apply, r as inject, t as Config } from "./tool-DVh61An-.js";
 export { Config, apply, inject, name };

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

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

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

@@ -24,7 +24,7 @@ export interface SavedConnection {
     /** Non-secret credential reference; mutually exclusive with `password`. */
     passwordRef?: string;
     /** Explicit form mode; absent legacy records infer it from passwordRef. */
-    credentialMode?: 'password' | 'reference';
+    credentialMode?: 'none' | 'password' | 'reference';
     /** Opt-in flag; when true, {@link saveConnection} may write `password`. */
     persistPassword?: boolean;
     readonly?: boolean;

package/lib/types/connections.d.ts

@@ -14,6 +14,8 @@ import { type QueryResult } from './query.ts';
 export declare const WILDCARD_SESSION = "*";
 /** Supported database client kinds. */
 export type DatabaseType = 'mysql' | 'postgres' | 'sqlite' | 'oracle' | 'hive' | 'impala';
+/** How a non-SQLite profile authenticates without ever persisting a secret. */
+export type CredentialMode = 'none' | 'password' | 'reference';
 /** Safe credential facts returned to UI/command surfaces. */
 export interface CredentialSummary {
     configured: boolean;
@@ -38,6 +40,8 @@ export interface DatabaseConnectionInput {
 }
 /** Runtime connection. `tables` and temporary `password` are never durable. */
 export interface DatabaseConnection extends DatabaseConnectionInput {
+    /** Internal authentication shape retained in the non-secret durable profile. */
+    credentialMode?: CredentialMode;
     tables?: string[];
 }
 /** Password-free public connection view. */
@@ -53,6 +57,11 @@ export interface ConnectionSummary {
     name?: string;
     tables?: string[];
     credential?: CredentialSummary;
+    credentialMode?: CredentialMode;
+    /** True only when the current process can execute a database operation now. */
+    ready?: boolean;
+    /** A saved profile exists, but its credential must be supplied/configured again. */
+    reconnectRequired?: boolean;
 }
 /** Value stored in the `profiles` domain table. Never add secrets here. */
 export interface PersistedConnectionProfile {
@@ -64,6 +73,7 @@ export interface PersistedConnectionProfile {
     database: string;
     readonly?: boolean;
     passwordRef?: string;
+    credentialMode?: CredentialMode;
     updatedAt: string;
 }
 /** Value stored in the `bindings` domain table. */

package/lib/types/storage.d.ts

@@ -31,6 +31,11 @@ export declare const persistedConnectionProfileSchema: z.ZodObject<{
     database: z.ZodString;
     readonly: z.ZodOptional<z.ZodBoolean>;
     passwordRef: z.ZodOptional<z.ZodString>;
+    credentialMode: z.ZodOptional<z.ZodEnum<{
+        none: "none";
+        password: "password";
+        reference: "reference";
+    }>>;
     updatedAt: z.ZodString;
 }, z.core.$strict>;
 /** Durable session-to-profile binding schema. */

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.10",
+  "version": "0.0.11",
   "publishConfig": {
     "access": "public"
   },