@yeaft/webchat-agent 0.0.234 → 0.0.236

package/crew/ui-messages.js

@@ -0,0 +1,246 @@
+/**
+ * Crew — UI 消息辅助函数
+ * sendCrewMessage, sendCrewOutput, sendStatusUpdate, endRoleStreaming, findActiveRole
+ */
+import ctx from '../context.js';
+import { upsertCrewIndex, saveSessionMeta } from './persistence.js';
+
+/**
+ * 发送 crew 消息到 server（透传到 Web）
+ */
+export function sendCrewMessage(msg) {
+  if (ctx.sendToServer) {
+    ctx.sendToServer(msg);
+  }
+}
+
+/** Format role label: "icon displayName" or just "displayName" if no icon */
+function roleLabel(r) {
+  return r.icon ? `${r.icon} ${r.displayName}` : r.displayName;
+}
+
+/**
+ * 结束指定角色的最后一条 streaming 消息（反向搜索）
+ */
+export function endRoleStreaming(session, roleName) {
+  for (let i = session.uiMessages.length - 1; i >= 0; i--) {
+    if (session.uiMessages[i].role === roleName && session.uiMessages[i]._streaming) {
+      delete session.uiMessages[i]._streaming;
+      break;
+    }
+  }
+}
+
+/**
+ * 找到当前活跃的角色（最近一个 turnActive 的）
+ */
+export function findActiveRole(session) {
+  for (const [name, state] of session.roleStates) {
+    if (state.turnActive) return name;
+  }
+  return null;
+}
+
+/**
+ * 发送角色输出到 Web
+ */
+export function sendCrewOutput(session, roleName, outputType, rawMessage, extra = {}) {
+  const role = session.roles.get(roleName);
+  const roleIcon = role?.icon || '';
+  const displayName = role?.displayName || roleName;
+
+  // 从 roleState 获取当前 task 信息
+  const roleState = session.roleStates.get(roleName);
+  const taskId = roleState?.currentTask?.taskId || null;
+  const taskTitle = roleState?.currentTask?.taskTitle || null;
+
+  sendCrewMessage({
+    type: 'crew_output',
+    sessionId: session.id,
+    role: roleName,
+    roleIcon,
+    roleName: displayName,
+    outputType,  // 'text' | 'tool_use' | 'tool_result' | 'route' | 'system'
+    data: rawMessage,
+    taskId,
+    taskTitle,
+    ...extra
+  });
+
+  // ★ 累积 feature 到持久化列表
+  if (taskId && taskTitle && !session.features.has(taskId)) {
+    session.features.set(taskId, { taskId, taskTitle, createdAt: Date.now() });
+  }
+
+  // ★ 记录精简 UI 消息用于恢复（跳过 tool_use/tool_result，只记录可见内容）
+  if (outputType === 'text') {
+    const content = rawMessage?.message?.content;
+    let text = '';
+    if (typeof content === 'string') {
+      text = content;
+    } else if (Array.isArray(content)) {
+      text = content.filter(b => b.type === 'text').map(b => b.text).join('');
+    }
+    if (!text) return;
+    // ★ 反向搜索该角色最后一条 _streaming 消息
+    let found = false;
+    for (let i = session.uiMessages.length - 1; i >= 0; i--) {
+      const msg = session.uiMessages[i];
+      if (msg.role === roleName && msg.type === 'text' && msg._streaming) {
+        msg.content += text;
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      session.uiMessages.push({
+        role: roleName, roleIcon, roleName: displayName,
+        type: 'text', content: text, _streaming: true,
+        taskId, taskTitle,
+        timestamp: Date.now()
+      });
+    }
+  } else if (outputType === 'route') {
+    // 结束该角色前一条 streaming
+    endRoleStreaming(session, roleName);
+    session.uiMessages.push({
+      role: roleName, roleIcon, roleName: displayName,
+      type: 'route', routeTo: extra.routeTo,
+      routeSummary: extra.routeSummary || '',
+      content: `→ @${extra.routeTo} ${extra.routeSummary || ''}`,
+      taskId, taskTitle,
+      timestamp: Date.now()
+    });
+  } else if (outputType === 'system') {
+    const content = rawMessage?.message?.content;
+    let text = '';
+    if (typeof content === 'string') {
+      text = content;
+    } else if (Array.isArray(content)) {
+      text = content.filter(b => b.type === 'text').map(b => b.text).join('');
+    }
+    if (!text) return;
+    session.uiMessages.push({
+      role: roleName, roleIcon, roleName: displayName,
+      type: 'system', content: text,
+      timestamp: Date.now()
+    });
+  } else if (outputType === 'tool_use') {
+    // 结束该角色前一条 streaming
+    endRoleStreaming(session, roleName);
+    const content = rawMessage?.message?.content;
+    if (Array.isArray(content)) {
+      for (const block of content) {
+        if (block.type === 'tool_use') {
+          // Save trimmed toolInput for restore
+          const input = block.input || {};
+          let savedInput;
+          if (block.name === 'TodoWrite') {
+            savedInput = input;
+          } else {
+            const trimmedInput = {};
+            if (input.file_path) trimmedInput.file_path = input.file_path;
+            if (input.command) trimmedInput.command = input.command.substring(0, 200);
+            if (input.pattern) trimmedInput.pattern = input.pattern;
+            if (input.old_string) trimmedInput.old_string = input.old_string.substring(0, 100);
+            if (input.new_string) trimmedInput.new_string = input.new_string.substring(0, 100);
+            if (input.url) trimmedInput.url = input.url;
+            if (input.query) trimmedInput.query = input.query;
+            savedInput = Object.keys(trimmedInput).length > 0 ? trimmedInput : null;
+          }
+          session.uiMessages.push({
+            role: roleName, roleIcon, roleName: displayName,
+            type: 'tool',
+            toolName: block.name,
+            toolId: block.id,
+            toolInput: savedInput,
+            content: `${block.name} ${block.input?.file_path || block.input?.command?.substring(0, 60) || ''}`,
+            hasResult: false,
+            taskId, taskTitle,
+            timestamp: Date.now()
+          });
+        }
+      }
+    }
+  } else if (outputType === 'tool_result') {
+    // 标记对应 tool 的 hasResult
+    const toolId = rawMessage?.message?.tool_use_id;
+    if (toolId) {
+      for (let i = session.uiMessages.length - 1; i >= 0; i--) {
+        if (session.uiMessages[i].type === 'tool' && session.uiMessages[i].toolId === toolId) {
+          session.uiMessages[i].hasResult = true;
+          break;
+        }
+      }
+    }
+    // Check for image blocks in tool_result content
+    const resultContent = rawMessage?.message?.content;
+    if (Array.isArray(resultContent)) {
+      for (const item of resultContent) {
+        if (item.type === 'image' && item.source?.type === 'base64') {
+          sendCrewMessage({
+            type: 'crew_image',
+            sessionId: session.id,
+            role: roleName,
+            roleIcon,
+            roleName: displayName,
+            toolId: toolId || '',
+            mimeType: item.source.media_type,
+            data: item.source.data,
+            taskId, taskTitle
+          });
+          session.uiMessages.push({
+            role: roleName, roleIcon, roleName: displayName,
+            type: 'image', toolId: toolId || '',
+            mimeType: item.source.media_type,
+            taskId, taskTitle,
+            timestamp: Date.now()
+          });
+        }
+      }
+    }
+  }
+  // tool 只保存精简信息（toolName + 摘要），不存完整 toolInput/toolResult
+}
+
+/**
+ * 发送 session 状态更新
+ */
+export function sendStatusUpdate(session) {
+  const currentRole = findActiveRole(session);
+
+  sendCrewMessage({
+    type: 'crew_status',
+    sessionId: session.id,
+    status: session.status,
+    currentRole,
+    round: session.round,
+    costUsd: session.costUsd,
+    totalInputTokens: session.totalInputTokens,
+    totalOutputTokens: session.totalOutputTokens,
+    roles: Array.from(session.roles.values()).map(r => ({
+      name: r.name,
+      displayName: r.displayName,
+      icon: r.icon,
+      description: r.description,
+      isDecisionMaker: r.isDecisionMaker || false,
+      model: r.model,
+      roleType: r.roleType,
+      groupIndex: r.groupIndex
+    })),
+    activeRoles: Array.from(session.roleStates.entries())
+      .filter(([, s]) => s.turnActive)
+      .map(([name]) => name),
+    currentToolByRole: Object.fromEntries(
+      Array.from(session.roleStates.entries())
+        .filter(([, s]) => s.turnActive && s.currentTool)
+        .map(([name, s]) => [name, s.currentTool])
+    ),
+    features: Array.from(session.features.values()),
+    initProgress: session.initProgress || null
+  });
+
+  // 异步更新持久化
+  upsertCrewIndex(session).catch(e => console.warn('[Crew] Failed to update index:', e.message));
+  saveSessionMeta(session).catch(e => console.warn('[Crew] Failed to save session meta:', e.message));
+}

package/crew/worktree.js

@@ -0,0 +1,130 @@
+/**
+ * Crew — Git Worktree 管理
+ * 为开发组创建/清理 git worktrees
+ */
+import { promises as fs } from 'fs';
+import { join } from 'path';
+import { execFile as execFileCb } from 'child_process';
+import { promisify } from 'util';
+
+const execFile = promisify(execFileCb);
+
+/**
+ * 为开发组创建 git worktree
+ * 每个 groupIndex 对应一个 worktree，同组的 dev/rev/test 共享
+ *
+ * @param {string} projectDir - 主项目目录
+ * @param {Array} roles - 展开后的角色列表
+ * @returns {Map<number, string>} groupIndex → worktree 路径
+ */
+export async function initWorktrees(projectDir, roles) {
+  const groupIndices = [...new Set(roles.filter(r => r.groupIndex > 0).map(r => r.groupIndex))];
+  if (groupIndices.length === 0) return new Map();
+
+  const worktreeBase = join(projectDir, '.worktrees');
+  await fs.mkdir(worktreeBase, { recursive: true });
+
+  // 获取 git 已知的 worktree 列表
+  let knownWorktrees = new Set();
+  try {
+    const { stdout } = await execFile('git', ['worktree', 'list', '--porcelain'], { cwd: projectDir });
+    for (const line of stdout.split('\n')) {
+      if (line.startsWith('worktree ')) {
+        knownWorktrees.add(line.slice('worktree '.length).trim());
+      }
+    }
+  } catch {
+    // git worktree list 失败，视为空集
+  }
+
+  const worktreeMap = new Map();
+
+  for (const idx of groupIndices) {
+    const wtDir = join(worktreeBase, `dev-${idx}`);
+    const branch = `crew/dev-${idx}`;
+
+    // 检查目录是否存在
+    let dirExists = false;
+    try {
+      await fs.access(wtDir);
+      dirExists = true;
+    } catch {}
+
+    if (dirExists) {
+      if (knownWorktrees.has(wtDir)) {
+        // 目录存在且 git 记录中也有，直接复用
+        console.log(`[Crew] Worktree already exists: ${wtDir}`);
+        worktreeMap.set(idx, wtDir);
+        continue;
+      } else {
+        // 孤立目录：目录存在但 git 不认识，先删除再重建
+        console.warn(`[Crew] Orphaned worktree dir, removing: ${wtDir}`);
+        await fs.rm(wtDir, { recursive: true, force: true }).catch(() => {});
+      }
+    }
+
+    try {
+      // 创建分支（如果不存在）
+      try {
+        await execFile('git', ['branch', branch], { cwd: projectDir });
+      } catch {
+        // 分支已存在，忽略
+      }
+
+      // 创建 worktree
+      await execFile('git', ['worktree', 'add', wtDir, branch], { cwd: projectDir });
+      console.log(`[Crew] Created worktree: ${wtDir} on branch ${branch}`);
+      worktreeMap.set(idx, wtDir);
+    } catch (e) {
+      console.error(`[Crew] Failed to create worktree for group ${idx}:`, e.message);
+    }
+  }
+
+  return worktreeMap;
+}
+
+/**
+ * 清理 session 的 git worktrees
+ * @param {string} projectDir - 主项目目录
+ */
+export async function cleanupWorktrees(projectDir) {
+  const worktreeBase = join(projectDir, '.worktrees');
+
+  try {
+    await fs.access(worktreeBase);
+  } catch {
+    return; // .worktrees 目录不存在，无需清理
+  }
+
+  try {
+    const entries = await fs.readdir(worktreeBase);
+    for (const entry of entries) {
+      if (!entry.startsWith('dev-')) continue;
+      const wtDir = join(worktreeBase, entry);
+      const branch = `crew/${entry}`;
+
+      try {
+        await execFile('git', ['worktree', 'remove', wtDir, '--force'], { cwd: projectDir });
+        console.log(`[Crew] Removed worktree: ${wtDir}`);
+      } catch (e) {
+        console.warn(`[Crew] Failed to remove worktree ${wtDir}:`, e.message);
+      }
+
+      try {
+        await execFile('git', ['branch', '-D', branch], { cwd: projectDir });
+        console.log(`[Crew] Deleted branch: ${branch}`);
+      } catch (e) {
+        console.warn(`[Crew] Failed to delete branch ${branch}:`, e.message);
+      }
+    }
+
+    // 尝试删除 .worktrees 目录（如果已空）
+    try {
+      await fs.rmdir(worktreeBase);
+    } catch {
+      // 目录不空或其他原因，忽略
+    }
+  } catch (e) {
+    console.error(`[Crew] Failed to cleanup worktrees:`, e.message);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.0.234",
+  "version": "0.0.236",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",
@@ -33,8 +33,12 @@
   },
   "files": [
     "*.js",
+    "connection/",
+    "crew/",
     "sdk/",
-    "scripts/"
+    "scripts/",
+    "service/",
+    "workbench/"
   ],
   "license": "MIT",
   "author": "Yeaft",

package/service/config.js

@@ -0,0 +1,133 @@
+/**
+ * Service — shared configuration and utility functions
+ */
+import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { platform, homedir } from 'os';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+export const SERVICE_NAME = 'yeaft-agent';
+
+/**
+ * Load .env file from agent directory (or cwd) into process.env
+ * Only sets vars that are not already set (won't override existing env)
+ */
+function loadDotenv() {
+  // Try agent source directory first, then cwd
+  const agentDir = join(__dirname, '..');
+  const candidates = [join(agentDir, '.env'), join(process.cwd(), '.env')];
+  for (const envPath of candidates) {
+    if (!existsSync(envPath)) continue;
+    try {
+      const content = readFileSync(envPath, 'utf-8');
+      for (const line of content.split('\n')) {
+        const match = line.match(/^\s*([^#][^=]*)\s*=\s*(.*)$/);
+        if (match) {
+          const key = match[1].trim();
+          let value = match[2].trim();
+          value = value.replace(/^["']|["']$/g, '');
+          // Don't override existing env vars
+          if (!process.env[key]) {
+            process.env[key] = value;
+          }
+        }
+      }
+      return; // loaded successfully, stop
+    } catch {
+      // continue to next candidate
+    }
+  }
+}
+
+// Standard config/log directory per platform
+export function getConfigDir() {
+  if (platform() === 'win32') {
+    return join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), SERVICE_NAME);
+  }
+  return join(homedir(), '.config', SERVICE_NAME);
+}
+
+export function getLogDir() {
+  return join(getConfigDir(), 'logs');
+}
+
+export function getConfigPath() {
+  return join(getConfigDir(), 'config.json');
+}
+
+/** Save agent configuration to standard location */
+export function saveServiceConfig(config) {
+  const dir = getConfigDir();
+  mkdirSync(dir, { recursive: true });
+  mkdirSync(getLogDir(), { recursive: true });
+  writeFileSync(getConfigPath(), JSON.stringify(config, null, 2));
+}
+
+/** Load agent configuration from standard location */
+export function loadServiceConfig() {
+  const configPath = getConfigPath();
+  if (!existsSync(configPath)) return null;
+  try {
+    return JSON.parse(readFileSync(configPath, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+
+/** Resolve the full path to the node binary */
+export function getNodePath() {
+  return process.execPath;
+}
+
+/** Resolve the full path to cli.js */
+export function getCliPath() {
+  return join(__dirname, '..', 'cli.js');
+}
+
+/**
+ * Parse --server/--name/--secret/--work-dir from args, merge with existing config
+ */
+export function parseServiceArgs(args) {
+  // Load .env if available (for dev / source-based usage)
+  loadDotenv();
+
+  const existing = loadServiceConfig() || {};
+  const config = {
+    serverUrl: existing.serverUrl || '',
+    agentName: existing.agentName || '',
+    agentSecret: existing.agentSecret || '',
+    workDir: existing.workDir || '',
+  };
+
+  // Environment variables override saved config
+  if (process.env.SERVER_URL) config.serverUrl = process.env.SERVER_URL;
+  if (process.env.AGENT_NAME) config.agentName = process.env.AGENT_NAME;
+  if (process.env.AGENT_SECRET) config.agentSecret = process.env.AGENT_SECRET;
+  if (process.env.WORK_DIR) config.workDir = process.env.WORK_DIR;
+
+  // CLI args override everything
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    const next = args[i + 1];
+    switch (arg) {
+      case '--server': if (next) { config.serverUrl = next; i++; } break;
+      case '--name': if (next) { config.agentName = next; i++; } break;
+      case '--secret': if (next) { config.agentSecret = next; i++; } break;
+      case '--work-dir': if (next) { config.workDir = next; i++; } break;
+    }
+  }
+
+  return config;
+}
+
+export function validateConfig(config) {
+  if (!config.serverUrl) {
+    console.error('Error: --server <url> is required');
+    process.exit(1);
+  }
+  if (!config.agentSecret) {
+    console.error('Error: --secret <secret> is required');
+    process.exit(1);
+  }
+}

package/service/index.js

@@ -0,0 +1,99 @@
+/**
+ * Service — platform dispatcher
+ * Routes install/uninstall/start/stop/restart/status/logs to the correct platform module.
+ */
+import { existsSync } from 'fs';
+import { platform } from 'os';
+import {
+  SERVICE_NAME, getConfigDir, getLogDir, getConfigPath,
+  saveServiceConfig, loadServiceConfig,
+  parseServiceArgs, validateConfig
+} from './config.js';
+import { getSystemdServicePath, linuxInstall, linuxUninstall, linuxStart, linuxStop, linuxRestart, linuxStatus, linuxLogs } from './linux.js';
+import { getLaunchdPlistPath, macInstall, macUninstall, macStart, macStop, macRestart, macStatus, macLogs } from './macos.js';
+import { winInstall, winUninstall, winStart, winStop, winRestart, winStatus, winLogs } from './windows.js';
+
+export {
+  getConfigDir, getLogDir, getConfigPath,
+  saveServiceConfig, loadServiceConfig,
+  parseServiceArgs
+};
+
+const os = platform();
+
+function ensureInstalled() {
+  if (os === 'linux') {
+    if (!existsSync(getSystemdServicePath())) {
+      console.error('Service not installed. Run "yeaft-agent install" first.');
+      process.exit(1);
+    }
+  } else if (os === 'darwin') {
+    if (!existsSync(getLaunchdPlistPath())) {
+      console.error('Service not installed. Run "yeaft-agent install" first.');
+      process.exit(1);
+    }
+  }
+  // Windows check is done inside individual functions
+}
+
+export function install(args) {
+  const config = parseServiceArgs(args);
+  validateConfig(config);
+  saveServiceConfig(config);
+
+  console.log(`Installing ${SERVICE_NAME} service...`);
+  console.log(`  Server: ${config.serverUrl}`);
+  console.log(`  Name:   ${config.agentName || '(auto)'}`);
+  console.log(`  WorkDir: ${config.workDir || '(home)'}`);
+  console.log('');
+
+  if (os === 'linux') linuxInstall(config);
+  else if (os === 'darwin') macInstall(config);
+  else if (os === 'win32') winInstall(config);
+  else {
+    console.error(`Unsupported platform: ${os}`);
+    console.log('You can run the agent directly: yeaft-agent --server <url> --secret <secret>');
+    process.exit(1);
+  }
+}
+
+export function uninstall() {
+  console.log(`Uninstalling ${SERVICE_NAME} service...`);
+  if (os === 'linux') linuxUninstall();
+  else if (os === 'darwin') macUninstall();
+  else if (os === 'win32') winUninstall();
+  else { console.error(`Unsupported platform: ${os}`); process.exit(1); }
+}
+
+export function start() {
+  ensureInstalled();
+  if (os === 'linux') linuxStart();
+  else if (os === 'darwin') macStart();
+  else if (os === 'win32') winStart();
+}
+
+export function stop() {
+  ensureInstalled();
+  if (os === 'linux') linuxStop();
+  else if (os === 'darwin') macStop();
+  else if (os === 'win32') winStop();
+}
+
+export function restart() {
+  ensureInstalled();
+  if (os === 'linux') linuxRestart();
+  else if (os === 'darwin') macRestart();
+  else if (os === 'win32') winRestart();
+}
+
+export function status() {
+  if (os === 'linux') linuxStatus();
+  else if (os === 'darwin') macStatus();
+  else if (os === 'win32') winStatus();
+}
+
+export function logs() {
+  if (os === 'linux') linuxLogs();
+  else if (os === 'darwin') macLogs();
+  else if (os === 'win32') winLogs();
+}