@danypops/papyrus 0.38.1 → 0.38.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/papyrus",
-  "version": "0.38.1",
+  "version": "0.38.3",
   "description": "Daemon-backed graph artifacts, evidence-bearing tasks, rules, skills, and native TUI workflows for Pi",
   "type": "module",
   "keywords": ["pi-package"],
@@ -34,8 +34,7 @@
   },
   "files": ["src", "README.md"],
   "dependencies": {
-    "@danypops/daemon-kit": "^0.10.0",
-    "@danypops/vehicle-core": "^0.1.0",
-    "@danypops/vehicle-server": "^0.1.0"
+    "@danypops/vehicle-core": "^0.1.1",
+    "@danypops/vehicle-server": "^0.3.2"
   }
 }

package/src/cli.ts

@@ -1,9 +1,10 @@
 #!/usr/bin/env bun
 import { execFileSync } from "node:child_process";
-import { copyFileSync, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { copyFileSync, existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { createNodeServiceInstallDeps, generateSystemdUnit, installUserService, type ServiceSpec } from "@danypops/vehicle-server/service";
 import { connectPapyrusClient, type PapyrusClient } from "./client.ts";
 import { DAEMON_UNIT_NAME, TASK_EXECUTION_MAX_NODES, dbPath } from "./constants.ts";
 import { serveMain } from "./daemon.ts";
@@ -18,20 +19,36 @@ export interface SystemdUnitOptions {
 	cliPath: string;
 }
 
-export function renderSystemdUnit(options: SystemdUnitOptions): string {
-	return `[Unit]
-Description=Papyrus graph artifact service
-After=default.target
-
-[Service]
-Type=simple
-ExecStart=${options.bunBin} ${options.cliPath} serve
-Restart=always
-RestartSec=2
+/**
+ * Pure text generator, delegating to vehicle-server's shared generateSystemdUnit -- kept as its
+ * own named export with the same options shape since this package's own tests (and any external
+ * caller) call it directly.
+ *
+ * Papyrus's own daemon.ts does not (yet) use vehicle-server's startDaemon/runDaemonProcess -- it's
+ * a bespoke Bun.serve() with its own state-file layout (daemon-state.ts) and maintenance-timer
+ * scheduling, predating that shared substrate. Only unit *generation* is migrated here; unitPath()
+ * stays a manual XDG_CONFIG_HOME construction rather than pulling in resolveDaemonPaths() for a
+ * database/token/handle layout Papyrus doesn't actually use. DAEMON_KIT_LAUNCH_PROVENANCE=service
+ * is emitted (generateSystemdUnit always adds it) but is currently inert -- Papyrus's daemon never
+ * reads it, since it has no idle-shutdown concept of its own. Migrating daemon.ts's own substrate
+ * is tracked separately.
+ */
+function papyrusServiceSpec(options: SystemdUnitOptions): ServiceSpec {
+	return {
+		name: "papyrus",
+		displayName: "Papyrus graph artifact service",
+		binPath: options.bunBin,
+		args: [options.cliPath, "serve"],
+		descriptorPath: unitPath(),
+		// Restart=always/RestartSec=2 already unconditional in the prior hand-rolled unit --
+		// preserved exactly, not a new opt-in.
+		restartOnFailure: true,
+		restartSec: 2,
+	};
+}
 
-[Install]
-WantedBy=default.target
-`;
+export function renderSystemdUnit(options: SystemdUnitOptions): string {
+	return generateSystemdUnit(papyrusServiceSpec(options));
 }
 
 function unitPath(): string {
@@ -53,14 +70,12 @@ function isDaemonActive(): boolean {
 }
 
 function installService(): void {
-	const path = unitPath();
-	mkdirSync(dirname(path), { recursive: true });
-	writeFileSync(path, renderSystemdUnit({
-		bunBin: process.execPath,
-		cliPath: fileURLToPath(import.meta.url),
-	}));
-	systemctl("daemon-reload");
-	systemctl("enable", DAEMON_UNIT_NAME);
+	const spec = papyrusServiceSpec({ bunBin: process.execPath, cliPath: fileURLToPath(import.meta.url) });
+	const result = installUserService(spec, createNodeServiceInstallDeps());
+	if (!result.installed) throw new Error(`failed to install the Papyrus service: ${result.reason}`);
+	// installUserService's Linux path is `enable --now` (starts if not already running) --
+	// an explicit restart on top ensures a re-install after an upgrade actually picks up the
+	// freshly-generated unit's new ExecStart path, not just re-enables the old one.
 	systemctl("restart", DAEMON_UNIT_NAME);
 }
 

package/src/client.ts

@@ -59,7 +59,7 @@ export async function connectPapyrusClient(dir: string = daemonStateDir()): Prom
 }
 
 export interface PushChannelTarget {
-	/** ws:// URL for the daemon's push-invalidation channel (see push-channel.ts in daemon-kit). */
+	/** ws:// URL for the daemon's push-invalidation channel (see push-channel.ts in vehicle-server). */
 	url: string;
 	token: string;
 }

package/src/daemon.ts

@@ -1,4 +1,4 @@
-import { PushChannel } from "@danypops/daemon-kit/push-channel";
+import { PushChannel } from "@danypops/vehicle-server/push-channel";
 import { DAEMON_HOST, DB_OPTIMIZE_INTERVAL_MS, WAL_CHECKPOINT_INTERVAL_MS, dbPath } from "./constants.ts";
 import { clearDaemonPort, daemonStateDir, loadOrCreateToken, writeDaemonPort } from "./daemon-state.ts";
 import { createApp, createPapyrusService } from "./service.ts";

package/src/db.ts

@@ -7,7 +7,7 @@ import { createHash } from "node:crypto";
 import { createRequire } from "node:module";
 import { mkdirSync } from "node:fs";
 import { join, dirname } from "node:path";
-import { runMigrations, type SqliteMigrationRunner } from "@danypops/daemon-kit/storage";
+import { runMigrations, type SqliteMigrationRunner } from "@danypops/vehicle-server/storage";
 import { SQLITE_BUSY_TIMEOUT_MS, SQLITE_SCHEMA_VERSION } from "./constants.ts";
 
 const require_ = createRequire(import.meta.url);
@@ -449,9 +449,10 @@ const LEGACY_MIGRATION_CHAIN_TARGET_VERSION = 13;
 
 /**
  * A migration beyond LEGACY_MIGRATION_CHAIN_TARGET_VERSION. Runs through @danypops/
- * daemon-kit's generic runMigrations engine (one transaction per migration, daemon-kit's
+ * vehicle-server's generic runMigrations engine (one transaction per migration, its
  * default) via dbMigrationRunner below, instead of a new branch appended to the legacy
- * if-chain -- the exact reuse daemon-kit's storage module was refactored (v0.2.1) to allow,
+ * if-chain -- the exact reuse the storage module was refactored (originally daemon-kit
+ * v0.2.1, now absorbed into vehicle-server) to allow,
  * since Papyrus's dual bun:sqlite/node:sqlite Db abstraction could never satisfy that
  * engine's original bun:sqlite-only signature.
  */
@@ -658,7 +659,7 @@ const FUTURE_MIGRATIONS: ReadonlyArray<PapyrusMigration> = [
 ];
 
 /**
- * Adapts Papyrus's own Db/inTransaction to daemon-kit's storage-agnostic
+ * Adapts Papyrus's own Db/inTransaction to vehicle-server's storage-agnostic
  * SqliteMigrationRunner port, so its runMigrations engine (written against bun:sqlite's
  * concrete Database) runs unmodified against Papyrus's dual-runtime Db abstraction instead.
  */

package/src/domain/session-identity.ts

@@ -17,11 +17,13 @@
  *
  * The actual cryptographic primitive (secret generation, hashing, constant-time verify,
  * first-touch registration semantics) is NOT reimplemented here -- it lives in
- * @danypops/daemon-kit's session-identity module. That gap (a shared bearer token cannot
+ * @danypops/vehicle-server's session-identity module. That gap (a shared bearer token cannot
  * distinguish callers; a session id needs a real credential once it becomes behavior-
- * affecting) is generic to every daemon-kit-shaped daemon, not Papyrus-specific -- Papyrus's
- * own daemon.ts/service.ts predates daemon-kit and has not migrated onto it, but this one
- * capability is adopted narrowly regardless (daemon-kit's exports map is designed for
+ * affecting) is generic to every Vehicle-shaped daemon, not Papyrus-specific -- Papyrus's
+ * own daemon.ts/service.ts is a fully custom Bun.serve() composition root that has never
+ * adopted vehicle-server's own startDaemon()/paths conventions (its own daemon-state.ts
+ * hand-rolls path/token/port management instead), but this one narrow capability is adopted
+ * regardless (vehicle-server's exports map is designed for
  * exactly this: "a consumer only pulls in what it uses"). This file only wires that generic
  * primitive to Papyrus's own SQLite storage (see adapters/sqlite-session-identity-store.ts)
  * and to Task Focus specifically, the one place session_id is behavior-affecting today.

package/src/index.ts

@@ -24,6 +24,7 @@ export type { DiscussionAndRounds } from "./discussion-service.ts";
 export { NOTE_DISPOSITIONS } from "./note-service.ts";
 export type { OperationName, SchemaState } from "./service.ts";
 export type { WorkflowRunResult } from "./workflow-execution.ts";
+export type { PlaybookInvocationResult, PlaybookMissingArguments } from "./playbook-execution.ts";
 export { projectArtifactRelationships } from "./artifact-relationship-view.ts";
 export { taskContext } from "./task-context.ts";
 export { projectTaskExecution, type TaskExecutionPlan, type TaskExecutionState } from "./task-execution.ts";

package/src/ports/session-identity-store.ts

@@ -1,9 +1,9 @@
-import type { SessionIdentityRecord, SessionIdentityStore as DaemonKitSessionIdentityStore } from "@danypops/daemon-kit/session-identity";
+import type { SessionIdentityRecord, SessionIdentityStore as VehicleSessionIdentityStore } from "@danypops/vehicle-server/session-identity";
 
 /**
- * Papyrus's persistence port for @danypops/daemon-kit's storage-agnostic session-identity
+ * Papyrus's persistence port for @danypops/vehicle-server's storage-agnostic session-identity
  * primitive -- re-exported under this project's own port naming convention (src/ports/*)
- * rather than importing the daemon-kit interface name directly at every call site.
+ * rather than importing the vehicle-server interface name directly at every call site.
  */
-export type SessionIdentityStore = DaemonKitSessionIdentityStore;
+export type SessionIdentityStore = VehicleSessionIdentityStore;
 export type { SessionIdentityRecord };

package/src/session-identity-service.ts

@@ -1,4 +1,4 @@
-import { isSessionRegistered, registerSessionIdentity, releaseSessionIdentity, verifySessionSecret } from "@danypops/daemon-kit/session-identity";
+import { isSessionRegistered, registerSessionIdentity, releaseSessionIdentity, verifySessionSecret } from "@danypops/vehicle-server/session-identity";
 import { assertValidSessionId } from "./domain/session-identity.ts";
 import type { SessionIdentityStore } from "./ports/session-identity-store.ts";
 
@@ -11,7 +11,7 @@ export interface RegisterSessionIdentityResult {
 export class InvalidSessionSecretError extends Error {}
 
 /**
- * Thin Papyrus-side wrapper over @danypops/daemon-kit's storage-agnostic session-identity
+ * Thin Papyrus-side wrapper over @danypops/vehicle-server's storage-agnostic session-identity
  * primitive: validates input shape, binds it to Papyrus's own SQLite-backed store, and
  * exposes the exact three operations Task Focus enforcement needs (see
  * assertAuthorizedForFocus in src/modules/tasks.ts). See domain/session-identity.ts for the