veryfront 0.1.660 → 0.1.662
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/esm/deno.js +1 -1
- package/esm/src/agent/hosted/child-tool-input.d.ts.map +1 -1
- package/esm/src/agent/hosted/child-tool-input.js +3 -2
- package/esm/src/agent/runtime/agent-definition.d.ts +2 -0
- package/esm/src/agent/runtime/agent-definition.d.ts.map +1 -1
- package/esm/src/agent/runtime/agent-definition.js +9 -0
- package/esm/src/agent/streaming/fork-runtime-stream.d.ts +1 -0
- package/esm/src/agent/streaming/fork-runtime-stream.d.ts.map +1 -1
- package/esm/src/agent/streaming/fork-runtime-stream.js +7 -0
- package/esm/src/sandbox/shell-tools.d.ts.map +1 -1
- package/esm/src/sandbox/shell-tools.js +23 -1
- package/esm/src/utils/version-constant.d.ts +1 -1
- package/esm/src/utils/version-constant.js +1 -1
- package/package.json +1 -1
package/esm/deno.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-tool-input.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-tool-input.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,+CAA+C;AAC/C,eAAO,MAAM,6BAA6B,uBAAuB,CAAC;AAElE,eAAO,MAAM,iCAAiC;;;;;;;;
|
|
1
|
+
{"version":3,"file":"child-tool-input.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-tool-input.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,+CAA+C;AAC/C,eAAO,MAAM,6BAA6B,uBAAuB,CAAC;AAElE,eAAO,MAAM,iCAAiC;;;;;;;;GAoB7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B;;;;;;;;GAAgD,CAAC;AAE5F,gDAAgD;AAChD,MAAM,MAAM,wBAAwB,GAAG,WAAW,CAChD,UAAU,CAAC,OAAO,iCAAiC,CAAC,CACrD,CAAC;AAEF,uDAAuD;AACvD,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,0BAA0B,GAAG,SAAS,CAAC;CACxD,CAAC;AAEF,kEAAkE;AAClE,MAAM,MAAM,wCAAwC,GAAG;IACrD,SAAS,EAAE,IAAI,CACb,wBAAwB,EACxB,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,GAAG,WAAW,CACxE,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5C,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C,CAAC;AAEF,oDAAoD;AACpD,wBAAgB,sCAAsC,CACpD,QAAQ,EAAE,wBAAwB,CAAC,UAAU,CAAC,GAC7C,0BAA0B,GAAG,SAAS,CAUxC;AAED,+DAA+D;AAC/D,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,wCAAwC,GAC9C,4BAA4B,CAkB9B"}
|
|
@@ -13,7 +13,7 @@ export const getHostedChildForkToolInputSchema = defineSchema((v) => v.object({
|
|
|
13
13
|
.nonnegative()
|
|
14
14
|
.optional()
|
|
15
15
|
.describe("Thinking override in budget tokens. Use 0 to disable thinking."),
|
|
16
|
-
max_steps: v.number().optional().describe("Max steps override."),
|
|
16
|
+
max_steps: v.number().optional().describe("Max steps override. Omit for the hosted child default. Values below the default are raised to the default."),
|
|
17
17
|
}));
|
|
18
18
|
/** Schema for hosted child fork tool input.
|
|
19
19
|
* @deprecated Use getHostedChildForkToolInputSchema()
|
|
@@ -33,6 +33,7 @@ export function resolveHostedChildForkThinkingOverride(thinking) {
|
|
|
33
33
|
export function resolveHostedChildForkRuntimeConfig(input) {
|
|
34
34
|
const { description, prompt, tools, model, thinking, max_steps } = input.forkInput;
|
|
35
35
|
const forkModel = input.resolveModelId(model || input.contextModel || input.defaultModel);
|
|
36
|
+
const requestedMaxSteps = typeof max_steps === "number" ? max_steps : undefined;
|
|
36
37
|
return {
|
|
37
38
|
description,
|
|
38
39
|
effectivePrompt: withDefaultResearchArtifactPath({
|
|
@@ -43,7 +44,7 @@ export function resolveHostedChildForkRuntimeConfig(input) {
|
|
|
43
44
|
requestedTools: tools,
|
|
44
45
|
forkModel,
|
|
45
46
|
provider: input.resolveProvider(forkModel),
|
|
46
|
-
maxSteps:
|
|
47
|
+
maxSteps: Math.max(requestedMaxSteps ?? input.defaultMaxSteps, input.defaultMaxSteps),
|
|
47
48
|
thinkingConfig: resolveHostedChildForkThinkingOverride(thinking),
|
|
48
49
|
};
|
|
49
50
|
}
|
|
@@ -27,6 +27,7 @@ export declare const getRuntimeAgentMarkdownDefinitionSchema: () => import("../.
|
|
|
27
27
|
}> | undefined>;
|
|
28
28
|
model: import("../../internal-agents/schema.js").Schema<string | undefined>;
|
|
29
29
|
maxSteps: import("../../internal-agents/schema.js").Schema<number | undefined>;
|
|
30
|
+
providerTools: import("../../internal-agents/schema.js").Schema<string[] | undefined>;
|
|
30
31
|
}>>;
|
|
31
32
|
/** Default value for runtime agent context marker. */
|
|
32
33
|
export declare const DEFAULT_RUNTIME_AGENT_CONTEXT_MARKER = "<!-- veryfront-runtime-context -->";
|
|
@@ -44,6 +45,7 @@ export declare const runtimeAgentMarkdownDefinitionSchema: import("../../interna
|
|
|
44
45
|
}> | undefined>;
|
|
45
46
|
model: import("../../internal-agents/schema.js").Schema<string | undefined>;
|
|
46
47
|
maxSteps: import("../../internal-agents/schema.js").Schema<number | undefined>;
|
|
48
|
+
providerTools: import("../../internal-agents/schema.js").Schema<string[] | undefined>;
|
|
47
49
|
}>>;
|
|
48
50
|
/** Definition for runtime agent markdown. */
|
|
49
51
|
export type RuntimeAgentMarkdownDefinition = InferSchema<ReturnType<typeof getRuntimeAgentMarkdownDefinitionSchema>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-definition.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/agent-definition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,wDAAwD;AACxD,eAAO,MAAM,mCAAmC;;;GAK/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gCAAgC;;;GAAkD,CAAC;AAEhG,oDAAoD;AACpD,MAAM,MAAM,0BAA0B,GAAG,WAAW,CAClD,UAAU,CAAC,OAAO,mCAAmC,CAAC,CACvD,CAAC;AAEF,4DAA4D;AAC5D,eAAO,MAAM,uCAAuC
|
|
1
|
+
{"version":3,"file":"agent-definition.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/agent-definition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,wDAAwD;AACxD,eAAO,MAAM,mCAAmC;;;GAK/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gCAAgC;;;GAAkD,CAAC;AAEhG,oDAAoD;AACpD,MAAM,MAAM,0BAA0B,GAAG,WAAW,CAClD,UAAU,CAAC,OAAO,mCAAmC,CAAC,CACvD,CAAC;AAEF,4DAA4D;AAC5D,eAAO,MAAM,uCAAuC;;;;;;;;;;;;GAWnD,CAAC;AAEF,sDAAsD;AACtD,eAAO,MAAM,oCAAoC,uCAAuC,CAAC;AAEzF;;GAEG;AACH,eAAO,MAAM,oCAAoC;;;;;;;;;;;;GAEhD,CAAC;AAEF,6CAA6C;AAC7C,MAAM,MAAM,8BAA8B,GAAG,WAAW,CACtD,UAAU,CAAC,OAAO,uCAAuC,CAAC,CAC3D,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,iDAAiD;;;GAK7D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8CAA8C;;;GAE1D,CAAC;AAEF,iEAAiE;AACjE,MAAM,MAAM,wCAAwC,GAAG,WAAW,CAChE,UAAU,CAAC,OAAO,iDAAiD,CAAC,CACrE,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,qCAAqC,GAAG;IAClD,KAAK,EAAE,8BAA8B,CAAC;IACtC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,MAAM,CAAC,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC3C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAuBF,mDAAmD;AACnD,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,wCAAwC,GAC9C,8BAA8B,CAoBhC;AAkBD,4CAA4C;AAC5C,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,qCAAqC,GAC3C,iBAAiB,EAAE,CA2CrB"}
|
|
@@ -20,6 +20,7 @@ export const getRuntimeAgentMarkdownDefinitionSchema = defineSchema((v) => v.obj
|
|
|
20
20
|
thinking: getRuntimeAgentThinkingConfigSchema().optional(),
|
|
21
21
|
model: v.string().min(1).optional(),
|
|
22
22
|
maxSteps: v.number().optional(),
|
|
23
|
+
providerTools: v.array(v.string().min(1)).optional(),
|
|
23
24
|
}));
|
|
24
25
|
/** Default value for runtime agent context marker. */
|
|
25
26
|
export const DEFAULT_RUNTIME_AGENT_CONTEXT_MARKER = "<!-- veryfront-runtime-context -->";
|
|
@@ -48,6 +49,12 @@ function parseThinking(value) {
|
|
|
48
49
|
}
|
|
49
50
|
return undefined;
|
|
50
51
|
}
|
|
52
|
+
function parseProviderTools(value) {
|
|
53
|
+
if (!Array.isArray(value)) {
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
return value;
|
|
57
|
+
}
|
|
51
58
|
/** Definition for parse runtime agent markdown. */
|
|
52
59
|
export function parseRuntimeAgentMarkdownDefinition(input) {
|
|
53
60
|
const parsedInput = getParseRuntimeAgentMarkdownDefinitionInputSchema().parse(input);
|
|
@@ -57,6 +64,7 @@ export function parseRuntimeAgentMarkdownDefinition(input) {
|
|
|
57
64
|
const model = typeof attrs.model === "string" && attrs.model.trim() ? attrs.model : undefined;
|
|
58
65
|
const thinking = parseThinking(attrs.thinking);
|
|
59
66
|
const maxSteps = typeof attrs["max-steps"] === "number" ? attrs["max-steps"] : undefined;
|
|
67
|
+
const providerTools = parseProviderTools(attrs["provider-tools"]);
|
|
60
68
|
return getRuntimeAgentMarkdownDefinitionSchema().parse({
|
|
61
69
|
id: parsedInput.id,
|
|
62
70
|
name,
|
|
@@ -65,6 +73,7 @@ export function parseRuntimeAgentMarkdownDefinition(input) {
|
|
|
65
73
|
...(model ? { model } : {}),
|
|
66
74
|
...(thinking ? { thinking } : {}),
|
|
67
75
|
...(maxSteps === undefined ? {} : { maxSteps }),
|
|
76
|
+
...(providerTools ? { providerTools } : {}),
|
|
68
77
|
});
|
|
69
78
|
}
|
|
70
79
|
function splitRuntimeAgentInstructions(input) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fork-runtime-stream.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/streaming/fork-runtime-stream.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC5B,KAAK,IAAI,EAET,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAgB1E,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAElF,UAAU,cAAc;IACtB,IAAI,EAAE,iBAAiB,GAAG,YAAY,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,sBAAsB;IAC9B,IAAI,EAAE,kBAAkB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,sBAAsB;IAC9B,IAAI,EAAE,kBAAkB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,iBAAiB;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;CACd;AAED,UAAU,aAAa;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;CACd;AAED,iDAAiD;AACjD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,KAAK,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,OAAO,CAAC;KAChB,CAAC,CAAC;IACH,WAAW,EAAE,KAAK,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC,CAAC;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,UAAU,wBAAwB;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,sCAAsC;AACtC,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACjD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,uBAAuB,CAAC;CAClC;AAED,KAAK,wBAAwB,GAAG,wBAAwB,GAAG;IACzD,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;CAC9B,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC9C,QAAQ,EAAE,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"fork-runtime-stream.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/streaming/fork-runtime-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -436,6 +436,10 @@ export function applyPartToStreamedStepState(state, part) {
|
|
|
436
436
|
});
|
|
437
437
|
break;
|
|
438
438
|
}
|
|
439
|
+
case "error": {
|
|
440
|
+
state.streamError = part.error;
|
|
441
|
+
break;
|
|
442
|
+
}
|
|
439
443
|
default:
|
|
440
444
|
break;
|
|
441
445
|
}
|
|
@@ -529,6 +533,9 @@ export async function resolveForkStepResponse(input) {
|
|
|
529
533
|
if (input.abortSignal?.aborted) {
|
|
530
534
|
throw createAgentRuntimeForkAbortError(input.abortSignal);
|
|
531
535
|
}
|
|
536
|
+
if (input.streamedStepState.streamError) {
|
|
537
|
+
throw input.streamedStepState.streamError;
|
|
538
|
+
}
|
|
532
539
|
const fallbackState = hasFallbackStepContent(input.streamedStepState)
|
|
533
540
|
? input.streamedStepState
|
|
534
541
|
: buildRecoverablePriorWorkState(input.currentMessages);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-tools.d.ts","sourceRoot":"","sources":["../../../src/src/sandbox/shell-tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,EAElB,mBAAmB,EACnB,yBAAyB,EAC1B,MAAM,gCAAgC,CAAC;AAExC,YAAY,EACV,kBAAkB,IAAI,mBAAmB,EACzC,0BAA0B,EAC1B,mBAAmB,EACnB,yBAAyB,IAAI,qBAAqB,GACnD,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"shell-tools.d.ts","sourceRoot":"","sources":["../../../src/src/sandbox/shell-tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,EAElB,mBAAmB,EACnB,yBAAyB,EAC1B,MAAM,gCAAgC,CAAC;AAExC,YAAY,EACV,kBAAkB,IAAI,mBAAmB,EACzC,0BAA0B,EAC1B,mBAAmB,EACnB,yBAAyB,IAAI,qBAAqB,GACnD,MAAM,gCAAgC,CAAC;AA0KxC,gCAAgC;AAChC,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,mBAAmB,CAM5F;AAED,iCAAiC;AACjC,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,mBAAmB,GAAG,mBAAmB,CAiC1F;AAED,kCAAkC;AAClC,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,yBAAyB,GAC1C,OAAO,CAAC,mBAAmB,CAAC,CAU9B"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
const SANDBOX_WORKING_DIRECTORY = "/workspace";
|
|
2
2
|
const SANDBOX_TOOL_PROMPT = "Available tools: agent-browser, awk, cat, column, comm, curl, cut, diff, expand, find, fold, grep, head, iconv, join, jq, nl, node, od, paste, printf, python3, rev, sed, sort, split, strings, tail, tee, tr, unexpand, uniq, veryfront, wc, xargs, xxd, yq, and more";
|
|
3
|
+
const PERMISSIVE_OBJECT_SCHEMA = {
|
|
4
|
+
type: "object",
|
|
5
|
+
properties: {},
|
|
6
|
+
additionalProperties: true,
|
|
7
|
+
};
|
|
3
8
|
const JSON_SCHEMA_TYPES = new Set([
|
|
4
9
|
"string",
|
|
5
10
|
"number",
|
|
@@ -98,7 +103,16 @@ function normalizeJsonSchema(value) {
|
|
|
98
103
|
schema.minItems = value.minItems;
|
|
99
104
|
if (typeof value.maxItems === "number")
|
|
100
105
|
schema.maxItems = value.maxItems;
|
|
101
|
-
return schema;
|
|
106
|
+
return Object.keys(schema).length > 0 ? schema : undefined;
|
|
107
|
+
}
|
|
108
|
+
function isContractSchema(value) {
|
|
109
|
+
if (!isRecord(value))
|
|
110
|
+
return false;
|
|
111
|
+
if ("__zod" in value)
|
|
112
|
+
return true;
|
|
113
|
+
return ("_output" in value &&
|
|
114
|
+
typeof value.parse === "function" &&
|
|
115
|
+
typeof value.safeParse === "function");
|
|
102
116
|
}
|
|
103
117
|
function normalizeBashTool(toolName, toolDefinition) {
|
|
104
118
|
if (!isRecord(toolDefinition)) {
|
|
@@ -110,6 +124,8 @@ function normalizeBashTool(toolName, toolDefinition) {
|
|
|
110
124
|
const description = toolDefinition.description;
|
|
111
125
|
const inputSchema = toolDefinition.inputSchema;
|
|
112
126
|
const inputSchemaJson = normalizeJsonSchema(toolDefinition.inputSchemaJson);
|
|
127
|
+
const hasContractInputSchema = isContractSchema(inputSchema);
|
|
128
|
+
const inputSchemaAsJson = hasContractInputSchema ? undefined : normalizeJsonSchema(inputSchema);
|
|
113
129
|
const executeCandidate = toolDefinition.execute;
|
|
114
130
|
const mcp = toolDefinition.mcp;
|
|
115
131
|
if (typeof id === "string") {
|
|
@@ -127,6 +143,12 @@ function normalizeBashTool(toolName, toolDefinition) {
|
|
|
127
143
|
if (inputSchemaJson !== undefined) {
|
|
128
144
|
normalized.inputSchemaJson = inputSchemaJson;
|
|
129
145
|
}
|
|
146
|
+
else if (inputSchemaAsJson !== undefined) {
|
|
147
|
+
normalized.inputSchemaJson = inputSchemaAsJson;
|
|
148
|
+
}
|
|
149
|
+
else if (inputSchema !== undefined && !hasContractInputSchema) {
|
|
150
|
+
normalized.inputSchemaJson = PERMISSIVE_OBJECT_SCHEMA;
|
|
151
|
+
}
|
|
130
152
|
if (typeof executeCandidate === "function") {
|
|
131
153
|
normalized.execute = async (input, options) => executeCandidate(input, options);
|
|
132
154
|
}
|