Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
fix(desktop): bump Clerk Electron SDK to 0.0.24 and register t3code:// scheme on Linux (#5015)
Julius Marmingefbecb7365ede
diff --git a/apps/desktop/src/app/DesktopAppIdentity.test.ts b/apps/desktop/src/app/DesktopAppIdentity.test.tsindex 2eb540f05..6c5385e70 100644--- a/apps/desktop/src/app/DesktopAppIdentity.test.ts+++ b/apps/desktop/src/app/DesktopAppIdentity.test.ts@@ -54,7 +54,6 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>calls.setAboutPanelOptions.push(options);}),setAppUserModelId: () => Effect.void,- requestSingleInstanceLock: Effect.succeed(true),getAppMetrics: Effect.succeed([]),isDefaultProtocolClient: () => Effect.succeed(false),setAsDefaultProtocolClient: () => Effect.succeed(true),diff --git a/apps/desktop/src/app/DesktopAppIdentity.ts b/apps/desktop/src/app/DesktopAppIdentity.tsindex 385e69433..0be55d633 100644--- a/apps/desktop/src/app/DesktopAppIdentity.ts+++ b/apps/desktop/src/app/DesktopAppIdentity.ts@@ -45,6 +45,27 @@ const normalizeCommitHash = (value: string): Option.Option<string> => {: Option.none();};+export const resolveUserDataPath = Effect.gen(function* () {+ const environment = yield* DesktopEnvironment.DesktopEnvironment;+ const fileSystem = yield* FileSystem.FileSystem;+ const legacyPath = environment.path.join(+ environment.appDataDirectory,+ environment.legacyUserDataDirName,+ );+ const legacyPathExists = yield* fileSystem.exists(legacyPath).pipe(+ Effect.mapError(+ (cause) =>+ new DesktopUserDataPathResolutionError({+ legacyPath,+ cause,+ }),+ ),+ );+ return legacyPathExists+ ? legacyPath+ : environment.path.join(environment.appDataDirectory, environment.userDataDirName);+}).pipe(Effect.withSpan("desktop.appIdentity.resolveUserDataPath"));+export const make = Effect.gen(function* () {const assets = yield* DesktopAssets.DesktopAssets;const electronApp = yield* ElectronApp.ElectronApp;@@ -90,24 +111,11 @@ export const make = Effect.gen(function* () {return commitHash;});- const resolveUserDataPath = Effect.gen(function* () {- const legacyPath = environment.path.join(- environment.appDataDirectory,- environment.legacyUserDataDirName,- );- const legacyPathExists = yield* fileSystem.exists(legacyPath).pipe(- Effect.mapError(- (cause) =>- new DesktopUserDataPathResolutionError({- legacyPath,- cause,- }),- ),- );- return legacyPathExists- ? legacyPath- : environment.path.join(environment.appDataDirectory, environment.userDataDirName);- }).pipe(Effect.withSpan("desktop.appIdentity.resolveUserDataPath"));+ const userDataPath = resolveUserDataPath.pipe(+ Effect.provide(+ yield* Effect.context<DesktopEnvironment.DesktopEnvironment | FileSystem.FileSystem>(),+ ),+ );const configure = Effect.gen(function* () {const commitHash = yield* resolveAboutCommitHash;@@ -136,7 +144,7 @@ export const make = Effect.gen(function* () {}).pipe(Effect.withSpan("desktop.appIdentity.configure"));return DesktopAppIdentity.of({- resolveUserDataPath,+ resolveUserDataPath: userDataPath,configure,});});diff --git a/apps/desktop/src/app/DesktopClerk.test.ts b/apps/desktop/src/app/DesktopClerk.test.tsindex 9b5ed56d1..2f61ca909 100644--- a/apps/desktop/src/app/DesktopClerk.test.ts+++ b/apps/desktop/src/app/DesktopClerk.test.ts@@ -22,17 +22,38 @@ vi.mock("@clerk/electron/storage", () => ({storage: storageMock,}));+import * as Exit from "effect/Exit";+import * as FileSystem from "effect/FileSystem";+import * as ElectronApp from "../electron/ElectronApp.ts";+import * as ElectronWindow from "../electron/ElectronWindow.ts";import * as DesktopClerk from "./DesktopClerk.ts";import * as DesktopEnvironment from "./DesktopEnvironment.ts";-const makeDesktopClerkLayer = (isDevelopment = true) => {+const makeDesktopClerkLayer = (isDevelopment = true, events: string[] = []) => {const environment = DesktopEnvironment.DesktopEnvironment.of({stateDir: "/tmp/t3-state",isDevelopment,+ appDataDirectory: "/tmp/app-data",+ userDataDirName: isDevelopment ? "t3code-dev" : "t3code",+ legacyUserDataDirName: isDevelopment ? "T3 Code (Dev)" : "T3 Code (Alpha)",+ path: { join: (...parts: ReadonlyArray<string>) => parts.join("/") },} as unknown as DesktopEnvironment.DesktopEnvironment["Service"]);+ const electronApp = {+ setPath: (name: string, value: string) =>+ Effect.sync(() => {+ events.push(`setPath:${name}:${value}`);+ }),+ } as unknown as ElectronApp.ElectronApp["Service"];+return DesktopClerk.layer.pipe(- Layer.provide(Layer.succeed(DesktopEnvironment.DesktopEnvironment, environment)),+ Layer.provide(+ Layer.mergeAll(+ Layer.succeed(DesktopEnvironment.DesktopEnvironment, environment),+ Layer.succeed(ElectronApp.ElectronApp, electronApp),+ FileSystem.layerNoop({ exists: () => Effect.succeed(false) }),+ ),+ ),);};@@ -55,11 +76,15 @@ describe("DesktopClerk", () => {it.effect("acquires and releases the SDK bridge with the layer", () => {const cleanup = vi.fn();+ const events: string[] = [];storageMock.mockReturnValue(storageAdapter);- createClerkBridgeMock.mockReturnValue({ cleanup });+ createClerkBridgeMock.mockImplementation(() => {+ events.push("createClerkBridge");+ return { cleanup, isPrimaryInstance: true };+ });return Effect.gen(function* () {- yield* Effect.scoped(Layer.build(makeDesktopClerkLayer()));+ yield* Effect.scoped(Layer.build(makeDesktopClerkLayer(true, events)));assert.deepEqual(createClerkBridgeMock.mock.calls, [[@@ -71,6 +96,10 @@ describe("DesktopClerk", () => {],]);assert.equal(cleanup.mock.calls.length, 1);+ // The bridge acquires Electron's single-instance lock at creation, and+ // the lock both lives in and creates the userData directory — so the+ // real path must be set before the bridge exists.+ assert.deepEqual(events, ["setPath:userData:/tmp/app-data/t3code-dev", "createClerkBridge"]);storageMock.mockClear();createClerkBridgeMock.mockClear();});@@ -124,11 +153,67 @@ describe("DesktopClerk", () => {});});+ it.effect("registers the second-instance handler in the primary instance", () => {+ storageMock.mockReturnValue(storageAdapter);+ createClerkBridgeMock.mockReturnValue({ cleanup: vi.fn(), isPrimaryInstance: true });+ const quit = vi.fn();+ const registeredEvents: string[] = [];+ const electronApp = {+ quit: Effect.sync(quit),+ on: (eventName: string) =>+ Effect.sync(() => {+ registeredEvents.push(eventName);+ }),+ } as unknown as ElectronApp.ElectronApp["Service"];+ const electronWindow = {} as ElectronWindow.ElectronWindow["Service"];++ return Effect.gen(function* () {+ const clerk = yield* DesktopClerk.DesktopClerk;+ const exit = yield* Effect.exit(Effect.scoped(clerk.configure));++ assert.isTrue(Exit.isSuccess(exit));+ assert.equal(quit.mock.calls.length, 0);+ assert.deepEqual(registeredEvents, ["second-instance"]);+ }).pipe(+ Effect.provide(makeDesktopClerkLayer()),+ Effect.provideService(ElectronApp.ElectronApp, electronApp),+ Effect.provideService(ElectronWindow.ElectronWindow, electronWindow),+ );+ });++ it.effect("quits and interrupts startup in a secondary instance", () => {+ storageMock.mockReturnValue(storageAdapter);+ createClerkBridgeMock.mockReturnValue({ cleanup: vi.fn(), isPrimaryInstance: false });+ const quit = vi.fn();+ const registeredEvents: string[] = [];+ const electronApp = {+ quit: Effect.sync(quit),+ on: (eventName: string) =>+ Effect.sync(() => {+ registeredEvents.push(eventName);+ }),+ } as unknown as ElectronApp.ElectronApp["Service"];+ const electronWindow = {} as ElectronWindow.ElectronWindow["Service"];++ return Effect.gen(function* () {+ const clerk = yield* DesktopClerk.DesktopClerk;+ const exit = yield* Effect.exit(Effect.scoped(clerk.configure));++ assert.isTrue(Exit.hasInterrupts(exit));+ assert.equal(quit.mock.calls.length, 1);+ assert.deepEqual(registeredEvents, []);+ }).pipe(+ Effect.provide(makeDesktopClerkLayer()),+ Effect.provideService(ElectronApp.ElectronApp, electronApp),+ Effect.provideService(ElectronWindow.ElectronWindow, electronWindow),+ );+ });+it.each([{ isDevelopment: true, scheme: "t3code-dev" },{ isDevelopment: false, scheme: "t3code" },])("configures the SDK with the $scheme renderer origin", ({ isDevelopment, scheme }) => {- const bridge = { cleanup: vi.fn() };+ const bridge = { cleanup: vi.fn(), isPrimaryInstance: true };storageMock.mockReturnValue(storageAdapter);createClerkBridgeMock.mockReturnValue(bridge);diff --git a/apps/desktop/src/app/DesktopClerk.ts b/apps/desktop/src/app/DesktopClerk.tsindex 0e283f8dd..9611dc083 100644--- a/apps/desktop/src/app/DesktopClerk.ts+++ b/apps/desktop/src/app/DesktopClerk.ts@@ -11,6 +11,7 @@ import { clerkFrontendApiHostnameFromPublishableKey } from "@t3tools/shared/relaimport * as ElectronApp from "../electron/ElectronApp.ts";import * as ElectronProtocol from "../electron/ElectronProtocol.ts";import * as ElectronWindow from "../electron/ElectronWindow.ts";+import * as DesktopAppIdentity from "./DesktopAppIdentity.ts";import * as DesktopEnvironment from "./DesktopEnvironment.ts";declare const __T3CODE_BUILD_CLERK_PUBLISHABLE_KEY__: string | undefined;@@ -84,7 +85,18 @@ export function createDesktopClerkBridge(stateDir: string, isDevelopment: booleaexport const make = Effect.gen(function* () {const environment = yield* DesktopEnvironment.DesktopEnvironment;- yield* Effect.acquireRelease(+ const electronApp = yield* ElectronApp.ElectronApp;++ // Electron scopes the single-instance lock to the userData directory and+ // creates that directory when the lock is acquired. The SDK bridge takes+ // the lock at creation, so userData must already point at the real+ // directory here — under the default productName-derived path, acquiring+ // the lock would create "T3 Code (Alpha)" and make the legacy-install+ // detection in resolveUserDataPath match on fresh installs.+ const userDataPath = yield* DesktopAppIdentity.resolveUserDataPath;+ yield* electronApp.setPath("userData", userDataPath);++ const bridge = yield* Effect.acquireRelease(Effect.try({try: () => createDesktopClerkBridge(environment.stateDir, environment.isDevelopment),catch: (cause) =>@@ -113,7 +125,12 @@ export const make = Effect.gen(function* () {const context = yield* Effect.context<ElectronWindow.ElectronWindow>();const runPromise = Effect.runPromiseWith(context);- if (!(yield* electronApp.requestSingleInstanceLock)) {+ // The SDK bridge holds Electron's single-instance lock (acquired at+ // bridge creation) so OAuth deep-link callbacks on Windows/Linux are+ // forwarded to the running app. In a secondary instance the bridge has+ // already begun quitting the app; app.quit() is asynchronous, so stop+ // bootstrap here before whenReady can fire.+ if (!bridge.isPrimaryInstance) {yield* electronApp.quit;return yield* Effect.interrupt;}diff --git a/apps/desktop/src/app/DesktopLifecycle.test.ts b/apps/desktop/src/app/DesktopLifecycle.test.tsindex e5ce72f8e..978e000a7 100644--- a/apps/desktop/src/app/DesktopLifecycle.test.ts+++ b/apps/desktop/src/app/DesktopLifecycle.test.ts@@ -29,7 +29,6 @@ describe("DesktopLifecycle", () => {setName: () => Effect.void,setAboutPanelOptions: () => Effect.void,setAppUserModelId: () => Effect.void,- requestSingleInstanceLock: Effect.succeed(true),getAppMetrics: Effect.succeed([]),isDefaultProtocolClient: () => Effect.succeed(false),setAsDefaultProtocolClient: () => Effect.succeed(true),diff --git a/apps/desktop/src/electron/ElectronApp.test.ts b/apps/desktop/src/electron/ElectronApp.test.tsindex 077b34395..ac14f56ad 100644--- a/apps/desktop/src/electron/ElectronApp.test.ts+++ b/apps/desktop/src/electron/ElectronApp.test.ts@@ -14,7 +14,6 @@ const {quitMock,relaunchMock,removeListenerMock,- requestSingleInstanceLockMock,setAboutPanelOptionsMock,setAppUserModelIdMock,setAsDefaultProtocolClientMock,@@ -35,7 +34,6 @@ const {quitMock: vi.fn(),relaunchMock: vi.fn(),removeListenerMock: vi.fn(),- requestSingleInstanceLockMock: vi.fn(() => true),setAboutPanelOptionsMock: vi.fn(),setAppUserModelIdMock: vi.fn(),setAsDefaultProtocolClientMock: vi.fn(() => true),@@ -67,7 +65,6 @@ vi.mock("electron", () => ({quit: quitMock,relaunch: relaunchMock,removeListener: removeListenerMock,- requestSingleInstanceLock: requestSingleInstanceLockMock,runningUnderARM64Translation: false,setAboutPanelOptions: setAboutPanelOptionsMock,setAsDefaultProtocolClient: setAsDefaultProtocolClientMock,diff --git a/apps/desktop/src/electron/ElectronApp.ts b/apps/desktop/src/electron/ElectronApp.tsindex 5f8052f90..733236171 100644--- a/apps/desktop/src/electron/ElectronApp.ts+++ b/apps/desktop/src/electron/ElectronApp.ts@@ -56,7 +56,6 @@ export class ElectronApp extends Context.Service<options: Electron.AboutPanelOptionsOptions,) => Effect.Effect<void>;readonly setAppUserModelId: (id: string) => Effect.Effect<void>;- readonly requestSingleInstanceLock: Effect.Effect<boolean>;readonly getAppMetrics: Effect.Effect<ReadonlyArray<Electron.ProcessMetric>>;readonly isDefaultProtocolClient: (protocol: string) => Effect.Effect<boolean>;readonly setAsDefaultProtocolClient: (@@ -153,7 +152,6 @@ export const make = ElectronApp.of({Effect.sync(() => {Electron.app.setAppUserModelId(id);}),- requestSingleInstanceLock: Effect.sync(() => Electron.app.requestSingleInstanceLock()),getAppMetrics: Effect.sync(() => Electron.app.getAppMetrics()),isDefaultProtocolClient: (protocol) =>Effect.sync(() => Electron.app.isDefaultProtocolClient(protocol)),diff --git a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.tsindex 475be3da1..36cdcb50b 100644--- a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts+++ b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts@@ -34,7 +34,6 @@ function makeElectronAppLayer(setName: () => Effect.void,setAboutPanelOptions: () => Effect.void,setAppUserModelId: () => Effect.void,- requestSingleInstanceLock: Effect.succeed(true),getAppMetrics: Effect.sync(() => {onMetricsRead();return metrics;diff --git a/apps/desktop/src/window/DesktopApplicationMenu.test.ts b/apps/desktop/src/window/DesktopApplicationMenu.test.tsindex 34fc44471..f04a49f82 100644--- a/apps/desktop/src/window/DesktopApplicationMenu.test.ts+++ b/apps/desktop/src/window/DesktopApplicationMenu.test.ts@@ -39,7 +39,6 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {setName: () => Effect.void,setAboutPanelOptions: () => Effect.void,setAppUserModelId: () => Effect.void,- requestSingleInstanceLock: Effect.succeed(true),getAppMetrics: Effect.succeed([]),isDefaultProtocolClient: () => Effect.succeed(false),setAsDefaultProtocolClient: () => Effect.succeed(true),diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 816846ab5..f5c6c8789 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -35,19 +35,19 @@ catalogs:version: 0.2.2overrides:- '@clerk/backend': 3.13.0- '@clerk/clerk-js': 6.25.7+ '@clerk/backend': 3.14.0+ '@clerk/clerk-js': 6.25.12'@clerk/clerk-js>@base-org/account': '-''@clerk/clerk-js>@coinbase/wallet-sdk': '-''@clerk/clerk-js>@solana/wallet-adapter-base': '-''@clerk/clerk-js>@solana/wallet-adapter-react': '-''@clerk/clerk-js>@solana/wallet-standard': '-''@clerk/clerk-js>@wallet-standard/core': '-'- '@clerk/electron': 0.0.18+ '@clerk/electron': 0.0.24'@clerk/electron-passkeys': 0.0.3- '@clerk/expo': 4.0.2- '@clerk/react': 6.12.7- '@clerk/shared': 4.25.7+ '@clerk/expo': 4.1.2+ '@clerk/react': 6.12.9+ '@clerk/shared': 4.25.9'@effect/atom-react': 4.0.0-beta.102'@effect/platform-bun': 4.0.0-beta.102'@effect/platform-node': 4.0.0-beta.102@@ -111,8 +111,8 @@ importers:apps/desktop:dependencies:'@clerk/electron':- specifier: 0.0.18- version: 0.0.18(@clerk/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])+ specifier: 0.0.24+ version: 0.0.24(@clerk/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])'@clerk/electron-passkeys':specifier: 0.0.3version: 0.0.3@@ -197,8 +197,8 @@ importers:specifier: ^0.7.1version: 0.7.1([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected])'@clerk/expo':- specifier: 4.0.2- version: 4.0.2([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected]))([email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])))([email protected])([email protected]([email protected]))([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected])([email protected])+ specifier: 4.1.2+ version: 4.1.2([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected]))([email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])))([email protected])([email protected]([email protected]))([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected])([email protected])'@effect/atom-react':specifier: 4.0.0-beta.102version: 4.0.0-beta.102([email protected](patch_hash=71215759e1ac0a7f65d7b75d816986687ae6c3a6cba02d928d184ca71790d488))([email protected])([email protected])@@ -514,11 +514,11 @@ importers:specifier: ^1.4.1'@clerk/electron':- specifier: 0.0.18- version: 0.0.18(@clerk/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])+ specifier: 0.0.24+ version: 0.0.24(@clerk/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])'@clerk/react':- specifier: 6.12.7+ specifier: 6.12.9'@dnd-kit/core':specifier: ^6.3.1@@ -668,8 +668,8 @@ importers:infra/relay:dependencies:'@clerk/backend':- specifier: 3.13.0+ specifier: 3.14.0'@effect/sql-pg':specifier: 4.0.0-beta.102version: 4.0.0-beta.102([email protected](patch_hash=71215759e1ac0a7f65d7b75d816986687ae6c3a6cba02d928d184ca71790d488))@@ -1695,12 +1695,12 @@ packages:resolution: {integrity: sha512-EYlRokl8szrP9Z25qT5aepMdBjzBvHF9ZEhzIiUBc9guz/T31EqRgvD0QSgZcpE93xiwrr+OkB4nz0BZyF6fSA==}engines: {node: '>= 20.12.0'}- '@clerk/[email protected]':- resolution: {integrity: sha512-kYOgeR48iXYypudpYITE0L2yxi4TeFXU+ISAOULlVgOcurw8qnm1/JEuK6Mr2IFUbRS9hcHk1HVO0Ceo0XmL8Q==}+ '@clerk/[email protected]':+ resolution: {integrity: sha512-WsphTvDFHDuQilKI7dyVE5qmt7USu8qSrujAq6SqpEHbVFfNBfINDNuzxlF9M2skOTfHFfgiTE8Jjb1egIBGLg==}engines: {node: '>=20.9.0'}- '@clerk/[email protected]':- resolution: {integrity: sha512-GOnbEUzPKAdsdCodZsHhku2YloBBuwLGx5UP0VeezUj73wKLwlSYMlVPuntsJoY7c8+lVrMCY9LQWYVZ7VMLBw==}+ '@clerk/[email protected]':+ resolution: {integrity: sha512-N91mFKenMF5e+LRQ0NsqFb8bw+icbwnF8MzjzS4cux72xG4Gekh772tiLIetbURe44Srgjw5lj8jkWbt+yH/FA==}engines: {node: '>=20.9.0'}'@clerk/[email protected]':@@ -1727,8 +1727,8 @@ packages:resolution: {integrity: sha512-OHhIe88qDL+FxyBalXdXNHAS5eEramr6Rerp+6iNkfkjqT8rx4hHNmfpmjg5/T1/am8QfknbOBZkqoXZlCrjPg==}engines: {node: '>=20.9.0'}- '@clerk/[email protected]':- resolution: {integrity: sha512-0lWiITlTxCviglPfPSu+uhERnQyXroiWrSMRpZcEO3FgBt3bnrpfgZUrXW8iaLoUYJrFP2byF7bHJPRwEPVXEw==}+ '@clerk/[email protected]':+ resolution: {integrity: sha512-xORO51KLzCqmRQ4IVsa+Amp1M5NjG28QnvsaRBq1v4CUEjH8vAXDKCPiPBKAE+HuQB6HUhzYmzUkyTw2FcDonw==}engines: {node: '>=20.9.0'}peerDependencies:'@clerk/electron-passkeys': 0.0.3@@ -1744,8 +1744,8 @@ packages:react-dom:optional: true- '@clerk/[email protected]':- resolution: {integrity: sha512-afBdV2bLRM55p5L7FoAGV/wCamLxXusjIBPmNo+TwAYabU0oUokMsm+0++xWDA0nxzMt/O08Oj+xAGEtE+Qvxg==}+ '@clerk/[email protected]':+ resolution: {integrity: sha512-ZyGozbbizcGwEyK0CEXsPHnHnQoaa2CbTsXAqWBygzKEZyFjLjCHwQsQBKj6WgjAgn8mtw2ByIP9qLpItZffgw==}engines: {node: '>=20.9.0'}peerDependencies:'@clerk/expo-google-signin': '>=0.1.0'@@ -1783,15 +1783,15 @@ packages:react-dom:optional: true- '@clerk/[email protected]':- resolution: {integrity: sha512-K8CK0tS7My/3RT5sAIJTjYgnH0xU+K4Jdnhi76xQdAY4agD/M07BbrBMWXEE0xUEDst2PqPfX660V1LRLOsxOQ==}+ '@clerk/[email protected]':+ resolution: {integrity: sha512-lQ1UOJhHGDweLCDf4IgT5r3rgkch1Gx21hNqK2/kOohJrJd/XM89fq2F7VK9Kg/Byc14TsfCh64Dm8ej2MyRWw==}engines: {node: '>=20.9.0'}peerDependencies:react: ^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0react-dom: ^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0- '@clerk/[email protected]':- resolution: {integrity: sha512-FfBbDeFkxwDuz/2YcVs4DhyZ0VxnqNtdbO0Tn/lkLAiDvFFspWw+PDYqo7LQiBymEQaOQkb094dX21WWnZbmlA==}+ '@clerk/[email protected]':+ resolution: {integrity: sha512-nw3maGzqPrwmUKjGffOM9Zvw24IyOllq0TkQGzsTfQX312WLu2u5CNvjKntMb6Ok6kXa1Zdc77zmPLn1/EAIFA==}engines: {node: '>=20.9.0'}peerDependencies:react: ^18.0.0 || ~19.0.3 || ~19.1.4 || ~19.2.3 || ~19.3.0-0@@ -11512,18 +11512,18 @@ snapshots:fast-wrap-ansi: 0.2.2sisteransi: 1.0.5dependencies:standardwebhooks: 1.0.0tslib: 2.8.1transitivePeerDependencies:- react- react-domdependencies:'@stripe/stripe-js': 5.6.0'@swc/helpers': 0.5.21'@tanstack/query-core': 5.100.14@@ -11538,9 +11538,9 @@ snapshots:- react- react-domdependencies:'@stripe/stripe-js': 5.6.0'@swc/helpers': 0.5.21'@tanstack/query-core': 5.100.14@@ -11574,11 +11574,11 @@ snapshots:'@clerk/electron-passkeys-win32-arm64-msvc': 0.0.3'@clerk/electron-passkeys-win32-x64-msvc': 0.0.3- '@clerk/[email protected](@clerk/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])':+ '@clerk/[email protected](@clerk/[email protected])([email protected])([email protected])([email protected]([email protected]))([email protected])':dependencies:electron: 41.5.0react: 19.2.6tslib: 2.8.1@@ -11587,11 +11587,11 @@ snapshots:electron-store: 8.2.0react-dom: 19.2.6([email protected])- '@clerk/[email protected]([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected]))([email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])))([email protected])([email protected]([email protected]))([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected])([email protected])':+ '@clerk/[email protected]([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected]))([email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected])([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])))([email protected])([email protected]([email protected]))([email protected](@babel/[email protected])(@react-native/[email protected](@babel/[email protected])([email protected])([email protected]))(@types/[email protected])([email protected])([email protected])([email protected]))([email protected])([email protected])':dependencies:'@expo/config-plugins': 56.0.9([email protected])base-64: 1.0.0expo: 56.0.12(8895228379997a2a064f9644cda56ed0)@@ -11610,21 +11610,21 @@ snapshots:- supports-color- typescriptdependencies:react: 19.2.3react-dom: 19.2.3([email protected])tslib: 2.8.1dependencies:react: 19.2.6react-dom: 19.2.6([email protected])tslib: 2.8.1dependencies:'@tanstack/query-core': 5.100.14dequal: 2.0.3@@ -11634,7 +11634,7 @@ snapshots:react: 19.2.3react-dom: 19.2.3([email protected])dependencies:'@tanstack/query-core': 5.100.14dequal: 2.0.3diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex d41e50e87..79736c894 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -23,13 +23,13 @@ allowBuilds:workerd: falsecatalog:- "@clerk/backend": 3.13.0- "@clerk/clerk-js": 6.25.7- "@clerk/electron": 0.0.18+ "@clerk/backend": 3.14.0+ "@clerk/clerk-js": 6.25.12+ "@clerk/electron": 0.0.24"@clerk/electron-passkeys": 0.0.3- "@clerk/expo": 4.0.2- "@clerk/react": 6.12.7- "@clerk/shared": 4.25.7+ "@clerk/expo": 4.1.2+ "@clerk/react": 6.12.9+ "@clerk/shared": 4.25.9"@effect/atom-react": 4.0.0-beta.102"@effect/openapi-generator": 4.0.0-beta.102"@effect/platform-bun": 4.0.0-beta.102@@ -52,12 +52,12 @@ catalog:yaml: ^2.9.0minimumReleaseAgeExclude:- - "@clerk/[email protected]"- - "@clerk/[email protected]"- - "@clerk/[email protected]"- - "@clerk/[email protected]"- - "@clerk/[email protected]"- - "@clerk/[email protected]"+ - "@clerk/[email protected]"+ - "@clerk/[email protected]"+ - "@clerk/[email protected]"+ - "@clerk/[email protected]"+ - "@clerk/[email protected]"+ - "@clerk/[email protected]"- "@distilled.cloud/[email protected]"- "@distilled.cloud/[email protected]"- "@distilled.cloud/[email protected]"diff --git a/scripts/build-desktop-artifact.test.ts b/scripts/build-desktop-artifact.test.tsindex 64bb6c061..7d2b7410a 100644--- a/scripts/build-desktop-artifact.test.ts+++ b/scripts/build-desktop-artifact.test.ts@@ -349,6 +349,11 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {assert.notProperty(mac, "asarUnpack");assert.notProperty(linux, "asarUnpack");assert.deepStrictEqual(win.asarUnpack, WINDOWS_ASAR_UNPACK);+ // Linux must register the renderer schemes so the generated .desktop+ // entry advertises MimeType=x-scheme-handler/t3code; for OAuth deep links.+ assert.deepStrictEqual((linux.linux as Record<string, unknown>).protocols, [+ { name: "T3 Code", schemes: ["t3code", "t3code-dev"] },+ ]);for (const config of [mac, linux, win]) {assert.deepStrictEqual(config.electronLanguages, DESKTOP_ELECTRON_LANGUAGES);assert.deepStrictEqual(config.files, DESKTOP_FILE_EXCLUSIONS);diff --git a/scripts/build-desktop-artifact.ts b/scripts/build-desktop-artifact.tsindex 9687e76a1..a3c999692 100644--- a/scripts/build-desktop-artifact.ts+++ b/scripts/build-desktop-artifact.ts@@ -1589,6 +1589,15 @@ export const createBuildConfig = Effect.fn("createBuildConfig")(function* (executableName: "t3code",icon: "icons",category: "Development",+ // electron-builder turns these into MimeType=x-scheme-handler/<scheme>;+ // in the .desktop entry (Exec already gets %U), so browsers can hand+ // t3code:// OAuth callbacks to the app.+ protocols: [+ {+ name: "T3 Code",+ schemes: ["t3code", "t3code-dev"],+ },+ ],desktop: {entry: {StartupWMClass: "t3code",