@fantasticit/sumi 0.9.0 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (124) hide show
  1. package/dist/adapters.js +70 -3
  2. package/dist/adapters.js.map +1 -1
  3. package/dist/fix.js +10 -3
  4. package/dist/fix.js.map +1 -1
  5. package/node_modules/@sumi/create/package.json +1 -1
  6. package/node_modules/@sumi/create/template/control/flows/check.flow.yaml +12 -0
  7. package/node_modules/@sumi/create/template/control/rubrics/behavior.yaml +5 -5
  8. package/node_modules/@sumi/create/template/control/rubrics/clean-code.yaml +9 -0
  9. package/node_modules/@sumi/create/template/control/rubrics/device-acceptance.yaml +10 -0
  10. package/node_modules/@sumi/create/template/control/rubrics/domain.yaml +9 -0
  11. package/node_modules/@sumi/create/template/control/rubrics/omission.yaml +3 -3
  12. package/node_modules/@sumi/kernel/dist/brief.d.ts +2 -0
  13. package/node_modules/@sumi/kernel/dist/brief.js.map +1 -1
  14. package/node_modules/@sumi/kernel/dist/engine.js +29 -13
  15. package/node_modules/@sumi/kernel/dist/engine.js.map +1 -1
  16. package/node_modules/@sumi/kernel/dist/registry.d.ts +6 -0
  17. package/node_modules/@sumi/kernel/dist/registry.js +7 -1
  18. package/node_modules/@sumi/kernel/dist/registry.js.map +1 -1
  19. package/node_modules/@sumi/kernel/dist/scope.d.ts +4 -2
  20. package/node_modules/@sumi/kernel/dist/scope.js +12 -39
  21. package/node_modules/@sumi/kernel/dist/scope.js.map +1 -1
  22. package/node_modules/@sumi/kernel/dist/step-cache.d.ts +19 -0
  23. package/node_modules/@sumi/kernel/dist/step-cache.js +185 -0
  24. package/node_modules/@sumi/kernel/dist/step-cache.js.map +1 -0
  25. package/node_modules/@sumi/kernel/package.json +2 -2
  26. package/node_modules/@sumi/plugin-sdk/README.md +2 -0
  27. package/node_modules/@sumi/plugin-sdk/dist/git.d.ts +16 -1
  28. package/node_modules/@sumi/plugin-sdk/dist/git.js +45 -5
  29. package/node_modules/@sumi/plugin-sdk/dist/git.js.map +1 -1
  30. package/node_modules/@sumi/plugin-sdk/dist/index.d.ts +1 -0
  31. package/node_modules/@sumi/plugin-sdk/dist/index.js +1 -0
  32. package/node_modules/@sumi/plugin-sdk/dist/index.js.map +1 -1
  33. package/node_modules/@sumi/plugin-sdk/dist/protocol.d.ts +5 -0
  34. package/node_modules/@sumi/plugin-sdk/dist/protocol.js.map +1 -1
  35. package/node_modules/@sumi/plugin-sdk/dist/snapshot.d.ts +2 -0
  36. package/node_modules/@sumi/plugin-sdk/dist/snapshot.js +60 -0
  37. package/node_modules/@sumi/plugin-sdk/dist/snapshot.js.map +1 -0
  38. package/node_modules/@sumi/plugin-sdk/dist/validate.js +9 -0
  39. package/node_modules/@sumi/plugin-sdk/dist/validate.js.map +1 -1
  40. package/node_modules/@sumi/plugin-sdk/package.json +1 -1
  41. package/node_modules/@sumi/plugins-core/README.md +14 -10
  42. package/node_modules/@sumi/plugins-core/dist/fix/lint.js +3 -3
  43. package/node_modules/@sumi/plugins-core/dist/fix/lint.js.map +1 -1
  44. package/node_modules/@sumi/plugins-core/dist/lib.d.ts +6 -2
  45. package/node_modules/@sumi/plugins-core/dist/lib.js +12 -7
  46. package/node_modules/@sumi/plugins-core/dist/lib.js.map +1 -1
  47. package/node_modules/@sumi/plugins-core/dist/plugins/test-affected.js +105 -28
  48. package/node_modules/@sumi/plugins-core/dist/plugins/test-affected.js.map +1 -1
  49. package/node_modules/@sumi/plugins-core/dist/test-batches.d.ts +16 -0
  50. package/node_modules/@sumi/plugins-core/dist/test-batches.js +83 -0
  51. package/node_modules/@sumi/plugins-core/dist/test-batches.js.map +1 -0
  52. package/node_modules/@sumi/plugins-core/dist/test-checkpoints.d.ts +27 -0
  53. package/node_modules/@sumi/plugins-core/dist/test-checkpoints.js +121 -0
  54. package/node_modules/@sumi/plugins-core/dist/test-checkpoints.js.map +1 -0
  55. package/node_modules/@sumi/plugins-core/dist/vitest-runner.js +20 -4
  56. package/node_modules/@sumi/plugins-core/dist/vitest-runner.js.map +1 -1
  57. package/node_modules/@sumi/plugins-core/package.json +2 -2
  58. package/node_modules/@sumi/plugins-core/sumi-plugins.yaml +4 -0
  59. package/node_modules/@sumi/plugins-governance/README.md +9 -6
  60. package/node_modules/@sumi/plugins-governance/dist/checkout.d.ts +1 -2
  61. package/node_modules/@sumi/plugins-governance/dist/checkout.js +6 -6
  62. package/node_modules/@sumi/plugins-governance/dist/checkout.js.map +1 -1
  63. package/node_modules/@sumi/plugins-governance/dist/commands/gate.js +61 -5
  64. package/node_modules/@sumi/plugins-governance/dist/commands/gate.js.map +1 -1
  65. package/node_modules/@sumi/plugins-governance/dist/commands/pr-report.js +19 -11
  66. package/node_modules/@sumi/plugins-governance/dist/commands/pr-report.js.map +1 -1
  67. package/node_modules/@sumi/plugins-governance/dist/gate-cache.js +42 -5
  68. package/node_modules/@sumi/plugins-governance/dist/gate-cache.js.map +1 -1
  69. package/node_modules/@sumi/plugins-governance/dist/plugins/protected-paths.js +7 -4
  70. package/node_modules/@sumi/plugins-governance/dist/plugins/protected-paths.js.map +1 -1
  71. package/node_modules/@sumi/plugins-governance/dist/pr-base.d.ts +9 -0
  72. package/node_modules/@sumi/plugins-governance/dist/pr-base.js +28 -0
  73. package/node_modules/@sumi/plugins-governance/dist/pr-base.js.map +1 -1
  74. package/node_modules/@sumi/plugins-governance/dist/pr-report-publish.d.ts +16 -4
  75. package/node_modules/@sumi/plugins-governance/dist/pr-report-publish.js +47 -9
  76. package/node_modules/@sumi/plugins-governance/dist/pr-report-publish.js.map +1 -1
  77. package/node_modules/@sumi/plugins-governance/dist/protected.js +7 -9
  78. package/node_modules/@sumi/plugins-governance/dist/protected.js.map +1 -1
  79. package/node_modules/@sumi/plugins-governance/dist/semantic.js +2 -17
  80. package/node_modules/@sumi/plugins-governance/dist/semantic.js.map +1 -1
  81. package/node_modules/@sumi/plugins-governance/instructions/push.md +6 -4
  82. package/node_modules/@sumi/plugins-governance/package.json +2 -2
  83. package/node_modules/@sumi/plugins-openspec/package.json +4 -4
  84. package/node_modules/@sumi/plugins-precedent/dist/model.js +2 -15
  85. package/node_modules/@sumi/plugins-precedent/dist/model.js.map +1 -1
  86. package/node_modules/@sumi/plugins-precedent/dist/plugins/harvest.js +28 -3
  87. package/node_modules/@sumi/plugins-precedent/dist/plugins/harvest.js.map +1 -1
  88. package/node_modules/@sumi/plugins-precedent/package.json +3 -3
  89. package/node_modules/@sumi/plugins-review/README.md +1 -1
  90. package/node_modules/@sumi/plugins-review/dist/dispute.d.ts +9 -0
  91. package/node_modules/@sumi/plugins-review/dist/dispute.js +91 -0
  92. package/node_modules/@sumi/plugins-review/dist/dispute.js.map +1 -0
  93. package/node_modules/@sumi/plugins-review/dist/index.d.ts +1 -0
  94. package/node_modules/@sumi/plugins-review/dist/index.js +1 -0
  95. package/node_modules/@sumi/plugins-review/dist/index.js.map +1 -1
  96. package/node_modules/@sumi/plugins-review/dist/plugins/independent-recheck.js +45 -8
  97. package/node_modules/@sumi/plugins-review/dist/plugins/independent-recheck.js.map +1 -1
  98. package/node_modules/@sumi/plugins-review/dist/plugins/rubric.js +56 -21
  99. package/node_modules/@sumi/plugins-review/dist/plugins/rubric.js.map +1 -1
  100. package/node_modules/@sumi/plugins-review/dist/recheck.d.ts +1 -0
  101. package/node_modules/@sumi/plugins-review/dist/recheck.js +21 -4
  102. package/node_modules/@sumi/plugins-review/dist/recheck.js.map +1 -1
  103. package/node_modules/@sumi/plugins-review/dist/review.d.ts +29 -0
  104. package/node_modules/@sumi/plugins-review/dist/review.js +215 -3
  105. package/node_modules/@sumi/plugins-review/dist/review.js.map +1 -1
  106. package/node_modules/@sumi/plugins-review/dist/submission.js +5 -1
  107. package/node_modules/@sumi/plugins-review/dist/submission.js.map +1 -1
  108. package/node_modules/@sumi/plugins-review/dist/upgrade-command.d.ts +1 -0
  109. package/node_modules/@sumi/plugins-review/dist/upgrade-command.js +14 -0
  110. package/node_modules/@sumi/plugins-review/dist/upgrade-command.js.map +1 -0
  111. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-plan.d.ts +13 -0
  112. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-plan.js +531 -0
  113. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-plan.js.map +1 -0
  114. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-render.d.ts +33 -0
  115. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-render.js +187 -0
  116. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-render.js.map +1 -0
  117. package/node_modules/@sumi/plugins-review/dist/upgrade.d.ts +26 -0
  118. package/node_modules/@sumi/plugins-review/dist/upgrade.js +68 -0
  119. package/node_modules/@sumi/plugins-review/dist/upgrade.js.map +1 -0
  120. package/node_modules/@sumi/plugins-review/dist/validation-receipt.js +105 -5
  121. package/node_modules/@sumi/plugins-review/dist/validation-receipt.js.map +1 -1
  122. package/node_modules/@sumi/plugins-review/package.json +5 -4
  123. package/node_modules/@sumi/plugins-review/sumi-plugins.yaml +1 -0
  124. package/package.json +10 -10
@@ -137,7 +137,7 @@ items:
137
137
 
138
138
  允许同模型的独立上下文复核时,将步骤配置为 `with: { source: review/architecture, vendor: openai, model: gpt-a, policy: independent-context }`。
139
139
 
140
- 使用期望模型开启全新代理上下文,按 `recheck-request.json` 对每个 finding 给出 `{ "findingId", "verdict": "confirm|reject", "reason" }`,写入派发给出的 `recheck-result.json`,再在该会话执行 `sumi model-recheck`。默认 `different-model` 要求双方有可核验的不同模型;`different-vendor` 还要求厂商不同。若项目接受以全新代理上下文作为复核条件,可显式设置 `policy: independent-context`:Cursor、Claude Code、Codex 都可用同厂商同模型的子代理,原评审或复核没有宿主模型记录时也可提交。Claude Code 的同会话子代理通过工具 hook 的 `agent_id` 区分:两次代理 ID 不同则核验通过,相同则拒绝;双方都没有代理 ID 时仍允许提交,但不能由宿主核验上下文独立性。Codex 子代理沿用父会话 ID,Cursor 工具 hook 没有稳定的子代理 ID;它们同会话时允许提交,但 Sumi 无法从宿主核验上下文独立性,报告会明确标注,派发方必须实际使用全新子代理。任一来源缺失或代理 ID 不足时也会标注未核验。该策略下 `vendor` / `model` 是目标模型配置,有宿主记录时仍须一致;缺失时不能据此宣称实际执行模型。复核缓存绑定原评审键/摘要、受检内容、来源、策略和每条 finding 身份;无宿主来源时还核对一次性 ticket 的使用记录。`confirm` 保留原失败;`reject` 交人处理,不自动清除原 finding。宿主 hook 是本机来源证据,不是厂商服务端签名。Cursor 通过 `preToolUse` 的 `model_id` 记录工具调用模型;Claude Code 自动 fallback 可能不报告实际请求模型,因此其会话模型作为“会话模型记录(非强证明)”参与比较,结果摘要和证据均显式标注,不能声称为服务端实际模型。
140
+ 使用期望模型开启全新代理上下文,按 `recheck-request.json` 对每个 finding 给出 `{ "findingId", "verdict": "confirm|reject", "reason" }`,写入派发给出的 `recheck-result.json`,再在该会话执行 `sumi model-recheck`。默认 `different-model` 要求双方有可核验的不同模型;`different-vendor` 还要求厂商不同。若项目接受以全新代理上下文作为复核条件,可显式设置 `policy: independent-context`:Cursor、Claude Code、Codex 都可用同厂商同模型的子代理,原评审或复核没有宿主模型记录时也可提交。Claude Code 的同会话子代理通过工具 hook 的 `agent_id` 区分:两次代理 ID 不同则核验通过,相同则拒绝;双方都没有代理 ID 时仍允许提交,但不能由宿主核验上下文独立性。Codex 子代理沿用父会话 ID,Cursor 工具 hook 没有稳定的子代理 ID;它们同会话时允许提交,但 Sumi 无法从宿主核验上下文独立性,报告会明确标注,派发方必须实际使用全新子代理。任一来源缺失或代理 ID 不足时也会标注未核验。该策略下 `vendor` / `model` 是目标模型配置,有宿主记录时仍须一致;缺失时不能据此宣称实际执行模型。复核缓存绑定原评审键/摘要、受检内容、来源、策略和每条 finding 身份;无宿主来源时还核对一次性 ticket 的使用记录。`confirm` 保留原失败;`reject` 给出逐 finding 的 `ask-human`,包含正式请求 ID 和 `sumi approve <请求 id>`。人应在自己的终端查看原 finding 与复核理由,确认采纳 reject 后重跑流程。源评审只解除该 finding 的当前阻断,原 fail、复核和批准记录全部保留;其他失败仍阻断。旧版 0.9.0 已接受且可验证的复核缓存可在升级后生成这一请求,不需修改缓存或重做相同内容的 9 项初审。宿主 hook 是本机来源证据,不是厂商服务端签名。Cursor 通过 `preToolUse` 的 `model_id` 记录工具调用模型;Claude Code 自动 fallback 可能不报告实际请求模型,因此其会话模型作为“会话模型记录(非强证明)”参与比较,结果摘要和证据均显式标注,不能声称为服务端实际模型。
141
141
 
142
142
  ## 结论与报告
143
143
 
@@ -0,0 +1,9 @@
1
+ import type { Finding } from '@sumi/plugin-sdk';
2
+ import { type AcceptedRecheck, type RecheckRequest } from './recheck.js';
3
+ /** 为被独立复核否定的单条 finding 登记人工裁决;已批准时返回 null。 */
4
+ export declare function requireDisputeApproval(root: string, request: RecheckRequest, accepted: AcceptedRecheck, findingId: string): string | null;
5
+ /** 重新验证原结果、内容、复核缓存和正式人工批准;任一证据无效则不解除阻断。 */
6
+ export declare function adjudicatedFindings(root: string, acceptedKey: string, acceptedDigest: string, contentDigest: string, stepId: string, findings: Finding[]): {
7
+ findingId: string;
8
+ recheckReason: string;
9
+ }[];
@@ -0,0 +1,91 @@
1
+ import { createHash, randomBytes } from 'node:crypto';
2
+ import { mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
3
+ import { join } from 'node:path';
4
+ import { isApproved, requireApproval } from '@sumi/plugins-governance';
5
+ import { findingIdentity, readRecheck, recheckKey } from './recheck.js';
6
+ import { reviewsDir } from './review.js';
7
+ const digest = (value) => createHash('sha256').update(JSON.stringify(value)).digest('hex');
8
+ const kind = 'review-dispute';
9
+ function binding(record) {
10
+ const { request } = record;
11
+ return {
12
+ acceptedKey: request.acceptedKey,
13
+ acceptedDigest: request.acceptedDigest,
14
+ contentDigest: request.contentDigest,
15
+ recheckKey: recheckKey(request),
16
+ recheckDigest: record.recheckDigest,
17
+ findingId: record.findingId,
18
+ };
19
+ }
20
+ function dir(root, acceptedKey) {
21
+ return join(reviewsDir(root), 'disputes', acceptedKey);
22
+ }
23
+ function file(root, acceptedKey, findingId, recheck) {
24
+ return join(dir(root, acceptedKey), `${findingId}-${recheck}.json`);
25
+ }
26
+ /** 为被独立复核否定的单条 finding 登记人工裁决;已批准时返回 null。 */
27
+ export function requireDisputeApproval(root, request, accepted, findingId) {
28
+ const finding = request.findings.find((item) => item.identity === findingId);
29
+ const verdict = accepted.result.verdicts.find((item) => item.findingId === findingId);
30
+ if (!finding || verdict?.verdict !== 'reject')
31
+ throw new Error('只有有效复核否定的 finding 可以请求裁决');
32
+ const record = { request, findingId, recheckDigest: digest(accepted.result) };
33
+ const target = file(root, request.acceptedKey, findingId, recheckKey(request));
34
+ const temporary = `${target}.${randomBytes(6).toString('hex')}.tmp`;
35
+ mkdirSync(dir(root, request.acceptedKey), { recursive: true });
36
+ try {
37
+ writeFileSync(temporary, JSON.stringify(record), { flag: 'wx', mode: 0o600 });
38
+ renameSync(temporary, target);
39
+ }
40
+ finally {
41
+ rmSync(temporary, { force: true });
42
+ }
43
+ return requireApproval(root, kind, binding(record), [
44
+ `原评审 ${request.stepId} 的 finding ${findingId}(${finding.rule}):${finding.message}`,
45
+ `独立复核 reject:${verdict.reason}`,
46
+ '确认采纳复核否定结论:此 finding 不再阻断当前内容;原失败与复核记录保留',
47
+ ]);
48
+ }
49
+ /** 重新验证原结果、内容、复核缓存和正式人工批准;任一证据无效则不解除阻断。 */
50
+ export function adjudicatedFindings(root, acceptedKey, acceptedDigest, contentDigest, stepId, findings) {
51
+ const resolved = [];
52
+ for (const [index, finding] of findings.entries()) {
53
+ const findingId = findingIdentity(stepId, index, finding);
54
+ let names;
55
+ try {
56
+ names = readdirSync(dir(root, acceptedKey)).filter((name) => name.startsWith(`${findingId}-`) && /^[a-f0-9]{64}-[a-f0-9]{64}\.json$/.test(name));
57
+ }
58
+ catch {
59
+ continue;
60
+ }
61
+ for (const name of names)
62
+ try {
63
+ const record = JSON.parse(readFileSync(join(dir(root, acceptedKey), name), 'utf8'));
64
+ const request = record.request;
65
+ if (record.findingId !== findingId ||
66
+ request.acceptedKey !== acceptedKey ||
67
+ request.acceptedDigest !== acceptedDigest ||
68
+ request.contentDigest !== contentDigest ||
69
+ request.stepId !== stepId ||
70
+ request.findings.length !== findings.length ||
71
+ !request.findings.every((item, i) => item.identity === findingIdentity(stepId, i, findings[i])) ||
72
+ name !== `${findingId}-${recheckKey(request)}.json`)
73
+ continue;
74
+ const accepted = readRecheck(root, request);
75
+ if (!accepted || digest(accepted.result) !== record.recheckDigest)
76
+ continue;
77
+ const verdict = accepted.result.verdicts.find((item) => item.findingId === findingId);
78
+ if (verdict?.verdict !== 'reject')
79
+ continue;
80
+ if (!isApproved(root, kind, binding(record)))
81
+ continue;
82
+ resolved.push({ findingId, recheckReason: verdict.reason });
83
+ break;
84
+ }
85
+ catch {
86
+ // 无效或损坏的裁决不能改变原失败。
87
+ }
88
+ }
89
+ return resolved;
90
+ }
91
+ //# sourceMappingURL=dispute.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dispute.js","sourceRoot":"","sources":["../src/dispute.ts"],"names":[],"mappings":"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"}
@@ -1 +1,2 @@
1
1
  export * from './review.js';
2
+ export * from './upgrade.js';
@@ -1,2 +1,3 @@
1
1
  export * from './review.js';
2
+ export * from './upgrade.js';
2
3
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}
@@ -4,8 +4,9 @@ import { join } from 'node:path';
4
4
  import { definePlugin, result } from '@sumi/plugin-sdk';
5
5
  import { canonicalModelId } from '../model-execution.js';
6
6
  import { compareVerifiedModels } from '../model-independence.js';
7
+ import { requireDisputeApproval } from '../dispute.js';
7
8
  import { buildRecheckRequest, loadOriginalRecheckInput, readRecheck, recheckContext, recheckKey } from '../recheck.js';
8
- import { reviewsDir } from '../review.js';
9
+ import { readAccepted, reviewsDir } from '../review.js';
9
10
  await definePlugin((ctx) => {
10
11
  const source = ctx.config.source;
11
12
  const vendor = ctx.config.vendor;
@@ -20,8 +21,20 @@ await definePlugin((ctx) => {
20
21
  try {
21
22
  // 无失败结果时不需要复核;待评审/损坏结果仍必须阻断。
22
23
  const step = JSON.parse(readFileSync(join(ctx.runDir, source, 'result.json'), 'utf8'));
23
- if (step.state === 'pass' || step.state === 'not-applicable')
24
- return result({ status: 'pass', summary: '原评审没有失败 finding,无需独立复核' });
24
+ if (step.state === 'pass' || step.state === 'not-applicable') {
25
+ let adjudicated = false;
26
+ try {
27
+ const receipt = JSON.parse(readFileSync(join(ctx.runDir, source, 'accepted-review.json'), 'utf8'));
28
+ adjudicated = !!receipt.key && !!readAccepted(ctx.repoRoot, receipt.key)?.verdicts.some((v) => v.verdict === 'fail');
29
+ }
30
+ catch {
31
+ // 没有源评审回执时沿用普通通过摘要。
32
+ }
33
+ return result({
34
+ status: 'pass',
35
+ summary: adjudicated ? '原失败 finding 已经独立复核并由人逐项裁决;历史结果保留' : '原评审没有失败 finding,无需独立复核',
36
+ });
37
+ }
25
38
  const original = loadOriginalRecheckInput(ctx.repoRoot, ctx.runDir, source, policy === 'independent-context');
26
39
  const reviewer = { vendor, model };
27
40
  if (policy !== 'independent-context') {
@@ -45,17 +58,41 @@ await definePlugin((ctx) => {
45
58
  ? `;${recheckContext(original.original, cached.source) === 'different' ? '宿主上下文不同' : '宿主未核验上下文独立性,派发流程要求使用全新代理上下文'}`
46
59
  : '';
47
60
  mkdirSync(ctx.evidenceDir, { recursive: true });
61
+ writeFileSync(join(ctx.evidenceDir, 'recheck-request.json'), JSON.stringify(request, null, 2));
48
62
  if (cached.source)
49
63
  writeFileSync(join(ctx.evidenceDir, 'recheck-model-source.json'), JSON.stringify(cached.source, null, 2));
50
- if (rejected.length)
64
+ if (rejected.length) {
65
+ const confirmed = cached.result.verdicts.filter((verdict) => verdict.verdict === 'confirm');
66
+ const pending = rejected
67
+ .map((verdict) => ({ verdict, id: requireDisputeApproval(ctx.repoRoot, request, cached, verdict.findingId) }))
68
+ .filter((item) => item.id !== null);
69
+ const actions = pending.map(({ verdict, id }) => ({
70
+ type: 'ask-human',
71
+ question: `请人工裁决 ${source} 的 finding ${verdict.findingId}`,
72
+ argv: ['sumi', 'approve', id],
73
+ why: '确认采纳独立复核的 reject,仅解除这一条 finding 的当前阻断,原结果保留',
74
+ }));
75
+ if (confirmed.length)
76
+ return result({
77
+ status: 'fail',
78
+ summary: `${confirmed.length} 条原 finding 经独立复核确认,${pending.length} 条 reject 待人工裁决;来源:${provenance}${contextEvidence}`,
79
+ checked: original.findings.flatMap((f) => (f.file ? [f.file] : [])),
80
+ findings: original.findings.filter((finding, index) => confirmed.some((verdict) => verdict.findingId === request.findings[index]?.identity)),
81
+ next: actions,
82
+ });
83
+ if (!pending.length)
84
+ return result({
85
+ status: 'pass',
86
+ summary: `${rejected.length} 条原 finding 经独立复核否定并获逐项人工裁决;原失败记录保留;来源:${provenance}${contextEvidence}`,
87
+ checked: original.findings.flatMap((f) => (f.file ? [f.file] : [])),
88
+ });
51
89
  return result({
52
90
  status: 'pending',
53
- summary: `独立复核否定 ${rejected.length} 条原 finding,等待人工处理;原失败仍保留;来源:${provenance}${contextEvidence}`,
91
+ summary: `独立复核否定 ${rejected.length} 条原 finding,其中 ${pending.length} 条等待人工裁决;原失败仍保留;来源:${provenance}${contextEvidence}`,
54
92
  checked: original.findings.flatMap((f) => (f.file ? [f.file] : [])),
55
- next: [
56
- { type: 'ask-human', question: `请人工判断 ${source} 的 ${rejected.length} 条独立复核争议`, why: '复核不能自行关闭原 finding' },
57
- ],
93
+ next: actions,
58
94
  });
95
+ }
59
96
  return result({
60
97
  status: 'fail',
61
98
  summary: `${policy === 'independent-context' ? '独立上下文复核' : '独立模型'}确认原评审的 ${request.findings.length} 条失败 finding;来源:${provenance}${contextEvidence}`,
@@ -1 +1 @@
1
- {"version":3,"file":"independent-recheck.js","sourceRoot":"","sources":["../../src/plugins/independent-recheck.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"independent-recheck.js","sourceRoot":"","sources":["../../src/plugins/independent-recheck.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,14 @@
1
1
  import { randomBytes } from 'node:crypto';
2
- import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
2
+ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
3
3
  import { join } from 'node:path';
4
4
  import { definePlugin, result } from '@sumi/plugin-sdk';
5
5
  import { requireApproval } from '@sumi/plugins-governance';
6
6
  import { impactScope, readImpact } from '@sumi/plugins-precedent';
7
7
  import { readModelSource } from '../model-execution.js';
8
+ import { adjudicatedFindings } from '../dispute.js';
8
9
  import { loadPriorReview, loadValidation } from '../review-evidence.js';
9
- import { recheckContext } from '../recheck.js';
10
- import { applicableItems, fileBlobs, filesDigest, findCoveringReview, impactRequestItems, loadRubric, readAccepted, requestKey, resultDigest, ticketsDir, } from '../review.js';
10
+ import { findingIdentity, recheckContext } from '../recheck.js';
11
+ import { applicableItems, fileBlobs, digestOfBlobs, findCoveringReview, findIncrementalReview, impactRequestItems, loadRubric, readAccepted, readIncrementalAlias, requestKey, resultDigest, ticketsDir, } from '../review.js';
11
12
  /** 表格单元:去掉换行并转义竖线。 */
12
13
  const cell = (text) => text.replace(/\s*\n\s*/g, ' ').replace(/\|/g, '\\|');
13
14
  /** 条目级报告段落:准则、每个条目的问题、结论与理由,不通过的条目附定位。 */
@@ -38,7 +39,14 @@ await definePlugin((ctx) => {
38
39
  const mode = ctx.config.mode === 'human-confirmed' ? 'human-confirmed' : 'advisory';
39
40
  const { rubric, digest } = loadRubric(ctx.repoRoot, rubricId);
40
41
  const impactMode = ctx.config.impact === true;
41
- const validationStep = typeof ctx.config.validationStep === 'string' ? ctx.config.validationStep : null;
42
+ const requiredValidationStep = typeof ctx.config.validationStep === 'string' ? ctx.config.validationStep : null;
43
+ const optionalValidationStep = typeof ctx.config.optionalValidationStep === 'string' ? ctx.config.optionalValidationStep : null;
44
+ const validationStep = requiredValidationStep ||
45
+ (optionalValidationStep &&
46
+ optionalValidationStep.split('/').every((part) => /^[a-zA-Z0-9_-]+$/.test(part)) &&
47
+ existsSync(join(ctx.runDir, optionalValidationStep, 'validation.json'))
48
+ ? optionalValidationStep
49
+ : null);
42
50
  const auditOf = typeof ctx.config.auditOf === 'string' ? ctx.config.auditOf : null;
43
51
  let validation;
44
52
  if (validationStep) {
@@ -86,11 +94,12 @@ await definePlugin((ctx) => {
86
94
  if (items.length === 0)
87
95
  return result({ status: 'pass', summary: '没有适用的评审条目', checked: ctx.files });
88
96
  const reviewed = [...new Set(items.flatMap((i) => i.files))];
97
+ const currentBlobs = fileBlobs(ctx.repoRoot, reviewed);
89
98
  const parts = {
90
99
  rubric: rubricId,
91
100
  rubricDigest: digest,
92
101
  base: impact ? impact.scope.base : ctx.base,
93
- contentDigest: filesDigest(ctx.repoRoot, reviewed),
102
+ contentDigest: digestOfBlobs(reviewed, currentBlobs),
94
103
  items,
95
104
  ...(rubric.requireEvidence ? { requireEvidence: true } : {}),
96
105
  ...(validationStep ? { validationStep } : {}),
@@ -98,8 +107,10 @@ await definePlugin((ctx) => {
98
107
  ...(validation ? { validation } : {}),
99
108
  ...(priorReview ? { priorReview } : {}),
100
109
  };
101
- const exactKey = requestKey(parts);
102
- // 键精确匹配优先;否则复用覆盖本次范围且内容一致的已通过评审(如门禁的增量范围落在工作区相对主干的评审之内)
110
+ // 键精确匹配优先(含此前带增量上下文提交的同一请求);否则复用覆盖本次范围且内容一致的已通过评审
111
+ // (如门禁的增量范围落在工作区相对主干的评审之内)。增量来源只在需要派发新评审时查找。
112
+ const baseKey = requestKey(parts);
113
+ const exactKey = readAccepted(ctx.repoRoot, baseKey) ? baseKey : (readIncrementalAlias(ctx.repoRoot, baseKey) ?? baseKey);
103
114
  const exact = readAccepted(ctx.repoRoot, exactKey);
104
115
  const testScopes = {};
105
116
  for (const entry of validation ?? []) {
@@ -114,7 +125,7 @@ await definePlugin((ctx) => {
114
125
  }
115
126
  const covering = exact || impact
116
127
  ? null
117
- : findCoveringReview(ctx.repoRoot, digest, items, fileBlobs(ctx.repoRoot, reviewed), {
128
+ : findCoveringReview(ctx.repoRoot, digest, items, currentBlobs, {
118
129
  requireEvidence: rubric.requireEvidence ? true : undefined,
119
130
  validationStep: validationStep ?? undefined,
120
131
  validation: validation ?? undefined,
@@ -154,23 +165,32 @@ await definePlugin((ctx) => {
154
165
  file: v.file,
155
166
  line: v.line,
156
167
  }));
168
+ const adjudicated = findings.length
169
+ ? adjudicatedFindings(ctx.repoRoot, key, resultDigest(accepted), parts.contentDigest, ctx.stepId, findings)
170
+ : [];
171
+ const resolved = new Set(adjudicated.map((item) => item.findingId));
172
+ const remaining = findings.filter((finding, index) => !resolved.has(findingIdentity(ctx.stepId, index, finding)));
173
+ const adjudicationReport = adjudicated.length
174
+ ? `${report}\n\n人工裁决:${adjudicated.length} 条原失败 finding 经独立复核 reject 并由人确认,不作为当前内容的阻断;原 verdict 与复核记录保留。\n${adjudicated.map((item) => `- ${item.findingId}:复核 reject,理由:${item.recheckReason}`).join('\n')}`
175
+ : report;
157
176
  const receipts = ctx.obligations
158
177
  .filter((o) => o.type === 'rubric-item')
159
178
  .map((o) => {
160
179
  // 只按本次适用的条目取值:覆盖复用的结果可能含本次不适用条目的结论,不能据此给出回执
161
180
  const item = String(o.target.item);
162
181
  const v = items.some((i) => i.id === item) ? accepted.verdicts.find((x) => x.item === item) : undefined;
163
- return { id: o.id, outcome: v ? (v.verdict === 'pass' ? 'passed' : 'failed') : 'not-executed' };
182
+ const failed = remaining.some((finding) => finding.rule === `${rubricId}#${item}`);
183
+ return { id: o.id, outcome: v ? (failed ? 'failed' : 'passed') : 'not-executed' };
164
184
  });
165
- if (findings.length) {
166
- const uncertain = accepted.verdicts.filter((v) => v.verdict === 'fail' && v.uncertain === true && items.some((i) => i.id === v.item));
185
+ if (remaining.length) {
186
+ const uncertain = accepted.verdicts.filter((v) => v.verdict === 'fail' && v.uncertain === true && remaining.some((f) => f.rule === `${rubricId}#${v.item}`));
167
187
  return result({
168
188
  status: 'fail',
169
- summary: `评审未通过:${findings.length} 个条目`,
170
- findings,
189
+ summary: `评审未通过:${remaining.length} 个条目${adjudicated.length ? `,${adjudicated.length} 条争议已人工裁决` : ''}`,
190
+ findings: remaining,
171
191
  checked: reviewed,
172
192
  obligations: receipts,
173
- report,
193
+ report: adjudicationReport,
174
194
  ...(uncertain.length
175
195
  ? {
176
196
  next: [
@@ -186,7 +206,9 @@ await definePlugin((ctx) => {
186
206
  }
187
207
  if (mode === 'human-confirmed') {
188
208
  const id = requireApproval(ctx.repoRoot, 'review-result', { key, result: resultDigest(accepted) }, [
189
- `评审准则 ${rubricId} 的结果全部通过,需要人确认`,
209
+ adjudicated.length
210
+ ? `评审准则 ${rubricId} 的 ${adjudicated.length} 条失败 finding 已获人工裁决,其余结果通过,需要人确认`
211
+ : `评审准则 ${rubricId} 的结果全部通过,需要人确认`,
190
212
  ...accepted.verdicts.map((v) => `${v.item}:${v.reason}`),
191
213
  ]);
192
214
  if (id) {
@@ -194,7 +216,7 @@ await definePlugin((ctx) => {
194
216
  status: 'pending',
195
217
  summary: `评审已通过,等待人工确认;模型来源:${provenance}`,
196
218
  checked: reviewed,
197
- report,
219
+ report: adjudicationReport,
198
220
  next: [
199
221
  {
200
222
  type: 'ask-human',
@@ -209,19 +231,27 @@ await definePlugin((ctx) => {
209
231
  const reuse = covering ? `,复用覆盖本次范围的评审 ${key.slice(0, 8)}` : '';
210
232
  return result({
211
233
  status: 'pass',
212
- summary: `评审通过(${items.length} 个条目${reuse})`,
234
+ summary: adjudicated.length
235
+ ? `原评审 ${adjudicated.length} 条失败 finding 经独立复核否定并获人工裁决;原记录保留`
236
+ : `评审通过(${items.length} 个条目${reuse})`,
213
237
  checked: reviewed,
214
238
  obligations: receipts,
215
- report,
239
+ report: adjudicationReport,
216
240
  });
217
241
  }
218
- const request = { key: exactKey, repoRoot: ctx.repoRoot, ...parts };
242
+ const incrementalReview = impact || auditOf ? null : findIncrementalReview(ctx.repoRoot, digest, items, currentBlobs, parts.base);
243
+ const requestParts = { ...parts, ...(incrementalReview ? { incrementalReview } : {}) };
244
+ const request = {
245
+ key: requestKey(requestParts),
246
+ repoRoot: ctx.repoRoot,
247
+ ...requestParts,
248
+ };
219
249
  mkdirSync(ctx.evidenceDir, { recursive: true });
220
250
  const requestPath = join(ctx.evidenceDir, 'review-request.json');
221
251
  const resultPath = join(ctx.evidenceDir, 'review-result.json');
222
252
  writeFileSync(requestPath, JSON.stringify(request, null, 2));
223
253
  const ticket = randomBytes(4).toString('hex');
224
- const record = { ticket, key, runId: ctx.runId, stepId: ctx.stepId, requestPath, resultPath, used: false };
254
+ const record = { ticket, key: request.key, runId: ctx.runId, stepId: ctx.stepId, requestPath, resultPath, used: false };
225
255
  writeFileSync(join(ticketsDir(ctx.repoRoot), `${ticket}.json`), JSON.stringify(record, null, 2));
226
256
  return result({
227
257
  status: 'pending',
@@ -233,7 +263,12 @@ await definePlugin((ctx) => {
233
263
  kind: 'dispatch-review',
234
264
  argv: ['sumi', 'submit', ctx.runId, ctx.stepId, '--ticket', ticket],
235
265
  effects: ['none'],
236
- why: `用全新上下文的代理按 ${requestPath} 逐条评审${auditOf ? ',专门寻找首轮通过结论遗漏的反例,并核对实际验证回执' : ''};每个请求条目的 areas 都要分别核查并填入 areaEvidence,只有本次 validation 中 state=pass 的验证才能填入 testEvidence;结果写入 ${resultPath}(格式:{"verdicts":[{"item","verdict":"pass|fail","reason","evidence?","areaEvidence?","testEvidence?","file?","line?"}]}),然后执行该命令`,
266
+ why: `用全新上下文的代理按 ${requestPath} 逐条评审${incrementalReview ? ';请求中的 incrementalReview 含已接受结论及本次差异(旧评审之后才进入范围的文件给出相对基准的完整差异),只需核对差异会否推翻旧结论,并为当前内容提交完整新结论' : ''}${auditOf ? ',专门寻找首轮通过结论遗漏的反例,并核对实际验证回执' : ''};每个请求条目的 areas 都要分别核查并填入 areaEvidence;${validation?.some((entry) => entry.state === 'pass')
267
+ ? `只有本次 validation 中 state=pass 的 ID(${validation
268
+ .filter((entry) => entry.state === 'pass')
269
+ .map((entry) => entry.id)
270
+ .join('、')})可以填入 testEvidence`
271
+ : '本准则没有可引用的本次验证回执,不得填写 testEvidence'};结果写入 ${resultPath}(格式:{"verdicts":[{"item","verdict":"pass|fail","reason","evidence?","areaEvidence?","testEvidence?","file?","line?"}]}),然后执行该命令`,
237
272
  },
238
273
  ],
239
274
  });
@@ -1 +1 @@
1
- {"version":3,"file":"rubric.js","sourceRoot":"","sources":["../../src/plugins/rubric.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rubric.js","sourceRoot":"","sources":["../../src/plugins/rubric.ts"],"names":[],"mappings":"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"}
@@ -36,6 +36,7 @@ export declare function recheckContext(original: ModelIdentity | null, reviewer:
36
36
  export declare function buildRecheckRequest(input: Omit<RecheckRequest, 'findings'> & {
37
37
  findings: Finding[];
38
38
  }): RecheckRequest;
39
+ export declare function findingIdentity(stepId: string, index: number, finding: Finding): string;
39
40
  export declare function recheckKey(request: RecheckRequest): string;
40
41
  /** 返回首个错误;null 表示每条原 finding 恰有一条有效结论。 */
41
42
  export declare function validateRecheckResult(request: RecheckRequest, value: unknown): string | null;
@@ -21,9 +21,12 @@ export function buildRecheckRequest(input) {
21
21
  ...input,
22
22
  findings: input.findings
23
23
  .filter((finding) => finding.severity === 'error')
24
- .map((finding, index) => ({ ...finding, identity: digest({ stepId: input.stepId, index, finding }) })),
24
+ .map((finding, index) => ({ ...finding, identity: findingIdentity(input.stepId, index, finding) })),
25
25
  };
26
26
  }
27
+ export function findingIdentity(stepId, index, finding) {
28
+ return digest({ stepId, index, finding });
29
+ }
27
30
  export function recheckKey(request) {
28
31
  return digest(request);
29
32
  }
@@ -136,8 +139,22 @@ export function loadOriginalRecheckInput(root, runDir, sourceStepId, allowMissin
136
139
  if (!accepted || resultDigest(accepted) !== receipt.resultDigest)
137
140
  throw new Error('原评审回执与已接受结果不一致');
138
141
  const fails = accepted.verdicts.filter((v) => v.verdict === 'fail');
139
- if (fails.length !== step.findings.length ||
140
- !fails.every((v) => step.findings.some((f) => f.rule.endsWith(`#${v.item}`) && f.message === v.reason && f.file === v.file && f.line === v.line)))
142
+ const rubric = step.findings[0]?.rule.split('#')[0];
143
+ if (!rubric || !fails.length || step.findings.length > fails.length)
144
+ throw new Error('原评审 finding 与已接受结论不一致');
145
+ const findings = fails.map((v, index) => ({
146
+ id: `F${index + 1}`,
147
+ rule: `${rubric}#${v.item}`,
148
+ severity: 'error',
149
+ message: v.reason,
150
+ file: v.file,
151
+ line: v.line,
152
+ }));
153
+ if (!step.findings.every((shown) => findings.some((original) => shown.id === original.id &&
154
+ shown.rule === original.rule &&
155
+ shown.message === original.message &&
156
+ shown.file === original.file &&
157
+ shown.line === original.line)))
141
158
  throw new Error('原评审 finding 与已接受结论不一致');
142
159
  const original = readModelSource(root, receipt.key, accepted);
143
160
  if (!original && !allowMissingSource)
@@ -148,7 +165,7 @@ export function loadOriginalRecheckInput(root, runDir, sourceStepId, allowMissin
148
165
  contentDigest: filesDigest(root, step.checked),
149
166
  original,
150
167
  stepId: sourceStepId,
151
- findings: step.findings,
168
+ findings,
152
169
  };
153
170
  }
154
171
  //# sourceMappingURL=recheck.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"recheck.js","sourceRoot":"","sources":["../src/recheck.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"recheck.js","sourceRoot":"","sources":["../src/recheck.ts"],"names":[],"mappings":"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"}