@pstdio/workbench 0.45.0-nightly.20261021143541 → 0.45.0

package/dist/index.js

@@ -1,8 +1,8 @@
-import { r as e, t } from "./navigation-tree-registry-OZpN52UT.js";
-import { $ as n, $t as r, A as i, At as a, B as o, Bt as s, C as c, Ct as l, D as u, Dt as d, E as f, Et as p, F as m, G as h, Gt as g, H as _, Ht as v, I as y, It as b, J as x, Jt as S, K as C, Kt as w, L as ee, M as te, Mt as T, N as ne, Nt as E, O as re, P as ie, Q as D, Qt as ae, R as oe, S as O, St as k, T as se, Tt as ce, U as le, Ut as A, V as ue, Vt as de, W as fe, Wt as pe, X as me, Xt as he, Yt as j, Z as ge, Zt as _e, _ as M, _t as ve, a as ye, an as be, at as xe, bt as Se, c as Ce, cn as we, ct as N, d as Te, dn as Ee, dt as De, en as Oe, et as ke, f as Ae, fn as je, ft as Me, g as Ne, gt as Pe, h as Fe, hn as Ie, ht as Le, i as Re, in as P, it as ze, j as Be, jt as F, k as Ve, kt as He, l as Ue, ln as I, lt as We, m as Ge, mt as L, n as Ke, nt as qe, o as Je, on as R, ot as Ye, pn as Xe, pt as Ze, q as Qe, qt as $e, r as et, rn as tt, rt as nt, s as rt, sn as z, st as it, tn as at, tt as ot, u as st, un as B, ut as ct, v as lt, vt as ut, w as dt, wt as ft, x as pt, xt as mt, yt as ht, z as gt, zt as _t } from "./workbench-renderers-DYpdN2Xi.js";
-import { n as vt } from "./layout-tab-presentation-Bz6EgFEa.js";
+import { r as e, t } from "./navigation-tree-registry-DM4Lhfir.js";
+import { $ as n, $t as r, A as i, At as a, B as o, Bt as s, C as c, Ct as l, D as u, Dt as d, E as f, Et as p, F as m, G as h, Gt as g, H as _, Ht as v, I as y, It as b, J as x, Jt as S, K as C, Kt as w, L as ee, M as te, Mt as T, N as ne, Nt as E, O as re, P as ie, Q as D, Qt as ae, R as oe, S as O, St as k, T as se, Tt as ce, U as le, Ut as A, V as ue, Vt as de, W as fe, Wt as pe, X as me, Xt as he, Yt as j, Z as ge, Zt as _e, _ as M, _t as ve, a as ye, an as be, at as xe, bt as Se, c as Ce, cn as we, ct as N, d as Te, dn as Ee, dt as De, en as Oe, et as ke, f as Ae, fn as je, ft as Me, g as Ne, gt as Pe, h as Fe, hn as Ie, ht as Le, i as Re, in as P, it as ze, j as Be, jt as F, k as Ve, kt as He, l as Ue, ln as I, lt as We, m as Ge, mt as L, n as Ke, nt as qe, o as Je, on as R, ot as Ye, pn as Xe, pt as Ze, q as Qe, qt as $e, r as et, rn as tt, rt as nt, s as rt, sn as z, st as it, tn as at, tt as ot, u as st, un as B, ut as ct, v as lt, vt as ut, w as dt, wt as ft, x as pt, xt as mt, yt as ht, z as gt, zt as _t } from "./workbench-renderers-DOc_oE0K.js";
+import { n as vt } from "./layout-tab-presentation-CCUroIOY.js";
 import { contributionRefId as yt, dockedWorkbenchRegions as bt, isLocalizedString as xt, isNavigationTarget as St, resourceKey as V, workbenchPages as Ct } from "@pstdio/sdk/extensions";
-var wt = {
+var H = {
 	normalize: (e) => ({ ...e }),
 	toUri: (e) => {
 		let t = `pstdio://extension-resource/${encodeURIComponent(e.type)}/${encodeURIComponent(e.id)}`, n = new URLSearchParams();
@@ -25,12 +25,12 @@ var wt = {
 			return;
 		}
 	}
-}, Tt = "pstdio", Et = (e) => `${e.extensionId ?? ""}:page:${e.id}`, Dt = (e, t) => e.find((e) => Et(e.ref) === Et(t)), Ot = (e) => e.split("/").filter(Boolean).map((e) => encodeURIComponent(e)).join("/"), kt = (e, t) => {
-	let n = `/projects/${encodeURIComponent(e)}`, r = Ot(t.path);
-	if (t.ref.extensionId === Tt) return r ? `${n}/${r}` : n;
+}, wt = "pstdio", Tt = (e) => `${e.extensionId ?? ""}:page:${e.id}`, Et = (e, t) => e.find((e) => Tt(e.ref) === Tt(t)), Dt = (e) => e.split("/").filter(Boolean).map((e) => encodeURIComponent(e)).join("/"), Ot = (e, t) => {
+	let n = `/projects/${encodeURIComponent(e)}`, r = Dt(t.path);
+	if (t.ref.extensionId === wt) return r ? `${n}/${r}` : n;
 	if (!t.ref.extensionId) throw Error(`Page "${t.id}" has no extension id`);
 	return `${n}/extensions/${encodeURIComponent(t.ref.extensionId)}/${r}`;
-}, At = (e) => {
+}, kt = (e) => {
 	if (!e || typeof e != "object" || !Array.isArray(e.anchors)) return;
 	let t = e.anchors;
 	if (!t.some((e) => !e || typeof e != "object" || typeof e.id != "string" || typeof e.heading != "string" || e.occurrence !== void 0 && (!Number.isInteger(e.occurrence) || Number(e.occurrence) < 0))) return { anchors: t.map((e) => {
@@ -41,19 +41,19 @@ var wt = {
 			...t.occurrence === void 0 ? {} : { occurrence: t.occurrence }
 		};
 	}) };
-}, jt = (e) => {
-	let t = At(e);
+}, At = (e) => {
+	let t = kt(e);
 	if (!t) throw Error("Page location has an invalid section");
 	return JSON.stringify(t);
-}, Mt = (e) => {
+}, jt = (e) => {
 	try {
-		return At(JSON.parse(e));
+		return kt(JSON.parse(e));
 	} catch {
 		return;
 	}
-}, Nt = (t) => {
-	let n = Dt(t.pages, t.location.page);
-	if (!n) throw Error(`Unknown page ref: ${Et(t.location.page)}`);
+}, Mt = (t) => {
+	let n = Et(t.pages, t.location.page);
+	if (!n) throw Error(`Unknown page ref: ${Tt(t.location.page)}`);
 	let r = new URLSearchParams();
 	t.location.resource && r.set("resource", t.resources.toUri(t.resources.normalize(t.location.resource)));
 	let i = n.document && t.location.resource?.metadata?.[n.document.metadataKey];
@@ -73,32 +73,32 @@ var wt = {
 			n !== void 0 && r.set(e, String(n));
 		}
 	}
-	t.location.section && r.set("section", jt(t.location.section));
+	t.location.section && r.set("section", At(t.location.section));
 	let a = Ee(n.params, t.location.params);
 	for (let [e, t] of je(n.params, a)) r.append(e, t);
-	let o = r.toString(), s = kt(t.projectId, n);
+	let o = r.toString(), s = Ot(t.projectId, n);
 	return o ? `${s}?${o}` : s;
-}, Pt = (e) => {
+}, Nt = (e) => {
 	try {
 		return e.split("/").filter(Boolean).map((e) => decodeURIComponent(e));
 	} catch {
 		return;
 	}
-}, Ft = (e, t) => {
+}, Pt = (e, t) => {
 	try {
-		let n = Pt(new URL(e, "http://workbench.local").pathname);
+		let n = Nt(new URL(e, "http://workbench.local").pathname);
 		return !!(n && n[0] === "projects" && n[1] === t);
 	} catch {
 		return !1;
 	}
-}, It = (e, t, n) => e.find((e) => e.ref.extensionId === t && e.path === n), Lt = (e, t) => {
+}, Ft = (e, t, n) => e.find((e) => e.ref.extensionId === t && e.path === n), It = (e, t) => {
 	try {
 		let n = t.fromUri(e);
 		return n ? t.normalize(n) : void 0;
 	} catch {
 		return;
 	}
-}, Rt = (t, n, r, i) => {
+}, Lt = (t, n, r, i) => {
 	let a = Object.fromEntries([
 		"line",
 		"column",
@@ -113,19 +113,19 @@ var wt = {
 		o = a;
 	}
 	return o;
-}, zt = (e, t, n) => {
-	let r = Pt(e.pathname);
+}, Rt = (e, t, n) => {
+	let r = Nt(e.pathname);
 	if (!r || r[0] !== "projects" || r[1] !== t) return;
-	let i = r.slice(2), a = i[0] === "extensions", o = a ? i[1] : Tt, s = (a ? i.slice(2) : i).join("/");
-	if (!(!o || a && !s)) return It(n, o, s);
-}, Bt = (e) => {
+	let i = r.slice(2), a = i[0] === "extensions", o = a ? i[1] : wt, s = (a ? i.slice(2) : i).join("/");
+	if (!(!o || a && !s)) return Ft(n, o, s);
+}, zt = (e) => {
 	let t;
 	try {
 		t = new URL(e.url, "http://workbench.local");
 	} catch {
 		return;
 	}
-	let n = zt(t, e.projectId, e.pages);
+	let n = Rt(t, e.projectId, e.pages);
 	if (!n) return;
 	for (let e of [
 		"resource",
@@ -136,7 +136,7 @@ var wt = {
 		"endLine",
 		"endColumn"
 	]) if (t.searchParams.getAll(e).length > 1) return;
-	let r = t.searchParams.get("resource"), i = r ? Lt(r, e.resources) : void 0;
+	let r = t.searchParams.get("resource"), i = r ? It(r, e.resources) : void 0;
 	if (r !== null && !i) return;
 	let a = t.searchParams.get("document");
 	if (a !== null) {
@@ -146,9 +146,9 @@ var wt = {
 			metadata: { [n.document.metadataKey]: a }
 		};
 	}
-	let o = t.searchParams.get("section"), s = o ? Mt(o) : void 0;
+	let o = t.searchParams.get("section"), s = o ? jt(o) : void 0;
 	if (o !== null && !s) return;
-	let c = Rt(t, n, a, s);
+	let c = Lt(t, n, a, s);
 	if (c === !1) return;
 	let l = Xe(n.params, t.searchParams);
 	return {
@@ -158,7 +158,7 @@ var wt = {
 		...s ? { section: s } : {},
 		...c ? { position: c } : {}
 	};
-}, Vt = () => {
+}, Bt = () => {
 	let e = R({
 		name: "workbench.breadcrumbs",
 		initialState: { items: void 0 }
@@ -181,7 +181,7 @@ var wt = {
 			return B(n);
 		}
 	};
-}, Ht = (e = {}) => {
+}, Vt = (e = {}) => {
 	let t = R({
 		name: "workbench.commandPalette",
 		initialState: {
@@ -281,10 +281,10 @@ var wt = {
 			return B(n);
 		}
 	};
-}, H = (e, t, n) => {
+}, U = (e, t, n) => {
 	let r = { ...e };
 	return n.viewId !== void 0 && (r.viewId = n.viewId ?? void 0), n.resource === null ? (r.resource = void 0, r.resourceKey = void 0, r.title = n.title ?? t.title) : n.resource ? (r.resource = n.resource, r.resourceKey = V(n.resource), r.title = n.title ?? n.resource.label ?? t.title) : n.title !== void 0 && (r.title = n.title), n.pinned !== void 0 && (r.pinned = n.pinned), n.closable !== void 0 && (r.closable = n.closable), n.mountStrategy !== void 0 && (r.mountStrategy = n.mountStrategy), n.hiddenByDefault !== void 0 && (r.hiddenByDefault = n.hiddenByDefault), n.tabRetention !== void 0 && (r.tabRetention = n.tabRetention), n.tab !== void 0 && (r.tab = n.tab), n.ownerId !== void 0 && (r.ownerId = n.ownerId), n.source !== void 0 && (r.source = n.source), n.role !== void 0 && (r.role = n.role), r;
-}, Ut = (e, t, n) => ({
+}, Ht = (e, t, n) => ({
 	widgetId: e,
 	contributionId: t.id,
 	viewId: n.viewId ?? void 0,
@@ -300,12 +300,12 @@ var wt = {
 	tabRetention: n.tabRetention,
 	tab: n.tab ?? t.tab,
 	role: n.role ?? "content"
-}), Wt = (e, t) => ({
+}), Ut = (e, t) => ({
 	id: e,
 	visible: t,
 	widgets: []
-}), Gt = (e = {}) => {
-	let t = (t) => Wt(t, e[t] ?? !0);
+}), Wt = (e = {}) => {
+	let t = (t) => Ut(t, e[t] ?? !0);
 	return { regions: {
 		nav: t("nav"),
 		activity: t("activity"),
@@ -325,13 +325,13 @@ var wt = {
 		status: t("status"),
 		overlay: t("overlay")
 	} };
-}, Kt = (e, t) => {
+}, Gt = (e, t) => {
 	for (let n = e.length - 1; n >= 0; --n) if (e[n]?.widgetId === t) return n;
 	return -1;
-}, qt = (e) => {
+}, Kt = (e) => {
 	let t = /* @__PURE__ */ new Set(), n = {}, r = e.activeWidgetId, i = e.activeResourceKey;
 	for (let [a, o] of Object.entries(e.regions)) {
-		let s = o.activeWidgetId, c = s ? Kt(o.widgets, s) : -1, l = o.widgets.map((e) => {
+		let s = o.activeWidgetId, c = s ? Gt(o.widgets, s) : -1, l = o.widgets.map((e) => {
 			let n = ae(t, e.contributionId, e.widgetId);
 			return t.add(n), n === e.widgetId ? e : {
 				...e,
@@ -350,16 +350,16 @@ var wt = {
 		activeWidgetId: r,
 		activeResourceKey: i
 	};
-}, Jt = (e, t = {}) => {
-	let n = Gt(t), r = Object.fromEntries(be.flatMap((t) => e.regions[t] ? [[t, e.regions[t]]] : []));
-	return qt({
+}, qt = (e, t = {}) => {
+	let n = Wt(t), r = Object.fromEntries(be.flatMap((t) => e.regions[t] ? [[t, e.regions[t]]] : []));
+	return Kt({
 		...e,
 		regions: {
 			...n.regions,
 			...r
 		}
 	});
-}, Yt = (e, t) => {
+}, Jt = (e, t) => {
 	let n = !1, r = { ...e.regions };
 	for (let e of Object.values(r)) {
 		let i = t(e.id);
@@ -374,7 +374,7 @@ var wt = {
 		...e,
 		regions: r
 	} : e;
-}, Xt = (e) => {
+}, Yt = (e) => {
 	let { getLayout: t, getWidgets: n, getPlaceholder: r } = e;
 	return {
 		getRegionSize(i) {
@@ -393,13 +393,13 @@ var wt = {
 			return r ? n()[r.contributionId]?.headerBorderBottom ?? !0 : !0;
 		}
 	};
-}, Zt = (e) => {
+}, Xt = (e) => {
 	let { getPlaceholders: t, getWidgets: n } = e;
 	return {
 		listPlaceholders: () => Object.values(t()).sort(T),
 		listWidgets: () => Object.values(n()).sort(T)
 	};
-}, Qt = (e) => {
+}, Zt = (e) => {
 	let { store: t, getPlaceholders: n, getWidgets: r, persistLayout: i } = e;
 	return {
 		registerPlaceholder(e, r) {
@@ -455,7 +455,7 @@ var wt = {
 			});
 		}
 	};
-}, $t = (e) => (t) => {
+}, Qt = (e) => (t) => {
 	let n = e.getLayout(), r = A(n, t);
 	if (!r) throw Error(`Panel instance not found: ${t}`);
 	if (r.regionId !== "main" || r.placement.role === "sub-panel" || r.placement.role === "panel-menu") return e.panelMethods.activatePanel(t);
@@ -473,12 +473,12 @@ var wt = {
 		...n,
 		regions: o
 	}, "main", i), e.panelMethods.getActivePanel("main");
-}, U = (e, t, n) => Oe(e, t, n).widgets, en = (e, t, n) => {
+}, W = (e, t, n) => Oe(e, t, n).widgets, $t = (e, t, n) => {
 	let r = e.find((e) => e.widgetId === t);
 	if (!r) return e;
 	let i = e.filter((e) => e.widgetId !== t);
 	return Oe(i, r, n).widgets;
-}, tn = (e, t) => {
+}, en = (e, t) => {
 	let n = e;
 	for (let r of Object.values(e.regions)) {
 		let e = r.widgets.filter(t);
@@ -492,7 +492,7 @@ var wt = {
 		activeWidgetId: void 0,
 		activeResourceKey: void 0
 	}), n;
-}, nn = (e, t) => tn(e, (e) => e.tabRetention === "preview" && (t === void 0 || e.ownerResourceKey !== t)), rn = (e) => ({
+}, tn = (e, t) => en(e, (e) => e.tabRetention === "preview" && (t === void 0 || e.ownerResourceKey !== t)), nn = (e) => ({
 	updateWidgetPlacement(t, n) {
 		let r = e.getLayout();
 		for (let i of Object.values(r.regions)) {
@@ -500,7 +500,7 @@ var wt = {
 			if (a < 0) continue;
 			let o = e.requireWidget(i.widgets[a].contributionId);
 			e.validateOpen?.(i.id, i.widgets[a], n);
-			let s = H(i.widgets[a], o, n), c = at(i.widgets.map((e, t) => t === a ? s : e), s.tabRetention === "preview" ? s.widgetId : i.activeWidgetId), l = j(r, i.id, () => c.widgets);
+			let s = U(i.widgets[a], o, n), c = at(i.widgets.map((e, t) => t === a ? s : e), s.tabRetention === "preview" ? s.widgetId : i.activeWidgetId), l = j(r, i.id, () => c.widgets);
 			return c.replaced.some((e) => e.widgetId === r.activeWidgetId || e.widgetId === i.activeWidgetId) ? e.applyAndActivate(l, i.id, s) : (e.setLayout(l), e.persistLayout(), s);
 		}
 		throw Error(`Widget placement not found: ${t}`);
@@ -508,13 +508,13 @@ var wt = {
 	reorderWidget(t, n) {
 		let r = e.getLayout();
 		for (let i of Object.values(r.regions)) if (i.widgets.some((e) => e.widgetId === t)) {
-			e.setLayout(j(r, i.id, (e) => en(e, t, n))), e.persistLayout();
+			e.setLayout(j(r, i.id, (e) => $t(e, t, n))), e.persistLayout();
 			return;
 		}
 		throw Error(`Widget placement not found: ${t}`);
 	},
 	expirePreviewTabs(t) {
-		e.setLayout(nn(e.getLayout(), t)), e.persistLayout();
+		e.setLayout(tn(e.getLayout(), t)), e.persistLayout();
 	},
 	activateWidget(t) {
 		let n = e.getLayout();
@@ -524,7 +524,7 @@ var wt = {
 		}
 		throw Error(`Widget placement not found: ${t}`);
 	}
-}), W = (e) => {
+}), G = (e) => {
 	let t = /* @__PURE__ */ new Set();
 	return {
 		notify(n) {
@@ -534,8 +534,8 @@ var wt = {
 			return t.add(e), B(() => t.delete(e));
 		}
 	};
-}, an = (e) => {
-	let { getLayout: t, setLayout: n, persistLayout: r } = e, i = W("layout restoration subscriber");
+}, rn = (e) => {
+	let { getLayout: t, setLayout: n, persistLayout: r } = e, i = G("layout restoration subscriber");
 	return {
 		onWillRestoreLayout: i.subscribe,
 		setRegionActiveWidget(e, i) {
@@ -587,10 +587,10 @@ var wt = {
 			}), r();
 		},
 		restoreLayout(t) {
-			i.notify(), n(Jt(t, e.defaultRegionVisibility)), r();
+			i.notify(), n(qt(t, e.defaultRegionVisibility)), r();
 		}
 	};
-}, on = (e) => {
+}, an = (e) => {
 	let t = (t, n) => {
 		let r = e.getLayout(), i = r.regions[t], a = n(i);
 		a !== i && (e.setLayout({
@@ -627,7 +627,7 @@ var wt = {
 			});
 		}
 	};
-}, sn = (e, t) => {
+}, on = (e, t) => {
 	let n = { ...t.regions };
 	for (let r of Object.values(e.regions)) {
 		let e = r.widgets.filter((e) => e.pinned && e.role === "content");
@@ -643,7 +643,7 @@ var wt = {
 		...t,
 		regions: n
 	};
-}, cn = (e, t, n) => {
+}, sn = (e, t, n) => {
 	if (n.length === 0) return t;
 	let r = { ...t.regions };
 	for (let t of n) r[t] = e.regions[t];
@@ -651,8 +651,8 @@ var wt = {
 		...t,
 		regions: r
 	};
-}, ln = (e, t) => t ? Jt(t, e) : Gt(e), un = (e) => {
-	let t, n = I("layout cache read for unscoped", () => e.persistence?.getLayout(void 0)) !== void 0, r = W("layout scope subscriber"), i = W("layout scope subscriber"), a = () => I(`layout cache for ${t ?? "unscoped"}`, () => e.persistence?.setLayout(e.getLayout(), t));
+}, cn = (e, t) => t ? qt(t, e) : Wt(e), ln = (e) => {
+	let t, n = I("layout cache read for unscoped", () => e.persistence?.getLayout(void 0)) !== void 0, r = G("layout scope subscriber"), i = G("layout scope subscriber"), a = () => I(`layout cache for ${t ?? "unscoped"}`, () => e.persistence?.setLayout(e.getLayout(), t));
 	return {
 		getPersistenceScope: () => t,
 		hasPersistedLayout: () => I(`layout cache read for ${t ?? "unscoped"}`, () => e.persistence?.getLayout(t)) !== void 0,
@@ -665,11 +665,11 @@ var wt = {
 			a(), r.notify(o), t = o;
 			let c = I(`layout cache read for ${t ?? "unscoped"}`, () => e.persistence?.getLayout(t));
 			n = c !== void 0;
-			let l = ln(e.defaultRegionVisibility, c), u = sn(e.getLayout(), l), d = cn(e.getLayout(), u, s.carryRegionState ?? []);
+			let l = cn(e.defaultRegionVisibility, c), u = on(e.getLayout(), l), d = sn(e.getLayout(), u, s.carryRegionState ?? []);
 			e.setLayout(d, "setPersistenceScope"), i.notify(t);
 		}
 	};
-}, dn = (e) => {
+}, un = (e) => {
 	for (let t of e.widget.ownedPanelMenuIds ?? []) {
 		let n = e.requireWidget(t);
 		e.openWidget(t, {
@@ -680,7 +680,7 @@ var wt = {
 			title: n.region === "main-left-menu" ? e.placement.resource?.label : n.title
 		});
 	}
-}, fn = (e, t, n) => {
+}, dn = (e, t, n) => {
 	if (e.singleton || e.reuse !== "none") {
 		if (n.role === "sub-panel" || n.role === "panel-menu") {
 			let r = g(t)?.resourceKey;
@@ -692,24 +692,22 @@ var wt = {
 					placement: i.widgets[t]
 				};
 			}
-			return;
-		}
-		return e.singleton ? v(t, e.id) : n.resource ? pe(t, e.id, V(n.resource)) : v(t, e.id);
+		} else return e.singleton ? v(t, e.id) : n.resource ? pe(t, e.id, V(n.resource)) : v(t, e.id);
 	}
-}, pn = (e, t) => t.role ? t : e.panelMenuOwner ? {
+}, fn = (e, t) => t.role ? t : e.panelMenuOwner ? {
 	...t,
 	role: "panel-menu"
 } : e.eligibleLocations === void 0 ? t : {
 	...t,
 	role: "sub-panel"
-}, mn = (e, t, n) => {
+}, pn = (e, t, n) => {
 	let r = e.regions[t], i = n.role === "location" ? e.activeLocationWidgetId : r.activeWidgetId;
 	if (n.replaceWidgetId) return r.widgets.findIndex((e) => e.widgetId === n.replaceWidgetId);
 	if (n.tabRetention === "preview") return r.widgets.findIndex((e) => e.tabRetention === "preview");
 	if (!n.replaceActive) return -1;
 	let a = t === "main" && n.resource && e.activeLocationWidgetId ? e.activeLocationWidgetId : i;
 	return r.widgets.findIndex((e) => e.widgetId === a && !e.pinned);
-}, hn = (e, t, n) => {
+}, mn = (e, t, n) => {
 	let r = e.find((e) => {
 		try {
 			return t.priority > n(e.contributionId).priority;
@@ -718,47 +716,47 @@ var wt = {
 		}
 	});
 	return r ? { beforeWidgetId: r.widgetId } : void 0;
-}, gn = (e) => {
+}, hn = (e) => {
 	let { getLayout: t, requireWidget: n, applyAndActivate: r } = e, i = (e, t) => e.role !== "sub-panel" && e.role !== "panel-menu" ? e : {
 		...e,
 		ownerResourceKey: g(t)?.resourceKey
 	}, a = (e, n, a) => {
-		let o = i(H(n.placement, e, a), t()), s = j(t(), n.regionId, (e) => {
+		let o = i(U(n.placement, e, a), t()), s = j(t(), n.regionId, (e) => {
 			let t = e.map((e, t) => t === n.index ? o : e);
-			return a.tabPosition ? U(t.filter((e) => e.widgetId !== o.widgetId), o, a.tabPosition) : t;
+			return a.tabPosition ? W(t.filter((e) => e.widgetId !== o.widgetId), o, a.tabPosition) : t;
 		});
 		return r(s, n.regionId, o);
 	}, o = (e, n, a, o, s) => {
-		let c = i(H(o, e, s), t()), l = j(t(), n, (e) => {
+		let c = i(U(o, e, s), t()), l = j(t(), n, (e) => {
 			let t = e.map((e, t) => t === a ? c : e);
-			return c.tabRetention === "preview" ? U(t, c, "start") : t;
+			return c.tabRetention === "preview" ? W(t, c, "start") : t;
 		});
 		return r(l, n, c);
 	}, s = (e, n, o, s, c) => {
 		if (c.tabRetention === "preview" && n.placement.tabRetention !== "preview") return r(t(), n.regionId, n.placement);
 		if (n.regionId !== o) {
-			let a = i(H(n.placement, e, c), t()), l = j(t(), n.regionId, (e) => e.filter((e, t) => t !== n.index), { clearActiveWidget: t().regions[n.regionId].activeWidgetId === n.placement.widgetId }), u = j(l, o, (e) => {
-				if (s < 0) return U(e, a, c.tabPosition);
+			let a = i(U(n.placement, e, c), t()), l = j(t(), n.regionId, (e) => e.filter((e, t) => t !== n.index), { clearActiveWidget: t().regions[n.regionId].activeWidgetId === n.placement.widgetId }), u = j(l, o, (e) => {
+				if (s < 0) return W(e, a, c.tabPosition);
 				let t = [...e];
-				return t.splice(s, 1, a), a.tabRetention === "preview" ? U(t, a, "start") : t;
+				return t.splice(s, 1, a), a.tabRetention === "preview" ? W(t, a, "start") : t;
 			});
 			return r(u, o, a);
 		}
 		if (s < 0 || n.index === s) return a(e, n, c);
-		let l = i(H(n.placement, e, c), t()), u = j(t(), o, (e) => U(e.map((e, t) => t === n.index ? l : e).filter((e, t) => t !== s && t !== n.index), l, c.tabPosition));
+		let l = i(U(n.placement, e, c), t()), u = j(t(), o, (e) => W(e.map((e, t) => t === n.index ? l : e).filter((e, t) => t !== s && t !== n.index), l, c.tabPosition));
 		return r(u, o, l);
 	}, c = (e, a, o, s) => {
-		let c = de(t(), e.id), l = i(Ut(c, e, s), t()), u = j(t(), a, (t) => {
-			if (o < 0) return U(t, l, s.tabPosition ?? hn(t, e, n));
+		let c = de(t(), e.id), l = i(Ht(c, e, s), t()), u = j(t(), a, (t) => {
+			if (o < 0) return W(t, l, s.tabPosition ?? mn(t, e, n));
 			let r = [...t];
-			return r.splice(o, 1, l), l.tabRetention === "preview" ? U(r, l, "start") : r;
+			return r.splice(o, 1, l), l.tabRetention === "preview" ? W(r, l, "start") : r;
 		});
 		return r(u, a, l);
 	}, l = (i, a = {}) => {
-		let u = n(i), d = pn(u, a), f = t(), p = d.region ?? u.region ?? u.fallbackRegion ?? "main", m = f.regions[p], h = mn(f, p, d), g = h >= 0 ? m.widgets[h] : void 0, _ = !d.replaceWidgetId && d.tabRetention === "preview" && d.resource ? pe(f, u.id, V(d.resource)) : void 0, v = d.replaceWidgetId && g ? void 0 : fn(u, f, d);
+		let u = n(i), d = fn(u, a), f = t(), p = d.region ?? u.region ?? u.fallbackRegion ?? "main", m = f.regions[p], h = pn(f, p, d), g = h >= 0 ? m.widgets[h] : void 0, _ = !d.replaceWidgetId && d.tabRetention === "preview" && d.resource ? pe(f, u.id, V(d.resource)) : void 0, v = d.replaceWidgetId && g ? void 0 : dn(u, f, d);
 		e.validateOpen?.(p, _?.placement ?? (v?.regionId === p ? v.placement : void 0), d);
 		let y;
-		return y = _ ? r(f, _.regionId, _.placement) : v ? s(u, v, p, h, d) : g?.contributionId === u.id ? o(u, p, h, g, d) : c(u, p, h, d), dn({
+		return y = _ ? r(f, _.regionId, _.placement) : v ? s(u, v, p, h, d) : g?.contributionId === u.id ? o(u, p, h, g, d) : c(u, p, h, d), un({
 			openWidget: l,
 			placement: y,
 			requireWidget: n,
@@ -766,12 +764,12 @@ var wt = {
 		}), r(t(), _?.regionId ?? p, y);
 	};
 	return { openWidget: l };
-}, _n = (e, t) => {
+}, gn = (e, t) => {
 	if (t.pinned) return "persistent";
 	let n = t.region ?? e.region ?? e.fallbackRegion ?? "main";
 	return P.includes(n) ? "preview" : "persistent";
-}, vn = (e) => {
-	let t = W("panel activation subscriber");
+}, _n = (e) => {
+	let t = G("panel activation subscriber");
 	return {
 		onDidActivatePanel: t.subscribe,
 		getPanel(t) {
@@ -795,7 +793,7 @@ var wt = {
 		openPanel(t, n = {}) {
 			let r = e.getWidgets()[t];
 			if (!r) throw Error(`Panel not registered: ${t}`);
-			return F(e.widgetOpeners.openWidget(t, He(n, _n(r, n))));
+			return F(e.widgetOpeners.openWidget(t, He(n, gn(r, n))));
 		},
 		updatePanel(t, n) {
 			if (!A(e.getLayout(), t)) throw Error(`Panel instance not found: ${t}`);
@@ -819,7 +817,7 @@ var wt = {
 			return e.setLayout(r.layout), e.persistLayout(), r.activePlacement ? F(r.activePlacement) : void 0;
 		}
 	};
-}, yn = Object.values(tt).flatMap((e) => Object.values(e)), bn = (e) => e.endsWith("-left-menu") ? "left" : "right", xn = (e, t) => e(t)?.panelMenuOwner?.contributionId, Sn = (e, t) => {
+}, vn = Object.values(tt).flatMap((e) => Object.values(e)), yn = (e) => e.endsWith("-left-menu") ? "left" : "right", bn = (e, t) => e(t)?.panelMenuOwner?.contributionId, xn = (e, t) => {
 	for (let n of P) {
 		let r = e.regions[n].widgets.find((e) => e.contributionId === t);
 		if (r) return {
@@ -827,10 +825,10 @@ var wt = {
 			placement: r
 		};
 	}
-}, Cn = (e, t, n) => {
+}, Sn = (e, t, n) => {
 	let r = [], i = [], a = /* @__PURE__ */ new Set(), o = !1;
 	for (let s of e.regions[n].widgets) {
-		let c = xn(t, s.contributionId);
+		let c = bn(t, s.contributionId);
 		if (!c) {
 			r.push(s);
 			continue;
@@ -840,7 +838,7 @@ var wt = {
 			continue;
 		}
 		a.add(s.contributionId);
-		let l = Sn(e, c);
+		let l = xn(e, c);
 		if (!l) {
 			o = !0;
 			continue;
@@ -850,26 +848,22 @@ var wt = {
 			ownerResourceKey: l.placement.resourceKey
 		};
 		u !== s && (o = !0);
-		let d = tt[l.region][bn(n)];
-		if (d === n) {
-			r.push(u);
-			continue;
-		}
-		o = !0, i.push({
+		let d = tt[l.region][yn(n)];
+		d === n ? r.push(u) : (o = !0, i.push({
 			placement: u,
 			target: d
-		});
+		}));
 	}
 	return {
 		changed: o,
 		moves: i,
 		placements: r
 	};
-}, wn = (e, t) => {
+}, Cn = (e, t) => {
 	let n = !1, r = { ...e.regions }, i = [];
-	for (let a of yn) {
+	for (let a of vn) {
 		if (e.regions[a].widgets.length === 0) continue;
-		let o = Cn(e, t, a);
+		let o = Sn(e, t, a);
 		if (i.push(...o.moves), !o.changed) continue;
 		n = !0;
 		let s = r[a];
@@ -890,9 +884,9 @@ var wt = {
 		...e,
 		regions: r
 	} : e;
-}, Tn = (e) => {
+}, wn = (e) => {
 	let t = () => {
-		let t = wn(e.getLayout(), e.getWidget);
+		let t = Cn(e.getLayout(), e.getWidget);
 		t !== e.getLayout() && (e.setLayout(t), e.persistLayout());
 	};
 	return {
@@ -902,7 +896,7 @@ var wt = {
 		},
 		reconcilePanelMenus: t
 	};
-}, En = (e, t, n) => {
+}, Tn = (e, t, n) => {
 	let { side: r, ...i } = t, a = e.region, o = P.find((t) => t === e.fallbackRegion);
 	return {
 		...i,
@@ -913,7 +907,7 @@ var wt = {
 			contributionId: e.id
 		}
 	};
-}, Dn = (e) => {
+}, En = (e) => {
 	let { kind: t, metadata: n, panel: r, registerWidget: i } = e, { panelMenus: a = [], ...o } = r, s = [];
 	if (a.length > 0 && !P.includes(r.region)) throw Error(`Panel Menus require a Panel region: ${r.id}`);
 	try {
@@ -922,7 +916,7 @@ var wt = {
 			ownedPanelMenuIds: a.map((e) => e.id)
 		};
 		s.push(i(e, n));
-		for (let e of a) s.push(i(En(r, e, t), n));
+		for (let e of a) s.push(i(Tn(r, e, t), n));
 	} catch (e) {
 		for (let e of s.reverse()) e.dispose();
 		throw e;
@@ -930,8 +924,8 @@ var wt = {
 	return B(() => {
 		for (let e of s.reverse()) e.dispose();
 	});
-}, On = (e) => ({
-	registerPanel: (t, n) => Dn({
+}, Dn = (e) => ({
+	registerPanel: (t, n) => En({
 		panel: t,
 		kind: t.eligibleLocations ? "sub-panel" : "panel",
 		metadata: n,
@@ -941,27 +935,27 @@ var wt = {
 		...t,
 		panelMenuOwner: t.panelMenuOwner ?? { level: "panel" }
 	}, n)
-}), kn = (e, t) => {
+}), On = (e, t) => {
 	let n = e[t];
 	if (!n) throw Error(`Widget not registered: ${t}`);
 	return n;
-}, An = (e = {}) => {
-	let t = e.persistence?.getLayout(void 0), n = ln(e.defaultRegionVisibility, t), r = R({
+}, kn = (e = {}) => {
+	let t = e.persistence?.getLayout(void 0), n = cn(e.defaultRegionVisibility, t), r = R({
 		name: "workbench.layout",
 		initialState: {
 			layout: n,
 			widgets: {},
 			placeholders: {}
 		}
-	}), i = () => r.getState().layout, a = () => r.getState().placeholders, o = () => r.getState().widgets, s = (e) => a()[e], c = Xt({
+	}), i = () => r.getState().layout, a = () => r.getState().placeholders, o = () => r.getState().widgets, s = (e) => a()[e], c = Yt({
 		getLayout: i,
 		getWidgets: o,
 		getPlaceholder: s,
 		getRegionSettings: e.getRegionSettings
-	}), l = Zt({
+	}), l = Xt({
 		getPlaceholders: a,
 		getWidgets: o
-	}), u = un({
+	}), u = ln({
 		defaultRegionVisibility: e.defaultRegionVisibility,
 		getLayout: i,
 		persistence: e.persistence,
@@ -969,42 +963,42 @@ var wt = {
 			...r.getState(),
 			layout: e
 		}, !1, t)
-	}), d = () => u.persistLayout(), f = (e) => kn(o(), e), p = (t) => {
+	}), d = () => u.persistLayout(), f = (e) => On(o(), e), p = (t) => {
 		t = e.normalizeLayout?.(t) ?? t;
 		let n = r.getState();
 		n.layout !== t && r.setState({
 			...n,
 			layout: t
 		}, !1, "setLayout");
-	}, m = on({
+	}, m = an({
 		getLayout: i,
 		setLayout: p,
 		persistLayout: d,
 		validateChange: e.validateRegionChange,
 		getRegionSettings: e.getRegionSettings
-	}), h = an({
+	}), h = rn({
 		defaultRegionVisibility: e.defaultRegionVisibility,
 		getLayout: i,
 		setLayout: p,
 		persistLayout: d
-	}), g = (e, t, n) => (p(_t(e, t, n)), d(), n), _ = Qt({
+	}), g = (e, t, n) => (p(_t(e, t, n)), d(), n), _ = Zt({
 		store: r,
 		getPlaceholders: a,
 		getWidgets: o,
 		persistLayout: d
-	}), v = On({ registerWidget: _.registerWidget }), y = gn({
+	}), v = Dn({ registerWidget: _.registerWidget }), y = hn({
 		getLayout: i,
 		requireWidget: f,
 		applyAndActivate: g,
 		validateOpen: e.validateWidgetOpen
-	}), b = rn({
+	}), b = nn({
 		validateOpen: e.validateWidgetOpen,
 		getLayout: i,
 		requireWidget: f,
 		setLayout: p,
 		persistLayout: d,
 		applyAndActivate: g
-	}), x = vn({
+	}), x = _n({
 		getLayout: i,
 		getWidgets: o,
 		listWidgets: l.listWidgets,
@@ -1012,13 +1006,13 @@ var wt = {
 		placementMethods: b,
 		setLayout: p,
 		widgetOpeners: y
-	}), C = Tn({
+	}), C = wn({
 		getLayout: i,
 		getWidget: (e) => o()[e],
 		openWidget: y.openWidget,
 		persistLayout: d,
 		setLayout: p
-	}), w = $t({
+	}), w = Qt({
 		applyAndActivate: g,
 		getLayout: i,
 		getWidget: f,
@@ -1064,13 +1058,13 @@ var wt = {
 		onWillChangePersistenceScope: u.onWillChangePersistenceScope,
 		onDidChangePersistenceScope: u.onDidChangePersistenceScope
 	};
-}, jn = /* @__PURE__ */ new WeakMap(), Mn = (e, t) => {
-	jn.set(e, t);
-}, Nn = (e, t, n) => {
-	let r = jn.get(e);
+}, An = /* @__PURE__ */ new WeakMap(), jn = (e, t) => {
+	An.set(e, t);
+}, Mn = (e, t, n) => {
+	let r = An.get(e);
 	if (!r) throw Error("Workbench mode registry internals are unavailable");
 	r.activatePageMode(t, n);
-}, Pn = (e, t, n) => {
+}, Nn = (e, t, n) => {
 	let r = !1, i = () => void 0, a = () => {
 		if (r) return;
 		let e = t.layout.getActivePanel("main");
@@ -1084,7 +1078,7 @@ var wt = {
 	} finally {
 		i();
 	}
-}, Fn = (e) => e ? Array.isArray(e) ? [...e] : [e] : [], In = (e) => {
+}, Pn = (e) => e ? Array.isArray(e) ? [...e] : [e] : [], Fn = (e) => {
 	let t = R({
 		name: "workbench.modes",
 		initialState: {
@@ -1093,11 +1087,11 @@ var wt = {
 		}
 	}), n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Map(), a = [], o, s, c = !1, u = (t) => {
 		if (n.has(t.id)) return;
-		let r = Fn(I(`mode ${t.id}.activate`, () => t.activate(e.resolveContext())));
+		let r = Pn(I(`mode ${t.id}.activate`, () => t.activate(e.resolveContext())));
 		n.set(t.id, r);
 	}, d = (t) => {
-		let n = e.resolveContext(), i = `${t.id}\0${n.layout.getPersistenceScope() ?? "unscoped"}`, a = Yt(ht(n.layout.getLayout(), t, (e) => n.layout.getRegionSettings(e, t.id)), n.layout.getRegionSize);
-		ft(n, a), n.layout.reconcilePanelMenus(), !r.has(i) && !n.layout.enteredWithPersistedLayout() && Pn(t, n, e.establishLocation), r.add(i);
+		let n = e.resolveContext(), i = `${t.id}\0${n.layout.getPersistenceScope() ?? "unscoped"}`, a = Jt(ht(n.layout.getLayout(), t, (e) => n.layout.getRegionSettings(e, t.id)), n.layout.getRegionSize);
+		ft(n, a), n.layout.reconcilePanelMenus(), !r.has(i) && !n.layout.enteredWithPersistedLayout() && Nn(t, n, e.establishLocation), r.add(i);
 	}, f = (t) => {
 		d(t), I(`mode ${t.id}.reconcile`, () => t.reconcile?.(e.resolveContext()));
 	}, p = (n) => {
@@ -1114,25 +1108,24 @@ var wt = {
 		o && ft(r, ce(r.layout.getLayout(), i.get(n), l(c), r.layout.store.getInitialState().layout)), g(n, { seed: s !== n });
 	}, m = (e, n) => {
 		if (e && !t.getState().modes[e]) throw Error(`Workbench mode not registered: ${e}`);
-		if (e === t.getState().activeModeId) {
-			n();
-			return;
-		}
-		c = !0, s = void 0;
-		try {
-			if (h(), e === void 0) {
-				t.setState({
-					...t.getState(),
-					activeModeId: void 0
-				}, !1, "deactivatePageMode"), n();
-				return;
+		if (e === t.getState().activeModeId) n();
+		else {
+			c = !0, s = void 0;
+			try {
+				if (h(), e === void 0) {
+					t.setState({
+						...t.getState(),
+						activeModeId: void 0
+					}, !1, "deactivatePageMode"), n();
+					return;
+				}
+				g(e, {
+					seed: !1,
+					afterPublish: n
+				});
+			} finally {
+				c = !1;
 			}
-			g(e, {
-				seed: !1,
-				afterPublish: n
-			});
-		} finally {
-			c = !1;
 		}
 	}, h = () => {
 		Se(a), a = [], o?.dispose(), o = void 0;
@@ -1145,7 +1138,7 @@ var wt = {
 			u(s), t.setState({
 				...t.getState(),
 				activeModeId: n
-			}, !1, "activateMode"), r.afterPublish?.(), r.seed && d(s), a = Fn(I(`mode ${s.id}.enter`, () => s.enter?.(i))), r.seed && I(`mode ${s.id}.reconcile`, () => s.reconcile?.(e.resolveContext()));
+			}, !1, "activateMode"), r.afterPublish?.(), r.seed && d(s), a = Pn(I(`mode ${s.id}.enter`, () => s.enter?.(i))), r.seed && I(`mode ${s.id}.reconcile`, () => s.reconcile?.(e.resolveContext()));
 		} catch (e) {
 			throw h(), t.setState({
 				...t.getState(),
@@ -1209,13 +1202,13 @@ var wt = {
 			if (e === t.getState().activeModeId) {
 				let n = e ? t.getState().modes[e] : void 0;
 				n && e !== s && f(n);
-				return;
-			}
-			c = !0, s = n.deferSeed ? e : void 0;
-			try {
-				p(e);
-			} finally {
-				c = !1;
+			} else {
+				c = !0, s = n.deferSeed ? e : void 0;
+				try {
+					p(e);
+				} finally {
+					c = !1;
+				}
 			}
 		},
 		seedActiveMode() {
@@ -1232,8 +1225,8 @@ var wt = {
 			return B(n);
 		}
 	};
-	return Mn(y, { activatePageMode: m }), y;
-}, Ln = (e, t, n, r) => {
+	return jn(y, { activatePageMode: m }), y;
+}, In = (e, t, n, r) => {
 	let i = t.getView(n.viewId);
 	if (!i) throw Error(`Workbench placement view is not registered: ${n.viewId}`);
 	let { role: a, viewId: o, ...s } = n;
@@ -1244,10 +1237,10 @@ var wt = {
 		rendererId: i.id,
 		panelMenus: r?.definitionsFor(i.id, n.id)
 	});
-}, G = (e) => `workbench.mode-placement.${encodeURIComponent(e)}`, Rn = (e, t) => `workbench.page-placement.${encodeURIComponent(e)}.${encodeURIComponent(t)}`, zn = (e) => P.filter((t) => k(e.mode, t) && e.mode?.regionSettings?.[t]?.acceptsTabs !== !1 && (!e.movableTo || e.movableTo.includes(t)) && (!e.allowedRegions || e.allowedRegions.includes(t))), Bn = (e, t) => {
+}, Ln = (e) => `workbench.mode-placement.${encodeURIComponent(e)}`, Rn = (e, t) => `workbench.page-placement.${encodeURIComponent(e)}.${encodeURIComponent(t)}`, zn = (e) => P.filter((t) => k(e.mode, t) && e.mode?.regionSettings?.[t]?.acceptsTabs !== !1 && (!e.movableTo || e.movableTo.includes(t)) && (!e.allowedRegions || e.allowedRegions.includes(t))), Bn = (e, t) => {
 	let n = e.layout.getWidget(t);
 	if (!n || !P.some((e) => e === n.region)) return [];
-	let r = e.modes.getActiveModeId(), i = r ? e.modes.getMode(r) : void 0, a = e.modePlacements.listPlacements(r).find((e) => G(e.id) === t), o = i?.listAddablePanels?.({
+	let r = e.modes.getActiveModeId(), i = r ? e.modes.getMode(r) : void 0, a = e.modePlacements.listPlacements(r).find((e) => Ln(e.id) === t), o = i?.listAddablePanels?.({
 		layout: e.layout.getLayout(),
 		resource: e.getPrimaryResource()
 	}).find((e) => e.panelId === t);
@@ -1461,11 +1454,11 @@ var wt = {
 		clearProject() {
 			e.clearProject(void 0), e.resetHistory();
 		},
-		isCurrentProjectUrl: (e) => Ft(t.browser.current().url, e),
+		isCurrentProjectUrl: (e) => Pt(t.browser.current().url, e),
 		hasCurrentPageUrl: (t) => $n(e, t),
 		getBootLocation(n) {
 			try {
-				if (Ft(t.browser.current().url, n)) return e.resolveUrl(n, t.browser.current())?.location;
+				if (Pt(t.browser.current().url, n)) return e.resolveUrl(n, t.browser.current())?.location;
 				let r = t.persistence.load(n);
 				return r ? e.normalizeStored(r.location).location : e.normalizeTarget({
 					kind: "page",
@@ -1544,7 +1537,7 @@ var wt = {
 		dispose: e.dispose
 	};
 }, tr = (e) => (t, n, r) => ({
-	url: Nt({
+	url: Mt({
 		projectId: t,
 		location: n,
 		pages: e.pages(),
@@ -1779,7 +1772,7 @@ var wt = {
 		...e.params ? { params: e.params } : {}
 	};
 }, yr = (e) => {
-	let t = W("page navigation subscriber"), n = K(e.registry), r = e.registry.listPages, i = rr(), a = nr(e.reportDiagnostic), o = tr({
+	let t = G("page navigation subscriber"), n = K(e.registry), r = e.registry.listPages, i = rr(), a = nr(e.reportDiagnostic), o = tr({
 		pages: r,
 		resources: n.resources
 	}), s = fr({
@@ -1806,7 +1799,7 @@ var wt = {
 		pages: r(),
 		resources: n.resources
 	}), p = (e, t) => {
-		let i = Bt({
+		let i = zt({
 			url: t.url,
 			projectId: e,
 			pages: r(),
@@ -1828,7 +1821,7 @@ var wt = {
 		try {
 			let a = e.browser.current();
 			_r(a.state) && a.state.projectId === o ? i.adopt(a.state.index) : i.reset();
-			let u = h && Ft(a.url, o), g = u ? p(o, a) : void 0;
+			let u = h && Pt(a.url, o), g = u ? p(o, a) : void 0;
 			if (u && !g) throw Error(`Cannot resolve page URL: ${a.url}`);
 			let _ = e.persistence.load(o);
 			s.restore(_?.rootLevel);
@@ -2398,14 +2391,14 @@ var wt = {
 		for (let e of i) we(e, () => I("mode placement subscriber", e));
 	}, l = (t, n, r, i, a, o) => {
 		if (!e.views.getView(q(t.item))) throw Error(`Workbench mode placement view is not registered: ${q(t.item)}`);
-		let s = G(t.id), c = e.getPanel(s);
+		let s = Ln(t.id), c = e.getPanel(s);
 		if (!c) throw Error(`Workbench mode placement is not registered: ${t.id}`);
 		return {
 			identity: Wr(t, n),
 			region: t.region,
 			order: t.order ?? 0,
 			value: {
-				...Ut(`workbench.mode.${encodeURIComponent(t.id)}.${encodeURIComponent(n)}`, c, {
+				...Ht(`workbench.mode.${encodeURIComponent(t.id)}.${encodeURIComponent(n)}`, c, {
 					viewId: q(t.item),
 					role: t.region === "main" ? "location" : "sub-panel",
 					closable: jr(t.item),
@@ -2469,9 +2462,9 @@ var wt = {
 				placements: t,
 				refs: n,
 				views: e.views
-			}), o = Jr(i), s = Ln(e.registerPanel, e.views, {
+			}), o = Jr(i), s = In(e.registerPanel, e.views, {
 				...o,
-				id: G(o.id),
+				id: Ln(o.id),
 				viewId: q(o.item),
 				role: o.region === "main" ? "location" : "sub-panel",
 				singleton: o.item.kind === "view" || o.item.binding.cardinality === "one",
@@ -2698,7 +2691,7 @@ var wt = {
 	return {
 		registerOverlay(r) {
 			if (t.has(r.id)) throw Error(`Overlay already registered: ${r.id}`);
-			let i = { ...r }, a = Ln(e.layout, e.views, {
+			let i = { ...r }, a = In(e.layout, e.views, {
 				...i,
 				id: ri(i.id),
 				region: "overlay",
@@ -3173,9 +3166,7 @@ var wt = {
 					valuesEqual: e.registryInput.valuesEqual
 				})
 			}, "unregisterActivePage"), o?.dispose();
-			return;
-		}
-		r.setState({
+		} else r.setState({
 			...i,
 			pages: c,
 			pageStates: l,
@@ -3345,16 +3336,12 @@ var wt = {
 		a?.(e);
 		for (let e of r) we(e, () => I("shell placement subscriber", e));
 	}, s = (t) => {
-		if (!e.enteredWithPersistedLayout()) {
-			Br(n, t.id);
-			return;
-		}
-		n = X({
+		e.enteredWithPersistedLayout() ? n = X({
 			state: n,
 			declarations: [t],
 			saved: Object.values(e.getLayout().regions).flatMap((e) => e.widgets),
 			owns: (e) => e.kind === "shell"
-		});
+		}) : Br(n, t.id);
 	};
 	e.onDidChangePersistenceScope(() => {
 		if (!e.isChangingPage?.()) {
@@ -3370,7 +3357,7 @@ var wt = {
 			region: t.region,
 			order: t.order ?? 0,
 			value: {
-				...Ut(Ri(t.id, n), s, {
+				...Ht(Ri(t.id, n), s, {
 					viewId: q(t.item),
 					role: zi(t.region),
 					closable: jr(t.item),
@@ -3446,7 +3433,7 @@ var wt = {
 			let a = {
 				...r,
 				item: { ...r.item }
-			}, c = Ln(e.registerPanel, e.views, {
+			}, c = In(e.registerPanel, e.views, {
 				...a,
 				id: Ii(a.id),
 				viewId: q(a.item),
@@ -4074,16 +4061,12 @@ var wt = {
 			for (let e of n.waiters) e();
 			n.waiters.clear();
 		}
-		!n.binding && !n.active && !n.pending && e.get(t) === n && e.delete(t);
+		n.binding || n.active || n.pending || e.get(t) !== n || e.delete(t);
 	}, r = (e, t) => e.binding === t.token && e.generation === t.generation, i = (e, a) => {
 		a.queued || a.active || t || (a.queued = !0, queueMicrotask(() => {
 			a.queued = !1;
 			let o = a.pending;
-			if (!o || t || a.active) {
-				n(e, a);
-				return;
-			}
-			if (a.pending = void 0, !r(a, o)) {
+			if (!o || t || a.active || (a.pending = void 0, !r(a, o))) {
 				n(e, a);
 				return;
 			}
@@ -4695,7 +4678,7 @@ var wt = {
 	}, { execute: (t) => e.movePanel(t.instanceId, t.region, t.position) });
 }, ya = (e) => ({
 	loadPageLayout: (t) => e.loadPageLayout(Te(t), t.pages[t.activePageId ?? ""]),
-	savePageMain: (t, n) => e.savePageMain(Te(t), n, t.pages[t.activePageId ?? ""])
+	savePageMain: (t, n, r) => e.savePageMain(Te(t), n, t.pages[t.activePageId ?? ""], r)
 }), ba = /* @__PURE__ */ new WeakMap(), xa = (e, t = e.modes.getActiveModeId(), n) => {
 	let r = ba.get(e), i = e.pages.store.getState(), a = e.layout.store.getInitialState().layout, o = t && t !== e.modes.getActiveModeId() ? r?.readMode(i.projectId, t) ?? a : e.layout.getLayout();
 	if (!n || !st(n, i)) return o;
@@ -4753,7 +4736,7 @@ var wt = {
 }), Ea = (e, t) => {
 	if (!e || e.modes.isTransitioning()) return t;
 	let n = e.modes.getActiveModeId(), r = n ? e.modes.getMode(n) : void 0;
-	return Yt(ht(t, r, (t) => e.layout.getRegionSettings(t, n)), e.layout.getRegionSize);
+	return Jt(ht(t, r, (t) => e.layout.getRegionSettings(t, n)), e.layout.getRegionSize);
 }, Da = (e, t, n = {}) => {
 	let r = n.identity && Object.values(xa(e, n.modeId, n.proposed).regions).flatMap((e) => e.widgets.map((t) => ({
 		region: e.id,
@@ -4986,9 +4969,7 @@ var wt = {
 		}
 		let e = n.pageLocations.closePlacement(t);
 		if (!e.ok) throw Error(e.diagnostic.message);
-		return;
-	}
-	t.kind === "mode" ? n.modePlacements.closePlacement(t) : n.shellPlacements.closePlacement(t);
+	} else t.kind === "mode" ? n.modePlacements.closePlacement(t) : n.shellPlacements.closePlacement(t);
 }, Ga = (e) => (t, n = !0) => {
 	let r = e(), i = N(t), a = Object.values(r.layout.getLayout().regions).flatMap((e) => e.widgets).find((e) => e.placementIdentity && N(e.placementIdentity) === i);
 	if (!a) throw Error(`Placement is not open: ${i}`);
@@ -5197,11 +5178,7 @@ var wt = {
 }, io = (e) => e.breadcrumbs.setItems(ro(e)), ao = (e) => {
 	let t, n = () => {
 		let n = e.pages.store.getState();
-		if (!n.activePageId || !n.location) {
-			t?.dispose(), t = void 0;
-			return;
-		}
-		t?.dispose(), t = io({
+		!n.activePageId || !n.location ? (t?.dispose(), t = void 0) : (t?.dispose(), t = io({
 			breadcrumbs: e.breadcrumbs,
 			location: n.location,
 			pages: Object.values(n.pages),
@@ -5215,7 +5192,7 @@ var wt = {
 				pageId: t,
 				slotId: n
 			})
-		});
+		}));
 	}, r = K(e.pages).onDidCommit(n);
 	return n(), B(() => {
 		r.dispose(), t?.dispose();
@@ -5313,11 +5290,12 @@ var wt = {
 }, _o = (e, t, n, r = e.registry.store.getState()) => {
 	let i = e.layout.getPersistenceScope(), a = e.registry.store.getState(), o = a.activeModeId ? e.layout.store.getInitialState().layout : e.layout.getLayout(), s = a.activeModeId !== t.activeModeId || a.projectId !== t.projectId, c = t.activeModeId ? e.loadModeLayout?.(t.projectId, t.activeModeId) : void 0, l = e.loadPageLayout?.(t), u = po(a, t, s, c);
 	if (n === "transition") {
+		let n = e.layout.getLayout();
 		s && a.activeModeId && e.saveModeLayout?.(a.projectId, a.activeModeId, e.layout.getLayout());
 		for (let n of Re(t, a, e.layout.getLayout())) e.layout.removeWidgetPlacement(n.widgetId);
-		st(t, a) && e.savePageMain?.(a, e.layout.getLayout());
+		st(t, a) && e.savePageMain?.(a, e.layout.getLayout(), n);
 	}
-	return Nn(e.modes, t.activeModeId, () => {
+	return Mn(e.modes, t.activeModeId, () => {
 		n === "transition" && e.beforeApply?.(t);
 		let d = e.registry.store.getState(), f = d === r ? t : d, p = n === "scope-restore" || e.layout.getPersistenceScope() !== i, m = s || p || st(t, a), h = ho(t, f, u), g = mo({
 			layout: m ? co(e.layout.getLayout(), c, o, l) : e.layout.getLayout(),
@@ -5326,7 +5304,7 @@ var wt = {
 			activate: h.map((e) => e.identity),
 			destinations: n === "transition" ? f.reconciliation.destinations : void 0
 		}, f, m), _ = f.activeModeId ? e.modes.getMode(f.activeModeId) : void 0, v = ht(g, _, (t) => e.layout.getRegionSettings(t, _?.id));
-		e.layout.restoreLayout(Yt(v, e.layout.getRegionSize)), uo(e.layout), n === "transition" && go(e, g, h);
+		e.layout.restoreLayout(Jt(v, e.layout.getRegionSize)), uo(e.layout), n === "transition" && go(e, g, h);
 	}), u ? "restore-mode" : "open-page";
 }, vo = (e) => {
 	let t = !1, n = K(e.registry).connectRuntime((n) => {
@@ -5363,7 +5341,7 @@ var wt = {
 	let a = Rn(e.pageId, e.slotId), o = t.getWidget(a);
 	if (!o) throw Error(`Workbench page placement is not registered: ${e.pageId}.${e.slotId}`);
 	return {
-		...Ut(`workbench.page.${encodeURIComponent(N(e.identity))}`, o, {
+		...Ht(`workbench.page.${encodeURIComponent(N(e.identity))}`, o, {
 			viewId: e.viewId,
 			title: r?.label ?? i.title ?? o.title,
 			role: e.role === "primary" ? "location" : "sub-panel",
@@ -5374,7 +5352,7 @@ var wt = {
 		...e.section ? { section: e.section } : {}
 	};
 }, xo = (e) => {
-	let t = e.resources ?? wt, n = Pi({
+	let t = e.resources ?? H, n = Pi({
 		restorePageState: e.restorePageState,
 		validateMode: (t) => {
 			if (!e.modes.getMode(t)) throw Error(`Workbench mode not registered: ${t}`);
@@ -5394,7 +5372,7 @@ var wt = {
 				let r = yt(n.item.kind === "view" ? n.item.view : n.item.binding.view);
 				if (!r) throw Error(`Workbench page slot view is not registered: ${t.id}.${n.id}`);
 				let i = qe(n);
-				return Ln(e.layout, e.views, {
+				return In(e.layout, e.views, {
 					...n,
 					id: Rn(t.id, n.id),
 					viewId: r,
@@ -5463,15 +5441,101 @@ var wt = {
 		...t,
 		currentScope: n?.getPersistenceScope() ?? t.currentScope
 	}), i = e.persistence?.getSnapshot(r?.scope)?.layout ?? e.layoutPersistence?.getLayout(r?.scope);
-	return !n || !r?.carryRegions?.length ? i : cn(n.getLayout(), i ?? Gt(), r.carryRegions);
-}, wo = (e, t = (t) => Co(e, t)) => (n, r, i) => {
-	let a = t({
-		modeId: n.modeId,
-		pageId: n.id,
-		projectId: i,
-		resource: r.resource
-	}, n), o = e.pageLocationPersistence?.load(i)?.location, s = L(o, r, wt, [n]);
-	if (a && (s || Object.values(a.regions).some((e) => e.widgets.some((e) => e.placementIdentity?.kind === "page" && e.placementIdentity.pageId === n.id)))) return So(n, a, r.resource);
+	return !n || !r?.carryRegions?.length ? i : sn(n.getLayout(), i ?? Wt(), r.carryRegions);
+}, wo = (e, t = (t) => Co(e, t), n) => (r, i, a) => {
+	let o = {
+		modeId: r.modeId,
+		pageId: r.id,
+		projectId: a,
+		resource: i.resource
+	}, s = t(o, r);
+	if (n && !n(o, r)) return;
+	let c = e.pageLocationPersistence?.load(a)?.location, l = L(c, i, H, [r]);
+	if (s && (l || Object.values(s.regions).some((e) => e.widgets.some((e) => e.placementIdentity?.kind === "page" && e.placementIdentity.pageId === r.id)))) return So(r, s, i.resource);
+}, To = () => {
+	let e = Symbol("current layout"), t = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o, s, c, l, u = (t) => {
+		let a = n.get(t), o = r.get(t), u = a?.get(e) ?? a?.get(i.get(t));
+		o !== u && (!!o != !!u && (s = void 0), o?.resource !== u?.resource && (l = void 0), u ? r.set(t, u) : r.delete(t), c = void 0);
+	}, d = (e, t, n) => {
+		let r = new Set([...t.values()].flatMap((e) => e.resource ? [V(e.resource)] : [])), i = new Set([...n.values()].flatMap((e) => e.resource ? [V(e.resource)] : []));
+		for (let t of r) {
+			if (i.has(t)) continue;
+			let n = a.get(t);
+			n.delete(e), n.size || a.delete(t);
+		}
+		for (let t of i) {
+			if (r.has(t)) continue;
+			let n = a.get(t);
+			n || (n = /* @__PURE__ */ new Set(), a.set(t, n)), n.add(e);
+		}
+	}, f = (t, r) => {
+		let a = n.get(r);
+		if (a.delete(t), i.get(r) === t) {
+			i.delete(r);
+			for (let t of a.keys()) t !== e && i.set(r, t);
+		}
+		a.size || n.delete(r), u(r);
+	}, p = (t, r, a) => {
+		for (let e of r.keys()) a.has(e) || f(t, e);
+		for (let [o, s] of a) {
+			if (r.get(o) === s) continue;
+			let a = n.get(o);
+			a || (a = /* @__PURE__ */ new Map(), n.set(o, a)), a.delete(t), a.set(t, s), t !== e && i.set(o, t), u(o);
+		}
+	}, m = (e, n) => {
+		let r = t.get(e) ?? /* @__PURE__ */ new Map(), i = new Map(Object.values(n?.regions ?? {}).flatMap((e) => e.widgets.map((e) => [e.widgetId, e])));
+		d(e, r, i), p(e, r, i), i.size ? t.set(e, i) : t.delete(e);
+	};
+	return {
+		set: m,
+		removeResource(e, n) {
+			let r = t.get(e);
+			if (!r) return;
+			let i = V(n), a = new Map([...r].filter(([, e]) => V(e.resource) !== i));
+			d(e, r, a), p(e, r, a), a.size ? t.set(e, a) : t.delete(e);
+		},
+		setCurrent(t) {
+			o !== t && (o = t, m(e, t));
+		},
+		getIds: () => s ??= new Set(r.keys()),
+		getPlacements: () => c ??= [...r.values()],
+		getResources: () => (l ??= [...new Map([...r.values()].flatMap((e) => e.resource ? [[V(e.resource), e.resource]] : [])).values()], l),
+		getScopes(e) {
+			return [...a.get(V(e)) ?? []].filter((e) => typeof e != "symbol");
+		}
+	};
+}, Eo = (e, t, n) => {
+	let r = {
+		pageId: e.id,
+		resource: t
+	}, i = (t) => lt(e, t, n), a = di({
+		page: e,
+		state: li({
+			page: e,
+			state: ai(e),
+			target: r,
+			resourceKey: i
+		}),
+		target: r,
+		resourceKey: i
+	});
+	return it({
+		shell: [],
+		page: Si({
+			page: e,
+			resource: t,
+			state: a,
+			staticInstanceKey: ke(e, t, n),
+			sharedPlacements: [],
+			resolvePagePlacement: (e) => e
+		})
+	}).regions.main;
+}, Do = (e, t, n) => e.placementIdentity && N(e.placementIdentity) === N(t.identity) && e.viewId === t.viewId && M(n, e.resource) === M(n, t.resource) && !!e.pinned == (t.open === "pin") && e.tabRetention === (t.open === "pin" ? "persistent" : t.open) && JSON.stringify(e.section) === JSON.stringify(t.section), Oo = (e, t, n, r = H) => {
+	if (!e || e.resource && !t) return !1;
+	let i = Eo(e, t, r), a = n.regions.main;
+	if (a.widgets.length !== i.length || !a.widgets.every((t, n) => Do(t, i[n].value, e))) return !1;
+	let o = a.widgets.find((e) => e.widgetId === a.activeWidgetId) ?? a.widgets[0], s = i.find((e) => e.value.role === "primary") ?? i[0];
+	return o?.placementIdentity && s ? N(o.placementIdentity) === N(s.identity) : !o && !s;
 }, Z = (e, t) => {
 	let n = { ...e.regions };
 	for (let r of be) {
@@ -5486,12 +5550,12 @@ var wt = {
 		...e,
 		regions: n
 	};
-}, To = (e, t) => `workbench-mode:${JSON.stringify([e ?? null, t])}`, Eo = (e, t) => `workbench-main:${JSON.stringify([
+}, ko = (e, t) => `workbench-mode:${JSON.stringify([e ?? null, t])}`, Ao = (e, t) => `workbench-main:${JSON.stringify([
 	e.projectId,
 	e.modeId,
 	e.pageId,
 	M(t, e.resource)
-])}`, Do = (e, t) => t !== "main" && (e.placementIdentity?.kind === "mode" || !!mt(t)), Oo = (e) => {
+])}`, jo = (e, t) => t !== "main" && (e.placementIdentity?.kind === "mode" || !!mt(t)), Mo = (e) => {
 	let { context: t, pages: n, saved: r } = e, i = Object.values(e.layout.regions).flatMap((e) => e.widgets).find((t) => t.widgetId === e.layout.activeLocationWidgetId), a = r && n.find((e) => e.ref.id === r.page.id && e.ref.extensionId === r.page.extensionId);
 	if (a && (!i?.resource?.projectId || i.resource.projectId === t.projectId)) {
 		let n = {
@@ -5516,22 +5580,26 @@ var wt = {
 		},
 		page: s
 	};
-}, ko = (e, t = () => void 0, n = () => void 0, r = () => []) => {
-	let i = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), o = e.persistence ? {
+}, No = (e, t = () => void 0, n = () => void 0, r = () => []) => {
+	let i = /* @__PURE__ */ new Map(), a = To(), o = !1, s = e.persistence ? {
 		getLayout: (t) => e.persistence?.getSnapshot(t)?.layout,
 		setLayout: (t, n) => e.persistence?.setSnapshot({ layout: t }, n),
+		removeLayout: e.persistence.removeSnapshot ? (t) => e.persistence?.removeSnapshot?.(t) : void 0,
 		listLayouts: () => e.persistence?.listLayouts?.() ?? [],
+		onDidChangeLayout: e.persistence?.onDidChangeLayout,
 		flush: e.persistence.flush,
 		dispose: e.persistence.dispose
 	} : e.layoutPersistence ?? {
-		getLayout: (e) => a.get(e),
-		setLayout: (e, t) => a.set(t, e)
-	}, s = (e) => {
-		i.add(e);
-		let t = I(`layout cache read for ${e ?? "unscoped"}`, () => o.getLayout(e));
-		return t ? vt(t, n) : void 0;
-	}, c = (e, t) => (i.add(t), I(`layout cache write for ${t ?? "unscoped"}`, () => (o.setLayout(e, t), !0))), l = (t, n, i, a) => {
-		let o = Oo({
+		getLayout: (e) => i.get(e),
+		setLayout: (e, t) => i.set(t, e),
+		removeLayout: (e) => {
+			i.delete(e);
+		}
+	}, c = s.onDidChangeLayout?.((e, t) => a.set(e, t)), l = (e) => {
+		let t = I(`layout cache read for ${e ?? "unscoped"}`, () => s.getLayout(e));
+		return t && a.set(e, t), t ? vt(t, n) : void 0;
+	}, u = (e, t) => I(`layout cache write for ${t ?? "unscoped"}`, () => (s.setLayout(e, t), a.set(t, e), !0)), d = (t, n, i, a) => {
+		let o = Mo({
 			layout: t,
 			context: n,
 			pages: i ? [i, ...r()] : r(),
@@ -5540,31 +5608,35 @@ var wt = {
 			resolveScope: e.resolvePagePersistenceScope
 		});
 		if (!o) return;
-		let l = Eo(o.context, o.page);
-		(s(l) || c(Z(t, (e, t) => t === "main"), l)) && c(Z(t, (e, t) => t !== "main"), a);
-	}, u = (e) => {
-		let t = /* @__PURE__ */ new Map(), n = [
-			...o.listLayouts?.().map((e) => e.layout) ?? [],
-			...[...i].map((e) => s(e)),
-			e
-		];
-		for (let e of n) if (e) for (let n of Object.values(e.regions)) for (let e of n.widgets) t.set(e.widgetId, e);
-		return [...t.values()];
+		let s = Ao(o.context, o.page);
+		(l(s) || u(Z(t, (e, t) => t === "main"), s)) && u(Z(t, (e, t) => t !== "main"), a);
+	}, f = (e) => {
+		if (!o) {
+			o = !0;
+			for (let { scope: e, layout: t } of s.listLayouts?.() ?? []) a.set(e, t);
+		}
+		a.setCurrent(e);
 	};
 	return {
-		listPlacements: u,
+		listPlacements(e) {
+			return f(e), a.getPlacements();
+		},
+		placementIds(e) {
+			return f(e), a.getIds();
+		},
 		listResources(e) {
-			let t = /* @__PURE__ */ new Map();
-			for (let n of u(e)) n.resource && t.set(V(n.resource), n.resource);
-			return [...t.values()];
+			return f(e), a.getResources();
+		},
+		hasPageMain(e, t) {
+			return !!l(Ao(e, t));
 		},
 		loadPageLayout(t, n) {
-			let r = e.resolvePagePersistenceScope?.(t)?.scope, i = s(r);
+			let r = e.resolvePagePersistenceScope?.(t)?.scope, i = l(r);
 			if (!t.pageId || !t.modeId) return i;
-			i?.regions.main.widgets.length && l(i, t, n, r);
-			let a = s(Eo(t, n));
+			i?.regions.main.widgets.length && d(i, t, n, r);
+			let a = l(Ao(t, n));
 			if (!i && !a) return;
-			let o = i ?? Gt(), c = new Set(a?.regions.main.widgets.map((e) => e.widgetId));
+			let o = i ?? Wt(), s = new Set(a?.regions.main.widgets.map((e) => e.widgetId));
 			return {
 				...o,
 				regions: {
@@ -5575,33 +5647,43 @@ var wt = {
 						activeWidgetId: void 0
 					}
 				},
-				activeWidgetId: c.has(a?.activeWidgetId ?? "") ? a?.activeWidgetId : o.activeWidgetId,
-				activeLocationWidgetId: c.has(a?.activeLocationWidgetId ?? "") ? a?.activeLocationWidgetId : o.activeLocationWidgetId
+				activeWidgetId: s.has(a?.activeWidgetId ?? "") ? a?.activeWidgetId : o.activeWidgetId,
+				activeLocationWidgetId: s.has(a?.activeLocationWidgetId ?? "") ? a?.activeLocationWidgetId : o.activeLocationWidgetId
 			};
 		},
-		savePageMain(e, t, n) {
-			e.pageId && e.modeId && c(Z(t, (e, t) => t === "main"), Eo(e, n));
+		savePageMain(t, n, r, i = n) {
+			if (!t.pageId || !t.modeId) return;
+			let o = Ao(t, r), c = Z(n, (e, t) => t === "main");
+			Oo(r, t.resource, n, e.pageResources) || i !== n && Oo(r, t.resource, i, e.pageResources) ? (I(`remove default page layout for ${o}`, () => {
+				s.removeLayout ? s.removeLayout(o) : s.getLayout(o) && s.setLayout(c, o);
+			}), a.set(o, s.removeLayout ? void 0 : s.getLayout(o))) : u(c, o);
 		},
 		removeResource(e) {
-			let t = /* @__PURE__ */ new Set([...i, ...o.listLayouts?.().map((e) => e.scope) ?? []]);
-			for (let n of t) {
-				let t = s(n);
-				t && c(Z(t, (t) => V(t.resource) !== V(e)), n);
+			if (!o) {
+				o = !0;
+				for (let { scope: e, layout: t } of s.listLayouts?.() ?? []) a.set(e, t);
+			}
+			for (let t of a.getScopes(e)) {
+				let n = l(t);
+				n ? u(Z(n, (t) => V(t.resource) !== V(e)), t) : a.removeResource(t, e);
 			}
 		},
 		layout: {
-			...o,
-			getLayout: s,
+			...s,
+			dispose() {
+				c?.(), s.dispose?.();
+			},
+			getLayout: l,
 			setLayout: (e, n) => {
-				let r = Z(e, (e, n) => !t() || n !== "main" && !Do(e, n));
+				let r = Z(e, (e, n) => !t() || n !== "main" && !jo(e, n));
 				for (let t of be) r.regions[t].savedWidgetOrder = e.regions[t].widgets.map((e) => e.widgetId);
-				return c(r, n);
+				return u(r, n);
 			}
 		},
-		readMode: (e, t) => s(To(e, t)),
-		saveMode: (e, t, n) => c(Z(n, (e, n) => Do(e, n) && (e.placementIdentity?.kind !== "mode" || e.placementIdentity.modeId === t)), To(e, t))
+		readMode: (e, t) => l(ko(e, t)),
+		saveMode: (e, t, n) => u(Z(n, (e, n) => jo(e, n) && (e.placementIdentity?.kind !== "mode" || e.placementIdentity.modeId === t)), ko(e, t))
 	};
-}, Ao = (e) => {
+}, Po = (e) => {
 	let t = (t) => !Object.hasOwn(p, t) || !e.getPolicy(t).movable || t === "main" && !e.getPolicy("secondary").open || (t === "main" || t === "secondary") && (!e.getPolicy("main").movable || !e.getPolicy("secondary").movable) ? [] : p[t];
 	return {
 		getArrangement: () => d(e.layout.getLayout().arrangement),
@@ -5618,7 +5700,7 @@ var wt = {
 			});
 		}
 	};
-}, jo = (e) => {
+}, Fo = (e) => {
 	let t = (t, n) => {
 		let r = e.getPolicy(t);
 		if (!r.provided) throw Error(`Panel is not provided: ${t}`);
@@ -5629,7 +5711,7 @@ var wt = {
 		}[n]) throw Error(`Panel cannot ${n}: ${t}`);
 	};
 	return {
-		...Ao(e),
+		...Po(e),
 		getPanelPolicy: e.getPolicy,
 		setHeaderVisible(t, n) {
 			if (!e.getPolicy(t).provided) throw Error(`Panel is not provided: ${t}`);
@@ -5653,11 +5735,7 @@ var wt = {
 			};
 		},
 		setRegionOpen(n, r) {
-			if (t(n, r ? "open" : "close"), n === "side") {
-				r ? e.sidePanel.getMode() === "closed" && e.sidePanel.setMode("attached") : e.sidePanel.setMode("closed");
-				return;
-			}
-			e.layout.setRegionVisible(n, r);
+			t(n, r ? "open" : "close"), n === "side" ? r ? e.sidePanel.getMode() === "closed" && e.sidePanel.setMode("attached") : e.sidePanel.setMode("closed") : e.layout.setRegionVisible(n, r);
 		},
 		setRegionSize(n, r) {
 			t(n, "resize");
@@ -5679,7 +5757,7 @@ var wt = {
 			});
 		}
 	};
-}, Mo = (e, t, n, r) => xr({
+}, Io = (e, t, n, r) => xr({
 	validateMode: (e) => {
 		let t = r();
 		if (!t) return;
@@ -5698,13 +5776,13 @@ var wt = {
 	onDidChangePolicy: t.onDidChangeActive,
 	initialMode: n.initialSidePanelMode,
 	layout: e
-}), No = (e) => {
+}), Lo = (e) => {
 	let t = e.focus.getActiveRegion() ?? "main";
 	return e.layout.getLayout().regions[t].activeWidgetId ?? `region:${t}`;
-}, Po = (e, t, n) => Object.values(e.regions).filter((e) => e.id === t).some((e) => e.widgets.some((e) => e.placementIdentity && n(e.placementIdentity))), Fo = (e, t) => {
+}, Ro = (e, t, n) => Object.values(e.regions).filter((e) => e.id === t).some((e) => e.widgets.some((e) => e.placementIdentity && n(e.placementIdentity))), zo = (e, t) => {
 	let n = Object.values(e.layout.getLayout().regions).flatMap((e) => e.widgets).find((e) => e.placementIdentity && N(e.placementIdentity) === N(t));
 	n && e.layout.activatePanel(n.widgetId);
-}, Io = async (e, t, n) => {
+}, Bo = async (e, t, n) => {
 	if (t.kind === "command") await e.commands.executeCommand(yt(t.target.command), t.target.params, {
 		source: "panel-add",
 		region: n
@@ -5729,20 +5807,20 @@ var wt = {
 		}
 		await e.navigation.openTarget(t);
 	}
-}, Lo = (e, t, n) => {
+}, Vo = (e, t, n) => {
 	if (t.kind !== "binding") return !0;
 	let r = t.binding.add;
 	if (!r) return !!(n && O(t.binding, n));
 	if (r.kind !== "command") return !0;
 	let i = yt(r.target.command);
 	return !!(e.commands.getCommand(i) && e.commands.isCommandVisible(i, r.target.params) && e.commands.isCommandEnabled(i, r.target.params));
-}, Ro = (e, t, n) => {
+}, Ho = (e, t, n) => {
 	for (let r of e.shellPlacements.listPlacements()) {
 		if (!Bn(e, Ii(r.id)).includes(t.region) || r.item.kind === "view" && r.item.presence === "fixed") continue;
-		let i = r.item.kind === "binding" && r.item.binding.cardinality === "many", a = Po(t.layout, t.region, (e) => e.kind === "shell" && e.placementId === r.id);
-		!i && a || !Lo(e, r.item, t.resource) || n(Ii(r.id), (n) => {
-			if (r.item.kind === "binding" && r.item.binding.add) return Io(e, r.item.binding.add, t.region);
-			Fo(e, e.shellPlacements.openPlacement({
+		let i = r.item.kind === "binding" && r.item.binding.cardinality === "many", a = Ro(t.layout, t.region, (e) => e.kind === "shell" && e.placementId === r.id);
+		!i && a || !Vo(e, r.item, t.resource) || n(Ii(r.id), (n) => {
+			if (r.item.kind === "binding" && r.item.binding.add) return Bo(e, r.item.binding.add, t.region);
+			zo(e, e.shellPlacements.openPlacement({
 				placementId: r.id,
 				region: t.region,
 				...r.item.kind === "binding" && n ? {
@@ -5752,13 +5830,13 @@ var wt = {
 			}));
 		});
 	}
-}, zo = (e, t, n) => {
+}, Uo = (e, t, n) => {
 	for (let r of e.modePlacements.listPlacements(t.modeId)) {
-		if (!Bn(e, G(r.id)).includes(t.region) || r.item.kind === "view" && r.item.presence === "fixed") continue;
-		let i = r.item.kind === "binding" && r.item.binding.cardinality === "many", a = Po(t.layout, t.region, (e) => e.kind === "mode" && e.placementId === r.id);
-		!i && a || !Lo(e, r.item, t.resource) || n(G(r.id), (n) => {
-			if (r.item.kind === "binding" && r.item.binding.add) return Io(e, r.item.binding.add, t.region);
-			Fo(e, e.modePlacements.openPlacement({
+		if (!Bn(e, Ln(r.id)).includes(t.region) || r.item.kind === "view" && r.item.presence === "fixed") continue;
+		let i = r.item.kind === "binding" && r.item.binding.cardinality === "many", a = Ro(t.layout, t.region, (e) => e.kind === "mode" && e.placementId === r.id);
+		!i && a || !Vo(e, r.item, t.resource) || n(Ln(r.id), (n) => {
+			if (r.item.kind === "binding" && r.item.binding.add) return Bo(e, r.item.binding.add, t.region);
+			zo(e, e.modePlacements.openPlacement({
 				panel: r.ref,
 				region: t.region,
 				...r.item.kind === "binding" && n ? {
@@ -5768,13 +5846,13 @@ var wt = {
 			}));
 		});
 	}
-}, Bo = (e, t, n) => {
+}, Wo = (e, t, n) => {
 	let r = e.pages.store.getState(), i = r.activePageId ? e.pages.getPage(r.activePageId) : void 0;
 	if (i) for (let r of i.slots) {
 		if (r.isAvailable && !r.isAvailable(t.resource) || !Bn(e, Rn(i.id, r.id)).includes(t.region) || r.item.kind === "view" && r.item.presence === "fixed") continue;
-		let a = r.item.kind === "binding" && r.item.binding.cardinality === "many", o = Po(t.layout, t.region, (e) => e.kind === "page" && e.pageId === i.id && e.slotId === r.id);
-		!a && o || !Lo(e, r.item, t.resource) || n(Rn(i.id, r.id), (n) => {
-			if (r.item.kind === "binding" && r.item.binding.add) return Io(e, r.item.binding.add, t.region);
+		let a = r.item.kind === "binding" && r.item.binding.cardinality === "many", o = Ro(t.layout, t.region, (e) => e.kind === "page" && e.pageId === i.id && e.slotId === r.id);
+		!a && o || !Vo(e, r.item, t.resource) || n(Rn(i.id, r.id), (n) => {
+			if (r.item.kind === "binding" && r.item.binding.add) return Bo(e, r.item.binding.add, t.region);
 			e.pages.openSlot({
 				pageId: i.id,
 				slotId: r.id,
@@ -5783,10 +5861,10 @@ var wt = {
 				...a ? { open: "pin" } : {}
 			});
 			let o = Object.values(e.layout.getLayout().regions).flatMap((e) => e.widgets).find((t) => t.widgetId === e.layout.getLayout().activeWidgetId && t.contributionId === Rn(i.id, r.id));
-			o?.placementIdentity && Fo(e, o.placementIdentity);
+			o?.placementIdentity && zo(e, o.placementIdentity);
 		});
 	}
-}, Vo = (e, t) => {
+}, Go = (e, t) => {
 	let n = [], r = (r, i) => {
 		let a = e.layout.getWidget(r);
 		a && n.push({
@@ -5796,8 +5874,8 @@ var wt = {
 			open: (t) => Ge(e, "Add panel", () => i?.(t))
 		});
 	};
-	return Ro(e, t, r), zo(e, t, r), Bo(e, t, r), n;
-}, Ho = (e) => (t) => !e.listProviders().some((e) => e.kind === t.type) || e.listResources("").some((e) => V(e.resource) === V(t)), Uo = ({ layout: e, isInScope: t }) => {
+	return Ho(e, t, r), Uo(e, t, r), Wo(e, t, r), n;
+}, Ko = (e) => (t) => !e.listProviders().some((e) => e.kind === t.type) || e.listResources("").some((e) => V(e.resource) === V(t)), qo = ({ layout: e, isInScope: t }) => {
 	let n = !1, r = e.onWillChangePersistenceScope(() => {
 		n = !0;
 	}), i = e.onDidChangePersistenceScope(() => {
@@ -5813,9 +5891,9 @@ var wt = {
 	return B(() => {
 		a(), r.dispose(), i.dispose();
 	});
-}, Wo = "sidenav", Go = (e, t) => {
+}, Jo = "sidenav", Yo = (e, t) => {
 	e.shell.setRegionOpen(t, !e.shell.getRegionState(t).open);
-}, Ko = [
+}, Xo = [
 	{
 		id: "workbench.toggleCommandPalette",
 		label: "Toggle Command Palette",
@@ -5860,10 +5938,10 @@ var wt = {
 		label: "Toggle Sidenav",
 		icon: "PanelLeft",
 		keybinding: "Mod+B",
-		execute: (e) => Go(e, Wo)
+		execute: (e) => Yo(e, Jo)
 	}
-], qo = (e) => {
-	for (let t of Ko) e.commands.registerCommand({
+], Zo = (e) => {
+	for (let t of Xo) e.commands.registerCommand({
 		id: t.id,
 		label: t.label,
 		category: "Workbench",
@@ -5880,7 +5958,7 @@ var wt = {
 		commandId: t.id,
 		group: "Workbench"
 	});
-}, Jo = (e) => Wn({
+}, Qo = (e) => Wn({
 	getActiveMode: () => {
 		let t = e(), n = t.modes.getActiveModeId();
 		return n ? t.modes.getMode(n) : void 0;
@@ -5888,13 +5966,13 @@ var wt = {
 	getLayout: () => e().layout.getLayout(),
 	getResource: () => e().getPrimaryResource(),
 	listWidgets: () => e().layout.listWidgets(),
-	listOwnedAddablePanels: ({ layout: t, mode: n, region: r, resource: i }) => Vo(e(), {
+	listOwnedAddablePanels: ({ layout: t, mode: n, region: r, resource: i }) => Go(e(), {
 		layout: t,
 		modeId: n?.id,
 		region: r,
 		resource: i
 	})
-}), Yo = (e, t) => {
+}), $o = (e, t) => {
 	e.layout.store.subscribe((t) => {
 		let n = e.focus.getActiveRegion();
 		n && !(Xa(e, n) ?? t.layout.regions[n].visible) && e.focus.clearFocus();
@@ -5903,17 +5981,17 @@ var wt = {
 		if (t) return Object.values(e.layout.regions).flatMap((e) => e.widgets).find((e) => e.widgetId === t)?.viewId;
 	}, (t) => {
 		t ? e.context.set(pa, t) : e.context.delete(pa);
-	}, { fireImmediately: !0 }), Uo({
+	}, { fireImmediately: !0 }), qo({
 		layout: e.layout,
-		isInScope: t.isInScope ?? Ho(e.resources)
-	}), qo(e);
-}, Xo = (e) => {
+		isInScope: t.isInScope ?? Ko(e.resources)
+	}), Zo(e);
+}, es = (e) => {
 	let t = e.layout.getLayout().activeWidgetId;
 	if (t) for (let n of Object.values(e.layout.getLayout().regions)) {
 		let e = n.widgets.find((e) => e.widgetId === t);
 		if (e) return e.resource;
 	}
-}, Zo = (e) => e.pages.store.getState().location?.resource, Qo = (e) => t({
+}, ts = (e) => e.pages.store.getState().location?.resource, ns = (e) => t({
 	subscribeViewRefresh: (t, n) => e.onDidRefresh(({ treeId: e }) => {
 		e === t && n();
 	}),
@@ -5930,8 +6008,8 @@ var wt = {
 		...r,
 		viewId: t
 	}),
-	moveViewNode: (t, n, r, i) => $o(e, t, n, r, i)
-}), $o = async (e, t, n, r, i) => {
+	moveViewNode: (t, n, r, i) => rs(e, t, n, r, i)
+}), rs = async (e, t, n, r, i) => {
 	await e.getTreeRenderer(t)?.moveNode?.(n, r, {
 		...i,
 		viewId: t,
@@ -5939,7 +6017,7 @@ var wt = {
 		refresh: () => e.refresh(t),
 		setSelectedNode: (n) => e.setSelectedNode(t, n)
 	});
-}, es = (e) => {
+}, is = (e) => {
 	let t = Yi();
 	return {
 		...t,
@@ -5955,7 +6033,7 @@ var wt = {
 }, Q = (e, t) => ({
 	dispose: () => e.dispose(),
 	refresh: t
-}), ts = (e) => (t, n) => {
+}), as = (e) => (t, n) => {
 	let r = t.body;
 	if (r.kind === "react") return Q(e.registerRenderer({
 		id: t.id,
@@ -6000,8 +6078,8 @@ var wt = {
 		id: t.id,
 		title: t.title
 	}, n), () => e.refreshDataTableRenderer(t.id));
-}, ns = (e, t) => {
-	let n = ha({ registerBody: ts(t) });
+}, os = (e, t) => {
+	let n = ha({ registerBody: as(t) });
 	return {
 		views: n,
 		viewMenus: fa({ views: n }),
@@ -6014,9 +6092,9 @@ var wt = {
 	...t,
 	source: e.source,
 	ownerId: e.ownerId
-}), rs = (e) => e ? Array.isArray(e) ? [...e] : [e] : [], is = (e) => {
+}), ss = (e) => e ? Array.isArray(e) ? [...e] : [e] : [], cs = (e) => {
 	for (let t = e.length - 1; t >= 0; --t) e[t]?.dispose();
-}, as = (e, t) => {
+}, ls = (e, t) => {
 	let n = e.context.createScope(t.contextScopeId);
 	t.track(n);
 	let r = (e) => (t.track(e), e), { openPanel: i, openWidget: a, registerPanel: o, registerPanelMenu: s, registerPlaceholder: c, registerWidget: l, ...u } = e.layout;
@@ -6064,12 +6142,12 @@ var wt = {
 			registerMode: (n) => r(e.modes.registerMode({
 				...n,
 				activate: () => {
-					let r = [], i = as(e, {
+					let r = [], i = ls(e, {
 						...t,
 						contextScopeId: `mode:${n.id}`,
 						track: (e) => r.push(e)
-					}), a = rs(n.activate(i));
-					return B(() => is([...r, ...a]));
+					}), a = ss(n.activate(i));
+					return B(() => cs([...r, ...a]));
 				}
 			})),
 			onDidChangeActive: (t) => r(e.modes.onDidChangeActive(t))
@@ -6163,19 +6241,19 @@ var wt = {
 			register: (t) => r(e.fileIconThemes.register(t))
 		}
 	};
-}, os = (e) => {
+}, us = (e) => {
 	let t = /* @__PURE__ */ new Map();
 	return {
 		registerModule(n) {
 			if (t.has(n.id)) throw Error(`Workbench module already registered: ${n.id}`);
 			let r = [], i;
 			i = B(() => {
-				t.get(n.id)?.disposable === i && (t.delete(n.id), is(r));
+				t.get(n.id)?.disposable === i && (t.delete(n.id), cs(r));
 			});
 			let a = { disposable: i };
 			t.set(n.id, a);
 			try {
-				let t = as(e(), {
+				let t = ls(e(), {
 					contextScopeId: `module:${n.id}`,
 					ownerId: n.ownerId ?? n.id,
 					source: n.source ?? "module",
@@ -6183,7 +6261,7 @@ var wt = {
 						r.push(e);
 					}
 				});
-				r.push(...rs(n.activate(t)));
+				r.push(...ss(n.activate(t)));
 			} catch (e) {
 				throw a.disposable.dispose(), e;
 			}
@@ -6193,7 +6271,7 @@ var wt = {
 			t.get(e)?.disposable.dispose();
 		}
 	};
-}, ss = (e, t, n) => {
+}, ds = (e, t, n) => {
 	let r = e.resolvePagePersistenceScope;
 	if (r) return (e) => {
 		let i = r({
@@ -6205,7 +6283,7 @@ var wt = {
 		});
 		n.setPersistenceScope(i.scope), t.setPersistenceScope(i.scope, { carryRegionState: i.carryRegions });
 	};
-}, cs = (e) => ({
+}, fs = (e) => ({
 	validateRegionChange(t, n) {
 		let r = e();
 		if (!r || r.modes.isTransitioning()) return;
@@ -6229,21 +6307,28 @@ var wt = {
 		if ((!n || r.resource && V(n.resource) !== V(r.resource)) && !a.acceptsTabs) throw Error(`Panel cannot accept tabs: ${t}`);
 		if (!a.open && !a.canOpen) throw Error(`Panel cannot open: ${t}`);
 	}
-}), ls = (e, t, n, r) => yr({
+}), ps = (e, t) => ({
+	getOpenPlacements: () => t.listPlacements(e.getLayout()),
+	getOpenPlacementIds: () => t.placementIds(e.getLayout()),
+	getSnapshot: () => ({ layout: e.getLayout() }),
+	restoreSnapshot: (t) => e.restoreLayout(t.layout),
+	setPersistenceScope: (t, n = {}) => e.setPersistenceScope(t, { carryRegionState: n.carryRegions }),
+	getPersistenceScope: e.getPersistenceScope
+}), ms = (e, t, n, r) => yr({
 	registry: t,
 	browser: e.pageLocationBrowser ?? oo(),
 	navigationTrees: n,
 	modes: r,
 	persistence: e.pageLocationPersistence ?? so(),
 	startPage: e.startPage ?? Ct.start
-}), us = (e) => {
+}), hs = (e) => {
 	e?.flush?.(), e?.dispose?.();
-}, ds = (e = {}) => {
-	let t, n = me(), r = Er({ context: n }), i = es(e), a = ko(e, () => t?.pages.store.getState().activeModeId, (e) => t?.layout.getWidget(e)?.tab, () => t?.pages.listPages() ?? []), o = {
+}, gs = (e = {}) => {
+	let t, n = me(), r = Er({ context: n }), i = is(e), a = No(e, () => t?.pages.store.getState().activeModeId, (e) => t?.layout.getWidget(e)?.tab, () => t?.pages.listPages() ?? []), o = {
 		...e,
 		persistence: void 0,
 		layoutPersistence: a.layout
-	}, { establishLocation: s, ...c } = An({
+	}, { establishLocation: s, ...c } = kn({
 		defaultRegionVisibility: {
 			...e.defaultPanelOpenByRegionId,
 			side: (e.initialSidePanelMode ?? "floating") !== "closed"
@@ -6255,7 +6340,7 @@ var wt = {
 				...i?.regionSettings?.[n]
 			};
 		},
-		...cs(() => t),
+		...fs(() => t),
 		normalizeLayout: (e) => Ea(t, e),
 		persistence: a.layout
 	}), l = {
@@ -6264,7 +6349,7 @@ var wt = {
 	}, u = qn({
 		context: n,
 		isRegionFocusable: (e) => Xa(t, e) ?? l.getLayout().regions[e].visible
-	}), { views: d, viewMenus: f, statusBar: p } = ns(e, i), h = e.pageResources ?? wt, g = Yr({
+	}), { views: d, viewMenus: f, statusBar: p } = os(e, i), h = e.pageResources ?? H, g = Yr({
 		loadLayout: (e) => a.readMode(e.projectId, e.modeId),
 		validateOpen: (e, n, r) => Da(t, n, {
 			identity: e,
@@ -6299,22 +6384,22 @@ var wt = {
 		}, l),
 		enteredWithPersistedLayout: l.enteredWithPersistedLayout,
 		onDidChangePersistenceScope: l.onDidChangePersistenceScope
-	}), v = Qo(i), y = ii({
+	}), v = ns(i), y = ii({
 		layout: l,
 		views: d,
 		viewMenus: f
 	}), b = Fi({
 		layout: l,
 		views: d
-	}), x = Vt(), S = br({ persistence: e.panelMenuStatePersistence }), C = ee({
+	}), x = Bt(), S = br({ persistence: e.panelMenuStatePersistence }), C = ee({
 		remove: (e, n) => Ya(t, e, n, a.removeResource),
 		getPrimary: () => t.getPrimaryResource(),
 		resolveView: d.getView
-	}), w = In({
+	}), w = Fn({
 		establishLocation: s,
 		layout: l,
 		resolveContext: () => t
-	}), te = Mo(l, w, e, () => t), T = jo({
+	}), te = Io(l, w, e, () => t), T = Fo({
 		layout: l,
 		sidePanel: te,
 		getPolicy: (e) => Ta(t, e)
@@ -6322,8 +6407,8 @@ var wt = {
 		...ya(a),
 		loadModeLayout: a.readMode,
 		saveModeLayout: a.saveMode,
-		beforeApply: ss(e, l, S),
-		restorePageState: wo(o, a.loadPageLayout),
+		beforeApply: ds(e, l, S),
+		restorePageState: wo(o, a.loadPageLayout, a.hasPageMain),
 		revealRegion: (e) => Ia(t, e),
 		layout: l,
 		modePlacements: g,
@@ -6332,7 +6417,7 @@ var wt = {
 		views: d,
 		viewMenus: f,
 		resources: h
-	}), E = ls(e, ne, v, w), re = Jo(() => t);
+	}), E = ms(e, ne, v, w), re = Qo(() => t);
 	t = {
 		getOpenResources: () => a.listResources(l.getLayout()),
 		closePlacement: Wa(() => t),
@@ -6340,19 +6425,13 @@ var wt = {
 		...Va(() => t),
 		...qa(() => t),
 		breadcrumbs: x,
-		commandPalette: Ht(),
+		commandPalette: Vt(),
 		commands: r,
 		composition: re,
 		context: n,
 		focus: u,
 		fullscreen: Za(() => t),
-		host: {
-			getOpenPlacements: () => a.listPlacements(l.getLayout()),
-			getSnapshot: () => ({ layout: l.getLayout() }),
-			restoreSnapshot: (e) => l.restoreLayout(e.layout),
-			setPersistenceScope: (e, t = {}) => l.setPersistenceScope(e, { carryRegionState: t.carryRegions }),
-			getPersistenceScope: l.getPersistenceScope
-		},
+		host: ps(l, a),
 		keybindings: m({
 			commands: r,
 			context: n
@@ -6361,7 +6440,7 @@ var wt = {
 		modes: w,
 		modePlacements: g,
 		shellPlacements: _,
-		notifications: ni(() => No({
+		notifications: ni(() => Lo({
 			focus: u,
 			layout: l
 		})),
@@ -6392,16 +6471,16 @@ var wt = {
 		themes: la(),
 		fileIconThemes: ca(),
 		getActiveResource() {
-			return Xo(t);
+			return es(t);
 		},
 		async dispose() {
-			ie(), us(a.layout), await Promise.all([d.reads.dispose(), t.terminal.dispose()]);
+			ie(), hs(a.layout), await Promise.all([d.reads.dispose(), t.terminal.dispose()]);
 		},
 		onDidChangeActiveResource(e) {
 			return B(t.layout.store.subscribeSelector((e) => e.layout.activeResourceKey, () => e(t.getActiveResource())));
 		},
 		getPrimaryResource() {
-			return Zo(t);
+			return ts(t);
 		},
 		onDidChangePrimaryResource(e) {
 			return B(t.pages.store.subscribeSelector((e) => e.location?.resource, () => e(t.getPrimaryResource())));
@@ -6409,7 +6488,7 @@ var wt = {
 		registerChildModule(e) {
 			return t.registerModule(e);
 		},
-		...os(() => t)
+		...us(() => t)
 	}, Ke(t, i);
 	let ie = Qa(t);
 	return va(t), Ca(t, a), ao({
@@ -6419,9 +6498,8 @@ var wt = {
 		navigationTrees: v,
 		modes: w,
 		resources: h
-	}), Yo(t, e), t;
+	}), $o(t, e), t;
 };
-//#endregion
-export { z as batchWorkbenchChanges, Xn as createLevelNavigation, ea as createRendererReadRegistry, ia as createStatusBarRegistry, sa as createStatusRegistry, ha as createViewRegistry, ds as createWorkbench, oe as createWorkbenchResourceContextValues, gt as createWorkbenchSelectionResourceMetadata, wt as defaultPageResourceCodec, bt as dockedWorkbenchRegions, y as getKeybindingSteps, pt as getNavigationTargetKey, mt as getWorkbenchModePanelForRegion, o as getWorkbenchSelectionResourceKeys, c as headerLeadingMenuPath, dt as headerTrailingMenuPath, k as isWorkbenchModePanelAvailable, Qe as isWorkbenchViewHierarchyNode, ge as matchesContextExpression, Fe as rendererReadKey, ie as resolveAnchorRegion, se as resourceContextMenuPath, x as resourceHierarchyCycleCode, Ge as runUserAction, ut as settleReadBatch, Ne as standardResourceIcons, f as workbenchBreadcrumbLocationMenuPath, u as workbenchCommandPaletteMenuPath, P as workbenchPanelRegions, re as workbenchRegionTabAddMenuPath, Ve as workbenchRegionTabLeadingMenuPath, be as workbenchRegions, _ as workbenchResourceIdContextKey, le as workbenchResourceMetadataContextKey, fe as workbenchResourceOwnerContextKey, h as workbenchResourceTypeContextKey, C as workbenchSelectionResourceKeyMetadataKey, i as workbenchTopHeaderLeadingMenuPath, Be as workbenchTopHeaderTrailingMenuPath, pa as workbenchViewIdContextKey };
+export { z as batchWorkbenchChanges, Xn as createLevelNavigation, ea as createRendererReadRegistry, ia as createStatusBarRegistry, sa as createStatusRegistry, ha as createViewRegistry, gs as createWorkbench, oe as createWorkbenchResourceContextValues, gt as createWorkbenchSelectionResourceMetadata, H as defaultPageResourceCodec, bt as dockedWorkbenchRegions, y as getKeybindingSteps, pt as getNavigationTargetKey, mt as getWorkbenchModePanelForRegion, o as getWorkbenchSelectionResourceKeys, c as headerLeadingMenuPath, dt as headerTrailingMenuPath, k as isWorkbenchModePanelAvailable, Qe as isWorkbenchViewHierarchyNode, ge as matchesContextExpression, Fe as rendererReadKey, ie as resolveAnchorRegion, se as resourceContextMenuPath, x as resourceHierarchyCycleCode, Ge as runUserAction, ut as settleReadBatch, Ne as standardResourceIcons, f as workbenchBreadcrumbLocationMenuPath, u as workbenchCommandPaletteMenuPath, P as workbenchPanelRegions, re as workbenchRegionTabAddMenuPath, Ve as workbenchRegionTabLeadingMenuPath, be as workbenchRegions, _ as workbenchResourceIdContextKey, le as workbenchResourceMetadataContextKey, fe as workbenchResourceOwnerContextKey, h as workbenchResourceTypeContextKey, C as workbenchSelectionResourceKeyMetadataKey, i as workbenchTopHeaderLeadingMenuPath, Be as workbenchTopHeaderTrailingMenuPath, pa as workbenchViewIdContextKey };
 
 //# sourceMappingURL=index.js.map