@mycadet/cli 0.12.10 → 0.13.0-dev.202610171617.9ea363e

package/src/lib/ingress-config.ts

@@ -11,7 +11,9 @@ import {
 
 import {
   lookupAssistantByIdentifier,
+  readEdgeShellSelection,
   saveAssistantEntry,
+  saveEdgeShellSelection,
   type AssistantEntry,
 } from "./assistant-config.js";
 import { getStateDir } from "./environments/paths.js";
@@ -68,6 +70,35 @@ export function getDefaultWorkspaceDir(): string {
   );
 }
 
+/** Which client bundle the nginx edge serves as the outer shell. */
+export type ShellMode = "web" | "app";
+
+export const DEFAULT_SHELL_MODE: ShellMode = "web";
+
+/**
+ * Read the persisted shell mode from the CLI lockfile. The nginx edge is a
+ * CLI-managed server — the lockfile's `app` record — not a per-cadet
+ * setting, so its shell lives beside that record there rather than in any
+ * one cadet's workspace config. Unset records read as the default so the
+ * edge's behavior never depends on config files that predate the setting;
+ * an unrecognized value fails loudly rather than silently serving a shell
+ * the user did not ask for.
+ */
+export function readShellMode(): ShellMode {
+  const raw = readEdgeShellSelection();
+  if (raw === undefined) return DEFAULT_SHELL_MODE;
+  if (raw === "web" || raw === "app") return raw;
+  throw new Error(
+    `The nginx edge shell mode must be "web" or "app" (got ${JSON.stringify(raw)}). ` +
+      "Fix it in the CLI lockfile or run `cadet tunnel --shell <web|app>`.",
+  );
+}
+
+/** Persist the shell mode to the CLI lockfile beside the nginx edge record. */
+export function saveShellMode(mode: ShellMode): void {
+  saveEdgeShellSelection(mode);
+}
+
 function getConfigPath(workspaceDir: string): string {
   return join(workspaceDir, "config.json");
 }

package/src/lib/live-voice/tunnel.test.ts

@@ -23,7 +23,7 @@ describe("tunnelHostForCloudUrl", () => {
       "tunnel.mycadet.ai",
     );
     expect(tunnelHostForCloudUrl("https://dev-cloud.mycadet.ai")).toBe(
-      "tunnel-dev.mycadet.ai",
+      "dev-tunnel.mycadet.ai",
     );
   });
 

package/src/lib/live-voice/tunnel.ts

@@ -28,7 +28,7 @@
  * mint again rather than reuse what resolution returned.
  */
 
-import { tunnelHostForPlatformHost } from "@mycadet/service-contracts/ingress";
+import { tunnelHostForCloudHost } from "@mycadet/service-contracts/ingress";
 
 import { authHeaders } from "../cloud-client.js";
 
@@ -55,7 +55,7 @@ export class TunnelWsTokenError extends Error {
  * reached: its tunnel is a loopback port that no naming convention predicts.
  * Otherwise the deployment convention maps the cloud host onto its sibling
  * (`cloud.mycadet.ai` to `tunnel.mycadet.ai`, `dev-cloud.mycadet.ai` to
- * `tunnel-dev.mycadet.ai`). A host outside that convention, including localhost,
+ * `dev-tunnel.mycadet.ai`). A host outside that convention, including localhost,
  * yields the production default, because guessing a tunnel for it would be
  * worse than dialing the one host that certainly exists.
  */
@@ -66,7 +66,7 @@ export function tunnelHostForCloudUrl(cloudUrl: string): string {
   }
   try {
     return (
-      tunnelHostForPlatformHost(new URL(cloudUrl).host) ??
+      tunnelHostForCloudHost(new URL(cloudUrl).host) ??
       DEFAULT_TUNNEL_HOST
     );
   } catch {

package/src/lib/local.ts

@@ -76,10 +76,11 @@ import {
   pathListDelimiter,
   resolveProcessState,
   stopProcessByPidFile,
+  stopProcessGracefully,
 } from "./process.js";
 import { stopTunnelProcess } from "./tunnel.js";
 import { stripVersionPrefix } from "./version-compat.js";
-import { openLogFile, pipeToLogFile } from "./xdg-log.js";
+import { openLogFile, openRuntimeLogFile, pipeToLogFile } from "./xdg-log.js";
 
 const _require = createRequire(import.meta.url);
 
@@ -839,7 +840,7 @@ async function startDaemonFromSource(
         windowsHide: true,
       })
     : (() => {
-        const daemonLogFd = openLogFile("hatch.log");
+        const daemonLogFd = openRuntimeLogFile(resources?.instanceDir ?? spawnStateRoot(), "assistant");
         const c = spawn(bunPath, ["run", resolve(daemonMainPath)], {
           cwd: spawnStateRoot(),
           detached: true,
@@ -912,7 +913,7 @@ async function startDaemonWatchFromSource(
   // detect the in-progress spawn and wait instead of racing.
   writeFileSync(pidFile, "starting", "utf-8");
 
-  const daemonLogFd = openLogFile("hatch.log");
+  const daemonLogFd = openRuntimeLogFile(resources?.instanceDir ?? spawnStateRoot(), "assistant");
   const child = spawn(
     resolveBunExecutable(),
     ["--watch", "run", resolve(mainPath)],
@@ -1699,7 +1700,7 @@ export async function startLocalDaemon(
             windowsHide: true,
           })
         : (() => {
-            const daemonLogFd = openLogFile("hatch.log");
+            const daemonLogFd = openRuntimeLogFile(resources?.instanceDir ?? spawnStateRoot(), "assistant");
             const c = spawn(daemonBinary, [], {
               cwd: spawnStateRoot(),
               detached: true,
@@ -1905,7 +1906,7 @@ export async function startGateway(
     // Use the compiled gateway binary when available (desktop app or compiled
     // CLI invoked from the terminal). In watch mode, skip the bundled binary
     // and use source (bun --watch only works with source files).
-    const gatewayLogFd = openLogFile("hatch.log");
+    const gatewayLogFd = openRuntimeLogFile(resources?.instanceDir ?? spawnStateRoot(), "gateway");
     gateway = spawn(gatewayBinary, [], {
       cwd: spawnStateRoot(),
       detached: true,
@@ -1921,7 +1922,7 @@ export async function startGateway(
     const bunArgs = watch
       ? ["--watch", "run", gatewayEntry, "--cadet-gateway"]
       : ["run", gatewayEntry, "--cadet-gateway"];
-    const gwLogFd = openLogFile("hatch.log");
+    const gwLogFd = openRuntimeLogFile(resources?.instanceDir ?? spawnStateRoot(), "gateway");
     gateway = spawn(resolveBunExecutable(), bunArgs, {
       cwd: spawnStateRoot(),
       detached: true,
@@ -1981,15 +1982,16 @@ export async function stopLocalProcesses(
     "daemon",
     undefined,
     DAEMON_STOP_TIMEOUT_MS,
+    stopProcessGracefully,
   );
 
   const gatewayPidFile = join(cadetDir, "gateway.pid");
-  await stopProcessByPidFile(gatewayPidFile, "gateway", undefined, 7000);
+  await stopProcessByPidFile(gatewayPidFile, "gateway", undefined, 7000, stopProcessGracefully);
 
   // Stop the CES sibling if one was launched. No-op when the
   // PID file is absent.
   const cesPidFile = join(cadetDir, "ces.pid");
-  await stopProcessByPidFile(cesPidFile, "credential-executor");
+  await stopProcessByPidFile(cesPidFile, "credential-executor", undefined, DAEMON_STOP_TIMEOUT_MS, stopProcessGracefully);
 
   // Stop the tunnel agent this CLI spawned (root lockfile `tunnel` entry),
   // verifying the pid still belongs to the provider's binary before signaling