From 4698914161bf695fad30f78637761781a82e26a5 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 8 Sep 2026 11:01:35 -0800 Subject: [PATCH] Fix incorrect data path being used --- CHANGELOG.md | 6 ++++++ patches/integration.diff | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9318d421f24..baa0f2d6cb43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.136.1 + +### Fixed + +- The data path was incorrectly being set to `~/.vscode-server-oss/data`. + ## [4.136.1](https://github.com/coder/code-server/releases/tag/v4.136.1) - 2026-09-08 Code v1.136.1 diff --git a/patches/integration.diff b/patches/integration.diff index 01d764f657d6..271c5634a272 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -56,15 +56,15 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts +} + +function createDirs(args: ServerParsedArgs): string { -+ const REMOTE_DATA_FOLDER = args['server-data-dir'] || process.env['VSCODE_AGENT_FOLDER'] || join(os.homedir(), product.serverDataFolderName || '.vscode-remote'); -+ const USER_DATA_PATH = join(REMOTE_DATA_FOLDER, 'data'); ++ const REMOTE_DATA_FOLDER = args['server-data-dir'] || args['user-data-dir'] || process.env['VSCODE_AGENT_FOLDER'] || join(os.homedir(), product.serverDataFolderName || '.vscode-remote'); ++ const USER_DATA_PATH = args['user-data-dir'] || join(REMOTE_DATA_FOLDER, 'data'); + const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User'); + const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage'); + const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History'); + const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine'); + args['user-data-dir'] = USER_DATA_PATH; + const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath); -+ const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions'); ++ const BUILTIN_EXTENSIONS_FOLDER_PATH = args['builtin-extensions-dir'] || join(APP_ROOT, 'extensions'); + args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH; + args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions'); +