dsh-edge 0.9.0 → 0.10.0

package/dist/plugins/@deepseek-ai/dsh-client-locale/client.js

@@ -7,7 +7,7 @@ window.__ModuleLoader__.load({
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let react = require("react");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
-		let _deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
+		let _deepseek_ai_dsh_client_store = require("@deepseek-ai/dsh-client-store");
 		//#region ../../../vendor/cosmokit/src/misc.ts
 		/** Return true when a value is `null` or `undefined`. */
 		function isNullable(value) {
@@ -806,9 +806,11 @@ window.__ModuleLoader__.load({
 		const LOCALE_SETTINGS_NAMESPACE = "locale";
 		/** Field carrying an explicit locale selection; absence delegates to the browser. */
 		const LOCALE_PREFERENCE_FIELD = "preference";
+		/** Accepted BCP 47-style language ids. */
+		const LOCALE_ID_PATTERN = /^[A-Za-z]{2,8}(?:-[A-Za-z0-9]{1,8})*$/u;
 		/** Locale identifiers shipped by the browser client. */
 		const LOCALE_IDS = ["zh", "en"];
-		Schema.object({ [LOCALE_PREFERENCE_FIELD]: Schema.union([...LOCALE_IDS]).required(false) });
+		Schema.object({ [LOCALE_PREFERENCE_FIELD]: Schema.string().pattern(LOCALE_ID_PATTERN).required(false) });
 		//#endregion
 		//#region lib/types/locales/zh.js
 		/** zh base dictionary for the common namespace: cross-feature standard words. */
@@ -818,6 +820,13 @@ window.__ModuleLoader__.load({
 			"close": "关闭",
 			"copy": "复制",
 			"copied": "复制成功",
+			"copy.failed": "复制失败",
+			"copy.value": "复制值",
+			"copy.json": "复制 JSON",
+			"copy.path": "复制属性路径",
+			"copy.prettyJson": "复制格式化 JSON",
+			"copy.compactJson": "复制紧凑 JSON",
+			"copy.optionsHint": "{action}；右键点击可选择复制方式",
 			"retry": "重试",
 			"loading": "加载中…",
 			"load.failed": "加载失败",
@@ -834,9 +843,17 @@ window.__ModuleLoader__.load({
 			"collapse": "收起",
 			"expand": "展开",
 			"back": "返回",
+			"brand.localBuild": "DSH 本地构建",
 			"unknown": "未知",
 			"none": "无",
-			"truncated": "已截断"
+			"truncated": "已截断",
+			"json.collapseNode": "收起 JSON 节点",
+			"json.expandNode": "展开 JSON 节点",
+			"json.label": "JSON",
+			"markdown.footnotes": "脚注",
+			"markdown.truncatedCharacters": "… 已截断，共 {total} 字符",
+			"number.thousand": "{value}K",
+			"number.million": "{value}M"
 		};
 		//#endregion
 		//#region lib/types/locales/en.js
@@ -847,6 +864,13 @@ window.__ModuleLoader__.load({
 			"close": "Close",
 			"copy": "Copy",
 			"copied": "Copied",
+			"copy.failed": "Copy failed",
+			"copy.value": "Copy value",
+			"copy.json": "Copy JSON",
+			"copy.path": "Copy property path",
+			"copy.prettyJson": "Copy pretty JSON",
+			"copy.compactJson": "Copy compact JSON",
+			"copy.optionsHint": "{action}; right-click for copy options",
 			"retry": "Retry",
 			"loading": "Loading…",
 			"load.failed": "Failed to load",
@@ -863,9 +887,17 @@ window.__ModuleLoader__.load({
 			"collapse": "Collapse",
 			"expand": "Expand",
 			"back": "Back",
+			"brand.localBuild": "DSH Local Build",
 			"unknown": "Unknown",
 			"none": "None",
-			"truncated": "Truncated"
+			"truncated": "Truncated",
+			"json.collapseNode": "Collapse JSON node",
+			"json.expandNode": "Expand JSON node",
+			"json.label": "JSON",
+			"markdown.footnotes": "Footnotes",
+			"markdown.truncatedCharacters": "… truncated at {total} characters",
+			"number.thousand": "{value}K",
+			"number.million": "{value}M"
 		};
 		//#endregion
 		//#region lib/types/locales/settings.js
@@ -876,7 +908,7 @@ window.__ModuleLoader__.load({
 		const en = { "language.title": "Language" };
 		//#endregion
 		//#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/locale/src/client/LanguageRow.module.css.mjs
-		const css = ".hVGvvW_row{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:16px 0;display:flex}.hVGvvW_rowText{flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px;display:flex}.hVGvvW_title{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}.hVGvvW_selector{background:var(--dsw-alias-bg-module-platform);height:36px;font:inherit;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:18px;align-items:center;gap:12px;padding:0 14px;font-size:14px;line-height:22px;display:inline-flex}.hVGvvW_selector:hover{background:var(--dsw-alias-interactive-bg-hover)}.hVGvvW_chevron{flex:none}";
+		const css = ".hVGvvW_row{border-bottom:.5px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:16px 0;display:flex}.hVGvvW_rowText{flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px;display:flex}.hVGvvW_title{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}.hVGvvW_selector{background:var(--dsw-alias-bg-module-platform);height:36px;font:inherit;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:18px;align-items:center;gap:12px;padding:0 14px;font-size:14px;line-height:22px;display:inline-flex}.hVGvvW_selector:hover{background:var(--dsw-alias-interactive-bg-hover)}.hVGvvW_chevron{flex:none}";
 		const tagId = "@deepseek-ai/dsh-client-locale/LanguageRow.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
 			const tag = document.createElement("style");
@@ -959,7 +991,7 @@ window.__ModuleLoader__.load({
 		* @returns the store handle.
 		*/
 		function createLanguageRowStore() {
-			return (0, _deepseek_ai_dsh_client_runtime_client.defineStore)({
+			return (0, _deepseek_ai_dsh_client_store.defineStore)({
 				init: () => ({
 					active: "",
 					options: [],
@@ -976,12 +1008,12 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region lib/types/client/index.js
 		/**
-		* English is both the locale the UI opens in when the browser names no shipped
+		* English is both the locale the UI opens in when the browser names no registered
 		* language (and for non-browser runs), and the dictionary consulted after the
 		* active locale misses a key. One constant serves both because the shipped
 		* `zh`/`en` dictionaries carry identical key sets, so neither direction can
 		* leave a key unresolved; the residual case points at English rather than
-		* zh because a browser naming neither shipped language is the reader least
+		* zh because a browser naming no registered language is the reader least
 		* likely to read Chinese.
 		*/
 		const FALLBACK_LOCALE = "en";
@@ -989,55 +1021,65 @@ window.__ModuleLoader__.load({
 		const COMMON_NS = "common";
 		/** Namespace owning this feature's settings-row copy. */
 		const SETTINGS_NS = "settings.locale";
-		/** The two shipped locales. */
-		const LOCALES = Object.freeze([{
-			id: "zh",
-			label: "中文"
-		}, {
-			id: "en",
-			label: "English"
-		}]);
-		/**
-		* `<html lang>` tag per shipped locale. The locale id is the app's own
-		* vocabulary (primary subtag); the document attribute wants a BCP 47 tag,
-		* which assistive technology and browser features (pronunciation rules,
-		* translation offers, font fallback, spell check) read to pick their own
-		* behavior. `zh` alone leaves the script ambiguous, so the shipped Chinese
-		* copy names the variant it actually is.
-		*/
-		const DOCUMENT_LANGUAGE = {
-			zh: "zh-CN",
-			en: "en"
+		/** The two locales and dictionaries shipped by this package. */
+		const BUILT_IN_LOCALE_METADATA = {
+			zh: {
+				label: "中文",
+				fallback: "en"
+			},
+			en: { label: "English" }
 		};
+		const BUILT_IN_LOCALES = Object.freeze(LOCALE_IDS.map((id) => Object.freeze({
+			id,
+			...BUILT_IN_LOCALE_METADATA[id]
+		})));
+		/** Case-insensitive key for BCP 47-style ids. */
+		function localeKey(value) {
+			return value.toLowerCase();
+		}
+		/** Validate and detach a language-pack contribution from its mutable input. */
+		function normalizeLanguage(input) {
+			if (!LOCALE_ID_PATTERN.test(input.id)) throw new Error(`locale id "${input.id}" is not a BCP 47-style tag`);
+			if (input.label.trim() === "") throw new Error("locale label must not be empty");
+			if (!LOCALE_ID_PATTERN.test(input.fallback)) throw new Error(`locale fallback "${input.fallback}" is not a BCP 47-style tag`);
+			return Object.freeze({
+				id: input.id,
+				label: input.label,
+				fallback: input.fallback
+			});
+		}
 		/**
-		* Point `<html lang>` at the active locale. Called on every locale change,
-		* so the attribute tracks the UI instead of standing at whatever the served
-		* markup happened to declare.
-		* @param active - the active locale id.
+		* Point `<html lang>` at the active locale, keeping the served document in
+		* sync with locale snapshot changes.
+		* @param snapshot - current locale state, including the active definition.
 		*/
-		function syncDocumentLanguage(active) {
+		function syncDocumentLanguage(snapshot) {
 			if (typeof document === "undefined") return;
-			document.documentElement.lang = DOCUMENT_LANGUAGE[active];
+			document.documentElement.lang = snapshot.active === "zh" ? "zh-CN" : snapshot.active;
 		}
 		/**
-		* Dictionary registry plus locale preference. Lookup chain per key: the
-		* entry's namespace in the active locale -> that namespace's en fallback ->
-		* the shared common namespace (active, then en) -> the key itself (missing
-		* text stays visible, fail loud in the UI rather than blank). Reads go
-		* through {@link getLocale}; writes only through {@link setLocale};
-		* continuous sync through the `locale/change` event, or through the
-		* LocaleFace getSnapshot/subscribe pair the render machinery consumes
-		* (installed via `ctx.slots.installLocale`).
+		* Dictionary registry plus locale preference. Lookup walks the active
+		* language's declared fallback chain in the entry namespace, then repeats it
+		* in the shared common namespace before showing the key itself. Reads go
+		* through {@link getLocale}; preferences change only through
+		* {@link setLocale}, while language packs extend the catalog through
+		* {@link addLanguage}. Continuous sync uses the `locale/change` event or
+		* the LocaleFace getSnapshot/subscribe pair installed through
+		* `ctx.slots.installLocale`.
 		*/
 		var LocaleRuntime = class {
 			dicts = /* @__PURE__ */ new Map();
 			bound = /* @__PURE__ */ new Map();
+			catalog = /* @__PURE__ */ new Map();
+			fallbackChains = /* @__PURE__ */ new Map();
 			snapshot;
 			listeners = /* @__PURE__ */ new Set();
 			ctx;
 			host;
 			/** Browser-derived locale standing wherever no explicit Host selection does. */
 			provisional;
+			/** Last explicit selection, including one awaiting an external registration. */
+			preference;
 			/**
 			* @param ctx - owning context (change events are emitted on it; the scope
 			* listener is released through ctx.effect on dispose).
@@ -1047,10 +1089,12 @@ window.__ModuleLoader__.load({
 			constructor(ctx, host) {
 				this.ctx = ctx;
 				this.host = host;
-				this.provisional = resolveInitialLocale();
+				for (const locale of BUILT_IN_LOCALES) this.catalog.set(localeKey(locale.id), locale);
+				const locales = this.localeList();
+				this.provisional = resolveInitialLocale(locales);
 				this.snapshot = Object.freeze({
 					active: this.provisional,
-					locales: LOCALES,
+					locales,
 					revision: 0
 				});
 				if (host !== void 0) {
@@ -1078,7 +1122,7 @@ window.__ModuleLoader__.load({
 			/**
 			* LocaleFace subscribe: notified on every snapshot change (locale switch
 			* or dictionary registration — registrations bump the revision so already
-			* rendered outlets pick up late-arriving dictionaries).
+			* rendered outlets pick up late-arriving dictionaries and locale definitions).
 			* @param fn - change callback.
 			* @returns unsubscribe.
 			*/
@@ -1101,12 +1145,49 @@ window.__ModuleLoader__.load({
 			* @param id - a registered locale id; unknown ids throw.
 			*/
 			setLocale(id) {
-				const match = this.snapshot.locales.find((l) => l.id === id);
+				const match = this.catalog.get(localeKey(id));
 				if (match === void 0) throw new Error(`locale "${id}" is not registered`);
+				this.preference = match.id;
 				if (this.snapshot.active !== match.id) this.publish(match.id, true);
 				this.host?.set(LOCALE_PREFERENCE_FIELD, match.id);
 			}
 			/**
+			* Add one selectable language to the shared catalog. Its fallback must
+			* already be registered, and following fallback definitions must terminate
+			* at English. Dictionaries may register before or after this definition.
+			* Registration rechecks an unresolved Host preference and the browser's
+			* ordered language list. The caller owns the returned disposer; removing an
+			* active language falls back without clearing the stored id.
+			* @param input - stable id, self-described label, and fallback language id.
+			* @returns idempotent disposer removing this exact definition.
+			* @throws when fields are malformed, the id is occupied, or the fallback
+			* target is unknown or creates a cycle.
+			*/
+			addLanguage(input) {
+				const candidate = normalizeLanguage(input);
+				const key = localeKey(candidate.id);
+				if (this.catalog.has(key)) throw new Error(`locale "${candidate.id}" is already registered`);
+				const fallback = this.catalog.get(localeKey(candidate.fallback));
+				if (fallback === void 0) throw new Error(`locale fallback "${candidate.fallback}" is not registered`);
+				const language = Object.freeze({
+					...candidate,
+					fallback: fallback.id
+				});
+				this.catalog.set(key, language);
+				try {
+					this.assertFallbackChain(language.id);
+				} catch (error) {
+					this.catalog.delete(key);
+					throw error;
+				}
+				this.publishCatalog();
+				return () => {
+					if (this.catalog.get(key) !== language) return;
+					this.catalog.delete(key);
+					this.publishCatalog();
+				};
+			}
+			/**
 			* Adopt the scope's accepted durable selection without writing it back; an
 			* absent selection returns to the browser-derived locale.
 			* @param host - the constructor-narrowed scope driving this adoption.
@@ -1114,19 +1195,74 @@ window.__ModuleLoader__.load({
 			adopt(host) {
 				const section = host.getSnapshot().value;
 				if (section === void 0) return;
-				const target = section.preference ?? this.provisional;
+				this.preference = section.preference;
+				const target = this.resolveActive();
 				if (this.snapshot.active === target) return;
 				this.publish(target, true);
 			}
+			/** Recompute browser fallback and publish the current catalog. */
+			publishCatalog() {
+				this.fallbackChains.clear();
+				const locales = this.localeList();
+				this.provisional = resolveInitialLocale(locales);
+				const active = this.resolveActive();
+				this.publish(active, active !== this.snapshot.active, locales);
+			}
+			/** Resolve an explicit preference only while its definition is available. */
+			resolveActive() {
+				if (this.preference === void 0) return this.provisional;
+				return this.catalog.get(localeKey(this.preference))?.id ?? this.provisional;
+			}
+			/** Snapshot the catalog in registration order. */
+			localeList() {
+				return Object.freeze([...this.catalog.values()]);
+			}
+			/** Fail a new definition whose complete fallback path does not reach English. */
+			assertFallbackChain(start) {
+				const seen = /* @__PURE__ */ new Set();
+				let current = this.catalog.get(localeKey(start));
+				while (current !== void 0) {
+					const key = localeKey(current.id);
+					if (seen.has(key)) throw new Error(`locale fallback cycle includes "${current.id}"`);
+					seen.add(key);
+					if (key === localeKey("en")) return;
+					/* v8 ignore next -- English is the only built-in terminal and every
+					* language accepted by addLanguage has a required fallback. */
+					if (current.fallback === void 0) throw new Error(`locale "${current.id}" fallback chain does not reach "en"`);
+					const next = this.catalog.get(localeKey(current.fallback));
+					if (next === void 0) throw new Error(`locale fallback "${current.fallback}" is not registered`);
+					current = next;
+				}
+			}
+			/** Resolve a lookup chain, falling directly to English across an unload gap. */
+			fallbackChain(start) {
+				const startKey = localeKey(start);
+				const cached = this.fallbackChains.get(startKey);
+				if (cached !== void 0) return cached;
+				const chain = [];
+				const seen = /* @__PURE__ */ new Set();
+				let current = this.catalog.get(startKey);
+				while (current !== void 0 && !seen.has(localeKey(current.id))) {
+					const key = localeKey(current.id);
+					seen.add(key);
+					chain.push(current.id);
+					current = current.fallback === void 0 ? void 0 : this.catalog.get(localeKey(current.fallback));
+				}
+				if (!seen.has(localeKey("en"))) chain.push("en");
+				const resolved = Object.freeze(chain);
+				this.fallbackChains.set(startKey, resolved);
+				return resolved;
+			}
 			register(ns, localeOrDicts, dict) {
 				const pairs = typeof localeOrDicts === "string" ? [[localeOrDicts, dict]] : Object.entries(localeOrDicts);
+				for (const [locale] of pairs) if (!LOCALE_ID_PATTERN.test(locale)) throw new Error(`locale id "${locale}" is not a BCP 47-style tag`);
 				let locales = this.dicts.get(ns);
 				if (!locales) {
 					locales = /* @__PURE__ */ new Map();
 					this.dicts.set(ns, locales);
 				}
-				for (const [locale] of pairs) if (locales.has(locale)) throw new Error(`locale namespace "${ns}" already has locale "${locale}"`);
-				for (const [locale, entries] of pairs) locales.set(locale, entries);
+				for (const [locale] of pairs) if (locales.has(localeKey(locale))) throw new Error(`locale namespace "${ns}" already has locale "${locale}"`);
+				for (const [locale, entries] of pairs) locales.set(localeKey(locale), entries);
 				this.publish(this.snapshot.active, false);
 				return () => {
 					const owner = this.dicts.get(ns);
@@ -1134,9 +1270,12 @@ window.__ModuleLoader__.load({
 					* first register and never removed, so the disposer always finds it. */
 					if (!owner) return;
 					let removed = false;
-					for (const [locale, entries] of pairs) if (owner.get(locale) === entries) {
-						owner.delete(locale);
-						removed = true;
+					for (const [locale, entries] of pairs) {
+						const key = localeKey(locale);
+						if (owner.get(key) === entries) {
+							owner.delete(key);
+							removed = true;
+						}
 					}
 					if (removed) this.publish(this.snapshot.active, false);
 				};
@@ -1151,13 +1290,17 @@ window.__ModuleLoader__.load({
 				return t;
 			}
 			translate(ns, key, params) {
-				const template = this.lookup(ns, key) ?? (ns !== "common" ? this.lookup("common", key) : void 0) ?? key;
+				const chain = this.fallbackChain(this.snapshot.active);
+				const template = this.lookup(ns, key, chain) ?? (ns !== "common" ? this.lookup("common", key, chain) : void 0) ?? key;
 				if (!params) return template;
 				return template.replace(/\{(\w+)\}/g, (match, name) => name in params ? String(params[name]) : match);
 			}
-			lookup(ns, key) {
+			lookup(ns, key, chain) {
 				const locales = this.dicts.get(ns);
-				return locales?.get(this.snapshot.active)?.[key] ?? locales?.get("en")?.[key];
+				for (const locale of chain) {
+					const value = locales?.get(localeKey(locale))?.[key];
+					if (value !== void 0) return value;
+				}
 			}
 			/**
 			* Advance the snapshot revision and notify LocaleFace subscribers (render
@@ -1166,10 +1309,10 @@ window.__ModuleLoader__.load({
 			* registration-heavy boot cannot storm event listeners (which may
 			* re-register slots in response).
 			*/
-			publish(active, localeChanged) {
+			publish(active, localeChanged, locales = this.snapshot.locales) {
 				this.snapshot = Object.freeze({
 					active,
-					locales: this.snapshot.locales,
+					locales,
 					revision: this.snapshot.revision + 1
 				});
 				if (localeChanged) this.ctx.emit("locale/change", this.snapshot);
@@ -1184,30 +1327,35 @@ window.__ModuleLoader__.load({
 		* The browser's own language wins over {@link FALLBACK_LOCALE}; an explicit
 		* Host preference may replace this provisional value after plugin activation.
 		*/
-		function resolveInitialLocale() {
-			return detectBrowserLocale() ?? "en";
+		function resolveInitialLocale(locales) {
+			return detectBrowserLocale(locales) ?? "en";
 		}
 		/**
-		* The first shipped locale the browser asks for, matched on the primary
-		* subtag so every regional variant lands on its language (`zh-Hans-CN` -> zh,
-		* `en-GB` -> en). `window` is the browser test, not `navigator`: Node exposes
-		* a global `navigator` reporting the machine's own language, which would
-		* otherwise decide the locale for non-browser runs (node e2e booting the
-		* client tree). `navigator.language` trails the ordered `languages` list and
-		* covers its absence on hosts that expose only the single tag.
+		* The first registered locale the browser asks for. Each browser tag first
+		* matches a locale id exactly, then its primary subtag, so an exact regional
+		* registration wins before a language-wide fallback.
+		* `window` is the browser test, not `navigator`: Node exposes a global
+		* `navigator` reporting the machine's own language, which must not decide the
+		* locale for non-browser runs. `navigator.language` trails the ordered
+		* `languages` list and covers hosts exposing only the single tag.
+		* @param locales - definitions currently available to the browser.
+		* @returns the first matching locale id, or undefined.
 		*/
-		function detectBrowserLocale() {
+		function detectBrowserLocale(locales) {
 			if (typeof window === "undefined") return void 0;
-			for (const tag of [...navigator.languages ?? [], navigator.language]) {
-				const primary = tag.toLowerCase().split("-")[0];
-				const match = LOCALES.find((locale) => locale.id === primary);
-				if (match) return match.id;
+			const languages = navigator.languages;
+			for (const tag of [...languages ?? [], navigator.language]) {
+				const requested = localeKey(tag);
+				const exact = locales.find((locale) => localeKey(locale.id) === requested);
+				if (exact !== void 0) return exact.id;
+				const primary = requested.split("-")[0];
+				const match = locales.find((locale) => localeKey(locale.id).split("-")[0] === primary);
+				if (match !== void 0) return match.id;
 			}
 		}
 		/** Required services: slot registration plus the settings transport. */
 		const inject = [
 			"slots",
-			"connection",
 			"remote",
 			"settingsScope"
 		];
@@ -1231,18 +1379,19 @@ window.__ModuleLoader__.load({
 			ctx.slots.installLocale(locale);
 			const store = createLanguageRowStore();
 			let bound;
-			const sync = (snapshot) => {
-				syncDocumentLanguage(snapshot.active);
+			const sync = () => {
+				const snapshot = locale.getSnapshot();
+				syncDocumentLanguage(snapshot);
 				bound?.sync(snapshot.active, snapshot.locales.map((l) => ({
 					id: l.id,
 					label: l.label
 				})), snapshot.revision);
 			};
-			ctx.on("locale/change", sync);
-			syncDocumentLanguage(locale.getLocale().active);
+			ctx.effect(() => locale.subscribe(sync), "locale: language row and document synchronization");
+			sync();
 			const injected = (actions) => {
 				bound = actions;
-				sync(locale.getLocale());
+				sync();
 				return { setLocale: (id) => {
 					locale.setLocale(id);
 				} };

package/dist/plugins/@deepseek-ai/dsh-client-modules/client.js

@@ -73,21 +73,26 @@ window.__ModuleLoader__.load({
 			const graph = wire;
 			if (typeof graph.rev !== "string") throw new Error("client-modules: boot manifest rev must be a string");
 			if (!Array.isArray(graph.entries)) throw new Error("client-modules: boot manifest entries must be an array");
-			const modules = [];
+			if (!Array.isArray(graph.batches)) throw new Error("client-modules: boot manifest batches must be an array");
+			const moduleFields = [];
 			const plugins = [];
+			const seenEntryIds = /* @__PURE__ */ new Set();
 			for (const value of graph.entries) {
 				if (typeof value !== "object" || value === null) throw new Error("client-modules: boot manifest entry is not an object");
 				const row = value;
 				const where = typeof row.id === "string" ? `"${row.id}"` : JSON.stringify(row);
 				if (typeof row.id !== "string" || typeof row.url !== "string" || typeof row.rev !== "string") throw new Error(`client-modules: boot manifest entry ${where} must carry string id/url/rev`);
+				if (seenEntryIds.has(row.id)) throw new Error(`client-modules: duplicate graph entry "${row.id}"`);
+				seenEntryIds.add(row.id);
 				const subject = `boot manifest entry ${where}`;
 				const inject = optionalStringArray(subject, "inject", row.inject);
 				const external = optionalStringArray(subject, "external", row.external);
 				if (row.immediately !== void 0 && typeof row.immediately !== "boolean") throw new Error(`client-modules: boot manifest entry ${where} immediately must be a boolean`);
-				modules.push({
+				moduleFields.push({
 					id: row.id,
 					url: row.url,
 					rev: row.rev,
+					inject: inject === void 0 ? [] : [...inject],
 					external: external === void 0 ? [] : [...external]
 				});
 				plugins.push({
@@ -96,6 +101,33 @@ window.__ModuleLoader__.load({
 					immediately: row.immediately === true
 				});
 			}
+			const entryIds = new Set(moduleFields.map((row) => row.id));
+			const initialUrls = /* @__PURE__ */ new Map();
+			const batchUrls = /* @__PURE__ */ new Set();
+			for (const value of graph.batches) {
+				if (typeof value !== "object" || value === null) throw new Error("client-modules: boot manifest batch is not an object");
+				const batch = value;
+				const phase = batch.phase;
+				if (phase !== "bootstrap" && phase !== "application") throw new Error(`client-modules: boot manifest batch phase must be "bootstrap" or "application", received ${JSON.stringify(phase)}`);
+				if (typeof batch.url !== "string" || typeof batch.rev !== "string") throw new Error(`client-modules: boot manifest ${phase} batch must carry string url/rev`);
+				if (batchUrls.has(batch.url)) throw new Error(`client-modules: boot manifest carries duplicate batch URL ${JSON.stringify(batch.url)}`);
+				batchUrls.add(batch.url);
+				const entries = optionalStringArray(`boot manifest ${phase} batch`, "entries", batch.entries);
+				if (entries === void 0 || entries.length === 0) throw new Error(`client-modules: boot manifest ${phase} batch entries must be a non-empty string array`);
+				for (const id of entries) {
+					if (!entryIds.has(id)) throw new Error(`client-modules: boot manifest ${phase} batch names unknown entry "${id}"`);
+					if (initialUrls.has(id)) throw new Error(`client-modules: boot manifest entry "${id}" belongs to more than one batch`);
+					initialUrls.set(id, batch.url);
+				}
+			}
+			const modules = moduleFields.map((row) => {
+				const initialUrl = initialUrls.get(row.id);
+				if (initialUrl === void 0) throw new Error(`client-modules: boot manifest entry "${row.id}" belongs to no initial-load batch`);
+				return {
+					...row,
+					initialUrl
+				};
+			});
 			return {
 				rev: graph.rev,
 				modules,
@@ -125,6 +157,11 @@ window.__ModuleLoader__.load({
 			}, { once: true });
 			document.head.append(el);
 		});
+		/** Replace the rev query while preserving absolute, protocol-relative, or path-relative form. */
+		function atRevision(url, rev) {
+			if (!/[?&]rev=[^&#]*/.test(url)) throw new Error(`client-modules: bundle URL ${url} has no revision`);
+			return url.replace(/([?&]rev=)[^&#]*/, `$1${encodeURIComponent(rev)}`);
+		}
 		/**
 		* Claim and inventory the <style> tags a factory injected during
 		* materialization: preset-emitted tags arrive pre-tagged with data-plugin;
@@ -151,8 +188,10 @@ window.__ModuleLoader__.load({
 			seed;
 			factories = /* @__PURE__ */ new Map();
 			bootstrapIds = /* @__PURE__ */ new Set();
-			/** In-flight prefetch (script load) per id; concurrent callers share it. */
+			/** In-flight script transport per URL; every row in one batch shares it. */
 			pendingArrival = /* @__PURE__ */ new Map();
+			/** Single-resource combo URL selected by HMR after invalidating one row. */
+			reloadUrls = /* @__PURE__ */ new Map();
 			/** Materialization re-entrancy guard: factory-form CJS cannot deliver partial exports, so a cycle is fatal. */
 			materializing = /* @__PURE__ */ new Set();
 			graphRows = /* @__PURE__ */ new Map();
@@ -194,28 +233,38 @@ window.__ModuleLoader__.load({
 			}
 			/** Load one graph row so its factory is registered (idempotent per in-flight arrival). */
 			arrive(row) {
-				const { id, url } = row;
-				const pending = this.pendingArrival.get(id);
-				if (pending !== void 0) return pending;
+				const { id } = row;
 				if (this.loadCache.has(id) || this.factories.has(id)) return Promise.resolve();
-				const task = this.loadBundle(url).then(() => {
+				const reloadUrl = this.reloadUrls.get(id);
+				const url = reloadUrl ?? row.initialUrl;
+				let transport = this.pendingArrival.get(url);
+				if (transport === void 0) {
+					transport = this.loadBundle(url).finally(() => {
+						this.pendingArrival.delete(url);
+					});
+					this.pendingArrival.set(url, transport);
+				}
+				return transport.then(() => {
 					if (!this.factories.has(id)) throw new Error(`client-modules: bundle ${url} loaded without registering "${id}" via __ModuleLoader__.load`);
-				}).finally(() => {
-					this.pendingArrival.delete(id);
+					if (reloadUrl !== void 0 && this.reloadUrls.get(id) === reloadUrl) this.reloadUrls.delete(id);
 				});
-				this.pendingArrival.set(id, task);
-				return task;
 			}
-			/** Register each unresolved dynamic request before registering its consumer. */
-			async arriveGraphRow(row, open = []) {
+			/** Register each injected package and unresolved dynamic request before its consumer. */
+			async arriveGraphRow(row, open = [], visited = /* @__PURE__ */ new Set()) {
 				const cycleStart = open.indexOf(row.id);
 				if (cycleStart !== -1) throw new Error(`client-modules: module arrival cycle ${[...open.slice(cycleStart), row.id].join(" -> ")} (the host must reject this graph before serving it)`);
+				if (visited.has(row.id)) return;
+				visited.add(row.id);
 				const next = [...open, row.id];
 				for (const request of row.external) {
 					const id = stripClientSuffix(request);
 					if (this.seed.has(request) || this.loadCache.has(id)) continue;
 					const dependency = this.graphRows.get(id);
-					if (dependency !== void 0) await this.arriveGraphRow(dependency, next);
+					if (dependency !== void 0) await this.arriveGraphRow(dependency, next, visited);
+				}
+				for (const packageName of row.inject) {
+					const dependency = this.graphRows.get(packageName);
+					if (dependency !== void 0) await this.arriveGraphRow(dependency, [], visited);
 				}
 				await this.arrive(row);
 			}
@@ -276,9 +325,12 @@ window.__ModuleLoader__.load({
 				if (row === void 0) throw new Error(`client-modules: prefetch("${id}") — not a graph entry`);
 				await this.arriveGraphRow(row);
 			}
-			invalidate(id) {
+			invalidate(id, rev) {
 				const normalized = stripClientSuffix(id);
 				if (this.bootstrapIds.has(normalized)) return;
+				const row = this.graphRows.get(normalized);
+				if (row !== void 0) this.reloadUrls.set(normalized, atRevision(row.url, rev ?? row.rev));
+				else this.reloadUrls.delete(normalized);
 				this.factories.delete(normalized);
 				this.loadCache.delete(normalized);
 			}