perttool 0.8.1 → 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 (139) hide show
  1. package/CHANGELOG.md +37 -1
  2. package/README.md +100 -38
  3. package/dist/application/cli-facade.d.ts +12 -7
  4. package/dist/application/cli-facade.d.ts.map +1 -1
  5. package/dist/application/cli-facade.js +16 -7
  6. package/dist/application/cli-facade.js.map +1 -1
  7. package/dist/application/contract8-milestone-acceptance.d.ts +74 -0
  8. package/dist/application/contract8-milestone-acceptance.d.ts.map +1 -0
  9. package/dist/application/contract8-milestone-acceptance.js +185 -0
  10. package/dist/application/contract8-milestone-acceptance.js.map +1 -0
  11. package/dist/application/editor-milestone-acceptance.d.ts +75 -0
  12. package/dist/application/editor-milestone-acceptance.d.ts.map +1 -0
  13. package/dist/application/editor-milestone-acceptance.js +161 -0
  14. package/dist/application/editor-milestone-acceptance.js.map +1 -0
  15. package/dist/application/target-governance-init.d.ts +1 -1
  16. package/dist/application/target-governance-init.d.ts.map +1 -1
  17. package/dist/application/target-governance-init.js +3 -5
  18. package/dist/application/target-governance-init.js.map +1 -1
  19. package/dist/application/target-governance-project.d.ts +2 -2
  20. package/dist/application/target-governance-project.d.ts.map +1 -1
  21. package/dist/application/target-historical-graph.d.ts +3 -1
  22. package/dist/application/target-historical-graph.d.ts.map +1 -1
  23. package/dist/application/target-historical-graph.js +85 -2
  24. package/dist/application/target-historical-graph.js.map +1 -1
  25. package/dist/application/target-project-history.d.ts +10 -0
  26. package/dist/application/target-project-history.d.ts.map +1 -1
  27. package/dist/application/target-project-history.js +54 -0
  28. package/dist/application/target-project-history.js.map +1 -1
  29. package/dist/application/target-velocity-observation.d.ts +6 -1
  30. package/dist/application/target-velocity-observation.d.ts.map +1 -1
  31. package/dist/application/target-velocity-observation.js +72 -4
  32. package/dist/application/target-velocity-observation.js.map +1 -1
  33. package/dist/cli.js +377 -37
  34. package/dist/cli.js.map +1 -1
  35. package/dist/command/assurance-discovery.d.ts +4 -3
  36. package/dist/command/assurance-discovery.d.ts.map +1 -1
  37. package/dist/command/assurance-discovery.js +96 -9
  38. package/dist/command/assurance-discovery.js.map +1 -1
  39. package/dist/command/assurance-usage.js +2 -2
  40. package/dist/command/assurance-usage.js.map +1 -1
  41. package/dist/command/discovery.js +4 -4
  42. package/dist/command/discovery.js.map +1 -1
  43. package/dist/command/registry.d.ts +1 -1
  44. package/dist/command/registry.d.ts.map +1 -1
  45. package/dist/command/registry.js +2 -2
  46. package/dist/command/registry.js.map +1 -1
  47. package/dist/command/usage.d.ts.map +1 -1
  48. package/dist/command/usage.js +12 -4
  49. package/dist/command/usage.js.map +1 -1
  50. package/dist/core/index.d.ts +1 -1
  51. package/dist/core/index.d.ts.map +1 -1
  52. package/dist/help/assurance-guide.d.ts +1 -1
  53. package/dist/help/assurance-guide.d.ts.map +1 -1
  54. package/dist/help/assurance-guide.js +46 -19
  55. package/dist/help/assurance-guide.js.map +1 -1
  56. package/dist/help/guide.d.ts +1 -1
  57. package/dist/help/guide.d.ts.map +1 -1
  58. package/dist/help/registry.js +5 -5
  59. package/dist/help/registry.js.map +1 -1
  60. package/dist/history/historical-graph.d.ts +2 -0
  61. package/dist/history/historical-graph.d.ts.map +1 -1
  62. package/dist/history/historical-graph.js +98 -24
  63. package/dist/history/historical-graph.js.map +1 -1
  64. package/dist/history/milestone-acceptance-history.d.ts +59 -0
  65. package/dist/history/milestone-acceptance-history.d.ts.map +1 -0
  66. package/dist/history/milestone-acceptance-history.js +332 -0
  67. package/dist/history/milestone-acceptance-history.js.map +1 -0
  68. package/dist/index.d.ts +10 -9
  69. package/dist/index.d.ts.map +1 -1
  70. package/dist/index.js +7 -6
  71. package/dist/index.js.map +1 -1
  72. package/dist/migration/grammar-boundary.d.ts +1 -1
  73. package/dist/migration/grammar-boundary.d.ts.map +1 -1
  74. package/dist/migration/grammar-boundary.js +7 -3
  75. package/dist/migration/grammar-boundary.js.map +1 -1
  76. package/dist/milestone-acceptance/advance.d.ts +39 -0
  77. package/dist/milestone-acceptance/advance.d.ts.map +1 -0
  78. package/dist/milestone-acceptance/advance.js +112 -0
  79. package/dist/milestone-acceptance/advance.js.map +1 -0
  80. package/dist/milestone-acceptance/evaluate.d.ts +51 -0
  81. package/dist/milestone-acceptance/evaluate.d.ts.map +1 -0
  82. package/dist/milestone-acceptance/evaluate.js +114 -0
  83. package/dist/milestone-acceptance/evaluate.js.map +1 -0
  84. package/dist/milestone-acceptance/migration.d.ts +25 -0
  85. package/dist/milestone-acceptance/migration.d.ts.map +1 -0
  86. package/dist/milestone-acceptance/migration.js +76 -0
  87. package/dist/milestone-acceptance/migration.js.map +1 -0
  88. package/dist/milestone-acceptance/mutation.d.ts +49 -0
  89. package/dist/milestone-acceptance/mutation.d.ts.map +1 -0
  90. package/dist/milestone-acceptance/mutation.js +136 -0
  91. package/dist/milestone-acceptance/mutation.js.map +1 -0
  92. package/dist/milestone-acceptance/source.d.ts +83 -0
  93. package/dist/milestone-acceptance/source.d.ts.map +1 -0
  94. package/dist/milestone-acceptance/source.js +301 -0
  95. package/dist/milestone-acceptance/source.js.map +1 -0
  96. package/dist/mutation/advance-deletion.d.ts.map +1 -1
  97. package/dist/mutation/advance-deletion.js +6 -1
  98. package/dist/mutation/advance-deletion.js.map +1 -1
  99. package/dist/perttool-vscode-private-0.0.0-d1578b9.vsix +0 -0
  100. package/dist/recommendation/override-types.d.ts +2 -2
  101. package/dist/recommendation/override.d.ts +1 -1
  102. package/dist/recommendation/override.js +2 -2
  103. package/dist/schema/registry.d.ts +1 -1
  104. package/dist/schema/registry.d.ts.map +1 -1
  105. package/dist/schema/registry.js +8 -6
  106. package/dist/schema/registry.js.map +1 -1
  107. package/dist/semantic/validator.d.ts.map +1 -1
  108. package/dist/semantic/validator.js +14 -3
  109. package/dist/semantic/validator.js.map +1 -1
  110. package/dist/session/document-session.d.ts +5 -0
  111. package/dist/session/document-session.d.ts.map +1 -1
  112. package/dist/session/document-session.js +25 -2
  113. package/dist/session/document-session.js.map +1 -1
  114. package/dist/version.d.ts +1 -1
  115. package/dist/version.js +1 -1
  116. package/package.json +1 -1
  117. package/schemas/{Perttool.AdvanceResult.v2.schema.json → Perttool.AdvanceResult.v3.schema.json} +36 -5
  118. package/schemas/Perttool.AgentGuidanceResult.v1.schema.json +1 -1
  119. package/schemas/{Perttool.AnalysisResult.v5.schema.json → Perttool.AnalysisResult.v6.schema.json} +12 -5
  120. package/schemas/{Perttool.CheckResult.v4.schema.json → Perttool.CheckResult.v5.schema.json} +12 -5
  121. package/schemas/Perttool.CliError.v1.schema.json +1 -1
  122. package/schemas/Perttool.CommandHelpResult.v1.schema.json +3 -3
  123. package/schemas/Perttool.ExportResult.v1.schema.json +1 -1
  124. package/schemas/Perttool.FormatResult.v1.schema.json +1 -1
  125. package/schemas/Perttool.GuideResult.v1.schema.json +1 -1
  126. package/schemas/Perttool.HistoricalGraphResult.v1.schema.json +100 -2
  127. package/schemas/Perttool.ImportResult.v1.schema.json +1 -1
  128. package/schemas/Perttool.InitResult.v1.schema.json +1 -1
  129. package/schemas/Perttool.MilestoneAcceptanceMigrationResult.v1.schema.json +24 -0
  130. package/schemas/Perttool.MilestoneAcceptanceResult.v1.schema.json +79 -0
  131. package/schemas/{Perttool.MutationResult.v4.schema.json → Perttool.MutationResult.v5.schema.json} +4 -4
  132. package/schemas/{Perttool.NextResult.v6.schema.json → Perttool.NextResult.v7.schema.json} +12 -5
  133. package/schemas/Perttool.OverrideDecision.v1.schema.json +1 -1
  134. package/schemas/Perttool.PlanAssuranceResult.v1.schema.json +1 -1
  135. package/schemas/Perttool.ProjectHistoryResult.v1.schema.json +1 -1
  136. package/schemas/Perttool.ProjectResult.v4.schema.json +2 -2
  137. package/schemas/Perttool.SchemaResult.v1.schema.json +1 -1
  138. package/schemas/Perttool.UnitMigrationResult.v3.schema.json +5 -3
  139. package/schemas/Perttool.VelocityObservationResult.v1.schema.json +1 -1
@@ -0,0 +1,136 @@
1
+ import { evaluateGovernanceAuthority, governanceDecisionDiagnostics, normalizeGovernanceRequest } from "../governance/authority.js";
2
+ import { sha256DigestUtf8 } from "../model/sha256.js";
3
+ import { replaceValidatedDocumentFile } from "../io/safe-write.js";
4
+ import { evaluateMilestoneAcceptance } from "./evaluate.js";
5
+ import { MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY, milestoneCriterionSetCommitment, normalizeCallerAssertedUtcZ, parseMilestoneAcceptanceSource, } from "./source.js";
6
+ const idPattern = /^[A-Za-z][A-Za-z0-9_-]*$/u;
7
+ function governanceMetadata(text) {
8
+ const owner = /^ dag_owner ([A-Za-z][A-Za-z0-9_-]*)$/mu.exec(text)?.[1] ?? "user";
9
+ const delegates = /^ dag_delegates(?: ([A-Za-z][A-Za-z0-9_-]*(?: [A-Za-z][A-Za-z0-9_-]*)*))?$/mu.exec(text)?.[1]?.split(" ") ?? [];
10
+ return { owner, delegates: new Set(delegates) };
11
+ }
12
+ function decision(text, digest, input) {
13
+ const normalized = normalizeGovernanceRequest(input);
14
+ if (!normalized.ok)
15
+ return { value: null, diagnostics: Object.freeze(normalized.diagnostics.map(({ code }) => code)) };
16
+ const metadata = governanceMetadata(text);
17
+ const value = evaluateGovernanceAuthority({
18
+ originalDigest: digest,
19
+ effective: {
20
+ goalOwner: "user", goalDelegates: new Set(),
21
+ dagOwner: metadata.owner, dagDelegates: metadata.delegates,
22
+ },
23
+ }, ["dag"], normalized.request);
24
+ return { value, diagnostics: Object.freeze(governanceDecisionDiagnostics(value).map(({ code }) => code)) };
25
+ }
26
+ function failure(operation, text, diagnostics, governance = null) {
27
+ return Object.freeze({ modelVersion: 1, operation, ok: false, changed: false, replayed: false, originalDigest: sha256DigestUtf8(text), updatedDigest: null, updatedText: null, governance, evaluation: null, diagnostics: Object.freeze([...diagnostics]) });
28
+ }
29
+ function insertAtEnd(text, block) {
30
+ return `${text}${text.endsWith("\n") ? "" : "\n"}${text.endsWith("\n\n") ? "" : "\n"}${block}`;
31
+ }
32
+ function removeSpans(text, spans) {
33
+ let result = text;
34
+ for (const span of [...spans].sort((a, b) => b.start.offset - a.start.offset)) {
35
+ let start = span.start.offset;
36
+ let end = span.end.offset;
37
+ if (start > 0 && text.slice(Math.max(0, start - 1), start) === "\n" && text.slice(Math.max(0, start - 2), start) === "\n\n")
38
+ start -= 1;
39
+ result = result.slice(0, start) + result.slice(end);
40
+ }
41
+ return result;
42
+ }
43
+ function criterionCommitment(input, criterion) {
44
+ return sha256DigestUtf8(JSON.stringify(["Perttool.MilestoneCriterion.v1", input.milestoneId, input.revisionId, criterion.criterionId, criterion.required, criterion.evidenceKind, criterion.description]));
45
+ }
46
+ function replacementBlock(input) {
47
+ const criteria = input.criteria.map((criterion) => ({ ...criterion, commitment: criterionCommitment(input, criterion) }));
48
+ const commitment = milestoneCriterionSetCommitment(input.milestoneId, input.revisionId, criteria);
49
+ return `milestone_criterion_set ${input.setId}:\n milestone ${input.milestoneId}\n revision ${input.revisionId}\n commitment ${commitment}\n${criteria.map((criterion) => ` criterion ${criterion.criterionId} ${criterion.required ? "required" : "optional"} ${criterion.evidenceKind} ${JSON.stringify(criterion.description)}\n`).join("")}`;
50
+ }
51
+ function finalResult(operation, text, candidate, governance, replayed = false) {
52
+ const parsed = parseMilestoneAcceptanceSource(candidate, MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY);
53
+ if (!parsed.ok)
54
+ return failure(operation, text, parsed.diagnostics.map(({ code }) => code), governance);
55
+ const milestoneIds = [...candidate.matchAll(/^milestone ([A-Za-z][A-Za-z0-9_-]*):$/gmu)].map((match) => match[1]);
56
+ const evaluation = evaluateMilestoneAcceptance({ source: parsed, milestoneIds, closureReachedMilestoneIds: new Set() });
57
+ if (!evaluation.ok)
58
+ return failure(operation, text, evaluation.diagnostics.map(({ code }) => code), governance);
59
+ const diagnostics = governanceDecisionDiagnostics(governance).map(({ code }) => code);
60
+ const denied = diagnostics.includes("PTGOV-101");
61
+ return Object.freeze({ modelVersion: 1, operation, ok: !denied, changed: candidate !== text, replayed, originalDigest: sha256DigestUtf8(text), updatedDigest: sha256DigestUtf8(candidate), updatedText: candidate, governance, evaluation, diagnostics: Object.freeze(diagnostics) });
62
+ }
63
+ export function planCriterionSetReplacement(text, input, options = {}) {
64
+ const parsed = parseMilestoneAcceptanceSource(text, MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY);
65
+ if (!parsed.ok)
66
+ return failure("replace", text, parsed.diagnostics.map(({ code }) => code));
67
+ if (![input.setId, input.milestoneId, input.revisionId].every((id) => idPattern.test(id)) || input.criteria.length === 0 || !input.criteria.some(({ required }) => required) || new Set(input.criteria.map(({ criterionId }) => criterionId)).size !== input.criteria.length || input.criteria.some(({ criterionId, description }) => !idPattern.test(criterionId) || description.length === 0))
68
+ return failure("replace", text, ["invalid_replacement"]);
69
+ const originalDigest = sha256DigestUtf8(text);
70
+ const governed = decision(text, originalDigest, options.governance);
71
+ if (governed.value === null)
72
+ return failure("replace", text, governed.diagnostics);
73
+ const ownedSets = parsed.records.filter((record) => record.kind === "milestone_criterion_set" && record.milestoneId === input.milestoneId);
74
+ const ownedIds = new Set(ownedSets.map(({ id }) => id));
75
+ const owned = parsed.records.filter((record) => ownedIds.has(record.kind === "milestone_acceptance_receipt" ? record.setId : record.id));
76
+ const candidate = insertAtEnd(removeSpans(text, owned.map(({ span }) => span)), replacementBlock(input));
77
+ return finalResult("replace", text, candidate, governed.value);
78
+ }
79
+ function receiptBlock(set, criterion, input) {
80
+ const time = input.occurredAt === undefined ? null : normalizeCallerAssertedUtcZ(input.occurredAt);
81
+ if (input.action === "verify" && (input.evidenceKind !== criterion.evidenceKind || !input.evidenceReference || !input.evidenceRevision || !input.verifier || time === null))
82
+ return null;
83
+ if (input.action === "revoke" && !input.revokes)
84
+ return null;
85
+ if (input.action === "waive" && (!criterion.required || !input.reason))
86
+ return null;
87
+ let block = `milestone_acceptance_receipt ${input.receiptId}:\n model 1\n set ${set.id}\n set_commitment ${set.commitment}\n criterion ${criterion.criterionId}\n criterion_commitment ${criterion.commitment}\n action ${input.action}\n`;
88
+ if (input.action === "verify")
89
+ block += ` evidence_kind ${input.evidenceKind}\n evidence_reference ${JSON.stringify(input.evidenceReference)}\n evidence_revision ${input.evidenceRevision}\n verifier ${input.verifier}\n occurred_at ${time}\n`;
90
+ if (input.reason !== undefined)
91
+ block += ` reason ${JSON.stringify(input.reason)}\n`;
92
+ if (input.revokes !== undefined)
93
+ block += ` revokes ${input.revokes}\n`;
94
+ return block;
95
+ }
96
+ export function planAcceptanceReceiptMutation(text, input, options = {}) {
97
+ const parsed = parseMilestoneAcceptanceSource(text, MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY);
98
+ if (!parsed.ok)
99
+ return failure(input.action, text, parsed.diagnostics.map(({ code }) => code));
100
+ if (![input.receiptId, input.setId, input.criterionId].every((id) => idPattern.test(id)))
101
+ return failure(input.action, text, ["invalid_receipt"]);
102
+ const set = parsed.records.find((record) => record.kind === "milestone_criterion_set" && record.id === input.setId);
103
+ const criterion = set?.criteria.find(({ criterionId }) => criterionId === input.criterionId);
104
+ if (set === undefined || criterion === undefined)
105
+ return failure(input.action, text, ["unknown_criterion"]);
106
+ const block = receiptBlock(set, criterion, input);
107
+ if (block === null)
108
+ return failure(input.action, text, ["invalid_receipt"]);
109
+ const existing = parsed.records.find((record) => record.kind === "milestone_acceptance_receipt" && record.id === input.receiptId);
110
+ if (existing !== undefined) {
111
+ const canonicalExisting = text.slice(existing.span.start.offset, existing.span.end.offset);
112
+ if (canonicalExisting === block) {
113
+ const governed = decision(text, sha256DigestUtf8(text), options.governance);
114
+ return governed.value === null ? failure(input.action, text, governed.diagnostics) : finalResult(input.action, text, text, governed.value, true);
115
+ }
116
+ return failure(input.action, text, ["conflicting_receipt_identity"]);
117
+ }
118
+ const governed = decision(text, sha256DigestUtf8(text), options.governance);
119
+ if (governed.value === null)
120
+ return failure(input.action, text, governed.diagnostics);
121
+ return finalResult(input.action, text, insertAtEnd(text, block), governed.value);
122
+ }
123
+ export function showMilestoneAcceptance(text, closureReachedMilestoneIds) {
124
+ const source = parseMilestoneAcceptanceSource(text, MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY);
125
+ const milestoneIds = [...text.matchAll(/^milestone ([A-Za-z][A-Za-z0-9_-]*):$/gmu)].map((match) => match[1]);
126
+ return evaluateMilestoneAcceptance({ source, milestoneIds, closureReachedMilestoneIds: new Set(closureReachedMilestoneIds) });
127
+ }
128
+ export async function persistMilestoneAcceptanceMutation(path, result, expectedDigest) {
129
+ if (!result.ok || !result.changed || result.updatedText === null || result.governance?.intent !== "persist" || !result.governance.writeAuthorized)
130
+ throw new TypeError("milestone acceptance mutation is not persistable");
131
+ return replaceValidatedDocumentFile(path, result.updatedText, { initialDigest: result.originalDigest, ...(expectedDigest === undefined ? {} : { expectedDigest }) }, (candidate) => {
132
+ const parsed = parseMilestoneAcceptanceSource(candidate, MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY);
133
+ return { ok: parsed.ok, diagnostics: [] };
134
+ });
135
+ }
136
+ //# sourceMappingURL=mutation.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mutation.js","sourceRoot":"","sources":["../../src/milestone-acceptance/mutation.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,83 @@
1
+ import type { SourceSpan } from "../model/diagnostics.js";
2
+ export declare const MILESTONE_ACCEPTANCE_SOURCE_MODEL_VERSION: 1;
3
+ export interface MilestoneAcceptanceSourceCapability {
4
+ readonly id: "perttool.target-grammar-7-milestone-acceptance-source";
5
+ readonly version: 1;
6
+ readonly grammarVersion: 7;
7
+ }
8
+ export declare const MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY: MilestoneAcceptanceSourceCapability;
9
+ export type CriterionEvidenceKind = "test" | "command" | "artifact" | "observation" | "owner";
10
+ export type AcceptanceReceiptAction = "verify" | "fail" | "unavailable" | "revoke" | "waive";
11
+ export interface MilestoneCriterionSourceV1 {
12
+ readonly criterionId: string;
13
+ readonly required: boolean;
14
+ readonly evidenceKind: CriterionEvidenceKind;
15
+ readonly description: string;
16
+ readonly commitment: `sha256:${string}`;
17
+ readonly span: SourceSpan;
18
+ }
19
+ export interface MilestoneCriterionSetSourceV1 {
20
+ readonly kind: "milestone_criterion_set";
21
+ readonly id: string;
22
+ readonly milestoneId: string;
23
+ readonly revisionId: string;
24
+ readonly commitment: `sha256:${string}`;
25
+ readonly criteria: readonly MilestoneCriterionSourceV1[];
26
+ readonly span: SourceSpan;
27
+ readonly idSpan: SourceSpan;
28
+ }
29
+ export interface MilestoneAcceptanceReceiptSourceV1 {
30
+ readonly kind: "milestone_acceptance_receipt";
31
+ readonly id: string;
32
+ readonly model: 1;
33
+ readonly setId: string;
34
+ readonly setCommitment: `sha256:${string}`;
35
+ readonly criterionId: string;
36
+ readonly criterionCommitment: `sha256:${string}`;
37
+ readonly action: AcceptanceReceiptAction;
38
+ readonly evidenceKind: CriterionEvidenceKind | null;
39
+ readonly evidenceReference: string | null;
40
+ readonly evidenceRevision: string | null;
41
+ readonly verifier: string | null;
42
+ readonly occurredAt: string | null;
43
+ readonly reason: string | null;
44
+ readonly revokes: string | null;
45
+ readonly span: SourceSpan;
46
+ readonly idSpan: SourceSpan;
47
+ }
48
+ export interface MilestoneAcceptanceMigrationSourceV1 {
49
+ readonly kind: "milestone_acceptance_migration";
50
+ readonly id: string;
51
+ readonly model: 1;
52
+ readonly repositoryId: string;
53
+ readonly path: string;
54
+ readonly objectFormat: "sha1" | "sha256";
55
+ readonly head: string;
56
+ readonly blob: string;
57
+ readonly sourceDigest: `sha256:${string}`;
58
+ readonly candidateDigest: `sha256:${string}`;
59
+ readonly grandfatheredMilestoneIds: readonly string[];
60
+ readonly span: SourceSpan;
61
+ readonly idSpan: SourceSpan;
62
+ }
63
+ export type MilestoneAcceptanceSourceRecordV1 = MilestoneCriterionSetSourceV1 | MilestoneAcceptanceReceiptSourceV1 | MilestoneAcceptanceMigrationSourceV1;
64
+ export interface MilestoneAcceptanceSourceDiagnosticV1 {
65
+ readonly code: "PTMAC-103" | "PTMAC-104" | "PTMAC-105" | "PTMAC-106";
66
+ readonly message: string;
67
+ readonly span: SourceSpan;
68
+ }
69
+ export interface MilestoneAcceptanceSourceResultV1 {
70
+ readonly ok: boolean;
71
+ readonly grammarVersion: number | null;
72
+ readonly documentId: string | null;
73
+ readonly records: readonly MilestoneAcceptanceSourceRecordV1[];
74
+ readonly diagnostics: readonly MilestoneAcceptanceSourceDiagnosticV1[];
75
+ readonly baseDiagnostics: readonly unknown[];
76
+ readonly canonicalText: string | null;
77
+ }
78
+ export declare function normalizeCallerAssertedUtcZ(value: string): string | null;
79
+ export declare function milestoneCriterionSetCommitment(milestoneId: string, revisionId: string, criteria: readonly Pick<MilestoneCriterionSourceV1, "criterionId" | "required" | "evidenceKind" | "description" | "commitment">[]): `sha256:${string}`;
80
+ export declare function milestoneAcceptanceBaseText(text: string): string;
81
+ export declare function parseMilestoneAcceptanceSource(text: string, capability: MilestoneAcceptanceSourceCapability): MilestoneAcceptanceSourceResultV1;
82
+ export declare function formatMilestoneAcceptanceSource(text: string, records: readonly MilestoneAcceptanceSourceRecordV1[]): string;
83
+ //# sourceMappingURL=source.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../src/milestone-acceptance/source.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,301 @@
1
+ import { sha256DigestUtf8 } from "../model/sha256.js";
2
+ import { TARGET_GRAMMAR_6_CAPABILITY, } from "../parser/document-parser.js";
3
+ import { validateTargetGrammar6Document } from "../semantic/target-validator.js";
4
+ export const MILESTONE_ACCEPTANCE_SOURCE_MODEL_VERSION = 1;
5
+ export const MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY = Object.freeze({
6
+ id: "perttool.target-grammar-7-milestone-acceptance-source",
7
+ version: 1,
8
+ grammarVersion: 7,
9
+ });
10
+ const idPattern = /^[A-Za-z][A-Za-z0-9_-]*$/u;
11
+ const digestPattern = /^sha256:[0-9a-f]{64}$/u;
12
+ const timePattern = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z$/u;
13
+ export function normalizeCallerAssertedUtcZ(value) {
14
+ if (!timePattern.test(value))
15
+ return null;
16
+ const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?Z$/u.exec(value);
17
+ const [year, month, day, hour, minute, second] = match.slice(1, 7).map(Number);
18
+ const date = new Date(Date.UTC(year, month - 1, day, hour, minute, second));
19
+ if (date.getUTCFullYear() !== year || date.getUTCMonth() + 1 !== month || date.getUTCDate() !== day || date.getUTCHours() !== hour || date.getUTCMinutes() !== minute || date.getUTCSeconds() !== second)
20
+ return null;
21
+ const fraction = (match[7] ?? "").replace(/0+$/u, "");
22
+ return `${match[1]}-${match[2]}-${match[3]}T${match[4]}:${match[5]}:${match[6]}${fraction.length === 0 ? "" : `.${fraction}`}Z`;
23
+ }
24
+ function lines(text) {
25
+ const result = [];
26
+ let offset = 0;
27
+ for (const [index, value] of text.split(/(?<=\n)/u).entries()) {
28
+ result.push({ text: value, start: offset, end: offset + value.length, number: index + 1 });
29
+ offset += value.length;
30
+ }
31
+ return result;
32
+ }
33
+ function position(text, offset) {
34
+ const prefix = text.slice(0, offset);
35
+ const rows = prefix.split("\n");
36
+ return { offset, line: rows.length, column: rows.at(-1).length + 1 };
37
+ }
38
+ function span(text, start, end) {
39
+ return { start: position(text, start), end: position(text, end) };
40
+ }
41
+ function quoted(value) {
42
+ try {
43
+ const parsed = JSON.parse(value);
44
+ return typeof parsed === "string" ? parsed : null;
45
+ }
46
+ catch {
47
+ return null;
48
+ }
49
+ }
50
+ function canonicalCriterion(milestoneId, revisionId, criterionId, required, evidenceKind, description) {
51
+ return sha256DigestUtf8(JSON.stringify([
52
+ "Perttool.MilestoneCriterion.v1", milestoneId, revisionId, criterionId,
53
+ required, evidenceKind, description,
54
+ ]));
55
+ }
56
+ export function milestoneCriterionSetCommitment(milestoneId, revisionId, criteria) {
57
+ return sha256DigestUtf8(JSON.stringify([
58
+ "Perttool.MilestoneCriterionSet.v1", milestoneId, revisionId,
59
+ criteria.map((criterion) => [
60
+ criterion.criterionId, criterion.required, criterion.evidenceKind,
61
+ criterion.description, criterion.commitment,
62
+ ]),
63
+ ]));
64
+ }
65
+ function fieldMap(block) {
66
+ const map = new Map();
67
+ for (const line of block) {
68
+ const match = /^ ([a-z_]+)(?: (.*))?\r?\n?$/u.exec(line.text);
69
+ if (match === null)
70
+ continue;
71
+ const values = map.get(match[1]) ?? [];
72
+ values.push(line);
73
+ map.set(match[1], values);
74
+ }
75
+ return map;
76
+ }
77
+ function rawField(line, name) {
78
+ if (line === undefined)
79
+ return null;
80
+ const match = new RegExp(`^ ${name}(?: (.*))?\\r?\\n?$`, "u").exec(line.text);
81
+ return match?.[1] ?? null;
82
+ }
83
+ function sanitizeBase(text, sourceLines, removed) {
84
+ return sourceLines.map((line, index) => {
85
+ if (removed.has(index)) {
86
+ const ending = line.text.endsWith("\r\n")
87
+ ? "\r\n"
88
+ : line.text.endsWith("\n")
89
+ ? "\n"
90
+ : "";
91
+ const contentLength = line.text.length - ending.length;
92
+ return contentLength === 0
93
+ ? line.text
94
+ : `#${" ".repeat(contentLength - 1)}${ending}`;
95
+ }
96
+ if (/^ version 7\r?\n?$/u.test(line.text))
97
+ return line.text.replace("7", "6");
98
+ return line.text;
99
+ }).join("");
100
+ }
101
+ export function milestoneAcceptanceBaseText(text) {
102
+ const sourceLines = lines(text);
103
+ const removed = new Set();
104
+ for (let index = 0; index < sourceLines.length; index += 1) {
105
+ if (!/^(milestone_criterion_set|milestone_acceptance_receipt|milestone_acceptance_migration) [A-Za-z][A-Za-z0-9_-]*:\r?\n?$/u.test(sourceLines[index].text))
106
+ continue;
107
+ let endIndex = index + 1;
108
+ while (endIndex < sourceLines.length && /^(?: |\s*$)/u.test(sourceLines[endIndex].text))
109
+ endIndex += 1;
110
+ for (let cursor = index; cursor < endIndex; cursor += 1)
111
+ removed.add(cursor);
112
+ index = endIndex - 1;
113
+ }
114
+ return sanitizeBase(text, sourceLines, removed);
115
+ }
116
+ export function parseMilestoneAcceptanceSource(text, capability) {
117
+ if (capability !== MILESTONE_ACCEPTANCE_SOURCE_CAPABILITY) {
118
+ throw new TypeError("milestone acceptance source capability identity mismatch");
119
+ }
120
+ const sourceLines = lines(text);
121
+ const versionMatch = /^ version (\d+)\r?$/mu.exec(text);
122
+ const grammarVersion = versionMatch === null ? 1 : Number(versionMatch[1]);
123
+ const removed = new Set();
124
+ const diagnostics = [];
125
+ const records = [];
126
+ const seen = new Set();
127
+ const addDiagnostic = (code, message, target) => diagnostics.push({ code, message, span: target });
128
+ for (let index = 0; index < sourceLines.length; index += 1) {
129
+ const header = /^(milestone_criterion_set|milestone_acceptance_receipt|milestone_acceptance_migration) ([A-Za-z][A-Za-z0-9_-]*):\r?\n?$/u.exec(sourceLines[index].text);
130
+ if (header === null)
131
+ continue;
132
+ const startIndex = index;
133
+ let endIndex = index + 1;
134
+ while (endIndex < sourceLines.length && (/^(?: |\s*$)/u.test(sourceLines[endIndex].text)))
135
+ endIndex += 1;
136
+ for (let cursor = startIndex; cursor < endIndex; cursor += 1)
137
+ removed.add(cursor);
138
+ const block = sourceLines.slice(startIndex + 1, endIndex);
139
+ const fields = fieldMap(block);
140
+ const declarationSpan = span(text, sourceLines[startIndex].start, sourceLines[endIndex - 1].end);
141
+ const id = header[2];
142
+ const idOffset = sourceLines[startIndex].start + header[1].length + 1;
143
+ const idSpan = span(text, idOffset, idOffset + id.length);
144
+ const identity = `${header[1]}:${id}`;
145
+ if (seen.has(identity))
146
+ addDiagnostic("PTMAC-104", `Duplicate ${identity}`, idSpan);
147
+ seen.add(identity);
148
+ const allowed = header[1] === "milestone_criterion_set"
149
+ ? new Set(["milestone", "revision", "commitment", "criterion"])
150
+ : header[1] === "milestone_acceptance_receipt"
151
+ ? new Set(["model", "set", "set_commitment", "criterion", "criterion_commitment", "action", "evidence_kind", "evidence_reference", "evidence_revision", "verifier", "occurred_at", "reason", "revokes"])
152
+ : new Set(["model", "repository", "path", "object_format", "head", "blob", "source_digest", "candidate_digest", "grandfathered"]);
153
+ for (const [name, occurrences] of fields) {
154
+ const repeatable = name === "criterion" && header[1] === "milestone_criterion_set" || name === "grandfathered" && header[1] === "milestone_acceptance_migration";
155
+ if (!allowed.has(name) || (!repeatable && occurrences.length !== 1)) {
156
+ addDiagnostic("PTMAC-103", `Invalid field ${name} in ${identity}`, span(text, occurrences[0].start, occurrences.at(-1).end));
157
+ }
158
+ }
159
+ if (header[1] === "milestone_criterion_set") {
160
+ const milestoneId = rawField(fields.get("milestone")?.[0], "milestone");
161
+ const revisionId = rawField(fields.get("revision")?.[0], "revision");
162
+ const stored = rawField(fields.get("commitment")?.[0], "commitment");
163
+ const criteria = [];
164
+ for (const line of fields.get("criterion") ?? []) {
165
+ const raw = rawField(line, "criterion") ?? "";
166
+ const match = /^([A-Za-z][A-Za-z0-9_-]*) (required|optional) (test|command|artifact|observation|owner) ("(?:[^"\\]|\\.)*")$/u.exec(raw);
167
+ if (match === null || milestoneId === null || revisionId === null) {
168
+ addDiagnostic("PTMAC-103", "Invalid criterion declaration", span(text, line.start, line.end));
169
+ continue;
170
+ }
171
+ const description = quoted(match[4]);
172
+ criteria.push({
173
+ criterionId: match[1], required: match[2] === "required",
174
+ evidenceKind: match[3], description,
175
+ commitment: canonicalCriterion(milestoneId, revisionId, match[1], match[2] === "required", match[3], description),
176
+ span: span(text, line.start, line.end),
177
+ });
178
+ }
179
+ if (milestoneId === null || revisionId === null || !idPattern.test(milestoneId) || !idPattern.test(revisionId) || stored === null || !digestPattern.test(stored) || criteria.length === 0 || !criteria.some((criterion) => criterion.required) || new Set(criteria.map((criterion) => criterion.criterionId)).size !== criteria.length) {
180
+ addDiagnostic("PTMAC-103", `Invalid criterion set ${id}`, declarationSpan);
181
+ }
182
+ else {
183
+ const commitment = milestoneCriterionSetCommitment(milestoneId, revisionId, criteria);
184
+ if (stored !== commitment)
185
+ addDiagnostic("PTMAC-105", `Criterion set ${id} commitment mismatch`, declarationSpan);
186
+ records.push({ kind: "milestone_criterion_set", id, milestoneId, revisionId, commitment, criteria: Object.freeze(criteria), span: declarationSpan, idSpan });
187
+ }
188
+ }
189
+ else if (header[1] === "milestone_acceptance_receipt") {
190
+ const value = (name) => rawField(fields.get(name)?.[0], name);
191
+ const model = value("model");
192
+ const setId = value("set");
193
+ const setCommitment = value("set_commitment");
194
+ const criterionId = value("criterion");
195
+ const criterionCommitment = value("criterion_commitment");
196
+ const action = value("action");
197
+ const evidenceKind = value("evidence_kind");
198
+ const evidenceReference = value("evidence_reference");
199
+ const evidenceRevision = value("evidence_revision");
200
+ const verifier = value("verifier");
201
+ const occurredAt = value("occurred_at");
202
+ const reason = value("reason");
203
+ const revokes = value("revokes");
204
+ const actionOk = action !== null && ["verify", "fail", "unavailable", "revoke", "waive"].includes(action);
205
+ if (model !== "1" || setId === null || criterionId === null || setCommitment === null || criterionCommitment === null || !digestPattern.test(setCommitment) || !digestPattern.test(criterionCommitment) || !actionOk) {
206
+ addDiagnostic("PTMAC-105", `Invalid receipt binding ${id}`, declarationSpan);
207
+ }
208
+ else {
209
+ const terminalEvidence = action === "verify";
210
+ const provenanceOk = !terminalEvidence || (evidenceKind !== null && ["test", "command", "artifact", "observation", "owner"].includes(evidenceKind) &&
211
+ evidenceReference !== null && quoted(evidenceReference) !== null && evidenceRevision !== null &&
212
+ verifier !== null && occurredAt !== null && normalizeCallerAssertedUtcZ(occurredAt) !== null);
213
+ const lifecycleOk = action !== "revoke" || revokes !== null;
214
+ const waiverOk = action !== "waive" || (reason !== null && quoted(reason) !== null && quoted(reason).length > 0);
215
+ if (!provenanceOk || !lifecycleOk || !waiverOk)
216
+ addDiagnostic("PTMAC-106", `Invalid receipt provenance ${id}`, declarationSpan);
217
+ records.push({
218
+ kind: "milestone_acceptance_receipt", id, model: 1, setId,
219
+ setCommitment: setCommitment, criterionId,
220
+ criterionCommitment: criterionCommitment,
221
+ action: action,
222
+ evidenceKind: evidenceKind,
223
+ evidenceReference: evidenceReference === null ? null : quoted(evidenceReference),
224
+ evidenceRevision, verifier,
225
+ occurredAt: occurredAt === null ? null : normalizeCallerAssertedUtcZ(occurredAt),
226
+ reason: reason === null ? null : quoted(reason), revokes,
227
+ span: declarationSpan, idSpan,
228
+ });
229
+ }
230
+ }
231
+ else {
232
+ const value = (name) => rawField(fields.get(name)?.[0], name);
233
+ const model = value("model");
234
+ const repositoryId = value("repository");
235
+ const pathValue = value("path");
236
+ const objectFormat = value("object_format");
237
+ const head = value("head");
238
+ const blob = value("blob");
239
+ const sourceDigest = value("source_digest");
240
+ const candidateDigest = value("candidate_digest");
241
+ const ids = (fields.get("grandfathered") ?? []).map((line) => rawField(line, "grandfathered")).filter(Boolean);
242
+ const objectLength = objectFormat === "sha1" ? 40 : objectFormat === "sha256" ? 64 : 0;
243
+ if (model !== "1" || repositoryId === null || pathValue === null || quoted(pathValue) === null || objectLength === 0 || head === null || blob === null || !new RegExp(`^[0-9a-f]{${objectLength}}$`, "u").test(head) || !new RegExp(`^[0-9a-f]{${objectLength}}$`, "u").test(blob) || sourceDigest === null || candidateDigest === null || !digestPattern.test(sourceDigest) || !digestPattern.test(candidateDigest) || ids.some((candidate) => !idPattern.test(candidate)) || [...ids].sort().join("\0") !== ids.join("\0") || new Set(ids).size !== ids.length) {
244
+ addDiagnostic("PTMAC-103", `Invalid migration baseline ${id}`, declarationSpan);
245
+ }
246
+ else
247
+ records.push({ kind: "milestone_acceptance_migration", id, model: 1, repositoryId, path: quoted(pathValue), objectFormat: objectFormat, head, blob, sourceDigest: sourceDigest, candidateDigest: candidateDigest, grandfatheredMilestoneIds: Object.freeze(ids), span: declarationSpan, idSpan });
248
+ }
249
+ index = endIndex - 1;
250
+ }
251
+ if (records.length > 0 && grammarVersion !== 7)
252
+ addDiagnostic("PTMAC-103", "Milestone acceptance records require Grammar 7", span(text, 0, Math.min(text.length, 1)));
253
+ const base = validateTargetGrammar6Document(sanitizeBase(text, sourceLines, removed), TARGET_GRAMMAR_6_CAPABILITY);
254
+ const projectIds = new Set(base.document.declarations.filter((item) => item.kind === "milestone").map((item) => item.id));
255
+ for (const record of records)
256
+ if (record.kind === "milestone_criterion_set" && !projectIds.has(record.milestoneId))
257
+ addDiagnostic("PTMAC-105", `Unknown milestone ${record.milestoneId}`, record.span);
258
+ const sets = new Map(records.filter((record) => record.kind === "milestone_criterion_set").map((record) => [record.id, record]));
259
+ const receiptIds = new Set(records.filter((record) => record.kind === "milestone_acceptance_receipt").map((record) => record.id));
260
+ for (const receipt of records.filter((record) => record.kind === "milestone_acceptance_receipt")) {
261
+ const set = sets.get(receipt.setId);
262
+ const criterion = set?.criteria.find((candidate) => candidate.criterionId === receipt.criterionId);
263
+ if (set === undefined || set.span.start.offset > receipt.span.start.offset || set.commitment !== receipt.setCommitment || criterion === undefined || criterion.commitment !== receipt.criterionCommitment) {
264
+ addDiagnostic("PTMAC-105", `Receipt ${receipt.id} does not bind an exact current criterion`, receipt.span);
265
+ }
266
+ if (receipt.action === "verify" && criterion !== undefined && receipt.evidenceKind !== criterion.evidenceKind) {
267
+ addDiagnostic("PTMAC-105", `Receipt ${receipt.id} evidence kind does not match its criterion`, receipt.span);
268
+ }
269
+ if (receipt.action === "revoke" && (receipt.revokes === null || !receiptIds.has(receipt.revokes) || receipt.revokes === receipt.id)) {
270
+ addDiagnostic("PTMAC-105", `Receipt ${receipt.id} revocation target is unavailable`, receipt.span);
271
+ }
272
+ }
273
+ const ok = base.ok && (grammarVersion >= 1 && grammarVersion <= 7) && diagnostics.length === 0;
274
+ return Object.freeze({ ok, grammarVersion, documentId: base.documentId, records: Object.freeze(records), diagnostics: Object.freeze(diagnostics), baseDiagnostics: base.diagnostics, canonicalText: ok ? formatMilestoneAcceptanceSource(text, records) : null });
275
+ }
276
+ export function formatMilestoneAcceptanceSource(text, records) {
277
+ if (records.length === 0)
278
+ return text;
279
+ const ordered = [...records].sort((left, right) => left.span.start.offset - right.span.start.offset);
280
+ let result = "";
281
+ let cursor = 0;
282
+ for (const record of ordered) {
283
+ result += text.slice(cursor, record.span.start.offset);
284
+ if (record.kind === "milestone_criterion_set") {
285
+ result += `milestone_criterion_set ${record.id}:\n milestone ${record.milestoneId}\n revision ${record.revisionId}\n commitment ${record.commitment}\n`;
286
+ for (const criterion of record.criteria)
287
+ result += ` criterion ${criterion.criterionId} ${criterion.required ? "required" : "optional"} ${criterion.evidenceKind} ${JSON.stringify(criterion.description)}\n`;
288
+ }
289
+ else if (record.kind === "milestone_acceptance_migration") {
290
+ result += `milestone_acceptance_migration ${record.id}:\n model 1\n repository ${record.repositoryId}\n path ${JSON.stringify(record.path)}\n object_format ${record.objectFormat}\n head ${record.head}\n blob ${record.blob}\n source_digest ${record.sourceDigest}\n candidate_digest ${record.candidateDigest}\n`;
291
+ for (const id of record.grandfatheredMilestoneIds)
292
+ result += ` grandfathered ${id}\n`;
293
+ }
294
+ else {
295
+ result += text.slice(record.span.start.offset, record.span.end.offset);
296
+ }
297
+ cursor = record.span.end.offset;
298
+ }
299
+ return result + text.slice(cursor);
300
+ }
301
+ //# sourceMappingURL=source.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"source.js","sourceRoot":"","sources":["../../src/milestone-acceptance/source.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"advance-deletion.d.ts","sourceRoot":"","sources":["../../src/mutation/advance-deletion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC;IAC7D,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;CACzB;AAeD,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,eAAe,CAAC,qBAAqB,CAAC,GAClD,MAAM,CAIR;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,CAAC,qBAAqB,CAAC,EAC7C,MAAM,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC,qBAAqB,CAAC,KAAK,OAAO,GACvE,SAAS,0BAA0B,EAAE,CAqCvC"}
1
+ {"version":3,"file":"advance-deletion.d.ts","sourceRoot":"","sources":["../../src/mutation/advance-deletion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC;IAC7D,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;CACzB;AAeD,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,eAAe,CAAC,qBAAqB,CAAC,GAClD,MAAM,CAIR;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,CAAC,qBAAqB,CAAC,EAC7C,MAAM,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC,qBAAqB,CAAC,KAAK,OAAO,GACvE,SAAS,0BAA0B,EAAE,CA0CvC"}
@@ -32,6 +32,7 @@ export function planAdvanceDeclarationDeletions(text, document, remove) {
32
32
  }
33
33
  const lines = splitPhysicalLines(text);
34
34
  const lastDeclaration = document.declarations.at(-1);
35
+ let previousTerminalEnd;
35
36
  return document.declarations
36
37
  .filter((declaration) => selected.has(declaration))
37
38
  .map((declaration) => {
@@ -39,11 +40,15 @@ export function planAdvanceDeclarationDeletions(text, document, remove) {
39
40
  if (!terminal.has(declaration)) {
40
41
  return { declaration, edit: ordinary };
41
42
  }
42
- const startOffset = terminalSeparatorStart(lines, ordinary.startOffset);
43
+ const desiredStart = terminalSeparatorStart(lines, ordinary.startOffset);
43
44
  const endOffset = declaration === lastDeclaration &&
44
45
  text.slice(ordinary.endOffset).trim() === ""
45
46
  ? text.length
46
47
  : ordinary.endOffset;
48
+ const startOffset = previousTerminalEnd === undefined
49
+ ? desiredStart
50
+ : Math.max(desiredStart, previousTerminalEnd);
51
+ previousTerminalEnd = endOffset;
47
52
  return {
48
53
  declaration,
49
54
  edit: { startOffset, endOffset, replacement: "" },