@sparkelf/dsh-plus 0.2.0-rc.39 → 0.2.0-rc.40

package/lib/bin.js

@@ -216,7 +216,52 @@ function capabilityEnvironment(answers, existing = "") {
 * @param answers - the interview's answers.
 * @returns the patch layer's YAML text.
 */
-function capabilityPatchLayer(answers) {
+/**
+* The patch rows a previous version of this file carried, minus the ones this module owns.
+*
+* The module writes a fixed set of rows, so everything else in the file belongs to the
+* deployment. A row starts at a top-level `- ` entry and runs to the next one, which keeps
+* each row's own config and comments with it.
+*
+* @param existing - the file's current text.
+* @returns the rows to write back after this module's own.
+*/
+function foreignPatchRows(existing) {
+	if (existing.trim() === "") return [];
+	const lines = existing.split("\n");
+	const rows = [];
+	let current = null;
+	for (const line of lines) {
+		if (/^-\s/.test(line)) {
+			if (current !== null) rows.push(current);
+			current = [line];
+			continue;
+		}
+		if (current !== null) current.push(line);
+	}
+	if (current !== null) rows.push(current);
+	const ownedHeads = new Set(["insert", "web"]);
+	return rows.filter((row) => {
+		const head = row[0] ?? "";
+		const id = /^-\s+id:\s*(\S+)/.exec(head)?.[1];
+		if (id !== void 0) return !ownedHeads.has(id);
+		if (/^-\s+insert:\s*$/.test(head)) {
+			const ownedChildren = new Set([
+				"web-search-exa",
+				"computer-use",
+				"computer-use-cua-driver-mcp",
+				"mineru"
+			]);
+			return row.filter((line, index) => {
+				if (index === 0) return false;
+				const childId = /^\s+-\s+id:\s*(\S+)/.exec(line)?.[1];
+				return childId === void 0 || !ownedChildren.has(childId);
+			}).some((line) => /^\s+-\s+/.test(line));
+		}
+		return true;
+	}).map((row) => row.join("\n").trimEnd());
+}
+function capabilityPatchLayer(answers, existing = "") {
 	const enabled = new Set(answers.enabled);
 	const rows = [];
 	if (enabled.has("exa")) rows.push("    - id: web-search-exa", "      name: '@deepseek-ai/dsh-web-search-exa'", "      config:", "        searchType: auto", "        numResults: 8");
@@ -224,9 +269,11 @@ function capabilityPatchLayer(answers) {
 	if (enabled.has("officecli")) rows.push("    - id: officecli", "      name: '@sparkelf/dsh-officecli'");
 	if (enabled.has("mineru")) rows.push("    - id: mineru", "      name: '@sparkelf/dsh-mineru'", "      config:", "        endpoint: " + (answers.mineruEndpoint ?? "http://127.0.0.1:8000/file_parse"));
 	const lines = ["# Written by dsh-plus start from the capability interview. Enabling or disabling a capability", "# rewrites this file; edits here are replaced."];
+	const foreign = foreignPatchRows(existing);
 	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");
+	if (foreign.length > 0) lines.push("", "# Rows this file carried before the capability interview; kept verbatim.", ...foreign);
 	return lines.join("\n") + "\n";
 }
 /** Run one command, reporting a failure rather than throwing. */
@@ -1582,7 +1629,7 @@ function writeCapabilityPatch(profileDirectory, answers) {
 		writeFileSync(path + ".before-capabilities", existing);
 		console.log("  Kept the existing profile layer at cordis.patch.yml.before-capabilities");
 	}
-	writeFileSync(path, capabilityPatchLayer(answers));
+	writeFileSync(path, capabilityPatchLayer(answers, existing ?? ""));
 }
 /**
 * Write the deployment's capability environment file.

package/lib/types/standalone-capabilities.d.ts

@@ -76,22 +76,7 @@ export declare function interviewCapabilities(interactive: boolean): Promise<Cap
  * @returns the environment file's text.
  */
 export declare function capabilityEnvironment(answers: CapabilityAnswers, existing?: string): string;
-/**
- * The profile patch layer that turns the selected capabilities on.
- *
- * The file is data the profile's loader merges, so enabling a capability writes a
- * row rather than editing the deployment. An empty selection still writes the file,
- * because a layer that exists and mounts nothing is how a previously enabled
- * capability is turned back off.
- *
- * The profile's own layer is a separate file with its own name: a deployment that
- * configured something by hand keeps it, and the capability rows are rewritten
- * whole on every start.
- *
- * @param answers - the interview's answers.
- * @returns the patch layer's YAML text.
- */
-export declare function capabilityPatchLayer(answers: CapabilityAnswers): string;
+export declare function capabilityPatchLayer(answers: CapabilityAnswers, existing?: string): string;
 /**
  * The capability record a previous configured run wrote, or `undefined` when none exists.
  *

package/lib/types/standalone-capabilities.js

@@ -162,7 +162,64 @@ export function capabilityEnvironment(answers, existing = '') {
  * @param answers - the interview's answers.
  * @returns the patch layer's YAML text.
  */
-export function capabilityPatchLayer(answers) {
+/**
+ * The patch rows a previous version of this file carried, minus the ones this module owns.
+ *
+ * The module writes a fixed set of rows, so everything else in the file belongs to the
+ * deployment. A row starts at a top-level `- ` entry and runs to the next one, which keeps
+ * each row's own config and comments with it.
+ *
+ * @param existing - the file's current text.
+ * @returns the rows to write back after this module's own.
+ */
+function foreignPatchRows(existing) {
+    if (existing.trim() === '')
+        return [];
+    const lines = existing.split('\n');
+    const rows = [];
+    let current = null;
+    for (const line of lines) {
+        if (/^-\s/.test(line)) {
+            if (current !== null)
+                rows.push(current);
+            current = [line];
+            continue;
+        }
+        if (current !== null)
+            current.push(line);
+    }
+    if (current !== null)
+        rows.push(current);
+    // The capability rows this module writes are the `insert` block's children plus the
+    // `web` row that routes search. A block whose head is not one of them belongs to the
+    // deployment; a block that is one of them is replaced by the current selection whole.
+    const ownedHeads = new Set(['insert', 'web']);
+    return rows
+        .filter((row) => {
+        const head = row[0] ?? '';
+        const id = /^-\s+id:\s*(\S+)/.exec(head)?.[1];
+        if (id !== undefined)
+            return !ownedHeads.has(id);
+        // A block keyed by something else, such as `- insert:`, is this module's when the
+        // module is what writes it. Only its own capability rows are recognised, so a
+        // deployment block that happens to use `insert` is the one ambiguous case; the
+        // module resolves it by removing only the rows it names.
+        if (/^-\s+insert:\s*$/.test(head)) {
+            const ownedChildren = new Set(['web-search-exa', 'computer-use', 'computer-use-cua-driver-mcp', 'mineru']);
+            const kept = row.filter((line, index) => {
+                if (index === 0)
+                    return false;
+                const childId = /^\s+-\s+id:\s*(\S+)/.exec(line)?.[1];
+                return childId === undefined || !ownedChildren.has(childId);
+            });
+            // Nothing but the block head is left: the module wrote it and now mounts nothing.
+            return kept.some(line => /^\s+-\s+/.test(line));
+        }
+        return true;
+    })
+        .map(row => row.join('\n').trimEnd());
+}
+export function capabilityPatchLayer(answers, existing = '') {
     const enabled = new Set(answers.enabled);
     const rows = [];
     if (enabled.has('exa')) {
@@ -193,6 +250,12 @@ export function capabilityPatchLayer(answers) {
     // 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.
+    // A deployment that configured something by hand keeps it: this file is the profile's
+    // only user layer, so a capability change must not drop rows it does not own. Only the
+    // rows this module writes are rewritten, which is what the file's own header promises.
+    // Parsing is line-based rather than a YAML round trip because the entries carry comments
+    // that a parse-and-serialize cycle would discard.
+    const foreign = foreignPatchRows(existing);
     if (rows.length > 0) {
         lines.push('- insert:', ...rows);
     }
@@ -202,6 +265,9 @@ export function capabilityPatchLayer(answers) {
     if (enabled.has('exa')) {
         lines.push('', '# Route web_search through Exa rather than the built-in provider.', '- id: web', '  config:', '    searchProvider: exa');
     }
+    if (foreign.length > 0) {
+        lines.push('', '# Rows this file carried before the capability interview; kept verbatim.', ...foreign);
+    }
     return lines.join('\n') + '\n';
 }
 /** Run one command, reporting a failure rather than throwing. */

package/lib/types/standalone-cli.js

@@ -382,11 +382,14 @@ function writeCapabilityPatch(profileDirectory, answers) {
     // this command did not write belongs to the deployment, and replacing it would drop
     // whatever the operator put there; keep it beside the new layer instead.
     const existing = existsSync(path) ? readFileSync(path, 'utf8') : undefined;
+    // The layer is rewritten whole, so a row this command does not own is carried over
+    // rather than dropped. Backing the file up is not a substitute: the operator's rows
+    // would stop applying until someone restored it by hand.
     if (existing !== undefined && !existing.includes(CAPABILITY_MARKER)) {
         writeFileSync(path + '.before-capabilities', existing);
         console.log('  Kept the existing profile layer at ' + CAPABILITY_PATCH_FILE + '.before-capabilities');
     }
-    writeFileSync(path, capabilityPatchLayer(answers));
+    writeFileSync(path, capabilityPatchLayer(answers, existing ?? ''));
 }
 /**
  * Write the deployment's capability environment file.

package/package.json

@@ -217,5 +217,5 @@
   },
   "type": "module",
   "types": "lib/types/index.d.ts",
-  "version": "0.2.0-rc.39"
+  "version": "0.2.0-rc.40"
 }