@ggui-ai/iframe-runtime 0.15.0 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -37,7 +37,7 @@ export { parseMetaFromGlobal, parseMetaFromToolResult, validateMeta, } from './m
37
37
  export type { RendererBootFailureReason, RendererBootFailedMessage, } from './runtime.js';
38
38
  export type { ProtocolError, ProtocolErrorEmitter, BootstrapFailureReason, } from './protocol-error.js';
39
39
  export { defaultProtocolErrorEmitter, fromBootstrapFailure, fromClientContractViolation, fromTransportFailure, fromAuthFailure, fromUpgradeRequired, fromUnknown, } from './protocol-error.js';
40
- export type { ObservabilityEvent, ObservabilityEmitter, ObservabilityMessage, SchemaVersionMismatchEvent, SubscribeFailedEvent, ChannelTransportPickedEvent, ChannelTransportFallbackEvent, ChannelTransportResubscribedEvent, ChannelPollDegradedEvent, ChannelPollRecoveredEvent, UiFeedbackEvent, RelayDeadTapEvent, RelayIncapabilityEvent, RelayLatchTrigger, UnknownObservabilityEvent, } from './observability.js';
40
+ export type { ObservabilityEvent, ObservabilityEmitter, ObservabilityMessage, SchemaVersionMismatchEvent, FontFaceBlockedEvent, AppThemeInvalidEvent, ThemeReinjectFailedEvent, SubscribeFailedEvent, ChannelTransportPickedEvent, ChannelTransportFallbackEvent, ChannelTransportResubscribedEvent, ChannelPollDegradedEvent, ChannelPollRecoveredEvent, UiFeedbackEvent, RelayDeadTapEvent, RelayIncapabilityEvent, RelayLatchTrigger, UnknownObservabilityEvent, } from './observability.js';
41
41
  export { isObservabilityMessage, isRelayDeadTapEvent, isRelayIncapabilityEvent, postObservabilityToParent, } from './observability.js';
42
42
  export type { LifecycleEmitter } from './lifecycle.js';
43
43
  export { postLifecycleToParent, makeLifecycleEvent } from './lifecycle.js';
@@ -50,6 +50,21 @@ export interface McpAppIframeMountOptions {
50
50
  /** Optional locale; defaults to `navigator.language` when
51
51
  * available. */
52
52
  readonly locale?: string;
53
+ /**
54
+ * The color mode this host paints around the card (ggui#987 §4: the
55
+ * embedding host owns runtime mode). Announced as
56
+ * `hostContext.theme`; the card's ladder, overlay and `color-scheme`
57
+ * follow it. Omit to announce nothing — the card falls back to the
58
+ * slice's stamped mode.
59
+ */
60
+ readonly theme?: 'light' | 'dark';
61
+ /**
62
+ * `@font-face` rules the card may install (ggui#987 §5), announced
63
+ * as `hostContext.styles.css.fonts`. The card's CSP decides whether
64
+ * each `src` loads; a refused face is reported back as
65
+ * `font-face-blocked`.
66
+ */
67
+ readonly fonts?: string;
53
68
  }
54
69
  export interface McpAppIframeMount {
55
70
  /** Tear down — posts `ui/resource-teardown` then removes the iframe. */
@@ -113,7 +113,9 @@ export function mountMcpAppIframe(container, opts) {
113
113
  // `hostCapabilities` + `hostContext`; the pre-App draft shape
114
114
  // fails that gate and kills the embedded mount. Adapter
115
115
  // boundary — `hostContext` carries `{locale,
116
- // containerDimensions}` ONLY (no outer ggui render state).
116
+ // containerDimensions}` plus the host's OWN `theme` / fonts
117
+ // when the embedder passed them (ggui#987 §4/§5); never any
118
+ // outer ggui render state.
117
119
  const requestedRaw = req.params?.['protocolVersion'];
118
120
  const requested = typeof requestedRaw === 'string' && requestedRaw.length > 0
119
121
  ? requestedRaw
@@ -133,6 +135,8 @@ export function mountMcpAppIframe(container, opts) {
133
135
  locale: opts.locale ??
134
136
  (typeof navigator !== 'undefined' ? navigator.language : 'en-US'),
135
137
  containerDimensions: dims,
138
+ ...(opts.theme !== undefined ? { theme: opts.theme } : {}),
139
+ ...(opts.fonts !== undefined ? { styles: { css: { fonts: opts.fonts } } } : {}),
136
140
  },
137
141
  };
138
142
  response = { jsonrpc: '2.0', id, result };
@@ -16,6 +16,15 @@ import type { McpAppAiGguiMetaParseResult } from './types.js';
16
16
  * has nothing to mount.
17
17
  */
18
18
  export declare function validateMeta(meta: McpAppAiGguiRenderMeta): McpAppAiGguiMetaParseResult;
19
+ /**
20
+ * The wire parser refused the slice's `theme` (ggui#987 §3.4): report it
21
+ * to the embedding host as `app-theme-invalid` and mount without it. A
22
+ * write door should have refused this upstream — the event is the
23
+ * operator's pointer to the door that did not. Passed as
24
+ * `onInvalidTheme` on every `parseMcpAppAiGguiRenderMeta` call in this
25
+ * package.
26
+ */
27
+ export declare function reportInvalidAppTheme(issues: readonly string[]): void;
19
28
  /**
20
29
  * Parse the render slice from `globalThis.__GGUI_META__` — the
21
30
  * synchronous self-contained shell delivery channel.
@@ -52,6 +52,7 @@
52
52
  */
53
53
  import { PUBLIC_ENV_APP_KEY_RE } from '@ggui-ai/protocol/wire';
54
54
  import { parseMcpAppAiGguiRenderMeta } from '@ggui-ai/protocol/integrations/mcp-apps';
55
+ import { postObservabilityToParent } from './observability.js';
55
56
  /**
56
57
  * Type guard — true iff `value` is a non-null, non-array plain object.
57
58
  */
@@ -323,6 +324,17 @@ export function validateMeta(meta) {
323
324
  return result;
324
325
  return { ok: true, meta: result.meta };
325
326
  }
327
+ /**
328
+ * The wire parser refused the slice's `theme` (ggui#987 §3.4): report it
329
+ * to the embedding host as `app-theme-invalid` and mount without it. A
330
+ * write door should have refused this upstream — the event is the
331
+ * operator's pointer to the door that did not. Passed as
332
+ * `onInvalidTheme` on every `parseMcpAppAiGguiRenderMeta` call in this
333
+ * package.
334
+ */
335
+ export function reportInvalidAppTheme(issues) {
336
+ postObservabilityToParent({ kind: 'app-theme-invalid', issues: [...issues] });
337
+ }
326
338
  /**
327
339
  * Parse the render slice from `globalThis.__GGUI_META__` — the
328
340
  * synchronous self-contained shell delivery channel.
@@ -345,7 +357,7 @@ export function parseMetaFromGlobal() {
345
357
  if (!isPlainObject(raw)) {
346
358
  return { ok: false, reason: 'MALFORMED_BOOTSTRAP' };
347
359
  }
348
- const parsed = parseMcpAppAiGguiRenderMeta(raw);
360
+ const parsed = parseMcpAppAiGguiRenderMeta(raw, { onInvalidTheme: reportInvalidAppTheme });
349
361
  if (!parsed.ok) {
350
362
  return { ok: false, reason: 'MALFORMED_BOOTSTRAP' };
351
363
  }
@@ -396,7 +408,7 @@ export function parseMetaFromToolResult(params) {
396
408
  return { ok: false, reason: 'MISSING_META_GGUI_BOOTSTRAP' };
397
409
  }
398
410
  const meta = topMeta;
399
- const parsed = parseMcpAppAiGguiRenderMeta(meta);
411
+ const parsed = parseMcpAppAiGguiRenderMeta(meta, { onInvalidTheme: reportInvalidAppTheme });
400
412
  if (!parsed.ok) {
401
413
  return { ok: false, reason: 'MALFORMED_BOOTSTRAP' };
402
414
  }
@@ -33,7 +33,7 @@ import { MCP_APP_OBSERVE_TYPE } from '@ggui-ai/protocol/integrations/mcp-apps';
33
33
  *
34
34
  * @public
35
35
  */
36
- export type ObservabilityEvent = SchemaVersionMismatchEvent | SubscribeFailedEvent | ChannelTransportPickedEvent | ChannelTransportFallbackEvent | ChannelTransportResubscribedEvent | ChannelPollDegradedEvent | ChannelPollRecoveredEvent | UiFeedbackEvent | RelayIncapabilityEvent | RelayDeadTapEvent | UnknownObservabilityEvent;
36
+ export type ObservabilityEvent = SchemaVersionMismatchEvent | FontFaceBlockedEvent | AppThemeInvalidEvent | ThemeReinjectFailedEvent | SubscribeFailedEvent | ChannelTransportPickedEvent | ChannelTransportFallbackEvent | ChannelTransportResubscribedEvent | ChannelPollDegradedEvent | ChannelPollRecoveredEvent | UiFeedbackEvent | RelayIncapabilityEvent | RelayDeadTapEvent | UnknownObservabilityEvent;
37
37
  /**
38
38
  * Fired when the protocol-version handshake rejects the connection.
39
39
  * Parallel to `UpgradeRequiredError` — the host can choose to render
@@ -303,6 +303,46 @@ export interface RelayDeadTapEvent {
303
303
  *
304
304
  * @public
305
305
  */
306
+ /**
307
+ * A host-delivered `@font-face` src the document's CSP refused
308
+ * (ggui#987 §5): the card installed the host's `styles.css.fonts`, the
309
+ * browser blocked the fetch under `font-src`, and the family will fall
310
+ * back to its stack. Reported ONCE per (family, host) per document —
311
+ * the operator's signal that the shell's `font-src` allowlist and the
312
+ * host's font origin disagree.
313
+ *
314
+ * @public
315
+ */
316
+ export interface FontFaceBlockedEvent {
317
+ readonly kind: 'font-face-blocked';
318
+ /** The `font-family` the refused `@font-face` block declared. */
319
+ readonly family: string;
320
+ /** Host of the blocked `src` URL (`blockedURI`, origin-stripped by CSP). */
321
+ readonly host: string;
322
+ }
323
+ /**
324
+ * The render slice carried a `theme` the wire schema refused (ggui#987
325
+ * §3.4): the parser dropped it and the card painted the compiled ladder
326
+ * alone. `issues` are the schema's own messages — the operator's
327
+ * pointer to what the write door should have refused.
328
+ *
329
+ * @public
330
+ */
331
+ export interface AppThemeInvalidEvent {
332
+ readonly kind: 'app-theme-invalid';
333
+ readonly issues: readonly string[];
334
+ }
335
+ /**
336
+ * The live re-injection on a host theme flip (ggui#987 §4) failed: the
337
+ * renderer's update rejected, so the card kept its previous overlay /
338
+ * ladder / `color-scheme`. `message` is the rejection's.
339
+ *
340
+ * @public
341
+ */
342
+ export interface ThemeReinjectFailedEvent {
343
+ readonly kind: 'theme-reinject-failed';
344
+ readonly message: string;
345
+ }
306
346
  export interface UnknownObservabilityEvent {
307
347
  readonly kind: string & {};
308
348
  readonly [field: string]: unknown;
@@ -63,44 +63,26 @@ export interface ReactRootMountOptions {
63
63
  */
64
64
  readonly themeMode?: 'light' | 'dark';
65
65
  /**
66
- * Per-app theme overlay — a partial set of `--ggui-*` values; unset
67
- * vars keep their token defaults. Merged INTO the scoped in-body
68
- * token block after the base block (and after `hostPalette`), which
69
- * is the only placement that can recolor tree content: a `:root`-only
70
- * append is cascade-dead for components — the scoped block sits later
71
- * in document order and re-specifies every token (browser-verified,
72
- * see the scoped-merge comment in `renderTree`). The `:root` append
73
- * still happens, but for body chrome only. A structural subset of
74
- * protocol's `AppTheme` (`name` is display-only, not needed at
75
- * render). `mode` drives `color-scheme` so native controls /
76
- * scrollbars / canvas pick up dark vs light.
66
+ * The per-app theme (protocol's `AppTheme`, ggui#987 v2): BOTH modes'
67
+ * derived `--ggui-*` projections (`overlays.light` / `overlays.dark`),
68
+ * optional mode-agnostic `cssVariables`, per-mode `keyframes`, and
69
+ * the `frameless` flag. The renderer injects the overlay for the
70
+ * EFFECTIVE mode (`themeMode`, host-owned per §4; absent ⇒ light) —
71
+ * a mode switch re-paints from the retained other set with no
72
+ * network activity. Merged INTO the scoped in-body token block, the
73
+ * only placement that can recolor tree content (a `:root`-only
74
+ * append is cascade-dead for components — the scoped block sits
75
+ * later in document order and re-specifies every token; browser-
76
+ * verified, see the scoped-merge comment in `renderTree`). The
77
+ * `:root` append still happens, for body chrome only.
77
78
  *
78
- * Precedence (ggui#573 ruling): base tokens < `hostPalette` <
79
- * `appTheme` < `cssOverrides` — the slice's stamped theme always
80
- * wins; the host palette is the fallback layer beneath it.
79
+ * Injection order (§3.3), one document-order cascade:
80
+ * compiled ladder (`themeId` ?? default) < `hostPalette` <
81
+ * `overlays[mode]` < `cssVariables` < `cssOverrides`, then
82
+ * `keyframes[mode]` and the frameless rule. Values are injection-
83
+ * safe by the wire schema — never re-validated here.
81
84
  */
82
- readonly appTheme?: {
83
- readonly mode: 'light' | 'dark';
84
- readonly cssVariables: Record<string, string>;
85
- /**
86
- * The REGISTERED base ladder, delivered over the wire (ggui#598-C
87
- * runtime theme registration — see protocol's `appThemeSchema`).
88
- * BOTH modes' resolved variable sets ride the envelope; when
89
- * present, the mode-selected set REPLACES the compiled ladder
90
- * block (`getScopedThemeCss`/`getScopedCssTokens`) at the base
91
- * position of the #573 precedence above — delivery changes WHERE
92
- * the ladder's bytes come from, never WHICH layer wins. Mode
93
- * selection reuses the mount's already-resolved `themeMode` (one
94
- * projection — no second mode resolution here), and a mode switch
95
- * re-paints from the retained other set with no network activity.
96
- * Values are injection-safe by the wire schema — never
97
- * re-validated here; serialization is key-sorted for byte-stable
98
- * output. `documentHash` is the registration's identity (joins a
99
- * painted ladder to its registration record); the renderer
100
- * carries it but exposes no observability surface for it today.
101
- */
102
- readonly base?: NonNullable<AppTheme['base']>;
103
- };
85
+ readonly appTheme?: AppTheme;
104
86
  /**
105
87
  * Host-announced palette, already translated onto `--ggui-*` tokens
106
88
  * (see `host-palette-bridge.ts` — the spec `--color-*` vocabulary
@@ -31,7 +31,7 @@
31
31
  */
32
32
  import React, { Component, createElement, Fragment, } from 'react';
33
33
  import { createRoot } from 'react-dom/client';
34
- import { stripMarkers, rewriteImports, getScopedThemeCss, getScopedCssTokens, assembleDeliveredThemeCss, getThemeCss, getCssTokens, } from '@ggui-ai/design/rendering';
34
+ import { stripMarkers, rewriteImports, getScopedThemeCss, getScopedCssTokens, framelessSuppressionRule, getThemeCss, getCssTokens, } from '@ggui-ai/design/rendering';
35
35
  import { hoistImports, loadModule, loadModuleInline, probeUrlModuleLoad, } from '@ggui-ai/design/module-loader';
36
36
  /**
37
37
  * Document-lifetime verdict: URL-scheme module loading (`blob:` main
@@ -109,7 +109,7 @@ class RcrErrorBoundary extends Component {
109
109
  // The two fallback UIs match the host-SDK error boundary
110
110
  // verbatim (same inline styles so operator-visible DOM is
111
111
  // identical between the host-SDK and iframe-renderer paths).
112
- // Colors inherit the themed body (`--ggui-color-onSurface`) with
112
+ // Colors inherit the themed body (`--ggui-color-onContainer`) with
113
113
  // opacity for hierarchy — hardcoded white-alpha text was
114
114
  // illegible on light shells (#481); the boundary must stay
115
115
  // readable on WHATEVER background the theme painted, including
@@ -126,7 +126,7 @@ class RcrErrorBoundary extends Component {
126
126
  gap: 8,
127
127
  fontFamily: FONT,
128
128
  fontSize: 13,
129
- color: 'var(--ggui-color-onSurface, inherit)',
129
+ color: 'var(--ggui-color-onContainer, inherit)',
130
130
  opacity: 0.6,
131
131
  },
132
132
  }, createElement('div', {
@@ -151,7 +151,7 @@ class RcrErrorBoundary extends Component {
151
151
  gap: 12,
152
152
  textAlign: 'center',
153
153
  fontFamily: FONT,
154
- color: 'var(--ggui-color-onSurface, inherit)',
154
+ color: 'var(--ggui-color-onContainer, inherit)',
155
155
  },
156
156
  }, createElement('div', {
157
157
  style: {
@@ -314,33 +314,15 @@ export async function mountReactRoot(container, opts) {
314
314
  }
315
315
  }
316
316
  function renderTree(opts) {
317
- // Delivered base ladder (ggui#598-C): when the slice theme carries
318
- // `base`, the mode-selected set REPLACES the compiled ladder block
319
- // at the base position — same precedence slot, different byte
320
- // source. Mode selection reuses the already-resolved `themeMode`
321
- // (one projection; absent means light — the same default
322
- // `getScopedThemeCss` applies). Both sets stay retained on the
323
- // options, so a mode-switch re-render picks the other ladder from
324
- // memory — never the network.
325
- const deliveredBase = opts.appTheme?.base;
326
- let themeCss = deliveredBase !== undefined
327
- ? // Design-package assembler (ggui#598-C, injection-review flag 1):
328
- // the delivered ladder gets the SAME scaffolding the compiled
329
- // ladder gets — base inherits, derived gradient/effect tokens
330
- // (color-mix fallback split), box-sizing, font-inherit — from
331
- // ONE shared builder, so the two paths cannot drift.
332
- assembleDeliveredThemeCss(scopeClass, opts.themeMode === 'dark' ? deliveredBase.dark : deliveredBase.light, {
333
- // ggui#613 residual 2 — the two former v1 deltas ride:
334
- // the active mode's keyframes block + the frameless
335
- // silhouette suppression, both same-rule as compiled.
336
- keyframes: opts.themeMode === 'dark'
337
- ? deliveredBase.keyframes?.dark
338
- : deliveredBase.keyframes?.light,
339
- frameless: deliveredBase.frameless,
340
- })
341
- : opts.themeId
342
- ? getScopedThemeCss(opts.themeId, scopeClass, opts.themeMode)
343
- : getScopedCssTokens(scopeClass, opts.themeMode);
317
+ // The effective mode (ggui#987 §4: the host owns it; the runtime
318
+ // resolves it ONCE into `themeMode`). Absent means no opinion
319
+ // anywhere — the light ladder paints, and every mode-keyed layer
320
+ // below selects with the same `m`, so the ladder, the overlay, the
321
+ // keyframes and `color-scheme` can never disagree.
322
+ const m = opts.themeMode ?? 'light';
323
+ let themeCss = opts.themeId
324
+ ? getScopedThemeCss(opts.themeId, scopeClass, m)
325
+ : getScopedCssTokens(scopeClass, m);
344
326
  if (opts.hostPalette) {
345
327
  // Host palette = the fallback layer (ggui#572, #573 ruling):
346
328
  // after the base scoped block so it can repaint at all (the base
@@ -349,22 +331,35 @@ export async function mountReactRoot(container, opts) {
349
331
  // arrive pre-sanitized from the host-palette bridge.
350
332
  themeCss += `.${scopeClass}{${toCssDecls(opts.hostPalette)}}`;
351
333
  }
352
- if (opts.appTheme) {
353
- const decls = toCssDecls(opts.appTheme.cssVariables);
354
- // The overlay must be merged HERE, into the scoped style that
355
- // mounts INSIDE the scope div — the `:root` append below is
356
- // cascade-dead for tree content: the in-scope block sits later
357
- // in document order than anything in `<head>`, so at equal
358
- // specificity the base scoped tokens always win over a head-level
359
- // override (browser-verified in rnd/gen-ui/beauty/experiments/001,
360
- // the probe sequence that found this). Appended AFTER the base
361
- // block + host palette and BEFORE `cssOverrides`, so: base <
362
- // host palette < operator overlay < explicit overrides
363
- // (ggui#573: slice wins, host fallback). Values validated
364
- // injection-safe upstream (same guarantee the `:root` append
365
- // cites).
366
- themeCss += `.${scopeClass}{${decls}}`;
367
- }
334
+ // The per-app theme's two variable layers, in this order: the
335
+ // derived projection for the effective mode, then the mode-agnostic
336
+ // `cssVariables` above it. Both must be merged HERE, into the
337
+ // scoped style that mounts INSIDE the scope div — the `:root`
338
+ // append below is cascade-dead for tree content: the in-scope block
339
+ // sits later in document order than anything in `<head>`, so at
340
+ // equal specificity the base scoped tokens always win over a head-
341
+ // level override (browser-verified in rnd/gen-ui/beauty/
342
+ // experiments/001, the probe sequence that found this). Appended
343
+ // AFTER the base block + host palette and BEFORE `cssOverrides`:
344
+ // compiled < host palette < overlays[m] < cssVariables < overrides
345
+ // (ggui#573: slice wins, host fallback). Values validated
346
+ // injection-safe upstream (same guarantee the `:root` append cites).
347
+ const appVarBlocks = opts.appTheme
348
+ ? [opts.appTheme.overlays[m], opts.appTheme.cssVariables]
349
+ .filter((vars) => vars !== undefined)
350
+ .map((vars) => `.${scopeClass}{${toCssDecls(vars)}}`)
351
+ .join('')
352
+ : '';
353
+ themeCss += appVarBlocks;
354
+ // Trailing rules (§3.3): the effective mode's `@keyframes` block and
355
+ // the frameless silhouette suppression — the SAME rule text the
356
+ // compiled path emits for `$metadata.frameless` — after
357
+ // `cssOverrides`, so an override can never be shadowed by them.
358
+ // Keyframes ride VERBATIM: their admission is the write door's
359
+ // (`appThemeSchema.keyframes`), not re-checked here.
360
+ const appTrailingCss = opts.appTheme
361
+ ? `${opts.appTheme.keyframes?.[m] ?? ''}${opts.appTheme.frameless === true ? framelessSuppressionRule(scopeClass) : ''}`
362
+ : '';
368
363
  // Also inject theme CSS at `:root` on `document.head`. The scoped
369
364
  // injection above isolates token resolution to the React tree, but
370
365
  // the embedding shell's body styles (font-family, color, background)
@@ -375,17 +370,10 @@ export async function mountReactRoot(container, opts) {
375
370
  // `ThemeProvider` so a Studio/Portal context with both runtime + RP
376
371
  // active doesn't double-stack.
377
372
  if (typeof document !== 'undefined') {
378
- // ggui#613 residual 5: under a DELIVERED base the body-chrome
379
- // ladder is the delivered set too — mirroring the scoped ternary
380
- // above — so the standalone viewer's body chrome and its tree
381
- // content resolve the same values. Pre-fix this started from the
382
- // compiled/default ladder regardless, and body chrome painted the
383
- // default brand under a registered theme.
384
- let rootCss = deliveredBase !== undefined
385
- ? `:root{${toCssDecls(opts.themeMode === 'dark' ? deliveredBase.dark : deliveredBase.light)}}`
386
- : opts.themeId
387
- ? getThemeCss(opts.themeId, opts.themeMode)
388
- : getCssTokens(opts.themeMode);
373
+ // Same ladder, same mode as the scoped block above — the
374
+ // standalone viewer's body chrome and its tree content resolve
375
+ // the same values.
376
+ let rootCss = opts.themeId ? getThemeCss(opts.themeId, m) : getCssTokens(m);
389
377
  if (opts.hostPalette) {
390
378
  // BODY-CHROME ONLY, same as the appTheme `:root` append below —
391
379
  // and beneath it, mirroring the scoped-block order (#573:
@@ -393,19 +381,23 @@ export async function mountReactRoot(container, opts) {
393
381
  // body font/color/background coherent with the tree.
394
382
  rootCss += `:root{${toCssDecls(opts.hostPalette)}}`;
395
383
  }
396
- if (opts.appTheme) {
397
- const decls = toCssDecls(opts.appTheme.cssVariables);
398
- // BODY-CHROME ONLY. This `:root` append themes the embedding
399
- // shell's body styles (font/color/background outside the scope
400
- // div). It does NOT reach tree content — the scoped in-body
401
- // token block wins by document order (see the scoped merge in
402
- // `renderTree`, and rnd/gen-ui/beauty/experiments/001 for the
403
- // probe that falsified the old "inherits into the tree" claim).
404
- // Values were validated injection-safe upstream (write-side
405
- // `appThemeSchema` + the wire parser re-validates), so the
406
- // string-join here is safe — do NOT re-sanitize.
407
- rootCss += `:root{color-scheme:${opts.appTheme.mode};${decls}}`;
408
- }
384
+ // BODY-CHROME ONLY. `color-scheme` follows the effective mode so
385
+ // native controls / scrollbars / canvas agree with the ladder
386
+ // painted; the app theme's two variable layers ride the same
387
+ // block, in the scoped order. None of this reaches tree content —
388
+ // the scoped in-body token block wins by document order (see the
389
+ // scoped merge above, and rnd/gen-ui/beauty/experiments/001 for
390
+ // the probe that falsified the old "inherits into the tree"
391
+ // claim). Values were validated injection-safe upstream (write-
392
+ // side `appThemeSchema` + the wire parser re-validates), so the
393
+ // string-join here is safe — do NOT re-sanitize.
394
+ const rootAppDecls = opts.appTheme
395
+ ? [opts.appTheme.overlays[m], opts.appTheme.cssVariables]
396
+ .filter((vars) => vars !== undefined)
397
+ .map(toCssDecls)
398
+ .join('')
399
+ : '';
400
+ rootCss += `:root{color-scheme:${m};${rootAppDecls}}`;
409
401
  const styleId = 'ggui-theme-vars';
410
402
  let styleEl = document.getElementById(styleId);
411
403
  if (!styleEl) {
@@ -426,7 +418,7 @@ export async function mountReactRoot(container, opts) {
426
418
  // The scope `<div>` + inline `<style>` + error-boundary-wrapped
427
419
  // children match RCR L376–383. `key={currentCode?.length}` mirrors
428
420
  // RCR's "reset boundary when code changes" heuristic.
429
- root.render(createElement('div', { className: scopeClass }, createElement('style', null, `${themeCss}${opts.cssOverrides ?? ''}`), createElement(RcrErrorBoundary, {
421
+ root.render(createElement('div', { className: scopeClass }, createElement('style', null, `${themeCss}${opts.cssOverrides ?? ''}${appTrailingCss}`), createElement(RcrErrorBoundary, {
430
422
  key: currentCode?.length ?? 0,
431
423
  ...(opts.onError ? { onError: opts.onError } : {}),
432
424
  }, createElement(Fragment, null, wrapped))));
@@ -47,20 +47,13 @@ export interface RenderItemOptions {
47
47
  */
48
48
  readonly themeMode?: 'light' | 'dark';
49
49
  /**
50
- * Per-app theme overlay forwarded to {@link ReactRootMountOptions.appTheme}
51
- * so the renderer injects the `--ggui-*` overrides + `color-scheme` at
52
- * `:root`. Sourced from the bootstrap's `_meta["ai.ggui/render"].theme`.
53
- * A structural subset of protocol's `AppTheme` (`name` is display-only).
54
- * `base` is the delivered registered ladder (ggui#598-C) — forwarded
55
- * verbatim; the renderer injects the mode-selected set in place of
56
- * the compiled ladder block (see
57
- * {@link ReactRootMountOptions.appTheme}).
50
+ * The per-app theme (protocol's `AppTheme`, ggui#987 v2) forwarded
51
+ * verbatim to {@link ReactRootMountOptions.appTheme}: the renderer
52
+ * injects the overlay for the effective `themeMode` into the scoped
53
+ * block and at `:root`. Sourced from the bootstrap's
54
+ * `_meta["ai.ggui/render"].theme`.
58
55
  */
59
- readonly appTheme?: {
60
- readonly mode: 'light' | 'dark';
61
- readonly cssVariables: Record<string, string>;
62
- readonly base?: NonNullable<AppTheme['base']>;
63
- };
56
+ readonly appTheme?: AppTheme;
64
57
  /**
65
58
  * Host-announced palette, pre-mapped onto `--ggui-*` tokens by the
66
59
  * host-palette bridge. Forwarded to
package/dist/runtime.d.ts CHANGED
@@ -97,36 +97,32 @@ export declare function setCurrentApp(app: App): void;
97
97
  * `color-scheme` via `applyDocumentTheme` — nothing in the token
98
98
  * pipeline keys off it, so a dark host painted the light ladder
99
99
  * (host-fit 46.0 vs 87.7 with the dark ladder, probe `cc728a8eb`).
100
- * `buildOpts` consumes this ONLY when the slice stamps no `themeMode`:
101
- * every operator layer (live provider > per-render override > app
102
- * default > server default) still wins by being stamped; the host
103
- * fills the gap where no operator had an opinion.
100
+ * Under ggui#987 §4 the embedding host OWNS runtime mode: when it
101
+ * announces one, `buildOpts` paints it over every stamped opinion; the
102
+ * stamped layers decide only when the host is silent. Read live from
103
+ * the App's pre-merged hostContext, so a `hostcontextchanged` flip
104
+ * re-resolves on the next `buildOpts`.
104
105
  *
105
106
  * @internal — exported for unit tests (`setCurrentApp` injects the
106
107
  * App); production caller is `buildOpts` inside `bootSequence`.
107
108
  */
108
109
  export declare function hostAnnouncedThemeMode(): 'light' | 'dark' | undefined;
109
110
  /**
110
- * Resolve the mount's base-stylesheet color mode from the slice, with
111
- * the host as the final fallback (ggui#589, completing the ggui#551
112
- * precedence ruling — "slice wins, host is the fallback, absent ≠
113
- * light"):
111
+ * Resolve the mount's color mode (ggui#987 §4 — the embedding host owns
112
+ * runtime mode; the app theme's `mode` is a DEFAULT, never a pin):
114
113
  *
115
- * stamped `themeMode` > `theme.mode` (the slice theme OBJECT) >
116
- * host-announced theme > undefined
114
+ * host-announced theme > stamped `themeMode` > `theme.mode`
115
+ * (the app theme's default) > undefined
117
116
  *
118
- * The middle leg is the ggui#589 fix: a render envelope carrying a
119
- * per-app theme (`theme: {mode, cssVariables}`) but no top-level
120
- * `themeMode` is still a slice-stamped mode opinion — before this,
121
- * the base token ladder ignored it and painted the LIGHT token set
122
- * under a dark overlay whenever the host (correctly, per the
123
- * adapter-boundary doctrine in the native host helpers) announced no
124
- * `hostContext.theme`: a light skeleton in a dark skin. The theme
125
- * object's own `mode` already drove `color-scheme`; now it also
126
- * selects the ladder.
117
+ * A card that ignored the host's announced mode painted a light
118
+ * skeleton inside a dark chat — the host's word is what the user
119
+ * actually sees around the card. The stamped layers (live provider >
120
+ * per-render override > app default > server default) decide only when
121
+ * the host is silent, which is the adapter-boundary case (a host
122
+ * helper that announces no `hostContext.theme`).
127
123
  *
128
124
  * `undefined` still means "no opinion anywhere" — the renderer's
129
- * default applies; never coerced to `'light'`.
125
+ * default applies; never coerced to `'light'` here (ggui#551).
130
126
  *
131
127
  * @internal — exported for unit tests; production caller is
132
128
  * `buildOpts` inside `bootSequence`.
@@ -134,36 +130,24 @@ export declare function hostAnnouncedThemeMode(): 'light' | 'dark' | undefined;
134
130
  export declare function resolveMountThemeMode(meta: {
135
131
  readonly themeMode?: 'light' | 'dark';
136
132
  readonly theme?: {
137
- readonly mode: 'light' | 'dark';
138
- readonly cssVariables?: Record<string, string>;
133
+ readonly mode?: 'light' | 'dark';
139
134
  };
140
135
  }): 'light' | 'dark' | undefined;
141
136
  /**
142
- * Resolve the mount's base-theme id from the slice (ggui#589 ask 3):
137
+ * Resolve the mount's compiled-ladder id from the slice (ggui#987 D2):
143
138
  *
144
- * stamped `themeId` > `theme.name` (the slice theme OBJECT's name)
145
- * > undefined (renderer default ladder)
139
+ * stamped `themeId` > undefined (renderer default ladder)
146
140
  *
147
- * The name leg makes a slice theme whose `name` matches a REGISTERED
148
- * theme id select that theme as the BASE token ladder — the overlay's
149
- * cssVariables still apply above it, so the base carries the full
150
- * brand ramp coverage a sparse overlay cannot (the "only the mapped
151
- * vars carry brand" store-frame class). An unregistered name is
152
- * harmless by construction: `getScopedThemeCss` falls back to the
153
- * default theme, which is byte-identical to the no-themeId path
154
- * (`getScopedCssTokens` ≡ `getScopedThemeCss(default)`), so a slice
155
- * naming its theme "My Custom" renders exactly as before.
141
+ * The app theme's `name` is a LABEL the author's tooling reads back —
142
+ * it never selects a ladder. An app theme carries its own full
143
+ * projection (`overlays`, exactly the manifest minus the floor), so
144
+ * there is no coverage gap for a compiled theme to fill beneath it.
156
145
  *
157
146
  * @internal — exported for unit tests; production caller is
158
147
  * `buildOpts` inside `bootSequence`.
159
148
  */
160
149
  export declare function resolveMountThemeId(meta: {
161
150
  readonly themeId?: string;
162
- readonly theme?: {
163
- readonly name?: string;
164
- readonly mode?: 'light' | 'dark';
165
- readonly cssVariables?: Record<string, string>;
166
- };
167
151
  }): string | undefined;
168
152
  /**
169
153
  * The host's announced palette, read from the connected App's