experimental-ash 0.2.0-alpha.33 → 0.2.0-alpha.34
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/src/execution/node-step.js +3 -3
- package/dist/src/execution/node-step.js.map +1 -1
- package/dist/src/execution/sandboxes/prewarm.js +66 -34
- package/dist/src/execution/sandboxes/prewarm.js.map +1 -1
- package/dist/src/execution/session.d.ts.map +1 -1
- package/dist/src/execution/session.js +1 -2
- package/dist/src/execution/session.js.map +1 -1
- package/dist/src/harness/execute-tool.d.ts +11 -35
- package/dist/src/harness/execute-tool.d.ts.map +1 -1
- package/dist/src/harness/execute-tool.js +1 -58
- package/dist/src/harness/execute-tool.js.map +1 -1
- package/dist/src/harness/step-hooks.d.ts.map +1 -1
- package/dist/src/harness/step-hooks.js +1 -2
- package/dist/src/harness/step-hooks.js.map +1 -1
- package/dist/src/harness/tool-loop.js +3 -3
- package/dist/src/harness/tool-loop.js.map +1 -1
- package/dist/src/harness/tools.d.ts +6 -3
- package/dist/src/harness/tools.d.ts.map +1 -1
- package/dist/src/harness/tools.js +11 -24
- package/dist/src/harness/tools.js.map +1 -1
- package/dist/src/harness/types.d.ts +2 -2
- package/dist/src/internal/application/package.js +1 -1
- package/dist/src/public/channels/auth.d.ts +1 -1
- package/dist/src/public/channels/auth.js +1 -1
- package/dist/src/public/definitions/channel.d.ts +3 -3
- package/dist/src/public/definitions/channel.js +2 -2
- package/dist/src/public/definitions/instrumentation.d.ts +6 -6
- package/dist/src/public/definitions/instrumentation.d.ts.map +1 -1
- package/dist/src/public/definitions/instrumentation.js +1 -1
- package/dist/src/public/definitions/tool.d.ts +19 -7
- package/dist/src/public/definitions/tool.d.ts.map +1 -1
- package/dist/src/public/definitions/tool.js.map +1 -1
- package/dist/src/public/index.d.ts +19 -18
- package/dist/src/public/index.d.ts.map +1 -1
- package/dist/src/public/index.js +19 -13
- package/dist/src/public/index.js.map +1 -1
- package/dist/src/public/instrumentation/index.d.ts +22 -0
- package/dist/src/public/instrumentation/index.d.ts.map +1 -0
- package/dist/src/public/instrumentation/index.js +22 -0
- package/dist/src/public/instrumentation/index.js.map +1 -0
- package/dist/src/public/schedules/index.d.ts +20 -0
- package/dist/src/public/schedules/index.d.ts.map +1 -0
- package/dist/src/public/schedules/index.js +20 -0
- package/dist/src/public/schedules/index.js.map +1 -0
- package/dist/src/public/subagents/index.d.ts +19 -0
- package/dist/src/public/subagents/index.d.ts.map +1 -0
- package/dist/src/public/subagents/index.js +19 -0
- package/dist/src/public/subagents/index.js.map +1 -0
- package/dist/src/public/tools/defaults.d.ts.map +1 -1
- package/dist/src/public/tools/defaults.js +1 -0
- package/dist/src/public/tools/defaults.js.map +1 -1
- package/dist/src/public/tools/internal.d.ts.map +1 -1
- package/dist/src/public/tools/internal.js +1 -3
- package/dist/src/public/tools/internal.js.map +1 -1
- package/dist/src/runtime/connections/mcp-client.d.ts +7 -0
- package/dist/src/runtime/connections/mcp-client.d.ts.map +1 -1
- package/dist/src/runtime/connections/mcp-client.js +23 -22
- package/dist/src/runtime/connections/mcp-client.js.map +1 -1
- package/dist/src/runtime/connections/types.d.ts +2 -0
- package/dist/src/runtime/connections/types.d.ts.map +1 -1
- package/dist/src/runtime/framework-tools/connection-tools.d.ts +7 -7
- package/dist/src/runtime/framework-tools/connection-tools.d.ts.map +1 -1
- package/dist/src/runtime/framework-tools/connection-tools.js +12 -17
- package/dist/src/runtime/framework-tools/connection-tools.js.map +1 -1
- package/dist/src/runtime/resolve-tool.d.ts.map +1 -1
- package/dist/src/runtime/resolve-tool.js +10 -6
- package/dist/src/runtime/resolve-tool.js.map +1 -1
- package/dist/src/runtime/types.d.ts +5 -5
- package/dist/src/runtime/types.d.ts.map +1 -1
- package/docs/internals/channels.md +1 -1
- package/docs/public/instrumentation.md +4 -4
- package/docs/public/tools.md +7 -5
- package/package.json +16 -1
- package/dist/src/harness/tool-schema.d.ts +0 -13
- package/dist/src/harness/tool-schema.d.ts.map +0 -1
- package/dist/src/harness/tool-schema.js +0 -33
- package/dist/src/harness/tool-schema.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { jsonSchema } from "ai";
|
|
1
2
|
import { createToolLoopHarness } from "../harness/tool-loop.js";
|
|
2
3
|
import { resolveInstalledPackageInfo } from "../internal/application/package.js";
|
|
3
4
|
import { resolveRuntimeModelReference } from "../runtime/agent/resolve-model.js";
|
|
@@ -84,7 +85,7 @@ function resolveHarnessToolDefinition(input) {
|
|
|
84
85
|
if (input.tool.kind === "subagent") {
|
|
85
86
|
return {
|
|
86
87
|
description: input.tool.description ?? "",
|
|
87
|
-
inputSchema: input.tool.inputSchema ?? {},
|
|
88
|
+
inputSchema: jsonSchema(input.tool.inputSchema ?? {}),
|
|
88
89
|
name: input.tool.name,
|
|
89
90
|
runtimeAction: {
|
|
90
91
|
kind: "subagent-call",
|
|
@@ -102,8 +103,7 @@ function resolveHarnessToolDefinition(input) {
|
|
|
102
103
|
approvalKey: def.approvalKey,
|
|
103
104
|
description: def.description,
|
|
104
105
|
execute: def.execute,
|
|
105
|
-
inputSchema: (def.inputSchema ?? {}),
|
|
106
|
-
inputValidator: def.inputValidator,
|
|
106
|
+
inputSchema: def.inputStandardSchema ?? jsonSchema(def.inputSchema ?? {}),
|
|
107
107
|
name: def.name,
|
|
108
108
|
needsApproval: def.needsApproval,
|
|
109
109
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-step.js","sourceRoot":"","sources":["../../../src/execution/node-step.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"node-step.js","sourceRoot":"","sources":["../../../src/execution/node-step.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,12 +48,48 @@ export async function prewarmExecutionSandboxTemplatesForApp(input) {
|
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
async function collectExecutionSandboxPrewarmTargets(input) {
|
|
51
|
-
const targetsByTemplateKey = new Map();
|
|
52
51
|
// Only sandboxes whose backend declares a `prewarm` hook need a
|
|
53
52
|
// build-time template. Backends without `prewarm` (currently the
|
|
54
53
|
// local backend) initialize themselves at runtime via `create`.
|
|
55
54
|
const prewarmableSandboxes = collectRegisteredSandboxes(input.graph).filter((registered) => registered.definition.backend.prewarm !== undefined);
|
|
56
|
-
const
|
|
55
|
+
const skillSeedFiles = await getCompiledSkillSeedFiles({
|
|
56
|
+
compiledArtifactsSource: input.compiledArtifactsSource,
|
|
57
|
+
graph: input.graph,
|
|
58
|
+
});
|
|
59
|
+
// Collect authored targets. When the authored sandbox overrides the
|
|
60
|
+
// framework default, skill seed files are folded in here so the
|
|
61
|
+
// framework-default branch below can be skipped entirely.
|
|
62
|
+
const hasAuthoredDefault = prewarmableSandboxes.some((registered) => registered.definition.name === DEFAULT_SANDBOX_NAME);
|
|
63
|
+
const authoredTargets = await collectAuthoredPrewarmTargets({
|
|
64
|
+
compiledArtifactsSource: input.compiledArtifactsSource,
|
|
65
|
+
defaultSandboxSkillSeedFiles: hasAuthoredDefault ? skillSeedFiles : [],
|
|
66
|
+
sandboxes: prewarmableSandboxes,
|
|
67
|
+
});
|
|
68
|
+
// Deduplicate by template key (multiple graph nodes may reference the
|
|
69
|
+
// same sandbox definition).
|
|
70
|
+
const targetsByTemplateKey = new Map();
|
|
71
|
+
for (const target of authoredTargets) {
|
|
72
|
+
if (!targetsByTemplateKey.has(target.prewarmInput.templateKey)) {
|
|
73
|
+
targetsByTemplateKey.set(target.prewarmInput.templateKey, target);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
// When no authored override exists, the framework default-sandbox
|
|
77
|
+
// prewarm bakes both the skill seed files and the default-sandbox
|
|
78
|
+
// workspace folder (if any) into the snapshot.
|
|
79
|
+
if (!hasAuthoredDefault) {
|
|
80
|
+
const frameworkTarget = await collectFrameworkDefaultPrewarmTarget({
|
|
81
|
+
compiledArtifactsSource: input.compiledArtifactsSource,
|
|
82
|
+
graph: input.graph,
|
|
83
|
+
skillSeedFiles,
|
|
84
|
+
});
|
|
85
|
+
if (frameworkTarget !== undefined) {
|
|
86
|
+
targetsByTemplateKey.set(frameworkTarget.prewarmInput.templateKey, frameworkTarget);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return [...targetsByTemplateKey.values()].sort((left, right) => left.label.localeCompare(right.label));
|
|
90
|
+
}
|
|
91
|
+
async function collectAuthoredPrewarmTargets(input) {
|
|
92
|
+
return await Promise.all(input.sandboxes.map(async ({ definition, workspaceFileSources }) => {
|
|
57
93
|
const templateKey = await createRuntimeSandboxTemplateKey({
|
|
58
94
|
backendName: definition.backend.name,
|
|
59
95
|
compiledArtifactsSource: input.compiledArtifactsSource,
|
|
@@ -63,7 +99,11 @@ async function collectExecutionSandboxPrewarmTargets(input) {
|
|
|
63
99
|
// Bake the authored workspace folder into the snapshot so the
|
|
64
100
|
// hosted runtime can reuse it without ever reading the
|
|
65
101
|
// developer's disk again.
|
|
66
|
-
const
|
|
102
|
+
const workspaceSeedFiles = await materializePerSandboxSeedFiles(workspaceFileSources);
|
|
103
|
+
const isDefault = definition.name === DEFAULT_SANDBOX_NAME;
|
|
104
|
+
const seedFiles = isDefault
|
|
105
|
+
? [...workspaceSeedFiles, ...input.defaultSandboxSkillSeedFiles]
|
|
106
|
+
: workspaceSeedFiles;
|
|
67
107
|
const prewarmInput = {
|
|
68
108
|
bootstrap: definition.bootstrap === undefined
|
|
69
109
|
? undefined
|
|
@@ -80,40 +120,32 @@ async function collectExecutionSandboxPrewarmTargets(input) {
|
|
|
80
120
|
prewarmInput,
|
|
81
121
|
};
|
|
82
122
|
}));
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
graph: input.graph,
|
|
86
|
-
});
|
|
87
|
-
for (const target of authoredTargets) {
|
|
88
|
-
if (!targetsByTemplateKey.has(target.prewarmInput.templateKey)) {
|
|
89
|
-
targetsByTemplateKey.set(target.prewarmInput.templateKey, target);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
// The framework default-sandbox prewarm runs whenever any node in the
|
|
93
|
-
// graph leaves the default sandbox on a prewarmable backend. It bakes
|
|
94
|
-
// both the skill seed files and the authored default-sandbox
|
|
95
|
-
// workspace folder (if any) into the snapshot.
|
|
123
|
+
}
|
|
124
|
+
async function collectFrameworkDefaultPrewarmTarget(input) {
|
|
96
125
|
const defaultBackend = findFirstPrewarmableDefaultSandboxBackend(input.graph);
|
|
126
|
+
if (defaultBackend === undefined) {
|
|
127
|
+
return undefined;
|
|
128
|
+
}
|
|
97
129
|
const defaultWorkspaceFiles = await materializePerSandboxSeedFiles(collectDefaultSandboxWorkspaceFileSources(input.graph));
|
|
98
|
-
const
|
|
99
|
-
if (
|
|
100
|
-
|
|
101
|
-
backendName: defaultBackend.name,
|
|
102
|
-
compiledArtifactsSource: input.compiledArtifactsSource,
|
|
103
|
-
sandboxName: DEFAULT_SANDBOX_NAME,
|
|
104
|
-
sourceId: DEFAULT_SANDBOX_SOURCE_ID,
|
|
105
|
-
});
|
|
106
|
-
targetsByTemplateKey.set(templateKey, {
|
|
107
|
-
backend: defaultBackend,
|
|
108
|
-
kind: "framework",
|
|
109
|
-
label: DEFAULT_SANDBOX_NAME,
|
|
110
|
-
prewarmInput: {
|
|
111
|
-
seedFiles: frameworkSeedFiles,
|
|
112
|
-
templateKey,
|
|
113
|
-
},
|
|
114
|
-
});
|
|
130
|
+
const seedFiles = [...defaultWorkspaceFiles, ...input.skillSeedFiles];
|
|
131
|
+
if (seedFiles.length === 0) {
|
|
132
|
+
return undefined;
|
|
115
133
|
}
|
|
116
|
-
|
|
134
|
+
const templateKey = await createRuntimeSandboxTemplateKey({
|
|
135
|
+
backendName: defaultBackend.name,
|
|
136
|
+
compiledArtifactsSource: input.compiledArtifactsSource,
|
|
137
|
+
sandboxName: DEFAULT_SANDBOX_NAME,
|
|
138
|
+
sourceId: DEFAULT_SANDBOX_SOURCE_ID,
|
|
139
|
+
});
|
|
140
|
+
return {
|
|
141
|
+
backend: defaultBackend,
|
|
142
|
+
kind: "framework",
|
|
143
|
+
label: DEFAULT_SANDBOX_NAME,
|
|
144
|
+
prewarmInput: {
|
|
145
|
+
seedFiles,
|
|
146
|
+
templateKey,
|
|
147
|
+
},
|
|
148
|
+
};
|
|
117
149
|
}
|
|
118
150
|
/**
|
|
119
151
|
* Materializes per-sandbox workspace file sources into the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prewarm.js","sourceRoot":"","sources":["../../../../src/execution/sandboxes/prewarm.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAC;AACtG,OAAO,EACL,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AAGlF,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAgC9D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,KAA4C;IAE5C,MAAM,OAAO,GAAG,MAAM,qCAAqC,CAAC,KAAK,CAAC,CAAC;IAEnE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,KAAK,CAAC,GAAG,EAAE,CACT,qBAAqB,OAAO,CAAC,MAAM,sBAAsB,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,kCAAkC,mCAAmC,CAAC,OAAO,CAAC,MAAM,CACnL,CAAC;IAEF,MAAM,QAAQ,GACZ,KAAK,CAAC,QAAQ;QACd,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;YAC1C,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;QAC3D,KAAK,CAAC,GAAG,EAAE,CACT,qBAAqB,iCAAiC,CAAC,IAAI,CAAC,sBAAsB,KAAK,MAAM,CAC9F,CAAC;QACF,MAAM,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QACjD,KAAK,CAAC,GAAG,EAAE,CACT,QAAQ,iCAAiC,CAAC,IAAI,CAAC,sBAAsB,KAAK,+BAA+B,CAC1G,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,KAAK,CAAC,GAAG,EAAE,CACT,8BAA8B,OAAO,CAAC,MAAM,sBAAsB,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,qBAAqB,mCAAmC,CAAC,OAAO,CAAC,IAAI,CAC7K,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,sCAAsC,CAAC,KAS5D;IACC,MAAM,uBAAuB,GAAG,wCAAwC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,IAAI,iCAAiC,CAAC,CAAC;QAC9E,uBAAuB;KACxB,CAAC,CAAC;IAEH,MAAM,gCAAgC,CAAC;QACrC,uBAAuB;QACvB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,qCAAqC,CAAC,KAGpD;IACC,
|
|
1
|
+
{"version":3,"file":"prewarm.js","sourceRoot":"","sources":["../../../../src/execution/sandboxes/prewarm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AACjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAMtE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,GAAE;IACL,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC/B;;;;;;;;EAsBP;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;CACtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,cAAc,CAoBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;CACH,GAAG,cAAc,CAiBjB;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAErE"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { normalizeToolInputSchema } from "../harness/tool-schema.js";
|
|
2
1
|
const DEFAULT_COMPACTION_RECENT_WINDOW_SIZE = 10;
|
|
3
2
|
const DEFAULT_COMPACTION_THRESHOLD_PERCENT = 0.9;
|
|
4
3
|
const FALLBACK_COMPACTION_THRESHOLD = 100_000;
|
|
@@ -92,7 +91,7 @@ function createSessionToolDefinitions(turnAgent) {
|
|
|
92
91
|
return turnAgent.tools.map((tool) => ({
|
|
93
92
|
description: tool.description ?? "",
|
|
94
93
|
name: tool.name,
|
|
95
|
-
parameters:
|
|
94
|
+
parameters: tool.inputSchema ?? {},
|
|
96
95
|
}));
|
|
97
96
|
}
|
|
98
97
|
//# sourceMappingURL=session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/execution/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
+
import type { FlexibleSchema } from "ai";
|
|
1
2
|
import type { NeedsApprovalContext } from "../public/definitions/tool.js";
|
|
2
|
-
import { type JsonValue } from "../runtime/json.js";
|
|
3
|
-
import type { StandardSchemaValidator } from "../runtime/standard-schema.js";
|
|
4
3
|
/**
|
|
5
4
|
* Runtime-owned action metadata attached to one harness-visible tool.
|
|
6
5
|
*
|
|
@@ -15,11 +14,14 @@ export type HarnessRuntimeActionDefinition = {
|
|
|
15
14
|
/**
|
|
16
15
|
* Unified harness-owned tool definition.
|
|
17
16
|
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
17
|
+
* Typed to align with the AI SDK's `Tool` interface so that
|
|
18
|
+
* `buildToolSet` can pass definitions directly to the SDK's `tool()`
|
|
19
|
+
* helper without type assertions.
|
|
20
|
+
*
|
|
21
|
+
* {@link inputSchema} is an AI SDK `FlexibleSchema`: either a live
|
|
22
|
+
* Standard Schema (Zod) for authored tools or a `jsonSchema()` wrapper
|
|
23
|
+
* for tools that only carry a static JSON schema. The AI SDK handles
|
|
24
|
+
* both JSON schema extraction and runtime validation.
|
|
23
25
|
*
|
|
24
26
|
* Session lifecycle hooks (e.g. compaction) are split off by the
|
|
25
27
|
* execution layer and passed to the harness separately.
|
|
@@ -30,36 +32,10 @@ export type HarnessRuntimeActionDefinition = {
|
|
|
30
32
|
export interface HarnessToolDefinition {
|
|
31
33
|
readonly approvalKey?: (toolInput: Readonly<Record<string, unknown>>) => string;
|
|
32
34
|
readonly description: string;
|
|
33
|
-
readonly execute?: (input:
|
|
34
|
-
readonly inputSchema:
|
|
35
|
-
readonly inputValidator?: StandardSchemaValidator;
|
|
35
|
+
readonly execute?: (input: any) => any;
|
|
36
|
+
readonly inputSchema: FlexibleSchema;
|
|
36
37
|
readonly name: string;
|
|
37
38
|
readonly needsApproval?: (ctx: NeedsApprovalContext) => boolean;
|
|
38
39
|
readonly runtimeAction?: HarnessRuntimeActionDefinition;
|
|
39
40
|
}
|
|
40
|
-
/**
|
|
41
|
-
* Result of executing one authored tool through the harness.
|
|
42
|
-
*/
|
|
43
|
-
export type ToolExecutionResult = {
|
|
44
|
-
readonly ok: false;
|
|
45
|
-
readonly code: string;
|
|
46
|
-
readonly message: string;
|
|
47
|
-
} | {
|
|
48
|
-
readonly ok: true;
|
|
49
|
-
readonly output: JsonValue;
|
|
50
|
-
};
|
|
51
|
-
/**
|
|
52
|
-
* Executes one authored tool call through the harness-owned pipeline.
|
|
53
|
-
*
|
|
54
|
-
* Validates input (when an {@link HarnessToolDefinition.inputValidator} is
|
|
55
|
-
* present), invokes the authored `execute` function, and validates that the
|
|
56
|
-
* returned value is JSON-serializable.
|
|
57
|
-
*
|
|
58
|
-
* The unified Ash context is already active when this function is called
|
|
59
|
-
* (the caller runs inside the execution layer's ALS scope), so authored code
|
|
60
|
-
* can access `getSession()`, `getSandbox()`, etc. directly.
|
|
61
|
-
*/
|
|
62
|
-
export declare function executeAuthoredTool(definition: HarnessToolDefinition & {
|
|
63
|
-
readonly execute: NonNullable<HarnessToolDefinition["execute"]>;
|
|
64
|
-
}, input: unknown): Promise<ToolExecutionResult>;
|
|
65
41
|
//# sourceMappingURL=execute-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-tool.d.ts","sourceRoot":"","sources":["../../../src/harness/execute-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"execute-tool.d.ts","sourceRoot":"","sources":["../../../src/harness/execute-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAEzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E;;;;;GAKG;AACH,MAAM,MAAM,8BAA8B,GAAG;IAC3C,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,MAAM,CAAC;IAChF,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,OAAO,CAAC;IAChE,QAAQ,CAAC,aAAa,CAAC,EAAE,8BAA8B,CAAC;CACzD"}
|
|
@@ -1,59 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
import { formatStandardSchemaIssues, validateStandardSchemaValue, } from "../runtime/standard-schema.js";
|
|
3
|
-
/**
|
|
4
|
-
* Executes one authored tool call through the harness-owned pipeline.
|
|
5
|
-
*
|
|
6
|
-
* Validates input (when an {@link HarnessToolDefinition.inputValidator} is
|
|
7
|
-
* present), invokes the authored `execute` function, and validates that the
|
|
8
|
-
* returned value is JSON-serializable.
|
|
9
|
-
*
|
|
10
|
-
* The unified Ash context is already active when this function is called
|
|
11
|
-
* (the caller runs inside the execution layer's ALS scope), so authored code
|
|
12
|
-
* can access `getSession()`, `getSandbox()`, etc. directly.
|
|
13
|
-
*/
|
|
14
|
-
export async function executeAuthoredTool(definition, input) {
|
|
15
|
-
let parsedInput = input;
|
|
16
|
-
if (definition.inputValidator !== undefined) {
|
|
17
|
-
let validationResult;
|
|
18
|
-
try {
|
|
19
|
-
validationResult = await validateStandardSchemaValue(definition.inputValidator, parsedInput);
|
|
20
|
-
}
|
|
21
|
-
catch (error) {
|
|
22
|
-
return {
|
|
23
|
-
code: "TOOL_INPUT_VALIDATION_FAILED",
|
|
24
|
-
message: formatErrorMessage(error),
|
|
25
|
-
ok: false,
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
if (!validationResult.ok) {
|
|
29
|
-
return {
|
|
30
|
-
code: "TOOL_INPUT_INVALID",
|
|
31
|
-
message: `Tool "${definition.name}" received invalid input: ${formatStandardSchemaIssues(validationResult.issues)}.`,
|
|
32
|
-
ok: false,
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
|
-
parsedInput = validationResult.value;
|
|
36
|
-
}
|
|
37
|
-
try {
|
|
38
|
-
const output = await definition.execute(parsedInput);
|
|
39
|
-
return { ok: true, output: parseJsonValue(output) };
|
|
40
|
-
}
|
|
41
|
-
catch (error) {
|
|
42
|
-
if (error instanceof TypeError && error.message === "Expected a JSON-serializable value.") {
|
|
43
|
-
return {
|
|
44
|
-
code: "TOOL_OUTPUT_NOT_SERIALIZABLE",
|
|
45
|
-
message: `Tool "${definition.name}" returned a non-JSON-serializable value.`,
|
|
46
|
-
ok: false,
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
return {
|
|
50
|
-
code: "TOOL_EXECUTION_FAILED",
|
|
51
|
-
message: formatErrorMessage(error),
|
|
52
|
-
ok: false,
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
function formatErrorMessage(error) {
|
|
57
|
-
return error instanceof Error ? error.message : String(error);
|
|
58
|
-
}
|
|
1
|
+
export {};
|
|
59
2
|
//# sourceMappingURL=execute-tool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-tool.js","sourceRoot":"","sources":["../../../src/harness/execute-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute-tool.js","sourceRoot":"","sources":["../../../src/harness/execute-tool.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-hooks.d.ts","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAEb,YAAY,EACZ,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,OAAO,EAGR,MAAM,IAAI,CAAC;AAcZ,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EACL,KAAK,oBAAoB,EAGzB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAMvF;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,UAAU,CAAC,OAAO,CAAC,EACnB,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAAG,OAAO,CACzF,CAAC;AAMF;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAC9D,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAC7D,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,EAAE,MAAM,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC;IAExE;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,cAAc,CAAC;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;;;;OAQG;IACH,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEnD;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACjD;AAMD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,CA6G/D;AAMD;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE;IACP,QAAQ,CAAC,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC;CAChD,GACA,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"step-hooks.d.ts","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAEb,YAAY,EACZ,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,OAAO,EAGR,MAAM,IAAI,CAAC;AAcZ,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EACL,KAAK,oBAAoB,EAGzB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAMvF;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,UAAU,CAAC,OAAO,CAAC,EACnB,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAAG,OAAO,CACzF,CAAC;AAMF;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAC9D,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAC7D,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,EAAE,MAAM,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC;IAExE;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,cAAc,CAAC;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;;;;OAQG;IACH,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEnD;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACjD;AAMD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,CA6G/D;AAMD;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,oBAAoB,EAC3B,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE;IACP,QAAQ,CAAC,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC;CAChD,GACA,OAAO,CAAC,IAAI,CAAC,CA4Df"}
|
|
@@ -127,9 +127,8 @@ export async function emitStepActions(emitFn, state, step, options) {
|
|
|
127
127
|
}
|
|
128
128
|
// action.result for each tool result
|
|
129
129
|
for (const tr of step.toolResults) {
|
|
130
|
-
if (isExcluded(tr.toolCallId, tr.toolName))
|
|
130
|
+
if (isExcluded(tr.toolCallId, tr.toolName))
|
|
131
131
|
continue;
|
|
132
|
-
}
|
|
133
132
|
await emitFn(createActionResultEvent({
|
|
134
133
|
result: {
|
|
135
134
|
callId: tr.toolCallId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-hooks.js","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"step-hooks.js","sourceRoot":"","sources":["../../../src/harness/step-hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,8 +47,8 @@ function enrichTelemetry(authored, session, agentName) {
|
|
|
47
47
|
"ash.session.id": session.sessionId,
|
|
48
48
|
"ash.continuation_token": session.continuationToken,
|
|
49
49
|
},
|
|
50
|
-
recordInputs: authored.recordInputs ??
|
|
51
|
-
recordOutputs: authored.recordOutputs,
|
|
50
|
+
recordInputs: authored.recordInputs ?? true,
|
|
51
|
+
recordOutputs: authored.recordOutputs ?? true,
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
// ---------------------------------------------------------------------------
|
|
@@ -202,7 +202,7 @@ export function createToolLoopHarness(config) {
|
|
|
202
202
|
// Inject connection tools whose metadata was cached by a prior
|
|
203
203
|
// connection_search call. Tools that haven't been searched yet
|
|
204
204
|
// remain invisible to the model.
|
|
205
|
-
const connectionTools = resolveDiscoveredConnectionTools({
|
|
205
|
+
const connectionTools = await resolveDiscoveredConnectionTools({
|
|
206
206
|
approvedTools,
|
|
207
207
|
existingToolNames: new Set(Object.keys(tools)),
|
|
208
208
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,12 @@ import type { HarnessToolMap } from "./types.js";
|
|
|
4
4
|
/**
|
|
5
5
|
* Builds an AI SDK `ToolSet` from unified harness tool definitions.
|
|
6
6
|
*
|
|
7
|
-
* Each
|
|
8
|
-
*
|
|
9
|
-
*
|
|
7
|
+
* Each definition already carries an SDK-compatible `inputSchema` — either
|
|
8
|
+
* a live Standard Schema or a `jsonSchema()` wrapper — so the harness
|
|
9
|
+
* passes it through without transformation.
|
|
10
|
+
*
|
|
11
|
+
* Tools without `execute` are surfaced to the model as client-side tools
|
|
12
|
+
* (no server execution).
|
|
10
13
|
*/
|
|
11
14
|
export declare function buildToolSet(input: {
|
|
12
15
|
readonly approvedTools?: ReadonlySet<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAQ,MAAM,IAAI,CAAC;AAExC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAI3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAaV;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,6BAA6B,CAAC,KAAK,EAAE;IACzD,QAAQ,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,CAAC,CAoBnB"}
|
|
@@ -1,38 +1,25 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { tool } from "ai";
|
|
2
2
|
import { WEB_SEARCH_TOOL_DEFINITION } from "../runtime/framework-tools/web-search.js";
|
|
3
|
-
import { executeAuthoredTool } from "./execute-tool.js";
|
|
4
3
|
import { resolveWebSearchBackend, resolveWebSearchProviderTool } from "./provider-tools.js";
|
|
5
|
-
import { normalizeToolInputSchema } from "./tool-schema.js";
|
|
6
4
|
/**
|
|
7
5
|
* Builds an AI SDK `ToolSet` from unified harness tool definitions.
|
|
8
6
|
*
|
|
9
|
-
* Each
|
|
10
|
-
*
|
|
11
|
-
*
|
|
7
|
+
* Each definition already carries an SDK-compatible `inputSchema` — either
|
|
8
|
+
* a live Standard Schema or a `jsonSchema()` wrapper — so the harness
|
|
9
|
+
* passes it through without transformation.
|
|
10
|
+
*
|
|
11
|
+
* Tools without `execute` are surfaced to the model as client-side tools
|
|
12
|
+
* (no server execution).
|
|
12
13
|
*/
|
|
13
14
|
export function buildToolSet(input) {
|
|
14
15
|
const tools = {};
|
|
15
16
|
for (const definition of input.tools.values()) {
|
|
16
|
-
|
|
17
|
+
tools[definition.name] = tool({
|
|
17
18
|
description: definition.description,
|
|
18
|
-
|
|
19
|
+
execute: definition.execute,
|
|
20
|
+
inputSchema: definition.inputSchema,
|
|
19
21
|
needsApproval: buildNeedsApprovalFn(definition, input),
|
|
20
|
-
};
|
|
21
|
-
if (definition.execute !== undefined) {
|
|
22
|
-
const executableDefinition = definition;
|
|
23
|
-
tools[definition.name] = tool({
|
|
24
|
-
...baseToolDefinition,
|
|
25
|
-
execute: async (rawInput) => {
|
|
26
|
-
const result = await executeAuthoredTool(executableDefinition, rawInput);
|
|
27
|
-
if (!result.ok) {
|
|
28
|
-
return { code: result.code, message: result.message };
|
|
29
|
-
}
|
|
30
|
-
return result.output;
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
continue;
|
|
34
|
-
}
|
|
35
|
-
tools[definition.name] = tool(baseToolDefinition);
|
|
22
|
+
});
|
|
36
23
|
}
|
|
37
24
|
return tools;
|
|
38
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,IAAI,EAAE,MAAM,IAAI,CAAC;AAGxC,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAEtF,OAAO,EAAE,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAG5F;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,KAI5B;IACC,MAAM,KAAK,GAAoC,EAAE,CAAC;IAElD,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9C,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YAC5B,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,aAAa,EAAE,oBAAoB,CAAC,UAAU,EAAE,KAAK,CAAC;SACvD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,KAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,KAKnD;IACC,MAAM,KAAK,GAAY;QACrB,GAAG,YAAY,CAAC;YACd,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,CAAC;KACH,CAAC;IAEF,uEAAuE;IACvE,+EAA+E;IAC/E,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IACvE,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,KAAK,CAAC,0BAA0B,CAAC,IAAI,CAAC,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAC3B,UAAiC,EACjC,KAAkF;IAElF,OAAO,KAAK,EAAE,SAAkB,EAAE,EAAE;QAClC,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEzD,MAAM,eAAe,GACnB,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI;YACjD,CAAC,CAAE,SAA+C;YAClD,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC;YACxC,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI,GAAG,EAAE;YAC/C,SAAS,EAAE,eAAe;YAC1B,QAAQ,EAAE,UAAU,CAAC,IAAI;SAC1B,CAAC,CAAC;QAEH,IAAI,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,qGAAqG,UAAU,CAAC,IAAI,oCAAoC,CACzJ,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}
|