@mzzsfy/dsh-rs-workflow 1.0.2 → 1.1.0

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-rs-workflow",
   "description": "若水工作流设置面:流程模板管理与工作位/预算配置(模板编辑/校验/配置读写)。编排运行时按 v5 设计(docs/rsww-v5/)另行实现。",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

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

@@ -1,15 +1,4 @@
-# The `rs-workflow` agent preset: 若水工作流(v5,主循环协作编排)。
-#
-# 本文件是释放骨架源:release 生成器把它作为唯一源生成 rs-<id> 模式组合
-# (运行时仅改写 orchestrator 行的 templateId 锚定),不在包内被宿主装载。
-#
-# 基底是 `standard` 全功能编码代理行集,差异:
-#   1. persona 换成流程模式纪律 v5(人机接口+受约束规划者,任务交付由编排子代理承担);
-#   2. delegation 组内 rs-workflow-orchestrator 工具行与 template-tool 行;
-#   3. 无 report 行(trace 事件 + run-store 取代);plan-mode 组移除(规划在编排内)。
-
-# ── identity ────────────────────────────────────────────────────────────────
-
+# 由 lib/skeleton.mjs emitRows 规范化生成,勿手改;漂移对拍见 test/skeleton.test.mjs。
 - id: persona
   name: '@deepseek-ai/dsh-persona'
   config:
@@ -33,64 +22,35 @@
       5. 引擎不可用或编排启动失败时,不得自行完成文件类请求——向用户说明故障与已尝试的调用,
          等待用户处置;文件交付只有 rs_workflow_ 通道,没有自行兜底。
     suffix: Your working directory is {{cwd}}.
-
 - id: agent-instructions
   name: '@deepseek-ai/dsh-agent-instructions'
   config:
     maxBytes: 65536
-
-# ── shell ───────────────────────────────────────────────────────────────────
-
-# 注:不可禁本组合 shell/fs 工具行——宿主 workflow worker 的段子代理继承组合行集,
-# 禁行使段子代理无法落盘交付物(实测证实)。主循环不写文件由 persona 判据约束,
-# 物理隔离需宿主提供 worker 行集覆写能力(外部依赖)。
-
 - id: tool-bash
   name: '@deepseek-ai/dsh-tool-bash'
   disabled: !!js process.platform === 'win32'
-
 - id: tool-pwsh
   name: '@deepseek-ai/dsh-tool-pwsh'
   disabled: !!js process.platform !== 'win32'
-
-# ── filesystem ──────────────────────────────────────────────────────────────
-
 - id: tool-fs
   name: '@deepseek-ai/dsh-tool-fs'
-
 - id: tool-fs-search
   name: '@deepseek-ai/dsh-tool-fs-search'
   config:
     sampleOverCapGlobResults: false
-
-# ── background jobs ────────────────────────────────────────────────────────
-
 - id: tool-jobs
   name: '@deepseek-ai/dsh-tool-jobs'
-  # 缺省连续唤醒预算 3 次且仅用户消息重置:纯自主编排每段 settle 耗 1 次,第 4 段起降级 inject 不唤醒,
-  # 编排静默停滞;放宽到 64 段(覆盖 spec 建议的 3~12 步多实例流程上限)
   config:
     maxConsecutiveWakes: 64
-
-# ── skills ──────────────────────────────────────────────────────────────────
-
 - id: skill-filesystem
   name: '@deepseek-ai/dsh-skill-filesystem'
-
 - id: tool-skill
   name: '@deepseek-ai/dsh-tool-skill'
-
-# ── web ─────────────────────────────────────────────────────────────────────
-
 - id: tool-web
   name: '@deepseek-ai/dsh-tool-web'
   config:
     fetch: false
     searchTimeoutMs: 60000
-
-# ── compaction ──────────────────────────────────────────────────────────────
-
-# 编排子代理上下文较长,保留 standard 的压缩组。
 - id: compaction
   name: cordis:group
   group: true
@@ -100,23 +60,14 @@
   config:
     - id: compaction-basic
       name: '@deepseek-ai/dsh-compaction-basic'
-
     - id: command-compact
       name: '@deepseek-ai/dsh-command-compact'
-
     - id: tool-result-pruner
       name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
       config:
         thresholdChars: 8192
         headChars: 4096
         tailChars: 1024
-
-# ── delegation and workflows ────────────────────────────────────────────────
-
-# workflowEngine 是预设私有服务(preset 组合发布全局服务会被宿主拒绝 mount),
-# 所有触达它的行共享一个 entry-local isolate realm。
-# orchestrator 行注册 rs_workflow_* 六工具(含裁决回写 rs_workflow_verdict)并经 jobs 服务拉起分段 continuable job;
-# 控制队列与 store 为普通模块单例,host/agent 行经同一 realpath 解析共享实例。
 - id: delegation
   name: cordis:group
   group: true
@@ -125,56 +76,42 @@
   config:
     - id: tool-subagent-control
       name: '@deepseek-ai/dsh-tool-subagent-control'
-
     - id: tool-subagent-list-agents
       name: '@deepseek-ai/dsh-tool-subagent-control/list-agents'
-
     - id: tool-subagent
       name: '@deepseek-ai/dsh-tool-subagent'
       config:
         provider: spawn
         toolName: subagent
         backgroundMode: continuable
-
     - id: tool-subagent-fork
       name: '@deepseek-ai/dsh-tool-subagent'
       config:
         provider: fork
         toolName: subagent_fork
         backgroundMode: continuable
-
-    - id: workflow-worker-thread
-      name: '@deepseek-ai/dsh-workflow-worker-thread'
+    - id: workflow-ptc
+      name: '@deepseek-ai/dsh-workflow-ptc'
       config:
         provider: spawn
-
     - id: tool-workflow
       name: '@deepseek-ai/dsh-tool-workflow'
-
     - id: tool-ralph
       name: '@deepseek-ai/dsh-tool-ralph'
       config:
         subagentProvider: spawn
         maxRounds: 64
-
-    # orchestrator 工具行:模板 id 由组合名承载(rs-<id> → <id>),释放生成器按组合名写入
     - id: rs-workflow-orchestrator
       name: '@mzzsfy/dsh-rs-workflow'
       config:
         role: orchestrator
         templateId: TPL_ANCHOR
-
-    # 模板编辑工具行:rs_workflow_template(AI 按口述逻辑生成/修改流程模板)
     - id: rs-workflow-template-tool
       name: '@mzzsfy/dsh-rs-workflow'
       config:
         role: template-tool
-
-# ── remaining model-facing rows ─────────────────────────────────────────────
-
 - id: tool-ask-user
   name: '@deepseek-ai/dsh-tool-ask-user'
-
 - id: tool-todo
   name: '@deepseek-ai/dsh-tool-todo'
   config: