@danypops/papyrus 0.44.2 → 0.44.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/papyrus",
-  "version": "0.44.2",
+  "version": "0.44.4",
   "description": "Daemon-backed graph artifacts, evidence-bearing tasks, rules, skills, and native TUI workflows for Pi",
   "type": "module",
   "keywords": ["pi-package"],
@@ -34,8 +34,8 @@
   },
   "files": ["src", "README.md"],
   "dependencies": {
+    "@danypops/vehicle-client": "^0.6.1",
     "@danypops/vehicle-core": "^0.10.0",
-    "@danypops/vehicle-client": "^0.5.0",
     "@danypops/vehicle-server": "^0.13.0"
   }
 }

package/src/client.ts

@@ -1,13 +1,19 @@
 import { spawn as spawnProcess } from "node:child_process";
 import { fileURLToPath } from "node:url";
-import { connectWithVersionCheck, spawnDetachedDaemon } from "@danypops/vehicle-client/daemon-client";
-import { readPackageVersion } from "@danypops/vehicle-client/version";
+import { connectWithVersionCheck, type ExpectedVersion, spawnDetachedDaemon } from "@danypops/vehicle-client/daemon-client";
+import { createLiveVersionExpectation } from "@danypops/vehicle-client/version";
 import { DAEMON_CLIENT_TIMEOUT_MS, DAEMON_DIR_ENV, DAEMON_PROBE_TIMEOUT_MS } from "./constants.ts";
 import { type DaemonHandle, daemonStateDir, readDaemonHandle } from "./daemon-state.ts";
 import type { OperationName, SchemaState } from "./service.ts";
 
-/** Compared against the running daemon's /health-reported version by connectWithVersionCheck below -- a long-lived daemon holds whatever code was loaded at its own start. */
-const PAPYRUS_VERSION = readPackageVersion(new URL("../package.json", import.meta.url), "Papyrus");
+/**
+ * Compared against the running daemon's /health-reported version by connectWithVersionCheck
+ * below. Re-read fresh on every call, not cached -- a module-level `const` here was the exact
+ * bug that caused repeated, never-self-healing daemon kill/respawn churn on any process that
+ * outlived an `npm update` (a respawned daemon runs the same source and reports the same real
+ * version, so a stale cached expectation never converges).
+ */
+const papyrusExpectedVersion = createLiveVersionExpectation(new URL("../package.json", import.meta.url), "Papyrus");
 
 export type FetchAdapter = (request: Request) => Promise<Response>;
 
@@ -89,7 +95,7 @@ export interface ConnectPapyrusClientOptions {
 	 */
 	env?: Record<string, string | undefined>;
 	/** Overrides the version connectWithVersionCheck compares against. Defaults to PAPYRUS_VERSION; test-only -- lets a test force a mismatch against a real daemon without a second build. */
-	expectedVersion?: string;
+	expectedVersion?: ExpectedVersion;
 }
 
 /**
@@ -126,7 +132,7 @@ export async function connectPapyrusClient(
 			fallbackMessage: "Papyrus daemon failed to start automatically; run `papyrus service install` or `papyrus serve` manually.",
 		},
 		{
-			expectedVersion: options.expectedVersion ?? PAPYRUS_VERSION,
+			expectedVersion: options.expectedVersion ?? papyrusExpectedVersion,
 			readVersion: async (client) => (await client.health()).version,
 			killStaleProcess: killStalePapyrusDaemon,
 		},

package/src/task-service.ts

@@ -329,11 +329,17 @@ export class Tasks {
 			throw new Error(`task graph limit must be between 1 and ${TASK_EXECUTION_MAX_NODES + 1}`);
 		}
 		const tasks = this.list({ ...filter, limit: requestedLimit });
+		return this.buildGraph(tasks, scope, filter.sessionId);
+	}
+
+	/** Shared by graph() and dependencyCheckGraph() -- the latter builds a graph from an
+	 * explicitly assembled task list (a union of two projects) rather than one filter's own scope. */
+	private buildGraph(tasks: Artifact[], scope: TaskViewSelection, sessionId?: string): TaskGraph {
 		if (tasks.length > TASK_EXECUTION_MAX_NODES) {
-			throw new Error(`task execution graph exceeds ${TASK_EXECUTION_MAX_NODES} nodes`);
+			throw new TaskExecutionBoundExceededError(`task execution graph exceeds ${TASK_EXECUTION_MAX_NODES} nodes`);
 		}
 		const byId = new Map(tasks.map((task) => [task.id, task]));
-		const focus = this.focusStore.get(filter.sessionId);
+		const focus = this.focusStore.get(sessionId);
 		const focusedId = focus?.taskId;
 		const focusStatus = focus?.status;
 		const nodes = new Map(
@@ -355,7 +361,7 @@ export class Tasks {
 			limit: TASK_EXECUTION_MAX_EDGES + 1,
 		});
 		if (relationships.length > TASK_EXECUTION_MAX_EDGES) {
-			throw new Error(`task execution graph exceeds ${TASK_EXECUTION_MAX_EDGES} relationships`);
+			throw new TaskExecutionBoundExceededError(`task execution graph exceeds ${TASK_EXECUTION_MAX_EDGES} relationships`);
 		}
 		for (const edge of relationships) {
 			if (!byId.has(edge.from) || !byId.has(edge.to)) continue;
@@ -656,6 +662,18 @@ export class Tasks {
 		if (sourceProject !== undefined && sourceProject === targetProject) {
 			return this.graph({ projectRoot: sourceProject, scope: "project" });
 		}
+		if (sourceProject !== undefined && targetProject !== undefined) {
+			// A genuine cross-project pair: the union of both endpoints' own project scopes
+			// covers every prerequisite/successor edge relevant to THIS pair's own cycle check,
+			// without pulling in every unrelated project's tasks -- those can push the daemon-wide
+			// total over TASK_EXECUTION_MAX_NODES for reasons that have nothing to do with these
+			// two tasks. A cycle threading through a third, uninvolved project is not covered by
+			// this union; falls back to the fully unscoped graph only when a project is unknown.
+			const limit = TASK_EXECUTION_MAX_NODES + 1;
+			const merged = new Map(this.list({ projectRoot: sourceProject, scope: "project", limit }).map((task) => [task.id, task]));
+			for (const task of this.list({ projectRoot: targetProject, scope: "project", limit })) merged.set(task.id, task);
+			return this.buildGraph([...merged.values()], { mode: "all", label: taskScopeLabel("all") });
+		}
 		return this.graph();
 	}