@opencode/client 0.0.0-dev-19629 → 0.0.0-dev-19631

package/dist/solid/data.js

@@ -136,6 +136,7 @@ export function createData(config) {
     const messageIndex = new Map();
     const sync = createSync();
     let activeUpdates;
+    const pendingUpdates = new Map();
     function setSessionActive(sessionID, status) {
         activeUpdates?.set(sessionID, status);
         setStore("session", "active", sessionID, status);
@@ -143,6 +144,7 @@ export function createData(config) {
     function removePending(sessionID, inboxID) {
         if (!inboxID)
             return;
+        pendingUpdates.get(sessionID)?.set(inboxID, undefined);
         if (store.session.pending[sessionID]?.some((item) => item.id === inboxID))
             setStore("session", "pending", sessionID, (store.session.pending[sessionID] ?? []).filter((item) => item.id !== inboxID));
     }
@@ -185,6 +187,7 @@ export function createData(config) {
     function updatePending(sessionID, inboxID, delivery) {
         const index = store.session.pending[sessionID]?.findIndex((item) => item.id === inboxID) ?? -1;
         const item = store.session.pending[sessionID]?.[index];
+        pendingUpdates.get(sessionID)?.set(inboxID, item ? { ...item, delivery } : delivery);
         if (index < 0 || !item || item.delivery === delivery)
             return;
         setStore("session", "pending", sessionID, index, { ...item, delivery });
@@ -625,12 +628,14 @@ export function createData(config) {
             }
             case "session.inbox.enqueued": {
                 outbox.delete(event.data.inboxID);
-                admitLocal({
+                const item = {
                     id: event.data.inboxID,
                     sessionID: event.data.sessionID,
                     time: { created: event.created },
                     ...event.data.item,
-                });
+                };
+                pendingUpdates.get(item.sessionID)?.set(item.id, item);
+                admitLocal(item);
                 if (event.data.item.type === "compaction") {
                     const active = compacting.get(event.data.sessionID);
                     active?.observed.add(event.data.inboxID);
@@ -1238,23 +1243,46 @@ export function createData(config) {
                 },
                 sync(sessionID) {
                     return sync.run(`session.pending:${sessionID}`, async () => {
-                        const pending = await api().session.inbox.list({ sessionID });
-                        // A positive read acknowledges admission even when its SSE echo is delayed.
-                        pending.forEach((item) => outbox.delete(item.id));
-                        // Compactions also coalesce by Session, not just by the proposed ID.
-                        if (pending.some((item) => item.type === "compaction"))
-                            store.session.pending[sessionID]
-                                ?.filter((item) => item.type === "compaction")
-                                .forEach((item) => outbox.delete(item.id));
-                        // Keep optimistic rows still awaiting their echo: this fetch may
-                        // have raced ahead of an in-flight admission the server does not
-                        // know about yet.
-                        const inflight = (store.session.pending[sessionID] ?? []).filter((item) => outbox.has(item.id));
-                        const merged = inflight.length === 0 ? pending : [...pending, ...inflight];
-                        batch(() => {
-                            setStore("session", "pending", sessionID, reconcile(merged));
-                            merged.forEach(materializeInboxMessage);
-                        });
+                        const updates = new Map();
+                        pendingUpdates.set(sessionID, updates);
+                        try {
+                            const snapshot = await api().session.inbox.list({ sessionID });
+                            // Events can overtake this HTTP response on a remote connection.
+                            // Reconcile them before an older snapshot can resurrect delivered input.
+                            const current = new Map(snapshot.map((item) => [item.id, item]));
+                            updates.forEach((item, id) => {
+                                if (item === undefined)
+                                    current.delete(id);
+                                else if (typeof item === "string") {
+                                    const existing = current.get(id);
+                                    if (existing)
+                                        current.set(id, { ...existing, delivery: item });
+                                }
+                                else
+                                    current.set(id, item);
+                            });
+                            const pending = [...current.values()];
+                            // A positive read acknowledges admission even when its SSE echo is delayed.
+                            pending.forEach((item) => outbox.delete(item.id));
+                            // Compactions also coalesce by Session, not just by the proposed ID.
+                            if (pending.some((item) => item.type === "compaction"))
+                                store.session.pending[sessionID]
+                                    ?.filter((item) => item.type === "compaction")
+                                    .forEach((item) => outbox.delete(item.id));
+                            // Keep optimistic rows still awaiting their echo: this fetch may
+                            // have raced ahead of an in-flight admission the server does not
+                            // know about yet.
+                            const inflight = (store.session.pending[sessionID] ?? []).filter((item) => outbox.has(item.id));
+                            const merged = inflight.length === 0 ? pending : [...pending, ...inflight];
+                            batch(() => {
+                                setStore("session", "pending", sessionID, reconcile(merged));
+                                merged.forEach(materializeInboxMessage);
+                            });
+                        }
+                        finally {
+                            if (pendingUpdates.get(sessionID) === updates)
+                                pendingUpdates.delete(sessionID);
+                        }
                     });
                 },
                 invalidate(sessionID) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/client",
-  "version": "0.0.0-dev-19629",
+  "version": "0.0.0-dev-19631",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -57,8 +57,8 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@opencode/schema": "0.0.0-dev-19629",
-    "@opencode/protocol": "0.0.0-dev-19629"
+    "@opencode/schema": "0.0.0-dev-19631",
+    "@opencode/protocol": "0.0.0-dev-19631"
   },
   "peerDependencies": {
     "effect": "4.0.0-rc.112",
@@ -74,7 +74,7 @@
   },
   "devDependencies": {
     "@effect/platform-node": "4.0.0-rc.112",
-    "@opencode/httpapi-codegen": "0.0.0-dev-19629",
+    "@opencode/httpapi-codegen": "0.0.0-dev-19631",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.4.0",
     "@typescript/native-preview": "7.0.0-dev.20251207.1",