@yeaft/webchat-agent 1.0.75 → 1.0.77

package/yeaft/conversation/search.js

@@ -8,14 +8,24 @@ import { existsSync, readdirSync, readFileSync, statSync } from 'fs';
 import { join } from 'path';
 import { parseMessage, parseSeqFromId } from './persist.js';
 
+function parseJsonLine(line) {
+  if (!line || !line.trim()) return null;
+  try {
+    const msg = JSON.parse(line);
+    return msg && typeof msg === 'object' ? msg : null;
+  } catch {
+    return null;
+  }
+}
+
 /**
- * Search messages in a directory for a keyword.
+ * Search Markdown messages in a directory for a keyword.
  *
  * @param {string} dir — messages directory
  * @param {string} keyword — search term (case-insensitive)
  * @returns {object[]} — matching messages
  */
-function searchDir(dir, keyword) {
+function searchMarkdownDir(dir, keyword) {
   if (!existsSync(dir)) return [];
 
   const lowerKeyword = keyword.toLowerCase();
@@ -35,6 +45,29 @@ function searchDir(dir, keyword) {
   return results;
 }
 
+function searchSegmentDir(dir, keyword) {
+  if (!existsSync(dir)) return [];
+  const lowerKeyword = keyword.toLowerCase();
+  const files = readdirSync(dir)
+    .filter(f => f.endsWith('.jsonl'))
+    .sort()
+    .reverse();
+
+  const results = [];
+  for (const file of files) {
+    const raw = readFileSync(join(dir, file), 'utf8');
+    if (!raw.toLowerCase().includes(lowerKeyword)) continue;
+    const lines = raw.split('\n');
+    for (let i = lines.length - 1; i >= 0; i -= 1) {
+      const line = lines[i];
+      if (!line || !line.toLowerCase().includes(lowerKeyword)) continue;
+      const msg = parseJsonLine(line);
+      if (msg) results.push(msg);
+    }
+  }
+  return results;
+}
+
 function compareNewest(a, b) {
   const sa = parseSeqFromId(a?.id);
   const sb = parseSeqFromId(b?.id);
@@ -42,7 +75,7 @@ function compareNewest(a, b) {
   return String(b?.time || '').localeCompare(String(a?.time || ''));
 }
 
-function sessionConversationMessageDirs(dir) {
+function sessionConversationDirs(dir) {
   const dirs = [];
   const seen = new Set();
   for (const rootName of ['sessions', 'groups']) {
@@ -57,12 +90,9 @@ function sessionConversationMessageDirs(dir) {
       }
 
       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);
-      }
+      if (seen.has(conversationDir)) continue;
+      seen.add(conversationDir);
+      dirs.push(conversationDir);
     }
   }
   return dirs;
@@ -79,17 +109,23 @@ function sessionConversationMessageDirs(dir) {
 export function searchMessages(dir, keyword, limit = 20) {
   if (!keyword || !keyword.trim()) return [];
 
-  const dirs = [
-    join(dir, 'chat', 'messages'),
-    join(dir, 'chat', 'cold'),
-    ...sessionConversationMessageDirs(dir),
+  const conversationDirs = [
+    join(dir, 'chat'),
+    ...sessionConversationDirs(dir),
+  ];
+
+  const markdownDirs = [
+    ...conversationDirs.flatMap(d => [join(d, 'messages'), join(d, 'cold')]),
     // Compatibility for profiles created before chat/session split.
     join(dir, 'conversation', 'messages'),
     join(dir, 'conversation', 'cold'),
   ];
+  const segmentDirs = conversationDirs.map(d => join(d, 'segments'));
 
-  return dirs
-    .flatMap(d => searchDir(d, keyword))
+  return [
+    ...segmentDirs.flatMap(d => searchSegmentDir(d, keyword)),
+    ...markdownDirs.flatMap(d => searchMarkdownDir(d, keyword)),
+  ]
     .sort(compareNewest)
     .slice(0, limit);
 }

package/yeaft/session.js

@@ -45,7 +45,7 @@ import { TaskManager } from './tasks/manager.js';
 // resumes with the same onDemand/recent membership it had on
 // disconnect. Engine.#runQuery uses the registry to populate the
 // AMS each turn and to run `memory/adjust.js` post-turn.
-import { ensureDefaultSessionIfEmpty } from './sessions/session-crud.js';
+import { ensureDefaultSessionIfEmpty, yeaftDirForWorkDir } from './sessions/session-crud.js';
 import { seedDefaultVps } from './vp/seed-defaults.js';
 import { topUpDefaultVps } from './vp/seed-topup.js';
 import { archiveLegacyScopes } from './memory/seed-backfill.js';
@@ -71,6 +71,7 @@ const DEFAULT_COMPACT_TRIGGER_RATIO = 0.7;
 /**
  * @typedef {Object} SessionOptions
  * @property {string} [dir] — Yeaft data directory override (default: ~/.yeaft)
+ * @property {string} [workDir] — Session workDir; when provided, storage lives under <workDir>/.yeaft while config still comes from dir/defaults
  * @property {string} [model] — Model override
  * @property {string} [language] — Language override ('en' | 'zh')
  * @property {boolean} [debug] — Debug mode override
@@ -136,6 +137,7 @@ function prepareToolStatsDir(yeaftDir) {
 export async function loadSession(options = {}) {
   const {
     dir,
+    workDir,
     model,
     language,
     debug,
@@ -146,21 +148,29 @@ export async function loadSession(options = {}) {
     serverMode = false,
   } = options;
 
-  // ─── 1. Determine yeaftDir + ensure directory structure ──
-  //        Must happen BEFORE loadConfig so that first-run
-  //        generates a default config.json that loadConfig can read.
+  // ─── 1. Determine config + store directories ─────────────
+  //        Must happen BEFORE loadConfig so that first-run generates a
+  //        default config.json that loadConfig can read. workDir-backed
+  //        Sessions store conversation/session data under <workDir>/.yeaft,
+  //        but runtime config still comes from the agent-local configDir.
   const overrides = { ...configOverrides };
   if (dir) overrides.dir = dir;
   if (model) overrides.model = model;
   if (language) overrides.language = language;
   if (debug !== undefined) overrides.debug = debug;
 
-  const yeaftDir = overrides.dir || process.env.YEAFT_DIR || DEFAULT_YEAFT_DIR;
-  const initResult = initYeaftDir(yeaftDir);
-  overrides.dir = yeaftDir;
-
-  // Log any warnings from directory initialization
-  for (const w of initResult.warnings) {
+  const sessionWorkDir = typeof workDir === 'string' && workDir.trim() ? workDir.trim() : '';
+  const configDir = overrides.dir || process.env.YEAFT_DIR || DEFAULT_YEAFT_DIR;
+  const yeaftDir = sessionWorkDir ? yeaftDirForWorkDir(sessionWorkDir) : configDir;
+  const configInitResult = initYeaftDir(configDir);
+  const storeInitResult = yeaftDir === configDir ? configInitResult : initYeaftDir(yeaftDir);
+  overrides.dir = configDir;
+
+  // Log any warnings from directory initialization.
+  const initWarnings = yeaftDir === configDir
+    ? configInitResult.warnings
+    : [...configInitResult.warnings, ...storeInitResult.warnings];
+  for (const w of initWarnings) {
     console.warn(`[Yeaft] ${w}`);
   }
 
@@ -212,7 +222,7 @@ export async function loadSession(options = {}) {
   // ─── 2a. Permission pre-check ─────────────────────────
   //         If the data dir is not writable, mark session as read-only.
   //         Persistence (conversation, memory, dream) is skipped in this mode.
-  if (!initResult.writable) {
+  if (!storeInitResult.writable) {
     config._readOnly = true;
     console.warn(`[Yeaft] ${yeaftDir} is not writable — running in read-only mode`);
   }
@@ -365,24 +375,23 @@ export async function loadSession(options = {}) {
   }
 
   // ─── 6. Load skills ────────────────────────────────────
-  // Project tier root for skills + MCP project assets. Per-session workDir
-  // overlays are loaded by web-bridge once it knows the selected Session meta;
-  // the base runtime still uses the agent process cwd for global/default status.
-  const projectTierRoot = process.cwd();
+  // User/global runtime assets still come from configDir. workDir, when
+  // present, is only a project tier overlay plus the storage root.
+  const projectTierRoot = sessionWorkDir || process.cwd();
 
   let skillManager;
   if (skipSkills) {
     // Pass the literal user-tier dir (matches the normal branch's tier 2)
     // so any save/remove calls land in the same place users expect. New
     // `SkillManager` API takes literal scan dirs — no auto-suffix of /skills.
-    skillManager = new SkillManager(join(yeaftDir, 'skills'));
+    skillManager = new SkillManager(join(configDir, 'skills'));
     // Don't call .load() — empty skill manager
   } else {
-    skillManager = createSkillManager(yeaftDir, projectTierRoot);
+    skillManager = createSkillManager(configDir, projectTierRoot);
   }
 
   // ─── 7. Connect MCP servers ────────────────────────────
-  const mcpConfig = loadMCPConfig(yeaftDir, undefined, projectTierRoot);
+  const mcpConfig = loadMCPConfig(configDir, undefined, projectTierRoot);
   const mcpManager = new MCPManager();
   let mcpStatus = { connected: [], failed: [] };
 

package/yeaft/web-bridge.js

@@ -53,6 +53,7 @@ import {
   scanWorkdirSessions,
   restoreSessionToRegistry,
   readWorkDirRegistry,
+  yeaftDirForWorkDir,
 } from './sessions/session-crud.js';
 import { openSession, loadSessionMeta } from './sessions/session-store.js';
 import { loadSessionConfig, resolveSessionConfig, SessionConfigError } from './sessions/session-config.js';
@@ -414,6 +415,13 @@ function projectRuntimeKey(workDir) {
   return normalizeSessionWorkDir(workDir) || '__agent_cwd__';
 }
 
+function resolveStoreYeaftDirForSession(defaultYeaftDir, { sessionId = null, sessionMeta = null, workDir = '' } = {}) {
+  const normalizedWorkDir = normalizeSessionWorkDir(workDir || sessionMeta?.workDir);
+  if (normalizedWorkDir) return yeaftDirForWorkDir(normalizedWorkDir);
+  if (sessionId) return resolveSessionYeaftDir(defaultYeaftDir, sessionId);
+  return defaultYeaftDir;
+}
+
 function createThreadId() {
   return `thr_${Date.now().toString(36)}_${randomUUID().slice(0, 8)}`;
 }
@@ -3880,6 +3888,11 @@ async function ensureSessionLoaded(opts = {}) {
   sessionLoadPromise = (async () => {
     const yeaftDir = ctx.CONFIG?.yeaftDir;
     const normalizedWorkDir = normalizeSessionWorkDir(opts?.workDir || opts?.sessionMeta?.workDir);
+    const sessionYeaftDir = resolveStoreYeaftDirForSession(yeaftDir, {
+      sessionId: opts?.sessionId || opts?.sessionMeta?.id || null,
+      sessionMeta: opts?.sessionMeta || null,
+      workDir: normalizedWorkDir,
+    });
     session = await loadSession({
       ...(yeaftDir && { dir: yeaftDir }),
       ...(normalizedWorkDir && { workDir: normalizedWorkDir }),
@@ -5626,8 +5639,6 @@ export async function handleYeaftLoadHistory(msg) {
       mode: 'recent',
       count: replayEntries.length,
       hasCompactSummary: hasCompactSummaryFlag,
-      totalHot: session.conversationStore.countHot(),
-      totalCold: session.conversationStore.countCold(),
       sessionId,
       hasMore,
       oldestSeq,
@@ -5642,12 +5653,22 @@ export async function handleYeaftLoadHistory(msg) {
     const limit = (typeof msg.limit === 'number') ? msg.limit : 10;
     ensureYeaftConversationId();
 
+    let sessionMetaForRuntime = null;
+    let sessionYeaftDir = yeaftDir;
+    if (sessionId) {
+      try {
+        sessionYeaftDir = resolveSessionYeaftDir(yeaftDir, sessionId);
+        const metaDir = join(sessionsRoot(sessionYeaftDir), sessionId);
+        sessionMetaForRuntime = loadSessionMeta(metaDir);
+      } catch { /* best-effort metadata hint */ }
+    }
+
     // First paint must not wait for full Yeaft runtime boot (MCP connects,
-    // skill scans, memory index sync). The conversation markdown store is the
+    // skill scans, memory index sync). The conversation segment store is the
     // source of truth and can be opened cheaply, so replay the visible message
     // window immediately, then finish loadSession below for actual turns.
     const coldStoreStart = perfNowMs();
-    const coldStore = new ConversationStore(yeaftDir);
+    const coldStore = new ConversationStore(sessionYeaftDir);
     traceDuration('history.cold_store_open', coldStoreStart);
     if (sessionId && (afterSeqRaw !== null || afterMessageId)) {
       let afterSeq = afterSeqRaw;
@@ -5677,14 +5698,6 @@ export async function handleYeaftLoadHistory(msg) {
     }
     historyAlreadyReplayed = true;
 
-    let sessionMetaForRuntime = null;
-    if (sessionId) {
-      try {
-        const groupYeaftDir = resolveSessionYeaftDir(yeaftDir, sessionId);
-        const metaDir = join(sessionsRoot(groupYeaftDir), sessionId);
-        sessionMetaForRuntime = loadSessionMeta(metaDir);
-      } catch { /* best-effort metadata hint */ }
-    }
     // Full runtime boot can be expensive (memory FTS sync, skills, MCP, dream
     // boot checks). It is not needed to render persisted history, so keep this
     // request short and let message-send await the same single-flight boot when