From 0534ac86844bdd59c8ab53fdcaeba0a6cdf3bf3d Mon Sep 17 00:00:00 2001 From: TB516 <77514919+TB516@users.noreply.github.com> Date: Wed, 18 Nov 2026 07:53:41 +0000 Subject: [PATCH 1/4] chore(flatpak): update T3 Code to v0.1.10 --- flatpak/com.t3tools.t3code.metainfo.xml | 6 +++++- flatpak/modules/t3code.yml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flatpak/com.t3tools.t3code.metainfo.xml b/flatpak/com.t3tools.t3code.metainfo.xml index 8e9e40a..cba7320 100644 --- a/flatpak/com.t3tools.t3code.metainfo.xml +++ b/flatpak/com.t3tools.t3code.metainfo.xml @@ -19,9 +19,13 @@ com.t3tools.t3code.desktop https://t3.codes + + https://github.com/pingdotgg/t3code/releases/tag/v0.1.10 + + https://github.com/pingdotgg/t3code/releases/tag/v0.1.9 - + https://github.com/pingdotgg/t3code/releases/tag/v0.1.8 diff --git a/flatpak/modules/t3code.yml b/flatpak/modules/t3code.yml index 4b3244d..b564eeb 100644 --- a/flatpak/modules/t3code.yml +++ b/flatpak/modules/t3code.yml @@ -66,8 +66,8 @@ test-commands: sources: - type: git url: https://github.com/pingdotgg/t3code.git - tag: v0.1.9 - commit: 24e77473ecf41bc1f7142529c7911c1c1aae1d76 + tag: v0.1.10 + commit: 7d32075e3757ded707914e2450c3e392a9665765 x-checker-data: type: json url: https://api.github.com/repos/pingdotgg/t3code/releases/latest From 47c3e8c5ef436e907ddb7a073ca888d16e63284c Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 18 Nov 2026 17:22:29 -0500 Subject: [PATCH 2/4] chore(flatpak): refresh patches for T3 Code v0.1.10 Upstream now reports that the Flatpak desktop can't install updates, so patch 0009 keeps only the server's own refusal. Flatpak editors go through upstream's launch path and get its new folder and position arguments. Ship node-pty's own prebuilt binary instead of one compiled against the SDK's glibc, so the host server's terminal loads on hosts with glibc 2.28 or newer and upstream's glibc ceiling check passes. --- flatpak/com.t3tools.t3code.metainfo.xml | 6 +- flatpak/modules/t3code.yml | 1 + .../0001-flatpak-desktop-integration.patch | 119 ++++++++++++------ patches/0002-flatpak-host-backend.patch | 6 +- patches/0003-flatpak-host-environment.patch | 22 ++-- .../0006-flatpak-document-portal-paths.patch | 26 ++-- patches/0007-flatpak-editor-discovery.patch | 36 +++--- patches/0008-flatpak-cli-launcher.patch | 6 +- patches/0009-flatpak-server-updates.patch | 75 +---------- .../0010-flatpak-browser-requirements.patch | 26 ++-- patches/0011-flatpak-legacy-database.patch | 23 ++-- patches/0012-flatpak-update-channel.patch | 16 +-- patches/0013-flatpak-startup-recovery.patch | 2 +- patches/0015-flatpak-browser-import.patch | 4 +- patches/0016-flatpak-prebuilt-pty.patch | 14 +++ 15 files changed, 191 insertions(+), 191 deletions(-) create mode 100644 patches/0016-flatpak-prebuilt-pty.patch diff --git a/flatpak/com.t3tools.t3code.metainfo.xml b/flatpak/com.t3tools.t3code.metainfo.xml index cba7320..9ef797d 100644 --- a/flatpak/com.t3tools.t3code.metainfo.xml +++ b/flatpak/com.t3tools.t3code.metainfo.xml @@ -21,7 +21,11 @@ https://github.com/pingdotgg/t3code/releases/tag/v0.1.10 - + +

Update to T3 Code 0.1.10.

+

The built-in terminal now works on hosts with an older glibc, such as + Ubuntu 24.04, Debian 13 and Fedora 42.

+
https://github.com/pingdotgg/t3code/releases/tag/v0.1.9 diff --git a/flatpak/modules/t3code.yml b/flatpak/modules/t3code.yml index b564eeb..b8f2ca8 100644 --- a/flatpak/modules/t3code.yml +++ b/flatpak/modules/t3code.yml @@ -91,6 +91,7 @@ sources: - ../../patches/0013-flatpak-startup-recovery.patch - ../../patches/0014-flatpak-managed-policy.patch - ../../patches/0015-flatpak-browser-import.patch + - ../../patches/0016-flatpak-prebuilt-pty.patch use-git: true - type: dir path: ../package diff --git a/patches/0001-flatpak-desktop-integration.patch b/patches/0001-flatpak-desktop-integration.patch index 4acf311..6b513ce 100644 --- a/patches/0001-flatpak-desktop-integration.patch +++ b/patches/0001-flatpak-desktop-integration.patch @@ -86,7 +86,7 @@ index d5fed4b228..05f90aedf5 100644 desktopLauncherPath: config.desktopLauncherPath, appImagePath: config.appImagePath, diff --git a/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts b/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts -index 16d2f8e241..df911a745a 100644 +index 8e8a2812ab..a0b203059a 100644 --- a/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts +++ b/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts @@ -1,5 +1,5 @@ @@ -96,7 +96,7 @@ index 16d2f8e241..df911a745a 100644 import * as HostProcess from "@t3tools/shared/HostProcess"; import * as Cause from "effect/Cause"; import * as Deferred from "effect/Deferred"; -@@ -165,6 +165,15 @@ const emptyRecording = (): RecordedRegistration => ({ +@@ -184,6 +184,15 @@ const emptyRecording = (): RecordedRegistration => ({ }); describe("DesktopLinuxUrlHandler", () => { @@ -113,7 +113,7 @@ index 16d2f8e241..df911a745a 100644 const entry = DesktopLinuxUrlHandler.renderUrlHandlerDesktopEntry({ displayName: "T3 Code (Nightly)", diff --git a/apps/desktop/src/app/DesktopLinuxUrlHandler.ts b/apps/desktop/src/app/DesktopLinuxUrlHandler.ts -index cfa8498ae6..4626a2601c 100644 +index 35fd46dd7a..f49e96bdf8 100644 --- a/apps/desktop/src/app/DesktopLinuxUrlHandler.ts +++ b/apps/desktop/src/app/DesktopLinuxUrlHandler.ts @@ -9,6 +9,7 @@ import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; @@ -124,7 +124,7 @@ index cfa8498ae6..4626a2601c 100644 import * as DesktopEnvironment from "./DesktopEnvironment.ts"; import { makeComponentLogger } from "./DesktopObservability.ts"; -@@ -287,7 +288,10 @@ export const make = Effect.gen(function* () { +@@ -319,7 +320,10 @@ export const make = Effect.gen(function* () { ); const register = Effect.gen(function* () { @@ -137,10 +137,10 @@ index cfa8498ae6..4626a2601c 100644 } yield* writeDesktopEntry; diff --git a/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts b/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts -index 22bfc969c4..da1d29ea71 100644 +index 45887a928a..0679d51740 100644 --- a/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts +++ b/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts -@@ -61,6 +61,24 @@ import * as DesktopConfig from "./DesktopConfig.ts"; +@@ -64,6 +64,24 @@ import * as DesktopConfig from "./DesktopConfig.ts"; import * as DesktopPreReadyPlatform from "./DesktopPreReadyPlatform.ts"; describe("DesktopPreReadyPlatform", () => { @@ -166,18 +166,18 @@ index 22bfc969c4..da1d29ea71 100644 appendSwitchMock.mockReset(); getSwitchValueMock.mockReset(); diff --git a/apps/desktop/src/app/DesktopPreReadyPlatform.ts b/apps/desktop/src/app/DesktopPreReadyPlatform.ts -index ff8c97b8f8..7214f0d672 100644 +index 8ac4654636..8b86fc53b8 100644 --- a/apps/desktop/src/app/DesktopPreReadyPlatform.ts +++ b/apps/desktop/src/app/DesktopPreReadyPlatform.ts -@@ -56,6 +56,7 @@ const LinuxDesktopEntryConfig = Config.all({ - xdgDataHome: trimmedString("XDG_DATA_HOME"), - launcherPath: trimmedString("T3CODE_DESKTOP_LAUNCHER_PATH"), +@@ -61,6 +61,7 @@ const LinuxDesktopEntryConfig = Config.all({ appImagePath: trimmedString("APPIMAGE"), + // electron-updater sets this on the AppImage it relaunches after installing an update. + relaunchedByUpdater: trimmedString("APPIMAGE_SILENT_INSTALL"), + flatpakId: trimmedString("FLATPAK_ID"), }); /** @public */ -@@ -85,54 +86,56 @@ export const make = Effect.gen(function* () { +@@ -90,75 +91,80 @@ export const make = Effect.gen(function* () { }); // The portal also requires a valid desktop entry. An AppImage update may // have removed the executable referenced by the previous launch's entry. @@ -200,27 +200,13 @@ index ff8c97b8f8..7214f0d672 100644 - if (iconPath !== undefined) { - try { - NodeFS.mkdirSync(NodePath.posix.dirname(iconPath), { recursive: true }); -- NodeFS.copyFileSync( -- NodePath.posix.join( -- Electron.app.getAppPath(), -- "apps/desktop/prod-resources/icon.png", -- ), +- // Electron's copyFileSync from app.asar extracts to a temp file it never deletes. +- NodeFS.writeFileSync( - iconPath, -- ); -- } catch {} -- } -- NodeFS.writeFileSync( -- NodePath.posix.join(applicationsDir, linux.linuxDesktopEntryName), -- renderUrlHandlerDesktopEntry({ -- displayName: resolveDesktopAppBranding({ -- isDevelopment: linux.isDevelopment, -- appVersion: Electron.app.getVersion(), -- }).displayName, -- execTarget: -- Option.getOrUndefined( -- Option.orElse( -- linuxDesktopEntryConfig.launcherPath, -- () => linuxDesktopEntryConfig.appImagePath, +- NodeFS.readFileSync( +- NodePath.posix.join( +- Electron.app.getAppPath(), +- "apps/desktop/prod-resources/icon.png", + if (Option.isNone(linuxDesktopEntryConfig.flatpakId)) { + try { + const applicationsDir = NodePath.posix.join( @@ -241,11 +227,50 @@ index ff8c97b8f8..7214f0d672 100644 + if (iconPath !== undefined) { + try { + NodeFS.mkdirSync(NodePath.posix.dirname(iconPath), { recursive: true }); -+ NodeFS.copyFileSync( -+ NodePath.posix.join( -+ Electron.app.getAppPath(), -+ "apps/desktop/prod-resources/icon.png", ++ // Electron's copyFileSync from app.asar extracts to a temp file it never deletes. ++ NodeFS.writeFileSync( ++ iconPath, ++ NodeFS.readFileSync( ++ NodePath.posix.join( ++ Electron.app.getAppPath(), ++ "apps/desktop/prod-resources/icon.png", ++ ), ), +- ), +- ); +- } catch {} +- } +- const desktopEntryPath = NodePath.posix.join(applicationsDir, linux.linuxDesktopEntryName); +- const { appImagePath } = linuxDesktopEntryConfig; +- if ( +- Option.isSome(appImagePath) && +- Option.isNone(linuxDesktopEntryConfig.launcherPath) && +- Option.contains(linuxDesktopEntryConfig.relaunchedByUpdater, "true") +- ) { +- try { +- const replacedPath = replacedVersionedAppImagePath({ +- previousEntry: NodeFS.readFileSync(desktopEntryPath, "utf8"), +- appImagePath: appImagePath.value, +- }); +- // Relative, so the pair survives a moved folder; symlink never overwrites a file. +- if (replacedPath !== null) { +- NodeFS.symlinkSync(NodePath.posix.basename(appImagePath.value), replacedPath); +- } +- } catch {} +- } +- NodeFS.writeFileSync( +- desktopEntryPath, +- renderUrlHandlerDesktopEntry({ +- displayName: resolveDesktopAppBranding({ +- isDevelopment: linux.isDevelopment, +- appVersion: Electron.app.getVersion(), +- }).displayName, +- execTarget: +- Option.getOrUndefined( +- Option.orElse( +- linuxDesktopEntryConfig.launcherPath, +- () => linuxDesktopEntryConfig.appImagePath, +- ), - ) ?? process.execPath, - scheme: ElectronProtocol.getDesktopScheme(linux.isDevelopment), - ...(iconPath === undefined ? {} : { iconPath }), @@ -253,12 +278,32 @@ index ff8c97b8f8..7214f0d672 100644 - "utf8", - ); - } catch {} -+ iconPath, + ); + } catch {} + } ++ const desktopEntryPath = NodePath.posix.join( ++ applicationsDir, ++ linux.linuxDesktopEntryName, ++ ); ++ const { appImagePath } = linuxDesktopEntryConfig; ++ if ( ++ Option.isSome(appImagePath) && ++ Option.isNone(linuxDesktopEntryConfig.launcherPath) && ++ Option.contains(linuxDesktopEntryConfig.relaunchedByUpdater, "true") ++ ) { ++ try { ++ const replacedPath = replacedVersionedAppImagePath({ ++ previousEntry: NodeFS.readFileSync(desktopEntryPath, "utf8"), ++ appImagePath: appImagePath.value, ++ }); ++ // Relative, so the pair survives a moved folder; symlink never overwrites a file. ++ if (replacedPath !== null) { ++ NodeFS.symlinkSync(NodePath.posix.basename(appImagePath.value), replacedPath); ++ } ++ } catch {} ++ } + NodeFS.writeFileSync( -+ NodePath.posix.join(applicationsDir, linux.linuxDesktopEntryName), ++ desktopEntryPath, + renderUrlHandlerDesktopEntry({ + displayName: resolveDesktopAppBranding({ + isDevelopment: linux.isDevelopment, diff --git a/patches/0002-flatpak-host-backend.patch b/patches/0002-flatpak-host-backend.patch index ab9cddc..db589fd 100644 --- a/patches/0002-flatpak-host-backend.patch +++ b/patches/0002-flatpak-host-backend.patch @@ -1,5 +1,5 @@ diff --git a/apps/desktop/src/backend/DesktopBackendConfiguration.ts b/apps/desktop/src/backend/DesktopBackendConfiguration.ts -index abadf58f3f..c1d7300493 100644 +index 82f0a30a40..ac044abe55 100644 --- a/apps/desktop/src/backend/DesktopBackendConfiguration.ts +++ b/apps/desktop/src/backend/DesktopBackendConfiguration.ts @@ -1,5 +1,8 @@ @@ -11,7 +11,7 @@ index abadf58f3f..c1d7300493 100644 import { parsePersistedServerObservabilitySettings } from "@t3tools/shared/serverSettings"; import { currentDesktopBootstrapToken } from "@t3tools/shared/desktopBootstrapToken"; import * as HostProcess from "@t3tools/shared/HostProcess"; -@@ -520,7 +523,7 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv +@@ -554,7 +557,7 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv ...buildObservabilityFragment(input.observabilitySettings), }; @@ -20,7 +20,7 @@ index abadf58f3f..c1d7300493 100644 executablePath: process.execPath, // Packaged builds have a separate cache; --require prevents cache settings leaking to provider subprocesses. args: [ -@@ -544,6 +547,12 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv +@@ -579,6 +582,12 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv captureOutput: true, preflightFailure: Option.none(), } satisfies DesktopBackendManager.DesktopBackendStartConfig; diff --git a/patches/0003-flatpak-host-environment.patch b/patches/0003-flatpak-host-environment.patch index 930d734..e25bde9 100644 --- a/patches/0003-flatpak-host-environment.patch +++ b/patches/0003-flatpak-host-environment.patch @@ -1,8 +1,8 @@ diff --git a/apps/desktop/src/shell/DesktopShellEnvironment.test.ts b/apps/desktop/src/shell/DesktopShellEnvironment.test.ts -index 0c78691943..8bf03d24fb 100644 +index 7808682dfd..34438f15b3 100644 --- a/apps/desktop/src/shell/DesktopShellEnvironment.test.ts +++ b/apps/desktop/src/shell/DesktopShellEnvironment.test.ts -@@ -163,6 +163,37 @@ function runShellEnvironment(input: { +@@ -184,6 +184,37 @@ function runShellEnvironment(input: { } describe("DesktopShellEnvironment", () => { @@ -41,10 +41,10 @@ index 0c78691943..8bf03d24fb 100644 Effect.gen(function* () { const started = yield* Deferred.make(); diff --git a/apps/desktop/src/shell/DesktopShellEnvironment.ts b/apps/desktop/src/shell/DesktopShellEnvironment.ts -index 9d9e390c95..0f4e738aba 100644 +index f2a92069f0..a5dab8d7a5 100644 --- a/apps/desktop/src/shell/DesktopShellEnvironment.ts +++ b/apps/desktop/src/shell/DesktopShellEnvironment.ts -@@ -23,6 +23,7 @@ import * as Stream from "effect/Stream"; +@@ -26,6 +26,7 @@ import * as Stream from "effect/Stream"; import * as ChildProcess from "effect/process/ChildProcess"; import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; @@ -52,7 +52,7 @@ index 9d9e390c95..0f4e738aba 100644 import * as DesktopEnvironment from "../app/DesktopEnvironment.ts"; type EnvironmentPatch = Record; -@@ -580,6 +581,15 @@ const CACHED_ENV_NAMES = [ +@@ -656,6 +657,15 @@ const CACHED_ENV_NAMES = [ /** @public */ export const make = Effect.gen(function* () { const environment = yield* DesktopEnvironment.DesktopEnvironment; @@ -69,7 +69,7 @@ index 9d9e390c95..0f4e738aba 100644 const path = yield* Path.Path; const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; diff --git a/apps/desktop/src/updates/DesktopUpdates.test.ts b/apps/desktop/src/updates/DesktopUpdates.test.ts -index 604fbeda3c..1b14a0497b 100644 +index 33ed00a764..44777e1c70 100644 --- a/apps/desktop/src/updates/DesktopUpdates.test.ts +++ b/apps/desktop/src/updates/DesktopUpdates.test.ts @@ -1,6 +1,6 @@ @@ -77,10 +77,10 @@ index 604fbeda3c..1b14a0497b 100644 -import { assert, describe, it } from "@effect/vitest"; +import { assert, describe, it, vi } from "@effect/vitest"; - import { DESKTOP_UPDATE_RESTART_MARKER_FILE } from "@t3tools/contracts"; + import { DESKTOP_UPDATE_RESTART_MARKER_FILE, DesktopUpdateStateSchema } from "@t3tools/contracts"; import { computeReleaseNotes } from "electron-updater/out/providers/GitHubProvider.js"; import * as Cause from "effect/Cause"; -@@ -77,6 +77,28 @@ const stableUpdateInfo = ( +@@ -80,6 +80,28 @@ const stableUpdateInfo = ( }; describe("DesktopUpdates", () => { @@ -110,15 +110,15 @@ index 604fbeda3c..1b14a0497b 100644 Effect.gen(function* () { const linuxState = (packageType: string | undefined) => diff --git a/apps/desktop/src/updates/DesktopUpdates.ts b/apps/desktop/src/updates/DesktopUpdates.ts -index 36492ca7b9..75ef423a27 100644 +index 775a9ff6b0..3ca3eacfce 100644 --- a/apps/desktop/src/updates/DesktopUpdates.ts +++ b/apps/desktop/src/updates/DesktopUpdates.ts @@ -1,3 +1,4 @@ +import { flatpakAppId } from "../app/Flatpak.ts"; import { DESKTOP_UPDATE_RESTART_MARKER_FILE, - DesktopUpdateChannelSchema, -@@ -343,6 +344,9 @@ function getAutoUpdateDisabledReason(args: { + DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE, +@@ -350,6 +351,9 @@ function getAutoUpdateDisabledReason(args: { disabledByEnv: boolean; hasUpdateFeedConfig: boolean; }): string | null { diff --git a/patches/0006-flatpak-document-portal-paths.patch b/patches/0006-flatpak-document-portal-paths.patch index 6fbf07a..e6b7f32 100644 --- a/patches/0006-flatpak-document-portal-paths.patch +++ b/patches/0006-flatpak-document-portal-paths.patch @@ -253,31 +253,31 @@ index 69d4f70c15..34ba9342ed 100644 Effect.annotateLogs({ channel }), Effect.withSpan("desktop.ipc.invokeSync"), diff --git a/apps/desktop/src/ipc/DesktopIpcHandlers.ts b/apps/desktop/src/ipc/DesktopIpcHandlers.ts -index 6a1b1c62e7..4808d16401 100644 +index 60b72deb29..d694fcffda 100644 --- a/apps/desktop/src/ipc/DesktopIpcHandlers.ts +++ b/apps/desktop/src/ipc/DesktopIpcHandlers.ts -@@ -50,6 +50,7 @@ import { - revealWindow, +@@ -53,6 +53,7 @@ import { pickFolder, + toLocalBackendPath, pickProjectFavicon, + resolveHostPath, pickThemeFiles, setTheme, syncHtmlFullscreen, -@@ -99,6 +100,7 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers" - yield* installRelayTelemetryEnabled(); +@@ -103,6 +104,7 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers" yield* ipc.handleSync(getSystemLocale); yield* ipc.handleSync(getPreferredSystemLanguages); + yield* ipc.handleSync(getPrimaryPasteEnabled); + yield* ipc.handleSync(resolveHostPath); yield* ipc.handleSync(getWindowFullscreenState); yield* ipc.handleSync(getLocalEnvironmentBootstraps); yield* ipc.handleSync(getLocalEnvironmentEnabled); diff --git a/apps/desktop/src/ipc/channels.ts b/apps/desktop/src/ipc/channels.ts -index aebbc1c24f..dceb96e655 100644 +index 9e5c7296a3..d0dcdda19e 100644 --- a/apps/desktop/src/ipc/channels.ts +++ b/apps/desktop/src/ipc/channels.ts -@@ -1,6 +1,7 @@ - export const PICK_FOLDER_CHANNEL = "desktop:pick-folder"; +@@ -2,6 +2,7 @@ export const PICK_FOLDER_CHANNEL = "desktop:pick-folder"; + export const TO_LOCAL_BACKEND_PATH_CHANNEL = "desktop:to-local-backend-path"; export const SET_NOTIFICATION_BADGE_CHANNEL = "desktop:set-notification-badge"; export const PICK_PROJECT_FAVICON_CHANNEL = "desktop:pick-project-favicon"; +export const RESOLVE_HOST_PATH_CHANNEL = "desktop:resolve-host-path"; @@ -285,10 +285,10 @@ index aebbc1c24f..dceb96e655 100644 export const SET_THEME_CHANNEL = "desktop:set-theme"; export const CONTEXT_MENU_CHANNEL = "desktop:context-menu"; diff --git a/apps/desktop/src/ipc/methods/window.ts b/apps/desktop/src/ipc/methods/window.ts -index e0eea5c74c..2fd7c294de 100644 +index 38887ec71d..5ae8d79387 100644 --- a/apps/desktop/src/ipc/methods/window.ts +++ b/apps/desktop/src/ipc/methods/window.ts -@@ -276,10 +276,26 @@ export const pickProjectFavicon = DesktopIpc.makeIpcMethod({ +@@ -314,10 +314,26 @@ export const pickProjectFavicon = DesktopIpc.makeIpcMethod({ }, ], }); @@ -317,10 +317,10 @@ index e0eea5c74c..2fd7c294de 100644 channel: IpcChannels.SET_THEME_CHANNEL, payload: DesktopThemeSchema, diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts -index 2dbc4eeda3..045d6dba29 100644 +index ba9c17aae2..26daa80b0c 100644 --- a/apps/desktop/src/preload.ts +++ b/apps/desktop/src/preload.ts -@@ -95,7 +95,13 @@ contextBridge.exposeInMainWorld("desktopBridge", { +@@ -113,7 +113,13 @@ contextBridge.exposeInMainWorld("desktopBridge", { }, getRelayTelemetryEnabled: () => ipcRenderer.sendSync(IpcChannels.GET_RELAY_TELEMETRY_ENABLED_CHANNEL) === true, @@ -333,5 +333,5 @@ index 2dbc4eeda3..045d6dba29 100644 + return typeof hostPath === "string" ? hostPath : ""; + }, getClientPlatform: () => clientPlatform, + restartAudioService: () => ipcRenderer.invoke(IpcChannels.RESTART_AUDIO_SERVICE_CHANNEL), setNotificationBadge: (badge) => - ipcRenderer.invoke(IpcChannels.SET_NOTIFICATION_BADGE_CHANNEL, badge), diff --git a/patches/0007-flatpak-editor-discovery.patch b/patches/0007-flatpak-editor-discovery.patch index 20e46e7..ae92291 100644 --- a/patches/0007-flatpak-editor-discovery.patch +++ b/patches/0007-flatpak-editor-discovery.patch @@ -1,10 +1,10 @@ diff --git a/apps/server/src/process/externalLauncher.test.ts b/apps/server/src/process/externalLauncher.test.ts -index f59b6a6187..c537ecf929 100644 +index 8ce873733d..edacc8fe36 100644 --- a/apps/server/src/process/externalLauncher.test.ts +++ b/apps/server/src/process/externalLauncher.test.ts -@@ -290,6 +290,55 @@ it.effect("launches an installed editor with platform-safe arguments", () => - }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)), - ); +@@ -592,6 +592,55 @@ for (const [replacement, verb, handler, target, expected] of [ + ); + } +it.effect.skipIf(windowsHost)("discovers and launches Flatpak editors without host commands", () => + Effect.gen(function* () { @@ -59,10 +59,10 @@ index f59b6a6187..c537ecf929 100644 "reveals a WSL file in Windows File Explorer through its UNC path", () => diff --git a/apps/server/src/process/externalLauncher.ts b/apps/server/src/process/externalLauncher.ts -index b900823f16..2dc12717ce 100644 +index caa6664a1b..c98b528f59 100644 --- a/apps/server/src/process/externalLauncher.ts +++ b/apps/server/src/process/externalLauncher.ts -@@ -123,6 +123,67 @@ const CommandLookupEnvConfig = Config.all({ +@@ -124,6 +124,67 @@ const CommandLookupEnvConfig = Config.all({ const readBrowserLaunchEnv = BrowserLaunchEnvConfig.pipe(Effect.orElseSucceed(() => ({}))); const readCommandLookupEnv = CommandLookupEnvConfig.pipe(Effect.orElseSucceed(() => ({}))); @@ -130,7 +130,7 @@ index b900823f16..2dc12717ce 100644 function parseTargetPathAndPosition(target: string): Option.Option { const match = TARGET_WITH_POSITION_PATTERN.exec(target); if (!match?.[1] || !match[2]) { -@@ -404,6 +465,7 @@ const buildAvailableEditors = Effect.fn("externalLauncher.buildAvailableEditors" +@@ -467,6 +528,7 @@ const buildAvailableEditors = Effect.fn("externalLauncher.buildAvailableEditors" FileSystem.FileSystem | Path.Path | ChildProcessSpawner.ChildProcessSpawner > { const available: EditorId[] = []; @@ -138,7 +138,7 @@ index b900823f16..2dc12717ce 100644 for (const editor of EDITORS) { if (editor.commands === null) { -@@ -414,7 +476,7 @@ const buildAvailableEditors = Effect.fn("externalLauncher.buildAvailableEditors" +@@ -477,7 +539,7 @@ const buildAvailableEditors = Effect.fn("externalLauncher.buildAvailableEditors" } const command = yield* resolveEditorCommand(editor, env); @@ -147,23 +147,23 @@ index b900823f16..2dc12717ce 100644 available.push(editor.id); } } -@@ -479,6 +541,19 @@ const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* ( +@@ -559,7 +621,18 @@ const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* ( + } + if (editorDef.commands) { - const resolved = yield* resolveEditorCommand(editorDef, env); - if (Option.isNone(resolved)) { +- const resolved = yield* resolveEditorCommand(editorDef, env); ++ let resolved: Option.Option<{ command: string; baseArgs: ReadonlyArray }> = ++ yield* resolveEditorCommand(editorDef, env); ++ if (Option.isNone(resolved)) { + const appId = installedFlatpakEditorAppId( + editorDef.id, + yield* installedFlatpakAppIds(platform, env), + ); + if (appId) { + const baseArgs = "baseArgs" in editorDef ? editorDef.baseArgs : []; -+ return { -+ editor: editorDef.id, -+ target: input.cwd, -+ command: "flatpak", -+ args: ["run", appId, ...baseArgs, ...resolveCommandEditorArgs(editorDef, input.cwd)], -+ }; ++ resolved = Option.some({ command: "flatpak", baseArgs: ["run", appId, ...baseArgs] }); + } ++ } + if (Option.isNone(resolved)) { return yield* new ExternalLauncherCommandNotFoundError({ editor: editorDef.id, - command: editorDef.commands[0], diff --git a/patches/0008-flatpak-cli-launcher.patch b/patches/0008-flatpak-cli-launcher.patch index 62691f7..063b686 100644 --- a/patches/0008-flatpak-cli-launcher.patch +++ b/patches/0008-flatpak-cli-launcher.patch @@ -1,5 +1,5 @@ diff --git a/apps/desktop/src/app/DesktopCliCommand.test.ts b/apps/desktop/src/app/DesktopCliCommand.test.ts -index 2dc59c5889..0a13af3121 100644 +index dd61b7984e..d127bb3839 100644 --- a/apps/desktop/src/app/DesktopCliCommand.test.ts +++ b/apps/desktop/src/app/DesktopCliCommand.test.ts @@ -94,6 +94,38 @@ const fakePowerShell = (initial: string, inherited: Record = {}) @@ -79,7 +79,7 @@ index b5306a6bb5..afb011e165 100644 const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; // Read the live env: shell discovery patches PATH after startup, and Windows variable diff --git a/apps/desktop/src/app/DesktopCliShim.ts b/apps/desktop/src/app/DesktopCliShim.ts -index f8bd8b5f91..7ab57eec94 100644 +index 217f3b327d..fa4d6c482f 100644 --- a/apps/desktop/src/app/DesktopCliShim.ts +++ b/apps/desktop/src/app/DesktopCliShim.ts @@ -1,9 +1,11 @@ @@ -94,7 +94,7 @@ index f8bd8b5f91..7ab57eec94 100644 import * as DesktopEnvironment from "./DesktopEnvironment.ts"; import { makeComponentLogger } from "./DesktopObservability.ts"; -@@ -122,7 +124,12 @@ export const launcherPath = (environment: DesktopEnvironment.DesktopEnvironment[ +@@ -125,7 +127,12 @@ export const launcherPath = (environment: DesktopEnvironment.DesktopEnvironment[ export const install = Effect.gen(function* () { const environment = yield* DesktopEnvironment.DesktopEnvironment; diff --git a/patches/0009-flatpak-server-updates.patch b/patches/0009-flatpak-server-updates.patch index 52bb6e5..dd8a58c 100644 --- a/patches/0009-flatpak-server-updates.patch +++ b/patches/0009-flatpak-server-updates.patch @@ -1,8 +1,8 @@ diff --git a/apps/server/src/cloud/selfUpdate.test.ts b/apps/server/src/cloud/selfUpdate.test.ts -index 6be4288ce3..e22848f9ae 100644 +index 73a7fea4ae..fc10ff6baa 100644 --- a/apps/server/src/cloud/selfUpdate.test.ts +++ b/apps/server/src/cloud/selfUpdate.test.ts -@@ -196,6 +196,28 @@ it.layer(NodeServices.layer)("server self update", (it) => { +@@ -240,6 +240,28 @@ it.layer(NodeServices.layer)("server self update", (it) => { }), ); @@ -32,10 +32,10 @@ index 6be4288ce3..e22848f9ae 100644 it.effect("rejects invalid versions and desktop-managed servers before staging", () => Effect.gen(function* () { diff --git a/apps/server/src/cloud/selfUpdate.ts b/apps/server/src/cloud/selfUpdate.ts -index 5e29996413..505b5e4a11 100644 +index 2c6d04f825..594036634f 100644 --- a/apps/server/src/cloud/selfUpdate.ts +++ b/apps/server/src/cloud/selfUpdate.ts -@@ -138,6 +138,7 @@ export const make = Effect.fn("cloud.server_self_update.make")(function* () { +@@ -156,6 +156,7 @@ export const make = Effect.fn("cloud.server_self_update.make")(function* () { mirror?.feedUrl ?? Option.getOrUndefined(yield* Config.String(CLI_RELEASE_BASE_URL_ENV).pipe(Config.option)); const inFlight = yield* Ref.make(false); @@ -43,7 +43,7 @@ index 5e29996413..505b5e4a11 100644 yield* pruneRuntimesOnStart({ baseDir: serverConfig.baseDir, managed: launcher.managed }).pipe( Effect.forkScoped, -@@ -161,6 +162,11 @@ export const make = Effect.fn("cloud.server_self_update.make")(function* () { +@@ -179,6 +180,11 @@ export const make = Effect.fn("cloud.server_self_update.make")(function* () { const update: ServerSelfUpdate["Service"]["update"] = Effect.fn( "cloud.server_self_update.update", )(function* (input, reportProgress = () => Effect.void, onHandoffAccepted = () => Effect.void) { @@ -55,7 +55,7 @@ index 5e29996413..505b5e4a11 100644 const policyRefusal = managedUpdateRefusal( policy.document, capability === "boot-service" ? cliReleaseChannelOf(input.targetVersion.trim()) : undefined, -@@ -333,6 +339,11 @@ export const make = Effect.fn("cloud.server_self_update.make")(function* () { +@@ -364,6 +370,11 @@ export const make = Effect.fn("cloud.server_self_update.make")(function* () { update, commitDesktopUpdate: Effect.fn("ServerSelfUpdate.commitDesktopUpdate")( function (requestId, onHandoffAccepted) { @@ -67,66 +67,3 @@ index 5e29996413..505b5e4a11 100644 return desktopAppUpdate.commit(requestId, onHandoffAccepted); }, ), -diff --git a/apps/server/src/environment/ServerEnvironment.test.ts b/apps/server/src/environment/ServerEnvironment.test.ts -index dc719ed93c..9567631217 100644 ---- a/apps/server/src/environment/ServerEnvironment.test.ts -+++ b/apps/server/src/environment/ServerEnvironment.test.ts -@@ -91,7 +91,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("ServerEnvironmen - yield* fs.symlink(entry, `${prefix}/bin/t3`); - const config = yield* makeServerConfig(baseDir); - yield* fs.makeDirectory(config.stateDir, { recursive: true }); -- for (const mode of ["web", "desktop"] as const) { -+ for (const { mode, flatpakManaged } of [ -+ { mode: "web", flatpakManaged: false }, -+ { mode: "desktop", flatpakManaged: false }, -+ { mode: "desktop", flatpakManaged: true }, -+ ] as const) { - const descriptor = yield* Effect.gen(function* () { - const environment = yield* ServerEnvironment.ServerEnvironment; - return yield* environment.getDescriptor; -@@ -99,13 +103,16 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("ServerEnvironmen - Effect.provide( - ServerEnvironment.layer.pipe( - Layer.provide(layerEmptySecretStore), -- Layer.provide(ServerConfig.layer({ ...config, mode })), -+ Layer.provide(ServerConfig.layer({ ...config, mode, desktopTelemetryControlFd: 5 })), - ), - ), - Effect.provideService(HostProcess.Arguments, ["node", entry]), - Effect.provideService(HostProcess.IsExecutable, false), - Effect.provideService(HostProcess.Platform, "linux"), -- Effect.provideService(HostProcess.Environment, {}), -+ Effect.provideService( -+ HostProcess.Environment, -+ flatpakManaged ? { T3CODE_FLATPAK_SERVER: "/installed/flatpak/t3code" } : {}, -+ ), - ); - expect(descriptor.capabilities.serverInstallation).toEqual( - mode === "web" ? { kind: "npm-global", prefix } : undefined, -@@ -113,6 +120,9 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("ServerEnvironmen - expect(descriptor.capabilities.serverSelfUpdate).toBe( - mode === "web" ? undefined : "desktop-managed", - ); -+ expect(descriptor.capabilities.desktopAppUpdate).toBe( -+ mode === "desktop" && !flatpakManaged ? true : undefined, -+ ); - expect(descriptor.capabilities).toMatchObject({ - settledWorktreeCleanup: true, - storageCleanupRun: true, -diff --git a/apps/server/src/environment/ServerEnvironment.ts b/apps/server/src/environment/ServerEnvironment.ts -index 9e29b0fded..ab77356eae 100644 ---- a/apps/server/src/environment/ServerEnvironment.ts -+++ b/apps/server/src/environment/ServerEnvironment.ts -@@ -203,8 +203,11 @@ export const make = Effect.gen(function* () { - const serverInstallation = serverSelfUpdate === null ? yield* resolveServerInstallation : null; - // Desktop and server ship together; a control fd guarantees requestDesktopUpdate support. - -+ const flatpakManaged = Boolean((yield* HostProcess.Environment).T3CODE_FLATPAK_SERVER); - const desktopAppUpdate = -- serverSelfUpdate === "desktop-managed" && serverConfig.desktopTelemetryControlFd !== undefined; -+ !flatpakManaged && -+ serverSelfUpdate === "desktop-managed" && -+ serverConfig.desktopTelemetryControlFd !== undefined; - - const databaseMigration = databaseMigrationHead(serverConfig.dbPath); - const descriptor: ExecutionEnvironmentDescriptor = { diff --git a/patches/0010-flatpak-browser-requirements.patch b/patches/0010-flatpak-browser-requirements.patch index 52ad43b..5743f77 100644 --- a/patches/0010-flatpak-browser-requirements.patch +++ b/patches/0010-flatpak-browser-requirements.patch @@ -34,7 +34,7 @@ index 02ea6bedc4..d978bda5a0 100644 Effect.gen(function* () { const { error } = yield* diagnose({ diff --git a/apps/server/src/preview/PreviewBrowserHost.ts b/apps/server/src/preview/PreviewBrowserHost.ts -index 1847e5f232..eea911ee35 100644 +index 0952dbaf94..dfb70daace 100644 --- a/apps/server/src/preview/PreviewBrowserHost.ts +++ b/apps/server/src/preview/PreviewBrowserHost.ts @@ -51,18 +51,24 @@ export const DEBIAN_PACKAGES: ReadonlyArray> = [ @@ -76,10 +76,10 @@ index 1847e5f232..eea911ee35 100644 // Playwright reports Chrome's refusal to sandbox as root as a sandbox failure too. return (yield* HostProcess.UserId) === 0 diff --git a/apps/server/src/preview/ServerBrowser.ts b/apps/server/src/preview/ServerBrowser.ts -index ee31b17cc5..8a0ae2935c 100644 +index 59f70c887f..ab90011429 100644 --- a/apps/server/src/preview/ServerBrowser.ts +++ b/apps/server/src/preview/ServerBrowser.ts -@@ -2765,7 +2765,9 @@ const make = Effect.gen(function* () { +@@ -3413,7 +3413,9 @@ const make = Effect.gen(function* () { (yield* PreviewBrowserHost.sandboxBlocked) ) { yield* Effect.logWarning( @@ -91,10 +91,10 @@ index ee31b17cc5..8a0ae2935c 100644 } diff --git a/apps/server/src/preview/ServerBrowserStream.test.ts b/apps/server/src/preview/ServerBrowserStream.test.ts -index c4a709ed8a..f4ba04e2e5 100644 +index c0a9fbc923..78bbc71d2f 100644 --- a/apps/server/src/preview/ServerBrowserStream.test.ts +++ b/apps/server/src/preview/ServerBrowserStream.test.ts -@@ -375,6 +375,17 @@ it.effect("passes uploaded files to the page's open picker and needs operate sco +@@ -376,6 +376,17 @@ it.effect("passes uploaded files to the page's open picker and needs operate sco const decodeHostSetup = Schema.decodeUnknownEffect(Schema.fromJsonString(PreviewStreamHostSetup)); it.effect.each([ @@ -112,7 +112,7 @@ index c4a709ed8a..f4ba04e2e5 100644 { error: new PreviewBrowserHost.PreviewBrowserSandboxError({ setupCommand: "sudo t3 browser setup", -@@ -388,7 +399,7 @@ it.effect.each([ +@@ -389,7 +400,7 @@ it.effect.each([ }), need: "libraries", }, @@ -121,14 +121,14 @@ index c4a709ed8a..f4ba04e2e5 100644 Effect.gen(function* () { const browser = ServerBrowser.ServerBrowser.of({ clearProfile: () => Effect.void, -@@ -428,7 +439,7 @@ it.effect.each([ +@@ -429,7 +440,7 @@ it.effect.each([ expect(code).toBe(PREVIEW_STREAM_HOST_SETUP_CLOSE_CODE); expect(yield* decodeHostSetup(reason)).toEqual({ need, - command: "sudo t3 browser setup", + command: error.setupCommand ?? "", }); - }).pipe(Effect.scoped), + }), ); diff --git a/apps/server/src/preview/ServerBrowserStream.ts b/apps/server/src/preview/ServerBrowserStream.ts index e46a0c76ad..643870286c 100644 @@ -147,10 +147,10 @@ index e46a0c76ad..643870286c 100644 const isSandboxError = Schema.is(PreviewBrowserHost.PreviewBrowserSandboxError); const isLibrariesError = Schema.is(PreviewBrowserHost.PreviewBrowserLibrariesError); diff --git a/apps/web/src/browser/ServerBrowserSurface.tsx b/apps/web/src/browser/ServerBrowserSurface.tsx -index e32e8f76f1..28578f27cd 100644 +index a881650f69..e91abf1c52 100644 --- a/apps/web/src/browser/ServerBrowserSurface.tsx +++ b/apps/web/src/browser/ServerBrowserSurface.tsx -@@ -902,7 +902,9 @@ export function ServerBrowserSurface(props: { +@@ -904,7 +904,9 @@ export function ServerBrowserSurface(props: {

{previewStreamHostSetupMessage(hostSetup)}

@@ -162,10 +162,10 @@ index e32e8f76f1..28578f27cd 100644 Try again diff --git a/packages/client-runtime/src/preview/serverBrowserStream.ts b/packages/client-runtime/src/preview/serverBrowserStream.ts -index 617c1d1842..48cde9433b 100644 +index 75b45c57e7..b915e20085 100644 --- a/packages/client-runtime/src/preview/serverBrowserStream.ts +++ b/packages/client-runtime/src/preview/serverBrowserStream.ts -@@ -463,7 +463,13 @@ const decodeHostSetup = (reason: string): PreviewStreamHostSetup => { +@@ -464,7 +464,13 @@ const decodeHostSetup = (reason: string): PreviewStreamHostSetup => { return { need: "sandbox", command: "sudo npx t3 browser setup" }; }; @@ -182,7 +182,7 @@ index 617c1d1842..48cde9433b 100644 : "This server's host is missing libraries its browser needs. Run this once on the host, then try again:"; +}; diff --git a/packages/contracts/src/preview.ts b/packages/contracts/src/preview.ts -index 1790a4797d..5c80cad2be 100644 +index 9216899834..fd930b1fe7 100644 --- a/packages/contracts/src/preview.ts +++ b/packages/contracts/src/preview.ts @@ -143,6 +143,7 @@ export type PreviewRuntime = typeof PreviewRuntime.Type; diff --git a/patches/0011-flatpak-legacy-database.patch b/patches/0011-flatpak-legacy-database.patch index a9ed418..77b3d88 100644 --- a/patches/0011-flatpak-legacy-database.patch +++ b/patches/0011-flatpak-legacy-database.patch @@ -1,8 +1,8 @@ diff --git a/apps/desktop/src/ipc/DesktopIpcHandlers.ts b/apps/desktop/src/ipc/DesktopIpcHandlers.ts -index 4808d16401..dc702af8f8 100644 +index d694fcffda..8db7250c73 100644 --- a/apps/desktop/src/ipc/DesktopIpcHandlers.ts +++ b/apps/desktop/src/ipc/DesktopIpcHandlers.ts -@@ -85,6 +85,12 @@ import { +@@ -88,6 +88,12 @@ import { addCliCommandToPath, } from "./methods/cliCommand.ts"; @@ -15,7 +15,7 @@ index 4808d16401..dc702af8f8 100644 export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers")(function* () { const ipc = yield* DesktopIpc.DesktopIpc; yield* installNotificationBadge(); -@@ -94,6 +100,9 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers" +@@ -97,6 +103,9 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers" yield* ipc.handle(AppActivationIpc.complete); yield* ipc.handle(WebLinksIpc.setReady); @@ -26,14 +26,13 @@ index 4808d16401..dc702af8f8 100644 yield* ipc.handle(completeLegacyLocalStorage); yield* ipc.handleSync(getAppBranding); diff --git a/apps/desktop/src/ipc/channels.ts b/apps/desktop/src/ipc/channels.ts -index dceb96e655..55da5a9d8c 100644 +index d0dcdda19e..3019fd1a5d 100644 --- a/apps/desktop/src/ipc/channels.ts +++ b/apps/desktop/src/ipc/channels.ts -@@ -133,3 +133,7 @@ export const RECEIVE_PROVIDER_AUTH_CALLBACK_CHANNEL = "desktop:receive-provider- - export const CANCEL_PROVIDER_AUTH_CALLBACK_CHANNEL = "desktop:cancel-provider-auth-callback"; - export const TAKE_LEGACY_LOCAL_STORAGE_CHANNEL = "desktop:take-legacy-local-storage"; +@@ -143,3 +143,6 @@ export const TAKE_LEGACY_LOCAL_STORAGE_CHANNEL = "desktop:take-legacy-local-stor export const COMPLETE_LEGACY_LOCAL_STORAGE_CHANNEL = "desktop:complete-legacy-local-storage"; -+ + + export const RESTART_AUDIO_SERVICE_CHANNEL = "desktop:restart-audio-service"; +export const LEGACY_DATABASE_SUPPORTED_CHANNEL = "desktop:legacy-database-supported"; +export const LEGACY_DATABASE_BYTES_CHANNEL = "desktop:legacy-database-bytes"; +export const LEGACY_DATABASE_REMOVE_CHANNEL = "desktop:legacy-database-remove"; @@ -98,10 +97,10 @@ index 0000000000..277e1908ca + }), +}); diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts -index 045d6dba29..e19a6c373d 100644 +index 26daa80b0c..da11ebbd0a 100644 --- a/apps/desktop/src/preload.ts +++ b/apps/desktop/src/preload.ts -@@ -299,6 +299,14 @@ contextBridge.exposeInMainWorld("desktopBridge", { +@@ -333,6 +333,14 @@ contextBridge.exposeInMainWorld("desktopBridge", { downloadUpdate: () => ipcRenderer.invoke(IpcChannels.UPDATE_DOWNLOAD_CHANNEL), installUpdate: (expectedVersion) => ipcRenderer.invoke(IpcChannels.UPDATE_INSTALL_CHANNEL, expectedVersion), @@ -251,10 +250,10 @@ index b4668a07f2..ef2f2a38c0 100644 + ); +} diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts -index 39f96754a6..3632f9fd6b 100644 +index 25339cb321..cd6cbdc39e 100644 --- a/packages/contracts/src/ipc.ts +++ b/packages/contracts/src/ipc.ts -@@ -1143,6 +1143,12 @@ export interface DesktopBridge { +@@ -1175,6 +1175,12 @@ export interface DesktopBridge { /** With a version, installs only that downloaded build. */ installUpdate: (expectedVersion?: string) => Promise; onUpdateState: (listener: (state: DesktopUpdateState) => void) => () => void; diff --git a/patches/0012-flatpak-update-channel.patch b/patches/0012-flatpak-update-channel.patch index 68669c4..ac4ebc8 100644 --- a/patches/0012-flatpak-update-channel.patch +++ b/patches/0012-flatpak-update-channel.patch @@ -1,8 +1,8 @@ diff --git a/apps/desktop/src/updates/DesktopUpdates.test.ts b/apps/desktop/src/updates/DesktopUpdates.test.ts -index 1b14a0497b..d5191e550c 100644 +index 44777e1c70..3187bf1b8b 100644 --- a/apps/desktop/src/updates/DesktopUpdates.test.ts +++ b/apps/desktop/src/updates/DesktopUpdates.test.ts -@@ -92,6 +92,11 @@ describe("DesktopUpdates", () => { +@@ -95,6 +95,11 @@ describe("DesktopUpdates", () => { const result = yield* updates.check("manual"); assert.isFalse(result.checked); assert.equal(harness.checkCount(), 0); @@ -15,10 +15,10 @@ index 1b14a0497b..d5191e550c 100644 Effect.scoped, Effect.provide(harness.layer), diff --git a/apps/desktop/src/updates/DesktopUpdates.ts b/apps/desktop/src/updates/DesktopUpdates.ts -index 75ef423a27..a70eb7d771 100644 +index 3ca3eacfce..a0a883b14e 100644 --- a/apps/desktop/src/updates/DesktopUpdates.ts +++ b/apps/desktop/src/updates/DesktopUpdates.ts -@@ -1208,6 +1208,9 @@ export const make = Effect.gen(function* () { +@@ -1347,6 +1347,9 @@ export const make = Effect.gen(function* () { options?: { readonly minimumVersion?: string | undefined }, ) { yield* Effect.annotateCurrentSpan({ channel: nextChannel }); @@ -29,10 +29,10 @@ index 75ef423a27..a70eb7d771 100644 return yield* new DesktopUpdateChannelManagedError({ channel: nextChannel, diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx -index 3dc9566e89..fcace2f695 100644 +index 633e18a567..ebd285182d 100644 --- a/apps/web/src/components/settings/SettingsPanels.tsx +++ b/apps/web/src/components/settings/SettingsPanels.tsx -@@ -356,6 +356,8 @@ function AboutVersionSection() { +@@ -359,6 +359,8 @@ function AboutVersionSection() { Review @@ -41,7 +41,7 @@ index 3dc9566e89..fcace2f695 100644 ) : ( "Switches this app and every connected machine whose database the target release supports." ) -@@ -364,6 +366,9 @@ function AboutVersionSection() { +@@ -367,6 +369,9 @@ function AboutVersionSection() { control={