@danypops/pi-packed 0.22.3 → 0.22.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-packed",
-  "version": "0.22.3",
+  "version": "0.22.5",
   "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/src/daemon/daemon.ts

@@ -9,12 +9,18 @@ import {
 } from "@danypops/vehicle-server/daemon";
 import { ensureAuthToken } from "@danypops/vehicle-server/paths";
 import { captureLoadedModules, checkModuleFreshnessAll, ownRuntimeDependencyNames } from "../adoption/module-freshness.ts";
-import { type DaemonServiceInstaller, PACKED_VEHICLE_NAME, RealDaemonServiceInstaller, reconcileAllDaemonServices } from "./daemon-service.ts";
+import {
+	type DaemonServiceInstaller,
+	listManagedPackages,
+	PACKED_VEHICLE_NAME,
+	RealDaemonServiceInstaller,
+	reconcileAllDaemonServices,
+} from "./daemon-service.ts";
 import { generateIndex, indexPath, indexStatus } from "../index/build-index.ts";
 import { catalogStatus, syncCatalog } from "../packages/catalog.ts";
 import { latestVersion, openDb } from "../packages/db.ts";
 import { ExecInstaller } from "../packages/install.ts";
-import { defaultPiHome, readInstalledPackages } from "../packages/installed.ts";
+import { defaultPiHome } from "../packages/installed.ts";
 import type { Installer, Registry } from "../packages/package.ts";
 import { HttpRegistry } from "../registry/registry.ts";
 import {
@@ -87,7 +93,10 @@ export function daemonOptions(options: StartPackedDaemonOptions): StartDaemonOpt
 			name: "package-update-check",
 			intervalMs: envMs(ENV.WATCH_SECS, WATCH_INTERVAL_DEFAULT_MS),
 			run: async () => {
-				const updates = checkUpdates((name) => latestVersion(database, name), readInstalledPackages(piHome));
+				// listManagedPackages(), not readInstalledPackages() -- also catches a physically
+				// installed daemon-dependency that isn't itself pi:-configured (e.g. papyrus via
+				// pi-papyrus). readInstalledPackages() alone silently missed every such stale package.
+				const updates = checkUpdates((name) => latestVersion(database, name), listManagedPackages(piHome));
 				await saveUpdates(paths.stateDirectory, { checkedAt: new Date().toISOString(), updates });
 			},
 		},

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

@@ -11,9 +11,11 @@ import {
 	RealDaemonServiceInstaller,
 	reconcileAllDaemonServices,
 } from "../src/daemon/daemon-service.ts";
+import { openDb, replaceAll } from "../src/packages/db.ts";
 import type { Installer, Registry } from "../src/packages/package.ts";
 import { RECONCILE_INTERVAL_DEFAULT_MS } from "../src/shared/constants.ts";
 import { resolvePackedPaths } from "../src/shared/paths.ts";
+import { loadUpdates } from "../src/daemon/watcher.ts";
 
 const roots: string[] = [];
 afterEach(() => {
@@ -57,6 +59,24 @@ function installMockDaemon(piHome: string, name: string): void {
 	writeFileSync(join(directory, "cli.ts"), "// Mock Vehicle entry point; Armada's test controller never executes it.\n");
 }
 
+/** A Vehicle-shaped daemon-dependency (real bin + vehicle-server dependency), not declared in
+ * settings.json's packages[] -- e.g. papyrus, resolved only via pi-papyrus. */
+function installUnconfiguredDaemonDependency(piHome: string, name: string, version: string): void {
+	const directory = join(piHome, "npm", "node_modules", name);
+	mkdirSync(directory, { recursive: true });
+	writeFileSync(
+		join(directory, "package.json"),
+		JSON.stringify({ name, version, bin: { probe: "cli.ts" }, dependencies: { "@danypops/vehicle-server": "^0.1.0" } }),
+	);
+	writeFileSync(join(directory, "cli.ts"), "// Mock Vehicle entry point.\n");
+}
+
+function installConfiguredExtension(piHome: string, name: string, version: string): void {
+	const directory = join(piHome, "npm", "node_modules", name);
+	mkdirSync(directory, { recursive: true });
+	writeFileSync(join(directory, "package.json"), JSON.stringify({ name, version }));
+}
+
 const registry: Registry = {
 	async search() {
 		return { total: 0, results: [] };
@@ -252,4 +272,40 @@ describe("startPackedDaemon's own maintenance-task wiring (self-heals Vehicle dr
 			await harness.dispose();
 		}
 	});
+
+	describe("package-update-check (feeds package.updates / pkg_updates)", () => {
+		it("reports a stale pi:-configured extension", async () => {
+			const piHome = fakePiHome(["npm:@danypops/probe-ext"]);
+			installConfiguredExtension(piHome, "@danypops/probe-ext", "1.0.0");
+			const paths = fakePaths();
+			const db = openDb(paths.database);
+			replaceAll(db, [{ name: "@danypops/probe-ext", version: "2.0.0" }], "test");
+			db.close();
+
+			const options = daemonOptions({ paths, reg: registry, inst: installer, piHome });
+			const task = options.maintenanceTasks?.find((t) => t.name === "package-update-check");
+			expect(task).toBeDefined();
+			await task?.run();
+
+			const snapshot = await loadUpdates(paths.stateDirectory);
+			expect(snapshot?.updates.map((u) => u.name)).toContain("@danypops/probe-ext");
+		});
+
+		it("also reports a stale daemon-dependency package (e.g. papyrus via pi-papyrus)", async () => {
+			const piHome = fakePiHome([]); // deliberately NOT declaring probe-daemon in settings.json
+			installUnconfiguredDaemonDependency(piHome, "@danypops/probe-daemon", "1.0.0");
+			const paths = fakePaths();
+			const db = openDb(paths.database);
+			replaceAll(db, [{ name: "@danypops/probe-daemon", version: "9.9.9" }], "test");
+			db.close();
+
+			const options = daemonOptions({ paths, reg: registry, inst: installer, piHome });
+			const task = options.maintenanceTasks?.find((t) => t.name === "package-update-check");
+			expect(task).toBeDefined();
+			await task?.run();
+
+			const snapshot = await loadUpdates(paths.stateDirectory);
+			expect(snapshot?.updates.map((u) => u.name)).toContain("@danypops/probe-daemon");
+		});
+	});
 });

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");