@gajae-gateway/cli 0.1.2 → 0.1.3

package/dist/main.js

@@ -129,7 +129,8 @@ function renderList(columns, rows, options, envelope) {
 
 // src/restart-stack.ts
 import { randomUUID } from "crypto";
-import { mkdir as mkdir2, readFile as readFile2, rename, stat, writeFile as writeFile2 } from "fs/promises";
+import { access, mkdir as mkdir2, readFile as readFile2, rename, stat, writeFile as writeFile2 } from "fs/promises";
+import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
 
 // src/services.ts
@@ -288,6 +289,12 @@ function systemdUnitDir(env, userHome) {
   const base = env.XDG_CONFIG_HOME || join(userHome, ".config");
   return join(base, "systemd", "user");
 }
+function launchAgentPlistPath(spec, launchAgentsDir) {
+  return join(launchAgentsDir, `dev.gajaeway.${spec.id}.plist`);
+}
+function systemdUnitPath(spec, unitDir) {
+  return join(unitDir, systemdUnitName(spec));
+}
 function restartStackCommands(platform, uid) {
   if (platform === "linux")
     return [["systemctl", "--user", "restart", GATEWAY_UNIT]];
@@ -462,6 +469,33 @@ function defaultServiceProbe(platform) {
 async function defaultBinaryModifiedAt(path) {
   return (await stat(path)).mtimeMs;
 }
+function defaultIsServiceInstalled(options) {
+  return async (label) => {
+    const spec = serviceSpecs().find((s) => s.label === label);
+    if (spec === undefined)
+      return false;
+    if (options.platform === "darwin") {
+      const userHome2 = options.env.HOME || homedir2();
+      const agentsDir = options.launchAgentsDir || join2(userHome2, "Library", "LaunchAgents");
+      const plistPath = launchAgentPlistPath(spec, agentsDir);
+      try {
+        await access(plistPath);
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    const userHome = options.env.HOME || homedir2();
+    const unitDirPath = options.unitDir || systemdUnitDir(options.env, userHome);
+    const unitPath = systemdUnitPath(spec, unitDirPath);
+    try {
+      await access(unitPath);
+      return true;
+    } catch {
+      return false;
+    }
+  };
+}
 function floorSecond(ms) {
   return Math.floor(ms / 1000) * 1000;
 }
@@ -470,6 +504,12 @@ async function runRestartStack(options) {
   const runner = options.runner ?? defaultCommandRunner;
   const probe = options.probe ?? defaultServiceProbe(platform);
   const modifiedAt = options.binaryModifiedAt ?? defaultBinaryModifiedAt;
+  const isInstalled = options.isServiceInstalled ?? defaultIsServiceInstalled({
+    platform,
+    env: options.env ?? process.env,
+    launchAgentsDir: options.launchAgentsDir,
+    unitDir: options.unitDir
+  });
   const now = options.now ?? Date.now;
   const sleep = options.sleep ?? ((ms) => Bun.sleep(ms));
   const timeoutMs = options.verifyTimeoutMs ?? VERIFY_TIMEOUT_MS;
@@ -486,6 +526,13 @@ async function runRestartStack(options) {
       continue;
     }
     try {
+      const installed = await isInstalled(step.label);
+      if (!installed) {
+        step.result = "skipped";
+        step.detail = "service is not installed";
+        await writeReceipt(options.home, receipt);
+        continue;
+      }
       if (step.command !== undefined) {
         issuedAt = now();
         const status = await runner(step.command);
@@ -501,8 +548,9 @@ async function runRestartStack(options) {
       step.result = "failed";
       step.detail = error instanceof Error ? error.message : String(error);
     }
-    if (step.result !== "ok")
+    if (step.result !== "ok" && step.result !== "skipped") {
       receipt.state = step.result === "stale" ? "stale" : "failed";
+    }
     await writeReceipt(options.home, receipt);
   }
   if (receipt.state === "running")

package/dist/restart-stack.d.ts

@@ -42,6 +42,7 @@ export interface ServiceProcess {
 }
 export type CommandRunner = (command: readonly string[]) => number | PromiseLike<number>;
 export type ServiceProbe = (label: string) => Promise<ServiceProcess | undefined>;
+export type IsServiceInstalled = (label: string) => Promise<boolean>;
 export interface RunRestartOptions {
     readonly home: string;
     readonly id: string;
@@ -49,6 +50,8 @@ export interface RunRestartOptions {
     readonly uid?: number;
     readonly runner?: CommandRunner;
     readonly probe?: ServiceProbe;
+    /** Checks if a service is installed; if not provided, defaults to checking the service manager's files. */
+    readonly isServiceInstalled?: IsServiceInstalled;
     /** Epoch ms modification time of a deployed binary. */
     readonly binaryModifiedAt?: (path: string) => Promise<number>;
     readonly now?: () => number;
@@ -56,6 +59,12 @@ export interface RunRestartOptions {
     /** How long one service may take to come back verified; covers the gateway's ordered shutdown. */
     readonly verifyTimeoutMs?: number;
     readonly pollMs?: number;
+    /** Environment variables; used to determine systemd unit dir on linux. Defaults to process.env. */
+    readonly env?: NodeJS.ProcessEnv;
+    /** LaunchAgents directory on darwin. Defaults to ~/Library/LaunchAgents. */
+    readonly launchAgentsDir?: string;
+    /** systemd unit directory on linux. Defaults to $XDG_CONFIG_HOME/systemd/user. */
+    readonly unitDir?: string;
 }
 export declare function restartReceiptPath(home: string): string;
 export declare function readRestartReceipt(home: string): Promise<RestartReceipt | undefined>;

package/dist/restart-stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restart-stack.d.ts","sourceRoot":"","sources":["../src/restart-stack.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"restart-stack.d.ts","sourceRoot":"","sources":["../src/restart-stack.ts"],"names":[],"mappings":"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"}

package/dist/services.d.ts

@@ -52,6 +52,11 @@ export declare function escapeXml(value: string): string;
 export declare function renderLaunchAgent(spec: ServiceSpec, binDir: string, home: string, path: string): string;
 export declare function systemdUnitName(spec: ServiceSpec): string;
 export declare function renderSystemdUnit(spec: ServiceSpec, binDir: string, home: string, path: string): string;
+export declare function systemdUnitDir(env: NodeJS.ProcessEnv, userHome: string): string;
+/** Gets the path where a service's LaunchAgent plist is stored on darwin. */
+export declare function launchAgentPlistPath(spec: ServiceSpec, launchAgentsDir: string): string;
+/** Gets the path where a service's systemd unit file is stored on linux. */
+export declare function systemdUnitPath(spec: ServiceSpec, unitDir: string): string;
 /**
  * The ordered commands that realign the whole stack.
  *

package/dist/services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@gajae-gateway/cli",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"type": "module",
 	"description": "Owner CLI for the gajaeway gateway: status, sessions, chat, monitors, and worker lanes over the gateway socket. Requires the Bun runtime (uses Bun.file/Bun.spawn).",
 	"license": "AGPL-3.0-only",
@@ -41,8 +41,8 @@
 		"prepublishOnly": "bun run build"
 	},
 	"dependencies": {
-		"@gajae-gateway/sdk": "0.1.2",
-		"@gajae-gateway/protocol": "0.1.2"
+		"@gajae-gateway/sdk": "0.1.3",
+		"@gajae-gateway/protocol": "0.1.3"
 	},
 	"engines": {
 		"bun": ">=1.4.0"

package/src/restart-stack.ts

@@ -1,13 +1,17 @@
 import { randomUUID } from "node:crypto";
-import { mkdir, readFile, rename, stat, writeFile } from "node:fs/promises";
+import { access, mkdir, readFile, rename, stat, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
 import { join } from "node:path";
 import {
 	currentPlatform,
+	launchAgentPlistPath,
 	restartOrder,
 	restartStackCommands,
 	type ServicePlatform,
 	serviceSpecs,
+	systemdUnitDir,
 	systemdUnitName,
+	systemdUnitPath,
 } from "./services";
 
 /**
@@ -58,6 +62,7 @@ export interface ServiceProcess {
 
 export type CommandRunner = (command: readonly string[]) => number | PromiseLike<number>;
 export type ServiceProbe = (label: string) => Promise<ServiceProcess | undefined>;
+export type IsServiceInstalled = (label: string) => Promise<boolean>;
 
 export interface RunRestartOptions {
 	readonly home: string;
@@ -66,6 +71,8 @@ export interface RunRestartOptions {
 	readonly uid?: number;
 	readonly runner?: CommandRunner;
 	readonly probe?: ServiceProbe;
+	/** Checks if a service is installed; if not provided, defaults to checking the service manager's files. */
+	readonly isServiceInstalled?: IsServiceInstalled;
 	/** Epoch ms modification time of a deployed binary. */
 	readonly binaryModifiedAt?: (path: string) => Promise<number>;
 	readonly now?: () => number;
@@ -73,6 +80,12 @@ export interface RunRestartOptions {
 	/** How long one service may take to come back verified; covers the gateway's ordered shutdown. */
 	readonly verifyTimeoutMs?: number;
 	readonly pollMs?: number;
+	/** Environment variables; used to determine systemd unit dir on linux. Defaults to process.env. */
+	readonly env?: NodeJS.ProcessEnv;
+	/** LaunchAgents directory on darwin. Defaults to ~/Library/LaunchAgents. */
+	readonly launchAgentsDir?: string;
+	/** systemd unit directory on linux. Defaults to $XDG_CONFIG_HOME/systemd/user. */
+	readonly unitDir?: string;
 }
 
 const RECEIPT_FILE = "restart-stack.json";
@@ -166,6 +179,42 @@ async function defaultBinaryModifiedAt(path: string): Promise<number> {
 	return (await stat(path)).mtimeMs;
 }
 
+/** Checks if a service is installed by verifying the service manager's definition file exists. */
+function defaultIsServiceInstalled(options: {
+	readonly platform: ServicePlatform;
+	readonly env: NodeJS.ProcessEnv;
+	readonly launchAgentsDir?: string;
+	readonly unitDir?: string;
+}): IsServiceInstalled {
+	return async (label: string) => {
+		const spec = serviceSpecs().find((s) => s.label === label);
+		if (spec === undefined) return false;
+
+		if (options.platform === "darwin") {
+			const userHome = options.env.HOME || homedir();
+			const agentsDir = options.launchAgentsDir || join(userHome, "Library", "LaunchAgents");
+			const plistPath = launchAgentPlistPath(spec, agentsDir);
+			try {
+				await access(plistPath);
+				return true;
+			} catch {
+				return false;
+			}
+		}
+
+		// linux
+		const userHome = options.env.HOME || homedir();
+		const unitDirPath = options.unitDir || systemdUnitDir(options.env, userHome);
+		const unitPath = systemdUnitPath(spec, unitDirPath);
+		try {
+			await access(unitPath);
+			return true;
+		} catch {
+			return false;
+		}
+	};
+}
+
 function floorSecond(ms: number): number {
 	return Math.floor(ms / 1_000) * 1_000;
 }
@@ -180,6 +229,14 @@ export async function runRestartStack(options: RunRestartOptions): Promise<Resta
 	const runner = options.runner ?? defaultCommandRunner;
 	const probe = options.probe ?? defaultServiceProbe(platform);
 	const modifiedAt = options.binaryModifiedAt ?? defaultBinaryModifiedAt;
+	const isInstalled =
+		options.isServiceInstalled ??
+		defaultIsServiceInstalled({
+			platform,
+			env: options.env ?? process.env,
+			launchAgentsDir: options.launchAgentsDir,
+			unitDir: options.unitDir,
+		});
 	const now = options.now ?? Date.now;
 	const sleep = options.sleep ?? ((ms: number) => Bun.sleep(ms));
 	const timeoutMs = options.verifyTimeoutMs ?? VERIFY_TIMEOUT_MS;
@@ -201,6 +258,15 @@ export async function runRestartStack(options: RunRestartOptions): Promise<Resta
 			continue;
 		}
 		try {
+			// Check if the service is installed before trying to restart it
+			const installed = await isInstalled(step.label);
+			if (!installed) {
+				step.result = "skipped";
+				step.detail = "service is not installed";
+				await writeReceipt(options.home, receipt);
+				continue;
+			}
+
 			if (step.command !== undefined) {
 				issuedAt = now();
 				const status = await runner(step.command);
@@ -215,7 +281,9 @@ export async function runRestartStack(options: RunRestartOptions): Promise<Resta
 			step.result = "failed";
 			step.detail = error instanceof Error ? error.message : String(error);
 		}
-		if (step.result !== "ok") receipt.state = step.result === "stale" ? "stale" : "failed";
+		if (step.result !== "ok" && step.result !== "skipped") {
+			receipt.state = step.result === "stale" ? "stale" : "failed";
+		}
 		await writeReceipt(options.home, receipt);
 	}
 	if (receipt.state === "running") receipt.state = "ok";

package/src/services.ts

@@ -235,11 +235,21 @@ export function renderSystemdUnit(spec: ServiceSpec, binDir: string, home: strin
 	return unit.join("\n");
 }
 
-function systemdUnitDir(env: NodeJS.ProcessEnv, userHome: string): string {
+export function systemdUnitDir(env: NodeJS.ProcessEnv, userHome: string): string {
 	const base = env.XDG_CONFIG_HOME || join(userHome, ".config");
 	return join(base, "systemd", "user");
 }
 
+/** Gets the path where a service's LaunchAgent plist is stored on darwin. */
+export function launchAgentPlistPath(spec: ServiceSpec, launchAgentsDir: string): string {
+	return join(launchAgentsDir, `dev.gajaeway.${spec.id}.plist`);
+}
+
+/** Gets the path where a service's systemd unit file is stored on linux. */
+export function systemdUnitPath(spec: ServiceSpec, unitDir: string): string {
+	return join(unitDir, systemdUnitName(spec));
+}
+
 /**
  * The ordered commands that realign the whole stack.
  *