@danypops/pi-packed 0.28.7 → 0.28.9

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

@@ -28,6 +28,7 @@ export declare class IsolatedDaemonPackageMaterializer implements DaemonPackageM
     materialize(piHome: string, source: string): Promise<MaterializedDaemonPackage>;
     remove(source: string): void;
     ownsExecutable(path: string): boolean;
+    private pruneTemporaryDirectories;
     private prune;
 }
 //# sourceMappingURL=isolated-service-install.d.ts.map

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":"AASA,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;IA+ErF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAM5B,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIrC,OAAO,CAAC,KAAK;CAiBb"}
+{"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;IAwFrF,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.7",
+  "version": "0.28.9",
   "description": "Pi package lifecycle, validation, daemon, tools, profiles, and TUI",
   "type": "module",
   "bin": {

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

@@ -2,8 +2,11 @@ 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;
+const STALE_TEMP_DIRECTORY_MS = 5 * 60 * 1_000;
 const MAX_INSTALL_OUTPUT_BYTES = 64 * 1024;
 const VERSION_DIRECTORY_RE = /^[0-9A-Za-z][0-9A-Za-z.+_-]{0,127}$/;
 
@@ -62,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() {} };
@@ -98,7 +112,9 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 		const finalDirectory = join(packageRoot, version);
 		const finalPiHome = isolatedPiHome(finalDirectory);
 		const finalPackageJson = resolvedPackageJson(finalPiHome, packageName);
-		if (readVersion(finalPackageJson) === version) {
+		mkdirSync(packageRoot, { recursive: true, mode: 0o700 });
+		this.pruneTemporaryDirectories(packageRoot);
+		if (readVersion(finalPackageJson) === version && hasCurrentInstallFormat(finalPiHome)) {
 			return {
 				piHome: finalPiHome,
 				source: `npm:${packageName}@${version}`,
@@ -107,7 +123,6 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 			};
 		}
 
-		mkdirSync(packageRoot, { recursive: true, mode: 0o700 });
 		if (existsSync(finalDirectory)) rmSync(finalDirectory, { recursive: true, force: true });
 		const temporaryDirectory = join(packageRoot, `.${version}.${process.pid}.${crypto.randomUUID()}.tmp`);
 		const temporaryPiHome = isolatedPiHome(temporaryDirectory);
@@ -115,7 +130,16 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 		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;
@@ -127,7 +151,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 },
@@ -176,6 +199,26 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 		return path.startsWith(join(this.stateDirectory, "services") + sep);
 	}
 
+	private pruneTemporaryDirectories(packageRoot: string): void {
+		let names: string[];
+		try {
+			names = readdirSync(packageRoot)
+				.filter((name) => name.startsWith(".") && name.endsWith(".tmp"))
+				.slice(0, MAX_TEMP_DIRECTORY_SCAN);
+		} catch {
+			return;
+		}
+		const staleBefore = Date.now() - STALE_TEMP_DIRECTORY_MS;
+		for (const name of names) {
+			const path = join(packageRoot, name);
+			try {
+				if (statSync(path).mtimeMs < staleBefore) rmSync(path, { recursive: true, force: true });
+			} catch {
+				// A concurrent materializer may have renamed or removed the candidate.
+			}
+		}
+	}
+
 	private prune(packageRoot: string, activeDirectory: string): void {
 		let directories: string[];
 		try {
@@ -188,7 +231,8 @@ export class IsolatedDaemonPackageMaterializer implements DaemonPackageMateriali
 			return;
 		}
 		directories.sort((left, right) => statSync(right).mtimeMs - statSync(left).mtimeMs);
-		const retained = new Set([activeDirectory, ...directories.slice(0, RETAINED_VERSION_DIRECTORIES)]);
+		const prior = directories.filter((directory) => directory !== activeDirectory).slice(0, RETAINED_VERSION_DIRECTORIES - 1);
+		const retained = new Set([activeDirectory, ...prior]);
 		for (const directory of directories) {
 			if (!retained.has(directory)) rmSync(directory, { recursive: true, force: true });
 		}

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

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from "bun:test";
-import { chmodSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, utimesSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { IsolatedDaemonPackageMaterializer } from "../src/daemon/isolated-service-install.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,44 @@ describe("IsolatedDaemonPackageMaterializer", () => {
 		expect(existsSync(versionDirectory)).toBe(false);
 	});
 
+	it("retains only the active and immediately previous committed versions", async () => {
+		const root = temporaryRoot();
+		const piHome = join(root, "pi");
+		const stateDirectory = join(root, "state");
+		const materializer = new IsolatedDaemonPackageMaterializer(stateDirectory, writeFakeNpm(root));
+		for (const version of ["1.0.0", "1.1.0", "1.2.0"]) {
+			writeInstalledPackage(piHome, "daemon", version);
+			const installed = await materializer.materialize(piHome, "npm:daemon");
+			installed.commit();
+		}
+
+		expect(readdirSync(join(stateDirectory, "services", "daemon")).filter((name) => !name.startsWith(".")).sort()).toEqual([
+			"1.1.0",
+			"1.2.0",
+		]);
+	});
+
+	it("cleans bounded stale crash candidates without touching a fresh concurrent candidate", async () => {
+		const root = temporaryRoot();
+		const piHome = join(root, "pi");
+		const stateDirectory = join(root, "state");
+		const packageRoot = join(stateDirectory, "services", "daemon");
+		const stale = join(packageRoot, ".stale.tmp");
+		const fresh = join(packageRoot, ".fresh.tmp");
+		mkdirSync(stale, { recursive: true });
+		mkdirSync(fresh, { recursive: true });
+		const old = new Date(Date.now() - 10 * 60 * 1_000);
+		utimesSync(stale, old, old);
+		writeInstalledPackage(piHome, "daemon", "1.0.0");
+		const materializer = new IsolatedDaemonPackageMaterializer(stateDirectory, writeFakeNpm(root));
+
+		const installed = await materializer.materialize(piHome, "npm:daemon");
+
+		expect(existsSync(stale)).toBe(false);
+		expect(existsSync(fresh)).toBe(true);
+		installed.rollback();
+	});
+
 	it("rejects an unsafe installed version before creating a service directory", async () => {
 		const root = temporaryRoot();
 		const piHome = join(root, "pi");