@mzzsfy/dsh-rs-workflow 1.0.1 → 1.1.0

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-tool.mjs

@@ -1,161 +1,172 @@
-// template-tool — rs_workflow_template 模型工具:AI 按用户口述逻辑生成/修改流程模板
-// 激活于已创建组合行(template-tool 行);落盘走自有文件存储与 release 模块,不直接触碰预设目录(v5)
-import { defineTool } from '@deepseek-ai/dsh-tools'
-import { parseTemplate, validateTemplate, validateTemplateSet } from './template.mjs'
-import { SPEC_TEXT } from './spec.mjs'
-import { loadJson, saveJson } from './storage.mjs'
-import { releaseFlowTemplate, unreleaseFlowTemplate } from './release.mjs'
-
-const ACTIONS = ['spec', 'list', 'save', 'remove']
-
-function normalizeTemplates(value) {
-  if (!Array.isArray(value)) return []
-  return value
-    .filter((t) => t && typeof t === 'object')
-    .map((t) => ({
-      id: typeof t.id === 'string' ? t.id : '',
-      label: typeof t.label === 'string' ? t.label : '',
-      description: typeof t.description === 'string' ? t.description : '',
-      enabled: t.enabled !== false,
-      json: typeof t.json === 'string' ? t.json : '',
-    }))
-    .filter((t) => t.id !== '')
-}
-
-export function createTemplateTool({ getTemplates, setTemplates, removeTemplate, releaseTemplate, unreleaseTemplate, logger }) {
-  return defineTool({
-    name: 'rs_workflow_template',
-    description: [
-      '若水工作流流程模板的 AI 编辑入口:用户口述流程逻辑,你据此生成/修改流程模板(严格 JSON)。',
-      '先调 {action:"spec"} 获取 DSL v5 规范与示例,再 {action:"save", template:{...}, release:true} 保存并创建为可选模式。',
-      'list 列出现有模板;remove 按 id 移除并撤下其模式。',
-      '每步以 outputs 声明结构化产出契约(子代理以结构化工具提交,引擎强制校验);人工审校用 type:"approve" 原语;',
-      '流程入参用 inputs;禁止把「希望模型怎么做」写成口头约定。',
-    ].join(''),
-    parameters: {
-      action: { type: 'string', required: true, enum: ACTIONS, description: 'spec=获取 DSL 规范;list=列模板;save=保存模板(可同时创建);remove=移除模板' },
-      template: {
-        type: 'object',
-        additionalProperties: true,
-        description: 'save:模板对象 {id,label,description,enabled,json};json 为流程定义严格 JSON 文本(先调 spec 按规范写)',
-      },
-      id: { type: 'string', description: 'remove:要移除的模板 id' },
-      release: { type: 'boolean', description: 'save:true=保存后立即创建为可选模式(rs-<id>)' },
-      dryRun: { type: 'boolean', description: 'save:true=仅校验不落盘(编辑器「校验」同源通道)' },
-    },
-    output: {
-      schema: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-          ok: { type: 'boolean', required: true },
-          action: { type: 'string' },
-          spec: { type: 'string' },
-          templates: { type: 'array', items: { type: 'object', additionalProperties: true } },
-          released: { type: 'boolean' },
-          presetId: { type: 'string' },
-          errors: { type: 'array', items: { type: 'string' } },
-          error: { type: 'string' },
-        },
-      },
-      render: (_args, value) => [{
-        type: 'text',
-        text: value.spec !== undefined ? value.spec : JSON.stringify(value, null, 2),
-      }],
-    },
-    async execute(args) {
-      const action = args.action
-      if (action === 'spec') {
-        return { ok: true, action, spec: SPEC_TEXT }
-      }
-      if (action === 'list') {
-        const templates = normalizeTemplates(await getTemplates())
-        return { ok: true, action, templates }
-      }
-      if (action === 'save') {
-        const t = args.template && typeof args.template === 'object' ? args.template : null
-        if (!t) return { ok: false, action, error: '缺少 template 对象 {id,label,description,json}' }
-        const id = typeof t.id === 'string' ? t.id.trim() : ''
-        const json = typeof t.json === 'string' ? t.json : ''
-        if (id === '' || json.trim() === '') return { ok: false, action, error: 'template.id 与 template.json 均为必填' }
-        let parsed
-        try {
-          parsed = parseTemplate(json)
-        } catch (error) {
-          return { ok: false, action, errors: ['JSON 解析失败: ' + String(error?.message ?? error)] }
-        }
-        if (parsed && typeof parsed.id === 'string' && parsed.id !== id) {
-          return { ok: false, action, errors: [`template.id("${id}") 与流程定义内 id("${parsed.id}") 不一致`] }
-        }
-        // 单模板校验 + 与既有模板并集跨流程校验(动态路由目标存在性;损坏既有模板跳过)
-        const single = validateTemplate(parsed)
-        if (single.length > 0) return { ok: false, action, errors: single.map((e) => `${e.target}: ${e.message}`) }
-        const others = normalizeTemplates(await getTemplates()).filter((item) => item.id !== id)
-        const otherFlows = []
-        for (const item of others) {
-          try {
-            otherFlows.push(parseTemplate(item.json))
-          } catch { /* 既有模板损坏不阻塞新模板保存 */ }
-        }
-        const cross = validateTemplateSet([parsed, ...otherFlows].filter(Boolean))
-        if (cross.length > 0) return { ok: false, action, errors: cross.map((e) => `${e.target}: ${e.message}`) }
-        const entry = {
-          id,
-          label: typeof t.label === 'string' && t.label.trim() !== '' ? t.label.trim() : (parsed && parsed.label) || id,
-          description: typeof t.description === 'string' && t.description.trim() !== '' ? t.description.trim() : (parsed && parsed.description) || '',
-          enabled: t.enabled !== false,
-          json,
-        }
-        if (args.dryRun === true) {
-          return { ok: true, action, templates: normalizeTemplates([...others, entry]) }
-        }
-        await setTemplates([...others, entry])
-        let released = false
-        let presetId = ''
-        if (args.release === true) {
-          released = (await releaseTemplate(entry)) === true
-          presetId = 'rs-' + id
-        }
-        logger?.info?.(`rs-workflow 模板已保存: ${id}${released ? `(已创建为模式 ${presetId})` : ''}`)
-        return { ok: true, action, released, presetId, templates: normalizeTemplates([...others, entry]) }
-      }
-      if (action === 'remove') {
-        const id = typeof args.id === 'string' ? args.id.trim() : ''
-        if (id === '') return { ok: false, action, error: '缺少 id' }
-        const outcome = await removeTemplate(id)
-        if (!outcome.ok) return { ok: false, action, error: outcome.error }
-        return { ok: true, action, presetId: 'rs-' + id, templates: outcome.templates }
-      }
-      return { ok: false, action, error: '未知 action: ' + action }
-    },
-    presentCall: () => ({ card: 'generic', title: '编辑若水工作流模板', kind: 'other', rawInput: {} }),
-  })
-}
-
-// 模式行激活入口:自有文件存储读写 + release 落盘(ctx = agent realm 组合行上下文)
-export function registerTemplateTool(ctx) {
-  ctx.inject(['tools'], (tctx) => {
-    tctx.effect(() => tctx.tools.register(createTemplateTool({
-      getTemplates: () => loadJson('templates.json', []),
-      setTemplates: (templates) => saveJson('templates.json', templates),
-      removeTemplate: (id) => {
-        const raw = loadJson('templates.json', [])
-        const next = raw.filter((t) => t.id !== id)
-        if (next.length === raw.length) return { ok: false, error: '模板不存在: ' + id }
-        saveJson('templates.json', next)
-        const outcome = unreleaseFlowTemplate(id)
-        return { ok: true, templates: next, outcome }
-      },
-      releaseTemplate: (entry) => {
-        try {
-          return releaseFlowTemplate(entry) !== 'foreign'
-        } catch (error) {
-          ctx.logger?.warn?.(`rs-workflow 模板释放失败: ${error?.message ?? error}`)
-          return false
-        }
-      },
-      unreleaseTemplate: (id) => unreleaseFlowTemplate(id),
-      logger: ctx.logger,
-    })), 'rs-workflow template tool')
-  })
-}
+// template-tool — rs_workflow_template 模型工具:AI 按用户口述逻辑生成/修改流程模板
+// 激活于已创建组合行(template-tool 行);落盘走自有文件存储与释放分派,不直接触碰预设目录(v5)
+import { defineTool } from '@deepseek-ai/dsh-tools'
+import { parseTemplate, validateTemplate, validateTemplateSet } from './template.mjs'
+import { SPEC_TEXT } from './spec.mjs'
+import { loadJson, saveJson } from './storage.mjs'
+import { currentAgentPresets, markReleased, releaseTemplateVia, unreleaseTemplateVia } from './release-registry.mjs'
+
+const ACTIONS = ['spec', 'list', 'save', 'remove']
+
+function normalizeTemplates(value) {
+  if (!Array.isArray(value)) return []
+  return value
+    .filter((t) => t && typeof t === 'object')
+    .map((t) => ({
+      id: typeof t.id === 'string' ? t.id : '',
+      label: typeof t.label === 'string' ? t.label : '',
+      description: typeof t.description === 'string' ? t.description : '',
+      enabled: t.enabled !== false,
+      json: typeof t.json === 'string' ? t.json : '',
+      // released 是注册形态的释放事实源(templates.json),归一化不得剥离
+      ...(t.released === true ? { released: true } : {}),
+    }))
+    .filter((t) => t.id !== '')
+}
+
+export function createTemplateTool({ getTemplates, setTemplates, removeTemplate, releaseTemplate, logger }) {
+  return defineTool({
+    name: 'rs_workflow_template',
+    description: [
+      '若水工作流流程模板的 AI 编辑入口:用户口述流程逻辑,你据此生成/修改流程模板(严格 JSON)。',
+      '先调 {action:"spec"} 获取 DSL v5 规范与示例,再 {action:"save", template:{...}, release:true} 保存并创建为可选模式。',
+      'list 列出现有模板;remove 按 id 移除并撤下其模式。',
+      '每步以 outputs 声明结构化产出契约(子代理以结构化工具提交,引擎强制校验);人工审校用 type:"approve" 原语;',
+      '流程入参用 inputs;禁止把「希望模型怎么做」写成口头约定。',
+    ].join(''),
+    parameters: {
+      action: { type: 'string', required: true, enum: ACTIONS, description: 'spec=获取 DSL 规范;list=列模板;save=保存模板(可同时创建);remove=移除模板' },
+      template: {
+        type: 'object',
+        additionalProperties: true,
+        description: 'save:模板对象 {id,label,description,enabled,json};json 为流程定义严格 JSON 文本(先调 spec 按规范写)',
+      },
+      id: { type: 'string', description: 'remove:要移除的模板 id' },
+      release: { type: 'boolean', description: 'save:true=保存后立即创建为可选模式(rs-<id>)' },
+      dryRun: { type: 'boolean', description: 'save:true=仅校验不落盘(编辑器「校验」同源通道)' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          ok: { type: 'boolean', required: true },
+          action: { type: 'string' },
+          spec: { type: 'string' },
+          templates: { type: 'array', items: { type: 'object', additionalProperties: true } },
+          released: { type: 'boolean' },
+          presetId: { type: 'string' },
+          errors: { type: 'array', items: { type: 'string' } },
+          error: { type: 'string' },
+        },
+      },
+      render: (_args, value) => [{
+        type: 'text',
+        text: value.spec !== undefined ? value.spec : JSON.stringify(value, null, 2),
+      }],
+    },
+    async execute(args) {
+      const action = args.action
+      if (action === 'spec') {
+        return { ok: true, action, spec: SPEC_TEXT }
+      }
+      if (action === 'list') {
+        const templates = normalizeTemplates(await getTemplates())
+        return { ok: true, action, templates }
+      }
+      if (action === 'save') {
+        const t = args.template && typeof args.template === 'object' ? args.template : null
+        if (!t) return { ok: false, action, error: '缺少 template 对象 {id,label,description,json}' }
+        const id = typeof t.id === 'string' ? t.id.trim() : ''
+        const json = typeof t.json === 'string' ? t.json : ''
+        if (id === '' || json.trim() === '') return { ok: false, action, error: 'template.id 与 template.json 均为必填' }
+        let parsed
+        try {
+          parsed = parseTemplate(json)
+        } catch (error) {
+          return { ok: false, action, errors: ['JSON 解析失败: ' + String(error?.message ?? error)] }
+        }
+        if (parsed && typeof parsed.id === 'string' && parsed.id !== id) {
+          return { ok: false, action, errors: [`template.id("${id}") 与流程定义内 id("${parsed.id}") 不一致`] }
+        }
+        // 单模板校验 + 与既有模板并集跨流程校验(动态路由目标存在性;损坏既有模板跳过)
+        const single = validateTemplate(parsed)
+        if (single.length > 0) return { ok: false, action, errors: single.map((e) => `${e.target}: ${e.message}`) }
+        const all = normalizeTemplates(await getTemplates())
+        const others = all.filter((item) => item.id !== id)
+        const otherFlows = []
+        for (const item of others) {
+          try {
+            otherFlows.push(parseTemplate(item.json))
+          } catch { /* 既有模板损坏不阻塞新模板保存 */ }
+        }
+        const cross = validateTemplateSet([parsed, ...otherFlows].filter(Boolean))
+        if (cross.length > 0) return { ok: false, action, errors: cross.map((e) => `${e.target}: ${e.message}`) }
+        const entry = {
+          id,
+          label: typeof t.label === 'string' && t.label.trim() !== '' ? t.label.trim() : (parsed && parsed.label) || id,
+          description: typeof t.description === 'string' && t.description.trim() !== '' ? t.description.trim() : (parsed && parsed.description) || '',
+          enabled: t.enabled !== false,
+          json,
+          // 编辑性重存不改变释放态(注销走 remove/unrelease 显式动作)
+          ...(all.find((item) => item.id === id)?.released === true ? { released: true } : {}),
+        }
+        if (args.dryRun === true) {
+          return { ok: true, action, templates: normalizeTemplates([...others, entry]) }
+        }
+        await setTemplates([...others, entry])
+        let released = false
+        let presetId = ''
+        if (args.release === true) {
+          released = (await releaseTemplate(entry)) === true
+          presetId = 'rs-' + id
+        }
+        logger?.info?.(`rs-workflow 模板已保存: ${id}${released ? `(已创建为模式 ${presetId})` : ''}`)
+        return { ok: true, action, released, presetId, templates: normalizeTemplates([...others, entry]) }
+      }
+      if (action === 'remove') {
+        const id = typeof args.id === 'string' ? args.id.trim() : ''
+        if (id === '') return { ok: false, action, error: '缺少 id' }
+        const outcome = await removeTemplate(id)
+        if (!outcome.ok) return { ok: false, action, error: outcome.error }
+        return { ok: true, action, presetId: 'rs-' + id, templates: outcome.templates }
+      }
+      return { ok: false, action, error: '未知 action: ' + action }
+    },
+    presentCall: () => ({ card: 'generic', title: '编辑若水工作流模板', kind: 'other', rawInput: {} }),
+  })
+}
+
+// 模式行激活入口:自有文件存储读写 + 释放分派(注册/目录形态,与 board 同源
+// 服务当值;ctx = agent realm 组合行上下文)
+export function registerTemplateTool(ctx) {
+  ctx.inject(['tools'], (tctx) => {
+    tctx.effect(() => tctx.tools.register(createTemplateTool({
+      getTemplates: () => loadJson('templates.json', []),
+      setTemplates: (templates) => saveJson('templates.json', templates),
+      removeTemplate: async (id) => {
+        const raw = loadJson('templates.json', [])
+        const next = raw.filter((t) => t.id !== id)
+        if (next.length === raw.length) return { ok: false, error: '模板不存在: ' + id }
+        saveJson('templates.json', next)
+        const result = await unreleaseTemplateVia(currentAgentPresets(), id)
+        return { ok: true, templates: next, outcome: result.outcome }
+      },
+      releaseTemplate: async (entry) => {
+        try {
+          const result = await releaseTemplateVia(currentAgentPresets(), entry)
+          if (result.outcome === 'failed') {
+            ctx.logger?.warn?.(`rs-workflow 模板释放失败: ${result.broken ?? '未知原因'}`)
+            return false
+          }
+          markReleased(entry.id, true)
+          return true
+        } catch (error) {
+          ctx.logger?.warn?.(`rs-workflow 模板释放失败: ${error?.message ?? error}`)
+          return false
+        }
+      },
+      logger: ctx.logger,
+    })), 'rs-workflow template tool')
+  })
+}

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.1.0",
   "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"
   }
 }