Skip to content

Commit ed34df8

Browse files
klausxieklausxie
committed
Merge branch 'codex/aggregation-baseline-expansion'
2 parents 016e474 + d4c4092 commit ed34df8

63 files changed

Lines changed: 5235 additions & 719 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contracts/acceptance_result.schema.json‎

Lines changed: 3 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,8 @@
33
"title": "AcceptanceResult",
44
"type": "object",
55
"required": ["sqlKey", "status", "equivalence", "perfComparison", "securityChecks"],
6-
"$defs": {
7-
"PatchReplayContract": {
8-
"type": "object",
9-
"required": [
10-
"replayMode",
11-
"requiredTemplateOps",
12-
"expectedRenderedSql",
13-
"expectedRenderedSqlNormalized",
14-
"expectedFingerprint",
15-
"requiredAnchors",
16-
"requiredIncludes",
17-
"requiredPlaceholderShape",
18-
"dialectSyntaxCheckRequired"
19-
],
20-
"properties": {
21-
"replayMode": {"type": "string"},
22-
"requiredTemplateOps": {"type": "array", "items": {"type": "string"}},
23-
"expectedRenderedSql": {"type": "string"},
24-
"expectedRenderedSqlNormalized": {"type": "string"},
25-
"expectedFingerprint": {"type": ["string", "object"]},
26-
"requiredAnchors": {"type": "array", "items": {"type": "string"}},
27-
"requiredIncludes": {"type": "array", "items": {"type": "string"}},
28-
"requiredPlaceholderShape": {"type": ["string", "array"], "items": {"type": "string"}},
29-
"dialectSyntaxCheckRequired": {"type": "boolean"}
30-
}
31-
},
32-
"PatchTargetContract": {
33-
"type": "object",
34-
"required": [
35-
"sqlKey",
36-
"selectedCandidateId",
37-
"targetSql",
38-
"targetSqlNormalized",
39-
"targetSqlFingerprint",
40-
"semanticGateStatus",
41-
"semanticGateConfidence",
42-
"selectedPatchStrategy",
43-
"family",
44-
"semanticEquivalence",
45-
"patchability",
46-
"rewriteMaterialization",
47-
"templateRewriteOps",
48-
"replayContract",
49-
"evidenceRefs"
50-
],
51-
"properties": {
52-
"sqlKey": {"type": "string"},
53-
"selectedCandidateId": {"type": "string"},
54-
"targetSql": {"type": "string"},
55-
"targetSqlNormalized": {"type": "string"},
56-
"targetSqlFingerprint": {"type": "string"},
57-
"semanticGateStatus": {"type": "string"},
58-
"semanticGateConfidence": {"type": "string"},
59-
"selectedPatchStrategy": {"type": "object"},
60-
"family": {"type": "string"},
61-
"semanticEquivalence": {"type": "object"},
62-
"patchability": {"type": "object"},
63-
"rewriteMaterialization": {"type": "object"},
64-
"templateRewriteOps": {"type": "array", "items": {"type": "object"}},
65-
"replayContract": {"$ref": "#/$defs/PatchReplayContract"},
66-
"evidenceRefs": {"type": "array", "items": {"type": "string"}}
67-
}
68-
}
69-
},
6+
"additionalProperties": false,
7+
"$defs": {},
708
"properties": {
719
"sqlKey": {"type": "string"},
7210
"status": {"type": "string"},
@@ -101,7 +39,6 @@
10139
"feedback": {"type": ["object", "null"]},
10240
"rewriteStrategy": {"type": "string"},
10341
"rewriteIntent": {"type": ["object", "null"]},
104-
"rewriteMaterialization": {"type": ["object", "null"]},
10542
"semanticRisk": {"type": "string"},
10643
"regressionSignals": {"type": "array"},
10744
"decisionTrace": {"type": ["array", "null"], "items": {"type": "object"}},
@@ -114,30 +51,13 @@
11451
"llmTraceRefs": {"type": "array", "items": {"type": "string"}},
11552
"selectionReason": {"type": ["object", "null"]},
11653
"selectionRationale": {"type": ["object", "null"]},
117-
"deliveryReadiness": {"type": ["object", "null"]},
11854
"decisionLayers": {"type": ["object", "null"]},
11955
"guardrailDecisions": {"type": ["array", "null"], "items": {"type": "object"}},
120-
"templateRewriteOps": {"type": ["array", "null"], "items": {"type": "object"}},
12156
"repairability": {"type": ["object", "null"]},
12257
"repairHints": {"type": ["array", "null"], "items": {"type": "object"}},
12358
"rewriteSafetyLevel": {"type": ["string", "null"]},
124-
"patchability": {"type": ["object", "null"]},
125-
"selectedPatchStrategy": {"type": ["object", "null"]},
126-
"dynamicTemplate": {
127-
"type": ["object", "null"],
128-
"properties": {
129-
"present": {"type": ["boolean", "null"]},
130-
"shapeFamily": {"type": ["string", "null"]},
131-
"capabilityTier": {"type": ["string", "null"]},
132-
"patchSurface": {"type": ["string", "null"]},
133-
"baselineFamily": {"type": ["string", "null"]},
134-
"blockingReason": {"type": ["string", "null"]},
135-
"deliveryClass": {"type": ["string", "null"]}
136-
}
137-
},
13859
"canonicalization": {"type": ["object", "null"]},
13960
"rewriteFacts": {"type": ["object", "null"]},
140-
"patchStrategyCandidates": {"type": ["array", "null"], "items": {"type": "object"}},
14161
"canonicalizationAssessment": {"type": ["array", "null"], "items": {"type": "object"}},
14262
"candidateSelectionTrace": {"type": ["array", "null"], "items": {"type": "object"}},
14363
"semanticEquivalence": {
@@ -158,7 +78,6 @@
15878
"coverage": {"type": ["object", "null"]},
15979
"evidence": {"type": ["object", "null"]}
16080
}
161-
},
162-
"patchTarget": {"$ref": "#/$defs/PatchTargetContract"}
81+
}
16382
}
16483
}

‎contracts/patch_result.schema.json‎

Lines changed: 7 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,7 @@
33
"title": "PatchResult",
44
"type": "object",
55
"required": ["sqlKey", "patchFiles", "diffSummary", "applyMode", "rollback"],
6-
"$defs": {
7-
"PatchReplayContract": {
8-
"type": "object",
9-
"required": [
10-
"replayMode",
11-
"requiredTemplateOps",
12-
"expectedRenderedSql",
13-
"expectedRenderedSqlNormalized",
14-
"expectedFingerprint",
15-
"requiredAnchors",
16-
"requiredIncludes",
17-
"requiredPlaceholderShape",
18-
"dialectSyntaxCheckRequired"
19-
],
20-
"properties": {
21-
"replayMode": {"type": "string"},
22-
"requiredTemplateOps": {"type": "array", "items": {"type": "string"}},
23-
"expectedRenderedSql": {"type": "string"},
24-
"expectedRenderedSqlNormalized": {"type": "string"},
25-
"expectedFingerprint": {"type": ["string", "object"]},
26-
"requiredAnchors": {"type": "array", "items": {"type": "string"}},
27-
"requiredIncludes": {"type": "array", "items": {"type": "string"}},
28-
"requiredPlaceholderShape": {"type": ["string", "array"], "items": {"type": "string"}},
29-
"dialectSyntaxCheckRequired": {"type": "boolean"}
30-
}
31-
},
32-
"PatchTargetContract": {
33-
"type": "object",
34-
"required": [
35-
"sqlKey",
36-
"selectedCandidateId",
37-
"targetSql",
38-
"targetSqlNormalized",
39-
"targetSqlFingerprint",
40-
"semanticGateStatus",
41-
"semanticGateConfidence",
42-
"selectedPatchStrategy",
43-
"family",
44-
"semanticEquivalence",
45-
"patchability",
46-
"rewriteMaterialization",
47-
"templateRewriteOps",
48-
"replayContract",
49-
"evidenceRefs"
50-
],
51-
"properties": {
52-
"sqlKey": {"type": "string"},
53-
"selectedCandidateId": {"type": "string"},
54-
"targetSql": {"type": "string"},
55-
"targetSqlNormalized": {"type": "string"},
56-
"targetSqlFingerprint": {"type": "string"},
57-
"semanticGateStatus": {"type": "string"},
58-
"semanticGateConfidence": {"type": "string"},
59-
"selectedPatchStrategy": {"type": "object"},
60-
"family": {"type": "string"},
61-
"semanticEquivalence": {"type": "object"},
62-
"patchability": {"type": "object"},
63-
"rewriteMaterialization": {"type": "object"},
64-
"templateRewriteOps": {"type": "array", "items": {"type": "object"}},
65-
"replayContract": {"$ref": "#/$defs/PatchReplayContract"},
66-
"evidenceRefs": {"type": "array", "items": {"type": "string"}}
67-
}
68-
}
69-
},
6+
"additionalProperties": false,
707
"properties": {
718
"sqlKey": {"type": "string"},
729
"statementKey": {"type": ["string", "null"]},
@@ -75,6 +12,10 @@
7512
"applyMode": {"type": "string"},
7613
"rollback": {"type": "string"},
7714
"selectedCandidateId": {"type": ["string", "null"]},
15+
"patchFamily": {"type": ["string", "null"]},
16+
"artifactKind": {"type": ["string", "null"]},
17+
"deliveryStage": {"type": ["string", "null"]},
18+
"failureClass": {"type": ["string", "null"]},
7819
"candidatesEvaluated": {"type": ["integer", "null"]},
7920
"applicable": {"type": ["boolean", "null"]},
8021
"applyCheckError": {"type": ["string", "null"]},
@@ -98,6 +39,7 @@
9839
"semanticEvidenceLevel": {"type": ["string", "null"]}
9940
}
10041
},
101-
"patchTarget": {"$ref": "#/$defs/PatchTargetContract"}
42+
"replayEvidence": {"type": ["object", "null"]},
43+
"syntaxEvidence": {"type": ["object", "null"]}
10244
}
10345
}

0 commit comments

Comments
 (0)