@yeaft/webchat-agent 1.0.82 → 1.0.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "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/session-wiring.js

@@ -145,7 +145,7 @@ function listConversationSessions(roots) {
     for (const name of readdirSync(root)) {
       if (name.startsWith('.')) continue;
       try {
-        const dir = sessionConversationDir(root, name);
+        const dir = sessionDir(root, name);
         if (!hasReadableMessages(dir)) continue;
         out.add(name);
       } catch {
@@ -158,9 +158,10 @@ function listConversationSessions(roots) {
 }
 
 /**
- * Load hot and cold conversation messages for one Yeaft Session. This mirrors
- * ConversationStore's session history source: `conversation/cold` plus
- * `conversation/messages`, deduped by id and sorted by message sequence.
+ * Load persisted conversation messages for one Yeaft Session. Supports both
+ * projections currently present on disk:
+ *   - ConversationStore markdown/jsonl under `conversation/`
+ *   - Session append-only audit log under `messages/*.jsonl`
  *
  * @param {string[]} roots session transcript roots in priority order
  * @param {string} sessionId
@@ -169,19 +170,26 @@ function listConversationSessions(roots) {
 function loadSessionConversationMessages(roots, sessionId) {
   const byId = new Map();
   for (const root of roots) {
-    const dir = sessionConversationDir(root, sessionId);
-    for (const m of loadConversationDirMessages(dir)) {
+    const dir = sessionDir(root, sessionId);
+    for (const m of loadSessionDiskMessages(dir, sessionId)) {
       if (!byId.has(m.id)) byId.set(m.id, m);
     }
   }
   return [...byId.values()].sort(compareMessagesBySeq);
 }
 
-function sessionConversationDir(root, sessionId) {
-  return join(root, safeDirComponent(sessionId), 'conversation');
+function sessionDir(root, sessionId) {
+  return join(root, safeDirComponent(sessionId));
 }
 
-function hasReadableMessages(conversationDir) {
+function hasReadableMessages(dir) {
+  const conversationDir = join(dir, 'conversation');
+  if (hasMarkdownMessages(conversationDir)) return true;
+  if (hasJsonlMessages(join(conversationDir, 'segments'))) return true;
+  return hasJsonlMessages(join(dir, 'messages'));
+}
+
+function hasMarkdownMessages(conversationDir) {
   return ['messages', 'cold'].some(kind => {
     const dir = join(conversationDir, kind);
     try {
@@ -192,8 +200,31 @@ function hasReadableMessages(conversationDir) {
   });
 }
 
+function hasJsonlMessages(dir) {
+  try {
+    return statSync(dir).isDirectory() && readdirSync(dir).some(f => f.endsWith('.jsonl'));
+  } catch {
+    return false;
+  }
+}
+
+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),
+  ];
+}
+
 function loadConversationDirMessages(conversationDir) {
-  return ['cold', 'messages'].flatMap(kind => loadMessageDir(join(conversationDir, kind)));
+  return [
+    ...['cold', 'messages'].flatMap(kind => loadMessageDir(join(conversationDir, kind))),
+    ...loadConversationJsonlMessages(join(conversationDir, 'segments')),
+  ];
 }
 
 function loadMessageDir(dir) {
@@ -207,6 +238,73 @@ function loadMessageDir(dir) {
     .filter(m => m && m.id);
 }
 
+function loadConversationJsonlMessages(dir) {
+  return loadJsonlDir(dir, normalizeConversationJsonlMessage);
+}
+
+function loadSessionJsonlMessages(dir, sessionId) {
+  return loadJsonlDir(dir, row => normalizeSessionJsonlMessage(row, sessionId));
+}
+
+function loadJsonlDir(dir, normalize) {
+  if (!existsSync(dir)) return [];
+  let files = [];
+  try {
+    files = readdirSync(dir).filter(f => f.endsWith('.jsonl')).sort();
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const file of files) {
+    let raw = '';
+    try { raw = readFileSync(join(dir, file), 'utf8'); } catch { continue; }
+    for (const line of raw.split('\n')) {
+      if (!line) continue;
+      try {
+        const msg = normalize(JSON.parse(line));
+        if (msg && msg.id) out.push(msg);
+      } catch {
+        // Skip corrupt rows; one bad JSONL line must not make Dream blind.
+      }
+    }
+  }
+  return out;
+}
+
+function normalizeConversationJsonlMessage(row) {
+  if (!row || typeof row !== 'object' || !row.id) return null;
+  return {
+    id: row.id,
+    role: row.role || 'assistant',
+    content: stringifyMessageBody(row.content ?? row.text ?? ''),
+    time: row.time || row.ts || '',
+    sessionId: row.sessionId || null,
+    speakerVpId: row.speakerVpId || null,
+  };
+}
+
+function normalizeSessionJsonlMessage(row, sessionId) {
+  if (!row || typeof row !== 'object' || !row.id) return null;
+  const role = row.role || (row.from === 'user' ? 'user' : 'assistant');
+  const speakerVpId = role === 'assistant'
+    ? (row.speakerVpId || row.meta?.senderVpId || (row.from && row.from !== 'user' ? row.from : null))
+    : null;
+  return {
+    id: row.id,
+    role,
+    content: stringifyMessageBody(row.content ?? row.text ?? ''),
+    time: row.time || row.ts || '',
+    sessionId,
+    speakerVpId,
+  };
+}
+
+function stringifyMessageBody(value) {
+  if (typeof value === 'string') return value;
+  if (value == null) return '';
+  try { return JSON.stringify(value); } catch { return String(value); }
+}
+
 function compareMessagesBySeq(a, b) {
   const sa = parseSeqFromId(a?.id);
   const sb = parseSeqFromId(b?.id);

package/yeaft/web-bridge.js

@@ -1190,6 +1190,12 @@ export function __testGroupHistory(sessionId) {
   return getOrCreateSessionHistory(sessionId);
 }
 
+export function __testResolveVpEffectiveConfig(sessionId) {
+  if (!session) return null;
+  const sessionConfigRoot = ctx.CONFIG?.yeaftDir || session.yeaftDir;
+  return resolveSessionConfig(session.config, loadSessionConfig(sessionConfigRoot, sessionId));
+}
+
 /**
  * Test-only: install a minimal `session` so `hydrateGroupHistory` can
  * read from a real `ConversationStore`. Pass `null` to clear.
@@ -1293,11 +1299,13 @@ function getOrCreateVpEngine(sessionId, vpId, threadId = 'main') {
   let eng = vpEngines.get(key);
   if (eng) return eng;
   if (!session) throw new Error('getOrCreateVpEngine: session not loaded');
-  // Per-group config overlay (v1: model only). Falls back to the
-  // session's user-level config when no override is set. The resolver
-  // never mutates session.config — it returns a new object.
-  const yeaftDir = ctx.CONFIG?.yeaftDir || session.yeaftDir;
-  const groupCfg = loadSessionConfig(yeaftDir, sessionId);
+  // Per-session config overlay (v1: model only). Falls back to the
+  // session's user-level config when no override is set. Prefer the agent-local
+  // config root: sessionConfigPath() resolves registered workDir-backed
+  // sessions from there, while still allowing a later agent-local session in
+  // the same bridge runtime to read its own override after a workDir-first boot.
+  const sessionConfigRoot = ctx.CONFIG?.yeaftDir || session.yeaftDir;
+  const groupCfg = loadSessionConfig(sessionConfigRoot, sessionId);
   const effectiveConfig = resolveSessionConfig(session.config, groupCfg);
   eng = new Engine({
     adapter: session.adapter,