@yeaft/webchat-agent 1.0.91 → 1.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.91",
+  "version": "1.0.95",
   "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/dream/output-snapshot.js

@@ -10,7 +10,8 @@
 import { join } from 'node:path';
 
 import { readMemory, readSummary } from '../memory/store.js';
-import { readSessionState } from './state.js';
+import { readDreamError, readSessionState } from './state.js';
+import { buildRunDreamOpts } from './session-wiring.js';
 
 export const DREAM_SNAPSHOT_TEXT_LIMIT = 6000;
 
@@ -32,7 +33,7 @@ export async function buildDreamOutputSnapshot(sessionLike, sessionId) {
   const scope = `sessions/${sessionId}`;
   const memoryScope = { kind: 'session', id: sessionId };
   const root = join(sessionLike.yeaftDir, 'memory');
-  const [memoryRaw, summaryRaw, state] = await Promise.all([
+  const [memoryRaw, summaryRaw, state, lastError] = await Promise.all([
     readMemory(memoryScope, { root }).catch(() => ''),
     readSummary(memoryScope, { root }).catch(() => ''),
     readSessionState(root, sessionId).catch(() => ({
@@ -40,7 +41,9 @@ export async function buildDreamOutputSnapshot(sessionLike, sessionId) {
       lastDreamAt: null,
       messageCount: 0,
     })),
+    readDreamError(root, scope).catch(() => null),
   ]);
+  const totalMessageCount = await countSessionMessages(sessionLike, sessionId);
   const memory = truncateDreamText(memoryRaw);
   const summary = truncateDreamText(summaryRaw);
   return {
@@ -50,10 +53,26 @@ export async function buildDreamOutputSnapshot(sessionLike, sessionId) {
     lastDreamAt: state?.lastDreamAt || null,
     lastDreamMessageId: state?.lastDreamMessageId || null,
     messageCount: Number.isFinite(state?.messageCount) ? state.messageCount : 0,
+    totalMessageCount,
     hasOutput: !!(memoryRaw || summaryRaw),
+    lastError,
     memoryText: memory.text,
     memoryTruncated: memory.truncated,
     summaryText: summary.text,
     summaryTruncated: summary.truncated,
   };
 }
+
+async function countSessionMessages(sessionLike, sessionId) {
+  try {
+    const opts = buildRunDreamOpts({
+      yeaftDir: sessionLike.yeaftDir,
+      config: sessionLike.config || {},
+      adapter: { call: async () => ({ text: '', usage: {} }) },
+    });
+    const n = await opts.countMessages(sessionId);
+    return Number.isFinite(n) ? n : 0;
+  } catch {
+    return 0;
+  }
+}

package/yeaft/dream/runner.js

@@ -45,7 +45,7 @@ import { listScopes, readSummary } from '../memory/store.js';
 import {
   DEFAULT_LIMITS,
 } from './limits.js';
-import { readSessionState, writeSessionState, writeDreamError } from './state.js';
+import { clearDreamError, readSessionState, writeSessionState, writeDreamError } from './state.js';
 import { segmentDiff, truncateMessage, estimateMessagesTokens } from './segment.js';
 import { triageGroupSegments } from './triage.js';
 import { mergeByTarget } from './merge.js';
@@ -166,7 +166,7 @@ export async function runDream(opts) {
         sessionId,
         segments,
         topicSummaries,
-        llm: opts.llm,
+        llm: dreamLlmForSession(opts.llm, sessionId),
         onProgress,
         language: opts.language,
       });
@@ -208,13 +208,14 @@ export async function runDream(opts) {
       const r = await applyMergedTarget(merged, {
         root: opts.root,
         ts,
-        llm: opts.llm,
+        llm: dreamLlmForSession(opts.llm, sourceSessionId(merged)),
         limits,
         nowIso: opts.nowIso || (() => nowIso),
         onProgress,
         siblingTopicsFor: opts.siblingTopicsFor,
         language: opts.language,
       });
+      await clearDreamError(opts.root, merged.target);
       targetsReport.push({ ...r, sources: merged.sources.length, status: 'done' });
     } catch (err) {
       targetsReport.push({
@@ -252,11 +253,12 @@ export async function runDream(opts) {
         sessionId: triage.sessionId,
         messages: triage.diff,
         targets,
-        llm: opts.llm,
+        llm: dreamLlmForSession(opts.llm, triage.sessionId),
         language: opts.language,
         nowIso: opts.nowIso || (() => nowIso),
         segmentIndex: opts.segmentIndex || null,
       });
+      await clearDreamError(opts.root, `sessions/${triage.sessionId}`);
       segmentReports.push({ sessionId: triage.sessionId, status: 'done', ...r });
       onProgress({ phase: 'extract-segments', sessionId: triage.sessionId, status: 'done', ...r });
     } catch (err) {
@@ -335,6 +337,10 @@ function deriveSessionFilter(filter) {
   return sessions.length > 0 ? new Set(sessions) : null;
 }
 
+function dreamLlmForSession(llm, sessionId) {
+  return (req = {}) => llm({ ...req, sessionId: req.sessionId || sessionId || null });
+}
+
 function sourceSessionId(mergedTarget) {
   const src = Array.isArray(mergedTarget?.sources) ? mergedTarget.sources[0] : null;
   return src && typeof src.sessionId === 'string' ? src.sessionId : '';

package/yeaft/dream/segment-extract.js

@@ -168,9 +168,7 @@ function normalizeExtractedSegment({ item, scope, now }) {
   if (!body) return null;
   const kind = VALID_KINDS.has(String(item.kind || '')) ? String(item.kind) : 'context';
   const tags = Array.isArray(item.tags) ? item.tags.map(t => String(t).trim()).filter(Boolean) : [];
-  const sourceMessages = Array.isArray(item.sourceMessages)
-    ? item.sourceMessages.map(id => String(id).trim()).filter(Boolean)
-    : [];
+  const sourceMessages = normalizeSourceMessageIds(item.sourceMessages);
   return makeSegment({
     scope,
     kind,
@@ -182,6 +180,23 @@ function normalizeExtractedSegment({ item, scope, now }) {
   });
 }
 
+function normalizeSourceMessageIds(value) {
+  if (!Array.isArray(value)) return [];
+  const ids = [];
+  for (const item of value) {
+    if (typeof item === 'string' || typeof item === 'number') {
+      const id = String(item).trim();
+      if (id) ids.push(id);
+      continue;
+    }
+    if (item && typeof item === 'object') {
+      const id = String(item.id || item.messageId || item.uuid || '').trim();
+      if (id) ids.push(id);
+    }
+  }
+  return ids;
+}
+
 function buildRecentSegment({ scope, messages, now }) {
   const recentMessages = messages.slice(-RECENT_MESSAGE_COUNT);
   const body = [

package/yeaft/dream/session-wiring.js

@@ -43,6 +43,8 @@ import { join } from 'path';
 import { runDream } from './runner.js';
 import { createDreamScheduler } from './schedule.js';
 import { parseMessage, parseSeqFromId } from '../conversation/persist.js';
+import { loadSessionConfig, resolveSessionConfig } from '../sessions/session-config.js';
+import { listSessions as listSessionMetas } from '../sessions/session-store.js';
 import { readSessionState } from './state.js';
 import { DREAM_NUDGE_AFTER_MESSAGES, DREAM_INTERVAL_HOURS } from './limits.js';
 
@@ -83,7 +85,7 @@ export function buildRunDreamOpts(session, onProgress) {
     segmentIndex: session.memoryIndex || null,
     llm: makeLlm(session),
     listSessions: async () => {
-      try { return listConversationSessions([sessionConversationsRoot, legacySessionConversationsRoot]); }
+      try { return listRegisteredSessions([sessionConversationsRoot, legacySessionConversationsRoot]); }
       catch { return []; }
     },
     countMessages: async (sessionId) => {
@@ -132,15 +134,25 @@ function translateSessionConversationMessage(m) {
 }
 
 /**
- * Enumerate session ids that have persisted conversation messages. `sessions/`
- * is the primary layout; `groups/` is read-only legacy fallback.
+ * Enumerate sessions from authoritative session metadata first, then fall back
+ * to legacy transcript-only directories. Message presence is not used as the
+ * source of truth: a stale/corrupt JSONL index must not make Dream forget that
+ * a Session exists. The runner's .dream-state cursor decides whether there is
+ * anything new to process.
  *
  * @param {string[]} roots session transcript roots in priority order
  * @returns {string[]}
  */
-function listConversationSessions(roots) {
+function listRegisteredSessions(roots) {
   const out = new Set();
-  for (const root of roots) {
+  const [sessionsRoot, ...legacyRoots] = roots;
+  try {
+    for (const meta of listSessionMetas(sessionsRoot)) {
+      if (meta?.id) out.add(meta.id);
+    }
+  } catch { /* fall through to legacy fallback */ }
+
+  for (const root of legacyRoots) {
     if (!existsSync(root)) continue;
     for (const name of readdirSync(root)) {
       if (name.startsWith('.')) continue;
@@ -149,8 +161,8 @@ function listConversationSessions(roots) {
         if (!hasReadableMessages(dir)) continue;
         out.add(name);
       } catch {
-        // Ignore partial or old session directories. Dream only needs sessions
-        // with readable conversation messages.
+        // Ignore partial old directories. Canonical sessions come from
+        // sessions/<id>/session.json above; this branch is read-only legacy.
       }
     }
   }
@@ -210,14 +222,13 @@ function hasJsonlMessages(dir) {
 
 function loadSessionDiskMessages(dir, sessionId) {
   const conversationDir = join(dir, 'conversation');
-  return [
-    // Prefer the canonical ConversationStore projection when it exists: it has
-    // normalized role/content/tool metadata. The session append-only audit log
-    // is still load-bearing for sessions created before/while conversation rows
-    // were being migrated to JSONL.
-    ...loadConversationDirMessages(conversationDir),
-    ...loadSessionJsonlMessages(join(dir, 'messages'), sessionId),
-  ];
+  // Canonical conversation history is the source Dream needs: it contains the
+  // full user/assistant timeline. The session audit log under messages/ is a
+  // fallback for older or partially migrated sessions, not a second source to
+  // union in — otherwise the same user turn can appear twice with different ids.
+  const canonical = loadConversationDirMessages(conversationDir);
+  if (canonical.length > 0) return canonical;
+  return loadSessionJsonlMessages(join(dir, 'messages'), sessionId);
 }
 
 function loadConversationDirMessages(conversationDir) {
@@ -302,6 +313,24 @@ function normalizeSessionJsonlMessage(row, sessionId) {
 function stringifyMessageBody(value) {
   if (typeof value === 'string') return value;
   if (value == null) return '';
+  if (Array.isArray(value)) return value.map(stringifyMessageBody).filter(Boolean).join('\n');
+  if (typeof value === 'object') {
+    if (typeof value.text === 'string') return value.text;
+    if (typeof value.content === 'string') return value.content;
+    if (typeof value.body === 'string') return value.body;
+    if (typeof value.value === 'string') return value.value;
+    if (Array.isArray(value.content)) return stringifyMessageBody(value.content);
+    if (Array.isArray(value.parts)) return stringifyMessageBody(value.parts);
+    if (Array.isArray(value.blocks)) return stringifyMessageBody(value.blocks);
+    if (value.type && (value.type === 'image' || value.type === 'image_url')) return '[image]';
+    if (value.type && (value.type === 'tool_use' || value.type === 'tool_call')) {
+      const name = value.name || value.toolName || value.function?.name || 'tool';
+      return `[tool call: ${name}]`;
+    }
+    if (value.type && (value.type === 'tool_result' || value.type === 'function_result')) {
+      return stringifyMessageBody(value.result ?? value.output ?? value.content ?? '[tool result]');
+    }
+  }
   try { return JSON.stringify(value); } catch { return String(value); }
 }
 
@@ -323,9 +352,13 @@ function safeDirComponent(s) {
  * @param {Object} session
  */
 function makeLlm(session) {
-  return async ({ pass, prompt, system }) => {
+  return async ({ pass, prompt, system, sessionId }) => {
     const adapter = session.adapter;
-    const model = session.config?.fastModelId || session.config?.model;
+    const effectiveConfig = resolveDreamSessionConfig(session, sessionId);
+    const model = effectiveConfig?.model || effectiveConfig?.primaryModel;
+    if (!model) {
+      throw new Error(`dream: no session model configured (pass=${pass}, sessionId=${sessionId || 'unknown'})`);
+    }
     if (!adapter || typeof adapter.call !== 'function') {
       throw new Error(`dream: no adapter.call available (pass=${pass})`);
     }
@@ -335,7 +368,7 @@ function makeLlm(session) {
     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')
+    const effectiveSystem = system || (String(effectiveConfig?.language || '').toLowerCase().startsWith('zh')
       ? `你是梦境流水线 — pass: ${pass}。请用中文生成自然语言内容；JSON key 保持英文。`
       : `You are the dream pipeline — pass: ${pass}.`);
 
@@ -344,6 +377,7 @@ function makeLlm(session) {
       system: effectiveSystem,
       messages: [{ role: 'user', content: prompt }],
       maxTokens: 2048,
+      modelEffort: effectiveConfig?.modelEffort || undefined,
     });
 
     // Emit complete loop event (request + response) to the debug panel.
@@ -366,6 +400,7 @@ function makeLlm(session) {
       loopNumber,
       pass,
       model: model || 'unknown',
+      sessionId: sessionId || null,
       systemPrompt: effectiveSystem,
       messages: [{ role: 'user', content: prompt }],
       response: typeof r?.text === 'string' ? r.text : '',
@@ -387,6 +422,15 @@ function makeLlm(session) {
 }
 
 
+function resolveDreamSessionConfig(session, sessionId) {
+  const base = session?.config || {};
+  if (!sessionId || !session?.yeaftDir) return { ...base };
+  const sessionConfig = loadSessionConfig(session.yeaftDir, sessionId);
+  if (!sessionConfig || Object.keys(sessionConfig).length === 0) return { ...base };
+  return resolveSessionConfig(base, sessionConfig);
+}
+
+
 function stampDreamScope(session, evt) {
   if (!evt || typeof evt !== 'object') return evt;
   if (evt.sessionId || !session?._dreamActiveGroupId) return evt;
@@ -646,7 +690,7 @@ export async function bootInitEmptyGroups(args) {
   if (!args || !args.memoryIndex || !args.dreamScheduler) return out;
   const sessionsRoot = join(args.yeaftDir, 'sessions');
   let ids;
-  try { ids = listSessions(sessionsRoot).map(g => g.id); }
+  try { ids = listSessionMetas(sessionsRoot).map(g => g.id); }
   catch { return out; }
   const empty = [];
   for (const gid of ids) {
@@ -656,11 +700,7 @@ export async function bootInitEmptyGroups(args) {
     if (segCount > 0) continue;
     let hasMessages = false;
     try {
-      const h = openSession(sessionsRoot, gid);
-      // Any message at all is enough — pull the first record off the
-      // iterator and stop.
-      const first = h.streamMessages().next();
-      hasMessages = !first.done;
+      hasMessages = loadSessionConversationMessages([sessionsRoot], gid).length > 0;
     } catch { continue; }
     if (!hasMessages) continue;
     empty.push(`sessions/${gid}`);
@@ -716,7 +756,7 @@ export async function bootCatchUpStaleDream(args) {
   const now = args.now ?? Date.now();
 
   let sessionIds;
-  try { sessionIds = listSessions(sessionsRoot).map(g => g.id); }
+  try { sessionIds = listSessionMetas(sessionsRoot).map(g => g.id); }
   catch { return out; }
 
   // Find the newest lastDreamAt across all groups.
@@ -732,9 +772,7 @@ export async function bootCatchUpStaleDream(args) {
     }
     if (!anyTraffic) {
       try {
-        const h = openSession(sessionsRoot, gid);
-        const first = h.streamMessages().next();
-        if (!first.done) anyTraffic = true;
+        if (loadSessionConversationMessages([sessionsRoot], gid).length > 0) anyTraffic = true;
       } catch { /* keep going */ }
     }
   }

package/yeaft/dream/state.js

@@ -187,6 +187,19 @@ export async function writeDreamError(root, scope, info) {
   }
 }
 
+/**
+ * Clear a scope's last Dream error after a successful pass. Best-effort: a
+ * missing file is fine and I/O failure must not turn success into failure.
+ *
+ * @param {string} root
+ * @param {string} scope
+ * @returns {Promise<void>}
+ */
+export async function clearDreamError(root, scope) {
+  try { await fsp.unlink(join(scopeDirFor(root, scope), ERROR_FILE)); }
+  catch { /* best-effort */ }
+}
+
 /**
  * Read the last dream error JSON for a scope, or null if absent. Used
  * by the debug panel and by tests. Tolerates a malformed file by

package/yeaft/memory/segment.js

@@ -93,9 +93,7 @@ export function makeSegment(raw) {
   const tags = Array.isArray(raw.tags)
     ? raw.tags.map(t => String(t).trim()).filter(Boolean)
     : [];
-  const sourceMessages = Array.isArray(raw.sourceMessages)
-    ? raw.sourceMessages.map(t => String(t).trim()).filter(Boolean)
-    : [];
+  const sourceMessages = normalizeSourceMessages(raw.sourceMessages);
 
   const now = new Date().toISOString();
   const createdAt = raw.createdAt || now;
@@ -105,6 +103,23 @@ export function makeSegment(raw) {
   return { id, scope, kind, tags, sourceMessages, createdAt, updatedAt, body };
 }
 
+function normalizeSourceMessages(value) {
+  if (!Array.isArray(value)) return [];
+  const out = [];
+  for (const item of value) {
+    if (typeof item === 'string' || typeof item === 'number') {
+      const id = String(item).trim();
+      if (id && id !== '[object Object]') out.push(id);
+      continue;
+    }
+    if (item && typeof item === 'object') {
+      const id = String(item.id || item.messageId || item.uuid || '').trim();
+      if (id) out.push(id);
+    }
+  }
+  return out;
+}
+
 /**
  * Parse a memory.md text into segments. Tolerant by design:
  *   - Empty / whitespace input → [].