@yeaft/webchat-agent 0.0.56 → 0.0.58

package/connection.js

@@ -22,7 +22,8 @@ import {
 } from './conversation.js';
 import {
   createCrewSession, handleCrewHumanInput, handleCrewControl,
-  addRoleToSession, removeRoleFromSession
+  addRoleToSession, removeRoleFromSession,
+  handleListCrewSessions, resumeCrewSession
 } from './crew.js';
 
 // 需要在断连期间缓冲的消息类型（Claude 输出相关的关键消息）
@@ -286,6 +287,14 @@ async function handleMessage(msg) {
       await removeRoleFromSession(msg);
       break;
 
+    case 'list_crew_sessions':
+      await handleListCrewSessions(msg);
+      break;
+
+    case 'resume_crew_session':
+      await resumeCrewSession(msg);
+      break;
+
     // Port proxy
     case 'proxy_request':
       handleProxyHttpRequest(msg);
@@ -475,6 +484,13 @@ async function handleMessage(msg) {
               '#!/bin/bash',
               `PID=${pid}`,
               `PKG="${pkgName}@latest"`,
+              `LOGFILE="${join(configDir, 'logs', 'upgrade.log')}"`,
+              `export PATH="${process.env.PATH}"`,
+              '',
+              '# Redirect all output to log file',
+              'exec > "$LOGFILE" 2>&1',
+              'echo "[Upgrade] Started at $(date)"',
+              '',
               ...(cwd ? [`INSTALL_DIR="${cwd}"`] : []),
               '',
               '# Wait for current process to exit',

package/conversation.js

@@ -1,6 +1,7 @@
 import ctx from './context.js';
 import { loadSessionHistory } from './history.js';
 import { startClaudeQuery } from './claude.js';
+import { crewSessions, loadCrewIndex } from './crew.js';
 
 // 不支持的斜杠命令（真正需要交互式 CLI 的命令）
 const UNSUPPORTED_SLASH_COMMANDS = ['/help', '/bug', '/login', '/logout', '/terminal-setup', '/vim', '/config'];
@@ -33,8 +34,8 @@ export function parseSlashCommand(message) {
   return { type: null, message };
 }
 
-// 发送 conversation 列表
-export function sendConversationList() {
+// 发送 conversation 列表（含活跃 crew sessions + 索引中已停止的 crew sessions）
+export async function sendConversationList() {
   const list = [];
   for (const [id, state] of ctx.conversations) {
     list.push({
@@ -47,7 +48,41 @@ export function sendConversationList() {
       username: state.username
     });
   }
-
+  // 追加活跃 crew sessions
+  const activeCrewIds = new Set();
+  for (const [id, session] of crewSessions) {
+    activeCrewIds.add(id);
+    list.push({
+      id,
+      workDir: session.projectDir,
+      createdAt: session.createdAt,
+      processing: session.status === 'running',
+      userId: session.userId,
+      username: session.username,
+      type: 'crew',
+      goal: session.goal
+    });
+  }
+  // 追加索引中已停止的 crew sessions（不重复）
+  try {
+    const index = await loadCrewIndex();
+    for (const entry of index) {
+      if (!activeCrewIds.has(entry.sessionId)) {
+        list.push({
+          id: entry.sessionId,
+          workDir: entry.projectDir,
+          createdAt: entry.createdAt,
+          processing: false,
+          userId: entry.userId,
+          username: entry.username,
+          type: 'crew',
+          status: entry.status
+        });
+      }
+    }
+  } catch (e) {
+    console.warn('[sendConversationList] Failed to load crew index:', e.message);
+  }
   ctx.sendToServer({
     type: 'conversation_list',
     conversations: list

package/crew.js

@@ -15,6 +15,7 @@
 import { query, Stream } from './sdk/index.js';
 import { promises as fs } from 'fs';
 import { join } from 'path';
+import { homedir } from 'os';
 import ctx from './context.js';
 
 // =====================================================================
@@ -24,9 +25,179 @@ import ctx from './context.js';
 /** @type {Map<string, CrewSession>} */
 const crewSessions = new Map();
 
-// 导出供 connection.js 使用
+// 导出供 connection.js / conversation.js 使用
 export { crewSessions };
 
+// =====================================================================
+// Crew Session Index (~/.claude/crew-sessions.json)
+// =====================================================================
+
+const CREW_INDEX_PATH = join(homedir(), '.claude', 'crew-sessions.json');
+
+export async function loadCrewIndex() {
+  try { return JSON.parse(await fs.readFile(CREW_INDEX_PATH, 'utf-8')); }
+  catch { return []; }
+}
+
+async function saveCrewIndex(index) {
+  await fs.mkdir(join(homedir(), '.claude'), { recursive: true });
+  await fs.writeFile(CREW_INDEX_PATH, JSON.stringify(index, null, 2));
+}
+
+function sessionToIndexEntry(session) {
+  return {
+    sessionId: session.id,
+    projectDir: session.projectDir,
+    sharedDir: session.sharedDir,
+    status: session.status,
+    createdAt: session.createdAt,
+    updatedAt: Date.now()
+  };
+}
+
+async function upsertCrewIndex(session) {
+  const index = await loadCrewIndex();
+  const entry = sessionToIndexEntry(session);
+  const idx = index.findIndex(e => e.sessionId === session.id);
+  if (idx >= 0) index[idx] = entry; else index.push(entry);
+  await saveCrewIndex(index);
+}
+
+// =====================================================================
+// Session Metadata (.crew/session.json)
+// =====================================================================
+
+async function saveSessionMeta(session) {
+  const meta = {
+    sessionId: session.id,
+    projectDir: session.projectDir,
+    sharedDir: session.sharedDir,
+    goal: session.goal,
+    status: session.status,
+    roles: Array.from(session.roles.values()).map(r => ({
+      name: r.name, displayName: r.displayName, icon: r.icon,
+      description: r.description, isDecisionMaker: r.isDecisionMaker || false
+    })),
+    decisionMaker: session.decisionMaker,
+    maxRounds: session.maxRounds,
+    round: session.round,
+    createdAt: session.createdAt,
+    updatedAt: Date.now(),
+    userId: session.userId,
+    username: session.username
+  };
+  await fs.writeFile(join(session.sharedDir, 'session.json'), JSON.stringify(meta, null, 2));
+}
+
+async function loadSessionMeta(sharedDir) {
+  try { return JSON.parse(await fs.readFile(join(sharedDir, 'session.json'), 'utf-8')); }
+  catch { return null; }
+}
+
+// =====================================================================
+// List & Resume Crew Sessions
+// =====================================================================
+
+/**
+ * 列出所有 crew sessions（从索引文件 + 活跃 sessions 合并）
+ */
+export async function handleListCrewSessions(msg) {
+  const { requestId, _requestClientId } = msg;
+  const index = await loadCrewIndex();
+
+  // 用活跃 session 更新实时状态
+  for (const entry of index) {
+    const active = crewSessions.get(entry.sessionId);
+    if (active) {
+      entry.status = active.status;
+    }
+  }
+
+  ctx.sendToServer({
+    type: 'crew_sessions_list',
+    requestId,
+    _requestClientId,
+    sessions: index
+  });
+}
+
+/**
+ * 恢复已停止的 crew session
+ */
+export async function resumeCrewSession(msg) {
+  const { sessionId, userId, username } = msg;
+
+  // 如果已经在活跃 sessions 中，直接返回状态
+  if (crewSessions.has(sessionId)) {
+    const session = crewSessions.get(sessionId);
+    sendStatusUpdate(session);
+    return;
+  }
+
+  // 从索引获取 sharedDir
+  const index = await loadCrewIndex();
+  const indexEntry = index.find(e => e.sessionId === sessionId);
+  if (!indexEntry) {
+    sendCrewMessage({ type: 'error', sessionId, message: 'Crew session not found in index' });
+    return;
+  }
+
+  // 从 session.json 加载详细元数据
+  const meta = await loadSessionMeta(indexEntry.sharedDir);
+  if (!meta) {
+    sendCrewMessage({ type: 'error', sessionId, message: 'Crew session metadata not found' });
+    return;
+  }
+
+  // 重建 session（跳过 initSharedDir，目录已存在）
+  const roles = meta.roles || [];
+  const decisionMaker = meta.decisionMaker || roles[0]?.name || null;
+  const session = {
+    id: sessionId,
+    projectDir: meta.projectDir,
+    sharedDir: meta.sharedDir || indexEntry.sharedDir,
+    goal: meta.goal,
+    roles: new Map(roles.map(r => [r.name, r])),
+    roleStates: new Map(),
+    decisionMaker,
+    status: 'waiting_human',
+    round: meta.round || 0,
+    maxRounds: meta.maxRounds || 20,
+    costUsd: 0,
+    messageHistory: [],
+    humanMessageQueue: [],
+    waitingHumanContext: null,
+    userId: userId || meta.userId,
+    username: username || meta.username,
+    createdAt: meta.createdAt || Date.now()
+  };
+  crewSessions.set(sessionId, session);
+
+  // 通知 server（复用 crew_session_created）
+  sendCrewMessage({
+    type: 'crew_session_created',
+    sessionId,
+    projectDir: session.projectDir,
+    sharedDir: session.sharedDir,
+    goal: session.goal,
+    roles: roles.map(r => ({
+      name: r.name, displayName: r.displayName, icon: r.icon,
+      description: r.description, isDecisionMaker: r.isDecisionMaker || false
+    })),
+    decisionMaker,
+    maxRounds: session.maxRounds,
+    userId: session.userId,
+    username: session.username
+  });
+  sendStatusUpdate(session);
+
+  // 更新索引和 session.json
+  await upsertCrewIndex(session);
+  await saveSessionMeta(session);
+
+  console.log(`[Crew] Session ${sessionId} resumed, waiting for human input`);
+}
+
 // =====================================================================
 // Session Lifecycle
 // =====================================================================
@@ -104,6 +275,10 @@ export async function createCrewSession(msg) {
   // 发送状态
   sendStatusUpdate(session);
 
+  // 持久化到索引和 session.json
+  await upsertCrewIndex(session);
+  await saveSessionMeta(session);
+
   // 如果有预设角色，启动第一个
   if (roles.length > 0) {
     const firstRole = roles.find(r => r.name === 'pm') || roles[0];
@@ -402,7 +577,7 @@ async function createRoleQuery(session, roleName) {
     cwd: roleCwd,
     permissionMode: 'bypassPermissions',
     abort: abortController.signal,
-    model: role.model || 'sonnet',
+    model: role.model || undefined,
     appendSystemPrompt: systemPrompt
   };
 
@@ -1022,4 +1197,8 @@ function sendStatusUpdate(session) {
       .filter(([, s]) => s.turnActive)
       .map(([name]) => name)
   });
+
+  // 异步更新持久化
+  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/package.json

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

package/service.js

@@ -164,6 +164,7 @@ ExecStart=${nodePath} ${cliPath}
 WorkingDirectory=${config.workDir || homedir()}
 Restart=on-failure
 RestartSec=10
+KillMode=process
 ${envLines.join('\n')}
 Environment=PATH=${nodeBinDir}:${homedir()}/.local/bin:${homedir()}/.npm-global/bin:/usr/local/bin:/usr/bin:/bin