@yeaft/webchat-agent 0.1.857 → 0.1.859

package/conversation.js

@@ -6,6 +6,7 @@ import { query } from './sdk/index.js';
 import { loadSessionHistory } from './history.js';
 import { startClaudeQuery } from './claude.js';
 import { crewSessions, loadCrewIndex } from './crew.js';
+import { getProvider, DEFAULT_PROVIDER, isValidProvider } from './providers/index.js';
 
 // 不支持的斜杠命令（真正需要交互式 CLI 的命令）
 const UNSUPPORTED_SLASH_COMMANDS = ['/help', '/bug', '/login', '/logout', '/terminal-setup', '/vim', '/config'];
@@ -293,7 +294,8 @@ export async function sendConversationList() {
       createdAt: state.createdAt,
       processing: !!state.turnActive,
       userId: state.userId,
-      username: state.username
+      username: state.username,
+      provider: state.providerName || DEFAULT_PROVIDER
     };
     list.push(entry);
   }
@@ -356,33 +358,41 @@ export function sendError(conversationId, message) {
 export async function createConversation(msg) {
   const { conversationId, workDir, userId, username, disallowedTools } = msg;
   const effectiveWorkDir = workDir || ctx.CONFIG.workDir;
+  const provider = isValidProvider(msg.provider) ? msg.provider : DEFAULT_PROVIDER;
 
-  console.log(`Creating conversation: ${conversationId} in ${effectiveWorkDir} (lazy start)`);
+  console.log(`Creating conversation: ${conversationId} in ${effectiveWorkDir} (lazy start, provider=${provider})`);
   if (username) console.log(`  User: ${username} (${userId})`);
 
-  // 只创建 conversation 状态，不启动 Claude 进程
-  // Claude 进程会在用户发送第一条消息时启动 (见 handleUserInput)
-  ctx.conversations.set(conversationId, {
-    query: null,
-    inputStream: null,
-    workDir: effectiveWorkDir,
-    claudeSessionId: null,
-    createdAt: Date.now(),
-    abortController: null,
-    tools: [],
-    slashCommands: [],
-    model: null,
-    userId,
-    username,
-    disallowedTools: disallowedTools || null,  // null = 使用全局默认
-    usage: {
-      inputTokens: 0,
-      outputTokens: 0,
-      cacheRead: 0,
-      cacheCreation: 0,
-      totalCostUsd: 0
-    }
-  });
+  if (provider === 'claude-code') {
+    // Claude path: lazy-init state, real CLI boots on first message.
+    ctx.conversations.set(conversationId, {
+      query: null,
+      inputStream: null,
+      workDir: effectiveWorkDir,
+      claudeSessionId: null,
+      createdAt: Date.now(),
+      abortController: null,
+      tools: [],
+      slashCommands: [],
+      model: null,
+      userId,
+      username,
+      providerName: provider,
+      disallowedTools: disallowedTools || null,
+      usage: { inputTokens: 0, outputTokens: 0, cacheRead: 0, cacheCreation: 0, totalCostUsd: 0 }
+    });
+  } else {
+    // Non-Claude providers own their own state construction.
+    const driver = getProvider(provider);
+    const state = await driver.start({
+      conversationId,
+      workDir: effectiveWorkDir,
+      resumeSessionId: null,
+      userId,
+      username,
+    });
+    state.disallowedTools = disallowedTools || null;
+  }
 
   ctx.sendToServer({
     type: 'conversation_created',
@@ -390,6 +400,7 @@ export async function createConversation(msg) {
     workDir: effectiveWorkDir,
     userId,
     username,
+    provider,
     disallowedTools: disallowedTools || null
   });
 
@@ -414,13 +425,16 @@ export async function createConversation(msg) {
 
   // ★ Prestart Claude CLI in background to eagerly fetch skills/tools/model
   // Fire-and-forget: failure just degrades to lazy-start behavior
-  prestartClaude(conversationId, effectiveWorkDir, null);
+  if (provider === 'claude-code') {
+    prestartClaude(conversationId, effectiveWorkDir, null);
+  }
 }
 
 // Resume 历史 conversation (延迟启动 Claude，等待用户发送第一条消息)
 export async function resumeConversation(msg) {
   const { conversationId, claudeSessionId, workDir, userId, username, disallowedTools } = msg;
   const effectiveWorkDir = workDir || ctx.CONFIG.workDir;
+  const provider = isValidProvider(msg.provider) ? msg.provider : DEFAULT_PROVIDER;
 
   console.log(`[Resume] conversationId: ${conversationId}`);
   console.log(`[Resume] claudeSessionId: ${claudeSessionId}`);
@@ -458,6 +472,7 @@ export async function resumeConversation(msg) {
     model: null,
     userId,
     username,
+    providerName: provider,
     disallowedTools: disallowedTools || null,  // null = 使用全局默认
     usage: {
       inputTokens: 0,
@@ -468,6 +483,19 @@ export async function resumeConversation(msg) {
     }
   });
 
+  // Non-Claude providers: re-init state via driver so sessionId/providerName are set correctly.
+  if (provider !== 'claude-code') {
+    const driver = getProvider(provider);
+    const state = await driver.start({
+      conversationId,
+      workDir: effectiveWorkDir,
+      resumeSessionId: claudeSessionId || null,
+      userId,
+      username,
+    });
+    state.disallowedTools = disallowedTools || null;
+  }
+
   ctx.sendToServer({
     type: 'conversation_resumed',
     conversationId,
@@ -475,7 +503,8 @@ export async function resumeConversation(msg) {
     workDir: effectiveWorkDir,
     historyMessages,
     userId,
-    username
+    username,
+    provider
   });
 
   // 立即发送 agent 级别的 MCP servers 列表
@@ -498,7 +527,7 @@ export async function resumeConversation(msg) {
   // ★ Prestart Claude CLI in background to eagerly fetch skills/tools/model
   // Skip if conversation already has an active query (shouldn't happen, but safety check)
   const resumeState = ctx.conversations.get(conversationId);
-  if (!resumeState?.query) {
+  if (provider === 'claude-code' && !resumeState?.query) {
     prestartClaude(conversationId, effectiveWorkDir, claudeSessionId);
   }
 }
@@ -704,6 +733,41 @@ export async function handleUserInput(msg) {
 
   let state = ctx.conversations.get(conversationId);
 
+  // ★ Non-Claude providers: dispatch to driver and return
+  const providerName = state?.providerName || DEFAULT_PROVIDER;
+  if (providerName !== 'claude-code') {
+    const driver = getProvider(providerName);
+    const effectiveWorkDir = workDir || state?.workDir || ctx.CONFIG.workDir;
+    if (!state) {
+      state = await driver.start({
+        conversationId,
+        workDir: effectiveWorkDir,
+        resumeSessionId: claudeSessionId || null,
+        userId: msg.userId,
+        username: msg.username,
+      });
+    }
+    if (workDir) state.workDir = workDir;
+    sendOutput(conversationId, { type: 'user', message: { role: 'user', content: prompt } });
+    state.turnActive = true;
+    sendConversationList();
+    try {
+      await driver.sendInput(state, prompt, { conversationId, raw: msg });
+    } catch (err) {
+      sendOutput(conversationId, {
+        type: 'result',
+        subtype: 'error',
+        session_id: state.sessionId || null,
+        is_error: true,
+        error: `${providerName} error: ${err?.message || err}`,
+      });
+    } finally {
+      state.turnActive = false;
+      sendConversationList();
+    }
+    return;
+  }
+
   // 如果没有活跃的查询，启动新的
   if (!state || !state.query || !state.inputStream) {
     const resumeSessionId = claudeSessionId || state?.claudeSessionId || null;

package/package.json

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

package/providers/base.js

@@ -0,0 +1,34 @@
+/**
+ * Chat provider abstraction.
+ *
+ * Wire-protocol note: `claude_output` is now a PROTOCOL name, not a
+ * vendor name. Every driver MUST emit events on
+ * `ctx.sendToServer({ type: 'claude_output', conversationId, data })`,
+ * where `data` follows the Claude stream-json envelope:
+ *   - { type: 'assistant', message: { role, content: [...] } }
+ *   - { type: 'user',      message: { role, content: [...] } }
+ *   - { type: 'result',    subtype, session_id, is_error, ... }
+ *   - { type: 'system',    subtype, ... }
+ *
+ * Non-Claude drivers (e.g. Copilot) MUST translate their native event
+ * streams into this envelope so the existing renderer needs no changes.
+ *
+ * @typedef {Object} ChatProvider
+ * @property {string} name
+ * @property {(opts: StartOpts) => Promise<Object>} start
+ * @property {(state: Object, prompt: string, opts?: Object) => Promise<void>} sendInput
+ * @property {(state: Object) => void} abort
+ *
+ * @typedef {Object} StartOpts
+ * @property {string} conversationId
+ * @property {string} workDir
+ * @property {string|null} [resumeSessionId]
+ * @property {string} [userId]
+ * @property {string} [username]
+ */
+
+export const PROVIDER_NAMES = Object.freeze(['claude-code', 'copilot']);
+export const DEFAULT_PROVIDER = 'claude-code';
+export function isValidProvider(name) {
+  return typeof name === 'string' && PROVIDER_NAMES.includes(name);
+}

package/providers/claude-code.js

@@ -0,0 +1,34 @@
+import { startClaudeQuery } from '../claude.js';
+
+export const name = 'claude-code';
+
+/**
+ * Start (or resume) a Claude Code CLI session.
+ * Returns the same state object that startClaudeQuery stores in ctx.conversations.
+ */
+export async function start(opts) {
+  const state = await startClaudeQuery(
+    opts.conversationId,
+    opts.workDir,
+    opts.resumeSessionId || null
+  );
+  state.providerName = name;
+  return state;
+}
+
+/**
+ * Claude CLI handles input via the persistent stdin Stream that
+ * conversation.js manages directly, so this driver's sendInput is a no-op.
+ * conversation.js's existing branch keeps owning the Claude path.
+ */
+export async function sendInput(_state, _prompt, _opts) {
+  /* handled inline by conversation.js for the Claude branch */
+}
+
+export function abort(state) {
+  if (state?.abortController) {
+    try { state.abortController.abort(); } catch { /* noop */ }
+  }
+}
+
+export default { name, start, sendInput, abort };

package/providers/copilot.js

@@ -0,0 +1,278 @@
+import { spawn } from 'child_process';
+import { randomUUID } from 'crypto';
+import ctx from '../context.js';
+
+export const name = 'copilot';
+
+const COPILOT_BIN = process.env.COPILOT_BIN || 'copilot';
+// Opt-in only: --allow-all-tools is a destructive footgun by default in a
+// multi-tenant agent. Set COPILOT_YOLO=1 (and only if you know what you're
+// doing) to skip Copilot's tool prompts.
+const YOLO = process.env.COPILOT_YOLO === '1';
+
+/**
+ * Start (or resume) a Copilot session.
+ * Copilot's `-p` mode is one-shot per turn, so "start" just prepares state.
+ * Each sendInput() spawns one `copilot -p ...` child with the same
+ * --session-id for continuity.
+ */
+export async function start(opts) {
+  const conversationId = opts.conversationId;
+  // Tear down any prior entry so we don't leak children.
+  const prior = ctx.conversations.get(conversationId);
+  if (prior?.copilotChild) {
+    try { prior.copilotChild.kill('SIGTERM'); } catch { /* noop */ }
+  }
+
+  const sessionId = opts.resumeSessionId || randomUUID();
+  const state = {
+    providerName: name,
+    conversationId: opts.conversationId,
+    query: null,
+    inputStream: null,
+    workDir: opts.workDir,
+    claudeSessionId: sessionId,
+    sessionId,
+    createdAt: prior?.createdAt || Date.now(),
+    abortController: null,
+    tools: [],
+    slashCommands: [],
+    model: 'copilot',
+    userId: opts.userId,
+    username: opts.username,
+    disallowedTools: prior?.disallowedTools || null,
+    copilotChild: null,
+    usage: { inputTokens: 0, outputTokens: 0, cacheRead: 0, cacheCreation: 0, totalCostUsd: 0 },
+  };
+  ctx.conversations.set(conversationId, state);
+  return state;
+}
+
+export async function sendInput(state, prompt, opts = {}) {
+  const conversationId = opts.conversationId || state.conversationId;
+  if (!conversationId) throw new Error('copilot: conversationId required');
+  if (!state.sessionId) state.sessionId = randomUUID();
+
+  // Abort any in-flight turn.
+  if (state.copilotChild) {
+    try { state.copilotChild.kill('SIGTERM'); } catch { /* noop */ }
+    state.copilotChild = null;
+  }
+  const abortController = new AbortController();
+  state.abortController = abortController;
+  state.turnActive = true;
+  state.turnResultReceived = false;
+
+  const args = ['-p', prompt, '--output-format', 'json', '-C', state.workDir, '--session-id', state.sessionId];
+  if (YOLO) args.push('--allow-all-tools');
+
+  let child;
+  try {
+    child = spawn(COPILOT_BIN, args, {
+      cwd: state.workDir,
+      env: process.env,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+  } catch (err) {
+    sendOutput(conversationId, {
+      type: 'result',
+      subtype: 'error',
+      session_id: state.sessionId,
+      is_error: true,
+      error: `copilot spawn failed: ${err?.message || err}`,
+    });
+    state.turnActive = false;
+    ctx.sendToServer({ type: 'turn_completed', conversationId, claudeSessionId: state.sessionId, workDir: state.workDir });
+    return;
+  }
+  state.copilotChild = child;
+
+  // Pre-register error handler so async ENOENT from spawn is never unhandled.
+  child.on('error', (err) => {
+    sendOutput(conversationId, {
+      type: 'result',
+      subtype: 'error',
+      session_id: state.sessionId,
+      is_error: true,
+      error: `copilot process error: ${err?.message || err}`,
+    });
+  });
+
+  let killTimer = null;
+  abortController.signal.addEventListener('abort', () => {
+    try { child.kill('SIGTERM'); } catch { /* noop */ }
+    // Escalate to SIGKILL if the child ignores SIGTERM, so the awaited
+    // close promise resolves and the next turn isn't blocked forever.
+    killTimer = setTimeout(() => {
+      try { child.kill('SIGKILL'); } catch { /* noop */ }
+    }, 5000);
+  });
+
+  let stderrBuf = '';
+  const STDERR_CAP = 64 * 1024;
+  let sawResult = false;
+
+  const parser = createNdjsonParser((evt) => {
+    const envelopes = translateCopilotEvent(evt, state);
+    for (const e of envelopes) {
+      sendOutput(conversationId, e);
+      if (e?.type === 'result') sawResult = true;
+    }
+  });
+
+  child.stdout.on('data', (chunk) => parser.push(chunk));
+  child.stderr.on('data', (chunk) => {
+    if (stderrBuf.length < STDERR_CAP) {
+      stderrBuf += chunk.toString('utf8').slice(0, STDERR_CAP - stderrBuf.length);
+    }
+  });
+
+  await new Promise((resolve) => {
+    child.on('close', (code) => {
+      if (killTimer) clearTimeout(killTimer);
+      parser.flush();
+      if (!sawResult) {
+        const ok = code === 0;
+        sendOutput(conversationId, {
+          type: 'result',
+          subtype: ok ? 'success' : 'error',
+          session_id: state.sessionId,
+          is_error: !ok,
+          error: ok ? undefined : (stderrBuf.trim().slice(0, 2000) || `copilot exited with code ${code}`),
+        });
+      }
+      state.copilotChild = null;
+      state.turnActive = false;
+      ctx.sendToServer({
+        type: 'turn_completed',
+        conversationId,
+        claudeSessionId: state.sessionId,
+        workDir: state.workDir,
+      });
+      resolve();
+    });
+  });
+}
+
+export function abort(state) {
+  if (state?.abortController) {
+    try { state.abortController.abort(); } catch { /* noop */ }
+  }
+  if (state?.copilotChild) {
+    try { state.copilotChild.kill('SIGTERM'); } catch { /* noop */ }
+  }
+}
+
+// ---------- internals ----------
+
+function sendOutput(conversationId, data) {
+  ctx.sendToServer({ type: 'claude_output', conversationId, data });
+}
+
+export function createNdjsonParser(onEvent) {
+  let buf = '';
+  return {
+    push(chunk) {
+      buf += chunk.toString('utf8');
+      let idx;
+      while ((idx = buf.indexOf('\n')) >= 0) {
+        const line = buf.slice(0, idx).trim();
+        buf = buf.slice(idx + 1);
+        if (!line) continue;
+        let evt;
+        try { evt = JSON.parse(line); }
+        catch (err) {
+          if (ctx?.CONFIG?.debug) console.warn('[copilot] dropping unparsable line:', line.slice(0, 200));
+          continue;
+        }
+        try { onEvent(evt); }
+        catch (err) { console.warn('[copilot] event handler error:', err?.message || err); }
+      }
+    },
+    flush() {
+      const line = buf.trim();
+      buf = '';
+      if (!line) return;
+      try {
+        const evt = JSON.parse(line);
+        onEvent(evt);
+      } catch { /* discard trailing junk */ }
+    },
+  };
+}
+
+/**
+ * Map a Copilot NDJSON event to zero-or-more claude_output envelopes.
+ * Defensive: unknown shapes are logged and dropped.
+ *
+ * Recognized loose schemas (Copilot CLI JSON output is not yet stable, so
+ * we accept several aliases and forward only what we understand):
+ *  - text:        { type: 'text'|'text_delta'|'assistant_text', text|delta }
+ *  - message:     { type: 'message', role, content }
+ *  - tool_call:   { type: 'tool_call'|'tool_use', id, name|tool, input|arguments }
+ *  - tool_result: { type: 'tool_result', tool_use_id|id, content|output }
+ *  - done:        { type: 'result'|'done'|'complete', session_id?, error? }
+ *  - error:       { type: 'error', message|error }
+ */
+export function translateCopilotEvent(evt, state) {
+  if (!evt || typeof evt !== 'object') return [];
+  const t = evt.type;
+
+  if (t === 'text' || t === 'text_delta' || t === 'assistant_text') {
+    const text = typeof evt.text === 'string' ? evt.text : (typeof evt.delta === 'string' ? evt.delta : '');
+    if (!text) return [];
+    return [{ type: 'assistant', message: { role: 'assistant', content: [{ type: 'text', text }] } }];
+  }
+
+  if (t === 'message' && evt.role === 'assistant') {
+    const content = normalizeContent(evt.content);
+    return [{ type: 'assistant', message: { role: 'assistant', content } }];
+  }
+
+  if (t === 'tool_call' || t === 'tool_use') {
+    const id = evt.id || evt.call_id || randomUUID();
+    const toolName = evt.name || evt.tool || 'unknown';
+    const input = evt.input ?? evt.arguments ?? {};
+    return [{ type: 'assistant', message: { role: 'assistant', content: [{ type: 'tool_use', id, name: toolName, input }] } }];
+  }
+
+  if (t === 'tool_result') {
+    const tool_use_id = evt.tool_use_id || evt.id || 'unknown';
+    const content = typeof evt.content === 'string'
+      ? evt.content
+      : (typeof evt.output === 'string' ? evt.output : JSON.stringify(evt.content ?? evt.output ?? ''));
+    return [{ type: 'user', message: { role: 'user', content: [{ type: 'tool_result', tool_use_id, content }] } }];
+  }
+
+  if (t === 'result' || t === 'done' || t === 'complete') {
+    const isErr = !!evt.error || evt.is_error === true;
+    return [{
+      type: 'result',
+      subtype: isErr ? 'error' : 'success',
+      session_id: evt.session_id || state?.sessionId || null,
+      is_error: isErr,
+      error: isErr ? (evt.error || evt.message || 'copilot error') : undefined,
+    }];
+  }
+
+  if (t === 'error') {
+    return [{
+      type: 'result',
+      subtype: 'error',
+      session_id: state?.sessionId || null,
+      is_error: true,
+      error: evt.message || evt.error || 'copilot error',
+    }];
+  }
+
+  if (ctx?.CONFIG?.debug) console.warn('[copilot] dropping unknown event type:', t);
+  return [];
+}
+
+function normalizeContent(content) {
+  if (typeof content === 'string') return [{ type: 'text', text: content }];
+  if (Array.isArray(content)) return content;
+  return [{ type: 'text', text: String(content ?? '') }];
+}
+
+export default { name, start, sendInput, abort };

package/providers/index.js

@@ -0,0 +1,19 @@
+import { PROVIDER_NAMES, DEFAULT_PROVIDER, isValidProvider } from './base.js';
+import * as claudeCode from './claude-code.js';
+import * as copilot from './copilot.js';
+
+const REGISTRY = Object.freeze({
+  'claude-code': claudeCode,
+  'copilot': copilot,
+});
+
+export function getProvider(nameOrUndef) {
+  const key = nameOrUndef || DEFAULT_PROVIDER;
+  const driver = REGISTRY[key];
+  if (!driver) {
+    throw new Error(`Unknown chat provider: ${nameOrUndef} (known: ${PROVIDER_NAMES.join(', ')})`);
+  }
+  return driver;
+}
+
+export { PROVIDER_NAMES, DEFAULT_PROVIDER, isValidProvider };

package/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/chat/messages/ or ~/.yeaft/group/messages/. Design: zero JSON, all Markdown.
+ * ~/.yeaft/chat/messages/ or ~/.yeaft/groups/<groupId>/conversation/messages/. Design: zero JSON, all Markdown.
  *
  * Message format:
  *   ---
@@ -18,7 +18,7 @@
  * Reference: yeaft-yeaft-core-systems.md §4.1, yeaft-yeaft-brainstorm-v5.1.md
  */
 
-import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, renameSync, unlinkSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, renameSync, unlinkSync, statSync } from 'fs';
 import { join, basename } from 'path';
 import { isPermissionError } from '../init.js';
 import { pairSanitize } from '../pair-sanitize.js';
@@ -328,34 +328,30 @@ export function parseMessage(raw) {
  *     messages/
  *     cold/
  *     blobs/
- *   group/           — group mode history
- *     index.md
- *     compact.md
+ *   groups/<groupId>/conversation/
+ *     compact/
  *     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/.
+ * New writes are split by mode: records with groupId go to
+ * groups/<groupId>/conversation/, all others go to chat/.
  */
 export class ConversationStore {
   #dir;         // root dir (e.g. ~/.yeaft)
   #chatDir;     // ~/.yeaft/chat
-  #groupDir;    // ~/.yeaft/group
+  #groupsDir;   // ~/.yeaft/groups
   #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
@@ -367,7 +363,7 @@ export class ConversationStore {
   constructor(dir) {
     this.#dir = dir;
     this.#chatDir = join(dir, 'chat');
-    this.#groupDir = join(dir, 'group');
+    this.#groupsDir = join(dir, 'groups');
     this.#legacyConvDir = join(dir, 'conversation');
 
     this.#convDir = this.#chatDir;
@@ -379,23 +375,23 @@ export class ConversationStore {
 
     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');
+    // Per-(groupId, vpId) compact summary files live under that group'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/group directories exist (graceful on permission errors).
-    // The legacy conversation directory is never created by new versions.
+    // Ensure new chat and group-root directories exist (graceful on permission
+    // errors). Per-group conversation directories are created lazily once a
+    // groupId is known. 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,
+      this.#groupsDir,
     ]) {
       try {
         if (!existsSync(d)) mkdirSync(d, { recursive: true, mode: 0o755 });
@@ -539,10 +535,8 @@ export class ConversationStore {
   /**
    * Sanitize one id (groupId or vpId) into a safe filename component.
    * Anything outside `[A-Za-z0-9._-]` collapses to `_`; max 120 chars.
-   * The result is only ever used as a basename joined to `compactScopedDir`
-   * — path traversal is blocked by the basename-only `join`, not by the
-   * regex (a literal `..` stays as `..` here and becomes part of a
-   * regular filename via the `__` separator + `.md` suffix).
+   * For directory path components, use `#safeDirComponent` instead; this
+   * helper intentionally preserves historical compact-summary filenames.
    *
    * @param {string} s
    * @returns {string}
@@ -551,6 +545,11 @@ export class ConversationStore {
     return String(s).replace(/[^A-Za-z0-9._-]/g, '_').slice(0, 120);
   }
 
+  #safeDirComponent(s) {
+    const safe = this.#safeIdComponent(s).replace(/^\.+$/, '_');
+    return safe || '_';
+  }
+
   /**
    * Sanitize a (groupId, vpId) pair into a safe filename. We accept
    * arbitrary user strings here (groupIds and vpIds are user-set), so
@@ -562,7 +561,8 @@ export class ConversationStore {
    */
   #scopedCompactPath(groupId, vpId) {
     if (!groupId || !vpId) return null;
-    return join(this.#compactScopedDir, `${this.#safeIdComponent(groupId)}__${this.#safeIdComponent(vpId)}.md`);
+    const compactDir = join(this.#groupConversationDir(groupId, { create: true }), 'compact');
+    return join(compactDir, `${this.#safeIdComponent(vpId)}.md`);
   }
 
   #legacyScopedCompactPath(groupId, vpId) {
@@ -632,12 +632,13 @@ export class ConversationStore {
    */
   hasAnyCompactSummaryForGroup(groupId) {
     if (!groupId) return false;
-    const prefix = `${this.#safeIdComponent(groupId)}__`;
-    for (const dir of [this.#compactScopedDir, this.#legacyCompactScopedDir]) {
+    const compactDir = join(this.#groupConversationDir(groupId), 'compact');
+    for (const dir of [compactDir, this.#legacyCompactScopedDir]) {
       if (!existsSync(dir)) continue;
       try {
         for (const f of readdirSync(dir)) {
-          if (f.startsWith(prefix) && f.endsWith('.md')) return true;
+          if (dir === compactDir && f.endsWith('.md')) return true;
+          if (dir === this.#legacyCompactScopedDir && f.startsWith(`${this.#safeIdComponent(groupId)}__`) && f.endsWith('.md')) return true;
         }
       } catch { /* best-effort */ }
     }
@@ -686,7 +687,7 @@ export class ConversationStore {
    * Clear all messages (hot + cold + compact).
    */
   clear() {
-    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, ...this.#groupMessageDirs('messages'), ...this.#groupMessageDirs('cold')]) {
       if (existsSync(dir)) {
         for (const file of readdirSync(dir)) {
           if (file.endsWith('.md')) {
@@ -785,7 +786,7 @@ export class ConversationStore {
    */
   loadRecentByGroup(groupId, turnsLimit = DEFAULT_RECENT_TURNS) {
     if (!groupId) return [];
-    const all = this.#loadGroupMessages();
+    const all = this.#loadGroupMessages(groupId)
     const filtered = all.filter(m => m && m.groupId === groupId);
     if (turnsLimit === Infinity || turnsLimit < 0) return pairSanitize(filtered);
     return pairSanitize(sliceLastNTurns(filtered, turnsLimit));
@@ -828,7 +829,7 @@ export class ConversationStore {
    */
   loadGroupHistoryForVp(groupId, vpId) {
     if (!groupId || !vpId) return [];
-    const all = this.#loadGroupMessages();
+    const all = this.#loadGroupMessages(groupId)
     const out = [];
     for (const m of all) {
       if (!m || m.groupId !== groupId) continue;
@@ -900,8 +901,8 @@ export class ConversationStore {
    */
   loadOlderByGroup(groupId, beforeSeq, turnsLimit = DEFAULT_RECENT_TURNS) {
     if (!groupId) return { messages: [], oldestSeq: null, hasMore: false };
-    const hot = this.#loadGroupHotMessages();
-    const cold = this.#loadGroupColdMessages();
+    const hot = this.#loadGroupHotMessages(groupId);
+    const cold = this.#loadGroupColdMessages(groupId);
     // Cold ids strictly < hot ids by construction → chronological concat.
     const all = [...cold, ...hot];
     const cutoff = Number.isFinite(beforeSeq) ? beforeSeq : Infinity;
@@ -941,8 +942,8 @@ export class ConversationStore {
     if (!groupId || !(turnsLimit > 0)) return { messages: [], oldestSeq: null, hasMore: false };
 
     const cutoff = Number.isFinite(beforeSeq) ? beforeSeq : Infinity;
-    const hot = this.#loadVisibleFromDirsByGroup([this.#groupMsgDir, this.#legacyMsgDir], groupId, cutoff);
-    const cold = this.#loadVisibleFromDirsByGroup([this.#groupColdDir, this.#legacyColdDir], groupId, cutoff);
+    const hot = this.#loadVisibleFromDirsByGroup([...this.#groupMessageDirs('messages', groupId), this.#legacyMsgDir], groupId, cutoff);
+    const cold = this.#loadVisibleFromDirsByGroup([...this.#groupMessageDirs('cold', groupId), this.#legacyColdDir], groupId, cutoff);
     const visible = [...cold, ...hot];
     if (visible.length === 0) return { messages: [], oldestSeq: null, hasMore: false };
 
@@ -969,7 +970,7 @@ export class ConversationStore {
    * @returns {number}
    */
   countHot() {
-    return this.#countFilesInDirs([this.#chatMsgDir, this.#groupMsgDir, this.#legacyMsgDir]);
+    return this.#countFilesInDirs([this.#chatMsgDir, ...this.#groupMessageDirs('messages'), this.#legacyMsgDir]);
   }
 
   /**
@@ -978,7 +979,7 @@ export class ConversationStore {
    * @returns {number}
    */
   countCold() {
-    return this.#countFilesInDirs([this.#chatColdDir, this.#groupColdDir, this.#legacyColdDir]);
+    return this.#countFilesInDirs([this.#chatColdDir, ...this.#groupMessageDirs('cold'), this.#legacyColdDir]);
   }
 
   /**
@@ -1034,7 +1035,7 @@ export class ConversationStore {
   deleteByGroup(groupId) {
     if (!groupId) return 0;
     let removed = 0;
-    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, ...this.#groupMessageDirs('messages'), ...this.#groupMessageDirs('cold'), this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1092,7 +1093,7 @@ export class ConversationStore {
     let scanned = 0;
     let removed = 0;
     const orphans = [];
-    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, ...this.#groupMessageDirs('messages'), ...this.#groupMessageDirs('cold'), this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1146,7 +1147,7 @@ export class ConversationStore {
   reassignThread(sourceId, targetId) {
     if (!sourceId || !targetId || sourceId === targetId) return 0;
     let rewritten = 0;
-    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, ...this.#groupMessageDirs('messages'), ...this.#groupMessageDirs('cold'), this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1225,7 +1226,7 @@ export class ConversationStore {
 
     // Collect source-thread candidate files from both hot + cold dirs.
     const candidates = [];
-    for (const dir of [this.#chatColdDir, this.#chatMsgDir, this.#groupColdDir, this.#groupMsgDir, this.#legacyColdDir, this.#legacyMsgDir]) {
+    for (const dir of [this.#chatColdDir, this.#chatMsgDir, ...this.#groupMessageDirs('cold'), ...this.#groupMessageDirs('messages'), this.#legacyColdDir, this.#legacyMsgDir]) {
       if (!existsSync(dir)) continue;
       let files;
       try {
@@ -1332,7 +1333,7 @@ export class ConversationStore {
     }
     // Legacy: messages live in the flat dir stamped with threadId.
     const collected = [];
-    for (const dir of [this.#chatColdDir, this.#chatMsgDir, this.#groupColdDir, this.#groupMsgDir, this.#legacyColdDir, this.#legacyMsgDir]) {
+    for (const dir of [this.#chatColdDir, this.#chatMsgDir, ...this.#groupMessageDirs('cold'), ...this.#groupMessageDirs('messages'), this.#legacyColdDir, this.#legacyMsgDir]) {
       if (!existsSync(dir)) continue;
       for (const f of readdirSync(dir).filter(x => x.endsWith('.md'))) {
         try {
@@ -1353,13 +1354,53 @@ export class ConversationStore {
   }
 
   #messageDirFor(msg) {
-    return msg?.groupId ? this.#groupMsgDir : this.#chatMsgDir;
+    if (!msg?.groupId) return this.#chatMsgDir;
+    return join(this.#groupConversationDir(msg.groupId, { create: true }), 'messages');
+  }
+
+  #groupConversationDir(groupId, { create = false } = {}) {
+    const dir = join(this.#groupsDir, this.#safeDirComponent(groupId), 'conversation');
+    if (create) this.#ensureConversationDirs(dir);
+    return dir;
+  }
+
+  #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 });
+    }
+  }
+
+  #groupConversationDirs() {
+    if (!existsSync(this.#groupsDir)) return [];
+    const dirs = [];
+    for (const name of readdirSync(this.#groupsDir)) {
+      const groupDir = join(this.#groupsDir, name);
+      try {
+        if (!statSync(groupDir).isDirectory()) continue;
+      } catch (err) {
+        if (isPermissionError(err)) continue;
+        throw err;
+      }
+      const conversationDir = join(groupDir, 'conversation');
+      if (existsSync(conversationDir)) dirs.push(conversationDir);
+    }
+    return dirs;
+  }
+
+  #groupMessageDirs(kind, groupId = null) {
+    if (groupId) {
+      const dir = join(this.#groupConversationDir(groupId), kind);
+      return existsSync(dir) ? [dir] : [];
+    }
+    return this.#groupConversationDirs()
+      .map(dir => join(dir, kind))
+      .filter(dir => existsSync(dir));
   }
 
   #hotColdDirPairs({ includeLegacy = true } = {}) {
     const pairs = [
       [this.#chatMsgDir, this.#chatColdDir],
-      [this.#groupMsgDir, this.#groupColdDir],
+      ...this.#groupConversationDirs().map(dir => [join(dir, 'messages'), join(dir, 'cold')]),
     ];
     if (includeLegacy) pairs.push([this.#legacyMsgDir, this.#legacyColdDir]);
     return pairs;
@@ -1375,22 +1416,22 @@ export class ConversationStore {
     ].sort(compareMessagesBySeq);
   }
 
-  #loadGroupHotMessages() {
+  #loadGroupHotMessages(groupId = null) {
     return [
       ...this.#loadFromDir(this.#legacyMsgDir, Infinity).filter(m => m?.groupId),
-      ...this.#loadFromDir(this.#groupMsgDir, Infinity),
+      ...this.#groupMessageDirs('messages', groupId).flatMap(dir => this.#loadFromDir(dir, Infinity)),
     ].sort(compareMessagesBySeq);
   }
 
-  #loadGroupColdMessages() {
+  #loadGroupColdMessages(groupId = null) {
     return [
       ...this.#loadFromDir(this.#legacyColdDir, Infinity).filter(m => m?.groupId),
-      ...this.#loadFromDir(this.#groupColdDir, Infinity),
+      ...this.#groupMessageDirs('cold', groupId).flatMap(dir => this.#loadFromDir(dir, Infinity)),
     ].sort(compareMessagesBySeq);
   }
 
-  #loadGroupMessages() {
-    return [...this.#loadGroupColdMessages(), ...this.#loadGroupHotMessages()].sort(compareMessagesBySeq);
+  #loadGroupMessages(groupId = null) {
+    return [...this.#loadGroupColdMessages(groupId), ...this.#loadGroupHotMessages(groupId)].sort(compareMessagesBySeq);
   }
 
   #loadAllMessages() {
@@ -1399,8 +1440,8 @@ export class ConversationStore {
       ...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),
+      ...this.#groupMessageDirs('cold').flatMap(dir => this.#loadFromDir(dir, Infinity)),
+      ...this.#groupMessageDirs('messages').flatMap(dir => this.#loadFromDir(dir, Infinity)),
     ].sort(compareMessagesBySeq);
   }
 
@@ -1514,7 +1555,7 @@ export class ConversationStore {
     if (this.#nextSeq != null) return this.#nextSeq;
 
     let maxSeq = 0;
-    for (const dir of [this.#chatMsgDir, this.#chatColdDir, this.#groupMsgDir, this.#groupColdDir, this.#legacyMsgDir, this.#legacyColdDir]) {
+    for (const dir of [this.#chatMsgDir, this.#chatColdDir, ...this.#groupMessageDirs('messages'), ...this.#groupMessageDirs('cold'), this.#legacyMsgDir, this.#legacyColdDir]) {
       if (!existsSync(dir)) continue;
       for (const file of readdirSync(dir)) {
         const match = file.match(/^m(\d+)\.md$/);

package/yeaft/conversation/search.js

@@ -4,7 +4,7 @@
  * Simple keyword search across hot and cold messages.
  */
 
-import { existsSync, readdirSync, readFileSync } from 'fs';
+import { existsSync, readdirSync, readFileSync, statSync } from 'fs';
 import { join } from 'path';
 import { parseMessage, parseSeqFromId } from './persist.js';
 
@@ -35,15 +35,34 @@ function searchDir(dir, keyword) {
   return results;
 }
 
-function compareNewestFirst(a, b) {
+function compareNewest(a, b) {
   const sa = parseSeqFromId(a?.id);
   const sb = parseSeqFromId(b?.id);
   if (Number.isFinite(sa) && Number.isFinite(sb) && sa !== sb) return sb - sa;
   return String(b?.time || '').localeCompare(String(a?.time || ''));
 }
 
+function groupConversationMessageDirs(dir) {
+  const groupsDir = join(dir, 'groups');
+  if (!existsSync(groupsDir)) return [];
+
+  const dirs = [];
+  for (const name of readdirSync(groupsDir)) {
+    const groupDir = join(groupsDir, name);
+    try {
+      if (!statSync(groupDir).isDirectory()) continue;
+    } catch {
+      continue;
+    }
+
+    const conversationDir = join(groupDir, 'conversation');
+    dirs.push(join(conversationDir, 'messages'), join(conversationDir, 'cold'));
+  }
+  return dirs;
+}
+
 /**
- * Search Yeaft history (chat + group + legacy conversation) for a keyword.
+ * Search Yeaft history (chat + per-group + legacy conversation) for a keyword.
  *
  * @param {string} dir — Yeaft root directory (e.g. ~/.yeaft)
  * @param {string} keyword — search term
@@ -56,8 +75,7 @@ export function searchMessages(dir, keyword, limit = 20) {
   const dirs = [
     join(dir, 'chat', 'messages'),
     join(dir, 'chat', 'cold'),
-    join(dir, 'group', 'messages'),
-    join(dir, 'group', 'cold'),
+    ...groupConversationMessageDirs(dir),
     // Compatibility for profiles created before chat/group split.
     join(dir, 'conversation', 'messages'),
     join(dir, 'conversation', 'cold'),
@@ -65,6 +83,6 @@ export function searchMessages(dir, keyword, limit = 20) {
 
   return dirs
     .flatMap(d => searchDir(d, keyword))
-    .sort(compareNewestFirst)
+    .sort(compareNewest)
     .slice(0, limit);
 }

package/yeaft/init.js

@@ -2,7 +2,7 @@
  * init.js — Yeaft directory structure initialization
  *
  * Ensures ~/.yeaft/ and all required subdirectories exist.
- * Creates default config.md, MEMORY.md, chat/index.md, and group/index.md if missing.
+ * Creates default config.md, MEMORY.md, and chat/index.md if missing.
  */
 
 import { existsSync, mkdirSync, writeFileSync, accessSync, constants } from 'fs';
@@ -77,10 +77,7 @@ const SUBDIRS = [
   'chat/messages',
   'chat/cold',
   'chat/blobs',
-  'group/messages',
-  'group/cold',
-  'group/blobs',
-  'group/compact',
+  'groups',
   'memory/entries',
   'tasks',
   'skills',
@@ -200,12 +197,10 @@ export function initYeaftDir(dir) {
     created.push(memoryPath);
   }
 
-  for (const mode of ['chat', 'group']) {
-    const indexPath = join(root, mode, 'index.md');
-    if (!existsSync(indexPath)) {
-      safeWriteFile(indexPath, DEFAULT_CONVERSATION_INDEX, warnings);
-      created.push(indexPath);
-    }
+  const chatIndexPath = join(root, 'chat', 'index.md');
+  if (!existsSync(chatIndexPath)) {
+    safeWriteFile(chatIndexPath, DEFAULT_CONVERSATION_INDEX, warnings);
+    created.push(chatIndexPath);
   }
 
   // mcp.json.example — reference template for MCP server configuration