@fased/fased 0.1.30 → 0.1.31

package/src/canvas-host/a2ui/.bundle.hash

@@ -1 +1 @@
-74c5d446a68345716bb580b5a2f3873d66b6071ca9941808c334d47b88545124
+24e7a81f8ec190d5c9f255805c2c41d611c27cfe776316cef88d5e3019985050

package/src/cli/daemon-cli/lifecycle.ts

@@ -1,5 +1,7 @@
 import { loadConfig, resolveGatewayPort } from "../../config/config.js";
 import { resolveGatewayService } from "../../daemon/service.js";
+import { resolveGatewayCredentialsFromConfig } from "../../gateway/credentials.js";
+import { loadGatewayTlsRuntime } from "../../infra/tls/gateway.js";
 import { defaultRuntime } from "../../runtime.js";
 import { theme } from "../../terminal/theme.js";
 import { formatCliCommand } from "../command-format.js";
@@ -35,6 +37,25 @@ async function resolveGatewayRestartPort() {
   return portFromArgs ?? resolveGatewayPort(loadConfig(), mergedEnv);
 }
 
+async function resolveGatewayRestartRpc(port: number) {
+  const cfg = loadConfig();
+  const tlsRuntime =
+    cfg.gateway?.tls?.enabled === true ? await loadGatewayTlsRuntime(cfg.gateway.tls) : undefined;
+  const scheme = tlsRuntime?.enabled ? "wss" : "ws";
+  const auth = resolveGatewayCredentialsFromConfig({
+    cfg,
+    env: process.env,
+    modeOverride: "local",
+  });
+  return {
+    url: `${scheme}://127.0.0.1:${port}`,
+    token: auth.token,
+    password: auth.password,
+    tlsFingerprint: tlsRuntime?.enabled ? tlsRuntime.fingerprintSha256 : undefined,
+    timeoutMs: 1_500,
+  };
+}
+
 export async function runDaemonUninstall(opts: DaemonLifecycleOptions = {}) {
   return await runServiceUninstall({
     serviceNoun: "Gateway",
@@ -88,6 +109,7 @@ export async function runDaemonRestart(opts: DaemonLifecycleOptions = {}): Promi
         port: restartPort,
         attempts: POST_RESTART_HEALTH_ATTEMPTS,
         delayMs: POST_RESTART_HEALTH_DELAY_MS,
+        rpc: await resolveGatewayRestartRpc(restartPort),
       });
 
       if (!health.healthy && health.staleGatewayPids.length > 0) {
@@ -105,6 +127,7 @@ export async function runDaemonRestart(opts: DaemonLifecycleOptions = {}): Promi
           port: restartPort,
           attempts: POST_RESTART_HEALTH_ATTEMPTS,
           delayMs: POST_RESTART_HEALTH_DELAY_MS,
+          rpc: await resolveGatewayRestartRpc(restartPort),
         });
       }
 

package/src/cli/daemon-cli/restart-health.ts

@@ -7,6 +7,7 @@ import {
   type PortUsage,
 } from "../../infra/ports.js";
 import { sleep } from "../../utils.js";
+import { probeGatewayStatus } from "./probe.js";
 
 export const DEFAULT_RESTART_HEALTH_TIMEOUT_MS = 60_000;
 export const DEFAULT_RESTART_HEALTH_DELAY_MS = 500;
@@ -18,6 +19,10 @@ export type GatewayRestartSnapshot = {
   runtime: GatewayServiceRuntime;
   portUsage: PortUsage;
   healthy: boolean;
+  rpc?: {
+    ok: boolean;
+    error?: string;
+  };
   staleGatewayPids: number[];
 };
 
@@ -32,6 +37,13 @@ export async function inspectGatewayRestart(params: {
   service: GatewayService;
   port: number;
   env?: NodeJS.ProcessEnv;
+  rpc?: {
+    url: string;
+    token?: string;
+    password?: string;
+    tlsFingerprint?: string;
+    timeoutMs: number;
+  };
 }): Promise<GatewayRestartSnapshot> {
   const env = params.env ?? process.env;
   let runtime: GatewayServiceRuntime = { status: "unknown" };
@@ -67,7 +79,18 @@ export async function inspectGatewayRestart(params: {
       ? portUsage.listeners.some((listener) => listenerOwnedByRuntimePid({ listener, runtimePid }))
       : gatewayListeners.length > 0 ||
         (portUsage.status === "busy" && portUsage.listeners.length === 0);
-  const healthy = running && ownsPort;
+  const shouldProbeRpc = running && ownsPort && params.rpc;
+  const rpc = shouldProbeRpc
+    ? await probeGatewayStatus({
+        url: params.rpc.url,
+        token: params.rpc.token,
+        password: params.rpc.password,
+        tlsFingerprint: params.rpc.tlsFingerprint,
+        timeoutMs: params.rpc.timeoutMs,
+        json: true,
+      })
+    : undefined;
+  const healthy = running && ownsPort && (rpc ? rpc.ok : true);
   const staleGatewayPids = Array.from(
     new Set(
       gatewayListeners
@@ -89,6 +112,7 @@ export async function inspectGatewayRestart(params: {
     runtime,
     portUsage,
     healthy,
+    ...(rpc ? { rpc } : {}),
     staleGatewayPids,
   };
 }
@@ -99,6 +123,13 @@ export async function waitForGatewayHealthyRestart(params: {
   attempts?: number;
   delayMs?: number;
   env?: NodeJS.ProcessEnv;
+  rpc?: {
+    url: string;
+    token?: string;
+    password?: string;
+    tlsFingerprint?: string;
+    timeoutMs: number;
+  };
 }): Promise<GatewayRestartSnapshot> {
   const attempts = params.attempts ?? DEFAULT_RESTART_HEALTH_ATTEMPTS;
   const delayMs = params.delayMs ?? DEFAULT_RESTART_HEALTH_DELAY_MS;
@@ -107,6 +138,7 @@ export async function waitForGatewayHealthyRestart(params: {
     service: params.service,
     port: params.port,
     env: params.env,
+    rpc: params.rpc,
   });
 
   for (let attempt = 0; attempt < attempts; attempt += 1) {
@@ -121,6 +153,7 @@ export async function waitForGatewayHealthyRestart(params: {
       service: params.service,
       port: params.port,
       env: params.env,
+      rpc: params.rpc,
     });
   }
 
@@ -151,6 +184,9 @@ export function renderRestartDiagnostics(snapshot: GatewayRestartSnapshot): stri
   if (snapshot.portUsage.errors?.length) {
     lines.push(`Port diagnostics errors: ${snapshot.portUsage.errors.join("; ")}`);
   }
+  if (snapshot.rpc && !snapshot.rpc.ok) {
+    lines.push(`Gateway RPC probe: failed${snapshot.rpc.error ? ` (${snapshot.rpc.error})` : ""}.`);
+  }
 
   return lines;
 }

package/src/cli/daemon-cli/status.gather.ts

@@ -13,6 +13,7 @@ import { auditGatewayServiceConfig } from "../../daemon/service-audit.js";
 import { resolveGatewayService } from "../../daemon/service.js";
 import { resolveGatewayBindHost } from "../../gateway/net.js";
 import {
+  classifyPortListener,
   formatPortDiagnostics,
   inspectPortUsage,
   type PortListener,
@@ -96,16 +97,49 @@ export type DaemonStatus = {
   extraServices: Array<{ label: string; detail: string; scope: string }>;
 };
 
-function shouldReportPortUsage(status: PortUsageStatus | undefined, rpcOk?: boolean) {
-  if (status !== "busy") {
+function shouldReportPortUsage(
+  port: DaemonStatus["port"] | undefined,
+  rpcOk?: boolean,
+  runtime?: DaemonStatus["service"]["runtime"],
+) {
+  if (!port || port.status !== "busy") {
     return false;
   }
   if (rpcOk === true) {
     return false;
   }
+  if (isExpectedSingleGatewayListener(port, runtime)) {
+    return false;
+  }
   return true;
 }
 
+function isExpectedSingleGatewayListener(
+  port: DaemonStatus["port"],
+  runtime?: DaemonStatus["service"]["runtime"],
+): boolean {
+  if (!port || port.status !== "busy" || runtime?.status !== "running") {
+    return false;
+  }
+  if (port.listeners.length === 0) {
+    return false;
+  }
+  const gatewayListeners = port.listeners.filter(
+    (listener) => classifyPortListener(listener, port.port) === "gateway",
+  );
+  if (gatewayListeners.length !== port.listeners.length) {
+    return false;
+  }
+  const pids = Array.from(
+    new Set(
+      gatewayListeners
+        .map((listener) => listener.pid)
+        .filter((pid): pid is number => typeof pid === "number" && Number.isFinite(pid)),
+    ),
+  );
+  return pids.length <= 1;
+}
+
 export async function gatherDaemonStatus(
   opts: {
     rpc: GatewayRpcOpts;
@@ -285,7 +319,7 @@ export async function gatherDaemonStatus(
 }
 
 export function renderPortDiagnosticsForCli(status: DaemonStatus, rpcOk?: boolean): string[] {
-  if (!status.port || !shouldReportPortUsage(status.port.status, rpcOk)) {
+  if (!shouldReportPortUsage(status.port, rpcOk, status.service.runtime)) {
     return [];
   }
   return formatPortDiagnostics({