acrylblends 1.5.0 → 1.5.2

package/dist/index.js

@@ -11,6 +11,16 @@ import { homedir } from "node:os";
 //#region ../../frame/packages.json
 var scope = "@acrylblends";
 var dshVersion = "0.2.0-rc.2";
+var pnpm = {
+	"//": "An app in the frame installed with pnpm: these build scripts run, as they do under npm (packages/cli/src/pnpm-settings.ts). Found by installing a framed app with pnpm 12: dsh-subprocess-local builds its spawn helper, node-pty and koffi their native parts.",
+	"allowBuilds": [
+		"@deepseek-ai/dsh-subprocess-local",
+		"@google/genai",
+		"koffi",
+		"node-pty",
+		"protobufjs"
+	]
+};
 var packages = {
 	"acryl-ui": {
 		"name": "ui",
@@ -78,6 +88,65 @@ var packages = {
 	}
 };
 //#endregion
+//#region src/pnpm-settings.ts
+/**
+* What an app in the ACRYL frame needs from pnpm to install and start as it does with npm, kept in the app's `pnpm-workspace.yaml` (npm never reads it).
+*
+* - `nodeLinker: hoisted`: the frame's host composes about a hundred DSH rows by package name from the app's own folder, which finds them only in a flat
+*   `node_modules` (npm's layout). pnpm's isolated layout hides them, and the host stops with "failed to import" on every row.
+* - `allowBuilds`: pnpm 11 and later refuse to finish an install while a dependency's build script is neither allowed nor denied. The frame's packages
+*   whose scripts run under npm (frame/packages.json `pnpm.allowBuilds`) are allowed, so pnpm installs what npm installs.
+*
+* The file is the person's too (pnpm itself writes `minimumReleaseAgeExclude` there), so it is edited by lines: a key they set is never changed, and
+* their comments and layout stay.
+*/
+/** The frame's dependencies whose build scripts pnpm must run. */
+const FRAME_ALLOW_BUILDS = pnpm.allowBuilds;
+const PNPM_WORKSPACE_FILE = "pnpm-workspace.yaml";
+/** A top-level key line (`name:` at column 0), with or without a value after it. */
+function topKey(line) {
+	return /^([A-Za-z][\w-]*):/u.exec(line)?.[1];
+}
+/** A YAML map key, quoted when it is not a plain word (a scoped package name). */
+function yamlKey(name) {
+	return /^[\w.-]+$/u.test(name) ? name : `'${name}'`;
+}
+/** The package names a top-level `allowBuilds:` block already decides, allowed or denied. */
+function decided(lines, start) {
+	const names = /* @__PURE__ */ new Set();
+	let end = start + 1;
+	for (let index = start + 1; index < lines.length; index += 1) {
+		const line = lines[index] ?? "";
+		if (line.trim() === "" || line.trimStart().startsWith("#")) continue;
+		if (!/^\s/u.test(line)) break;
+		const key = /^\s+(['"]?)(.+?)\1\s*:/u.exec(line)?.[2];
+		if (key !== void 0) names.add(key);
+		end = index + 1;
+	}
+	return {
+		names,
+		end
+	};
+}
+/**
+* `pnpm-workspace.yaml` with the frame's settings added: the whole file when there is none, else only what it lacks. `builds` defaults to the frame's
+* list. Returns the text unchanged when nothing is missing.
+*/
+function withFramePnpmSettings(text, builds = FRAME_ALLOW_BUILDS) {
+	const lines = text === void 0 || text === "" ? [] : text.replace(/\n$/u, "").split("\n");
+	if (!new Set(lines.map(topKey).filter((key) => key !== void 0)).has("nodeLinker")) lines.push("# The ACRYL frame finds its packages in a flat node_modules, as npm lays it out (acrylblends writes this; npm ignores the file).", "nodeLinker: hoisted");
+	const at = lines.findIndex((line) => topKey(line) === "allowBuilds");
+	if (at === -1) {
+		if (builds.length > 0) lines.push("# The frame's packages whose install scripts npm runs too; pnpm stops an install while a build is neither allowed nor denied.", "allowBuilds:", ...builds.map((name) => `  ${yamlKey(name)}: true`));
+	} else {
+		const { names, end } = decided(lines, at);
+		const missing = builds.filter((name) => !names.has(name));
+		if (missing.length > 0 && /^allowBuilds:\s*(#.*)?$/u.test(lines[at] ?? "")) lines.splice(end, 0, ...missing.map((name) => `  ${yamlKey(name)}: true`));
+	}
+	const next = lines.length === 0 ? "" : `${lines.join("\n")}\n`;
+	return text !== void 0 && next === text ? text : next;
+}
+//#endregion
 //#region src/ide-profile.ts
 /**
 * The host an app runs on inside the ACRYL frame: the app's own node server and loader composition, with DSH riding as the chat/session driver
@@ -622,7 +691,7 @@ function hostScriptOf(profile, frameModule) {
 		`agentRows.find((row) => row.id === 'preset-${AGENT_PRESET_ID}').config.plugins.push(...DSH_STANDARD_PLUGINS.map(dshStandardPlugin))`,
 		"const hostLayer = anchorRows([{",
 		"  insert: [",
-		"    { id: 'node-server', name: './plugins/acryl-node-server/src/index.ts', config: { hostname: '127.0.0.1', port: Number(port), scan: Number(port) === 0 ? 0 : 20 } },",
+		"    { id: 'node-server', name: './plugins/acryl-node-server/src/index.ts', config: { hostname: chosen.host ?? '127.0.0.1', port: Number(port), scan: Number(port) === 0 ? 0 : 20 } },",
 		"    { id: 'web-server', name: './plugins/acryl-web-server/src/index.ts' },",
 		"    { id: 'page', name: './plugins/acryl-page/src/index.ts', config: { title: appTitle } },",
 		"    ...clientRows,",
@@ -684,10 +753,11 @@ function hostScriptOf(profile, frameModule) {
 		"  const entries = Array.isArray(error?.entries) ? error.entries : []",
 		"  const failures = entries.filter(({ outcome }) => outcome?.kind === \"failed\")",
 		"  console.error(`acrylblends host: startup failed (${String(failures.length)} row(s))`)",
-		"  for (const { entry, outcome } of failures) {",
+		"  // Each entry is the boot report of one row: { id, module, required, fiberState, outcome }.",
+		"  for (const { id, module, outcome } of failures) {",
 		"    const cause = outcome.error",
 		"    const detail = cause instanceof Error ? cause.stack ?? cause.message : String(cause)",
-		"    console.error(`- ${entry.id} (${entry.options?.name ?? \"?\"}): ${detail}`)",
+		"    console.error(`- ${String(id)} (${String(module)}): ${detail}`)",
 		"  }",
 		"  const cause = error?.cause",
 		"  if (failures.length === 0 && cause !== undefined) console.error(cause instanceof Error ? cause.stack ?? cause.message : String(cause))",
@@ -947,36 +1017,41 @@ function planIdeProfileWrite(root, input) {
 	const hostPath = join(root, "scripts/ide-host.mjs");
 	const appHost = existsSync(hostPath) ? readFileSync(hostPath, "utf8") : void 0;
 	let clientRowsAdded = [];
+	const files = GENERATED_FILES.map(({ file, of }) => {
+		let text = of(plan);
+		if (file === "scripts/ide-host.mjs") {
+			const merged = mergeHostClientRows(text, appHost);
+			text = merged.text;
+			clientRowsAdded = merged.added;
+		}
+		const path = join(root, file);
+		if (!existsSync(path)) return {
+			file,
+			text,
+			state: "add"
+		};
+		const before = readFileSync(path, "utf8");
+		if (before === text) return {
+			file,
+			text,
+			state: "same"
+		};
+		const firstLine = before.split("\n", 1)[0] ?? "";
+		return {
+			file,
+			text,
+			state: GENERATED_MARKER.test(firstLine) ? "update" : "conflict"
+		};
+	});
+	const workspaceFile = join(root, PNPM_WORKSPACE_FILE);
+	const workspaceBefore = existsSync(workspaceFile) ? readFileSync(workspaceFile, "utf8") : void 0;
+	const workspaceAfter = withFramePnpmSettings(workspaceBefore);
 	return {
 		plan,
-		files: GENERATED_FILES.map(({ file, of }) => {
-			let text = of(plan);
-			if (file === "scripts/ide-host.mjs") {
-				const merged = mergeHostClientRows(text, appHost);
-				text = merged.text;
-				clientRowsAdded = merged.added;
-			}
-			const path = join(root, file);
-			if (!existsSync(path)) return {
-				file,
-				text,
-				state: "add"
-			};
-			const before = readFileSync(path, "utf8");
-			if (before === text) return {
-				file,
-				text,
-				state: "same"
-			};
-			const firstLine = before.split("\n", 1)[0] ?? "";
-			return {
-				file,
-				text,
-				state: GENERATED_MARKER.test(firstLine) ? "update" : "conflict"
-			};
-		}),
+		files,
 		manifestChanged: existing !== plan.packageJson,
-		clientRowsAdded
+		clientRowsAdded,
+		pnpmWorkspace: workspaceAfter === workspaceBefore ? void 0 : workspaceAfter
 	};
 }
 /** Write a plan made by {@link planIdeProfileWrite}: only the files whose bytes differ, and `package.json` only when the merge changes it. */
@@ -997,6 +1072,10 @@ function writeIdeProfilePlan(root, planned) {
 		writeFileSync(join(root, "package.json"), planned.plan.packageJson);
 		written.push("package.json");
 	} else unchanged.push("package.json");
+	if (planned.pnpmWorkspace !== void 0) {
+		writeFileSync(join(root, PNPM_WORKSPACE_FILE), planned.pnpmWorkspace);
+		written.push(PNPM_WORKSPACE_FILE);
+	} else unchanged.push(PNPM_WORKSPACE_FILE);
 	return {
 		written,
 		unchanged