@yeaft/webchat-agent 0.1.857 → 0.1.860

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,42 @@ 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,
+      providerOptions: msg.providerOptions || {},
+    });
+    state.disallowedTools = disallowedTools || null;
+  }
 
   ctx.sendToServer({
     type: 'conversation_created',
@@ -390,6 +401,7 @@ export async function createConversation(msg) {
     workDir: effectiveWorkDir,
     userId,
     username,
+    provider,
     disallowedTools: disallowedTools || null
   });
 
@@ -414,22 +426,27 @@ 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}`);
   console.log(`[Resume] workDir: ${effectiveWorkDir} (lazy start)`);
 
   // 清理旧条目：同 conversationId 或同 claudeSessionId 的条目（避免重复恢复同一个 session 累积）
+  let priorProviderOptions = null;
   for (const [id, conv] of ctx.conversations) {
     if (id === conversationId || (claudeSessionId && conv.claudeSessionId === claudeSessionId)) {
       console.log(`[Resume] Cleaning up old conversation: ${id} (claudeSessionId: ${conv.claudeSessionId})`);
+      if (conv.providerOptions && !priorProviderOptions) priorProviderOptions = conv.providerOptions;
       if (conv.abortController) {
         conv.abortController.abort();
       }
@@ -440,7 +457,15 @@ export async function resumeConversation(msg) {
     }
   }
 
-  const historyMessages = loadSessionHistory(effectiveWorkDir, claudeSessionId);
+  let driverForHistory;
+  try { driverForHistory = getProvider(provider); }
+  catch (err) {
+    console.warn(`[Resume] unknown provider "${provider}", falling back to claude-code history loader:`, err?.message || err);
+    driverForHistory = {};
+  }
+  const historyMessages = typeof driverForHistory.loadHistory === 'function'
+    ? await driverForHistory.loadHistory(effectiveWorkDir, claudeSessionId)
+    : loadSessionHistory(effectiveWorkDir, claudeSessionId);
   if (username) console.log(`[Resume] User: ${username} (${userId})`);
   console.log(`Loaded ${historyMessages.length} history messages`);
 
@@ -458,6 +483,7 @@ export async function resumeConversation(msg) {
     model: null,
     userId,
     username,
+    providerName: provider,
     disallowedTools: disallowedTools || null,  // null = 使用全局默认
     usage: {
       inputTokens: 0,
@@ -468,6 +494,20 @@ 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,
+      providerOptions: msg.providerOptions || priorProviderOptions || {},
+    });
+    state.disallowedTools = disallowedTools || null;
+  }
+
   ctx.sendToServer({
     type: 'conversation_resumed',
     conversationId,
@@ -475,7 +515,8 @@ export async function resumeConversation(msg) {
     workDir: effectiveWorkDir,
     historyMessages,
     userId,
-    username
+    username,
+    provider
   });
 
   // 立即发送 agent 级别的 MCP servers 列表
@@ -498,7 +539,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);
   }
 }
@@ -627,9 +668,15 @@ export async function handleCancelExecution(msg) {
   // 标记为取消状态，防止 processClaudeOutput 的 finally 发送 conversation_closed
   state.cancelled = true;
 
-  // 中止当前查询
-  if (state.abortController) {
-    state.abortController.abort();
+  // 通过 driver 中止当前查询（Claude 走 abortController；Copilot 走 SIGTERM）
+  try {
+    const driver = getProvider(state.providerName || DEFAULT_PROVIDER);
+    if (typeof driver.abort === 'function') driver.abort(state);
+  } catch (err) {
+    console.warn(`[${conversationId}] driver.abort failed:`, err?.message || err);
+    if (state.abortController) {
+      try { state.abortController.abort(); } catch { /* noop */ }
+    }
   }
 
   // 关闭输入流
@@ -704,6 +751,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/history.js

@@ -2,6 +2,7 @@ import { homedir } from 'os';
 import { existsSync, readFileSync, readdirSync, statSync } from 'fs';
 import { join } from 'path';
 import ctx from './context.js';
+import { getProvider, DEFAULT_PROVIDER } from './providers/index.js';
 
 // Claude 项目目录
 export function getClaudeProjectsDir() {
@@ -184,18 +185,23 @@ export function loadSessionHistory(workDir, claudeSessionId, limit = 500) {
 }
 
 export async function handleListHistorySessions(msg) {
-  const { workDir, requestId, _requestClientId } = msg;
+  const { workDir, requestId, _requestClientId, provider } = msg;
   const effectiveWorkDir = workDir || ctx.CONFIG.workDir;
+  const providerName = provider || DEFAULT_PROVIDER;
 
-  console.log(`Listing history sessions for: ${effectiveWorkDir}`);
+  console.log(`Listing history sessions for: ${effectiveWorkDir} (provider=${providerName})`);
 
   try {
-    const sessions = await getHistorySessions(effectiveWorkDir);
+    const driver = getProvider(providerName);
+    const sessions = typeof driver.listSessions === 'function'
+      ? await driver.listSessions(effectiveWorkDir)
+      : await getHistorySessions(effectiveWorkDir);
     ctx.sendToServer({
       type: 'history_sessions_list',
       requestId,
       _requestClientId,
       workDir: effectiveWorkDir,
+      provider: providerName,
       sessions
     });
   } catch (e) {
@@ -205,85 +211,42 @@ export async function handleListHistorySessions(msg) {
       requestId,
       _requestClientId,
       workDir: effectiveWorkDir,
+      provider: providerName,
       sessions: [],
       error: e.message
     });
   }
 }
 
-// 列出 Claude projects 目录下的所有 folder (工作目录)
+// 列出指定 provider 下所有 folder (工作目录)
 export async function handleListFolders(msg) {
-  const { requestId, _requestClientId } = msg;
-  const projectsDir = getClaudeProjectsDir();
+  const { requestId, _requestClientId, provider } = msg;
+  const providerName = provider || DEFAULT_PROVIDER;
 
-  console.log(`Listing folders from: ${projectsDir}`);
+  console.log(`Listing folders for provider=${providerName}`);
 
   try {
-    const folders = [];
-
-    if (existsSync(projectsDir)) {
-      const entries = readdirSync(projectsDir);
-
-      for (const entry of entries) {
-        const entryPath = join(projectsDir, entry);
-        const stats = statSync(entryPath);
-
-        if (stats.isDirectory()) {
-          // 过滤掉 crew 角色的 session 文件夹
-          // crew 角色的 cwd 在 .crew/roles/{roleName} 下，对应的文件夹名包含 --crew-roles-
-          if (entry.includes('--crew-roles-')) {
-            continue;
-          }
-
-          // 从 session 文件读取真实的工作目录路径
-          const originalPath = getWorkDirFromProjectFolder(entryPath, entry);
-
-          // 快速计数：只数 .jsonl 文件数量，不读取文件内容
-          let sessionCount = 0;
-          let lastModified = stats.mtime.getTime();
-
-          try {
-            const files = readdirSync(entryPath);
-
-            for (const file of files) {
-              if (file.endsWith('.jsonl')) {
-                sessionCount++;
-                try {
-                  const fileStats = statSync(join(entryPath, file));
-                  if (fileStats.mtime.getTime() > lastModified) {
-                    lastModified = fileStats.mtime.getTime();
-                  }
-                } catch {}
-              }
-            }
-          } catch {}
-
-          folders.push({
-            name: entry,
-            path: originalPath,
-            sessionCount,
-            lastModified
-          });
-        }
-      }
+    const driver = getProvider(providerName);
+    let folders = [];
+    if (typeof driver.listFolders === 'function') {
+      folders = await driver.listFolders();
     }
-
-    folders.sort((a, b) => b.lastModified - a.lastModified);
-
-    console.log(`Found ${folders.length} folders, sending response...`);
+    folders.sort((a, b) => (b.lastModified || 0) - (a.lastModified || 0));
+    console.log(`Found ${folders.length} folders (provider=${providerName}), sending response...`);
     ctx.sendToServer({
       type: 'folders_list',
       requestId,
       _requestClientId,
+      provider: providerName,
       folders
     });
-    console.log(`folders_list sent with ${folders.length} folders`);
   } catch (e) {
     console.error('Error listing folders:', e);
     ctx.sendToServer({
       type: 'folders_list',
       requestId,
       _requestClientId,
+      provider: providerName,
       folders: [],
       error: e.message
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.857",
+  "version": "0.1.860",
   "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,58 @@
+/**
+ * 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
+ * @property {() => Promise<FolderInfo[]>} listFolders
+ *   Return the list of work-directories that this provider has sessions for.
+ * @property {(workDir: string) => Promise<SessionInfo[]>} listSessions
+ *   Return resumable sessions for a given work-directory.
+ * @property {(workDir: string, sessionId: string, limit?: number) => Promise<HistoryMessage[]>} loadHistory
+ *   Return the resumable transcript as an array of `claude_output`-compatible
+ *   envelopes (the same shape the live stream would have produced).
+ *
+ * @typedef {Object} StartOpts
+ * @property {string} conversationId
+ * @property {string} workDir
+ * @property {string|null} [resumeSessionId]
+ * @property {string} [userId]
+ * @property {string} [username]
+ * @property {Object} [providerOptions]   per-provider knobs (model, allowAllTools, ...)
+ *
+ * @typedef {Object} FolderInfo
+ * @property {string} name           opaque folder identifier (provider-specific)
+ * @property {string} path           original cwd path
+ * @property {number} sessionCount
+ * @property {number} lastModified   epoch ms
+ *
+ * @typedef {Object} SessionInfo
+ * @property {string} sessionId
+ * @property {string} workDir
+ * @property {string} title
+ * @property {string} [preview]
+ * @property {number} lastModified
+ * @property {number} [size]
+ *
+ * @typedef {Object} HistoryMessage   a single claude_output `data` envelope
+ */
+
+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,84 @@
+import { existsSync, readdirSync, statSync } from 'fs';
+import { join } from 'path';
+import { startClaudeQuery } from '../claude.js';
+import {
+  getClaudeProjectsDir,
+  getHistorySessions,
+  loadSessionHistory,
+  getWorkDirFromProjectFolder,
+} from '../history.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 */ }
+  }
+}
+
+// ---------- history surface ----------
+
+export async function listFolders() {
+  const projectsDir = getClaudeProjectsDir();
+  const folders = [];
+  if (!existsSync(projectsDir)) return folders;
+
+  for (const entry of readdirSync(projectsDir)) {
+    const entryPath = join(projectsDir, entry);
+    let stats;
+    try { stats = statSync(entryPath); } catch { continue; }
+    if (!stats.isDirectory()) continue;
+    if (entry.includes('--crew-roles-')) continue;
+
+    const originalPath = getWorkDirFromProjectFolder(entryPath, entry);
+    let sessionCount = 0;
+    let lastModified = stats.mtime.getTime();
+    try {
+      for (const file of readdirSync(entryPath)) {
+        if (!file.endsWith('.jsonl')) continue;
+        sessionCount++;
+        try {
+          const fs = statSync(join(entryPath, file));
+          if (fs.mtime.getTime() > lastModified) lastModified = fs.mtime.getTime();
+        } catch { /* noop */ }
+      }
+    } catch { /* noop */ }
+
+    folders.push({ name: entry, path: originalPath, sessionCount, lastModified });
+  }
+  folders.sort((a, b) => b.lastModified - a.lastModified);
+  return folders;
+}
+
+export async function listSessions(workDir) {
+  return await getHistorySessions(workDir);
+}
+
+export async function loadHistory(workDir, sessionId, limit = 500) {
+  return loadSessionHistory(workDir, sessionId, limit);
+}
+
+export default { name, start, sendInput, abort, listFolders, listSessions, loadHistory };