dsh-superagent-console 0.1.1 → 0.1.3

package/lib/index.d.ts

@@ -28,6 +28,8 @@ interface Prereq {
   name: string;
   ok: boolean;
   detail: string;
+  /** Suggested remediation command for a failed check; absent when none applies. */
+  hint?: string;
 }
 interface EngineHealth {
   exit: number;
@@ -86,6 +88,16 @@ interface EngineActionResult {
 }
 /** Run the lifecycle script's start/restart action and wait for its verdict. */
 declare function engineAction(config: ResolvedConsoleConfig, action: 'start' | 'restart', env?: InstallEnv): Promise<EngineActionResult>;
+/**
+ * Collect `link:` dependencies whose target no longer exists. The official
+ * CLI sails through the package operation itself (pnpm trusts the lockfile's
+ * recorded link resolution without checking the target) but its post-install
+ * bundle reconciliation probes `node_modules/<name>/package.json` and exits 1
+ * with an opaque "cannot resolve profile bundle" error — the shape seen after
+ * a hosting checkout is moved and only the manifest specifiers are rewritten.
+ * Refusing up front keeps the failure readable and names the repair.
+ */
+declare function danglingLinks(config: ResolvedConsoleConfig): string[];
 /** Minimal structural view of the settings service the sync reads through. */
 interface SettingsFace {
   describe(): Array<{
@@ -163,4 +175,4 @@ declare function proxyHandler(options: ProxyOptions): (req: IncomingMessage, res
 declare const name: string;
 declare const inject: string[];
 declare function apply(ctx: Context, config?: Partial<ResolvedConsoleConfig>): void;
-export { Config, type ConsoleState, type DetectResult, type Prereq, type ProviderDiff, type ResolvedConsoleConfig, type SettingsFace, type SetupState, type StageId, type SyncMode, type SyncReport, apply, applyProviderSync, detect, diffProviders, engineAction, inject, name, proxyHandler, readEngineProviders, readHostProviders, readSetupState, runInstall };
+export { Config, type ConsoleState, type DetectResult, type Prereq, type ProviderDiff, type ResolvedConsoleConfig, type SettingsFace, type SetupState, type StageId, type SyncMode, type SyncReport, apply, applyProviderSync, danglingLinks, detect, diffProviders, engineAction, inject, name, proxyHandler, readEngineProviders, readHostProviders, readSetupState, runInstall };

package/lib/index.js

@@ -2,7 +2,7 @@ import os from "node:os";
 import path from "node:path";
 import z from "@deepseek-ai/schemastery";
 import fs, { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { execFile } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { parse, stringify } from "yaml";
 import { Readable } from "node:stream";
 // src/config.ts
@@ -37,13 +37,31 @@ const Config = z.object({
 * Every spawn goes through `execFile` with an argv array (never a shell
 * string), an explicit timeout, and an augmented PATH: the desktop app
 * process may run with a minimal GUI PATH, so the node installation bin
-* directory and the configured `extraPath` entries are prepended.
+* directory, the configured `extraPath` entries, and the app's bundled
+* dsh CLI directory are prepended (in that order; user entries win).
 */
 const MAX_BUFFER = 16777216;
-/** PATH prepended for every spawned tool: the running node's bin dir plus the configured extras. */
+/**
+* Directory of the dsh CLI shipped inside the desktop app bundle: the
+* Electron binary lives at `<App>.app/Contents/MacOS/<bin>`, so the bundled
+* CLI resolves to `../Resources/runtime/cli/bin`. Null outside an app
+* bundle (plain node runs, tests) or when the bundle carries no CLI.
+* Uncached on purpose: spawns are rare and the probe is one existsSync.
+*/
+function bundledCliDir(execPath = process.execPath) {
+	const candidate = path.join(path.dirname(execPath), "..", "Resources", "runtime", "cli", "bin");
+	return existsSync(path.join(candidate, "dsh")) ? candidate : null;
+}
+/**
+* PATH prepended for every spawned tool: the running node's bin dir, the
+* configured extras, the app's bundled CLI dir (fallback only, so an
+* explicit user install keeps winning), then the inherited PATH.
+*/
 function spawnPath(extraPath) {
 	const parts = [path.dirname(process.execPath)];
 	if (extraPath) parts.push(...extraPath.split(":").filter(Boolean));
+	const bundled = bundledCliDir();
+	if (bundled) parts.push(bundled);
 	const inherited = process.env.PATH ?? "";
 	return [...parts, inherited].filter(Boolean).join(":");
 }
@@ -74,6 +92,73 @@ function run(argv, options = {}) {
 		});
 	});
 }
+/**
+* Spawn like {@link run} but deliver output as it arrives: the plugins API
+* mirrors each chunk into the operation state so the dialog can stream the
+* install log the way the native manager does. Output stays bounded by the
+* consumer (it keeps a tail); this runner only concatenates what it saw.
+*/
+function runStreaming(argv, options = {}, onChunk) {
+	const [file, ...args] = argv;
+	if (!file) throw new Error("runStreaming() needs a command");
+	const { cwd, timeoutMs = 3e4, extraPath } = options;
+	const child = spawn(file, args, {
+		cwd,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		],
+		env: {
+			...process.env,
+			PATH: spawnPath(extraPath)
+		},
+		windowsHide: true
+	});
+	let stdout = "";
+	let stderr = "";
+	let timedOut = false;
+	const timer = setTimeout(() => {
+		timedOut = true;
+		child.kill("SIGKILL");
+	}, timeoutMs);
+	child.stdout?.on("data", (chunk) => {
+		stdout += chunk.toString();
+		onChunk?.(chunk.toString());
+	});
+	child.stderr?.on("data", (chunk) => {
+		stderr += chunk.toString();
+		onChunk?.(chunk.toString());
+	});
+	return {
+		promise: new Promise((resolve) => {
+			const startedAt = Date.now();
+			child.on("error", (error) => {
+				clearTimeout(timer);
+				resolve({
+					code: -1,
+					stdout,
+					stderr: stderr + String(error),
+					timedOut
+				});
+			});
+			child.on("close", (code) => {
+				clearTimeout(timer);
+				const hitTimeout = timedOut && Date.now() - startedAt >= timeoutMs - 1;
+				resolve({
+					code: code ?? (timedOut || hitTimeout ? -1 : 0),
+					stdout,
+					stderr,
+					timedOut: timedOut || hitTimeout
+				});
+			});
+		}),
+		kill: () => {
+			clearTimeout(timer);
+			child.kill("SIGKILL");
+		}
+	};
+}
 /** Truncate captured output for audit logging. */
 function tail$1(text, max = 2e3) {
 	const value = text.trim();
@@ -220,7 +305,13 @@ async function engineHealth(engineDir, profileName, target, env = {}) {
 		};
 	}
 }
-/** L3: toolchain probe; never throws, missing tools surface as ok:false entries. */
+/** Locale-neutral remediation commands surfaced next to a failed check (darwin only). */
+function missingHint(name) {
+	if (process.platform !== "darwin") return void 0;
+	if (name === "tmux") return "brew install tmux";
+	if (name === "pnpm") return "npm install -g pnpm";
+}
+/** L3: toolchain probe; never throws, missing tools surface as ok:false entries (with a hint where one applies). */
 async function prereqCheck(env = {}) {
 	const checks = [nodeOk()];
 	for (const tool of TOOL_CHECKS) {
@@ -233,7 +324,8 @@ async function prereqCheck(env = {}) {
 			checks.push({
 				name: tool.name,
 				ok: false,
-				detail: result.code === -1 ? "not found on PATH" : tail(output, 200)
+				detail: result.code === -1 ? "not found on PATH" : tail(output, 200),
+				hint: missingHint(tool.name)
 			});
 			continue;
 		}
@@ -242,7 +334,8 @@ async function prereqCheck(env = {}) {
 		checks.push({
 			name: tool.name,
 			ok,
-			detail: ok ? version : `${version} (needs >= ${tool.min})`
+			detail: ok ? version : `${version} (needs >= ${tool.min})`,
+			hint: ok ? void 0 : missingHint(tool.name)
 		});
 	}
 	return checks;
@@ -302,6 +395,11 @@ async function detect(config, env = {}) {
 *     own host profile);
 *   - install specs must be non-empty, option-free single tokens; remove
 *     names must already be profile dependencies;
+*   - before any install/remove, `link:` dependencies are realpath-checked;
+*     a dangling target (checkout moved, manifest rewritten without
+*     reinstalling) makes the official CLI's post-install bundle
+*     reconciliation exit 1 with an opaque resolve error, so the operation
+*     refuses up front and names the repair;
 *   - the engine core package (`dsh-superagent`) can be neither removed
 *     nor toggled — without it the console has no subject;
 *   - operations are single-flight in-process: install, remove, and
@@ -407,6 +505,71 @@ function validateRegistry(raw) {
 	if (!/^https?:\/\/\S+$/.test(registry) || registry.length > 256) throw new PluginRequestError("invalid registry: an http(s) URL is required");
 	return registry;
 }
+/**
+* Collect `link:` dependencies whose target no longer exists. The official
+* CLI sails through the package operation itself (pnpm trusts the lockfile's
+* recorded link resolution without checking the target) but its post-install
+* bundle reconciliation probes `node_modules/<name>/package.json` and exits 1
+* with an opaque "cannot resolve profile bundle" error — the shape seen after
+* a hosting checkout is moved and only the manifest specifiers are rewritten.
+* Refusing up front keeps the failure readable and names the repair.
+*/
+function danglingLinks(config) {
+	const manifest = readManifest(config.profileName);
+	if (!manifest) return [];
+	const dir = profileDir(config.profileName);
+	const broken = [];
+	for (const [name, spec] of Object.entries(manifest.dependencies ?? {})) {
+		if (!spec.startsWith("link:")) continue;
+		const target = spec.slice(5);
+		const resolved = path.isAbsolute(target) ? target : path.resolve(dir, target);
+		if (!existsSync(resolved)) broken.push(`${name} (${spec})`);
+	}
+	return broken;
+}
+/** Package-name reading of an install spec, when derivable offline. */
+function specPackageName(config, spec) {
+	const trimmed = spec.trim();
+	if (trimmed.startsWith("link:") || trimmed.startsWith("file:")) {
+		const target = trimmed.slice(trimmed.indexOf(":") + 1);
+		const resolved = path.isAbsolute(target) ? target : path.resolve(profileDir(config.profileName), target);
+		try {
+			const manifest = JSON.parse(readFileSync(path.join(resolved, "package.json"), "utf8"));
+			return typeof manifest.name === "string" ? manifest.name : null;
+		} catch {
+			return null;
+		}
+	}
+	if (/^https?:\/\//.test(trimmed) || trimmed.startsWith("git")) return null;
+	if (trimmed.startsWith("@")) {
+		const at = trimmed.indexOf("@", 1);
+		return at === -1 ? trimmed : trimmed.slice(0, at);
+	}
+	const at = trimmed.indexOf("@");
+	return at === -1 ? trimmed : trimmed.slice(0, at);
+}
+/**
+* Refuse installs before they start when the spec is malformed, already a
+* profile dependency, or the profile carries dangling link: dependencies
+* (the official CLI's post-install reconciliation exits 1 on those). Mirrors
+* the native manager's checking phase and its refusal screen.
+*/
+function checkProblems(config, raw) {
+	const spec = typeof raw === "string" ? raw.trim() : "";
+	if (!spec || spec.length > 512 || /[\r\n]/.test(spec) || spec.startsWith("-")) return [{
+		kind: "invalid",
+		detail: "a non-empty package name, git URL, tarball, or absolute path is required"
+	}];
+	const problems = [];
+	const broken = danglingLinks(config);
+	if (broken.length > 0) problems.push({
+		kind: "links",
+		detail: broken.join(", ")
+	});
+	const name = specPackageName(config, spec);
+	if (name && Object.hasOwn(readManifest(config.profileName)?.dependencies ?? {}, name)) problems.push({ kind: "installed" });
+	return problems;
+}
 /** Validate a remove/enable target: an existing profile dependency, not the engine core. */
 function validateName(config, raw, allowProtected = false) {
 	const name = typeof raw === "string" ? raw.trim() : "";
@@ -434,12 +597,29 @@ async function runCliOperation(config, env, kind, target, registryUrl) {
 		target: redact$1(target),
 		...registryUrl ? { registry: registryUrl } : {}
 	});
-	const result = await run(argv, {
+	const before = Object.keys(readManifest(config.profileName)?.dependencies ?? {});
+	let output = "";
+	const result = await runStreaming(argv, {
 		timeoutMs: kind === "install" ? 9e5 : 6e5,
 		extraPath: env.extraPath
-	});
-	const output = tail$1(redact$1((result.stdout + "\n" + result.stderr).trim()), 4e3);
+	}, (chunk) => {
+		output = (output + chunk).slice(-4e3);
+		last = {
+			...last,
+			output: redact$1(output.trim())
+		};
+	}).promise;
 	const failed = result.code !== 0;
+	let installed;
+	if (!failed && kind === "install") {
+		const after = readManifest(config.profileName)?.dependencies ?? {};
+		installed = Object.entries(after).filter(([name]) => !before.includes(name)).map(([name, spec]) => ({
+			name,
+			spec,
+			version: readInstalledManifest(config.profileName, name)?.version ?? null,
+			bundle: readInstalledManifest(config.profileName, name)?.dsh?.bundle !== void 0
+		}));
+	}
 	const state = {
 		running: false,
 		kind,
@@ -448,8 +628,10 @@ async function runCliOperation(config, env, kind, target, registryUrl) {
 		finishedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		exitCode: result.code,
 		timedOut: result.timedOut,
-		output,
-		error: failed ? result.timedOut ? "command timed out" : `exit ${result.code}` : null
+		output: tail$1(redact$1((result.stdout + "\n" + result.stderr).trim()), 4e3),
+		error: failed ? result.timedOut ? "command timed out" : `exit ${result.code}` : null,
+		installed,
+		profileDir: profileDir(config.profileName)
 	};
 	last = state;
 	audit$1(config, {
@@ -470,6 +652,8 @@ async function runCliOperation(config, env, kind, target, registryUrl) {
 function runPluginOperation(config, env, kind, target, registry) {
 	if (config.profileName === "desktop") return Promise.reject(new PluginRequestError("refusing to manage plugins of the desktop profile"));
 	if (inFlight$1) return Promise.reject(new PluginRequestError("another plugin operation is already running"));
+	const broken = danglingLinks(config);
+	if (broken.length > 0) return Promise.reject(new PluginRequestError(`dangling link dependencies in the ${config.profileName} profile — the official installer's bundle reconciliation would fail; repair them first:\n  ` + broken.join("\n  ") + `\nFix: correct the targets in package.json and the pnpm-lock version fields, then run 'dsh plugin --profile ${config.profileName} install'.`));
 	const prepared = kind === "install" ? validateSpec(target) : validateName(config, target);
 	const registryUrl = kind === "install" ? validateRegistry(registry) : null;
 	last = {
@@ -1504,6 +1688,11 @@ function consoleApiHandler(options) {
 				case "GET /superagent-console/api/plugins/operation":
 					sendJson(res, 200, pluginOperation());
 					return;
+				case "POST /superagent-console/api/plugins/check": {
+					const body = await readJson(req);
+					sendJson(res, 200, { problems: checkProblems(config, body.spec) });
+					return;
+				}
 				case "POST /superagent-console/api/plugins/install": {
 					const body = await readJson(req);
 					if (pluginBusy()) {
@@ -1730,4 +1919,4 @@ function apply(ctx, config) {
 		ctx.logger?.info?.("dsh-superagent-console: provider sync source attached (autoSync %s, mode %s)", resolved.autoSync ? "on" : "off", resolved.syncMode);
 	});
 }
-export { Config, apply, applyProviderSync, detect, diffProviders, engineAction, inject, name, proxyHandler, readEngineProviders, readHostProviders, readSetupState, runInstall };
+export { Config, apply, applyProviderSync, danglingLinks, detect, diffProviders, engineAction, inject, name, proxyHandler, readEngineProviders, readHostProviders, readSetupState, runInstall };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-superagent-console",
-  "description": "Desktop console for the Superagent engine: the official panel embedded over a same-origin proxy. Detects the engine's state, installs it online (source build into a dedicated profile) when missing, and starts/restarts it on demand; the engine stays resident across desktop restarts.",
-  "version": "0.1.1",
+  "description": "Desktop console for the dsh-superagent engine: same-origin proxied panel with engine detection, guided online install, plugin management, and model-provider sync.",
+  "version": "0.1.3",
   "license": "MIT",
   "author": "Shuai-S",
   "type": "module",
@@ -12,7 +12,9 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./client": "./lib/client.js"
+    "./client": "./lib/client.js",
+    "./locale/*": "./locale/*",
+    "./package.json": "./package.json"
   },
   "files": [
     "lib",
@@ -71,6 +73,7 @@
     "@deepseek-ai/dsh-client-locale": "0.2.1-alpha.2",
     "@deepseek-ai/dsh-client-ui-layout": "0.2.1-alpha.2",
     "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-rc.5",
     "@deepseek-ai/dsh-client-ui-renderer": "0.2.1-alpha.2",
     "@deepseek-ai/dsh-client-ui-settings": "0.2.1-alpha.2",
     "@deepseek-ai/dsh-client-ui-sidebar": "0.2.1-alpha.2",