@sparkelf/dsh-plus 0.2.0-rc.18 → 0.2.0-rc.19

package/lib/bin.js

@@ -210,6 +210,7 @@ function capabilityPatchLayer(answers) {
 	if (enabled.has("computer-use")) rows.push("    - id: computer-use", "      name: '@deepseek-ai/dsh-computer-use'", "    - id: computer-use-cua-driver-mcp", "      name: '@deepseek-ai/dsh-experimental-computer-use-cua-driver-mcp'");
 	const lines = ["# Written by dsh-plus start from the capability interview. Enabling or disabling a capability", "# rewrites this file; edits here are replaced."];
 	if (rows.length > 0) lines.push("- insert:", ...rows);
+	else lines.push("[]");
 	if (enabled.has("exa")) lines.push("", "# Route web_search through Exa rather than the built-in provider.", "- id: web", "  config:", "    searchProvider: exa");
 	return lines.join("\n") + "\n";
 }
@@ -1029,6 +1030,7 @@ function parseStartOptions(argv) {
 	let host = "127.0.0.1";
 	let open = true;
 	let foreground = false;
+	let capabilities;
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
 		if (token === "--port" || token === "-p") {
@@ -1053,13 +1055,41 @@ function parseStartOptions(argv) {
 			foreground = true;
 			continue;
 		}
+		if (token === "--capabilities") {
+			const value = argv[index + 1];
+			if (value === void 0) throw new Error("--capabilities requires a comma-separated list, or an empty string for none");
+			const stated = value === "" ? [] : value.split(",").map((entry) => entry.trim()).filter((entry) => entry !== "");
+			const offered = new Set(CAPABILITIES.map((capability) => capability.id));
+			for (const id of stated) if (!offered.has(id)) throw new Error("unknown capability \"" + id + "\"; this release offers " + [...offered].join(", "));
+			capabilities = stated;
+			index += 1;
+			continue;
+		}
 		throw new Error("unknown option: " + String(token));
 	}
 	return {
 		port,
 		host,
 		open,
-		foreground
+		foreground,
+		capabilities
+	};
+}
+/**
+* Resolve a stated capability selection.
+*
+* An unattended install states what it wants instead of answering the interview, so a
+* name it does not offer has to fail here rather than silently enable nothing: the
+* deployment would otherwise start with a capability the caller believes it selected.
+*
+* @param ids - capability ids the caller selected.
+* @returns the answers the interview would have returned.
+*/
+function selectCapabilities(ids) {
+	const selected = [...new Set(ids)];
+	return {
+		enabled: selected,
+		...selected.includes("mineru") ? { mineruEndpoint: DEFAULT_MINERU_ENDPOINT } : {}
 	};
 }
 /**
@@ -1090,6 +1120,25 @@ function installationRoot() {
 function installationAnchor() {
 	return join(installationRoot(), "package.json");
 }
+/**
+* Path to the installed command's own file, which is where a declaration lookup starts.
+*
+* The declaration belongs to the package the user installed, and that package is a
+* sibling of this module rather than an ancestor: a variant's forwarder imports this
+* CLI in-process, so `import.meta.url` names `@sparkelf/dsh-plus` while the installed
+* command is the variant. `process.argv[1]` is the entry that was actually invoked,
+* which is the package whose declaration applies.
+*
+* Walking out from the installation root cannot reach it either: that root is the
+* project the user ran the command in, so every variant would fall back to the full
+* profile and keep the capabilities it excluded.
+*
+* @returns absolute path to the invoked command, or this module when argv carries none.
+*/
+function declarationAnchor() {
+	const invoked = process.argv[1];
+	return invoked === void 0 || invoked === "" ? fileURLToPath(import.meta.url) : resolve(invoked);
+}
 /** The launcher entry this installation must drive. */
 function launcherEntry(anchor) {
 	return createRequire(anchor).resolve("@deepseek-ai/dsh/lib/bin.js");
@@ -1111,7 +1160,7 @@ function runForeground(entry, profileName, port, host, open) {
 async function start(argv) {
 	const options = parseStartOptions(argv);
 	const anchor = installationAnchor();
-	const paths = resolvePaths(anchor);
+	const paths = resolvePaths(declarationAnchor());
 	if (!pnpmAvailable()) {
 		const command = pnpmInstallCommand();
 		console.log("pnpm is required to install the plus profile, and was not found.");
@@ -1144,7 +1193,7 @@ async function start(argv) {
 	const created = ensureProfile(paths, installationRoot());
 	console.log(created ? "Created the " + paths.profileName + " profile at " + paths.profileDirectory : "Using the existing " + paths.profileName + " profile");
 	for (const label of applyProfileNpmPatches(paths.distributionDirectory, paths.profileDirectory)) console.log("Applied the reviewed patch " + label);
-	const answers = created || !existsSync(join(paths.home, "capabilities.json")) ? await interviewCapabilities(true) : void 0;
+	const answers = created || !existsSync(join(paths.home, "capabilities.json")) ? options.capabilities === void 0 ? await interviewCapabilities(true) : selectCapabilities(options.capabilities) : void 0;
 	if (answers !== void 0) {
 		const ready = await installCapabilityServices(answers, paths.home);
 		writeCapabilityPatch(paths.profileDirectory, answers);

package/lib/types/standalone-capabilities.js

@@ -159,8 +159,16 @@ export function capabilityPatchLayer(answers) {
         '# ' + CAPABILITY_MARKER + ' Enabling or disabling a capability',
         '# rewrites this file; edits here are replaced.',
     ];
-    if (rows.length > 0)
+    // The loader requires a top-level YAML array, so a selection that mounts nothing
+    // still has to produce one. Comments alone parse as `null`, and the profile then
+    // refuses to boot with "must be a top-level YAML array of loader patch entries" —
+    // which is the whole deployment, not just the missing capability.
+    if (rows.length > 0) {
         lines.push('- insert:', ...rows);
+    }
+    else {
+        lines.push('[]');
+    }
     if (enabled.has('exa')) {
         lines.push('', '# Route web_search through Exa rather than the built-in provider.', '- id: web', '  config:', '    searchProvider: exa');
     }

package/lib/types/standalone-cli.js

@@ -10,10 +10,10 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
-import { dirname, join } from 'node:path';
+import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { newerVersion } from "./registry-versions.js";
-import { CAPABILITY_ENV_FILE, CAPABILITY_MARKER, CAPABILITY_RECORD, capabilityEnvironment, capabilityPatchLayer, installCapabilityServices, interviewCapabilities, } from "./standalone-capabilities.js";
+import { CAPABILITIES, CAPABILITY_ENV_FILE, CAPABILITY_MARKER, CAPABILITY_RECORD, DEFAULT_MINERU_ENDPOINT, capabilityEnvironment, capabilityPatchLayer, installCapabilityServices, interviewCapabilities, } from "./standalone-capabilities.js";
 import { DEFAULT_PORT, STOP_GRACE_MILLISECONDS, choosePort, clearState, isRunning, portAvailable, readState, spawnServer, stateDirectory, waitForAuthenticatedUrl, waitForServer, writeState, } from "./standalone-server.js";
 import { STANDALONE_PROFILE, applyProfileNpmPatches, ensureProfile, pnpmAvailable, pnpmInstallCommand, pnpmInstallCommands, registryOrder, readDistributionProfile, resolvePaths, } from "./standalone-profile.js";
 /** Milliseconds a start waits for the server to answer before reporting failure. */
@@ -25,6 +25,7 @@ function parseStartOptions(argv) {
     let host = '127.0.0.1';
     let open = true;
     let foreground = false;
+    let capabilities;
     for (let index = 0; index < argv.length; index += 1) {
         const token = argv[index];
         if (token === '--port' || token === '-p') {
@@ -51,9 +52,47 @@ function parseStartOptions(argv) {
             foreground = true;
             continue;
         }
+        if (token === '--capabilities') {
+            const value = argv[index + 1];
+            if (value === undefined)
+                throw new Error('--capabilities requires a comma-separated list, or an empty string for none');
+            const stated = value === '' ? [] : value.split(',').map(entry => entry.trim()).filter(entry => entry !== '');
+            // A stated selection is the only way an unattended install chooses capabilities, so
+            // a name this release does not offer fails here: the deployment would otherwise
+            // start without a capability its caller believes it selected. Validating at parse
+            // time also makes the failure independent of what is installed.
+            const offered = new Set(CAPABILITIES.map(capability => capability.id));
+            for (const id of stated) {
+                if (!offered.has(id)) {
+                    throw new Error('unknown capability "' + id + '"; this release offers ' + [...offered].join(', '));
+                }
+            }
+            capabilities = stated;
+            index += 1;
+            continue;
+        }
         throw new Error('unknown option: ' + String(token));
     }
-    return { port, host, open, foreground };
+    return { port, host, open, foreground, capabilities };
+}
+/**
+ * Resolve a stated capability selection.
+ *
+ * An unattended install states what it wants instead of answering the interview, so a
+ * name it does not offer has to fail here rather than silently enable nothing: the
+ * deployment would otherwise start with a capability the caller believes it selected.
+ *
+ * @param ids - capability ids the caller selected.
+ * @returns the answers the interview would have returned.
+ */
+function selectCapabilities(ids) {
+    const selected = [...new Set(ids)];
+    // MinerU is started from an endpoint the interview collects; an unattended install
+    // gets the documented default rather than an unset one.
+    return {
+        enabled: selected,
+        ...selected.includes('mineru') ? { mineruEndpoint: DEFAULT_MINERU_ENDPOINT } : {},
+    };
 }
 /**
  * Where the installation that owns this command keeps its packages.
@@ -87,6 +126,25 @@ function installationRoot() {
 function installationAnchor() {
     return join(installationRoot(), 'package.json');
 }
+/**
+ * Path to the installed command's own file, which is where a declaration lookup starts.
+ *
+ * The declaration belongs to the package the user installed, and that package is a
+ * sibling of this module rather than an ancestor: a variant's forwarder imports this
+ * CLI in-process, so `import.meta.url` names `@sparkelf/dsh-plus` while the installed
+ * command is the variant. `process.argv[1]` is the entry that was actually invoked,
+ * which is the package whose declaration applies.
+ *
+ * Walking out from the installation root cannot reach it either: that root is the
+ * project the user ran the command in, so every variant would fall back to the full
+ * profile and keep the capabilities it excluded.
+ *
+ * @returns absolute path to the invoked command, or this module when argv carries none.
+ */
+function declarationAnchor() {
+    const invoked = process.argv[1];
+    return invoked === undefined || invoked === '' ? fileURLToPath(import.meta.url) : resolve(invoked);
+}
 /** The launcher entry this installation must drive. */
 function launcherEntry(anchor) {
     return createRequire(anchor).resolve('@deepseek-ai/dsh/lib/bin.js');
@@ -102,7 +160,9 @@ function runForeground(entry, profileName, port, host, open) {
 async function start(argv) {
     const options = parseStartOptions(argv);
     const anchor = installationAnchor();
-    const paths = resolvePaths(anchor);
+    // The profile's own name and omissions come from the package that installed this
+    // command, which is a different tree position than the dependencies it resolves.
+    const paths = resolvePaths(declarationAnchor());
     // The profile installs its own dependency tree, which needs pnpm. Asking here rather
     // than failing inside the install turns a missing prerequisite into a decision the
     // consumer makes, and the install it can run is the one command that provides it.
@@ -157,7 +217,9 @@ async function start(argv) {
     // on every start would make a restart look like a first install.
     const needsInterview = created || !existsSync(join(paths.home, CAPABILITY_RECORD));
     const answers = needsInterview
-        ? await interviewCapabilities(true)
+        ? options.capabilities === undefined
+            ? await interviewCapabilities(true)
+            : selectCapabilities(options.capabilities)
         : undefined;
     if (answers !== undefined) {
         const ready = await installCapabilityServices(answers, paths.home);

package/package.json

@@ -120,9 +120,10 @@
         "dsh-video-preview": "0.1.4"
       },
       "overrides": {
-        "@deepseek-ai/dsh-agent-presets": "npm:@sparkelf/dsh-agent-presets@0.1.6-alpha.2",
+        "@deepseek-ai/dsh-agent-presets": "npm:@sparkelf/dsh-agent-presets@0.1.6-alpha.3",
         "@deepseek-ai/dsh-api-gateway": "npm:@sparkelf/dsh-api-gateway@0.1.6-alpha.2",
-        "@deepseek-ai/dsh-api-session-controller": "npm:@sparkelf/dsh-api-session-controller@0.1.6-alpha.2",
+        "@deepseek-ai/dsh-api-session-controller": "npm:@sparkelf/dsh-api-session-controller@0.1.6-alpha.3",
+        "@deepseek-ai/dsh-api-terminal-controller": "npm:@sparkelf/dsh-api-terminal-controller@0.1.6-alpha.3",
         "@deepseek-ai/dsh-client-connection": "npm:@sparkelf/dsh-client-connection@0.1.6-alpha.2",
         "@deepseek-ai/dsh-client-ui-agent-preset": "npm:@sparkelf/dsh-client-ui-agent-preset@0.1.6-alpha.2",
         "@deepseek-ai/dsh-client-ui-deliverables": "npm:@sparkelf/dsh-client-ui-deliverables@0.1.6-alpha.2",
@@ -203,5 +204,5 @@
   },
   "type": "module",
   "types": "lib/types/index.d.ts",
-  "version": "0.2.0-rc.18"
+  "version": "0.2.0-rc.19"
 }