chore(coil): merge upstream/main 25bf84ab07 (66 commits)

.github/actions/setup-ci-deps/action.yml

@@ -13,6 +13,10 @@ inputs:
     description: Arguments for `vp install`, such as filters. Empty installs the whole workspace.
     required: false
     default: ""
+  save-pnpm-store:
+    description: Set to "false" when a concurrent job with the same install args saves the pnpm store
+    required: false
+    default: "true"
 runs:
   using: composite
   steps:
@@ -125,9 +129,11 @@ runs:
     # A filtered install that started from the current full store adds nothing
     # worth a second copy of it. A stacked PR, based on a branch other than the
     # default, saves a ~1 GB store only its own reruns can read, so it only restores.
+    # Concurrent jobs with the same install args reserve one key, so the losers
+    # compress the store for nothing; all but one pass save-pnpm-store: false.
     - name: Save pnpm store
       if: >-
-        inputs.install == 'true' &&
+        inputs.install == 'true' && inputs.save-pnpm-store == 'true' &&
         (github.event_name != 'pull_request' || github.base_ref == github.event.repository.default_branch) &&
         steps.pnpm_cache.outputs.cache-hit != 'true' &&
         (steps.pnpm_store.outputs.namespace == 'full' ||

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -42,6 +42,7 @@ const layerElectronApp = (calls: ElectronAppCalls) =>
     metadata: Effect.die("unexpected metadata read"),
     name: Effect.succeed("T3 Code"),
     systemLocale: Effect.succeed("en-US"),
+    preferredSystemLanguages: Effect.succeed(["en-US"]),
     whenReady: Effect.void,
     requestSingleInstanceLock: Effect.succeed(true),
     quit: Effect.void,

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -39,6 +39,7 @@ function layerElectronApp(
     metadata: Effect.die("unexpected metadata read"),
     name: Effect.succeed("T3 Code"),
     systemLocale: Effect.succeed("en-US"),
+    preferredSystemLanguages: Effect.succeed(["en-US"]),
     whenReady: Effect.void,
     requestSingleInstanceLock: Effect.succeed(true),
     quit,

apps/desktop/src/electron/ElectronApp.ts

@@ -46,6 +46,7 @@ export class ElectronApp extends Context.Service<
     readonly name: Effect.Effect<string>;
     /** Packaged builds ship only en-US; app.getLocale() and Intl defaults do not reflect the OS locale. */
     readonly systemLocale: Effect.Effect<string>;
+    readonly preferredSystemLanguages: Effect.Effect<ReadonlyArray<string>>;
     readonly whenReady: Effect.Effect<void, ElectronAppWhenReadyError>;
     readonly requestSingleInstanceLock: Effect.Effect<boolean>;
     readonly quit: Effect.Effect<void>;
@@ -155,6 +156,7 @@ export const make = ElectronApp.of({
     }
     return toSystemLocaleTag(identifier, hourCycle);
   }),
+  preferredSystemLanguages: Effect.sync(() => Electron.app.getPreferredSystemLanguages()),
   whenReady: Effect.gen(function* () {
     const isPackaged = Electron.app.isPackaged;
     yield* Effect.tryPromise({

apps/desktop/src/ipc/DesktopIpcHandlers.ts

@@ -6,6 +6,7 @@ import { installNotificationBadge } from "./methods/notificationBadge.ts";
 import { getClientSettings, setClientSettings } from "./methods/clientSettings.ts";
 import { getConnectionCatalog, setConnectionCatalog } from "./methods/connectionCatalog.ts";
 import {
+  getHostEnvironmentId,
   getLocalEnvironmentEnabled,
   setLocalEnvironmentEnabled,
 } from "./methods/localEnvironment.ts";
@@ -40,6 +41,7 @@ import {
   getLocalEnvironmentBearerToken,
   installRelayTelemetryEnabled,
   getSystemLocale,
+  getPreferredSystemLanguages,
   getWindowFullscreenState,
   openExternal,
   readMedia,
@@ -96,10 +98,12 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
   yield* ipc.handleSync(getAppBranding);
   yield* installRelayTelemetryEnabled();
   yield* ipc.handleSync(getSystemLocale);
+  yield* ipc.handleSync(getPreferredSystemLanguages);
   yield* ipc.handleSync(getWindowFullscreenState);
   yield* ipc.handleSync(getLocalEnvironmentBootstraps);
   yield* ipc.handleSync(getLocalEnvironmentEnabled);
   yield* ipc.handle(setLocalEnvironmentEnabled);
+  yield* ipc.handle(getHostEnvironmentId);
   yield* ipc.handle(getLocalEnvironmentBearerToken);
 
   yield* ipc.handle(getClientSettings);

apps/desktop/src/ipc/channels.ts

@@ -34,9 +34,11 @@ export const CLI_COMMAND_UNINSTALL_CHANNEL = "desktop:cli-command-uninstall";
 export const GET_APP_BRANDING_CHANNEL = "desktop:get-app-branding";
 export const GET_RELAY_TELEMETRY_ENABLED_CHANNEL = "desktop:get-relay-telemetry-enabled";
 export const GET_SYSTEM_LOCALE_CHANNEL = "desktop:get-system-locale";
+export const GET_PREFERRED_SYSTEM_LANGUAGES_CHANNEL = "desktop:get-preferred-system-languages";
 export const GET_LOCAL_ENVIRONMENT_BOOTSTRAPS_CHANNEL = "desktop:get-local-environment-bootstraps";
 export const GET_LOCAL_ENVIRONMENT_ENABLED_CHANNEL = "desktop:get-local-environment-enabled";
 export const SET_LOCAL_ENVIRONMENT_ENABLED_CHANNEL = "desktop:set-local-environment-enabled";
+export const GET_HOST_ENVIRONMENT_ID_CHANNEL = "desktop:get-host-environment-id";
 export const GET_LOCAL_ENVIRONMENT_BEARER_TOKEN_CHANNEL =
   "desktop:get-local-environment-bearer-token";
 export const GET_CLIENT_SETTINGS_CHANNEL = "desktop:get-client-settings";

apps/desktop/src/ipc/methods/localEnvironment.test.ts

@@ -1,4 +1,7 @@
 import { assert, describe, it } from "@effect/vitest";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 
@@ -10,7 +13,11 @@ import * as ElectronApp from "../../electron/ElectronApp.ts";
 import * as ElectronTheme from "../../electron/ElectronTheme.ts";
 import * as DesktopAppSettings from "../../settings/DesktopAppSettings.ts";
 import * as DesktopWindow from "../../window/DesktopWindow.ts";
-import { getLocalEnvironmentEnabled, setLocalEnvironmentEnabled } from "./localEnvironment.ts";
+import {
+  getHostEnvironmentId,
+  getLocalEnvironmentEnabled,
+  setLocalEnvironmentEnabled,
+} from "./localEnvironment.ts";
 
 const layerUnusedLifecycleRuntime = Layer.mergeAll(
   DesktopShutdown.layer,
@@ -27,6 +34,26 @@ const layerUnusedLifecycleRuntime = Layer.mergeAll(
 );
 
 describe("local environment IPC", () => {
+  it.effect("reads the shared home identity without creating one", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const stateDir = yield* fs.makeTempDirectoryScoped();
+      const environment = DesktopEnvironment.DesktopEnvironment.of({
+        path,
+        stateDir,
+      } as DesktopEnvironment.DesktopEnvironment["Service"]);
+      const read = getHostEnvironmentId
+        .handler(undefined)
+        .pipe(Effect.provideService(DesktopEnvironment.DesktopEnvironment, environment));
+      assert.strictEqual(yield* read, null);
+      assert.isFalse(yield* fs.exists(path.join(stateDir, "environment-id")));
+      yield* fs.writeFileString(path.join(stateDir, "environment-id"), "  service-id\n");
+      assert.strictEqual(yield* read, "service-id");
+      yield* fs.writeFileString(path.join(stateDir, "environment-id"), "\n");
+      assert.strictEqual(yield* read, null);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
   it.effect("relaunches only when the setting changes and keeps other settings", () => {
     const relaunchReasons: Array<string> = [];
     const layer = Layer.mergeAll(

apps/desktop/src/ipc/methods/localEnvironment.ts

@@ -1,6 +1,8 @@
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Schema from "effect/Schema";
 
+import * as DesktopEnvironment from "../../app/DesktopEnvironment.ts";
 import * as DesktopLifecycle from "../../app/DesktopLifecycle.ts";
 import * as DesktopAppSettings from "../../settings/DesktopAppSettings.ts";
 import * as IpcChannels from "../channels.ts";
@@ -28,3 +30,18 @@ export const setLocalEnvironmentEnabled = makeIpcMethod({
     }
   }),
 });
+
+// A background service sharing this app's T3 home records its environment ID in the same state dir.
+export const getHostEnvironmentId = makeIpcMethod({
+  channel: IpcChannels.GET_HOST_ENVIRONMENT_ID_CHANNEL,
+  payload: Schema.Void,
+  result: Schema.NullOr(Schema.String),
+  handler: Effect.fn("desktop.ipc.localEnvironment.getHostEnvironmentId")(function* () {
+    const environment = yield* DesktopEnvironment.DesktopEnvironment;
+    const fileSystem = yield* FileSystem.FileSystem;
+    const contents = yield* fileSystem
+      .readFileString(environment.path.join(environment.stateDir, "environment-id"))
+      .pipe(Effect.orElseSucceed(() => ""));
+    return contents.trim() || null;
+  }),
+});

apps/desktop/src/ipc/methods/window.ts

@@ -106,6 +106,15 @@ export const getSystemLocale = DesktopIpc.makeSyncIpcMethod({
   }),
 });
 
+export const getPreferredSystemLanguages = DesktopIpc.makeSyncIpcMethod({
+  channel: IpcChannels.GET_PREFERRED_SYSTEM_LANGUAGES_CHANNEL,
+  result: Schema.Array(Schema.String),
+  handler: Effect.fn("desktop.ipc.window.getPreferredSystemLanguages")(function* () {
+    const electronApp = yield* ElectronApp.ElectronApp;
+    return yield* electronApp.preferredSystemLanguages;
+  }),
+});
+
 export const getWindowFullscreenState = DesktopIpc.makeSyncIpcMethod({
   channel: IpcChannels.GET_WINDOW_FULLSCREEN_STATE_CHANNEL,
   result: Schema.Boolean,

apps/desktop/src/preload.ts

@@ -107,6 +107,12 @@ contextBridge.exposeInMainWorld("desktopBridge", {
     const result = ipcRenderer.sendSync(IpcChannels.GET_SYSTEM_LOCALE_CHANNEL);
     return typeof result === "string" ? result : null;
   },
+  getPreferredSystemLanguages: () => {
+    const result: unknown = ipcRenderer.sendSync(
+      IpcChannels.GET_PREFERRED_SYSTEM_LANGUAGES_CHANNEL,
+    );
+    return Array.isArray(result) ? result.filter((tag) => typeof tag === "string") : [];
+  },
   getLocalEnvironmentBootstraps: () => {
     const result = ipcRenderer.sendSync(IpcChannels.GET_LOCAL_ENVIRONMENT_BOOTSTRAPS_CHANNEL);
     if (!Array.isArray(result)) {
@@ -120,6 +126,7 @@ contextBridge.exposeInMainWorld("desktopBridge", {
     ipcRenderer.sendSync(IpcChannels.GET_LOCAL_ENVIRONMENT_ENABLED_CHANNEL) !== false,
   setLocalEnvironmentEnabled: (enabled) =>
     ipcRenderer.invoke(IpcChannels.SET_LOCAL_ENVIRONMENT_ENABLED_CHANNEL, enabled),
+  getHostEnvironmentId: () => ipcRenderer.invoke(IpcChannels.GET_HOST_ENVIRONMENT_ID_CHANNEL),
   getClientSettings: () => ipcRenderer.invoke(IpcChannels.GET_CLIENT_SETTINGS_CHANNEL),
   setClientSettings: (settings) =>
     ipcRenderer.invoke(IpcChannels.SET_CLIENT_SETTINGS_CHANNEL, settings),

apps/desktop/src/preview/BrowserSession.test.ts

@@ -16,6 +16,7 @@ const { fromPartition, sessions } = vi.hoisted(() => ({
       readonly setPermissionRequestHandler: ReturnType<typeof vi.fn>;
       readonly setPermissionCheckHandler: ReturnType<typeof vi.fn>;
       readonly setUserAgent: ReturnType<typeof vi.fn>;
+      readonly webRequest: { readonly onBeforeSendHeaders: ReturnType<typeof vi.fn> };
     }
   >(),
 }));
@@ -62,6 +63,7 @@ describe("BrowserSession", () => {
         setPermissionRequestHandler: vi.fn(),
         setPermissionCheckHandler: vi.fn(),
         setUserAgent: vi.fn(),
+        webRequest: { onBeforeSendHeaders: vi.fn() },
       };
       sessions.set(partition, browserSession);
       return browserSession;
@@ -115,10 +117,12 @@ describe("BrowserSession", () => {
     }).pipe(Effect.provide(layer)),
   );
 
-  it.effect("keeps the guest's effective User-Agent equal to Electron's native one", () =>
+  it.effect("keeps the native User-Agent except for the Electron token sent to Teams", () =>
     Effect.gen(function* () {
       const nativeUserAgent =
         "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) T3Code(Alpha)/0.0.33 Chrome/146.0.7680.216 Electron/41.5.0 Safari/537.36";
+      const teamsUserAgent =
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) T3Code(Alpha)/0.0.33 Chrome/146.0.7680.216 Safari/537.36";
       fromPartition.mockReset();
       fromPartition.mockImplementation((partition: string) => {
         let userAgent = nativeUserAgent;
@@ -131,6 +135,7 @@ describe("BrowserSession", () => {
           setUserAgent: vi.fn((next: string) => {
             userAgent = next;
           }),
+          webRequest: { onBeforeSendHeaders: vi.fn() },
         };
         sessions.set(partition, browserSession);
         return browserSession;
@@ -143,6 +148,29 @@ describe("BrowserSession", () => {
       const browserSession = sessions.get(partition);
       assert.isDefined(browserSession);
       assert.strictEqual(browserSession.getUserAgent(), nativeUserAgent);
+
+      // Teams redirects Electron to an error page before sign-in; every other host sees the native one.
+      const calls = browserSession.webRequest.onBeforeSendHeaders.mock.calls;
+      assert.strictEqual(calls.length, 1);
+      const [filter, listener] = calls[0] ?? [];
+      assert.deepStrictEqual(filter, {
+        urls: ["https://teams.cloud.microsoft/*", "https://teams.microsoft.com/*"],
+      });
+      const send = (requestHeaders: Record<string, string>) => {
+        let response: { requestHeaders?: Record<string, string> } | undefined;
+        listener({ requestHeaders }, (next: typeof response) => {
+          response = next;
+        });
+        return response;
+      };
+      for (const key of ["User-Agent", "user-agent"]) {
+        const requestHeaders = { [key]: nativeUserAgent, Accept: "*/*" };
+        assert.deepStrictEqual(send(requestHeaders), {
+          requestHeaders: { [key]: teamsUserAgent, Accept: "*/*" },
+        });
+        assert.strictEqual(requestHeaders[key], nativeUserAgent);
+      }
+      assert.deepStrictEqual(send({ Accept: "*/*" }), {});
     }).pipe(Effect.provide(layer)),
   );
 

apps/desktop/src/preview/BrowserSession.ts

@@ -55,6 +55,9 @@ const externalProtocolPromptUrl = (rawUrl: string | undefined): string | null =>
   }
 };
 
+// Teams sends Electron User-Agents to an error page before sign-in. Electron allows one listener per session.
+const TEAMS_URL_PATTERNS = ["https://teams.cloud.microsoft/*", "https://teams.microsoft.com/*"];
+
 const MAX_PROMPT_URL_LENGTH = 300;
 
 const truncateForPrompt = (text: string): string =>
@@ -342,6 +345,22 @@ export const make = Effect.gen(function* BrowserSessionMake() {
               ? clipboardReadDecisions.get(permissionOrigin(requestingOrigin) ?? "") === true
               : ALLOWED_PREVIEW_PERMISSIONS.has(permission),
           );
+          browserSession.webRequest.onBeforeSendHeaders(
+            { urls: TEAMS_URL_PATTERNS },
+            ({ requestHeaders }, callback) => {
+              const userAgent = Object.entries(requestHeaders).find(
+                ([name]) => name.toLowerCase() === "user-agent",
+              );
+              if (userAgent === undefined) {
+                callback({});
+                return;
+              }
+              const [name, value] = userAgent;
+              callback({
+                requestHeaders: { ...requestHeaders, [name]: value.replace(/ Electron\/\S+/, "") },
+              });
+            },
+          );
           const next = new Map(sessions);
           next.set(partition, browserSession);
           return [browserSession, next] as const;

apps/desktop/src/preview/PickPreload.ts

@@ -633,6 +633,8 @@ function startAnnotation(
     " h-7 w-7 shrink-0 rounded-full border-primary bg-primary p-0 text-primary-foreground hover:bg-primary/90";
   const voiceSkip = createButton("Skip", "Skip transcript cleanup");
   voiceSkip.className += " h-7 shrink-0 rounded-full px-2.5";
+  // createButton's rounded-md sorts after rounded-full in the generated CSS, so it would win.
+  for (const button of [voiceCancel, voiceFinish, voiceSkip]) button.classList.remove("rounded-md");
   const voiceStatus = document.createElement("div");
   voiceStatus.className = "flex h-7 min-w-0 flex-1 items-center gap-2";
   voiceStatus.setAttribute("role", "status");
@@ -744,16 +746,27 @@ function startAnnotation(
     }
     const recording = state.phase === "recording";
     const active = state.phase !== "idle" && state.phase !== "error";
+    const wasActive = voicePill.parentElement === composerRow;
     voiceButton.hidden = !state.available || active;
     voiceButton.disabled = voiceBusy;
     const label = voiceSettings ? "Open voice settings" : "Start voice input";
     voiceButton.title =
       !voiceSettings && state.shortcutLabel ? `${label} (${state.shortcutLabel})` : label;
     voiceButton.setAttribute("aria-label", label);
-    voiceRow.hidden = state.phase === "idle";
+    // An active dictation takes the textarea's place; it takes focus once (sr-only) so Enter still attaches.
+    voiceRow.hidden = state.phase === "idle" || active;
+    comment.classList.toggle("sr-only", active);
+    if (active && !wasActive) comment.focus({ preventScroll: true });
+    submit.hidden = active;
+    // Re-inserting on every level update would blur a focused Finish or Cancel.
+    if (active && voicePill.parentElement !== composerRow) comment.after(voicePill);
+    else if (!active && voicePill.parentElement !== voiceRow) voiceRow.appendChild(voicePill);
     voicePill.className = active
-      ? "flex h-9 w-64 min-w-0 items-center gap-2 rounded-full border border-border bg-background p-1"
+      ? "flex h-8 min-w-0 flex-1 items-center gap-2"
       : "flex min-w-0 items-center gap-1";
+    // A draft that arrived while the textarea was sr-only was measured at 1px wide.
+    if (wasActive && !active) resizeComment();
+    else if (phaseChanged) queueEditorLayout();
     voiceCancel.title =
       state.phase === "error" ? "Dismiss voice input error" : "Cancel voice input";
     voiceCancel.setAttribute("aria-label", voiceCancel.title);

apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts

@@ -37,6 +37,7 @@ function layerElectronApp(
     metadata: Effect.die("unexpected metadata read"),
     name: Effect.succeed("T3 Code"),
     systemLocale: Effect.succeed("en-US"),
+    preferredSystemLanguages: Effect.succeed(["en-US"]),
     whenReady: Effect.void,
     requestSingleInstanceLock: Effect.succeed(true),
     quit: Effect.void,

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -31,6 +31,7 @@ const layerElectronApp = Layer.succeed(ElectronApp.ElectronApp, {
   metadata: Effect.die("unexpected metadata read"),
   name: Effect.succeed("T3 Code"),
   systemLocale: Effect.succeed("en-US"),
+  preferredSystemLanguages: Effect.succeed(["en-US"]),
   whenReady: Effect.void,
   requestSingleInstanceLock: Effect.succeed(true),
   quit: Effect.void,

apps/marketing/src/pages/index.astro

@@ -1191,6 +1191,10 @@ const mobileEndorsementRows = [
   .cta-title {
     font-size: clamp(40px, 6vw, 72px);
   }
+  .open-head h2,
+  .cta-title {
+    text-wrap: balance;
+  }
   .cta-sub {
     color: var(--fg-muted);
     font-size: 18px;

apps/mobile/app.config.ts

@@ -458,6 +458,9 @@ const config: ExpoConfig = {
   ],
   extra: {
     appVariant: APP_VARIANT,
+    secretsFeatureEnabled: ["1", "true"].includes(
+      process.env.T3CODE_FEATURE_SECRETS?.trim().toLowerCase() ?? "",
+    ),
     iosPersonalTeamBuild: isIosPersonalTeamBuild,
     relay: {
       url: repoEnv.T3CODE_RELAY_URL ?? null,