@mzzsfy/dsh-rs-workflow 1.0.1 → 1.0.2

package/lib/storage.mjs

@@ -1,7 +1,7 @@
 // storage — rs-workflow 自有文件存储(不经宿主 settings 服务,settings.yaml 不承载本插件配置)
 // 布局:<dataDir>/v5/{templates,config}.json;dataDir(DSH_RS_WORKFLOW_DATA_DIR 覆写)
 import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
-import { homedir, tmpdir } from 'node:os'
+import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 
 export function dataDir() {
@@ -14,18 +14,27 @@ function v5File(name) {
 }
 
 export function loadJson(name, fallback) {
+  let raw
   try {
-    return JSON.parse(readFileSync(v5File(name), 'utf8'))
+    raw = readFileSync(v5File(name), 'utf8')
   } catch {
+    // 缺失即首启:回默认;存在但读失败同路,下次 save 重建
+    return fallback
+  }
+  try {
+    return JSON.parse(raw)
+  } catch (e) {
+    // 损坏不可静默吞成默认值:留痕后回退,否则损坏文件被下一次 save 无声覆盖
+    console.error(`[rsww] ${name} 解析失败,回退默认值:${e?.message ?? e}`)
     return fallback
   }
 }
 
-// 写临时文件后原子改名,断电不产生半截 JSON
+// 写同目录临时文件后原子改名:跨卷 tmpdir 会触发 EXDEV;同盘保证 rename 原子性
 export function saveJson(name, data) {
   const target = v5File(name)
   mkdirSync(dirname(target), { recursive: true })
-  const tmp = `${join(tmpdir(), 'rsww')}-${Date.now()}-${Math.random().toString(36).slice(2)}.json`
+  const tmp = `${target}.${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`
   try {
     writeFileSync(tmp, JSON.stringify(data, null, 2))
     renameSync(tmp, target)

package/lib/store.mjs

@@ -1,7 +1,7 @@
 // run-store(v5):每 run 全量 JSON + index.json 索引;LRU 容量收敛;零截断
 // namespace 子目录 v5/(旧数据物理隔离);record 增 plan/warnings/controls[].by(见 data-design.md)
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from 'node:fs'
-import { homedir, tmpdir } from 'node:os'
+import { homedir } from 'node:os'
 import { join } from 'node:path'
 
 export const KEEP_RUNS = 200
@@ -31,9 +31,14 @@ export function createStore({ dir = defaultDataDir(), logger = console, keepRuns
   const warn = (message) => logger.warn?.(`[rsww-store] ${message}`)
 
   const writeAtomic = (path, text) => {
-    const tmp = join(tmpdir(), `rsww-${Date.now()}-${Math.random().toString(36).slice(2)}`)
-    writeFileSync(tmp, text, 'utf8')
-    renameSync(tmp, path)
+    // 临时文件落目标同目录:跨卷 tmpdir rename 触发 EXDEV;同盘保证原子性
+    const tmp = `${path}.${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`
+    try {
+      writeFileSync(tmp, text, 'utf8')
+      renameSync(tmp, path)
+    } finally {
+      rmSync(tmp, { force: true })
+    }
   }
 
   const persistRun = (record) => writeAtomic(join(runsDir, `${record.runId}.json`), JSON.stringify(record, null, 2))
@@ -54,7 +59,7 @@ export function createStore({ dir = defaultDataDir(), logger = console, keepRuns
       const at = Date.now()
       record.status = 'cancelled'
       record.finishedAt = at
-      if (!record.summary) record.summary = '进程重启,运行中断,可在会话页签断点续跑'
+      if (!record.summary) record.summary = '进程重启,运行已自动取消,可在会话页签断点续跑'
       record.controls = [...(record.controls ?? []), { at, kind: 'cancel', text: '进程重启,自动收敛' }]
       persistRun(record)
       const entry = index.find((e) => e.runId === record.runId)
@@ -101,13 +106,17 @@ export function createStore({ dir = defaultDataDir(), logger = console, keepRuns
         warn(`运行记录 ${name} 读取失败,跳过:${e.message}`)
       }
     }
-    // 对账:runs/ 文件集合为权威修齐 index(缺行补、幽灵行删、收敛改写行落盘),仅内存修正
+    // 对账:runs/ 文件集合为权威修齐 index(缺行补、幽灵行删、已存行内容刷新),仅内存修正
     let repaired = settledCount > 0
     const fileIds = new Set(records.keys())
     for (const record of records.values()) {
-      if (!index.some((e) => e.runId === record.runId)) {
+      const entry = index.find((e) => e.runId === record.runId)
+      if (entry === undefined) {
         index.push(indexEntryOf(record))
         repaired = true
+      } else {
+        // finish 先写 run 文件后写 index,中断会留旧行;以文件记录刷新,消除失真窗口
+        Object.assign(entry, indexEntryOf(record))
       }
     }
     for (let i = index.length - 1; i >= 0; i--) {
@@ -154,9 +163,18 @@ export function createStore({ dir = defaultDataDir(), logger = console, keepRuns
         state: state ?? emptyState(), controls: [], stepsTrace: {}, queued: [],
       }
       records.set(id, record)
-      index.unshift(indexEntryOf(record))
-      persistRun(record)
-      persistIndex()
+      const entry = indexEntryOf(record)
+      index.unshift(entry)
+      try {
+        persistRun(record)
+        persistIndex()
+      } catch (e) {
+        // 落盘失败须回滚内存,否则同 id 重试恒撞"runId 已存在"且列表含幽灵行
+        records.delete(id)
+        const at = index.indexOf(entry)
+        if (at >= 0) index.splice(at, 1)
+        throw e
+      }
       evictOverCapacity()
       return record
     },

package/lib/template.mjs

@@ -1,4 +1,4 @@
-// 模板静态校验器:DSL v5 唯一权威(board 保存校验唯一入口);v5 新增顶层 autoApprove 键
+// 模板静态校验器:DSL v5 唯一权威(board 保存校验唯一入口);v5 新增顶层 autoApprove 键
 
 export const SLOT_KEYS = ['planner', 'executor', 'reviewer', 'executor-loop', 'reviewer-approve', 'executor-escalate']
 const TOP_FIELDS = new Set(['id', 'label', 'description', 'inputs', 'steps', 'autoApprove'])
@@ -313,12 +313,13 @@ export function validateTemplateSet(list) {
     }
     if (outs.size > 0) tmplEdges.set(t.id, outs)
   }
-  const depthOf = (id, seen) => {
-    // 环即拒绝:深度无穷,不限于此路径是否重复经过
-    if (seen.has(id)) return Infinity
-    seen.add(id)
+  const depthOf = (id, path) => {
+    // 仅同路径重访即环(深度无穷);菱形(不同路径汇合同一子流程)是合法 DAG,回溯时摘除路径标记
+    if (path.has(id)) return Infinity
+    path.add(id)
     let d = 1
-    for (const n of tmplEdges.get(id) ?? []) d = Math.max(d, 1 + depthOf(n, seen))
+    for (const n of tmplEdges.get(id) ?? []) d = Math.max(d, 1 + depthOf(n, path))
+    path.delete(id)
     return d
   }
   for (const id of tmplEdges.keys()) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-rs-workflow",
   "description": "若水工作流设置面:流程模板管理与工作位/预算配置(模板编辑/校验/配置读写)。编排运行时按 v5 设计(docs/rsww-v5/)另行实现。",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -34,6 +34,8 @@
     "README.md"
   ],
   "peerDependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "@deepseek-ai/dsh-llm": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.2"
   }
 }

package/preset/rs-workflow/agent.cordis.yml

@@ -67,6 +67,10 @@
 
 - id: tool-jobs
   name: '@deepseek-ai/dsh-tool-jobs'
+  # 缺省连续唤醒预算 3 次且仅用户消息重置:纯自主编排每段 settle 耗 1 次,第 4 段起降级 inject 不唤醒,
+  # 编排静默停滞;放宽到 64 段(覆盖 spec 建议的 3~12 步多实例流程上限)
+  config:
+    maxConsecutiveWakes: 64
 
 # ── skills ──────────────────────────────────────────────────────────────────
 

package/src/client.js

@@ -1260,7 +1260,6 @@ window.__ModuleLoader__.load({
             unsubscribe()
             if (timer) clearInterval(timer)
             if (disposeView) disposeView()
-            if (disposeChip) disposeChip()
           }
         }, 'rs-workflow: session-aware flow view')
       },