Merge pull request #180 from aakashmandavilli96/srmanda1.8

Update code oss version to 1.101.2

Author: NewtonDer

.github/workflows/build.yml

@@ -84,7 +84,8 @@ jobs:
       - name: Apply patches (if any)
         run: |
           if [ -d patches ] && [ "$(ls -A patches)" ]; then
-            quilt push -a || true
+            set -e
+            quilt push -a
           fi
 
       # Step 5: Generate a version string for this specific build.

patched-vscode/src/vs/server/node/webClientServer.ts

@@ -34,34 +34,24 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
 +++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
-@@ -64,6 +64,8 @@ import { ILocalizedString } from 'vs/pla
- import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
- import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
- import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-+import { IProductService } from 'vs/platform/product/common/productService';
-+import { memoize } from 'vs/base/common/decorators';
- 
- export const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
- export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
-@@ -87,7 +89,6 @@ const SortByUpdateDateContext = new RawC
- const REMOTE_CATEGORY: ILocalizedString = localize2({ key: 'remote', comment: ['Remote as in remote machine'] }, "Remote");
- 
- export class ExtensionsViewletViewsContribution extends Disposable implements IWorkbenchContribution {
--
- 	private readonly container: ViewContainer;
- 
- 	constructor(
-@@ -516,7 +517,8 @@ export class ExtensionsViewPaneContainer
- 		@IExtensionService extensionService: IExtensionService,
- 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
- 		@IPreferencesService private readonly preferencesService: IPreferencesService,
--		@ICommandService private readonly commandService: ICommandService
-+		@ICommandService private readonly commandService: ICommandService,
+@@ -64,6 +64,8 @@ import { createActionViewItem } from '..
+ import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
+ import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+ import { KeyCode } from '../../../../base/common/keyCodes.js';
++import { IProductService } from '../../../../platform/product/common/productService.js';
++import { memoize } from '../../../../base/common/decorators.js';
+ import { ThemeIcon } from '../../../../base/common/themables.js';
+ import { Codicon } from '../../../../base/common/codicons.js';
+ import { IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+@@ -531,6 +533,7 @@ export class ExtensionsViewPaneContainer
+ 		@ICommandService private readonly commandService: ICommandService,
+ 		@IMcpGalleryService private readonly mcpGalleryService: IMcpGalleryService,
+ 		@ILogService logService: ILogService,
 +		@IProductService private readonly productService: IProductService,
  	) {
- 		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+ 		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 
-@@ -544,6 +546,15 @@ export class ExtensionsViewPaneContainer
+@@ -560,6 +563,15 @@ export class ExtensionsViewPaneContainer
  		this.searchViewletState = this.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
  	}
 
@@ -77,43 +67,33 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/extensions/browser/
  	get searchValue(): string | undefined {
  		return this.searchBox?.getValue();
  	}
-@@ -558,8 +569,7 @@ export class ExtensionsViewPaneContainer
- 		hide(overlay);
+@@ -586,7 +598,7 @@ export class ExtensionsViewPaneContainer
 
- 		const header = append(this.root, $('.header'));
+ 		this.header = append(this.root, $('.header'));
 -		const placeholder = localize('searchExtensions', "Search Extensions in Marketplace");
--
 +		const placeholder = localize('searchExtensions', 'Search extensions in {0}', this.extensionsGalleryHostname);
+ 
  		const searchValue = this.searchViewletState['query.value'] ? this.searchViewletState['query.value'] : '';
 
- 		const searchContainer = append(header, $('.extensions-search-container'));
-@@ -924,4 +934,4 @@ export class MaliciousExtensionChecker i
- 			}).then(() => undefined);
- 		}, err => this.logService.error(err));
- 	}
--}
-+}
-\ No newline at end of file
 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
-@@ -331,14 +331,7 @@ export class WebClientServer {
- 		const productConfiguration = {
- 			rootEndpoint: base,
+@@ -339,11 +339,7 @@ export class WebClientServer {
+ 		const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
  			embedderIdentifier: 'server-distro',
 -			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
 -				...this._productService.extensionsGallery,
 -				resourceUrlTemplate: this._webExtensionResourceUrlTemplate.with({
 -					scheme: 'http',
 -					authority: remoteAuthority,
--					path: `${this._webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
+-					path: `${webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
 -				}).toString(true)
 -			} : undefined
 +			extensionsGallery: this._productService.extensionsGallery,
- 		} satisfies Partial<IProductConfiguration>;
+ 		};
 
- 		if (!this._environmentService.isBuilt) {
+ 		const proposedApi = this._environmentService.args['enable-proposed-api'];
 Index: sagemaker-code-editor/vscode/product.json
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/product.json
@@ -146,7 +126,16 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/extensionResourceLoader/comm
  import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
 
  const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
-@@ -141,9 +140,9 @@ export abstract class AbstractExtensionR
+@@ -123,7 +122,7 @@ export abstract class AbstractExtensionR
+ 					: version,
+ 				path: 'extension'
+ 			}));
+-			return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: RemoteAuthorities.getPreferredWebSchema() }) : uri;
++			return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: 'https' }) : uri;
+ 		}
+ 		return undefined;
+ 	}
+@@ -163,9 +162,9 @@ export abstract class AbstractExtensionR
  	}
 
  	protected _isWebExtensionResourceEndPoint(uri: URI): boolean {
@@ -158,4 +147,4 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/extensionResourceLoader/comm
 +		return uriPath.startsWith(WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT);
  	}
 
- }
+ }

patches/custom-extensions-marketplace.diff

@@ -140,7 +140,7 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-idle-extension/src/exte
 @@ -0,0 +1,112 @@
 +import * as vscode from "vscode";
 +import * as fs from "fs";
-+import * as path from "path";
++import { join } from "path";
 +
 +let idleFilePath: string
 +let terminalActivityInterval: NodeJS.Timeout | undefined
@@ -165,7 +165,7 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-idle-extension/src/exte
 + */
 +function initializeIdleFilePath() {
 +	const tmpDirectory = "/tmp/"; 
-+	idleFilePath = path.join(tmpDirectory, ".sagemaker-last-active-timestamp");
++	idleFilePath = join(tmpDirectory, ".sagemaker-last-active-timestamp");
 +
 +	// Set initial lastActivetimestamp
 +	updateLastActivityTimestamp()
@@ -225,7 +225,7 @@ Index: sagemaker-code-editor/vscode/extensions/sagemaker-idle-extension/src/exte
 +
 +		const now = Date.now();
 +		const activityDetected = files.some((file) => {
-+			const filePath = path.join("/dev/pts", file);
++			const filePath = join("/dev/pts", file);
 +			try {
 +				const stats = fs.statSync(filePath);
 +				const mtime = new Date(stats.mtime).getTime();
@@ -285,18 +285,18 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
 
 -import { createReadStream, promises } from 'fs';
 +import { createReadStream, promises, existsSync, writeFileSync } from 'fs';
- import * as path from 'path';
  import * as http from 'http';
  import * as url from 'url';
-@@ -96,6 +96,7 @@ const APP_ROOT = dirname(FileAccess.asFi
+ import * as cookie from 'cookie';
+@@ -95,6 +95,7 @@ const APP_ROOT = dirname(FileAccess.asFi
  const STATIC_PATH = `/static`;
  const CALLBACK_PATH = `/callback`;
  const WEB_EXTENSION_PATH = `/web-extension-resource`;
 +const IDLE_EXTENSION_PATH = `/api/idle`;
 
  export class WebClientServer {
 
-@@ -133,6 +134,9 @@ export class WebClientServer {
+@@ -131,6 +132,9 @@ export class WebClientServer {
  				// callback support
  				return this._handleCallback(res);
  			}
@@ -306,7 +306,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  			if (pathname.startsWith(WEB_EXTENSION_PATH) && pathname.charCodeAt(WEB_EXTENSION_PATH.length) === CharCode.Slash) {
  				// extension resource support
  				return this._handleWebExtensionResource(req, res, pathname.substring(WEB_EXTENSION_PATH.length));
-@@ -498,4 +502,29 @@ export class WebClientServer {
+@@ -496,4 +500,29 @@ export class WebClientServer {
  		});
  		return void res.end(data);
  	}
@@ -317,7 +317,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
 + 	private async _handleIdle(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
 + 		try {
 + 			const tmpDirectory = '/tmp/'
-+ 			const idleFilePath = path.join(tmpDirectory, '.sagemaker-last-active-timestamp');
++ 			const idleFilePath = join(tmpDirectory, '.sagemaker-last-active-timestamp');
 + 
 + 			// If idle shutdown file does not exist, this indicates the app UI may never been opened
 + 			// Create the initial metadata file

patches/sagemaker-idle-extension.patch

@@ -154,7 +154,7 @@ Index: sagemaker-code-editor/vscode/build/npm/dirs.js
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/build/npm/dirs.js
 +++ sagemaker-code-editor/vscode/build/npm/dirs.js
-@@ -43,6 +43,7 @@ const dirs = [
+@@ -42,6 +42,7 @@ const dirs = [
  	'extensions/sagemaker-idle-extension',
  	'extensions/sagemaker-terminal-crash-mitigation',
  	'extensions/sagemaker-open-notebook-extension',

patches/sagemaker-ui-dark-theme.patch

@@ -2,16 +2,16 @@ 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
-@@ -4,6 +4,8 @@
-  *--------------------------------------------------------------------------------------------*/
+@@ -6,6 +6,8 @@
 
  import { createReadStream, promises, existsSync, writeFileSync } from 'fs';
+ import * as http from 'http';
 +import { spawn } from 'child_process';
 +import * as fs from 'fs';
- import * as path from 'path';
- import * as http from 'http';
  import * as url from 'url';
-@@ -38,6 +40,10 @@ const textMimeType: { [ext: string]: str
+ import * as cookie from 'cookie';
+ import * as crypto from 'crypto';
+@@ -30,6 +32,10 @@ const textMimeType: { [ext: string]: st
  	'.svg': 'image/svg+xml',
  };
 
@@ -22,61 +22,61 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
  /**
   * Return an error to the client.
   */
-@@ -97,6 +103,7 @@ const STATIC_PATH = `/static`;
+@@ -93,6 +99,7 @@ const STATIC_PATH = `/static`;
  const CALLBACK_PATH = `/callback`;
  const WEB_EXTENSION_PATH = `/web-extension-resource`;
  const IDLE_EXTENSION_PATH = `/api/idle`;
 +const POST_STARTUP_SCRIPT_PATH = `/api/poststartup`;
 
  export class WebClientServer {
 
-@@ -141,6 +148,9 @@ export class WebClientServer {
- 				// extension resource support
- 				return this._handleWebExtensionResource(req, res, pathname.substring(WEB_EXTENSION_PATH.length));
+@@ -134,6 +141,9 @@ export class WebClientServer {
+ 			if (pathname === IDLE_EXTENSION_PATH) {
+ 				return this._handleIdle(req, res);
  			}
 +			if (pathname === POST_STARTUP_SCRIPT_PATH) {
 +				return this._handlePostStartupScriptInvocation(req, res);
 +			}
- 
- 			return serveError(req, res, 404, 'Not found.');
- 		} catch (error) {
-@@ -527,4 +537,39 @@ export class WebClientServer {
-  			serveError(req, res, 500, error.message)
-  		}
-  	}
+ 			if (pathname.startsWith(WEB_EXTENSION_PATH) && pathname.charCodeAt(WEB_EXTENSION_PATH.length) === CharCode.Slash) {
+ 				// extension resource support
+ 				return this._handleWebExtensionResource(req, res, pathname.substring(WEB_EXTENSION_PATH.length));
+@@ -507,4 +517,39 @@ export class WebClientServer {
+ 			serveError(req, res, 500, error.message)
+ 		}
+ 	}
 +
-+    /**
-+     * Handles API requests to run the post-startup script in SMD.
-+     */
-+    private async _handlePostStartupScriptInvocation(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
-+        const postStartupScriptPath = '/etc/sagemaker-ui/sagemaker_ui_post_startup.sh'
-+        const logPath = '/var/log/apps/post_startup_default.log';
-+        const logStream = fs.createWriteStream(logPath, { flags: 'a' });
++	/**
++	 * Handles API requests to run the post-startup script in SMD.
++	 */
++	private async _handlePostStartupScriptInvocation(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
++		const postStartupScriptPath = '/etc/sagemaker-ui/sagemaker_ui_post_startup.sh'
++		const logPath = '/var/log/apps/post_startup_default.log';
++		const logStream = fs.createWriteStream(logPath, { flags: 'a' });
 +
-+        // Only trigger post-startup script invocation for SageMakerUnifiedStudio app.
-+        if (process.env['SERVICE_NAME'] != ServiceName.SAGEMAKER_UNIFIED_STUDIO) {
-+            return serveError(req, res, 403, 'Forbidden');
-+        } else {
-+            //If postStartupScriptFile doesn't exist, it will throw FileNotFoundError (404)
-+            //If exists, it will start the execution and add the execution logs in logFile.
-+            try {
-+                if (fs.existsSync(postStartupScriptPath)) {
-+                    // Adding 0o755 to make script file executable
-+                    fs.chmodSync(postStartupScriptPath, 0o755);
++		// Only trigger post-startup script invocation for SageMakerUnifiedStudio app.
++		if (process.env['SERVICE_NAME'] != ServiceName.SAGEMAKER_UNIFIED_STUDIO) {
++			return serveError(req, res, 403, 'Forbidden');
++		} else {
++			//If postStartupScriptFile doesn't exist, it will throw FileNotFoundError (404)
++			//If exists, it will start the execution and add the execution logs in logFile.
++			try {
++				if (fs.existsSync(postStartupScriptPath)) {
++					// Adding 0o755 to make script file executable
++					fs.chmodSync(postStartupScriptPath, 0o755);
 +
-+                    const subprocess = spawn('bash', [`${postStartupScriptPath}`], { cwd: '/' });
-+                    subprocess.stdout.pipe(logStream);
-+                    subprocess.stderr.pipe(logStream);
++					const subprocess = spawn('bash', [`${postStartupScriptPath}`], { cwd: '/' });
++					subprocess.stdout.pipe(logStream);
++					subprocess.stderr.pipe(logStream);
 +
-+                    res.statusCode = 200;
-+                    res.setHeader('Content-Type', 'application/json');
-+                    res.end(JSON.stringify({ 'success': 'true' }));
-+                } else {
-+                    serveError(req, res, 500, 'Poststartup script file not found at ' + postStartupScriptPath);
-+                }
-+            } catch (error) {
-+                serveError(req, res, 500, error.message);
-+            }
-+        }
-+    }
- }
++					res.statusCode = 200;
++					res.setHeader('Content-Type', 'application/json');
++					res.end(JSON.stringify({ 'success': 'true' }));
++				} else {
++					serveError(req, res, 500, 'Poststartup script file not found at ' + postStartupScriptPath);
++				}
++			} catch (error) {
++				serveError(req, res, 500, error.message);
++			}
++		}
++	}
+ }

patches/sagemaker-ui-post-startup.patch

@@ -15,3 +15,5 @@ sagemaker-ui-post-startup.patch
 sagemaker-extension-smus-support.patch
 post-startup-notifications.patch
 sagemaker-extensions-sync.patch
+# custom-extensions-marketplace.diff
+# display-language.patch

patches/series

@@ -73,7 +73,7 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre
  	<meta charset="UTF-8">
 
  	<meta http-equiv="Content-Security-Policy"
--		content="default-src 'none'; script-src 'sha256-nlLyDpnjtftJG2xvXh2vuy77l7xFTjfOz7Jnj1iXNmA=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+-		content="default-src 'none'; script-src 'sha256-gEAyFzmkyqMoTTnN+3KReFUYoHsK4RAJEb+6eiul+UY=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 +		content="default-src 'none'; script-src 'sha256-ap/AtocvSWp0rrxaO19DJy/nOpazT6M5Cv9utUWe7MA=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
  	<!-- Disable pinch zooming -->
@@ -91,23 +91,7 @@ Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/webview/browser/pre
  				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