@ai-sdk/workflow 2.0.59 → 2.0.61
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/CHANGELOG.md +28 -0
- package/README.md +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +42 -38
- package/dist/index.js.map +1 -1
- package/package.json +5 -5
- package/src/build-model-step-result.ts +18 -10
- package/src/do-stream-step.ts +4 -0
- package/src/model-call.ts +8 -0
- package/src/serializable-schema.ts +33 -26
- package/src/workflow-agent.ts +12 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,33 @@
|
|
|
1
1
|
# @ai-sdk/workflow
|
|
2
2
|
|
|
3
|
+
## 2.0.61
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 758b092: fix(workflow): accept common tool JSON Schema dialects and annotations
|
|
8
|
+
- cd41d05: fix(workflow): report measured performance for streamed agent steps
|
|
9
|
+
- Updated dependencies [fc1e19e]
|
|
10
|
+
- Updated dependencies [e37d213]
|
|
11
|
+
- Updated dependencies [5094ebd]
|
|
12
|
+
- Updated dependencies [73d8343]
|
|
13
|
+
- Updated dependencies [268225c]
|
|
14
|
+
- Updated dependencies [d83366e]
|
|
15
|
+
- Updated dependencies [34905a2]
|
|
16
|
+
- Updated dependencies [16ab882]
|
|
17
|
+
- Updated dependencies [f810ea3]
|
|
18
|
+
- Updated dependencies [19a127b]
|
|
19
|
+
- Updated dependencies [0af2f7c]
|
|
20
|
+
- Updated dependencies [4c6979c]
|
|
21
|
+
- @ai-sdk/provider-utils@5.0.55
|
|
22
|
+
- ai@7.0.129
|
|
23
|
+
- @ai-sdk/provider@4.0.23
|
|
24
|
+
|
|
25
|
+
## 2.0.60
|
|
26
|
+
|
|
27
|
+
### Patch Changes
|
|
28
|
+
|
|
29
|
+
- d9e04cb: fix(workflow): reuse persisted tool denial results during approval resumption
|
|
30
|
+
|
|
3
31
|
## 2.0.59
|
|
4
32
|
|
|
5
33
|
### Patch Changes
|
package/README.md
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","names":["CoreTelemetryOptions","SandboxSession","ToolCallRepairFunction"],"sources":["../src/model-call.ts","../src/types.ts","../src/workflow-agent.ts","../src/to-ui-message-chunk.ts","../src/normalize-ui-message-stream.ts"],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","names":["CoreTelemetryOptions","SandboxSession","ToolCallRepairFunction"],"sources":["../src/model-call.ts","../src/types.ts","../src/workflow-agent.ts","../src/to-ui-message-chunk.ts","../src/normalize-ui-message-stream.ts"],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -4,6 +4,7 @@ import { DefaultGeneratedFile, InvalidToolApprovalSignatureError, NoOutputGenera
|
|
|
4
4
|
import { DefaultGenerateTextResult, DefaultStepResult, addLanguageModelUsage, asLanguageModelUsage, calculateTokensPerSecond, collectToolApprovals, convertLanguageModelContent, convertToLanguageModelPrompt, createDefaultDownloadFunction, createNullLanguageModelUsage, createRestrictedTelemetryDispatcher, createToolModelOutput, createToolSearchState, downloadAssets, mapToolResultOutput, mergeAbortSignals, mergeCallbacks, parseToolCall, prepareLanguageModelCallOptions, prepareRetries, prepareToolChoice, prepareTools, resolveLanguageModel, signToolApproval, standardizePrompt, validateApprovedToolApprovals, verifyToolApprovalSignature } from "ai/internal";
|
|
5
5
|
import { getWorkflowMetadata } from "workflow";
|
|
6
6
|
import Ajv from "ajv";
|
|
7
|
+
import Ajv2020 from "ajv/dist/2020.js";
|
|
7
8
|
//#region src/add-tool-results-to-conversation.ts
|
|
8
9
|
function addToolResultsToConversation({ messages, toolResults, providerExecutedToolCallIds, providerExecutedToolResultPositions = [] }) {
|
|
9
10
|
const providerResultIds = /* @__PURE__ */ new Set([...providerExecutedToolCallIds, ...providerExecutedToolResultPositions.map((position) => position.toolCallId)]);
|
|
@@ -213,7 +214,7 @@ async function buildModelStepResult(raw, toolCalls, finish, providerExecutedTool
|
|
|
213
214
|
}
|
|
214
215
|
});
|
|
215
216
|
}
|
|
216
|
-
const { content: rawContent, reasoning: reasoningParts, responseMetadata, warnings } = raw;
|
|
217
|
+
const { content: rawContent, reasoning: reasoningParts, performance: modelCallPerformance, responseMetadata, warnings } = raw;
|
|
217
218
|
const reasoningText = reasoningParts.map((r) => r.text).join("") || void 0;
|
|
218
219
|
const validToolCallsByIndex = new Map(toolCalls.flatMap((tc, index) => tc.invalid ? [] : [[index, {
|
|
219
220
|
type: "tool-call",
|
|
@@ -352,7 +353,7 @@ async function buildModelStepResult(raw, toolCalls, finish, providerExecutedTool
|
|
|
352
353
|
},
|
|
353
354
|
totalTokens: 0
|
|
354
355
|
},
|
|
355
|
-
performance: {
|
|
356
|
+
performance: modelCallPerformance == null ? {
|
|
356
357
|
effectiveOutputTokensPerSecond: 0,
|
|
357
358
|
outputTokensPerSecond: void 0,
|
|
358
359
|
inputTokensPerSecond: void 0,
|
|
@@ -361,6 +362,10 @@ async function buildModelStepResult(raw, toolCalls, finish, providerExecutedTool
|
|
|
361
362
|
responseTimeMs: 0,
|
|
362
363
|
toolExecutionMs: {},
|
|
363
364
|
timeToFirstOutputMs: void 0
|
|
365
|
+
} : {
|
|
366
|
+
...modelCallPerformance,
|
|
367
|
+
stepTimeMs: modelCallPerformance.responseTimeMs,
|
|
368
|
+
toolExecutionMs: {}
|
|
364
369
|
},
|
|
365
370
|
warnings,
|
|
366
371
|
request: {
|
|
@@ -427,7 +432,26 @@ function resolveToolDescription({ tool, toolName, toolsContext, experimental_san
|
|
|
427
432
|
* equivalent to using zod schemas directly with the AI SDK.
|
|
428
433
|
*/
|
|
429
434
|
function resolveSerializableTools(tools) {
|
|
430
|
-
const
|
|
435
|
+
const ajvOptions = {
|
|
436
|
+
strict: false,
|
|
437
|
+
validateFormats: false
|
|
438
|
+
};
|
|
439
|
+
const ajv = new Ajv(ajvOptions);
|
|
440
|
+
const ajv2020 = new Ajv2020(ajvOptions);
|
|
441
|
+
const createValidatedInputSchema = (inputSchema) => {
|
|
442
|
+
const schemaAjv = (typeof inputSchema.$schema === "string" ? inputSchema.$schema.replace(/#$/, "") : void 0) === "https://json-schema.org/draft/2020-12/schema" ? ajv2020 : ajv;
|
|
443
|
+
const validateFn = schemaAjv.compile(inputSchema);
|
|
444
|
+
return jsonSchema(inputSchema, { validate: (value) => {
|
|
445
|
+
if (validateFn(value)) return {
|
|
446
|
+
success: true,
|
|
447
|
+
value
|
|
448
|
+
};
|
|
449
|
+
return {
|
|
450
|
+
success: false,
|
|
451
|
+
error: new Error(schemaAjv.errorsText(validateFn.errors))
|
|
452
|
+
};
|
|
453
|
+
} });
|
|
454
|
+
};
|
|
431
455
|
return Object.fromEntries(Object.entries(tools).map(([name, t]) => {
|
|
432
456
|
if (t.type === "provider") {
|
|
433
457
|
const providerTool = {
|
|
@@ -448,25 +472,12 @@ function resolveSerializableTools(tools) {
|
|
|
448
472
|
isProviderExecuted: false
|
|
449
473
|
})];
|
|
450
474
|
}
|
|
451
|
-
if (t.type === "dynamic") {
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
inputSchema: jsonSchema(t.inputSchema, { validate: (value) => {
|
|
458
|
-
if (validateFn(value)) return {
|
|
459
|
-
success: true,
|
|
460
|
-
value
|
|
461
|
-
};
|
|
462
|
-
return {
|
|
463
|
-
success: false,
|
|
464
|
-
error: new Error(ajv.errorsText(validateFn.errors))
|
|
465
|
-
};
|
|
466
|
-
} })
|
|
467
|
-
})];
|
|
468
|
-
}
|
|
469
|
-
const validateFn = ajv.compile(t.inputSchema);
|
|
475
|
+
if (t.type === "dynamic") return [name, dynamicTool({
|
|
476
|
+
description: t.description,
|
|
477
|
+
inputExamples: t.inputExamples,
|
|
478
|
+
providerOptions: t.providerOptions,
|
|
479
|
+
inputSchema: createValidatedInputSchema(t.inputSchema)
|
|
480
|
+
})];
|
|
470
481
|
const functionTool = {
|
|
471
482
|
title: t.title,
|
|
472
483
|
metadata: t.metadata,
|
|
@@ -474,16 +485,7 @@ function resolveSerializableTools(tools) {
|
|
|
474
485
|
strict: t.strict,
|
|
475
486
|
inputExamples: t.inputExamples,
|
|
476
487
|
providerOptions: t.providerOptions,
|
|
477
|
-
inputSchema:
|
|
478
|
-
if (validateFn(value)) return {
|
|
479
|
-
success: true,
|
|
480
|
-
value
|
|
481
|
-
};
|
|
482
|
-
return {
|
|
483
|
-
success: false,
|
|
484
|
-
error: new Error(ajv.errorsText(validateFn.errors))
|
|
485
|
-
};
|
|
486
|
-
} })
|
|
488
|
+
inputSchema: createValidatedInputSchema(t.inputSchema)
|
|
487
489
|
};
|
|
488
490
|
return [name, t.type === "dynamic" ? tool({
|
|
489
491
|
...functionTool,
|
|
@@ -707,6 +709,7 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
|
|
|
707
709
|
const reasoningPartIndexes = /* @__PURE__ */ new Map();
|
|
708
710
|
let responseMetadata;
|
|
709
711
|
let warnings;
|
|
712
|
+
let performance;
|
|
710
713
|
let terminalError;
|
|
711
714
|
let hasTerminalError = false;
|
|
712
715
|
const ongoingToolCallToolNames = /* @__PURE__ */ new Map();
|
|
@@ -871,6 +874,7 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
|
|
|
871
874
|
usage: part.usage,
|
|
872
875
|
providerMetadata: part.providerMetadata
|
|
873
876
|
};
|
|
877
|
+
performance = part.performance;
|
|
874
878
|
break;
|
|
875
879
|
case "model-call-start":
|
|
876
880
|
warnings = part.warnings;
|
|
@@ -905,6 +909,7 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
|
|
|
905
909
|
content,
|
|
906
910
|
reasoning: reasoningParts,
|
|
907
911
|
responseMetadata,
|
|
912
|
+
performance,
|
|
908
913
|
warnings
|
|
909
914
|
},
|
|
910
915
|
providerExecutedToolResults,
|
|
@@ -1659,7 +1664,8 @@ var WorkflowAgent = class {
|
|
|
1659
1664
|
toolName: collected.toolCall.toolName,
|
|
1660
1665
|
input: collected.toolCall.input,
|
|
1661
1666
|
reason: collected.approvalResponse.reason,
|
|
1662
|
-
providerExecuted: collected.toolCall.providerExecuted === true
|
|
1667
|
+
providerExecuted: collected.toolCall.providerExecuted === true,
|
|
1668
|
+
existingToolResult: collected.existingToolResult
|
|
1663
1669
|
}));
|
|
1664
1670
|
const providerExecutedApprovalIds = new Set([...collectedApprovals.approvedToolApprovals, ...collectedApprovals.deniedToolApprovals].filter((collected) => collected.toolCall.providerExecuted === true).map((collected) => collected.approvalResponse.approvalId));
|
|
1665
1671
|
if (approvedToolApprovals.length > 0 || deniedToolApprovals.length > 0) {
|
|
@@ -1744,7 +1750,7 @@ var WorkflowAgent = class {
|
|
|
1744
1750
|
}
|
|
1745
1751
|
}
|
|
1746
1752
|
for (const denial of deniedToolApprovals) {
|
|
1747
|
-
if (denial.providerExecuted) continue;
|
|
1753
|
+
if (denial.providerExecuted || denial.existingToolResult !== void 0) continue;
|
|
1748
1754
|
toolResultContent.push({
|
|
1749
1755
|
type: "tool-result",
|
|
1750
1756
|
toolCallId: denial.toolCallId,
|
|
@@ -1785,10 +1791,8 @@ var WorkflowAgent = class {
|
|
|
1785
1791
|
content: toolResultContent
|
|
1786
1792
|
});
|
|
1787
1793
|
prompt.messages = cleanedMessages;
|
|
1788
|
-
|
|
1789
|
-
|
|
1790
|
-
await writeApprovalToolResults(options.writable, approvedRawResults, deniedResults);
|
|
1791
|
-
}
|
|
1794
|
+
const deniedResults = deniedToolApprovals.filter((denial) => !denial.providerExecuted).map((denial) => ({ toolCallId: denial.toolCallId }));
|
|
1795
|
+
if (options.writable && (toolResultContent.length > 0 || deniedResults.length > 0)) await writeApprovalToolResults(options.writable, approvedRawResults, deniedResults);
|
|
1792
1796
|
}
|
|
1793
1797
|
const modelPrompt = await convertToLanguageModelPrompt({
|
|
1794
1798
|
prompt,
|