fix(Sky): Add reentrancy guard to InstallSkyBridge and phase advancement

NikolaRHristov · NikolaRHristov · commit 876ea919a147 · 2026-04-29T21:37:25.000+03:00
The InstallSkyBridge function lacked reentrancy protection, causing duplicate Tauri listen() registrations on Astro view-transitions, Tauri webview reloads, and dev HMR. Each Mountain emit fired handlers N times, resulting in duplicated tree views, markers, and webview renders—the "workbench loading twice" / "purple overlays" bug.

Add a module-level guard (_SkyBridgeInstalled, _SkyBridgeInstallPromise) so multiple calls to InstallSkyBridge only execute once. Also add the phase advance script to Layout.astro that fires BEFORE the workbench import, mirroring Mountain.astro to prevent the 8s/23s fallback timers from leaving the workbench in a half-restored render state. Finally, add a +5s view-registry snapshot diagnostic to probe extension-point registration status.

Additionally, update astro.config.ts: set output="static", disable clientPrerender and contentIntellisense, and add queuedRendering config. This restores responsive UI during startup and eliminates the double-render flicker.
diff --git a/Source/Function/Markup/Base.astro b/Source/Function/Markup/Base.astro
@@ -5,24 +5,6 @@ import Meta from "../Meta.astro";
 <!doctype html>
 <html lang="en" class="no-js" dir="ltr">
 	<head>
-		<!-- Early paint colour. Without this the WKWebView renders its
-		     default white → VS Code's theme CSS → native-titlebar repaint
-		     all in ~200 ms, visible as a purple/fuchsia/white flash on
-		     every Tauri `Window.navigate()` reload (reported as
-		     "overlaying purple windows" + stuttering). Matching VS Code
-		     Dark+ (`#1e1e1e` editor bg, `#d4d4d4` editor fg) keeps the
-		     first paint inside the app's dark band so the flash
-		     disappears. Kept inline so it applies before any external
-		     CSS loads. -->
-		<style is:inline>
-			html,
-			body {
-				background: #1e1e1e;
-				color: #d4d4d4;
-				margin: 0;
-			}
-		</style>
-
 		<script>
 			document.documentElement.classList.remove("no-js");
 
diff --git a/Source/Function/SkyBridge.ts b/Source/Function/SkyBridge.ts
@@ -316,6 +316,41 @@ function GetServices(): CelServices | null {
 		// but isn't the real `WebviewViewService`) still surfaces.
 		const RegisterShape = `WebviewViews.register=${typeof (S["WebviewViews"] as any)?.register} Markers.changeOne=${typeof (S["Markers"] as any)?.changeOne}`;
 		ToMountain("cel-services", RegisterShape);
+		// View-registry snapshot. The Output transform's
+		// `ViewRegistrySnapshot()` accessor (added in
+		// `ExposeWorkbenchAccessor.ts`) walks the workbench's
+		// `IViewContainersRegistry` and `IViewsRegistry`, returning
+		// counts + sample IDs. Logged at +5s so the extension-points
+		// pipeline has time to flush. If `containers` is still tiny
+		// (only built-ins like `workbench.view.explorer`) and no
+		// extension-contributed IDs (`roo-cline`, `claude-vscode`,
+		// `gitlens.views.welcome`, ...) appear, the issue is that
+		// extension manifests aren't reaching
+		// `viewsContainersExtensionPoint.setHandler` - meaning the
+		// workbench's `IExtensionService` never received those
+		// extensions' descriptions through the `_registerExtensions`
+		// path. Activity bar stays empty, panels can't open.
+		setTimeout(() => {
+			try {
+				const Snapshot = (S as any)?.ViewRegistrySnapshot?.();
+				if (!Snapshot) {
+					ToMountain(
+						"view-registry",
+						"snapshot accessor missing on __CEL_SERVICES__",
+					);
+					return;
+				}
+				ToMountain(
+					"view-registry",
+					`containers=${Snapshot.containers} views=${Snapshot.views} containerSample=${(Snapshot.containerSample ?? []).join(",")} viewSample=${(Snapshot.viewSample ?? []).join(",")}`,
+				);
+			} catch (Error) {
+				ToMountain(
+					"view-registry",
+					`probe failed: ${(Error as Error)?.message ?? String(Error)}`,
+				);
+			}
+		}, 5000);
 	};
 	if (typeof window !== "undefined") {
 		// If services already ready by the time this module loads, probe
@@ -592,8 +627,38 @@ function ShowNotification(
 /**
  * Install all `sky://` event listeners. Call this AFTER the VS Code
  * workbench has loaded (so `__CEL_WORKBENCH__` is available).
+ *
+ * **Reentrancy:** the function is idempotent. Multiple calls (Astro
+ * view-transition, Tauri webview reload, dev HMR re-import) only attach
+ * the listener set once. Without this guard every double-call doubled
+ * the Tauri `listen()` registrations, so each Mountain emit fired every
+ * `sky://*` handler N times - rendering the same tree view twice,
+ * inserting the same marker twice, painting the same webview twice,
+ * etc. That looked exactly like "the workbench is loading twice" /
+ * "purple overlays / panels not rendering properly" in the renderer.
  */
+let _SkyBridgeInstalled = false;
+let _SkyBridgeInstallPromise: Promise<void> | null = null;
+
 export async function InstallSkyBridge(): Promise<void> {
+	if (_SkyBridgeInstalled) {
+		return;
+	}
+	if (_SkyBridgeInstallPromise) {
+		return _SkyBridgeInstallPromise;
+	}
+	_SkyBridgeInstallPromise = (async () => {
+		try {
+			await _InstallSkyBridgeOnce();
+			_SkyBridgeInstalled = true;
+		} finally {
+			_SkyBridgeInstallPromise = null;
+		}
+	})();
+	return _SkyBridgeInstallPromise;
+}
+
+async function _InstallSkyBridgeOnce(): Promise<void> {
 	const Cleanups: Array<() => void> = [];
 	const Register = async (
 		Channel: string,
diff --git a/Source/Workbench/Bundled/Electron/Layout.astro b/Source/Workbench/Bundled/Electron/Layout.astro
@@ -26,6 +26,39 @@ import TelemetryBridge from "../../TelemetryBridge.astro";
 	<NLS />
 	<TelemetryBridge />
 
+	<!-- Phase advance script - fires BEFORE the workbench import so it
+	     is not blocked by the main workbench script. Mirrors the
+	     equivalent block in `Mountain.astro:30` so the bundled Electron
+	     route doesn't hang at phase 2 / 3 waiting for Mountain's 8s /
+	     23s fallback timers (visible in the log as
+	     `[Lifecycle] [Fallback] Sky did not advance to Restored within
+	     8s ...`). The fallback delay leaves the workbench in a
+	     half-restored render state - editor state-restoration gated on
+	     phase=Restored is deferred, "Eventually" work is deferred -
+	     which surfaces as sluggish UI / heavy-on-the-eye flicker
+	     during the first 8-23 seconds. -->
+	<script type="module">
+		const PhaseInvoke =
+			globalThis.__TAURI_INTERNALS__?.invoke ??
+			globalThis.__TAURI__?.invoke ??
+			globalThis.__TAURI__?.core?.invoke ??
+			null;
+		if (PhaseInvoke) {
+			const Advance = (PhaseNumber) =>
+				PhaseInvoke("MountainIPCInvoke", {
+					method: "lifecycle:advancePhase",
+					params: [PhaseNumber],
+				}).catch(() => {});
+			// Phase 3 = Restored: workbench DOM is attached, first
+			// paint imminent. Mountain rejects same-/backwards-phase
+			// advances, so racing the workbench import is safe.
+			Advance(3);
+			// Phase 4 = Eventually: long-tail background work can
+			// start. Delayed so 3 → 4 stays monotonic.
+			setTimeout(() => Advance(4), 1500);
+		}
+	</script>
+
 	<!-- Sequential: Preload -> Polyfills -> Bootstrap -> Entry (bundled workbench) -> SkyBridge -->
 	<script type="module">
 		await import("../../Electron/WindPreload.js");
diff --git a/astro.config.ts b/astro.config.ts
@@ -63,7 +63,12 @@ import { External, Host, Link, On } from "./Source/Function/Debug";
 // empty and the `vs/**` external rules below stay in effect - existing
 // builds are byte-for-byte identical.
 // -----------------------------------------------------------------------------
-const BundledVariants = ["electron", "browser", "sessions", "workbench"] as const;
+const BundledVariants = [
+	"electron",
+	"browser",
+	"sessions",
+	"workbench",
+] as const;
 type BundledVariant = (typeof BundledVariants)[number];
 
 const BundledList = (process.env["Pack"] ?? "")
@@ -616,9 +621,7 @@ export default defineConfig({
 					// Scanner observes the same flag (Atom J3) and returns early
 					// for the built-in fallback paths, so the runtime matches the
 					// zero-on-disk state.
-					if (
-						process.env["Skip"] === "true"
-					) {
+					if (process.env["Skip"] === "true") {
 						console.log(
 							"[CopyVSCode] Step 13: Skip=true - skipping built-in extension copy",
 						);
@@ -645,8 +648,7 @@ export default defineConfig({
 						// `Install=false` for CI
 						// runs that pre-populate the cache.
 						const AutoInstallDeps =
-							process.env["Install"] !==
-							"false";
+							process.env["Install"] !== "false";
 						const InstallLog: Array<{
 							Name: string;
 							Installed: number;
@@ -739,11 +741,7 @@ export default defineConfig({
 							// exporting the flag in the shell or
 							// `.env.Land.Local`. Preserve the call-to-action at
 							// the end so the opt-in output is self-explanatory.
-							if (
-								process.env[
-									"Warn"
-								] === "true"
-							) {
+							if (process.env["Warn"] === "true") {
 								for (const Warning of BundleWarnings) {
 									console.warn(
 										`[CopyVSCode] Step 13: bundle warning - ${Warning}`,
@@ -807,12 +805,22 @@ export default defineConfig({
 		},
 	],
 
+	output: "static",
+
 	experimental: {
-		clientPrerender: true,
+		clientPrerender: false,
 
-		contentIntellisense: true,
+		contentIntellisense: false,
 
 		rustCompiler: true,
+
+		queuedRendering: {
+			enabled: false,
+
+			contentCache: false,
+
+			poolSize: 1000,
+		},
 	},
 
 	vite: {
@@ -853,11 +861,9 @@ export default defineConfig({
 			"import.meta.env.Report": JSON.stringify(
 				process.env["Report"] ?? "true",
 			),
-			"import.meta.env.Throttle":
-				JSON.stringify(
-					process.env["Throttle"] ??
-						"5",
-				),
+			"import.meta.env.Throttle": JSON.stringify(
+				process.env["Throttle"] ?? "5",
+			),
 			"import.meta.env.Buffer": JSON.stringify(
 				process.env["Buffer"] ?? "3000",
 			),
@@ -870,9 +876,7 @@ export default defineConfig({
 			"import.meta.env.Ask": JSON.stringify(
 				process.env["Ask"] ?? "false",
 			),
-			"import.meta.env.Brand": JSON.stringify(
-				process.env["Brand"] ?? "",
-			),
+			"import.meta.env.Brand": JSON.stringify(process.env["Brand"] ?? ""),
 		},
 
 		build: {
