From 662ac587373f411cb7d45cdecacd89584058c52d Mon Sep 17 00:00:00 2001 From: Ito Date: Mon, 7 Jul 2025 10:21:41 -0700 Subject: [PATCH 1/2] fix(auth): Apply static workspace ID for Eclipse Che instances --- packages/core/src/shared/vscode/env.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/core/src/shared/vscode/env.ts b/packages/core/src/shared/vscode/env.ts index 5ee891cc7d3..9cc56f168e3 100644 --- a/packages/core/src/shared/vscode/env.ts +++ b/packages/core/src/shared/vscode/env.ts @@ -307,6 +307,11 @@ export async function getMachineId(): Promise { // TODO: use `vscode.env.machineId` instead? return 'browser' } + // Eclipse Che-based envs (backing compute rotates, not classified as a web instance) + // TODO: use `vscode.env.machineId` instead? + if (process.env.CHE_WORKSPACE_ID) { + return process.env.CHE_WORKSPACE_ID + } const proc = new ChildProcess('hostname', [], { collect: true, logging: 'no' }) // TODO: check exit code. return (await proc.run()).stdout.trim() ?? 'unknown-host' From 526052bdac26ac0bd037814c310c0d23faf1cdb2 Mon Sep 17 00:00:00 2001 From: Ito Date: Wed, 23 Jul 2025 09:51:04 -0700 Subject: [PATCH 2/2] Add RedHat Dev Workspaces --- packages/core/src/shared/vscode/env.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/core/src/shared/vscode/env.ts b/packages/core/src/shared/vscode/env.ts index 9cc56f168e3..abd9c58ae2d 100644 --- a/packages/core/src/shared/vscode/env.ts +++ b/packages/core/src/shared/vscode/env.ts @@ -312,6 +312,10 @@ export async function getMachineId(): Promise { if (process.env.CHE_WORKSPACE_ID) { return process.env.CHE_WORKSPACE_ID } + // RedHat Dev Workspaces (run some VSC web variant) + if (process.env.DEVWORKSPACE_ID) { + return process.env.DEVWORKSPACE_ID + } const proc = new ChildProcess('hostname', [], { collect: true, logging: 'no' }) // TODO: check exit code. return (await proc.run()).stdout.trim() ?? 'unknown-host'