@iamsamyiok/agents-chat 3.19.0 → 3.19.2

package/app/lib/cards.js

@@ -227,6 +227,8 @@ class CardRunner {
     this.running = false;
     this.timer = null;
     this.procs = new Map(); // cardId -> { pid, child, lastActive, status }
+    this.followups = new Set(); // 追加聊天中的卡牌（并发防护）
+    this.baseline = null; // 本轮编排开始时的 done/failed 基线（all_done 报增量）
   }
   isRunning() { return this.running; }
 
@@ -271,6 +273,9 @@ class CardRunner {
     if (this.running) return;
     this.running = true;
     this.token++;
+    // 记录基线：all_done 时报告本轮增量（成功/失败数），避免混入历史任务
+    const all0 = CardStore.list();
+    this.baseline = { done: all0.filter(c => c.status === 'done').length, failed: all0.filter(c => c.status === 'failed').length };
     broadcast({ type: 'runner_started' });
     this.tick();
   }
@@ -283,9 +288,11 @@ class CardRunner {
     if (!eligible.length) {
       if (this.active.size === 0) {
         this.running = false;
-        // 完成通知附统计（成功/失败数），前端据此提醒
-        const done = all.filter(c => c.status === 'done').length;
-        const failed = all.filter(c => c.status === 'failed').length;
+        // 完成通知附本轮增量统计（成功/失败数），前端据此提醒
+        const all = CardStore.list();
+        const done = Math.max(0, all.filter(c => c.status === 'done').length - (this.baseline ? this.baseline.done : 0));
+        const failed = Math.max(0, all.filter(c => c.status === 'failed').length - (this.baseline ? this.baseline.failed : 0));
+        this.baseline = null;
         broadcast({ type: 'all_done', done, failed });
       }
       return;
@@ -349,6 +356,9 @@ class CardRunner {
     let sesId = ocSessionId;
 
     let child = null;
+    // 进程登记：spawn 前占位（执行中即可见于进程条），spawn 后回填真实 PID
+    this.procs.set(card.id, { pid: null, child: null, lastActive: Date.now() });
+    broadcast({ type: 'proc', cardId: card.id, pid: null });
     try {
       await new Promise((resolve) => {
         child = oc.chatSolo(kind, runner, {
@@ -378,15 +388,15 @@ class CardRunner {
             resolve();
           }
         });
+        // chatSolo 同步返回 child（spawn 已完成）：立即回填真实 PID，执行中即可见于进程条
+        const proc0 = this.procs.get(card.id);
+        if (proc0 && child) { proc0.pid = child.pid; proc0.child = child; }
+        broadcast({ type: 'proc', cardId: card.id, pid: child ? child.pid : null });
       });
     } catch (err) {
       doneError = String((err && err.message) || err).slice(0, 2000);
     }
 
-    // 登记进程信息（PID + 是否工作中），并广播给前端
-    this.procs.set(card.id, { pid: child ? child.pid : null, child, lastActive: Date.now() });
-    broadcast({ type: 'proc', cardId: card.id, pid: child ? child.pid : null });
-
     const finalText = order.map(id => texts.get(id)).join('\n\n').trim();
     const stopped = myToken !== this.token;
     if (finalText) {
@@ -396,8 +406,9 @@ class CardRunner {
     CardStore.update(card.id, {
       status,
       ocSessionId: sesId,
-      result: (doneError ? `执行出错：${doneError}` : finalText).slice(0, 20000),
-      error: doneError || '',
+      // 手动停止回到待执行：清掉残留，避免 pending 卡带着脏结果/错误
+      result: stopped ? '' : (doneError ? `执行出错：${doneError}` : finalText).slice(0, 20000),
+      error: stopped ? '' : (doneError || ''),
       finishedAt: Date.now()
     });
     broadcast({ type: 'task_done', cardId: card.id, status, title: card.title });
@@ -408,6 +419,8 @@ class CardRunner {
   async runOne(cardId) {
     const card = CardStore.get(cardId);
     if (!card || card.status === 'running') return false;
+    // 并发防护：追加聊天进行中的卡不可同时执行（避免同一会话被两条链路并发续写）
+    if (this.followups.has(cardId)) return false;
     this.active.add(cardId);
     const myToken = this.token;
     await this.runCard(card, myToken).catch(() => {});
@@ -421,8 +434,8 @@ class CardRunner {
     const card = CardStore.get(cardId);
     if (!card) return { ok: false, error: '任务不存在' };
     if (card.status === 'running' || card.status === 'pending') return { ok: false, error: '任务尚未执行完成，先运行任务再追加聊天' };
-    if (this.followups && this.followups.has(cardId)) return { ok: false, error: '该任务已有追加聊天进行中' };
-    if (!this.followups) this.followups = new Set();
+    if (this.active.has(cardId)) return { ok: false, error: '任务正在执行中，稍后再追加聊天' };
+    if (this.followups.has(cardId)) return { ok: false, error: '该任务已有追加聊天进行中' };
     this.followups.add(cardId);
 
     const runner = resolveRunner();
@@ -443,6 +456,8 @@ class CardRunner {
       if (!userText) return { ok: false, error: '请输入追加内容' };
       store.addMessage({ role: 'user', agentId: 'solo', agentName: '我', actor: 'user', phase: 'followup', taskId: cardId, content: userText.slice(0, 20000) });
       broadcast({ type: 'followup_start', cardId: cardId });
+      // 进程登记：spawn 前占位，spawn 后回填 PID（追加聊天执行中亦可见于进程条）
+      this.procs.set(cardId, { pid: null, child: null, lastActive: Date.now() });
 
       const texts = new Map();
       const order = [];
@@ -475,9 +490,14 @@ class CardRunner {
               resolve();
             }
           });
+          const proc0 = this.procs.get(cardId);
+          if (proc0 && child) { proc0.pid = child.pid; proc0.child = child; }
+          broadcast({ type: 'proc', cardId, pid: child ? child.pid : null });
         });
       } catch (err) {
         doneError = String((err && err.message) || err).slice(0, 2000);
+      } finally {
+        this.procs.delete(cardId);
       }
 
       const finalText = order.map(id => texts.get(id)).join('\n\n').trim();

package/app/public/cards.html

@@ -525,8 +525,15 @@ function fuSetState(running, tipText){
   btn.textContent = running ? '回复中…' : '发送';
   if(tipText!==undefined) $('#fuTip').textContent = tipText;
 }
+let DETAIL_SEQ = 0; // 详情加载序号：快速切换任务时只认最新请求（响应乱序防护）
 async function openDetail(id){
-  OPEN_ID=id; const data=await api('/api/cards/'+id+'/log'); const card=data.card; const msgs=data.messages||[];
+  if(!id) return;
+  const seq = ++DETAIL_SEQ;
+  OPEN_ID = id;
+  const data = await api('/api/cards/'+encodeURIComponent(id)+'/log');
+  if (seq !== DETAIL_SEQ || OPEN_ID !== id) return; // 已切换到其他任务或关闭弹窗：丢弃过期响应
+  if(!data || !data.success || !data.card){ toast('任务不存在或已被删除'); return; }
+  const card=data.card; const msgs=data.messages||[];
   $('#dTitle').textContent=card.title;
   $('#dMeta').innerHTML=badge(card)+`<span class="badge">${card.status}</span>`;
   const depTitles = (card.dependsOn||[]).map(d=>{const c=CARDS.find(x=>x.id===d);return c?c.title:d;});
@@ -540,6 +547,8 @@ async function openDetail(id){
   if(!msgs.length) log.innerHTML='<span class="empty">暂无过程记录</span>';
   for(const m of msgs){
     if(m.role==='user') appendLog(log,'👤 '+m.content,'msg-user');
+    else if(m.phase==='archive') appendLog(log,'📦 '+m.content,'msg-tool');
+    else if(m.phase==='system') appendLog(log,'⚠ '+m.content,'msg-err');
     else if(/工具|执行完成/.test(m.content||'')) appendLog(log,'🔧 '+m.content,'msg-tool');
     else if(/出错|失败/.test(m.content||'')) appendLog(log,'⚠ '+m.content,'msg-err');
     else appendLog(log,'🤖 '+(m.content||'').slice(0,4000),'msg-assistant');
@@ -558,7 +567,7 @@ async function openDetail(id){
   fuSetState(FU_RUNNING);
   $('#maskDetail').classList.add('show');
 }
-$('#dClose').onclick=()=>{ OPEN_ID=null; $('#maskDetail').classList.remove('show'); };
+$('#dClose').onclick=()=>{ OPEN_ID=null; DETAIL_SEQ++; $('#maskDetail').classList.remove('show'); };
 $('#dRun').onclick=async()=>{ if(!OPEN_ID)return; await runOne(OPEN_ID); openDetail(OPEN_ID); };
 
 // ---- 追加聊天：复用会话第二轮输入 ----
@@ -586,7 +595,7 @@ let G_SIG=''; // 结构+状态指纹：无变化时跳过重绘（避免流式
 function renderGraph(force){
   const box=$('#graphBody');
   const cards=CARDS;
-  const sig=cards.map(c=>c.id+':'+c.status+':'+(c.dependsOn||[]).join(',')).join('|');
+  const sig=cards.map(c=>c.id+':'+c.status+':'+(c.dependsOn||[]).join(',')+':'+c.title+':'+c.mode).join('|');
   if(!force && sig===G_SIG && box.querySelector('svg')) return;
   G_SIG=sig;
   if(!cards.length){ box.innerHTML='<div class="empty" style="padding:24px 8px">暂无任务<br/>新建任务后此处展示依赖关系</div>'; return; }
@@ -764,22 +773,24 @@ es.onmessage = (e)=>{
   }
   if(ev.type==='ws_warning'){ toast('⚠ 工作区路径无效：'+ev.path+'，任务将在默认目录执行'); }
   if(ev.type==='followup_start'||ev.type==='followup_done'){ loadCards(); }
-  if(['task_start','text','tool','task_done','proc'].includes(ev.type)){
+  // text 为正文快照（不改变卡片状态）：仅实时渲染，不触发全量刷新，避免流式期间频繁重建 DOM
+  if(['task_start','tool','task_done','proc'].includes(ev.type)){
     loadCards();
     refreshProcs();
     if(OPEN_ID && ev.cardId===OPEN_ID){
       const log=$('#dLog'); if(log.querySelector('.empty')) log.innerHTML='';
       if(ev.type==='task_start') TEXT_PARTS.clear();
-      if(ev.type==='text') renderSnapText(ev);
       else if(ev.type==='tool'){ appendLog(log,'🔧 ['+ev.name+'] '+(ev.summary||''),'msg-tool'); log.scrollTop=log.scrollHeight; }
-      else if(ev.type==='task_done'){ loadCards().then(()=>openDetail(OPEN_ID)); }
+      else if(ev.type==='task_done'){ loadCards().then(()=>{ if(OPEN_ID===ev.cardId) openDetail(ev.cardId); }); }
     }
   }
+  // 正文快照独立渲染（不依赖上面的状态事件）
+  if(ev.type==='text' && OPEN_ID===ev.cardId) renderSnapText(ev);
   if(ev.type==='followup_start' && OPEN_ID===ev.cardId) TEXT_PARTS.clear();
   if(ev.type==='followup_done' && OPEN_ID===ev.cardId){
     fuSetState(false);
     if(ev.error){ appendLog($('#dLog'),'⚠ '+ev.error,'msg-err'); toast('追加聊天失败：'+errSummary(ev.error)); }
-    loadCards().then(()=>openDetail(OPEN_ID));
+    loadCards().then(()=>{ if(OPEN_ID===ev.cardId) openDetail(ev.cardId); });
   }
 };
 es.onerror=()=>{};

package/app/public/index.html

@@ -634,7 +634,7 @@
 </div>
 
 <script>
-const PAGE_VERSION = '3.19.0'; // 与服务端 /api/health.version 互检，不一致说明页面缓存过期
+const PAGE_VERSION = '3.19.2'; // 与服务端 /api/health.version 互检，不一致说明页面缓存过期
 const AV_COLORS = ['#5b8def','#07c160','#fa9d3b','#10aeff','#8a6fe8','#fa5151','#e8a33d','#3aa7a3'];
 const PHASE_LABEL = { plan: '调度规划', work: '执行', review: '验收', report: '汇总', talk: '圆桌发言', task: '任务执行' };
 // 职业图标库（智能体配置可选）

package/app/server.js

@@ -1,6 +1,6 @@
 // Agents Chat Portable - 零依赖 HTTP 服务
 // 启动：node app/server.js [--port 3456]
-const APP_VERSION = '3.19.0'; // 页面与服务端版本互检，不一致提示强刷
+const APP_VERSION = '3.19.2'; // 页面与服务端版本互检，不一致提示强刷
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
@@ -968,22 +968,24 @@ const server = http.createServer(async (req, res) => {
   }
   if (p === '/api/cards/config' && req.method === 'POST') {
     const body = await readBody(req);
-    const cfg = CardStore.setConfig({ workspace: String(body.workspace || '').trim().slice(0, 500) });
-    // 工作区校验：保存允许（可能是尚未创建的目录），但路径不存在时显式警告
-    let warning = '';
-    const ws = (cfg.workspace || '').trim();
-    if (body.workspace !== undefined && ws) {
-      try { if (!fs.existsSync(ws) || !fs.statSync(ws).isDirectory()) warning = `工作区路径当前不存在或不是目录：${ws}，任务执行时将回退到默认目录`; } catch { warning = `工作区路径无法访问：${ws}`; }
-    }
-    // 并行度（1-8）：热更新，调度器每轮 tick 动态读取
+    // 按 patch 语义合并：仅写入请求中显式出现的字段（避免单项更新时清空另一项）
+    const patch = {};
+    if (body.workspace !== undefined) patch.workspace = String(body.workspace || '').trim().slice(0, 500);
     let parallelBad = false;
     if (body.maxParallel !== undefined) {
       const n = Number(body.maxParallel);
-      if (n >= 1 && n <= 8) CardStore.setConfig({ maxParallel: Math.floor(n) });
+      if (n >= 1 && n <= 8) patch.maxParallel = Math.floor(n);
       else parallelBad = true;
     }
     if (parallelBad) { json(res, 400, { success: false, error: 'maxParallel 需在 1-8 之间' }); return; }
-    json(res, 200, { success: true, config: CardStore.getConfig(), warning });
+    const cfg = Object.keys(patch).length ? CardStore.setConfig(patch) : CardStore.getConfig();
+    // 工作区校验：保存允许（可能是尚未创建的目录），但路径不存在时显式警告
+    let warning = '';
+    const ws = (cfg.workspace || '').trim();
+    if (patch.workspace !== undefined && ws) {
+      try { if (!fs.existsSync(ws) || !fs.statSync(ws).isDirectory()) warning = `工作区路径当前不存在或不是目录：${ws}，任务执行时将回退到默认目录`; } catch { warning = `工作区路径无法访问：${ws}`; }
+    }
+    json(res, 200, { success: true, config: cfg, warning });
     return;
   }
 
@@ -1109,9 +1111,9 @@ const server = http.createServer(async (req, res) => {
     if (body.title !== undefined) patch.title = String(body.title).slice(0, 500);
     if (body.content !== undefined) patch.content = String(body.content).slice(0, 20000);
     if (body.priority !== undefined) patch.priority = Number(body.priority) || 999;
-    if (body.mode !== undefined) patch.mode = body.mode;
-    if (body.chainId !== undefined) patch.chainId = body.chainId;
-    if (Array.isArray(body.dependsOn)) patch.dependsOn = body.dependsOn.map(String);
+    if (body.mode !== undefined) patch.mode = ['new', 'continue', 'parallel'].includes(body.mode) ? body.mode : 'new';
+    if (body.chainId !== undefined) patch.chainId = String(body.chainId).slice(0, 100);
+    if (Array.isArray(body.dependsOn)) patch.dependsOn = body.dependsOn.map(String).slice(0, 50);
     if (body.model !== undefined) patch.model = String(body.model).slice(0, 80);
     // 状态手动复位：failed/pending -> pending 可重跑
     if (body.status === 'pending') { patch.status = 'pending'; patch.result = ''; patch.error = ''; patch.ocSessionId = ''; }
@@ -1152,7 +1154,7 @@ const server = http.createServer(async (req, res) => {
     // SSE：实时推送卡牌生命周期事件（task_start/text/tool/task_done/all_done/runner_*）
     const send = sse(req, res);
     const unsub = sseSubscribe(send);
-    send({ type: 'init', running: cardRunner.isRunning(), maxParallel: MAX_PARALLEL });
+    send({ type: 'init', running: cardRunner.isRunning(), maxParallel: cardRunner.maxP() });
     req.on('close', unsub);
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamsamyiok/agents-chat",
-  "version": "3.19.0",
+  "version": "3.19.2",
   "description": "多智能体群聊工具 - 支持 OpenCode/Claude Code/Codex/pi 内核，微信风格聊天界面",
   "main": "lib/start.js",
   "bin": {