Skip to content

Commit 5097749

Browse files
RomneyDaRomneyDa
authored
fix: canonicalize codex protocol JSON assets (#91507)
1 parent 27189b3 commit 5097749

9 files changed

Lines changed: 290 additions & 131 deletions

‎extensions/codex/src/app-server/protocol-generated/json/v2/ErrorNotification.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,6 @@
44
"CodexErrorInfo": {
55
"description": "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
66
"oneOf": [
7-
{
8-
"enum": [
9-
"contextWindowExceeded",
10-
"usageLimitExceeded",
11-
"serverOverloaded",
12-
"cyberPolicy",
13-
"internalServerError",
14-
"unauthorized",
15-
"badRequest",
16-
"threadRollbackFailed",
17-
"sandboxError",
18-
"other"
19-
],
20-
"type": "string"
21-
},
227
{
238
"additionalProperties": false,
249
"properties": {
@@ -135,6 +120,21 @@
135120
],
136121
"title": "ActiveTurnNotSteerableCodexErrorInfo",
137122
"type": "object"
123+
},
124+
{
125+
"enum": [
126+
"contextWindowExceeded",
127+
"usageLimitExceeded",
128+
"serverOverloaded",
129+
"cyberPolicy",
130+
"internalServerError",
131+
"unauthorized",
132+
"badRequest",
133+
"threadRollbackFailed",
134+
"sandboxError",
135+
"other"
136+
],
137+
"type": "string"
138138
}
139139
]
140140
},

‎extensions/codex/src/app-server/protocol-generated/json/v2/ThreadResumeResponse.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,6 @@
3939
},
4040
"AskForApproval": {
4141
"oneOf": [
42-
{
43-
"enum": [
44-
"untrusted",
45-
"on-failure",
46-
"on-request",
47-
"never"
48-
],
49-
"type": "string"
50-
},
5142
{
5243
"additionalProperties": false,
5344
"properties": {
@@ -84,6 +75,15 @@
8475
],
8576
"title": "GranularAskForApproval",
8677
"type": "object"
78+
},
79+
{
80+
"enum": [
81+
"untrusted",
82+
"on-failure",
83+
"on-request",
84+
"never"
85+
],
86+
"type": "string"
8787
}
8888
]
8989
},
@@ -109,21 +109,6 @@
109109
"CodexErrorInfo": {
110110
"description": "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
111111
"oneOf": [
112-
{
113-
"enum": [
114-
"contextWindowExceeded",
115-
"usageLimitExceeded",
116-
"serverOverloaded",
117-
"cyberPolicy",
118-
"internalServerError",
119-
"unauthorized",
120-
"badRequest",
121-
"threadRollbackFailed",
122-
"sandboxError",
123-
"other"
124-
],
125-
"type": "string"
126-
},
127112
{
128113
"additionalProperties": false,
129114
"properties": {
@@ -240,6 +225,21 @@
240225
],
241226
"title": "ActiveTurnNotSteerableCodexErrorInfo",
242227
"type": "object"
228+
},
229+
{
230+
"enum": [
231+
"contextWindowExceeded",
232+
"usageLimitExceeded",
233+
"serverOverloaded",
234+
"cyberPolicy",
235+
"internalServerError",
236+
"unauthorized",
237+
"badRequest",
238+
"threadRollbackFailed",
239+
"sandboxError",
240+
"other"
241+
],
242+
"type": "string"
243243
}
244244
]
245245
},
@@ -830,16 +830,6 @@
830830
},
831831
"SessionSource": {
832832
"oneOf": [
833-
{
834-
"enum": [
835-
"cli",
836-
"vscode",
837-
"exec",
838-
"appServer",
839-
"unknown"
840-
],
841-
"type": "string"
842-
},
843833
{
844834
"additionalProperties": false,
845835
"properties": {
@@ -865,19 +855,21 @@
865855
],
866856
"title": "SubAgentSessionSource",
867857
"type": "object"
858+
},
859+
{
860+
"enum": [
861+
"cli",
862+
"vscode",
863+
"exec",
864+
"appServer",
865+
"unknown"
866+
],
867+
"type": "string"
868868
}
869869
]
870870
},
871871
"SubAgentSource": {
872872
"oneOf": [
873-
{
874-
"enum": [
875-
"review",
876-
"compact",
877-
"memory_consolidation"
878-
],
879-
"type": "string"
880-
},
881873
{
882874
"additionalProperties": false,
883875
"properties": {
@@ -941,6 +933,14 @@
941933
],
942934
"title": "OtherSubAgentSource",
943935
"type": "object"
936+
},
937+
{
938+
"enum": [
939+
"review",
940+
"compact",
941+
"memory_consolidation"
942+
],
943+
"type": "string"
944944
}
945945
]
946946
},

‎extensions/codex/src/app-server/protocol-generated/json/v2/ThreadStartResponse.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,6 @@
3939
},
4040
"AskForApproval": {
4141
"oneOf": [
42-
{
43-
"enum": [
44-
"untrusted",
45-
"on-failure",
46-
"on-request",
47-
"never"
48-
],
49-
"type": "string"
50-
},
5142
{
5243
"additionalProperties": false,
5344
"properties": {
@@ -84,6 +75,15 @@
8475
],
8576
"title": "GranularAskForApproval",
8677
"type": "object"
78+
},
79+
{
80+
"enum": [
81+
"untrusted",
82+
"on-failure",
83+
"on-request",
84+
"never"
85+
],
86+
"type": "string"
8787
}
8888
]
8989
},
@@ -109,21 +109,6 @@
109109
"CodexErrorInfo": {
110110
"description": "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
111111
"oneOf": [
112-
{
113-
"enum": [
114-
"contextWindowExceeded",
115-
"usageLimitExceeded",
116-
"serverOverloaded",
117-
"cyberPolicy",
118-
"internalServerError",
119-
"unauthorized",
120-
"badRequest",
121-
"threadRollbackFailed",
122-
"sandboxError",
123-
"other"
124-
],
125-
"type": "string"
126-
},
127112
{
128113
"additionalProperties": false,
129114
"properties": {
@@ -240,6 +225,21 @@
240225
],
241226
"title": "ActiveTurnNotSteerableCodexErrorInfo",
242227
"type": "object"
228+
},
229+
{
230+
"enum": [
231+
"contextWindowExceeded",
232+
"usageLimitExceeded",
233+
"serverOverloaded",
234+
"cyberPolicy",
235+
"internalServerError",
236+
"unauthorized",
237+
"badRequest",
238+
"threadRollbackFailed",
239+
"sandboxError",
240+
"other"
241+
],
242+
"type": "string"
243243
}
244244
]
245245
},
@@ -830,16 +830,6 @@
830830
},
831831
"SessionSource": {
832832
"oneOf": [
833-
{
834-
"enum": [
835-
"cli",
836-
"vscode",
837-
"exec",
838-
"appServer",
839-
"unknown"
840-
],
841-
"type": "string"
842-
},
843833
{
844834
"additionalProperties": false,
845835
"properties": {
@@ -865,19 +855,21 @@
865855
],
866856
"title": "SubAgentSessionSource",
867857
"type": "object"
858+
},
859+
{
860+
"enum": [
861+
"cli",
862+
"vscode",
863+
"exec",
864+
"appServer",
865+
"unknown"
866+
],
867+
"type": "string"
868868
}
869869
]
870870
},
871871
"SubAgentSource": {
872872
"oneOf": [
873-
{
874-
"enum": [
875-
"review",
876-
"compact",
877-
"memory_consolidation"
878-
],
879-
"type": "string"
880-
},
881873
{
882874
"additionalProperties": false,
883875
"properties": {
@@ -941,6 +933,14 @@
941933
],
942934
"title": "OtherSubAgentSource",
943935
"type": "object"
936+
},
937+
{
938+
"enum": [
939+
"review",
940+
"compact",
941+
"memory_consolidation"
942+
],
943+
"type": "string"
944944
}
945945
]
946946
},

‎extensions/codex/src/app-server/protocol-generated/json/v2/TurnCompletedNotification.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,6 @@
2727
"CodexErrorInfo": {
2828
"description": "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
2929
"oneOf": [
30-
{
31-
"enum": [
32-
"contextWindowExceeded",
33-
"usageLimitExceeded",
34-
"serverOverloaded",
35-
"cyberPolicy",
36-
"internalServerError",
37-
"unauthorized",
38-
"badRequest",
39-
"threadRollbackFailed",
40-
"sandboxError",
41-
"other"
42-
],
43-
"type": "string"
44-
},
4530
{
4631
"additionalProperties": false,
4732
"properties": {
@@ -158,6 +143,21 @@
158143
],
159144
"title": "ActiveTurnNotSteerableCodexErrorInfo",
160145
"type": "object"
146+
},
147+
{
148+
"enum": [
149+
"contextWindowExceeded",
150+
"usageLimitExceeded",
151+
"serverOverloaded",
152+
"cyberPolicy",
153+
"internalServerError",
154+
"unauthorized",
155+
"badRequest",
156+
"threadRollbackFailed",
157+
"sandboxError",
158+
"other"
159+
],
160+
"type": "string"
161161
}
162162
]
163163
},

0 commit comments

Comments
 (0)