@n8n/agents 0.6.0 → 0.7.1
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/build.tsbuildinfo +1 -1
- package/dist/index.d.ts +12 -8
- package/dist/index.js +10 -3
- package/dist/index.js.map +1 -1
- package/dist/integrations/langsmith.d.ts +2 -0
- package/dist/integrations/langsmith.js +117 -2
- package/dist/integrations/langsmith.js.map +1 -1
- package/dist/runtime/agent-runtime.d.ts +6 -7
- package/dist/runtime/agent-runtime.js +390 -204
- package/dist/runtime/agent-runtime.js.map +1 -1
- package/dist/runtime/event-bus.d.ts +1 -0
- package/dist/runtime/event-bus.js +3 -0
- package/dist/runtime/event-bus.js.map +1 -1
- package/dist/runtime/json-value.d.ts +2 -0
- package/dist/runtime/json-value.js +43 -0
- package/dist/runtime/json-value.js.map +1 -0
- package/dist/runtime/memory-store.d.ts +40 -2
- package/dist/runtime/memory-store.js +138 -3
- package/dist/runtime/memory-store.js.map +1 -1
- package/dist/runtime/message-list.d.ts +5 -0
- package/dist/runtime/message-list.js +47 -0
- package/dist/runtime/message-list.js.map +1 -1
- package/dist/runtime/messages.d.ts +0 -2
- package/dist/runtime/messages.js +127 -101
- package/dist/runtime/messages.js.map +1 -1
- package/dist/runtime/model-factory.js +117 -34
- package/dist/runtime/model-factory.js.map +1 -1
- package/dist/runtime/provider-credentials.d.ts +167 -0
- package/dist/runtime/provider-credentials.js +34 -0
- package/dist/runtime/provider-credentials.js.map +1 -0
- package/dist/runtime/runtime-helpers.d.ts +3 -4
- package/dist/runtime/runtime-helpers.js +6 -32
- package/dist/runtime/runtime-helpers.js.map +1 -1
- package/dist/runtime/stream.js +25 -43
- package/dist/runtime/stream.js.map +1 -1
- package/dist/runtime/strip-orphaned-tool-messages.js +1 -25
- package/dist/runtime/strip-orphaned-tool-messages.js.map +1 -1
- package/dist/runtime/title-generation.d.ts +12 -3
- package/dist/runtime/title-generation.js +72 -3
- package/dist/runtime/title-generation.js.map +1 -1
- package/dist/runtime/tool-adapter.d.ts +1 -1
- package/dist/runtime/tool-adapter.js +3 -2
- package/dist/runtime/tool-adapter.js.map +1 -1
- package/dist/runtime/working-memory.d.ts +1 -1
- package/dist/runtime/working-memory.js +1 -1
- package/dist/runtime/working-memory.js.map +1 -1
- package/dist/sdk/agent.d.ts +24 -23
- package/dist/sdk/agent.js +50 -324
- package/dist/sdk/agent.js.map +1 -1
- package/dist/sdk/eval.d.ts +0 -3
- package/dist/sdk/eval.js +4 -9
- package/dist/sdk/eval.js.map +1 -1
- package/dist/sdk/provider-capabilities.js +4 -2
- package/dist/sdk/provider-capabilities.js.map +1 -1
- package/dist/sdk/provider-tools.d.ts +17 -2
- package/dist/sdk/provider-tools.js +19 -0
- package/dist/sdk/provider-tools.js.map +1 -1
- package/dist/sdk/telemetry.d.ts +2 -0
- package/dist/sdk/telemetry.js +6 -0
- package/dist/sdk/telemetry.js.map +1 -1
- package/dist/sdk/tool.d.ts +17 -10
- package/dist/sdk/tool.js +34 -0
- package/dist/sdk/tool.js.map +1 -1
- package/dist/sdk/verify.js +1 -4
- package/dist/sdk/verify.js.map +1 -1
- package/dist/storage/base-memory.d.ts +64 -0
- package/dist/storage/base-memory.js +54 -0
- package/dist/storage/base-memory.js.map +1 -0
- package/dist/storage/postgres-memory.d.ts +33 -16
- package/dist/storage/postgres-memory.js +46 -25
- package/dist/storage/postgres-memory.js.map +1 -1
- package/dist/storage/sqlite-memory.d.ts +16 -6
- package/dist/storage/sqlite-memory.js +16 -10
- package/dist/storage/sqlite-memory.js.map +1 -1
- package/dist/types/index.d.ts +4 -2
- package/dist/types/index.js +3 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/runtime/event.d.ts +3 -9
- package/dist/types/runtime/event.js.map +1 -1
- package/dist/types/sdk/agent-builder.d.ts +0 -3
- package/dist/types/sdk/agent.d.ts +64 -27
- package/dist/types/sdk/credential-provider.d.ts +2 -3
- package/dist/types/sdk/memory.d.ts +23 -2
- package/dist/types/sdk/message.d.ts +11 -10
- package/dist/types/sdk/observation.d.ts +100 -0
- package/dist/types/sdk/observation.js +5 -0
- package/dist/types/sdk/observation.js.map +1 -0
- package/dist/types/sdk/tool-descriptor.d.ts +13 -0
- package/dist/types/sdk/{schema.js → tool-descriptor.js} +1 -1
- package/dist/types/sdk/tool-descriptor.js.map +1 -0
- package/dist/types/sdk/tool.d.ts +8 -3
- package/dist/types/telemetry.d.ts +1 -0
- package/dist/utils/parse.d.ts +10 -0
- package/dist/utils/parse.js +26 -0
- package/dist/utils/parse.js.map +1 -0
- package/dist/utils/zod.d.ts +1 -1
- package/dist/utils/zod.js.map +1 -1
- package/dist/workspace/tools/batch-str-replace-file.d.ts +3 -0
- package/dist/workspace/tools/batch-str-replace-file.js +67 -0
- package/dist/workspace/tools/batch-str-replace-file.js.map +1 -0
- package/dist/workspace/tools/str-replace-file.d.ts +3 -0
- package/dist/workspace/tools/str-replace-file.js +51 -0
- package/dist/workspace/tools/str-replace-file.js.map +1 -0
- package/dist/workspace/tools/workspace-tools.js +4 -0
- package/dist/workspace/tools/workspace-tools.js.map +1 -1
- package/package.json +17 -8
- package/dist/codegen/generate-agent-code.d.ts +0 -2
- package/dist/codegen/generate-agent-code.js +0 -197
- package/dist/codegen/generate-agent-code.js.map +0 -1
- package/dist/sdk/from-schema.d.ts +0 -15
- package/dist/sdk/from-schema.js +0 -218
- package/dist/sdk/from-schema.js.map +0 -1
- package/dist/types/sdk/schema.d.ts +0 -99
- package/dist/types/sdk/schema.js.map +0 -1
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const PROVIDER_CREDENTIAL_SCHEMAS: {
|
|
3
|
+
readonly openai: z.ZodObject<{
|
|
4
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
5
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
6
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
7
|
+
}, "strip", z.ZodTypeAny, {
|
|
8
|
+
apiKey?: string | undefined;
|
|
9
|
+
baseURL?: string | undefined;
|
|
10
|
+
headers?: Record<string, string> | undefined;
|
|
11
|
+
}, {
|
|
12
|
+
apiKey?: string | undefined;
|
|
13
|
+
baseURL?: string | undefined;
|
|
14
|
+
headers?: Record<string, string> | undefined;
|
|
15
|
+
}>;
|
|
16
|
+
readonly anthropic: z.ZodObject<{
|
|
17
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
18
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
19
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
20
|
+
}, "strip", z.ZodTypeAny, {
|
|
21
|
+
apiKey?: string | undefined;
|
|
22
|
+
baseURL?: string | undefined;
|
|
23
|
+
headers?: Record<string, string> | undefined;
|
|
24
|
+
}, {
|
|
25
|
+
apiKey?: string | undefined;
|
|
26
|
+
baseURL?: string | undefined;
|
|
27
|
+
headers?: Record<string, string> | undefined;
|
|
28
|
+
}>;
|
|
29
|
+
readonly google: z.ZodObject<{
|
|
30
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
31
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
32
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
33
|
+
}, "strip", z.ZodTypeAny, {
|
|
34
|
+
apiKey?: string | undefined;
|
|
35
|
+
baseURL?: string | undefined;
|
|
36
|
+
headers?: Record<string, string> | undefined;
|
|
37
|
+
}, {
|
|
38
|
+
apiKey?: string | undefined;
|
|
39
|
+
baseURL?: string | undefined;
|
|
40
|
+
headers?: Record<string, string> | undefined;
|
|
41
|
+
}>;
|
|
42
|
+
readonly xai: z.ZodObject<{
|
|
43
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
44
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
45
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
46
|
+
}, "strip", z.ZodTypeAny, {
|
|
47
|
+
apiKey?: string | undefined;
|
|
48
|
+
baseURL?: string | undefined;
|
|
49
|
+
headers?: Record<string, string> | undefined;
|
|
50
|
+
}, {
|
|
51
|
+
apiKey?: string | undefined;
|
|
52
|
+
baseURL?: string | undefined;
|
|
53
|
+
headers?: Record<string, string> | undefined;
|
|
54
|
+
}>;
|
|
55
|
+
readonly groq: z.ZodObject<{
|
|
56
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
57
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
58
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
59
|
+
}, "strip", z.ZodTypeAny, {
|
|
60
|
+
apiKey?: string | undefined;
|
|
61
|
+
baseURL?: string | undefined;
|
|
62
|
+
headers?: Record<string, string> | undefined;
|
|
63
|
+
}, {
|
|
64
|
+
apiKey?: string | undefined;
|
|
65
|
+
baseURL?: string | undefined;
|
|
66
|
+
headers?: Record<string, string> | undefined;
|
|
67
|
+
}>;
|
|
68
|
+
readonly deepseek: z.ZodObject<{
|
|
69
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
70
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
71
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
72
|
+
}, "strip", z.ZodTypeAny, {
|
|
73
|
+
apiKey?: string | undefined;
|
|
74
|
+
baseURL?: string | undefined;
|
|
75
|
+
headers?: Record<string, string> | undefined;
|
|
76
|
+
}, {
|
|
77
|
+
apiKey?: string | undefined;
|
|
78
|
+
baseURL?: string | undefined;
|
|
79
|
+
headers?: Record<string, string> | undefined;
|
|
80
|
+
}>;
|
|
81
|
+
readonly cohere: z.ZodObject<{
|
|
82
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
83
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
84
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
85
|
+
}, "strip", z.ZodTypeAny, {
|
|
86
|
+
apiKey?: string | undefined;
|
|
87
|
+
baseURL?: string | undefined;
|
|
88
|
+
headers?: Record<string, string> | undefined;
|
|
89
|
+
}, {
|
|
90
|
+
apiKey?: string | undefined;
|
|
91
|
+
baseURL?: string | undefined;
|
|
92
|
+
headers?: Record<string, string> | undefined;
|
|
93
|
+
}>;
|
|
94
|
+
readonly mistral: z.ZodObject<{
|
|
95
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
96
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
97
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
98
|
+
}, "strip", z.ZodTypeAny, {
|
|
99
|
+
apiKey?: string | undefined;
|
|
100
|
+
baseURL?: string | undefined;
|
|
101
|
+
headers?: Record<string, string> | undefined;
|
|
102
|
+
}, {
|
|
103
|
+
apiKey?: string | undefined;
|
|
104
|
+
baseURL?: string | undefined;
|
|
105
|
+
headers?: Record<string, string> | undefined;
|
|
106
|
+
}>;
|
|
107
|
+
readonly vercel: z.ZodObject<{
|
|
108
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
109
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
110
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
111
|
+
}, "strip", z.ZodTypeAny, {
|
|
112
|
+
apiKey?: string | undefined;
|
|
113
|
+
baseURL?: string | undefined;
|
|
114
|
+
headers?: Record<string, string> | undefined;
|
|
115
|
+
}, {
|
|
116
|
+
apiKey?: string | undefined;
|
|
117
|
+
baseURL?: string | undefined;
|
|
118
|
+
headers?: Record<string, string> | undefined;
|
|
119
|
+
}>;
|
|
120
|
+
readonly openrouter: z.ZodObject<{
|
|
121
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
122
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
123
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
124
|
+
}, "strip", z.ZodTypeAny, {
|
|
125
|
+
apiKey?: string | undefined;
|
|
126
|
+
baseURL?: string | undefined;
|
|
127
|
+
headers?: Record<string, string> | undefined;
|
|
128
|
+
}, {
|
|
129
|
+
apiKey?: string | undefined;
|
|
130
|
+
baseURL?: string | undefined;
|
|
131
|
+
headers?: Record<string, string> | undefined;
|
|
132
|
+
}>;
|
|
133
|
+
readonly 'azure-openai': z.ZodObject<{
|
|
134
|
+
apiKey: z.ZodOptional<z.ZodString>;
|
|
135
|
+
resourceName: z.ZodString;
|
|
136
|
+
apiVersion: z.ZodOptional<z.ZodString>;
|
|
137
|
+
baseURL: z.ZodOptional<z.ZodString>;
|
|
138
|
+
}, "strip", z.ZodTypeAny, {
|
|
139
|
+
resourceName: string;
|
|
140
|
+
apiKey?: string | undefined;
|
|
141
|
+
baseURL?: string | undefined;
|
|
142
|
+
apiVersion?: string | undefined;
|
|
143
|
+
}, {
|
|
144
|
+
resourceName: string;
|
|
145
|
+
apiKey?: string | undefined;
|
|
146
|
+
baseURL?: string | undefined;
|
|
147
|
+
apiVersion?: string | undefined;
|
|
148
|
+
}>;
|
|
149
|
+
readonly 'aws-bedrock': z.ZodObject<{
|
|
150
|
+
region: z.ZodString;
|
|
151
|
+
accessKeyId: z.ZodString;
|
|
152
|
+
secretAccessKey: z.ZodString;
|
|
153
|
+
sessionToken: z.ZodOptional<z.ZodString>;
|
|
154
|
+
}, "strip", z.ZodTypeAny, {
|
|
155
|
+
region: string;
|
|
156
|
+
accessKeyId: string;
|
|
157
|
+
secretAccessKey: string;
|
|
158
|
+
sessionToken?: string | undefined;
|
|
159
|
+
}, {
|
|
160
|
+
region: string;
|
|
161
|
+
accessKeyId: string;
|
|
162
|
+
secretAccessKey: string;
|
|
163
|
+
sessionToken?: string | undefined;
|
|
164
|
+
}>;
|
|
165
|
+
};
|
|
166
|
+
export type ProviderId = keyof typeof PROVIDER_CREDENTIAL_SCHEMAS;
|
|
167
|
+
export type ProviderCredentials<P extends ProviderId> = z.infer<(typeof PROVIDER_CREDENTIAL_SCHEMAS)[P]>;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PROVIDER_CREDENTIAL_SCHEMAS = void 0;
|
|
4
|
+
const zod_1 = require("zod");
|
|
5
|
+
const apiKeyCreds = zod_1.z.object({
|
|
6
|
+
apiKey: zod_1.z.string().optional(),
|
|
7
|
+
baseURL: zod_1.z.string().optional(),
|
|
8
|
+
headers: zod_1.z.record(zod_1.z.string(), zod_1.z.string()).optional(),
|
|
9
|
+
});
|
|
10
|
+
exports.PROVIDER_CREDENTIAL_SCHEMAS = {
|
|
11
|
+
openai: apiKeyCreds,
|
|
12
|
+
anthropic: apiKeyCreds,
|
|
13
|
+
google: apiKeyCreds,
|
|
14
|
+
xai: apiKeyCreds,
|
|
15
|
+
groq: apiKeyCreds,
|
|
16
|
+
deepseek: apiKeyCreds,
|
|
17
|
+
cohere: apiKeyCreds,
|
|
18
|
+
mistral: apiKeyCreds,
|
|
19
|
+
vercel: apiKeyCreds,
|
|
20
|
+
openrouter: apiKeyCreds,
|
|
21
|
+
'azure-openai': zod_1.z.object({
|
|
22
|
+
apiKey: zod_1.z.string().optional(),
|
|
23
|
+
resourceName: zod_1.z.string().min(1, 'Azure resourceName is required'),
|
|
24
|
+
apiVersion: zod_1.z.string().optional(),
|
|
25
|
+
baseURL: zod_1.z.string().optional(),
|
|
26
|
+
}),
|
|
27
|
+
'aws-bedrock': zod_1.z.object({
|
|
28
|
+
region: zod_1.z.string().min(1, 'AWS region is required'),
|
|
29
|
+
accessKeyId: zod_1.z.string().min(1, 'AWS accessKeyId is required'),
|
|
30
|
+
secretAccessKey: zod_1.z.string().min(1, 'AWS secretAccessKey is required'),
|
|
31
|
+
sessionToken: zod_1.z.string().optional(),
|
|
32
|
+
}),
|
|
33
|
+
};
|
|
34
|
+
//# sourceMappingURL=provider-credentials.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-credentials.js","sourceRoot":"","sources":["../../src/runtime/provider-credentials.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CACpD,CAAC,CAAC;AAMU,QAAA,2BAA2B,GAAG;IAC1C,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,WAAW;IACnB,GAAG,EAAE,WAAW;IAChB,IAAI,EAAE,WAAW;IACjB,QAAQ,EAAE,WAAW;IACrB,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,WAAW;IACpB,MAAM,EAAE,WAAW;IACnB,UAAU,EAAE,WAAW;IAEvB,cAAc,EAAE,OAAC,CAAC,MAAM,CAAC;QACxB,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC7B,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,gCAAgC,CAAC;QACjE,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACjC,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC9B,CAAC;IACF,aAAa,EAAE,OAAC,CAAC,MAAM,CAAC;QACvB,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,wBAAwB,CAAC;QACnD,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,6BAA6B,CAAC;QAC7D,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,iCAAiC,CAAC;QACrE,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KACnC,CAAC;CACO,CAAC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import type { GenerateResult, StreamChunk, TokenUsage } from '../types';
|
|
2
|
-
import type { AgentMessage,
|
|
2
|
+
import type { AgentMessage, ContentToolCall } from '../types/sdk/message';
|
|
3
3
|
export declare function normalizeInput(input: AgentMessage[] | string): AgentMessage[];
|
|
4
|
-
export declare function
|
|
5
|
-
export declare function
|
|
6
|
-
export declare function extractToolResults(messages: AgentMessage[]): ContentToolResult[];
|
|
4
|
+
export declare function stringifyError(error: unknown): string;
|
|
5
|
+
export declare function extractSettledToolCalls(messages: AgentMessage[]): ContentToolCall[];
|
|
7
6
|
export declare function makeErrorStream(error: unknown): ReadableStream<StreamChunk>;
|
|
8
7
|
export declare function mergeUsage(current: TokenUsage | undefined, next: TokenUsage | undefined): TokenUsage | undefined;
|
|
9
8
|
export declare function accumulateUsage(current: TokenUsage | undefined, raw: {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeInput = normalizeInput;
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
6
|
-
exports.extractToolResults = extractToolResults;
|
|
4
|
+
exports.stringifyError = stringifyError;
|
|
5
|
+
exports.extractSettledToolCalls = extractSettledToolCalls;
|
|
7
6
|
exports.makeErrorStream = makeErrorStream;
|
|
8
7
|
exports.mergeUsage = mergeUsage;
|
|
9
8
|
exports.accumulateUsage = accumulateUsage;
|
|
@@ -15,38 +14,13 @@ function normalizeInput(input) {
|
|
|
15
14
|
}
|
|
16
15
|
return input;
|
|
17
16
|
}
|
|
18
|
-
function
|
|
19
|
-
return {
|
|
20
|
-
role: 'tool',
|
|
21
|
-
content: [
|
|
22
|
-
{
|
|
23
|
-
type: 'tool-result',
|
|
24
|
-
toolCallId,
|
|
25
|
-
toolName,
|
|
26
|
-
result: result,
|
|
27
|
-
},
|
|
28
|
-
],
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
function makeErrorToolResultMessage(toolCallId, toolName, error) {
|
|
32
|
-
const message = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
|
|
33
|
-
return {
|
|
34
|
-
role: 'tool',
|
|
35
|
-
content: [
|
|
36
|
-
{
|
|
37
|
-
type: 'tool-result',
|
|
38
|
-
toolCallId,
|
|
39
|
-
toolName,
|
|
40
|
-
result: { error: message },
|
|
41
|
-
isError: true,
|
|
42
|
-
},
|
|
43
|
-
],
|
|
44
|
-
};
|
|
17
|
+
function stringifyError(error) {
|
|
18
|
+
return error instanceof Error ? `${error.name}: ${error.message}` : String(error);
|
|
45
19
|
}
|
|
46
|
-
function
|
|
20
|
+
function extractSettledToolCalls(messages) {
|
|
47
21
|
return messages
|
|
48
22
|
.flatMap((m) => ('content' in m ? m.content : []))
|
|
49
|
-
.filter((c) => c.type === 'tool-
|
|
23
|
+
.filter((c) => c.type === 'tool-call' && c.state !== 'pending');
|
|
50
24
|
}
|
|
51
25
|
function makeErrorStream(error) {
|
|
52
26
|
const { readable, writable } = new TransformStream();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-helpers.js","sourceRoot":"","sources":["../../src/runtime/runtime-helpers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"runtime-helpers.js","sourceRoot":"","sources":["../../src/runtime/runtime-helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime/stream.js
CHANGED
|
@@ -25,60 +25,42 @@ function toTokenUsage(usage) {
|
|
|
25
25
|
}
|
|
26
26
|
function convertChunk(c) {
|
|
27
27
|
switch (c.type) {
|
|
28
|
+
case 'start-step':
|
|
29
|
+
return { type: 'start-step' };
|
|
30
|
+
case 'finish-step':
|
|
31
|
+
return { type: 'finish-step' };
|
|
32
|
+
case 'text-start':
|
|
33
|
+
return { type: 'text-start', id: c.id };
|
|
28
34
|
case 'text-delta':
|
|
29
|
-
return { type: 'text-delta', delta: c.text ?? '' };
|
|
35
|
+
return { type: 'text-delta', id: c.id, delta: c.text ?? '' };
|
|
36
|
+
case 'text-end':
|
|
37
|
+
return { type: 'text-end', id: c.id };
|
|
38
|
+
case 'reasoning-start':
|
|
39
|
+
return { type: 'reasoning-start', id: c.id };
|
|
30
40
|
case 'reasoning-delta':
|
|
31
|
-
return { type: 'reasoning-delta', delta: c.text ?? '' };
|
|
32
|
-
case '
|
|
33
|
-
return {
|
|
34
|
-
type: 'message',
|
|
35
|
-
message: {
|
|
36
|
-
role: 'tool',
|
|
37
|
-
content: [
|
|
38
|
-
{
|
|
39
|
-
type: 'tool-call',
|
|
40
|
-
toolCallId: c.toolCallId,
|
|
41
|
-
toolName: c.toolName ?? '',
|
|
42
|
-
input: c.input,
|
|
43
|
-
},
|
|
44
|
-
],
|
|
45
|
-
},
|
|
46
|
-
};
|
|
41
|
+
return { type: 'reasoning-delta', id: c.id, delta: c.text ?? '' };
|
|
42
|
+
case 'reasoning-end':
|
|
43
|
+
return { type: 'reasoning-end', id: c.id };
|
|
47
44
|
case 'tool-input-start':
|
|
48
|
-
return {
|
|
49
|
-
type: 'tool-call-delta',
|
|
50
|
-
name: c.toolName,
|
|
51
|
-
};
|
|
45
|
+
return { type: 'tool-input-start', toolCallId: c.id, toolName: c.toolName };
|
|
52
46
|
case 'tool-input-delta':
|
|
47
|
+
return { type: 'tool-input-delta', toolCallId: c.id, delta: c.delta };
|
|
48
|
+
case 'tool-call':
|
|
53
49
|
return {
|
|
54
|
-
type: 'tool-call
|
|
55
|
-
|
|
50
|
+
type: 'tool-call',
|
|
51
|
+
toolCallId: c.toolCallId,
|
|
52
|
+
toolName: c.toolName ?? '',
|
|
53
|
+
input: c.input,
|
|
56
54
|
};
|
|
57
55
|
case 'tool-result':
|
|
58
56
|
return {
|
|
59
|
-
type: '
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
{
|
|
64
|
-
type: 'tool-result',
|
|
65
|
-
toolCallId: c.toolCallId ?? '',
|
|
66
|
-
toolName: c.toolName ?? '',
|
|
67
|
-
result: c.output && 'value' in c.output ? c.output.value : null,
|
|
68
|
-
},
|
|
69
|
-
],
|
|
70
|
-
},
|
|
57
|
+
type: 'tool-result',
|
|
58
|
+
toolCallId: c.toolCallId ?? '',
|
|
59
|
+
toolName: c.toolName ?? '',
|
|
60
|
+
output: c.output && 'value' in c.output ? c.output.value : null,
|
|
71
61
|
};
|
|
72
62
|
case 'error':
|
|
73
63
|
return { type: 'error', error: c.error };
|
|
74
|
-
case 'finish-step': {
|
|
75
|
-
const usage = toTokenUsage(c.usage);
|
|
76
|
-
return {
|
|
77
|
-
type: 'finish',
|
|
78
|
-
finishReason: (c.finishReason ?? 'stop'),
|
|
79
|
-
...(usage && { usage }),
|
|
80
|
-
};
|
|
81
|
-
}
|
|
82
64
|
case 'finish': {
|
|
83
65
|
const usage = toTokenUsage(c.totalUsage);
|
|
84
66
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/runtime/stream.ts"],"names":[],"mappings":";;AAMA,oCAiCC;
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/runtime/stream.ts"],"names":[],"mappings":";;AAMA,oCAiCC;AAKD,oCAiEC;AAvGD,SAAgB,YAAY,CAC3B,KAQY;IAEZ,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAE7B,MAAM,MAAM,GAAe;QAC1B,YAAY,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC;QACpC,gBAAgB,EAAE,KAAK,CAAC,YAAY,IAAI,CAAC;QACzC,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC;KACtF,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,CAAC,iBAAiB,EAAE,eAAe,CAAC;IAC3D,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;IAC7D,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,CAAC,iBAAiB,GAAG;YAC1B,GAAG,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;YAC/B,GAAG,CAAC,UAAU,IAAI,EAAE,UAAU,EAAE,CAAC;SACjC,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,kBAAkB,EAAE,eAAe,KAAK,SAAS,EAAE,CAAC;QAC7D,MAAM,CAAC,kBAAkB,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,kBAAkB,CAAC,eAAe,EAAE,CAAC;IACrF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAKD,SAAgB,YAAY,CAAC,CAA0B;IACtD,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,YAAY;YAChB,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QAE/B,KAAK,aAAa;YACjB,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;QAEhC,KAAK,YAAY;YAChB,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QAEzC,KAAK,YAAY;YAChB,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAE9D,KAAK,UAAU;YACd,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QAEvC,KAAK,iBAAiB;YACrB,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QAE9C,KAAK,iBAAiB;YACrB,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAEnE,KAAK,eAAe;YACnB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QAE5C,KAAK,kBAAkB;YAEtB,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE7E,KAAK,kBAAkB;YACtB,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAEvE,KAAK,WAAW;YACf,OAAO;gBACN,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;gBAC1B,KAAK,EAAE,CAAC,CAAC,KAAkB;aAC3B,CAAC;QAEH,KAAK,aAAa;YACjB,OAAO;gBACN,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;gBAE1B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,KAAmB,CAAC,CAAC,CAAC,IAAI;aAC9E,CAAC;QAEH,KAAK,OAAO;YACX,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAE1C,KAAK,QAAQ,CAAC,CAAC,CAAC;YACf,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACzC,OAAO;gBACN,IAAI,EAAE,QAAQ;gBACd,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,IAAI,MAAM,CAAiB;gBACxD,GAAG,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,CAAC;aACvB,CAAC;QACH,CAAC;QAED;YACC,OAAO,SAAS,CAAC;IACnB,CAAC;AACF,CAAC"}
|
|
@@ -3,25 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.stripOrphanedToolMessages = stripOrphanedToolMessages;
|
|
4
4
|
const message_1 = require("../sdk/message");
|
|
5
5
|
function stripOrphanedToolMessages(messages) {
|
|
6
|
-
const callIds = new Set();
|
|
7
|
-
const resultIds = new Set();
|
|
8
|
-
for (const msg of messages) {
|
|
9
|
-
if (!(0, message_1.isLlmMessage)(msg))
|
|
10
|
-
continue;
|
|
11
|
-
for (const block of msg.content) {
|
|
12
|
-
if (block.type === 'tool-call' && block.toolCallId) {
|
|
13
|
-
callIds.add(block.toolCallId);
|
|
14
|
-
}
|
|
15
|
-
else if (block.type === 'tool-result' && block.toolCallId) {
|
|
16
|
-
resultIds.add(block.toolCallId);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
const orphanedCallIds = new Set([...callIds].filter((id) => !resultIds.has(id)));
|
|
21
|
-
const orphanedResultIds = new Set([...resultIds].filter((id) => !callIds.has(id)));
|
|
22
|
-
if (orphanedCallIds.size === 0 && orphanedResultIds.size === 0) {
|
|
23
|
-
return messages;
|
|
24
|
-
}
|
|
25
6
|
const result = [];
|
|
26
7
|
for (const msg of messages) {
|
|
27
8
|
if (!(0, message_1.isLlmMessage)(msg)) {
|
|
@@ -29,12 +10,7 @@ function stripOrphanedToolMessages(messages) {
|
|
|
29
10
|
continue;
|
|
30
11
|
}
|
|
31
12
|
const filtered = msg.content.filter((block) => {
|
|
32
|
-
if (block.type === 'tool-call' && block.
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
if (block.type === 'tool-result' &&
|
|
36
|
-
block.toolCallId &&
|
|
37
|
-
orphanedResultIds.has(block.toolCallId)) {
|
|
13
|
+
if (block.type === 'tool-call' && block.state === 'pending') {
|
|
38
14
|
return false;
|
|
39
15
|
}
|
|
40
16
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strip-orphaned-tool-messages.js","sourceRoot":"","sources":["../../src/runtime/strip-orphaned-tool-messages.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"strip-orphaned-tool-messages.js","sourceRoot":"","sources":["../../src/runtime/strip-orphaned-tool-messages.ts"],"names":[],"mappings":";;AAYA,8DAsBC;AAlCD,4CAA8C;AAY9C,SAAgB,yBAAyB,CAAyB,QAAa;IAC9E,MAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,SAAS;QACV,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAqB,EAAE,EAAE;YAC7D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAEpC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
import { type LanguageModel } from 'ai';
|
|
2
|
-
import type { BuiltMemory, TitleGenerationConfig } from '../types';
|
|
2
|
+
import type { BuiltMemory, BuiltTelemetry, TitleGenerationConfig } from '../types';
|
|
3
3
|
import type { ModelConfig } from '../types/sdk/agent';
|
|
4
4
|
import type { AgentDbMessage } from '../types/sdk/message';
|
|
5
|
-
|
|
5
|
+
interface GenerateTitleFromMessageOptions {
|
|
6
6
|
instructions?: string;
|
|
7
|
-
|
|
7
|
+
telemetry?: BuiltTelemetry;
|
|
8
|
+
}
|
|
9
|
+
export declare function generateTitleFromMessage(model: LanguageModel, userMessage: string, opts?: GenerateTitleFromMessageOptions): Promise<string | null>;
|
|
10
|
+
export declare function generateTitleAndEmojiFromMessage(model: LanguageModel, userMessage: string, opts?: {
|
|
11
|
+
instructions?: string;
|
|
12
|
+
}): Promise<{
|
|
13
|
+
title: string;
|
|
14
|
+
emoji?: string;
|
|
15
|
+
} | null>;
|
|
8
16
|
export declare function generateThreadTitle(opts: {
|
|
9
17
|
memory: BuiltMemory;
|
|
10
18
|
threadId: string;
|
|
@@ -13,3 +21,4 @@ export declare function generateThreadTitle(opts: {
|
|
|
13
21
|
agentModel: ModelConfig;
|
|
14
22
|
turnDelta: AgentDbMessage[];
|
|
15
23
|
}): Promise<void>;
|
|
24
|
+
export {};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateTitleFromMessage = generateTitleFromMessage;
|
|
4
|
+
exports.generateTitleAndEmojiFromMessage = generateTitleAndEmojiFromMessage;
|
|
4
5
|
exports.generateThreadTitle = generateThreadTitle;
|
|
5
6
|
const ai_1 = require("ai");
|
|
6
7
|
const logger_1 = require("./logger");
|
|
@@ -30,9 +31,33 @@ const DEFAULT_TITLE_INSTRUCTIONS = [
|
|
|
30
31
|
'Message: "Build a workflow with a manual trigger that queries Scryfall for a random card"',
|
|
31
32
|
'Title: Scryfall random card workflow',
|
|
32
33
|
].join('\n');
|
|
34
|
+
const DEFAULT_TITLE_AND_EMOJI_INSTRUCTIONS = [
|
|
35
|
+
'Generate a short title and a single emoji for a conversation based on the user message.',
|
|
36
|
+
'Respond with ONLY a JSON object: {"title": "...", "emoji": "..."}',
|
|
37
|
+
'Rules:',
|
|
38
|
+
'- Title: 2 to 6 words, max 50 characters, sentence case',
|
|
39
|
+
'- Title must not contain emoji, quotes, colons, or markdown formatting',
|
|
40
|
+
'- Emoji: exactly one emoji that represents the topic',
|
|
41
|
+
'- Respond with the JSON object only, no other text',
|
|
42
|
+
].join('\n');
|
|
33
43
|
const TRIVIAL_MESSAGE_MAX_CHARS = 15;
|
|
34
44
|
const TRIVIAL_MESSAGE_MAX_WORDS = 3;
|
|
35
45
|
const MAX_TITLE_LENGTH = 80;
|
|
46
|
+
function buildTelemetryOptions(telemetry) {
|
|
47
|
+
if (!telemetry?.enabled)
|
|
48
|
+
return {};
|
|
49
|
+
return {
|
|
50
|
+
experimental_telemetry: {
|
|
51
|
+
isEnabled: true,
|
|
52
|
+
functionId: telemetry.functionId ?? 'title-generation',
|
|
53
|
+
metadata: telemetry.metadata,
|
|
54
|
+
recordInputs: telemetry.recordInputs,
|
|
55
|
+
recordOutputs: telemetry.recordOutputs,
|
|
56
|
+
tracer: telemetry.tracer,
|
|
57
|
+
integrations: telemetry.integrations.length > 0 ? telemetry.integrations : undefined,
|
|
58
|
+
},
|
|
59
|
+
};
|
|
60
|
+
}
|
|
36
61
|
function isTrivialMessage(message) {
|
|
37
62
|
const normalized = message.trim();
|
|
38
63
|
if (normalized.length <= TRIVIAL_MESSAGE_MAX_CHARS)
|
|
@@ -77,6 +102,7 @@ async function generateTitleFromMessage(model, userMessage, opts) {
|
|
|
77
102
|
content: `Generate a title for the following first message of a conversation. Do not answer the message — only produce the title.\n\n<message>\n${trimmed}\n</message>`,
|
|
78
103
|
},
|
|
79
104
|
],
|
|
105
|
+
...buildTelemetryOptions(opts?.telemetry),
|
|
80
106
|
});
|
|
81
107
|
const raw = result.text?.trim();
|
|
82
108
|
if (!raw)
|
|
@@ -84,6 +110,47 @@ async function generateTitleFromMessage(model, userMessage, opts) {
|
|
|
84
110
|
const title = sanitizeTitle(raw);
|
|
85
111
|
return title || null;
|
|
86
112
|
}
|
|
113
|
+
async function generateTitleAndEmojiFromMessage(model, userMessage, opts) {
|
|
114
|
+
const trimmed = userMessage.trim();
|
|
115
|
+
if (!trimmed)
|
|
116
|
+
return null;
|
|
117
|
+
if (isTrivialMessage(trimmed)) {
|
|
118
|
+
return null;
|
|
119
|
+
}
|
|
120
|
+
const result = await (0, ai_1.generateText)({
|
|
121
|
+
model,
|
|
122
|
+
messages: [
|
|
123
|
+
{ role: 'system', content: opts?.instructions ?? DEFAULT_TITLE_AND_EMOJI_INSTRUCTIONS },
|
|
124
|
+
{ role: 'user', content: trimmed },
|
|
125
|
+
],
|
|
126
|
+
});
|
|
127
|
+
let text = result.text?.trim();
|
|
128
|
+
if (!text)
|
|
129
|
+
return null;
|
|
130
|
+
text = text.replace(/<think>[\s\S]*?<\/think>/g, '').trim();
|
|
131
|
+
if (!text)
|
|
132
|
+
return null;
|
|
133
|
+
let rawTitle = '';
|
|
134
|
+
let emoji;
|
|
135
|
+
const jsonMatch = /\{[\s\S]*\}/.exec(text);
|
|
136
|
+
if (jsonMatch) {
|
|
137
|
+
try {
|
|
138
|
+
const parsed = JSON.parse(jsonMatch[0]);
|
|
139
|
+
rawTitle = parsed.title?.trim() ?? '';
|
|
140
|
+
emoji = parsed.emoji?.trim() ?? undefined;
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
rawTitle = text;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
rawTitle = text;
|
|
148
|
+
}
|
|
149
|
+
const title = sanitizeTitle(rawTitle);
|
|
150
|
+
if (!title)
|
|
151
|
+
return null;
|
|
152
|
+
return { title, emoji };
|
|
153
|
+
}
|
|
87
154
|
async function generateThreadTitle(opts) {
|
|
88
155
|
try {
|
|
89
156
|
const thread = await opts.memory.getThread(opts.threadId);
|
|
@@ -100,16 +167,18 @@ async function generateThreadTitle(opts) {
|
|
|
100
167
|
return;
|
|
101
168
|
const titleModelId = opts.titleConfig.model ?? opts.agentModel;
|
|
102
169
|
const titleModel = (0, model_factory_1.createModel)(titleModelId);
|
|
103
|
-
const
|
|
170
|
+
const generated = await generateTitleAndEmojiFromMessage(titleModel, userText, {
|
|
104
171
|
instructions: opts.titleConfig.instructions,
|
|
105
172
|
});
|
|
106
|
-
if (!
|
|
173
|
+
if (!generated)
|
|
107
174
|
return;
|
|
175
|
+
const { title, emoji } = generated;
|
|
176
|
+
const metadata = { ...(thread?.metadata ?? {}), ...(emoji && { emoji }) };
|
|
108
177
|
await opts.memory.saveThread({
|
|
109
178
|
id: opts.threadId,
|
|
110
179
|
resourceId: opts.resourceId,
|
|
111
180
|
title,
|
|
112
|
-
metadata
|
|
181
|
+
metadata,
|
|
113
182
|
});
|
|
114
183
|
}
|
|
115
184
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"title-generation.js","sourceRoot":"","sources":["../../src/runtime/title-generation.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"title-generation.js","sourceRoot":"","sources":["../../src/runtime/title-generation.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export declare function isAgentToolResult(value: unknown): value is AgentToolRes
|
|
|
17
17
|
export declare function createAgentToolResult(output: unknown, subAgentUsage: SubAgentUsage[]): never;
|
|
18
18
|
export declare function toAiSdkProviderTools(tools?: BuiltProviderTool[]): Record<string, AiSdkTool>;
|
|
19
19
|
export declare function toAiSdkTools(tools?: BuiltTool[]): Record<string, AiSdkTool>;
|
|
20
|
-
export declare function executeTool(args: unknown, builtTool: BuiltTool, resumeData?: unknown, parentTelemetry?: BuiltTelemetry): Promise<unknown>;
|
|
20
|
+
export declare function executeTool(args: unknown, builtTool: BuiltTool, resumeData?: unknown, parentTelemetry?: BuiltTelemetry, toolCallId?: string): Promise<unknown>;
|
|
21
21
|
export declare function isInterruptible(toolName: string, toolMap: Map<string, BuiltTool>): boolean;
|
|
22
22
|
export declare function buildToolMap(tools?: BuiltTool[]): Map<string, BuiltTool>;
|
|
23
23
|
export {};
|
|
@@ -71,7 +71,7 @@ function toAiSdkTools(tools) {
|
|
|
71
71
|
}
|
|
72
72
|
return result;
|
|
73
73
|
}
|
|
74
|
-
async function executeTool(args, builtTool, resumeData, parentTelemetry) {
|
|
74
|
+
async function executeTool(args, builtTool, resumeData, parentTelemetry, toolCallId) {
|
|
75
75
|
if (!builtTool.handler) {
|
|
76
76
|
throw new Error(`No handler found for tool "${builtTool.name}"`);
|
|
77
77
|
}
|
|
@@ -82,10 +82,11 @@ async function executeTool(args, builtTool, resumeData, parentTelemetry) {
|
|
|
82
82
|
},
|
|
83
83
|
resumeData,
|
|
84
84
|
parentTelemetry,
|
|
85
|
+
toolCallId,
|
|
85
86
|
};
|
|
86
87
|
return await builtTool.handler(args, ctx);
|
|
87
88
|
}
|
|
88
|
-
const ctx = { parentTelemetry };
|
|
89
|
+
const ctx = { parentTelemetry, toolCallId };
|
|
89
90
|
return await builtTool.handler(args, ctx);
|
|
90
91
|
}
|
|
91
92
|
function isInterruptible(toolName, toolMap) {
|