@danypops/pi-packed 0.28.8 → 0.28.10

package/README.md

@@ -10,7 +10,7 @@ The extension connects to Packed's authenticated user daemon and starts the pack
 
 ## Isolated daemon services
 
-Packed materializes every managed daemon into a private, versioned npm project under its state directory (`services/<package>/<version>/`). Each root has its own `package.json`, lockfile, and `node_modules`; Pi's shared global project, root-level `overrides`, hoisting, and unrelated package updates therefore cannot rewrite a daemon's dependency closure. Downloads still use npm's shared cache.
+Packed materializes every managed daemon into a private, versioned npm project under its state directory (`services/<package>/<version>/`). Each root has its own `package.json`, lockfile, and `node_modules`; Pi's shared global project, root-level `overrides`, hoisting, and unrelated package updates therefore cannot rewrite a daemon's dependency closure. npm may hoist dependencies inside that one private root for ordinary package compatibility, but never across service roots. Downloads still use npm's shared cache.
 
 A complete root is activated only after installation and manifest validation, using an atomic directory rename. Armada switches the persistent service to that root, and Packed retains the previous root for rollback while pruning older versions within a fixed bound. Removing the service removes its private roots. Pi extensions remain installed in Pi's own package project; only their daemon processes run from the isolated closure.
 

package/dist/daemon/isolated-service-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isolated-service-install.d.ts","sourceRoot":"","sources":["../../service/src/daemon/isolated-service-install.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,yBAAyB;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,yBAAyB;IACzC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAChF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CACtC;AA4CD,qBAAa,oCAAqC,YAAW,yBAAyB;IAC/E,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAIrF,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAE7B,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAGtC;AAED;;;;;;GAMG;AACH,qBAAa,iCAAkC,YAAW,yBAAyB;IAEjF,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,cAAc,EAAE,MAAM,EACtB,MAAM,SAAgE;IAGlF,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAgFrF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAM5B,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIrC,OAAO,CAAC,yBAAyB;IAoBjC,OAAO,CAAC,KAAK;CAkBb"}
+{"version":3,"file":"isolated-service-install.d.ts","sourceRoot":"","sources":["../../service/src/daemon/isolated-service-install.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,yBAAyB;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,MAAM,IAAI,IAAI,CAAC;IACf,QAAQ,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,yBAAyB;IACzC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAChF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CACtC;AAuDD,qBAAa,oCAAqC,YAAW,yBAAyB;IAC/E,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAIrF,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAE7B,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAGtC;AAED;;;;;;GAMG;AACH,qBAAa,iCAAkC,YAAW,yBAAyB;IAEjF,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,cAAc,EAAE,MAAM,EACtB,MAAM,SAAgE;IAGlF,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA2FrF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAM5B,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIrC,OAAO,CAAC,yBAAyB;IAoBjC,OAAO,CAAC,KAAK;CAkBb"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-packed",
-  "version": "0.28.8",
+  "version": "0.28.10",
   "description": "Pi package lifecycle, validation, daemon, tools, profiles, and TUI",
   "type": "module",
   "bin": {

package/service/src/daemon/isolated-service-install.ts

@@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, s
 import { join, sep } from "node:path";
 import { npmPackageName } from "../packages/installed.ts";
 
+const INSTALL_FORMAT_VERSION = 1;
 const MAX_VERSION_DIRECTORIES = 20;
 const MAX_TEMP_DIRECTORY_SCAN = 100;
 const RETAINED_VERSION_DIRECTORIES = 2;
@@ -64,6 +65,17 @@ function resolvedPackageJson(piHome: string, packageName: string): string {
 	return join(packageDirectory(piHome, packageName), "package.json");
 }
 
+function hasCurrentInstallFormat(piHome: string): boolean {
+	try {
+		const project = JSON.parse(readFileSync(join(piHome, "npm", "package.json"), "utf8")) as {
+			packedServiceInstallFormat?: unknown;
+		};
+		return project.packedServiceInstallFormat === INSTALL_FORMAT_VERSION;
+	} catch {
+		return false;
+	}
+}
+
 export class PassThroughDaemonPackageMaterializer implements DaemonPackageMaterializer {
 	async materialize(piHome: string, source: string): Promise<MaterializedDaemonPackage> {
 		return { piHome, source, commit() {}, rollback() {} };
@@ -97,12 +109,12 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 		if (!VERSION_DIRECTORY_RE.test(version)) throw new Error(`cannot isolate ${packageName}: installed package version is unsafe`);
 
 		const packageRoot = join(this.stateDirectory, "services", installKey(packageName));
-		const finalDirectory = join(packageRoot, version);
+		const finalDirectory = join(packageRoot, `${version}-f${INSTALL_FORMAT_VERSION}`);
 		const finalPiHome = isolatedPiHome(finalDirectory);
 		const finalPackageJson = resolvedPackageJson(finalPiHome, packageName);
 		mkdirSync(packageRoot, { recursive: true, mode: 0o700 });
 		this.pruneTemporaryDirectories(packageRoot);
-		if (readVersion(finalPackageJson) === version) {
+		if (readVersion(finalPackageJson) === version && hasCurrentInstallFormat(finalPiHome)) {
 			return {
 				piHome: finalPiHome,
 				source: `npm:${packageName}@${version}`,
@@ -111,14 +123,22 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 			};
 		}
 
-		if (existsSync(finalDirectory)) rmSync(finalDirectory, { recursive: true, force: true });
 		const temporaryDirectory = join(packageRoot, `.${version}.${process.pid}.${crypto.randomUUID()}.tmp`);
 		const temporaryPiHome = isolatedPiHome(temporaryDirectory);
 		const projectDirectory = join(temporaryPiHome, "npm");
 		mkdirSync(projectDirectory, { recursive: true, mode: 0o700 });
 		writeFileSync(
 			join(projectDirectory, "package.json"),
-			JSON.stringify({ name: `packed-service-${installKey(packageName)}`, private: true, dependencies: { [packageName]: version } }, null, 2),
+			JSON.stringify(
+				{
+					name: `packed-service-${installKey(packageName)}`,
+					private: true,
+					packedServiceInstallFormat: INSTALL_FORMAT_VERSION,
+					dependencies: { [packageName]: version },
+				},
+				null,
+				2,
+			),
 		);
 
 		let publishedByThisCall = false;
@@ -130,7 +150,6 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 					"--ignore-scripts",
 					"--no-audit",
 					"--no-fund",
-					"--install-strategy=nested",
 					"--loglevel=error",
 				],
 				{ cwd: projectDirectory, stdout: "pipe", stderr: "pipe", env: process.env },
@@ -144,6 +163,10 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 				throw new Error(`isolated npm install did not resolve ${packageName}@${version}`);
 			}
 			try {
+				// A damaged directory for this exact format is replaced only after the complete
+				// candidate exists. Format migrations use a different final path, so the service's
+				// currently registered executable remains present throughout installation.
+				if (existsSync(finalDirectory)) rmSync(finalDirectory, { recursive: true, force: true });
 				renameSync(temporaryDirectory, finalDirectory);
 				publishedByThisCall = true;
 			} catch (error) {

package/service/test/isolated-service-install.test.ts

@@ -30,6 +30,7 @@ const fs = require("node:fs");
 const path = require("node:path");
 const project = JSON.parse(fs.readFileSync(path.join(process.cwd(), "package.json"), "utf8"));
 if (project.overrides) throw new Error("host overrides leaked into isolated project");
+if (project.packedServiceInstallFormat !== 1) throw new Error("missing isolated install format marker");
 const [name, version] = Object.entries(project.dependencies)[0];
 const vehicleVersions = ${JSON.stringify(vehicleVersions)};
 const vehicleVersion = typeof vehicleVersions === "string" ? vehicleVersions : vehicleVersions[name];
@@ -117,6 +118,23 @@ describe("IsolatedDaemonPackageMaterializer", () => {
 		expect(existsSync(versionDirectory)).toBe(false);
 	});
 
+	it("uses format-versioned paths so a migration never removes the currently registered executable", async () => {
+		const root = temporaryRoot();
+		const piHome = join(root, "pi");
+		const stateDirectory = join(root, "state");
+		const legacyExecutable = join(stateDirectory, "services", "daemon", "1.0.0", "pi-home", "npm", "node_modules", "daemon", "cli.ts");
+		mkdirSync(join(legacyExecutable, ".."), { recursive: true });
+		writeFileSync(legacyExecutable, "// running legacy executable\n");
+		writeInstalledPackage(piHome, "daemon", "1.0.0");
+		const materializer = new IsolatedDaemonPackageMaterializer(stateDirectory, writeFakeNpm(root));
+
+		const installed = await materializer.materialize(piHome, "npm:daemon");
+
+		expect(existsSync(legacyExecutable)).toBe(true);
+		expect(installed.piHome).toContain("1.0.0-f1");
+		installed.commit();
+	});
+
 	it("retains only the active and immediately previous committed versions", async () => {
 		const root = temporaryRoot();
 		const piHome = join(root, "pi");
@@ -129,8 +147,8 @@ describe("IsolatedDaemonPackageMaterializer", () => {
 		}
 
 		expect(readdirSync(join(stateDirectory, "services", "daemon")).filter((name) => !name.startsWith(".")).sort()).toEqual([
-			"1.1.0",
-			"1.2.0",
+			"1.1.0-f1",
+			"1.2.0-f1",
 		]);
 	});