@yejiming/dsh-data-agent 0.0.9 → 0.0.11

package/lib/index.js

@@ -1,6 +1,9 @@
-import { o as clientsSchema, t as createConnectionService } from "./connections-DeauhaZi.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 { access, cp, mkdir, readFile } from "node:fs/promises";
+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";
 import { join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -40,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. */
@@ -109,24 +117,32 @@ function createDomainConnectionPersistence(domain) {
 //#endregion
 //#region src/index.ts
 /**
-* 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
 */
 /** Cordis plugin name (diagnostics only). */
 const name = "data-agent";
-/** Services required before the store can serve. */
-const inject = ["subprocess", "credentials"];
+/** Services required before the profile entry can mount its preset layer. */
+const inject = [
+	"agentPresets",
+	"commands",
+	"credentials",
+	"subprocess",
+	"tools"
+];
 /** Loader schema with deployment defaults (no library defaults). */
 const Config = z.object({
 	presetId: z.string().default(DEFAULT_PRESET_ID),
@@ -135,6 +151,7 @@ const Config = z.object({
 	introspectMaxTables: z.number().step(1).min(1).default(500),
 	queryTimeoutMs: z.number().step(1).min(1e3).default(DEFAULT_QUERY_TIMEOUT_MS),
 	maxResultChars: z.number().step(1).min(1024).default(DEFAULT_MAX_RESULT_CHARS),
+	maxRows: z.number().step(1).min(1).default(100),
 	maxQueryChars: z.number().step(1).min(1024).default(DEFAULT_MAX_QUERY_CHARS),
 	readonly: z.boolean().default(false),
 	persistConnections: z.boolean().default(true),
@@ -168,26 +185,57 @@ function resolveDshHome(env = process.env) {
 }
 /**
 * 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.
 */
 async function installPreset(ctx, presetId) {
 	const targetDir = join(resolveDshHome(), ".agent-presets", presetId);
+	const sourceDir = fileURLToPath(new URL("../preset/data-agent/", import.meta.url));
 	try {
 		await access(targetDir);
-		ctx.logger.info("data-agent: preset \"%s\" already present at %s, skipping install", presetId, targetDir);
-		await diagnoseExistingPreset(ctx, targetDir);
-		return;
+		return await synchronizeExistingPreset(ctx, targetDir, sourceDir, presetId);
 	} catch {}
-	const sourceDir = fileURLToPath(new URL("../preset/data-agent/", import.meta.url));
 	try {
 		await mkdir(targetDir, { recursive: true });
 		await cp(sourceDir, targetDir, { recursive: true });
 		ctx.logger.info("data-agent: installed preset \"%s\" to %s", presetId, targetDir);
+		return true;
 	} catch (error) {
 		ctx.logger.warn("data-agent: failed to install preset \"%s\" to %s (%s); copy preset/data-agent/ manually to enable the 数据模式 preset", presetId, targetDir, error instanceof Error ? error.message : String(error));
+		return false;
+	}
+}
+/** SHA-256 of the unmodified 0.0.9 composition that imported /tool and /command dynamically. */
+const LEGACY_PRESET_0_0_9_SHA256 = "bae875a90d638ea78715030246b0f8a9f1a2c3359ca61febb6ceb59d0fcd930a";
+/** Public for regression tests of the non-destructive preset migration gate. */
+function isLegacyManagedPreset(source) {
+	return createHash("sha256").update(source).digest("hex") === LEGACY_PRESET_0_0_9_SHA256;
+}
+/** Upgrade only the exact package-owned legacy composition; preserve every edited preset. */
+async function synchronizeExistingPreset(ctx, targetDir, sourceDir, presetId) {
+	const composition = join(targetDir, "agent.cordis.yml");
+	try {
+		const current = await readFile(composition, "utf8");
+		if (isLegacyManagedPreset(current)) {
+			const replacement = await readFile(join(sourceDir, "agent.cordis.yml"), "utf8");
+			await writeFile(composition, replacement, "utf8");
+			ctx.logger.info("data-agent: migrated preset at %s to profile-preloaded tools (removed dynamic /tool and /command rows)", composition);
+			return true;
+		}
+		if (current.includes("@yejiming/dsh-data-agent/tool") || current.includes("@yejiming/dsh-data-agent/command")) {
+			ctx.logger.warn("data-agent: user-edited preset at %s still imports /tool or /command dynamically; remove those rows so the profile-preloaded preset capabilities can activate in DSH Desktop", composition);
+			return false;
+		}
+		ctx.logger.info("data-agent: preset \"%s\" already present at %s, skipping install", presetId, targetDir);
+		return true;
+	} catch (error) {
+		ctx.logger.warn("data-agent: could not inspect existing preset %s (%s); it was not overwritten", composition, error instanceof Error ? error.message : String(error));
+		return false;
 	}
 }
 /** Exact profile-local package installation command used by diagnostics/docs. */
@@ -196,24 +244,32 @@ function profileInstallCommand(profile) {
 }
 /** Actionable diagnostic for a roster-visible preset whose profile lacks this package. */
 function missingProfileDependencyMessage(profile) {
-	return `data-agent preset is visible, but profile "${profile}" cannot resolve @yejiming/dsh-data-agent/tool or /command. Run: ${profileInstallCommand(profile)}`;
+	return `data-agent preset is visible, but its profile-preloaded capabilities are absent from profile "${profile}". Run: ${profileInstallCommand(profile)}`;
 }
-/** Warn without overwriting when a pre-existing user preset lacks the command row. */
-async function diagnoseExistingPreset(ctx, targetDir) {
-	const composition = join(targetDir, "agent.cordis.yml");
-	try {
-		if ((await readFile(composition, "utf8")).includes("@yejiming/dsh-data-agent/command")) return;
-		const profile = process.env.DSH_PROFILE?.trim();
-		const installHint = profile !== void 0 && profile.length > 0 ? profileInstallCommand(profile) : `${profileInstallCommand("web")}；${profileInstallCommand("dsh-tui")}`;
-		ctx.logger.warn("data-agent: existing user preset at %s does not contain the database-command row; the file was not overwritten. Back it up, then add name: \"@yejiming/dsh-data-agent/command\". Also install this package in the target profile: %s", composition, installHint);
-	} catch (error) {
-		ctx.logger.warn("data-agent: could not inspect existing preset %s (%s); it was not overwritten", composition, error instanceof Error ? error.message : String(error));
-	}
+/**
+* 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.
+*/
+async function mountPresetCapabilities(ctx, key, scopeTag, config) {
+	const scoped = ctx.extend({ [scopeTag]: key });
+	apply$2(scoped, config);
+	apply$1(scoped);
+}
+/** Read the host-owned scope tag from AgentPresets' already-created standing mount. */
+async function standingScopeTag(ctx, presetId, key) {
+	const pending = ctx.agentPresets.standing?.get(presetId);
+	if (pending === void 0) throw new Error(`data-agent: preset "${presetId}" has no standing scope after standingKeyFor()`);
+	const standing = await pending;
+	if (standing.key !== key) throw new Error(`data-agent: preset "${presetId}" standing scope changed during profile preload`);
+	const tag = Object.getOwnPropertySymbols(standing.scope.ctx).find((candidate) => Reflect.get(standing.scope.ctx, candidate) === key);
+	if (tag === void 0) throw new Error(`data-agent: preset "${presetId}" standing context exposes no scope tag`);
+	return tag;
 }
 /**
-* 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`).
+* 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.
 */
@@ -225,6 +281,7 @@ async function apply(ctx, config) {
 		introspectMaxTables: config.introspectMaxTables,
 		queryTimeoutMs: config.queryTimeoutMs,
 		maxResultChars: config.maxResultChars,
+		maxRows: config.maxRows,
 		maxQueryChars: config.maxQueryChars,
 		readonly: config.readonly,
 		persistConnections: config.persistConnections,
@@ -255,6 +312,7 @@ async function apply(ctx, config) {
 			store.set(sessionId, connection);
 		}
 	};
+	const presetReady = resolved.installPreset ? await installPreset(ctx, resolved.presetId) : false;
 	if (resolved.persistConnections) {
 		const domain = await (await ensureStorageDomain(ctx)).open(connectionStorageSpec);
 		ctx.effect(() => () => domain.close(), "data-agent: close connection storage domain");
@@ -263,7 +321,17 @@ async function apply(ctx, config) {
 		ctx.logger.warn("data-agent: persistConnections=false; connection state is process-local and cannot restore across Web/TUI");
 		mountService(ctx);
 	}
-	if (resolved.installPreset) await installPreset(ctx, resolved.presetId);
+	if (presetReady) {
+		const standingKey = await ctx.agentPresets.standingKeyFor(resolved.presetId);
+		await mountPresetCapabilities(ctx, standingKey, await standingScopeTag(ctx, resolved.presetId, standingKey), {
+			queryTimeoutMs: resolved.queryTimeoutMs,
+			maxResultChars: resolved.maxResultChars,
+			maxRows: resolved.maxRows,
+			maxQueryChars: resolved.maxQueryChars,
+			readonly: resolved.readonly,
+			clients: resolved.clients
+		});
+	}
 }
 /**
 * Reuse a surface-provided storage stack (Web) or mount the same JSON stack
@@ -289,4 +357,4 @@ async function ensureStorageDomain(ctx) {
 	return facility;
 }
 //#endregion
-export { Config, apply, inject, installPreset, missingProfileDependencyMessage, name, profileInstallCommand, resolveDshHome };
+export { Config, apply, inject, installPreset, isLegacyManagedPreset, missingProfileDependencyMessage, mountPresetCapabilities, name, profileInstallCommand, resolveDshHome };

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;