@zakstam/codex-local-component 0.1.2 → 0.2.0

package/dist/react/useCodexStreamOverlay.js

@@ -1,24 +1,56 @@
 "use client";
 import { useQuery } from "convex/react";
 import { useEffect, useState } from "react";
-function applyDeltaBatch(state, deltas) {
+function applyDeltaBatch(state, payload) {
+    const { deltas, streamWindows, nextCheckpoints } = payload;
     if (deltas.length === 0) {
-        return state;
+        const nextOnly = { ...state.cursorsByStreamId };
+        const resetStreamIds = new Set(streamWindows
+            .filter((window) => window.status === "rebased" || window.status === "stale")
+            .map((window) => window.streamId));
+        const nextDeltas = state.deltas.filter((delta) => !resetStreamIds.has(delta.streamId));
+        for (const window of streamWindows) {
+            if (window.status !== "ok") {
+                nextOnly[window.streamId] = window.serverCursorStart;
+            }
+        }
+        for (const checkpoint of nextCheckpoints) {
+            nextOnly[checkpoint.streamId] = Math.max(nextOnly[checkpoint.streamId] ?? 0, checkpoint.cursor);
+        }
+        if (nextCheckpoints.length === 0 && resetStreamIds.size === 0) {
+            return state;
+        }
+        return { ...state, cursorsByStreamId: nextOnly, deltas: nextDeltas };
     }
     const nextCursors = { ...state.cursorsByStreamId };
-    const nextDeltas = [...state.deltas];
+    const resetStreamIds = new Set(streamWindows
+        .filter((window) => window.status === "rebased" || window.status === "stale")
+        .map((window) => window.streamId));
+    let nextDeltas = state.deltas.filter((delta) => !resetStreamIds.has(delta.streamId));
+    for (const window of streamWindows) {
+        if (window.status !== "ok") {
+            nextCursors[window.streamId] = window.serverCursorStart;
+        }
+    }
     const sorted = [...deltas].sort((a, b) => a.cursorEnd - b.cursorEnd);
     for (const delta of sorted) {
         const currentCursor = nextCursors[delta.streamId] ?? 0;
         if (delta.cursorEnd <= currentCursor) {
             continue;
         }
-        if (delta.cursorStart !== currentCursor) {
+        if (delta.cursorStart > currentCursor) {
+            nextDeltas = nextDeltas.filter((existing) => existing.streamId !== delta.streamId);
+            nextCursors[delta.streamId] = delta.cursorStart;
+        }
+        else if (delta.cursorStart < currentCursor) {
             continue;
         }
         nextDeltas.push(delta);
         nextCursors[delta.streamId] = delta.cursorEnd;
     }
+    for (const checkpoint of nextCheckpoints) {
+        nextCursors[checkpoint.streamId] = Math.max(nextCursors[checkpoint.streamId] ?? 0, checkpoint.cursor);
+    }
     return {
         threadId: state.threadId,
         cursorsByStreamId: nextCursors,
@@ -58,13 +90,19 @@ export function useCodexStreamOverlay(query, args, enabled, options) {
                 })),
             },
         });
-    const newDeltas = streamDeltaQuery?.streams?.kind === "deltas" ? streamDeltaQuery.streams.deltas : undefined;
+    const deltaPayload = streamDeltaQuery?.streams?.kind === "deltas"
+        ? {
+            deltas: streamDeltaQuery.streams.deltas,
+            streamWindows: streamDeltaQuery.streams.streamWindows,
+            nextCheckpoints: streamDeltaQuery.streams.nextCheckpoints,
+        }
+        : undefined;
     useEffect(() => {
-        if (!newDeltas || newDeltas.length === 0) {
+        if (!deltaPayload) {
             return;
         }
-        setOverlayState((current) => applyDeltaBatch(current, newDeltas));
-    }, [newDeltas]);
+        setOverlayState((current) => applyDeltaBatch(current, deltaPayload));
+    }, [deltaPayload]);
     return {
         deltas: overlayState.deltas,
         streamIds,

package/dist/react/useCodexStreamOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCodexStreamOverlay.js","sourceRoot":"","sources":["../../src/react/useCodexStreamOverlay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useCodexStreamOverlay.js","sourceRoot":"","sources":["../../src/react/useCodexStreamOverlay.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zakstam/codex-local-component",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,6 +32,10 @@
     "./protocol": {
       "types": "./dist/protocol/index.d.ts",
       "import": "./dist/protocol/index.js"
+    },
+    "./app-server": {
+      "types": "./dist/app-server/index.d.ts",
+      "import": "./dist/app-server/index.js"
     }
   },
   "files": [
@@ -62,6 +66,7 @@
   "scripts": {
     "clean": "rm -rf dist",
     "build": "tsc -p tsconfig.build.json",
+    "build:watch": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
     "typecheck": "tsc --noEmit",
     "test": "pnpm run build && node --test test/*.test.mjs",
     "check:mount-imports": "node ./scripts/check-mount-imports.mjs",