Merge branch 'main' into perf/lazy-orchestration-startup

Author: justsomelegs

apps/desktop/src/main.ts

@@ -75,6 +75,7 @@ import {
 } from "./updateMachine.ts";
 import { isArm64HostRunningIntelBuild, resolveDesktopRuntimeInfo } from "./runtimeArch.ts";
 import { resolveDesktopAppBranding } from "./appBranding.ts";
+import { bindFirstRevealTrigger, type RevealSubscription } from "./windowReveal.ts";
 
 syncShellEnvironment();
 
@@ -1998,16 +1999,17 @@ function createWindow(): BrowserWindow {
     emitUpdateState();
   });
 
-  let initialRevealScheduled = false;
-  const revealInitialWindow = () => {
-    if (initialRevealScheduled) {
-      return;
-    }
-    initialRevealScheduled = true;
-    revealWindow(window);
-  };
-
-  window.once("ready-to-show", revealInitialWindow);
+  // On Linux/Wayland with `show: false`, Electron's `ready-to-show` only
+  // fires after `show()` is called, deadlocking the standard "wait for
+  // ready, then show" pattern. Add `did-finish-load` as a Linux-only
+  // fallback so the window still surfaces once the renderer has loaded
+  // the page. Other platforms keep the no-flash `ready-to-show` path,
+  // since `did-finish-load` typically fires before the first paint there.
+  const revealSubscribers: RevealSubscription[] = [(fire) => window.once("ready-to-show", fire)];
+  if (process.platform === "linux") {
+    revealSubscribers.push((fire) => window.webContents.once("did-finish-load", fire));
+  }
+  bindFirstRevealTrigger(revealSubscribers, () => revealWindow(window));
 
   if (isDevelopment) {
     void window.loadURL(resolveDesktopDevServerUrl());

apps/desktop/src/windowReveal.test.ts

@@ -0,0 +1,74 @@
+import { EventEmitter } from "node:events";
+
+import { describe, expect, it, vi } from "vitest";
+
+import { bindFirstRevealTrigger } from "./windowReveal.ts";
+
+describe("bindFirstRevealTrigger", () => {
+  it("reveals when the first trigger fires", () => {
+    const window = new EventEmitter();
+    const webContents = new EventEmitter();
+    const reveal = vi.fn();
+
+    bindFirstRevealTrigger(
+      [
+        (fire) => window.once("ready-to-show", fire),
+        (fire) => webContents.once("did-finish-load", fire),
+      ],
+      reveal,
+    );
+
+    window.emit("ready-to-show");
+
+    expect(reveal).toHaveBeenCalledTimes(1);
+  });
+
+  it("reveals when only the fallback trigger fires (Wayland deadlock case)", () => {
+    const window = new EventEmitter();
+    const webContents = new EventEmitter();
+    const reveal = vi.fn();
+
+    bindFirstRevealTrigger(
+      [
+        (fire) => window.once("ready-to-show", fire),
+        (fire) => webContents.once("did-finish-load", fire),
+      ],
+      reveal,
+    );
+
+    webContents.emit("did-finish-load");
+
+    expect(reveal).toHaveBeenCalledTimes(1);
+  });
+
+  it("only reveals once when multiple triggers fire", () => {
+    const window = new EventEmitter();
+    const webContents = new EventEmitter();
+    const reveal = vi.fn();
+
+    bindFirstRevealTrigger(
+      [
+        (fire) => window.once("ready-to-show", fire),
+        (fire) => webContents.once("did-finish-load", fire),
+      ],
+      reveal,
+    );
+
+    webContents.emit("did-finish-load");
+    window.emit("ready-to-show");
+
+    expect(reveal).toHaveBeenCalledTimes(1);
+  });
+
+  it("subscribers using `once` ignore re-emitted events after reveal", () => {
+    const window = new EventEmitter();
+    const reveal = vi.fn();
+
+    bindFirstRevealTrigger([(fire) => window.once("ready-to-show", fire)], reveal);
+
+    window.emit("ready-to-show");
+    window.emit("ready-to-show");
+
+    expect(reveal).toHaveBeenCalledTimes(1);
+  });
+});

apps/desktop/src/windowReveal.ts

@@ -0,0 +1,28 @@
+export type RevealSubscription = (listener: () => void) => void;
+
+/**
+ * Wire a reveal callback to fire exactly once, on whichever of the provided
+ * event subscribers fires first. Each subscriber is responsible for binding
+ * its own event source.
+ *
+ * Used by the desktop main window's first-paint reveal logic. The standard
+ * Electron pattern is to wait for `ready-to-show` before calling `show()`,
+ * but on Linux/Wayland with `show: false`, `ready-to-show` only fires after
+ * `show()` is called, deadlocking that pattern. Subscribing to both
+ * `ready-to-show` and `did-finish-load` (or any other "renderer is alive"
+ * signal) lets the window surface reliably across platforms.
+ */
+export function bindFirstRevealTrigger(
+  subscribers: readonly RevealSubscription[],
+  reveal: () => void,
+): void {
+  let revealed = false;
+  const fire = () => {
+    if (revealed) return;
+    revealed = true;
+    reveal();
+  };
+  for (const subscribe of subscribers) {
+    subscribe(fire);
+  }
+}

apps/server/src/provider/Layers/ClaudeProvider.ts

@@ -19,6 +19,7 @@ import {
 
 import {
   buildServerProvider,
+  AUTH_PROBE_TIMEOUT_MS,
   DEFAULT_TIMEOUT_MS,
   detailFromResult,
   extractAuthBoolean,
@@ -674,7 +675,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
   // ── Auth check + subscription detection ────────────────────────────
 
   const authProbe = yield* runClaudeCommand(["auth", "status"]).pipe(
-    Effect.timeoutOption(DEFAULT_TIMEOUT_MS),
+    Effect.timeoutOption(AUTH_PROBE_TIMEOUT_MS),
     Effect.result,
   );
 

apps/server/src/provider/Layers/CodexProvider.ts

@@ -62,7 +62,9 @@ function codexAccountAuthLabel(account: CodexSchema.V2GetAccountResponse["accoun
     case "plus":
       return "ChatGPT Plus Subscription";
     case "pro":
-      return "ChatGPT Pro Subscription";
+      return "ChatGPT Pro 20x Subscription";
+    case "prolite":
+      return "ChatGPT Pro 5x Subscription";
     case "team":
       return "ChatGPT Team Subscription";
     case "self_serve_business_usage_based":

apps/server/src/provider/Layers/CodexSessionRuntime.ts

@@ -468,6 +468,7 @@ function readNotificationThreadId(notification: CodexServerNotification): string
     case "item/commandExecution/outputDelta":
     case "item/commandExecution/terminalInteraction":
     case "item/fileChange/outputDelta":
+    case "item/fileChange/patchUpdated":
     case "serverRequest/resolved":
     case "item/mcpToolCall/progress":
     case "item/reasoning/summaryTextDelta":
@@ -476,7 +477,8 @@ function readNotificationThreadId(notification: CodexServerNotification): string
     case "thread/compacted":
     case "thread/realtime/started":
     case "thread/realtime/itemAdded":
-    case "thread/realtime/transcriptUpdated":
+    case "thread/realtime/transcript/delta":
+    case "thread/realtime/transcript/done":
     case "thread/realtime/outputAudio/delta":
     case "thread/realtime/sdp":
     case "thread/realtime/error":
@@ -530,6 +532,7 @@ function readRouteFields(notification: CodexServerNotification): {
     case "item/commandExecution/outputDelta":
     case "item/commandExecution/terminalInteraction":
     case "item/fileChange/outputDelta":
+    case "item/fileChange/patchUpdated":
     case "item/reasoning/summaryTextDelta":
     case "item/reasoning/summaryPartAdded":
     case "item/reasoning/textDelta":

apps/server/src/provider/Layers/OpenCodeProvider.test.ts

@@ -16,9 +16,12 @@ import {
 import { OpenCodeProviderLive } from "./OpenCodeProvider.ts";
 import type { OpenCodeInventory } from "../opencodeRuntime.ts";
 
+const DEFAULT_VERSION_STDOUT = "opencode 1.14.19\n";
+
 const runtimeMock = {
   state: {
     runVersionError: null as Error | null,
+    versionStdout: DEFAULT_VERSION_STDOUT,
     inventoryError: null as Error | null,
     inventory: {
       providerList: { connected: [] as string[], all: [] as unknown[], default: {} },
@@ -27,6 +30,7 @@ const runtimeMock = {
   },
   reset() {
     this.state.runVersionError = null;
+    this.state.versionStdout = DEFAULT_VERSION_STDOUT;
     this.state.inventoryError = null;
     this.state.inventory = {
       providerList: { connected: [], all: [] as unknown[], default: {} },
@@ -56,7 +60,7 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
             cause: runtimeMock.state.runVersionError,
           }),
         )
-      : Effect.succeed({ stdout: "opencode 1.0.0\n", stderr: "", code: 0 }),
+      : Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
   createOpenCodeSdkClient: () =>
     ({}) as unknown as ReturnType<OpenCodeRuntimeShape["createOpenCodeSdkClient"]>,
   loadOpenCodeInventory: () =>
@@ -108,6 +112,33 @@ it.layer(makeTestLayer())("OpenCodeProviderLive", (it) => {
     }),
   );
 
+  it.effect("refuses to probe when opencode is older than the required minimum", () =>
+    Effect.gen(function* () {
+      runtimeMock.state.versionStdout = "opencode 1.4.7\n";
+      const provider = yield* OpenCodeProvider;
+      const snapshot = yield* provider.refresh;
+
+      assert.equal(snapshot.status, "error");
+      assert.equal(snapshot.installed, true);
+      assert.equal(snapshot.version, "1.4.7");
+      assert.ok(snapshot.message?.includes("1.14.19"));
+      assert.ok(snapshot.message?.toLowerCase().includes("upgrade"));
+    }),
+  );
+
+  it.effect("refuses to probe when opencode --version output is unparseable", () =>
+    Effect.gen(function* () {
+      runtimeMock.state.versionStdout = "garbled binary output\n";
+      const provider = yield* OpenCodeProvider;
+      const snapshot = yield* provider.refresh;
+
+      assert.equal(snapshot.status, "error");
+      assert.equal(snapshot.installed, true);
+      assert.equal(snapshot.version, null);
+      assert.ok(snapshot.message?.includes("1.14.19"));
+    }),
+  );
+
   it.effect("emits OpenCode variant defaults so trait picker can resolve a visible selection", () =>
     Effect.gen(function* () {
       runtimeMock.state.inventory = {

apps/server/src/provider/Layers/OpenCodeProvider.ts

@@ -15,6 +15,7 @@ import {
   parseGenericCliVersion,
   providerModelsFromSettings,
 } from "../providerSnapshot.ts";
+import { compareCliVersions } from "../cliVersion.ts";
 import { OpenCodeProvider } from "../Services/OpenCodeProvider.ts";
 import {
   OpenCodeRuntime,
@@ -24,6 +25,7 @@ import {
 import type { Agent, ProviderListResponse } from "@opencode-ai/sdk/v2";
 
 const PROVIDER = "opencode" as const;
+const MINIMUM_OPENCODE_VERSION = "1.14.19";
 
 class OpenCodeProbeError extends Data.TaggedError("OpenCodeProbeError")<{
   readonly cause: unknown;
@@ -354,6 +356,35 @@ export const OpenCodeProviderLive = Layer.effect(
           return fallback(Cause.squash(versionExit.cause));
         }
         version = parseGenericCliVersion(versionExit.value.stdout) ?? null;
+
+        if (!version) {
+          return fallback(
+            new Error(
+              `Unable to determine OpenCode version from \`opencode --version\` output. T3 Code requires OpenCode v${MINIMUM_OPENCODE_VERSION} or newer.`,
+            ),
+            null,
+          );
+        }
+        if (compareCliVersions(version, MINIMUM_OPENCODE_VERSION) < 0) {
+          return buildServerProvider({
+            provider: PROVIDER,
+            enabled: input.settings.enabled,
+            checkedAt,
+            models: providerModelsFromSettings(
+              [],
+              PROVIDER,
+              customModels,
+              DEFAULT_OPENCODE_MODEL_CAPABILITIES,
+            ),
+            probe: {
+              installed: true,
+              version,
+              status: "error",
+              auth: { status: "unknown" },
+              message: `OpenCode v${version} is too old. Upgrade to v${MINIMUM_OPENCODE_VERSION} or newer.`,
+            },
+          });
+        }
       }
 
       const inventoryExit = yield* Effect.exit(

apps/server/src/provider/Layers/ProviderRegistry.test.ts

@@ -179,7 +179,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest()))(
           assert.strictEqual(status.version, "1.0.0");
           assert.strictEqual(status.auth.status, "authenticated");
           assert.strictEqual(status.auth.type, "chatgpt");
-          assert.strictEqual(status.auth.label, "ChatGPT Pro Subscription");
+          assert.strictEqual(status.auth.label, "ChatGPT Pro 20x Subscription");
           assert.deepStrictEqual(status.models, [
             {
               slug: "gpt-live-codex",

apps/server/src/provider/providerSnapshot.ts

@@ -13,6 +13,8 @@ import { normalizeModelSlug } from "@t3tools/shared/model";
 import { isWindowsCommandNotFound } from "../processRunner.ts";
 
 export const DEFAULT_TIMEOUT_MS = 4_000;
+// Auth status checks involve disk/network lookups and can be slow on first run (especially Windows)
+export const AUTH_PROBE_TIMEOUT_MS = 10_000;
 
 export interface CommandResult {
   readonly stdout: string;