Skip to content

Commit d8dd6a9

Browse files
juliusmarmingeclaude
juliusmarminge
and
claude
committed
fix(desktop): SSH environments see a release mirror set in the login shell
A desktop launched from the dock or a menu gets T3CODE_RELEASE_BASE_URL only once the login shell environment is installed, after the SSH layer is built. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent cfa8dfd commit d8dd6a9

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎apps/desktop/src/main.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ const layerDesktopSshEnvironment = Layer.unwrap(
108108
const environment = yield* DesktopEnvironment.DesktopEnvironment;
109109
const env = yield* HostProcess.Environment;
110110
return DesktopSshEnvironment.layer({
111-
resolveCliRunner: Effect.succeed(
111+
// Per connect: the login shell's environment is installed after this layer is built.
112+
resolveCliRunner: Effect.sync(() =>
112113
DesktopSshEnvironment.resolveDesktopSshCliRunner(environment, env),
113114
),
114115
});

‎apps/desktop/src/shell/DesktopShellEnvironment.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ const LOGIN_SHELL_ENV_NAMES = [
106106
"NODE_EXTRA_CA_CERTS",
107107
"T3CODE_TELEMETRY_ENABLED",
108108
"T3CODE_GITHUB_APP_CLIENT_ID",
109+
"T3CODE_RELEASE_BASE_URL",
109110
"__MISE_DIFF",
110111
"JAVA_HOME",
111112
] as const;
@@ -478,6 +479,7 @@ const installPosixEnvironment = Effect.fn("desktop.shellEnvironment.installPosix
478479
"JAVA_HOME",
479480
"T3CODE_TELEMETRY_ENABLED",
480481
"T3CODE_GITHUB_APP_CLIENT_ID",
482+
"T3CODE_RELEASE_BASE_URL",
481483
] as const) {
482484
if (!config.env[name] && shellEnvironment[name]) {
483485
config.env[name] = shellEnvironment[name];

‎packages/contracts/src/resourceTelemetry.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ export const ShellEnvironmentPatch = Schema.Struct({
318318
NODE_EXTRA_CA_CERTS: Schema.optionalKey(Schema.NullOr(Schema.String)),
319319
T3CODE_TELEMETRY_ENABLED: Schema.optionalKey(Schema.NullOr(Schema.String)),
320320
T3CODE_GITHUB_APP_CLIENT_ID: Schema.optionalKey(Schema.NullOr(Schema.String)),
321+
T3CODE_RELEASE_BASE_URL: Schema.optionalKey(Schema.NullOr(Schema.String)),
321322
__MISE_DIFF: Schema.optionalKey(Schema.NullOr(Schema.String)),
322323
JAVA_HOME: Schema.optionalKey(Schema.NullOr(Schema.String)),
323324
FNM_DIR: Schema.optionalKey(Schema.NullOr(Schema.String)),

0 commit comments

Comments
 (0)