always set EXECUTOR_CLIENT so the surface is never guessed

The CLI now stamps EXECUTOR_CLIENT=cli at startup (preserving desktop's own EXECUTOR_CLIENT=desktop), so the in-process apps/local server always sees an explicit surface. apps/local passes the value through, validated, instead of defaulting not-desktop to a guess.

Author: RhysSullivan

apps/cli/src/client-env.ts

@@ -0,0 +1,10 @@
+// Stamp the surface client for this process so the integrations User-Agent is
+// always `cli` or `desktop`, never guessed. The desktop app sets
+// EXECUTOR_CLIENT=desktop before spawning the CLI as its sidecar/daemon, so
+// `??=` preserves that; every other invocation is the CLI itself.
+//
+// This MUST run before the `@executor-js/local` import graph loads: apps/local
+// builds its User-Agent from EXECUTOR_CLIENT at module init (installation.ts),
+// so setting the env in main.ts's body would run too late. Imported as an early
+// side effect in main.ts, right after native-bindings.
+process.env.EXECUTOR_CLIENT ??= "cli";

apps/cli/src/main.ts

@@ -2,6 +2,10 @@
 // before any import (e.g. `@executor-js/local` → libSQL) eagerly loads them.
 import "./native-bindings";
 
+// Stamp EXECUTOR_CLIENT=cli (unless the desktop app already set `desktop`)
+// before `@executor-js/local` builds its integrations User-Agent from it.
+import "./client-env";
+
 import { randomUUID } from "node:crypto";
 import { existsSync, realpathSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";

apps/local/src/installation.ts

@@ -15,13 +15,19 @@ const resolveChannel = (version: string): InstallationChannel => {
   return "stable";
 };
 
-// The desktop main process sets `EXECUTOR_CLIENT=desktop` when it spawns the
-// sidecar. Otherwise this headless apps/local server was launched by the
-// `executor` CLI (`executor mcp`, `web`, `daemon run --foreground`, or the
-// installed background service), so it reports as `cli`. Surface is only ever
-// `cli` or `desktop`; mirrors the owner.client resolution in apps/cli/src/main.ts.
-const resolveClient = (): SurfaceClient =>
-  process.env.EXECUTOR_CLIENT === "desktop" ? "desktop" : "cli";
+// EXECUTOR_CLIENT identifies which product launched this headless apps/local
+// server: the desktop app sets `desktop` before spawning it, and the executor
+// CLI sets `cli` (apps/cli stamps it at startup, see src/client-env.ts). It is
+// therefore always set to a valid surface in a real launch, so we pass it
+// through rather than guess. The `cli` floor only covers direct library/test
+// imports that boot the server without going through a launcher.
+const SURFACE_CLIENTS = ["cli", "desktop"] as const;
+const resolveClient = (): SurfaceClient => {
+  const client = process.env.EXECUTOR_CLIENT;
+  return (SURFACE_CLIENTS as readonly string[]).includes(client ?? "")
+    ? (client as SurfaceClient)
+    : "cli";
+};
 
 export const CHANNEL: InstallationChannel = resolveChannel(LOCAL_VERSION);
 export const VERSION: string = LOCAL_VERSION;