@iamsamyiok/agents-chat 3.30.0 → 3.32.0

package/app/server.js

@@ -2,6 +2,7 @@
 // 启动：node app/server.js [--port 3456]
 const APP_VERSION = require('../package.json').version; // 单源版本：与 package.json 始终一致（页面互检/更新检查共用）
 const { checkLatest, UPDATE_COMMAND } = require('./lib/updatecheck');
+const { notifyDone } = require('./lib/notify');
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
@@ -326,6 +327,11 @@ const server = http.createServer(async (req, res) => {
     serveStatic(res, path.join(PUBLIC_DIR, 'cards.html'));
     return;
   }
+  if (req.method === 'GET' && p === '/manifest.json') {
+    // PWA 清单（添加到主屏幕/手机访问）
+    serveStatic(res, path.join(PUBLIC_DIR, 'manifest.json'));
+    return;
+  }
   if (req.method === 'GET' && p.startsWith('/static/')) {
     const safe = path.normalize(p.slice('/static/'.length)).replace(/^(\.\.[/\\])+/, '');
     serveStatic(res, path.join(PUBLIC_DIR, safe));
@@ -360,6 +366,30 @@ const server = http.createServer(async (req, res) => {
     return;
   }
 
+  // ---------- 历史检索 / 用量 / 空间 ----------
+  if (p === '/api/search' && req.method === 'GET') {
+    const q = String(parsed.query.q || '');
+    const limit = Math.min(200, Math.max(1, Number(parsed.query.limit) || 50));
+    json(res, 200, { success: true, results: store.searchMessages(q, { limit }) });
+    return;
+  }
+  if (p === '/api/usage' && req.method === 'GET') {
+    json(res, 200, { success: true, usage: store.getUsageStats() });
+    return;
+  }
+  if (p === '/api/data/stats' && req.method === 'GET') {
+    json(res, 200, { success: true, stats: store.dataStats(), dataDir: store.DATA_DIR });
+    return;
+  }
+  if (p === '/api/data/prune' && req.method === 'POST') {
+    // 手动清理：与每日自动清理同一套逻辑（已完结任务/过期会话/产出存档等），返回各项清理量
+    const body = await readBody(req);
+    const days = Math.max(1, Number(body.days) || PRUNE_DAYS);
+    const stat = store.pruneOldData(days);
+    json(res, 200, { success: true, days, stat });
+    return;
+  }
+
   if (p === '/api/stop' && req.method === 'POST') {
     // 手动停止：kill 对应作用域的全部子进程；编排循环检测令牌后跳过剩余工作
     const body = await readBody(req);
@@ -599,8 +629,18 @@ const server = http.createServer(async (req, res) => {
     }
     const mode = body.mode === 'scheduled' ? 'scheduled' : 'sequential';
     const runner = body.runner === 'solo' ? 'solo' : '';
-    const { added, warnings } = store.importTasks(body.text, mode, runner, body.model);
-    json(res, 200, { success: true, added, warnings, mode, runner, tasks: store.getTasks() });
+    const { added, warnings, addedTasks } = store.importTasks(body.text, mode, runner, body.model);
+    // Git 隔离执行：为每个新任务创建独立 worktree（工作目录是 git 仓库时生效）
+    let isolated = 0;
+    if (body.isolated && Array.isArray(addedTasks)) {
+      const worktree = require('./lib/worktree');
+      for (const t of addedTasks) {
+        const wt = await worktree.createForTask(t.id);
+        if (wt) { store.updateTask(t.id, { worktree: wt }); isolated++; }
+      }
+      if (!isolated) warnings.push('统一工作目录不是 Git 仓库（或没有任何提交），任务将按共享目录执行');
+    }
+    json(res, 200, { success: true, added, warnings, mode, runner, isolated, tasks: store.getTasks() });
     return;
   }
 
@@ -617,14 +657,62 @@ const server = http.createServer(async (req, res) => {
   }
 
   if (p === '/api/tasks/delete' && req.method === 'POST') {
-    // 删除任务及其会话消息
+    // 删除任务及其会话消息；Git 隔离区一并清理
     const body = await readBody(req);
     if (!body.id) { json(res, 400, { success: false, error: 'id 不能为空' }); return; }
+    const t = store.getTasks().find(x => x.id === String(body.id));
+    if (t && t.worktree) {
+      require('./lib/worktree').removeForTask(t.worktree).catch(() => {});
+    }
     store.deleteTask(String(body.id));
     json(res, 200, { success: true, tasks: store.getTasks() });
     return;
   }
 
+  // ---------- Git 隔离区：改动查看 / 合并 / 丢弃 ----------
+  if (p === '/api/tasks/diff' && req.method === 'GET') {
+    const t = store.getTasks().find(x => x.id === String(parsed.query.id || ''));
+    if (!t || !t.worktree) { json(res, 404, { success: false, error: '任务不存在或无隔离区' }); return; }
+    try {
+      const d = await require('./lib/worktree').diff(t.worktree, { withPatch: true });
+      json(res, 200, { success: true, task: { id: t.id, title: t.title, status: t.status }, diff: d });
+    } catch (e) {
+      json(res, 500, { success: false, error: String((e && e.message) || e) });
+    }
+    return;
+  }
+
+  if (p === '/api/tasks/merge' && req.method === 'POST') {
+    const body = await readBody(req);
+    const t = store.getTasks().find(x => x.id === String(body.id || ''));
+    if (!t || !t.worktree) { json(res, 404, { success: false, error: '任务不存在或无隔离区' }); return; }
+    if (runLocks.tasks) { json(res, 409, { success: false, error: '任务批次执行中，暂不能合并' }); return; }
+    try {
+      const r = await require('./lib/worktree').mergeToMain(t.worktree, t.title);
+      if (r.ok) store.updateTask(t.id, { mergedAt: Date.now() });
+      json(res, 200, { success: r.ok, already: !!r.already, error: r.error || '' });
+    } catch (e) {
+      json(res, 500, { success: false, error: String((e && e.message) || e) });
+    }
+    return;
+  }
+
+  if (p === '/api/tasks/discard' && req.method === 'POST') {
+    // 丢弃隔离区：删除 worktree 与分支，任务保留（可重跑重建）
+    const body = await readBody(req);
+    const t = store.getTasks().find(x => x.id === String(body.id || ''));
+    if (!t || !t.worktree) { json(res, 404, { success: false, error: '任务不存在或无隔离区' }); return; }
+    if (runLocks.tasks) { json(res, 409, { success: false, error: '任务批次执行中，暂不能丢弃' }); return; }
+    try {
+      const r = await require('./lib/worktree').removeForTask(t.worktree);
+      if (r.ok) store.updateTask(t.id, { worktree: null });
+      json(res, 200, { success: r.ok, error: r.error || '' });
+    } catch (e) {
+      json(res, 500, { success: false, error: String((e && e.message) || e) });
+    }
+    return;
+  }
+
   if (p === '/api/tasks/run' && req.method === 'POST') {
     // 顺序执行任务：scope='solo' 时由 OpenCode 单体逐个执行（每个任务独立一次性对话）；
     // 默认（群聊）每个任务 = 独立会话 + 一次完整管家调度
@@ -656,6 +744,8 @@ const server = http.createServer(async (req, res) => {
       } else {
         await executeTaskBatch(selected, send, myToken);
       }
+      // 群聊批次整体完成通知（单任务通知由 orchestrator 消息流承担，批次级聚合在此）
+      notifyDone({ kind: 'batch', title: `${soloScope ? '单聊' : '群聊'}任务批次（${selected.length} 个）`, status: 'done', snippet: selected.map(t => t.title).join('、') });
     } catch (err) {
       console.error('[tasks/run] 编排异常:', err && (err.stack || err));
       send({ type: 'error', content: `任务编排异常：${err && err.message || err}` });
@@ -1282,6 +1372,10 @@ function shutdown(code) {
   process.exit(code);
 }
 process.on('SIGINT', () => shutdown(0));
+// 兜底：async 路由内的同步异常会以 unhandledRejection 形式出现——记录日志防静默丢错（请求层应自行捕获）
+process.on('unhandledRejection', (err) => {
+  console.error('[unhandledRejection]', err && (err.stack || err));
+});
 process.on('SIGTERM', () => shutdown(0));
 // Windows 关闭控制台窗口（CTRL_CLOSE_EVENT）在 Node 上映射为 SIGHUP，系统给约 5 秒处理宽限：
 // 同步 killTree 足够完成，正在执行的 AI 子进程不再变孤儿
@@ -1308,7 +1402,7 @@ async function executeTaskBatch(selected, send, myToken) {
   const persist = (m) => store.addMessage({ ...m, timestamp: new Date().toISOString() });
   await runTasks(
     selected, butler, subAgents,
-    { getHistory: (tid) => buildHistoryText(tid), resolveAssign, scope: 'tasks', isStopped: () => stopTokens.tasks !== myToken, approval: approvalSetting(), requestApproval: makeRequestApproval() },
+    { getHistory: (tid) => buildHistoryText(tid), resolveAssign, scope: 'tasks', isStopped: () => stopTokens.tasks !== myToken, approval: approvalSetting(), requestApproval: makeRequestApproval(), taskCwd: (task) => (task.worktree && task.worktree.dir) || '' },
     send, persist,
     // 任务会话首条消息：任务本身（用户视角）
     (task) => {
@@ -1353,6 +1447,7 @@ async function executeSoloTaskBatch(selected, send, myToken) {
     if (runner.kind === 'missing') {
       store.updateTask(task.id, { status: 'failed', result: missingHint(runner).slice(0, 2000) });
       send({ type: 'task_done', taskId: task.id, title: task.title, status: 'failed' });
+      notifyDone({ kind: 'task', title: task.title, status: 'failed', snippet: missingHint(runner) });
       return '';
     }
 
@@ -1360,7 +1455,11 @@ async function executeSoloTaskBatch(selected, send, myToken) {
     const order = [];
     let doneError = '';
     let sesId = ocSessionId || '';
-    await new Promise((resolve) => {
+    // 任务隔离 worktree：整任务执行期间注入 cwd 上下文（ALS，与并发请求互不干扰）
+    const worktreeMod = require('./lib/worktree');
+    const wtDir = task.worktree && task.worktree.dir ? task.worktree.dir : '';
+    if (wtDir) send({ type: 'notice', content: `🌿 本任务在 Git 隔离区执行：${wtDir}`, taskId: task.id });
+    await worktreeMod.runWithTaskCwd(wtDir, () => new Promise((resolve) => {
       const kind = runner.kind === 'demo' ? 'demo' : (runner.kind === 'opencode' ? 'opencode' : 'fallback');
       oc.chatSolo(kind, runner, {
         prompt: cont
@@ -1385,7 +1484,7 @@ async function executeSoloTaskBatch(selected, send, myToken) {
           resolve();
         }
       });
-    });
+    }));
 
     const finalText = order.map(id => texts.get(id)).join('\n\n').trim();
     if (finalText) {
@@ -1397,6 +1496,7 @@ async function executeSoloTaskBatch(selected, send, myToken) {
       result: (doneError ? `执行出错：${doneError}` : finalText).slice(0, 2000)
     });
     send({ type: 'task_done', taskId: task.id, title: task.title, status: stopped ? 'pending' : (doneError ? 'failed' : 'done') });
+    notifyDone({ kind: 'task', title: task.title, status: doneError ? 'failed' : 'done', snippet: finalText || doneError });
     return stopped ? '' : sesId;
   };
 
@@ -1430,12 +1530,19 @@ async function executeSoloTaskBatch(selected, send, myToken) {
 // 执行过程照常持久化到对应任务会话，用户打开会话即可查看全过程
 const SCHED_INTERVAL_MS = 15000;
 function startScheduler() {
+  let firstScan = true; // 启动首扫：识别停机期间错过的定时任务并说明补跑
   const timer = setInterval(() => {
     if (runLocks.tasks) return; // 手动批次执行中，下轮再查
     if (store.getSchedEnabled() === false) return; // 用户关闭了定时调度总开关
+    const now = Date.now();
     const due = store.getTasks().filter(t =>
-      t.kind === 'scheduled' && t.status === 'pending' && t.scheduledAt && t.scheduledAt <= Date.now());
-    if (!due.length) return;
+      t.kind === 'scheduled' && t.status === 'pending' && t.scheduledAt && t.scheduledAt <= now);
+    if (!due.length) { firstScan = false; return; }
+    const missed = due.filter(t => now - t.scheduledAt > 60000); // 触发点已过 1 分钟以上 = 停机期间错过
+    if (firstScan && missed.length) {
+      console.log(`[scheduler] 检测到 ${missed.length} 个停机期间错过的定时任务，将立即补跑：${missed.map(t => t.title).join('、')}`);
+    }
+    firstScan = false;
     runLocks.tasks = true;
     const myToken = stopTokens.tasks;
     console.log(`[scheduler] 定时触发 ${due.length} 个任务：${due.map(t => t.title).join('、')}`);
@@ -1458,6 +1565,10 @@ const PRUNE_DAYS = Number(process.env.AGENTS_CHAT_PRUNE_DAYS) > 0 ? Number(proce
 function pruneOldDataQuiet() {
   try {
     const stat = store.pruneOldData(PRUNE_DAYS);
+    // Git 隔离区同步治理：无主（任务已删）或完结超期的 worktree 一并清理
+    require('./lib/worktree').pruneStale(PRUNE_DAYS, store.getTasks())
+      .then(ws => { if (ws.worktrees) { stat.worktrees = ws.worktrees; console.log('[maintenance] 清理过期 Git 隔离区:', ws.worktrees); } })
+      .catch(() => {});
     const touched = Object.values(stat).reduce((a, b) => a + b, 0);
     if (touched) console.log(`[maintenance] 自动清理超 ${PRUNE_DAYS} 天的历史数据：`, JSON.stringify(stat));
   } catch (e) { console.error('[maintenance] 自动清理失败:', e && (e.message || e)); }

package/bin/agents-chat.js

@@ -275,6 +275,104 @@ function showVersion() {
   console.log(`agents-chat v${PKG.version}`);
 }
 
+// ---------- 开机自启（定时任务抗重启）----------
+// Windows: HKCU Run 键 + VBS 静默启动（无黑窗闪烁）；exe 形态直接注册 exe 路径
+// macOS:   ~/Library/LaunchAgents/com.agents-chat.plist（登录即拉起）
+// Linux:   crontab @reboot 行
+const AUTOSTART_KEY = 'AgentsChat';
+function autostartTarget() {
+  // 单文件 exe：直接跑 exe（已无窗口）；npm 形态：VBS 静默执行 agents-chat start
+  if (process.env.AGENTS_CHAT_STANDALONE === '1' || process.versions.bun) {
+    return { kind: 'exe', cmd: `"${process.execPath}"` };
+  }
+  return { kind: 'npm', cmd: null };
+}
+function autostartOn() {
+  const t = autostartTarget();
+  const home = os.homedir();
+  if (process.platform === 'win32') {
+    const run = t.kind === 'exe'
+      ? t.cmd
+      : `wscript.exe "${path.join(home, '.agents-chat', 'autostart.vbs')}"`;
+    if (t.kind === 'npm') {
+      fs.mkdirSync(path.join(home, '.agents-chat'), { recursive: true });
+      // 0 = 隐藏窗口；npm bin 已在用户 PATH（npm 安装时配置）， explorer 启动的进程可继承
+      fs.writeFileSync(path.join(home, '.agents-chat', 'autostart.vbs'),
+        `CreateObject("Wscript.Shell").Run "cmd /c agents-chat start", 0, False\r\n`);
+    }
+    execSync(`reg add "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" /v ${AUTOSTART_KEY} /t REG_SZ /d "${run}" /f`, { stdio: 'ignore' });
+    console.log('✓ 开机自启已开启（当前用户级，无需管理员）');
+  } else if (process.platform === 'darwin') {
+    const plist = path.join(home, 'Library', 'LaunchAgents', 'com.agents-chat.plist');
+    fs.mkdirSync(path.dirname(plist), { recursive: true });
+    const exe = t.kind === 'exe' ? process.execPath : process.execPath;
+    const arg = t.kind === 'exe' ? [] : [path.join(__dirname, '..', 'app', 'server.js'), '--port', String(PORT)];
+    const envData = `  <key>EnvironmentVariables</key>\n  <dict><key>AGENTS_CHAT_DATA</key><string>${DATA_DIR}</string></dict>`;
+    fs.writeFileSync(plist, `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0"><dict>
+  <key>Label</key><string>com.agents-chat</string>
+  <key>ProgramArguments</key>
+  <array><string>${exe}</string>${arg.map(a => `<string>${a}</string>`).join('')}</array>
+  ${envData}
+  <key>RunAtLoad</key><true/>
+  <key>StandardOutPath</key><string>${path.join(home, '.agents-chat', 'autostart.log')}</string>
+  <key>StandardErrorPath</key><string>${path.join(home, '.agents-chat', 'autostart.log')}</string>
+</dict></plist>`);
+    try { execSync(`launchctl unload "${plist}" 2>/dev/null; launchctl load "${plist}"`); } catch { /* 下次登录生效 */ }
+    console.log('✓ 开机自启已开启（LaunchAgent，登录即启动）');
+  } else {
+    // Linux: crontab @reboot
+    let cron = '';
+    try { cron = execSync('crontab -l', { stdio: ['pipe', 'pipe', 'ignore'] }).toString(); } catch { /* 无 crontab */ }
+    const line = t.kind === 'exe'
+      ? `@reboot ${process.execPath}`
+      : `@reboot ${process.execPath} ${path.join(__dirname, '..', 'app', 'server.js')} --port ${PORT}`;
+    if (cron.includes(AUTOSTART_KEY)) {
+      cron = cron.split('\n').filter(l => l && !l.includes(AUTOSTART_KEY)).join('\n');
+    }
+    cron = (cron ? cron.trimEnd() + '\n' : '') + `${line} # ${AUTOSTART_KEY} env AGENTS_CHAT_DATA=${DATA_DIR}`;
+    // @reboot 行无法带 env 前缀于部分 cron 实现，数据目录路径直接写进 server 启动参数不可行时靠默认 ~/.agents-chat
+    execSync('crontab -', { input: cron.replace(/ # [^\n]*/, '') + '\n' });
+    console.log('✓ 开机自启已开启（crontab @reboot，数据目录 ~/.agents-chat）');
+  }
+  console.log('关闭方式: agents-chat autostart off');
+}
+function autostartOff() {
+  try {
+    if (process.platform === 'win32') {
+      execSync(`reg delete "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" /v ${AUTOSTART_KEY} /f`, { stdio: 'ignore' });
+    } else if (process.platform === 'darwin') {
+      const plist = path.join(os.homedir(), 'Library', 'LaunchAgents', 'com.agents-chat.plist');
+      try { execSync(`launchctl unload "${plist}"`); } catch { /* ignore */ }
+      fs.unlinkSync(plist);
+    } else {
+      let cron = '';
+      try { cron = execSync('crontab -l', { stdio: ['pipe', 'pipe', 'ignore'] }).toString(); } catch { }
+      const kept = cron.split('\n').filter(l => l && !(l.includes('@reboot') && (l.includes('app/server.js') || l.includes('agents-chat'))));
+      execSync('crontab -', { input: kept.join('\n') + (kept.length ? '\n' : '') });
+    }
+    console.log('✓ 开机自启已关闭');
+  } catch (err) {
+    console.error('关闭失败:', err.message);
+  }
+}
+function autostartStatus() {
+  try {
+    if (process.platform === 'win32') {
+      execSync(`reg query "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" /v ${AUTOSTART_KEY}`, { stdio: 'pipe' });
+    } else if (process.platform === 'darwin') {
+      fs.accessSync(path.join(os.homedir(), 'Library', 'LaunchAgents', 'com.agents-chat.plist'));
+    } else {
+      const cron = execSync('crontab -l', { stdio: ['pipe', 'pipe', 'ignore'] }).toString();
+      if (!/@reboot.*agents-chat|@reboot.*app\/server\.js/.test(cron)) throw new Error('not set');
+    }
+    console.log('开机自启: 已开启');
+  } catch {
+    console.log('开机自启: 未开启（agents-chat autostart on 开启）');
+  }
+}
+
 // 主逻辑
 const command = process.argv[2] || 'start';
 
@@ -301,6 +399,12 @@ switch (command) {
   case '--version':
     showVersion();
     break;
+  case 'autostart':
+    if (process.argv[3] === 'off') autostartOff();
+    else if (process.argv[3] === 'status' || !process.argv[3]) autostartStatus();
+    else if (process.argv[3] === 'on') autostartOn();
+    else { console.error('用法: agents-chat autostart on|off|status'); process.exit(1); }
+    break;
   case 'help':
   case '--help':
   case '-h':
@@ -315,6 +419,9 @@ Agents Chat CLI v${PKG.version}
   agents-chat open       仅打开浏览器
   agents-chat update     检查并一键升级到 npm 最新版
   agents-chat version    查看当前版本
+  agents-chat autostart on|off|status
+                         开机自启管理（定时任务抗机器重启，Windows 用户级注册表/
+                         macOS LaunchAgent/Linux crontab）
 
 环境变量:
   AGENTS_CHAT_PORT     端口号 (默认: 3456)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamsamyiok/agents-chat",
-  "version": "3.30.0",
+  "version": "3.32.0",
   "description": "多智能体群聊工具 - 支持 OpenCode/Claude Code/Codex/pi 内核，微信风格聊天界面",
   "main": "lib/start.js",
   "bin": {
@@ -10,7 +10,8 @@
     "bin",
     "lib",
     "app",
-    "scripts"
+    "scripts",
+    ".env.example"
   ],
   "keywords": [
     "ai",
@@ -35,7 +36,7 @@
   "homepage": "https://github.com/iamsamyiok/agents-chat",
   "scripts": {
     "start": "node app/server.js",
-    "test": "node --test \"test/*.test.js\"",
+    "test": "node --test --test-force-exit \"test/*.test.js\"",
     "build:exe": "node scripts/build-exe.js",
     "postinstall": "node scripts/postinstall.js"
   }

package/scripts/build-exe.js

@@ -30,10 +30,10 @@ for (const t of targets) {
   }
 }
 
-// 1. 生成内嵌资源模块（HTML → JSON 字符串常量，杜绝转义问题）
+// 1. 生成内嵌资源模块（HTML/JSON/SVG → JSON 字符串常量，杜绝转义问题）
 const assets = {};
 for (const f of fs.readdirSync(PUB)) {
-  if (f.endsWith('.html')) assets[f] = fs.readFileSync(path.join(PUB, f), 'utf8');
+  if (/\.(html|json|svg)$/.test(f)) assets[f] = fs.readFileSync(path.join(PUB, f), 'utf8');
 }
 fs.writeFileSync(EMBED, [
   '// 本文件由 scripts/build-exe.js 构建时自动生成，勿手工编辑、勿提交仓库',
@@ -71,4 +71,15 @@ if (failed.length) {
   console.error(`失败平台: ${failed.join(', ')}`);
   process.exit(1);
 }
+
+// 4. 生成校验清单（Release 附上，供核对下载完整性；exe 未签名场景尤为重要）
+const { createHash } = require('crypto');
+const lines = [];
+for (const f of fs.readdirSync(DIST).sort()) {
+  const fp = path.join(DIST, f);
+  const h = createHash('sha256').update(fs.readFileSync(fp)).digest('hex');
+  lines.push(`${h}  ${f}`);
+}
+fs.writeFileSync(path.join(DIST, 'checksums.txt'), lines.join('\n') + '\n');
+console.log('校验清单: dist/checksums.txt');
 console.log('全部构建完成');