Merge upstream main and preserve Copilot provider support

.github/workflows/ci.yml

@@ -71,8 +71,8 @@ jobs:
 
       - name: Verify preload bundle output
         run: |
-          test -f apps/desktop/dist-electron/preload.js
-          grep -nE "desktopBridge|getLocalEnvironmentBootstrap|PICK_FOLDER_CHANNEL|wsUrl" apps/desktop/dist-electron/preload.js
+          test -f apps/desktop/dist-electron/preload.cjs
+          grep -nE "desktopBridge|getLocalEnvironmentBootstrap|PICK_FOLDER_CHANNEL|wsUrl" apps/desktop/dist-electron/preload.cjs
 
   release_smoke:
     name: Release Smoke

.github/workflows/release.yml

@@ -138,12 +138,12 @@ jobs:
       matrix:
         include:
           - label: macOS arm64
-            runner: macos-14
+            runner: macos-26
             platform: mac
             target: dmg
             arch: arm64
           - label: macOS x64
-            runner: macos-15-intel
+            runner: macos-26-intel
             platform: mac
             target: dmg
             arch: x64
@@ -153,10 +153,15 @@ jobs:
             target: AppImage
             arch: x64
           - label: Windows x64
-            runner: windows-2022
+            runner: windows-2022 # blacksmith-32vcpu-windows-2025
             platform: win
             target: nsis
             arch: x64
+          # - label: Windows arm64
+          #   runner: windows-11-arm
+          #   platform: win
+          #   target: nsis
+          #   arch: arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -269,6 +274,18 @@ jobs:
             done
           fi
 
+          # Enable if Windows arm64 builds are enabled.
+          # Windows updater metadata is channel-specific (for example
+          # "latest.yml" or "nightly.yml"). Suffix each per-arch copy so the
+          # release job can merge matching arm64/x64 manifests back into one
+          # canonical manifest per channel.
+          # if [[ "${{ matrix.platform }}" == "win" ]]; then
+          #   shopt -s nullglob
+          #   for manifest in release-publish/*.yml; do
+          #     mv "$manifest" "${manifest%.yml}-win-${{ matrix.arch }}.yml"
+          #   done
+          # fi
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v7
         with:
@@ -292,6 +309,14 @@ jobs:
         with:
           node-version-file: package.json
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version-file: package.json
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile --ignore-scripts
+
       - name: Download all desktop artifacts
         uses: actions/download-artifact@v8
         with:
@@ -305,11 +330,40 @@ jobs:
           for x64_manifest in release-assets/*-mac-x64.yml; do
             arm64_manifest="${x64_manifest%-x64.yml}.yml"
             if [[ -f "$arm64_manifest" ]]; then
-              node scripts/merge-mac-update-manifests.ts "$arm64_manifest" "$x64_manifest"
+              node scripts/merge-update-manifests.ts --platform mac "$arm64_manifest" "$x64_manifest"
               rm -f "$x64_manifest"
             fi
           done
 
+      # - name: Merge Windows updater manifests
+      #   run: |
+      #     shopt -s nullglob
+      #     found_windows_manifest=false
+      #     for x64_manifest in release-assets/*-win-x64.yml; do
+      #       if [[ "$(basename "$x64_manifest")" == builder-debug-* ]]; then
+      #         continue
+      #       fi
+
+      #       arm64_manifest="${x64_manifest/-x64.yml/-arm64.yml}"
+      #       output_manifest="${x64_manifest/-win-x64.yml/.yml}"
+      #       if [[ ! -f "$arm64_manifest" ]]; then
+      #         echo "Missing matching arm64 Windows manifest for $x64_manifest" >&2
+      #         exit 1
+      #       fi
+
+      #       found_windows_manifest=true
+      #       node scripts/merge-update-manifests.ts --platform win \
+      #         "$arm64_manifest" \
+      #         "$x64_manifest" \
+      #         "$output_manifest"
+      #       rm -f "$arm64_manifest" "$x64_manifest"
+      #     done
+
+      #     if [[ "$found_windows_manifest" != true ]]; then
+      #       echo "No Windows updater manifests found to merge." >&2
+      #       exit 1
+      #     fi
+
       - name: Publish release
         if: needs.preflight.outputs.previous_tag != ''
         uses: softprops/action-gh-release@v2
@@ -392,6 +446,9 @@ jobs:
         with:
           node-version-file: package.json
 
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
       - id: update_versions
         name: Update version strings
         env:

.gitignore

@@ -22,4 +22,3 @@ apps/web/src/components/__screenshots__
 __screenshots__/
 .tanstack
 squashfs-root/
-core.*

apps/desktop/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@t3tools/desktop",
-  "version": "0.0.17",
+  "version": "0.0.20",
   "private": true,
-  "main": "dist-electron/main.js",
+  "type": "module",
+  "main": "dist-electron/main.cjs",
   "scripts": {
     "dev": "bun run --parallel dev:bundle dev:electron",
     "dev:bundle": "tsdown --watch",
-    "dev:electron": "bun run scripts/dev-electron.mjs",
+    "dev:electron": "node scripts/dev-electron.mjs",
     "build": "tsdown",
-    "start": "bun run scripts/start-electron.mjs",
+    "start": "node scripts/start-electron.mjs",
     "typecheck": "tsc --noEmit",
     "test": "vitest run --passWithNoTests",
     "smoke-test": "node scripts/smoke-test.mjs"

apps/desktop/scripts/dev-electron.mjs

@@ -17,12 +17,12 @@ if (!Number.isInteger(port) || port <= 0) {
 }
 
 const requiredFiles = [
-  "dist-electron/main.js",
-  "dist-electron/preload.js",
+  "dist-electron/main.cjs",
+  "dist-electron/preload.cjs",
   "../server/dist/bin.mjs",
 ];
 const watchedDirectories = [
-  { directory: "dist-electron", files: new Set(["main.js", "preload.js"]) },
+  { directory: "dist-electron", files: new Set(["main.cjs", "preload.cjs"]) },
   { directory: "../server/dist", files: new Set(["bin.mjs"]) },
 ];
 const forcedShutdownTimeoutMs = 1_500;
@@ -69,7 +69,7 @@ function startApp() {
 
   const app = spawn(
     resolveElectronPath(),
-    [`--t3code-dev-root=${desktopDir}`, "dist-electron/main.js"],
+    [`--t3code-dev-root=${desktopDir}`, "dist-electron/main.cjs"],
     {
       cwd: desktopDir,
       env: childEnv,

apps/desktop/scripts/electron-launcher.mjs

@@ -8,7 +8,6 @@ import {
   mkdirSync,
   mkdtempSync,
   readFileSync,
-  readdirSync,
   rmSync,
   statSync,
   writeFileSync,
@@ -20,7 +19,7 @@ import { fileURLToPath } from "node:url";
 const isDevelopment = Boolean(process.env.VITE_DEV_SERVER_URL);
 const APP_DISPLAY_NAME = isDevelopment ? "T3 Code (Dev)" : "T3 Code (Alpha)";
 const APP_BUNDLE_ID = isDevelopment ? "com.t3tools.t3code.dev" : "com.t3tools.t3code";
-const LAUNCHER_VERSION = 1;
+const LAUNCHER_VERSION = 2;
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export const desktopDir = resolve(__dirname, "..");
@@ -121,40 +120,6 @@ function patchMainBundleInfoPlist(appBundlePath, iconPath) {
   copyFileSync(iconPath, join(resourcesDir, "electron.icns"));
 }
 
-function patchHelperBundleInfoPlists(appBundlePath) {
-  const frameworksDir = join(appBundlePath, "Contents", "Frameworks");
-  if (!existsSync(frameworksDir)) {
-    return;
-  }
-
-  for (const entry of readdirSync(frameworksDir, { withFileTypes: true })) {
-    if (!entry.isDirectory() || !entry.name.endsWith(".app")) {
-      continue;
-    }
-    if (!entry.name.startsWith("Electron Helper")) {
-      continue;
-    }
-
-    const helperPlistPath = join(frameworksDir, entry.name, "Contents", "Info.plist");
-    if (!existsSync(helperPlistPath)) {
-      continue;
-    }
-
-    const suffix = entry.name.replace("Electron Helper", "").replace(".app", "").trim();
-    const helperName = suffix
-      ? `${APP_DISPLAY_NAME} Helper ${suffix}`
-      : `${APP_DISPLAY_NAME} Helper`;
-    const helperIdSuffix = suffix.replace(/[()]/g, "").trim().toLowerCase().replace(/\s+/g, "-");
-    const helperBundleId = helperIdSuffix
-      ? `${APP_BUNDLE_ID}.helper.${helperIdSuffix}`
-      : `${APP_BUNDLE_ID}.helper`;
-
-    setPlistString(helperPlistPath, "CFBundleDisplayName", helperName);
-    setPlistString(helperPlistPath, "CFBundleName", helperName);
-    setPlistString(helperPlistPath, "CFBundleIdentifier", helperBundleId);
-  }
-}
-
 function readJson(path) {
   try {
     return JSON.parse(readFileSync(path, "utf8"));
@@ -192,7 +157,6 @@ function buildMacLauncher(electronBinaryPath) {
   rmSync(targetAppBundlePath, { recursive: true, force: true });
   cpSync(sourceAppBundlePath, targetAppBundlePath, { recursive: true });
   patchMainBundleInfoPlist(targetAppBundlePath, iconPath);
-  patchHelperBundleInfoPlists(targetAppBundlePath);
   writeFileSync(metadataPath, `${JSON.stringify(expectedMetadata, null, 2)}\n`);
 
   return targetBinaryPath;
@@ -206,5 +170,11 @@ export function resolveElectronPath() {
     return electronBinaryPath;
   }
 
+  // Dev launches do not need a renamed app bundle badly enough to risk breaking
+  // Electron helper resource lookup on macOS.
+  if (isDevelopment) {
+    return electronBinaryPath;
+  }
+
   return buildMacLauncher(electronBinaryPath);
 }

apps/desktop/scripts/smoke-test.mjs

@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const desktopDir = resolve(__dirname, "..");
 const electronBin = resolve(desktopDir, "node_modules/.bin/electron");
-const mainJs = resolve(desktopDir, "dist-electron/main.js");
+const mainJs = resolve(desktopDir, "dist-electron/main.cjs");
 
 console.log("\nLaunching Electron smoke test...");
 

apps/desktop/scripts/start-electron.mjs

@@ -5,7 +5,7 @@ import { desktopDir, resolveElectronPath } from "./electron-launcher.mjs";
 const childEnv = { ...process.env };
 delete childEnv.ELECTRON_RUN_AS_NODE;
 
-const child = spawn(resolveElectronPath(), ["dist-electron/main.js"], {
+const child = spawn(resolveElectronPath(), ["dist-electron/main.cjs"], {
   stdio: "inherit",
   cwd: desktopDir,
   env: childEnv,

apps/desktop/src/appBranding.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { resolveDesktopAppBranding, resolveDesktopAppStageLabel } from "./appBranding";
+import { resolveDesktopAppBranding, resolveDesktopAppStageLabel } from "./appBranding.ts";
 
 describe("resolveDesktopAppStageLabel", () => {
   it("uses Dev in desktop development", () => {

apps/desktop/src/appBranding.ts

@@ -1,7 +1,8 @@
 import type { DesktopAppBranding, DesktopAppStageLabel } from "@t3tools/contracts";
 
+import { isNightlyDesktopVersion } from "./updateChannels.ts";
+
 const APP_BASE_NAME = "T3 Code";
-const NIGHTLY_VERSION_PATTERN = /-nightly\.\d{8}\.\d+$/;
 
 export function resolveDesktopAppStageLabel(input: {
   readonly isDevelopment: boolean;
@@ -11,7 +12,7 @@ export function resolveDesktopAppStageLabel(input: {
     return "Dev";
   }
 
-  return NIGHTLY_VERSION_PATTERN.test(input.appVersion) ? "Nightly" : "Alpha";
+  return isNightlyDesktopVersion(input.appVersion) ? "Nightly" : "Alpha";
 }
 
 export function resolveDesktopAppBranding(input: {

apps/desktop/src/backendPort.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 
-import { resolveDesktopBackendPort } from "./backendPort";
+import { resolveDesktopBackendPort } from "./backendPort.ts";
 
 describe("resolveDesktopBackendPort", () => {
   it("returns the starting port when it is available", async () => {

apps/desktop/src/backendReadiness.test.ts

@@ -4,7 +4,7 @@ import {
   BackendReadinessAbortedError,
   isBackendReadinessAborted,
   waitForHttpReady,
-} from "./backendReadiness";
+} from "./backendReadiness.ts";
 
 describe("waitForHttpReady", () => {
   it("returns once the backend serves the requested readiness path", async () => {

apps/desktop/src/clientPersistence.test.ts

@@ -18,7 +18,7 @@ import {
   writeSavedEnvironmentRegistry,
   writeSavedEnvironmentSecret,
   type DesktopSecretStorage,
-} from "./clientPersistence";
+} from "./clientPersistence.ts";
 
 const tempDirectories: string[] = [];
 
@@ -52,6 +52,10 @@ const clientSettings: ClientSettings = {
   confirmThreadArchive: true,
   confirmThreadDelete: false,
   diffWordWrap: true,
+  sidebarProjectGroupingMode: "repository_path",
+  sidebarProjectGroupingOverrides: {
+    "environment-1:/tmp/project-a": "separate",
+  },
   sidebarProjectSortOrder: "manual",
   sidebarThreadSortOrder: "created_at",
   timestampFormat: "24-hour",
@@ -75,24 +79,6 @@ describe("clientPersistence", () => {
     expect(readClientSettings(settingsPath)).toEqual(clientSettings);
   });
 
-  it("migrates partial persisted client settings with schema defaults", () => {
-    const settingsPath = makeTempPath("client-settings.json");
-    fs.writeFileSync(
-      settingsPath,
-      `${JSON.stringify({ settings: { confirmThreadArchive: true, timestampFormat: "24-hour" } })}\n`,
-      "utf8",
-    );
-
-    expect(readClientSettings(settingsPath)).toEqual({
-      confirmThreadArchive: true,
-      confirmThreadDelete: true,
-      diffWordWrap: false,
-      sidebarProjectSortOrder: "updated_at",
-      sidebarThreadSortOrder: "updated_at",
-      timestampFormat: "24-hour",
-    });
-  });
-
   it("persists and reloads saved environment metadata", () => {
     const registryPath = makeTempPath("saved-environments.json");
 

apps/desktop/src/clientPersistence.ts

@@ -6,8 +6,8 @@ import {
   type ClientSettings,
   type PersistedSavedEnvironmentRecord,
 } from "@t3tools/contracts";
-import * as Schema from "effect/Schema";
 import { Predicate } from "effect";
+import * as Schema from "effect/Schema";
 
 interface ClientSettingsDocument {
   readonly settings: ClientSettings;
@@ -88,12 +88,12 @@ function toPersistedSavedEnvironmentRecord(
 }
 
 export function readClientSettings(settingsPath: string): ClientSettings | null {
-  const settings = readJsonFile<ClientSettingsDocument>(settingsPath)?.settings;
-  if (!settings) {
+  const raw = readJsonFile<ClientSettingsDocument>(settingsPath)?.settings;
+  if (!raw) {
     return null;
   }
   try {
-    return Schema.decodeSync(ClientSettingsSchema)(settings);
+    return Schema.decodeUnknownSync(ClientSettingsSchema)(raw);
   } catch {
     return null;
   }

apps/desktop/src/confirmDialog.test.ts

@@ -11,7 +11,7 @@ vi.mock("electron", () => ({
   },
 }));
 
-import { showDesktopConfirmDialog } from "./confirmDialog";
+import { showDesktopConfirmDialog } from "./confirmDialog.ts";
 
 describe("showDesktopConfirmDialog", () => {
   beforeEach(() => {