The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 21:00 UTC
fix(server): only offer desktop app updates the desktop can install (#30804)
Julius Marminge committed
Nov 11, 2026 at 15:59 UTC
35f539844563ca33eb650a5aa8efd06cb4f45b61
10 files changed
+78
-7
apps/desktop/src/app/DesktopState.ts
+3
@@ -17,6 +17,8 @@ export class DesktopState extends Context.Service<
17
{
18
readonly backendReady: Ref.Ref<boolean>;
19
readonly quitting: Ref.Ref<boolean>;
20
+ // Set by DesktopUpdates.configure, which runs before the first backend start.
21
+ readonly canInstallUpdates: Ref.Ref<boolean>;
22
readonly primaryBackendStartup: SubscriptionRef.SubscriptionRef<PrimaryBackendStartup>;
23
}
24
>()("@t3tools/desktop/app/DesktopState") {}
@@ -24,6 +26,7 @@ export class DesktopState extends Context.Service<
26
const make = Effect.all({
27
backendReady: Ref.make(false),
28
quitting: Ref.make(false),
29
+ canInstallUpdates: Ref.make(false),
30
primaryBackendStartup: SubscriptionRef.make<PrimaryBackendStartup>({ _tag: "Starting" }),
31
});
32
apps/desktop/src/backend/DesktopBackendConfiguration.test.ts
+5
-1
@@ -19,6 +19,7 @@ import * as DesktopBackendConfiguration from "./DesktopBackendConfiguration.ts";
19
import * as DesktopShellEnvironment from "../shell/DesktopShellEnvironment.ts";
20
import * as DesktopConfig from "../app/DesktopConfig.ts";
21
import * as DesktopServerExposure from "./DesktopServerExposure.ts";
22
+import * as DesktopState from "../app/DesktopState.ts";
23
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
24
import * as DesktopWslEnvironment from "../wsl/DesktopWslEnvironment.ts";
25
import * as DesktopWslServerTree from "../wsl/DesktopWslServerTree.ts";
@@ -32,7 +33,10 @@ const layerShellEnvironment = (prepared = true) =>
33
});
34
35
const layerBackendConfiguration = (prepared = true) =>
35
- DesktopBackendConfiguration.layer.pipe(Layer.provide(layerShellEnvironment(prepared)));
36
+ DesktopBackendConfiguration.layer.pipe(
37
+ Layer.provide(layerShellEnvironment(prepared)),
38
+ Layer.provide(DesktopState.layer),
39
+ );
40
41
const layerServerExposure = Layer.succeed(DesktopServerExposure.DesktopServerExposure, {
42
getState: Effect.die("unexpected getState"),
apps/desktop/src/backend/DesktopBackendConfiguration.ts
+6
@@ -13,6 +13,7 @@ import * as FileSystem from "effect/FileSystem";
13
import * as Layer from "effect/Layer";
14
import * as Option from "effect/Option";
15
import * as PlatformError from "effect/PlatformError";
16
+import * as Ref from "effect/Ref";
17
import * as Schema from "effect/Schema";
18
import * as SynchronizedRef from "effect/SynchronizedRef";
19
@@ -21,6 +22,7 @@ import serverPackageJson from "../../../server/package.json" with { type: "json"
22
import * as DesktopBackendManager from "./DesktopBackendManager.ts";
23
import * as DesktopCliShim from "../app/DesktopCliShim.ts";
24
import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
25
+import * as DesktopState from "../app/DesktopState.ts";
26
import * as DesktopServerExposure from "./DesktopServerExposure.ts";
27
import * as DesktopShellEnvironment from "../shell/DesktopShellEnvironment.ts";
28
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
@@ -488,6 +490,7 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv
490
readonly resourceMonitorPath: Option.Option<string>;
491
readonly cliPath: Option.Option<string>;
492
readonly shellEnvironmentPrepared: boolean;
493
+ readonly desktopAppUpdate: boolean;
494
},
495
): Effect.fn.Return<
496
DesktopBackendManager.DesktopBackendStartConfig,
@@ -511,6 +514,7 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv
514
tailscaleServePort: backendExposure.tailscaleServePort,
515
desktopTelemetryFd: 4,
516
desktopTelemetryControlFd: 5,
517
+ desktopAppUpdate: input.desktopAppUpdate,
518
desktopBrowserFd: 6,
519
desktopBrowserControlFd: 7,
520
...Option.match(input.resourceMonitorPath, {
@@ -726,6 +730,7 @@ export const make = Effect.gen(function* () {
730
const wslEnvironment = yield* DesktopWslEnvironment.DesktopWslEnvironment;
731
const wslServerTree = yield* DesktopWslServerTree.DesktopWslServerTree;
732
const settings = yield* DesktopAppSettings.DesktopAppSettings;
733
+ const desktopState = yield* DesktopState.DesktopState;
734
const mac = yield* Mac.Mac;
735
const random = yield* SecureRandom.SecureRandom;
736
// Random generation yields; serialize it so concurrent backends cannot capture distinct bootstrap secrets.
@@ -793,6 +798,7 @@ export const make = Effect.gen(function* () {
798
resourceMonitorPath,
799
cliPath,
800
shellEnvironmentPrepared,
801
+ desktopAppUpdate: yield* Ref.get(desktopState.canInstallUpdates),
802
}).pipe(
803
Effect.provideService(DesktopEnvironment.DesktopEnvironment, environment),
804
Effect.provideService(DesktopServerExposure.DesktopServerExposure, serverExposure),
apps/desktop/src/updates/DesktopUpdates.test.ts
+9
-3
@@ -83,16 +83,22 @@ describe("DesktopUpdates", () => {
83
Effect.scoped(
84
Effect.gen(function* () {
85
const updates = yield* DesktopUpdates.DesktopUpdates;
86
+ const desktopState = yield* DesktopState.DesktopState;
87
yield* updates.configure;
87
- return yield* updates.getState;
88
+ return {
89
+ state: yield* updates.getState,
90
+ canInstallUpdates: yield* Ref.get(desktopState.canInstallUpdates),
91
+ };
92
}),
93
).pipe(Effect.provide(makeHarness({ platform: "linux", packageType }).layer));
94
95
const deb = yield* linuxState("deb\n");
92
- assert.equal(deb.status, "idle");
96
+ assert.equal(deb.state.status, "idle");
97
+ assert.isTrue(deb.canInstallUpdates);
98
99
const unmarked = yield* linuxState(undefined);
95
- assert.equal(unmarked.status, "disabled");
100
+ assert.equal(unmarked.state.status, "disabled");
101
+ assert.isFalse(unmarked.canInstallUpdates);
102
}),
103
);
104
apps/desktop/src/updates/DesktopUpdates.ts
+2
@@ -1150,6 +1150,8 @@ export const make = Effect.gen(function* () {
1150
1151
const settings = yield* desktopSettings.get;
1152
const disabledReason = yield* resolveDisabledReason;
1153
+ // A blocked nightly channel still lets the user switch back to stable, so it stays updatable.
1154
+ yield* Ref.set(desktopState.canInstallUpdates, Option.isNone(disabledReason));
1155
yield* setState(
1156
yield* baseUpdateState(
1157
settings.updateChannel,
apps/server/src/cli/config.ts
+2
@@ -383,6 +383,7 @@ export const resolveServerConfig = Effect.fn("config.resolveServerConfig")(funct
383
const shellEnvironmentPrepared = bootstrap?.shellEnvironmentPrepared;
384
const desktopTelemetryFd = bootstrap?.desktopTelemetryFd;
385
const desktopTelemetryControlFd = bootstrap?.desktopTelemetryControlFd;
386
+ const desktopAppUpdate = bootstrap?.desktopAppUpdate;
387
const desktopBrowserFd = bootstrap?.desktopBrowserFd;
388
const desktopBrowserControlFd = bootstrap?.desktopBrowserControlFd;
389
const resourceMonitorPath = bootstrap?.resourceMonitorPath;
@@ -516,6 +517,7 @@ export const resolveServerConfig = Effect.fn("config.resolveServerConfig")(funct
517
...(shellEnvironmentPrepared === undefined ? {} : { shellEnvironmentPrepared }),
518
desktopTelemetryFd,
519
desktopTelemetryControlFd,
520
+ ...(desktopAppUpdate === undefined ? {} : { desktopAppUpdate }),
521
desktopBrowserFd,
522
desktopBrowserControlFd,
523
resourceMonitorPath,
apps/server/src/config.ts
+1
@@ -100,6 +100,7 @@ export class ServerConfig extends Context.Service<
100
readonly shellEnvironmentPrepared?: boolean | undefined;
101
readonly desktopTelemetryFd?: number | undefined;
102
readonly desktopTelemetryControlFd?: number | undefined;
103
+ readonly desktopAppUpdate?: boolean | undefined;
104
readonly desktopBrowserFd?: number | undefined;
105
readonly desktopBrowserControlFd?: number | undefined;
106
readonly resourceMonitorPath?: string | undefined;
apps/server/src/environment/ServerEnvironment.test.ts
+44
@@ -123,6 +123,50 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("ServerEnvironmen
123
}
124
}),
125
);
126
+ it.effect.each([
127
+ { desktopAppUpdate: false, advertised: undefined },
128
+ { desktopAppUpdate: true, advertised: true },
129
+ ])(
130
+ "advertises desktop app updates only when the desktop can install them ($desktopAppUpdate)",
131
+ ({ desktopAppUpdate, advertised }) =>
132
+ Effect.gen(function* () {
133
+ const fs = yield* FileSystem.FileSystem;
134
+ const baseDir = yield* fs.makeTempDirectoryScoped();
135
+ const config = yield* makeServerConfig(baseDir);
136
+ yield* fs.makeDirectory(config.stateDir, { recursive: true });
137
+ const descriptor = yield* Effect.gen(function* () {
138
+ const environment = yield* ServerEnvironment.ServerEnvironment;
139
+ return yield* environment.getDescriptor;
140
+ }).pipe(
141
+ Effect.provide(
142
+ ServerEnvironment.layer.pipe(
143
+ Layer.provide(layerEmptySecretStore),
144
+ Layer.provide(
145
+ ServerConfig.layer({
146
+ ...config,
147
+ mode: "desktop",
148
+ desktopTelemetryControlFd: 5,
149
+ desktopAppUpdate,
150
+ }),
151
+ ),
152
+ ),
153
+ ),
154
+ Effect.provideService(HostProcess.Environment, {}),
155
+ );
156
+ const capabilities = descriptor.capabilities;
157
+ expect({
158
+ serverSelfUpdate: capabilities.serverSelfUpdate,
159
+ desktopAppUpdate: capabilities.desktopAppUpdate,
160
+ desktopAppChannelSwitch: capabilities.desktopAppChannelSwitch,
161
+ serverSelfUpdateProgress: capabilities.serverSelfUpdateProgress,
162
+ }).toEqual({
163
+ serverSelfUpdate: "desktop-managed",
164
+ desktopAppUpdate: advertised,
165
+ desktopAppChannelSwitch: advertised,
166
+ serverSelfUpdateProgress: advertised,
167
+ });
168
+ }),
169
+ );
170
it.effect.each([
171
{ platform: "darwin", architecture: "arm64", supported: true },
172
{ platform: "linux", architecture: "x64", supported: true },
apps/server/src/environment/ServerEnvironment.ts
+4
-3
@@ -201,10 +201,11 @@ export const make = Effect.gen(function* () {
201
launcherManaged: launcher.managed,
202
});
203
const serverInstallation = serverSelfUpdate === null ? yield* resolveServerInstallation : null;
204
- // Desktop and server ship together; a control fd guarantees requestDesktopUpdate support.
205
-
204
+ // The desktop reports whether it can install updates; requests travel over its control fd.
205
const desktopAppUpdate =
207
- serverSelfUpdate === "desktop-managed" && serverConfig.desktopTelemetryControlFd !== undefined;
206
+ serverSelfUpdate === "desktop-managed" &&
207
+ serverConfig.desktopAppUpdate === true &&
208
+ serverConfig.desktopTelemetryControlFd !== undefined;
209
210
const databaseMigration = databaseMigrationHead(serverConfig.dbPath);
211
const descriptor: ExecutionEnvironmentDescriptor = {
packages/contracts/src/desktopBootstrap.ts
+2
@@ -26,6 +26,8 @@ export const DesktopBackendBootstrap = Schema.Struct({
26
otlpLogsUrl: Schema.optional(Schema.String),
27
desktopTelemetryFd: Schema.optionalKey(PositiveInt),
28
desktopTelemetryControlFd: Schema.optionalKey(PositiveInt),
29
+ // Whether the spawning desktop app can install updates when the server requests one.
30
+ desktopAppUpdate: Schema.optionalKey(Schema.Boolean),
31
desktopBrowserFd: Schema.optionalKey(PositiveInt),
32
desktopBrowserControlFd: Schema.optionalKey(PositiveInt),
33
resourceMonitorPath: Schema.optionalKey(TrimmedNonEmptyString),