From f649c4bec4260ab93eadbb9018a47b11b37dd19c Mon Sep 17 00:00:00 2001
From: Spencer Ng <spenceng@amazon.com>
Date: Thu, 7 Mar 2024 16:27:58 -0800
Subject: [PATCH 1/3] PR6: webview, local-storage, sagemaker-integration

---
 patches/local-storage.diff         |  66 +++++
 patches/sagemaker-integration.diff | 395 +++++++++++++++++++++++++++++
 patches/series                     |   5 +-
 patches/webview.diff               | 137 ++++++++++
 4 files changed, 602 insertions(+), 1 deletion(-)
 create mode 100644 patches/local-storage.diff
 create mode 100644 patches/sagemaker-integration.diff
 create mode 100644 patches/webview.diff

diff --git a/patches/local-storage.diff b/patches/local-storage.diff
new file mode 100644
index 000000000..90c24abe7
--- /dev/null
+++ b/patches/local-storage.diff
@@ -0,0 +1,66 @@
+Make storage local to the remote server
+
+This solves two problems:
+  1. Extensions running in the browser (like Vim) might use these paths
+     directly instead of using the file service and most likely can't write
+     to `/User` on disk.
+  2. Settings will be stored in the file system instead of in browser
+     storage. Using browser storage makes sharing or seeding settings
+     between browsers difficult. We may want to revisit this once/if we get
+     settings sync.
+
+Unfortunately this does not affect state which uses a separate method with
+IndexedDB and does not appear nearly as easy to redirect to disk.
+
+To test install the Vim extension and make sure something that uses file storage
+works (history recall for example) and change settings from the UI and on disk
+while making sure they appear on the other side.
+
+Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/server/node/webClientServer.ts
++++ sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
+@@ -332,6 +332,7 @@ export class WebClientServer {
+ 		const workbenchWebConfiguration = {
+ 			remoteAuthority,
+ 			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
++			userDataPath: this._environmentService.userDataPath,
+ 			_wrapWebWorkerExtHostInIframe,
+ 			developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
+ 			settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
+Index: sagemaker-code-editor/vscode/src/vs/workbench/browser/web.api.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/browser/web.api.ts
++++ sagemaker-code-editor/vscode/src/vs/workbench/browser/web.api.ts
+@@ -276,6 +276,11 @@ export interface IWorkbenchConstructionO
+ 	 */
+ 	readonly configurationDefaults?: Record<string, any>;
+ 
++	/**
++	 * Path to the user data directory.
++	 */
++	readonly userDataPath?: string
++
+ 	//#endregion
+ 
+ 	//#region Profile options
+Index: sagemaker-code-editor/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
++++ sagemaker-code-editor/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
+@@ -102,7 +102,14 @@ export class BrowserWorkbenchEnvironment
+ 	get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); }
+ 
+ 	@memoize
+-	get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); }
++	get userRoamingDataHome(): URI { return joinPath(URI.file(this.userDataPath).with({ scheme: Schemas.vscodeRemote }), 'User'); }
++
++	get userDataPath(): string {
++		if (!this.options.userDataPath) {
++			throw new Error('userDataPath was not provided to the browser');
++		}
++		return this.options.userDataPath;
++	}
+ 
+ 	@memoize
+ 	get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }
diff --git a/patches/sagemaker-integration.diff b/patches/sagemaker-integration.diff
new file mode 100644
index 000000000..a9fa925b7
--- /dev/null
+++ b/patches/sagemaker-integration.diff
@@ -0,0 +1,395 @@
+Index: sagemaker-code-editor/vscode/src/vs/workbench/browser/client.ts
+===================================================================
+--- /dev/null
++++ sagemaker-code-editor/vscode/src/vs/workbench/browser/client.ts
+@@ -0,0 +1,61 @@
++import { Disposable } from 'vs/base/common/lifecycle';
++import { CommandsRegistry } from 'vs/platform/commands/common/commands';
++import { MenuId, MenuRegistry } from "vs/platform/actions/common/actions";
++import { localize } from "vs/nls";
++import { ILogService } from "vs/platform/log/common/log";
++
++export class SagemakerServerClient extends Disposable {
++	constructor (
++		@ILogService private logService: ILogService
++	) {
++		super();
++
++		this.logService.debug('Initializing SagemakerServerClient...');
++		this.registerSagemakerCommands();
++	}
++
++	static LOGOUT_COMMAND_ID = 'sagemaker.logout';
++	static COOKIE_COMMAND_ID = 'sagemaker.parseCookies';
++
++	private registerSagemakerCommands() {
++		const authMode: string | undefined = this.getCookieValue('authMode');
++		const expiryTime: string | undefined = this.getCookieValue('expiryTime');
++		const studioUserProfileName: string | undefined = this.getCookieValue('studioUserProfileName')
++		const ssoExpiryTimestamp: string | undefined = this.getCookieValue('ssoExpiryTimestamp')
++		const redirectURL: string | undefined = this.getCookieValue('redirectURL')
++
++		this.logService.debug('Registering sagemaker commands...');
++
++		CommandsRegistry.registerCommand(SagemakerServerClient.COOKIE_COMMAND_ID, () => {
++			return {
++				authMode: authMode,
++				expiryTime: expiryTime,
++				ssoExpiryTimestamp: ssoExpiryTimestamp,
++				studioUserProfileName: studioUserProfileName,
++				redirectURL: redirectURL
++			};
++		});
++
++		CommandsRegistry.registerCommand(SagemakerServerClient.LOGOUT_COMMAND_ID, () => {
++			const currentUrl = new URL(window.location.href);
++			const hostname = currentUrl.hostname;
++			const pathComponents = currentUrl.pathname.split('/');
++			const logoutUrl = `https://${hostname}/${pathComponents[1]}/${pathComponents[2]}/logout`;
++			window.location.href = logoutUrl;
++		});
++
++		for (const menuId of [MenuId.CommandPalette, MenuId.MenubarHomeMenu]) {
++			MenuRegistry.appendMenuItem(menuId, {
++				command: {
++					id: SagemakerServerClient.LOGOUT_COMMAND_ID,
++					title: localize('logout', "{0}: Log out", 'Sagemaker'),
++				},
++			});
++		}
++	}
++
++	private getCookieValue(name: string): string | undefined {
++		const match = document.cookie.match('(^|[^;]+)\\s*' + name + '\\s*=\\s*([^;]+)'); // See https://stackoverflow.com/a/25490531
++		return match ? match.pop() : undefined;
++	}
++}
+\ No newline at end of file
+Index: sagemaker-code-editor/vscode/src/vs/workbench/browser/web.main.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/browser/web.main.ts
++++ sagemaker-code-editor/vscode/src/vs/workbench/browser/web.main.ts
+@@ -95,6 +95,7 @@ import { TunnelSource } from 'vs/workbench/services/re
+ import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService';
+ import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
+ import { TunnelSource } from 'vs/workbench/services/remote/common/tunnelModel';
++import { SagemakerServerClient } from 'vs/workbench/browser/client';
+ 
+ export class BrowserMain extends Disposable {
+ 
+@@ -129,6 +130,9 @@ export class BrowserMain extends Disposable {
+ 
+ 		// Startup
+ 		const instantiationService = workbench.startup();
++
++		// Create instance of SagemakerServerClient
++		this._register(instantiationService.createInstance(SagemakerServerClient));
+ 
+ 		// Window
+ 		this._register(instantiationService.createInstance(BrowserWindow));
+Index: sagemaker-code-editor/vscode/product.json
+===================================================================
+--- sagemaker-code-editor.orig/vscode/product.json
++++ sagemaker-code-editor/vscode/product.json
+@@ -1,6 +1,6 @@
+ {
+-	"nameShort": "Code - OSS",
+-	"nameLong": "Code - OSS",
++	"nameShort": "SageMaker Code Editor",
++	"nameLong": "SageMaker Code Editor",
+ 	"applicationName": "code-oss",
+ 	"dataFolderName": ".vscode-oss",
+ 	"win32MutexName": "vscodeoss",
+@@ -34,53 +34,17 @@
+ 	"urlProtocol": "code-oss",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"builtInExtensions": [
+-		{
+-			"name": "ms-vscode.js-debug-companion",
+-			"version": "1.1.2",
+-			"sha256": "e034b8b41beb4e97e02c70f7175bd88abe66048374c2bd629f54bb33354bc2aa",
+-			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
+-			"metadata": {
+-				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
+-				"publisherId": {
+-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+-					"publisherName": "ms-vscode",
+-					"displayName": "Microsoft",
+-					"flags": "verified"
+-				},
+-				"publisherDisplayName": "Microsoft"
+-			}
+-		},
+-		{
+-			"name": "ms-vscode.js-debug",
+-			"version": "1.83.1",
+-			"sha256": "1452fdbab8d0d83ca5765bb66170d50b005c97ca4dcd13e154c3401d842a92d4",
+-			"repo": "https://github.com/microsoft/vscode-js-debug",
+-			"metadata": {
+-				"id": "25629058-ddac-4e17-abba-74678e126c5d",
+-				"publisherId": {
+-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+-					"publisherName": "ms-vscode",
+-					"displayName": "Microsoft",
+-					"flags": "verified"
+-				},
+-				"publisherDisplayName": "Microsoft"
+-			}
+-		},
+-		{
+-			"name": "ms-vscode.vscode-js-profile-table",
+-			"version": "1.0.3",
+-			"sha256": "b9dab017506d9e6a469a0f82b392e4cb1d7a25a4843f1db8ba396cbee209cfc5",
+-			"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
+-			"metadata": {
+-				"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",
+-				"publisherId": {
+-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+-					"publisherName": "ms-vscode",
+-					"displayName": "Microsoft",
+-					"flags": "verified"
+-				},
+-				"publisherDisplayName": "Microsoft"
+-			}
+-		}
++	],
++	"extensionsGallery": {
++		"serviceUrl": "https://open-vsx.org/vscode/gallery",
++		"itemUrl": "https://open-vsx.org/vscode/item",
++		"resourceUrlTemplate": "https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}",
++		"controlUrl": "",
++		"recommendationsUrl": "",
++		"nlsBaseUrl": "",
++		"publisherUrl": ""
++	},
++	"linkProtectionTrustedDomains": [
++		"https://open-vsx.org"
+ 	]
+-}
+\ No newline at end of file
++}
+Index: sagemaker-code-editor/vscode/src/vs/platform/product/common/product.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/platform/product/common/product.ts
++++ sagemaker-code-editor/vscode/src/vs/platform/product/common/product.ts
+@@ -59,15 +59,17 @@ else {
+ 	if (Object.keys(product).length === 0) {
+ 		Object.assign(product, {
+ 			version: '1.82.0-dev',
+-			nameShort: 'Code - OSS Dev',
+-			nameLong: 'Code - OSS Dev',
++			nameShort: 'CodeEditor',
++			nameLong: 'Code Editor',
+ 			applicationName: 'code-oss',
+ 			dataFolderName: '.vscode-oss',
++			commit: "hellocommit",
++			date: "hellodate",
+ 			urlProtocol: 'code-oss',
+ 			reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new',
+ 			licenseName: 'MIT',
+ 			licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
+-			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt'
++			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
+ 		});
+ 	}
+ }
+Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
++++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+@@ -779,8 +779,8 @@ export class GettingStartedPage extends EditorPane {
+ 		}));
+ 
+ 		const header = $('.header', {},
+-			$('h1.product-name.caption', {}, this.productService.nameLong),
+-			$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
++			$('h1.product-name.caption', {}, "Code Editor"),
++			$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Based on Code-OSS, Visual Studio Code Open Source"))
+ 		);
+ 
+ 		const leftColumn = $('.categories-column.categories-column-left', {},);
+Index: sagemaker-code-editor/vscode/extensions/git/package.nls.json
+===================================================================
+--- sagemaker-code-editor.orig/vscode/extensions/git/package.nls.json
++++ sagemaker-code-editor/vscode/extensions/git/package.nls.json
+@@ -203,7 +203,7 @@
+ 		"message": "List of git commands (ex: commit, push) that would have their `stdout` logged to the [git output](command:git.showOutput). If the git command has a client-side hook configured, the client-side hook's `stdout` will also be logged to the [git output](command:git.showOutput).",
+ 		"comment": [
+ 			"{Locked='](command:git.showOutput'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -230,8 +230,8 @@
+ 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
+ 	"config.requireGitUserConfig": "Controls whether to require explicit Git user configuration or allow Git to guess if missing.",
+ 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
+-	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
+-	"config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
++	"config.terminalAuthentication": "Controls whether to enable Code-OSS to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
++	"config.terminalGitEditor": "Controls whether to enable Code-OSS to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
+ 	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.",
+ 	"config.timeline.showUncommitted": "Controls whether to show uncommitted changes in the Timeline view.",
+ 	"config.timeline.date": "Controls which date to use for items in the Timeline view.",
+@@ -282,7 +282,7 @@
+ 		"message": "[Download Git for Windows](https://git-scm.com/download/win)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
+ 		"comment": [
+ 			"{Locked='](command:workbench.action.reloadWindow'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -290,7 +290,7 @@
+ 		"message": "[Download Git for macOS](https://git-scm.com/download/mac)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
+ 		"comment": [
+ 			"{Locked='](command:workbench.action.reloadWindow'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -298,48 +298,48 @@
+ 		"message": "Source control depends on Git being installed.\n[Download Git for Linux](https://git-scm.com/download/linux)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
+ 		"comment": [
+ 			"{Locked='](command:workbench.action.reloadWindow'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+ 	"view.workbench.scm.missing": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).",
+ 	"view.workbench.scm.disabled": {
+-		"message": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
++		"message": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
+ 		"comment": [
+ 			"{Locked='](command:workbench.action.openSettings?%5B%22git.enabled%22%5D'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+ 	"view.workbench.scm.empty": {
+-		"message": "In order to use git features, you can open a folder containing a git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
++		"message": "In order to use git features, you can open a folder containing a git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
+ 		"comment": [
+ 			"{Locked='](command:vscode.openFolder'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+ 	"view.workbench.scm.folder": {
+-		"message": "The folder currently open doesn't have a git repository. You can initialize a repository which will enable source control features powered by git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
++		"message": "The folder currently open doesn't have a git repository. You can initialize a repository which will enable source control features powered by git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
+ 		"comment": [
+ 			"{Locked='](command:git.init?%5Btrue%5D'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+ 	"view.workbench.scm.workspace": {
+-		"message": "The workspace currently open doesn't have any folders containing git repositories. You can initialize a repository on a folder which will enable source control features powered by git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
++		"message": "The workspace currently open doesn't have any folders containing git repositories. You can initialize a repository on a folder which will enable source control features powered by git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
+ 		"comment": [
+ 			"{Locked='](command:git.init'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+ 	"view.workbench.scm.emptyWorkspace": {
+-		"message": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
++		"message": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
+ 		"comment": [
+ 			"{Locked='](command:workbench.action.addRootFolder'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -354,7 +354,7 @@
+ 		"comment": [
+ 			"{Locked='](command:git.openRepositoriesInParentFolders'}",
+ 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -363,7 +363,7 @@
+ 		"comment": [
+ 			"{Locked='](command:git.openRepositoriesInParentFolders'}",
+ 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -371,7 +371,7 @@
+ 		"message": "The detected git repository is potentially unsafe as the folder is owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).",
+ 		"comment": [
+ 			"{Locked='](command:git.manageUnsafeRepositories'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -379,23 +379,23 @@
+ 		"message": "The detected git repositories are potentially unsafe as the folders are owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).",
+ 		"comment": [
+ 			"{Locked='](command:git.manageUnsafeRepositories'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+ 	"view.workbench.scm.closedRepository": {
+-		"message": "A git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
++		"message": "A git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
+ 		"comment": [
+ 			"{Locked='](command:git.reopenClosedRepositories'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+ 	"view.workbench.scm.closedRepositories": {
+-		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
++		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
+ 		"comment": [
+ 			"{Locked='](command:git.reopenClosedRepositories'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+@@ -403,9 +403,9 @@
+ 		"message": "You can clone a repository locally.\n[Clone Repository](command:git.clone 'Clone a repository once the git extension has activated')",
+ 		"comment": [
+ 			"{Locked='](command:git.clone'}",
+-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
++			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
+ 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+ 		]
+ 	},
+-	"view.workbench.learnMore": "To learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
++	"view.workbench.learnMore": "To learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm)."
+ }
+Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
++++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+@@ -257,8 +257,8 @@ export const walkthroughs: GettingStartedWalkthroughCo
+ 
+ 	{
+ 		id: 'SetupWeb',
+-		title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"),
+-		description: localize('gettingStarted.setupWeb.description', "Discover the best customizations to make VS Code for the Web yours."),
++		title: localize('gettingStarted.setupWeb.title', "Get Started with Code Editor"),
++		description: localize('gettingStarted.setupWeb.description', "Discover the best customizations to make Code Editor yours."),
+ 		isFeatured: true,
+ 		icon: setupIcon,
+ 		when: 'isWeb',
diff --git a/patches/series b/patches/series
index 6f238e852..8ffae8993 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,7 @@
 sagemaker-extension.diff
 disable-online-services.diff
 disable-telemetry.diff
-base-path.diff
\ No newline at end of file
+base-path.diff
+webview.diff
+local-storage.diff
+sagemaker-integration.diff
\ No newline at end of file
diff --git a/patches/webview.diff b/patches/webview.diff
new file mode 100644
index 000000000..f973af4df
--- /dev/null
+++ b/patches/webview.diff
@@ -0,0 +1,137 @@
+Serve webviews from the same origin
+
+Normally webviews are served from vscode-webview.net but we would rather them be
+self-hosted.
+
+When doing this CSP will block resources (for example when viewing images) so
+add 'self' to the CSP to fix that.
+
+Additionally the service worker defaults to handling *all* requests made to the
+current host but when self-hosting the webview this will end up including the
+webview HTML itself which means these requests will fail since the communication
+channel between the webview and the main thread has not been set up yet as the
+webview itself is not ready yet (it has no HTML and therefore no script either).
+Since this code exists only for the authentication case we can just skip it when
+it is served from the current host as authentication is not a problem if the
+request is not cross-origin.
+
+There is also an origin check we bypass (this seems to be related to how the
+webview host is separate by default but we serve on the same host).
+
+To test, open a few types of webviews (images, markdown, extension details, etc).
+
+Make sure to update the hash. To do so:
+1. run code-server 
+2. open any webview (i.e. preview Markdown)
+3. see error in console and copy hash
+
+That will test the hash change in pre/index.html
+
+Double-check the console to make sure there are no console errors for the webWorkerExtensionHostIframe
+which also requires a hash change.
+
+parentOriginHash changes
+
+This fixes webviews from not working properly due to a change upstream.
+Upstream added a check to ensure parent authority is encoded into the webview
+origin. Since our webview origin is the parent authority, we can bypass this
+check.
+
+Note: webviews will only work in secure contexts (i.e. accessing the server using https or localhost)
+And this change will not apply if using port forwarding to access the server from a different address
+
+Index: sagemaker-code-editor/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
++++ sagemaker-code-editor/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
+@@ -225,7 +225,7 @@ export class BrowserWorkbenchEnvironment
+ 
+ 	@memoize
+ 	get webviewExternalEndpoint(): string {
+-		const endpoint = this.options.webviewEndpoint
++		const endpoint = (this.options.webviewEndpoint && new URL(this.options.webviewEndpoint, window.location.toString()).toString())
+ 			|| this.productService.webviewContentExternalBaseUrlTemplate
+ 			|| 'https://{{uuid}}.vscode-cdn.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/';
+ 
+Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/server/node/webClientServer.ts
++++ sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
+@@ -323,6 +323,7 @@ export class WebClientServer {
+ 
+ 		const workbenchWebConfiguration = {
+ 			remoteAuthority,
++			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
+ 			_wrapWebWorkerExtHostInIframe,
+ 			developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
+ 			settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
+Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
++++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
+@@ -5,7 +5,7 @@
+ 	<meta charset="UTF-8">
+ 
+ 	<meta http-equiv="Content-Security-Policy"
+-		content="default-src 'none'; script-src 'sha256-QA1gXilHYAUFCvp7MpjgcmyBCFzSKV0SpiecMU8aUVc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
++		content="default-src 'none'; script-src 'sha256-5X5RiKYn8NTJVx919WStPrAmsV80rIIBbePhKquPcAQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+
+ 	<!-- Disable pinch zooming -->
+ 	<meta name="viewport"
+@@ -335,6 +335,12 @@
+ 
+ 				const hostname = location.hostname;
+ 
++				// It is safe to run if we are on the same host.
++				const parent = new URL(parentOrigin)
++				if (parent.hostname === hostname) {
++					return start(parentOrigin)
++				}
++
+ 				if (!crypto.subtle) {
+ 					// cannot validate, not running in a secure context
+ 					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
+Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
++++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
+@@ -334,6 +334,12 @@
+ 
+ 				const hostname = location.hostname;
+ 
++				// It is safe to run if we are on the same host.
++				const parent = new URL(parentOrigin)
++				if (parent.hostname === hostname) {
++					return start(parentOrigin)
++				}
++
+ 				if (!crypto.subtle) {
+ 					// cannot validate, not running in a secure context
+ 					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
+Index: sagemaker-code-editor/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+===================================================================
+--- sagemaker-code-editor.orig/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
++++ sagemaker-code-editor/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+@@ -4,7 +4,7 @@
+ 		<meta http-equiv="Content-Security-Policy" content="
+ 			default-src 'none';
+ 			child-src 'self' data: blob:;
+-			script-src 'self' 'unsafe-eval' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' https:;
++			script-src 'self' 'unsafe-eval' 'sha256-TkIM/TmudlFEe0ZRp0ptvN54LClwk30Rql4ZPE0hm/I=' https:;
+ 			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
+ 	</head>
+ 	<body>
+@@ -23,6 +23,13 @@
+ 			// validation not requested
+ 			return start();
+ 		}
++
++		// It is safe to run if we are on the same host.
++		const parent = new URL(parentOrigin)
++		if (parent.hostname === hostname) {
++			return start()
++		}
++
+ 		if (!crypto.subtle) {
+ 			// cannot validate, not running in a secure context
+ 			return sendError(new Error(`Cannot validate in current context!`));

From 1fc7a764599de166d98f9b4fb80b248dc9e4d9bf Mon Sep 17 00:00:00 2001
From: Spencer Ng <spenceng@amazon.com>
Date: Thu, 7 Mar 2024 16:55:28 -0800
Subject: [PATCH 2/3] Added patched-vscode changes

---
 patched-vscode/build/gulpfile.extensions.js   |  1 -
 patched-vscode/build/npm/dirs.js              |  1 -
 patched-vscode/src/vs/base/common/network.ts  |  4 +-
 patched-vscode/src/vs/base/common/product.ts  |  1 -
 .../code/browser/workbench/workbench-dev.html |  2 +-
 .../vs/code/browser/workbench/workbench.html  |  2 +-
 .../vs/code/browser/workbench/workbench.ts    |  3 +-
 .../common/extensionResourceLoader.ts         |  3 +-
 .../remote/browser/browserSocketFactory.ts    |  1 -
 .../platform/telemetry/common/1dsAppender.ts  |  4 +-
 .../telemetry/common/telemetryService.ts      |  4 +-
 .../common/update.config.contribution.ts      |  4 +-
 .../server/node/serverEnvironmentService.ts   |  6 --
 .../src/vs/server/node/webClientServer.ts     | 70 +------------------
 .../common/preferencesContribution.ts         |  2 +-
 .../electron-sandbox/desktop.contribution.ts  |  2 +-
 .../assignment/common/assignmentService.ts    |  2 +-
 17 files changed, 18 insertions(+), 94 deletions(-)

diff --git a/patched-vscode/build/gulpfile.extensions.js b/patched-vscode/build/gulpfile.extensions.js
index 028a88416..bcdb20660 100644
--- a/patched-vscode/build/gulpfile.extensions.js
+++ b/patched-vscode/build/gulpfile.extensions.js
@@ -63,7 +63,6 @@ const compilations = [
 	'php-language-features/tsconfig.json',
 	'search-result/tsconfig.json',
 	'references-view/tsconfig.json',
-	'sagemaker-extension/tsconfig.json',
 	'simple-browser/tsconfig.json',
 	'tunnel-forwarding/tsconfig.json',
 	'typescript-language-features/test-workspace/tsconfig.json',
diff --git a/patched-vscode/build/npm/dirs.js b/patched-vscode/build/npm/dirs.js
index 5726d1a28..faf3a6577 100644
--- a/patched-vscode/build/npm/dirs.js
+++ b/patched-vscode/build/npm/dirs.js
@@ -39,7 +39,6 @@ const dirs = [
 	'extensions/npm',
 	'extensions/php-language-features',
 	'extensions/references-view',
-	'extensions/sagemaker-extension',
 	'extensions/search-result',
 	'extensions/simple-browser',
 	'extensions/tunnel-forwarding',
diff --git a/patched-vscode/src/vs/base/common/network.ts b/patched-vscode/src/vs/base/common/network.ts
index 87cca678a..b00899c50 100644
--- a/patched-vscode/src/vs/base/common/network.ts
+++ b/patched-vscode/src/vs/base/common/network.ts
@@ -168,9 +168,7 @@ class RemoteAuthoritiesImpl {
 		return URI.from({
 			scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
 			authority: `${host}:${port}`,
-			path: platform.isWeb
-				? (window.location.pathname + "/" + this._remoteResourcesPath).replace(/\/\/+/g, "/")
-				: this._remoteResourcesPath,
+			path: this._remoteResourcesPath,
 			query
 		});
 	}
diff --git a/patched-vscode/src/vs/base/common/product.ts b/patched-vscode/src/vs/base/common/product.ts
index 1dc9c4f8d..3a935977e 100644
--- a/patched-vscode/src/vs/base/common/product.ts
+++ b/patched-vscode/src/vs/base/common/product.ts
@@ -55,7 +55,6 @@ export type ExtensionVirtualWorkspaceSupport = {
 };
 
 export interface IProductConfiguration {
-	readonly rootEndpoint?: string
 	readonly version: string;
 	readonly date?: string;
 	readonly quality?: string;
diff --git a/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html b/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html
index f64481579..be6d30bfb 100644
--- a/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html
+++ b/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html
@@ -38,7 +38,7 @@
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
 	<script>
-		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
 		Object.keys(self.webPackagePaths).map(function (key, index) {
 			self.webPackagePaths[key] = `${baseUrl}/remote/web/node_modules/${key}/${self.webPackagePaths[key]}`;
 		});
diff --git a/patched-vscode/src/vs/code/browser/workbench/workbench.html b/patched-vscode/src/vs/code/browser/workbench/workbench.html
index 845ae621b..addc28f0c 100644
--- a/patched-vscode/src/vs/code/browser/workbench/workbench.html
+++ b/patched-vscode/src/vs/code/browser/workbench/workbench.html
@@ -36,7 +36,7 @@
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
 	<script>
-		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
 		Object.keys(self.webPackagePaths).map(function (key, index) {
 			self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
 		});
diff --git a/patched-vscode/src/vs/code/browser/workbench/workbench.ts b/patched-vscode/src/vs/code/browser/workbench/workbench.ts
index b4db48a57..962e2f4c3 100644
--- a/patched-vscode/src/vs/code/browser/workbench/workbench.ts
+++ b/patched-vscode/src/vs/code/browser/workbench/workbench.ts
@@ -304,8 +304,7 @@ class LocalStorageURLCallbackProvider extends Disposable implements IURLCallback
 			this.startListening();
 		}
 
-		const path = (window.location.pathname + "/" + this._callbackRoute).replace(/\/\/+/g, "/");
-		return URI.parse(window.location.href).with({ path: path, query: queryParams.join('&') });
+		return URI.parse(window.location.href).with({ path: this._callbackRoute, query: queryParams.join('&') });
 	}
 
 	private startListening(): void {
diff --git a/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts b/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
index d148e475b..e63c48d0c 100644
--- a/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
+++ b/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
@@ -16,6 +16,7 @@ import { getServiceMachineId } from 'vs/platform/externalServices/common/service
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
 import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
+import { RemoteAuthorities } from 'vs/base/common/network';
 import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
 import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
 
@@ -101,7 +102,7 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
 					: version,
 				path: 'extension'
 			}));
-			return this._isWebExtensionResourceEndPoint(uri) ? URI.joinPath(URI.parse(window.location.href), uri.path) : uri;
+			return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: RemoteAuthorities.getPreferredWebSchema() }) : uri;
 		}
 		return undefined;
 	}
diff --git a/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts b/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
index 4d341bdd8..765b2f3fa 100644
--- a/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -280,7 +280,6 @@ export class BrowserSocketFactory implements ISocketFactory<RemoteConnectionType
 	connect({ host, port }: WebSocketRemoteConnection, path: string, query: string, debugLabel: string): Promise<ISocket> {
 		return new Promise<ISocket>((resolve, reject) => {
 			const webSocketSchema = (/^https:/.test(window.location.href) ? 'wss' : 'ws');
-			path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
 			const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
 			const errorListener = socket.onError(reject);
 			socket.onOpen(() => {
diff --git a/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts b/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts
index 416f244f3..ccfbc3f7d 100644
--- a/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts
+++ b/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -18,8 +18,8 @@ export interface IAppInsightsCore {
 	unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
 }
 
-const endpointUrl = 'https://0.0.0.0/OneCollector/1.0';
-const endpointHealthUrl = 'https://0.0.0.0/ping';
+const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0';
+const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping';
 
 async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
 	const oneDs = await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'dist/ms.core.js');
diff --git a/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts b/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts
index ce794e59b..e10d846b0 100644
--- a/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts
@@ -204,7 +204,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 	'properties': {
 		[TELEMETRY_SETTING_ID]: {
 			'type': 'string',
-			'enum': [TelemetryConfiguration.OFF],
+			'enum': [TelemetryConfiguration.ON, TelemetryConfiguration.ERROR, TelemetryConfiguration.CRASH, TelemetryConfiguration.OFF],
 			'enumDescriptions': [
 				localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."),
 				localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."),
@@ -212,7 +212,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 				localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
 			],
 			'markdownDescription': getTelemetryLevelSettingDescription(),
-			'default': TelemetryConfiguration.OFF,
+			'default': TelemetryConfiguration.ON,
 			'restricted': true,
 			'scope': ConfigurationScope.APPLICATION,
 			'tags': ['usesOnlineServices', 'telemetry']
diff --git a/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts b/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts
index d7181f8fe..4134233de 100644
--- a/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts
+++ b/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts
@@ -18,7 +18,7 @@ configurationRegistry.registerConfiguration({
 		'update.mode': {
 			type: 'string',
 			enum: ['none', 'manual', 'start', 'default'],
-			default: 'none',
+			default: 'default',
 			scope: ConfigurationScope.APPLICATION,
 			description: localize('updateMode', "Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service."),
 			tags: ['usesOnlineServices'],
@@ -50,7 +50,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'update.showReleaseNotes': {
 			type: 'boolean',
-			default: false,
+			default: true,
 			scope: ConfigurationScope.APPLICATION,
 			description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
 			tags: ['usesOnlineServices']
diff --git a/patched-vscode/src/vs/server/node/serverEnvironmentService.ts b/patched-vscode/src/vs/server/node/serverEnvironmentService.ts
index 366b29472..e3742efaa 100644
--- a/patched-vscode/src/vs/server/node/serverEnvironmentService.ts
+++ b/patched-vscode/src/vs/server/node/serverEnvironmentService.ts
@@ -87,9 +87,6 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
 	'compatibility': { type: 'string' },
 
-	/* ----- sagemaker ----- */
-	'base-path': { type: 'string' },
-
 	_: OPTIONS['_']
 };
 
@@ -206,9 +203,6 @@ export interface ServerParsedArgs {
 
 	compatibility: string;
 
-	/* ----- sagemaker ----- */
-	'base-path'?: string,
-
 	_: string[];
 }
 
diff --git a/patched-vscode/src/vs/server/node/webClientServer.ts b/patched-vscode/src/vs/server/node/webClientServer.ts
index ee8ef4386..c9791cc15 100644
--- a/patched-vscode/src/vs/server/node/webClientServer.ts
+++ b/patched-vscode/src/vs/server/node/webClientServer.ts
@@ -278,7 +278,7 @@ export class WebClientServer {
 		const remoteAuthority = (
 			useTestResolver
 				? 'test+test'
-				: (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host || window.location.host)
+				: (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host)
 		);
 		if (!remoteAuthority) {
 			return serveError(req, res, 400, `Bad request.`);
@@ -305,12 +305,7 @@ export class WebClientServer {
 			scopes: [['user:email'], ['repo']]
 		} : undefined;
 
-		const basePath: string = this._environmentService.args['base-path'] || "/"
-		const base = relativeRoot(basePath)
-		const vscodeBase = relativePath(basePath)
-
 		const productConfiguration = <Partial<IProductConfiguration>>{
-			rootEndpoint: base,
 			embedderIdentifier: 'server-distro',
 			extensionsGallery: this._webExtensionResourceUrlTemplate ? {
 				...this._productService.extensionsGallery,
@@ -345,10 +340,8 @@ export class WebClientServer {
 		const values: { [key: string]: string } = {
 			WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
 			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
-			WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
-			WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
-			BASE: base,
-			VS_BASE: vscodeBase,
+			WORKBENCH_WEB_BASE_URL: this._staticRoute,
+			WORKBENCH_NLS_BASE_URL: nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : '',
 		};
 
 		if (useTestResolver) {
@@ -446,60 +439,3 @@ export class WebClientServer {
 		return void res.end(data);
 	}
 }
-
-
-/**
- * Remove extra slashes in a URL.
- *
- * This is meant to fill the job of `path.join` so you can concatenate paths and
- * then normalize out any extra slashes.
- *
- * If you are using `path.join` you do not need this but note that `path` is for
- * file system paths, not URLs.
- */
-export const normalizeUrlPath = (url: string, keepTrailing = false): string => {
-	return url.replace(/\/\/+/g, "/").replace(/\/+$/, keepTrailing ? "/" : "")
-}
-
-/**
- * Get the relative path that will get us to the root of the page. For each
- * slash we need to go up a directory.  Will not have a trailing slash.
- *
- * For example:
- *
- * / => .
- * /foo => .
- * /foo/ => ./..
- * /foo/bar => ./..
- * /foo/bar/ => ./../..
- *
- * All paths must be relative in order to work behind a reverse proxy since we
- * we do not know the base path.  Anything that needs to be absolute (for
- * example cookies) must get the base path from the frontend.
- *
- * All relative paths must be prefixed with the relative root to ensure they
- * work no matter the depth at which they happen to appear.
- *
- * For Express `req.originalUrl` should be used as they remove the base from the
- * standard `url` property making it impossible to get the true depth.
- */
-export const relativeRoot = (originalUrl: string): string => {
-	const depth = (originalUrl.split("?", 1)[0].match(/\//g) || []).length
-	return normalizeUrlPath("./" + (depth > 1 ? "../".repeat(depth - 1) : ""))
-}
-
-/**
- * Get the relative path to the current resource.
- *
- * For example:
- *
- * / => .
- * /foo => ./foo
- * /foo/ => .
- * /foo/bar => ./bar
- * /foo/bar/ => .
- */
-export const relativePath = (originalUrl: string): string => {
-	const parts = originalUrl.split("?", 1)[0].split("/")
-	return normalizeUrlPath("./" + parts[parts.length - 1])
-}
diff --git a/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts b/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
index 785eff9a2..c1c1e3fa5 100644
--- a/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ b/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -144,7 +144,7 @@ registry.registerConfiguration({
 		'workbench.settings.enableNaturalLanguageSearch': {
 			'type': 'boolean',
 			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
-			'default': false,
+			'default': true,
 			'scope': ConfigurationScope.WINDOW,
 			'tags': ['usesOnlineServices']
 		},
diff --git a/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index da1272cbb..b1c44b5f1 100644
--- a/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -263,7 +263,7 @@ import { applicationConfigurationNodeBase } from 'vs/workbench/common/configurat
 			'telemetry.enableCrashReporter': {
 				'type': 'boolean',
 				'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),
-				'default': false,
+				'default': true,
 				'tags': ['usesOnlineServices', 'telemetry'],
 				'markdownDeprecationMessage': localize('enableCrashReporterDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated due to being combined into the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
 			}
diff --git a/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts b/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
index 6760a1ece..0d0b424d2 100644
--- a/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
+++ b/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
@@ -143,7 +143,7 @@ registry.registerConfiguration({
 		'workbench.enableExperiments': {
 			'type': 'boolean',
 			'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
-			'default': false,
+			'default': true,
 			'scope': ConfigurationScope.APPLICATION,
 			'restricted': true,
 			'tags': ['usesOnlineServices']

From 10886ee4a1bd656904f3fcf432a03750a935347e Mon Sep 17 00:00:00 2001
From: Spencer Ng <spenceng@amazon.com>
Date: Thu, 7 Mar 2024 17:23:21 -0800
Subject: [PATCH 3/3] Updated with patch differences

---
 patched-vscode/build/gulpfile.extensions.js   |  1 +
 patched-vscode/build/npm/dirs.js              |  1 +
 .../extensions/git/package.nls.json           | 52 +++++++-------
 patched-vscode/product.json                   | 66 ++++-------------
 patched-vscode/src/vs/base/common/network.ts  |  4 +-
 patched-vscode/src/vs/base/common/product.ts  |  1 +
 .../code/browser/workbench/workbench-dev.html |  2 +-
 .../vs/code/browser/workbench/workbench.html  |  2 +-
 .../vs/code/browser/workbench/workbench.ts    |  3 +-
 .../common/extensionResourceLoader.ts         |  3 +-
 .../src/vs/platform/product/common/product.ts |  8 ++-
 .../remote/browser/browserSocketFactory.ts    |  1 +
 .../platform/telemetry/common/1dsAppender.ts  |  4 +-
 .../telemetry/common/telemetryService.ts      |  4 +-
 .../common/update.config.contribution.ts      |  4 +-
 .../server/node/serverEnvironmentService.ts   |  6 ++
 .../src/vs/server/node/webClientServer.ts     | 72 ++++++++++++++++++-
 .../src/vs/workbench/browser/client.ts        | 61 ++++++++++++++++
 .../src/vs/workbench/browser/web.api.ts       |  5 ++
 .../src/vs/workbench/browser/web.main.ts      |  4 ++
 .../common/preferencesContribution.ts         |  2 +-
 .../webview/browser/pre/index-no-csp.html     |  6 ++
 .../contrib/webview/browser/pre/index.html    |  8 ++-
 .../browser/gettingStarted.ts                 |  4 +-
 .../common/gettingStartedContent.ts           |  4 +-
 .../electron-sandbox/desktop.contribution.ts  |  2 +-
 .../assignment/common/assignmentService.ts    |  2 +-
 .../environment/browser/environmentService.ts | 11 ++-
 .../worker/webWorkerExtensionHostIframe.html  |  9 ++-
 29 files changed, 246 insertions(+), 106 deletions(-)
 create mode 100644 patched-vscode/src/vs/workbench/browser/client.ts

diff --git a/patched-vscode/build/gulpfile.extensions.js b/patched-vscode/build/gulpfile.extensions.js
index bcdb20660..028a88416 100644
--- a/patched-vscode/build/gulpfile.extensions.js
+++ b/patched-vscode/build/gulpfile.extensions.js
@@ -63,6 +63,7 @@ const compilations = [
 	'php-language-features/tsconfig.json',
 	'search-result/tsconfig.json',
 	'references-view/tsconfig.json',
+	'sagemaker-extension/tsconfig.json',
 	'simple-browser/tsconfig.json',
 	'tunnel-forwarding/tsconfig.json',
 	'typescript-language-features/test-workspace/tsconfig.json',
diff --git a/patched-vscode/build/npm/dirs.js b/patched-vscode/build/npm/dirs.js
index faf3a6577..5726d1a28 100644
--- a/patched-vscode/build/npm/dirs.js
+++ b/patched-vscode/build/npm/dirs.js
@@ -39,6 +39,7 @@ const dirs = [
 	'extensions/npm',
 	'extensions/php-language-features',
 	'extensions/references-view',
+	'extensions/sagemaker-extension',
 	'extensions/search-result',
 	'extensions/simple-browser',
 	'extensions/tunnel-forwarding',
diff --git a/patched-vscode/extensions/git/package.nls.json b/patched-vscode/extensions/git/package.nls.json
index de8f10e71..bdd03a2c8 100644
--- a/patched-vscode/extensions/git/package.nls.json
+++ b/patched-vscode/extensions/git/package.nls.json
@@ -203,7 +203,7 @@
 		"message": "List of git commands (ex: commit, push) that would have their `stdout` logged to the [git output](command:git.showOutput). If the git command has a client-side hook configured, the client-side hook's `stdout` will also be logged to the [git output](command:git.showOutput).",
 		"comment": [
 			"{Locked='](command:git.showOutput'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -230,8 +230,8 @@
 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
 	"config.requireGitUserConfig": "Controls whether to require explicit Git user configuration or allow Git to guess if missing.",
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
-	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
-	"config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
+	"config.terminalAuthentication": "Controls whether to enable Code-OSS to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
+	"config.terminalGitEditor": "Controls whether to enable Code-OSS to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.",
 	"config.timeline.showUncommitted": "Controls whether to show uncommitted changes in the Timeline view.",
 	"config.timeline.date": "Controls which date to use for items in the Timeline view.",
@@ -282,7 +282,7 @@
 		"message": "[Download Git for Windows](https://git-scm.com/download/win)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -290,7 +290,7 @@
 		"message": "[Download Git for macOS](https://git-scm.com/download/mac)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -298,48 +298,48 @@
 		"message": "Source control depends on Git being installed.\n[Download Git for Linux](https://git-scm.com/download/linux)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.missing": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).",
 	"view.workbench.scm.disabled": {
-		"message": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.enabled%22%5D'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.empty": {
-		"message": "In order to use git features, you can open a folder containing a git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "In order to use git features, you can open a folder containing a git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:vscode.openFolder'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.folder": {
-		"message": "The folder currently open doesn't have a git repository. You can initialize a repository which will enable source control features powered by git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "The folder currently open doesn't have a git repository. You can initialize a repository which will enable source control features powered by git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:git.init?%5Btrue%5D'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.workspace": {
-		"message": "The workspace currently open doesn't have any folders containing git repositories. You can initialize a repository on a folder which will enable source control features powered by git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "The workspace currently open doesn't have any folders containing git repositories. You can initialize a repository on a folder which will enable source control features powered by git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:git.init'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.emptyWorkspace": {
-		"message": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:workbench.action.addRootFolder'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -354,7 +354,7 @@
 		"comment": [
 			"{Locked='](command:git.openRepositoriesInParentFolders'}",
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -363,7 +363,7 @@
 		"comment": [
 			"{Locked='](command:git.openRepositoriesInParentFolders'}",
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -371,7 +371,7 @@
 		"message": "The detected git repository is potentially unsafe as the folder is owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).",
 		"comment": [
 			"{Locked='](command:git.manageUnsafeRepositories'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -379,23 +379,23 @@
 		"message": "The detected git repositories are potentially unsafe as the folders are owned by someone other than the current user.\n[Manage Unsafe Repositories](command:git.manageUnsafeRepositories)\nTo learn more about unsafe repositories [read our docs](https://aka.ms/vscode-git-unsafe-repository).",
 		"comment": [
 			"{Locked='](command:git.manageUnsafeRepositories'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.closedRepository": {
-		"message": "A git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "A git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:git.reopenClosedRepositories'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
 	"view.workbench.scm.closedRepositories": {
-		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm).",
 		"comment": [
 			"{Locked='](command:git.reopenClosedRepositories'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
@@ -403,9 +403,9 @@
 		"message": "You can clone a repository locally.\n[Clone Repository](command:git.clone 'Clone a repository once the git extension has activated')",
 		"comment": [
 			"{Locked='](command:git.clone'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for Code-OSS",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
-	"view.workbench.learnMore": "To learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
+	"view.workbench.learnMore": "To learn more about how to use git and source control in Code-OSS [read the docs](https://aka.ms/vscode-scm)."
 }
diff --git a/patched-vscode/product.json b/patched-vscode/product.json
index d4ff5cd56..2eee35831 100644
--- a/patched-vscode/product.json
+++ b/patched-vscode/product.json
@@ -1,6 +1,6 @@
 {
-	"nameShort": "Code - OSS",
-	"nameLong": "Code - OSS",
+	"nameShort": "SageMaker Code Editor",
+	"nameLong": "SageMaker Code Editor",
 	"applicationName": "code-oss",
 	"dataFolderName": ".vscode-oss",
 	"win32MutexName": "vscodeoss",
@@ -34,53 +34,17 @@
 	"urlProtocol": "code-oss",
 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
 	"builtInExtensions": [
-		{
-			"name": "ms-vscode.js-debug-companion",
-			"version": "1.1.2",
-			"sha256": "e034b8b41beb4e97e02c70f7175bd88abe66048374c2bd629f54bb33354bc2aa",
-			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
-			"metadata": {
-				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
-		},
-		{
-			"name": "ms-vscode.js-debug",
-			"version": "1.83.1",
-			"sha256": "1452fdbab8d0d83ca5765bb66170d50b005c97ca4dcd13e154c3401d842a92d4",
-			"repo": "https://github.com/microsoft/vscode-js-debug",
-			"metadata": {
-				"id": "25629058-ddac-4e17-abba-74678e126c5d",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
-		},
-		{
-			"name": "ms-vscode.vscode-js-profile-table",
-			"version": "1.0.3",
-			"sha256": "b9dab017506d9e6a469a0f82b392e4cb1d7a25a4843f1db8ba396cbee209cfc5",
-			"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
-			"metadata": {
-				"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
-		}
+	],
+	"extensionsGallery": {
+		"serviceUrl": "https://open-vsx.org/vscode/gallery",
+		"itemUrl": "https://open-vsx.org/vscode/item",
+		"resourceUrlTemplate": "https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}",
+		"controlUrl": "",
+		"recommendationsUrl": "",
+		"nlsBaseUrl": "",
+		"publisherUrl": ""
+	},
+	"linkProtectionTrustedDomains": [
+		"https://open-vsx.org"
 	]
-}
+}
\ No newline at end of file
diff --git a/patched-vscode/src/vs/base/common/network.ts b/patched-vscode/src/vs/base/common/network.ts
index b00899c50..87cca678a 100644
--- a/patched-vscode/src/vs/base/common/network.ts
+++ b/patched-vscode/src/vs/base/common/network.ts
@@ -168,7 +168,9 @@ class RemoteAuthoritiesImpl {
 		return URI.from({
 			scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
 			authority: `${host}:${port}`,
-			path: this._remoteResourcesPath,
+			path: platform.isWeb
+				? (window.location.pathname + "/" + this._remoteResourcesPath).replace(/\/\/+/g, "/")
+				: this._remoteResourcesPath,
 			query
 		});
 	}
diff --git a/patched-vscode/src/vs/base/common/product.ts b/patched-vscode/src/vs/base/common/product.ts
index 3a935977e..1dc9c4f8d 100644
--- a/patched-vscode/src/vs/base/common/product.ts
+++ b/patched-vscode/src/vs/base/common/product.ts
@@ -55,6 +55,7 @@ export type ExtensionVirtualWorkspaceSupport = {
 };
 
 export interface IProductConfiguration {
+	readonly rootEndpoint?: string
 	readonly version: string;
 	readonly date?: string;
 	readonly quality?: string;
diff --git a/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html b/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html
index be6d30bfb..f64481579 100644
--- a/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html
+++ b/patched-vscode/src/vs/code/browser/workbench/workbench-dev.html
@@ -38,7 +38,7 @@
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
 	<script>
-		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
 		Object.keys(self.webPackagePaths).map(function (key, index) {
 			self.webPackagePaths[key] = `${baseUrl}/remote/web/node_modules/${key}/${self.webPackagePaths[key]}`;
 		});
diff --git a/patched-vscode/src/vs/code/browser/workbench/workbench.html b/patched-vscode/src/vs/code/browser/workbench/workbench.html
index addc28f0c..845ae621b 100644
--- a/patched-vscode/src/vs/code/browser/workbench/workbench.html
+++ b/patched-vscode/src/vs/code/browser/workbench/workbench.html
@@ -36,7 +36,7 @@
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
 	<script>
-		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
 		Object.keys(self.webPackagePaths).map(function (key, index) {
 			self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
 		});
diff --git a/patched-vscode/src/vs/code/browser/workbench/workbench.ts b/patched-vscode/src/vs/code/browser/workbench/workbench.ts
index 962e2f4c3..b4db48a57 100644
--- a/patched-vscode/src/vs/code/browser/workbench/workbench.ts
+++ b/patched-vscode/src/vs/code/browser/workbench/workbench.ts
@@ -304,7 +304,8 @@ class LocalStorageURLCallbackProvider extends Disposable implements IURLCallback
 			this.startListening();
 		}
 
-		return URI.parse(window.location.href).with({ path: this._callbackRoute, query: queryParams.join('&') });
+		const path = (window.location.pathname + "/" + this._callbackRoute).replace(/\/\/+/g, "/");
+		return URI.parse(window.location.href).with({ path: path, query: queryParams.join('&') });
 	}
 
 	private startListening(): void {
diff --git a/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts b/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
index e63c48d0c..d148e475b 100644
--- a/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
+++ b/patched-vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
@@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/platform/externalServices/common/service
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
 import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { RemoteAuthorities } from 'vs/base/common/network';
 import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
 import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
 
@@ -102,7 +101,7 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
 					: version,
 				path: 'extension'
 			}));
-			return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: RemoteAuthorities.getPreferredWebSchema() }) : uri;
+			return this._isWebExtensionResourceEndPoint(uri) ? URI.joinPath(URI.parse(window.location.href), uri.path) : uri;
 		}
 		return undefined;
 	}
diff --git a/patched-vscode/src/vs/platform/product/common/product.ts b/patched-vscode/src/vs/platform/product/common/product.ts
index 8cc6f60aa..30bb54c96 100644
--- a/patched-vscode/src/vs/platform/product/common/product.ts
+++ b/patched-vscode/src/vs/platform/product/common/product.ts
@@ -59,15 +59,17 @@ else {
 	if (Object.keys(product).length === 0) {
 		Object.assign(product, {
 			version: '1.82.0-dev',
-			nameShort: 'Code - OSS Dev',
-			nameLong: 'Code - OSS Dev',
+			nameShort: 'CodeEditor',
+			nameLong: 'Code Editor',
 			applicationName: 'code-oss',
 			dataFolderName: '.vscode-oss',
+			commit: "hellocommit",
+			date: "hellodate",
 			urlProtocol: 'code-oss',
 			reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new',
 			licenseName: 'MIT',
 			licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
-			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt'
+			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
 		});
 	}
 }
diff --git a/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts b/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
index 765b2f3fa..4d341bdd8 100644
--- a/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/patched-vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -280,6 +280,7 @@ export class BrowserSocketFactory implements ISocketFactory<RemoteConnectionType
 	connect({ host, port }: WebSocketRemoteConnection, path: string, query: string, debugLabel: string): Promise<ISocket> {
 		return new Promise<ISocket>((resolve, reject) => {
 			const webSocketSchema = (/^https:/.test(window.location.href) ? 'wss' : 'ws');
+			path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
 			const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
 			const errorListener = socket.onError(reject);
 			socket.onOpen(() => {
diff --git a/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts b/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts
index ccfbc3f7d..416f244f3 100644
--- a/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts
+++ b/patched-vscode/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -18,8 +18,8 @@ export interface IAppInsightsCore {
 	unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
 }
 
-const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0';
-const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping';
+const endpointUrl = 'https://0.0.0.0/OneCollector/1.0';
+const endpointHealthUrl = 'https://0.0.0.0/ping';
 
 async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
 	const oneDs = await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'dist/ms.core.js');
diff --git a/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts b/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts
index e10d846b0..ce794e59b 100644
--- a/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/patched-vscode/src/vs/platform/telemetry/common/telemetryService.ts
@@ -204,7 +204,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 	'properties': {
 		[TELEMETRY_SETTING_ID]: {
 			'type': 'string',
-			'enum': [TelemetryConfiguration.ON, TelemetryConfiguration.ERROR, TelemetryConfiguration.CRASH, TelemetryConfiguration.OFF],
+			'enum': [TelemetryConfiguration.OFF],
 			'enumDescriptions': [
 				localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."),
 				localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."),
@@ -212,7 +212,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 				localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
 			],
 			'markdownDescription': getTelemetryLevelSettingDescription(),
-			'default': TelemetryConfiguration.ON,
+			'default': TelemetryConfiguration.OFF,
 			'restricted': true,
 			'scope': ConfigurationScope.APPLICATION,
 			'tags': ['usesOnlineServices', 'telemetry']
diff --git a/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts b/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts
index 4134233de..d7181f8fe 100644
--- a/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts
+++ b/patched-vscode/src/vs/platform/update/common/update.config.contribution.ts
@@ -18,7 +18,7 @@ configurationRegistry.registerConfiguration({
 		'update.mode': {
 			type: 'string',
 			enum: ['none', 'manual', 'start', 'default'],
-			default: 'default',
+			default: 'none',
 			scope: ConfigurationScope.APPLICATION,
 			description: localize('updateMode', "Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service."),
 			tags: ['usesOnlineServices'],
@@ -50,7 +50,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'update.showReleaseNotes': {
 			type: 'boolean',
-			default: true,
+			default: false,
 			scope: ConfigurationScope.APPLICATION,
 			description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
 			tags: ['usesOnlineServices']
diff --git a/patched-vscode/src/vs/server/node/serverEnvironmentService.ts b/patched-vscode/src/vs/server/node/serverEnvironmentService.ts
index e3742efaa..366b29472 100644
--- a/patched-vscode/src/vs/server/node/serverEnvironmentService.ts
+++ b/patched-vscode/src/vs/server/node/serverEnvironmentService.ts
@@ -87,6 +87,9 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
 	'compatibility': { type: 'string' },
 
+	/* ----- sagemaker ----- */
+	'base-path': { type: 'string' },
+
 	_: OPTIONS['_']
 };
 
@@ -203,6 +206,9 @@ export interface ServerParsedArgs {
 
 	compatibility: string;
 
+	/* ----- sagemaker ----- */
+	'base-path'?: string,
+
 	_: string[];
 }
 
diff --git a/patched-vscode/src/vs/server/node/webClientServer.ts b/patched-vscode/src/vs/server/node/webClientServer.ts
index c9791cc15..30bd7b7bc 100644
--- a/patched-vscode/src/vs/server/node/webClientServer.ts
+++ b/patched-vscode/src/vs/server/node/webClientServer.ts
@@ -278,7 +278,7 @@ export class WebClientServer {
 		const remoteAuthority = (
 			useTestResolver
 				? 'test+test'
-				: (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host)
+				: (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host || window.location.host)
 		);
 		if (!remoteAuthority) {
 			return serveError(req, res, 400, `Bad request.`);
@@ -305,7 +305,12 @@ export class WebClientServer {
 			scopes: [['user:email'], ['repo']]
 		} : undefined;
 
+		const basePath: string = this._environmentService.args['base-path'] || "/"
+		const base = relativeRoot(basePath)
+		const vscodeBase = relativePath(basePath)
+
 		const productConfiguration = <Partial<IProductConfiguration>>{
+			rootEndpoint: base,
 			embedderIdentifier: 'server-distro',
 			extensionsGallery: this._webExtensionResourceUrlTemplate ? {
 				...this._productService.extensionsGallery,
@@ -326,6 +331,8 @@ export class WebClientServer {
 
 		const workbenchWebConfiguration = {
 			remoteAuthority,
+			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
+			userDataPath: this._environmentService.userDataPath,
 			_wrapWebWorkerExtHostInIframe,
 			developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
 			settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
@@ -340,8 +347,10 @@ export class WebClientServer {
 		const values: { [key: string]: string } = {
 			WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
 			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
-			WORKBENCH_WEB_BASE_URL: this._staticRoute,
-			WORKBENCH_NLS_BASE_URL: nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : '',
+			WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
+			WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
+			BASE: base,
+			VS_BASE: vscodeBase,
 		};
 
 		if (useTestResolver) {
@@ -439,3 +448,60 @@ export class WebClientServer {
 		return void res.end(data);
 	}
 }
+
+
+/**
+ * Remove extra slashes in a URL.
+ *
+ * This is meant to fill the job of `path.join` so you can concatenate paths and
+ * then normalize out any extra slashes.
+ *
+ * If you are using `path.join` you do not need this but note that `path` is for
+ * file system paths, not URLs.
+ */
+export const normalizeUrlPath = (url: string, keepTrailing = false): string => {
+	return url.replace(/\/\/+/g, "/").replace(/\/+$/, keepTrailing ? "/" : "")
+}
+
+/**
+ * Get the relative path that will get us to the root of the page. For each
+ * slash we need to go up a directory.  Will not have a trailing slash.
+ *
+ * For example:
+ *
+ * / => .
+ * /foo => .
+ * /foo/ => ./..
+ * /foo/bar => ./..
+ * /foo/bar/ => ./../..
+ *
+ * All paths must be relative in order to work behind a reverse proxy since we
+ * we do not know the base path.  Anything that needs to be absolute (for
+ * example cookies) must get the base path from the frontend.
+ *
+ * All relative paths must be prefixed with the relative root to ensure they
+ * work no matter the depth at which they happen to appear.
+ *
+ * For Express `req.originalUrl` should be used as they remove the base from the
+ * standard `url` property making it impossible to get the true depth.
+ */
+export const relativeRoot = (originalUrl: string): string => {
+	const depth = (originalUrl.split("?", 1)[0].match(/\//g) || []).length
+	return normalizeUrlPath("./" + (depth > 1 ? "../".repeat(depth - 1) : ""))
+}
+
+/**
+ * Get the relative path to the current resource.
+ *
+ * For example:
+ *
+ * / => .
+ * /foo => ./foo
+ * /foo/ => .
+ * /foo/bar => ./bar
+ * /foo/bar/ => .
+ */
+export const relativePath = (originalUrl: string): string => {
+	const parts = originalUrl.split("?", 1)[0].split("/")
+	return normalizeUrlPath("./" + parts[parts.length - 1])
+}
diff --git a/patched-vscode/src/vs/workbench/browser/client.ts b/patched-vscode/src/vs/workbench/browser/client.ts
new file mode 100644
index 000000000..1de4fedb0
--- /dev/null
+++ b/patched-vscode/src/vs/workbench/browser/client.ts
@@ -0,0 +1,61 @@
+import { Disposable } from 'vs/base/common/lifecycle';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { MenuId, MenuRegistry } from "vs/platform/actions/common/actions";
+import { localize } from "vs/nls";
+import { ILogService } from "vs/platform/log/common/log";
+
+export class SagemakerServerClient extends Disposable {
+	constructor (
+		@ILogService private logService: ILogService
+	) {
+		super();
+
+		this.logService.debug('Initializing SagemakerServerClient...');
+		this.registerSagemakerCommands();
+	}
+
+	static LOGOUT_COMMAND_ID = 'sagemaker.logout';
+	static COOKIE_COMMAND_ID = 'sagemaker.parseCookies';
+
+	private registerSagemakerCommands() {
+		const authMode: string | undefined = this.getCookieValue('authMode');
+		const expiryTime: string | undefined = this.getCookieValue('expiryTime');
+		const studioUserProfileName: string | undefined = this.getCookieValue('studioUserProfileName')
+		const ssoExpiryTimestamp: string | undefined = this.getCookieValue('ssoExpiryTimestamp')
+		const redirectURL: string | undefined = this.getCookieValue('redirectURL')
+
+		this.logService.debug('Registering sagemaker commands...');
+
+		CommandsRegistry.registerCommand(SagemakerServerClient.COOKIE_COMMAND_ID, () => {
+			return {
+				authMode: authMode,
+				expiryTime: expiryTime,
+				ssoExpiryTimestamp: ssoExpiryTimestamp,
+				studioUserProfileName: studioUserProfileName,
+				redirectURL: redirectURL
+			};
+		});
+
+		CommandsRegistry.registerCommand(SagemakerServerClient.LOGOUT_COMMAND_ID, () => {
+			const currentUrl = new URL(window.location.href);
+			const hostname = currentUrl.hostname;
+			const pathComponents = currentUrl.pathname.split('/');
+			const logoutUrl = `https://${hostname}/${pathComponents[1]}/${pathComponents[2]}/logout`;
+			window.location.href = logoutUrl;
+		});
+
+		for (const menuId of [MenuId.CommandPalette, MenuId.MenubarHomeMenu]) {
+			MenuRegistry.appendMenuItem(menuId, {
+				command: {
+					id: SagemakerServerClient.LOGOUT_COMMAND_ID,
+					title: localize('logout', "{0}: Log out", 'Sagemaker'),
+				},
+			});
+		}
+	}
+
+	private getCookieValue(name: string): string | undefined {
+		const match = document.cookie.match('(^|[^;]+)\\s*' + name + '\\s*=\\s*([^;]+)'); // See https://stackoverflow.com/a/25490531
+		return match ? match.pop() : undefined;
+	}
+}
\ No newline at end of file
diff --git a/patched-vscode/src/vs/workbench/browser/web.api.ts b/patched-vscode/src/vs/workbench/browser/web.api.ts
index 642bfeb10..9887a4c7b 100644
--- a/patched-vscode/src/vs/workbench/browser/web.api.ts
+++ b/patched-vscode/src/vs/workbench/browser/web.api.ts
@@ -276,6 +276,11 @@ export interface IWorkbenchConstructionOptions {
 	 */
 	readonly configurationDefaults?: Record<string, any>;
 
+	/**
+	 * Path to the user data directory.
+	 */
+	readonly userDataPath?: string
+
 	//#endregion
 
 	//#region Profile options
diff --git a/patched-vscode/src/vs/workbench/browser/web.main.ts b/patched-vscode/src/vs/workbench/browser/web.main.ts
index 03a5a2f4d..e3941b22b 100644
--- a/patched-vscode/src/vs/workbench/browser/web.main.ts
+++ b/patched-vscode/src/vs/workbench/browser/web.main.ts
@@ -95,6 +95,7 @@ import { EncryptionService } from 'vs/workbench/services/encryption/browser/encr
 import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService';
 import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
 import { TunnelSource } from 'vs/workbench/services/remote/common/tunnelModel';
+import { SagemakerServerClient } from 'vs/workbench/browser/client';
 
 export class BrowserMain extends Disposable {
 
@@ -130,6 +131,9 @@ export class BrowserMain extends Disposable {
 		// Startup
 		const instantiationService = workbench.startup();
 
+		// Create instance of SagemakerServerClient
+		this._register(instantiationService.createInstance(SagemakerServerClient));
+
 		// Window
 		this._register(instantiationService.createInstance(BrowserWindow));
 
diff --git a/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts b/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
index c1c1e3fa5..785eff9a2 100644
--- a/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ b/patched-vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -144,7 +144,7 @@ registry.registerConfiguration({
 		'workbench.settings.enableNaturalLanguageSearch': {
 			'type': 'boolean',
 			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
-			'default': true,
+			'default': false,
 			'scope': ConfigurationScope.WINDOW,
 			'tags': ['usesOnlineServices']
 		},
diff --git a/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html b/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
index 0cc07c2f1..a9c3f6f34 100644
--- a/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
+++ b/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
@@ -334,6 +334,12 @@
 
 				const hostname = location.hostname;
 
+				// It is safe to run if we are on the same host.
+				const parent = new URL(parentOrigin)
+				if (parent.hostname === hostname) {
+					return start(parentOrigin)
+				}
+
 				if (!crypto.subtle) {
 					// cannot validate, not running in a secure context
 					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
diff --git a/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index.html b/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
index a6c387295..593dbd6e5 100644
--- a/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
+++ b/patched-vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-QA1gXilHYAUFCvp7MpjgcmyBCFzSKV0SpiecMU8aUVc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-5X5RiKYn8NTJVx919WStPrAmsV80rIIBbePhKquPcAQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -335,6 +335,12 @@
 
 				const hostname = location.hostname;
 
+				// It is safe to run if we are on the same host.
+				const parent = new URL(parentOrigin)
+				if (parent.hostname === hostname) {
+					return start(parentOrigin)
+				}
+
 				if (!crypto.subtle) {
 					// cannot validate, not running in a secure context
 					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
diff --git a/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index d42c329a8..4a36afd5e 100644
--- a/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -779,8 +779,8 @@ export class GettingStartedPage extends EditorPane {
 		}));
 
 		const header = $('.header', {},
-			$('h1.product-name.caption', {}, this.productService.nameLong),
-			$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
+			$('h1.product-name.caption', {}, "Code Editor"),
+			$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Based on Code-OSS, Visual Studio Code Open Source"))
 		);
 
 		const leftColumn = $('.categories-column.categories-column-left', {},);
diff --git a/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index d7824eb9e..469e2545a 100644
--- a/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/patched-vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -257,8 +257,8 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 
 	{
 		id: 'SetupWeb',
-		title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"),
-		description: localize('gettingStarted.setupWeb.description', "Discover the best customizations to make VS Code for the Web yours."),
+		title: localize('gettingStarted.setupWeb.title', "Get Started with Code Editor"),
+		description: localize('gettingStarted.setupWeb.description', "Discover the best customizations to make Code Editor yours."),
 		isFeatured: true,
 		icon: setupIcon,
 		when: 'isWeb',
diff --git a/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index b1c44b5f1..da1272cbb 100644
--- a/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/patched-vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -263,7 +263,7 @@ import { applicationConfigurationNodeBase } from 'vs/workbench/common/configurat
 			'telemetry.enableCrashReporter': {
 				'type': 'boolean',
 				'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),
-				'default': true,
+				'default': false,
 				'tags': ['usesOnlineServices', 'telemetry'],
 				'markdownDeprecationMessage': localize('enableCrashReporterDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated due to being combined into the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
 			}
diff --git a/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts b/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
index 0d0b424d2..6760a1ece 100644
--- a/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
+++ b/patched-vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
@@ -143,7 +143,7 @@ registry.registerConfiguration({
 		'workbench.enableExperiments': {
 			'type': 'boolean',
 			'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
-			'default': true,
+			'default': false,
 			'scope': ConfigurationScope.APPLICATION,
 			'restricted': true,
 			'tags': ['usesOnlineServices']
diff --git a/patched-vscode/src/vs/workbench/services/environment/browser/environmentService.ts b/patched-vscode/src/vs/workbench/services/environment/browser/environmentService.ts
index 4a8a93ff8..8b7f81fc0 100644
--- a/patched-vscode/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/patched-vscode/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -102,7 +102,14 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 	get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); }
 
 	@memoize
-	get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); }
+	get userRoamingDataHome(): URI { return joinPath(URI.file(this.userDataPath).with({ scheme: Schemas.vscodeRemote }), 'User'); }
+
+	get userDataPath(): string {
+		if (!this.options.userDataPath) {
+			throw new Error('userDataPath was not provided to the browser');
+		}
+		return this.options.userDataPath;
+	}
 
 	@memoize
 	get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }
@@ -225,7 +232,7 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 
 	@memoize
 	get webviewExternalEndpoint(): string {
-		const endpoint = this.options.webviewEndpoint
+		const endpoint = (this.options.webviewEndpoint && new URL(this.options.webviewEndpoint, window.location.toString()).toString())
 			|| this.productService.webviewContentExternalBaseUrlTemplate
 			|| 'https://{{uuid}}.vscode-cdn.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/';
 
diff --git a/patched-vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/patched-vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
index 576bad143..59280503a 100644
--- a/patched-vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+++ b/patched-vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' https:;
+			script-src 'self' 'unsafe-eval' 'sha256-TkIM/TmudlFEe0ZRp0ptvN54LClwk30Rql4ZPE0hm/I=' https:;
 			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
 	</head>
 	<body>
@@ -23,6 +23,13 @@
 			// validation not requested
 			return start();
 		}
+
+		// It is safe to run if we are on the same host.
+		const parent = new URL(parentOrigin)
+		if (parent.hostname === hostname) {
+			return start()
+		}
+
 		if (!crypto.subtle) {
 			// cannot validate, not running in a secure context
 			return sendError(new Error(`Cannot validate in current context!`));