@forgeax/engine-app 0.1.3 → 0.1.6

package/dist/index.mjs

@@ -1,20 +1,20 @@
 import { Update, World, createWorldContext, componentDefinition } from '@forgeax/engine-ecs';
 export { Context } from '@forgeax/engine-plugin';
-import * as engineRuntimeModule from '@forgeax/engine-runtime';
-import { defaultAssetDecoderContributions, createRenderer, EngineEnvironmentError } from '@forgeax/engine-runtime';
-import { err, ok } from '@forgeax/engine-types';
-import { createAssetRegistry, createCatalogSource } from '@forgeax/engine-assets-runtime';
-import { getAssetRegistryResolver } from '@forgeax/engine-assets-runtime/internal';
-import { loadRhiPack, createDebugDrawOnReady, releaseDebugDraw } from '@forgeax/engine-render/internal';
+export { createFullscreenRenderFeature } from '@forgeax/engine-render/authoring';
+import { Camera, perspective, renderComponentsPlugin, CAMERA_PROJECTION_PERSPECTIVE } from '@forgeax/engine-render';
 import { RhiError } from '@forgeax/engine-rhi';
-import { Camera, perspective, ownedRendererPlugin, renderComponentsPlugin, rendererPlugin, CAMERA_PROJECTION_PERSPECTIVE } from '@forgeax/engine-render';
+import { attachRecorder, decodeTape, openReplay, decodeToRgba8, buildTapeIndex, createRhiDebugError } from '@forgeax/engine-rhi-debug';
+import * as engineRuntimeModule from '@forgeax/engine-runtime';
+import { EngineEnvironmentError } from '@forgeax/engine-runtime';
+import { loadRhiPack, constructRuntimeRendererHost } from '@forgeax/engine-runtime/internal/renderer-host';
+import { ok, err } from '@forgeax/engine-types';
 import { createHostAudioConsumer } from '@forgeax/engine-audio-webaudio';
 import { INPUT_BACKEND_KEY, InputSet, InputFrameStartScan, attachBrowserInputBackend, inputBackendPlugin, ownedInputBackendPlugin, INPUT_MAP_KEY } from '@forgeax/engine-input';
 import { componentSchema } from '@forgeax/engine-ecs/internal';
 import { animationPayloadsPlugin, animationRuntimePlugin } from '@forgeax/engine-animation';
 import { Transform, scenePlugin } from '@forgeax/engine-scene';
 import { statePlugin } from '@forgeax/engine-state';
-import { decodeTape, openReplay, decodeToRgba8, attachRecorder, buildTapeIndex, createRhiDebugError } from '@forgeax/engine-rhi-debug';
+import { createDebugDraw } from '@forgeax/engine-debug-draw';
 import { createProfiler } from '@forgeax/engine-profiler';
 import { isSerializableValue, createPreviewArtifactManifest, validatePreviewArtifactManifest, createArtifactRef, snapshotStaleError } from '@forgeax/engine-tool-runtime';
 
@@ -96,10 +96,7 @@ function serializeError(error) {
 }
 async function installBrowserRemoteBridge(deps) {
   const { world, renderer, assets, rhiCapture, profiler, execution, port } = deps;
-  const mod = await import(
-    /* @vite-ignore */
-    '@forgeax/engine-remote/execute'
-  );
+  const mod = await import('@forgeax/engine-remote/execute');
   const executeScript = mod.executeScript;
   const importModule = createEcsImportModule((specifier) => {
     if (specifier === "@forgeax/engine-runtime")
@@ -219,66 +216,11 @@ var init_browser_remote_bridge = __esm({
     init_ecs_import();
   }
 });
-function assembleAssetRuntime(registry, contributions) {
-  const leases = [];
-  const overrides = new Set(contributions.map((contribution) => contribution.kind.kind));
-  const defaults = defaultAssetDecoderContributions ?? [];
-  const assembledContributions = [
-    ...defaults.filter((contribution) => !overrides.has(contribution.kind.kind)),
-    ...contributions
-  ];
-  try {
-    const installedKinds = /* @__PURE__ */ new Set();
-    for (const contribution of assembledContributions) {
-      if (installedKinds.has(contribution.kind.kind)) {
-        throw new TypeError(`duplicate decoder kind "${contribution.kind.kind}"`);
-      }
-      installedKinds.add(contribution.kind.kind);
-      leases.push(
-        registry.installDecoder(
-          contribution.kind,
-          contribution.decoder
-        )
-      );
-    }
-  } catch (cause) {
-    for (const lease of leases) lease.dispose();
-    const failed = assembledContributions[leases.length];
-    return err({
-      code: "asset-assembly-failed",
-      expected: "each owner decoder contribution to install exactly once in the realm registry",
-      hint: "remove the conflicting owner contribution and assemble the current realm again",
-      detail: { kind: failed?.kind.kind ?? "unknown", cause }
-    });
-  }
-  let disposed = false;
-  return ok({
-    registry,
-    leases: Object.freeze([...leases]),
-    dispose() {
-      if (disposed) return;
-      disposed = true;
-      for (const lease of leases) lease.dispose();
-    }
-  });
-}
 
 // src/animation-asset-lookup.ts
 function createAnimationPayloadLookup(source) {
   return (guid) => source?.lookup(guid);
 }
-function syncCameraAspect(world, canvasW, canvasH) {
-  if (canvasW <= 0 || canvasH <= 0) return;
-  const aspect = canvasW / canvasH;
-  const query = world.query({ with: [Camera] }).unwrap();
-  for (const row of query) {
-    const camera = world.get(row.entity, Camera);
-    if (!camera.ok) continue;
-    if (camera.value.autoAspect !== true) continue;
-    if (camera.value.projection !== CAMERA_PROJECTION_PERSPECTIVE) continue;
-    world.set(row.entity, Camera, { aspect });
-  }
-}
 
 // src/errors.ts
 function summarizeCause(cause) {
@@ -341,10 +283,6 @@ var appErrorPolicy = {
     expected: "canvas.isConnected === true at createApp(canvas) entry",
     hint: "append the canvas to the document tree before calling createApp(canvas), or use the assemble entry createApp({ renderer, world }) when the host already manages canvas lifetime"
   },
-  "app-invalid-canvas-pixel-ratio": {
-    expected: "maxCanvasPixelRatio is finite and greater than 0",
-    hint: "omit maxCanvasPixelRatio to keep the device pixel ratio, or pass a finite value > 0 from the Host policy"
-  },
   "app-frame-step-invalid": {
     expected: "stepFrame(deltaSeconds) runs only while the App is paused and deltaSeconds is finite and non-negative",
     hint: "pause the App before deterministic stepping and pass an explicit finite delta; resume after the bounded step sequence completes"
@@ -740,20 +678,17 @@ function createLocalExecutionControl(initial, providers = {}) {
       world: providers.world?.() ?? current.world,
       audio: executionAudioReport(providers.audio?.())
     }),
-    rebuild: async () => {
-      if (providers.rebuild !== void 0) return providers.rebuild();
-      return err(
-        new AppError({
-          code: "app-execution-rebuild-failed",
-          expected: APP_EXPECTED["app-execution-rebuild-failed"],
-          hint: APP_ERROR_HINTS["app-execution-rebuild-failed"],
-          detail: {
-            worldIdentity: current.world.identity,
-            cause: new Error("This local assembly has no bootstrap module.")
-          }
-        })
-      );
-    }
+    rebuild: async () => err(
+      new AppError({
+        code: "app-execution-rebuild-failed",
+        expected: APP_EXPECTED["app-execution-rebuild-failed"],
+        hint: APP_ERROR_HINTS["app-execution-rebuild-failed"],
+        detail: {
+          worldIdentity: current.world.identity,
+          cause: new Error("This local assembly has no bootstrap module.")
+        }
+      })
+    )
   };
 }
 var ENGINE_WORKER_CAPABILITIES = [
@@ -828,6 +763,25 @@ function selectExecutionTier(input) {
     sharedEvidencePassed: input.sharedEvidencePassed
   });
 }
+function normalizeExecutionBootstrapUrl(bootstrap) {
+  const moduleUrl = typeof bootstrap === "string" ? bootstrap : bootstrap.href;
+  try {
+    return ok(new URL(bootstrap, globalThis.location?.href).href);
+  } catch (cause) {
+    return err(
+      new AppError({
+        code: "app-execution-bootstrap-failed",
+        expected: APP_EXPECTED["app-execution-bootstrap-failed"],
+        hint: APP_ERROR_HINTS["app-execution-bootstrap-failed"],
+        detail: {
+          phase: "prepare",
+          moduleUrl,
+          cause: cause instanceof TypeError ? cause : new TypeError(String(cause))
+        }
+      })
+    );
+  }
+}
 
 // src/internal/error-fanout.ts
 var ErrorFanoutRegistry = class {
@@ -977,6 +931,7 @@ async function startEngineWorker(options) {
     bootstrapUrl: options.bootstrapUrl,
     ...options.bootstrapData === void 0 ? {} : { bootstrapData: options.bootstrapData },
     ...options.bootstrapPort === void 0 ? {} : { bootstrapPort: options.bootstrapPort },
+    ...options.assetCatalog === void 0 ? {} : { assetCatalog: options.assetCatalog },
     ...options.shaderManifestUrl !== void 0 ? { shaderManifestUrl: options.shaderManifestUrl } : {},
     ...options.time !== void 0 ? { time: options.time } : {},
     tier: options.tier
@@ -1047,7 +1002,7 @@ var FrameCreditLedger = class {
   nextFrameId = 1;
   inFlight = null;
   completed = 0;
-  issue(deltaSeconds, sampleInput, canvasSize) {
+  issue(deltaSeconds, sampleInput, canvasSize = { width: 0, height: 0 }) {
     if (this.inFlight !== null) return void 0;
     const frameId = this.nextFrameId;
     this.nextFrameId += 1;
@@ -1109,15 +1064,18 @@ function runtimeError(message) {
 async function createWorkerExecutionApp(options) {
   const executionOptions = options.appOptions.execution;
   if (executionOptions === void 0) throw new Error("execution options are required");
-  const syncCanvas = options.syncCanvas;
-  const bootstrapUrl = new URL(executionOptions.bootstrap, globalThis.location?.href).href;
+  const normalizedBootstrap = normalizeExecutionBootstrapUrl(executionOptions.bootstrap);
+  if (!normalizedBootstrap.ok) return normalizedBootstrap;
+  const bootstrapUrl = normalizedBootstrap.value;
   const startupTimeoutMs = executionOptions.startupTimeoutMs ?? 1e4;
   const frameTimeoutMs = executionOptions.frameTimeoutMs ?? 2e3;
+  const syncCanvas = options.syncCanvas;
   const started = await startEngineWorker({
     canvas: options.canvas,
     bootstrapUrl,
     ...executionOptions.bootstrapData === void 0 ? {} : { bootstrapData: executionOptions.bootstrapData },
     ...executionOptions.bootstrapPort === void 0 ? {} : { bootstrapPort: executionOptions.bootstrapPort },
+    ...executionOptions.assetCatalog === void 0 ? {} : { assetCatalog: executionOptions.assetCatalog },
     ...options.bundler?.shaderManifestUrl !== void 0 ? { shaderManifestUrl: options.bundler.shaderManifestUrl } : {},
     ...options.appOptions.time !== void 0 ? { time: options.appOptions.time } : {},
     timeoutMs: startupTimeoutMs,
@@ -1453,61 +1411,99 @@ async function createWorkerExecutionApp(options) {
   return ok(app);
 }
 
-// src/internal/assets-world-plugin.ts
-var RENDER_ASSET_PORT_RESOURCE_KEY = "RenderAssetPort";
-var ASSET_REGISTRY_RESOURCE_KEY = "AssetRegistry";
-function rendererAssetsPlugin() {
+// src/renderer-plugin.ts
+function createRenderFeatureHost(host) {
   return {
-    name: "renderer-assets",
-    inject: ["renderer"],
-    provide: "assets",
+    async installFeature(feature) {
+      const installed = await host.installRenderFeature(feature);
+      if (!installed.ok) return installed;
+      let released = false;
+      return {
+        ok: true,
+        value: {
+          release: async () => {
+            if (released) return { ok: true, value: void 0 };
+            released = true;
+            return host.uninstallRenderFeature(feature);
+          }
+        }
+      };
+    }
+  };
+}
+function rendererPlugin(renderer) {
+  return {
+    name: "renderer",
+    provide: "renderer",
     apply(ctx) {
-      if (ctx.renderer === void 0) throw new Error("assets require the renderer service");
-      ctx.provide("assets", ctx.renderer.assets);
+      ctx.provide("renderer", renderer);
     }
   };
 }
-function assetRegistryPlugin(assembly) {
+function ownedRendererPlugin(renderer) {
   return {
-    name: "asset-registry",
-    provide: "assetRegistry",
+    name: "renderer",
+    provide: "renderer",
     apply(ctx) {
-      ctx.provide("assetRegistry", assembly.registry);
+      ctx.provide("renderer", renderer);
+      ctx.effect(() => () => renderer.dispose(), "render/renderer");
+    }
+  };
+}
+function renderFeatureHostPlugin(host) {
+  return {
+    name: "render-feature-host",
+    provide: "renderFeatureHost",
+    apply(ctx) {
+      ctx.provide("renderFeatureHost", host);
+    }
+  };
+}
+function renderFeaturePlugin(feature) {
+  return {
+    name: `render-feature:${feature.identity}`,
+    inject: ["renderFeatureHost"],
+    async apply(ctx) {
+      if (ctx.renderFeatureHost === void 0) {
+        throw new Error("render-feature host capability is unavailable in this App realm");
+      }
+      const installed = await ctx.renderFeatureHost.installFeature(feature);
+      if (!installed.ok) throw installed.error;
       ctx.effect(
-        () => () => {
-          assembly.dispose();
-          assembly.registry.dispose();
+        () => async () => {
+          const removed = await installed.value.release();
+          if (!removed.ok) throw removed.error;
         },
-        "assets/registry"
+        `render-feature/${feature.identity}`
       );
     }
   };
 }
-function assetsWorldPlugin() {
+
+// src/internal/assets-world-plugin.ts
+var ASSET_REGISTRY_RESOURCE_KEY = "AssetRegistry";
+function rendererAssetsPlugin(assets) {
   return {
-    name: "assets-world",
-    inject: ["world", "assets"],
+    name: "renderer-assets",
+    inject: ["renderer"],
+    provide: "assets",
     apply(ctx) {
-      ctx.effect(() => {
-        ctx.world.insertResource(RENDER_ASSET_PORT_RESOURCE_KEY, ctx.assets);
-        return () => {
-          ctx.world.removeResource(RENDER_ASSET_PORT_RESOURCE_KEY);
-        };
-      }, "assets/world-render-projection");
+      if (assets !== void 0) ctx.provide("assets", assets);
     }
   };
 }
-function assetRegistryWorldPlugin() {
+function assetsWorldPlugin() {
   return {
-    name: "asset-registry-world",
-    inject: ["world", "assetRegistry"],
+    name: "assets-world",
+    inject: ["world", "assets"],
     apply(ctx) {
+      if (ctx.assets === void 0) return;
       ctx.effect(() => {
-        ctx.world.insertResource(ASSET_REGISTRY_RESOURCE_KEY, ctx.assetRegistry);
+        ctx.world.insertResource(ASSET_REGISTRY_RESOURCE_KEY, ctx.assets);
         return () => {
           ctx.world.removeResource(ASSET_REGISTRY_RESOURCE_KEY);
         };
-      }, "assets/world-registry");
+      }, "assets/world-resource");
     }
   };
 }
@@ -1516,8 +1512,7 @@ function assetRegistryWorldPlugin() {
 function assembledEngineProfile(options) {
   return [
     rendererPlugin(options.renderer),
-    rendererAssetsPlugin(),
-    ...options.assetAssembly === void 0 ? [] : [assetRegistryPlugin(options.assetAssembly), assetRegistryWorldPlugin()],
+    rendererAssetsPlugin(options.assets),
     assetsWorldPlugin(),
     ...options.extensions ?? []
   ];
@@ -1680,7 +1675,6 @@ function resolveCaf(opts) {
 }
 function createFrameLoop(opts) {
   const { world, renderer } = opts;
-  const primaryDrawWorlds = [world];
   const phaseCatalogRegistration = opts.profiler?.registerPhaseCatalog("app", APP_PHASE_CATALOG);
   let releasePhaseCatalog = phaseCatalogRegistration?.ok === true ? phaseCatalogRegistration.value : void 0;
   let drawSource = opts.drawSource;
@@ -1692,53 +1686,50 @@ function createFrameLoop(opts) {
   let pendingFrameId = 0;
   let profilerFrameId = 0;
   let profilerCaptureId;
-  let primaryAttached = false;
-  let activeInjectedWorlds;
-  let nextInjectedWorlds;
+  const leases = /* @__PURE__ */ new Map();
   function attachPrimary(fireError) {
-    if (primaryAttached) return;
+    if (leases.has(world)) return;
     try {
-      const result = renderer.attachWorld(world);
-      primaryAttached = result.ok;
-      if (!result.ok) fireError(result.error);
+      const result = renderer.attach(world);
+      if (result.ok) leases.set(world, result.value);
+      else fireError(result.error);
     } catch (cause) {
       fireError(makeWorldUpdateError(cause));
     }
   }
   function syncInjectedAttachments(worlds, fireError) {
     if (worlds === void 0) {
-      if (activeInjectedWorlds !== void 0) {
-        for (const attached of activeInjectedWorlds) renderer.detachWorld(attached);
-        activeInjectedWorlds.clear();
+      for (const [attached, lease] of leases) {
+        if (attached !== world) {
+          lease.dispose();
+          leases.delete(attached);
+        }
       }
       return void 0;
     }
-    const next = nextInjectedWorlds ?? /* @__PURE__ */ new Set();
-    nextInjectedWorlds = next;
-    next.clear();
-    const active = activeInjectedWorlds;
+    const next = /* @__PURE__ */ new Set();
     for (const candidate of worlds) {
       if (candidate === world || next.has(candidate)) continue;
-      if (active?.has(candidate) === true) {
+      if (leases.has(candidate)) {
         next.add(candidate);
         continue;
       }
       try {
-        const result = renderer.attachWorld(candidate);
-        if (result.ok) next.add(candidate);
-        else fireError?.(result.error);
+        const result = renderer.attach(candidate);
+        if (result.ok) {
+          leases.set(candidate, result.value);
+          next.add(candidate);
+        } else fireError?.(result.error);
       } catch (cause) {
         fireError?.(makeWorldUpdateError(cause));
       }
     }
-    if (active !== void 0) {
-      for (const attached of active) {
-        if (!next.has(attached)) renderer.detachWorld(attached);
+    for (const [attached, lease] of leases) {
+      if (attached !== world && !next.has(attached)) {
+        lease.dispose();
+        leases.delete(attached);
       }
-      active.clear();
     }
-    activeInjectedWorlds = next;
-    nextInjectedWorlds = active;
     return next;
   }
   function releaseInjectedAttachments() {
@@ -1746,9 +1737,11 @@ function createFrameLoop(opts) {
   }
   function releaseAttachments() {
     releaseInjectedAttachments();
-    if (!primaryAttached) return;
-    renderer.detachWorld(world);
-    primaryAttached = false;
+    const lease = leases.get(world);
+    if (lease !== void 0) {
+      lease.dispose();
+      leases.delete(world);
+    }
   }
   function runProfiledPhase(session, phase, action) {
     const opened = beginPhase(session, phase);
@@ -1799,7 +1792,7 @@ function createFrameLoop(opts) {
       });
       const attachedInjectedWorlds = syncInjectedAttachments(injected?.worlds, reportError);
       const updatedWorlds = injected === void 0 ? void 0 : /* @__PURE__ */ new Set();
-      if (updatedWorlds !== void 0 && primaryUpdated && primaryAttached) {
+      if (updatedWorlds !== void 0 && primaryUpdated && leases.has(world)) {
         updatedWorlds.add(world);
       }
       runProfiledPhase(session, "world-update-injected", () => {
@@ -1816,27 +1809,34 @@ function createFrameLoop(opts) {
       });
       runProfiledPhase(session, "renderer-draw", () => {
         try {
-          const profileOptions = profileFrame === void 0 ? {} : { profileFrame };
           let drawResult;
           if (injected === void 0) {
-            if (!primaryUpdated || !primaryAttached) return;
-            drawResult = renderer.draw(primaryDrawWorlds, {
-              cameraOwner: 0,
-              resourceOwner: 0,
-              ...profileOptions
+            const primaryLease = leases.get(world);
+            if (!primaryUpdated || primaryLease === void 0) return;
+            drawResult = renderer.draw({
+              leases: [primaryLease],
+              camera: { lease: primaryLease },
+              environment: { lease: primaryLease },
+              ...profileFrame === void 0 ? {} : { profileFrame }
             });
           } else {
             if (updatedWorlds === void 0) return;
-            const readyWorlds = injected.worlds.filter((candidate) => updatedWorlds.has(candidate));
+            const readyEntries = injected.worlds.filter((candidate) => updatedWorlds.has(candidate)).map((candidate) => ({ candidate, lease: leases.get(candidate) })).filter(
+              (entry) => entry.lease !== void 0
+            );
+            const readyLeases = readyEntries.map((entry) => entry.lease);
             const cameraWorld = injected.worlds[injected.cameraOwner];
-            const resourceWorld = injected.worlds[injected.resourceOwner];
-            const cameraOwner = cameraWorld === void 0 ? -1 : readyWorlds.indexOf(cameraWorld);
-            const resourceOwner = resourceWorld === void 0 ? -1 : readyWorlds.indexOf(resourceWorld);
-            if (readyWorlds.length === 0 || cameraOwner < 0 || resourceOwner < 0) return;
-            drawResult = renderer.draw(readyWorlds, {
-              cameraOwner,
-              resourceOwner,
-              ...profileOptions
+            const environmentWorld = injected.worlds[injected.resourceOwner];
+            if (cameraWorld === void 0 || environmentWorld === void 0) return;
+            const cameraLease = leases.get(cameraWorld);
+            const environmentLease = leases.get(environmentWorld);
+            if (readyLeases.length === 0 || cameraLease === void 0 || environmentLease === void 0)
+              return;
+            drawResult = renderer.draw({
+              leases: readyLeases,
+              camera: { lease: cameraLease },
+              environment: { lease: environmentLease },
+              ...profileFrame === void 0 ? {} : { profileFrame }
             });
           }
           if (drawResult !== void 0) {
@@ -1851,14 +1851,14 @@ function createFrameLoop(opts) {
       });
     });
     endFrame(session);
+    try {
+      opts.debugRhi?.onFrameEnd();
+    } catch {
+    }
     return frameError === void 0 ? ok(void 0) : err(frameError);
   }
   function tick() {
     if (state !== "running") return;
-    if (renderer.health?.().reason === "device-lost") {
-      pendingFrameId = raf(tick);
-      return;
-    }
     const timestamp = now();
     const deltaSeconds = (timestamp - lastTimestamp) / 1e3;
     lastTimestamp = timestamp;
@@ -2066,17 +2066,53 @@ function inputPlugin() {
   };
 }
 
+// ../render/src/record/render-context.ts
+function selectSwapChainFormat(storageBufferCapable) {
+  if (!storageBufferCapable) return { storage: "rgba8unorm", view: "rgba8unorm-srgb" };
+  const nav = globalThis.navigator;
+  const gpu = nav?.gpu;
+  const getPreferred = gpu?.getPreferredCanvasFormat;
+  if (gpu !== void 0 && typeof getPreferred === "function") {
+    const storage = getPreferred.call(gpu);
+    const view = storage === "rgba8unorm" ? "rgba8unorm-srgb" : storage === "bgra8unorm" ? "bgra8unorm-srgb" : storage;
+    return { storage, view };
+  }
+  return {
+    storage: "rgba8unorm",
+    view: "rgba8unorm-srgb",
+    fallbackReason: "preferred-canvas-format-missing"
+  };
+}
+
+// src/internal/debug-draw.ts
+async function createDebugDrawOnReady(context, format) {
+  const ready = await context.initialization;
+  if (!ready.ok) throw ready.error;
+  const resolvedFormat = selectSwapChainFormat(context.device.caps.storageBuffer).view;
+  const result = await createDebugDraw({
+    device: context.device,
+    queue: context.device.queue,
+    createShaderModule: context._internal_createShaderModule,
+    format: resolvedFormat
+  });
+  if (!result.ok) throw result.error;
+  context._internal_setRenderOverlay(result.value);
+  return result.value;
+}
+function releaseDebugDraw(context, debugDraw) {
+  context._internal_setRenderOverlay(void 0);
+  debugDraw.destroy();
+}
+
 // src/internal/main-engine-profile.ts
-function debugDrawPlugin(onReady) {
+function debugDrawPlugin(context, onReady) {
   return {
     name: "debug-draw",
-    inject: ["renderer"],
     async apply(ctx) {
-      if (ctx.renderer === void 0) throw new Error("debug draw requires the renderer service");
       try {
-        const debugDraw = await createDebugDrawOnReady(ctx.renderer);
+        const debugDraw = await createDebugDrawOnReady(context);
         onReady(debugDraw);
-        ctx.effect(() => () => releaseDebugDraw(debugDraw), "render/debug-draw");
+        ctx.effect(() => () => releaseDebugDraw(context, debugDraw), "render/debug-draw");
       } catch {
       }
     }
@@ -2086,8 +2122,8 @@ function mainEngineProfile(options) {
   return [
     ownedRendererPlugin(options.renderer),
     renderComponentsPlugin(),
-    rendererAssetsPlugin(),
-    ...options.assetAssembly === void 0 ? [] : [assetRegistryPlugin(options.assetAssembly), assetRegistryWorldPlugin()],
+    ...options.rendererFeatureHost === void 0 ? [] : [renderFeatureHostPlugin(options.rendererFeatureHost)],
+    rendererAssetsPlugin(options.assets),
     assetsWorldPlugin(),
     ...options.input === void 0 ? [] : [
       options.inputDispose === void 0 ? inputBackendPlugin(options.input) : ownedInputBackendPlugin(options.input, options.inputDispose)
@@ -2096,7 +2132,7 @@ function mainEngineProfile(options) {
     animationPayloadsPlugin(options.animationPayloads),
     animationRuntimePlugin(),
     statePlugin(),
-    ...options.onDebugDrawReady === void 0 ? [] : [debugDrawPlugin(options.onDebugDrawReady)],
+    ...options.onDebugDrawReady === void 0 || options.rendererDebugDrawHost === void 0 ? [] : [debugDrawPlugin(options.rendererDebugDrawHost, options.onDebugDrawReady)],
     ...options.input === void 0 ? [] : [inputPlugin()],
     ...options.inputMap === void 0 ? [] : [inputMapPlugin(options.inputMap)],
     ...options.extensions ?? []
@@ -2104,8 +2140,7 @@ function mainEngineProfile(options) {
 }
 
 // src/internal/remote-serve-flag.ts
-function resolveRemoteServeFlag(isDev, processEnv, isBrowser = false) {
-  if (isBrowser) return false;
+function resolveRemoteServeFlag(isDev, processEnv) {
   if (isDev === true) return true;
   if (processEnv?.FORGEAX_ENGINE_REMOTE_SERVE === "1") return true;
   return false;
@@ -2292,38 +2327,10 @@ function resolveRhiDebugFlag(importMetaEnv, processEnv) {
 }
 
 // src/create-app.ts
-var DEFAULT_ASSET_CATALOG_PATH = "pack-index.json";
-function defaultAssetCatalogUrl() {
-  const base = typeof document !== "undefined" ? document.baseURI : globalThis.location?.href;
-  return base === void 0 ? DEFAULT_ASSET_CATALOG_PATH : new URL(DEFAULT_ASSET_CATALOG_PATH, base).href;
-}
-function assembleAppAssetRuntime(catalog, contributions) {
-  const registry = createAssetRegistry({
-    catalog: catalog ?? createCatalogSource({ url: defaultAssetCatalogUrl() })
-  });
-  const assembled = assembleAssetRuntime(registry, contributions ?? []);
-  if (!assembled.ok) registry.dispose();
-  return assembled;
-}
 function makeAppError2(code, expected, hint, detail) {
   return new AppError({ code, expected, hint, detail });
 }
-function normalizeExecutionBootstrapUrl(bootstrap) {
-  const moduleUrl = typeof bootstrap === "string" ? bootstrap : bootstrap.href;
-  try {
-    return ok(new URL(bootstrap, globalThis.location?.href).href);
-  } catch (cause) {
-    return err(
-      makeAppError2(
-        "app-execution-bootstrap-failed",
-        APP_EXPECTED["app-execution-bootstrap-failed"],
-        APP_ERROR_HINTS["app-execution-bootstrap-failed"],
-        { phase: "prepare", moduleUrl, cause }
-      )
-    );
-  }
-}
-function canvasAspectPlugin(canvas, maxCanvasPixelRatio) {
+function canvasAspectPlugin(canvas) {
   return {
     name: "canvas-aspect",
     inject: ["world"],
@@ -2333,7 +2340,7 @@ function canvasAspectPlugin(canvas, maxCanvasPixelRatio) {
           name: "app-sync-camera-aspect",
           queries: [],
           fn: () => {
-            syncCanvasDrawingBuffer(canvas, maxCanvasPixelRatio);
+            syncCanvasDrawingBuffer(canvas);
             syncCameraAspect(ctx.world, canvas.width, canvas.height);
           }
         };
@@ -2358,17 +2365,6 @@ function createApp(arg, opts, bundler) {
   return createAppFromAssemble(arg);
 }
 async function createAppFromCanvas(canvas, opts, bundler) {
-  const maxCanvasPixelRatio = opts?.maxCanvasPixelRatio;
-  if (maxCanvasPixelRatio !== void 0 && (!Number.isFinite(maxCanvasPixelRatio) || maxCanvasPixelRatio <= 0)) {
-    return err(
-      makeAppError2(
-        "app-invalid-canvas-pixel-ratio",
-        APP_EXPECTED["app-invalid-canvas-pixel-ratio"],
-        APP_ERROR_HINTS["app-invalid-canvas-pixel-ratio"],
-        { value: maxCanvasPixelRatio }
-      )
-    );
-  }
   if (!canvas.isConnected) {
     return err(
       makeAppError2(
@@ -2379,22 +2375,18 @@ async function createAppFromCanvas(canvas, opts, bundler) {
       )
     );
   }
-  const executionOptions = opts?.execution;
-  const normalizedExecutionBootstrap = executionOptions === void 0 ? void 0 : normalizeExecutionBootstrapUrl(executionOptions.bootstrap);
-  if (normalizedExecutionBootstrap?.ok === false) {
-    return err(normalizedExecutionBootstrap.error);
-  }
-  syncCanvasDrawingBuffer(canvas, maxCanvasPixelRatio);
-  if (opts?.execution !== void 0 && normalizedExecutionBootstrap?.ok === true) {
+  syncCanvasDrawingBuffer(canvas);
+  let executionBootstrapUrl;
+  if (opts?.execution !== void 0) {
+    const normalizedBootstrap = normalizeExecutionBootstrapUrl(opts.execution.bootstrap);
+    if (!normalizedBootstrap.ok) return err(normalizedBootstrap.error);
+    executionBootstrapUrl = normalizedBootstrap.value;
     const realmBoundOption = [
       ["features", opts.features],
       ["plugins", opts.plugins],
       ["rhi", opts.rhi],
-      ["rawDeviceForContextConfigure", opts.rawDeviceForContextConfigure],
+      ["rhiInstrumentation", opts.rhiInstrumentation],
       ["drawSource", opts.drawSource],
-      ["membershipTiming", opts.membershipTiming],
-      ["assetCatalog", opts.assetCatalog],
-      ["assetDecoders", opts.assetDecoders],
       ["bundler.importTransport", bundler?.importTransport]
     ].find(([, value]) => value !== void 0)?.[0];
     if (realmBoundOption !== void 0) {
@@ -2405,7 +2397,7 @@ async function createAppFromCanvas(canvas, opts, bundler) {
           APP_ERROR_HINTS["app-execution-bootstrap-failed"],
           {
             phase: "prepare",
-            moduleUrl: normalizedExecutionBootstrap.value,
+            moduleUrl: executionBootstrapUrl,
             cause: new TypeError(
               `${realmBoundOption} must be constructed by the execution bootstrap module`
             )
@@ -2416,11 +2408,10 @@ async function createAppFromCanvas(canvas, opts, bundler) {
   }
   let executionContext;
   let preparedExecutionBootstrap;
-  if (opts?.execution !== void 0 && normalizedExecutionBootstrap?.ok === true) {
-    const executionOptions2 = opts.execution;
+  if (opts?.execution !== void 0) {
     const capabilities = await probeExecutionCapabilities(canvas);
     const selected = selectExecutionTier({
-      requestedTier: executionOptions2.tier ?? "auto",
+      requestedTier: opts.execution.tier ?? "auto",
       capabilities,
       sharedEvidencePassed: true
     });
@@ -2430,15 +2421,18 @@ async function createAppFromCanvas(canvas, opts, bundler) {
       return createWorkerExecutionApp({
         canvas,
         appOptions: opts,
-        syncCanvas: () => measureCanvasDrawingBuffer(canvas, maxCanvasPixelRatio),
+        syncCanvas: () => measureCanvasDrawingBuffer(canvas),
         ...bundler !== void 0 ? { bundler } : {},
         capabilities,
         selection: selected.value
       });
     }
+    if (executionBootstrapUrl === void 0) {
+      throw new Error("execution bootstrap URL was not normalized");
+    }
     const prepared = await prepareBootstrapEntry(
-      normalizedExecutionBootstrap.value,
-      executionOptions2.bootstrapData
+      executionBootstrapUrl,
+      opts.execution.bootstrapData
     );
     if (!prepared.ok) return err(prepared.error);
     preparedExecutionBootstrap = prepared.value;
@@ -2447,24 +2441,19 @@ async function createAppFromCanvas(canvas, opts, bundler) {
   if (opts?.rhi !== void 0) {
     Object.assign(rendererOpts, { rhi: opts.rhi });
   }
-  if (opts?.rhiInstrumentation !== void 0) {
-    Object.assign(rendererOpts, { rhiInstrumentation: opts.rhiInstrumentation });
-  }
-  if (opts?.rawDeviceForContextConfigure !== void 0) {
-    Object.assign(rendererOpts, {
-      rawDeviceForContextConfigure: opts.rawDeviceForContextConfigure
-    });
-  }
   if (opts?.profiler !== void 0) {
     Object.assign(rendererOpts, { profiler: opts.profiler });
   }
-  if (opts?.membershipTiming !== void 0) {
-    Object.assign(rendererOpts, { membershipTiming: opts.membershipTiming });
-  }
   const rendererFeatures = preparedExecutionBootstrap?.features ?? opts?.features;
   if (rendererFeatures !== void 0) {
     Object.assign(rendererOpts, { features: rendererFeatures });
   }
+  if (opts?.standardProfile !== void 0) {
+    Object.assign(rendererOpts, { standardProfile: opts.standardProfile });
+  }
+  if (opts?.rhiInstrumentation !== void 0) {
+    Object.assign(rendererOpts, { rhiInstrumentation: opts.rhiInstrumentation });
+  }
   let rhiAttachment;
   let rhiCapture;
   let rhiDebugGlobal;
@@ -2482,61 +2471,54 @@ async function createAppFromCanvas(canvas, opts, bundler) {
   const rhiDebugFlag = resolveRhiDebugFlag(importMetaEnv, processEnv);
   const nav = typeof globalThis !== "undefined" ? globalThis.navigator : void 0;
   const hasWebGPU = nav !== void 0 && "gpu" in nav && nav.gpu !== void 0;
-  if (opts?.rhi === void 0 && (browserBuildRhiDebugFlag === void 0 || browserBuildRhiDebugFlag === "1") && rhiDebugFlag === "1") {
-    const backend = hasWebGPU ? await import('@forgeax/engine-rhi-webgpu') : await import('@forgeax/engine-rhi-wgpu');
-    if (!hasWebGPU && "ensureReady" in backend) await backend.ensureReady();
-    const pack = loadRhiPack(backend);
-    const debugModule = await import(
-      /* @vite-ignore */
-      '@forgeax/engine-rhi-debug'
-    );
+  if ((browserBuildRhiDebugFlag === void 0 || browserBuildRhiDebugFlag === "1") && rhiDebugFlag === "1") {
+    const realBackend = hasWebGPU ? await import('@forgeax/engine-rhi-webgpu') : await import('@forgeax/engine-rhi-wgpu');
+    if (!hasWebGPU && "ensureReady" in realBackend) {
+      await realBackend.ensureReady();
+    }
+    const pack = loadRhiPack(realBackend);
     if (pack.createShaderModule === void 0) {
-      throw new Error("RHI debug capture requires the backend shader-module entry");
+      throw new Error("RHI-debug requires a backend createShaderModule capability");
     }
-    const createShaderModule = pack.createShaderModule;
-    const attached = debugModule.attachRecorder({
+    const attached = attachRecorder({
       rhi: pack.rhi,
-      createShaderModule
+      createShaderModule: pack.createShaderModule
     });
     if (!attached.ok) throw new Error(attached.error.hint);
-    const attachment = attached.value;
-    rhiAttachment = attachment;
-    const capture = createRhiCapture(attachment);
-    rhiCapture = capture;
+    rhiAttachment = attached.value;
+    rhiCapture = createRhiCapture(attached.value);
+    const capture = rhiCapture;
+    rhiDebugGlobal = { captureFrame: (options) => capture.captureFrame(options) };
     Object.assign(rendererOpts, {
-      rhi: attachment.backend.rhi,
-      rhiInstrumentation: createRhiInstrumentation(attachment)
+      rhi: attached.value.backend.rhi,
+      rhiInstrumentation: createRhiInstrumentation(attached.value)
     });
-    rhiDebugGlobal = {
-      captureFrame: (options) => capture.captureFrame(options)
-    };
     globalThis.__forgeax = rhiDebugGlobal;
   }
-  const assetAssemblyResult = assembleAppAssetRuntime(opts?.assetCatalog, opts?.assetDecoders);
-  if (!assetAssemblyResult.ok) {
-    cleanupRhiDebugHost();
-    return err(assetAssemblyResult.error);
-  }
-  const assetAssembly = assetAssemblyResult.value;
   let renderer;
+  let rendererDebugDrawHost;
+  let rendererFeatureHost;
+  let assets;
   try {
-    renderer = await createRenderer(canvas, rendererOpts, {
-      ...bundler,
-      assetResolver: getAssetRegistryResolver(assetAssembly.registry)
-    });
+    const constructed = await constructRuntimeRendererHost(canvas, rendererOpts, bundler);
+    if (!constructed.ok) throw constructed.error;
+    renderer = constructed.value.renderer;
+    rendererDebugDrawHost = constructed.value.debugDrawHost;
+    rendererFeatureHost = createRenderFeatureHost(constructed.value.featureHost);
+    assets = constructed.value.assets;
   } catch (e) {
     cleanupRhiDebugHost();
-    assetAssembly.dispose();
-    assetAssembly.registry.dispose();
-    if (e instanceof EngineEnvironmentError) {
-      return err(e);
-    }
-    throw e;
+    if (e instanceof EngineEnvironmentError) return err(e);
+    const detail = e instanceof Error ? e : new Error(String(e));
+    return err(
+      new EngineEnvironmentError("renderer construction failed", {
+        webgpuError: detail
+      })
+    );
   }
   const shouldStartRemote = resolveRemoteServeFlag(
     typeof import.meta !== "undefined" ? import.meta.env?.DEV : void 0,
-    globalThis.process?.env,
-    typeof window !== "undefined"
+    globalThis.process?.env
   );
   let debugDraw;
   const world = new World(opts?.time !== void 0 ? { time: opts.time } : {});
@@ -2560,8 +2542,10 @@ async function createAppFromCanvas(canvas, opts, bundler) {
       world,
       mainEngineProfile({
         renderer,
-        assetAssembly,
-        animationPayloads: createAnimationPayloadLookup(renderer.assets),
+        rendererDebugDrawHost,
+        rendererFeatureHost,
+        assets,
+        animationPayloads: createAnimationPayloadLookup(assets),
         ...inputBackend === void 0 ? {} : { input: inputBackend },
         ...inputHandle === void 0 ? {} : { inputDispose: inputHandle.cleanup },
         ...opts?.inputMap === void 0 ? {} : { inputMap: opts.inputMap },
@@ -2571,14 +2555,12 @@ async function createAppFromCanvas(canvas, opts, bundler) {
         extensions: [
           rhiDebugHostPlugin(cleanupRhiDebugHost),
           ...userPlugins,
-          canvasAspectPlugin(canvas, maxCanvasPixelRatio)
+          canvasAspectPlugin(canvas)
         ]
       })
     );
   } catch (cause) {
     cleanupRhiDebugHost();
-    assetAssembly.dispose();
-    assetAssembly.registry.dispose();
     return err(
       makeAppError2(
         "app-plugin-activation-failed",
@@ -2626,18 +2608,11 @@ async function createAppFromCanvas(canvas, opts, bundler) {
       })
     }
   );
-  const remoteHandle = shouldStartRemote ? await startRemoteServer(
-    world,
-    renderer,
-    assetAssembly.registry,
-    rhiCapture,
-    opts?.profiler,
-    executionControl
-  ) : void 0;
+  const remoteHandle = shouldStartRemote ? await startRemoteServer(world, renderer, assets, rhiCapture, opts?.profiler, executionControl) : void 0;
   if (remoteHandle !== void 0) await pluginContext.plugin(remoteServerPlugin(remoteHandle));
   const buildArgs = {
     renderer,
-    assets: assetAssembly.registry,
+    assets,
     world,
     pluginContext,
     executionControl,
@@ -2663,10 +2638,7 @@ async function createAppFromCanvas(canvas, opts, bundler) {
     Object.assign(buildArgs, { profiler: opts.profiler });
   }
   if (rhiCapture !== void 0) {
-    Object.assign(buildArgs, {
-      rhiCapture,
-      ...rhiAttachment === void 0 ? {} : { rhiAttachment }
-    });
+    Object.assign(buildArgs, { rhiCapture });
   }
   if (debugDraw !== void 0) {
     Object.assign(buildArgs, { debugDraw });
@@ -2684,17 +2656,17 @@ async function createAppFromCanvas(canvas, opts, bundler) {
       const bridgePort = import.meta.env?.VITE_FORGEAX_ENGINE_BRIDGE_PORT ?? "5733";
       await pluginContext.plugin({
         name: "browser-remote-bridge",
-        inject: ["world", "renderer", "assetRegistry"],
+        inject: ["world", "renderer", "assets"],
         async apply(ctx) {
-          if (ctx.renderer === void 0 || ctx.assetRegistry === void 0) {
-            throw new Error("browser remote bridge requires renderer and assetRegistry services");
+          if (ctx.renderer === void 0 || ctx.assets === void 0) {
+            throw new Error("browser remote bridge requires renderer and assets services");
           }
           try {
             const bridge = await Promise.resolve().then(() => (init_browser_remote_bridge(), browser_remote_bridge_exports));
             const teardown = await bridge.installBrowserRemoteBridge({
               world: ctx.world,
               renderer: ctx.renderer,
-              assets: ctx.assetRegistry,
+              assets: ctx.assets,
               runtimeModule: engineRuntimeModule,
               ...rhiCapture !== void 0 ? { rhiCapture } : {},
               ...opts?.profiler !== void 0 ? { profiler: opts.profiler } : {},
@@ -2710,43 +2682,62 @@ async function createAppFromCanvas(canvas, opts, bundler) {
   }
   return built;
 }
-function syncCanvasDrawingBuffer(canvas, maxCanvasPixelRatio) {
-  const size = resolveCanvasDrawingBufferSize(canvas, maxCanvasPixelRatio);
-  if (size === void 0) return { width: canvas.width, height: canvas.height };
-  if (canvas.width !== size.width) canvas.width = size.width;
-  if (canvas.height !== size.height) canvas.height = size.height;
-  return size;
-}
-function measureCanvasDrawingBuffer(canvas, maxCanvasPixelRatio) {
-  return resolveCanvasDrawingBufferSize(canvas, maxCanvasPixelRatio) ?? {
-    width: canvas.width,
-    height: canvas.height
-  };
-}
-function resolveCanvasDrawingBufferSize(canvas, maxCanvasPixelRatio) {
+function syncCanvasDrawingBuffer(canvas) {
   if (!Number.isFinite(canvas.clientWidth) || !Number.isFinite(canvas.clientHeight) || canvas.clientWidth <= 0 || canvas.clientHeight <= 0)
-    return void 0;
+    return;
   const hasExplicitCssSize = (canvas.style?.width ?? "") !== "" || (canvas.style?.height ?? "") !== "";
   if (!hasExplicitCssSize && canvas.clientWidth === canvas.width && canvas.clientHeight === canvas.height) {
-    return { width: canvas.width, height: canvas.height };
+    return;
   }
-  const devicePixelRatio = Math.max(1, globalThis.devicePixelRatio || 1);
-  const dpr = maxCanvasPixelRatio === void 0 || !Number.isFinite(maxCanvasPixelRatio) || maxCanvasPixelRatio <= 0 ? devicePixelRatio : Math.min(devicePixelRatio, maxCanvasPixelRatio);
+  const dpr = Math.max(1, globalThis.devicePixelRatio || 1);
   const previous = syncedCanvasSizes.get(canvas);
   const drawingBufferIsTheLayoutMeasurement = previous !== void 0 && canvas.width === previous.drawingWidth && canvas.height === previous.drawingHeight && canvas.clientWidth === previous.drawingWidth && canvas.clientHeight === previous.drawingHeight;
   const cssWidth = drawingBufferIsTheLayoutMeasurement ? previous.cssWidth : canvas.clientWidth;
   const cssHeight = drawingBufferIsTheLayoutMeasurement ? previous.cssHeight : canvas.clientHeight;
   const width = Math.max(1, Math.round(cssWidth * dpr));
   const height = Math.max(1, Math.round(cssHeight * dpr));
+  if (canvas.width !== width) canvas.width = width;
+  if (canvas.height !== height) canvas.height = height;
   syncedCanvasSizes.set(canvas, {
     cssWidth,
     cssHeight,
     drawingWidth: width,
     drawingHeight: height
   });
-  return { width, height };
+}
+function measureCanvasDrawingBuffer(canvas, maxCanvasPixelRatio) {
+  if (!Number.isFinite(canvas.clientWidth) || !Number.isFinite(canvas.clientHeight) || canvas.clientWidth <= 0 || canvas.clientHeight <= 0) {
+    return { width: canvas.width, height: canvas.height };
+  }
+  const hasExplicitCssSize = (canvas.style?.width ?? "") !== "" || (canvas.style?.height ?? "") !== "";
+  if (!hasExplicitCssSize && canvas.clientWidth === canvas.width && canvas.clientHeight === canvas.height) {
+    return { width: canvas.width, height: canvas.height };
+  }
+  const devicePixelRatio = Math.max(1, globalThis.devicePixelRatio || 1);
+  const dpr = maxCanvasPixelRatio === void 0 || !Number.isFinite(maxCanvasPixelRatio) || maxCanvasPixelRatio <= 0 ? devicePixelRatio : Math.min(devicePixelRatio, maxCanvasPixelRatio);
+  const previous = syncedCanvasSizes.get(canvas);
+  const drawingBufferIsTheLayoutMeasurement = previous !== void 0 && canvas.width === previous.drawingWidth && canvas.height === previous.drawingHeight && canvas.clientWidth === previous.drawingWidth && canvas.clientHeight === previous.drawingHeight;
+  const cssWidth = drawingBufferIsTheLayoutMeasurement ? previous.cssWidth : canvas.clientWidth;
+  const cssHeight = drawingBufferIsTheLayoutMeasurement ? previous.cssHeight : canvas.clientHeight;
+  return {
+    width: Math.max(1, Math.round(cssWidth * dpr)),
+    height: Math.max(1, Math.round(cssHeight * dpr))
+  };
 }
 var syncedCanvasSizes = /* @__PURE__ */ new WeakMap();
+function syncCameraAspect(world, canvasW, canvasH) {
+  if (canvasW <= 0 || canvasH <= 0) return;
+  const aspect = canvasW / canvasH;
+  const query = world.query({ with: [Camera] }).unwrap();
+  for (const row of query) {
+    const entity = row.entity;
+    const r = world.get(entity, Camera);
+    if (!r.ok) continue;
+    if (r.value.autoAspect !== true) continue;
+    if (r.value.projection !== CAMERA_PROJECTION_PERSPECTIVE) continue;
+    world.set(entity, Camera, { aspect });
+  }
+}
 async function startRemoteServer(world, renderer, assets, rhiCapture, profiler, execution) {
   try {
     const remoteServerMod = await import(
@@ -2772,22 +2763,17 @@ async function startRemoteServer(world, renderer, assets, rhiCapture, profiler,
   return void 0;
 }
 async function createAppFromAssemble(args) {
-  const assetAssemblyResult = assembleAppAssetRuntime(args.assetCatalog, args.assetDecoders);
-  if (!assetAssemblyResult.ok) return err(assetAssemblyResult.error);
-  const assetAssembly = assetAssemblyResult.value;
   let pluginContext;
   try {
     pluginContext = await createWorldContext(
       args.world,
       assembledEngineProfile({
         renderer: args.renderer,
-        assetAssembly,
+        ...args.assets === void 0 ? {} : { assets: args.assets },
         extensions: args.plugins ?? []
       })
     );
   } catch (cause) {
-    assetAssembly.dispose();
-    assetAssembly.registry.dispose();
     return err(
       makeAppError2(
         "app-plugin-activation-failed",
@@ -2829,7 +2815,7 @@ async function createAppFromAssemble(args) {
   const remoteHandle = shouldStartRemote ? await startRemoteServer(
     args.world,
     args.renderer,
-    assetAssembly.registry,
+    args.assets,
     void 0,
     args.profiler,
     executionControl
@@ -2837,7 +2823,6 @@ async function createAppFromAssemble(args) {
   if (remoteHandle !== void 0) await pluginContext.plugin(remoteServerPlugin(remoteHandle));
   const buildArgs = {
     renderer: args.renderer,
-    assets: assetAssembly.registry,
     world: args.world,
     pluginContext,
     executionControl,
@@ -2870,14 +2855,12 @@ async function createAppFromAssemble(args) {
 async function buildApp(args) {
   const {
     renderer,
-    assets,
     world,
     pluginContext,
     inputBackend,
     audioBackend,
     silenceUnhandledErrors,
     rhiCapture,
-    rhiAttachment,
     debugDraw,
     remoteHandle,
     profiler
@@ -2888,6 +2871,7 @@ async function buildApp(args) {
   const fanout = new ErrorFanoutRegistry(
     silenceUnhandledErrors !== void 0 ? { silenceUnhandledErrors } : {}
   );
+  let lastError;
   const execution = args.executionControl ?? createLocalExecutionControl(
     {
       ...createExecutionReport("main-serial", unavailableExecutionCapabilities("not required")),
@@ -2913,6 +2897,7 @@ async function buildApp(args) {
     }
   );
   function dispatch(e) {
+    lastError = e;
     fanout.fire(e);
   }
   if (args.wireOnLockErrorDispatch) {
@@ -2930,7 +2915,7 @@ async function buildApp(args) {
     Object.assign(loopOpts, { profiler });
   }
   const loop = createFrameLoop(loopOpts);
-  if (rhiCapture !== void 0 && rhiAttachment !== void 0) {
+  if (rhiCapture !== void 0) {
     bindRhiCaptureFrameDriver(rhiCapture, {
       getState: () => loop.getState(),
       pause: () => {
@@ -2946,17 +2931,15 @@ async function buildApp(args) {
       stepFrame: (deltaSeconds) => loop.stepFrame(deltaSeconds)
     });
   }
-  let lastError;
   let rendererUnsubscribe;
   let resumeAfterSurfaceRestore = false;
   function subscribeRendererErrors() {
     if (rendererUnsubscribe !== void 0) {
       return;
     }
-    rendererUnsubscribe = renderer.onError((e) => {
-      if (e?.code === "device-lost") {
-        lastError = e;
-      }
+    rendererUnsubscribe = renderer.subscribe((event) => {
+      if (event.kind !== "error") return;
+      const e = event.error;
       dispatch(e);
     });
   }
@@ -2968,7 +2951,7 @@ async function buildApp(args) {
   }
   const stub = {
     renderer,
-    assets,
+    ...args.assets === void 0 ? {} : { assets: args.assets },
     world,
     execution,
     async releaseSurfacePreserveWorld() {
@@ -3063,7 +3046,7 @@ async function buildApp(args) {
       loop.setDrawSource(drawSource);
     },
     /**
-     * Most recent device-loss error retained for host self-inspection.
+     * Most recent dispatched error retained for host self-inspection.
      */
     get lastError() {
       return lastError;
@@ -3072,10 +3055,6 @@ async function buildApp(args) {
     ...debugDraw !== void 0 ? { debugDraw } : {},
     ...remoteHandle !== void 0 ? { remote: remoteHandle } : {}
   };
-  const readyResult = await renderer.ready;
-  if (!readyResult.ok) {
-    return err(readyResult.error);
-  }
   return ok(stub);
 }
 function ensureFallbackCamera(world, aspect = 1) {
@@ -3682,19 +3661,6 @@ async function createToolPreviewHost(options) {
   const app = appResult.value;
   const appErrors = [];
   const unsubscribeAppErrors = app.onError((error) => appErrors.push(error));
-  const rendererReady = await app.renderer.ready;
-  if (!rendererReady.ok) {
-    unsubscribeAppErrors();
-    await app.dispose();
-    await runtime.attachment.dispose();
-    removeOwnedCanvas(canvas, ownsCanvas);
-    return err({
-      code: "tool-preview-bootstrap-failed",
-      expected: "the real WebGPU Renderer to finish pipeline initialization before preview frames",
-      hint: rendererReady.error.hint,
-      detail: { phase: "renderer-ready", cause: rendererReady.error }
-    });
-  }
   let resourceFacts;
   try {
     const prepared = await options.prepare?.(app);
@@ -3719,7 +3685,7 @@ async function createToolPreviewHost(options) {
       detail: { phase: bootstrapFailure.phase, cause }
     });
   }
-  const attached = app.renderer.attachWorld(app.world);
+  const attached = app.renderer.attach(app.world);
   if (!attached.ok) {
     unsubscribeAppErrors();
     await app.dispose();
@@ -3980,6 +3946,6 @@ function fitToolPreviewCameraToAabb(aabb, options) {
   };
 }
 
-export { APP_ERROR_HINTS, APP_EXPECTED, APP_PHASE_CATALOG, AppError, EXECUTION_CAPABILITY_NAMES, EXECUTION_REPORT_SCHEMA_VERSION, EXECUTION_REQUESTED_TIERS, EXECUTION_TIERS, LOAD_GAME_ERROR_HINTS, LOAD_GAME_EXPECTED, LoadGameError, assembleAssetRuntime, createApp, createExecutionReport, createToolPreviewEvidence, createToolPreviewHost, createToolPreviewRecipe, ensureFallbackCamera, executionBootstrapHostPlugin, fitToolPreviewCameraToAabb, gameHostPlugin, inputPlugin, isAppError, isExecutionReport, isLoadGameError, joinResourcePreviewEvidence, joinToolPreviewEvidence, loadBootstrapEntry, loadGame, measureCanvasDrawingBuffer, missingExecutionCapabilities, prepareBootstrapEntry, probeExecutionCapabilities, replayToolPreviewCapture, selectExecutionTier, syncCanvasDrawingBuffer, unavailableExecutionCapabilities, validateExecutionBootstrapData, validateToolPreviewTrace };
+export { APP_ERROR_HINTS, APP_EXPECTED, APP_PHASE_CATALOG, AppError, EXECUTION_CAPABILITY_NAMES, EXECUTION_REPORT_SCHEMA_VERSION, EXECUTION_REQUESTED_TIERS, EXECUTION_TIERS, LOAD_GAME_ERROR_HINTS, LOAD_GAME_EXPECTED, LoadGameError, createApp, createExecutionReport, createToolPreviewEvidence, createToolPreviewHost, createToolPreviewRecipe, ensureFallbackCamera, executionBootstrapHostPlugin, fitToolPreviewCameraToAabb, gameHostPlugin, inputPlugin, isAppError, isExecutionReport, isLoadGameError, joinResourcePreviewEvidence, joinToolPreviewEvidence, loadBootstrapEntry, loadGame, measureCanvasDrawingBuffer, missingExecutionCapabilities, ownedRendererPlugin, prepareBootstrapEntry, probeExecutionCapabilities, renderFeatureHostPlugin, renderFeaturePlugin, rendererPlugin, replayToolPreviewCapture, selectExecutionTier, syncCanvasDrawingBuffer, unavailableExecutionCapabilities, validateExecutionBootstrapData, validateToolPreviewTrace };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map