@danypops/pi-packed 0.28.0 → 0.28.1

package/dist/adoption/smoke.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smoke.d.ts","sourceRoot":"","sources":["../../service/src/adoption/smoke.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,GAAG,mBAAmB,GAAG,cAAc,GAAG,qBAAqB,CAAC;AAEpH,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,kBAAkB,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACtB;AA2BD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO7F;AA4ID,wBAAsB,iBAAiB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,YAAiB,GACxB,OAAO,CAAC,oBAAoB,CAAC,CAoF/B"}
+{"version":3,"file":"smoke.d.ts","sourceRoot":"","sources":["../../service/src/adoption/smoke.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,GAAG,mBAAmB,GAAG,cAAc,GAAG,qBAAqB,CAAC;AAEpH,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,kBAAkB,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACtB;AAuDD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO7F;AAmJD,wBAAsB,iBAAiB,CACtC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,YAAiB,GACxB,OAAO,CAAC,oBAAoB,CAAC,CAoF/B"}

package/package.json

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

package/service/src/adoption/smoke.ts

@@ -54,6 +54,34 @@ function addReadOnlyBind(args: string[], path: string): void {
 	if (existsSync(path)) args.push("--ro-bind", path, path);
 }
 
+const MAX_ANCESTOR_WALK = 32;
+
+/**
+ * Every ancestor directory's own node_modules from packageRoot's parent up to
+ * the filesystem root -- mirrors Node's real module-resolution walk
+ * (require.resolve checks <dir>/node_modules at every level up to /).
+ * Confirmed live: packed doctor's own widget reported real extensions
+ * (pi-lector, pi-pipes, pi-tickets, pi-jittor, pi-web-spider) as "crash" on a
+ * plain Cannot-find-module for a sibling dependency npm/bun hoisted to a
+ * shared ancestor node_modules, though Pi's own real, unsandboxed process
+ * resolves the exact same import fine -- the sandbox only ever bound the
+ * package's own root, never the hoisted siblings one or more levels above it.
+ * Bounded to MAX_ANCESTOR_WALK levels as a defensive cap; a real filesystem
+ * hierarchy never gets remotely close to that before reaching /.
+ */
+function collectAncestorNodeModulesDirs(packageRoot: string): string[] {
+	const dirs: string[] = [];
+	let current = dirname(packageRoot);
+	for (let i = 0; i < MAX_ANCESTOR_WALK; i++) {
+		const candidate = join(current, "node_modules");
+		if (existsSync(candidate)) dirs.push(realpathSync(candidate));
+		const parent = dirname(current);
+		if (parent === current) break;
+		current = parent;
+	}
+	return dirs;
+}
+
 /**
  * Resolves an installed dependency's real on-disk package directory via
  * Node's own module-resolution algorithm (require.resolve against its
@@ -85,7 +113,6 @@ function sandboxCommand(packageRoot: string, extensionPath: string, maxProcesses
 	const jitiModules = resolveDependencyModulesDir(packageDirectory, "jiti");
 	if (!jitiModules) return undefined;
 	const bun = realpathSync(process.execPath);
-	const relativeExtension = relative(packageRoot, extensionPath).split(sep).join("/");
 	const args = [
 		"/usr/bin/bwrap",
 		"--unshare-user",
@@ -116,9 +143,6 @@ function sandboxCommand(packageRoot: string, extensionPath: string, maxProcesses
 		jitiModules,
 		"/runner/node_modules/jiti",
 		"--ro-bind",
-		packageRoot,
-		"/package",
-		"--ro-bind",
 		bun,
 		"/bun",
 		"--dev",
@@ -131,6 +155,17 @@ function sandboxCommand(packageRoot: string, extensionPath: string, maxProcesses
 		"/tmp",
 		"--dir",
 		"/tmp/home",
+	);
+	// Package-related identity binds go AFTER the virtual/tmpfs mounts above --
+	// bwrap applies mounts in argument order, so a bind whose real path happens
+	// to sit under one of those special mounts (e.g. a test fixture under
+	// /tmp, which --tmpfs /tmp would otherwise shadow) must come later to win.
+	addReadOnlyBind(args, packageRoot);
+	// Real-path identity binds so a hoisted sibling dependency resolves exactly
+	// as it would in Pi's own real, unsandboxed process -- see
+	// collectAncestorNodeModulesDirs's own doc comment for why this is needed.
+	for (const dir of collectAncestorNodeModulesDirs(packageRoot)) addReadOnlyBind(args, dir);
+	args.push(
 		"--remount-ro",
 		"/",
 		"--clearenv",
@@ -147,7 +182,7 @@ function sandboxCommand(packageRoot: string, extensionPath: string, maxProcesses
 		"NODE_PATH",
 		"/runner/node_modules",
 		"--chdir",
-		"/package",
+		packageRoot,
 		"--",
 		"/usr/bin/prlimit",
 		`--nproc=${maxProcesses}`,
@@ -158,7 +193,7 @@ function sandboxCommand(packageRoot: string, extensionPath: string, maxProcesses
 		"--",
 		"/bun",
 		"/runner/src/smoke-child.ts",
-		`/package/${relativeExtension}`,
+		extensionPath,
 	);
 	return args;
 }

package/service/test/smoke.test.ts

@@ -151,6 +151,35 @@ describeIfSandboxed("isolated extension smoke runner", () => {
 		expect((await runExtensionSmoke(output.root, output.path, { maxOutputBytes: 4_096 })).status).toBe("output-limit");
 	});
 
+	it("resolves a dependency hoisted to a shared ancestor node_modules -- confirmed live bug: packed doctor's own widget reported 5/8 real extensions as crashing on a plain 'Cannot find module' for a sibling dependency npm/bun hoisted above the package's own node_modules, though Pi's own real, unsandboxed process resolves the exact same import fine", async () => {
+		const workspaceRoot = mkdtempSync(join(tmpdir(), "packed-smoke-hoisted-"));
+		roots.push(workspaceRoot);
+		const sharedNodeModules = join(workspaceRoot, "node_modules");
+		writeFakeDependency(sharedNodeModules, "hoisted-sibling");
+		const packageDir = join(sharedNodeModules, "@fixture", "pi-smoke-hoisted");
+		mkdirSync(join(packageDir, "extension"), { recursive: true });
+		const extensionPath = join(packageDir, "extension", "index.ts");
+		writeFileSync(
+			extensionPath,
+			'import pkg from "hoisted-sibling/package.json" with { type: "json" };\nexport default function (pi: any) { pi.registerCommand(pkg.name, { handler() {} }); }\n',
+		);
+		writeFileSync(
+			join(packageDir, "package.json"),
+			JSON.stringify({
+				name: "@fixture/pi-smoke-hoisted",
+				version: "1.0.0",
+				keywords: ["pi-package"],
+				files: ["extension"],
+				pi: { extensions: ["extension/index.ts"] },
+			}),
+		);
+
+		const result = await runExtensionSmoke(packageDir, extensionPath);
+
+		expect(result.status).toBe("ok");
+		expect(result.registrations.commands).toEqual(["hoisted-sibling"]);
+	});
+
 	it("keeps default package checks static and adds smoke results only when requested", async () => {
 		const fixture = extension(
 			'import { writeFileSync } from "node:fs"; export default function (pi: any) { writeFileSync("executed", "yes"); pi.registerCommand("x", { handler() {} }); }',