@experiture/xyra-cli 0.6.2 → 0.6.4
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.
- package/README.md +24 -1
- package/dist/auth/oauthClient.js +89 -30
- package/dist/auth/oauthClient.js.map +1 -1
- package/dist/auth/session.js +11 -7
- package/dist/auth/session.js.map +1 -1
- package/dist/auth/tokenStore.js.map +1 -1
- package/dist/chat/runtimeChatClient.js +22110 -850
- package/dist/chat/runtimeChatClient.js.map +4 -4
- package/dist/commands/chat.js +159 -9
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/login.js +7 -7
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/mcpContext.js +29 -3
- package/dist/commands/mcpContext.js.map +1 -1
- package/dist/commands/session.js +32 -24
- package/dist/commands/session.js.map +1 -1
- package/dist/commands/tools.js +72 -7
- package/dist/commands/tools.js.map +1 -1
- package/dist/commands/workflowProposal.js +19 -0
- package/dist/commands/workflowProposal.js.map +1 -0
- package/dist/config/configStore.js +88 -45
- package/dist/config/configStore.js.map +2 -2
- package/dist/index.js +27 -1
- package/dist/index.js.map +1 -1
- package/dist/mcp/confirmation.js +17 -3
- package/dist/mcp/confirmation.js.map +1 -1
- package/dist/mcp/mcpClient.js +56 -6
- package/dist/mcp/mcpClient.js.map +2 -2
- package/dist/output/formatters.js +4 -0
- package/dist/output/formatters.js.map +1 -1
- package/package.json +2 -2
package/dist/commands/tools.js
CHANGED
|
@@ -10,6 +10,7 @@ exports.runApprovalDecision = runApprovalDecision;
|
|
|
10
10
|
const node_fs_1 = require("node:fs");
|
|
11
11
|
const CliError_1 = require("../errors/CliError");
|
|
12
12
|
const mcpContext_1 = require("./mcpContext");
|
|
13
|
+
const mcpClient_1 = require("../mcp/mcpClient");
|
|
13
14
|
const confirmation_1 = require("../mcp/confirmation");
|
|
14
15
|
const confirmPrompt_1 = require("../prompt/confirmPrompt");
|
|
15
16
|
const formatters_1 = require("../output/formatters");
|
|
@@ -112,8 +113,8 @@ async function ensureLocalConfirmation(client, writer, toolKey) {
|
|
|
112
113
|
/** Human rendering of a server-issued confirmation challenge (stderr). */
|
|
113
114
|
function describeServerChallenge(challenge, toolKey) {
|
|
114
115
|
const request = challenge.confirmation;
|
|
115
|
-
const toolDisplayName = typeof request?.
|
|
116
|
-
? request.
|
|
116
|
+
const toolDisplayName = typeof request?.actionDisplayName === 'string' && request.actionDisplayName.trim()
|
|
117
|
+
? request.actionDisplayName.trim()
|
|
117
118
|
: toolKey;
|
|
118
119
|
const lines = [`The server requires confirmation before running '${toolDisplayName}'.`];
|
|
119
120
|
if (request) {
|
|
@@ -137,6 +138,7 @@ function describeServerChallenge(challenge, toolKey) {
|
|
|
137
138
|
return lines.join('\n');
|
|
138
139
|
}
|
|
139
140
|
async function runToolsCall(config, writer, toolKey, options = {}) {
|
|
141
|
+
const conversationId = (0, mcpClient_1.validateToolConversationId)(options.conversation);
|
|
140
142
|
const args = buildToolArguments(options);
|
|
141
143
|
return (0, mcpContext_1.withMcpClient)(config, writer, async (client) => {
|
|
142
144
|
// --yes skips the metadata lookup entirely; otherwise gate non-read tools.
|
|
@@ -148,7 +150,15 @@ async function runToolsCall(config, writer, toolKey, options = {}) {
|
|
|
148
150
|
}
|
|
149
151
|
}
|
|
150
152
|
let raw;
|
|
151
|
-
|
|
153
|
+
const existing = options.confirmationRequestId ? await client.getConfirmation(options.confirmationRequestId) : undefined;
|
|
154
|
+
let result;
|
|
155
|
+
if (options.confirmationRequestId && existing?.executionUnitKind === 'governance_change_set') {
|
|
156
|
+
const resumed = await client.continueGovernanceApproval(options.confirmationRequestId, undefined, options.raw ? { captureRaw: response => (raw = response) } : undefined);
|
|
157
|
+
result = { structuredContent: resumed, isError: resumed.status !== 'completed' };
|
|
158
|
+
}
|
|
159
|
+
else
|
|
160
|
+
result = await client.callTool(toolKey, args, options.raw ? { captureRaw: (response) => (raw = response) } : undefined, options.confirmationRequestId || conversationId
|
|
161
|
+
? { confirmationRequestId: options.confirmationRequestId, conversationId } : undefined);
|
|
152
162
|
const challenge = (0, confirmation_1.extractServerConfirmationChallenge)(result);
|
|
153
163
|
if (challenge) {
|
|
154
164
|
writer.err(describeServerChallenge(challenge, toolKey));
|
|
@@ -156,7 +166,7 @@ async function runToolsCall(config, writer, toolKey, options = {}) {
|
|
|
156
166
|
if (!(0, confirmPrompt_1.isInteractive)() || !requestId) {
|
|
157
167
|
if (options.raw)
|
|
158
168
|
writer.out((0, formatters_1.toJson)(raw));
|
|
159
|
-
else
|
|
169
|
+
else
|
|
160
170
|
writer.out((0, formatters_1.toJson)(result));
|
|
161
171
|
return 1;
|
|
162
172
|
}
|
|
@@ -166,9 +176,64 @@ async function runToolsCall(config, writer, toolKey, options = {}) {
|
|
|
166
176
|
writer.err('Rejected. The action was not executed.');
|
|
167
177
|
return 1;
|
|
168
178
|
}
|
|
169
|
-
|
|
179
|
+
let decision;
|
|
180
|
+
try {
|
|
181
|
+
decision = await client.approveConfirmation(requestId);
|
|
182
|
+
}
|
|
183
|
+
catch (error) {
|
|
184
|
+
// The decision may have committed before its reply was lost.
|
|
185
|
+
// Read that same approval before choosing any continuation.
|
|
186
|
+
try {
|
|
187
|
+
decision = await client.getConfirmation(requestId);
|
|
188
|
+
}
|
|
189
|
+
catch {
|
|
190
|
+
throw error;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
170
193
|
raw = undefined;
|
|
171
|
-
|
|
194
|
+
const current = decision.status === 'pending' ? await client.getConfirmation(requestId) : decision;
|
|
195
|
+
if (current.status !== 'approved' && current.status !== 'consumed') {
|
|
196
|
+
writer.out((0, formatters_1.toJson)({ control: challenge.control, confirmation: current }));
|
|
197
|
+
return 1;
|
|
198
|
+
}
|
|
199
|
+
if (challenge.control.continuation.kind === 'client_resubmit') {
|
|
200
|
+
result = await client.callTool(toolKey, args, options.raw ? { captureRaw: (response) => (raw = response) } : undefined, { confirmationRequestId: requestId, ...(conversationId ? { conversationId } : {}) });
|
|
201
|
+
}
|
|
202
|
+
else if (challenge.control.continuation.kind === 'workflow_checkpoint') {
|
|
203
|
+
const executionId = challenge.control.continuation.toolExecutionId;
|
|
204
|
+
const resume = (0, mcpClient_1.workflowResumeControlFor)(result, toolKey, executionId);
|
|
205
|
+
if (!resume) {
|
|
206
|
+
writer.out((0, formatters_1.toJson)({ control: challenge.control, confirmation: await client.getConfirmation(requestId) }));
|
|
207
|
+
return 1;
|
|
208
|
+
}
|
|
209
|
+
result = await client.callTool(toolKey, {}, options.raw ? { captureRaw: response => (raw = response) } : undefined, { ...resume, ...(conversationId ? { conversationId } : {}) });
|
|
210
|
+
const latest = (0, mcpClient_1.workflowResumeControlFor)(result, toolKey, executionId);
|
|
211
|
+
if (result.structuredContent?.status === 'waiting'
|
|
212
|
+
&& latest && latest.workflowResume.expectedRevision !== resume.workflowResume.expectedRevision) {
|
|
213
|
+
result = await client.callTool(toolKey, {}, options.raw ? { captureRaw: response => (raw = response) } : undefined, { ...latest, ...(conversationId ? { conversationId } : {}) });
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
const continuation = challenge.control.continuation;
|
|
218
|
+
const capture = options.raw ? { captureRaw: (response) => (raw = response) } : undefined;
|
|
219
|
+
let resumed;
|
|
220
|
+
try {
|
|
221
|
+
resumed = await client.continueGovernanceApproval(requestId, continuation, capture);
|
|
222
|
+
}
|
|
223
|
+
catch (error) {
|
|
224
|
+
// Reconcile a possibly committed original change set through its owner.
|
|
225
|
+
try {
|
|
226
|
+
await client.getConfirmation(requestId);
|
|
227
|
+
resumed = await client.continueGovernanceApproval(requestId, continuation, capture);
|
|
228
|
+
}
|
|
229
|
+
catch {
|
|
230
|
+
throw error;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
if (resumed.status === 'pending')
|
|
234
|
+
resumed = await client.continueGovernanceApproval(requestId, continuation, capture);
|
|
235
|
+
result = { structuredContent: resumed, isError: resumed.status !== 'completed' };
|
|
236
|
+
}
|
|
172
237
|
}
|
|
173
238
|
if (options.raw)
|
|
174
239
|
writer.out((0, formatters_1.toJson)(raw));
|
|
@@ -178,7 +243,7 @@ async function runToolsCall(config, writer, toolKey, options = {}) {
|
|
|
178
243
|
writer.out((0, formatters_1.formatToolResult)(result));
|
|
179
244
|
// A tool that reports an application-level error still returned a JSON-RPC result;
|
|
180
245
|
// reflect that in the exit code without masking the payload above.
|
|
181
|
-
return result.isError ? 1 : 0;
|
|
246
|
+
return result.isError || result.structuredContent?.status === 'control_required' ? 1 : 0;
|
|
182
247
|
});
|
|
183
248
|
}
|
|
184
249
|
async function runApprovalsList(config, writer, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/commands/tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/commands/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runWorkflowProposal = runWorkflowProposal;
|
|
4
|
+
const CliError_1 = require("../errors/CliError");
|
|
5
|
+
const formatters_1 = require("../output/formatters");
|
|
6
|
+
const chat_1 = require("./chat");
|
|
7
|
+
/** Explicit review reads the existing proposal; it never resumes or applies it. */
|
|
8
|
+
async function runWorkflowProposal(config, writer, options) {
|
|
9
|
+
const revision = Number(options.revision);
|
|
10
|
+
if (![options.conversation, options.request, options.execution, options.step].every(value => typeof value === 'string' && value.trim())
|
|
11
|
+
|| !Number.isSafeInteger(revision) || revision < 1)
|
|
12
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Proposal review requires the original conversation, request, execution, revision and step.');
|
|
13
|
+
const client = await (0, chat_1.createClient)(config);
|
|
14
|
+
const proposal = await client.getWorkflowProposal({ conversationId: options.conversation, clientRequestId: options.request,
|
|
15
|
+
executionId: options.execution, revision, stepKey: options.step });
|
|
16
|
+
writer.out(options.json ? (0, formatters_1.toJson)(proposal) : `Unsaved proposal — ${proposal.operationKey}\nReview against the latest saved version before applying through its normal editor or API.\n${(0, formatters_1.toJson)(proposal.input)}`);
|
|
17
|
+
return 0;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=workflowProposal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workflowProposal.js","sourceRoot":"","sources":["../../src/commands/workflowProposal.ts"],"names":[],"mappings":";;AASA,kDAUC;AAjBD,iDAA0D;AAC1D,qDAA4C;AAC5C,iCAAoC;AAIpC,mFAAmF;AAC5E,KAAK,UAAU,mBAAmB,CAAC,MAAkB,EAAC,MAAmB,EAAC,OAA+B;IAC9G,MAAM,QAAQ,GAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,CAAC,CAAC,OAAO,CAAC,YAAY,EAAC,OAAO,CAAC,OAAO,EAAC,OAAO,CAAC,SAAS,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAA,EAAE,CAAA,OAAO,KAAK,KAAG,QAAQ,IAAE,KAAK,CAAC,IAAI,EAAE,CAAC;WAC1H,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAE,QAAQ,GAAC,CAAC;QAC7C,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EAAC,4FAA4F,CAAC,CAAC;IAClJ,MAAM,MAAM,GAAC,MAAM,IAAA,mBAAY,EAAC,MAAM,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,EAAC,cAAc,EAAC,OAAO,CAAC,YAAY,EAAC,eAAe,EAAC,OAAO,CAAC,OAAO;QAClH,WAAW,EAAC,OAAO,CAAC,SAAS,EAAC,QAAQ,EAAC,OAAO,EAAC,OAAO,CAAC,IAAI,EAAC,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA,CAAC,CAAA,IAAA,mBAAM,EAAC,QAAQ,CAAC,CAAA,CAAC,CAAA,sBAAsB,QAAQ,CAAC,YAAY,gGAAgG,IAAA,mBAAM,EAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9M,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -130,13 +130,15 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
130
130
|
"../../libs/xyra-types/dist/canonical-runtime-json.js"(exports2) {
|
|
131
131
|
"use strict";
|
|
132
132
|
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
133
|
-
exports2.MAXIMUM_BOUNDED_RUNTIME_JSON_BYTES_V1 = exports2.BoundedRuntimeJsonErrorV1 = exports2.CanonicalRuntimeJsonErrorV1 = void 0;
|
|
133
|
+
exports2.MAXIMUM_EVALUATION_EVIDENCE_JSON_BYTES_V1 = exports2.MAXIMUM_BOUNDED_RUNTIME_JSON_BYTES_V1 = exports2.BoundedRuntimeJsonErrorV1 = exports2.CanonicalRuntimeJsonErrorV1 = void 0;
|
|
134
134
|
exports2.canonicalRuntimeJsonV1 = canonicalRuntimeJsonV1;
|
|
135
135
|
exports2.canonicalRuntimeUtf8BytesV1 = canonicalRuntimeUtf8BytesV1;
|
|
136
136
|
exports2.canonicalRuntimeUtf8ByteLengthV1 = canonicalRuntimeUtf8ByteLengthV1;
|
|
137
137
|
exports2.boundedRuntimeDataV1 = boundedRuntimeDataV1;
|
|
138
138
|
exports2.boundedRuntimeJsonDataV1 = boundedRuntimeJsonDataV1;
|
|
139
|
+
exports2.boundedEvaluationEvidenceJsonDataV1 = boundedEvaluationEvidenceJsonDataV1;
|
|
139
140
|
exports2.parseBoundedRuntimeJsonV1 = parseBoundedRuntimeJsonV12;
|
|
141
|
+
exports2.parseBoundedEvaluationEvidenceJsonV1 = parseBoundedEvaluationEvidenceJsonV1;
|
|
140
142
|
var CanonicalRuntimeJsonErrorV1 = class extends TypeError {
|
|
141
143
|
constructor(reason, path) {
|
|
142
144
|
super(`Canonical runtime JSON rejected ${reason} at ${path}.`);
|
|
@@ -238,22 +240,25 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
238
240
|
return canonicalRuntimeUtf8BytesV1(value).byteLength;
|
|
239
241
|
}
|
|
240
242
|
var BoundedRuntimeJsonErrorV1 = class extends SyntaxError {
|
|
241
|
-
constructor(reason) {
|
|
243
|
+
constructor(reason, rule = "syntax", at = []) {
|
|
242
244
|
super(`Bounded runtime JSON rejected ${reason}.`);
|
|
243
245
|
this.reason = reason;
|
|
246
|
+
this.rule = rule;
|
|
247
|
+
this.at = at;
|
|
244
248
|
this.name = "BoundedRuntimeJsonErrorV1";
|
|
245
249
|
}
|
|
246
250
|
};
|
|
247
251
|
exports2.BoundedRuntimeJsonErrorV1 = BoundedRuntimeJsonErrorV1;
|
|
248
|
-
var boundedInvalid = (reason) => {
|
|
249
|
-
throw new BoundedRuntimeJsonErrorV1(reason);
|
|
252
|
+
var boundedInvalid = (reason, rule, at = []) => {
|
|
253
|
+
throw new BoundedRuntimeJsonErrorV1(reason, rule, [...at]);
|
|
250
254
|
};
|
|
251
255
|
exports2.MAXIMUM_BOUNDED_RUNTIME_JSON_BYTES_V1 = 2097152;
|
|
252
|
-
|
|
256
|
+
exports2.MAXIMUM_EVALUATION_EVIDENCE_JSON_BYTES_V1 = 8388608;
|
|
257
|
+
function boundedLimits(limits, ceiling = exports2.MAXIMUM_BOUNDED_RUNTIME_JSON_BYTES_V1) {
|
|
253
258
|
const maximumBytes = limits.maximumBytes ?? 1048576;
|
|
254
259
|
const maximumDepth = limits.maximumDepth ?? 16;
|
|
255
|
-
if (!Number.isSafeInteger(maximumBytes) || maximumBytes < 1 || maximumBytes >
|
|
256
|
-
boundedInvalid("limits");
|
|
260
|
+
if (!Number.isSafeInteger(maximumBytes) || maximumBytes < 1 || maximumBytes > ceiling || !Number.isSafeInteger(maximumDepth) || maximumDepth < 1 || maximumDepth > 24)
|
|
261
|
+
boundedInvalid("limits", "limits");
|
|
257
262
|
return { maximumBytes, maximumDepth };
|
|
258
263
|
}
|
|
259
264
|
function boundedUnicode(value) {
|
|
@@ -272,32 +277,39 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
272
277
|
let nodes = 0;
|
|
273
278
|
let characters = 0;
|
|
274
279
|
const ancestors = /* @__PURE__ */ new Set();
|
|
280
|
+
const at = [];
|
|
275
281
|
function copy(value, depth) {
|
|
276
|
-
if (++nodes > (jsonOnly ? 2e5 : 1e5)
|
|
277
|
-
boundedInvalid("shape");
|
|
282
|
+
if (++nodes > (jsonOnly ? 2e5 : 1e5))
|
|
283
|
+
boundedInvalid("shape", "nodes", at);
|
|
284
|
+
if (depth > maximumDepth)
|
|
285
|
+
boundedInvalid("shape", "depth", at);
|
|
278
286
|
if (value === null || typeof value === "boolean" || !jsonOnly && value === void 0)
|
|
279
287
|
return value;
|
|
280
288
|
if (typeof value === "number" && Number.isFinite(value))
|
|
281
289
|
return value;
|
|
282
290
|
if (typeof value === "string") {
|
|
283
291
|
characters += value.length;
|
|
284
|
-
if (jsonOnly ? characters > maximumBytes
|
|
285
|
-
boundedInvalid("text");
|
|
292
|
+
if (jsonOnly ? characters > maximumBytes : value.length > 1048576 || characters > 16777216)
|
|
293
|
+
boundedInvalid("text", "bytes", at);
|
|
294
|
+
if (jsonOnly && !boundedUnicode(value))
|
|
295
|
+
boundedInvalid("text", "unicode", at);
|
|
286
296
|
return value;
|
|
287
297
|
}
|
|
288
298
|
if (!value || typeof value !== "object" || ancestors.has(value))
|
|
289
|
-
boundedInvalid("shape");
|
|
299
|
+
boundedInvalid("shape", "value_kind", at);
|
|
290
300
|
const objectValue = value;
|
|
291
301
|
const array = Array.isArray(objectValue);
|
|
292
302
|
const prototype = Object.getPrototypeOf(objectValue);
|
|
293
303
|
const arrayLength = array ? objectValue.length : 0;
|
|
294
304
|
if (array ? prototype !== Array.prototype && (jsonOnly || prototype !== null) : prototype !== Object.prototype && prototype !== null)
|
|
295
|
-
boundedInvalid("shape");
|
|
305
|
+
boundedInvalid("shape", "value_kind", at);
|
|
296
306
|
const keys = Reflect.ownKeys(objectValue);
|
|
297
|
-
if (keys.length > 10001
|
|
298
|
-
boundedInvalid("shape");
|
|
307
|
+
if (keys.length > 10001)
|
|
308
|
+
boundedInvalid("shape", array ? "array_length" : "key_count", at);
|
|
309
|
+
if (keys.some((key) => typeof key !== "string"))
|
|
310
|
+
boundedInvalid("shape", "value_kind", at);
|
|
299
311
|
if (array && keys.length !== arrayLength + 1)
|
|
300
|
-
boundedInvalid("array");
|
|
312
|
+
boundedInvalid("array", "value_kind", at);
|
|
301
313
|
const seen = /* @__PURE__ */ new Set();
|
|
302
314
|
const result = array ? [] : {};
|
|
303
315
|
ancestors.add(objectValue);
|
|
@@ -306,10 +318,18 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
306
318
|
if (array && key === "length")
|
|
307
319
|
continue;
|
|
308
320
|
const descriptor = Object.getOwnPropertyDescriptor(objectValue, key);
|
|
309
|
-
if (!descriptor.enumerable || !("value" in descriptor)
|
|
310
|
-
boundedInvalid("shape");
|
|
311
|
-
|
|
321
|
+
if (!descriptor.enumerable || !("value" in descriptor))
|
|
322
|
+
boundedInvalid("shape", "value_kind", at);
|
|
323
|
+
if (key.length > (jsonOnly ? 160 : 256))
|
|
324
|
+
boundedInvalid("shape", "key_length", at);
|
|
325
|
+
if (jsonOnly && seen.has(key))
|
|
326
|
+
boundedInvalid("shape", "duplicate_key", at);
|
|
327
|
+
if (array && (!/^(0|[1-9][0-9]*)$/.test(key) || Number(key) >= arrayLength))
|
|
328
|
+
boundedInvalid("shape", "value_kind", at);
|
|
329
|
+
seen.add(key);
|
|
330
|
+
at.push(array ? Number(key) : key);
|
|
312
331
|
Object.defineProperty(result, key, { enumerable: true, writable: true, configurable: true, value: copy(descriptor.value, depth + 1) });
|
|
332
|
+
at.pop();
|
|
313
333
|
}
|
|
314
334
|
} finally {
|
|
315
335
|
ancestors.delete(objectValue);
|
|
@@ -322,18 +342,35 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
322
342
|
return copyBoundedRuntimeData(input, 16777216, 24, false, preserveKeyOrder);
|
|
323
343
|
}
|
|
324
344
|
function boundedRuntimeJsonDataV1(input, limits = {}) {
|
|
325
|
-
|
|
345
|
+
return copyBoundedJsonData(input, boundedLimits(limits));
|
|
346
|
+
}
|
|
347
|
+
function boundedEvaluationEvidenceJsonDataV1(input, limits = {}) {
|
|
348
|
+
return copyBoundedJsonData(input, boundedLimits(limits, exports2.MAXIMUM_EVALUATION_EVIDENCE_JSON_BYTES_V1));
|
|
349
|
+
}
|
|
350
|
+
function copyBoundedJsonData(input, { maximumBytes, maximumDepth }) {
|
|
326
351
|
const value = copyBoundedRuntimeData(input, maximumBytes, maximumDepth, true);
|
|
327
352
|
if (canonicalRuntimeUtf8ByteLengthV1(value) > maximumBytes)
|
|
328
|
-
boundedInvalid("bytes");
|
|
353
|
+
boundedInvalid("bytes", "bytes");
|
|
329
354
|
return value;
|
|
330
355
|
}
|
|
331
356
|
function parseBoundedRuntimeJsonV12(source, limits = {}) {
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
357
|
+
return parseBoundedJson(source, boundedLimits(limits));
|
|
358
|
+
}
|
|
359
|
+
function parseBoundedEvaluationEvidenceJsonV1(source, limits = {}) {
|
|
360
|
+
return parseBoundedJson(source, boundedLimits(limits, exports2.MAXIMUM_EVALUATION_EVIDENCE_JSON_BYTES_V1));
|
|
361
|
+
}
|
|
362
|
+
function parseBoundedJson(source, { maximumBytes, maximumDepth }) {
|
|
363
|
+
if (typeof source !== "string")
|
|
364
|
+
boundedInvalid("bytes", "value_kind");
|
|
365
|
+
if (source.length > maximumBytes)
|
|
366
|
+
boundedInvalid("bytes", "bytes");
|
|
367
|
+
if (!boundedUnicode(source))
|
|
368
|
+
boundedInvalid("bytes", "unicode");
|
|
369
|
+
if (new TextEncoder().encode(source).byteLength > maximumBytes)
|
|
370
|
+
boundedInvalid("bytes", "bytes");
|
|
335
371
|
let index = 0;
|
|
336
372
|
let nodes = 0;
|
|
373
|
+
const at = [];
|
|
337
374
|
const whitespace = () => {
|
|
338
375
|
while (/[\x20\t\r\n]/.test(source[index] ?? "\0"))
|
|
339
376
|
index += 1;
|
|
@@ -341,7 +378,7 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
341
378
|
function string() {
|
|
342
379
|
const start = index;
|
|
343
380
|
if (source[index++] !== '"')
|
|
344
|
-
boundedInvalid("string");
|
|
381
|
+
boundedInvalid("string", "syntax", at);
|
|
345
382
|
while (index < source.length) {
|
|
346
383
|
const char = source[index++];
|
|
347
384
|
if (char === "\\") {
|
|
@@ -352,20 +389,22 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
352
389
|
try {
|
|
353
390
|
const parsed = JSON.parse(source.slice(start, index));
|
|
354
391
|
if (!boundedUnicode(parsed))
|
|
355
|
-
boundedInvalid("unicode");
|
|
392
|
+
boundedInvalid("unicode", "unicode", at);
|
|
356
393
|
return parsed;
|
|
357
394
|
} catch (error) {
|
|
358
395
|
if (error instanceof BoundedRuntimeJsonErrorV1)
|
|
359
396
|
throw error;
|
|
360
|
-
boundedInvalid("string");
|
|
397
|
+
boundedInvalid("string", "syntax", at);
|
|
361
398
|
}
|
|
362
399
|
}
|
|
363
400
|
}
|
|
364
|
-
return boundedInvalid("string");
|
|
401
|
+
return boundedInvalid("string", "syntax", at);
|
|
365
402
|
}
|
|
366
403
|
function value(depth) {
|
|
367
|
-
if (++nodes > 2e5
|
|
368
|
-
boundedInvalid("shape");
|
|
404
|
+
if (++nodes > 2e5)
|
|
405
|
+
boundedInvalid("shape", "nodes", at);
|
|
406
|
+
if (depth > maximumDepth)
|
|
407
|
+
boundedInvalid("shape", "depth", at);
|
|
369
408
|
whitespace();
|
|
370
409
|
const char = source[index];
|
|
371
410
|
if (char === '"') {
|
|
@@ -381,20 +420,22 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
381
420
|
return;
|
|
382
421
|
}
|
|
383
422
|
for (; ; ) {
|
|
384
|
-
const
|
|
385
|
-
if (seen.has(
|
|
386
|
-
boundedInvalid("duplicate_key");
|
|
387
|
-
seen.add(
|
|
423
|
+
const key = string();
|
|
424
|
+
if (seen.has(key))
|
|
425
|
+
boundedInvalid("duplicate_key", "duplicate_key", at);
|
|
426
|
+
seen.add(key);
|
|
388
427
|
whitespace();
|
|
389
428
|
if (source[index++] !== ":")
|
|
390
|
-
boundedInvalid("object");
|
|
429
|
+
boundedInvalid("object", "syntax", at);
|
|
430
|
+
at.push(key);
|
|
391
431
|
value(depth + 1);
|
|
432
|
+
at.pop();
|
|
392
433
|
whitespace();
|
|
393
434
|
const end = source[index++];
|
|
394
435
|
if (end === "}")
|
|
395
436
|
return;
|
|
396
437
|
if (end !== ",")
|
|
397
|
-
boundedInvalid("object");
|
|
438
|
+
boundedInvalid("object", "syntax", at);
|
|
398
439
|
whitespace();
|
|
399
440
|
}
|
|
400
441
|
}
|
|
@@ -408,28 +449,30 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
408
449
|
let count = 0;
|
|
409
450
|
for (; ; ) {
|
|
410
451
|
if (++count > 1e4)
|
|
411
|
-
boundedInvalid("array");
|
|
452
|
+
boundedInvalid("array", "array_length", at);
|
|
453
|
+
at.push(count - 1);
|
|
412
454
|
value(depth + 1);
|
|
455
|
+
at.pop();
|
|
413
456
|
whitespace();
|
|
414
457
|
const end = source[index++];
|
|
415
458
|
if (end === "]")
|
|
416
459
|
return;
|
|
417
460
|
if (end !== ",")
|
|
418
|
-
boundedInvalid("array");
|
|
461
|
+
boundedInvalid("array", "syntax", at);
|
|
419
462
|
whitespace();
|
|
420
463
|
}
|
|
421
464
|
}
|
|
422
465
|
const token = /^(?:true|false|null|-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?)/.exec(source.slice(index));
|
|
423
466
|
if (!token)
|
|
424
|
-
boundedInvalid("value");
|
|
467
|
+
boundedInvalid("value", "syntax", at);
|
|
425
468
|
const tokenText = token[0];
|
|
426
469
|
if (/^-?\d/.test(tokenText)) {
|
|
427
470
|
const numeric = Number(tokenText);
|
|
428
471
|
if (!Number.isFinite(numeric))
|
|
429
|
-
boundedInvalid("number");
|
|
472
|
+
boundedInvalid("number", "number", at);
|
|
430
473
|
if (Number.isInteger(numeric)) {
|
|
431
474
|
if (!Number.isSafeInteger(numeric))
|
|
432
|
-
boundedInvalid("number");
|
|
475
|
+
boundedInvalid("number", "number", at);
|
|
433
476
|
const parts = /^(-?)(\d+)(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/.exec(tokenText);
|
|
434
477
|
let digits = (parts[2] + (parts[3] ?? "")).replace(/^0+/, "");
|
|
435
478
|
let power = Number(parts[4] ?? 0) - (parts[3]?.length ?? 0);
|
|
@@ -438,7 +481,7 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
438
481
|
power += digits.length - trimmed.length;
|
|
439
482
|
digits = trimmed;
|
|
440
483
|
if (power < 0 || digits.length + power > 16 || Number(digits + "0".repeat(power)) !== Math.abs(numeric))
|
|
441
|
-
boundedInvalid("number");
|
|
484
|
+
boundedInvalid("number", "number", at);
|
|
442
485
|
}
|
|
443
486
|
}
|
|
444
487
|
}
|
|
@@ -447,13 +490,13 @@ var require_canonical_runtime_json = __commonJS({
|
|
|
447
490
|
value(0);
|
|
448
491
|
whitespace();
|
|
449
492
|
if (index !== source.length)
|
|
450
|
-
boundedInvalid("trailing");
|
|
493
|
+
boundedInvalid("trailing", "syntax");
|
|
451
494
|
try {
|
|
452
|
-
return
|
|
495
|
+
return copyBoundedJsonData(JSON.parse(source), { maximumBytes, maximumDepth });
|
|
453
496
|
} catch (error) {
|
|
454
497
|
if (error instanceof BoundedRuntimeJsonErrorV1)
|
|
455
498
|
throw error;
|
|
456
|
-
return boundedInvalid("json");
|
|
499
|
+
return boundedInvalid("json", "syntax");
|
|
457
500
|
}
|
|
458
501
|
}
|
|
459
502
|
}
|