@danypops/pi-packed 0.22.3 → 0.22.4

package/package.json

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

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

@@ -146,6 +146,28 @@ export function detectVehicleDaemonService(
 		for (const depDir of candidateDirs) {
 			const dep = readPackageJson(depDir);
 			if (!dep) continue;
+			// An explicit manifest on the dependency itself wins over convention detection here too --
+			// mirrors resolveDaemonServiceSpec's own explicit-manifest-first behavior for a directly
+			// installed package. Without this, a dependency's own correct, explicit
+			// handleFilename/name/etc. was silently discarded in favor of a guess whenever the daemon
+			// was discovered one level down instead of installed directly by name -- exactly the
+			// common case (a Pi extension like pi-papyrus has no daemon of its own). Confirmed live:
+			// papyrus's real handle file is "vehicle-handle.json", not the "daemon.json" convention
+			// guess, and papyrus is only ever discovered this way, never installed directly by name.
+			const depManifest = dep.packed?.daemonService;
+			if (depManifest && typeof depManifest.binPath === "string" && depManifest.binPath.length > 0 && dep.version) {
+				return {
+					binPath: join(depDir, depManifest.binPath),
+					args: depManifest.args,
+					name: depManifest.name ?? unscopedName(dep.name ?? depName),
+					displayName: depManifest.displayName,
+					handleFilename: depManifest.handleFilename,
+					workingDirectory: depManifest.workingDirectory,
+					restartOnFailure: depManifest.restartOnFailure,
+					restartSec: depManifest.restartSec,
+					version: dep.version,
+				};
+			}
 			const depBin = firstBinPath(dep);
 			if (depBin && dependsOnVehicle(dep) && dep.version) {
 				return { binPath: join(depDir, depBin), args: ["serve"], name: unscopedName(dep.name ?? depName), version: dep.version };

package/service/test/daemon-service.test.ts

@@ -185,6 +185,29 @@ describe("resolveDaemonServiceSpec", () => {
 		expect(result.spec.name).toBe("papyrus");
 	});
 
+	it("honors a nested dependency's own explicit packed.daemonService manifest, not just bin+dependency convention -- confirmed live: papyrus's real handle file is 'vehicle-handle.json', not the 'daemon.json' convention guess, and papyrus is only ever discovered this way (one level into pi-papyrus's own dependencies), never installed directly by name", () => {
+		const piHome = fakePiHome();
+		const extDir = join(piHome, "npm", "node_modules", "@danypops/pi-papyrus");
+		writeRawPackage(extDir, { name: "@danypops/pi-papyrus", version: "1.0.0", dependencies: { "@danypops/papyrus": "^0.54.0" } });
+		const depDir = join(extDir, "node_modules", "@danypops/papyrus");
+		writeRawPackage(depDir, {
+			name: "@danypops/papyrus",
+			version: "0.54.0",
+			bin: { papyrus: "src/cli.ts" },
+			dependencies: { "@danypops/vehicle-server": "^0.24.0" },
+			packed: { daemonService: { binPath: "src/cli.ts", args: ["serve"], handleFilename: "vehicle-handle.json", restartOnFailure: true, restartSec: 2 } },
+		});
+
+		const result = resolveDaemonServiceSpec(piHome, "npm:@danypops/pi-papyrus");
+		expect(result.ok).toBe(true);
+		if (!result.ok) throw new Error("expected ok");
+		expect(result.spec.binPath).toBe(join(depDir, "src/cli.ts"));
+		expect(result.spec.name).toBe("papyrus");
+		expect(result.spec.handlePath.endsWith("vehicle-handle.json")).toBe(true);
+		expect(result.spec.restartOnFailure).toBe(true);
+		expect(result.spec.restartSec).toBe(2);
+	});
+
 	it("also detects the legacy @danypops/daemon-kit dependency name, not just vehicle-server", () => {
 		const piHome = fakePiHome();
 		const dir = join(piHome, "npm", "node_modules", "@danypops/web-spider-daemon");