fix(sidecar): close identity and child env gaps

Author: PerishCode

apps/daemon/src/sidecar/payload-desktop-handoff.ts

@@ -20,12 +20,13 @@ import {
   type LauncherRuntimeDescriptor,
   type LauncherVersionPointer,
 } from "@open-design/launcher-proto";
-import { releaseChannelFromNamespace, releaseChannelFromVersion } from "@open-design/release";
+import { releaseChannelFromIdentity } from "@open-design/release";
 import {
   readJsonFile,
   writeJsonFile,
 } from "@open-design/sidecar";
 import {
+  OPEN_DESIGN_RUNTIME_DEFAULTS,
   OPEN_DESIGN_RUNTIME_SOURCES as SIDECAR_SOURCES,
   OPEN_DESIGN_SERVICES as APP_KEYS,
   type OpenDesignRuntimeSource as SidecarSource,
@@ -267,8 +268,11 @@ export async function prepareLegacyPayloadDesktopHandoff(options: {
   } catch {
     return { kind: "none", reason: "invalid-launcher-state" };
   }
-  const channel = releaseChannelFromVersion(appVersion)
-    ?? releaseChannelFromNamespace(options.namespace, "default")
+  const channel = releaseChannelFromIdentity(
+    appVersion,
+    options.namespace,
+    OPEN_DESIGN_RUNTIME_DEFAULTS.namespace,
+  )
     ?? "stable";
   const launcherPaths = resolveLauncherPaths({
     channel,

apps/packaged/src/control.ts

@@ -1,10 +1,11 @@
 import {
   createOpenDesignRuntimeProjection,
+  OPEN_DESIGN_RUNTIME_DEFAULTS,
   OPEN_DESIGN_RUNTIME_MODES,
   OPEN_DESIGN_RUNTIME_SOURCES,
   type OpenDesignRuntimeContext,
 } from "@open-design/contracts/runtime/sidecars";
-import { releaseChannelFromVersion } from "@open-design/release";
+import { releaseChannelFromIdentity } from "@open-design/release";
 import { bootstrapControlPlane, type SidecarControlPlane } from "@open-design/sidecar/control";
 
 import type { PackagedNamespacePaths } from "./paths.js";
@@ -15,7 +16,11 @@ export function createPackagedControl(
   namespace: string,
   paths: PackagedNamespacePaths,
 ): { control: SidecarControlPlane; runtime: OpenDesignRuntimeContext } {
-  const channel = appVersion == null ? "local" : releaseChannelFromVersion(appVersion) ?? "local";
+  const channel = releaseChannelFromIdentity(
+    appVersion,
+    namespace,
+    OPEN_DESIGN_RUNTIME_DEFAULTS.namespace,
+  ) ?? "local";
   const projection = createOpenDesignRuntimeProjection(
     OPEN_DESIGN_RUNTIME_MODES.RUNTIME,
     OPEN_DESIGN_RUNTIME_SOURCES.PACKAGED,

apps/packaged/src/launcher-runtime.ts

@@ -22,7 +22,8 @@ import {
   type LauncherAttemptDescriptor,
   type LauncherTargetSelection,
 } from "@open-design/launcher-proto";
-import { releaseChannelFromNamespace, releaseChannelFromVersion } from "@open-design/release";
+import { releaseChannelFromIdentity } from "@open-design/release";
+import { OPEN_DESIGN_RUNTIME_DEFAULTS } from "@open-design/contracts/runtime/sidecars";
 
 import type { PackagedConfig, PackagedWebOutputMode, RawPackagedConfig } from "./config.js";
 import type { LauncherExistingDesktopGateResult } from "./launcher-after-quit.js";
@@ -107,8 +108,11 @@ async function pathExists(path: string): Promise<boolean> {
 }
 
 function inferLauncherChannel(config: Pick<PackagedConfig, "appVersion" | "namespace">): LauncherChannel {
-  return releaseChannelFromVersion(config.appVersion)
-    ?? releaseChannelFromNamespace(config.namespace, "default")
+  return releaseChannelFromIdentity(
+    config.appVersion,
+    config.namespace,
+    OPEN_DESIGN_RUNTIME_DEFAULTS.namespace,
+  )
     ?? "stable";
 }
 

apps/packaged/src/window-title.ts

@@ -1,14 +1,16 @@
 import {
-  releaseChannelFromNamespace,
-  releaseChannelFromVersion,
+  releaseChannelFromIdentity,
   releaseInstallIdentity,
 } from "@open-design/release";
+import { OPEN_DESIGN_RUNTIME_DEFAULTS } from "@open-design/contracts/runtime/sidecars";
 
 const DEFAULT_WINDOW_TITLE = "Open Design";
 
 export function resolvePackagedWindowTitle(config: { appVersion: string | null; namespace: string }): string {
-  const channel =
-    releaseChannelFromVersion(config.appVersion) ??
-    releaseChannelFromNamespace(config.namespace);
+  const channel = releaseChannelFromIdentity(
+    config.appVersion,
+    config.namespace,
+    OPEN_DESIGN_RUNTIME_DEFAULTS.namespace,
+  );
   return channel == null ? DEFAULT_WINDOW_TITLE : releaseInstallIdentity(channel).productName;
 }

apps/packaged/tests/identity.test.ts

@@ -51,6 +51,21 @@ describe("packaged identity markers", () => {
     expect(result.runtime).toMatchObject(result.control.scope);
   });
 
+  it.each([
+    { appVersion: "1.2.3", channel: "stable", namespace: "default" },
+    { appVersion: "1.2.3", channel: "stable", namespace: "release-stable" },
+    { appVersion: null, channel: "beta", namespace: "release-beta-linux" },
+  ] as const)(
+    "resolves $channel control identity for version=$appVersion namespace=$namespace",
+    ({ appVersion, channel, namespace }) => {
+      const paths = fakePaths(join(tmpdir(), `od-packaged-control-${process.pid}-${namespace}`));
+      const result = createPackagedControl(appVersion, 0, namespace, paths);
+
+      expect(result.control.scope).toEqual({ channel, generation: 0, namespace });
+      expect(result.runtime).toMatchObject(result.control.scope);
+    },
+  );
+
   it("can write and close the desktop identity shape at the headless marker path", async () => {
     const root = join(tmpdir(), `od-packaged-identity-${process.pid}-${Date.now()}`);
     const paths = fakePaths(root);

e2e/lib/vitest/packaged-win-identity.ts

@@ -1,8 +1,8 @@
 import {
-  releaseChannelFromNamespace,
-  releaseChannelFromVersion,
+  releaseChannelFromIdentity,
   releaseInstallIdentity,
 } from "@open-design/release";
+import { OPEN_DESIGN_RUNTIME_DEFAULTS } from "@open-design/contracts/runtime/sidecars";
 
 export { releaseAppVersionArgs } from "./packaged-release-version.js";
 
@@ -20,8 +20,11 @@ export function resolvePackagedWinInstallIdentity(options: {
   releaseVersion: string | null | undefined;
 }): PackagedWinInstallIdentity {
   const namespaceToken = sanitizeNamespace(options.namespace);
-  const channel = releaseChannelFromVersion(options.releaseVersion)
-    ?? releaseChannelFromNamespace(options.namespace, "default");
+  const channel = releaseChannelFromIdentity(
+    options.releaseVersion,
+    options.namespace,
+    OPEN_DESIGN_RUNTIME_DEFAULTS.namespace,
+  );
   const displayName = channel == null ? `Open Design ${namespaceToken}` : releaseInstallIdentity(channel).productName;
   return { displayName, namespaceToken };
 }

packages/release/src/index.ts

@@ -126,6 +126,16 @@ export function releaseChannelFromNamespace(namespace: string, defaultNamespace
   return isReleaseChannel(match?.[1]) ? match[1] : null;
 }
 
+/** Resolve one release channel identity with version precedence and namespace fallback. */
+export function releaseChannelFromIdentity(
+  version: string | null | undefined,
+  namespace: string,
+  defaultNamespace = DEFAULT_NAMESPACE,
+): ReleaseChannel | null {
+  return releaseChannelFromVersion(version)
+    ?? releaseChannelFromNamespace(namespace, defaultNamespace);
+}
+
 export function isReleaseChannelNamespace(namespace: string, channel: ReleaseChannel): boolean {
   return new RegExp(`^release-${channel}(?:$|[-_.])`, "i").test(namespace);
 }

packages/release/tests/index.test.ts

@@ -6,6 +6,7 @@ import {
   parseReleaseBaseVersion,
   parseReleaseVersion,
   releaseChannelDescriptor,
+  releaseChannelFromIdentity,
   releaseChannelFromNamespace,
   releaseChannelFromVersion,
   releaseInstallIdentity,
@@ -85,6 +86,13 @@ describe("@open-design/release", () => {
     expect(releaseChannelFromNamespace("release-local")).toBeNull();
   });
 
+  it("resolves one channel identity from version then namespace", () => {
+    expect(releaseChannelFromIdentity("1.2.3-beta.1", "release-preview", "default")).toBe("beta");
+    expect(releaseChannelFromIdentity("1.2.3", "default", "default")).toBe("stable");
+    expect(releaseChannelFromIdentity(null, "release-beta-linux", "default")).toBe("beta");
+    expect(releaseChannelFromIdentity(null, "local-smoke", "default")).toBeNull();
+  });
+
   it("derives Windows release identity from the same namespace token", () => {
     expect(resolveWindowsReleaseNamespaceToken("release beta/win x64")).toBe(
       "release-beta-win-x64",

packages/sidecar/src/control/controller.ts

@@ -229,7 +229,7 @@ function createClient<TMethods>(descriptor: PrivateLaunchMetadata): SidecarContr
         : options.timeoutMs;
       return (await invoke({ kind: "call", input, method }, timeoutMs)) as never;
     },
-    environment(extraEnv = {}) {
+    environment(extraEnv) {
       return createPrivateLaunchEnv(descriptor, extraEnv);
     },
     identity: descriptor.identity,

packages/sidecar/src/control/private-protocol.ts

@@ -1,5 +1,4 @@
 import { createHash, randomUUID } from "node:crypto";
-import { tmpdir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
 
 import { SidecarControlError, type SidecarControlErrorCode } from "./error.js";
@@ -13,6 +12,8 @@ import type {
 
 const CONTROL_SCHEMA_VERSION = 1 as const;
 const CONTROL_BOOTSTRAP_ENV = "OD_SIDECAR_CONTROL_BOOTSTRAP_V1";
+// Launch environments may be exact allowlists, so endpoint identity cannot depend on TMPDIR.
+const POSIX_CONTROL_ROOT = "/tmp";
 const CONTROL_TOKEN = /^[A-Za-z0-9](?:[A-Za-z0-9._-]{0,62}[A-Za-z0-9])?$/;
 const CONTROL_NAMESPACE = /^[A-Za-z0-9](?:[A-Za-z0-9._-]{0,126}[A-Za-z0-9])?$/;
 
@@ -214,7 +215,7 @@ export function privateControlPaths(
     endpointPath:
       process.platform === "win32"
         ? `\\\\.\\pipe\\open-design-sidecar-${key}`
-        : join(tmpdir(), `od-sidecar-${key}.sock`),
+        : join(POSIX_CONTROL_ROOT, `od-sidecar-${key}.sock`),
   };
 }
 
@@ -303,11 +304,10 @@ export function installPrivateLaunchMetadata(
 
 export function createPrivateLaunchEnv(
   metadata: PrivateLaunchMetadata,
-  extraEnv: NodeJS.ProcessEnv = {},
+  extraEnv?: NodeJS.ProcessEnv,
 ): NodeJS.ProcessEnv {
   return {
-    ...process.env,
-    ...extraEnv,
+    ...(extraEnv ?? process.env),
     [CONTROL_BOOTSTRAP_ENV]: encodePrivateLaunchMetadata(metadata),
   };
 }