@1agh/maude 1.4.1 → 1.4.2

package/apps/studio/canvas-lib.tsx

@@ -3200,6 +3200,21 @@ export function PhotoPreviewBridge() {
   // clobbering a NEWER edit that already resolved first.
   const tokenRef = useRef<Map<string, number>>(new Map());
   const bakeTimers = useRef<Map<string, ReturnType<typeof setTimeout>>>(new Map());
+  // Per-asset FETCH generation — the same guard one step earlier. Two synced
+  // edits in a row start two sidecar fetches, and the older answer can arrive
+  // last: applying it put the previous edit back on screen while every disk had
+  // the newer one (surface run 2026-09-16, L13 on the hub: shown, then
+  // reverted). A live preview counts as newer than any fetch in flight.
+  const fetchGenRef = useRef<Map<string, number>>(new Map());
+  const nextFetchGen = useCallback((asset: string): number => {
+    const g = (fetchGenRef.current.get(asset) ?? 0) + 1;
+    fetchGenRef.current.set(asset, g);
+    return g;
+  }, []);
+  const isLatestFetch = useCallback(
+    (asset: string, g: number): boolean => fetchGenRef.current.get(asset) === g,
+    []
+  );
 
   const bake = useCallback((asset: string, original: string, edit: PhotoEdit) => {
     const token = (tokenRef.current.get(asset) ?? 0) + 1;
@@ -3231,6 +3246,8 @@ export function PhotoPreviewBridge() {
       clearTimeout(timers.get(asset));
       if (!edit || isDefaultEdit(edit)) {
         timers.delete(asset);
+        // A bake already rendering an earlier edit must not land over this.
+        tokenRef.current.set(asset, (tokenRef.current.get(asset) ?? 0) + 1);
         setPhotoElSrc(el, original);
         return;
       }
@@ -3270,17 +3287,20 @@ export function PhotoPreviewBridge() {
         }
       }
       if (!asset) return; // no photo on this canvas uses that asset
-      fetch(`/_api/photo-edit?asset=${encodeURIComponent(asset)}`)
+      const target = asset;
+      const g = nextFetchGen(target);
+      fetch(`/_api/photo-edit?asset=${encodeURIComponent(target)}`)
         .then((r) => (r.ok ? r.json() : null))
         .then((edit) => {
+          if (!isLatestFetch(target, g)) return; // a newer answer owns the render
           // A deleted/reset edit applies as null → restores the original src.
-          apply(asset as string, edit && !isDefaultEdit(edit) ? (edit as PhotoEdit) : null);
+          apply(target, edit && !isDefaultEdit(edit) ? (edit as PhotoEdit) : null);
         })
         .catch(() => {});
     };
     document.addEventListener('maude:photo-edit-refreshed', onRefreshed);
     return () => document.removeEventListener('maude:photo-edit-refreshed', onRefreshed);
-  }, [apply]);
+  }, [apply, nextFetchGen, isLatestFetch]);
 
   useEffect(() => {
     const onMsg = (e: MessageEvent) => {
@@ -3304,11 +3324,12 @@ export function PhotoPreviewBridge() {
       if (m.dgn !== 'photo-preview' || typeof m.asset !== 'string') return;
       const asset = m.asset;
       const edit = (m.edit ?? null) as PhotoEdit | null;
+      nextFetchGen(asset);
       apply(asset, edit);
     };
     window.addEventListener('message', onMsg);
     return () => window.removeEventListener('message', onMsg);
-  }, [apply]);
+  }, [apply, nextFetchGen]);
   // Boot-time (+ ongoing) hydration from the PERSISTED sidecar, not just the
   // live `photo-preview` message above. Without this, a saved PhotoEdit is
   // invisible after anything that re-mounts the canvas doc (Cmd+R, an
@@ -3342,10 +3363,11 @@ export function PhotoPreviewBridge() {
         if (!asset || attempted.has(asset)) continue;
         if (++scanned > MAX_SCAN_PER_PASS) break;
         attempted.add(asset);
+        const g = nextFetchGen(asset);
         fetch(`/_api/photo-edit?asset=${encodeURIComponent(asset)}`)
           .then((r) => (r.ok ? r.json() : null))
           .then((edit) => {
-            if (cancelled || !edit || isDefaultEdit(edit)) return;
+            if (cancelled || !isLatestFetch(asset, g) || !edit || isDefaultEdit(edit)) return;
             apply(asset, edit);
           })
           .catch(() => {});
@@ -3367,7 +3389,7 @@ export function PhotoPreviewBridge() {
       cancelAnimationFrame(raf);
       observer.disconnect();
     };
-  }, [apply]);
+  }, [apply, nextFetchGen, isLatestFetch]);
   return null; // mutates the real elements directly — no visible DOM of its own.
 }
 PhotoPreviewBridge.displayName = 'PhotoPreviewBridge';

package/apps/studio/client/app.jsx

@@ -12,6 +12,7 @@ import { createRoot } from 'react-dom/client';
 // import that Bun erases), so this pulls only string constants into the client
 // bundle — no React, no input-router. See the tool-cursor handler below.
 import { resolveToolCursor } from '../canvas-cursors.ts';
+import { commandForEnter, matchCommands } from './command-palette-match.js';
 import {
   defaultScopeForFormat,
   isScopeValidForFormat,
@@ -878,15 +879,7 @@ function CommandPalette({ open, onClose, actions }) {
       ?.querySelector('.st-pal-item.is-active')
       ?.scrollIntoView({ block: 'nearest' });
   }, [active]);
-  const filtered = useMemo(() => {
-    const needle = q.trim().toLowerCase();
-    if (!needle) return actions;
-    return actions.filter(
-      (a) =>
-        a.label.toLowerCase().includes(needle) ||
-        (a.group && a.group.toLowerCase().includes(needle))
-    );
-  }, [q, actions]);
+  const filtered = useMemo(() => matchCommands(actions, q), [q, actions]);
   useEffect(() => {
     if (active >= filtered.length) setActive(0);
   }, [filtered.length, active]);
@@ -925,7 +918,8 @@ function CommandPalette({ open, onClose, actions }) {
                 setActive((i) => Math.max(0, i - 1));
               } else if (e.key === 'Enter') {
                 e.preventDefault();
-                if (filtered[active]) run(filtered[active]);
+                const pick = commandForEnter(actions, q, e.currentTarget.value, active);
+                if (pick) run(pick);
               }
             }}
           />

package/apps/studio/client/command-palette-match.js

@@ -0,0 +1,35 @@
+// command-palette-match.js — which ⌘K command a query names.
+//
+// Kept out of app.jsx so the one decision that matters — what Enter runs —
+// can be tested on its own.
+
+/** The commands a query matches, in list order (label or group substring). */
+export function matchCommands(actions, query) {
+  const needle = String(query ?? '')
+    .trim()
+    .toLowerCase();
+  if (!needle) return actions;
+  return actions.filter(
+    (a) => a.label.toLowerCase().includes(needle) || (a.group && a.group.toLowerCase().includes(needle))
+  );
+}
+
+/**
+ * The command Enter runs.
+ *
+ * WHAT IS IN THE BOX, not what the last render saw. A query typed or pasted
+ * and confirmed at once can reach Enter before the list re-rendered for it;
+ * the rendered list is then the unfiltered one and its first row — "New brief
+ * board" — ran instead of the command that was asked for (surface run
+ * 2026-09-16, "New video" on the hub). When the box and the rendered query
+ * disagree, the box wins and its first match runs; when they agree, the
+ * highlighted row does.
+ */
+export function commandForEnter(actions, renderedQuery, liveQuery, activeIndex) {
+  const norm = (s) =>
+    String(s ?? '')
+      .trim()
+      .toLowerCase();
+  if (norm(liveQuery) !== norm(renderedQuery)) return matchCommands(actions, liveQuery)[0] ?? null;
+  return matchCommands(actions, renderedQuery)[activeIndex] ?? null;
+}