@mzzsfy/dsh-rs-workflow 1.0.2 → 1.1.0

package/README.md

@@ -25,4 +25,4 @@ node --test "test/*.test.mjs"      # 包内测试(在 packages/dsh-rs-workflow
 
 ## dsh 版本兼容
 
-三版本全部通过:preset 释放、Agent 预设页若水工作流卡、rs_workflow_ 工具可列出、激活 live。
+三版本(0.1.2-rc.1 / 0.1.5-rc.3 / 0.1.7-rc.1)全部通过:preset 释放、Agent 预设页若水工作流卡(0.1.7-rc.1 预设页换形「模式」卡,属宿主演进)、rs_workflow_ 工具可列出、配置页六工作位、移除删除联动、激活 live。

package/lib/board.mjs

@@ -6,7 +6,17 @@
 import { reportStore, ACTIVE_STATES } from './store.mjs'
 import { registry, post, initiatorOf, resumerOf } from './driver/control.mjs'
 import { validateTemplate, validateTemplateSet } from './template.mjs'
-import { releaseFlowTemplate, unreleaseFlowTemplate, releasedTemplateIds } from './release.mjs'
+import { releasedTemplateIds } from './release.mjs'
+import {
+  currentAgentPresets,
+  disposeAllRegistered,
+  markReleased,
+  registryFormAvailable,
+  replayReleased,
+  setAgentPresets,
+  unreleaseTemplateVia,
+  releaseTemplateVia,
+} from './release-registry.mjs'
 import { SPEC_TEXT } from './spec.mjs'
 import { normalizeConfig, BUDGET_KEYS, SLOT_KEYS } from './settings-schema.mjs'
 import { loadJson, saveJson } from './storage.mjs'
@@ -105,13 +115,25 @@ function writeTemplates(templates) {
   saveJson('templates.json', templates)
 }
 
-function removeTemplateById(id) {
+// ── 释放分派(注册形态 rc.1+ / 目录形态 0.1.2-0.1.5,见 计划-rs-workflow-preset-rc1.md)──
+// released 事实源随形态:注册形态 = templates.json released 标志(markReleased 落盘);
+// 目录形态 = 目录本身。服务当值经 release-registry 模块单例,template-tool 行同源消费
+const releaseDispatch = (entry) => releaseTemplateVia(currentAgentPresets(), entry)
+
+const unreleaseDispatch = (id) => unreleaseTemplateVia(currentAgentPresets(), id)
+
+function releasedIdsVia() {
+  if (!registryFormAvailable(currentAgentPresets())) return releasedTemplateIds()
+  return rawTemplates().filter((t) => t.released === true).map((t) => t.id)
+}
+
+async function removeTemplateById(id) {
   const raw = rawTemplates()
   const next = raw.filter((t) => t.id !== id)
   if (next.length === raw.length) return { ok: false, error: '模板不存在: ' + id }
   writeTemplates(next)
-  // 撤下释放物:删除模板即移除对应释放目录(外来目录返回 foreign 不动)
-  const outcome = unreleaseFlowTemplate(id)
+  // 撤下释放物:注册形态注销预设,目录形态移除释放目录(外来目录返回 foreign 不动)
+  const outcome = await unreleaseDispatch(id)
   return { ok: true, outcome }
 }
 
@@ -232,6 +254,19 @@ export function handleControl(body) {
 
 export function registerBoardRoutes(ctx) {
   const store = reportStore()
+  // 注册形态运行态:服务注入即设当值 + 重放已释放模板;行卸载清当值并注销全部
+  // 注册(热重载后随重放重建)。目录形态宿主(无 register)保持当值空缺
+  ctx.inject(['agentPresets'], (actx) => {
+    const service = actx.agentPresets
+    if (!registryFormAvailable(service)) return
+    setAgentPresets(service)
+    const released = rawTemplates().filter((t) => t.released === true && t.enabled !== false)
+    replayReleased(service, released).catch(() => {})
+    actx.effect(() => async () => {
+      setAgentPresets(undefined)
+      await disposeAllRegistered()
+    }, 'rs-workflow preset registrations')
+  })
   ctx.inject(['webServer'], (wctx) => {
     const route = (path, handler, name) => wctx.effect(() => wctx.webServer.register({ kind: 'exact', path, handler }), name)
     route('/api/rsww/runs', guardedRoute(async (req, res) => {
@@ -300,7 +335,7 @@ export function registerBoardRoutes(ctx) {
       sendJson(res, 200, { entry, parsed })
     }), 'rsww template detail route')
     route('/api/rsww/released', guardedRoute(async (req, res) => {
-      sendJson(res, 200, { ids: releasedTemplateIds() })
+      sendJson(res, 200, { ids: releasedIdsVia() })
     }), 'rsww released route')
     route('/api/rsww/spec', guardedRoute(async (req, res) => {
       sendJson(res, 200, { spec: SPEC_TEXT })
@@ -313,6 +348,7 @@ export function registerBoardRoutes(ctx) {
         sendJson(res, 200, { ok: true, dryRun: true })
         return
       }
+      const previous = rawTemplates().find((t) => t.id === id)
       const templates = rawTemplates().filter((t) => t.id !== id)
       templates.push({
         id,
@@ -320,6 +356,8 @@ export function registerBoardRoutes(ctx) {
         description: typeof body.description === 'string' && body.description.trim() !== '' ? body.description.trim() : parsed.description || '',
         enabled: body.enabled !== false,
         json,
+        // 已释放模板的编辑性重存不改变释放态(注销走 unrelease 显式动作)
+        ...(previous?.released === true ? { released: true } : {}),
       })
       writeTemplates(templates)
       sendJson(res, 200, { ok: true })
@@ -327,7 +365,7 @@ export function registerBoardRoutes(ctx) {
     route('/api/rsww/template-remove', guardedRoute.post(async (req, res) => {
       const body = JSON.parse(await readJsonBody(req, res))
       const id = typeof body.id === 'string' ? body.id.trim() : ''
-      const outcome = removeTemplateById(id)
+      const outcome = await removeTemplateById(id)
       if (!outcome.ok) throw new Error(outcome.error)
       sendJson(res, 200, { ok: true })
     }), 'rsww template-remove route')
@@ -344,14 +382,17 @@ export function registerBoardRoutes(ctx) {
       }).filter((t) => t !== null)
       const setErrors = validateTemplateSet(parsedSet).filter((e) => e.target === 'top:id' && e.message.startsWith(id + ' '))
       if (setErrors.length > 0) throw new Error('模板集合校验失败:' + setErrors.map((e) => e.message).join(';'))
-      const outcome = releaseFlowTemplate(entry)
-      sendJson(res, 200, { ok: true, outcome })
+      const result = await releaseDispatch(entry)
+      if (result.outcome === 'failed') throw new Error(result.broken ?? '释放失败')
+      markReleased(id, true)
+      sendJson(res, 200, { ok: true, outcome: result.outcome, ...(result.broken === undefined ? {} : { broken: result.broken }) })
     }), 'rsww release route')
     route('/api/rsww/unrelease', guardedRoute.post(async (req, res) => {
       const body = JSON.parse(await readJsonBody(req, res))
       const id = typeof body.id === 'string' ? body.id.trim() : ''
-      const outcome = unreleaseFlowTemplate(id)
-      sendJson(res, 200, { ok: true, outcome })
+      const result = await unreleaseDispatch(id)
+      markReleased(id, false)
+      sendJson(res, 200, { ok: true, outcome: result.outcome })
     }), 'rsww unrelease route')
     route('/api/rsww/config', guardedRoute(async (req, res) => {
       sendJson(res, 200, { config: normalizeConfig(loadJson('config.json', undefined)) })

package/lib/orchestrator.mjs

@@ -464,17 +464,19 @@ export function registerOrchestrator(ctx, config) {
     // 现行为返回注册 disposer,行销毁即注销;挂靠表(initiator/resumer)以 agentId 为键,行销毁后的
     // stale 表项由下次 status/start 受理覆盖;run 终态经 finishRun 清 activeRuns。
   })
-  registerTurnGuard(ctx, { currentRunId })
+  registerTurnGuard(ctx, { currentRunId, createUserMessage: config.createUserMessage })
   return { rejectCounts, activeRuns }
 }
 
 // 会话守门注册:轮次将停时判定欠动作并 steer 拉回(宿主机器重读 inbox,有 steering 即续跑一步)。
-// 消息构造依赖宿主 llm 包,缺失即降级不守门(规约条款 1:编排能力不得被增强功能拖垮)。
-function registerTurnGuard(ctx, { currentRunId }) {
+// 消息构造依赖宿主 llm 包(peerDependency,仅宿主运行时可解析):config.createUserMessage
+// 供单元测试注入桩;生产缺省动态 import,解析失败即降级不守门(规约条款 1:编排能力不得被
+// 增强功能拖垮)。
+function registerTurnGuard(ctx, { currentRunId, createUserMessage: injectedCreateUserMessage }) {
   // 事件面缺失的上下文(旧宿主 / 精简组合)不注册守门——编排本身照常可用
   if (typeof ctx.on !== 'function') return
   const nudgeGate = createNudgeGate()
-  let createUserMessage
+  let createUserMessage = injectedCreateUserMessage
   ctx.on('agent/turn-stopping', async ({ agent }) => {
     const runId = currentRunId(agent)
     if (runId === undefined) { return }

package/lib/release-registry.mjs

@@ -0,0 +1,134 @@
+// release-registry — 释放的注册形态(rc.1+:agentPresets.register 运行时注册,见 .compat/计划-rs-workflow-preset-rc1.md)
+// 与 release.mjs 的目录形态(0.1.2-0.1.5)并立;分派判据 = register 方法在场
+// (0.1.5 及以下的 agentPresets 是目录读取服务,同名但无 register)。
+// 运行态:flowId → 注销 disposer 的模块级单例;board 行是唯一注册方,行卸载时
+// disposeAllRegistered 统一注销(热重载 = 清空后重放,规避宿主 Duplicate 抛错)。
+import { FLOW_ID_RE, presetMeta, releaseFlowTemplate, unreleaseFlowTemplate } from './release.mjs'
+import { validateTemplate } from './template.mjs'
+import { skeletonRows } from './skeleton.mjs'
+import { loadJson, saveJson } from './storage.mjs'
+
+const PRESET_ID_PREFIX = 'rs-'
+// 注册预设排在官方 standard(order 1)之后
+const PRESET_ORDER = 100
+
+// 目录形态兜底用的家目录透传(测试注入临时目录;生产省略走 env 解析)
+export function registryFormAvailable(agentPresets) {
+  return typeof agentPresets?.register === 'function'
+}
+
+// 注册形态服务运行态:board 行注入时设置,行卸载清理时清除;template-tool 等
+// 非 board 上下文的释放动作经 currentAgentPresets 取当值分派
+let currentService
+export function setAgentPresets(service) {
+  currentService = service
+}
+export function currentAgentPresets() {
+  return currentService
+}
+
+// released 标志落盘(注册形态的释放事实源 = templates.json;目录形态事实源 =
+// 目录本身,标志仅冗余)。持久化形状与 normalizeTemplates 同约:仅 true 存字段,
+// 撤销即删字段。模板不存在时静默跳过
+export function markReleased(id, released) {
+  const raw = loadJson('templates.json', [])
+  const entry = raw.find((t) => t.id === id)
+  if (entry === undefined) return
+  if (released === true) entry.released = true
+  else delete entry.released
+  saveJson('templates.json', raw)
+}
+
+// 流程 id 校验收口(目录/注册两形态共用同一规则)
+function normalizeFlowId(entry) {
+  const flowId = typeof entry?.id === 'string' ? entry.id.trim() : ''
+  if (!FLOW_ID_RE.test(flowId)) throw new Error(`流程 id 非法: ${JSON.stringify(entry?.id)}(须匹配 ${FLOW_ID_RE.source})`)
+  return flowId
+}
+
+// 注册定义:骨架行(rows,已按 flowId 改写 templateId)+ 展示元数据
+// 注册前完成全部校验,失败不触达宿主注册表
+function buildDefinition(flowId, entry, rows) {
+  let parsed
+  try {
+    parsed = JSON.parse(entry.json)
+  } catch (error) {
+    throw new Error(`模板 JSON 解析失败: ${error.message}`)
+  }
+  const errors = validateTemplate(parsed)
+  if (errors.length > 0) throw new Error('模板校验失败:\n' + errors.map((e) => `${e.target}: ${e.message}`).join('\n'))
+  const { name, description } = presetMeta(entry, flowId)
+  return { id: PRESET_ID_PREFIX + flowId, name, description, order: PRESET_ORDER, plugins: rows }
+}
+
+const disposers = new Map()
+
+async function registerDefinition(agentPresets, definition) {
+  const previous = disposers.get(definition.id)
+  const replaced = previous !== undefined
+  if (replaced) {
+    disposers.delete(definition.id)
+    await previous()
+  }
+  const dispose = await agentPresets.register(definition)
+  disposers.set(definition.id, dispose)
+  // register 对挂载失败不抛(record.broken);回读名单把 broken 透出,防假成功。
+  // broken 是诊断不是失败:定义已注册在案,可正常注销
+  const roster = await agentPresets.list()
+  const row = roster.find((item) => item.id === definition.id)
+  return { replaced, broken: row?.broken === undefined ? undefined : String(row.broken) }
+}
+
+// 释放:注册形态优先,无 register 的宿主回落目录形态。
+// 返回 {form, outcome, presetId, broken?};outcome ∈ created|updated|removed|missing|foreign|failed
+export async function releaseTemplateVia(agentPresets, entry, rowsOf = (flowId) => skeletonRows(flowId), options = {}) {
+  if (!registryFormAvailable(agentPresets)) {
+    return { form: 'dir', outcome: releaseFlowTemplate(entry, options.dshHome) }
+  }
+  const flowId = normalizeFlowId(entry)
+  const definition = buildDefinition(flowId, entry, rowsOf(flowId))
+  try {
+    const { replaced, broken } = await registerDefinition(agentPresets, definition)
+    return { form: 'registry', outcome: replaced ? 'updated' : 'created', presetId: definition.id, ...(broken === undefined ? {} : { broken }) }
+  } catch (error) {
+    return { form: 'registry', outcome: 'failed', presetId: definition.id, broken: error.message }
+  }
+}
+
+export async function unreleaseTemplateVia(agentPresets, flowId, options = {}) {
+  if (!registryFormAvailable(agentPresets)) {
+    return { form: 'dir', outcome: unreleaseFlowTemplate(flowId, options.dshHome) }
+  }
+  const id = PRESET_ID_PREFIX + normalizeFlowId({ id: flowId })
+  const dispose = disposers.get(id)
+  if (dispose === undefined) return { form: 'registry', outcome: 'missing', presetId: id }
+  disposers.delete(id)
+  await dispose()
+  return { form: 'registry', outcome: 'removed', presetId: id }
+}
+
+// 启动重放:board 行激活时对已释放模板逐一注册。校验类失败(抛错)收敛为
+// failed 条目,不阻断其余;单条注册服务错误同理
+export async function replayReleased(agentPresets, entries, rowsOf = (flowId) => skeletonRows(flowId)) {
+  const results = []
+  for (const entry of entries) {
+    try {
+      results.push(await releaseTemplateVia(agentPresets, entry, rowsOf))
+    } catch (error) {
+      results.push({ form: 'registry', outcome: 'failed', broken: error.message })
+    }
+  }
+  return results
+}
+
+// 行卸载清理:注销全部注册定义(热重载后由重放重建)
+export async function disposeAllRegistered() {
+  const pending = [...disposers.values()]
+  disposers.clear()
+  for (const dispose of pending) {
+    try {
+      await dispose()
+    } catch { /* 单条注销失败不阻断其余 */ }
+  }
+  return pending.length
+}