diff --git a/cli/src/commands/agent_host.rs b/cli/src/commands/agent_host.rs
index ac477a67455..b5330e4df76 100644
--- a/cli/src/commands/agent_host.rs
+++ b/cli/src/commands/agent_host.rs
@@ -319,7 +319,7 @@ impl AgentHostManager {
 				e = child.wait() => {
 					info!(self.log, "[{} process]: exited: {:?}", commit_prefix, e);
 					if let Some(o) = opener.take() {
-						o.open(Err(format!("Server exited before ready: {:?}", e)));
+						o.open(Err(format!("Server exited before ready: {e:?}")));
 					}
 					break;
 				}
diff --git a/src/vs/platform/agentHost/node/remoteAgentHostProtocolClient.ts b/src/vs/platform/agentHost/electron-browser/remoteAgentHostProtocolClient.ts
similarity index 100%
rename from src/vs/platform/agentHost/node/remoteAgentHostProtocolClient.ts
rename to src/vs/platform/agentHost/electron-browser/remoteAgentHostProtocolClient.ts
diff --git a/src/vs/platform/agentHost/electron-browser/remoteAgentHostService.ts b/src/vs/platform/agentHost/electron-browser/remoteAgentHostService.ts
index 3ca6561955a..38714cb1d9d 100644
--- a/src/vs/platform/agentHost/electron-browser/remoteAgentHostService.ts
+++ b/src/vs/platform/agentHost/electron-browser/remoteAgentHostService.ts
@@ -5,6 +5,6 @@
 
 import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
 import { IRemoteAgentHostService } from '../common/remoteAgentHostService.js';
-import { RemoteAgentHostService } from '../node/remoteAgentHostService.js';
+import { RemoteAgentHostService } from './remoteAgentHostServiceImpl.js';
 
 registerSingleton(IRemoteAgentHostService, RemoteAgentHostService, InstantiationType.Delayed);
diff --git a/src/vs/platform/agentHost/node/remoteAgentHostService.ts b/src/vs/platform/agentHost/electron-browser/remoteAgentHostServiceImpl.ts
similarity index 100%
rename from src/vs/platform/agentHost/node/remoteAgentHostService.ts
rename to src/vs/platform/agentHost/electron-browser/remoteAgentHostServiceImpl.ts
diff --git a/src/vs/platform/agentHost/node/webSocketClientTransport.ts b/src/vs/platform/agentHost/electron-browser/webSocketClientTransport.ts
similarity index 100%
rename from src/vs/platform/agentHost/node/webSocketClientTransport.ts
rename to src/vs/platform/agentHost/electron-browser/webSocketClientTransport.ts
diff --git a/src/vs/platform/agentHost/test/node/agentSideEffects.test.ts b/src/vs/platform/agentHost/test/node/agentSideEffects.test.ts
index 0b5e21b4cde..a71600cb0f2 100644
--- a/src/vs/platform/agentHost/test/node/agentSideEffects.test.ts
+++ b/src/vs/platform/agentHost/test/node/agentSideEffects.test.ts
@@ -15,6 +15,7 @@ import { SessionStatus } from '../../common/state/sessionState.js';
 import { AgentSideEffects } from '../../node/agentSideEffects.js';
 import { SessionStateManager } from '../../node/sessionStateManager.js';
 import { MockAgent } from './mockAgent.js';
+import { cwd } from '../../../../base/common/process.js';
 
 // ---- Tests ------------------------------------------------------------------
 
@@ -283,7 +284,7 @@ suite('AgentSideEffects', () => {
 
 		test('throws when the target is not a directory', async () => {
 			await assert.rejects(
-				() => sideEffects.handleBrowseDirectory(URI.file('/Users/roblou/code/vscode/package.json')),
+				() => sideEffects.handleBrowseDirectory(URI.file(cwd() + '/package.json')),
 				/Not a directory/,
 			);
 		});