@yeaft/webchat-agent 0.1.854 → 0.1.856

package/{unify → yeaft}/config.js

@@ -33,15 +33,15 @@ const DEFAULTS = {
   maxOutputTokens: 16384,
   messageTokenBudget: 32768,
   maxContinueTurns: 3,
-  // task-318: Unify-specific runtime caps. `maxConcurrentThreads` gates
+  // task-318: Yeaft-specific runtime caps. `maxConcurrentThreads` gates
   // how many ThreadEngineRegistry instances may be live at once; dispatch
   // refuses new threads beyond this. The count INCLUDES the always-on
   // `main` thread, so the default 6 gives users 5 user-initiated threads
   // on top of main. `autoArchiveIdleDays` is consumed by ThreadStore's
   // idle-archive pass (task-317 will wire the pass itself; here we just
   // plumb the knob through so the UI can set it).
-  unifyMaxConcurrentThreads: 6,
-  unifyAutoArchiveIdleDays: 30,
+  yeaftMaxConcurrentThreads: 6,
+  yeaftAutoArchiveIdleDays: 30,
   // CLAUDE.md / AGENTS.md project-doc cap, in bytes. Mirrors Codex's
   // `project_doc_max_bytes`. 0 disables the feature (no project-doc
   // block is injected). Hand-edited values are NOT clamped — we let
@@ -149,44 +149,44 @@ function isTruthy(val) {
 }
 
 /**
- * Clamp and normalise the `unify` config section. Missing / non-numeric
+ * Clamp and normalise the `yeaft` config section. Missing / non-numeric
  * inputs fall back to the DEFAULTS; numeric-but-out-of-range inputs are
  * *clamped* to the valid range rather than silently reverting to the
- * default. This keeps the read path aligned with `updateUnifySettings`,
+ * default. This keeps the read path aligned with `updateYeaftSettings`,
  * which rejects out-of-range writes up front — a hand-edited
  * `config.json` with `maxConcurrentThreads: 100` now loads as 50 (the
  * nearest valid value) instead of collapsing back to 5.
  *
  * Exported for tests and for `config-api.js` to share the same clamp
- * bounds via `clampUnifyField`.
+ * bounds via `clampYeaftField`.
  *
- * @param {any} raw — jsonConfig.unify (may be undefined / malformed)
+ * @param {any} raw — jsonConfig.yeaft (may be undefined / malformed)
  * @returns {{ maxConcurrentThreads: number, autoArchiveIdleDays: number }}
  */
-export function normaliseUnifySection(raw) {
+export function normaliseYeaftSection(raw) {
   const out = {
-    maxConcurrentThreads: DEFAULTS.unifyMaxConcurrentThreads,
-    autoArchiveIdleDays: DEFAULTS.unifyAutoArchiveIdleDays,
+    maxConcurrentThreads: DEFAULTS.yeaftMaxConcurrentThreads,
+    autoArchiveIdleDays: DEFAULTS.yeaftAutoArchiveIdleDays,
   };
   if (!raw || typeof raw !== 'object') return out;
-  const mc = clampUnifyField(raw.maxConcurrentThreads, 'maxConcurrentThreads');
+  const mc = clampYeaftField(raw.maxConcurrentThreads, 'maxConcurrentThreads');
   if (mc !== null) out.maxConcurrentThreads = mc;
-  const ad = clampUnifyField(raw.autoArchiveIdleDays, 'autoArchiveIdleDays');
+  const ad = clampYeaftField(raw.autoArchiveIdleDays, 'autoArchiveIdleDays');
   if (ad !== null) out.autoArchiveIdleDays = ad;
   return out;
 }
 
 /**
- * Clamp a single unify field to its valid range. Returns `null` if the
+ * Clamp a single yeaft field to its valid range. Returns `null` if the
  * input is not a finite number (so callers can treat it as "not set" and
  * keep the previous value). Centralises the bounds used on both read
- * (`normaliseUnifySection`) and write (`updateUnifySettings` validation).
+ * (`normaliseYeaftSection`) and write (`updateYeaftSettings` validation).
  *
  * @param {unknown} v
  * @param {'maxConcurrentThreads'|'autoArchiveIdleDays'} field
  * @returns {number | null}
  */
-export function clampUnifyField(v, field) {
+export function clampYeaftField(v, field) {
   if (v === null || v === undefined) return null;
   const n = Number(v);
   if (!Number.isFinite(n)) return null;
@@ -224,8 +224,8 @@ function loadLegacyConfig(dir, overrides) {
     // has no field for this, so it always lands on the default unless
     // explicitly overridden via CLI.
     projectDocMaxBytes: overrides.projectDocMaxBytes ?? fileConfig.projectDocMaxBytes ?? DEFAULTS.projectDocMaxBytes,
-    // task-318: legacy path never had the `unify` section — defaults.
-    unify: normaliseUnifySection(null),
+    // task-318: legacy path never had the `yeaft` section — defaults.
+    yeaft: normaliseYeaftSection(null),
     providers: null,
     primaryModel: null,
     fastModel: null,
@@ -323,9 +323,9 @@ export function loadConfig(overrides = {}) {
     // ~/.yeaft/config.json or threaded through CLI overrides.
     projectDocMaxBytes: overrides.projectDocMaxBytes ?? jsonConfig.projectDocMaxBytes ?? DEFAULTS.projectDocMaxBytes,
 
-    // task-318: Unify runtime caps. `unify` is a nested section so we
+    // task-318: Yeaft runtime caps. `yeaft` is a nested section so we
     // don't pollute the flat config namespace used by chat/crew code.
-    unify: normaliseUnifySection(jsonConfig.unify),
+    yeaft: normaliseYeaftSection(jsonConfig.yeaft),
 
     // Legacy fields (null when using config.json)
     apiKey: overrides.apiKey || null,

package/{unify → yeaft}/conversation/migrate-messages-threadid.js

@@ -23,7 +23,7 @@
  *   // { ran: true, migrated: 42, skipped: 3 }
  *
  * Usage (CLI):
- *   node agent/unify/conversation/migrate-messages-threadid.js [yeaftDir]
+ *   node agent/yeaft/conversation/migrate-messages-threadid.js [yeaftDir]
  */
 
 import {

package/{unify → yeaft}/conversation/persist.js

@@ -2,7 +2,7 @@
  * persist.js — Conversation message persistence
  *
  * Each message is stored as a .md file with YAML frontmatter in
- * ~/.yeaft/conversation/messages/. Design: zero JSON, all Markdown.
+ * ~/.yeaft/chat/messages/ or ~/.yeaft/group/messages/. Design: zero JSON, all Markdown.
  *
  * Message format:
  *   ---
@@ -15,7 +15,7 @@
  *   ---
  *   Message content here...
  *
- * Reference: yeaft-unify-core-systems.md §4.1, yeaft-unify-brainstorm-v5.1.md
+ * Reference: yeaft-yeaft-core-systems.md §4.1, yeaft-yeaft-brainstorm-v5.1.md
  */
 
 import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, renameSync, unlinkSync } from 'fs';
@@ -69,6 +69,13 @@ export function parseSeqFromId(id) {
   return m ? parseInt(m[1], 10) : NaN;
 }
 
+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 || ''));
+}
+
 // ─── Frontmatter helpers ─────────────────────────────────────
 
 /**
@@ -315,22 +322,43 @@ export function parseMessage(raw) {
  * ConversationStore — persist and load messages to/from disk.
  *
  * Directory layout:
- *   conversation/
- *     index.md       — message index with frontmatter
- *     compact.md     — cumulative compact summary
- *     messages/      — hot messages (mNNNN.md)
- *     cold/          — archived messages (moved from messages/)
- *     blobs/         — attachments (never moved)
+ *   chat/            — one-to-one chat mode history
+ *     index.md
+ *     compact.md
+ *     messages/
+ *     cold/
+ *     blobs/
+ *   group/           — group mode history
+ *     index.md
+ *     compact.md
+ *     messages/
+ *     cold/
+ *     blobs/
+ *
+ * Legacy compatibility: ~/.yeaft/conversation is read as an old mixed store.
+ * New writes are split by mode: records with groupId go to group/, all others
+ * go to chat/.
  */
 export class ConversationStore {
   #dir;         // root dir (e.g. ~/.yeaft)
-  #convDir;     // ~/.yeaft/conversation
-  #msgDir;      // ~/.yeaft/conversation/messages
-  #coldDir;     // ~/.yeaft/conversation/cold
-  #indexPath;   // ~/.yeaft/conversation/index.md
-  #compactPath; // ~/.yeaft/conversation/compact.md
-  #compactScopedDir; // ~/.yeaft/conversation/compact/  (per-(group,vp))
-  #nextSeq;     // next message sequence number (global, legacy)
+  #chatDir;     // ~/.yeaft/chat
+  #groupDir;    // ~/.yeaft/group
+  #legacyConvDir; // ~/.yeaft/conversation (read-only compatibility)
+  #convDir;     // default thread dir root: ~/.yeaft/chat
+  #msgDir;      // default hot messages dir: ~/.yeaft/chat/messages
+  #coldDir;     // default cold messages dir: ~/.yeaft/chat/cold
+  #indexPath;   // ~/.yeaft/chat/index.md
+  #compactPath; // ~/.yeaft/chat/compact.md
+  #compactScopedDir; // ~/.yeaft/group/compact/  (per-(group,vp))
+  #legacyCompactPath;
+  #legacyCompactScopedDir;
+  #chatMsgDir;
+  #chatColdDir;
+  #groupMsgDir;
+  #groupColdDir;
+  #legacyMsgDir;
+  #legacyColdDir;
+  #nextSeq;     // next message sequence number across chat/group/legacy
   #nextSeqByThread; // Map<threadId, number> — per-thread counters (task-314)
 
   /**
@@ -338,20 +366,37 @@ export class ConversationStore {
    */
   constructor(dir) {
     this.#dir = dir;
-    this.#convDir = join(dir, 'conversation');
-    this.#msgDir = join(dir, 'conversation', 'messages');
-    this.#coldDir = join(dir, 'conversation', 'cold');
-    this.#indexPath = join(dir, 'conversation', 'index.md');
-    this.#compactPath = join(dir, 'conversation', 'compact.md');
-    // Per-(groupId, vpId) compact summary files live here. The legacy
-    // single-file `compact.md` above is kept for backward compatibility
-    // and the "no groupId/vpId" fallback (sub-agents, legacy callers).
-    this.#compactScopedDir = join(dir, 'conversation', 'compact');
+    this.#chatDir = join(dir, 'chat');
+    this.#groupDir = join(dir, 'group');
+    this.#legacyConvDir = join(dir, 'conversation');
+
+    this.#convDir = this.#chatDir;
+    this.#msgDir = join(this.#chatDir, 'messages');
+    this.#coldDir = join(this.#chatDir, 'cold');
+    this.#indexPath = join(this.#chatDir, 'index.md');
+    this.#compactPath = join(this.#chatDir, 'compact.md');
+    this.#legacyCompactPath = join(this.#legacyConvDir, 'compact.md');
+
+    this.#chatMsgDir = this.#msgDir;
+    this.#chatColdDir = this.#coldDir;
+    this.#groupMsgDir = join(this.#groupDir, 'messages');
+    this.#groupColdDir = join(this.#groupDir, 'cold');
+    this.#legacyMsgDir = join(this.#legacyConvDir, 'messages');
+    this.#legacyColdDir = join(this.#legacyConvDir, 'cold');
+
+    // Per-(groupId, vpId) compact summary files live in group mode. The legacy
+    // ~/.yeaft/conversation/compact directory is read for compatibility.
+    this.#compactScopedDir = join(this.#groupDir, 'compact');
+    this.#legacyCompactScopedDir = join(this.#legacyConvDir, 'compact');
     this.#nextSeq = null;
     this.#nextSeqByThread = new Map();
 
-    // Ensure directories exist (graceful on permission errors)
-    for (const d of [this.#convDir, this.#msgDir, this.#coldDir, this.#compactScopedDir]) {
+    // Ensure new chat/group directories exist (graceful on permission errors).
+    // The legacy conversation directory is never created by new versions.
+    for (const d of [
+      this.#chatDir, join(this.#chatDir, 'blobs'), this.#chatMsgDir, this.#chatColdDir,
+      this.#groupDir, join(this.#groupDir, 'blobs'), this.#groupMsgDir, this.#groupColdDir, this.#compactScopedDir,
+    ]) {
       try {
         if (!existsSync(d)) mkdirSync(d, { recursive: true, mode: 0o755 });
       } catch (err) {
@@ -385,7 +430,7 @@ export class ConversationStore {
       tokens_est: msg.tokens_est || estimateTokens(msg.content || ''),
     };
 
-    const filePath = join(this.#msgDir, `${id}.md`);
+    const filePath = join(this.#messageDirFor(fullMsg), `${id}.md`);
     try {
       writeFileSync(filePath, serializeMessage(fullMsg), { encoding: 'utf8', mode: 0o644 });
     } catch (err) {
@@ -420,9 +465,10 @@ export class ConversationStore {
    * @param {string} id — message id (e.g. "m0355")
    */
   moveToCold(id) {
-    const src = join(this.#msgDir, `${id}.md`);
-    const dst = join(this.#coldDir, `${id}.md`);
-    if (existsSync(src)) {
+    for (const [hotDir, coldDir] of this.#hotColdDirPairs({ includeLegacy: false })) {
+      const src = join(hotDir, `${id}.md`);
+      const dst = join(coldDir, `${id}.md`);
+      if (!existsSync(src)) continue;
       try {
         renameSync(src, dst);
       } catch (err) {
@@ -435,6 +481,7 @@ export class ConversationStore {
           throw err;
         }
       }
+      return;
     }
   }
 
@@ -484,8 +531,9 @@ export class ConversationStore {
    * @returns {string}
    */
   readCompactSummary() {
-    if (!existsSync(this.#compactPath)) return '';
-    return readFileSync(this.#compactPath, 'utf8');
+    if (existsSync(this.#compactPath)) return readFileSync(this.#compactPath, 'utf8');
+    if (existsSync(this.#legacyCompactPath)) return readFileSync(this.#legacyCompactPath, 'utf8');
+    return '';
   }
 
   /**
@@ -517,6 +565,11 @@ export class ConversationStore {
     return join(this.#compactScopedDir, `${this.#safeIdComponent(groupId)}__${this.#safeIdComponent(vpId)}.md`);
   }
 
+  #legacyScopedCompactPath(groupId, vpId) {
+    if (!groupId || !vpId) return null;
+    return join(this.#legacyCompactScopedDir, `${this.#safeIdComponent(groupId)}__${this.#safeIdComponent(vpId)}.md`);
+  }
+
   /**
    * Read a per-(groupId, vpId) compact summary. Returns '' if no summary
    * has been written yet. Falls back to nothing — callers that need the
@@ -534,10 +587,13 @@ export class ConversationStore {
    */
   readCompactSummaryFor(groupId, vpId) {
     const path = this.#scopedCompactPath(groupId, vpId);
-    if (!path) return '';
-    if (!existsSync(path)) return '';
-    try { return readFileSync(path, 'utf8'); }
-    catch { return ''; }
+    const legacyPath = this.#legacyScopedCompactPath(groupId, vpId);
+    for (const candidate of [path, legacyPath]) {
+      if (!candidate || !existsSync(candidate)) continue;
+      try { return readFileSync(candidate, 'utf8'); }
+      catch { return ''; }
+    }
+    return '';
   }
 
   /**
@@ -576,13 +632,15 @@ export class ConversationStore {
    */
   hasAnyCompactSummaryForGroup(groupId) {
     if (!groupId) return false;
-    if (!existsSync(this.#compactScopedDir)) return false;
     const prefix = `${this.#safeIdComponent(groupId)}__`;
-    try {
-      for (const f of readdirSync(this.#compactScopedDir)) {
-        if (f.startsWith(prefix) && f.endsWith('.md')) return true;
-      }
-    } catch { /* best-effort */ }
+    for (const dir of [this.#compactScopedDir, this.#legacyCompactScopedDir]) {
+      if (!existsSync(dir)) continue;
+      try {
+        for (const f of readdirSync(dir)) {
+          if (f.startsWith(prefix) && f.endsWith('.md')) return true;
+        }
+      } catch { /* best-effort */ }
+    }
     return false;
   }
 
@@ -628,7 +686,7 @@ export class ConversationStore {
    * Clear all messages (hot + cold + compact).
    */
   clear() {
-    for (const dir of [this.#msgDir, this.#coldDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir]) {
       if (existsSync(dir)) {
         for (const file of readdirSync(dir)) {
           if (file.endsWith('.md')) {
@@ -641,10 +699,12 @@ export class ConversationStore {
         }
       }
     }
-    // Reset compact
-    if (existsSync(this.#compactPath)) {
+    // Reset compact files in the new chat/group stores. Legacy
+    // ~/.yeaft/conversation is intentionally left untouched.
+    for (const path of [this.#compactPath]) {
+      if (!existsSync(path)) continue;
       try {
-        writeFileSync(this.#compactPath, '', { encoding: 'utf8', mode: 0o644 });
+        writeFileSync(path, '', { encoding: 'utf8', mode: 0o644 });
       } catch (err) {
         if (!isPermissionError(err)) throw err;
       }
@@ -653,6 +713,7 @@ export class ConversationStore {
     this.updateIndex({ totalMessages: 0, lastMessageId: null });
   }
 
+
   // ─── Read API ───────────────────────────────────────────
 
   /**
@@ -676,7 +737,7 @@ export class ConversationStore {
    * @returns {object[]} — parsed message objects
    */
   loadRecent(turnsLimit = DEFAULT_RECENT_TURNS) {
-    const all = this.#loadFromDir(this.#msgDir, Infinity);
+    const all = this.#loadChatMessages();
     if (turnsLimit === Infinity || turnsLimit < 0) return pairSanitize(all);
     return pairSanitize(sliceLastNTurns(all, turnsLimit));
   }
@@ -687,7 +748,7 @@ export class ConversationStore {
    * @returns {object[]}
    */
   loadAll() {
-    return this.#loadFromDir(this.#msgDir, Infinity);
+    return this.#loadAllMessages();
   }
 
   /**
@@ -724,7 +785,7 @@ export class ConversationStore {
    */
   loadRecentByGroup(groupId, turnsLimit = DEFAULT_RECENT_TURNS) {
     if (!groupId) return [];
-    const all = this.#loadFromDir(this.#msgDir, Infinity);
+    const all = this.#loadGroupMessages();
     const filtered = all.filter(m => m && m.groupId === groupId);
     if (turnsLimit === Infinity || turnsLimit < 0) return pairSanitize(filtered);
     return pairSanitize(sliceLastNTurns(filtered, turnsLimit));
@@ -767,7 +828,7 @@ export class ConversationStore {
    */
   loadGroupHistoryForVp(groupId, vpId) {
     if (!groupId || !vpId) return [];
-    const all = this.#loadFromDir(this.#msgDir, Infinity);
+    const all = this.#loadGroupMessages();
     const out = [];
     for (const m of all) {
       if (!m || m.groupId !== groupId) continue;
@@ -808,7 +869,7 @@ export class ConversationStore {
   /**
    * Pagination-cursor read: load the page of `turnsLimit` TURNS that ends
    * just before `beforeSeq` (exclusive) for the given `groupId`. Used by
-   * the Unify "Load older messages" UI to walk backwards through history
+   * the Yeaft "Load older messages" UI to walk backwards through history
    * one click at a time.
    *
    * Crucially, this scans BOTH hot (`messages/`) and cold (`cold/`) dirs
@@ -839,8 +900,8 @@ export class ConversationStore {
    */
   loadOlderByGroup(groupId, beforeSeq, turnsLimit = DEFAULT_RECENT_TURNS) {
     if (!groupId) return { messages: [], oldestSeq: null, hasMore: false };
-    const hot = this.#loadFromDir(this.#msgDir, Infinity);
-    const cold = this.#loadFromDir(this.#coldDir, Infinity);
+    const hot = this.#loadGroupHotMessages();
+    const cold = this.#loadGroupColdMessages();
     // Cold ids strictly < hot ids by construction → chronological concat.
     const all = [...cold, ...hot];
     const cutoff = Number.isFinite(beforeSeq) ? beforeSeq : Infinity;
@@ -880,8 +941,8 @@ export class ConversationStore {
     if (!groupId || !(turnsLimit > 0)) return { messages: [], oldestSeq: null, hasMore: false };
 
     const cutoff = Number.isFinite(beforeSeq) ? beforeSeq : Infinity;
-    const hot = this.#loadVisibleFromDirByGroup(this.#msgDir, groupId, cutoff);
-    const cold = this.#loadVisibleFromDirByGroup(this.#coldDir, groupId, cutoff);
+    const hot = this.#loadVisibleFromDirsByGroup([this.#groupMsgDir, this.#legacyMsgDir], groupId, cutoff);
+    const cold = this.#loadVisibleFromDirsByGroup([this.#groupColdDir, this.#legacyColdDir], groupId, cutoff);
     const visible = [...cold, ...hot];
     if (visible.length === 0) return { messages: [], oldestSeq: null, hasMore: false };
 
@@ -908,8 +969,7 @@ export class ConversationStore {
    * @returns {number}
    */
   countHot() {
-    if (!existsSync(this.#msgDir)) return 0;
-    return readdirSync(this.#msgDir).filter(f => f.endsWith('.md')).length;
+    return this.#countFilesInDirs([this.#chatMsgDir, this.#groupMsgDir, this.#legacyMsgDir]);
   }
 
   /**
@@ -918,8 +978,7 @@ export class ConversationStore {
    * @returns {number}
    */
   countCold() {
-    if (!existsSync(this.#coldDir)) return 0;
-    return readdirSync(this.#coldDir).filter(f => f.endsWith('.md')).length;
+    return this.#countFilesInDirs([this.#chatColdDir, this.#groupColdDir, this.#legacyColdDir]);
   }
 
   /**
@@ -975,7 +1034,7 @@ export class ConversationStore {
   deleteByGroup(groupId) {
     if (!groupId) return 0;
     let removed = 0;
-    for (const dir of [this.#msgDir, this.#coldDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1033,7 +1092,7 @@ export class ConversationStore {
     let scanned = 0;
     let removed = 0;
     const orphans = [];
-    for (const dir of [this.#msgDir, this.#coldDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1087,7 +1146,7 @@ export class ConversationStore {
   reassignThread(sourceId, targetId) {
     if (!sourceId || !targetId || sourceId === targetId) return 0;
     let rewritten = 0;
-    for (const dir of [this.#msgDir, this.#coldDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1166,7 +1225,7 @@ export class ConversationStore {
 
     // Collect source-thread candidate files from both hot + cold dirs.
     const candidates = [];
-    for (const dir of [this.#coldDir, this.#msgDir]) {
+    for (const dir of [this.#chatColdDir, this.#chatMsgDir, this.#groupColdDir, this.#groupMsgDir, this.#legacyColdDir, this.#legacyMsgDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1273,7 +1332,7 @@ export class ConversationStore {
     }
     // Legacy: messages live in the flat dir stamped with threadId.
     const collected = [];
-    for (const dir of [this.#coldDir, this.#msgDir]) {
+    for (const dir of [this.#chatColdDir, this.#chatMsgDir, this.#groupColdDir, this.#groupMsgDir, this.#legacyColdDir, this.#legacyMsgDir]) {
       if (!existsSync(dir)) continue;
       for (const f of readdirSync(dir).filter(x => x.endsWith('.md'))) {
         try {
@@ -1293,6 +1352,76 @@ export class ConversationStore {
     return collected.map(x => x.msg);
   }
 
+  #messageDirFor(msg) {
+    return msg?.groupId ? this.#groupMsgDir : this.#chatMsgDir;
+  }
+
+  #hotColdDirPairs({ includeLegacy = true } = {}) {
+    const pairs = [
+      [this.#chatMsgDir, this.#chatColdDir],
+      [this.#groupMsgDir, this.#groupColdDir],
+    ];
+    if (includeLegacy) pairs.push([this.#legacyMsgDir, this.#legacyColdDir]);
+    return pairs;
+  }
+
+  #loadChatMessages() {
+    // Legacy ~/.yeaft/conversation held both chat and group records. For chat
+    // mode compatibility, only import legacy records that are not stamped with
+    // a groupId, so group mode cannot bleed into chat.
+    return [
+      ...this.#loadFromDir(this.#legacyMsgDir, Infinity).filter(m => !m?.groupId),
+      ...this.#loadFromDir(this.#chatMsgDir, Infinity),
+    ].sort(compareMessagesBySeq);
+  }
+
+  #loadGroupHotMessages() {
+    return [
+      ...this.#loadFromDir(this.#legacyMsgDir, Infinity).filter(m => m?.groupId),
+      ...this.#loadFromDir(this.#groupMsgDir, Infinity),
+    ].sort(compareMessagesBySeq);
+  }
+
+  #loadGroupColdMessages() {
+    return [
+      ...this.#loadFromDir(this.#legacyColdDir, Infinity).filter(m => m?.groupId),
+      ...this.#loadFromDir(this.#groupColdDir, Infinity),
+    ].sort(compareMessagesBySeq);
+  }
+
+  #loadGroupMessages() {
+    return [...this.#loadGroupColdMessages(), ...this.#loadGroupHotMessages()].sort(compareMessagesBySeq);
+  }
+
+  #loadAllMessages() {
+    return [
+      ...this.#loadFromDir(this.#legacyColdDir, Infinity),
+      ...this.#loadFromDir(this.#legacyMsgDir, Infinity),
+      ...this.#loadFromDir(this.#chatColdDir, Infinity),
+      ...this.#loadFromDir(this.#chatMsgDir, Infinity),
+      ...this.#loadFromDir(this.#groupColdDir, Infinity),
+      ...this.#loadFromDir(this.#groupMsgDir, Infinity),
+    ].sort(compareMessagesBySeq);
+  }
+
+  #countFilesInDirs(dirs) {
+    let total = 0;
+    for (const dir of dirs) {
+      if (!existsSync(dir)) continue;
+      try {
+        total += readdirSync(dir).filter(f => f.endsWith('.md')).length;
+      } catch (err) {
+        if (!isPermissionError(err)) throw err;
+      }
+    }
+    return total;
+  }
+
+  #loadVisibleFromDirsByGroup(dirs, groupId, beforeSeq) {
+    return dirs.flatMap(dir => this.#loadVisibleFromDirByGroup(dir, groupId, beforeSeq))
+      .sort(compareMessagesBySeq);
+  }
+
   // task-314: per-thread sub-directory for forked threads.
   #threadMsgDir(threadId) {
     return join(this.#convDir, 'threads', threadId, 'messages');
@@ -1385,7 +1514,7 @@ export class ConversationStore {
     if (this.#nextSeq != null) return this.#nextSeq;
 
     let maxSeq = 0;
-    for (const dir of [this.#msgDir, this.#coldDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       for (const file of readdirSync(dir)) {
         const match = file.match(/^m(\d+)\.md$/);