@yeaft/webchat-agent 1.0.39 → 1.0.41

package/connection/buffer.js

@@ -5,6 +5,7 @@ import { encrypt, decrypt, isEncrypted } from '../encryption.js';
 // 需要在断连期间缓冲的消息类型（CLI / Session 输出相关的关键消息）
 export const BUFFERABLE_TYPES = new Set([
   'claude_output', 'yeaft_output', 'yeaft_session_output', 'session_output',
+  'yeaft_history_chunk',
   'turn_completed', 'conversation_closed',
   'session_id_update', 'compact_status', 'slash_commands_update',
   'background_task_started', 'background_task_output',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/yeaft/conversation/persist.js

@@ -206,6 +206,7 @@ function serializeMessage(msg) {
   // routing can filter/replay by thread without rescanning JSON blobs.
   // Defaults to 'main' for legacy messages (see migrate-messages-threadid.js).
   fm.push(`threadId: ${msg.threadId || 'main'}`);
+  if (msg.turnId) fm.push(`turnId: ${msg.turnId}`);
   // task-313: when a thread is merged into another, the messages keep
   // their original thread id in `sourceThreadId` so the UI can still
   // render a small "#source" pill next to each bubble.
@@ -216,6 +217,7 @@ function serializeMessage(msg) {
   // shows an empty pane.
   if (msg.sessionId) fm.push(`sessionId: ${msg.sessionId}`);
   if (msg.chatId) fm.push(`chatId: ${msg.chatId}`);
+  if (msg.clientMessageId) fm.push(`clientMessageId: ${msg.clientMessageId}`);
   // Session attribution: when a VP authors an assistant turn (either
   // its own reply or a route_forward injection from another VP), stamp
   // the speaker so the UI can render the message on the correct VP track.
@@ -333,9 +335,11 @@ export function parseMessage(raw) {
       case 'isError': msg.isError = value === 'true'; break;
       case 'tokens_est': msg.tokens_est = parseInt(value, 10); break;
       case 'threadId': msg.threadId = value; break;
+      case 'turnId': msg.turnId = value; break;
       case 'sourceThreadId': msg.sourceThreadId = value; break;
       case 'sessionId': msg.sessionId = value; break;
       case 'chatId': msg.chatId = value; break;
+      case 'clientMessageId': msg.clientMessageId = value; break;
       case 'speakerVpId': msg.speakerVpId = value; break;
       case 'attachmentsB64':
         try {

package/yeaft/engine.js

@@ -1597,7 +1597,7 @@ export class Engine {
    *   string-prompt shape (no regression for existing callers).
    * @yields {EngineEvent}
    */
-  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, drainPendingUserMessages = null, collabToolPolicy = null } = {}) {
+  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null } = {}) {
     if (!prompt || typeof prompt !== 'string' || !prompt.trim()) {
       yield {
         type: 'error',
@@ -2833,6 +2833,7 @@ export class Engine {
             // history replay can re-stamp them on reload.
             sessionId,
             threadId,
+            turnId: vpTurnId || queryTurnId,
             vpId: this.#vpId,
             // Multi-VP fan-out (history-dedup): skip the user-row append
             // in stop-hooks when the orchestrator already wrote it once

package/yeaft/stop-hooks.js

@@ -65,6 +65,7 @@ export async function runStopHooks(context) {
     // history replay can route messages back into the originating group.
     sessionId,
     threadId,
+    turnId,
     // Group VP attribution: persist the engine-bound VP id on assistant/tool
     // rows so history replay can route replies back to the same visible VP.
     vpId,
@@ -167,6 +168,9 @@ export async function runStopHooks(context) {
         // Bug 6: stamp sessionId / threadId so replay can re-route by group.
         if (sessionId) record.sessionId = sessionId;
         if (threadId) record.threadId = threadId;
+        if (turnId && (msg.role === 'assistant' || msg.role === 'tool')) {
+          record.turnId = turnId;
+        }
         if (vpId && (msg.role === 'assistant' || msg.role === 'tool')) {
           record.speakerVpId = vpId;
         }

package/yeaft/web-bridge.js

@@ -712,8 +712,9 @@ function projectPersistedToHistoryEntry(m) {
   const entry = { role: m.role, content: m.role === 'tool' ? m.content : __testNormalizePersistedVisibleContent(m.content) };
   if (m.id) entry.id = m.id;
   entry.threadId = m.threadId || m.turnId || 'main';
-  entry.turnId = m.turnId || entry.threadId;
+  if (m.turnId) entry.turnId = m.turnId;
   if (m.sessionId) entry.sessionId = m.sessionId;
+  if (m.clientMessageId) entry.clientMessageId = m.clientMessageId;
   if (m.speakerVpId) entry.speakerVpId = m.speakerVpId;
   if (m.toolCallId) entry.toolCallId = m.toolCallId;
   if (Array.isArray(m.toolCalls) && m.toolCalls.length > 0) {
@@ -813,8 +814,9 @@ function projectVisibleHistoryChunkMessages(messages = []) {
       content: m.content,
       ts: m.ts || null,
       sessionId: m.sessionId || null,
+      ...(m.clientMessageId ? { clientMessageId: m.clientMessageId } : {}),
       threadId: m.threadId || m.turnId || 'main',
-      turnId: m.turnId || m.threadId || 'main',
+      ...(m.turnId ? { turnId: m.turnId } : {}),
       ...(Array.isArray(m.attachments) && m.attachments.length > 0 ? { attachments: hydrateHistoryAttachmentPreviews(m.attachments) } : {}),
       ...(m.speakerVpId ? { speakerVpId: m.speakerVpId } : {}),
       ...(Number.isFinite(m.toolSummaryCount) && m.toolSummaryCount > 0
@@ -1392,6 +1394,7 @@ async function routeEnvelopeToVpThread(sessionId, vpId, envelope) {
       attachments: Array.isArray(envelope?.msg?.meta?.attachments) ? envelope.msg.meta.attachments : [],
       internal: isInternalAppend,
       ts: envelope?.msg?.ts || null,
+      clientMessageId: envelope?.msg?.meta?.clientMessageId || null,
     });
     thread.updatedAt = Date.now();
     try {
@@ -1489,6 +1492,7 @@ function ensureDriverRunning(sessionId, vpId, threadId = 'main') {
             attachments: Array.isArray(meta.attachments) ? meta.attachments : [],
             internal: isInternal,
             ts: envelope?.msg?.ts || null,
+            clientMessageId: meta.clientMessageId || null,
           });
         }
       } catch { /* never crash WS pipeline */ }
@@ -3152,6 +3156,7 @@ export async function handleYeaftSessionSend(msg) {
         mentions,
         // Persisted form (no base64) — safe for jsonl-log.
         attachments: persistedAttachments,
+        clientMessageId: typeof msg.id === 'string' && msg.id ? msg.id : null,
       },
       // Live form — adapters need the base64 image blocks; runVpTurn
       // reads `_promptParts` off the envelope rather than going
@@ -3691,6 +3696,7 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
         // would render the user's prompt N times.
         userAlreadyPersisted: true,
         threadId,
+        vpTurnId: turnId,
         drainPendingUserMessages: () => {
           if (!thread || !Array.isArray(thread.pendingQueries) || thread.pendingQueries.length === 0) return [];
           return thread.pendingQueries.splice(0);
@@ -3945,11 +3951,11 @@ function appendTurnToSessionHistory(sessionId, threadId, vpId, prompts, assistan
  * refresh replay can render chips without leaking image source data into
  * the message body.
  *
- * @param {{ msgId:string, text:string, sessionId:string, role?:string, speakerVpId?:string|null, attachments?:Array<object>, internal?:boolean, ts?:string|null }} args
+ * @param {{ msgId:string, text:string, sessionId:string, role?:string, speakerVpId?:string|null, attachments?:Array<object>, internal?:boolean, ts?:string|null, clientMessageId?:string|null }} args
  * @returns {boolean} true if this call wrote the row, false if a prior
  *   call already wrote it (dedup hit).
  */
-function persistInboundMessageOnceByMsgId({ msgId, text, sessionId, threadId = 'main', role, speakerVpId, attachments, internal = false, ts = null }) {
+function persistInboundMessageOnceByMsgId({ msgId, text, sessionId, threadId = 'main', role, speakerVpId, attachments, internal = false, ts = null, clientMessageId = null }) {
   if (!session?.conversationStore) return false;
   // No msgId means no dedup key — caller is responsible for guarding.
   // Both call sites already do (`if (envMsgId && text)` and
@@ -3993,6 +3999,9 @@ function persistInboundMessageOnceByMsgId({ msgId, text, sessionId, threadId = '
       threadId: threadId || 'main',
     };
     if (sessionId) record.sessionId = sessionId;
+    if (persistRole === 'user' && clientMessageId && typeof clientMessageId === 'string') {
+      record.clientMessageId = clientMessageId;
+    }
     // Stamp speakerVpId so the UI's loadHistory replay can route the row
     // to the correct VP block. Only meaningful when role='assistant'; for
     // a real user message we leave it unset (the UI's user track is
@@ -4818,6 +4827,110 @@ export async function handleYeaftLoadHistory(msg) {
     sessionId ? store.loadRecentBySession(sessionId, lim) : store.loadRecent(lim);
   let historyAlreadyReplayed = false;
 
+  const replayHistoryFromStore = () => {
+    // Delta path: caller knows the latest seq (or message id) it has cached
+    // and wants only the messages that arrived after that cursor. Returns
+    // mode:'delta' so the frontend can append+dedupe instead of replacing
+    // the pane.
+    const afterSeqRaw = (msg && Number.isFinite(msg.afterSeq)) ? msg.afterSeq : null;
+    const afterMessageId = (msg && typeof msg.afterMessageId === 'string') ? msg.afterMessageId : null;
+    let afterSeq = afterSeqRaw;
+    if (afterSeq === null && afterMessageId && typeof session.conversationStore.getMessageSeqById === 'function') {
+      afterSeq = session.conversationStore.getMessageSeqById(afterMessageId);
+    }
+    if (sessionId && afterSeq !== null && typeof session.conversationStore.loadAfterSeqByGroup === 'function') {
+      const delta = session.conversationStore.loadAfterSeqByGroup(sessionId, afterSeq);
+      const projectedMessages = emitHistoryChunk({
+        sessionId,
+        messages: delta.messages,
+        mode: 'delta',
+        latestSeq: delta.latestSeq,
+        afterSeq,
+      });
+      sendSessionEvent({
+        type: 'history_loaded',
+        mode: 'delta',
+        count: projectedMessages.length,
+        sessionId,
+        latestSeq: delta.latestSeq,
+        afterSeq,
+      });
+      return;
+    }
+
+    // `msg.limit` is the replay-scrollback request from the frontend (UI
+    // history pane, not engine context). Keep the bootstrap window small so
+    // opening a group can paint the latest messages quickly; older rows are
+    // paged via `yeaft_load_more_history` when the user scrolls upward.
+    const limit = (typeof msg.limit === 'number') ? msg.limit : 10;
+    const visiblePage = sessionId
+      ? loadVisibleGroupHistoryPage(session.conversationStore, sessionId, limit)
+      : { messages: limit > 0 ? pickRecent(session.conversationStore, limit) : [], oldestSeq: null, hasMore: false };
+    // Legacy compact.md is a non-group fallback only. For group replay, reading
+    // it makes every group show "has compact" once any legacy/non-scoped compact
+    // exists, even when this group has no scoped summary.
+    const compactSummary = sessionId ? '' : session.conversationStore.readCompactSummary();
+    const replayEntries = sessionId
+      ? visiblePage.messages
+      : visiblePage.messages
+        .map(projectPersistedToVisibleHistoryEntry)
+        .filter(Boolean);
+
+    let latestSeq = null;
+    if (replayEntries.length > 0 && typeof session.conversationStore.getMessageSeqById === 'function') {
+      const last = replayEntries[replayEntries.length - 1];
+      if (last && last.id) latestSeq = session.conversationStore.getMessageSeqById(last.id);
+    }
+
+    if (sessionId) {
+      emitHistoryChunk({
+        sessionId,
+        messages: replayEntries,
+        mode: 'recent',
+        oldestSeq: visiblePage.oldestSeq,
+        hasMore: visiblePage.hasMore,
+        latestSeq,
+        turns: limit,
+      });
+    } else {
+      emitLegacyHistoryOutputFrames(replayEntries);
+    }
+
+    // Compute the pagination cursor for the bootstrap load so the frontend
+    // knows whether a "Load older messages" hint should be shown and where
+    // to start the next page. For group history, this is computed from the
+    // visible projected page, not raw persisted rows, so reflection/internal
+    // tail rows cannot consume the bootstrap window or create false hasMore.
+    let hasMore = false;
+    let oldestSeq = null;
+    if (sessionId) {
+      hasMore = visiblePage.hasMore;
+      oldestSeq = visiblePage.oldestSeq;
+    }
+
+    // hasCompactSummary used to read a single session-global file, so it was
+    // always true once ANY group/VP in the session had compacted. For group
+    // replay, only scoped per-(group, vp) summaries count; legacy compact.md is
+    // reserved for non-group / pre-scoped 1:1 callers.
+    let hasCompactSummaryFlag = !!compactSummary;
+    if (sessionId && typeof session.conversationStore.hasAnyCompactSummaryForSession === 'function') {
+      hasCompactSummaryFlag = session.conversationStore.hasAnyCompactSummaryForSession(sessionId);
+    }
+
+    sendSessionEvent({
+      type: 'history_loaded',
+      mode: 'recent',
+      count: replayEntries.length,
+      hasCompactSummary: hasCompactSummaryFlag,
+      totalHot: session.conversationStore.countHot(),
+      totalCold: session.conversationStore.countCold(),
+      sessionId,
+      hasMore,
+      oldestSeq,
+      latestSeq,
+    });
+  };
+
   if (!session) {
     const yeaftDir = ctx.CONFIG?.yeaftDir || DEFAULT_YEAFT_DIR;
     const afterSeqRaw = (msg && Number.isFinite(msg.afterSeq)) ? msg.afterSeq : null;
@@ -4869,6 +4982,8 @@ export async function handleYeaftLoadHistory(msg) {
     // hydration handles it.
     if (sessionId) setGroupHistory(sessionId, hydrateGroupHistory(sessionId));
   } else {
+    replayHistoryFromStore();
+    historyAlreadyReplayed = true;
     refreshLiveSessionConfig();
     hydrateYeaftStatusFromSession(session, { reason: 'history_load', emitEvent: true });
   }
@@ -4908,107 +5023,7 @@ export async function handleYeaftLoadHistory(msg) {
 
   if (historyAlreadyReplayed) return;
 
-  // Delta path: caller knows the latest seq (or message id) it has cached
-  // and wants only the messages that arrived after that cursor. Returns
-  // early with mode:'delta' so the frontend can append+dedupe instead of
-  // replacing the pane.
-  const afterSeqRaw = (msg && Number.isFinite(msg.afterSeq)) ? msg.afterSeq : null;
-  const afterMessageId = (msg && typeof msg.afterMessageId === 'string') ? msg.afterMessageId : null;
-  let afterSeq = afterSeqRaw;
-  if (afterSeq === null && afterMessageId && typeof session.conversationStore.getMessageSeqById === 'function') {
-    afterSeq = session.conversationStore.getMessageSeqById(afterMessageId);
-  }
-  if (sessionId && afterSeq !== null && typeof session.conversationStore.loadAfterSeqByGroup === 'function') {
-    const delta = session.conversationStore.loadAfterSeqByGroup(sessionId, afterSeq);
-    const projectedMessages = emitHistoryChunk({
-      sessionId,
-      messages: delta.messages,
-      mode: 'delta',
-      latestSeq: delta.latestSeq,
-      afterSeq,
-    });
-    sendSessionEvent({
-      type: 'history_loaded',
-      mode: 'delta',
-      count: projectedMessages.length,
-      sessionId,
-      latestSeq: delta.latestSeq,
-      afterSeq,
-    });
-    return;
-  }
-
-  // `msg.limit` is the replay-scrollback request from the frontend (UI
-  // history pane, not engine context). Keep the bootstrap window small so
-  // opening a group can paint the latest messages quickly; older rows are
-  // paged via `yeaft_load_more_history` when the user scrolls upward.
-  const limit = (typeof msg.limit === 'number') ? msg.limit : 10;
-  const visiblePage = sessionId
-    ? loadVisibleGroupHistoryPage(session.conversationStore, sessionId, limit)
-    : { messages: limit > 0 ? pickRecent(session.conversationStore, limit) : [], oldestSeq: null, hasMore: false };
-  // Legacy compact.md is a non-group fallback only. For group replay, reading
-  // it makes every group show "has compact" once any legacy/non-scoped compact
-  // exists, even when this group has no scoped summary.
-  const compactSummary = sessionId ? '' : session.conversationStore.readCompactSummary();
-  const replayEntries = sessionId
-    ? visiblePage.messages
-    : visiblePage.messages
-      .map(projectPersistedToVisibleHistoryEntry)
-      .filter(Boolean);
-
-  let latestSeq = null;
-  if (replayEntries.length > 0 && typeof session.conversationStore.getMessageSeqById === 'function') {
-    const last = replayEntries[replayEntries.length - 1];
-    if (last && last.id) latestSeq = session.conversationStore.getMessageSeqById(last.id);
-  }
-
-  if (sessionId) {
-    emitHistoryChunk({
-      sessionId,
-      messages: replayEntries,
-      mode: 'recent',
-      oldestSeq: visiblePage.oldestSeq,
-      hasMore: visiblePage.hasMore,
-      latestSeq,
-      turns: limit,
-    });
-  } else {
-    emitLegacyHistoryOutputFrames(replayEntries);
-  }
-
-  // Compute the pagination cursor for the bootstrap load so the frontend
-  // knows whether a "Load older messages" hint should be shown and where
-  // to start the next page. For group history, this is computed from the
-  // visible projected page, not raw persisted rows, so reflection/internal
-  // tail rows cannot consume the bootstrap window or create false hasMore.
-  let hasMore = false;
-  let oldestSeq = null;
-  if (sessionId) {
-    hasMore = visiblePage.hasMore;
-    oldestSeq = visiblePage.oldestSeq;
-  }
-
-  // hasCompactSummary used to read a single session-global file, so it was
-  // always true once ANY group/VP in the session had compacted. For group
-  // replay, only scoped per-(group, vp) summaries count; legacy compact.md is
-  // reserved for non-group / pre-scoped 1:1 callers.
-  let hasCompactSummaryFlag = !!compactSummary;
-  if (sessionId && typeof session.conversationStore.hasAnyCompactSummaryForSession === 'function') {
-    hasCompactSummaryFlag = session.conversationStore.hasAnyCompactSummaryForSession(sessionId);
-  }
-
-  sendSessionEvent({
-    type: 'history_loaded',
-    mode: 'recent',
-    count: replayEntries.length,
-    hasCompactSummary: hasCompactSummaryFlag,
-    totalHot: session.conversationStore.countHot(),
-    totalCold: session.conversationStore.countCold(),
-    sessionId,
-    hasMore,
-    oldestSeq,
-    latestSeq,
-  });
+  replayHistoryFromStore();
 }
 
 /**