@vinaverse/client 0.1.0-alpha.2 → 0.1.0-alpha.4

package/dist/conversation/index.js

@@ -1,5 +1,5 @@
-import { ConversationEngine, randomId, VinaverseSession, VinaverseClientError, isKnownCard } from '../chunk-AWHPWRGT.js';
-export { CONTRACT, VinaverseClientError, isKnownCard } from '../chunk-AWHPWRGT.js';
+import { ConversationEngine, randomId, VinaverseSession, VinaverseClientError, transcriptHasIds, isKnownCard } from '../chunk-MKUNSAMT.js';
+export { CONTRACT, VinaverseClientError, isKnownCard } from '../chunk-MKUNSAMT.js';
 
 // src/conversation/answers.ts
 var CHOICE = /* @__PURE__ */ new Set([
@@ -153,7 +153,8 @@ function buildTimeline(input, previous) {
         type: "card",
         key: card.id,
         card,
-        busy: input.busy.has(card.id),
+        busy: !input.inert?.has(card.id) && input.busy.has(card.id),
+        ...input.inert?.has(card.id) ? { restored: true } : {},
         ...input.decisionErrors?.has(card.id) ? { decisionError: true } : {}
       },
       order: input.cardOrder?.get(card.id) ?? card.seq
@@ -185,17 +186,10 @@ function buildTimeline(input, previous) {
     });
   }
   live.sort((a, b) => a.order - b.order);
-  const liveByKey = new Map(live.map((l) => [l.item.key, l.item]));
-  const transcript = input.transcriptSeen === true;
-  const items = [];
-  const placed = /* @__PURE__ */ new Set();
-  if (!transcript)
-    for (const item of input.history) {
-      const current = liveByKey.get(item.key);
-      items.push(current ?? item);
-      if (current) placed.add(item.key);
-    }
-  for (const { item } of live) if (!placed.has(item.key)) items.push(item);
+  const items = mergeByKey(
+    input.transcriptSeen === true ? [] : input.history,
+    live.map((l) => l.item)
+  );
   let same = items.length === previous.length;
   const shared = items.map((item, i) => {
     const prev = before.get(item.key);
@@ -205,6 +199,24 @@ function buildTimeline(input, previous) {
   });
   return same ? previous : shared;
 }
+function mergeByKey(history, live) {
+  if (!history.length) return [...live];
+  const items = [...history];
+  const at = (key) => items.findIndex((item) => item.key === key);
+  let last = -1;
+  live.forEach((item, i) => {
+    const found = at(item.key);
+    if (found >= 0) {
+      items[found] = item;
+      last = found;
+      return;
+    }
+    const next = live.slice(i + 1).map((l) => at(l.key)).find((p) => p >= 0);
+    last = next === void 0 ? items.length : last >= 0 ? last + 1 : next;
+    items.splice(last, 0, item);
+  });
+  return items;
+}
 function messageItem(m) {
   const role = m.role === "assistant" ? "agent" : m.role;
   return {
@@ -236,6 +248,7 @@ function persistable(item) {
 
 // src/conversation/store.ts
 var MAX_TEXT = 2e3;
+var TURN_INPUTS = 50;
 var PERSIST_DELAY = 500;
 var PERSIST_VERSION = 1;
 var NO_ITEMS = [];
@@ -266,6 +279,8 @@ var ConversationStore = class {
   /** Proposals whose tenant decision threw: shown as recoverable, the person may decide again. */
   decisionErrors = /* @__PURE__ */ new Set();
   system = [];
+  /** The person's text that started each recent turn, by `turn_id` (`turn.started` echoes its `client_event_id`). */
+  turnInputs = /* @__PURE__ */ new Map();
   /** Numbers system rows that carry no id of their own. */
   systemSeq = 0;
   history = NO_ITEMS;
@@ -276,6 +291,8 @@ var ConversationStore = class {
   readySession = null;
   cardOrder = /* @__PURE__ */ new Map();
   kept = [];
+  /** Cards an earlier session drew, kept by a merged transcript: drawn as restored, taking no tap. */
+  inert = /* @__PURE__ */ new Set();
   locale;
   /** The request for a session in flight, to abort when it is no longer wanted. */
   fetching = null;
@@ -317,6 +334,8 @@ var ConversationStore = class {
     this.live();
     if (this.session) {
       if (this.session.status === "idle") this.session.connect();
+      else if (this.session.status === "unauthorized")
+        void this.resumeWith("resume");
       return;
     }
     void this.ensureSession("open");
@@ -381,9 +400,19 @@ var ConversationStore = class {
     session.close();
     this.update();
   }
-  /** Back in the foreground: a new connection to the same session, with a fresh secret when the backend gives one. */
-  async wake() {
+  /**
+   * Back in the foreground, or the person acted while away: a new connection to the same session, with a fresh secret
+   * when the backend gives one. A session that passed its end meanwhile is never reopened (a fresh secret cannot bring
+   * back an expired tool token): the person's action continues the conversation in a new session from `getSession`,
+   * and until then nothing connects.
+   */
+  async wake(byPerson = false) {
     const info = this.info;
+    if (info && this.sessionOver()) {
+      if (byPerson) await this.resumeWith("resume");
+      else this.update();
+      return;
+    }
     this.suspended = false;
     if (!info) return;
     let next = info;
@@ -423,7 +452,7 @@ var ConversationStore = class {
     }
     if (this.suspended) {
       this.early.set(id, text);
-      void this.wake();
+      void this.wake(true);
       this.update();
       return id;
     }
@@ -433,6 +462,12 @@ var ConversationStore = class {
       this.update();
       return id;
     }
+    if (this.sessionOver()) {
+      this.early.set(id, text);
+      void this.resumeWith("resume");
+      this.update();
+      return id;
+    }
     this.nextId = id;
     this.session.sendText(text);
     this.nextId = null;
@@ -495,6 +530,24 @@ var ConversationStore = class {
     this.sent.delete(key);
     return this.send(sent.text);
   }
+  /**
+   * Send again the person's text whose turn failed before any reply (a `turn_failed` row with `data.retry`), as a new
+   * message (the person's action). Once per row: its `retry` turns false. Returns the new id, or null when the row
+   * allows no retry.
+   */
+  retryTurn(key) {
+    const at = this.system.findIndex(
+      (s) => s.item.key === key && s.item.event === "turn_failed"
+    );
+    const entry = this.system[at];
+    if (entry?.item.data.retry !== true) return null;
+    const text = this.turnText(String(entry.item.data.turn ?? ""));
+    if (text === void 0) return null;
+    this.system = this.system.map(
+      (s, i) => i === at ? { ...s, item: { ...s.item, data: { ...s.item.data, retry: false } } } : s
+    );
+    return this.send(text);
+  }
   /** After the conversation continued on another device: continue it here (the person's choice). */
   continueHere() {
     return this.resumeWith("continue_here");
@@ -551,11 +604,21 @@ var ConversationStore = class {
   }
   open(info) {
     this.info = info;
+    this.suspended = false;
+    const refreshSecret = this.options.refreshSecret;
     const session = new VinaverseSession({
       ...this.options.transport,
       session: info,
       engine: this.engine,
-      ...this.options.refreshSecret ? { refreshSecret: this.options.refreshSecret } : {},
+      ...refreshSecret ? {
+        // Past the session's end a fresh secret cannot help: refused here, and the store rolls over instead.
+        refreshSecret: (id) => this.sessionOver() ? Promise.reject(
+          new VinaverseClientError(
+            "needs_new_session",
+            "This session has ended."
+          )
+        ) : refreshSecret(id)
+      } : {},
       createId: () => this.nextId ?? (this.options.createId ?? randomId)()
     });
     this.session = session;
@@ -563,7 +626,9 @@ var ConversationStore = class {
       session.on("state", () => this.update()),
       session.on("status", (status) => this.statusChanged(status)),
       session.on("event", (event) => this.event(event)),
-      session.on("error", (error) => this.options.onError?.(error))
+      session.on("error", (error) => {
+        if (!this.sessionOver()) this.options.onError?.(error);
+      })
     );
     session.setForeground(this.foreground);
     session.connect();
@@ -590,6 +655,10 @@ var ConversationStore = class {
     this.resuming = this.fetchSession(reason).then((info) => {
       this.resuming = null;
       if (!info || this.disposed || !this.session) return;
+      if (this.session.status === "closed") {
+        this.open(info);
+        return;
+      }
       this.info = info;
       this.session.resume(info);
       this.flushEarly();
@@ -604,10 +673,18 @@ var ConversationStore = class {
   }
   reconnectIfDown() {
     const session = this.session;
-    if (session && session.status === "idle" && this.nextFrom(this.engine.state()) === null)
+    if (session && session.status === "idle" && !this.sessionOver() && // past its end: the person's next action gets a new session
+    this.nextFrom(this.engine.state()) === null)
       session.connect();
   }
+  /** A refusal already led to a new session, and none has been ready since: another refusal is no cue. */
+  rolled = false;
   statusChanged(status) {
+    if (status === "ready") this.rolled = false;
+    if (status === "unauthorized" && !this.rolled) {
+      this.rolled = true;
+      void this.resumeWith("resume");
+    }
     if (status === "idle")
       this.offlineAfterRetries = this.lastStatus === "reconnecting";
     else if (status !== "reconnecting") this.offlineAfterRetries = false;
@@ -632,9 +709,18 @@ var ConversationStore = class {
         const session = frame.session?.id;
         const moved = typeof session === "string" && session !== this.readySession;
         if (typeof session === "string") this.readySession = session;
-        if (frame.resumed === true && Array.isArray(frame.transcript)) {
+        if (frame.resumed === true && Array.isArray(frame.transcript) && !transcriptHasIds(frame.transcript)) {
           this.transcriptSeen = true;
           this.anchorCards(moved);
+        } else if (moved && frame.resumed === true) {
+          const pending = new Set(
+            (Array.isArray(frame.pending_cards) ? frame.pending_cards : []).map(
+              (c) => str(c.id)
+            )
+          );
+          for (const card of this.engine.state().cards)
+            if (pending.has(card.id)) this.inert.delete(card.id);
+            else this.inert.add(card.id);
         }
         return;
       }
@@ -667,6 +753,17 @@ var ConversationStore = class {
           code: str(frame.code)
         });
         return;
+      case "turn.started": {
+        const turn = str(frame.turn_id);
+        const input = str(frame.client_event_id);
+        if (turn === null || input === null) return;
+        this.turnInputs.set(turn, input);
+        if (this.turnInputs.size > TURN_INPUTS) {
+          const oldest = this.turnInputs.keys().next().value;
+          if (oldest !== void 0) this.turnInputs.delete(oldest);
+        }
+        return;
+      }
       case "turn.failed": {
         const turn = str(frame.turn_id) ?? "";
         if (this.engine.state().messages.some((m) => m.key === `a:${turn}`))
@@ -675,7 +772,9 @@ var ConversationStore = class {
         add(`failed:${turn}`, "turn_failed", {
           code: str(frame.code),
           message: str(frame.message),
-          retryable: frame.retryable === true
+          retryable: frame.retryable === true,
+          retry: frame.retryable === true && this.turnText(turn) !== void 0,
+          turn
         });
         return;
       }
@@ -683,6 +782,13 @@ var ConversationStore = class {
         return;
     }
   }
+  /** The person's text that started a turn, while its message is on screen. */
+  turnText(turn) {
+    const input = this.turnInputs.get(turn);
+    if (input === void 0) return void 0;
+    const message = this.engine.state().messages.find((m) => m.key === input && m.role === "person");
+    return message?.text || void 0;
+  }
   /**
    * A resumed session's transcript replaced the messages, and a chat transcript carries text only: the engine drops
    * the cards it drew, and draws the pending ones again at the end. Each card on screen is anchored just after the
@@ -773,6 +879,7 @@ var ConversationStore = class {
         transcriptSeen: this.transcriptSeen,
         cardOrder: this.cardOrder,
         kept: this.kept,
+        inert: this.inert,
         system: this.system
       },
       prev?.items ?? NO_ITEMS
@@ -784,10 +891,12 @@ var ConversationStore = class {
     const avatarUrl = this.info?.agent?.avatar_url ?? null;
     const view = {
       status,
+      conversationId: s.conversationId,
       banner: banner(status, next),
       next,
       agent: sameAgent(prev?.agent, name, avatarUrl) ? prev.agent : { name, avatarUrl },
       disclosure: s.disclosure ?? this.info?.disclosure ?? null,
+      welcome: this.info?.welcome ?? null,
       takeover: s.takeover,
       items,
       activity: prev && sameTools(prev.activity, activity) ? prev.activity : activity,
@@ -894,6 +1003,11 @@ var ConversationStore = class {
     }, PERSIST_DELAY);
   }
   // ------------------------------------------------------------ guards
+  /** Past the session's end (`expires_at`), when the backend passed it on. */
+  sessionOver() {
+    const end = this.info?.expires_at;
+    return end !== void 0 && Date.now() >= Date.parse(end);
+  }
   live() {
     if (this.disposed)
       throw new VinaverseClientError(
@@ -947,6 +1061,42 @@ function shallowEqual(a, b) {
   return a.status === b.status && a.banner === b.banner && a.next === b.next && a.agent.name === b.agent.name && a.agent.avatarUrl === b.agent.avatarUrl && a.disclosure === b.disclosure && a.takeover?.by === b.takeover?.by && a.takeover?.at === b.takeover?.at && a.takeover === null === (b.takeover === null) && a.items === b.items && a.activity === b.activity && a.responding === b.responding && a.openQuestion === b.openQuestion && a.answersNeedWebSocket === b.answersNeedWebSocket && a.turnsLeft === b.turnsLeft && a.history === b.history;
 }
 
-export { ConversationStore, MAX_TEXT, answerProblem, codePoints, createConversation, isAllowedLink, isValidLinkPrefix };
+// src/conversation/modes.ts
+function createConversationsByMode(options) {
+  const { getSession, modes = [], ...shared } = options;
+  const base = shared.persistenceKey ?? "vinaverse.conversation";
+  const stores = /* @__PURE__ */ new Map();
+  const get = (mode) => {
+    let store = stores.get(mode);
+    if (!store) {
+      store = createConversation({
+        ...shared,
+        persistenceKey: `${base}.${mode}`,
+        getSession: (request) => getSession({ ...request, mode })
+      });
+      stores.set(mode, store);
+    }
+    return store;
+  };
+  return {
+    get,
+    select(mode) {
+      for (const [other, store] of stores)
+        if (other !== mode) store.setForeground(false);
+      return get(mode);
+    },
+    dispose() {
+      for (const store of stores.values()) store.dispose();
+      stores.clear();
+    },
+    clear() {
+      for (const mode of /* @__PURE__ */ new Set([...stores.keys(), ...modes]))
+        get(mode).clear();
+      stores.clear();
+    }
+  };
+}
+
+export { ConversationStore, MAX_TEXT, answerProblem, codePoints, createConversation, createConversationsByMode, isAllowedLink, isValidLinkPrefix };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map