@yeaft/webchat-agent 0.1.817 → 0.1.821

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.817",
+  "version": "0.1.821",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/unify/conversation/persist.js

@@ -107,6 +107,12 @@ function serializeMessage(msg) {
   // the speaker so the UI can render the message on the correct VP track.
   // For real user messages this is unset.
   if (msg.speakerVpId) fm.push(`speakerVpId: ${msg.speakerVpId}`);
+  if (Array.isArray(msg.attachments) && msg.attachments.length > 0) {
+    try {
+      const b64 = Buffer.from(JSON.stringify(msg.attachments)).toString('base64');
+      fm.push(`attachmentsB64: ${b64}`);
+    } catch { /* best-effort: attachments are UI metadata, not engine-critical */ }
+  }
   // Internal/synthetic rows must round-trip so refresh/history replay can
   // keep them out of the user-visible conversation. Reflection folding uses
   // `_reflection`; other engine-only rows may use one of the explicit flags.
@@ -213,6 +219,12 @@ export function parseMessage(raw) {
       case 'sourceThreadId': msg.sourceThreadId = value; break;
       case 'groupId': msg.groupId = value; break;
       case 'speakerVpId': msg.speakerVpId = value; break;
+      case 'attachmentsB64':
+        try {
+          const parsed = JSON.parse(Buffer.from(value, 'base64').toString('utf8'));
+          if (Array.isArray(parsed)) msg.attachments = parsed;
+        } catch { /* best-effort: ignore malformed attachment metadata */ }
+        break;
       case '_reflection': msg._reflection = value === 'true'; break;
       case 'internal': msg.internal = value === 'true'; break;
       case 'systemOnly': msg.systemOnly = value === 'true'; break;

package/unify/debug-trace.js

@@ -364,11 +364,14 @@ export class DebugTrace {
    * fields the panel expects. JSON columns are parsed; truncated /
    * malformed payloads degrade to null instead of failing the call.
    *
-   * @param {{ limit?: number, groupId?: string|null, threadId?: string|null }} [opts]
-   * @returns {{ loops: object[], turns: object[] }}
+   * @param {{ limit?: number, dreamLimit?: number, groupId?: string|null, threadId?: string|null }} [opts]
+   * @returns {{ loops: object[], turns: object[], dreamEvents: object[] }}
    */
-  fetchRecentDebugHistory({ limit = 100, groupId = null, threadId = null } = {}) {
+  fetchRecentDebugHistory({ limit = 100, dreamLimit = 5, groupId = null, threadId = null } = {}) {
     const lim = Math.max(1, Math.min(500, Number(limit) || 100));
+    const dreamLim = Number.isFinite(Number(dreamLimit))
+      ? Math.max(0, Math.min(50, Number(dreamLimit)))
+      : 5;
     const where = [];
     const args = [];
     if (groupId) { where.push('group_id = ?'); args.push(groupId); }
@@ -471,10 +474,30 @@ export class DebugTrace {
         isError: !!tool.is_error,
       });
     }
+    const dreamEvents = [];
+    if (dreamLim > 0) {
+      const eventRows = this.#db.prepare(`
+        SELECT * FROM trace_events WHERE event_type = 'dream_progress' ORDER BY created_at DESC LIMIT ?
+      `).all(Math.max(dreamLim * 5, dreamLim));
+      for (const er of eventRows) {
+        const data = parseJsonSafe(er.event_data) || {};
+        const evtGroupId = typeof data.groupId === 'string' && data.groupId ? data.groupId : null;
+        const target = typeof data.target === 'string' ? data.target : '';
+        if (groupId) {
+          const isBroadcast = !evtGroupId && !target;
+          const isThisGroup = evtGroupId === groupId || target === `group/${groupId}`;
+          if (!isBroadcast && !isThisGroup) continue;
+        }
+        dreamEvents.push({ type: 'dream_progress', ...data, at: er.created_at, ts: data.ts || er.created_at });
+        if (dreamEvents.length >= dreamLim) break;
+      }
+      dreamEvents.reverse();
+    }
+
     // Reverse to oldest-first so the panel's existing append-driven UI
     // renders in chronological order on hydration.
     loops.reverse();
-    return { loops, turns: Array.from(turnsById.values()) };
+    return { loops, turns: Array.from(turnsById.values()), dreamEvents };
   }
 
   /**
@@ -624,7 +647,7 @@ export class NullTrace {
   cleanup() { return { deletedTurns: 0, deletedTools: 0, deletedEvents: 0 }; }
   purge() {}
   close() {}
-  fetchRecentDebugHistory() { return { loops: [], turns: [] }; }
+  fetchRecentDebugHistory() { return { loops: [], turns: [], dreamEvents: [] }; }
 }
 
 /**

package/unify/dream-v2/session-wiring.js

@@ -110,14 +110,43 @@ function makeLlm(session) {
     if (!adapter || typeof adapter.call !== 'function') {
       throw new Error(`dream-v2: no adapter.call available (pass=${pass})`);
     }
+
+    // Bug 2: emit loop event so the debug panel shows dream LLM API calls.
+    const startedMs = Date.now();
+    session._dreamLoopCounter = (session._dreamLoopCounter || 0) + 1;
+    const loopNumber = session._dreamLoopCounter;
+    const turnId = session._dreamTurnId || 'dream';
+    const effectiveSystem = system || (String(session.config?.language || '').toLowerCase().startsWith('zh')
+      ? `你是梦境流水线 — pass: ${pass}。请用中文生成自然语言内容；JSON key 保持英文。`
+      : `You are the dream pipeline — pass: ${pass}.`);
+
     const r = await adapter.call({
       model,
-      system: system || (String(session.config?.language || '').toLowerCase().startsWith('zh')
-        ? `你是梦境流水线 — pass: ${pass}。请用中文生成自然语言内容；JSON key 保持英文。`
-        : `You are the dream pipeline — pass: ${pass}.`),
+      system: effectiveSystem,
       messages: [{ role: 'user', content: prompt }],
       maxTokens: 2048,
     });
+
+    // Emit complete loop event (request + response) to the debug panel.
+    if (typeof session._dreamProgressSink === 'function') {
+      session._dreamProgressSink({
+        type: 'loop',
+        turnId,
+        loopNumber,
+        model: model || 'unknown',
+        systemPrompt: effectiveSystem,
+        messages: [{ role: 'user', content: prompt }],
+        response: typeof r?.text === 'string' ? r.text : '',
+        toolCalls: [],
+        usage: r?.usage || { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+        latencyMs: Date.now() - startedMs,
+        ttfbMs: null,
+        stopReason: 'end_turn',
+        rawRequest: null,
+        rawResponse: null,
+      });
+    }
+
     return (r && r.text) ? r.text : '';
   };
 }
@@ -151,11 +180,46 @@ export function createV2DreamScheduler(session) {
     } catch { /* never let progress reporting kill the run */ }
   };
 
-  const run = (opts = {}) => runDream({
-    ...buildRunDreamOpts(session, onProgress),
-    manual: !!opts.manual,
-    scopeFilter: Array.isArray(opts.scopeFilter) ? opts.scopeFilter : undefined,
-  });
+  let dreamTurnCounter = 0;
+
+  const run = (opts = {}) => {
+    // Bug 2: emit turn_open before the dream pass so the debug panel
+    // can group all LLM loop events under a single dream "turn".
+    dreamTurnCounter += 1;
+    const turnId = `dream-${dreamTurnCounter}-${Date.now()}`;
+    const startedAt = Date.now();
+    session._dreamTurnId = turnId;
+    session._dreamLoopCounter = 0;
+
+    if (typeof session._dreamProgressSink === 'function') {
+      session._dreamProgressSink({
+        type: 'turn_open',
+        turnId,
+        userPrompt: '[dream] automatic memory consolidation',
+        vpId: null,
+        groupId: null,
+        at: startedAt,
+      });
+    }
+
+    return runDream({
+      ...buildRunDreamOpts(session, onProgress),
+      manual: !!opts.manual,
+      scopeFilter: Array.isArray(opts.scopeFilter) ? opts.scopeFilter : undefined,
+    }).then((result) => {
+      // Bug 2: emit turn_close when the dream pass completes.
+      if (typeof session._dreamProgressSink === 'function') {
+        session._dreamProgressSink({
+          type: 'turn_close',
+          turnId,
+          totalMs: Date.now() - startedAt,
+          totalTokens: 0,
+          loopCount: session._dreamLoopCounter || 0,
+        });
+      }
+      return result;
+    });
+  };
 
   const v2 = createDreamScheduler({
     run,

package/unify/web-bridge.js

@@ -497,6 +497,56 @@ function makeGroupContextStub() {
   };
 }
 
+/**
+ * Parse persisted content that may have been stringified from provider content
+ * blocks, then return only user-visible text. Image/file binary blocks are UI
+ * metadata and must never be rendered as bubble text; attachment chips ride in
+ * `attachments` instead.
+ *
+ * @param {unknown} content
+ * @returns {string}
+ */
+export function __testNormalizePersistedVisibleContent(content) {
+  let value = content;
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    if ((trimmed.startsWith('[') && trimmed.endsWith(']')) || (trimmed.startsWith('{') && trimmed.endsWith('}'))) {
+      try { value = JSON.parse(trimmed); } catch { value = content; }
+    }
+  }
+
+  if (Array.isArray(value)) {
+    return value
+      .map((part) => {
+        if (typeof part === 'string') return part;
+        if (!part || typeof part !== 'object') return '';
+        if (part.type === 'text' && typeof part.text === 'string') return part.text;
+        if (part.type === 'input_text' && typeof part.text === 'string') return part.text;
+        return '';
+      })
+      .join('')
+      .replace(/\n\n\[Uploaded files\][\s\S]*$/m, '')
+      .trim();
+  }
+
+  if (value && typeof value === 'object') {
+    if (typeof value.text === 'string') return value.text.trim();
+    if (typeof value.content === 'string') return value.content.trim();
+    return '';
+  }
+
+  return typeof value === 'string'
+    ? value.replace(/\n\n\[Uploaded files\][\s\S]*$/m, '').trim()
+    : '';
+}
+
+function isPersistedInternalMessage(m) {
+  if (!m) return true;
+  if (m._reflection || m.internal || m.systemOnly || m.systemOnlyMessage) return true;
+  if (m.kind === 'compact_summary' || m._compactSummary) return true;
+  return false;
+}
+
 /**
  * Project a persisted message record into the in-memory history shape.
  * Accepts `role:'tool'` and preserves `toolCalls`/`toolCallId` so the
@@ -509,8 +559,8 @@ function makeGroupContextStub() {
 function projectPersistedToHistoryEntry(m) {
   if (!m) return null;
   if (m.role !== 'user' && m.role !== 'assistant' && m.role !== 'tool') return null;
-  if (m._reflection || m.internal || m.systemOnly || m.systemOnlyMessage) return null;
-  const entry = { role: m.role, content: m.content };
+  if (isPersistedInternalMessage(m)) return null;
+  const entry = { role: m.role, content: m.role === 'tool' ? m.content : __testNormalizePersistedVisibleContent(m.content) };
   if (m.id) entry.id = m.id;
   if (m.groupId) entry.groupId = m.groupId;
   if (m.speakerVpId) entry.speakerVpId = m.speakerVpId;
@@ -523,6 +573,9 @@ function projectPersistedToHistoryEntry(m) {
     }));
   }
   if (m.isError) entry.isError = true;
+  if (m.ts) entry.ts = m.ts;
+  if (Array.isArray(m.attachments) && m.attachments.length > 0) entry.attachments = m.attachments;
+  if ((entry.role === 'user' || entry.role === 'assistant') && !entry.content && !entry.attachments) return null;
   return entry;
 }
 
@@ -902,6 +955,7 @@ async function routeEnvelopeToVpThread(groupId, vpId, envelope) {
       threadId: thread.threadId,
       role: envelope?.msg?.meta?.injectedBy === 'route_forward' ? 'assistant' : 'user',
       speakerVpId: envelope?.msg?.meta?.senderVpId || envelope?.msg?.from || null,
+      attachments: Array.isArray(envelope?.msg?.meta?.attachments) ? envelope.msg.meta.attachments : [],
     });
     thread.updatedAt = Date.now();
     try {
@@ -987,6 +1041,7 @@ function ensureDriverRunning(groupId, vpId, threadId = 'main') {
             threadId: thread.threadId,
             role: isForward ? 'assistant' : 'user',
             speakerVpId: senderVpId,
+            attachments: Array.isArray(meta.attachments) ? meta.attachments : [],
           });
         }
       } catch { /* never crash WS pipeline */ }
@@ -1597,11 +1652,19 @@ export function installUnifyRuntimeBridge(s) {
   // `handleUnifyDreamTrigger` wraps THIS sink for the lifetime of the
   // trigger to inject `groupId` per-call (see that function below). The
   // base sink is intentionally a pure passthrough.
+  //
+  // Bug 2: also forward turn_open / turn_close / loop events emitted by
+  // the dream pipeline so the debug panel shows dream LLM API calls.
   s._dreamProgressSink = (evt) => {
     try {
-      const out = { type: 'dream_progress', ...evt };
-      const tag = evt && evt.groupId ? { groupId: evt.groupId } : {};
-      sendUnifyEvent(out, tag);
+      if (evt.type === 'turn_open' || evt.type === 'turn_close' || evt.type === 'loop') {
+        const tag = evt && evt.groupId ? { groupId: evt.groupId } : {};
+        sendUnifyEvent(evt, tag);
+      } else {
+        const out = { type: 'dream_progress', ...evt };
+        const tag = evt && evt.groupId ? { groupId: evt.groupId } : {};
+        sendUnifyEvent(out, tag);
+      }
     } catch { /* never let event delivery throw */ }
   };
 
@@ -2440,6 +2503,7 @@ async function ensureSessionLoaded() {
     skills: session.status.skills,
     mcpServers: session.status.mcpServers,
     tools: session.status.tools,
+    yeaftDir: ctx.CONFIG?.yeaftDir || null,
   });
   sendGroupSnapshotBroadcast();
   // vp-status: rebuild frontend status table from authoritative agent
@@ -2848,17 +2912,17 @@ function appendTurnToGroupHistory(groupId, threadId, prompts, assistantTextParts
  * Best-effort: a write failure does NOT abort the turn — engines can
  * still run, and the next user message will trigger another append.
  *
- * Note: we mirror `engine.#persistMessages`'s schema for the user row
- * exactly (role/content/threadId/groupId), so existing parsers /
- * loaders see no schema drift. Attachments are not part of the on-disk
- * schema today (the engine never wrote them either) — they live on the
- * coordinator's jsonl-log under group meta.
+ * Note: we mirror `engine.#persistMessages`'s core user-row fields
+ * (role/content/threadId/groupId) so existing parsers keep working.
+ * Attachment UI metadata is persisted separately (without base64) so
+ * refresh replay can render chips without leaking image source data into
+ * the message body.
  *
- * @param {{ msgId:string, text:string, groupId:string, role?:string, speakerVpId?:string|null }} args
+ * @param {{ msgId:string, text:string, groupId:string, role?:string, speakerVpId?:string|null, attachments?:Array<object> }} args
  * @returns {boolean} true if this call wrote the row, false if a prior
  *   call already wrote it (dedup hit).
  */
-function persistInboundMessageOnceByMsgId({ msgId, text, groupId, threadId = 'main', role, speakerVpId }) {
+function persistInboundMessageOnceByMsgId({ msgId, text, groupId, threadId = 'main', role, speakerVpId, attachments }) {
   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
@@ -2909,6 +2973,9 @@ function persistInboundMessageOnceByMsgId({ msgId, text, groupId, threadId = 'ma
     if (persistRole === 'assistant' && speakerVpId && typeof speakerVpId === 'string') {
       record.speakerVpId = speakerVpId;
     }
+    if (persistRole === 'user' && Array.isArray(attachments) && attachments.length > 0) {
+      record.attachments = attachments;
+    }
     session.conversationStore.append(record);
     return true;
   } catch (err) {
@@ -3348,21 +3415,25 @@ export async function handleUnifyFetchToolStats(_msg = {}) {
  */
 export async function handleUnifyFetchDebugHistory(msg = {}) {
   const limit = Number.isFinite(msg?.limit) ? Number(msg.limit) : 100;
+  const dreamLimit = Number.isFinite(msg?.dreamLimit) ? Number(msg.dreamLimit) : 5;
   const groupId = typeof msg?.groupId === 'string' && msg.groupId ? msg.groupId : null;
   const threadId = typeof msg?.threadId === 'string' && msg.threadId ? msg.threadId : null;
   let loops = [];
   let turns = [];
+  let dreamEvents = [];
   try {
     if (session?.trace && typeof session.trace.fetchRecentDebugHistory === 'function') {
-      const out = session.trace.fetchRecentDebugHistory({ limit, groupId, threadId });
+      const out = session.trace.fetchRecentDebugHistory({ limit, dreamLimit, groupId, threadId });
       loops = Array.isArray(out?.loops) ? out.loops : [];
       turns = Array.isArray(out?.turns) ? out.turns : [];
+      dreamEvents = Array.isArray(out?.dreamEvents) ? out.dreamEvents : [];
     }
   } catch (err) {
     sendToServer({
       type: 'unify_debug_history',
       loops: [],
       turns: [],
+      dreamEvents: [],
       error: err && err.message ? err.message : String(err),
     });
     return;
@@ -3371,6 +3442,7 @@ export async function handleUnifyFetchDebugHistory(msg = {}) {
     type: 'unify_debug_history',
     loops,
     turns,
+    dreamEvents,
     groupId,
     threadId,
   });
@@ -3454,6 +3526,7 @@ export async function handleUnifyLoadHistory(msg) {
     skills: session.status.skills,
     mcpServers: session.status.mcpServers,
     tools: session.status.tools,
+    yeaftDir: ctx.CONFIG?.yeaftDir || null,
   });
   sendGroupSnapshotBroadcast();
   // vp-status: replay the authoritative table on reconnect so a refreshed
@@ -3483,7 +3556,15 @@ export async function handleUnifyLoadHistory(msg) {
 
   for (const entry of replayEntries) {
     if (entry.role === 'user') {
-      sendUnifyOutput({ type: 'user', message: { content: entry.content, id: entry.id || null } }, { groupId: entry.groupId || null });
+      sendUnifyOutput({
+        type: 'user',
+        message: {
+          content: entry.content,
+          id: entry.id || null,
+          ...(Array.isArray(entry.attachments) && entry.attachments.length > 0 ? { attachments: entry.attachments } : {}),
+        },
+        ts: entry.ts || null,
+      }, { groupId: entry.groupId || null });
     } else if (entry.role === 'assistant') {
       // speakerVpId rides on the envelope so the frontend can route this
       // replayed assistant text to the correct VP track. Without it, the
@@ -3496,6 +3577,7 @@ export async function handleUnifyLoadHistory(msg) {
       sendUnifyOutput({
         type: 'assistant',
         message: { id: entry.id || null, content: [{ type: 'text', text: entry.content }] },
+        ts: entry.ts || null,
       }, envelopeOpts);
       sendUnifyOutput({ type: 'result', result_text: '' }, envelopeOpts);
     }
@@ -3573,6 +3655,7 @@ export async function handleUnifyLoadMoreHistory(msg) {
       role: m.role,
       content: m.content,
       groupId: m.groupId || null,
+      ...(Array.isArray(m.attachments) && m.attachments.length > 0 ? { attachments: m.attachments } : {}),
       ...(m.speakerVpId ? { speakerVpId: m.speakerVpId } : {}),
     }));
 
@@ -3661,6 +3744,7 @@ export async function resetUnifySession() {
       skills: session.status.skills,
       mcpServers: session.status.mcpServers,
       tools: session.status.tools,
+      yeaftDir: ctx.CONFIG?.yeaftDir || null,
     });
     // vp-status: after a forced reset the broker table is still live in
     // memory; broadcast so the frontend can rebuild its mirror without