@vgai/editor 0.4.0 → 0.4.1

package/src/command-listener.ts

@@ -6,6 +6,7 @@
  * This module translates them into store method calls.
  */
 
+import type { ViewportShadingMode } from '@engine/render/viewport-shading';
 import { waitForHoldBudget } from '@engine/runtime/debug-bridge';
 import { parseSceneFile, SceneParseError } from '@engine/scene/parse';
 import {
@@ -14,13 +15,18 @@ import {
   captureObjectAssetPreview,
 } from './asset-preview';
 import { getActiveSystems } from './authoring/active-systems';
-import { isAssetDocumentId, openAssetDocument } from './components/asset-documents';
+import {
+  isAssetDocumentId,
+  migrateAssetEditorDocumentId,
+  openAssetDocument,
+} from './components/asset-documents';
 import { openBuildProfilesDocument } from './components/build-documents';
 import { capturePlayComposite } from './composite-screenshot';
 import { connectEvents, reportCommandResult, reportEditorState } from './editor-api';
 import { editorConsole } from './editor-console';
 import { getEditorMode } from './editor-mode';
 import type { AssetKind, EditorStore, HelperVisibility } from './editor-store';
+import { gameViewportShadingMode, setGameDocumentShadingMode } from './game-viewport-state';
 import {
   enterPlayMode,
   exitPlayMode,
@@ -128,7 +134,7 @@ export function collectState(store: EditorStore): Record<string, unknown> {
     showGrid: store.showGrid,
     showHelpers: store.showHelpers,
     showStats: store.showStats,
-    shadingMode: store.shadingMode,
+    shadingMode: store.activeViewportTab === 'game' ? gameViewportShadingMode() : store.shadingMode,
     helperVisibility: { ...store.helperVisibility },
     transformMode: store.transformMode,
     transformSpace: store.transformSpace,
@@ -783,7 +789,7 @@ export async function handleCommand(
     // ALWAYS shows the Inspector — nothing displaces it anymore (§10.3).
     case 'active-tab': {
       const key = cmd['key'] as string;
-      if (key !== '__inspector__') activateWorkspaceDocument(key);
+      if (key !== '__inspector__') activateWorkspaceDocument(migrateAssetEditorDocumentId(key));
       break;
     }
     case 'open-asset-tab':
@@ -797,13 +803,14 @@ export async function handleCommand(
       // false` is only a UI-affordance rule, not a registry invariant; see
       // workspace-document-registry.ts) — so this command must keep the
       // no-op itself. `isAssetDocumentId` is exactly the legacy asset key
-      // vocabulary check (project asset path / `asset-lab:entity:<id>` /
+      // vocabulary check (project asset path / canonical `asset-editor:entity:<id>`
+      // plus compatibility `asset-lab:entity:<id>` /
       // `online:<source>:<id>` — see asset-documents.tsx), so gating on it
       // blocks the pinned `workspace:scene`/`workspace:game` ids (and any
       // story `story:<path>#<name>` id) while preserving the real behavior
       // for actual asset tabs.
       const key = cmd['key'] as string;
-      if (isAssetDocumentId(key)) closeWorkspaceDocument(key);
+      if (isAssetDocumentId(key)) closeWorkspaceDocument(migrateAssetEditorDocumentId(key));
       break;
     }
     case 'toggle-command-palette':
@@ -869,7 +876,11 @@ export async function handleCommand(
       if (store.showStats !== (cmd['enabled'] as boolean)) store.toggleStats();
       break;
     case 'set-shading-mode':
-      store.setShadingMode(cmd['mode'] as 'solid' | 'wireframe' | 'unlit');
+      if (store.activeViewportTab === 'game') {
+        setGameDocumentShadingMode(cmd['mode'] as ViewportShadingMode);
+      } else {
+        store.setShadingMode(cmd['mode'] as ViewportShadingMode);
+      }
       break;
     case 'set-helper-type': {
       const helperType = cmd['helperType'] as keyof HelperVisibility;
@@ -1147,8 +1158,24 @@ export function connectCommandListener(store: EditorStore): () => void {
   }
   const source = connectEvents();
 
+  const reportLatestState = () => void reportEditorState(collectState(store));
+  let storeReportScheduled = false;
+  const reportStoreChange = () => {
+    // One editor action commonly emits several store notifications. Collapse
+    // that synchronous burst into one current snapshot without delaying it a
+    // frame — UI Play/Stop must be visible to `vgai status` immediately even
+    // though no relayed command caused the transition.
+    if (storeReportScheduled) return;
+    storeReportScheduled = true;
+    queueMicrotask(() => {
+      storeReportScheduled = false;
+      reportLatestState();
+    });
+  };
+  const unsubscribeStoreReport = store.subscribe(reportStoreChange);
+
   // Report initial state
-  reportEditorState(collectState(store));
+  reportLatestState();
 
   source.addEventListener('editor-command', (e: MessageEvent) => {
     try {
@@ -1160,7 +1187,7 @@ export function connectCommandListener(store: EditorStore): () => void {
           reportCommandResult(requestId, result.ok, result.error, result.data);
         }
         // Report updated state after command execution
-        reportEditorState(collectState(store));
+        reportLatestState();
       });
     } catch {
       /* ignore malformed events */
@@ -1175,7 +1202,7 @@ export function connectCommandListener(store: EditorStore): () => void {
   // #145 — presence freshness: the state snapshot the server holds is only
   // re-POSTed after commands, so visibility/focus changes between commands
   // would go stale. Report on the three events that change presence.
-  const reportPresence = () => reportEditorState(collectState(store));
+  const reportPresence = reportLatestState;
   document.addEventListener('visibilitychange', reportPresence);
   window.addEventListener('focus', reportPresence);
   window.addEventListener('blur', reportPresence);
@@ -1190,6 +1217,7 @@ export function connectCommandListener(store: EditorStore): () => void {
   window.addEventListener('unhandledrejection', reportAfterError);
 
   return () => {
+    unsubscribeStoreReport();
     document.removeEventListener('visibilitychange', reportPresence);
     window.removeEventListener('focus', reportPresence);
     window.removeEventListener('blur', reportPresence);

package/src/components/ApplicationMenus.tsx

@@ -1,4 +1,3 @@
-import { normalizeToolPlacement } from '@engine/tools/define-tool';
 import { useEffect, useRef, useState, useSyncExternalStore } from 'react';
 import {
   EditorIcon,
@@ -10,14 +9,14 @@ import {
 } from '../design-system';
 import { useEditorStore, useHistoryCommandSnapshot, useHistoryCommands } from '../EditorContext';
 import { getEditorMode } from '../editor-mode';
-import { getProjectOperations, subscribeProjectOperations } from '../project-operations';
+import { getProjectTools, subscribeProjectTools } from '../project-tools';
 import { editorThemeLibrarySnapshot, subscribeEditorThemeLibrary } from '../theme-library';
 import {
   editorThemeSnapshot,
   setEditorThemePreference,
   subscribeEditorTheme,
 } from '../theme-preference';
-import { getGlobalTools, subscribeGlobalTools } from '../tool-loader';
+import { getGlobalToolContributions, subscribeToolContributions } from '../tool-loader';
 import { openUndoHistory } from '../workspace-aux-commands';
 import {
   resetWorkspaceDockLayout,
@@ -29,7 +28,7 @@ import { BUILD_OUTPUT_UTILITY_ID } from '../workspace-utility-commands';
 import { openBuildProfilesDocument } from './build-documents';
 import { openDataAssetsDocument } from './data-documents';
 import { openDebuggerPanel } from './debugger-panel-state';
-import { openProjectOperationsDocument } from './project-operation-documents';
+import { openProjectToolsDocument } from './project-tool-documents';
 import { ThemeManagerDialog } from './ThemeManagerDialog';
 import { openToolDocument } from './tool-documents';
 
@@ -39,17 +38,17 @@ export function ApplicationMenus() {
   const store = useEditorStore();
   const history = useHistoryCommands();
   const historySnapshot = useHistoryCommandSnapshot();
-  const tools = useSyncExternalStore(subscribeGlobalTools, getGlobalTools, getGlobalTools);
+  const tools = useSyncExternalStore(
+    subscribeToolContributions,
+    getGlobalToolContributions,
+    getGlobalToolContributions,
+  );
   const themeId = useSyncExternalStore(
     subscribeEditorTheme,
     editorThemeSnapshot,
     editorThemeSnapshot,
   );
-  const commands = useSyncExternalStore(
-    subscribeProjectOperations,
-    getProjectOperations,
-    getProjectOperations,
-  );
+  const commands = useSyncExternalStore(subscribeProjectTools, getProjectTools, getProjectTools);
   const themeChoices = useSyncExternalStore(
     subscribeEditorThemeLibrary,
     editorThemeLibrarySnapshot,
@@ -193,20 +192,19 @@ export function ApplicationMenus() {
     tools: (
       <>
         {getEditorMode() === 'server' && (
-          <MenuItem onSelect={choose(() => openProjectOperationsDocument(store))}>
-            Project Commands…
-            {commands.operations.length > 0 ? ` (${commands.operations.length})` : ''}
+          <MenuItem onSelect={choose(() => openProjectToolsDocument(store))}>
+            Project Tools…
+            {commands.tools.length > 0 ? ` (${commands.tools.length})` : ''}
           </MenuItem>
         )}
         {getEditorMode() === 'server' && <Separator />}
         {tools.length ? (
           tools.map((tool) => {
-            const placement = normalizeToolPlacement(tool.placement);
             return (
               <MenuItem
                 key={tool.id}
                 onSelect={choose(() => {
-                  if (placement === 'document') openToolDocument(store, tool.id);
+                  if (tool.point === 'workspace.document') openToolDocument(store, tool.id);
                   else showWorkspaceUtility(`tool:${tool.id}`);
                 })}
               >