@iamsamyiok/agents-chat 3.19.1 → 3.20.0

package/app/lib/cards.js

@@ -209,6 +209,24 @@ function isEligible(card, all) {
   return true;
 }
 
+// 环检测：把 cardId 的依赖改为 newDeps 后，沿依赖边 DFS 是否能回到 cardId 自身
+// 用于 PUT 写入拦截（间接环也拦截，如 A→B→C→A）
+function wouldCycle(cardId, newDeps) {
+  const all = CardStore.list();
+  const byId = new Map(all.filter(c => c.id !== cardId).map(c => [c.id, c]));
+  const seen = new Set();
+  const stack = [...(newDeps || [])];
+  while (stack.length) {
+    const cur = stack.pop();
+    if (cur === cardId) return true;
+    if (seen.has(cur)) continue;
+    seen.add(cur);
+    const c = byId.get(cur);
+    if (c) stack.push(...(c.dependsOn || []));
+  }
+  return false;
+}
+
 function pickEligible(all, activeIds) {
   const eligible = all.filter(c => isEligible(c, all) && !activeIds.has(c.id));
   eligible.sort((a, b) => {
@@ -356,6 +374,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 +406,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 +424,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 +437,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 +452,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 +474,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 +508,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();
@@ -515,4 +547,4 @@ function isValidDir(p) {
 
 const runner = new CardRunner();
 
-module.exports = { CardStore, CardRunner, runner, sseSubscribe, buildCardPrompt, isEligible, pickEligible, MAX_PARALLEL, CARDS_PATH, CARDS_CFG_PATH };
+module.exports = { CardStore, CardRunner, runner, sseSubscribe, buildCardPrompt, isEligible, pickEligible, wouldCycle, MAX_PARALLEL, CARDS_PATH, CARDS_CFG_PATH };

package/app/public/cards.html

@@ -310,10 +310,20 @@ function errSummary(err){
   if(!err) return '';
   return String(err).split('\n').map(s=>s.trim()).filter(Boolean)[0] || '';
 }
-// 依赖阻塞判定：pending 卡的依赖存在未完成（等待）或已失败（阻塞）
+// 依赖阻塞判定：pending 卡的依赖存在未完成（等待）或已失败（阻塞）；依赖链成环时明确提示
 function blockedInfo(card){
   if(card.status!=='pending' || !(card.dependsOn&&card.dependsOn.length)) return null;
   const byId=Object.fromEntries(CARDS.map(c=>[c.id,c]));
+  // 环检测：沿依赖边 DFS，回到自身即成环（历史数据兜底，正常写入已被服务端拦截）
+  const seen=new Set(), stack=[...card.dependsOn];
+  while(stack.length){
+    const cur=stack.pop();
+    if(cur===card.id) return {kind:'fail',text:'循环依赖：依赖链最终依赖本任务，全量执行时将被跳过'};
+    if(seen.has(cur)) continue;
+    seen.add(cur);
+    const c=byId[cur];
+    if(c) stack.push(...(c.dependsOn||[]));
+  }
   const failedDeps=[], waitDeps=[];
   for(const d of card.dependsOn){
     const dc=byId[d];
@@ -525,8 +535,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 +577,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 +791,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 +800,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.20.0'; // 与服务端 /api/health.version 互检，不一致说明页面缓存过期
 const AV_COLORS = ['#5b8def','#07c160','#fa9d3b','#10aeff','#8a6fe8','#fa5151','#e8a33d','#3aa7a3'];
 const PHASE_LABEL = { plan: '调度规划', work: '执行', review: '验收', report: '汇总', talk: '圆桌发言', task: '任务执行' };
 // 职业图标库（智能体配置可选）
@@ -2319,7 +2319,6 @@ async function doImport() {
     (data.warnings || []).forEach(w => chatMode === 'solo' ? addSoloSys('⚠ ' + w) : addSys('⚠ ' + w));
     closeImport();
     importText.value = '';
-    if (importMode === 'scheduled' && schedOpen) renderSchedList();
   } else toast(data.error || '导入失败');
 }
 

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.20.0'; // 页面与服务端版本互检，不一致提示强刷
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
@@ -38,7 +38,7 @@ const { runAgent, stopScope, stopAllChildren } = require('./lib/agent');
 const { runButler, runMentioned, runRoundtable, runTasks, prepareRerun } = require('./lib/orchestrator');
 const oc = require('./lib/oc');
 const memoryMod = require('./lib/memory');
-const { CardStore, runner: cardRunner, sseSubscribe, MAX_PARALLEL } = require('./lib/cards');
+const { CardStore, runner: cardRunner, sseSubscribe, MAX_PARALLEL, wouldCycle } = require('./lib/cards');
 
 // ---------- 人工审批关卡：orchestrator 暂停等待用户放行（方案/交付），SSE 断线后可经 /api/approvals 恢复 ----------
 const pendingApprovals = new Map(); // approvalId -> {kind,label,taskId,resolve,timer}
@@ -1071,16 +1071,22 @@ const server = http.createServer(async (req, res) => {
     const card = CardStore.get(id);
     if (!card) { json(res, 404, { success: false, error: '卡牌不存在' }); return; }
     const msgs = store.getMessages(id);
+    // 中文友好的日期时间（YYYY-MM-DD HH:mm，避免随系统 locale 变成英文格式）
+    const fmtDateTime = (t) => {
+      const d = new Date(t || Date.now());
+      const p2 = (n) => String(n).padStart(2, '0');
+      return `${d.getFullYear()}-${p2(d.getMonth() + 1)}-${p2(d.getDate())} ${p2(d.getHours())}:${p2(d.getMinutes())}`;
+    };
     const roleOf = (m) => (m.role === 'user' ? '用户' : (m.phase === 'archive' ? '归档' : (m.phase === 'system' ? '系统' : 'Agent')));
     const lines = [
       `# ${card.title}`, '',
       `- 状态：${card.status}｜模式：${card.mode}｜优先级：P${card.priority}`,
-      `- 创建：${new Date(card.createdAt).toLocaleString()}${card.finishedAt ? `｜完成：${new Date(card.finishedAt).toLocaleString()}` : ''}`,
+      `- 创建：${fmtDateTime(card.createdAt)}${card.finishedAt ? `｜完成：${fmtDateTime(card.finishedAt)}` : ''}`,
       card.error ? `- 失败原因：${card.error.replace(/\n/g, ' ')}` : '',
       '', '## 任务内容', '', String(card.content || '').trim(), '', '## 执行过程', ''
     ];
     for (const m of msgs) {
-      lines.push(`### ${new Date(m.timestamp || Date.now()).toLocaleString()} · ${roleOf(m)}`, '');
+      lines.push(`### ${fmtDateTime(m.timestamp || Date.now())} · ${roleOf(m)}`, '');
       lines.push(String(m.content || '').trim() || '（无内容）');
       lines.push('');
     }
@@ -1111,9 +1117,14 @@ 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)) {
+      const deps = body.dependsOn.map(String).slice(0, 50);
+      // 环检测：修改依赖后若形成（直接或间接）循环依赖则拒绝写入
+      if (wouldCycle(id, deps)) { json(res, 409, { success: false, error: '循环依赖：该任务的依赖链最终会依赖它自己，请调整依赖关系' }); return; }
+      patch.dependsOn = deps;
+    }
     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 = ''; }
@@ -1125,6 +1136,7 @@ const server = http.createServer(async (req, res) => {
 
   if (p.startsWith('/api/cards/') && req.method === 'DELETE') {
     const id = p.slice('/api/cards/'.length);
+    if (!CardStore.get(id)) { json(res, 404, { success: false, error: '卡牌不存在' }); return; }
     cardRunner.killCard(id);
     CardStore.remove(id);
     json(res, 200, { success: true });

package/package.json

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