@iamsamyiok/agents-chat 3.19.1 → 3.19.2

package/app/lib/cards.js

@@ -356,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, {
@@ -385,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) {
@@ -403,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 });
@@ -415,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(() => {});
@@ -428,6 +434,7 @@ 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.active.has(cardId)) return { ok: false, error: '任务正在执行中，稍后再追加聊天' };
     if (this.followups.has(cardId)) return { ok: false, error: '该任务已有追加聊天进行中' };
     this.followups.add(cardId);
 
@@ -449,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 = [];
@@ -481,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;});
@@ -560,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); };
 
 // ---- 追加聊天：复用会话第二轮输入 ----
@@ -774,7 +781,7 @@ es.onmessage = (e)=>{
       const log=$('#dLog'); if(log.querySelector('.empty')) log.innerHTML='';
       if(ev.type==='task_start') TEXT_PARTS.clear();
       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); }); }
     }
   }
   // 正文快照独立渲染（不依赖上面的状态事件）
@@ -783,7 +790,7 @@ es.onmessage = (e)=>{
   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.1'; // 与服务端 /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.1'; // 页面与服务端版本互检，不一致提示强刷
+const APP_VERSION = '3.19.2'; // 页面与服务端版本互检，不一致提示强刷
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
@@ -1111,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 = ''; }

package/package.json

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