refactor(Sky): Revert to /Static/Application/ paths with build-time asset consolidation

NikolaRHristov · NikolaRHristov · commit 7210878e677f · 2026-04-07T08:33:17.000+03:00
Revert the /vs/ URL prefix approach from the previous commit. Instead:
- Revert _VSCODE_FILE_ROOT to /Static/Application/ in all page templates (Base, BrowserProxy, Electron, Mountain)
- Delete Public/vs symlink (no longer needed)
- Enhance astro.config.ts build hook to:
  1. Copy ESBuild-processed files from Output/vs to Static/Application/vs/
  2. Supplement missing files from Dependency/Editor/out/vs (e.g., workbench.web.main.js)
  3. Copy Worker.js from node_modules to Target/Worker.js
  4. Strip CSS imports from VS Code JS files for Tauri WKWebView (which lacks service worker interception). Replaced with _LOAD_CSS_WORKER calls to inject &lt;link&gt; elements.
- Add __name esbuild helper polyfill in Base.astro for extension host worker contexts
- Add ipc: to CSP connect-src and chatDebugTokenizer to worker allowlist

This approach consolidates VS Code assets at /Static/Application/vs/ with a two-source strategy (Output primary, Dependency for gaps), ensuring all required files are present while maintaining Tauri compatibility.
diff --git a/Public/vs b/Public/vs
diff --git a/Source/Function/Markup/Base.astro b/Source/Function/Markup/Base.astro
@@ -23,7 +23,20 @@ import Meta from "../Meta.astro";
 
 		<!-- Global VSCode File Root - Must execute before module scripts -->
 		<script is:inline>
-			globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/`;
+			globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/Static/Application/`;
+			// esbuild __name helper — required by Dependency/out/ files loaded in
+			// extension host worker contexts that don't have their own __name definition.
+			if (typeof globalThis.__name === "undefined") {
+				Object.defineProperty(globalThis, "__name", {
+					value: (Target, Value) =>
+						Object.defineProperty(Target, "name", {
+							value: Value,
+							configurable: true,
+						}),
+					configurable: true,
+					writable: true,
+				});
+			}
 		</script>
 
 		<slot name="Head" />
diff --git a/Source/Workbench/Browser.astro b/Source/Workbench/Browser.astro
@@ -12,7 +12,10 @@ import NLS from "./NLS.astro";
 		try {
 			await import("/vs/code/browser/workbench/workbench.js");
 		} catch (error) {
-			console.error("[Browser] Failed to load VS Code browser workbench:", error);
+			console.error(
+				"[Browser] Failed to load VS Code browser workbench:",
+				error,
+			);
 		}
 	</script>
 </Fragment>
diff --git a/Source/Workbench/BrowserTest.astro b/Source/Workbench/BrowserTest.astro
@@ -77,10 +77,17 @@ import NLS from "./NLS.astro";
 	<script is:inline type="module">
 		try {
 			await import("/vs/code/browser/workbench/workbench.js");
-			console.log("[BrowserTest] ===== Loading browser VSCode workbench =====");
-			console.log("[BrowserTest] ✓ Browser workbench script loaded successfully");
+			console.log(
+				"[BrowserTest] ===== Loading browser VSCode workbench =====",
+			);
+			console.log(
+				"[BrowserTest] ✓ Browser workbench script loaded successfully",
+			);
 		} catch (error) {
-			console.error("[BrowserTest] Failed to load VS Code browser workbench:", error);
+			console.error(
+				"[BrowserTest] Failed to load VS Code browser workbench:",
+				error,
+			);
 		}
 		console.log("[BrowserTest] ===== Workbench load attempted =====");
 	</script>
diff --git a/Source/Workbench/Mountain.astro b/Source/Workbench/Mountain.astro
@@ -194,7 +194,8 @@ import NLS from "./NLS.astro";
 		try {
 			// Variable URL: Rollup only analyzes string literals — an identifier
 			// reference is treated as truly dynamic and never resolved at build time.
-			const WorkbenchUrl = "/vs/code/browser/workbench/workbench.js";
+			const WorkbenchUrl =
+				"/Static/Application/vs/code/browser/workbench/workbench.js";
 			await import(WorkbenchUrl);
 
 			console.log(
diff --git a/Source/Workbench/NLS.astro b/Source/Workbench/NLS.astro
@@ -6,5 +6,5 @@ import { Bust, On } from "../Function/Shared";
 	is:inline
 	type="module"
 	src={Bust(
-		`${On ? "/vs/nls.js" : "/Static/Application/nls.messages.js"}`,
+		`/Static/Application/${On ? "vs/" : ""}${On ? "nls.js" : "nls.messages.js"}`,
 	)}></script>
diff --git a/Source/pages/BrowserProxy.astro b/Source/pages/BrowserProxy.astro
@@ -170,7 +170,7 @@ const Worker = `/Worker.js?BASE_REMOTE=${encodeURIComponent(Astro.url.origin)}`;
 
 	<!-- Global VSCode File Root -->
 	<script is:inline slot="Head">
-		globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/`;
+		globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/Static/Application/`;
 	</script>
 
 	<!-- Worker Configuration -->
diff --git a/Source/pages/Electron.astro b/Source/pages/Electron.astro
@@ -170,7 +170,7 @@ const Worker = `/Worker.js?BASE_REMOTE=${encodeURIComponent(Astro.url.origin)}`;
 
 	<!-- Global VSCode File Root -->
 	<script is:inline slot="Head">
-		globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/`;
+		globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/Static/Application/`;
 	</script>
 
 	<!-- Worker Configuration -->
diff --git a/Source/pages/Mountain.astro b/Source/pages/Mountain.astro
@@ -170,7 +170,7 @@ const Worker = `/Worker.js?BASE_REMOTE=${encodeURIComponent(Astro.url.origin)}`;
 
 	<!-- Global VSCode File Root -->
 	<script is:inline slot="Head">
-		globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/`;
+		globalThis._VSCODE_FILE_ROOT = `${window.location.origin}/Static/Application/`;
 	</script>
 
 	<!-- Worker Configuration -->
diff --git a/Source/pages/index.astro b/Source/pages/index.astro
@@ -102,6 +102,7 @@ const Worker = `/Worker.js?BASE_REMOTE=${encodeURIComponent(Astro.url.origin)}`;
 				],
 				"connect-src": [
 					"'self'",
+					"ipc:",
 					"http://localhost:*",
 					"https://tauri.localhost",
 					"wss://tauri.localhost",
@@ -119,6 +120,7 @@ const Worker = `/Worker.js?BASE_REMOTE=${encodeURIComponent(Astro.url.origin)}`;
 					"WorkerApplication",
 					"amdLoader",
 					"cellRendererEditorText",
+					"chatDebugTokenizer",
 					"defaultWorkerFactory",
 					"diffEditorWidget",
 					"diffReview",
diff --git a/astro.config.ts b/astro.config.ts
@@ -13,7 +13,9 @@
  * build context logging to `Element/Sky/Source/Function/Debug.ts`.
  *--------------------------------------------------------------------------------------------*/
 
-import { readFile } from "node:fs/promises";
+import { copyFile, cp, readdir, readFile, writeFile } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 
 import { defineConfig } from "astro/config";
 
@@ -59,28 +61,125 @@ export default defineConfig({
 			name: "CopyVSCodeAssets",
 			hooks: {
 				"astro:build:done": async ({ dir }) => {
-					const { cp } = await import("node:fs/promises");
-					const { fileURLToPath } = await import("node:url");
-					const { join, resolve } = await import("node:path");
-					const Source = resolve(
+					const TargetDir = fileURLToPath(dir);
+					const Destination = join(
+						TargetDir,
+						"Static",
+						"Application",
+						"vs",
+					);
+					// Step 1: Copy ESBuild-processed files from Output (primary source)
+					const OutputSource = resolve(
 						process.cwd(),
-						"../../Output/Target/Microsoft/VSCode/vs",
+						"../Output/Target/Microsoft/VSCode/vs",
 					);
-					const Destination = join(fileURLToPath(dir), "vs");
 					console.log(
-						`[CopyVSCode] Copying vs/ assets → Target/vs/`,
+						`[CopyVSCode] Step 1: Copying Output/vs → Static/Application/vs/`,
 					);
 					try {
-						await cp(Source, Destination, { recursive: true });
+						await cp(OutputSource, Destination, {
+							recursive: true,
+						});
+					} catch (Error) {
+						console.warn(
+							"[CopyVSCode] ✗ Output copy failed:",
+							Error,
+						);
+					}
+					// Step 2: Supplement with tsc-compiled files from Dependency
+					// (fills gaps like workbench.web.main.js missing from Output)
+					const DependencySource = resolve(
+						process.cwd(),
+						"../../Dependency/Microsoft/Dependency/Editor/out/vs",
+					);
+					console.log(
+						`[CopyVSCode] Step 2: Supplementing from Dependency/out/vs/`,
+					);
+					try {
+						await cp(DependencySource, Destination, {
+							recursive: true,
+							force: false,
+						});
+					} catch (Error) {
+						console.warn(
+							"[CopyVSCode] ✗ Dependency supplement failed:",
+							Error,
+						);
+					}
+					// Step 3: Copy Worker.js from node_modules to Target/Worker.js
+					const WorkerSource = resolve(
+						process.cwd(),
+						"node_modules/@codeeditorland/worker/Target/Worker.js",
+					);
+					const WorkerDestination = join(TargetDir, "Worker.js");
+					try {
+						await copyFile(WorkerSource, WorkerDestination);
 						console.log(
-							"[CopyVSCode] ✓ VS Code assets copied to Target/vs/",
+							"[CopyVSCode] ✓ Worker.js copied to Target/",
 						);
 					} catch (Error) {
 						console.warn(
-							"[CopyVSCode] ✗ Could not copy VS Code assets:",
+							"[CopyVSCode] ✗ Worker.js copy failed:",
 							Error,
 						);
 					}
+					// Step 4: Strip CSS imports — Tauri WKWebView has no service worker
+					// interception for Tauri embedded assets, so CSS module imports in
+					// VS Code's JS files must be removed before embedding.
+					// (The Worker/CSS interception handles the browser/PWA context.)
+					// Matches: import "./foo.css"; or import './bar.css'
+					const CSSImport =
+						/^import\s+(['"])([^'"]+\.css)\1\s*;?\s*$/gm;
+					async function StripCSSImports(Dir: string): Promise<void> {
+						let Entries;
+						try {
+							Entries = await readdir(Dir, {
+								withFileTypes: true,
+							});
+						} catch {
+							return;
+						}
+						await Promise.all(
+							Entries.map(async (Entry) => {
+								const Full = join(Dir, Entry.name);
+								if (Entry.isDirectory()) {
+									await StripCSSImports(Full);
+								} else if (Entry.name.endsWith(".js")) {
+									try {
+										const Content = await readFile(
+											Full,
+											"utf-8",
+										);
+										if (CSSImport.test(Content)) {
+											CSSImport.lastIndex = 0;
+											// Replace with _LOAD_CSS_WORKER call so CSS is
+											// injected as a <link> element instead of being
+											// imported as a JS module (which fails with
+											// 'text/css is not a valid MIME type').
+											// import.meta.url resolves the relative path to
+											// the correct absolute /Static/Application/vs/ URL.
+											await writeFile(
+												Full,
+												Content.replace(
+													CSSImport,
+													(_m, _q, Path) =>
+														`window._LOAD_CSS_WORKER?.(new URL("${Path}",import.meta.url).pathname);`,
+												),
+												"utf-8",
+											);
+										}
+									} catch {
+										/* skip */
+									}
+								}
+							}),
+						);
+					}
+					console.log(
+						"[CopyVSCode] Step 4: Stripping CSS imports from Static/Application/vs/",
+					);
+					await StripCSSImports(Destination);
+					console.log("[CopyVSCode] ✓ Assets ready in Target/");
 				},
 			},
 		},
@@ -99,6 +198,15 @@ export default defineConfig({
 
 		build: {
 			rollupOptions: {
+				treeshake: {
+					// Preserve all side effects in the worker package so Register.js
+					// SW registration code is not eliminated by Rollup.
+					moduleSideEffects: (Id: string) =>
+						Id.includes("@codeeditorland/worker") ||
+						Id.includes("Element/Worker")
+							? true
+							: "no-external",
+				},
 				external: [
 					...External,
 					(id: string) =>
