@usestratus/sdk 0.14.0 → 1.0.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/azure/chat-completions-model.d.ts.map +1 -1
- package/dist/azure/chat-completions-model.js +30 -2
- package/dist/azure/chat-completions-model.js.map +1 -1
- package/dist/azure/responses-model.d.ts.map +1 -1
- package/dist/azure/responses-model.js +89 -11
- package/dist/azure/responses-model.js.map +1 -1
- package/dist/core/builtin-tools.d.ts +1 -0
- package/dist/core/builtin-tools.d.ts.map +1 -1
- package/dist/core/builtin-tools.js.map +1 -1
- package/dist/core/index.d.ts +9 -6
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +5 -3
- package/dist/core/index.js.map +1 -1
- package/dist/core/mcp-client.d.ts +57 -0
- package/dist/core/mcp-client.d.ts.map +1 -0
- package/dist/core/mcp-client.js +181 -0
- package/dist/core/mcp-client.js.map +1 -0
- package/dist/core/memory-store.d.ts +9 -0
- package/dist/core/memory-store.d.ts.map +1 -0
- package/dist/core/memory-store.js +16 -0
- package/dist/core/memory-store.js.map +1 -0
- package/dist/core/model.d.ts +15 -0
- package/dist/core/model.d.ts.map +1 -1
- package/dist/core/result.d.ts +24 -0
- package/dist/core/result.d.ts.map +1 -1
- package/dist/core/result.js +18 -0
- package/dist/core/result.js.map +1 -1
- package/dist/core/run.d.ts +12 -2
- package/dist/core/run.d.ts.map +1 -1
- package/dist/core/run.js +267 -13
- package/dist/core/run.js.map +1 -1
- package/dist/core/session.d.ts +32 -0
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +37 -2
- package/dist/core/session.js.map +1 -1
- package/dist/core/subagent.d.ts.map +1 -1
- package/dist/core/subagent.js +26 -2
- package/dist/core/subagent.js.map +1 -1
- package/dist/core/tool.d.ts +18 -0
- package/dist/core/tool.d.ts.map +1 -1
- package/dist/core/tool.js +3 -1
- package/dist/core/tool.js.map +1 -1
- package/dist/core/types.d.ts +19 -1
- package/dist/core/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAS,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAE5C,OAAO,KAAK,EACX,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAExF,MAAM,WAAW,aAAa,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,GAAG,SAAS;IACrE,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;IACpC,eAAe,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC7C,gBAAgB,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC/C,KAAK,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC9B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACtD,mBAAmB,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACrD,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACvD,eAAe,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"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"}
|
package/dist/core/session.js
CHANGED
|
@@ -15,13 +15,15 @@ export class Session {
|
|
|
15
15
|
_toolInputGuardrails;
|
|
16
16
|
_toolOutputGuardrails;
|
|
17
17
|
_resetToolChoice;
|
|
18
|
+
_store;
|
|
19
|
+
_onStateChange;
|
|
18
20
|
_messages = [];
|
|
19
21
|
_resultPromise = null;
|
|
20
22
|
_streaming = false;
|
|
21
23
|
_closed = false;
|
|
22
24
|
_started = false;
|
|
23
25
|
constructor(config, restore) {
|
|
24
|
-
this.id = restore?.id ?? crypto.randomUUID();
|
|
26
|
+
this.id = restore?.id ?? config.sessionId ?? crypto.randomUUID();
|
|
25
27
|
this._context = config.context;
|
|
26
28
|
this._maxTurns = config.maxTurns;
|
|
27
29
|
this._costEstimator = config.costEstimator;
|
|
@@ -33,6 +35,8 @@ export class Session {
|
|
|
33
35
|
this._toolInputGuardrails = config.toolInputGuardrails ?? [];
|
|
34
36
|
this._toolOutputGuardrails = config.toolOutputGuardrails ?? [];
|
|
35
37
|
this._resetToolChoice = config.resetToolChoice;
|
|
38
|
+
this._store = config.store;
|
|
39
|
+
this._onStateChange = config.onStateChange;
|
|
36
40
|
this._agent = new Agent({
|
|
37
41
|
name: "session_agent",
|
|
38
42
|
model: config.model,
|
|
@@ -54,7 +58,9 @@ export class Session {
|
|
|
54
58
|
send(message) {
|
|
55
59
|
if (this._closed)
|
|
56
60
|
throw new StratusError("Session is closed");
|
|
57
|
-
|
|
61
|
+
const msg = { role: "user", content: message };
|
|
62
|
+
this._messages.push(msg);
|
|
63
|
+
this._onStateChange?.({ type: "message_added", message: msg });
|
|
58
64
|
this._resultPromise = null;
|
|
59
65
|
}
|
|
60
66
|
stream(options) {
|
|
@@ -94,6 +100,7 @@ export class Session {
|
|
|
94
100
|
}
|
|
95
101
|
async *_streamInternal(signal) {
|
|
96
102
|
this._streaming = true;
|
|
103
|
+
this._onStateChange?.({ type: "stream_start" });
|
|
97
104
|
// Fire onSessionStart on first stream
|
|
98
105
|
if (!this._started) {
|
|
99
106
|
this._started = true;
|
|
@@ -101,6 +108,7 @@ export class Session {
|
|
|
101
108
|
await this._hooks.onSessionStart({ context: this._context });
|
|
102
109
|
}
|
|
103
110
|
}
|
|
111
|
+
let streamError = false;
|
|
104
112
|
try {
|
|
105
113
|
const { stream: s, result: resultPromise } = coreStream(this._agent, [...this._messages], {
|
|
106
114
|
context: this._context,
|
|
@@ -116,7 +124,14 @@ export class Session {
|
|
|
116
124
|
resetToolChoice: this._resetToolChoice,
|
|
117
125
|
});
|
|
118
126
|
this._resultPromise = resultPromise.then((result) => {
|
|
127
|
+
const oldLength = this._messages.length;
|
|
119
128
|
this._messages = result.messages.filter((m) => m.role !== "system");
|
|
129
|
+
// Emit message_added for new messages beyond what we already had
|
|
130
|
+
if (this._onStateChange) {
|
|
131
|
+
for (let i = oldLength; i < this._messages.length; i++) {
|
|
132
|
+
this._onStateChange({ type: "message_added", message: this._messages[i] });
|
|
133
|
+
}
|
|
134
|
+
}
|
|
120
135
|
return result;
|
|
121
136
|
});
|
|
122
137
|
// Prevent unhandled rejection if user doesn't await .result
|
|
@@ -126,8 +141,22 @@ export class Session {
|
|
|
126
141
|
}
|
|
127
142
|
await this._resultPromise;
|
|
128
143
|
}
|
|
144
|
+
catch (err) {
|
|
145
|
+
streamError = true;
|
|
146
|
+
throw err;
|
|
147
|
+
}
|
|
129
148
|
finally {
|
|
130
149
|
this._streaming = false;
|
|
150
|
+
try {
|
|
151
|
+
if (!streamError && this._store && !this._closed) {
|
|
152
|
+
await this._store.save(this.id, this.save());
|
|
153
|
+
this._onStateChange?.({ type: "saved", sessionId: this.id });
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
catch {
|
|
157
|
+
// Don't let save failures prevent stream_end
|
|
158
|
+
}
|
|
159
|
+
this._onStateChange?.({ type: "stream_end" });
|
|
131
160
|
// Fire onSessionEnd in finally
|
|
132
161
|
if (this._hooks?.onSessionEnd) {
|
|
133
162
|
await this._hooks.onSessionEnd({ context: this._context });
|
|
@@ -149,6 +178,12 @@ export function forkSession(snapshot, config) {
|
|
|
149
178
|
messages: structuredClone(snapshot.messages),
|
|
150
179
|
});
|
|
151
180
|
}
|
|
181
|
+
export async function loadSession(store, sessionId, config) {
|
|
182
|
+
const snapshot = await store.load(sessionId);
|
|
183
|
+
if (!snapshot)
|
|
184
|
+
return undefined;
|
|
185
|
+
return resumeSession(snapshot, { ...config, store });
|
|
186
|
+
}
|
|
152
187
|
export async function prompt(input, config) {
|
|
153
188
|
const session = createSession(config);
|
|
154
189
|
session.send(input);
|
package/dist/core/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAwC,MAAM,SAAS,CAAC;AAEtE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAWxC,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../src/core/subagent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,KAAK,EAAE,YAAY,EAAsB,MAAM,QAAQ,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAG9C,MAAM,WAAW,cAAc,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,YAAY,GAAG,SAAS;IACpF,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,MAAM,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,QAAQ,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,YAAY,GAAG,SAAS;IAC9E,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,MAAM,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,wBAAgB,QAAQ,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,YAAY,GAAG,SAAS,EAC7E,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,GACnD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAYzC;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,GAAG,cAAc,CASjE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../src/core/subagent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,KAAK,EAAE,YAAY,EAAsB,MAAM,QAAQ,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAG9C,MAAM,WAAW,cAAc,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,YAAY,GAAG,SAAS;IACpF,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,MAAM,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,QAAQ,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,YAAY,GAAG,SAAS;IAC9E,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,MAAM,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAED,wBAAgB,QAAQ,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,YAAY,GAAG,SAAS,EAC7E,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,GACnD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAYzC;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,GAAG,cAAc,CASjE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CA0DzF"}
|
package/dist/core/subagent.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { run } from "./run";
|
|
1
|
+
import { stream, run } from "./run";
|
|
2
2
|
import { zodToJsonSchema } from "./utils/zod";
|
|
3
3
|
export function subagent(config) {
|
|
4
4
|
return {
|
|
@@ -33,18 +33,42 @@ export function subagentToTool(sa) {
|
|
|
33
33
|
const childInput = sa.mapInput(params);
|
|
34
34
|
const childContext = sa.mapContext ? sa.mapContext(parentContext) : undefined;
|
|
35
35
|
const model = sa.model ?? sa.agent.model;
|
|
36
|
+
const agentName = sa.agent.name;
|
|
36
37
|
try {
|
|
38
|
+
if (options?.onStreamEvent) {
|
|
39
|
+
const emit = options.onStreamEvent;
|
|
40
|
+
emit({ type: "subagent_start", agentName });
|
|
41
|
+
const { stream: childStream, result: resultPromise } = stream(sa.agent, childInput, {
|
|
42
|
+
context: childContext,
|
|
43
|
+
model,
|
|
44
|
+
maxTurns: sa.maxTurns,
|
|
45
|
+
signal: options?.signal,
|
|
46
|
+
});
|
|
47
|
+
// Prevent unhandled rejection if the stream throws before we await resultPromise
|
|
48
|
+
resultPromise.catch(() => { });
|
|
49
|
+
for await (const event of childStream) {
|
|
50
|
+
if (event.type === "content_delta") {
|
|
51
|
+
emit({ type: "subagent_delta", agentName, content: event.content });
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
const result = await resultPromise;
|
|
55
|
+
emit({ type: "subagent_end", agentName, result: result.output });
|
|
56
|
+
return result.output;
|
|
57
|
+
}
|
|
37
58
|
const result = await run(sa.agent, childInput, {
|
|
38
59
|
context: childContext,
|
|
39
60
|
model,
|
|
40
61
|
maxTurns: sa.maxTurns,
|
|
41
62
|
signal: options?.signal,
|
|
42
63
|
});
|
|
64
|
+
if (result.interrupted) {
|
|
65
|
+
return `Sub-agent "${agentName}" was interrupted waiting for tool approval`;
|
|
66
|
+
}
|
|
43
67
|
return result.output;
|
|
44
68
|
}
|
|
45
69
|
catch (error) {
|
|
46
70
|
const message = error instanceof Error ? error.message : String(error);
|
|
47
|
-
return `Error in sub-agent "${
|
|
71
|
+
return `Error in sub-agent "${agentName}": ${message}`;
|
|
48
72
|
}
|
|
49
73
|
},
|
|
50
74
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../src/core/subagent.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../src/core/subagent.ts"],"names":[],"mappings":"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"}
|
package/dist/core/tool.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { z } from "zod";
|
|
|
2
2
|
import type { ToolDefinition } from "./types";
|
|
3
3
|
export interface ToolExecuteOptions {
|
|
4
4
|
signal?: AbortSignal;
|
|
5
|
+
onStreamEvent?: (event: import("./model").StreamEvent) => void;
|
|
5
6
|
}
|
|
6
7
|
export interface FunctionTool<TParams = any, TContext = any> {
|
|
7
8
|
type: "function";
|
|
@@ -13,6 +14,21 @@ export interface FunctionTool<TParams = any, TContext = any> {
|
|
|
13
14
|
timeout?: number;
|
|
14
15
|
/** If false or returns false, the tool is excluded from the tools list sent to the LLM. */
|
|
15
16
|
isEnabled?: boolean | ((context: TContext) => boolean | Promise<boolean>);
|
|
17
|
+
/** If true or returns true, the run loop pauses for approval before executing this tool. */
|
|
18
|
+
needsApproval?: boolean | ((params: TParams, context: TContext) => boolean | Promise<boolean>);
|
|
19
|
+
/** Retry configuration for transient tool failures. */
|
|
20
|
+
retries?: {
|
|
21
|
+
/** Maximum number of retry attempts (default: 0 = no retries). */
|
|
22
|
+
limit: number;
|
|
23
|
+
/** Base delay in ms between retries (default: 1000). */
|
|
24
|
+
delay?: number;
|
|
25
|
+
/** Backoff strategy (default: "exponential"). */
|
|
26
|
+
backoff?: "fixed" | "exponential";
|
|
27
|
+
/** Predicate to decide if the error is retryable. Defaults to retrying all errors. */
|
|
28
|
+
shouldRetry?: (error: unknown) => boolean;
|
|
29
|
+
};
|
|
30
|
+
/** Raw JSON Schema override. When set, toolToDefinition uses this instead of zodToJsonSchema. Used by McpClient. */
|
|
31
|
+
_rawJsonSchema?: Record<string, unknown>;
|
|
16
32
|
}
|
|
17
33
|
export declare function tool<TParams, TContext = unknown>(config: {
|
|
18
34
|
name: string;
|
|
@@ -21,6 +37,8 @@ export declare function tool<TParams, TContext = unknown>(config: {
|
|
|
21
37
|
execute: (context: TContext, params: TParams, options?: ToolExecuteOptions) => Promise<string> | string;
|
|
22
38
|
timeout?: number;
|
|
23
39
|
isEnabled?: boolean | ((context: TContext) => boolean | Promise<boolean>);
|
|
40
|
+
needsApproval?: boolean | ((params: TParams, context: TContext) => boolean | Promise<boolean>);
|
|
41
|
+
retries?: FunctionTool<TParams, TContext>["retries"];
|
|
24
42
|
}): FunctionTool<TParams, TContext>;
|
|
25
43
|
export declare function toolToDefinition(t: FunctionTool): ToolDefinition;
|
|
26
44
|
//# sourceMappingURL=tool.d.ts.map
|
package/dist/core/tool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/core/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAG9C,MAAM,WAAW,kBAAkB;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/core/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAG9C,MAAM,WAAW,kBAAkB;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,SAAS,EAAE,WAAW,KAAK,IAAI,CAAC;CAC/D;AAGD,MAAM,WAAW,YAAY,CAAC,OAAO,GAAG,GAAG,EAAE,QAAQ,GAAG,GAAG;IAC1D,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,EAAE,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,kBAAkB,KACxB,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAC9B,mGAAmG;IACnG,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2FAA2F;IAC3F,SAAS,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,4FAA4F;IAC5F,aAAa,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/F,uDAAuD;IACvD,OAAO,CAAC,EAAE;QACT,kEAAkE;QAClE,KAAK,EAAE,MAAM,CAAC;QACd,wDAAwD;QACxD,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,iDAAiD;QACjD,OAAO,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;QAClC,sFAAsF;QACtF,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;KAC1C,CAAC;IACF,oHAAoH;IACpH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,EAAE,MAAM,EAAE;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,EAAE,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,kBAAkB,KACxB,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,aAAa,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/F,OAAO,CAAC,EAAE,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;CACrD,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAYlC;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,YAAY,GAAG,cAAc,CAShE"}
|
package/dist/core/tool.js
CHANGED
|
@@ -8,6 +8,8 @@ export function tool(config) {
|
|
|
8
8
|
execute: config.execute,
|
|
9
9
|
timeout: config.timeout,
|
|
10
10
|
isEnabled: config.isEnabled,
|
|
11
|
+
needsApproval: config.needsApproval,
|
|
12
|
+
retries: config.retries,
|
|
11
13
|
};
|
|
12
14
|
}
|
|
13
15
|
export function toolToDefinition(t) {
|
|
@@ -16,7 +18,7 @@ export function toolToDefinition(t) {
|
|
|
16
18
|
function: {
|
|
17
19
|
name: t.name,
|
|
18
20
|
description: t.description,
|
|
19
|
-
parameters: zodToJsonSchema(t.parameters),
|
|
21
|
+
parameters: t._rawJsonSchema ?? zodToJsonSchema(t.parameters),
|
|
20
22
|
},
|
|
21
23
|
};
|
|
22
24
|
}
|
package/dist/core/tool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/core/tool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/core/tool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAuC9C,MAAM,UAAU,IAAI,CAA8B,MAajD;IACA,OAAO;QACN,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,OAAO,EAAE,MAAM,CAAC,OAAO;KACvB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,CAAe;IAC/C,OAAO;QACN,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE;YACT,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,UAAU,EAAE,CAAC,CAAC,cAAc,IAAI,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC;SAC7D;KACD,CAAC;AACH,CAAC"}
|
package/dist/core/types.d.ts
CHANGED
|
@@ -13,7 +13,25 @@ export interface ImageContentPart {
|
|
|
13
13
|
detail?: "auto" | "low" | "high";
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
|
-
export
|
|
16
|
+
export interface FileContentPart {
|
|
17
|
+
type: "file";
|
|
18
|
+
file: {
|
|
19
|
+
url: string;
|
|
20
|
+
} | {
|
|
21
|
+
file_id: string;
|
|
22
|
+
};
|
|
23
|
+
filename?: string;
|
|
24
|
+
}
|
|
25
|
+
export interface AudioContentPart {
|
|
26
|
+
type: "audio";
|
|
27
|
+
audio: {
|
|
28
|
+
url: string;
|
|
29
|
+
} | {
|
|
30
|
+
data: string;
|
|
31
|
+
format: "wav" | "mp3";
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
export type ContentPart = TextContentPart | ImageContentPart | FileContentPart | AudioContentPart;
|
|
17
35
|
export interface UserMessage {
|
|
18
36
|
role: "user";
|
|
19
37
|
content: string | ContentPart[];
|
package/dist/core/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC;CAC7D;AAED,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"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"}
|