@yeaft/webchat-agent 0.1.960 → 0.1.961

package/package.json

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

package/yeaft/conversation/persist.js

@@ -2,15 +2,12 @@
  * persist.js — Conversation message persistence
  *
  * Each message is stored as a .md file with YAML frontmatter in
- * ~/.yeaft/chat/messages/ or ~/.yeaft/groups/<sessionId>/conversation/messages/. Design: zero JSON, all Markdown.
+ * ~/.yeaft/chat/messages/ or ~/.yeaft/sessions/<sessionId>/conversation/messages/. Design: zero JSON, all Markdown.
  *
- * Vocabulary note: the on-disk layout literally uses `groups/<id>/` (and
- * the AMS registry uses `memory/sessions/<id>/`) — the asymmetry is
- * deliberate. The `groups/` path predates the rename and we keep it as a
- * literal string to avoid a destructive data migration; every API
- * surface above the disk layer (method names, params, comments) uses
- * "session" vocabulary. See `ConversationStore.#sessionsDir` for the
- * boundary annotation.
+ * Vocabulary note: the primary on-disk layout uses `sessions/<id>/`. Older
+ * installs may still have transcript files under `groups/<id>/`; those are
+ * read as a legacy fallback only. Every API surface above the disk layer
+ * uses "session" vocabulary.
  *
  * Message format:
  *   ---
@@ -199,12 +196,12 @@ function serializeMessage(msg) {
   // render a small "#source" pill next to each bubble.
   if (msg.sourceThreadId) fm.push(`sourceThreadId: ${msg.sourceThreadId}`);
   // Bug 6: persist sessionId so history replay can stamp messages with the
-  // group they originated in. Without this, every replayed message lands
-  // in the default group and switching back to the originating group
+  // session they originated in. Without this, every replayed message lands
+  // in the default session and switching back to the originating session
   // shows an empty pane.
   if (msg.sessionId) fm.push(`sessionId: ${msg.sessionId}`);
   if (msg.chatId) fm.push(`chatId: ${msg.chatId}`);
-  // Group-chat attribution: when a VP authors an assistant turn (either
+  // 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.
   // For real user messages this is unset.
@@ -424,25 +421,22 @@ export function parseMessage(raw) {
  *     messages/
  *     cold/
  *     blobs/
- *   groups/<sessionId>/conversation/
+ *   sessions/<sessionId>/conversation/
  *     compact/
  *     messages/
  *     cold/
  *     blobs/
  *
- * Legacy compatibility: ~/.yeaft/conversation is read as an old mixed store.
- * New writes are split by mode: records with sessionId go to
- * groups/<sessionId>/conversation/, all others go to chat/.
+ * Legacy compatibility: ~/.yeaft/conversation is read as an old mixed store,
+ * and ~/.yeaft/groups/<sessionId>/conversation is read as an old session
+ * transcript store. New writes are split by mode: records with sessionId go to
+ * sessions/<sessionId>/conversation/, all others go to chat/.
  */
 export class ConversationStore {
   #dir;         // root dir (e.g. ~/.yeaft)
   #chatDir;     // ~/.yeaft/chat
-  // ~/.yeaft/groups — on-disk path literal kept for backward compat with
-  // existing user data; the live disk layout is still `groups/<id>/` even
-  // after the session-v1 meta migration (which only collapses the meta
-  // files, not the conversation tree). All API surfaces above the disk
-  // layer have been renamed to the "session" vocabulary.
-  #sessionsDir;
+  #sessionsDir; // ~/.yeaft/sessions — primary Session transcript store
+  #legacySessionsDir; // ~/.yeaft/groups — read-only legacy Session transcripts
   #legacyConvDir; // ~/.yeaft/conversation (read-only compatibility)
   #convDir;     // default thread dir root: ~/.yeaft/chat
   #msgDir;      // default hot messages dir: ~/.yeaft/chat/messages
@@ -464,7 +458,8 @@ export class ConversationStore {
   constructor(dir) {
     this.#dir = dir;
     this.#chatDir = join(dir, 'chat');
-    this.#sessionsDir = join(dir, 'groups');
+    this.#sessionsDir = join(dir, 'sessions');
+    this.#legacySessionsDir = join(dir, 'groups');
     this.#legacyConvDir = join(dir, 'conversation');
 
     this.#convDir = this.#chatDir;
@@ -479,17 +474,16 @@ export class ConversationStore {
     this.#legacyMsgDir = join(this.#legacyConvDir, 'messages');
     this.#legacyColdDir = join(this.#legacyConvDir, 'cold');
 
-    // Per-(sessionId, vpId) compact summary files live under that group's
+    // Per-(sessionId, vpId) compact summary files live under that session's
     // conversation directory. The legacy ~/.yeaft/conversation/compact directory
     // is read for compatibility.
     this.#legacyCompactScopedDir = join(this.#legacyConvDir, 'compact');
     this.#nextSeq = null;
     this.#nextSeqByThread = new Map();
 
-    // Ensure new chat and group-root directories exist (graceful on permission
-    // errors). Per-group conversation directories are created lazily once a
-    // sessionId is known. The legacy conversation directory is never created by
-    // new versions.
+    // Ensure new chat and session-root directories exist (graceful on permission
+    // errors). Per-session conversation directories are created lazily once a
+    // sessionId is known. Legacy directories are never created by new versions.
     for (const d of [
       this.#chatDir, join(this.#chatDir, 'blobs'), this.#chatMsgDir, this.#chatColdDir,
       this.#sessionsDir,
@@ -724,7 +718,7 @@ export class ConversationStore {
   }
 
   /**
-   * Check whether ANY per-(group, vp) compact summary exists for `sessionId`.
+   * Check whether ANY per-(session, vp) compact summary exists for `sessionId`.
    * Used by the history-replay path to decide whether to flag
    * `hasCompactSummary` for the UI without committing to one VP's view.
    *
@@ -1626,6 +1620,10 @@ export class ConversationStore {
     return dir;
   }
 
+  #legacySessionConversationDir(sessionId) {
+    return join(this.#legacySessionsDir, this.#safeDirComponent(sessionId), 'conversation');
+  }
+
   #ensureConversationDirs(dir) {
     for (const d of [dir, join(dir, 'blobs'), join(dir, 'messages'), join(dir, 'cold'), join(dir, 'compact')]) {
       if (!existsSync(d)) mkdirSync(d, { recursive: true, mode: 0o755 });
@@ -1633,26 +1631,34 @@ export class ConversationStore {
   }
 
   #sessionConversationDirs() {
-    if (!existsSync(this.#sessionsDir)) return [];
     const dirs = [];
-    for (const name of readdirSync(this.#sessionsDir)) {
-      const sessionDir = join(this.#sessionsDir, name);
-      try {
-        if (!statSync(sessionDir).isDirectory()) continue;
-      } catch (err) {
-        if (isPermissionError(err)) continue;
-        throw err;
+    const seen = new Set();
+    for (const root of [this.#sessionsDir, this.#legacySessionsDir]) {
+      if (!existsSync(root)) continue;
+      for (const name of readdirSync(root)) {
+        const sessionDir = join(root, name);
+        try {
+          if (!statSync(sessionDir).isDirectory()) continue;
+        } catch (err) {
+          if (isPermissionError(err)) continue;
+          throw err;
+        }
+        const conversationDir = join(sessionDir, 'conversation');
+        if (!existsSync(conversationDir) || seen.has(conversationDir)) continue;
+        seen.add(conversationDir);
+        dirs.push(conversationDir);
       }
-      const conversationDir = join(sessionDir, 'conversation');
-      if (existsSync(conversationDir)) dirs.push(conversationDir);
     }
     return dirs;
   }
 
   #sessionMessageDirs(kind, sessionId = null) {
     if (sessionId) {
-      const dir = join(this.#sessionConversationDir(sessionId), kind);
-      return existsSync(dir) ? [dir] : [];
+      const dirs = [
+        join(this.#sessionConversationDir(sessionId), kind),
+        join(this.#legacySessionConversationDir(sessionId), kind),
+      ];
+      return dirs.filter(dir => existsSync(dir));
     }
     return this.#sessionConversationDirs()
       .map(dir => join(dir, kind))

package/yeaft/conversation/search.js

@@ -42,27 +42,34 @@ function compareNewest(a, b) {
   return String(b?.time || '').localeCompare(String(a?.time || ''));
 }
 
-function groupConversationMessageDirs(dir) {
-  const groupsDir = join(dir, 'groups');
-  if (!existsSync(groupsDir)) return [];
-
+function sessionConversationMessageDirs(dir) {
   const dirs = [];
-  for (const name of readdirSync(groupsDir)) {
-    const groupDir = join(groupsDir, name);
-    try {
-      if (!statSync(groupDir).isDirectory()) continue;
-    } catch {
-      continue;
-    }
+  const seen = new Set();
+  for (const rootName of ['sessions', 'groups']) {
+    const root = join(dir, rootName);
+    if (!existsSync(root)) continue;
+    for (const name of readdirSync(root)) {
+      const sessionDir = join(root, name);
+      try {
+        if (!statSync(sessionDir).isDirectory()) continue;
+      } catch {
+        continue;
+      }
 
-    const conversationDir = join(groupDir, 'conversation');
-    dirs.push(join(conversationDir, 'messages'), join(conversationDir, 'cold'));
+      const conversationDir = join(sessionDir, 'conversation');
+      for (const kind of ['messages', 'cold']) {
+        const messagesDir = join(conversationDir, kind);
+        if (seen.has(messagesDir)) continue;
+        seen.add(messagesDir);
+        dirs.push(messagesDir);
+      }
+    }
   }
   return dirs;
 }
 
 /**
- * Search Yeaft history (chat + per-group + legacy conversation) for a keyword.
+ * Search Yeaft history (chat + per-session + legacy conversation) for a keyword.
  *
  * @param {string} dir — Yeaft root directory (e.g. ~/.yeaft)
  * @param {string} keyword — search term
@@ -75,8 +82,8 @@ export function searchMessages(dir, keyword, limit = 20) {
   const dirs = [
     join(dir, 'chat', 'messages'),
     join(dir, 'chat', 'cold'),
-    ...groupConversationMessageDirs(dir),
-    // Compatibility for profiles created before chat/group split.
+    ...sessionConversationMessageDirs(dir),
+    // Compatibility for profiles created before chat/session split.
     join(dir, 'conversation', 'messages'),
     join(dir, 'conversation', 'cold'),
   ];

package/yeaft/dream/apply.js

@@ -20,6 +20,7 @@
 
 import { promises as fsp } from 'fs';
 import { join, dirname } from 'path';
+import { inspect } from 'util';
 
 import { writeMemory, writeSummary, readMemory, readSummary } from '../memory/store.js';
 import { withDreamMarker } from './state.js';
@@ -28,6 +29,18 @@ import { snapshotScope } from './snapshot.js';
 import { parseJsonSafe } from './triage.js';
 import { render } from './prompts/index.js';
 
+function malformedJsonError(message, raw) {
+  const err = new Error(message);
+  err.rawSnippet = rawResponseSnippet(raw);
+  return err;
+}
+
+function rawResponseSnippet(raw) {
+  if (typeof raw === 'string') return raw.slice(0, 1000);
+  if (raw == null) return String(raw);
+  return inspect(raw, { depth: 2, maxArrayLength: 10, breakLength: 120 }).slice(0, 1000);
+}
+
 function applySystem(language) {
   return String(language || '').toLowerCase().startsWith('zh')
     ? '你是梦境流水线的 Apply 阶段。你会根据最近的群组对话重写单个 scope 的 memory.md 和 summary.md。请只回复严格 JSON，不要输出说明文字或 markdown fence。memory_md 和 summary_md 的自然语言内容必须使用中文；JSON key、scope、schema 字段和代码标识符保持英文。'
@@ -204,7 +217,7 @@ export async function applyMergedTarget(merged, opts) {
     const raw = await opts.llm({ pass: 'create', prompt, system: applySystem(opts.language) });
     const parsed = parseJsonSafe(raw);
     if (!parsed || typeof parsed.memory_md !== 'string') {
-      throw new Error(`apply: CREATE returned malformed JSON for ${merged.target}`);
+      throw malformedJsonError(`apply: CREATE returned malformed JSON for ${merged.target}`, raw);
     }
     memoryMd = parsed.memory_md;
     summaryMd = typeof parsed.summary_md === 'string' ? parsed.summary_md : '';
@@ -233,7 +246,7 @@ export async function applyMergedTarget(merged, opts) {
       const raw = await opts.llm({ pass: 'update', prompt, system: applySystem(opts.language) });
       const parsed = parseJsonSafe(raw);
       if (!parsed || typeof parsed.memory_md !== 'string') {
-        throw new Error(`apply: UPDATE batch ${i} returned malformed JSON for ${merged.target}`);
+        throw malformedJsonError(`apply: UPDATE batch ${i} returned malformed JSON for ${merged.target}`, raw);
       }
       memoryMd = parsed.memory_md;
       if (typeof parsed.summary_md === 'string') summaryMd = parsed.summary_md;

package/yeaft/dream/runner.js

@@ -176,6 +176,7 @@ export async function runDream(opts) {
         phase: 'triage',
         message: err.message,
         stack: err.stack,
+        rawSnippet: err.rawSnippet,
       });
       continue;
     }
@@ -227,6 +228,7 @@ export async function runDream(opts) {
         phase: 'apply',
         message: err.message,
         stack: err.stack,
+        rawSnippet: err.rawSnippet,
       });
     }
   }

package/yeaft/dream/session-wiring.js

@@ -38,10 +38,11 @@
  * `sessionId` may be inherited via `stampDreamScope()` when a scope is active.
  */
 
+import { existsSync, readdirSync, readFileSync, statSync } from 'fs';
 import { join } from 'path';
 import { runDream } from './runner.js';
 import { createDreamScheduler } from './schedule.js';
-import { listSessions, openSession } from '../sessions/session-store.js';
+import { parseMessage, parseSeqFromId } from '../conversation/persist.js';
 import { readSessionState } from './state.js';
 import { DREAM_NUDGE_AFTER_MESSAGES, DREAM_INTERVAL_HOURS } from './limits.js';
 
@@ -56,48 +57,47 @@ import { DREAM_NUDGE_AFTER_MESSAGES, DREAM_INTERVAL_HOURS } from './limits.js';
 export function buildRunDreamOpts(session, onProgress) {
   const yeaftDir = session.yeaftDir;
   const memoryRoot = join(yeaftDir, 'memory');
-  const sessionsRoot = join(yeaftDir, 'sessions');
+  const sessionConversationsRoot = join(yeaftDir, 'sessions');
+  // Legacy disk fallback for pre-session transcript directories. New writes and
+  // Dream's primary source use `sessions/<sessionId>/conversation`.
+  const legacySessionConversationsRoot = join(yeaftDir, 'groups');
 
   return {
     root: memoryRoot,
     language: session.config?.language || 'en',
     llm: makeLlm(session),
     listSessions: async () => {
-      try { return listSessions(sessionsRoot).map(g => g.id); }
+      try { return listConversationSessions([sessionConversationsRoot, legacySessionConversationsRoot]); }
       catch { return []; }
     },
-    countMessages: async (gid) => {
-      try {
-        const h = openSession(sessionsRoot, gid);
-        let n = 0;
-        for (const _m of h.streamMessages()) n += 1;
-        return n;
-      } catch { return 0; }
+    countMessages: async (sessionId) => {
+      try { return loadSessionConversationMessages([sessionConversationsRoot, legacySessionConversationsRoot], sessionId).length; }
+      catch { return 0; }
     },
-    loadGroupDiff: async (gid, sinceId) => {
+    loadGroupDiff: async (sessionId, sinceId) => {
       try {
-        const h = openSession(sessionsRoot, gid);
+        const messages = loadSessionConversationMessages([sessionConversationsRoot, legacySessionConversationsRoot], sessionId);
         const out = [];
         let started = !sinceId;
-        for (const m of h.streamMessages()) {
+        for (const m of messages) {
           if (!started) {
             if (m.id === sinceId) started = true;
             continue;
           }
-          out.push(translateGroupMessage(m));
+          out.push(translateSessionConversationMessage(m));
         }
         return out;
       } catch { return []; }
     },
-    loadOverlapPreamble: async (gid, beforeId, n) => {
+    loadOverlapPreamble: async (sessionId, beforeId, n) => {
       try {
-        const h = openSession(sessionsRoot, gid);
+        const messages = loadSessionConversationMessages([sessionConversationsRoot, legacySessionConversationsRoot], sessionId);
         const buf = [];
-        for (const m of h.streamMessages()) {
+        for (const m of messages) {
           if (m.id === beforeId) break;
           buf.push(m);
         }
-        return buf.slice(-n).map(translateGroupMessage);
+        return buf.slice(-n).map(translateSessionConversationMessage);
       } catch { return []; }
     },
     onProgress,
@@ -105,8 +105,8 @@ export function buildRunDreamOpts(session, onProgress) {
 }
 
 /**
- * Translate a group-store message record (id, from, role, text, ...) into
- * the shape runDream expects (id, role, body, vpId, author).
+ * Translate a persisted session conversation message into the shape runDream
+ * expects (id, role, body, vpId, author).
  *
  * (2026-05-13: legacy `m.meta.featureId` propagation was dropped along
  * with the Feature system. Historical messages on disk may still carry
@@ -114,19 +114,107 @@ export function buildRunDreamOpts(session, onProgress) {
  *
  * @param {Object} m
  */
-function translateGroupMessage(m) {
-  const role = m.role || (m.from === 'user' ? 'user' : 'assistant');
+function translateSessionConversationMessage(m) {
+  const role = m.role || 'assistant';
   const out = {
     id: m.id,
     role,
-    body: m.text || '',
+    body: m.content || m.text || '',
   };
-  if (role === 'assistant' && m.from && m.from !== 'user') {
-    out.vpId = m.from;
+  if (role === 'assistant' && m.speakerVpId) {
+    out.vpId = m.speakerVpId;
   }
   return out;
 }
 
+/**
+ * Enumerate session ids that have persisted conversation messages. `sessions/`
+ * is the primary layout; `groups/` is read-only legacy fallback.
+ *
+ * @param {string[]} roots session transcript roots in priority order
+ * @returns {string[]}
+ */
+function listConversationSessions(roots) {
+  const out = new Set();
+  for (const root of roots) {
+    if (!existsSync(root)) continue;
+    for (const name of readdirSync(root)) {
+      if (name.startsWith('.')) continue;
+      try {
+        const dir = sessionConversationDir(root, name);
+        if (!hasReadableMessages(dir)) continue;
+        out.add(name);
+      } catch {
+        // Ignore partial or old session directories. Dream only needs sessions
+        // with readable conversation messages.
+      }
+    }
+  }
+  return [...out].sort();
+}
+
+/**
+ * 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.
+ *
+ * @param {string[]} roots session transcript roots in priority order
+ * @param {string} sessionId
+ * @returns {object[]}
+ */
+function loadSessionConversationMessages(roots, sessionId) {
+  const byId = new Map();
+  for (const root of roots) {
+    const dir = sessionConversationDir(root, sessionId);
+    for (const m of loadConversationDirMessages(dir)) {
+      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 hasReadableMessages(conversationDir) {
+  return ['messages', 'cold'].some(kind => {
+    const dir = join(conversationDir, kind);
+    try {
+      return statSync(dir).isDirectory() && readdirSync(dir).some(f => f.endsWith('.md'));
+    } catch {
+      return false;
+    }
+  });
+}
+
+function loadConversationDirMessages(conversationDir) {
+  return ['cold', 'messages'].flatMap(kind => loadMessageDir(join(conversationDir, kind)));
+}
+
+function loadMessageDir(dir) {
+  if (!existsSync(dir)) return [];
+  return readdirSync(dir)
+    .filter(f => f.endsWith('.md'))
+    .map(file => {
+      try { return parseMessage(readFileSync(join(dir, file), 'utf8')); }
+      catch { return null; }
+    })
+    .filter(m => m && m.id);
+}
+
+function compareMessagesBySeq(a, b) {
+  const sa = parseSeqFromId(a?.id);
+  const sb = parseSeqFromId(b?.id);
+  if (Number.isFinite(sa) && Number.isFinite(sb) && sa !== sb) return sa - sb;
+  return String(a?.time || '').localeCompare(String(b?.time || ''));
+}
+
+function safeDirComponent(s) {
+  const safe = String(s).replace(/[^A-Za-z0-9._-]/g, '_').slice(0, 120).replace(/^\.+$/, '_');
+  return safe || '_';
+}
+
 /**
  * Build the LLM callable that runDream's triage/apply prompts use.
  *

package/yeaft/dream/state.js

@@ -178,6 +178,7 @@ export async function writeDreamError(root, scope, info) {
       phase: String(info?.phase || 'unknown'),
       message: String(info?.message || ''),
       stack: stackLines.length > 0 ? stackLines.join('\n') : null,
+      rawSnippet: typeof info?.rawSnippet === 'string' ? info.rawSnippet.slice(0, 1000) : null,
     }, null, 2) + '\n';
     await atomicWrite(abs, body);
   } catch {