@yeaft/webchat-agent 1.0.224 → 1.0.227

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.224",
+  "version": "1.0.227",
   "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/terminal.js

@@ -58,11 +58,19 @@ export async function loadNodePty() {
   }
 }
 
+function terminalRoutingFields(source) {
+  return {
+    ...(source?._requestUserId ? { _requestUserId: source._requestUserId } : {}),
+    ...(source?._requestClientId ? { _requestClientId: source._requestClientId } : {}),
+  };
+}
+
 export async function handleTerminalCreate(msg) {
   const { conversationId, cols, rows } = msg;
   const terminalId = msg.terminalId || conversationId;
   const conv = ctx.conversations.get(conversationId);
   const workDir = conv?.workDir || ctx.CONFIG.workDir;
+  const routingFields = terminalRoutingFields(msg);
 
   // 如果已存在终端，先关闭
   if (ctx.terminals.has(terminalId)) {
@@ -80,7 +88,8 @@ export async function handleTerminalCreate(msg) {
       type: 'terminal_error',
       conversationId,
       terminalId,
-      message: 'Terminal backend is not installed. Run: npm install'
+      message: 'Terminal backend is not installed. Run: npm install',
+      ...routingFields,
     });
     return;
   }
@@ -123,7 +132,8 @@ export async function handleTerminalCreate(msg) {
             type: 'terminal_output',
             conversationId,
             terminalId,
-            data: buffer
+            data: buffer,
+            ...routingFields,
           });
           buffer = '';
           timer = null;
@@ -138,7 +148,8 @@ export async function handleTerminalCreate(msg) {
           type: 'terminal_output',
           conversationId,
           terminalId,
-          data: buffer
+          data: buffer,
+          ...routingFields,
         });
         buffer = '';
       }
@@ -149,7 +160,8 @@ export async function handleTerminalCreate(msg) {
       ctx.sendToServer({
         type: 'terminal_closed',
         conversationId,
-        terminalId
+        terminalId,
+        ...routingFields,
       });
     });
 
@@ -159,7 +171,8 @@ export async function handleTerminalCreate(msg) {
       cols: cols || 80,
       rows: rows || 24,
       buffer: '',
-      timer: null
+      timer: null,
+      ...routingFields,
     });
 
     console.log(`[PTY] Created terminal ${terminalId} for ${conversationId} in ${workDir}`);
@@ -167,7 +180,8 @@ export async function handleTerminalCreate(msg) {
       type: 'terminal_created',
       conversationId,
       terminalId,
-      success: true
+      success: true,
+      ...routingFields,
     });
   } catch (e) {
     console.error(`[PTY] Failed to create terminal:`, e.message);
@@ -175,7 +189,8 @@ export async function handleTerminalCreate(msg) {
       type: 'terminal_error',
       conversationId,
       terminalId,
-      message: `Failed to create terminal: ${e.message}`
+      message: `Failed to create terminal: ${e.message}`,
+      ...routingFields,
     });
   }
 }
@@ -220,7 +235,8 @@ export function handleTerminalClose(msg) {
     ctx.sendToServer({
       type: 'terminal_closed',
       conversationId: term.conversationId || msg.conversationId,
-      terminalId
+      terminalId,
+      ...terminalRoutingFields(term),
     });
   }
 }

package/yeaft/conversation/internal-control.js

@@ -20,3 +20,13 @@ export function isHiddenConversationRow(row) {
   if (row.kind === 'compact_summary' || row._compactSummary) return true;
   return isInternalControlContent(row.content);
 }
+
+/**
+ * Whether a persisted row may be shown as a human-authored conversation turn.
+ * Legacy user rows predate provenance metadata and remain visible; new Engine
+ * protocol rows carry `userAuthored: false` and are model-only.
+ */
+export function isVisibleConversationRow(row) {
+  if (isHiddenConversationRow(row)) return false;
+  return row?.role !== 'user' || row.userAuthored !== false;
+}

package/yeaft/conversation/persist.js

@@ -23,7 +23,7 @@ import { isPermissionError } from '../init.js';
 import { writeAtomic } from '../storage/atomic.js';
 import { pairSanitize } from '../pair-sanitize.js';
 import { sliceLastNTurns, stripVpMentionPrefix } from '../turn-utils.js';
-import { isHiddenConversationRow } from './internal-control.js';
+import { isHiddenConversationRow, isVisibleConversationRow } from './internal-control.js';
 
 /**
  * Default cold-start "recent window" size, expressed in TURNS (not raw
@@ -317,6 +317,7 @@ export function projectVisibleSessionMessages(messages) {
   const visible = [];
   for (const row of rows) {
     if (!row || (row.role !== 'user' && row.role !== 'assistant')) continue;
+    if (!isVisibleConversationRow(row)) continue;
     if (row.role !== 'assistant' || !Array.isArray(row.toolCalls) || row.toolCalls.length === 0) {
       if (row.role === 'assistant' && !row.content && !row.attachments && !row.images
           && !row.toolSummaryCount && !row.askUserResults) continue;
@@ -385,6 +386,7 @@ function serializeMessage(msg) {
   if (msg.sessionId) fm.push(`sessionId: ${msg.sessionId}`);
   if (msg.chatId) fm.push(`chatId: ${msg.chatId}`);
   if (msg.clientMessageId) fm.push(`clientMessageId: ${msg.clientMessageId}`);
+  if (typeof msg.userAuthored === 'boolean') fm.push(`userAuthored: ${msg.userAuthored}`);
   if (msg.incomplete) fm.push('incomplete: true');
   if (msg.stopReason) fm.push(`stopReason: ${msg.stopReason}`);
   // Session attribution: when a VP authors an assistant turn (either
@@ -516,6 +518,7 @@ export function parseMessage(raw) {
       case 'sessionId': msg.sessionId = value; break;
       case 'chatId': msg.chatId = value; break;
       case 'clientMessageId': msg.clientMessageId = value; break;
+      case 'userAuthored': msg.userAuthored = value === 'true'; break;
       case 'incomplete': msg.incomplete = value === 'true'; break;
       case 'stopReason': msg.stopReason = value; break;
       case 'speakerVpId': msg.speakerVpId = value; break;
@@ -1524,7 +1527,7 @@ export class ConversationStore {
     if (!sessionId) return { messages: [], oldestSeq: null, hasMore: false };
     const cutoff = Number.isFinite(beforeSeq) ? beforeSeq : Infinity;
     const prefix = this.#readSessionRows(sessionId, { beforeSeq: cutoff })
-      .filter(m => m && m.sessionId === sessionId && !isHiddenConversationRow(m));
+      .filter(m => m && m.sessionId === sessionId && isVisibleConversationRow(m));
     if (prefix.length === 0) return { messages: [], oldestSeq: null, hasMore: false };
     const sliced = pairSanitize(sliceLastNTurns(prefix, turnsLimit));
     // Turn-based hasMore: there's an EARLIER turn boundary we didn't keep.
@@ -1563,6 +1566,7 @@ export class ConversationStore {
       beforeSeq: cutoff,
       roles: null,
       stripAssistantToolCalls: false,
+      visibleOnly: true,
     });
     const messages = projectVisibleSessionMessages(page.messages);
     if (messages.length === 0) return { messages: [], oldestSeq: null, hasMore: page.truncated };
@@ -1638,7 +1642,7 @@ export class ConversationStore {
     for (const m of this.#iterateSessionRows(sessionId, { afterSeq: cutoff, desc: false })) {
       if (!m || m.sessionId !== sessionId) continue;
       const seq = parseSeqFromId(m.id);
-      const hidden = isHiddenConversationRow(m);
+      const hidden = !isVisibleConversationRow(m);
       if (!hidden) {
         // Keep every outstanding call open across interleaved VP rows. Session
         // persistence is globally sequenced, so a sibling VP may append visible
@@ -1794,13 +1798,14 @@ export class ConversationStore {
       beforeSeq: anchorSeq + 1,
       roles: null,
       stripAssistantToolCalls: false,
+      visibleOnly: true,
     });
     const messages = beforeRaw.messages.slice();
     const seen = new Set(messages.map(message => message?.id).filter(Boolean));
     let followingUserTurns = 0;
 
     for (const message of this.#iterateSessionRows(sessionId, { afterSeq: anchorSeq, desc: false })) {
-      if (!message || message.sessionId !== sessionId || isHiddenConversationRow(message)) continue;
+      if (!message || message.sessionId !== sessionId || !isVisibleConversationRow(message)) continue;
       if (message.role === 'user') {
         followingUserTurns += 1;
         if (followingUserTurns > afterTurns) break;
@@ -2452,6 +2457,7 @@ export class ConversationStore {
     roles = null,
     stripAssistantToolCalls = false,
     includeReflections = false,
+    visibleOnly = false,
   } = {}) {
     const kept = [];
     const pendingBoundaryRows = [];
@@ -2498,7 +2504,9 @@ export class ConversationStore {
       if (!m || m.sessionId !== sessionId) continue;
 
       const boundaryComplete = turnsFromEnd >= turnsLimit;
-      if (isHiddenConversationRow(m) && !(includeReflections && m._reflection === true)) {
+      const hidden = isHiddenConversationRow(m)
+        || (visibleOnly && !isVisibleConversationRow(m));
+      if (hidden && !(includeReflections && m._reflection === true)) {
         if (boundaryComplete) {
           truncated = true;
           break;
@@ -2551,7 +2559,7 @@ export class ConversationStore {
     let current = null;
 
     const visibleRow = (message) => {
-      if (!message || message.sessionId !== sessionId || isHiddenConversationRow(message)) return null;
+      if (!message || message.sessionId !== sessionId || !isVisibleConversationRow(message)) return null;
       if (message.role !== 'user' && message.role !== 'assistant') return null;
       if (!message.id || seen.has(message.id)) return null;
       seen.add(message.id);

package/yeaft/engine.js

@@ -1401,6 +1401,8 @@ export class Engine {
     if (message.isError) record.isError = true;
     if (message.imageAssetAnchor) record.imageAssetAnchor = true;
     if (message._reflection) record._reflection = true;
+    if (message.role === 'user') record.userAuthored = message.userAuthored === true;
+    if (message.internal === true) record.internal = true;
     if (Array.isArray(message.foldedMessageIds) && message.foldedMessageIds.length > 0) {
       record.foldedMessageIds = [...message.foldedMessageIds];
     }
@@ -1702,7 +1704,11 @@ export class Engine {
 
   #persistAppendedUserMessage(item, sessionId) {
     if (!item || item.persisted || item.internal) return;
-    this.#persistConversationMessage({ role: 'user', content: item.content }, { sessionId });
+    this.#persistConversationMessage({
+      role: 'user',
+      content: item.content,
+      userAuthored: true,
+    }, { sessionId });
     item.persisted = true;
   }
 
@@ -1912,7 +1918,7 @@ export class Engine {
     // already writes one shared user row before multi-VP fan-out, so those
     // callers set userAlreadyPersisted and every VP skips this append.
     if (!userAlreadyPersisted) {
-      this.#persistConversationMessage({ role: 'user', content: prompt }, {
+      this.#persistConversationMessage({ role: 'user', content: prompt, userAuthored: true }, {
         sessionId: runtimeSessionId,
       });
     }

package/yeaft/router/continuity.js

@@ -98,9 +98,10 @@ export function stripMetaForWire(messages) {
   let mutated = false;
   const out = messages.map(m => {
     if (m && typeof m === 'object'
-        && ('_meta' in m || '_runtimeTurnId' in m || '_partialTurn' in m || '_persistedMessageId' in m)) {
+        && ('_meta' in m || '_runtimeTurnId' in m || '_partialTurn' in m
+          || '_persistedMessageId' in m || 'userAuthored' in m)) {
       mutated = true;
-      const { _meta, _runtimeTurnId, _partialTurn, _persistedMessageId, ...rest } = m;
+      const { _meta, _runtimeTurnId, _partialTurn, _persistedMessageId, userAuthored, ...rest } = m;
       return rest;
     }
     return m;

package/yeaft/web-bridge.js

@@ -62,7 +62,7 @@ import {
 } from './history-compact.js';
 import { persistYeaftAttachments, attachmentsForPersistence, persistedAttachmentPreviewPayload } from './attachments.js';
 import { ConversationStore, parseSeqFromId, projectVisibleSessionMessages } from './conversation/persist.js';
-import { isHiddenConversationRow } from './conversation/internal-control.js';
+import { isHiddenConversationRow, isVisibleConversationRow } from './conversation/internal-control.js';
 import { imageMetadataForPersistence } from './image-assets.js';
 import { sliceLastNTurns } from './turn-utils.js';
 import { pairSanitize } from './pair-sanitize.js';
@@ -1215,6 +1215,7 @@ function projectPersistedToHistoryEntry(m, { includeReflections = false } = {})
 }
 
 function projectPersistedToVisibleHistoryEntry(m) {
+  if (!isVisibleConversationRow(m)) return null;
   const entry = projectPersistedToHistoryEntry(m);
   return entry && (entry.role === 'user' || entry.role === 'assistant') ? entry : null;
 }
@@ -3703,6 +3704,7 @@ function handleEngineEvent(event, hctx) {
       }
       sendSessionOutputFrame({
         type: 'user',
+        userAuthored: false,
         tool_use_result: [{
           type: 'tool_result',
           tool_use_id: event.id,
@@ -3735,6 +3737,7 @@ function handleEngineEvent(event, hctx) {
       }
       sendSessionOutputFrame({
         type: 'user',
+        userAuthored: false,
         tool_use_result: [{
           type: 'tool_result',
           tool_use_id: event.toolCallId,
@@ -5461,8 +5464,11 @@ function persistInboundMessageOnceByMsgId({ msgId, text, sessionId, threadId = '
       threadId: threadId || 'main',
     };
     if (sessionId) record.sessionId = sessionId;
-    if (persistRole === 'user' && clientMessageId && typeof clientMessageId === 'string') {
-      record.clientMessageId = clientMessageId;
+    if (persistRole === 'user') {
+      record.userAuthored = true;
+      if (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