@opengeni/react 0.12.0 → 0.13.0

package/src/hooks/use-turn-queue.ts

@@ -1,117 +1,77 @@
-import type { SessionEvent, SessionTurn, UpdateSessionTurnRequest } from "@opengeni/sdk";
+import type { SessionEvent, SessionQueueSnapshot, SessionTurn } from "@opengeni/sdk";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useOpenGeni, type ClientOverride } from "../provider";
-import { useDebouncedCallback, useMutationRunner, useSessionEventTrigger, type SessionEventFeedOptions } from "./internal";
-
-/** Event types that change the turn queue (queue/edit/reorder/claim/finish). */
+import {
+  useDebouncedCallback,
+  useMutationRunner,
+  useSessionEventTrigger,
+  type SessionEventFeedOptions,
+} from "./internal";
+
+/** Events that can change the authoritative prompt queue or its pause gates. */
 export function isTurnQueueEvent(event: Pick<SessionEvent, "type">): boolean {
-  return event.type.startsWith("turn.");
-}
-
-/** Queued turns in execution order (position, then creation time). */
-export function queueFromTurns(turns: SessionTurn[]): SessionTurn[] {
-  return turns
-    .filter((turn) => turn.status === "queued")
-    .sort((a, b) => a.position - b.position || a.createdAt.localeCompare(b.createdAt) || a.id.localeCompare(b.id));
-}
-
-/** The turn currently holding the session (running or awaiting approval). */
-export function activeTurnFromTurns(turns: SessionTurn[]): SessionTurn | null {
-  return turns.find((turn) => turn.status === "running" || turn.status === "requires_action") ?? null;
-}
-
-/** Optimistic projection of a queued-turn edit. */
-export function applyTurnEdit(turns: SessionTurn[], turnId: string, update: UpdateSessionTurnRequest): SessionTurn[] {
-  return turns.map((turn) => {
-    if (turn.id !== turnId || turn.status !== "queued") {
-      return turn;
-    }
-    return {
-      ...turn,
-      ...(update.prompt !== undefined ? { prompt: update.prompt } : {}),
-      ...(update.resources !== undefined ? { resources: update.resources } : {}),
-      ...(update.tools !== undefined ? { tools: update.tools } : {}),
-      ...(update.model !== undefined ? { model: update.model } : {}),
-      ...(update.reasoningEffort !== undefined ? { reasoningEffort: update.reasoningEffort } : {}),
-      ...(update.sandboxBackend !== undefined ? { sandboxBackend: update.sandboxBackend } : {}),
-      ...(update.metadata !== undefined ? { metadata: update.metadata } : {}),
-    };
-  });
-}
-
-/**
- * Optimistic projection of a reorder, mirroring the server: the listed
- * queued turns get positions 1..n in the given order; everything else keeps
- * its position.
- */
-export function applyTurnReorder(turns: SessionTurn[], turnIds: string[]): SessionTurn[] {
-  const positions = new Map(turnIds.map((turnId, index) => [turnId, index + 1] as const));
-  return turns.map((turn) => {
-    const position = positions.get(turn.id);
-    return position !== undefined && turn.status === "queued" ? { ...turn, position } : turn;
-  });
-}
-
-/** Optimistic projection of a queued-turn delete (server marks it cancelled). */
-export function applyTurnRemoval(turns: SessionTurn[], turnId: string): SessionTurn[] {
-  return turns.map((turn) => (turn.id === turnId && turn.status === "queued" ? { ...turn, status: "cancelled" as const } : turn));
+  return (
+    event.type.startsWith("turn.") ||
+    event.type.startsWith("session.queue.") ||
+    event.type.startsWith("session.control.") ||
+    event.type.startsWith("workspace.inference.")
+  );
 }
 
-export type UseTurnQueueOptions = ClientOverride & SessionEventFeedOptions & {
-  /** Optional safety-net polling (ms). Off by default — turn.* events drive updates. */
-  pollIntervalMs?: number | undefined;
-};
+export type UseTurnQueueOptions = ClientOverride &
+  SessionEventFeedOptions & {
+    pollIntervalMs?: number | undefined;
+  };
 
 export type UseTurnQueueResult = {
-  /** All turns the API returned (history + queue), newest server view. */
-  turns: SessionTurn[];
-  /** Queued turns in execution order — render this as the editable queue. */
+  snapshot: SessionQueueSnapshot | null;
+  /** Human/API prompts exactly in server execution order. Never client-sorted. */
   queue: SessionTurn[];
-  /** The running / requires_action turn, if any. */
-  activeTurn: SessionTurn | null;
+  controlState: SessionQueueSnapshot["controlState"] | null;
+  controlGeneration: number | null;
+  workspaceInferenceState: SessionQueueSnapshot["workspaceInferenceState"] | null;
+  workspaceInferenceGeneration: number | null;
+  workspaceRunExceptionGeneration: number | null;
   loading: boolean;
   error: Error | null;
   refresh: () => Promise<void>;
-  /** Edit a queued turn (optimistic; rolls back via refetch on failure). */
-  editTurn: (turnId: string, update: UpdateSessionTurnRequest) => Promise<SessionTurn | null>;
-  /** Reorder the queue to the given queued-turn id order (optimistic). */
-  reorderTurns: (turnIds: string[]) => Promise<SessionTurn[] | null>;
-  /** Delete (cancel) a queued turn before it is claimed (optimistic). */
-  removeTurn: (turnId: string) => Promise<SessionTurn | null>;
-  /** True while an edit/reorder/remove is in flight. */
+  /** Delete a waiting prompt before the worker claims it. */
+  removeTurn: (turnId: string) => Promise<boolean>;
   mutating: boolean;
-  /** Last failed mutation, until the next mutation or clear. */
   mutationError: Error | null;
   clearMutationError: () => void;
 };
 
 /**
- * The live turn queue — the heart of the queue-by-default interaction model.
- * Messages sent mid-turn stack up here, visible and editable/reorderable/
- * deletable until the worker claims them. Updates arrive over the session
- * event stream (`turn.*`), either shared via `options.events` (pass the log
- * from `useSessionEvents` to reuse its connection) or a dedicated tail
- * stream. All mutations apply optimistically and reconcile with the server.
+ * The single authoritative waiting-prompt queue. The server owns ordering; the
+ * client renders the returned array verbatim and supports deletion only.
  */
-export function useTurnQueue(sessionId: string | null | undefined, options: UseTurnQueueOptions = {}): UseTurnQueueResult {
+export function useTurnQueue(
+  sessionId: string | null | undefined,
+  options: UseTurnQueueOptions = {},
+): UseTurnQueueResult {
   const { client, workspaceId } = useOpenGeni(options);
   const enabled = (options.enabled ?? true) && Boolean(sessionId);
-  const [turns, setTurns] = useState<SessionTurn[]>([]);
+  const [snapshot, setSnapshot] = useState<SessionQueueSnapshot | null>(null);
   const [loading, setLoading] = useState(enabled);
   const [error, setError] = useState<Error | null>(null);
-  const mutation = useMutationRunner();
+  const { run, mutating, mutationError, clearMutationError } = useMutationRunner();
   const generation = useRef(0);
   const targetKeyRef = useRef<string | null>(null);
+  const snapshotRef = useRef<SessionQueueSnapshot | null>(null);
+
+  const replaceSnapshot = useCallback((next: SessionQueueSnapshot | null): void => {
+    snapshotRef.current = next;
+    setSnapshot(next);
+  }, []);
 
   const load = useCallback(async (): Promise<void> => {
-    if (!sessionId) {
-      return;
-    }
+    if (!sessionId) return;
     const ticket = ++generation.current;
     try {
-      const fetched = await client.listTurns(workspaceId, sessionId);
+      const fetched = await client.getQueue(workspaceId, sessionId);
       if (ticket === generation.current) {
-        setTurns(fetched);
+        replaceSnapshot(fetched);
         setError(null);
         setLoading(false);
       }
@@ -121,14 +81,13 @@ export function useTurnQueue(sessionId: string | null | undefined, options: UseT
         setLoading(false);
       }
     }
-  }, [client, workspaceId, sessionId]);
+  }, [client, workspaceId, sessionId, replaceSnapshot]);
 
-  // Reset when the target session changes; initial load + optional polling.
   useEffect(() => {
     const targetKey = `${workspaceId}\u0000${sessionId ?? ""}`;
     if (targetKeyRef.current !== targetKey) {
       targetKeyRef.current = targetKey;
-      setTurns([]);
+      replaceSnapshot(null);
       setError(null);
     }
     if (!enabled) {
@@ -148,82 +107,50 @@ export function useTurnQueue(sessionId: string | null | undefined, options: UseT
       clearInterval(timer);
       generation.current += 1;
     };
-  }, [load, enabled, workspaceId, sessionId, options.pollIntervalMs]);
+  }, [load, enabled, workspaceId, sessionId, options.pollIntervalMs, replaceSnapshot]);
 
-  // Live updates: any turn.* event re-syncs the queue (debounced).
   const scheduleRefresh = useDebouncedCallback(() => void load());
   useSessionEventTrigger(client, workspaceId, sessionId, isTurnQueueEvent, scheduleRefresh, {
     enabled,
     ...(options.events !== undefined ? { events: options.events } : {}),
   });
 
-  const editTurn = useCallback(
-    async (turnId: string, update: UpdateSessionTurnRequest): Promise<SessionTurn | null> => {
-      if (!sessionId) {
-        return null;
-      }
-      setTurns((current) => applyTurnEdit(current, turnId, update));
-      const result = await mutation.run(() => client.updateQueuedTurn(workspaceId, sessionId, turnId, update));
-      if (result) {
-        setTurns((current) => current.map((turn) => (turn.id === result.id ? result : turn)));
-      } else {
-        void load();
-      }
-      return result;
-    },
-    [client, workspaceId, sessionId, mutation.run, load],
-  );
-
-  const reorderTurns = useCallback(
-    async (turnIds: string[]): Promise<SessionTurn[] | null> => {
-      if (!sessionId || turnIds.length === 0) {
-        return null;
-      }
-      setTurns((current) => applyTurnReorder(current, turnIds));
-      const result = await mutation.run(() => client.reorderQueuedTurns(workspaceId, sessionId, turnIds));
-      if (result) {
-        // The server returns the queued turns; merge them over local state.
-        setTurns((current) => {
-          const bySId = new Map(result.map((turn) => [turn.id, turn] as const));
-          return current.map((turn) => bySId.get(turn.id) ?? turn);
-        });
-      } else {
-        void load();
-      }
-      return result;
-    },
-    [client, workspaceId, sessionId, mutation.run, load],
-  );
-
   const removeTurn = useCallback(
-    async (turnId: string): Promise<SessionTurn | null> => {
-      if (!sessionId) {
-        return null;
-      }
-      setTurns((current) => applyTurnRemoval(current, turnId));
-      const result = await mutation.run(() => client.deleteQueuedTurn(workspaceId, sessionId, turnId));
-      if (result) {
-        setTurns((current) => current.map((turn) => (turn.id === result.id ? result : turn)));
-      } else {
+    async (turnId: string): Promise<boolean> => {
+      if (!sessionId) return false;
+      const current = snapshotRef.current;
+      const item = current?.items.find((turn) => turn.id === turnId);
+      if (!current || !item) return false;
+      const result = await run(() =>
+        client.cancelQueueItem(workspaceId, sessionId, turnId, {
+          expectedQueueVersion: current.version,
+          expectedItemVersion: item.version,
+        }),
+      );
+      if (!result) {
         void load();
+        return false;
       }
-      return result;
+      replaceSnapshot(result.snapshot);
+      return true;
     },
-    [client, workspaceId, sessionId, mutation.run, load],
+    [client, workspaceId, sessionId, run, load, replaceSnapshot],
   );
 
   return {
-    turns,
-    queue: queueFromTurns(turns),
-    activeTurn: activeTurnFromTurns(turns),
+    snapshot,
+    queue: snapshot?.items ?? [],
+    controlState: snapshot?.controlState ?? null,
+    controlGeneration: snapshot?.controlGeneration ?? null,
+    workspaceInferenceState: snapshot?.workspaceInferenceState ?? null,
+    workspaceInferenceGeneration: snapshot?.workspaceInferenceGeneration ?? null,
+    workspaceRunExceptionGeneration: snapshot?.workspaceRunExceptionGeneration ?? null,
     loading,
     error,
     refresh: load,
-    editTurn,
-    reorderTurns,
     removeTurn,
-    mutating: mutation.mutating,
-    mutationError: mutation.mutationError,
-    clearMutationError: mutation.clearMutationError,
+    mutating,
+    mutationError,
+    clearMutationError,
   };
 }

package/src/hooks/use-windowed-sections.ts

@@ -0,0 +1,204 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+
+/* ----------------------------------------------------------------------------
+   Windowed sections — variable-height file-section virtualization.
+
+   The Changes tab stacks N file diffs in one scroll pane. Mounting N Shiki
+   highlighters (Pierre's `PatchDiff`) at once is the exact wart this replaces,
+   so we mount only the sections inside the visible window ± overscan and reserve
+   the rest as empty space (dossier §10.7, D2).
+
+   Why NOT `virtua` here (unlike the file tree/rail): Pierre renders each diff in
+   a shadow DOM with its own internal overflow/virtualization, so an outer
+   measuring virtualizer can read a collapsed or fixed height and lay sections
+   out wrong (dossier risk #6). This hook windows by mounting/unmounting whole
+   file sections off a scroll offset and a per-section height ESTIMATE (refined
+   by measurement when a real browser provides it), which never depends on
+   Pierre reporting its own height — and the math is pure + deterministic, so
+   D2 is provable in both happy-dom (drive scrollTop/clientHeight) and a real
+   browser (Playwright, the verification-matrix path).
+   -------------------------------------------------------------------------- */
+
+export type WindowRange = {
+  /** First mounted index (inclusive). */
+  start: number;
+  /** One past the last mounted index (exclusive). */
+  end: number;
+};
+
+/**
+ * Pure windowing math: given each section's height (px), the scroll offset, the
+ * viewport height, and an overscan count, return the `[start, end)` index window
+ * to mount. Robust to a zero viewport (a headless/pre-layout pass) — it then
+ * mounts a small overscan window anchored at the item under `scrollTop` rather
+ * than the whole list.
+ */
+export function computeWindowRange(
+  heights: readonly number[],
+  scrollTop: number,
+  viewport: number,
+  overscan: number,
+): WindowRange {
+  const n = heights.length;
+  if (n === 0) return { start: 0, end: 0 };
+  const top = Math.max(scrollTop, 0);
+  const bottom = top + Math.max(viewport, 0);
+
+  let firstVisible = -1;
+  let lastVisible = -1;
+  let acc = 0;
+  let anchor = 0; // the item containing `scrollTop` — the zero-viewport fallback
+  for (let i = 0; i < n; i++) {
+    const secTop = acc;
+    const secBottom = secTop + Math.max(heights[i] ?? 0, 0);
+    if (secTop <= top) anchor = i;
+    // A section is visible when it overlaps [top, bottom); with viewport 0 the
+    // half-open interval is empty, so nothing matches and we fall back to anchor.
+    if (secBottom > top && secTop < bottom) {
+      if (firstVisible === -1) firstVisible = i;
+      lastVisible = i;
+    }
+    acc = secBottom;
+  }
+
+  if (firstVisible === -1) {
+    firstVisible = anchor;
+    lastVisible = anchor;
+  }
+
+  return {
+    start: Math.max(0, firstVisible - overscan),
+    end: Math.min(n, lastVisible + 1 + overscan),
+  };
+}
+
+export type WindowedSections = {
+  /** Attach to the scroll container. */
+  scrollRef: React.RefObject<HTMLDivElement | null>;
+  /** The mounted window `[start, end)`. */
+  range: WindowRange;
+  /** Prefix offsets: `offsets[i]` is the top px of section `i`; `offsets[count]`
+   *  is the total content height. */
+  offsets: number[];
+  /** Total content height (px) — set on the spacer so scroll length is stable. */
+  totalHeight: number;
+  /** Report a MOUNTED section's real height (px) so the layout refines as async
+   *  content — e.g. Pierre's Shiki render — grows. Drive it from a ResizeObserver;
+   *  a zero/idle value is ignored so a headless pass keeps the estimate. */
+  measure: (index: number, height: number) => void;
+  /** Scroll section `index` to the top of the pane (the rail-jump). */
+  scrollToIndex: (index: number) => void;
+};
+
+/**
+ * Variable-height section windowing over a scroll container. Seeds every section
+ * to `estimateHeight(i)`, mounts only `range`, and refines heights from real
+ * measurements (a no-op in a zero-layout headless pass, which keeps the estimate
+ * — deterministic for tests). Pass a STABLE `estimateHeight` (wrap in useCallback).
+ */
+export function useWindowedSections(opts: {
+  count: number;
+  estimateHeight: (index: number) => number;
+  overscan?: number | undefined;
+}): WindowedSections {
+  const { count, estimateHeight, overscan = 3 } = opts;
+  const scrollRef = useRef<HTMLDivElement | null>(null);
+
+  const [heights, setHeights] = useState<number[]>(() =>
+    Array.from({ length: count }, (_, i) => estimateHeight(i)),
+  );
+
+  // Re-seed heights when the section count changes (a new diff arrives), keeping
+  // any already-measured heights for surviving indices.
+  useEffect(() => {
+    setHeights((prev) => {
+      if (prev.length === count) return prev;
+      return Array.from({ length: count }, (_, i) => prev[i] ?? estimateHeight(i));
+    });
+    // estimateHeight is expected stable; count is the real trigger.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [count]);
+
+  const heightsRef = useRef(heights);
+  heightsRef.current = heights;
+
+  const [range, setRange] = useState<WindowRange>(() => ({
+    start: 0,
+    end: Math.min(count, overscan + 1),
+  }));
+
+  const recompute = useCallback(() => {
+    const el = scrollRef.current;
+    if (!el) return;
+    const next = computeWindowRange(heightsRef.current, el.scrollTop, el.clientHeight, overscan);
+    setRange((prev) => (prev.start === next.start && prev.end === next.end ? prev : next));
+  }, [overscan]);
+
+  // Recompute on scroll (rAF-coalesced) and on container resize.
+  useEffect(() => {
+    const el = scrollRef.current;
+    if (!el) return;
+    let raf = 0;
+    const onScroll = () => {
+      if (raf) return;
+      raf =
+        typeof requestAnimationFrame === "function"
+          ? requestAnimationFrame(() => {
+              raf = 0;
+              recompute();
+            })
+          : (recompute(), 0);
+    };
+    el.addEventListener("scroll", onScroll, { passive: true });
+    const ro = typeof ResizeObserver !== "undefined" ? new ResizeObserver(() => recompute()) : null;
+    ro?.observe(el);
+    recompute();
+    return () => {
+      el.removeEventListener("scroll", onScroll);
+      ro?.disconnect();
+      if (raf && typeof cancelAnimationFrame === "function") cancelAnimationFrame(raf);
+    };
+  }, [recompute, count]);
+
+  const measure = useCallback((index: number, height: number) => {
+    if (height <= 0) return; // zero-layout pass — keep the estimate
+    setHeights((prev) => {
+      if (Math.abs((prev[index] ?? 0) - height) < 1) return prev;
+      const next = prev.slice();
+      next[index] = height;
+      return next;
+    });
+  }, []);
+
+  const offsets = useMemo(() => {
+    const out = new Array<number>(count + 1);
+    out[0] = 0;
+    for (let i = 0; i < count; i++) out[i + 1] = (out[i] ?? 0) + Math.max(heights[i] ?? 0, 0);
+    return out;
+  }, [heights, count]);
+
+  // A measured height can shift the window (e.g. estimates were short) — keep the
+  // mounted set in sync without waiting for the next scroll.
+  useEffect(() => {
+    recompute();
+  }, [offsets, recompute]);
+
+  const scrollToIndex = useCallback(
+    (index: number) => {
+      const el = scrollRef.current;
+      if (!el) return;
+      const clamped = Math.max(0, Math.min(count - 1, index));
+      el.scrollTop = offsets[clamped] ?? 0;
+    },
+    [offsets, count],
+  );
+
+  return {
+    scrollRef,
+    range,
+    offsets,
+    totalHeight: offsets[count] ?? 0,
+    measure,
+    scrollToIndex,
+  };
+}