@godv61/dsh-task-engine 0.24.0 → 0.26.0

package/.workflow-test.mjs

@@ -5,14 +5,41 @@ import { tmpdir } from 'node:os'
 import { join, resolve, sep } from 'node:path'
 import { registerDevTask } from './lib/dev-task.js'
 import { newTask } from './lib/engine.js'
-import { resolveFlow } from './lib/workflows.js'
+import { adoptRecommendation, resolveFlow } from './lib/workflows.js'
 import Controller from './lib/controller.js'
 import { registerShippedSkills } from './lib/shipped-skills.js'
 
+/**
+ * The preset as a project would actually run it: the skeleton plus the shipped
+ * recommendation, adopted exactly the way a user adopts it. A test that asserts
+ * on bindings, commit rules or artifacts wants this, because those no longer come
+ * from the preset itself.
+ * @param {string} id - preset id.
+ * @returns {import('./lib/engine.js').WorkflowConfig} the adopted config.
+ */
+function adoptedFlow(id, extra) {
+  const base = adoptRecommendation(id)
+  if (base === undefined) throw new Error('unknown preset: ' + id)
+  return resolveFlow(id, { ...base, ...extra }).config
+}
+
+
 function fixture(stage = '开发', extra = {}, services = {}) {
   const cwd = resolve('test-project')
-  const config = resolveFlow('standard', { stage_bindings: { 完成: { skills: [{ skill: { source: 'bundled', name: 'software-testing' }, rules: [] }] } } }).config
-  const state = newTask({ id: 'LIVE-1', title: 'EAM regression', branch: 'test', work_size: 'standard', risk_level: 'standard', flow: { flow: 'standard', version: 2, config }, root: cwd })
+  // A project running the standard flow: the skeleton plus the adopted
+  // recommendation, with one extra skill mounted on 完成 for the tests that need
+  // a binding beyond the shipped set. The bindings are MERGED, not replaced —
+  // replacing them would drop the recommended skills and artifacts the tests
+  // assert on, since the preset skeleton itself carries none.
+  const adopted = adoptRecommendation('standard')
+  const config = resolveFlow('standard', {
+    ...adopted,
+    stage_bindings: {
+      ...adopted.stage_bindings,
+      完成: { skills: [{ skill: { source: 'bundled', name: 'software-testing' }, rules: [] }] },
+    },
+  }).config
+  const state = newTask({ id: 'LIVE-1', title: 'EAM regression', branch: 'test', work_size: 'standard', risk_level: 'standard', flow: { flow: 'standard', version: 3, config }, root: cwd })
   Object.assign(state, { stage, execution_version: 1, files: ['app.js'], requirement_confirmed: true, solution_confirmed: true, ...extra })
   const records = new Map([[join(cwd, '.dsh/task-LIVE-1.json'), JSON.stringify(state)], [join(cwd, 'app.js'), 'source']])
   const events = [], runs = []
@@ -48,6 +75,92 @@ function fixture(stage = '开发', extra = {}, services = {}) {
     state: () => JSON.parse(records.get(join(cwd, '.dsh/task-LIVE-1.json'))) }
 }
 
+test('manual skill evidence is approved by the host without a shell command', async () => {
+  const config = resolveFlow('minimal', { flow: 'minimal', stage_bindings: {
+    '开发': { skills: [{ skill: { source: 'project', name: 'human-check' }, rules: [], evidence: 'manual' }] },
+  } }).config
+  const approvals = []
+  const f = fixture('开发', { flow: { flow: 'minimal', version: 3, config } }, {
+    approval: { request: async request => { approvals.push(request); return 'allowed-once' } },
+  })
+  f.load('human-check')
+  await f.call({ operation: 'skill_result', skill_name: 'human-check', evidence: ['checked by owner'] })
+  assert.equal(f.runs.length, 0)
+  assert.equal(approvals.length, 1)
+  assert.equal(f.state().skill_results['开发']['human-check'].approved, true)
+  assert.deepEqual(JSON.parse(await f.call({ operation: 'status' })).skill_blockers, [])
+  const denied = fixture('开发', { flow: { flow: 'minimal', version: 3, config } }, {
+    approval: { request: async () => 'rejected' },
+  })
+  denied.load('human-check')
+  await assert.rejects(denied.call({ operation: 'skill_result', skill_name: 'human-check', evidence: ['claimed approval'] }), /not approved/)
+  assert.equal(denied.state().skill_results?.['开发']?.['human-check'], undefined)
+})
+
+test('completion rejects unresolved terminal skills and rules', async () => {
+  const config = resolveFlow('minimal', { flow: 'minimal', stage_bindings: {
+    '交付': { skills: [{ skill: { source: 'project', name: 'must-run' }, rules: [{ source: 'project', name: 'missing' }], evidence: 'command' }] },
+  } }).config
+  const f = fixture('交付', {
+    flow: { flow: 'minimal', version: 3, config },
+    items: [{ id: 'A', title: 'small', status: 'done', review: { spec: { outcome: 'pass' }, quality: { outcome: 'pass' } } }],
+    commits: [{ label: 'TASK', hash: 'abcdef1' }],
+  })
+  const status = JSON.parse(await f.call({ operation: 'status' }))
+  assert.ok(status.skill_blockers.length > 0)
+  assert.ok(status.missing_rules.length > 0)
+  await assert.rejects(f.call({ operation: 'complete' }), /cannot complete.*must-run|cannot complete.*missing/)
+  assert.equal(f.state().completed, undefined)
+})
+
+test('same-named skill and rule freeze separately and disclose the rule body', async () => {
+  const f = fixture()
+  f.records.delete(join(f.cwd, '.dsh/task-LIVE-1.json'))
+  f.records.set(join(f.cwd, '.dsh/eng.json'), JSON.stringify({ flow: 'minimal', stage_bindings: {
+    '开发': { skills: [{ skill: { source: 'project', name: 'custom' }, rules: [{ source: 'project', name: 'custom' }], evidence: 'none' }] },
+  } }))
+  f.records.set(join(f.cwd, '.dsh/skills/custom/SKILL.md'), 'SKILL BODY')
+  f.records.set(join(f.cwd, '.dsh/rules/custom.md'), 'RULE BODY')
+  await f.call({ operation: 'create', title: 'collision', branch: 'main', files: ['app.js'] })
+  const resources = f.state().flow.resources.filter(resource => resource.ref.name === 'custom')
+  assert.deepEqual(resources.map(resource => resource.kind).sort(), ['rule', 'skill'])
+  assert.equal(JSON.parse(await f.call({ operation: 'status' })).bindings.rules[0].content, 'RULE BODY')
+  f.records.set(join(f.cwd, '.dsh/skills/custom/SKILL.md'), 'CHANGED SKILL')
+  assert.equal(JSON.parse(await f.call({ operation: 'status' })).bindings.skill_contents[0].content, 'SKILL BODY')
+})
+
+test('task creation applies skill_profiles rules even when legacy inline bindings are empty', async () => {
+  const f = fixture()
+  const skill = { source: 'project', name: 'custom' }
+  const rule = { source: 'project', name: 'my-rule' }
+  f.records.delete(join(f.cwd, '.dsh/task-LIVE-1.json'))
+  f.records.set(join(f.cwd, '.dsh/eng.json'), JSON.stringify({ flow: 'minimal',
+    stage_bindings: {
+      '开发': { skills: [{ skill, rules: [], evidence: 'none' }] },
+      '交付': { skills: [{ skill, rules: [], evidence: 'none' }] },
+    },
+    skill_profiles: { 'project:custom': { rules: [rule], evidence: 'none' } },
+  }))
+  f.records.set(join(f.cwd, '.dsh/skills/custom/SKILL.md'), 'SKILL BODY')
+  await assert.rejects(f.call({ operation: 'create', title: 'profile regression', branch: 'main', files: ['app.js'] }), /rule:project:my-rule/)
+  f.records.set(join(f.cwd, '.dsh/rules/my-rule.md'), 'RULE BODY')
+  await f.call({ operation: 'create', title: 'profile regression', branch: 'main', files: ['app.js'] })
+  assert.deepEqual(f.state().flow.config.stage_bindings['开发'].skills[0].rules, [rule])
+  assert.deepEqual(f.state().flow.config.stage_bindings['交付'].skills[0].rules, [rule])
+  assert.equal(f.state().flow.resources.find(resource => resource.kind === 'rule')?.content, 'RULE BODY')
+  assert.equal(JSON.parse(await f.call({ operation: 'status' })).bindings.rules[0].content, 'RULE BODY')
+})
+
+test('task creation rejects an unavailable skill or rule before writing a record', async () => {
+  const f = fixture()
+  f.records.delete(join(f.cwd, '.dsh/task-LIVE-1.json'))
+  f.records.set(join(f.cwd, '.dsh/eng.json'), JSON.stringify({ flow: 'minimal', stage_bindings: {
+    '开发': { skills: [{ skill: { source: 'project', name: 'missing-skill' }, rules: [] }] },
+  } }))
+  await assert.rejects(f.call({ operation: 'create', title: 'missing', branch: 'main' }), /unreadable bound resources/)
+  assert.equal(f.records.has(join(f.cwd, '.dsh/task-LIVE-1.json')), false)
+})
+
 test('审查通过后更新状态并激活下一项，保留已完成项的审计', async () => {
   const f = fixture()
   await f.call({ operation: 'items', items: [{ id: 'A', title: 'first', status: 'doing' }, { id: 'B', title: 'second' }] })
@@ -168,7 +281,7 @@ test('status 披露当前阶段记录字段和缺项，字段误用不写入且
 })
 
 test('记录字段来自冻结流程，精简流程不硬编码标准字段，无记录阶段返回空列表', async () => {
-  const config = resolveFlow('agile').config
+  const config = adoptedFlow('agile')
   const f = fixture('需求', { flow: { flow: 'agile', version: 1, config } })
   assert.deepEqual(JSON.parse(await f.call({ operation: 'status' })).artifact_requirements, [{ id: 'requirement', name: '需求说明', fields: ['scope'], missing_fields: ['scope'] }])
   await f.call({ operation: 'record', artifact: 'requirement', fields: { scope: '目标、验收与疑问' } })

package/README.md

@@ -27,7 +27,7 @@
 让 AI 修改代码时，你可以先明确需求，再检查方案、推进实施、验证结果，最后审核提交。DSH Task Engine 把这些步骤组织成可检查、可追踪的任务流程，适合在本机使用 DeepSeek Harness 开发个人项目。
 
 - **知道下一步做什么**：按所选流程推进，当前阶段需要的条件和产物清楚可查。
-- **复用自己的工作方法**：把技能和规则安装到项目或个人目录，再挂到对应阶段。
+- **复用自己的工作方法**：把技能和规则安装到项目或个人目录，将规则配置在技能下，再把技能挂到节点上；同一技能在任何节点都使用同一套约束。
 - **找得到过程记录**：任务台账集中查看阶段、实施项、验证与审核状态。
 
 ## 快速开始
@@ -51,22 +51,24 @@ dsh plugin --profile web add @godv61/dsh-task-engine
 | 页面 | 你可以做什么 |
 | :--- | :--- |
 | **项目初始化** | 查看或编辑 `AGENTS.md`，让 AI 生成项目说明，预览后保存。 |
-| **流程配置** | 选择内置流程，为各阶段追加技能和规则。 |
+| **流程配置** | 选择流程骨架，给节点挂技能，并在技能上配置它遵循的规则。需要现成起点时可「采用推荐配置」。 |
 | **任务台账** | 查看实施、验证和审核记录，按关键词、阶段或风险筛选。 |
-| **技能** | 选择技能文件夹，预览内容与目标目录后安装；支持查看、编辑和删除。 |
+| **技能** | 安装、编辑技能，并集中维护每个技能唯一的规则列表。 |
 | **规则** | 选择 Markdown 文件安装规则，维护项目或个人开发约定。 |
 
 内置技能和规则只读；项目与个人资源可编辑。安装、删除都会明确展示目标位置。
 
+**流程与工作方法是两回事。** 流程只决定工作怎么流转（阶段顺序与门禁），预设不自带任何技能或提交格式。要用什么技能、遵守哪些规则、提交信息写什么，都由你配置——「采用推荐配置」只是把一份现成的起点**写入**你的配置，之后完全归你：删掉的不再补回，升级也不覆盖。规则挂在技能下，所以打开一个技能看到的就是它完整的规则列表，挂到任何节点都一样。
+
 ## 选择适合这次任务的流程
 
 | 预设 | 阶段顺序 | 适用场景 |
 | :--- | :--- | :--- |
-| **标准研发** `standard` | 需求评审 → 设计 → 开发 → 交付 → 代码审核 → 完成 | 需要需求、方案和交付检查的完整开发任务。 |
-| **敏捷轻量** `agile` | 需求 → 开发 → 交付 → 审查 | 希望保留任务记录、减少阶段和产物的迭代。 |
-| **纯代码** `minimal` | 开发 → 交付 | 已明确做法的小改动。 |
+| **完整研发** `standard` | 需求评审 → 设计 → 开发 → 交付 → 代码审核 → 完成 | 需要需求、方案和交付检查的完整开发任务。 |
+| **日常迭代** `agile` | 需求 → 开发 → 交付 → 审查 | 目标明确的日常开发任务。 |
+| **快速修改** `minimal` | 开发 → 交付 | 已明确做法的小改动。 |
 
-当前版本的阶段顺序和检查条件由预设固定，默认技能/规则绑定只能追加。**可视化自定义流程不在计划内**——它把流程设计的负担转嫁给使用者，而三个内置流程已覆盖个人项目的常见需要，详见[功能规划](docs/roadmap.md)。
+阶段顺序和检查条件由预设固定；技能与规则由用户配置。选择流程不会强制加入内置技能；需要现成起点时可显式采用推荐配置。**可视化自定义流程不在计划内**，详见[功能规划](docs/roadmap.md)。
 
 ## 把自己的技能和规则带进来
 
@@ -96,7 +98,7 @@ dsh plugin --profile web add @godv61/dsh-task-engine
 
 ## 能力说明
 
-`dev_task` 按配置检查阶段、产物和提交条件。0.23.1 新任务验证要求真实命令回执；附加技能的回执要求可在任务状态中查看，内置技能使用已有的记录、验证、审核和提交操作。任务保存创建时的流程快照，之后修改项目配置不会直接改变进行中的任务。
+`dev_task` 按配置检查阶段、产物和提交条件。新任务的验证要求真实命令回执；技能可按自身配置要求命令、产物、审核、人工批准或无需额外证据，执行义务可在任务状态中查看。任务保存创建时的流程与资源快照，之后修改项目配置不会直接改变进行中的任务。
 
 审核结论、实施项完成情况和测试覆盖面仍需要你判断。本地提交钩子提供即时检查，不能替代人工审核或项目自己的 CI。详细说明见[常见问题](docs/faq.md)。
 

package/cordis.patch.yml

@@ -1,11 +1,11 @@
-# dsh-task-engine bundle: one host-plane row that mounts the `task-engine`
-# Remote namespace (what the browser workbench reads/writes) plus, via
-# `dsh.client`, the workbench UI. This host row registers NO model-facing tool
-# and NO skill — `dev_task` and the shipped skills live on the AGENT plane,
-# behind the `@godv61/dsh-task-engine/agent` entry. A preset's
-# `agent.cordis.yml` names that agent row to activate the flow for its
-# sessions; presets that never name it get neither the tool nor the skills
-# (the workbench stays available so a human can still configure the flow).
-- insert:
-    - id: task-engine
+# dsh-task-engine bundle: one host-plane row that mounts the `task-engine`
+# Remote namespace (what the browser workbench reads/writes) plus, via
+# `dsh.client`, the workbench UI. This host row registers NO model-facing tool
+# and NO skill — `dev_task` and the shipped skills live on the AGENT plane,
+# behind the `@godv61/dsh-task-engine/agent` entry. A preset's
+# `agent.cordis.yml` names that agent row to activate the flow for its
+# sessions; presets that never name it get neither the tool nor the skills
+# (the workbench stays available so a human can still configure the flow).
+- insert:
+    - id: task-engine
       name: '@godv61/dsh-task-engine'

package/defaults/eng.json

@@ -2,48 +2,96 @@
   "flow": "standard",
   "stage_bindings": {
     "需求评审": {
-      "skills": [
+      "skill_refs": [
         {
-          "skill": { "source": "bundled", "name": "requirement-analysis" },
-          "rules": [{ "source": "bundled", "name": "security-redlines" }]
+          "source": "bundled",
+          "name": "requirement-analysis"
         }
       ]
     },
     "设计": {
-      "skills": [
-        { "skill": { "source": "bundled", "name": "solution-design" }, "rules": [] }
+      "skill_refs": [
+        {
+          "source": "bundled",
+          "name": "solution-design"
+        }
       ]
     },
     "开发": {
-      "skills": [
+      "skill_refs": [
         {
-          "skill": { "source": "bundled", "name": "code-implement" },
-          "rules": [
-            { "source": "bundled", "name": "coding-conventions" },
-            { "source": "bundled", "name": "security-redlines" }
-          ]
+          "source": "bundled",
+          "name": "code-implement"
         }
       ]
     },
     "交付": {
-      "skills": [
-        { "skill": { "source": "bundled", "name": "code-verify" }, "rules": [] }
+      "skill_refs": [
+        {
+          "source": "bundled",
+          "name": "code-verify"
+        }
       ]
     },
     "代码审核": {
-      "skills": [
+      "skill_refs": [
+        {
+          "source": "bundled",
+          "name": "code-review"
+        },
+        {
+          "source": "bundled",
+          "name": "code-commit"
+        }
+      ]
+    }
+  },
+  "skill_profiles": {
+    "bundled:requirement-analysis": {
+      "rules": [
+        {
+          "source": "bundled",
+          "name": "security-redlines"
+        }
+      ]
+    },
+    "bundled:solution-design": {
+      "rules": []
+    },
+    "bundled:code-implement": {
+      "rules": [
         {
-          "skill": { "source": "bundled", "name": "code-review" },
-          "rules": [
-            { "source": "bundled", "name": "coding-conventions" },
-            { "source": "bundled", "name": "security-redlines" }
-          ]
+          "source": "bundled",
+          "name": "coding-conventions"
         },
         {
-          "skill": { "source": "bundled", "name": "code-commit" },
-          "rules": [{ "source": "bundled", "name": "commit-conventions" }]
+          "source": "bundled",
+          "name": "security-redlines"
+        }
+      ]
+    },
+    "bundled:code-verify": {
+      "rules": []
+    },
+    "bundled:code-review": {
+      "rules": [
+        {
+          "source": "bundled",
+          "name": "coding-conventions"
+        },
+        {
+          "source": "bundled",
+          "name": "security-redlines"
+        }
+      ]
+    },
+    "bundled:code-commit": {
+      "rules": [
+        {
+          "source": "bundled",
+          "name": "commit-conventions"
         }
       ]
     }
   }
-}
+}