@fantasticit/sumi 0.8.0 → 0.9.1

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 (166) hide show
  1. package/README.md +18 -18
  2. package/dist/adapters.d.ts +1 -0
  3. package/dist/adapters.js +83 -5
  4. package/dist/adapters.js.map +1 -1
  5. package/dist/fix.js +10 -3
  6. package/dist/fix.js.map +1 -1
  7. package/dist/trace.d.ts +16 -0
  8. package/dist/trace.js +30 -0
  9. package/dist/trace.js.map +1 -0
  10. package/dist/visualize-page.d.ts +1 -1
  11. package/dist/visualize-page.js +2 -2
  12. package/dist/visualize.js +52 -8
  13. package/dist/visualize.js.map +1 -1
  14. package/node_modules/@sumi/create/dist/bin.d.ts +2 -0
  15. package/node_modules/@sumi/create/dist/bin.js +52 -0
  16. package/node_modules/@sumi/create/dist/bin.js.map +1 -0
  17. package/node_modules/@sumi/create/package.json +1 -1
  18. package/node_modules/@sumi/create/template/control/flows/check.flow.yaml +28 -0
  19. package/node_modules/@sumi/create/template/control/rubrics/behavior.yaml +17 -0
  20. package/node_modules/@sumi/create/template/control/rubrics/clean-code.yaml +9 -0
  21. package/node_modules/@sumi/create/template/control/rubrics/device-acceptance.yaml +10 -0
  22. package/node_modules/@sumi/create/template/control/rubrics/domain.yaml +9 -0
  23. package/node_modules/@sumi/create/template/control/rubrics/omission.yaml +13 -0
  24. package/node_modules/@sumi/kernel/dist/brief.d.ts +2 -0
  25. package/node_modules/@sumi/kernel/dist/brief.js.map +1 -1
  26. package/node_modules/@sumi/kernel/dist/engine.js +29 -13
  27. package/node_modules/@sumi/kernel/dist/engine.js.map +1 -1
  28. package/node_modules/@sumi/kernel/dist/registry.d.ts +6 -0
  29. package/node_modules/@sumi/kernel/dist/registry.js +7 -1
  30. package/node_modules/@sumi/kernel/dist/registry.js.map +1 -1
  31. package/node_modules/@sumi/kernel/dist/scope.d.ts +4 -2
  32. package/node_modules/@sumi/kernel/dist/scope.js +12 -39
  33. package/node_modules/@sumi/kernel/dist/scope.js.map +1 -1
  34. package/node_modules/@sumi/kernel/dist/step-cache.d.ts +19 -0
  35. package/node_modules/@sumi/kernel/dist/step-cache.js +185 -0
  36. package/node_modules/@sumi/kernel/dist/step-cache.js.map +1 -0
  37. package/node_modules/@sumi/kernel/package.json +2 -2
  38. package/node_modules/@sumi/plugin-sdk/README.md +3 -1
  39. package/node_modules/@sumi/plugin-sdk/dist/git.d.ts +16 -1
  40. package/node_modules/@sumi/plugin-sdk/dist/git.js +45 -5
  41. package/node_modules/@sumi/plugin-sdk/dist/git.js.map +1 -1
  42. package/node_modules/@sumi/plugin-sdk/dist/index.d.ts +1 -0
  43. package/node_modules/@sumi/plugin-sdk/dist/index.js +1 -0
  44. package/node_modules/@sumi/plugin-sdk/dist/index.js.map +1 -1
  45. package/node_modules/@sumi/plugin-sdk/dist/protocol.d.ts +7 -0
  46. package/node_modules/@sumi/plugin-sdk/dist/protocol.js.map +1 -1
  47. package/node_modules/@sumi/plugin-sdk/dist/snapshot.d.ts +2 -0
  48. package/node_modules/@sumi/plugin-sdk/dist/snapshot.js +60 -0
  49. package/node_modules/@sumi/plugin-sdk/dist/snapshot.js.map +1 -0
  50. package/node_modules/@sumi/plugin-sdk/dist/trace.d.ts +1 -1
  51. package/node_modules/@sumi/plugin-sdk/dist/trace.js +15 -5
  52. package/node_modules/@sumi/plugin-sdk/dist/trace.js.map +1 -1
  53. package/node_modules/@sumi/plugin-sdk/dist/validate.js +11 -1
  54. package/node_modules/@sumi/plugin-sdk/dist/validate.js.map +1 -1
  55. package/node_modules/@sumi/plugin-sdk/package.json +1 -1
  56. package/node_modules/@sumi/plugins-core/README.md +14 -10
  57. package/node_modules/@sumi/plugins-core/dist/fix/lint.js +3 -3
  58. package/node_modules/@sumi/plugins-core/dist/fix/lint.js.map +1 -1
  59. package/node_modules/@sumi/plugins-core/dist/lib.d.ts +6 -2
  60. package/node_modules/@sumi/plugins-core/dist/lib.js +12 -7
  61. package/node_modules/@sumi/plugins-core/dist/lib.js.map +1 -1
  62. package/node_modules/@sumi/plugins-core/dist/plugins/test-affected.js +198 -29
  63. package/node_modules/@sumi/plugins-core/dist/plugins/test-affected.js.map +1 -1
  64. package/node_modules/@sumi/plugins-core/dist/test-batches.d.ts +16 -0
  65. package/node_modules/@sumi/plugins-core/dist/test-batches.js +83 -0
  66. package/node_modules/@sumi/plugins-core/dist/test-batches.js.map +1 -0
  67. package/node_modules/@sumi/plugins-core/dist/test-checkpoints.d.ts +27 -0
  68. package/node_modules/@sumi/plugins-core/dist/test-checkpoints.js +121 -0
  69. package/node_modules/@sumi/plugins-core/dist/test-checkpoints.js.map +1 -0
  70. package/node_modules/@sumi/plugins-core/dist/tool-batches.d.ts +11 -0
  71. package/node_modules/@sumi/plugins-core/dist/tool-batches.js +41 -0
  72. package/node_modules/@sumi/plugins-core/dist/tool-batches.js.map +1 -0
  73. package/node_modules/@sumi/plugins-core/dist/vitest-runner.js +20 -4
  74. package/node_modules/@sumi/plugins-core/dist/vitest-runner.js.map +1 -1
  75. package/node_modules/@sumi/plugins-core/package.json +2 -2
  76. package/node_modules/@sumi/plugins-core/sumi-plugins.yaml +4 -0
  77. package/node_modules/@sumi/plugins-governance/README.md +9 -6
  78. package/node_modules/@sumi/plugins-governance/dist/checkout.d.ts +1 -2
  79. package/node_modules/@sumi/plugins-governance/dist/checkout.js +6 -6
  80. package/node_modules/@sumi/plugins-governance/dist/checkout.js.map +1 -1
  81. package/node_modules/@sumi/plugins-governance/dist/commands/gate.js +61 -5
  82. package/node_modules/@sumi/plugins-governance/dist/commands/gate.js.map +1 -1
  83. package/node_modules/@sumi/plugins-governance/dist/commands/pr-report.js +20 -11
  84. package/node_modules/@sumi/plugins-governance/dist/commands/pr-report.js.map +1 -1
  85. package/node_modules/@sumi/plugins-governance/dist/gate-cache.js +42 -5
  86. package/node_modules/@sumi/plugins-governance/dist/gate-cache.js.map +1 -1
  87. package/node_modules/@sumi/plugins-governance/dist/hooks.d.ts +2 -0
  88. package/node_modules/@sumi/plugins-governance/dist/hooks.js +4 -0
  89. package/node_modules/@sumi/plugins-governance/dist/hooks.js.map +1 -0
  90. package/node_modules/@sumi/plugins-governance/dist/plugins/protected-paths.js +7 -4
  91. package/node_modules/@sumi/plugins-governance/dist/plugins/protected-paths.js.map +1 -1
  92. package/node_modules/@sumi/plugins-governance/dist/pr-base.d.ts +9 -0
  93. package/node_modules/@sumi/plugins-governance/dist/pr-base.js +28 -0
  94. package/node_modules/@sumi/plugins-governance/dist/pr-base.js.map +1 -1
  95. package/node_modules/@sumi/plugins-governance/dist/pr-report-publish.d.ts +16 -4
  96. package/node_modules/@sumi/plugins-governance/dist/pr-report-publish.js +47 -9
  97. package/node_modules/@sumi/plugins-governance/dist/pr-report-publish.js.map +1 -1
  98. package/node_modules/@sumi/plugins-governance/dist/pr-report-sections.js +3 -1
  99. package/node_modules/@sumi/plugins-governance/dist/pr-report-sections.js.map +1 -1
  100. package/node_modules/@sumi/plugins-governance/dist/protected.js +7 -9
  101. package/node_modules/@sumi/plugins-governance/dist/protected.js.map +1 -1
  102. package/node_modules/@sumi/plugins-governance/dist/semantic.js +2 -17
  103. package/node_modules/@sumi/plugins-governance/dist/semantic.js.map +1 -1
  104. package/node_modules/@sumi/plugins-governance/instructions/push.md +6 -4
  105. package/node_modules/@sumi/plugins-governance/package.json +2 -2
  106. package/node_modules/@sumi/plugins-openspec/package.json +4 -4
  107. package/node_modules/@sumi/plugins-precedent/dist/model.js +2 -15
  108. package/node_modules/@sumi/plugins-precedent/dist/model.js.map +1 -1
  109. package/node_modules/@sumi/plugins-precedent/dist/plugins/harvest.js +28 -3
  110. package/node_modules/@sumi/plugins-precedent/dist/plugins/harvest.js.map +1 -1
  111. package/node_modules/@sumi/plugins-precedent/package.json +3 -3
  112. package/node_modules/@sumi/plugins-review/README.md +18 -11
  113. package/node_modules/@sumi/plugins-review/dist/commands/host-model-hook.js +4 -1
  114. package/node_modules/@sumi/plugins-review/dist/commands/host-model-hook.js.map +1 -1
  115. package/node_modules/@sumi/plugins-review/dist/commands/model-recheck.js +25 -10
  116. package/node_modules/@sumi/plugins-review/dist/commands/model-recheck.js.map +1 -1
  117. package/node_modules/@sumi/plugins-review/dist/commands/submit.js +8 -1
  118. package/node_modules/@sumi/plugins-review/dist/commands/submit.js.map +1 -1
  119. package/node_modules/@sumi/plugins-review/dist/dispute.d.ts +9 -0
  120. package/node_modules/@sumi/plugins-review/dist/dispute.js +91 -0
  121. package/node_modules/@sumi/plugins-review/dist/dispute.js.map +1 -0
  122. package/node_modules/@sumi/plugins-review/dist/index.d.ts +1 -0
  123. package/node_modules/@sumi/plugins-review/dist/index.js +1 -0
  124. package/node_modules/@sumi/plugins-review/dist/index.js.map +1 -1
  125. package/node_modules/@sumi/plugins-review/dist/model-execution.d.ts +2 -1
  126. package/node_modules/@sumi/plugins-review/dist/model-execution.js +49 -18
  127. package/node_modules/@sumi/plugins-review/dist/model-execution.js.map +1 -1
  128. package/node_modules/@sumi/plugins-review/dist/model-independence.d.ts +2 -1
  129. package/node_modules/@sumi/plugins-review/dist/model-independence.js +13 -4
  130. package/node_modules/@sumi/plugins-review/dist/model-independence.js.map +1 -1
  131. package/node_modules/@sumi/plugins-review/dist/plugins/independent-recheck.js +77 -20
  132. package/node_modules/@sumi/plugins-review/dist/plugins/independent-recheck.js.map +1 -1
  133. package/node_modules/@sumi/plugins-review/dist/plugins/rubric.js +131 -22
  134. package/node_modules/@sumi/plugins-review/dist/plugins/rubric.js.map +1 -1
  135. package/node_modules/@sumi/plugins-review/dist/plugins/validation.d.ts +1 -0
  136. package/node_modules/@sumi/plugins-review/dist/plugins/validation.js +35 -0
  137. package/node_modules/@sumi/plugins-review/dist/plugins/validation.js.map +1 -0
  138. package/node_modules/@sumi/plugins-review/dist/recheck.d.ts +10 -5
  139. package/node_modules/@sumi/plugins-review/dist/recheck.js +51 -10
  140. package/node_modules/@sumi/plugins-review/dist/recheck.js.map +1 -1
  141. package/node_modules/@sumi/plugins-review/dist/review-evidence.d.ts +3 -0
  142. package/node_modules/@sumi/plugins-review/dist/review-evidence.js +58 -0
  143. package/node_modules/@sumi/plugins-review/dist/review-evidence.js.map +1 -0
  144. package/node_modules/@sumi/plugins-review/dist/review.d.ts +74 -1
  145. package/node_modules/@sumi/plugins-review/dist/review.js +320 -9
  146. package/node_modules/@sumi/plugins-review/dist/review.js.map +1 -1
  147. package/node_modules/@sumi/plugins-review/dist/submission.js +45 -4
  148. package/node_modules/@sumi/plugins-review/dist/submission.js.map +1 -1
  149. package/node_modules/@sumi/plugins-review/dist/upgrade-command.d.ts +1 -0
  150. package/node_modules/@sumi/plugins-review/dist/upgrade-command.js +14 -0
  151. package/node_modules/@sumi/plugins-review/dist/upgrade-command.js.map +1 -0
  152. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-plan.d.ts +13 -0
  153. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-plan.js +531 -0
  154. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-plan.js.map +1 -0
  155. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-render.d.ts +33 -0
  156. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-render.js +187 -0
  157. package/node_modules/@sumi/plugins-review/dist/upgrade-flow-render.js.map +1 -0
  158. package/node_modules/@sumi/plugins-review/dist/upgrade.d.ts +26 -0
  159. package/node_modules/@sumi/plugins-review/dist/upgrade.js +68 -0
  160. package/node_modules/@sumi/plugins-review/dist/upgrade.js.map +1 -0
  161. package/node_modules/@sumi/plugins-review/dist/validation-receipt.d.ts +8 -0
  162. package/node_modules/@sumi/plugins-review/dist/validation-receipt.js +210 -0
  163. package/node_modules/@sumi/plugins-review/dist/validation-receipt.js.map +1 -0
  164. package/node_modules/@sumi/plugins-review/package.json +5 -4
  165. package/node_modules/@sumi/plugins-review/sumi-plugins.yaml +8 -1
  166. package/package.json +10 -10
@@ -4,9 +4,12 @@ const chunks = [];
4
4
  for await (const chunk of process.stdin)
5
5
  chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
6
6
  try {
7
- observeHostModelEvent(root, JSON.parse(Buffer.concat(chunks).toString('utf8')));
7
+ const event = JSON.parse(Buffer.concat(chunks).toString('utf8'));
8
+ observeHostModelEvent(root, event);
8
9
  }
9
10
  catch {
10
11
  // 模型事件只提供来源证据;坏输入不能阻断无关的编辑或命令。
11
12
  }
13
+ if (process.argv[2] === '--cursor')
14
+ process.stdout.write('{"permission":"allow"}\n');
12
15
  //# sourceMappingURL=host-model-hook.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"host-model-hook.js","sourceRoot":"","sources":["../../src/commands/host-model-hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AACpD,MAAM,MAAM,GAAa,EAAE,CAAC;AAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK;IAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1G,IAAI,CAAC;IACH,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAClF,CAAC;AAAC,MAAM,CAAC;IACP,+BAA+B;AACjC,CAAC"}
1
+ {"version":3,"file":"host-model-hook.js","sourceRoot":"","sources":["../../src/commands/host-model-hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AACpD,MAAM,MAAM,GAAa,EAAE,CAAC;AAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK;IAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1G,IAAI,CAAC;IACH,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACrC,CAAC;AAAC,MAAM,CAAC;IACP,+BAA+B;AACjC,CAAC;AACD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU;IAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC"}
@@ -3,7 +3,7 @@ import { join } from 'node:path';
3
3
  import { guardCommandArgs } from '@sumi/plugin-sdk';
4
4
  import { consumeHostModelEvent } from '../model-execution.js';
5
5
  import { compareVerifiedModels } from '../model-independence.js';
6
- import { buildRecheckRequest, loadOriginalRecheckInput, recheckKey, validateRecheckResult, writeRecheck, } from '../recheck.js';
6
+ import { buildRecheckRequest, loadOriginalRecheckInput, recheckContext, recheckKey, validateRecheckResult, writeRecheck, } from '../recheck.js';
7
7
  import { reviewsDir } from '../review.js';
8
8
  const root = process.env.SUMI_ROOT ?? process.cwd();
9
9
  const args = process.argv.slice(2);
@@ -26,11 +26,16 @@ try {
26
26
  throw new Error('ticket 不匹配或已使用');
27
27
  if (typeof ticket.runDir !== 'string' || typeof ticket.source !== 'string' || !ticket.reviewer || typeof ticket.resultPath !== 'string')
28
28
  throw new Error('ticket 格式无效');
29
- const original = loadOriginalRecheckInput(root, ticket.runDir, ticket.source);
30
- const independent = compareVerifiedModels(original.original, ticket.reviewer);
31
- if (!independent.independent)
32
- throw new Error(independent.reason);
33
- const expected = buildRecheckRequest({ ...original, reviewer: ticket.reviewer });
29
+ const policy = ticket.policy ?? 'different-model';
30
+ if (policy !== 'different-model' && policy !== 'different-vendor' && policy !== 'independent-context')
31
+ throw new Error('复核策略无效');
32
+ const original = loadOriginalRecheckInput(root, ticket.runDir, ticket.source, policy === 'independent-context');
33
+ if (policy !== 'independent-context') {
34
+ const independent = compareVerifiedModels(original.original, ticket.reviewer, undefined, policy);
35
+ if (!independent.independent)
36
+ throw new Error(independent.reason);
37
+ }
38
+ const expected = buildRecheckRequest({ ...original, reviewer: ticket.reviewer, ...(policy !== 'different-model' ? { policy } : {}) });
34
39
  if (recheckKey(expected) !== ticket.key)
35
40
  throw new Error('复核输入已变化,请重新运行流程');
36
41
  const supplied = JSON.parse(readFileSync(ticket.requestPath, 'utf8'));
@@ -40,11 +45,21 @@ try {
40
45
  const error = validateRecheckResult(expected, response);
41
46
  if (error)
42
47
  throw new Error(`复核结果不合法:${error}`);
43
- const identity = consumeHostModelEvent(root, ticketId, 'model-recheck');
44
- if (identity.vendor !== ticket.reviewer.vendor || identity.model !== ticket.reviewer.model)
48
+ let identity = null;
49
+ try {
50
+ identity = consumeHostModelEvent(root, ticketId, 'model-recheck');
51
+ }
52
+ catch (error) {
53
+ if (policy !== 'independent-context')
54
+ throw error;
55
+ }
56
+ if (identity && (identity.vendor !== ticket.reviewer.vendor || identity.model !== ticket.reviewer.model))
45
57
  throw new Error('复核结果提交者的宿主模型与目标模型不一致');
46
- const current = loadOriginalRecheckInput(root, ticket.runDir, ticket.source);
47
- if (recheckKey(buildRecheckRequest({ ...current, reviewer: ticket.reviewer })) !== ticket.key)
58
+ if (policy === 'independent-context' && recheckContext(original.original, identity) === 'same')
59
+ throw new Error('原评审与复核使用同一宿主上下文');
60
+ const current = loadOriginalRecheckInput(root, ticket.runDir, ticket.source, policy === 'independent-context');
61
+ if (recheckKey(buildRecheckRequest({ ...current, reviewer: ticket.reviewer, ...(policy !== 'different-model' ? { policy } : {}) })) !==
62
+ ticket.key)
48
63
  throw new Error('提交期间被评审内容发生变化');
49
64
  writeRecheck(root, expected, response, ticketId, identity);
50
65
  writeFileSync(ticketPath, JSON.stringify({ ...ticket, used: true }, null, 2));
@@ -1 +1 @@
1
- {"version":3,"file":"model-recheck.js","sourceRoot":"","sources":["../../src/commands/model-recheck.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-recheck.js","sourceRoot":"","sources":["../../src/commands/model-recheck.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  import { readFileSync } from 'node:fs';
2
2
  import { guardCommandArgs } from '@sumi/plugin-sdk';
3
- import { consumeHostModelEvent, writeModelSource } from '../model-execution.js';
3
+ import { consumeHostModelEvent, readModelSource, writeModelSource } from '../model-execution.js';
4
4
  import { isReviewResult, validateReviewResult } from '../review.js';
5
+ import { recheckContext } from '../recheck.js';
5
6
  import { acceptSubmission, prepareSubmission } from '../submission.js';
6
7
  const root = process.env.SUMI_ROOT ?? process.cwd();
7
8
  const args = process.argv.slice(2);
@@ -37,6 +38,12 @@ try {
37
38
  catch {
38
39
  // 无模型来源时仍可用于普通 rubric,但独立复核会拒绝。
39
40
  }
41
+ const prior = prepared.request.priorReview;
42
+ if (prior && identity) {
43
+ const original = readModelSource(root, prior.key, { verdicts: prior.verdicts });
44
+ if (recheckContext(original, identity) === 'same')
45
+ throw new Error('漏检审查与首轮评审是同一代理上下文,请使用全新子代理');
46
+ }
40
47
  const accepted = acceptSubmission(prepared, value);
41
48
  if (identity)
42
49
  writeModelSource(root, prepared.request.key, accepted, ticketId, identity);
@@ -1 +1 @@
1
- {"version":3,"file":"submit.js","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"submit.js","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"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"}
@@ -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"}
@@ -2,9 +2,10 @@ import { type ReviewResult } from './review.js';
2
2
  export interface ModelIdentity {
3
3
  vendor: string;
4
4
  model: string;
5
- host: 'codex' | 'claude';
5
+ host: 'codex' | 'claude' | 'cursor';
6
6
  assurance: 'tool-model' | 'session-model';
7
7
  sessionId: string;
8
+ agentId?: string;
8
9
  eventId: string;
9
10
  }
10
11
  export interface ModelSource extends ModelIdentity {
@@ -23,8 +23,22 @@ export function canonicalModelId(value) {
23
23
  return null;
24
24
  return model;
25
25
  }
26
- function vendorFor(host) {
27
- return host === 'codex' ? 'openai' : 'anthropic';
26
+ function vendorFor(host, model) {
27
+ if (host === 'codex')
28
+ return 'openai';
29
+ if (host === 'claude')
30
+ return 'anthropic';
31
+ const [namespace, name] = model.includes('/') ? model.split('/', 2) : [null, model];
32
+ let inferred = null;
33
+ if (/^claude-/.test(name))
34
+ inferred = 'anthropic';
35
+ else if (/^(gpt-|o[1-9](?:-|$)|codex-)/.test(name))
36
+ inferred = 'openai';
37
+ else if (/^gemini-/.test(name))
38
+ inferred = 'google';
39
+ else if (/^grok-/.test(name))
40
+ inferred = 'xai';
41
+ return inferred && (!namespace || namespace === inferred) ? inferred : null;
28
42
  }
29
43
  function readJson(path) {
30
44
  try {
@@ -37,18 +51,21 @@ function readJson(path) {
37
51
  }
38
52
  /** 只采纳代理宿主 hook 的结构化事件,不执行第三方模型适配器。 */
39
53
  export function observeHostModelEvent(root, value, now = Date.now()) {
40
- if (!record(value) || typeof value.session_id !== 'string' || !value.session_id || typeof value.cwd !== 'string')
54
+ if (!record(value) || typeof value.cwd !== 'string')
55
+ return;
56
+ const cursor = value.hook_event_name === 'preToolUse';
57
+ const sessionId = cursor ? value.conversation_id : value.session_id;
58
+ if (typeof sessionId !== 'string' || !sessionId)
41
59
  return;
42
60
  const rel = relative(root, value.cwd);
43
61
  if (!isAbsolute(value.cwd) || rel === '..' || rel.startsWith(`..${sep}`))
44
62
  return;
45
- const sessionId = value.session_id;
46
63
  if (value.hook_event_name === 'SessionStart' || value.hook_event_name === 'PostModelSwitch') {
47
64
  const model = canonicalModelId(value.hook_event_name === 'PostModelSwitch' ? value.to_model : value.model);
48
65
  writeFileSync(statePath(root, sessionId), JSON.stringify({ model, updatedAt: now }));
49
66
  return;
50
67
  }
51
- if (value.hook_event_name !== 'PreToolUse' || !record(value.tool_input))
68
+ if ((!cursor && value.hook_event_name !== 'PreToolUse') || !record(value.tool_input))
52
69
  return;
53
70
  const command = value.tool_input.command;
54
71
  if (typeof command !== 'string' || typeof value.tool_use_id !== 'string' || !value.tool_use_id)
@@ -56,24 +73,32 @@ export function observeHostModelEvent(root, value, now = Date.now()) {
56
73
  const match = command.match(/(?:^|\s)(?:sumi|node\s+(?:"[^"]*sumi\.cjs"|'[^']*sumi\.cjs'|\S*sumi\.cjs))\s+(submit|model-recheck)\s+\S+\s+\S+\s+--ticket\s+([a-f0-9]{8,16})(?:\s|$)/);
57
74
  if (!match)
58
75
  return;
59
- const host = typeof value.turn_id === 'string' ? 'codex' : 'claude';
76
+ const path = ticketPath(root, match[2]);
77
+ const previous = readJson(path);
78
+ const host = cursor ? 'cursor' : typeof value.turn_id === 'string' ? 'codex' : 'claude';
60
79
  const session = host === 'claude' ? readJson(statePath(root, sessionId)) : null;
61
- const model = canonicalModelId(host === 'codex' ? value.model : session?.model);
62
- if (!model)
80
+ const model = canonicalModelId(host === 'cursor' ? value.model_id : host === 'codex' ? value.model : session?.model);
81
+ const vendor = model ? vendorFor(host, model) : null;
82
+ if (!model || !vendor) {
83
+ // 同一 ticket 的后续工具事件若无法确认模型,旧来源不得替代当前调用。
84
+ if (previous && !previous.used)
85
+ writeFileSync(path, JSON.stringify({ ...previous, conflict: true }));
63
86
  return;
87
+ }
64
88
  const event = {
65
89
  action: match[1],
66
90
  ticket: match[2],
67
91
  host,
68
- assurance: host === 'codex' ? 'tool-model' : 'session-model',
69
- vendor: vendorFor(host),
92
+ assurance: host === 'claude' ? 'session-model' : 'tool-model',
93
+ vendor,
70
94
  model,
71
95
  sessionId,
96
+ ...(host === 'claude' && typeof value.agent_id === 'string' && value.agent_id.length > 0 && value.agent_id.length <= 512
97
+ ? { agentId: value.agent_id }
98
+ : {}),
72
99
  eventId: value.tool_use_id,
73
100
  issuedAt: now,
74
101
  };
75
- const path = ticketPath(root, event.ticket);
76
- const previous = readJson(path);
77
102
  // 已消耗事件是评审来源证据;同一命令误重试时不能改写它。
78
103
  if (previous?.used)
79
104
  return;
@@ -81,7 +106,9 @@ export function observeHostModelEvent(root, value, now = Date.now()) {
81
106
  (previous.conflict ||
82
107
  previous.model !== event.model ||
83
108
  previous.sessionId !== event.sessionId ||
109
+ previous.agentId !== event.agentId ||
84
110
  previous.host !== event.host ||
111
+ previous.vendor !== event.vendor ||
85
112
  previous.action !== event.action))
86
113
  event.conflict = true;
87
114
  writeFileSync(path, JSON.stringify(event));
@@ -97,10 +124,11 @@ export function consumeHostModelEvent(root, ticket, action, now = Date.now()) {
97
124
  now < event.issuedAt ||
98
125
  now - event.issuedAt > 120_000 ||
99
126
  !canonicalModelId(event.model) ||
100
- (event.host !== 'codex' && event.host !== 'claude') ||
101
- event.assurance !== (event.host === 'codex' ? 'tool-model' : 'session-model') ||
102
- event.vendor !== vendorFor(event.host) ||
127
+ (event.host !== 'codex' && event.host !== 'claude' && event.host !== 'cursor') ||
128
+ event.assurance !== (event.host === 'claude' ? 'session-model' : 'tool-model') ||
129
+ event.vendor !== vendorFor(event.host, event.model) ||
103
130
  typeof event.sessionId !== 'string' ||
131
+ (event.agentId !== undefined && (typeof event.agentId !== 'string' || !event.agentId || event.agentId.length > 512)) ||
104
132
  typeof event.eventId !== 'string' ||
105
133
  event.used)
106
134
  throw new Error('缺少与该 ticket 绑定的当前代理宿主模型事件,或模型来源存在冲突');
@@ -111,6 +139,7 @@ export function consumeHostModelEvent(root, ticket, action, now = Date.now()) {
111
139
  vendor: event.vendor,
112
140
  model: event.model,
113
141
  sessionId: event.sessionId,
142
+ ...(typeof event.agentId === 'string' ? { agentId: event.agentId } : {}),
114
143
  eventId: event.eventId,
115
144
  };
116
145
  }
@@ -130,6 +159,7 @@ export function wasHostModelEventConsumed(root, ticket, action, identity) {
130
159
  event.vendor === identity.vendor &&
131
160
  event.model === identity.model &&
132
161
  event.sessionId === identity.sessionId &&
162
+ event.agentId === identity.agentId &&
133
163
  event.eventId === identity.eventId);
134
164
  }
135
165
  export function writeModelSource(root, key, result, ticket, identity) {
@@ -142,10 +172,11 @@ export function readModelSource(root, key, result) {
142
172
  source.key !== key ||
143
173
  source.resultDigest !== resultDigest(result) ||
144
174
  !canonicalModelId(source.model) ||
145
- (source.host !== 'codex' && source.host !== 'claude') ||
146
- source.assurance !== (source.host === 'codex' ? 'tool-model' : 'session-model') ||
147
- source.vendor !== vendorFor(source.host) ||
175
+ (source.host !== 'codex' && source.host !== 'claude' && source.host !== 'cursor') ||
176
+ source.assurance !== (source.host === 'claude' ? 'session-model' : 'tool-model') ||
177
+ source.vendor !== vendorFor(source.host, source.model) ||
148
178
  typeof source.sessionId !== 'string' ||
179
+ (source.agentId !== undefined && (typeof source.agentId !== 'string' || !source.agentId || source.agentId.length > 512)) ||
149
180
  typeof source.eventId !== 'string' ||
150
181
  typeof source.ticket !== 'string' ||
151
182
  !/^[a-f0-9]{8}$/.test(source.ticket))
@@ -1 +1 @@
1
- {"version":3,"file":"model-execution.js","sourceRoot":"","sources":["../src/model-execution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-execution.js","sourceRoot":"","sources":["../src/model-execution.ts"],"names":[],"mappings":"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"}
@@ -6,5 +6,6 @@ export interface IndependenceDecision {
6
6
  independent: boolean;
7
7
  reason: string;
8
8
  }
9
+ export type RecheckPolicy = 'different-model' | 'different-vendor' | 'independent-context';
9
10
  /** 仅比较已由受信执行路径取得的身份;调用方必须先验证来源,不能把自报 JSON 直接传入。 */
10
- export declare function compareVerifiedModels(original: ModelIdentity | null, reviewer: ModelIdentity | null, reviewerClaim?: string): IndependenceDecision;
11
+ export declare function compareVerifiedModels(original: ModelIdentity | null, reviewer: ModelIdentity | null, reviewerClaim?: string, policy?: Exclude<RecheckPolicy, 'independent-context'>): IndependenceDecision;
@@ -1,14 +1,23 @@
1
1
  import { canonicalModelId } from './model-execution.js';
2
+ function comparableModel(model, vendor) {
3
+ const id = canonicalModelId(model);
4
+ if (!id)
5
+ return null;
6
+ const prefix = `${vendor?.toLowerCase()}/`;
7
+ return vendor && id.startsWith(prefix) ? id.slice(prefix.length) : id;
8
+ }
2
9
  /** 仅比较已由受信执行路径取得的身份;调用方必须先验证来源,不能把自报 JSON 直接传入。 */
3
- export function compareVerifiedModels(original, reviewer, reviewerClaim) {
4
- const first = canonicalModelId(original?.model);
5
- const second = canonicalModelId(reviewer?.model);
10
+ export function compareVerifiedModels(original, reviewer, reviewerClaim, policy = 'different-model') {
11
+ const first = comparableModel(original?.model, original?.vendor);
12
+ const second = comparableModel(reviewer?.model, reviewer?.vendor);
6
13
  if (!original?.vendor || !reviewer?.vendor || !first || !second)
7
14
  return { independent: false, reason: '原评审或复核缺少可核验的厂商和明确模型 ID' };
8
- if (reviewerClaim !== undefined && canonicalModelId(reviewerClaim) !== second)
15
+ if (reviewerClaim !== undefined && comparableModel(reviewerClaim, reviewer.vendor) !== second)
9
16
  return { independent: false, reason: '复核模型声明与受信执行来源冲突' };
10
17
  if (first === second)
11
18
  return { independent: false, reason: `原评审与复核使用同一模型 ${first}` };
19
+ if (policy === 'different-vendor' && original.vendor === reviewer.vendor)
20
+ return { independent: false, reason: `跨厂商复核要求不同厂商,当前双方均为 ${original.vendor}` };
12
21
  return { independent: true, reason: '使用不同的明确模型,允许独立复核' };
13
22
  }
14
23
  //# sourceMappingURL=model-independence.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"model-independence.js","sourceRoot":"","sources":["../src/model-independence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAYxD,mDAAmD;AACnD,MAAM,UAAU,qBAAqB,CACnC,QAA8B,EAC9B,QAA8B,EAC9B,aAAsB;IAEtB,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACjD,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM;QAC7D,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC;IAClE,IAAI,aAAa,KAAK,SAAS,IAAI,gBAAgB,CAAC,aAAa,CAAC,KAAK,MAAM;QAC3E,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC3D,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,KAAK,EAAE,EAAE,CAAC;IACrF,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;AAC3D,CAAC"}
1
+ {"version":3,"file":"model-independence.js","sourceRoot":"","sources":["../src/model-independence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAcxD,SAAS,eAAe,CAAC,KAAc,EAAE,MAA0B;IACjE,MAAM,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACnC,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC;IACrB,MAAM,MAAM,GAAG,GAAG,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC;IAC3C,OAAO,MAAM,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxE,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,qBAAqB,CACnC,QAA8B,EAC9B,QAA8B,EAC9B,aAAsB,EACtB,SAAwD,iBAAiB;IAEzE,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClE,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM;QAC7D,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC;IAClE,IAAI,aAAa,KAAK,SAAS,IAAI,eAAe,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,MAAM;QAC3F,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC3D,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,KAAK,EAAE,EAAE,CAAC;IACrF,IAAI,MAAM,KAAK,kBAAkB,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QACtE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;IACjF,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;AAC3D,CAAC"}