pinomad 0.11.0 → 0.13.0

package/README.md

@@ -17,7 +17,7 @@ A self-hosted coding agent built on [Pi Durable](https://www.npmjs.com/package/@
 ## Quick start
 
 1. **Create an account** at [app.pinomad.si](https://app.pinomad.si/) (sign-up is by invite).
-2. **Add your host.** On the machine that should run the agent (macOS or Linux), run the two lines below. `pinomad up` prints a code; enter it on the page it opens, signed in, to add the host to your account. It then runs as a service.
+2. **Add your host.** On the machine that should run the agent (macOS or Linux), run the two lines below. `pinomad up` opens a page in your browser; sign in and confirm to add the host to your account. It then runs as a service. Without a browser on that machine (over SSH, say), it prints a code to enter on any signed-in device instead.
 
    ```sh
    curl -fsSL https://pinomad.si/install.sh | sh

package/dist/{chunk-wb10efyq.js → chunk-445cevpm.js}

@@ -16,7 +16,7 @@ var NOT_BUILT = "Web client not built: run bun run build";
 var SECURITY_HEADERS = {
   "content-security-policy": [
     "default-src 'self'",
-    "script-src 'self'",
+    "script-src 'self' 'wasm-unsafe-eval'",
     "style-src 'self' 'unsafe-inline'",
     "img-src 'self' data:",
     "connect-src 'self' ws: wss:",

package/dist/{chunk-jt34g8st.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-xqycs43g.js";
+  rtcSelectedPair,
+  withEarlier
+} from "./chunk-kmzzjv53.js";
 import {
   SECURE_PROLOGUE,
   SecureSession,
@@ -286,11 +290,12 @@ function webSocketTransport(url, token) {
   };
 }
 
-// packages/protocol/src/transcript.ts
-function isBusy(view) {
-  const live = view.docs?.["pi.live"];
-  return live?.run !== undefined;
+// packages/protocol/src/terminals.ts
+function isTerminalsHello(value) {
+  return value !== null && typeof value === "object" && typeof value.limit === "number";
 }
+var terminalsStream = (id) => `terminals:${id}`;
+var terminalStream = (id) => `terminal:${id}`;
 
 // packages/protocol/src/remote-durable.ts
 var DEFAULT_CANDIDATE_TIMEOUTS = {
@@ -389,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 = [];
@@ -458,6 +465,11 @@ class RemoteClient {
   #helloModels = [];
   #helloDefaults = {};
   #hostVersion;
+  #hostTerminals;
+  #terminalWatchers = new Map;
+  #terminalSinks = new Map;
+  #terminalPositions = new Map;
+  #terminalSizes = new Map;
   #attempt = 0;
   #rtcAttemptNonce = randomHex(8);
   #closed = false;
@@ -710,6 +722,7 @@ class RemoteClient {
     this.#helloModels = frame.models;
     this.#helloDefaults = frame.defaults ?? {};
     this.#hostVersion = frame.hostVersion;
+    this.#hostTerminals = isTerminalsHello(frame.terminals) ? frame.terminals : undefined;
     this.#fresh.clear();
     const covered = new Set(hostStreams(hostMinor));
     for (const name of HOST_STREAM_NAMES) {
@@ -727,6 +740,7 @@ class RemoteClient {
     if (this.#side !== undefined)
       for (const stream of this.#conversationStreams(this.#side))
         this.#wanted.add(stream);
+    this.#terminalsAvailability();
     for (const stream of this.#wanted)
       this.#subscribe(stream);
     if (frame.endpointSet !== undefined) {
@@ -815,6 +829,7 @@ class RemoteClient {
       this.#resolveReady({
         view: this.#viewSource(),
         controller: this.#controller(),
+        terminals: this.#terminals(),
         setConnectionMode: (mode) => this.setConnectionMode(mode),
         rtcDiagnostics: () => this.rtcDiagnostics(),
         close: () => this.#close()
@@ -828,6 +843,9 @@ class RemoteClient {
     await this.#recoverSubmissions();
     if (!this.#isActive(dial))
       return;
+    for (const [terminalId, size] of this.#terminalSizes) {
+      this.#callNow("resizeTerminal", { terminalId, ...size }).catch(() => {});
+    }
     this.#finishSyncGate();
     this.#afterCarrierReady(dial);
   }
@@ -1961,7 +1979,14 @@ class RemoteClient {
       case "snapshot":
         if (!this.#wanted.has(frame.stream))
           return;
+        if (frame.stream.startsWith("terminals:")) {
+          this.#values.set(frame.stream, frame.value);
+          this.#notifyTerminals(frame.stream, { kind: "ready", list: frame.value });
+          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();
@@ -1974,9 +1999,23 @@ class RemoteClient {
         this.#values.set(frame.stream, applyImmutable(this.#values.get(frame.stream), frame.ops));
         this.#refresh();
         return;
+      case "output": {
+        const sink = this.#terminalSinks.get(frame.stream);
+        if (sink === undefined || !this.#wanted.has(frame.stream))
+          return;
+        this.#terminalPositions.set(frame.stream, frame.seq);
+        sink.output(frame.data, frame.reset === true);
+        return;
+      }
       case "ended": {
+        if (frame.stream.startsWith("terminals:") || frame.stream.startsWith("terminal:")) {
+          this.#endTerminalStream(frame.stream, frame.reason);
+          return;
+        }
         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) ?? []) {
@@ -2062,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();
@@ -2070,7 +2111,162 @@ class RemoteClient {
   }
   #subscribe(stream) {
     const refs = stream.startsWith("conversation:") && hostSupportsFeature(this.#hostMinor, "imageRefs");
-    this.#send({ type: "subscribe", stream, ...refs ? { images: "ref" } : {} });
+    const since = this.#terminalPositions.get(stream);
+    const window = this.#window(stream);
+    this.#send({
+      type: "subscribe",
+      stream,
+      ...refs ? { images: "ref" } : {},
+      ...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")) {
+      return "The host is too old for terminals (needs protocol 5.27); run `pinomad upgrade` on the host";
+    }
+    if (this.#hostTerminals === undefined)
+      return "The host couldn't load its terminal module; its log says which package is missing";
+    return;
+  }
+  #terminalsAvailability() {
+    const reason = this.#terminalsUnavailable();
+    if (reason === undefined) {
+      for (const stream of this.#terminalWatchers.keys())
+        this.#wanted.add(stream);
+      for (const stream of this.#terminalSinks.keys())
+        this.#wanted.add(stream);
+      return;
+    }
+    for (const stream of [...this.#terminalWatchers.keys()]) {
+      this.#wanted.delete(stream);
+      this.#values.delete(stream);
+      this.#notifyTerminals(stream, { kind: "unavailable", reason });
+    }
+    for (const stream of [...this.#terminalSinks.keys()])
+      this.#endTerminalStream(stream, reason);
+  }
+  #notifyTerminals(stream, state) {
+    for (const listener of [...this.#terminalWatchers.get(stream) ?? []])
+      listener(state);
+  }
+  #endTerminalStream(stream, reason) {
+    this.#wanted.delete(stream);
+    this.#values.delete(stream);
+    if (stream.startsWith("terminals:")) {
+      this.#notifyTerminals(stream, { kind: "unavailable", reason });
+      return;
+    }
+    const sink = this.#terminalSinks.get(stream);
+    this.#terminalSinks.delete(stream);
+    this.#terminalPositions.delete(stream);
+    this.#terminalSizes.delete(stream.slice("terminal:".length));
+    sink?.ended(reason);
+  }
+  #terminalCall(method, args) {
+    const reason = this.#terminalsUnavailable();
+    return reason === undefined ? this.#call(method, args) : Promise.reject(new Error(reason));
+  }
+  #terminals() {
+    return {
+      watch: (conversationId, listener) => {
+        const stream = terminalsStream(conversationId);
+        let listeners = this.#terminalWatchers.get(stream);
+        const first = listeners === undefined;
+        if (listeners === undefined)
+          this.#terminalWatchers.set(stream, listeners = new Set);
+        listeners.add(listener);
+        const reason = this.#terminalsUnavailable();
+        const list = this.#values.get(stream);
+        listener(reason !== undefined ? { kind: "unavailable", reason } : list !== undefined ? { kind: "ready", list } : { kind: "loading" });
+        if (first && reason === undefined) {
+          this.#wanted.add(stream);
+          if (this.#helloReceived)
+            this.#subscribe(stream);
+        }
+        return () => {
+          if (!listeners.delete(listener) || listeners.size > 0)
+            return;
+          this.#terminalWatchers.delete(stream);
+          if (!this.#wanted.delete(stream))
+            return;
+          this.#values.delete(stream);
+          this.#send({ type: "unsubscribe", stream });
+        };
+      },
+      attach: (terminalId, sink) => {
+        const stream = terminalStream(terminalId);
+        const reason = this.#terminalsUnavailable();
+        if (reason !== undefined) {
+          sink.ended(reason);
+          return () => {};
+        }
+        if (this.#terminalSinks.has(stream) && this.#wanted.has(stream))
+          this.#send({ type: "unsubscribe", stream });
+        this.#terminalSinks.set(stream, sink);
+        this.#terminalPositions.delete(stream);
+        this.#wanted.add(stream);
+        if (this.#helloReceived)
+          this.#subscribe(stream);
+        return () => {
+          if (this.#terminalSinks.get(stream) !== sink)
+            return;
+          this.#terminalSinks.delete(stream);
+          this.#terminalPositions.delete(stream);
+          this.#terminalSizes.delete(terminalId);
+          if (this.#wanted.delete(stream))
+            this.#send({ type: "unsubscribe", stream });
+        };
+      },
+      open: (conversationId, size) => this.#terminalCall("openTerminal", { conversationId, ...size }).then(({ terminalId }) => terminalId),
+      input: (terminalId, data) => {
+        this.#terminalCall("terminalInput", { terminalId, data }).catch(() => {});
+      },
+      resize: (terminalId, size) => {
+        if (this.#terminalSinks.has(terminalStream(terminalId)))
+          this.#terminalSizes.set(terminalId, size);
+        this.#terminalCall("resizeTerminal", { terminalId, ...size }).catch(() => {});
+      },
+      rename: (terminalId, name) => this.#terminalCall("renameTerminal", { terminalId, name }).then(() => {}),
+      restart: (terminalId, size) => this.#terminalCall("restartTerminal", { terminalId, ...this.#terminalSizes.get(terminalId) ?? size }).then(() => {}),
+      close: (terminalId) => this.#terminalCall("closeTerminal", { terminalId }).then(() => {})
+    };
   }
   #host(name) {
     return this.#values.get(name);
@@ -2172,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;
@@ -2218,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);
         }
       }
@@ -2256,6 +2462,8 @@ class RemoteClient {
     } catch {} finally {
       record.confirming = false;
     }
+    if (!this.#closed && !this.#submissionSettled(record))
+      this.#reconcileSubmissions();
   }
   #submissionArgs(record) {
     const conversationId = record.conversationId;
@@ -2299,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();
@@ -2549,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 ?? [];
@@ -2565,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,
@@ -2797,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(() => {
@@ -2865,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"));