@volter/editor-game 0.5.65 → 0.5.67

package/src/three/authoring/r3f-design-session.ts

@@ -1,4 +1,4 @@
-import { onAssetReload } from '@volter/editor-core/project-asset-refresh';
+import { onAssetReload } from '@volter/editor-sdk/kit/project-asset-refresh';
 
 /**
  * R3F design session (W4) — mounts an entry-based R3F three world at DESIGN
@@ -61,31 +61,39 @@ import { onAssetReload } from '@volter/editor-core/project-asset-refresh';
  *    published), and the returned disposer.
  */
 
-import { setActiveSystems, updateInstanceSystems } from '@volter/editor-core/authoring/active-systems';
+import { setActiveSystems, updateInstanceSystems } from '@volter/editor-sdk/kit/authoring/active-systems';
 import {
   BoundaryAuthoringAdapter,
   type BoundaryRootInfo,
-} from '@volter/editor-core/authoring/boundary-authoring-adapter';
-import type { CompositeAuthoringAdapter } from '@volter/editor-core/authoring/composite-authoring-adapter';
+} from '@volter/editor-sdk/kit/authoring/boundary-authoring-adapter';
+import type { CompositeAuthoringAdapter } from '@volter/editor-sdk/kit/authoring/composite-authoring-adapter';
 import {
   collaborationSnapshot,
   subscribeCollaborationRevision,
-} from '@volter/editor-core/collaboration-client';
-import { editorConsole } from '@volter/editor-core/editor-console';
-import type { EditorShellStore } from '@volter/editor-core/editor-shell-store';
+} from '@volter/editor-sdk/kit/collaboration-client';
+import { editorConsole } from '@volter/editor-sdk/kit/editor-console';
+import {
+  describeModuleFetch,
+  diagnoseModuleFetch,
+  failedImportEntry,
+} from '@volter/editor-sdk/kit/module-fetch-diagnosis';
+import type { EditorShellStore } from '@volter/editor-threejs/kit/editor-shell-store';
+import { withObservedPhysics } from '../../host/adapter-runtime-bindings';
+import { whenRapierWorldMounts } from '../../services/game-physics';
 import { adjudicateThreeEntry } from '../../host/entry-adjudication';
-import { onPlayTransitionSettled } from '@volter/editor-core/live-transition';
-import { fetchRawGameManifest } from '@volter/editor-core/manifest-project';
-import { getCurrentProject } from '@volter/editor-core/project-manager';
+import { onPlayTransitionSettled } from '@volter/editor-sdk/kit/live-transition';
+import { fetchRawGameManifest } from '@volter/editor-sdk/kit/manifest-project';
+import { getCurrentProject } from '@volter/editor-sdk/kit/active-project';
 import { activeRealmServices } from '../../host/realm-services';
-import { pickGameCamera } from '@volter/editor-core/scene-framing';
-import { tierSourceWriteBackend } from '@volter/editor-core/ui-source/tier-source-write-backend';
+import { pickGameCamera } from '@volter/editor-threejs/kit/scene-framing';
+import { tierSourceWriteBackend } from '@volter/editor-sdk/kit/ui-source/tier-source-write-backend';
 import type {
   MountedThreeRoot,
   RootAdapter,
   SystemAdapters,
 } from '@volter/editor-project/adapter';
-import type { GameThreeHostContext } from '@volter/game-runtime/runtime/host-context';
+import type { GameThreeHostContext } from '../../runtime/host-context';
+import type { ThreeMountedRoot } from '@volter/editor-threejs/adapter/three-contract';
 import { nodeKeyedPhysics } from '@volter/editor-project/adapter';
 import { declaredRoots, rootById } from '@volter/editor-project/adapter/manifest-interpreter';
 import {
@@ -95,11 +103,11 @@ import {
   type NativeSystemsBinding,
   nativeDebugBindingFromEntryModule,
   nativeSystemsBindingFromEntryModule,
-} from '@volter/game-runtime/adapter/native-debug-module';
+} from '../../runtime/adapter/native-debug-module';
 import { createAssetCache } from '@volter/threejs-runtime/assets';
-import { createGameLoop } from '@volter/game-runtime/core/game-loop';
-import { registerThreeRoot } from '@volter/game-runtime/runtime/create-runtime';
-import { createGame, type GameInternal } from '@volter/game-runtime/runtime/game';
+import { createGameLoop } from '../../runtime/core/game-loop';
+import { registerThreeRoot } from '../../runtime/create-runtime';
+import { createGame, type GameInternal } from '../../runtime/game';
 import {
   beginProjectMountEpoch,
   viteUpdateImportPath,
@@ -131,13 +139,13 @@ import {
   type EditModeRootSpec,
   parseEditModeManifest,
   queueEditModeRebuild,
-} from '@volter/editor-core/authoring/edit-mode-authoring';
-import { liveGestureActive, whenLiveGestureIdle } from '@volter/editor-core/authoring/live-gesture-lock';
+} from '@volter/editor-sdk/kit/authoring/edit-mode-authoring';
+import { liveGestureActive, whenLiveGestureIdle } from '@volter/editor-sdk/kit/live-gesture-lock';
 import {
   addMountFailureReport,
   clearMountFailureReport,
   formatMountFailureMessage,
-} from '@volter/editor-core/authoring/mount-failure-report';
+} from '@volter/editor-sdk/kit/mount-failure-report';
 import { SelectionRemountHandoff } from '../../host/authoring/selection-remount-handoff';
 import {
   type RefreshSource,
@@ -145,6 +153,7 @@ import {
 } from '../../host/authoring/source-refresh-revisions';
 import type { R3fSourceAuthoringAdapter } from './r3f-source-authoring-adapter';
 import { isThreeScene } from './three-scene-identity';
+import { evictDreiCaches } from '../drei-asset-caches';
 
 // The world root's stage is recreated when the workspace changes.
 // The outgoing panel restores the editor scene and the incoming panel loads
@@ -178,6 +187,12 @@ export function unresolvedDesignEntryError(
 export function reportDesignMountFailure(worldId: string, err: unknown): string {
   const message = formatMountFailureMessage(err);
   editorConsole.error(`[r3f-design] world "${worldId}" failed to mount: ${message}`, 'authoring');
+  const entry = failedImportEntry(message);
+  if (entry) {
+    void diagnoseModuleFetch(entry).then((diagnosis) =>
+      editorConsole.error(`[r3f-design] world "${worldId}": ${describeModuleFetch(diagnosis)}`, 'authoring'),
+    );
+  }
   addMountFailureReport({
     worldId,
     kind: 'three',
@@ -222,7 +237,8 @@ export function registerR3FDesignRoot(
 ): void {
   registerThreeRoot(game, adapter, mounted, { id: worldId });
   installNativeDebugBindings(game, entryDebug ? [entryDebug] : []);
-  installNativeSystemsBindings(game, entrySystems ? [entrySystems] : []);
+  // The design world's own `@react-three/rapier` world is observed the way Play's is.
+  installNativeSystemsBindings(game, withObservedPhysics(game, entrySystems ? [entrySystems] : []));
 }
 
 /**
@@ -241,10 +257,6 @@ export function registerR3FDesignRoot(
  * promises. It also gets its OWN debug registry (registries are game-scoped),
  * so design-time providers can't collide with the play game's.
  *
- * Input is explicitly DISABLED: `new InputManager()` binds window-level
- * keyboard/mouse listeners in its constructor, and design time is not play
- * (T6.3's invariant). `dispose()` unbinds them — the caller must call it.
- *
  * Its renderer is `createDesignTimeRenderer`, which isolates Fiber configuration
  * and permits real offscreen work without transferring canvas ownership.
  */
@@ -257,7 +269,6 @@ function createDesignHost(renderer: THREE.WebGLRenderer): {
   const borrowedRenderer = createDesignTimeRenderer(canvas, renderer);
   const assets = createAssetCache();
   const game = createGame({ loop: createGameLoop({ update: () => {} }), assets });
-  game.input.setEnabled(false);
   return {
     game,
     host: {
@@ -287,11 +298,11 @@ function rebuildWhenPlayStops(store: EditorShellStore): () => void {
   let disposed = false;
   let requested = false;
   const request = () => {
-    if (disposed || requested || store.playState !== 'stopped') return;
+    if (disposed || requested || store.shell.playState !== 'stopped') return;
     requested = true;
     queueEditModeRebuild();
   };
-  const unsubscribe = store.subscribe(request);
+  const unsubscribe = store.shell.subscribe(request);
   request();
   return () => {
     disposed = true;
@@ -328,7 +339,7 @@ export async function mountR3FDesignSession(
 
   // Mirror design-time-layers' entry guard: while play is already running,
   // mount nothing and wait for Stop's rebuild.
-  if (store.playState !== 'stopped') {
+  if (store.shell.playState !== 'stopped') {
     return rebuildWhenPlayStops(store);
   }
 
@@ -391,7 +402,7 @@ export async function mountR3FDesignSession(
    *  design world is mounted, this session is live, and play is stopped. */
   const publishPlane = (): void => {
     if (publishedSystems || !designGame) return;
-    if (torndown || suspended || store.playState !== 'stopped') return;
+    if (torndown || suspended || store.shell.playState !== 'stopped') return;
     publishedSystems = designGame.systemAdapters;
     setActiveSystems(publishedSystems);
   };
@@ -467,7 +478,7 @@ export async function mountR3FDesignSession(
    * Ownership is `adoptMount`'s, and only after `disposeMounted`.
    */
   interface DesignMount {
-    root: MountedThreeRoot;
+    root: ThreeMountedRoot;
     game: GameInternal;
     disposeHost: () => void;
   }
@@ -496,7 +507,7 @@ export async function mountR3FDesignSession(
     // (Rapier, game debug providers, and future native systems) on
     // `mounted.systems` even though the component registered successfully.
     registerR3FDesignRoot(hostGame, adapterExport, result, worldId, entryDebug, entrySystems);
-    return { root: result, game: hostGame, disposeHost };
+    return { root: result as ThreeMountedRoot, game: hostGame, disposeHost };
   };
 
   /** Install a freshly-mounted design world as THE live one. The previous one
@@ -518,7 +529,7 @@ export async function mountR3FDesignSession(
         publishedSystems = systems;
         updateInstanceSystems(systems);
       }
-      store.notifyIngestEdit();
+      store.shell.notifyIngestEdit();
     });
     // The design Game outlives `mount()` (the world holds its ctx) and must go
     // down with the mount, or every HMR remount leaks another window-listener
@@ -568,21 +579,21 @@ export async function mountR3FDesignSession(
     composite.replaceChild(
       worldId,
       new BoundaryAuthoringAdapter(
-        store,
+        store.shell,
         boundaryInfo(world),
         'R3F design session suspended by play mode — Stop restores it.',
       ),
     );
-    store.notifyIngestEdit();
+    store.shell.notifyIngestEdit();
   };
 
   const failToBoundary = (err: unknown): void => {
     const message = reportDesignMountFailure(worldId, err);
     composite.replaceChild(
       worldId,
-      new BoundaryAuthoringAdapter(store, boundaryInfo(world), message),
+      new BoundaryAuthoringAdapter(store.shell, boundaryInfo(world), message),
     );
-    store.notifyIngestEdit();
+    store.shell.notifyIngestEdit();
   };
 
   // ---------------------------------------------------------- initial mount
@@ -617,10 +628,10 @@ export async function mountR3FDesignSession(
     }
     if (torndown) return () => {};
     // Restart can enter Play while this design import is in flight.
-    if (store.playState !== 'stopped') return rebuildWhenPlayStops(store);
+    if (store.shell.playState !== 'stopped') return rebuildWhenPlayStops(store);
     const first = await mountRoot(loaded.adapter, loaded.entryDebug, loaded.entrySystems);
     adoptMount(first);
-    if (torndown || store.playState !== 'stopped') {
+    if (torndown || store.shell.playState !== 'stopped') {
       disposeMounted();
       return torndown ? () => {} : rebuildWhenPlayStops(store);
     }
@@ -631,12 +642,17 @@ export async function mountR3FDesignSession(
       physics: () => nodeKeyedPhysics(designGame?.systemAdapters.physics),
     });
     composite.replaceChild(worldId, adapter);
+    // A body's colliders appear once the world's `<Physics>` has loaded Rapier;
+    // panels that already read it are told to read again.
+    void whenRapierWorldMounts(first.root.scene as THREE.Object3D).then((mounted) => {
+      if (mounted && !torndown) store.shell.notifyIngestEdit();
+    });
     // The hierarchy can become interactive as soon as the composite child is
     // replaced, while this async mount is still completing. Preserve a user
     // selection made in that window across enterPlayScene(), which clears the
     // store selection while adopting the mounted scene. OID-signature ids are
     // stable across the boundary, so only restore ids the new composite owns.
-    const selectedIds = selectionRemountHandoff.take(store, store.selectedEntityIds);
+    const selectedIds = selectionRemountHandoff.take(store, store.shell.selectedEntityIds);
     // The world's own colour pipeline travels WITH the adoption: this session
     // mounted it against a renderer that draws nothing, so the declaration has
     // to reach the viewport's renderer through the adoption instead (see
@@ -669,10 +685,10 @@ export async function mountR3FDesignSession(
     // from under them on every save. A first look is opened once.
     store.focusOnScene(() => pickGameCamera(null, first.root.scene));
     const alive = selectedIds.filter((id) => composite.hierarchy.node(id) !== null);
-    if (alive.length > 0) store.selectMultiple(alive);
+    if (alive.length > 0) store.shell.selectMultiple(alive);
     clearMountFailureReport(worldId);
     publishPlane();
-    store.notifyIngestEdit();
+    store.shell.notifyIngestEdit();
     editorConsole.log(
       `[r3f-design] world "${worldId}" mounted for design-time authoring (${entry})`,
       'authoring',
@@ -738,12 +754,12 @@ export async function mountR3FDesignSession(
   // ---------------------------------------------------------------- remount
   const remount = async (): Promise<void> => {
     if (torndown || suspended) return;
-    const selectedIds = [...store.selectedEntityIds];
+    const selectedIds = [...store.shell.selectedEntityIds];
     // Same stall watchdog as the initial mount, per stage: after a crashed
     // mount the NEXT remount was observed to hang silently — no "mounted", no
     // "failed" — leaving the world Unavailable with a clean console.
     const startedAtWriteStamp = writeStamp;
-    const historyBusyAtStart = store.projectHistory?.getSnapshot().busy === true;
+    const historyBusyAtStart = store.shell.projectHistory?.getSnapshot().busy === true;
     let stage: 'importing' | 'mounting' = 'importing';
     const stallTimer = setTimeout(() => {
       editorConsole.warn(
@@ -786,7 +802,7 @@ export async function mountR3FDesignSession(
       for (let settle = 0; settle < 50; settle += 1) {
         await whenLiveGestureIdle();
         await whenProjectHistoryIdle();
-        if (!liveGestureActive() && store.projectHistory?.getSnapshot().busy !== true) break;
+        if (!liveGestureActive() && store.shell.projectHistory?.getSnapshot().busy !== true) break;
       }
       settledAt = performance.now();
       if (!torndown && !suspended && writeStamp !== startedAtWriteStamp) {
@@ -822,7 +838,7 @@ export async function mountR3FDesignSession(
       // selection snapped back to A 255 ms after the adopt (Opus
       // reproduction on preview-b53, 2/2 with a non-reverting control; the
       // human typed their Position X into the wrong tree — runhuman pass 128).
-      const selectionAtSwap = new Set(store.selectedEntityIds);
+      const selectionAtSwap = new Set(store.shell.selectedEntityIds);
       restoreEditorScene();
       // The OUTGOING world goes down first, with its OWN host — then the
       // incoming one is adopted. Reversing these disposes the incoming Game.
@@ -883,7 +899,7 @@ export async function mountR3FDesignSession(
       // objects (exitPlayScene cleared the store selection; restore it).
       const restoreIds = selectionChangedMidRemount ? [...selectionAtSwap] : selectedIds;
       const alive = restoreIds.filter((id) => adapter?.hierarchy.node(id) !== null);
-      if (alive.length > 0) store.selectMultiple(alive);
+      if (alive.length > 0) store.shell.selectMultiple(alive);
       // PD-1: this world is mounted again — retract its failure report so the
       // status item (and `vgai status`) can go back to healthy.
       clearMountFailureReport(worldId);
@@ -891,7 +907,7 @@ export async function mountR3FDesignSession(
       // one's), so a stat added by the edit that triggered this remount is
       // readable without entering play.
       publishPlane();
-      store.notifyIngestEdit();
+      store.shell.notifyIngestEdit();
       reportSlowRemount(worldId, remountStartedAt, importedAt, mountedAt, settledAt);
       refreshRevisions.mounted();
       clearTimeout(revisionFallback);
@@ -938,7 +954,7 @@ export async function mountR3FDesignSession(
    *  in-flight work — bounded, so a wedged pipeline degrades to the stale-drop
    *  guard instead of holding the swap forever. */
   const whenProjectHistoryIdle = async (): Promise<void> => {
-    const history = store.projectHistory;
+    const history = store.shell.projectHistory;
     if (!history) return;
     const deadline = Date.now() + 10_000;
     while (history.getSnapshot().busy && Date.now() < deadline) {
@@ -988,7 +1004,7 @@ export async function mountR3FDesignSession(
       );
       return;
     }
-    const history = store.projectHistory;
+    const history = store.shell.projectHistory;
     if (!history) return;
     const snapshot = history.getSnapshot();
     const last = snapshot.canUndo ? snapshot.transactions[snapshot.cursor - 1] : undefined;
@@ -1042,9 +1058,11 @@ export async function mountR3FDesignSession(
     }, 80);
   };
 
-  const stopAssetReload = onAssetReload(() => {
-    writeStamp += 1;
-    scheduleRemount();
+  const stopAssetReload = onAssetReload((paths) => {
+    void evictDreiCaches(paths).then(() => {
+      writeStamp += 1;
+      scheduleRemount();
+    });
   });
 
   const hot = import.meta.hot;
@@ -1081,7 +1099,7 @@ export async function mountR3FDesignSession(
       if (!refreshRevisions.needsRemount()) clearTimeout(revisionFallback);
       // The native adapter observes child additions/removals. Property-only
       // refreshes still need an inspector/viewport notification.
-      store.notifyIngestEdit();
+      store.shell.notifyIngestEdit();
     };
     hot.on('vgai:r3f-entry-update', onUpdate);
     hot.on('vgai:r3f-refresh-source', onSource);
@@ -1119,16 +1137,16 @@ export async function mountR3FDesignSession(
   // ------------------------------------------------------------ play handoff
   let stopRebuildRequested = false;
   let suspendQueued = false;
-  unsubStore = store.subscribe(() => {
+  unsubStore = store.shell.subscribe(() => {
     if (torndown) return;
     // Seat handover, BEFORE the deferred visual suspend below: play mode
     // registers under its own mount id, so holding both seats would make an
     // unaddressed `vgai eval` ambiguous. This fires at
     // `store.setPlayState('playing')`, which precedes play's own
     // `setActiveSystems` — so the two never overlap in either direction.
-    if (store.playState === 'stopped') publishPlane();
+    if (store.shell.playState === 'stopped') publishPlane();
     else withdrawPlane();
-    if (!suspended && !suspendQueued && store.playState !== 'stopped') {
+    if (!suspended && !suspendQueued && store.shell.playState !== 'stopped') {
       // Keep the adopted design scene alive UNDER the play-entry transition.
       // Suspending at the playState flip swapped the viewport back to the
       // placeholder editor scene mid-flight — the whole screen flashed the
@@ -1140,12 +1158,12 @@ export async function mountR3FDesignSession(
       suspendQueued = true;
       onPlayTransitionSettled(() => {
         suspendQueued = false;
-        if (torndown || suspended || store.playState === 'stopped') return;
+        if (torndown || suspended || store.shell.playState === 'stopped') return;
         suspendForPlay();
       });
       return;
     }
-    if (suspended && !stopRebuildRequested && store.playState === 'stopped') {
+    if (suspended && !stopRebuildRequested && store.shell.playState === 'stopped') {
       stopRebuildRequested = true;
       queueEditModeRebuild();
     }
@@ -1165,8 +1183,8 @@ export async function mountR3FDesignSession(
     // changes) should preserve editor-global selection. Play suspension is a
     // different scene lifecycle and deliberately keeps exitPlayScene's normal
     // clearing semantics.
-    if (!suspended && store.playState === 'stopped' && store.selectedEntityIds.size > 0) {
-      selectionRemountHandoff.remember(store, store.selectedEntityIds);
+    if (!suspended && store.shell.playState === 'stopped' && store.shell.selectedEntityIds.size > 0) {
+      selectionRemountHandoff.remember(store, store.shell.selectedEntityIds);
     }
     restoreEditorScene();
     disposeMounted();