dsh-mcmp 2.1.0 → 2.1.1

package/README.md

@@ -123,7 +123,7 @@ Client 插件(dsh-mcmp,标准 __ModuleLoader__ bundle)
 
 ## 文件说明
 
-> 仓库根目录即插件包本体(发布到 npm 的内容 = `lib/` + `cordis.patch.yml` + `package.json`)。
+> 仓库根目录即插件包本体(发布到 npm 的内容 = `lib/` + `cordis.patch.yml` + `package.json`;`tests/` 不随包发布)。
 
 | 文件 | 内容 |
 | --- | --- |
@@ -131,6 +131,7 @@ Client 插件(dsh-mcmp,标准 __ModuleLoader__ bundle)
 | `cordis.patch.yml` | **bundle 补丁**:安装时自动注册插件行(`insert: mcmp`),无需手动编辑配置 |
 | `lib/index.js` | **Host 半**:命令注册、识图能力探测、断点续跑、Host 侧子智能体编排(8 步骤 + 兜底定稿)、`/mcmp-api` 面板路由 |
 | `lib/client.js` | **Client 半**:浮动进度面板(标准 `__ModuleLoader__` bundle,`fetch` 轮询) |
+| `tests/smoke.mjs` | **冒烟测试**:伪造 Cordis ctx 驱动插件,验证启动/触发/断点续跑(含多轮)/中止/兜底/`--from`/识图探测等路径,`node tests/smoke.mjs`(不随 npm 包发布) |
 
 ## License
 

package/lib/client.js

@@ -80,7 +80,8 @@ window.__ModuleLoader__.load({
       // 拖拽只绑定在标题文字上,避免指针捕获吞掉同栏按钮的点击
       const onTitleDown = (e) => {
         if (e.button !== 0) return
-        const box = e.currentTarget.parentElement ? e.currentTarget.parentElement.parentElement : null
+        const head = e.currentTarget.parentElement
+        const box = head && head.parentElement ? head.parentElement : null
         if (!box) return
         const rect = box.getBoundingClientRect()
         box.setPointerCapture(e.pointerId)

package/lib/index.js

@@ -170,33 +170,32 @@ export function apply(ctx) {
         if (ev.type === 'tool-workflow/run-start') {
           const d = ev.data || {}
           if (d.name === FLOW_NAME) {
-            current = { started: [], ended: [] }
+            current = { done: new Set() }
             runs.push(current)
           } else {
             current = null
           }
-        } else if (ev.type === 'tool-workflow/agent-start' && current) {
-          const d = ev.data || {}
-          if (Number.isSafeInteger(d.seq) && d.seq >= 1) current.started[d.seq - 1] = true
         } else if (ev.type === 'tool-workflow/agent-end' && current) {
           const d = ev.data || {}
-          if (Number.isSafeInteger(d.seq) && d.seq >= 1) current.ended[d.seq - 1] = d.outcome === 'completed'
+          if (Number.isSafeInteger(d.seq) && d.seq >= 1 && d.outcome === 'completed') current.done.add(d.seq)
         }
       } catch (err) { /* 单条事件解析失败忽略 */ }
     }
-    const prefix = (run) => {
-      let n = 0
-      for (let i = 0; i < run.started.length; i++) {
-        if (run.started[i] === true && run.ended[i] === true) n = i + 1
-        else break
-      }
-      return n
+    // 一次运行从最小序号 S 起连续完成 C 个迭代,则该运行贡献 = (S-1) + C。
+    // 这样多轮/续跑运行(seq 从 20、39…继续编号)也能正确累计,而不是只数 1..19。
+    const contribution = (run) => {
+      if (!run || run.done.size === 0) return 0
+      let S = Infinity
+      for (const seq of run.done) if (seq < S) S = seq
+      let c = 0
+      while (run.done.has(S + c)) c++
+      return (S - 1) + c
     }
     const last = runs[runs.length - 1]
-    let n = last ? prefix(last) : 0
+    let n = last ? contribution(last) : 0
     if (n === 0) {
       let m = 0
-      for (const run of runs) m = Math.max(m, prefix(run))
+      for (const run of runs) m = Math.max(m, contribution(run))
       n = m
     }
     return n
@@ -534,7 +533,8 @@ export function apply(ctx) {
       if (!Number.isSafeInteger(rounds) || rounds < 1) rounds = 1
       if (rounds > 10) return { kind: 'error', text: '--round 最大为 10。每轮 19 次迭代、每次迭代启动一个专家子智能体,轮数过大会非常耗时。' }
       const fresh = /(?:^|\s)--fresh\b/i.test(raw)
-      const mFrom = /(?:^|\s)--from(?:=)?\s*([^\r\n]+)$/i.exec(raw)
+      // --from 路径:允许含空格,遇到下一个 -- 标志或行尾即结束,避免吞掉后面的 --round/--fresh
+      const mFrom = /(?:^|\s)--from(?:=)?\s*([^\r\n]+?)(?=\s+--|\r?$)/i.exec(raw)
       let problem = null
       if (mFrom) {
         let p = mFrom[1].trim().replace(/^["']|["']$/g, '')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mcmp",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "DeepSeek Harness 插件:数学建模论文自动化流水线 v2(8 步骤 × 19 迭代 × N 轮:图表视觉自检与修复、评审问题修复闭环、跨步骤缺陷台账与向上修复、论文兜底定稿、质疑驱动、断点续跑、进度面板)",
   "type": "module",
   "main": "lib/index.js",