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

package/dist/conversation/index.cjs

@@ -2,8 +2,8 @@
 
 // src/contract.ts
 var CONTRACT = {
-  api: "v1-draft.17",
-  commit: "fe4fb7d2945e1ced2bce7d44e85a4b28005e46df"
+  api: "v1-draft.20",
+  commit: "5f6f41bdbfbdd6eadf21180eed1ffddfa5310355"
 };
 
 // src/errors.ts
@@ -36,7 +36,8 @@ var CARD_KINDS = {
   document: true,
   question: true,
   proposal: true,
-  next_step: true
+  next_step: true,
+  links: true
 };
 function isKnownCard(card) {
   return Object.hasOwn(CARD_KINDS, card.kind);
@@ -416,7 +417,9 @@ var ConversationEngine = class {
     this.takeover = null;
     this.cutOff("interrupted");
     if (event.resumed !== true) return;
-    if (event.transcript !== void 0) {
+    if (event.transcript !== void 0 && transcriptHasIds(event.transcript)) {
+      this.mergeTranscript(asArray(event.transcript));
+    } else if (event.transcript !== void 0) {
       this.messages = [];
       this.replaced = this.cards;
       this.cards = /* @__PURE__ */ new Map();
@@ -438,7 +441,61 @@ var ConversationEngine = class {
       this.hold(card, str(card.turn_id));
     this.replaced = null;
   }
-  hold(raw, turnId) {
+  /**
+   * A transcript merged by key: an item the app holds keeps its place, with the text the server recorded; one it does
+   * not hold goes just after the nearest earlier item it does (just before the first later one when none came before,
+   * at the end when it holds none of them). Nothing the app holds is dropped.
+   */
+  mergeTranscript(items) {
+    const seqOf = (key) => key === void 0 ? void 0 : (this.messages.find((m) => m.key === key) ?? this.cards.get(key))?.seq;
+    const keys = items.map(
+      (item) => item.role === "card" ? str(item.card?.id) : transcriptKey(str(item.role) ?? "", str(item.id), str(item.at))
+    );
+    let prev;
+    items.forEach((item, i) => {
+      const key = keys[i];
+      if (key === void 0) return;
+      const known = seqOf(key);
+      let at;
+      if (known === void 0) {
+        const near = prev ?? keys.slice(i + 1).map(seqOf).find((q) => q !== void 0);
+        if (near !== void 0) {
+          const seqs = [...this.messages, ...this.cards.values()].map(
+            (h) => h.seq
+          );
+          const bound = prev === void 0 ? Math.max(near - 1, ...seqs.filter((q) => q < near)) : Math.min(...seqs.filter((q) => q > near));
+          if (Number.isFinite(bound)) at = (near + bound) / 2;
+        }
+      }
+      if (item.role === "card") this.hold(item.card, void 0, at);
+      else {
+        const text = str(item.text) ?? "";
+        const partial = item.interrupted === true ? "interrupted" : void 0;
+        if (known === void 0)
+          this.say(
+            str(item.role) ?? "",
+            text,
+            key,
+            partial ? { partial } : {},
+            at
+          );
+        else
+          this.messages = this.messages.map((m) => {
+            if (m.key !== key) return m;
+            const { partial: local, ...rest } = m;
+            const kept = partial ?? (local === "interrupted" ? void 0 : local);
+            return {
+              ...rest,
+              text: text || m.text,
+              ...kept ? { partial: kept } : {}
+            };
+          });
+      }
+      prev = seqOf(key);
+    });
+    this.messages.sort((a, b) => a.seq - b.seq);
+  }
+  hold(raw, turnId, at) {
     if (!raw) return;
     const id = str(raw.id);
     if (id === void 0) return;
@@ -452,7 +509,7 @@ var ConversationEngine = class {
       locked: lockedFrom(question),
       ...turnId !== void 0 ? { turnId } : {},
       // A card still held keeps its place when it is drawn again (a reconnect's pending cards, a repeated ui.cards).
-      seq: this.cards.get(id)?.seq ?? this.seq++
+      seq: this.cards.get(id)?.seq ?? at ?? this.seq++
     };
     for (const held of this.held) {
       const sent = this.inputs.get(held);
@@ -548,9 +605,9 @@ var ConversationEngine = class {
     this.unqueue(id);
   }
   /** Adds a message once: a key already held (a frame seen twice) changes nothing. */
-  say(role, text, key, extra = {}, seq = this.seq++) {
+  say(role, text, key, extra = {}, seq) {
     if (this.messages.some((m) => m.key === key)) return;
-    this.messages.push({ role, text, key, seq, ...extra });
+    this.messages.push({ role, text, key, seq: seq ?? this.seq++, ...extra });
   }
   /** The turn's streamed text, kept as the agent's message when the turn ends without its `message.completed`. */
   cutOff(partial) {
@@ -645,6 +702,11 @@ function transcriptKey(role, id, at) {
   if (role === "staff") return `s:${id}`;
   return id;
 }
+function transcriptHasIds(transcript) {
+  return asArray(transcript).every(
+    (item) => item.role === "card" ? str(item.card?.id) !== void 0 : str(item.id) !== void 0
+  );
+}
 function lockedFrom(question) {
   if (!question) return [];
   if (question.state !== "open") {
@@ -1467,7 +1529,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
@@ -1499,17 +1562,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);
@@ -1519,6 +1575,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 {
@@ -1593,6 +1667,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;
@@ -1634,6 +1710,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");
@@ -1698,9 +1776,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;
@@ -1740,7 +1828,7 @@ var ConversationStore = class {
     }
     if (this.suspended) {
       this.early.set(id, text);
-      void this.wake();
+      void this.wake(true);
       this.update();
       return id;
     }
@@ -1750,6 +1838,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;
@@ -1886,11 +1980,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;
@@ -1898,7 +2002,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();
@@ -1925,6 +2031,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();
@@ -1939,10 +2049,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;
@@ -1967,9 +2085,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) => str2(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;
       }
@@ -2128,6 +2255,7 @@ var ConversationStore = class {
         transcriptSeen: this.transcriptSeen,
         cardOrder: this.cardOrder,
         kept: this.kept,
+        inert: this.inert,
         system: this.system
       },
       prev?.items ?? NO_ITEMS
@@ -2144,6 +2272,7 @@ var ConversationStore = class {
       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,
@@ -2250,6 +2379,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(
@@ -2303,6 +2437,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;
 }
 
+// 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();
+    }
+  };
+}
+
 exports.CONTRACT = CONTRACT;
 exports.ConversationStore = ConversationStore;
 exports.MAX_TEXT = MAX_TEXT;
@@ -2310,6 +2480,7 @@ exports.VinaverseClientError = VinaverseClientError;
 exports.answerProblem = answerProblem;
 exports.codePoints = codePoints;
 exports.createConversation = createConversation;
+exports.createConversationsByMode = createConversationsByMode;
 exports.isAllowedLink = isAllowedLink;
 exports.isKnownCard = isKnownCard;
 exports.isValidLinkPrefix = isValidLinkPrefix;