dsh-quick-actions 0.1.0 → 0.2.0-rc.2

package/lib/client.js

@@ -182,6 +182,29 @@ window.__ModuleLoader__.load({
 				}
 			};
 		}
+		const FNV_OFFSET_BASIS = 144066263297769815596495629667062367629n;
+		const FNV_PRIME = 309485009821345068724781371n;
+		const FNV_MASK = (1n << 128n) - 1n;
+		function fnv1a128(value) {
+			let hash = FNV_OFFSET_BASIS;
+			for (const byte of new TextEncoder().encode(value)) hash = (hash ^ BigInt(byte)) * FNV_PRIME & FNV_MASK;
+			return hash.toString(16).padStart(32, "0");
+		}
+		/**
+		* Hash the whole catalog projection, field by field and in order, so that any
+		* change a client could observe — including a pure reordering — moves the
+		* revision, and an unchanged catalog never does (spec 6.2).
+		*/
+		function revisionOf(presets) {
+			return fnv1a128(JSON.stringify([1, presets.map((preset) => [
+				preset.id,
+				preset.kind,
+				preset.label,
+				preset.text,
+				preset.icon ?? null,
+				preset.confirm
+			])]));
+		}
 		function fieldIssue(field, reason) {
 			return {
 				field,
@@ -221,55 +244,135 @@ window.__ModuleLoader__.load({
 			} };
 		}
 		/**
-		* Read one published catalog snapshot back (spec 17.2). The Host is the catalog's
-		* single validation authority, so this is a defensive decode of an already
-		* confirmed snapshot rather than a second authority — but it is a decode, not a
-		* cast: a snapshot this release cannot read in full yields no catalog at all.
-		*
-		* All-or-nothing on purpose. Dropping the entries it cannot read would show the
-		* user a silently truncated action list, which is exactly what spec 5.1 forbids
-		* the Host to do; the consumer reports a catalog error instead (spec 10).
-		*
-		* The Host's `revision` is carried through rather than recomputed. It is the
-		* catalog's published identity, and a Client that recomputed it would be
-		* asserting an authority it does not have.
-		*/
-		function decodeCatalogSnapshot(raw) {
-			if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return void 0;
-			const { schemaVersion, revision, presets } = raw;
-			if (schemaVersion !== 1) return void 0;
-			if (typeof revision !== "string" || revision === "") return void 0;
-			if (!Array.isArray(presets)) return void 0;
-			const read = readPublishedPresets(presets);
-			if (read === void 0) return void 0;
-			return {
-				schemaVersion: 1,
-				revision,
-				presets: read
-			};
-		}
-		/**
-		* Validate an already-published preset list against the same field rules the
-		* Host applied. Nothing is reported field by field: the Host is the authority
-		* that names an author's mistake, and a Client can only refuse the snapshot.
+		* Merge and validate the built-in manifest with the Host composition's presets.
+		* Nothing is repaired or dropped: the first release refuses to load a catalog an
+		* author got wrong, so the mistake surfaces at startup rather than at send time.
 		*/
-		function readPublishedPresets(entries) {
-			if (entries.length > 50) return void 0;
+		function buildPresetCatalog(input) {
+			const issues = [];
 			const presets = [];
 			const seen = /* @__PURE__ */ new Set();
-			for (const entry of entries) {
-				if (typeof entry !== "object" || entry === null || Array.isArray(entry)) return void 0;
+			const sources = [["builtin", input.builtins], ["config", input.configured]];
+			for (const [source, entries] of sources) for (const [index, entry] of entries.entries()) {
+				const at = (issue, id) => ({
+					scope: "preset",
+					source,
+					index,
+					id,
+					field: issue.field,
+					reason: issue.reason
+				});
+				if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
+					issues.push(at(fieldIssue("id", "invalid-type"), void 0));
+					continue;
+				}
 				const record = entry;
 				const identity = readId(record);
-				if ("issue" in identity || seen.has(identity.id)) return void 0;
+				if ("issue" in identity) {
+					issues.push(at(identity.issue, void 0));
+					continue;
+				}
+				if (seen.has(identity.id)) {
+					issues.push(at(fieldIssue("id", "duplicate"), identity.id));
+					continue;
+				}
 				const read = readPreset(record, identity.id);
-				if ("issue" in read) return void 0;
+				if ("issue" in read) {
+					issues.push(at(read.issue, identity.id));
+					continue;
+				}
 				seen.add(identity.id);
 				presets.push(read.preset);
 			}
-			return presets;
+			const count = input.builtins.length + input.configured.length;
+			if (count > 50) issues.push({
+				scope: "catalog",
+				reason: "too-many",
+				count,
+				limit: 50
+			});
+			if (issues.length > 0) return {
+				ok: false,
+				issues
+			};
+			return {
+				ok: true,
+				catalog: {
+					schemaVersion: 1,
+					revision: revisionOf(presets),
+					presets
+				}
+			};
 		}
 		//#endregion
+		//#region src/model/presets.ts
+		/**
+		* The package's built-in Preset Quick Action manifest — component 1 of the
+		* Preset Catalog (spec 5.1), declared ahead of the Host composition's
+		* `Config.presets`.
+		*
+		* It lives in the shared model because both faces merge it: the Host validates
+		* the catalog at load, and the Client rebuilds the same catalog from this list
+		* plus the `presets` form field it reads (spec 22.3). One list, so the two can
+		* never disagree about what the built-ins are.
+		*
+		* These are author-facing product copy in one language; changing a label or a
+		* text is a product decision, not an implementation one.
+		*
+		* Two rules bind any edit here:
+		*
+		* - A Preset Action ID is permanent. Label, icon and text may change under the
+		*   same id, but `kind` and `confirm` are the immutable safety behaviour
+		*   signature — changing either needs a new id (spec 5.1). Editing a text so it
+		*   crosses the Command Send Action boundary counts as crossing that signature.
+		* - Adding an entry is additive: a new id appends to the end of every existing
+		*   user's order and rewrites no stored data (spec 5.3).
+		*
+		* `summarize` and `explain` carry new ids rather than reusing
+		* `summarize-thread` and `explain-last-change`: those two shipped on the
+		* default `confirm: true`, and turning confirmation off is exactly the
+		* signature change the first rule reserves a new id for. The old ids simply
+		* leave the catalog, which the model already handles — a stored preference for
+		* an id no longer in the catalog is kept as a tombstone, neither shown nor
+		* counted (spec 5.3).
+		*/
+		const BUILT_IN_PRESETS = Object.freeze([
+			Object.freeze({
+				id: "approve",
+				label: "确认",
+				text: "确认，按你刚才说的做。",
+				icon: "✅",
+				confirm: false
+			}),
+			Object.freeze({
+				id: "continue",
+				label: "继续",
+				text: "继续。",
+				icon: "▶️",
+				confirm: false
+			}),
+			Object.freeze({
+				id: "summarize",
+				label: "总结",
+				text: "总结当前对话：已确定的结论、仍未决的问题、下一步要做的事。",
+				icon: "📝",
+				confirm: false
+			}),
+			Object.freeze({
+				id: "explain",
+				label: "解释",
+				text: "解释你刚才的改动：为什么这样做，考虑过哪些替代方案，取舍是什么。",
+				icon: "🔍",
+				confirm: false
+			}),
+			Object.freeze({
+				id: "compact-context",
+				label: "压缩",
+				text: "/compact",
+				icon: "🧹"
+			})
+		]);
+		//#endregion
 		//#region src/model/settings.ts
 		/**
 		* Settings V1 decoding (spec 4.2, 6.3). Decoding is defensive and lossless: it
@@ -278,17 +381,27 @@ window.__ModuleLoader__.load({
 		* Catalog-aware canonicalization lives in `normalize.ts`.
 		*/
 		/**
-		* The one namespace holding user data (spec 4.2); renaming it orphans every
-		* stored section. It lives in the shared model because both faces address it:
-		* the Host registers it, the Client binds the same name.
+		* The one namespace holding user data (spec 4.2, 22); renaming it orphans every
+		* stored section. Since DSH 0.1.7 a Settings namespace *is* a profile entry id,
+		* so this is also the Cordis loader entry id the bundle patch inserts — the two
+		* can no longer drift apart. It lives in the shared model because both faces
+		* address it: the Host describes and fences its canonical rewrite against it,
+		* the Client reads and writes the same form.
 		*/
 		const QUICK_ACTIONS_SETTINGS_NAMESPACE = "composer-quick-actions";
 		/**
-		* The read-only namespace carrying the Preset Catalog to Clients (spec 17.2).
-		* The plugin never writes its user layer, so it holds no persisted section —
-		* `composer-quick-actions` remains the only persisted namespace (spec 4.2).
+		* The top-level fields of the stored section, in canonical order (spec 4.2).
+		* Each is a separate volatile Config field (spec 22.2): the DSH legacy import
+		* addresses a section by these exact top-level keys, and every write sets them
+		* field by field so a write never reaches the author's `presets`.
 		*/
-		const QUICK_ACTIONS_CATALOG_NAMESPACE = "composer-quick-actions-catalog";
+		const QUICK_ACTION_STATE_FIELDS = Object.freeze([
+			"schemaVersion",
+			"layout",
+			"userActionsById",
+			"actionOrder",
+			"presetStateById"
+		]);
 		/** The state a fresh install starts from (spec 4.2). */
 		const DEFAULT_QUICK_ACTION_SETTINGS = Object.freeze({
 			schemaVersion: 1,
@@ -764,10 +877,10 @@ window.__ModuleLoader__.load({
 		/**
 		* The Client's single owner of authoritative Quick Action state (spec 7.1).
 		*
-		* It binds the two Settings namespaces the Host registers — the read-only
-		* catalog namespace, read off its composition `base` layer, and the user-state
-		* namespace — derives the projection every surface renders, and serializes
-		* revision-fenced writes back through the same scope.
+		* It reads the plugin entry's one Settings form (spec 22) — the user-state
+		* fields and the author's `presets`, from which it rebuilds the Preset Catalog
+		* with the shared model — derives the projection every surface renders, and
+		* serializes revision-fenced writes back through the same form.
 		*
 		* What it deliberately does not own:
 		*
@@ -779,10 +892,21 @@ window.__ModuleLoader__.load({
 		*   `InputActions` object reaches this module — long-lived global state must not
 		*   pin a session's runtime objects (spec 7.1). Draft occupancy, confirmation and
 		*   send single-flight belong to the per-session execution layer (spec 7.2).
-		* - **Its own copy of the settings document.** Both bindings derive from the one
+		* - **Its own copy of the settings document.** The form derives from the one
 		*   browser-side describe mirror, so the catalog costs no read of its own and
-		*   refreshes with that mirror after a reconnect (spec 17.3).
+		*   refreshes with that mirror after a reconnect (spec 17.3, 22.3).
+		*/
+		/**
+		* Whether a user retry can clear this catalog error (spec 10).
+		*
+		* Only a failed first read can: the mirror's public face re-reads only while it
+		* holds no document (`ensure()`, spec 22.4). The other two arrive with a held
+		* document and clear on their own when the Host's `settings/document-updated`
+		* broadcast or a reconnect refreshes it, so a retry there would do nothing.
 		*/
+		function isRetryableCatalogError(reason) {
+			return reason === "unreadable";
+		}
 		/**
 		* How many Custom Action IDs a create or clone tries before giving up.
 		* Normalization must never renumber a stored id (spec 4.1), so the planner
@@ -790,44 +914,27 @@ window.__ModuleLoader__.load({
 		* anything; exhausting the attempts surfaces the refusal instead of hiding it.
 		*/
 		const ID_MINT_ATTEMPTS = 4;
-		/** The five top-level fields of the persisted section (spec 4.2). */
+		/**
+		* One write per user-state field (spec 4.2), never touching `presets`: the
+		* author's list shares the entry's config, and this face never writes it.
+		*/
 		function sectionOps(next) {
-			return [
-				{
-					op: "set",
-					path: ["schemaVersion"],
-					value: next.schemaVersion
-				},
-				{
-					op: "set",
-					path: ["layout"],
-					value: next.layout
-				},
-				{
-					op: "set",
-					path: ["userActionsById"],
-					value: next.userActionsById
-				},
-				{
-					op: "set",
-					path: ["actionOrder"],
-					value: next.actionOrder
-				},
-				{
-					op: "set",
-					path: ["presetStateById"],
-					value: next.presetStateById
-				}
-			];
+			return QUICK_ACTION_STATE_FIELDS.map((field) => ({
+				op: "set",
+				path: [field],
+				value: next[field]
+			}));
 		}
 		/**
-		* Read the catalog off a bound namespace.
+		* Rebuild the catalog from the form (spec 22.3): the package's built-ins, then
+		* the author's `presets` field, merged by the same shared model the Host
+		* validated them with at load.
 		*
-		* `base` is read, never `value`: `base` is the author's own layer, so a user who
-		* hand-writes a section of that name into the settings document still sees the
-		* Host's catalog (spec 17.2).
+		* The resolved `value` is read, not `base`: author presets are declared in the
+		* profile's own patch layer, which is exactly the layer `base` leaves out. A
+		* list the model refuses is an error, never a partial catalog (spec 5.1).
 		*/
-		function readCatalog(snapshot, document) {
+		function readCatalog(snapshot, document, builtins) {
 			if (snapshot.status === "loading") {
 				if (document.view !== void 0) return {
 					status: "error",
@@ -838,18 +945,25 @@ window.__ModuleLoader__.load({
 					reason: "unreadable"
 				};
 			}
-			if (snapshot.status === "unavailable" || snapshot.base === void 0) return {
+			if (snapshot.status === "unavailable") return {
 				status: "error",
 				reason: "unavailable"
 			};
-			const catalog = decodeCatalogSnapshot(snapshot.base);
-			if (catalog === void 0) return {
+			const configured = snapshot.value?.presets ?? [];
+			if (!Array.isArray(configured)) return {
 				status: "error",
 				reason: "undecodable"
 			};
-			return {
+			const result = buildPresetCatalog({
+				builtins,
+				configured
+			});
+			return result.ok ? {
 				status: "ready",
-				catalog
+				catalog: result.catalog
+			} : {
+				status: "error",
+				reason: "undecodable"
 			};
 		}
 		/**
@@ -891,21 +1005,19 @@ window.__ModuleLoader__.load({
 			};
 		}
 		/**
-		* Create the controller. Both bindings are made on the calling fiber, so the
-		* scope disposers the binder registers are withdrawn with it; `dispose()`
-		* releases what this module owns on top of that.
+		* Create the controller. The form is owned by the settings provider and shared
+		* by every reader of this entry, so there is nothing to release for it;
+		* `dispose()` withdraws this module's own subscriptions.
+		*
+		* Both the catalog and the user state come off the same form. It is decoded
+		* here, by the shared model, rather than trusted as the transport validated
+		* it: the Client's reading of a confirmed snapshot is the model's.
 		*/
 		function createQuickActionsController(options) {
 			const mintId = options.mintCustomActionId ?? (() => crypto.randomUUID());
-			const catalogScope = options.settingsScope.bind({
-				namespace: QUICK_ACTIONS_CATALOG_NAMESPACE,
-				decode: (value) => value ?? null
-			});
-			const settingsScope = options.settingsScope.bind({
-				namespace: QUICK_ACTIONS_SETTINGS_NAMESPACE,
-				decode: (value) => decodeQuickActionSettings(value)
-			});
-			const mirror = options.settingsScope.describe();
+			const builtins = options.builtinPresets ?? BUILT_IN_PRESETS;
+			const form = options.configForms.get(QUICK_ACTIONS_SETTINGS_NAMESPACE);
+			const mirror = options.configForms.describe();
 			const listeners = /* @__PURE__ */ new Set();
 			let disposed = false;
 			let manager = { open: false };
@@ -916,8 +1028,9 @@ window.__ModuleLoader__.load({
 			/** Serializes this controller's own writes so each plan reads the previous one back. */
 			let tail = Promise.resolve();
 			function derive() {
-				const catalog = readCatalog(catalogScope.getSnapshot(), mirror.getSnapshot());
-				const settings = readSettings(settingsScope.getSnapshot());
+				const snapshot = form.getSnapshot();
+				const catalog = readCatalog(snapshot, mirror.getSnapshot(), builtins);
+				const settings = readSettings(snapshot);
 				const projection = catalog.status === "ready" ? projectQuickActions(settings.status === "ready" ? settings.settings : DEFAULT_QUICK_ACTION_SETTINGS, catalog.catalog) : void 0;
 				const stale = connectionState !== void 0 && connectionState !== "connected";
 				return {
@@ -939,11 +1052,7 @@ window.__ModuleLoader__.load({
 				state = next;
 				for (const listener of Array.from(listeners)) listener();
 			}
-			const stopSources = [
-				mirror.subscribe(publish),
-				catalogScope.subscribe(publish),
-				settingsScope.subscribe(publish)
-			];
+			const stopSources = [mirror.subscribe(publish), form.subscribe(publish)];
 			const stopConnection = options.connection.state.subscribe(() => {
 				connectionState = options.connection.state.getSnapshot();
 				publish();
@@ -973,7 +1082,7 @@ window.__ModuleLoader__.load({
 			* the writer that won.
 			*/
 			function classify(catalog, next, fence) {
-				const snapshot = settingsScope.getSnapshot();
+				const snapshot = form.getSnapshot();
 				const settings = readSettings(snapshot);
 				if (settings.status === "ready" && deepEqualJson(normalizeQuickActionSettings(settings.settings, catalog), next)) return {
 					ok: true,
@@ -1019,10 +1128,10 @@ window.__ModuleLoader__.load({
 							ok: true,
 							changed: false
 						});
-						await settingsScope.mutate(sectionOps(outcome.plan.next), gate.revision);
+						await form.mutate(sectionOps(outcome.plan.next), gate.revision);
 						return settle(classify(gate.catalog, outcome.plan.next, gate.revision));
 					} catch (error) {
-						await mirror.load().catch(() => void 0);
+						await mirror.ensure().catch(() => void 0);
 						return settle({
 							ok: false,
 							failure: {
@@ -1048,7 +1157,7 @@ window.__ModuleLoader__.load({
 				},
 				refresh: async () => {
 					if (disposed) return;
-					await mirror.load();
+					await mirror.ensure();
 				},
 				openManager() {
 					manager = { open: true };
@@ -1576,6 +1685,11 @@ window.__ModuleLoader__.load({
 		* no layout — every width reads as zero. That answers "all of them": showing the
 		* full row and letting the browser's own overflow handle it for one frame is
 		* better than flashing a "more" button that the next frame withdraws.
+		*
+		* A control fits when it overruns the row by less than `FIT_TOLERANCE`. Whenever
+		* the bar is content-sized (spec 22.9) the row it measures is exactly as wide as
+		* the controls it shows, and fractional layout can report that a hair short;
+		* folding a face over the difference would narrow the row and start a cascade.
 		*/
 		function fitActionCount(input) {
 			const { available, widths, reserved, gap } = input;
@@ -1585,7 +1699,7 @@ window.__ModuleLoader__.load({
 			let shown = 0;
 			for (const width of widths) {
 				const next = used + width + (shown === 0 && reserved === 0 ? 0 : gap);
-				if (next > available) break;
+				if (next > available + .5) break;
 				used = next;
 				shown += 1;
 			}
@@ -1781,6 +1895,31 @@ window.__ModuleLoader__.load({
 		* per-Session engine, which owns the single flight and the final re-verification
 		* (spec 9.3, 9.5). The panel never mints a second lock.
 		*/
+		/**
+		* The search field's glyph: the official `IconSearchOutlineRegular` artwork,
+		* drawn here rather than imported. DSH renamed its icon exports between lines
+		* (`IconSearchOutline16` is gone as of 0.1.7) and the shell's seed table serves
+		* only the running line's names, so an imported icon breaks the whole panel the
+		* next time a name moves (spec 22.5). Stroke follows `currentColor`, so it
+		* themes with the field like the official one.
+		*/
+		function SearchIcon() {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("svg", {
+				width: 16,
+				height: 16,
+				viewBox: "0 0 16 16",
+				fill: "none",
+				"aria-hidden": "true",
+				strokeWidth: 1,
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
+					d: "M6.58727 11.8586C9.55061 11.8586 11.9529 9.45637 11.9529 6.49304C11.9529 3.5297 9.55061 1.12744 6.58727 1.12744C3.62394 1.12744 1.22168 3.5297 1.22168 6.49304C1.22168 9.45637 3.62394 11.8586 6.58727 11.8586Z",
+					stroke: "currentColor"
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
+					d: "M10.2991 10.3933L14.7783 14.8725",
+					stroke: "currentColor"
+				})]
+			});
+		}
 		function ActionPanel(props) {
 			const { actions, session, t, labelledBy, onActivate, onClose } = props;
 			const [query, setQuery] = (0, react.useState)("");
@@ -1822,7 +1961,7 @@ window.__ModuleLoader__.load({
 							className: "dsh-cqa-field-label",
 							children: t("panel.search")
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
-							icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, {}),
+							icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SearchIcon, {}),
 							type: "search",
 							value: query,
 							"data-quick-actions-search": "",
@@ -1953,10 +2092,13 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/**
-		* Measure one element's inner width, republishing on every resize. Used twice:
-		* on the whole row for the density rule, and on the action region alone for the
-		* bar's overflow split — the region is `flex: 1 1 auto`, so its width is already
-		* what is left after the controls that must stay visible.
+		* Measure one element's width, republishing on every resize. Used twice: on the
+		* whole row for the density rule, and on the action region alone for the bar's
+		* overflow split — the region is `flex: 1 1 auto`, so its width is already what
+		* is left after the controls that must stay visible.
+		*
+		* Fractional, like the control widths it is compared with: `clientWidth` rounds,
+		* and a region reported a pixel short of the faces it holds folds one of them.
 		*/
 		function useElementWidth() {
 			const ref = (0, react.useRef)(null);
@@ -1965,10 +2107,10 @@ window.__ModuleLoader__.load({
 				const element = ref.current;
 				if (element === null || typeof ResizeObserver === "undefined") return;
 				const observer = new ResizeObserver(() => {
-					setWidth(element.clientWidth);
+					setWidth(element.getBoundingClientRect().width);
 				});
 				observer.observe(element);
-				setWidth(element.clientWidth);
+				setWidth(element.getBoundingClientRect().width);
 				return () => {
 					observer.disconnect();
 				};
@@ -1989,7 +2131,7 @@ window.__ModuleLoader__.load({
 				let changed = false;
 				for (const node of Array.from(fitRef.current?.querySelectorAll("[data-quick-action]") ?? [])) {
 					const key = node.dataset["quickAction"];
-					const value = node.offsetWidth;
+					const value = node.getBoundingClientRect().width;
 					if (key === void 0 || value <= 0 || widths.current.get(key) === value) continue;
 					widths.current.set(key, value);
 					changed = true;
@@ -2060,6 +2202,7 @@ window.__ModuleLoader__.load({
 				className: layout === "bar" ? "dsh-cqa-bar" : layout === "launcher" ? "dsh-cqa-launcher" : "dsh-cqa-ribbon",
 				"data-quick-actions-layout": layout,
 				"data-quick-actions-density": density,
+				"data-quick-actions-overflow": layout === "bar" && overflow.length > 0 ? "" : void 0,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "dsh-cqa-row",
 					ref: rowRef,
@@ -2190,8 +2333,8 @@ window.__ModuleLoader__.load({
 			"feedback.dismiss": "知道了",
 			"catalog.loading": "正在读取快捷动作…",
 			"catalog.unreadable": "无法读取设置，快捷动作暂不可用",
-			"catalog.unavailable": "未找到预置目录",
-			"catalog.undecodable": "预置目录版本过新，无法读取",
+			"catalog.unavailable": "DSH 未向本页面提供快捷动作设置，快捷动作暂不可用",
+			"catalog.undecodable": "预置目录配置无效，快捷动作暂不可用",
 			"catalog.retry": "重试",
 			"crash.title": "快捷动作出错了",
 			"crash.retry": "重新加载",
@@ -2290,8 +2433,8 @@ window.__ModuleLoader__.load({
 				"feedback.dismiss": "Dismiss",
 				"catalog.loading": "Loading Quick Actions…",
 				"catalog.unreadable": "Settings could not be read, so Quick Actions are unavailable",
-				"catalog.unavailable": "No Preset Catalog was published",
-				"catalog.undecodable": "The Preset Catalog is newer than this release can read",
+				"catalog.unavailable": "DSH is not serving Quick Actions settings to this page, so Quick Actions are unavailable",
+				"catalog.undecodable": "The Preset Catalog configuration is invalid, so Quick Actions are unavailable",
 				"catalog.retry": "Retry",
 				"crash.title": "Quick Actions hit an error",
 				"crash.retry": "Reload",
@@ -2931,14 +3074,14 @@ window.__ModuleLoader__.load({
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "dsh-cqa-note-text",
 							children: t(client.catalog.status === "error" ? `catalog.${client.catalog.reason}` : "catalog.loading")
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						}), client.catalog.status === "error" && isRetryableCatalogError(client.catalog.reason) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 							type: "button",
 							className: "dsh-cqa-link",
 							onClick: () => {
 								controller.refresh().catch(() => void 0);
 							},
 							children: t("catalog.retry")
-						})]
+						}) : null]
 					}) : null,
 					readOnlyReason === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "dsh-cqa-note",
@@ -3234,12 +3377,12 @@ window.__ModuleLoader__.load({
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: "dsh-cqa-note-text",
 					children: t(`catalog.${client.catalog.reason}`)
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+				}), isRetryableCatalogError(client.catalog.reason) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 					type: "button",
 					className: "dsh-cqa-link",
 					onClick: onRetry,
 					children: t("catalog.retry")
-				})]
+				}) : null]
 			});
 		}
 		/** Build both Slot entry components over one set of fiber-owned dependencies. */
@@ -3329,20 +3472,24 @@ window.__ModuleLoader__.load({
 		* Colours are DSH alias theme tokens only — nothing here defines a palette, and
 		* nothing overrides a global theme (spec 8.4).
 		*
-		* ## The width rule (spec 8.2)
-		*
-		* The two layouts sit in different boxes, so they reach the same outer edges by
-		* different arithmetic:
-		*
-		* - `.dsh-cqa-ribbon` renders in the composer stack, outside the InputBar, which
-		*   is the element that owns `--dsh-composer-side-clearance` as padding. It
-		*   therefore subtracts that clearance from both sides itself.
-		* - `.dsh-cqa-bar` renders as the InputBar's last child, inside that padding, so
-		*   it is simply `100%` wide.
-		*
-		* Both are then capped at `--dsh-composer-card-max-width` — the same cap the
-		* composer card uses — and centred, so their left and right edges coincide with
-		* the input box exactly rather than approximately.
+		* ## The width rule (spec 8.2, 22.9)
+		*
+		* `.dsh-cqa-ribbon` (and the launcher, in the same box) renders in the composer
+		* stack, outside the InputBar, which is the element that owns
+		* `--dsh-composer-side-clearance` as padding. It therefore subtracts that
+		* clearance from both sides itself, is capped at `--dsh-composer-card-max-width`
+		* — the same cap the composer card uses — and is centred, so its left and right
+		* edges coincide with the input box exactly rather than approximately.
+		*
+		* `.dsh-cqa-bar` makes no such claim. Since DSH 0.1.6-alpha.2 the composer dock is
+		* a row under the card that DSH centres and sizes to its content, shared with
+		* DSH's own stats pills and context meter, so the bar is a content-sized member of
+		* that row (spec 22.9). It only has to stay inside it: `min-width: 0` lets it
+		* shrink when the row reaches the composer's width, which is what hands the
+		* overflow split a smaller region to fold into "more". Once it folds it claims
+		* the card's width (`[data-quick-actions-overflow]`), capped by the row's own
+		* `max-width: 100%`: content-sized, the region the split measures would only be
+		* as wide as what it already shows, and a wider window could never unfold it.
 		*/
 		const TAG_ID = "dsh-quick-actions/surfaces.css";
 		const QUICK_ACTIONS_CSS = `
@@ -3355,9 +3502,12 @@ window.__ModuleLoader__.load({
 }
 .dsh-cqa-bar {
   box-sizing: border-box;
-  width: 100%;
+  min-width: 0;
   max-width: var(--dsh-composer-card-max-width);
-  margin: 0 auto;
+}
+/* Folding: claim the card's width, for the dock row's own max-width to cap. */
+.dsh-cqa-bar[data-quick-actions-overflow] {
+  width: var(--dsh-composer-card-max-width);
 }
 
 .dsh-cqa-row {
@@ -3839,7 +3989,7 @@ window.__ModuleLoader__.load({
 		*/
 		const inject = [
 			"slots",
-			"settingsScope",
+			"configForms",
 			"connection",
 			"locale"
 		];
@@ -3855,7 +4005,7 @@ window.__ModuleLoader__.load({
 		*/
 		function apply(ctx) {
 			const controller = createQuickActionsController({
-				settingsScope: ctx.settingsScope,
+				configForms: ctx.configForms,
 				connection: ctx.connection
 			});
 			const sessions = createQuickActionSessionRegistry();