@codingame/monaco-vscode-view-common-service-override 31.0.0 → 32.0.0

package/index.js

@@ -49,7 +49,10 @@ import './vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.co
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/media/views.css';
 import './vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js';
 import './vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js';
+import './vscode/src/vs/workbench/browser/parts/titlebar/menubar.contribution.js';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/workbench.contribution';
+import './vscode/src/vs/workbench/browser/workbench.zenMode.contribution.js';
+import './vscode/src/vs/sessions/common/theme.js';
 import './vscode/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.js';
 import './vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js';
 import './vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "31.0.0",
+  "version": "32.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "31.0.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "31.0.0"
+    "@codingame/monaco-vscode-api": "32.0.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "32.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/service-override/vs/workbench/contrib/webview/browser/pre/service-worker.js

@@ -8,7 +8,7 @@
 /** @type {ServiceWorkerGlobalScope} */
 const sw = /** @type {any} */ (self);
 
-const VERSION = 4;
+const VERSION = 5;
 
 const resourceCacheName = `vscode-resource-cache-${VERSION}`;
 
@@ -18,9 +18,6 @@ const searchParams = new URL(location.toString()).searchParams;
 
 const remoteAuthority = searchParams.get('remoteAuthority');
 
-/** @type {MessagePort|undefined} */
-let outerIframeMessagePort;
-
 /**
  * Origin used for resources
  */
@@ -115,6 +112,13 @@ class RequestStore {
 /** @type {RequestStore<ResourceResponse>} */
 const resourceRequestStore = new RequestStore();
 
+/**
+ * Safari fallback: map of active chunk-based streaming responses.
+ * Maps request id to a WritableStreamDefaultWriter for piping chunks.
+ * @type {Map<number, WritableStreamDefaultWriter<Uint8Array>>}
+ */
+const safariResourceStreams = new Map();
+
 /**
  * Map of requested localhost origins to optional redirects.
  */
@@ -141,28 +145,65 @@ sw.addEventListener('message', async (event) => {
 	/** @type {Client} */
 	const source = event.source;
 	switch (event.data.channel) {
-		case 'version': {
-			perfMark('version/request');
-			outerIframeMessagePort = event.ports[0];
-			sw.clients.get(source.id).then(client => {
-				perfMark('version/reply');
-				if (client) {
-					client.postMessage({
-						channel: 'version',
-						version: VERSION
-					});
-				}
-			});
-			return;
-		}
 		case 'did-load-resource': {
 			/** @type {ResourceResponse} */
 			const response = event.data.data;
-			if (!resourceRequestStore.resolve(response.id, response)) {
+			if (response.status === 200 || response.status === 206) {
+				/** @type {ReadableStream<Uint8Array>} */
+				let stream;
+				if (response.stream) {
+					// Transferable stream (Chromium/Firefox)
+					stream = response.stream;
+				} else {
+					// Safari fallback: set up a TransformStream for incoming chunks
+					const transform = new TransformStream();
+					const writer = transform.writable.getWriter();
+					safariResourceStreams.set(response.id, writer);
+					writer.closed.then(
+						() => safariResourceStreams.delete(response.id),
+						() => safariResourceStreams.delete(response.id)
+					);
+					stream = transform.readable;
+				}
+				resourceRequestStore.resolve(response.id, {
+					status: response.status,
+					id: response.id,
+					path: response.path,
+					mime: response.mime,
+					etag: response.etag,
+					mtime: response.mtime,
+					stream,
+					range: response.range,
+				});
+			} else if (!resourceRequestStore.resolve(response.id, response)) {
 				console.log('Could not resolve unknown resource', response.path);
 			}
 			return;
 		}
+		// Safari fallback: chunk-based streaming for browsers without transferable streams
+		case 'did-load-resource-chunk': {
+			const data = event.data.data;
+			const writer = safariResourceStreams.get(data.id);
+			if (writer) {
+				writer.write(data.data).catch(() => {
+					safariResourceStreams.delete(data.id);
+				});
+			}
+			return;
+		}
+		case 'did-load-resource-end': {
+			const data = event.data.data;
+			const writer = safariResourceStreams.get(data.id);
+			if (writer) {
+				if (data.error) {
+					writer.abort(new Error('Stream error')).catch(() => { /* already cleaning up */ });
+				} else {
+					writer.close().catch(() => { /* already cleaning up */ });
+				}
+				safariResourceStreams.delete(data.id);
+			}
+			return;
+		}
 		case 'did-load-localhost': {
 			const data = event.data.data;
 			if (!localhostRequestStore.resolve(data.id, data.location)) {
@@ -264,17 +305,14 @@ async function processResourceRequest(
 	const webviewId = getWebviewIdForClient(client);
 
 	// Refs https://github.com/microsoft/vscode/issues/244143
-	// With PlzDedicatedWorker, worker subresources and blob wokers
+	// With PlzDedicatedWorker, worker subresources and blob workers
 	// will use clients different from the window client.
-	// Since we cannot different a worker main resource from a worker subresource
-	// we will use message channel to the outer iframe provided at the time
-	// of service worker controller version initialization.
 	if (!webviewId && client.type !== 'worker' && client.type !== 'sharedworker') {
 		console.error('Could not resolve webview id');
 		return notFound();
 	}
 
-	const shouldTryCaching = (event.request.method === 'GET');
+	const shouldTryCaching = (event.request.method === 'GET' && !event.request.headers.get('range'));
 
 	/**
 	 * @param {RequestStoreResult<ResourceResponse>} result
@@ -309,46 +347,14 @@ async function processResourceRequest(
 			return unauthorized();
 		}
 
-		if (entry.status !== 200) {
+		if (entry.status !== 200 && entry.status !== 206) {
 			return notFound();
 		}
 
-		const byteLength = entry.data.byteLength;
-
-		const range = event.request.headers.get('range');
-		if (range) {
-			// To support seeking for videos, we need to handle range requests
-			const bytes = range.match(/^bytes\=(\d+)\-(\d+)?$/g);
-			if (bytes) {
-				// TODO: Right now we are always reading the full file content. This is a bad idea
-				// for large video files :)
-
-				const start = Number(bytes[1]);
-				const end = Number(bytes[2]) || byteLength - 1;
-				return new Response(entry.data.slice(start, end + 1), {
-					status: 206,
-					headers: {
-						...accessControlHeaders,
-						'Content-range': `bytes 0-${end}/${byteLength}`,
-					}
-				});
-			} else {
-				// We don't understand the requested bytes
-				return new Response(null, {
-					status: 416,
-					headers: {
-						...accessControlHeaders,
-						'Content-range': `*/${byteLength}`
-					}
-				});
-			}
-		}
-
 		/** @type {Record<string, string>} */
 		const headers = {
 			...accessControlHeaders,
 			'Content-Type': entry.mime,
-			'Content-Length': byteLength.toString(),
 		};
 
 		if (entry.etag) {
@@ -370,17 +376,25 @@ async function processResourceRequest(
 			headers['Cross-Origin-Opener-Policy'] = 'same-origin';
 		}
 
-		const response = new Response(entry.data, {
-			status: 200,
-			headers
-		});
+		if (entry.stream) {
+			// Range responses: the host already read only the requested range,
+			// so we just pipe the stream through with a 206 status.
+			if (entry.status === 206 && entry.range) {
+				headers['Content-Range'] = entry.range;
+				headers['Cache-Control'] = 'no-store';
+				return new Response(entry.stream, { status: 206, headers });
+			}
 
-		if (shouldTryCaching && entry.etag) {
-			caches.open(resourceCacheName).then(cache => {
-				return cache.put(event.request, response);
-			});
+			const response = new Response(entry.stream, { status: 200, headers });
+
+			if (shouldTryCaching && entry.etag) {
+				const responseForCache = response.clone();
+				caches.open(resourceCacheName).then(cache => {
+					return cache.put(event.request, responseForCache);
+				});
+			}
+			return response;
 		}
-		return response.clone();
 	};
 
 	/** @type {Response|undefined} */
@@ -392,6 +406,28 @@ async function processResourceRequest(
 
 	const { requestId, promise } = resourceRequestStore.create();
 
+	// Parse range header to forward to the host so it can read only the needed bytes
+	/** @type {{ start: number, end?: number } | undefined} */
+	let range;
+	const rangeHeader = event.request.headers.get('range');
+	if (rangeHeader) {
+		const bytes = rangeHeader.match(/^bytes\=(\d+)\-(\d+)?$/);
+		if (bytes) {
+			range = {
+				start: Number(bytes[1]),
+				end: bytes[2] !== undefined ? Number(bytes[2]) : undefined,
+			};
+		} else {
+			return new Response(null, {
+				status: 416,
+				headers: {
+					'Access-Control-Allow-Origin': '*',
+					'Content-Range': '*/*',
+				}
+			});
+		}
+	}
+
 	if (webviewId) {
 		const parentClients = await getOuterIframeClient(webviewId);
 		if (!parentClients.length) {
@@ -408,18 +444,9 @@ async function processResourceRequest(
 				path: requestUrlComponents.path,
 				query: requestUrlComponents.query,
 				ifNoneMatch: cached?.headers.get('ETag'),
+				range,
 			});
 		}
-	} else if (client.type === 'worker' || client.type === 'sharedworker') {
-		outerIframeMessagePort?.postMessage({
-			channel: 'load-resource',
-			id: requestId,
-			scheme: requestUrlComponents.scheme,
-			authority: requestUrlComponents.authority,
-			path: requestUrlComponents.path,
-			query: requestUrlComponents.query,
-			ifNoneMatch: cached?.headers.get('ETag'),
-		});
 	}
 
 	return promise.then(entry => resolveResourceEntry(entry, cached));
@@ -442,11 +469,8 @@ async function processLocalhostRequest(
 	}
 	const webviewId = getWebviewIdForClient(client);
 	// Refs https://github.com/microsoft/vscode/issues/244143
-	// With PlzDedicatedWorker, worker subresources and blob wokers
+	// With PlzDedicatedWorker, worker subresources and blob workers
 	// will use clients different from the window client.
-	// Since we cannot different a worker main resource from a worker subresource
-	// we will use message channel to the outer iframe provided at the time
-	// of service worker controller version initialization.
 	if (!webviewId && client.type !== 'worker' && client.type !== 'sharedworker') {
 		console.error('Could not resolve webview id');
 		return fetch(event.request);
@@ -487,12 +511,6 @@ async function processLocalhostRequest(
 				id: requestId,
 			});
 		}
-	} else if (client.type === 'worker' || client.type === 'sharedworker') {
-		outerIframeMessagePort?.postMessage({
-			channel: 'load-localhost',
-			origin: origin,
-			id: requestId,
-		});
 	}
 
 	return promise.then(resolveRedirect);
@@ -535,8 +553,9 @@ async function getWorkerClientForId(clientId) {
 
 /**
  * @typedef {(
- *   | { readonly status: 200, id: number, path: string, mime: string, data: Uint8Array, etag: string|undefined, mtime: number|undefined }
- *   | { readonly status: 304, id: number, path: string, mime: string, mtime: number|undefined }
+ *   | { readonly status: 200, id: number, path: string, mime: string, stream: ReadableStream<Uint8Array>, etag: string|undefined, mtime: number | undefined }
+ *   | { readonly status: 206, id: number, path: string, mime: string, stream: ReadableStream<Uint8Array>, range: string, etag: string|undefined, mtime: number | undefined }
+ *   | { readonly status: 304, id: number, path: string, mime: string, mtime: number | undefined }
  *   | { readonly status: 401, id: number, path: string }
  *   | { readonly status: 404, id: number, path: string }
  * )} ResourceResponse

package/vscode/src/vs/sessions/common/theme.d.ts

@@ -0,0 +1,21 @@
+export declare const agentsBackground: string;
+export declare const agentsPanelBackground: string;
+export declare const agentsPanelForeground: string;
+export declare const agentsPanelBorder: string;
+export declare const agentsGradientTintColor: string;
+export declare const agentFeedbackInputWidgetBorder: string;
+export declare const agentsUpdateButtonDownloadingBackground: string;
+export declare const agentsUpdateButtonDownloadedBackground: string;
+export declare const agentsChatInputBackground: string;
+export declare const agentsChatInputForeground: string;
+export declare const agentsChatInputBorder: string;
+export declare const agentsChatInputFocusBorder: string;
+export declare const agentsChatInputPlaceholderForeground: string;
+export declare const agentsNewSessionButtonBackground: string;
+export declare const agentsNewSessionButtonForeground: string;
+export declare const agentsNewSessionButtonBorder: string;
+export declare const agentsNewSessionButtonHoverBackground: string;
+export declare const agentsBadgeBackground: string;
+export declare const agentsBadgeForeground: string;
+export declare const agentsUnreadBadgeBackground: string;
+export declare const agentsUnreadBadgeForeground: string;

package/vscode/src/vs/sessions/common/theme.js

@@ -0,0 +1,126 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerColor, transparent } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import { contrastBorder, focusBorder } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground, editorWidgetBorder, toolbarHoverBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import { buttonBackground, inputBackground, inputForeground, inputBorder, inputPlaceholderForeground, buttonBorder } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, PANEL_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
+
+registerColor("agents.background", {
+    dark: editorBackground,
+    light: SIDE_BAR_BACKGROUND,
+    hcDark: editorBackground,
+    hcLight: editorBackground
+}, ( localize(
+    2541,
+    "Background color of the agent sessions window shell and gradient base."
+)));
+registerColor("agentsPanel.background", {
+    dark: SIDE_BAR_BACKGROUND,
+    light: editorBackground,
+    hcDark: SIDE_BAR_BACKGROUND,
+    hcLight: SIDE_BAR_BACKGROUND
+}, ( localize(
+    2542,
+    "Background color of the card panels (chat, files, terminal) in the agent sessions window."
+)));
+registerColor("agentsPanel.foreground", SIDE_BAR_FOREGROUND, ( localize(
+    2543,
+    "Foreground color of the card panels (chat, files, terminal) in the agent sessions window."
+)));
+registerColor("agentsPanel.border", {
+    dark: PANEL_BORDER,
+    light: editorWidgetBorder,
+    hcDark: contrastBorder,
+    hcLight: contrastBorder
+}, ( localize(
+    2544,
+    "Border color of the card panels (chat, files, terminal) in the agent sessions window."
+)));
+registerColor("agentsGradient.tintColor", buttonBackground, ( localize(
+    2545,
+    "Tint color used in the background gradient of the agent sessions window shell."
+)));
+registerColor("agentFeedbackInputWidget.border", {
+    dark: editorWidgetBorder,
+    light: editorWidgetBorder,
+    hcDark: contrastBorder,
+    hcLight: contrastBorder
+}, ( localize(
+    2546,
+    "Border color of the agent feedback input widget shown in the editor."
+)));
+registerColor("agentsUpdateButton.downloadingBackground", ( transparent(buttonBackground, 0.4)), ( localize(
+    2547,
+    "Background color of the update button to show download progress in the agent sessions window."
+)));
+registerColor("agentsUpdateButton.downloadedBackground", ( transparent(buttonBackground, 0.7)), ( localize(
+    2548,
+    "Background color of the update button when download is complete in the agent sessions window."
+)));
+registerColor("agentsChatInput.background", inputBackground, ( localize(
+    2549,
+    "Background color of the chat input field in the agent sessions window."
+)));
+registerColor("agentsChatInput.foreground", inputForeground, ( localize(
+    2550,
+    "Foreground color of the chat input field in the agent sessions window."
+)));
+registerColor("agentsChatInput.border", inputBorder, ( localize(2551, "Border color of the chat input field in the agent sessions window.")));
+registerColor("agentsChatInput.focusBorder", focusBorder, ( localize(
+    2552,
+    "Border color of the chat input field when focused in the agent sessions window."
+)));
+registerColor(
+    "agentsChatInput.placeholderForeground",
+    inputPlaceholderForeground,
+    ( localize(
+    2553,
+    "Placeholder text color in the chat input field in the agent sessions window."
+))
+);
+registerColor("agentsNewSessionButton.background", "#00000000", ( localize(
+    2554,
+    "Background color of the New Session button in the agent sessions sidebar."
+)));
+registerColor("agentsNewSessionButton.foreground", SIDE_BAR_FOREGROUND, ( localize(
+    2555,
+    "Foreground color of the New Session button in the agent sessions sidebar."
+)));
+registerColor("agentsNewSessionButton.border", buttonBorder, ( localize(
+    2556,
+    "Border color of the New Session button in the agent sessions sidebar."
+)));
+registerColor(
+    "agentsNewSessionButton.hoverBackground",
+    toolbarHoverBackground,
+    ( localize(
+    2557,
+    "Background color of the New Session button when hovered in the agent sessions sidebar."
+))
+);
+registerColor("agentsBadge.background", ACTIVITY_BAR_BADGE_BACKGROUND, ( localize(2558, "Background color of badges in the agent sessions window.")));
+registerColor("agentsBadge.foreground", ACTIVITY_BAR_BADGE_FOREGROUND, ( localize(2559, "Foreground color of badges in the agent sessions window.")));
+registerColor(
+    "agentsUnreadBadge.background",
+    ACTIVITY_BAR_BADGE_BACKGROUND,
+    ( localize(
+    2560,
+    "Background color of the unread sessions count badge on the sidebar toggle."
+))
+);
+registerColor(
+    "agentsUnreadBadge.foreground",
+    ACTIVITY_BAR_BADGE_FOREGROUND,
+    ( localize(
+    2561,
+    "Foreground color of the unread sessions count badge on the sidebar toggle."
+))
+);