pinomad 0.12.0 → 0.13.0

package/dist/{chunk-np4jd070.js → chunk-4fferbxw.js}

@@ -3,7 +3,9 @@ import {
   MAX_ATTACHMENTS_PER_MESSAGE,
   PROTOCOL,
   RTC_DATA_CHANNEL_LABEL,
+  TRANSCRIPT_PAGE,
   UNAUTHORIZED_CLOSE_CODE,
+  addEarlier,
   checkoutOf,
   conversationStream,
   docStream,
@@ -11,11 +13,13 @@ import {
   hostStreams,
   hostSupportsCall,
   hostSupportsFeature,
+  isBusy,
   isRtcHello,
   organize,
   parseRtcMaxMessageSize,
-  rtcSelectedPair
-} from "./chunk-47ff1d1t.js";
+  rtcSelectedPair,
+  withEarlier
+} from "./chunk-kmzzjv53.js";
 import {
   SECURE_PROLOGUE,
   SecureSession,
@@ -293,12 +297,6 @@ function isTerminalsHello(value) {
 var terminalsStream = (id) => `terminals:${id}`;
 var terminalStream = (id) => `terminal:${id}`;
 
-// packages/protocol/src/transcript.ts
-function isBusy(view) {
-  const live = view.docs?.["pi.live"];
-  return live?.run !== undefined;
-}
-
 // packages/protocol/src/remote-durable.ts
 var DEFAULT_CANDIDATE_TIMEOUTS = {
   socketOpenMs: 5000,
@@ -396,6 +394,8 @@ class RemoteClient {
   #options;
   #listeners = new Set;
   #values = new Map;
+  #earlier = new Map;
+  #loadingEarlier = new Map;
   #wanted = new Set;
   #fresh = new Set;
   #docs = [];
@@ -1985,6 +1985,8 @@ class RemoteClient {
           return;
         }
         this.#values.set(frame.stream, frame.value);
+        this.#earlier.delete(frame.stream);
+        this.#loadingEarlier.delete(frame.stream);
         this.#fresh.add(frame.stream);
         this.#streamVersions.set(frame.stream, (this.#streamVersions.get(frame.stream) ?? 0) + 1);
         this.#refresh();
@@ -2012,6 +2014,8 @@ class RemoteClient {
         }
         this.#wanted.delete(frame.stream);
         this.#values.delete(frame.stream);
+        this.#earlier.delete(frame.stream);
+        this.#loadingEarlier.delete(frame.stream);
         this.#fresh.delete(frame.stream);
         const ended = new Error(`Stream ${frame.stream} ended: ${frame.reason}`);
         for (const waiter of this.#snapshotWaiters.get(frame.stream)?.splice(0) ?? []) {
@@ -2097,6 +2101,8 @@ class RemoteClient {
         continue;
       this.#wanted.delete(stream);
       this.#values.delete(stream);
+      this.#earlier.delete(stream);
+      this.#loadingEarlier.delete(stream);
       this.#fresh.delete(stream);
       for (const waiter of this.#snapshotWaiters.get(stream)?.splice(0) ?? [])
         waiter.resolve();
@@ -2106,12 +2112,50 @@ class RemoteClient {
   #subscribe(stream) {
     const refs = stream.startsWith("conversation:") && hostSupportsFeature(this.#hostMinor, "imageRefs");
     const since = this.#terminalPositions.get(stream);
+    const window = this.#window(stream);
     this.#send({
       type: "subscribe",
       stream,
       ...refs ? { images: "ref" } : {},
-      ...since === undefined ? {} : { since }
+      ...since === undefined ? {} : { since },
+      ...window === undefined ? {} : { window }
+    });
+  }
+  #window(stream) {
+    if (!stream.startsWith("conversation:") || !hostSupportsFeature(this.#hostMinor, "transcriptPaging"))
+      return;
+    const from = this.#shownView(stream)?.entries[0]?.id;
+    return from === undefined ? { limit: TRANSCRIPT_PAGE } : { limit: TRANSCRIPT_PAGE, from };
+  }
+  #shownView(stream) {
+    const view = this.#values.get(stream);
+    return view === undefined ? undefined : withEarlier(view, this.#earlier.get(stream));
+  }
+  #loadEarlier(id) {
+    const stream = conversationStream(id);
+    const inFlight = this.#loadingEarlier.get(stream);
+    if (inFlight !== undefined)
+      return inFlight;
+    const requested = this.#shownView(stream)?.before;
+    if (requested === undefined)
+      return Promise.resolve();
+    const load = this.#call("earlierEntries", { conversationId: id, before: requested, limit: TRANSCRIPT_PAGE }).then((page) => {
+      if (this.#loadingEarlier.get(stream) !== load)
+        return;
+      const shown = this.#shownView(stream);
+      if (shown === undefined)
+        return;
+      const earlier = addEarlier(shown, this.#earlier.get(stream), requested, page);
+      if (earlier === undefined)
+        return;
+      this.#earlier.set(stream, earlier);
+      this.#refresh();
+    }).finally(() => {
+      if (this.#loadingEarlier.get(stream) === load)
+        this.#loadingEarlier.delete(stream);
     });
+    this.#loadingEarlier.set(stream, load);
+    return load;
   }
   #terminalsUnavailable() {
     if (!hostSupportsFeature(this.#hostMinor, "terminals")) {
@@ -2324,22 +2368,33 @@ class RemoteClient {
     record.error = undefined;
     this.#clearSubmissionTimer(record);
   }
-  #entriesOf(id) {
-    if (id === undefined)
-      return [];
-    const view = this.#values.get(conversationStream(id));
-    return view?.entries ?? [];
-  }
   #entryPresent(record) {
-    if (record.entry === undefined)
+    if (record.entry === undefined || record.conversationId === undefined)
+      return false;
+    const shown = this.#shownView(conversationStream(record.conversationId));
+    if (shown === undefined)
       return false;
-    return this.#entriesOf(record.conversationId).some((entry) => String(entry.id) === String(record.entry));
+    if (shown.before !== undefined && Number(record.entry) <= Number(shown.before))
+      return true;
+    return shown.entries.some((entry) => String(entry.id) === String(record.entry));
+  }
+  #inboxOf(id) {
+    if (id === undefined)
+      return;
+    const view = this.#values.get(conversationStream(id));
+    return view?.docs?.["pi.inbox"];
   }
   #inboxHas(record) {
-    if (record.conversationId === undefined || record.submissionId === undefined)
+    if (record.submissionId === undefined)
       return false;
-    const inbox = this.#values.get(docStream("pi.inbox", record.conversationId));
-    return (inbox?.items ?? []).some((item) => String(item.id) === String(record.submissionId));
+    const items = this.#inboxOf(record.conversationId)?.items ?? [];
+    return items.some((item) => String(item.id) === String(record.submissionId));
+  }
+  #markChecked(record) {
+    if (record.conversationId === undefined)
+      return;
+    record.checkedVersion = this.#streamVersions.get(conversationStream(record.conversationId)) ?? 0;
+    record.checkedInbox = this.#inboxOf(record.conversationId);
   }
   #applySubmissionRecord(record, found) {
     record.admitted = true;
@@ -2370,11 +2425,10 @@ class RemoteClient {
         this.#settleSubmission(record);
         continue;
       }
-      if (record.conversationId !== undefined && record.submissionId !== undefined && record.admitted && (record.entry !== undefined || !this.#inboxHas(record))) {
+      if (record.conversationId !== undefined && !record.confirming && record.admitted && (record.entry !== undefined || !this.#inboxHas(record))) {
         const stream = conversationStream(record.conversationId);
-        const version = (this.#streamVersions.get(stream) ?? 0) + (this.#streamVersions.get(docStream("pi.inbox", record.conversationId)) ?? 0);
-        if (this.#fresh.has(stream) && record.checkedVersion !== version) {
-          record.checkedVersion = version;
+        if (this.#fresh.has(stream) && (record.checkedVersion !== (this.#streamVersions.get(stream) ?? 0) || record.checkedInbox !== this.#inboxOf(record.conversationId))) {
+          this.#markChecked(record);
           this.#confirmSubmission(record);
         }
       }
@@ -2408,6 +2462,8 @@ class RemoteClient {
     } catch {} finally {
       record.confirming = false;
     }
+    if (!this.#closed && !this.#submissionSettled(record))
+      this.#reconcileSubmissions();
   }
   #submissionArgs(record) {
     const conversationId = record.conversationId;
@@ -2451,11 +2507,11 @@ class RemoteClient {
       record.phase = "inFlight";
       if (this.#entryPresent(record))
         this.#settleSubmission(record);
+    } else if (this.#inboxHas(record)) {
+      this.#settleSubmission(record);
     } else {
       record.phase = "inFlight";
-      if (record.conversationId !== undefined) {
-        record.checkedVersion = (this.#streamVersions.get(conversationStream(record.conversationId)) ?? 0) + (this.#streamVersions.get(docStream("pi.inbox", record.conversationId)) ?? 0);
-      }
+      this.#markChecked(record);
       this.#confirmSubmission(record);
     }
     this.#touchSubmissions();
@@ -2701,7 +2757,7 @@ class RemoteClient {
     this.#reconcileSubmissions();
     const current = this.#current;
     const side = this.#side;
-    const conversation = current === undefined ? undefined : this.#values.get(conversationStream(current));
+    const conversation = current === undefined ? undefined : this.#shownView(conversationStream(current));
     const summaries = this.#host("conversations") ?? [];
     const index = this.#host("index") ?? { projects: [], conversations: [] };
     const devices = this.#host("devices")?.devices ?? [];
@@ -2717,7 +2773,7 @@ class RemoteClient {
       submissions: this.#activeSubmissions(),
       side: side === undefined ? undefined : {
         id: side,
-        conversation: this.#values.get(conversationStream(side)),
+        conversation: this.#shownView(conversationStream(side)),
         docs: this.#docsOf(side)
       },
       devices,
@@ -2949,6 +3005,17 @@ class RemoteClient {
         });
         return outcome;
       }),
+      reorderQueued: (submissionId, before, target) => this.#request(async () => {
+        if (!hostSupportsCall(this.#hostMinor, "reorderQueued")) {
+          throw new Error("The host is too old for this (needs protocol 5.29); run `pinomad upgrade` on the host");
+        }
+        const { outcome } = await this.#call("reorderQueued", {
+          conversationId: target ?? conversationId(),
+          submissionId,
+          ...before === undefined ? {} : { before }
+        });
+        return outcome;
+      }),
       setThinkingLevel: (level) => this.#command(() => this.#call("setThinkingLevel", { conversationId: conversationId(), level })),
       setModel: (model) => this.#command(() => this.#call("setModel", { conversationId: conversationId(), model })),
       setAgent: (agent) => this.#command(() => {
@@ -3017,6 +3084,7 @@ class RemoteClient {
         }
         return this.#call("listSkills", { scope });
       },
+      loadEarlier: (id) => this.#loadEarlier(id),
       listCommands: (id) => {
         if (!hostSupportsCall(this.#hostMinor, "listCommands")) {
           return Promise.reject(new Error("The host is too old for this (needs protocol 5.17); run `pinomad upgrade` on the host"));