@n8n/agents 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/codegen/generate-agent-code.d.ts +2 -0
- package/dist/codegen/generate-agent-code.js +197 -0
- package/dist/codegen/generate-agent-code.js.map +1 -0
- package/dist/index.d.ts +7 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/runtime/agent-runtime.d.ts +2 -2
- package/dist/runtime/agent-runtime.js +7 -11
- package/dist/runtime/agent-runtime.js.map +1 -1
- package/dist/runtime/memory-store.d.ts +3 -3
- package/dist/runtime/memory-store.js +2 -4
- package/dist/runtime/memory-store.js.map +1 -1
- package/dist/runtime/message-list.d.ts +8 -4
- package/dist/runtime/message-list.js +49 -6
- package/dist/runtime/message-list.js.map +1 -1
- package/dist/runtime/messages.d.ts +3 -3
- package/dist/runtime/messages.js +1 -2
- package/dist/runtime/messages.js.map +1 -1
- package/dist/runtime/runtime-helpers.d.ts +5 -5
- package/dist/runtime/runtime-helpers.js +6 -7
- package/dist/runtime/runtime-helpers.js.map +1 -1
- package/dist/runtime/strip-orphaned-tool-messages.d.ts +2 -2
- package/dist/runtime/strip-orphaned-tool-messages.js.map +1 -1
- package/dist/runtime/title-generation.js +10 -3
- package/dist/runtime/title-generation.js.map +1 -1
- package/dist/sdk/agent.d.ts +12 -1
- package/dist/sdk/agent.js +201 -1
- package/dist/sdk/agent.js.map +1 -1
- package/dist/sdk/eval.js +6 -0
- package/dist/sdk/eval.js.map +1 -1
- package/dist/sdk/from-schema.d.ts +15 -0
- package/dist/sdk/from-schema.js +218 -0
- package/dist/sdk/from-schema.js.map +1 -0
- package/dist/sdk/mcp-client.d.ts +1 -0
- package/dist/sdk/mcp-client.js +3 -0
- package/dist/sdk/mcp-client.js.map +1 -1
- package/dist/sdk/message.d.ts +2 -2
- package/dist/sdk/message.js +14 -5
- package/dist/sdk/message.js.map +1 -1
- package/dist/sdk/provider-capabilities.d.ts +10 -0
- package/dist/sdk/provider-capabilities.js +26 -0
- package/dist/sdk/provider-capabilities.js.map +1 -0
- package/dist/sdk/tool.js +2 -1
- package/dist/sdk/tool.js.map +1 -1
- package/dist/sdk/verify.js +0 -11
- package/dist/sdk/verify.js.map +1 -1
- package/dist/storage/postgres-memory.d.ts +2 -2
- package/dist/storage/postgres-memory.js +4 -5
- package/dist/storage/postgres-memory.js.map +1 -1
- package/dist/storage/sqlite-memory.d.ts +2 -2
- package/dist/storage/sqlite-memory.js +4 -5
- package/dist/storage/sqlite-memory.js.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/sdk/agent-builder.d.ts +25 -0
- package/dist/types/sdk/agent-builder.js +3 -0
- package/dist/types/sdk/agent-builder.js.map +1 -0
- package/dist/types/sdk/credential-provider.d.ts +13 -0
- package/dist/types/sdk/credential-provider.js +3 -0
- package/dist/types/sdk/credential-provider.js.map +1 -0
- package/dist/types/sdk/eval.d.ts +3 -0
- package/dist/types/sdk/handler-executor.d.ts +12 -0
- package/dist/types/sdk/handler-executor.js +3 -0
- package/dist/types/sdk/handler-executor.js.map +1 -0
- package/dist/types/sdk/memory.d.ts +3 -3
- package/dist/types/sdk/message.d.ts +1 -0
- package/dist/types/sdk/schema.d.ts +99 -0
- package/dist/types/sdk/schema.js +3 -0
- package/dist/types/sdk/schema.js.map +1 -0
- package/dist/types/sdk/tool.d.ts +1 -0
- package/dist/utils/zod.d.ts +1 -0
- package/dist/utils/zod.js +24 -1
- package/dist/utils/zod.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ProviderOptions } from '@ai-sdk/provider-utils';
|
|
2
2
|
import type { ModelMessage } from 'ai';
|
|
3
3
|
import type { SerializedMessageList } from '../types/runtime/message-list';
|
|
4
|
-
import type { AgentDbMessage } from '../types/sdk/message';
|
|
4
|
+
import type { AgentDbMessage, AgentMessage } from '../types/sdk/message';
|
|
5
5
|
export type { SerializedMessageList };
|
|
6
6
|
export interface WorkingMemoryContext {
|
|
7
7
|
template: string;
|
|
@@ -13,10 +13,14 @@ export declare class AgentMessageList {
|
|
|
13
13
|
private historySet;
|
|
14
14
|
private inputSet;
|
|
15
15
|
private responseSet;
|
|
16
|
+
private lastCreatedAt;
|
|
17
|
+
private addMessage;
|
|
18
|
+
private createdAtSortKey;
|
|
19
|
+
private sortAllByCreatedAt;
|
|
16
20
|
workingMemory: WorkingMemoryContext | undefined;
|
|
17
|
-
addHistory(messages: AgentDbMessage[]): void;
|
|
18
|
-
addInput(messages: AgentDbMessage[]): void;
|
|
19
|
-
addResponse(messages: AgentDbMessage[]): void;
|
|
21
|
+
addHistory(messages: AgentMessage[] | AgentDbMessage[]): void;
|
|
22
|
+
addInput(messages: AgentMessage[] | AgentDbMessage[]): void;
|
|
23
|
+
addResponse(messages: AgentMessage[] | AgentDbMessage[]): void;
|
|
20
24
|
forLlm(baseInstructions: string, instructionProviderOptions?: ProviderOptions): ModelMessage[];
|
|
21
25
|
turnDelta(): AgentDbMessage[];
|
|
22
26
|
responseDelta(): AgentDbMessage[];
|
|
@@ -11,24 +11,66 @@ class AgentMessageList {
|
|
|
11
11
|
this.historySet = new Set();
|
|
12
12
|
this.inputSet = new Set();
|
|
13
13
|
this.responseSet = new Set();
|
|
14
|
+
this.lastCreatedAt = 0;
|
|
15
|
+
}
|
|
16
|
+
addMessage(message, source) {
|
|
17
|
+
const id = 'id' in message && typeof message.id === 'string' ? message.id : crypto.randomUUID();
|
|
18
|
+
const existing = (0, message_1.getCreatedAt)(message);
|
|
19
|
+
let createdAt;
|
|
20
|
+
if (existing !== null && source === 'history') {
|
|
21
|
+
createdAt = existing;
|
|
22
|
+
this.lastCreatedAt = Math.max(this.lastCreatedAt, createdAt.getTime());
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
const hint = existing !== null ? existing.getTime() : Date.now();
|
|
26
|
+
const ts = Math.max(hint, this.lastCreatedAt + 1);
|
|
27
|
+
createdAt = new Date(ts);
|
|
28
|
+
this.lastCreatedAt = ts;
|
|
29
|
+
}
|
|
30
|
+
const dbMsg = { ...message, id, createdAt };
|
|
31
|
+
this.all.push(dbMsg);
|
|
32
|
+
return dbMsg;
|
|
33
|
+
}
|
|
34
|
+
createdAtSortKey(m) {
|
|
35
|
+
const t = m.createdAt instanceof Date ? m.createdAt.getTime() : new Date(m.createdAt).getTime();
|
|
36
|
+
return Number.isFinite(t) ? t : Number.POSITIVE_INFINITY;
|
|
37
|
+
}
|
|
38
|
+
sortAllByCreatedAt() {
|
|
39
|
+
this.all.sort((a, b) => {
|
|
40
|
+
const ta = this.createdAtSortKey(a);
|
|
41
|
+
const tb = this.createdAtSortKey(b);
|
|
42
|
+
if (ta !== tb)
|
|
43
|
+
return ta < tb ? -1 : 1;
|
|
44
|
+
return a.id.localeCompare(b.id);
|
|
45
|
+
});
|
|
46
|
+
let max = 0;
|
|
47
|
+
for (const m of this.all) {
|
|
48
|
+
const t = m.createdAt instanceof Date ? m.createdAt.getTime() : new Date(m.createdAt).getTime();
|
|
49
|
+
if (Number.isFinite(t) && t > max)
|
|
50
|
+
max = t;
|
|
51
|
+
}
|
|
52
|
+
this.lastCreatedAt = max;
|
|
14
53
|
}
|
|
15
54
|
addHistory(messages) {
|
|
16
55
|
for (const m of messages) {
|
|
17
|
-
this.
|
|
18
|
-
this.historySet.add(
|
|
56
|
+
const dbMsg = this.addMessage(m, 'history');
|
|
57
|
+
this.historySet.add(dbMsg);
|
|
19
58
|
}
|
|
59
|
+
this.sortAllByCreatedAt();
|
|
20
60
|
}
|
|
21
61
|
addInput(messages) {
|
|
22
62
|
for (const m of messages) {
|
|
23
|
-
this.
|
|
24
|
-
this.inputSet.add(
|
|
63
|
+
const dbMsg = this.addMessage(m, 'input');
|
|
64
|
+
this.inputSet.add(dbMsg);
|
|
25
65
|
}
|
|
66
|
+
this.sortAllByCreatedAt();
|
|
26
67
|
}
|
|
27
68
|
addResponse(messages) {
|
|
28
69
|
for (const m of messages) {
|
|
29
|
-
this.
|
|
30
|
-
this.responseSet.add(
|
|
70
|
+
const dbMsg = this.addMessage(m, 'response');
|
|
71
|
+
this.responseSet.add(dbMsg);
|
|
31
72
|
}
|
|
73
|
+
this.sortAllByCreatedAt();
|
|
32
74
|
}
|
|
33
75
|
forLlm(baseInstructions, instructionProviderOptions) {
|
|
34
76
|
let systemPrompt = baseInstructions;
|
|
@@ -72,6 +114,7 @@ class AgentMessageList {
|
|
|
72
114
|
if (responseIdSet.has(m.id))
|
|
73
115
|
list.responseSet.add(m);
|
|
74
116
|
}
|
|
117
|
+
list.sortAllByCreatedAt();
|
|
75
118
|
return list;
|
|
76
119
|
}
|
|
77
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-list.js","sourceRoot":"","sources":["../../src/runtime/message-list.ts"],"names":[],"mappings":";;;AAGA,yCAA0C;AAC1C,iFAA2E;AAC3E,qDAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"message-list.js","sourceRoot":"","sources":["../../src/runtime/message-list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { ModelMessage, FinishReason as AiFinishReason } from 'ai';
|
|
2
2
|
import type { FinishReason } from '../types';
|
|
3
|
-
import type {
|
|
3
|
+
import type { AgentMessage, Message } from '../types/sdk/message';
|
|
4
4
|
export declare function toAiMessage(msg: Message): ModelMessage;
|
|
5
5
|
export declare function toAiMessages(messages: Message[]): ModelMessage[];
|
|
6
|
-
export declare function fromAiMessage(msg: ModelMessage):
|
|
7
|
-
export declare function fromAiMessages(messages: ModelMessage[]):
|
|
6
|
+
export declare function fromAiMessage(msg: ModelMessage): AgentMessage;
|
|
7
|
+
export declare function fromAiMessages(messages: ModelMessage[]): AgentMessage[];
|
|
8
8
|
export declare function fromAiFinishReason(reason: AiFinishReason): FinishReason;
|
package/dist/runtime/messages.js
CHANGED
|
@@ -5,7 +5,6 @@ exports.toAiMessages = toAiMessages;
|
|
|
5
5
|
exports.fromAiMessage = fromAiMessage;
|
|
6
6
|
exports.fromAiMessages = fromAiMessages;
|
|
7
7
|
exports.fromAiFinishReason = fromAiFinishReason;
|
|
8
|
-
const message_1 = require("../sdk/message");
|
|
9
8
|
function isText(block) {
|
|
10
9
|
return block.type === 'text';
|
|
11
10
|
}
|
|
@@ -215,7 +214,7 @@ function fromAiMessage(msg) {
|
|
|
215
214
|
if ('providerOptions' in msg && msg.providerOptions) {
|
|
216
215
|
message.providerOptions = msg.providerOptions;
|
|
217
216
|
}
|
|
218
|
-
return
|
|
217
|
+
return message;
|
|
219
218
|
}
|
|
220
219
|
function fromAiMessages(messages) {
|
|
221
220
|
return messages.map(fromAiMessage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/runtime/messages.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/runtime/messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { GenerateResult, StreamChunk, TokenUsage } from '../types';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function normalizeInput(input: AgentMessage[] | string):
|
|
4
|
-
export declare function makeToolResultMessage(toolCallId: string, toolName: string, result: unknown):
|
|
5
|
-
export declare function makeErrorToolResultMessage(toolCallId: string, toolName: string, error: unknown):
|
|
6
|
-
export declare function extractToolResults(messages:
|
|
2
|
+
import type { AgentMessage, ContentToolResult } from '../types/sdk/message';
|
|
3
|
+
export declare function normalizeInput(input: AgentMessage[] | string): AgentMessage[];
|
|
4
|
+
export declare function makeToolResultMessage(toolCallId: string, toolName: string, result: unknown): AgentMessage;
|
|
5
|
+
export declare function makeErrorToolResultMessage(toolCallId: string, toolName: string, error: unknown): AgentMessage;
|
|
6
|
+
export declare function extractToolResults(messages: AgentMessage[]): ContentToolResult[];
|
|
7
7
|
export declare function makeErrorStream(error: unknown): ReadableStream<StreamChunk>;
|
|
8
8
|
export declare function mergeUsage(current: TokenUsage | undefined, next: TokenUsage | undefined): TokenUsage | undefined;
|
|
9
9
|
export declare function accumulateUsage(current: TokenUsage | undefined, raw: {
|
|
@@ -8,16 +8,15 @@ exports.makeErrorStream = makeErrorStream;
|
|
|
8
8
|
exports.mergeUsage = mergeUsage;
|
|
9
9
|
exports.accumulateUsage = accumulateUsage;
|
|
10
10
|
exports.applySubAgentUsage = applySubAgentUsage;
|
|
11
|
-
const message_1 = require("../sdk/message");
|
|
12
11
|
const stream_1 = require("./stream");
|
|
13
12
|
function normalizeInput(input) {
|
|
14
13
|
if (typeof input === 'string') {
|
|
15
|
-
return [
|
|
14
|
+
return [{ role: 'user', content: [{ type: 'text', text: input }] }];
|
|
16
15
|
}
|
|
17
|
-
return input
|
|
16
|
+
return input;
|
|
18
17
|
}
|
|
19
18
|
function makeToolResultMessage(toolCallId, toolName, result) {
|
|
20
|
-
return
|
|
19
|
+
return {
|
|
21
20
|
role: 'tool',
|
|
22
21
|
content: [
|
|
23
22
|
{
|
|
@@ -27,11 +26,11 @@ function makeToolResultMessage(toolCallId, toolName, result) {
|
|
|
27
26
|
result: result,
|
|
28
27
|
},
|
|
29
28
|
],
|
|
30
|
-
}
|
|
29
|
+
};
|
|
31
30
|
}
|
|
32
31
|
function makeErrorToolResultMessage(toolCallId, toolName, error) {
|
|
33
32
|
const message = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
|
|
34
|
-
return
|
|
33
|
+
return {
|
|
35
34
|
role: 'tool',
|
|
36
35
|
content: [
|
|
37
36
|
{
|
|
@@ -42,7 +41,7 @@ function makeErrorToolResultMessage(toolCallId, toolName, error) {
|
|
|
42
41
|
isError: true,
|
|
43
42
|
},
|
|
44
43
|
],
|
|
45
|
-
}
|
|
44
|
+
};
|
|
46
45
|
}
|
|
47
46
|
function extractToolResults(messages) {
|
|
48
47
|
return messages
|
|
@@ -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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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function stripOrphanedToolMessages(messages:
|
|
1
|
+
import type { AgentMessage } from '../types/sdk/message';
|
|
2
|
+
export declare function stripOrphanedToolMessages<T extends AgentMessage>(messages: T[]): T[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strip-orphaned-tool-messages.js","sourceRoot":"","sources":["../../src/runtime/strip-orphaned-tool-messages.ts"],"names":[],"mappings":";;AAmBA,8DAkDC;AArED,4CAA8C;AAmB9C,SAAgB,yBAAyB,
|
|
1
|
+
{"version":3,"file":"strip-orphaned-tool-messages.js","sourceRoot":"","sources":["../../src/runtime/strip-orphaned-tool-messages.ts"],"names":[],"mappings":";;AAmBA,8DAkDC;AArED,4CAA8C;AAmB9C,SAAgB,yBAAyB,CAAyB,QAAa;IAC9E,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAA,sBAAY,EAAC,GAAG,CAAC;YAAE,SAAS;QACjC,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACpD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBAC7D,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEnF,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,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,UAAU,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7F,OAAO,KAAK,CAAC;YACd,CAAC;YACD,IACC,KAAK,CAAC,IAAI,KAAK,aAAa;gBAC5B,KAAK,CAAC,UAAU;gBAChB,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EACtC,CAAC;gBACF,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"}
|
|
@@ -7,10 +7,11 @@ const model_factory_1 = require("./model-factory");
|
|
|
7
7
|
const logger = (0, logger_1.createFilteredLogger)();
|
|
8
8
|
const DEFAULT_TITLE_INSTRUCTIONS = [
|
|
9
9
|
'- you will generate a short title based on the first message a user begins a conversation with',
|
|
10
|
-
'- ensure it is not more than 80 characters long',
|
|
11
10
|
"- the title should be a summary of the user's message",
|
|
12
|
-
'-
|
|
13
|
-
'-
|
|
11
|
+
'- 1 to 5 words, no more than 80 characters',
|
|
12
|
+
'- use sentence case (e.g. "Conversation title" instead of "Conversation Title")',
|
|
13
|
+
'- do not use quotes, colons, or markdown formatting',
|
|
14
|
+
'- the entire text you return will be used directly as the title, so respond with the title only',
|
|
14
15
|
].join('\n');
|
|
15
16
|
async function generateThreadTitle(opts) {
|
|
16
17
|
try {
|
|
@@ -40,6 +41,12 @@ async function generateThreadTitle(opts) {
|
|
|
40
41
|
if (!title)
|
|
41
42
|
return;
|
|
42
43
|
title = title.replace(/<think>[\s\S]*?<\/think>/g, '').trim();
|
|
44
|
+
if (!title)
|
|
45
|
+
return;
|
|
46
|
+
title = title
|
|
47
|
+
.replace(/^#{1,6}\s+/, '')
|
|
48
|
+
.replace(/\*+/g, '')
|
|
49
|
+
.trim();
|
|
43
50
|
if (!title)
|
|
44
51
|
return;
|
|
45
52
|
await opts.memory.saveThread({
|
|
@@ -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":";;AA0BA,kDA0DC;AApFD,2BAAkC;AAGlC,qCAAgD;AAChD,mDAA8C;AAI9C,MAAM,MAAM,GAAG,IAAA,6BAAoB,GAAE,CAAC;AAEtC,MAAM,0BAA0B,GAAG;IAClC,gGAAgG;IAChG,uDAAuD;IACvD,4CAA4C;IAC5C,iFAAiF;IACjF,qDAAqD;IACrD,iGAAiG;CACjG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AASN,KAAK,UAAU,mBAAmB,CAAC,IASzC;IACA,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE,KAAK;YAAE,OAAO;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QACjF,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,IAAI,WAAW,CAAC;YAAE,OAAO;QAExD,MAAM,QAAQ,GAAI,WAAW,CAAC,OAAkD;aAC9E,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC;aAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAK,CAAC;aACnB,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC;QAC/D,MAAM,UAAU,GAAG,IAAA,2BAAW,EAAC,YAAY,CAAC,CAAC;QAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,0BAA0B,CAAC;QAEjF,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAY,EAAC;YACjC,KAAK,EAAE,UAAU;YACjB,QAAQ,EAAE;gBACT,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE;gBACzC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;aACnC;SACD,CAAC,CAAC;QAEH,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK;YAAE,OAAO;QAGnB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9D,IAAI,CAAC,KAAK;YAAE,OAAO;QAGnB,KAAK,GAAG,KAAK;aACX,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;aACzB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;aACnB,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YAC5B,EAAE,EAAE,IAAI,CAAC,QAAQ;YACjB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK;YACL,QAAQ,EAAE,MAAM,EAAE,QAAQ;SAC1B,CAAC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,CAAC;AACF,CAAC"}
|
package/dist/sdk/agent.d.ts
CHANGED
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
import type { ProviderOptions } from '@ai-sdk/provider-utils';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import type { Eval } from './eval';
|
|
4
|
+
import { type FromSchemaOptions } from './from-schema';
|
|
4
5
|
import type { McpClient } from './mcp-client';
|
|
5
6
|
import { Memory } from './memory';
|
|
6
7
|
import { Telemetry } from './telemetry';
|
|
7
8
|
import { AgentRuntime } from '../runtime/agent-runtime';
|
|
8
9
|
import type { AgentEvent, AgentEventHandler, AgentMiddleware, BuiltAgent, BuiltEval, BuiltGuardrail, BuiltMemory, BuiltProviderTool, BuiltTool, BuiltTelemetry, CheckpointStore, ExecutionOptions, GenerateResult, MemoryConfig, ModelConfig, Provider, RunOptions, SerializableAgentState, StreamResult, ThinkingConfigFor, ResumeOptions } from '../types';
|
|
10
|
+
import type { AgentBuilder } from '../types/sdk/agent-builder';
|
|
11
|
+
import type { CredentialProvider } from '../types/sdk/credential-provider';
|
|
9
12
|
import type { AgentMessage } from '../types/sdk/message';
|
|
13
|
+
import type { AgentSchema } from '../types/sdk/schema';
|
|
10
14
|
import type { Workspace } from '../workspace/workspace';
|
|
11
15
|
type ToolParameter = BuiltTool | {
|
|
12
16
|
build(): BuiltTool;
|
|
13
17
|
};
|
|
14
|
-
export declare class Agent implements BuiltAgent {
|
|
18
|
+
export declare class Agent implements BuiltAgent, AgentBuilder {
|
|
15
19
|
readonly name: string;
|
|
16
20
|
private modelId?;
|
|
17
21
|
private modelConfigObj?;
|
|
@@ -27,6 +31,7 @@ export declare class Agent implements BuiltAgent {
|
|
|
27
31
|
private checkpointStore?;
|
|
28
32
|
private thinkingConfig?;
|
|
29
33
|
private credentialName?;
|
|
34
|
+
private credProvider?;
|
|
30
35
|
private resolvedKey?;
|
|
31
36
|
private runtime?;
|
|
32
37
|
private concurrencyValue?;
|
|
@@ -39,12 +44,16 @@ export declare class Agent implements BuiltAgent {
|
|
|
39
44
|
private eventBus;
|
|
40
45
|
private workspaceInstance?;
|
|
41
46
|
constructor(name: string);
|
|
47
|
+
static fromSchema(schema: AgentSchema, name: string, options: FromSchemaOptions): Promise<Agent>;
|
|
48
|
+
hasCheckpointStorage(): boolean;
|
|
49
|
+
hasMemory(): boolean;
|
|
42
50
|
model(providerOrIdOrConfig: string | ModelConfig, modelName?: string): this;
|
|
43
51
|
instructions(text: string, options?: {
|
|
44
52
|
providerOptions?: ProviderOptions;
|
|
45
53
|
}): this;
|
|
46
54
|
tool(t: ToolParameter | ToolParameter[]): this;
|
|
47
55
|
providerTool(builtProviderTool: BuiltProviderTool): this;
|
|
56
|
+
get declaredTools(): BuiltTool[];
|
|
48
57
|
memory(m: MemoryConfig | Memory | BuiltMemory): this;
|
|
49
58
|
middleware(m: AgentMiddleware): this;
|
|
50
59
|
inputGuardrail(g: BuiltGuardrail | {
|
|
@@ -58,6 +67,7 @@ export declare class Agent implements BuiltAgent {
|
|
|
58
67
|
}): this;
|
|
59
68
|
checkpoint(storage: 'memory' | CheckpointStore): this;
|
|
60
69
|
credential(name: string): this;
|
|
70
|
+
credentialProvider(provider: CredentialProvider): this;
|
|
61
71
|
protected get declaredCredential(): string | undefined;
|
|
62
72
|
protected set resolvedApiKey(key: string);
|
|
63
73
|
structuredOutput(schema: z.ZodType): this;
|
|
@@ -71,6 +81,7 @@ export declare class Agent implements BuiltAgent {
|
|
|
71
81
|
get evaluations(): BuiltEval[];
|
|
72
82
|
on(event: AgentEvent, handler: AgentEventHandler): void;
|
|
73
83
|
asTool(description: string): BuiltTool;
|
|
84
|
+
describe(): AgentSchema;
|
|
74
85
|
getState(): SerializableAgentState;
|
|
75
86
|
abort(): void;
|
|
76
87
|
generate(input: AgentMessage[] | string, options?: RunOptions & ExecutionOptions): Promise<GenerateResult>;
|