@dexto/core 1.9.7 → 1.10.0
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/dist/approval/factory.cjs +6 -3
- package/dist/approval/factory.d.ts.map +1 -1
- package/dist/approval/factory.js +6 -3
- package/dist/approval/index.cjs +2 -0
- package/dist/approval/index.d.ts +2 -2
- package/dist/approval/index.d.ts.map +1 -1
- package/dist/approval/index.js +2 -0
- package/dist/approval/manager.cjs +29 -44
- package/dist/approval/manager.d.ts +4 -2
- package/dist/approval/manager.d.ts.map +1 -1
- package/dist/approval/manager.js +30 -44
- package/dist/approval/schemas.cjs +5 -0
- package/dist/approval/schemas.d.ts +44 -0
- package/dist/approval/schemas.d.ts.map +1 -1
- package/dist/approval/schemas.js +4 -0
- package/dist/approval/types.d.ts +2 -1
- package/dist/approval/types.d.ts.map +1 -1
- package/dist/llm/executor/provider-error.cjs +15 -1
- package/dist/llm/executor/provider-error.d.ts.map +1 -1
- package/dist/llm/executor/provider-error.js +16 -2
- package/dist/llm/executor/provider-options.cjs +4 -4
- package/dist/llm/executor/provider-options.d.ts.map +1 -1
- package/dist/llm/executor/provider-options.js +4 -4
- package/dist/llm/services/factory.cjs +6 -5
- package/dist/llm/services/factory.d.ts.map +1 -1
- package/dist/llm/services/factory.js +6 -5
- package/package.json +2 -2
|
@@ -23,6 +23,7 @@ __export(factory_exports, {
|
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(factory_exports);
|
|
25
25
|
var import_crypto = require("crypto");
|
|
26
|
+
var import_schemas = require("./schemas.js");
|
|
26
27
|
function createDeterministicApprovalId(key) {
|
|
27
28
|
const hash = (0, import_crypto.createHash)("sha256").update(key).digest("hex");
|
|
28
29
|
const variant = (Number.parseInt(hash.slice(16, 17), 16) & 3 | 8).toString(16);
|
|
@@ -37,12 +38,14 @@ function createDeterministicApprovalId(key) {
|
|
|
37
38
|
return approvalId;
|
|
38
39
|
}
|
|
39
40
|
function createApprovalRequest(details, approvalId = (0, import_crypto.randomUUID)()) {
|
|
41
|
+
const autoApproval = details.autoApproval === void 0 ? void 0 : import_schemas.ApprovalAutoApprovalPolicySchema.parse(details.autoApproval);
|
|
40
42
|
return {
|
|
41
43
|
approvalId,
|
|
44
|
+
...autoApproval === void 0 ? {} : { autoApproval },
|
|
42
45
|
type: details.type,
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
timeout: details.timeout,
|
|
46
|
+
...details.hostRuntime === void 0 ? {} : { hostRuntime: details.hostRuntime },
|
|
47
|
+
...details.sessionId === void 0 ? {} : { sessionId: details.sessionId },
|
|
48
|
+
...details.timeout === void 0 ? {} : { timeout: details.timeout },
|
|
46
49
|
timestamp: /* @__PURE__ */ new Date(),
|
|
47
50
|
metadata: details.metadata
|
|
48
51
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/approval/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/approval/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAE1E,KAAK,UAAU,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;AAEhD,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAYrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,sBAAsB,EAC/B,UAAU,GAAE,UAAyB,GACtC,eAAe,CAejB"}
|
package/dist/approval/factory.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import "../chunk-C6A6W6XS.js";
|
|
2
2
|
import { createHash, randomUUID } from "crypto";
|
|
3
|
+
import { ApprovalAutoApprovalPolicySchema } from "./schemas.js";
|
|
3
4
|
function createDeterministicApprovalId(key) {
|
|
4
5
|
const hash = createHash("sha256").update(key).digest("hex");
|
|
5
6
|
const variant = (Number.parseInt(hash.slice(16, 17), 16) & 3 | 8).toString(16);
|
|
@@ -14,12 +15,14 @@ function createDeterministicApprovalId(key) {
|
|
|
14
15
|
return approvalId;
|
|
15
16
|
}
|
|
16
17
|
function createApprovalRequest(details, approvalId = randomUUID()) {
|
|
18
|
+
const autoApproval = details.autoApproval === void 0 ? void 0 : ApprovalAutoApprovalPolicySchema.parse(details.autoApproval);
|
|
17
19
|
return {
|
|
18
20
|
approvalId,
|
|
21
|
+
...autoApproval === void 0 ? {} : { autoApproval },
|
|
19
22
|
type: details.type,
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
timeout: details.timeout,
|
|
23
|
+
...details.hostRuntime === void 0 ? {} : { hostRuntime: details.hostRuntime },
|
|
24
|
+
...details.sessionId === void 0 ? {} : { sessionId: details.sessionId },
|
|
25
|
+
...details.timeout === void 0 ? {} : { timeout: details.timeout },
|
|
23
26
|
timestamp: /* @__PURE__ */ new Date(),
|
|
24
27
|
metadata: details.metadata
|
|
25
28
|
};
|
package/dist/approval/index.cjs
CHANGED
|
@@ -20,6 +20,7 @@ var approval_exports = {};
|
|
|
20
20
|
__export(approval_exports, {
|
|
21
21
|
APPROVAL_STATUSES: () => import_types.APPROVAL_STATUSES,
|
|
22
22
|
APPROVAL_TYPES: () => import_types.APPROVAL_TYPES,
|
|
23
|
+
ApprovalAutoApprovalPolicySchema: () => import_schemas.ApprovalAutoApprovalPolicySchema,
|
|
23
24
|
ApprovalError: () => import_errors.ApprovalError,
|
|
24
25
|
ApprovalErrorCode: () => import_error_codes.ApprovalErrorCode,
|
|
25
26
|
ApprovalManager: () => import_manager.ApprovalManager,
|
|
@@ -58,6 +59,7 @@ var import_manager = require("./manager.js");
|
|
|
58
59
|
0 && (module.exports = {
|
|
59
60
|
APPROVAL_STATUSES,
|
|
60
61
|
APPROVAL_TYPES,
|
|
62
|
+
ApprovalAutoApprovalPolicySchema,
|
|
61
63
|
ApprovalError,
|
|
62
64
|
ApprovalErrorCode,
|
|
63
65
|
ApprovalManager,
|
package/dist/approval/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export type { ApprovalHandler, ApprovalRequest, ApprovalResponse, ApprovalRequestDetails, ElicitationMetadata, ElicitationRequest, ElicitationResponse, ElicitationResponseData, CustomApprovalMetadata, CustomApprovalRequest, CustomApprovalResponse, CustomApprovalResponseData, BaseApprovalRequest, BaseApprovalResponse, } from './types.js';
|
|
1
|
+
export type { ApprovalAutoApprovalPolicy, ApprovalHandler, ApprovalRequest, ApprovalResponse, ApprovalRequestDetails, ElicitationMetadata, ElicitationRequest, ElicitationResponse, ElicitationResponseData, CustomApprovalMetadata, CustomApprovalRequest, CustomApprovalResponse, CustomApprovalResponseData, BaseApprovalRequest, BaseApprovalResponse, } from './types.js';
|
|
2
2
|
export { APPROVAL_TYPES, APPROVAL_STATUSES, DENIAL_REASONS, ApprovalType, ApprovalStatus, DenialReason, } from './types.js';
|
|
3
|
-
export { ApprovalTypeSchema, ApprovalStatusSchema, DenialReasonSchema, ToolApprovalMetadataSchema, ElicitationMetadataSchema, CustomApprovalMetadataSchema, BaseApprovalRequestSchema, ToolApprovalRequestSchema, ElicitationRequestSchema, CustomApprovalRequestSchema, ApprovalRequestSchema, ToolApprovalResponseDataSchema, ElicitationResponseDataSchema, CustomApprovalResponseDataSchema, BaseApprovalResponseSchema, ToolApprovalResponseSchema, ElicitationResponseSchema, CustomApprovalResponseSchema, ApprovalResponseSchema, ApprovalRequestDetailsSchema, } from './schemas.js';
|
|
3
|
+
export { ApprovalAutoApprovalPolicySchema, ApprovalTypeSchema, ApprovalStatusSchema, DenialReasonSchema, ToolApprovalMetadataSchema, ElicitationMetadataSchema, CustomApprovalMetadataSchema, BaseApprovalRequestSchema, ToolApprovalRequestSchema, ElicitationRequestSchema, CustomApprovalRequestSchema, ApprovalRequestSchema, ToolApprovalResponseDataSchema, ElicitationResponseDataSchema, CustomApprovalResponseDataSchema, BaseApprovalResponseSchema, ToolApprovalResponseSchema, ElicitationResponseSchema, CustomApprovalResponseSchema, ApprovalResponseSchema, ApprovalRequestDetailsSchema, } from './schemas.js';
|
|
4
4
|
export type { ValidatedApprovalRequest, ValidatedApprovalResponse, ValidatedToolApprovalRequest, ValidatedElicitationRequest, ValidatedCustomApprovalRequest, } from './schemas.js';
|
|
5
5
|
export { ApprovalErrorCode } from './error-codes.js';
|
|
6
6
|
export { ApprovalError } from './errors.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/approval/index.ts"],"names":[],"mappings":"AAKA,YAAY,EACR,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,EACnB,oBAAoB,GACvB,MAAM,YAAY,CAAC;AAKpB,OAAO,EACH,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,YAAY,GACf,MAAM,YAAY,CAAC;AAGpB,OAAO,EACH,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,0BAA0B,EAC1B,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,yBAAyB,EACzB,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,8BAA8B,EAC9B,6BAA6B,EAC7B,gCAAgC,EAChC,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,EACzB,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,GAC/B,MAAM,cAAc,CAAC;AAEtB,YAAY,EACR,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,GACjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,YAAY,EACR,yBAAyB,EACzB,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,GAC/B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,YAAY,EACR,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,GACzB,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/approval/index.ts"],"names":[],"mappings":"AAKA,YAAY,EACR,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,EACnB,oBAAoB,GACvB,MAAM,YAAY,CAAC;AAKpB,OAAO,EACH,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,YAAY,GACf,MAAM,YAAY,CAAC;AAGpB,OAAO,EACH,gCAAgC,EAChC,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,0BAA0B,EAC1B,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,yBAAyB,EACzB,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,8BAA8B,EAC9B,6BAA6B,EAC7B,gCAAgC,EAChC,0BAA0B,EAC1B,0BAA0B,EAC1B,yBAAyB,EACzB,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,GAC/B,MAAM,cAAc,CAAC;AAEtB,YAAY,EACR,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,GACjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,YAAY,EACR,yBAAyB,EACzB,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,GAC/B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,YAAY,EACR,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,GACzB,MAAM,cAAc,CAAC"}
|
package/dist/approval/index.js
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
DenialReason
|
|
9
9
|
} from "./types.js";
|
|
10
10
|
import {
|
|
11
|
+
ApprovalAutoApprovalPolicySchema,
|
|
11
12
|
ApprovalTypeSchema,
|
|
12
13
|
ApprovalStatusSchema,
|
|
13
14
|
DenialReasonSchema,
|
|
@@ -35,6 +36,7 @@ import { ApprovalManager } from "./manager.js";
|
|
|
35
36
|
export {
|
|
36
37
|
APPROVAL_STATUSES,
|
|
37
38
|
APPROVAL_TYPES,
|
|
39
|
+
ApprovalAutoApprovalPolicySchema,
|
|
38
40
|
ApprovalError,
|
|
39
41
|
ApprovalErrorCode,
|
|
40
42
|
ApprovalManager,
|
|
@@ -219,20 +219,6 @@ class ApprovalManager {
|
|
|
219
219
|
}
|
|
220
220
|
});
|
|
221
221
|
}
|
|
222
|
-
createApprovalDetails(type, metadata, sessionId, hostRuntime, timeout) {
|
|
223
|
-
const details = {
|
|
224
|
-
type,
|
|
225
|
-
timeout: this.getApprovalTimeout(type, timeout),
|
|
226
|
-
metadata
|
|
227
|
-
};
|
|
228
|
-
if (sessionId !== void 0) {
|
|
229
|
-
details.sessionId = sessionId;
|
|
230
|
-
}
|
|
231
|
-
if (hostRuntime !== void 0) {
|
|
232
|
-
details.hostRuntime = hostRuntime;
|
|
233
|
-
}
|
|
234
|
-
return details;
|
|
235
|
-
}
|
|
236
222
|
withDefaultTimeout(details) {
|
|
237
223
|
return {
|
|
238
224
|
...details,
|
|
@@ -249,6 +235,7 @@ class ApprovalManager {
|
|
|
249
235
|
}
|
|
250
236
|
assertMatchingRecordedRequest(existing, candidate) {
|
|
251
237
|
const existingComparable = {
|
|
238
|
+
autoApproval: existing.autoApproval ?? "allowed",
|
|
252
239
|
type: existing.type,
|
|
253
240
|
sessionId: existing.sessionId,
|
|
254
241
|
hostRuntime: existing.hostRuntime,
|
|
@@ -256,6 +243,7 @@ class ApprovalManager {
|
|
|
256
243
|
metadata: existing.metadata
|
|
257
244
|
};
|
|
258
245
|
const candidateComparable = {
|
|
246
|
+
autoApproval: candidate.autoApproval ?? "allowed",
|
|
259
247
|
type: candidate.type,
|
|
260
248
|
sessionId: candidate.sessionId,
|
|
261
249
|
hostRuntime: candidate.hostRuntime,
|
|
@@ -395,6 +383,7 @@ class ApprovalManager {
|
|
|
395
383
|
* @private
|
|
396
384
|
*/
|
|
397
385
|
async handleApproval(request) {
|
|
386
|
+
const autoApproval = request.autoApproval === void 0 ? "allowed" : import_schemas.ApprovalAutoApprovalPolicySchema.parse(request.autoApproval);
|
|
398
387
|
if (request.type === import_types.ApprovalType.ELICITATION) {
|
|
399
388
|
const handler2 = this.ensureHandler();
|
|
400
389
|
this.logger.info(
|
|
@@ -403,7 +392,7 @@ class ApprovalManager {
|
|
|
403
392
|
return handler2(request);
|
|
404
393
|
}
|
|
405
394
|
const mode = this.config.permissions.mode;
|
|
406
|
-
if (mode === "auto-approve") {
|
|
395
|
+
if (mode === "auto-approve" && autoApproval === "allowed") {
|
|
407
396
|
this.logger.info(
|
|
408
397
|
`Auto-approve approval '${request.type}', approvalId: ${request.approvalId}`
|
|
409
398
|
);
|
|
@@ -425,16 +414,15 @@ class ApprovalManager {
|
|
|
425
414
|
* Tool approvals always happen in session context during LLM execution
|
|
426
415
|
*/
|
|
427
416
|
async requestToolApproval(metadata) {
|
|
428
|
-
const { sessionId, hostRuntime, timeout, ...toolMetadata } = metadata;
|
|
429
|
-
return this.requestApproval(
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
);
|
|
417
|
+
const { autoApproval, sessionId, hostRuntime, timeout, ...toolMetadata } = metadata;
|
|
418
|
+
return this.requestApproval({
|
|
419
|
+
...autoApproval === void 0 ? {} : { autoApproval },
|
|
420
|
+
...hostRuntime === void 0 ? {} : { hostRuntime },
|
|
421
|
+
metadata: toolMetadata,
|
|
422
|
+
...sessionId === void 0 ? {} : { sessionId },
|
|
423
|
+
...timeout === void 0 ? {} : { timeout },
|
|
424
|
+
type: import_types.ApprovalType.TOOL_APPROVAL
|
|
425
|
+
});
|
|
438
426
|
}
|
|
439
427
|
/**
|
|
440
428
|
* Request command approval
|
|
@@ -458,16 +446,15 @@ class ApprovalManager {
|
|
|
458
446
|
* ```
|
|
459
447
|
*/
|
|
460
448
|
async requestCommandApproval(metadata) {
|
|
461
|
-
const { sessionId, hostRuntime, timeout, ...commandMetadata } = metadata;
|
|
462
|
-
return this.requestApproval(
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
);
|
|
449
|
+
const { autoApproval, sessionId, hostRuntime, timeout, ...commandMetadata } = metadata;
|
|
450
|
+
return this.requestApproval({
|
|
451
|
+
...autoApproval === void 0 ? {} : { autoApproval },
|
|
452
|
+
...hostRuntime === void 0 ? {} : { hostRuntime },
|
|
453
|
+
metadata: commandMetadata,
|
|
454
|
+
...sessionId === void 0 ? {} : { sessionId },
|
|
455
|
+
...timeout === void 0 ? {} : { timeout },
|
|
456
|
+
type: import_types.ApprovalType.COMMAND_APPROVAL
|
|
457
|
+
});
|
|
471
458
|
}
|
|
472
459
|
/**
|
|
473
460
|
* Request elicitation from MCP server
|
|
@@ -478,15 +465,13 @@ class ApprovalManager {
|
|
|
478
465
|
*/
|
|
479
466
|
async requestElicitation(metadata) {
|
|
480
467
|
const { sessionId, hostRuntime, timeout, ...elicitationMetadata } = metadata;
|
|
481
|
-
return this.requestApproval(
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
)
|
|
489
|
-
);
|
|
468
|
+
return this.requestApproval({
|
|
469
|
+
...hostRuntime === void 0 ? {} : { hostRuntime },
|
|
470
|
+
metadata: elicitationMetadata,
|
|
471
|
+
...sessionId === void 0 ? {} : { sessionId },
|
|
472
|
+
...timeout === void 0 ? {} : { timeout },
|
|
473
|
+
type: import_types.ApprovalType.ELICITATION
|
|
474
|
+
});
|
|
490
475
|
}
|
|
491
476
|
/**
|
|
492
477
|
* Check if tool approval was approved
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ApprovalHandler, ApprovalRequest, ApprovalResponse, ApprovalRequestDetails, ToolApprovalMetadata, CommandApprovalMetadata, ElicitationMetadata } from './types.js';
|
|
1
|
+
import type { ApprovalAutoApprovalPolicy, ApprovalHandler, ApprovalRequest, ApprovalResponse, ApprovalRequestDetails, ToolApprovalMetadata, CommandApprovalMetadata, ElicitationMetadata } from './types.js';
|
|
2
2
|
import { ApprovalStatus } from './types.js';
|
|
3
3
|
import type { Logger } from '../logger/v2/types.js';
|
|
4
4
|
import type { PermissionsMode } from '../tools/schemas.js';
|
|
@@ -114,7 +114,6 @@ export declare class ApprovalManager {
|
|
|
114
114
|
* Convenience method for clearing all session state at once.
|
|
115
115
|
*/
|
|
116
116
|
clearSessionApprovals(sessionId?: string): Promise<void>;
|
|
117
|
-
private createApprovalDetails;
|
|
118
117
|
private withDefaultTimeout;
|
|
119
118
|
private approvalIdentityKey;
|
|
120
119
|
private assertMatchingRecordedRequest;
|
|
@@ -142,6 +141,7 @@ export declare class ApprovalManager {
|
|
|
142
141
|
* Tool approvals always happen in session context during LLM execution
|
|
143
142
|
*/
|
|
144
143
|
requestToolApproval(metadata: ToolApprovalMetadata & {
|
|
144
|
+
autoApproval?: ApprovalAutoApprovalPolicy;
|
|
145
145
|
sessionId?: string;
|
|
146
146
|
hostRuntime?: ApprovalRequestDetails['hostRuntime'];
|
|
147
147
|
timeout?: number;
|
|
@@ -168,6 +168,7 @@ export declare class ApprovalManager {
|
|
|
168
168
|
* ```
|
|
169
169
|
*/
|
|
170
170
|
requestCommandApproval(metadata: CommandApprovalMetadata & {
|
|
171
|
+
autoApproval?: ApprovalAutoApprovalPolicy;
|
|
171
172
|
sessionId?: string;
|
|
172
173
|
hostRuntime?: ApprovalRequestDetails['hostRuntime'];
|
|
173
174
|
timeout?: number;
|
|
@@ -189,6 +190,7 @@ export declare class ApprovalManager {
|
|
|
189
190
|
* Throws appropriate error if denied
|
|
190
191
|
*/
|
|
191
192
|
checkToolApproval(metadata: ToolApprovalMetadata & {
|
|
193
|
+
autoApproval?: ApprovalAutoApprovalPolicy;
|
|
192
194
|
sessionId?: string;
|
|
193
195
|
hostRuntime?: ApprovalRequestDetails['hostRuntime'];
|
|
194
196
|
timeout?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/approval/manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,EACvB,mBAAmB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAgB,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/approval/manager.ts"],"names":[],"mappings":"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"}
|
package/dist/approval/manager.js
CHANGED
|
@@ -2,6 +2,7 @@ import "../chunk-C6A6W6XS.js";
|
|
|
2
2
|
import { isDeepStrictEqual } from "node:util";
|
|
3
3
|
import { ApprovalType, ApprovalStatus } from "./types.js";
|
|
4
4
|
import {
|
|
5
|
+
ApprovalAutoApprovalPolicySchema,
|
|
5
6
|
CommandApprovalResponseSchema,
|
|
6
7
|
CustomApprovalResponseSchema,
|
|
7
8
|
ElicitationResponseSchema,
|
|
@@ -202,20 +203,6 @@ class ApprovalManager {
|
|
|
202
203
|
}
|
|
203
204
|
});
|
|
204
205
|
}
|
|
205
|
-
createApprovalDetails(type, metadata, sessionId, hostRuntime, timeout) {
|
|
206
|
-
const details = {
|
|
207
|
-
type,
|
|
208
|
-
timeout: this.getApprovalTimeout(type, timeout),
|
|
209
|
-
metadata
|
|
210
|
-
};
|
|
211
|
-
if (sessionId !== void 0) {
|
|
212
|
-
details.sessionId = sessionId;
|
|
213
|
-
}
|
|
214
|
-
if (hostRuntime !== void 0) {
|
|
215
|
-
details.hostRuntime = hostRuntime;
|
|
216
|
-
}
|
|
217
|
-
return details;
|
|
218
|
-
}
|
|
219
206
|
withDefaultTimeout(details) {
|
|
220
207
|
return {
|
|
221
208
|
...details,
|
|
@@ -232,6 +219,7 @@ class ApprovalManager {
|
|
|
232
219
|
}
|
|
233
220
|
assertMatchingRecordedRequest(existing, candidate) {
|
|
234
221
|
const existingComparable = {
|
|
222
|
+
autoApproval: existing.autoApproval ?? "allowed",
|
|
235
223
|
type: existing.type,
|
|
236
224
|
sessionId: existing.sessionId,
|
|
237
225
|
hostRuntime: existing.hostRuntime,
|
|
@@ -239,6 +227,7 @@ class ApprovalManager {
|
|
|
239
227
|
metadata: existing.metadata
|
|
240
228
|
};
|
|
241
229
|
const candidateComparable = {
|
|
230
|
+
autoApproval: candidate.autoApproval ?? "allowed",
|
|
242
231
|
type: candidate.type,
|
|
243
232
|
sessionId: candidate.sessionId,
|
|
244
233
|
hostRuntime: candidate.hostRuntime,
|
|
@@ -378,6 +367,7 @@ class ApprovalManager {
|
|
|
378
367
|
* @private
|
|
379
368
|
*/
|
|
380
369
|
async handleApproval(request) {
|
|
370
|
+
const autoApproval = request.autoApproval === void 0 ? "allowed" : ApprovalAutoApprovalPolicySchema.parse(request.autoApproval);
|
|
381
371
|
if (request.type === ApprovalType.ELICITATION) {
|
|
382
372
|
const handler2 = this.ensureHandler();
|
|
383
373
|
this.logger.info(
|
|
@@ -386,7 +376,7 @@ class ApprovalManager {
|
|
|
386
376
|
return handler2(request);
|
|
387
377
|
}
|
|
388
378
|
const mode = this.config.permissions.mode;
|
|
389
|
-
if (mode === "auto-approve") {
|
|
379
|
+
if (mode === "auto-approve" && autoApproval === "allowed") {
|
|
390
380
|
this.logger.info(
|
|
391
381
|
`Auto-approve approval '${request.type}', approvalId: ${request.approvalId}`
|
|
392
382
|
);
|
|
@@ -408,16 +398,15 @@ class ApprovalManager {
|
|
|
408
398
|
* Tool approvals always happen in session context during LLM execution
|
|
409
399
|
*/
|
|
410
400
|
async requestToolApproval(metadata) {
|
|
411
|
-
const { sessionId, hostRuntime, timeout, ...toolMetadata } = metadata;
|
|
412
|
-
return this.requestApproval(
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
);
|
|
401
|
+
const { autoApproval, sessionId, hostRuntime, timeout, ...toolMetadata } = metadata;
|
|
402
|
+
return this.requestApproval({
|
|
403
|
+
...autoApproval === void 0 ? {} : { autoApproval },
|
|
404
|
+
...hostRuntime === void 0 ? {} : { hostRuntime },
|
|
405
|
+
metadata: toolMetadata,
|
|
406
|
+
...sessionId === void 0 ? {} : { sessionId },
|
|
407
|
+
...timeout === void 0 ? {} : { timeout },
|
|
408
|
+
type: ApprovalType.TOOL_APPROVAL
|
|
409
|
+
});
|
|
421
410
|
}
|
|
422
411
|
/**
|
|
423
412
|
* Request command approval
|
|
@@ -441,16 +430,15 @@ class ApprovalManager {
|
|
|
441
430
|
* ```
|
|
442
431
|
*/
|
|
443
432
|
async requestCommandApproval(metadata) {
|
|
444
|
-
const { sessionId, hostRuntime, timeout, ...commandMetadata } = metadata;
|
|
445
|
-
return this.requestApproval(
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
);
|
|
433
|
+
const { autoApproval, sessionId, hostRuntime, timeout, ...commandMetadata } = metadata;
|
|
434
|
+
return this.requestApproval({
|
|
435
|
+
...autoApproval === void 0 ? {} : { autoApproval },
|
|
436
|
+
...hostRuntime === void 0 ? {} : { hostRuntime },
|
|
437
|
+
metadata: commandMetadata,
|
|
438
|
+
...sessionId === void 0 ? {} : { sessionId },
|
|
439
|
+
...timeout === void 0 ? {} : { timeout },
|
|
440
|
+
type: ApprovalType.COMMAND_APPROVAL
|
|
441
|
+
});
|
|
454
442
|
}
|
|
455
443
|
/**
|
|
456
444
|
* Request elicitation from MCP server
|
|
@@ -461,15 +449,13 @@ class ApprovalManager {
|
|
|
461
449
|
*/
|
|
462
450
|
async requestElicitation(metadata) {
|
|
463
451
|
const { sessionId, hostRuntime, timeout, ...elicitationMetadata } = metadata;
|
|
464
|
-
return this.requestApproval(
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
)
|
|
472
|
-
);
|
|
452
|
+
return this.requestApproval({
|
|
453
|
+
...hostRuntime === void 0 ? {} : { hostRuntime },
|
|
454
|
+
metadata: elicitationMetadata,
|
|
455
|
+
...sessionId === void 0 ? {} : { sessionId },
|
|
456
|
+
...timeout === void 0 ? {} : { timeout },
|
|
457
|
+
type: ApprovalType.ELICITATION
|
|
458
|
+
});
|
|
473
459
|
}
|
|
474
460
|
/**
|
|
475
461
|
* Check if tool approval was approved
|
|
@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var schemas_exports = {};
|
|
20
20
|
__export(schemas_exports, {
|
|
21
|
+
ApprovalAutoApprovalPolicySchema: () => ApprovalAutoApprovalPolicySchema,
|
|
21
22
|
ApprovalRequestDetailsSchema: () => ApprovalRequestDetailsSchema,
|
|
22
23
|
ApprovalRequestSchema: () => ApprovalRequestSchema,
|
|
23
24
|
ApprovalResponseSchema: () => ApprovalResponseSchema,
|
|
@@ -52,6 +53,7 @@ const JsonSchema7Schema = import_zod.z.record(import_zod.z.string(), import_zod.
|
|
|
52
53
|
const ApprovalTypeSchema = import_zod.z.enum(import_types.APPROVAL_TYPES);
|
|
53
54
|
const ApprovalStatusSchema = import_zod.z.enum(import_types.APPROVAL_STATUSES);
|
|
54
55
|
const DenialReasonSchema = import_zod.z.enum(import_types.DENIAL_REASONS);
|
|
56
|
+
const ApprovalAutoApprovalPolicySchema = import_zod.z.enum(["allowed", "disallowed"]).describe("Whether configured automatic approval may satisfy this request.");
|
|
55
57
|
const ToolDisplayDataSchema = import_zod.z.custom((val) => (0, import_display_types.isValidDisplayData)(val), {
|
|
56
58
|
message: "Invalid ToolDisplayData"
|
|
57
59
|
});
|
|
@@ -90,6 +92,7 @@ const ElicitationMetadataSchema = import_zod.z.object({
|
|
|
90
92
|
const CustomApprovalMetadataSchema = import_zod.z.record(import_zod.z.string(), import_zod.z.unknown()).describe("Custom metadata");
|
|
91
93
|
const BaseApprovalRequestSchema = import_zod.z.object({
|
|
92
94
|
approvalId: import_zod.z.string().uuid().describe("Unique approval identifier"),
|
|
95
|
+
autoApproval: ApprovalAutoApprovalPolicySchema.optional(),
|
|
93
96
|
type: ApprovalTypeSchema.describe("Type of approval"),
|
|
94
97
|
sessionId: import_zod.z.string().optional().describe("Session identifier"),
|
|
95
98
|
hostRuntime: import_runtime.HostRuntimeContextSchema.optional().describe(
|
|
@@ -165,6 +168,7 @@ const ApprovalResponseSchema = import_zod.z.union([
|
|
|
165
168
|
CustomApprovalResponseSchema
|
|
166
169
|
]);
|
|
167
170
|
const ApprovalRequestDetailsSchema = import_zod.z.object({
|
|
171
|
+
autoApproval: ApprovalAutoApprovalPolicySchema.optional(),
|
|
168
172
|
type: ApprovalTypeSchema,
|
|
169
173
|
sessionId: import_zod.z.string().optional(),
|
|
170
174
|
hostRuntime: import_runtime.HostRuntimeContextSchema.optional().describe(
|
|
@@ -218,6 +222,7 @@ const ApprovalRequestDetailsSchema = import_zod.z.object({
|
|
|
218
222
|
});
|
|
219
223
|
// Annotate the CommonJS export names for ESM import in node:
|
|
220
224
|
0 && (module.exports = {
|
|
225
|
+
ApprovalAutoApprovalPolicySchema,
|
|
221
226
|
ApprovalRequestDetailsSchema,
|
|
222
227
|
ApprovalRequestSchema,
|
|
223
228
|
ApprovalResponseSchema,
|
|
@@ -31,6 +31,10 @@ export declare const DenialReasonSchema: z.ZodEnum<{
|
|
|
31
31
|
validation_failed: "validation_failed";
|
|
32
32
|
elicitation_disabled: "elicitation_disabled";
|
|
33
33
|
}>;
|
|
34
|
+
export declare const ApprovalAutoApprovalPolicySchema: z.ZodEnum<{
|
|
35
|
+
allowed: "allowed";
|
|
36
|
+
disallowed: "disallowed";
|
|
37
|
+
}>;
|
|
34
38
|
/**
|
|
35
39
|
* Tool approval metadata schema
|
|
36
40
|
*/
|
|
@@ -70,6 +74,10 @@ export declare const CustomApprovalMetadataSchema: z.ZodRecord<z.ZodString, z.Zo
|
|
|
70
74
|
*/
|
|
71
75
|
export declare const BaseApprovalRequestSchema: z.ZodObject<{
|
|
72
76
|
approvalId: z.ZodString;
|
|
77
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
78
|
+
allowed: "allowed";
|
|
79
|
+
disallowed: "disallowed";
|
|
80
|
+
}>>;
|
|
73
81
|
type: z.ZodEnum<{
|
|
74
82
|
custom: "custom";
|
|
75
83
|
tool_approval: "tool_approval";
|
|
@@ -88,6 +96,10 @@ export declare const BaseApprovalRequestSchema: z.ZodObject<{
|
|
|
88
96
|
*/
|
|
89
97
|
export declare const ToolApprovalRequestSchema: z.ZodObject<{
|
|
90
98
|
approvalId: z.ZodString;
|
|
99
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
100
|
+
allowed: "allowed";
|
|
101
|
+
disallowed: "disallowed";
|
|
102
|
+
}>>;
|
|
91
103
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
92
104
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
93
105
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -110,6 +122,10 @@ export declare const ToolApprovalRequestSchema: z.ZodObject<{
|
|
|
110
122
|
*/
|
|
111
123
|
export declare const CommandApprovalRequestSchema: z.ZodObject<{
|
|
112
124
|
approvalId: z.ZodString;
|
|
125
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
126
|
+
allowed: "allowed";
|
|
127
|
+
disallowed: "disallowed";
|
|
128
|
+
}>>;
|
|
113
129
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
114
130
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
115
131
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -128,6 +144,10 @@ export declare const CommandApprovalRequestSchema: z.ZodObject<{
|
|
|
128
144
|
*/
|
|
129
145
|
export declare const ElicitationRequestSchema: z.ZodObject<{
|
|
130
146
|
approvalId: z.ZodString;
|
|
147
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
148
|
+
allowed: "allowed";
|
|
149
|
+
disallowed: "disallowed";
|
|
150
|
+
}>>;
|
|
131
151
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
132
152
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
133
153
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -147,6 +167,10 @@ export declare const ElicitationRequestSchema: z.ZodObject<{
|
|
|
147
167
|
*/
|
|
148
168
|
export declare const CustomApprovalRequestSchema: z.ZodObject<{
|
|
149
169
|
approvalId: z.ZodString;
|
|
170
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
171
|
+
allowed: "allowed";
|
|
172
|
+
disallowed: "disallowed";
|
|
173
|
+
}>>;
|
|
150
174
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
151
175
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
152
176
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -161,6 +185,10 @@ export declare const CustomApprovalRequestSchema: z.ZodObject<{
|
|
|
161
185
|
*/
|
|
162
186
|
export declare const ApprovalRequestSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
163
187
|
approvalId: z.ZodString;
|
|
188
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
189
|
+
allowed: "allowed";
|
|
190
|
+
disallowed: "disallowed";
|
|
191
|
+
}>>;
|
|
164
192
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
165
193
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
166
194
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -179,6 +207,10 @@ export declare const ApprovalRequestSchema: z.ZodDiscriminatedUnion<[z.ZodObject
|
|
|
179
207
|
}, z.core.$strict>;
|
|
180
208
|
}, z.core.$strict>, z.ZodObject<{
|
|
181
209
|
approvalId: z.ZodString;
|
|
210
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
211
|
+
allowed: "allowed";
|
|
212
|
+
disallowed: "disallowed";
|
|
213
|
+
}>>;
|
|
182
214
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
183
215
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
184
216
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -193,6 +225,10 @@ export declare const ApprovalRequestSchema: z.ZodDiscriminatedUnion<[z.ZodObject
|
|
|
193
225
|
}, z.core.$strict>;
|
|
194
226
|
}, z.core.$strict>, z.ZodObject<{
|
|
195
227
|
approvalId: z.ZodString;
|
|
228
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
229
|
+
allowed: "allowed";
|
|
230
|
+
disallowed: "disallowed";
|
|
231
|
+
}>>;
|
|
196
232
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
197
233
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
198
234
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -208,6 +244,10 @@ export declare const ApprovalRequestSchema: z.ZodDiscriminatedUnion<[z.ZodObject
|
|
|
208
244
|
}, z.core.$strict>;
|
|
209
245
|
}, z.core.$strict>, z.ZodObject<{
|
|
210
246
|
approvalId: z.ZodString;
|
|
247
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
248
|
+
allowed: "allowed";
|
|
249
|
+
disallowed: "disallowed";
|
|
250
|
+
}>>;
|
|
211
251
|
sessionId: z.ZodOptional<z.ZodString>;
|
|
212
252
|
hostRuntime: z.ZodOptional<z.ZodObject<{
|
|
213
253
|
ids: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
@@ -479,6 +519,10 @@ export declare const ApprovalResponseSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
|
479
519
|
* Approval request details schema for creating requests
|
|
480
520
|
*/
|
|
481
521
|
export declare const ApprovalRequestDetailsSchema: z.ZodObject<{
|
|
522
|
+
autoApproval: z.ZodOptional<z.ZodEnum<{
|
|
523
|
+
allowed: "allowed";
|
|
524
|
+
disallowed: "disallowed";
|
|
525
|
+
}>>;
|
|
482
526
|
type: z.ZodEnum<{
|
|
483
527
|
custom: "custom";
|
|
484
528
|
tool_approval: "tool_approval";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/approval/schemas.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAMpE;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;;;EAAyB,CAAC;AAEzD;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;;EAA4B,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;EAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/approval/schemas.ts"],"names":[],"mappings":"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"}
|
package/dist/approval/schemas.js
CHANGED
|
@@ -7,6 +7,7 @@ const JsonSchema7Schema = z.record(z.string(), z.unknown());
|
|
|
7
7
|
const ApprovalTypeSchema = z.enum(APPROVAL_TYPES);
|
|
8
8
|
const ApprovalStatusSchema = z.enum(APPROVAL_STATUSES);
|
|
9
9
|
const DenialReasonSchema = z.enum(DENIAL_REASONS);
|
|
10
|
+
const ApprovalAutoApprovalPolicySchema = z.enum(["allowed", "disallowed"]).describe("Whether configured automatic approval may satisfy this request.");
|
|
10
11
|
const ToolDisplayDataSchema = z.custom((val) => isValidDisplayData(val), {
|
|
11
12
|
message: "Invalid ToolDisplayData"
|
|
12
13
|
});
|
|
@@ -45,6 +46,7 @@ const ElicitationMetadataSchema = z.object({
|
|
|
45
46
|
const CustomApprovalMetadataSchema = z.record(z.string(), z.unknown()).describe("Custom metadata");
|
|
46
47
|
const BaseApprovalRequestSchema = z.object({
|
|
47
48
|
approvalId: z.string().uuid().describe("Unique approval identifier"),
|
|
49
|
+
autoApproval: ApprovalAutoApprovalPolicySchema.optional(),
|
|
48
50
|
type: ApprovalTypeSchema.describe("Type of approval"),
|
|
49
51
|
sessionId: z.string().optional().describe("Session identifier"),
|
|
50
52
|
hostRuntime: HostRuntimeContextSchema.optional().describe(
|
|
@@ -120,6 +122,7 @@ const ApprovalResponseSchema = z.union([
|
|
|
120
122
|
CustomApprovalResponseSchema
|
|
121
123
|
]);
|
|
122
124
|
const ApprovalRequestDetailsSchema = z.object({
|
|
125
|
+
autoApproval: ApprovalAutoApprovalPolicySchema.optional(),
|
|
123
126
|
type: ApprovalTypeSchema,
|
|
124
127
|
sessionId: z.string().optional(),
|
|
125
128
|
hostRuntime: HostRuntimeContextSchema.optional().describe(
|
|
@@ -172,6 +175,7 @@ const ApprovalRequestDetailsSchema = z.object({
|
|
|
172
175
|
}
|
|
173
176
|
});
|
|
174
177
|
export {
|
|
178
|
+
ApprovalAutoApprovalPolicySchema,
|
|
175
179
|
ApprovalRequestDetailsSchema,
|
|
176
180
|
ApprovalRequestSchema,
|
|
177
181
|
ApprovalResponseSchema,
|
package/dist/approval/types.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { z } from 'zod';
|
|
2
|
-
import type { ToolApprovalMetadataSchema, CommandApprovalMetadataSchema, ElicitationMetadataSchema, CustomApprovalMetadataSchema, BaseApprovalRequestSchema, ToolApprovalRequestSchema, CommandApprovalRequestSchema, ElicitationRequestSchema, CustomApprovalRequestSchema, ApprovalRequestSchema, ApprovalRequestDetailsSchema, ToolApprovalResponseDataSchema, CommandApprovalResponseDataSchema, ElicitationResponseDataSchema, CustomApprovalResponseDataSchema, BaseApprovalResponseSchema, ToolApprovalResponseSchema, CommandApprovalResponseSchema, ElicitationResponseSchema, CustomApprovalResponseSchema, ApprovalResponseSchema } from './schemas.js';
|
|
2
|
+
import type { ApprovalAutoApprovalPolicySchema, ToolApprovalMetadataSchema, CommandApprovalMetadataSchema, ElicitationMetadataSchema, CustomApprovalMetadataSchema, BaseApprovalRequestSchema, ToolApprovalRequestSchema, CommandApprovalRequestSchema, ElicitationRequestSchema, CustomApprovalRequestSchema, ApprovalRequestSchema, ApprovalRequestDetailsSchema, ToolApprovalResponseDataSchema, CommandApprovalResponseDataSchema, ElicitationResponseDataSchema, CustomApprovalResponseDataSchema, BaseApprovalResponseSchema, ToolApprovalResponseSchema, CommandApprovalResponseSchema, ElicitationResponseSchema, CustomApprovalResponseSchema, ApprovalResponseSchema } from './schemas.js';
|
|
3
|
+
export type ApprovalAutoApprovalPolicy = z.output<typeof ApprovalAutoApprovalPolicySchema>;
|
|
3
4
|
/**
|
|
4
5
|
* Types of approval requests supported by the system
|
|
5
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/approval/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/approval/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,9 @@ function providerMessage(details, fallback) {
|
|
|
97
97
|
return details.openRouterProviderRawMessage ?? details.openRouterErrorMessage ?? details.responseBody ?? fallback;
|
|
98
98
|
}
|
|
99
99
|
function messageFromUnknown(value) {
|
|
100
|
-
|
|
100
|
+
if (value instanceof Error) return value.message;
|
|
101
|
+
if (isRecord(value)) return readString(value.message) ?? String(value);
|
|
102
|
+
return String(value);
|
|
101
103
|
}
|
|
102
104
|
function isInvalidSchemaMessage(message) {
|
|
103
105
|
return message.includes("Invalid schema for function") || message.includes("invalid_function_parameters") || message.includes("schema must have type");
|
|
@@ -175,6 +177,18 @@ function mapProviderError(input) {
|
|
|
175
177
|
if (input.error instanceof import_DextoRuntimeError.DextoRuntimeError) return input.error;
|
|
176
178
|
if (!import_ai.APICallError.isInstance?.(input.error)) {
|
|
177
179
|
const message2 = messageFromUnknown(input.error);
|
|
180
|
+
if (import_ai.UnsupportedFunctionalityError.isInstance(input.error)) {
|
|
181
|
+
return new import_DextoRuntimeError.DextoRuntimeError(
|
|
182
|
+
import_error_codes.LLMErrorCode.GENERATION_FAILED,
|
|
183
|
+
import_types.ErrorScope.LLM,
|
|
184
|
+
import_types.ErrorType.THIRD_PARTY,
|
|
185
|
+
message2,
|
|
186
|
+
buildContext(input, extractProviderErrorDetails(input)),
|
|
187
|
+
void 0,
|
|
188
|
+
void 0,
|
|
189
|
+
"non_retryable"
|
|
190
|
+
);
|
|
191
|
+
}
|
|
178
192
|
if (isInvalidSchemaMessage(message2)) {
|
|
179
193
|
return new import_DextoRuntimeError.DextoRuntimeError(
|
|
180
194
|
import_error_codes.LLMErrorCode.REQUEST_INVALID_SCHEMA,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-error.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/provider-error.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,uBAAuB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,yBAAyB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-error.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/provider-error.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,uBAAuB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,yBAAyB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAmLF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,qBAAqB,GAAG,uBAAuB,CAuBjG;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,KAAK,CA4EpE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import "../../chunk-C6A6W6XS.js";
|
|
2
|
-
import { APICallError } from "ai";
|
|
2
|
+
import { APICallError, UnsupportedFunctionalityError } from "ai";
|
|
3
3
|
import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
|
|
4
4
|
import { ErrorScope, ErrorType } from "../../errors/types.js";
|
|
5
5
|
import { LLMErrorCode } from "../error-codes.js";
|
|
@@ -74,7 +74,9 @@ function providerMessage(details, fallback) {
|
|
|
74
74
|
return details.openRouterProviderRawMessage ?? details.openRouterErrorMessage ?? details.responseBody ?? fallback;
|
|
75
75
|
}
|
|
76
76
|
function messageFromUnknown(value) {
|
|
77
|
-
|
|
77
|
+
if (value instanceof Error) return value.message;
|
|
78
|
+
if (isRecord(value)) return readString(value.message) ?? String(value);
|
|
79
|
+
return String(value);
|
|
78
80
|
}
|
|
79
81
|
function isInvalidSchemaMessage(message) {
|
|
80
82
|
return message.includes("Invalid schema for function") || message.includes("invalid_function_parameters") || message.includes("schema must have type");
|
|
@@ -152,6 +154,18 @@ function mapProviderError(input) {
|
|
|
152
154
|
if (input.error instanceof DextoRuntimeError) return input.error;
|
|
153
155
|
if (!APICallError.isInstance?.(input.error)) {
|
|
154
156
|
const message2 = messageFromUnknown(input.error);
|
|
157
|
+
if (UnsupportedFunctionalityError.isInstance(input.error)) {
|
|
158
|
+
return new DextoRuntimeError(
|
|
159
|
+
LLMErrorCode.GENERATION_FAILED,
|
|
160
|
+
ErrorScope.LLM,
|
|
161
|
+
ErrorType.THIRD_PARTY,
|
|
162
|
+
message2,
|
|
163
|
+
buildContext(input, extractProviderErrorDetails(input)),
|
|
164
|
+
void 0,
|
|
165
|
+
void 0,
|
|
166
|
+
"non_retryable"
|
|
167
|
+
);
|
|
168
|
+
}
|
|
155
169
|
if (isInvalidSchemaMessage(message2)) {
|
|
156
170
|
return new DextoRuntimeError(
|
|
157
171
|
LLMErrorCode.REQUEST_INVALID_SCHEMA,
|
|
@@ -118,11 +118,11 @@ function buildOpenRouterProviderOptions(config) {
|
|
|
118
118
|
return void 0;
|
|
119
119
|
}
|
|
120
120
|
if (reasoningVariant === "disabled") {
|
|
121
|
-
return {
|
|
121
|
+
return { openrouter: { include_reasoning: false } };
|
|
122
122
|
}
|
|
123
123
|
if (budgetTokens !== void 0) {
|
|
124
124
|
return {
|
|
125
|
-
|
|
125
|
+
openrouter: {
|
|
126
126
|
include_reasoning: true,
|
|
127
127
|
reasoning: { enabled: true, max_tokens: budgetTokens }
|
|
128
128
|
}
|
|
@@ -131,7 +131,7 @@ function buildOpenRouterProviderOptions(config) {
|
|
|
131
131
|
if (profile.paradigm === "budget") {
|
|
132
132
|
if (reasoningVariant === void 0 || reasoningVariant === "enabled") {
|
|
133
133
|
return {
|
|
134
|
-
|
|
134
|
+
openrouter: {
|
|
135
135
|
include_reasoning: true
|
|
136
136
|
}
|
|
137
137
|
};
|
|
@@ -140,7 +140,7 @@ function buildOpenRouterProviderOptions(config) {
|
|
|
140
140
|
}
|
|
141
141
|
const effort = toOpenAIReasoningEffort(reasoningVariant);
|
|
142
142
|
return {
|
|
143
|
-
|
|
143
|
+
openrouter: {
|
|
144
144
|
include_reasoning: true,
|
|
145
145
|
...effort !== void 0 ? { reasoning: { enabled: true, effort } } : {}
|
|
146
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-options.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/provider-options.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAelE,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CAC9C;
|
|
1
|
+
{"version":3,"file":"provider-options.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/provider-options.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAelE,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CAC9C;AA8LD,wBAAgB,iCAAiC,CAC7C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,GACrE,MAAM,GAAG,SAAS,CA6BpB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,qBAAqB,GAC9B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CA4IrD"}
|
|
@@ -106,11 +106,11 @@ function buildOpenRouterProviderOptions(config) {
|
|
|
106
106
|
return void 0;
|
|
107
107
|
}
|
|
108
108
|
if (reasoningVariant === "disabled") {
|
|
109
|
-
return {
|
|
109
|
+
return { openrouter: { include_reasoning: false } };
|
|
110
110
|
}
|
|
111
111
|
if (budgetTokens !== void 0) {
|
|
112
112
|
return {
|
|
113
|
-
|
|
113
|
+
openrouter: {
|
|
114
114
|
include_reasoning: true,
|
|
115
115
|
reasoning: { enabled: true, max_tokens: budgetTokens }
|
|
116
116
|
}
|
|
@@ -119,7 +119,7 @@ function buildOpenRouterProviderOptions(config) {
|
|
|
119
119
|
if (profile.paradigm === "budget") {
|
|
120
120
|
if (reasoningVariant === void 0 || reasoningVariant === "enabled") {
|
|
121
121
|
return {
|
|
122
|
-
|
|
122
|
+
openrouter: {
|
|
123
123
|
include_reasoning: true
|
|
124
124
|
}
|
|
125
125
|
};
|
|
@@ -128,7 +128,7 @@ function buildOpenRouterProviderOptions(config) {
|
|
|
128
128
|
}
|
|
129
129
|
const effort = toOpenAIReasoningEffort(reasoningVariant);
|
|
130
130
|
return {
|
|
131
|
-
|
|
131
|
+
openrouter: {
|
|
132
132
|
include_reasoning: true,
|
|
133
133
|
...effort !== void 0 ? { reasoning: { enabled: true, effort } } : {}
|
|
134
134
|
}
|
|
@@ -239,14 +239,15 @@ async function createVercelModel(llmConfig, context) {
|
|
|
239
239
|
if (process.env.DEXTO_CLI_VERSION) {
|
|
240
240
|
headers[DEXTO_GATEWAY_HEADERS.CLIENT_VERSION] = process.env.DEXTO_CLI_VERSION;
|
|
241
241
|
}
|
|
242
|
-
const {
|
|
243
|
-
const provider2 =
|
|
244
|
-
name: "dexto-nova",
|
|
242
|
+
const { createOpenRouter } = await import("@openrouter/ai-sdk-provider");
|
|
243
|
+
const provider2 = createOpenRouter({
|
|
245
244
|
baseURL: dextoBaseURL,
|
|
245
|
+
compatibility: "strict",
|
|
246
246
|
headers,
|
|
247
|
-
...apiKey?.trim() ? { apiKey } : {}
|
|
247
|
+
...apiKey?.trim() ? { apiKey } : {},
|
|
248
|
+
...runtimeFetch ? { fetch: runtimeFetch } : {}
|
|
248
249
|
});
|
|
249
|
-
const chatModel = provider2.
|
|
250
|
+
const chatModel = provider2.chat(model);
|
|
250
251
|
if (!isLanguageModel(chatModel)) {
|
|
251
252
|
throw import_errors.LLMError.generationFailed(
|
|
252
253
|
"Dexto gateway provider returned an invalid language model instance",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EACR,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AAoHpB;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACnC,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EACR,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AAoHpB;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACnC,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,OAAO,CAAC,aAAa,CAAC,CAkUxB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CAClC,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,uBAAuB,EAChC,oBAAoB,CAAC,EAAE,oBAAoB,GAC5C,OAAO,CAAC,gBAAgB,CAAC,CAwC3B"}
|
|
@@ -211,14 +211,15 @@ async function createVercelModel(llmConfig, context) {
|
|
|
211
211
|
if (process.env.DEXTO_CLI_VERSION) {
|
|
212
212
|
headers[DEXTO_GATEWAY_HEADERS.CLIENT_VERSION] = process.env.DEXTO_CLI_VERSION;
|
|
213
213
|
}
|
|
214
|
-
const {
|
|
215
|
-
const provider2 =
|
|
216
|
-
name: "dexto-nova",
|
|
214
|
+
const { createOpenRouter } = await import("@openrouter/ai-sdk-provider");
|
|
215
|
+
const provider2 = createOpenRouter({
|
|
217
216
|
baseURL: dextoBaseURL,
|
|
217
|
+
compatibility: "strict",
|
|
218
218
|
headers,
|
|
219
|
-
...apiKey?.trim() ? { apiKey } : {}
|
|
219
|
+
...apiKey?.trim() ? { apiKey } : {},
|
|
220
|
+
...runtimeFetch ? { fetch: runtimeFetch } : {}
|
|
220
221
|
});
|
|
221
|
-
const chatModel = provider2.
|
|
222
|
+
const chatModel = provider2.chat(model);
|
|
222
223
|
if (!isLanguageModel(chatModel)) {
|
|
223
224
|
throw LLMError.generationFailed(
|
|
224
225
|
"Dexto gateway provider returned an invalid language model instance",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dexto/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -162,7 +162,7 @@
|
|
|
162
162
|
"nanoid": "^5.1.6",
|
|
163
163
|
"winston": "^3.17.0",
|
|
164
164
|
"yaml": "^2.8.3",
|
|
165
|
-
"@dexto/llm": "1.
|
|
165
|
+
"@dexto/llm": "1.10.0"
|
|
166
166
|
},
|
|
167
167
|
"devDependencies": {
|
|
168
168
|
"@opentelemetry/context-async-hooks": "^1.28.0",
|