@mycadet/cli 0.12.7 → 0.12.9

package/src/lib/assistant-config.ts

@@ -63,19 +63,11 @@ export type LocalInstanceResources = Omit<
   [key: string]: unknown;
 };
 
-/** Docker image metadata for the service group. Enables rollback to known-good digests. */
+/** Docker image metadata for the service group. Enables rollback to known-good refs. */
 export interface ContainerInfo {
   assistantImage: string;
   gatewayImage: string;
   cesImage: string;
-  /** sha256 digest of the assistant image at time of hatch/upgrade */
-  assistantDigest?: string;
-  /** sha256 digest of the gateway image at time of hatch/upgrade */
-  gatewayDigest?: string;
-  /** sha256 digest of the CES image at time of hatch/upgrade */
-  cesDigest?: string;
-  /** Docker network name for the service group */
-  networkName?: string;
   /**
    * Host-side port the assistant HTTP API is published on. Dynamically
    * allocated at hatch time so concurrent instances don't collide on the
@@ -159,10 +151,29 @@ export type AssistantLookupResult =
 interface LockfileData {
   assistants?: Record<string, unknown>[];
   activeAssistant?: string;
-  platformBaseUrl?: string;
+  cloudBaseUrl?: string;
+  tunnel?: RootProcessRecord;
+  app?: RootProcessRecord;
   [key: string]: unknown;
 }
 
+/**
+ * A CLI-managed OS process recorded at the lockfile root, keyed by what it is
+ * for — `tunnel` (the auto-tunnel agent fronting the edge) and `app` (the
+ * nginx ingress edge). `cadet ps` renders these alongside the per-assistant
+ * process trees, and the stop paths verify the pid before signaling it.
+ */
+export interface RootProcessRecord {
+  pid: number;
+  /** Which tunnel provider owns the process; "tunnel" entries only. */
+  provider?: string;
+  /** The assistant the process fronts, so `cadet ps` can nest the row. */
+  assistantId?: string;
+  startedAt: string;
+}
+
+export type RootProcessKind = "tunnel" | "app";
+
 /**
  * Derive the daemon PID file path from a resources object. The PID file
  * lives inside the instance's workspace directory. When no resources are
@@ -224,6 +235,40 @@ function withCliLockfileLock<T>(fn: () => T): T {
   return locked.value;
 }
 
+/** Record a CLI-managed root process (tunnel agent, app edge) by pid. */
+export function stampRootProcess(
+  kind: RootProcessKind,
+  record: RootProcessRecord,
+): void {
+  withCliLockfileLock(() => {
+    const data = readLockfile();
+    data[kind] = record;
+    writeLockfileUnlocked(data);
+  });
+}
+
+/** Drop the recorded root process entry, e.g. once the process is stopped. */
+export function clearRootProcess(kind: RootProcessKind): void {
+  withCliLockfileLock(() => {
+    const data = readLockfile();
+    if (data[kind] === undefined) return;
+    delete data[kind];
+    writeLockfileUnlocked(data);
+  });
+}
+
+/**
+ * Read the root-level process entries for `cadet ps`. Read-only: no lock, so
+ * a concurrently-updating lockfile is fine — the pid is verified separately.
+ */
+export function readRootProcesses(): {
+  tunnel?: RootProcessRecord;
+  app?: RootProcessRecord;
+} {
+  const data = readLockfile();
+  return { tunnel: data.tunnel, app: data.app };
+}
+
 /**
  * Try to extract a port number from a URL string (e.g. `http://localhost:7830`).
  * Returns undefined if the URL is malformed or has no explicit port.
@@ -746,13 +791,14 @@ export async function allocateLocalResources(
 }
 
 /**
- * Return `platformBaseUrl` from the lockfile, if set. This is the value
+ * Return `cloudBaseUrl` from the lockfile, if set. This is the value
  * persisted by {@link syncConfigToLockfile} the last time the active
  * assistant was hatched/waked, and is the source of truth for "which
  * platform does the currently-active assistant target".
  */
 export function getLockfilePlatformBaseUrl(): string | undefined {
-  const url = readLockfile().platformBaseUrl;
+  const lockfile = readLockfile();
+  const url = lockfile.cloudBaseUrl ?? lockfile.platformBaseUrl;
   if (typeof url === "string" && url.trim()) return url.trim();
   return undefined;
 }