@dommaker/harness 1.8.1 → 1.10.0

package/src/__tests__/checker-extra.test.ts

@@ -54,9 +54,9 @@ describe('ConstraintChecker - 补充覆盖', () => {
 
       const result = checker.findApplicableConstraints(context);
 
-      expect(result.ironLaws.length).toBeGreaterThan(0);
+      expect(result.errors.length).toBeGreaterThan(0);
       expect(
-        result.ironLaws.some((c: any) => c.id === 'no_completion_without_verification')
+        result.errors.some(c => c.id === 'no_completion_without_verification')
       ).toBe(true);
     });
 
@@ -68,9 +68,9 @@ describe('ConstraintChecker - 补充覆盖', () => {
       const result = checker.findApplicableConstraints(context);
 
       // file_creation 可能没有任何约束匹配
-      // 这个测试的目的是验证 filterByTrigger 逻辑
-      expect(Array.isArray(result.ironLaws)).toBe(true);
-      expect(Array.isArray(result.guidelines)).toBe(true);
+      // 这个测试的目的是验证按 trigger 过滤逻辑
+      expect(Array.isArray(result.errors)).toBe(true);
+      expect(Array.isArray(result.warnings)).toBe(true);
     });
   });
 
@@ -99,25 +99,25 @@ describe('ConstraintChecker - 补充覆盖', () => {
       await expect(checkBeforeExecution(context)).rejects.toThrow();
     });
 
-    it('customConfig 应替换内置集（空配置不检查内置铁律）', async () => {
+    it('customConfig 应替换内置集（空配置不检查内置 error 级约束）', async () => {
       const context: ConstraintContext = {
         operation: 'code_implementation',
         hasTest: false,
         hasVerificationEvidence: false,
       };
 
-      // 内置铁律下违规抛错
+      // 内置 error 级约束下违规抛错
       await expect(checkBeforeExecution(context)).rejects.toThrow();
 
       // 空 customConfig 替换内置集 → 不抛
       await expect(
-        checkBeforeExecution(context, { ironLaws: {}, guidelines: {}, disabled: [], custom: [] })
+        checkBeforeExecution(context, { constraints: {}, disabled: [] })
       ).resolves.not.toThrow();
     });
   });
 
   describe('checkConstraints 完整流程', () => {
-    it('应该返回完整的三层检查结果', async () => {
+    it('应该返回完整的检查结果', async () => {
       const context: ConstraintContext = {
         operation: 'commit',
         projectPath: tempDir,
@@ -127,8 +127,8 @@ describe('ConstraintChecker - 补充覆盖', () => {
 
       const result = await checkConstraints(context);
 
-      expect(result.ironLaws).toBeDefined();
-      expect(result.guidelines).toBeDefined();
+      expect(result.errors).toBeDefined();
+      expect(result.warnings).toBeDefined();
       expect(typeof result.passed).toBe('boolean');
       expect(typeof result.warningCount).toBe('number');
     });
@@ -137,80 +137,57 @@ describe('ConstraintChecker - 补充覆盖', () => {
   describe('自定义约束配置', () => {
     it('per-request customConfig 应该生效', () => {
       const constraints = checker.getConstraints({
-        ironLaws: {},
-        guidelines: {},
+        constraints: {},
         disabled: [],
-        custom: [],
       });
 
-      expect(constraints.ironLaws).toEqual({});
-      expect(constraints.guidelines).toEqual({});
+      expect(constraints).toEqual({});
     });
 
-    it('checkConstraint 带 customConfig 应命中自定义约束', async () => {
-      const context: ConstraintContext = { operation: 'file_modification' };
+    it('checkConstraint 带 customConfig 应命中配置内约束', async () => {
+      const context: ConstraintContext = {
+        operation: 'code_implementation',
+        hasVerificationEvidence: true,
+      };
       const customConfig = {
-        ironLaws: {
-          test_only: {
-            id: 'test_only',
-            kind: 'prompt' as const,
-            level: 'iron_law' as const,
+        constraints: {
+          no_completion_without_verification: {
+            id: 'no_completion_without_verification',
+            kind: 'check' as const,
+            severity: 'error' as const,
             rule: 'TEST',
             message: 'test',
-            trigger: 'file_modification',
+            trigger: 'code_implementation',
             enforcement: 'test',
           },
         },
-        guidelines: {},
         disabled: [] as string[],
-        custom: [] as string[],
       };
 
-      // 不带 customConfig：自定义约束不可见
+      // 不带 customConfig：未生效的 id 不可见
       const missing = await checkConstraint('test_only', context);
       expect(missing.satisfied).toBe(false);
       expect(missing.message).toContain('未知的约束');
 
-      // 带 customConfig：命中（prompt kind 直接 pass）
-      const hit = await checkConstraint('test_only', context, customConfig);
-      expect(hit.id).toBe('test_only');
+      // 带 customConfig：命中配置内约束
+      const hit = await checkConstraint('no_completion_without_verification', context, customConfig);
+      expect(hit.id).toBe('no_completion_without_verification');
       expect(hit.satisfied).toBe(true);
     });
   });
 
-  describe('getSeverity', () => {
-    it('iron_law 应该返回 error', async () => {
-      const context: ConstraintContext = {
-        operation: 'code_implementation',
-        hasTest: true,
-      };
-
-      const result = await checker.check(
-        {
-          id: 'test_severity_iron',
-          kind: 'prompt',
-          level: 'iron_law',
-          rule: 'TEST',
-          message: 'test',
-          trigger: 'code_implementation',
-          enforcement: 'test',
-        },
-        context
-      );
-
-      expect(result).toBeDefined();
-    });
-
-    it('guideline 应该返回 warning', async () => {
+  describe('severity 透传', () => {
+    it('check 结果带约束定义的 severity', async () => {
       const context: ConstraintContext = {
         operation: 'code_implementation',
+        hasVerificationEvidence: true,
       };
 
       const result = await checker.check(
         {
-          id: 'test_severity_guideline',
-          kind: 'prompt',
-          level: 'guideline',
+          id: 'no_completion_without_verification',
+          kind: 'check',
+          severity: 'error',
           rule: 'TEST',
           message: 'test',
           trigger: 'code_implementation',
@@ -219,9 +196,8 @@ describe('ConstraintChecker - 补充覆盖', () => {
         context
       );
 
-      expect(result).toBeDefined();
+      expect(result.severity).toBe('error');
     });
-
   });
 
   describe('checkConstraint 快捷函数', () => {
@@ -251,8 +227,8 @@ describe('ConstraintChecker - 补充覆盖', () => {
     });
   });
 
-  describe('checkConstraints Iron Law 违规', () => {
-    it('Iron Law 违规应该抛出 ConstraintViolationError', async () => {
+  describe('checkConstraints error 级违规', () => {
+    it('error 级违规应该抛出 ConstraintViolationError', async () => {
       const context: ConstraintContext = {
         operation: 'code_implementation',
         hasTest: false,

package/src/__tests__/checker.test.ts

@@ -1,15 +1,13 @@
 /**
  * checker.ts 测试
  *
- * ADR-0001：只覆盖存活 check 约束的 checker 行为；
- * prompt 类约束的短路语义见 'Prompt constraints' 一节；
- * 已退役/被吸收约束的用例随之移除。
+ * ADR-0029：只覆盖存活 check 约束的 checker 行为；
+ * prompt 面已删除，其短路用例随之移除。
  */
 
 import { ConstraintChecker, checkConstraint } from '../core/constraints/checker';
-import { PROMPTS } from '../core/constraints/definitions';
 import type { ConstraintContext } from '../types/constraint';
-import { writeFileSync, rmSync, mkdtempSync } from 'fs';
+import { rmSync, mkdtempSync } from 'fs';
 import { join } from 'path';
 import { tmpdir } from 'os';
 
@@ -31,42 +29,7 @@ describe('ConstraintChecker', () => {
     }
   });
 
-  describe('Iron Laws', () => {
-    it('should check no_bypass_checkpoint with skip patterns', async () => {
-      // 创建包含 skip 的文件
-      const skipFile = join(tempDir, 'skip-test.ts');
-      writeFileSync(skipFile, 'test.skip("skipped test", () => {});');
-
-      const context: ConstraintContext = {
-        operation: 'code_implementation',
-        changedFiles: [skipFile],
-      };
-
-      const result = await checker.check(
-        { id: 'no_bypass_checkpoint', kind: 'check', level: 'guideline', rule: 'NO BYPASS', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
-        context
-      );
-
-      expect(result.satisfied).toBe(false);
-    });
-
-    it('should pass no_bypass_checkpoint without skip patterns', async () => {
-      const normalFile = join(tempDir, 'normal-test.ts');
-      writeFileSync(normalFile, 'test("normal test", () => { expect(true).toBe(true); });');
-
-      const context: ConstraintContext = {
-        operation: 'code_implementation',
-        changedFiles: [normalFile],
-      };
-
-      const result = await checker.check(
-        { id: 'no_bypass_checkpoint', kind: 'check', level: 'guideline', rule: 'NO BYPASS', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
-        context
-      );
-
-      expect(result.satisfied).toBe(true);
-    });
-
+  describe('error 级约束', () => {
     it('should check no_completion_without_verification', async () => {
       const contextWithEvidence: ConstraintContext = {
         operation: 'code_implementation',
@@ -79,71 +42,21 @@ describe('ConstraintChecker', () => {
       };
 
       const resultWithEvidence = await checker.check(
-        { id: 'no_completion_without_verification', kind: 'check', level: 'iron_law', rule: 'NO COMPLETION', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
+        { id: 'no_completion_without_verification', kind: 'check', severity: 'error', rule: 'NO COMPLETION', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
         contextWithEvidence
       );
 
       const resultWithoutEvidence = await checker.check(
-        { id: 'no_completion_without_verification', kind: 'check', level: 'iron_law', rule: 'NO COMPLETION', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
+        { id: 'no_completion_without_verification', kind: 'check', severity: 'error', rule: 'NO COMPLETION', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
         contextWithoutEvidence
       );
 
       expect(resultWithEvidence.satisfied).toBe(true);
       expect(resultWithoutEvidence.satisfied).toBe(false);
     });
-
-    it('should check incremental_progress', async () => {
-      const contextWithSingleTask: ConstraintContext = {
-        operation: 'code_implementation',
-        hasSingleTask: true,
-      };
-
-      const contextWithMultipleTasks: ConstraintContext = {
-        operation: 'code_implementation',
-        hasSingleTask: false,
-      };
-
-      const resultWith = await checker.check(
-        { id: 'incremental_progress', kind: 'check', level: 'iron_law', rule: 'ONE TASK', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
-        contextWithSingleTask
-      );
-
-      const resultWithout = await checker.check(
-        { id: 'incremental_progress', kind: 'check', level: 'iron_law', rule: 'ONE TASK', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
-        contextWithMultipleTasks
-      );
-
-      expect(resultWith.satisfied).toBe(true);
-      expect(resultWithout.satisfied).toBe(false);
-    });
-
-    it('should check no_implementation_without_requirement', async () => {
-      const contextWithRequirement: ConstraintContext = {
-        operation: 'code_implementation',
-        hasRequirement: true,
-      };
-
-      const contextWithoutRequirement: ConstraintContext = {
-        operation: 'code_implementation',
-        hasRequirement: false,
-      };
-
-      const resultWith = await checker.check(
-        { id: 'no_implementation_without_requirement', kind: 'check', level: 'iron_law', rule: 'REQ EXISTS', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
-        contextWithRequirement
-      );
-
-      const resultWithout = await checker.check(
-        { id: 'no_implementation_without_requirement', kind: 'check', level: 'iron_law', rule: 'REQ EXISTS', message: 'test', trigger: 'code_implementation', enforcement: 'test' },
-        contextWithoutRequirement
-      );
-
-      expect(resultWith.satisfied).toBe(true);
-      expect(resultWithout.satisfied).toBe(false);
-    });
   });
 
-  describe('Guidelines', () => {
+  describe('warning 级约束', () => {
     it('should check capability_sync without CAPABILITIES.md', async () => {
       // 注意：tempDir 在 harness 仓库内，如果有缓存的变更，会检查到代码变更
       // 所以需要创建一个无代码变更的场景或创建 CAPABILITIES.md
@@ -159,7 +72,7 @@ describe('ConstraintChecker', () => {
       fs.writeFileSync(capabilitiesPath, '# Capabilities\n');
 
       const result = await checker.check(
-        { id: 'capability_sync', kind: 'check', level: 'guideline', rule: 'CAPABILITY SYNC', message: 'test', trigger: 'commit', enforcement: 'test' },
+        { id: 'capability_sync', kind: 'check', severity: 'warning', rule: 'CAPABILITY SYNC', message: 'test', trigger: 'commit', enforcement: 'test' },
         context
       );
 
@@ -171,24 +84,6 @@ describe('ConstraintChecker', () => {
     });
   });
 
-  describe('Prompt constraints（ADR-0001：不执行 checker，check() 短路 satisfied）', () => {
-    it('所有内置 prompt 约束 check() 均短路通过', async () => {
-      const context: ConstraintContext = { operation: 'code_implementation' };
-      for (const prompt of Object.values(PROMPTS)) {
-        const result = await checker.check(prompt, context);
-        expect(result.satisfied).toBe(true);
-      }
-    });
-
-    it('prompt 短路不产生 requiredAction/message', async () => {
-      const context: ConstraintContext = { operation: 'code_implementation' };
-      const result = await checker.check(PROMPTS['no_fix_without_root_cause'], context);
-      expect(result.satisfied).toBe(true);
-      expect(result.message).toBeUndefined();
-      expect(result.requiredAction).toBeUndefined();
-    });
-  });
-
   describe('Helper functions', () => {
     it('should check single constraint via checkConstraint', async () => {
       const context: ConstraintContext = {
@@ -205,8 +100,8 @@ describe('ConstraintChecker', () => {
         operation: 'code_implementation',
       };
 
-      const result = await checkConstraint('no_fuzzy_completion_claim', context);
-      expect(result.id).toBe('no_fuzzy_completion_claim');
+      const result = await checkConstraint('no_completion_without_verification', context);
+      expect(result.id).toBe('no_completion_without_verification');
       expect(result.satisfied).toBe(true);
     });
 

package/src/__tests__/effective-constraints.test.ts

@@ -1,7 +1,8 @@
 /**
  * 生效约束集（getEffectiveConstraints / lintEffectiveConfig）测试
  *
- * 合并矩阵：preset 裁剪 / config.yml 禁用 / custom 追加 / scenes 过滤 / 未知 id 诊断
+ * 合并矩阵（ADR-0029）：preset 裁剪 / config.yml 禁用 / 未知 id 诊断
+ * （custom 追加与 scenes 过滤已随文本注入层关停一并退役）
  */
 
 import { describe, it, expect, beforeEach, afterEach } from '@jest/globals';
@@ -11,25 +12,19 @@ import {
   lintEffectiveConfig,
 } from '../core/effective-constraints';
 import { createProjectFixture } from '../test-setup/project-fixture';
-import { IRON_LAWS, GUIDELINES, PROMPTS } from '../core/constraints/definitions';
+import { CONSTRAINTS } from '../core/constraints/definitions';
 
-const BUILTIN_TOTAL =
-  Object.keys(IRON_LAWS).length + Object.keys(GUIDELINES).length + Object.keys(PROMPTS).length;
-/** 带 appliesTo 标签的内置 prompt（scenes 过滤对象） */
-const SCENE_PROMPTS = Object.values(PROMPTS)
-  .filter(c => c.appliesTo && c.appliesTo.length > 0)
-  .map(c => c.id);
+const BUILTIN_TOTAL = Object.keys(CONSTRAINTS).length;
 
 describe('getEffectiveConstraints / lintEffectiveConfig', () => {
   let tempDir: string;
   let counter = 0;
 
-  const setupProject = (configYaml?: string, customYaml?: string): string =>
+  const setupProject = (configYaml?: string): string =>
     createProjectFixture({
       parentDir: tempDir,
       name: `p${counter++}`,
       config: configYaml,
-      files: customYaml === undefined ? undefined : { '.harness/custom-constraints.yml': customYaml },
     });
 
   beforeEach(() => {
@@ -42,65 +37,28 @@ describe('getEffectiveConstraints / lintEffectiveConfig', () => {
   });
 
   describe('合并矩阵', () => {
-    it('无配置项目：内置全集减去场景专属 prompt（scenes 缺省为空）', () => {
+    it('无配置项目：内置全集（全部 kind=check，带 severity）', () => {
       const dir = setupProject();
       const constraints = getEffectiveConstraints(dir);
-      const ids = constraints.map(c => c.id);
-
-      expect(constraints.length).toBe(BUILTIN_TOTAL - SCENE_PROMPTS.length);
-      for (const id of SCENE_PROMPTS) {
-        expect(ids).not.toContain(id);
-      }
-      // check + prompt 均带 kind
-      expect(constraints.every(c => c.kind === 'check' || c.kind === 'prompt')).toBe(true);
-      expect(constraints.filter(c => c.kind === 'check')).toHaveLength(
-        Object.keys(IRON_LAWS).length + Object.keys(GUIDELINES).length
-      );
-    });
-
-    it('scenes 命中：对应场景 prompt 进入生效集，其余场景 prompt 仍排除', () => {
-      const dir = setupProject(`scenes:\n  - agent-skill\n`);
-      const ids = getEffectiveConstraints(dir).map(c => c.id);
 
-      expect(ids).toContain('no_skill_without_test');
-      expect(ids).not.toContain('no_model_for_deterministic');
+      expect(constraints.length).toBe(BUILTIN_TOTAL);
+      expect(constraints.every(c => c.kind === 'check')).toBe(true);
     });
 
-    it('config.yml 禁用：check 与 prompt 条目均从生效集移除', () => {
+    it('config.yml 禁用：条目从生效集移除', () => {
       const dir = setupProject(`
 constraints:
-  no_bypass_checkpoint:
+  capability_sync:
     enabled: false
-  no_fuzzy_completion_claim:
+  docs_freshness:
     enabled: false
 `);
       const constraints = getEffectiveConstraints(dir);
       const ids = constraints.map(c => c.id);
 
-      expect(ids).not.toContain('no_bypass_checkpoint');
-      expect(ids).not.toContain('no_fuzzy_completion_claim');
-      expect(constraints.length).toBe(BUILTIN_TOTAL - SCENE_PROMPTS.length - 2);
-    });
-
-    it('config.yml 禁用：custom 约束同样从生效集移除（retire 落 config.yml 的退役路径）', () => {
-      const dir = setupProject(
-        `
-constraints:
-  my_project_rule:
-    enabled: false
-`,
-        `
-custom_constraints:
-  my_project_rule:
-    level: iron_law
-    rule: MY RULE
-    message: 项目自定义
-`
-      );
-      const constraints = getEffectiveConstraints(dir);
-      const ids = constraints.map(c => c.id);
-
-      expect(ids).not.toContain('my_project_rule');
+      expect(ids).not.toContain('capability_sync');
+      expect(ids).not.toContain('docs_freshness');
+      expect(constraints.length).toBe(BUILTIN_TOTAL - 2);
     });
 
     it('preset: relaxed 裁剪生效集', () => {
@@ -111,33 +69,13 @@ custom_constraints:
       expect(ids).toEqual(
         expect.arrayContaining([
           'no_completion_without_verification',
-          'incremental_progress',
-          'no_implementation_without_requirement',
-          'no_bypass_checkpoint',
           'no_hardcoded_credentials',
         ])
       );
-      expect(constraints).toHaveLength(5);
+      expect(constraints).toHaveLength(2);
       expect(constraints.every(c => c.kind === 'check')).toBe(true);
     });
 
-    it('custom-constraints.yml 追加自定义约束（kind=prompt）', () => {
-      const dir = setupProject(undefined, `
-custom_constraints:
-  my_project_rule:
-    level: guideline
-    rule: MY RULE
-    message: 项目自定义
-    trigger: code_implementation
-`);
-      const constraints = getEffectiveConstraints(dir);
-      const custom = constraints.find(c => c.id === 'my_project_rule');
-
-      expect(custom).toBeDefined();
-      expect(custom!.kind).toBe('prompt');
-      expect(custom!.level).toBe('guideline');
-    });
-
     it('禁用未知 id（已移除约束的残留配置）：不报错，lint 可诊断', () => {
       const dir = setupProject(`
 constraints:
@@ -146,19 +84,16 @@ constraints:
 `);
       // 生效集不受影响、不抛错
       const constraints = getEffectiveConstraints(dir);
-      expect(constraints.length).toBe(BUILTIN_TOTAL - SCENE_PROMPTS.length);
+      expect(constraints.length).toBe(BUILTIN_TOTAL);
 
       const lint = lintEffectiveConfig(dir);
       expect(lint.unknownIds).toContain('removed_legacy_constraint');
     });
 
-    it('lintEffectiveConfig 报告 scenes 与被场景过滤的 prompt', () => {
-      const dir = setupProject(`scenes:\n  - llm-app\n`);
+    it('lintEffectiveConfig：干净配置 unknownIds 为空', () => {
+      const dir = setupProject();
       const lint = lintEffectiveConfig(dir);
 
-      expect(lint.scenes).toEqual(['llm-app']);
-      expect(lint.sceneExcluded).toContain('no_skill_without_test');
-      expect(lint.sceneExcluded).not.toContain('no_model_for_deterministic');
       expect(lint.unknownIds).toEqual([]);
     });
   });