@notic/agent-engine 3.0.2 → 3.1.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/CHANGELOG.md +15 -0
- package/README.md +6 -3
- package/dist/agent/Agent.d.ts +13 -1
- package/dist/agent/Agent.d.ts.map +1 -1
- package/dist/agent/Agent.js +80 -7
- package/dist/agent/Agent.js.map +1 -1
- package/dist/agent/index.d.ts +5 -0
- package/dist/agent/index.d.ts.map +1 -1
- package/dist/agent/index.js +8 -0
- package/dist/agent/index.js.map +1 -1
- package/dist/agent/runFromContext.d.ts +13 -0
- package/dist/agent/runFromContext.d.ts.map +1 -0
- package/dist/agent/runFromContext.js +124 -0
- package/dist/agent/runFromContext.js.map +1 -0
- package/dist/agent/runFromOptions.d.ts +99 -0
- package/dist/agent/runFromOptions.d.ts.map +1 -0
- package/dist/agent/runFromOptions.js +19 -0
- package/dist/agent/runFromOptions.js.map +1 -0
- package/dist/agent/runFromPersistence.d.ts +36 -0
- package/dist/agent/runFromPersistence.d.ts.map +1 -0
- package/dist/agent/runFromPersistence.js +267 -0
- package/dist/agent/runFromPersistence.js.map +1 -0
- package/dist/agent/runFromRecovery.d.ts +81 -0
- package/dist/agent/runFromRecovery.d.ts.map +1 -0
- package/dist/agent/runFromRecovery.js +277 -0
- package/dist/agent/runFromRecovery.js.map +1 -0
- package/dist/agent/runFromRun.d.ts +25 -0
- package/dist/agent/runFromRun.d.ts.map +1 -0
- package/dist/agent/runFromRun.js +548 -0
- package/dist/agent/runFromRun.js.map +1 -0
- package/dist/agent/runFromStore.d.ts +63 -0
- package/dist/agent/runFromStore.d.ts.map +1 -0
- package/dist/agent/runFromStore.js +131 -0
- package/dist/agent/runFromStore.js.map +1 -0
- package/dist/agent/runFromTools.d.ts +26 -0
- package/dist/agent/runFromTools.d.ts.map +1 -0
- package/dist/agent/runFromTools.js +196 -0
- package/dist/agent/runFromTools.js.map +1 -0
- package/dist/core/data.d.ts +2 -0
- package/dist/core/data.d.ts.map +1 -1
- package/dist/core/data.js +11 -1
- package/dist/core/data.js.map +1 -1
- package/dist/message/Message.d.ts +4 -0
- package/dist/message/Message.d.ts.map +1 -1
- package/dist/message/Message.js +15 -1
- package/dist/message/Message.js.map +1 -1
- package/dist/provider/HttpProvider.d.ts +1 -0
- package/dist/provider/HttpProvider.d.ts.map +1 -1
- package/dist/provider/HttpProvider.js +7 -3
- package/dist/provider/HttpProvider.js.map +1 -1
- package/dist/provider/Provider.d.ts +4 -1
- package/dist/provider/Provider.d.ts.map +1 -1
- package/dist/provider/Provider.js.map +1 -1
- package/dist/provider/streamCompletion.d.ts +8 -2
- package/dist/provider/streamCompletion.d.ts.map +1 -1
- package/dist/provider/streamCompletion.js +29 -4
- package/dist/provider/streamCompletion.js.map +1 -1
- package/dist/provider/transport.d.ts +2 -0
- package/dist/provider/transport.d.ts.map +1 -1
- package/dist/provider/transport.js +13 -6
- package/dist/provider/transport.js.map +1 -1
- package/dist/session/BaseSession.d.ts +4 -0
- package/dist/session/BaseSession.d.ts.map +1 -1
- package/dist/session/BaseSession.js +40 -2
- package/dist/session/BaseSession.js.map +1 -1
- package/dist/session/ListSession.d.ts +3 -0
- package/dist/session/ListSession.d.ts.map +1 -1
- package/dist/session/ListSession.js +61 -0
- package/dist/session/ListSession.js.map +1 -1
- package/dist/session/TreeSession.d.ts +3 -0
- package/dist/session/TreeSession.d.ts.map +1 -1
- package/dist/session/TreeSession.js +31 -4
- package/dist/session/TreeSession.js.map +1 -1
- package/dist/session/runFromSession.d.ts +60 -0
- package/dist/session/runFromSession.d.ts.map +1 -0
- package/dist/session/runFromSession.js +220 -0
- package/dist/session/runFromSession.js.map +1 -0
- package/dist/session/runFromSessionAccess.d.ts +40 -0
- package/dist/session/runFromSessionAccess.d.ts.map +1 -0
- package/dist/session/runFromSessionAccess.js +8 -0
- package/dist/session/runFromSessionAccess.js.map +1 -0
- package/dist/session/trace.d.ts +3 -0
- package/dist/session/trace.d.ts.map +1 -1
- package/dist/session/trace.js +10 -0
- package/dist/session/trace.js.map +1 -1
- package/dist/tool/ToolExecutor.d.ts +4 -0
- package/dist/tool/ToolExecutor.d.ts.map +1 -1
- package/dist/tool/ToolExecutor.js +92 -22
- package/dist/tool/ToolExecutor.js.map +1 -1
- package/dist/tool/runFromToolAccess.d.ts +26 -0
- package/dist/tool/runFromToolAccess.d.ts.map +1 -0
- package/dist/tool/runFromToolAccess.js +16 -0
- package/dist/tool/runFromToolAccess.js.map +1 -0
- package/docs/API.md +129 -6
- package/docs/RUN-FROM-DESIGN.md +356 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/session/trace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/session/trace.ts"],"names":[],"mappings":"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"}
|
package/dist/session/trace.js
CHANGED
|
@@ -2,8 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ExecutionTrace = void 0;
|
|
4
4
|
const data_1 = require("../core/data");
|
|
5
|
+
const runFromSessionAccess_1 = require("./runFromSessionAccess");
|
|
5
6
|
class ExecutionTrace {
|
|
6
7
|
data = { turns: [], runs: [], steps: [], tools: [], contributions: [] };
|
|
8
|
+
[runFromSessionAccess_1.applyRunFromTrace](draft) {
|
|
9
|
+
this.data = draft.data;
|
|
10
|
+
}
|
|
11
|
+
[runFromSessionAccess_1.appendRunFromTurnInput](turnId, messageId) {
|
|
12
|
+
const turn = this.data.turns.find(item => item.id === turnId);
|
|
13
|
+
(0, data_1.assert)(turn && !turn.inputMessageIds.includes(messageId), "Invalid runFrom turn input");
|
|
14
|
+
turn.inputMessageIds.push(messageId);
|
|
15
|
+
return (0, data_1.copy)(turn);
|
|
16
|
+
}
|
|
7
17
|
get records() {
|
|
8
18
|
return (0, data_1.immutable)((0, data_1.copy)(this.data));
|
|
9
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/session/trace.ts"],"names":[],"mappings":";;;AAAA,uCAA2D;
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/session/trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Message, ToolCallPart } from "../message";
|
|
2
2
|
import type { ToolExecutionRecord } from "../session/trace";
|
|
3
3
|
import { ToolKit } from './ToolKit';
|
|
4
|
+
import { runFromToolAccess, type RunFromToolAccess } from "./runFromToolAccess";
|
|
4
5
|
export declare class ToolExecutionError extends Error {
|
|
5
6
|
readonly record: ToolExecutionRecord;
|
|
6
7
|
readonly cause?: unknown | undefined;
|
|
@@ -56,6 +57,9 @@ export declare class ToolExecutor {
|
|
|
56
57
|
/** Synchronous ownership/precondition check at the actual execution boundary. */
|
|
57
58
|
assertCanExecute?: () => void;
|
|
58
59
|
}): Promise<ToolOutcome>;
|
|
60
|
+
[runFromToolAccess](): RunFromToolAccess;
|
|
61
|
+
private executeRunFrom;
|
|
62
|
+
private prepare;
|
|
59
63
|
private wait;
|
|
60
64
|
}
|
|
61
65
|
//# sourceMappingURL=ToolExecutor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolExecutor.d.ts","sourceRoot":"","sources":["../../src/tool/ToolExecutor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,qBAAa,kBAAmB,SAAQ,KAAK;IAEZ,QAAQ,CAAC,MAAM,EAAE,mBAAmB;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IAD3F,QAAQ,CAAC,IAAI,oBAAoB;gBACrB,OAAO,EAAE,MAAM,EAAW,MAAM,EAAE,mBAAmB,EAAW,KAAK,CAAC,EAAE,OAAO,YAAA;CAI9F;AACD,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG;IACtD,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,CAAC,CAAC,OAAO,EAAE,eAAe,KAAK,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC5G,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACpC;AACD,MAAM,MAAM,SAAS,GAAG;IACpB,IAAI,EAAE,kBAAkB,CAAC;IACzB,OAAO,EAAE,eAAe,CAAC;CAC5B,GAAG;IACA,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AACF,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;CAC/B;AACD,qBAAa,YAAY;IAUT,OAAO,CAAC,OAAO;IAT3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,OAAO,CAMV;gBACe,OAAO,EAAE,mBAAmB;IAGhD,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,GAAG,MAAM,IAAI;IAGrF,IAAI,gBAAgB,IAAI,eAAe,EAAE,CAExC;IACD,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAOpC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,SAAqB,GAAG,OAAO;IAO1D,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,GAAE;QACvC,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;QACjC,iFAAiF;QACjF,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;KAC5B,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ToolExecutor.d.ts","sourceRoot":"","sources":["../../src/tool/ToolExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.ToolExecutor = exports.ToolExecutionError = void 0;
|
|
|
4
4
|
const data_1 = require("../core/data");
|
|
5
5
|
const message_1 = require("../message");
|
|
6
6
|
const Tool_1 = require("./Tool");
|
|
7
|
+
const runFromToolAccess_1 = require("./runFromToolAccess");
|
|
7
8
|
class ToolExecutionError extends Error {
|
|
8
9
|
record;
|
|
9
10
|
cause;
|
|
@@ -54,26 +55,7 @@ class ToolExecutor {
|
|
|
54
55
|
try {
|
|
55
56
|
context.signal?.throwIfAborted();
|
|
56
57
|
context.assertCanExecute?.();
|
|
57
|
-
const tool = this.
|
|
58
|
-
(0, data_1.assert)(tool && this.toolkit.isEnabled(call.name), `Unavailable tool: ${call.name}`);
|
|
59
|
-
let args;
|
|
60
|
-
try {
|
|
61
|
-
args = call.arguments.trim() ? JSON.parse(call.arguments) : {};
|
|
62
|
-
}
|
|
63
|
-
catch {
|
|
64
|
-
throw new Tool_1.ToolArgumentsError("Tool arguments are not valid JSON");
|
|
65
|
-
}
|
|
66
|
-
const validated = tool.validate(args);
|
|
67
|
-
record.arguments = (0, data_1.copy)(validated);
|
|
68
|
-
const request = { approvalId: (0, data_1.id)("approval"), toolExecutionId: record.id, toolCallId: call.toolCallId, name: call.name, arguments: (0, data_1.copy)(validated), runId: context.runId, stepId: context.stepId };
|
|
69
|
-
const decision = typeof this.options.approval === "function" ? await (0, data_1.abortable)(Promise.resolve(this.options.approval(request)), context.signal) : this.options.approval === "manual" || tool.requiresApproval ? "ask" : "allow";
|
|
70
|
-
const action = typeof decision === "string" ? decision : decision.action;
|
|
71
|
-
let accepted = { approved: action === "allow", reason: typeof decision === "object" ? decision.reason : undefined };
|
|
72
|
-
if (action === "ask") {
|
|
73
|
-
record.status = "awaitingApproval";
|
|
74
|
-
await update();
|
|
75
|
-
accepted = await this.wait(request, context.signal);
|
|
76
|
-
}
|
|
58
|
+
const { tool, validated, accepted } = await this.prepare(call, record, context.signal, update);
|
|
77
59
|
if (!accepted.approved) {
|
|
78
60
|
record.status = "rejected";
|
|
79
61
|
record.error = accepted.reason ?? "Tool execution denied";
|
|
@@ -112,7 +94,91 @@ class ToolExecutor {
|
|
|
112
94
|
return { message, record: (0, data_1.copy)(record) };
|
|
113
95
|
}
|
|
114
96
|
}
|
|
115
|
-
|
|
97
|
+
[runFromToolAccess_1.runFromToolAccess]() {
|
|
98
|
+
const emit = async (event, signal, forward) => {
|
|
99
|
+
await Promise.allSettled([
|
|
100
|
+
(0, data_1.abortable)(this.events.emit((0, data_1.copy)(event)), signal),
|
|
101
|
+
(0, data_1.abortable)(forward(event), signal),
|
|
102
|
+
]);
|
|
103
|
+
};
|
|
104
|
+
return { emit, execute: (call, context) => this.executeRunFrom(call, context, emit) };
|
|
105
|
+
}
|
|
106
|
+
async executeRunFrom(call, context, emit) {
|
|
107
|
+
const record = { id: context.executionId, runId: context.runId, stepId: context.stepId,
|
|
108
|
+
toolCallId: call.toolCallId, name: call.name, arguments: {}, status: "running" };
|
|
109
|
+
const guard = () => {
|
|
110
|
+
context.startSignal.throwIfAborted();
|
|
111
|
+
context.assertCanStart();
|
|
112
|
+
};
|
|
113
|
+
const finish = (status, result, error) => {
|
|
114
|
+
const message = message_1.Message.tool(call.toolCallId, result, call.name);
|
|
115
|
+
return { message, record: { ...record, status, error, resultMessageId: message.id } };
|
|
116
|
+
};
|
|
117
|
+
guard();
|
|
118
|
+
let prepared;
|
|
119
|
+
try {
|
|
120
|
+
prepared = await this.prepare(call, record, context.startSignal, async () => {
|
|
121
|
+
void emit({ type: "toolUpdated", record: (0, data_1.copy)(record) }, context.startSignal, context.onEvent);
|
|
122
|
+
}, event => emit(event, context.startSignal, context.onEvent));
|
|
123
|
+
}
|
|
124
|
+
catch (error) {
|
|
125
|
+
guard();
|
|
126
|
+
const reason = (0, data_1.errorOf)(error).message;
|
|
127
|
+
return finish("failed", { error: reason }, reason);
|
|
128
|
+
}
|
|
129
|
+
guard();
|
|
130
|
+
const { tool, validated, accepted } = prepared;
|
|
131
|
+
if (!accepted.approved) {
|
|
132
|
+
const reason = accepted.reason ?? "Tool execution denied";
|
|
133
|
+
return finish("rejected", { error: reason, rejected: true }, reason);
|
|
134
|
+
}
|
|
135
|
+
record.status = "running";
|
|
136
|
+
const verifyTool = () => {
|
|
137
|
+
guard();
|
|
138
|
+
(0, data_1.assert)(this.toolkit.get(call.name) === tool && this.toolkit.isEnabled(call.name), `Tool changed before execution: ${call.name}`);
|
|
139
|
+
};
|
|
140
|
+
verifyTool();
|
|
141
|
+
await context.beforeStart();
|
|
142
|
+
await emit({ type: "toolUpdated", record: (0, data_1.copy)(record) }, context.startSignal, context.onEvent);
|
|
143
|
+
verifyTool();
|
|
144
|
+
await context.confirmLease();
|
|
145
|
+
verifyTool();
|
|
146
|
+
const toolContext = { signal: context.signal, runId: record.runId, stepId: record.stepId,
|
|
147
|
+
toolExecutionId: record.id, toolCallId: record.toolCallId, throwIfAborted: () => context.signal.throwIfAborted() };
|
|
148
|
+
try {
|
|
149
|
+
const value = await (0, data_1.abortable)(Promise.resolve(tool.execute(validated, toolContext)), context.signal);
|
|
150
|
+
return finish("completed", value);
|
|
151
|
+
}
|
|
152
|
+
catch (error) {
|
|
153
|
+
throw new runFromToolAccess_1.ToolOutcomeUnknown(error, (0, data_1.copy)(record));
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
async prepare(call, record, signal, update, announce) {
|
|
157
|
+
const tool = this.toolkit.get(call.name);
|
|
158
|
+
(0, data_1.assert)(tool && this.toolkit.isEnabled(call.name), `Unavailable tool: ${call.name}`);
|
|
159
|
+
let args;
|
|
160
|
+
try {
|
|
161
|
+
args = call.arguments.trim() ? JSON.parse(call.arguments) : {};
|
|
162
|
+
}
|
|
163
|
+
catch {
|
|
164
|
+
throw new Tool_1.ToolArgumentsError("Tool arguments are not valid JSON");
|
|
165
|
+
}
|
|
166
|
+
const validated = tool.validate(args);
|
|
167
|
+
record.arguments = (0, data_1.copy)(validated);
|
|
168
|
+
const request = { approvalId: (0, data_1.id)("approval"), toolExecutionId: record.id, toolCallId: call.toolCallId,
|
|
169
|
+
name: call.name, arguments: (0, data_1.copy)(validated), runId: record.runId, stepId: record.stepId };
|
|
170
|
+
const decision = typeof this.options.approval === "function" ? await (0, data_1.abortable)(Promise.resolve(this.options.approval(request)), signal)
|
|
171
|
+
: this.options.approval === "manual" || tool.requiresApproval ? "ask" : "allow";
|
|
172
|
+
const action = typeof decision === "string" ? decision : decision.action;
|
|
173
|
+
let accepted = { approved: action === "allow", reason: typeof decision === "object" ? decision.reason : undefined };
|
|
174
|
+
if (action === "ask") {
|
|
175
|
+
record.status = "awaitingApproval";
|
|
176
|
+
await update();
|
|
177
|
+
accepted = await this.wait(request, signal, announce);
|
|
178
|
+
}
|
|
179
|
+
return { tool, validated, accepted };
|
|
180
|
+
}
|
|
181
|
+
async wait(request, signal, announce) {
|
|
116
182
|
let timer;
|
|
117
183
|
const promise = new Promise(resolve => {
|
|
118
184
|
this.pending.set(request.approvalId, { request: (0, data_1.copy)(request), resolve });
|
|
@@ -120,7 +186,11 @@ class ToolExecutor {
|
|
|
120
186
|
timer = setTimeout(() => resolve({ approved: false, reason: "Approval timed out" }), this.options.approvalTimeoutMs);
|
|
121
187
|
});
|
|
122
188
|
try {
|
|
123
|
-
|
|
189
|
+
const event = { type: "approvalRequired", request: (0, data_1.copy)(request) };
|
|
190
|
+
if (announce)
|
|
191
|
+
void announce(event);
|
|
192
|
+
else
|
|
193
|
+
await this.events.emit(event);
|
|
124
194
|
return await (0, data_1.abortable)(promise, signal);
|
|
125
195
|
}
|
|
126
196
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolExecutor.js","sourceRoot":"","sources":["../../src/tool/ToolExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ToolExecutor.js","sourceRoot":"","sources":["../../src/tool/ToolExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { ToolCallPart } from "../message";
|
|
2
|
+
import type { ToolExecutionRecord } from "../session/trace";
|
|
3
|
+
import type { ToolEvent, ToolOutcome } from "./ToolExecutor";
|
|
4
|
+
interface RunFromToolContext {
|
|
5
|
+
executionId: string;
|
|
6
|
+
runId: string;
|
|
7
|
+
stepId: string;
|
|
8
|
+
signal: AbortSignal;
|
|
9
|
+
startSignal: AbortSignal;
|
|
10
|
+
assertCanStart(): void;
|
|
11
|
+
beforeStart(): Promise<void>;
|
|
12
|
+
confirmLease(): Promise<void>;
|
|
13
|
+
onEvent(event: ToolEvent): Promise<void>;
|
|
14
|
+
}
|
|
15
|
+
export interface RunFromToolAccess {
|
|
16
|
+
execute(call: ToolCallPart, context: RunFromToolContext): Promise<ToolOutcome>;
|
|
17
|
+
emit(event: ToolEvent, signal: AbortSignal, forward: (event: ToolEvent) => Promise<void>): Promise<void>;
|
|
18
|
+
}
|
|
19
|
+
/** A handler was invoked but no serializable result was obtained. */
|
|
20
|
+
export declare class ToolOutcomeUnknown extends Error {
|
|
21
|
+
readonly record: ToolExecutionRecord;
|
|
22
|
+
constructor(cause: unknown, record: ToolExecutionRecord);
|
|
23
|
+
}
|
|
24
|
+
export declare const runFromToolAccess: unique symbol;
|
|
25
|
+
export {};
|
|
26
|
+
//# sourceMappingURL=runFromToolAccess.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runFromToolAccess.d.ts","sourceRoot":"","sources":["../../src/tool/runFromToolAccess.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7D,UAAU,kBAAkB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,IAAI,IAAI,CAAC;IACvB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/E,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5G;AAED,qEAAqE;AACrE,qBAAa,kBAAmB,SAAQ,KAAK;IACb,QAAQ,CAAC,MAAM,EAAE,mBAAmB;gBAApD,KAAK,EAAE,OAAO,EAAW,MAAM,EAAE,mBAAmB;CAInE;AAED,eAAO,MAAM,iBAAiB,eAA8B,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runFromToolAccess = exports.ToolOutcomeUnknown = void 0;
|
|
4
|
+
const data_1 = require("../core/data");
|
|
5
|
+
/** A handler was invoked but no serializable result was obtained. */
|
|
6
|
+
class ToolOutcomeUnknown extends Error {
|
|
7
|
+
record;
|
|
8
|
+
constructor(cause, record) {
|
|
9
|
+
super((0, data_1.errorOf)(cause).message, { cause });
|
|
10
|
+
this.record = record;
|
|
11
|
+
this.name = "ToolOutcomeUnknown";
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.ToolOutcomeUnknown = ToolOutcomeUnknown;
|
|
15
|
+
exports.runFromToolAccess = Symbol("runFromToolAccess");
|
|
16
|
+
//# sourceMappingURL=runFromToolAccess.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runFromToolAccess.js","sourceRoot":"","sources":["../../src/tool/runFromToolAccess.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAsBvC,qEAAqE;AACrE,MAAa,kBAAmB,SAAQ,KAAK;IACJ;IAArC,YAAY,KAAc,EAAW,MAA2B;QAC5D,KAAK,CAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QADR,WAAM,GAAN,MAAM,CAAqB;QAE5D,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACrC,CAAC;CACJ;AALD,gDAKC;AAEY,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
|
package/docs/API.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# AgentEngine 3.
|
|
1
|
+
# AgentEngine 3.1 API
|
|
2
2
|
|
|
3
3
|
本文对应当前运行时代码。根入口及 /agent、/message、/session、/prompt、/provider、/generator、/tool 子入口提供新 API。历史方案保留在设计记录;迁移见 [MIGRATION-3.0.md](./MIGRATION-3.0.md)。
|
|
4
4
|
|
|
@@ -108,7 +108,7 @@ const wire = await provider.buildRequest({
|
|
|
108
108
|
}, false);
|
|
109
109
|
```
|
|
110
110
|
|
|
111
|
-
HTTP Provider 接受 apiKey(字符串/异步函数)、baseURL、headers、transport、mediaResolver。buildRequest(request,stream?,signal?) 只转换,不发送;generate(request,{stream,signal?},emit?) 返回统一 ModelResponse,普通业务使用 Generator 取得配置校验与稳定身份。
|
|
111
|
+
HTTP Provider 接受 apiKey(字符串/异步函数)、baseURL、headers、transport、mediaResolver,以及 OpenAI Chat 专用的 streamCompletion。buildRequest(request,stream?,signal?) 只转换,不发送;generate(request,{stream,signal?},emit?) 返回统一 ModelResponse,普通业务使用 Generator 取得配置校验与稳定身份。
|
|
112
112
|
|
|
113
113
|
generation 字段:temperature、topP、topK、maxOutputTokens、stop、frequencyPenalty、presencePenalty、seed、responseFormat、providerOptions。responseFormat 为 text、json_object 或 `{type:"json_schema",name?,schema}`。
|
|
114
114
|
|
|
@@ -147,7 +147,20 @@ const response = await generator.generate({
|
|
|
147
147
|
|
|
148
148
|
ProviderRequestError 含 HTTP status;流失败用 GenerationError(cause,partial?) 保留部分响应。自定义聊天实现 ChatProvider.generate,应把 signal 传到真实操作;Generator 会限制独立实现的等待并忽略迟到事件。HttpProvider 子类覆盖 generate 时需遵守原有取消契约,以保留原生部分状态。取消无法终止忽略 signal 的底层副作用,传输和工具需合作取消。
|
|
149
149
|
|
|
150
|
-
3.0.
|
|
150
|
+
内置 HttpProvider 要求本协议的完成信号。3.0.3 起,OpenAIProvider(OpenAICompatibleProvider 的别名)默认使用 `streamCompletion: "compatible"`:接受非空 finish_reason,也接受有效助手响应之后的显式 `data: [DONE]`。有效响应包括正文、思考、工具调用增量或 assistant 角色起始块;只有 `[DONE]`、usage 或空 delta 不算有效响应。缺失的 finishReason 保持 undefined,Step 记录同样保留未知,不推断为 stop;已有 length、tool_calls、content_filter 等原因不会被 `[DONE]` 覆盖。仅凭结束标记无法还原中转站省略的截断原因。
|
|
151
|
+
|
|
152
|
+
需要沿用 3.0.2 的严格检查时,在 Provider 构造配置中设置 `streamCompletion: "strict"`,只接受 finish_reason:
|
|
153
|
+
|
|
154
|
+
```ts
|
|
155
|
+
const provider = new OpenAIProvider({
|
|
156
|
+
apiKey: "key", baseURL: "https://your-proxy/v1",
|
|
157
|
+
streamCompletion: "strict",
|
|
158
|
+
});
|
|
159
|
+
```
|
|
160
|
+
|
|
161
|
+
streamCompletion 不进入请求 body,也不影响非流式请求。其他协议始终要求各自的原生完成信号:Responses 的 response.completed/response.incomplete、Anthropic 的 message_stop、Gemini candidate 的 finishReason;不能用 `[DONE]` 替代。通过 `[DONE]` 回退完成的 OpenAI 响应,会先检查所有工具调用都有非空 ID/名称及完整的 JSON 对象参数,不把空参数补成 `{}`;实际执行仍经过 ToolExecutor 的 schema 校验、启用检查和审批。
|
|
162
|
+
|
|
163
|
+
没有任何可接受完成信号就关闭 HTTP body,仍抛 GenerationError,其 cause 为 IncompleteStreamError(code=INCOMPLETE_STREAM),partial 保留已收到内容,不执行残缺工具调用。流内错误信封会抛出 ProviderStreamError,保留 detail、message 及可用的 code/type/status;流式情况下它作为 GenerationError.cause 返回。非流式 HTTP 200 错误信封同样识别。错误、取消和超时不会因缓冲区已有 `[DONE]` 而转成成功。自定义 ChatProvider 的完成判断仍由实现者负责。
|
|
151
164
|
|
|
152
165
|
## ToolExecutor:独立审批与执行
|
|
153
166
|
|
|
@@ -197,12 +210,13 @@ const result = await agent.chat("完成任务");
|
|
|
197
210
|
| --- | --- |
|
|
198
211
|
| chat(input,options?) | 添加 User,开始交互,自动执行模型/工具循环 |
|
|
199
212
|
| run(options?) | 从已准备历史执行,不添加用户消息 |
|
|
200
|
-
| continue(options?) | 扩展最后选中 Assistant,支持 targetMessageId
|
|
201
|
-
| resume(options?) |
|
|
213
|
+
| continue(options?) | 扩展最后选中 Assistant,支持 targetMessageId、instruction、carryThinking 和 persistInstruction |
|
|
214
|
+
| resume(options?) | 接续本实例上一失败或中断的运行,支持 persistInstruction,新 Run 关联原 Turn 和 resumedFrom |
|
|
215
|
+
| runFrom(options) | 从新输入、指定回复或已存档的运行位置开始执行 |
|
|
202
216
|
| abort(reason?) | 取消当前运行 |
|
|
203
217
|
| previewContext(options?) | 无消耗预览 run、continue 或 resume 请求上下文 |
|
|
204
218
|
|
|
205
|
-
options 支持 signal、stream、generation、execution、thinking、requestTimeoutMs。execution.maxSteps 默认 10,3.0.1 起 0 表示不限轮数;负数、非整数和非有限值无效。execution.timeoutMs 覆盖整次运行的模型、工具和审批等待,0 或不设置表示不限时。工具默认 sequential,也可 parallel,与 toolErrorPolicy 独立。return 将异常回传模型;pause/throw 保存失败工具结果后结束,应用决定是否 resume。审批拒绝是工具结果。
|
|
219
|
+
`chat()`、`run()`、`continue()` 和 `resume()` 的 options 支持 signal、stream、generation、execution、thinking、requestTimeoutMs。execution.maxSteps 默认 10,3.0.1 起 0 表示不限轮数;负数、非整数和非有限值无效。execution.timeoutMs 覆盖整次运行的模型、工具和审批等待,0 或不设置表示不限时。工具默认 sequential,也可 parallel,与 toolErrorPolicy 独立。return 将异常回传模型;pause/throw 保存失败工具结果后结束,应用决定是否 resume。审批拒绝是工具结果。
|
|
206
220
|
|
|
207
221
|
`execution.lengthPolicy`(3.0.2)可为 `"error"`(默认,沿用原行为)或 `"complete"`。complete 允许没有工具调用的 length 回复正常结束,结果 status=completed、stopReason=length,afterCommit/afterRun 与 lastRunState 一致;续写同样适用。包含工具调用的截断回复始终失败,不执行工具。单次执行配置可覆盖 Agent 默认值,例如 `await agent.continue({execution:{lengthPolicy:"complete"}})`。CE 希望保持 2.x 截断行为时,应显式设置这个选项。
|
|
208
222
|
|
|
@@ -218,6 +232,22 @@ AgentResult 包含 runId/turnId?/status/stopReason/message?/usage/error?/unappli
|
|
|
218
232
|
|
|
219
233
|
导入 Session 恢复数据,不恢复进程运行、等待审批或 exactly-once 工具现场。新 Agent 不能 resume 另一实例运行,可显式 run 已导入上下文。
|
|
220
234
|
|
|
235
|
+
### 保存续写指令
|
|
236
|
+
|
|
237
|
+
`continue()` 和 `resume()` 的 `persistInstruction` 默认关闭。对内置会话开启后,两个入口使用 `runFrom()` 的执行流程,在首个新模型请求前把指令保存为 User 消息。`continue()` 会在该指令之后创建 Assistant 回复。`instruction: ""` 关闭本次指令,续写按原位追加。开启保存的运行仍可通过 `lastRunState` 查看,运行开始后的错误由 `AgentRunError` 携带结果。
|
|
238
|
+
|
|
239
|
+
```ts
|
|
240
|
+
await agent.continue({
|
|
241
|
+
instruction: "继续给出一个例子。",
|
|
242
|
+
persistInstruction: true,
|
|
243
|
+
});
|
|
244
|
+
|
|
245
|
+
// 在同一个 Agent 中接手一次可恢复的失败或中断。
|
|
246
|
+
await agent.resume({ persistInstruction: true });
|
|
247
|
+
```
|
|
248
|
+
|
|
249
|
+
中断的旧运行首次用该选项接手时,从原 Turn 的选中历史开始建立恢复记录。后续 `resume()` 沿用此运行的恢复点,先结算遗留工具批次,再请求模型。如果恢复点已经停在保存的指令上,直接复用该消息。
|
|
250
|
+
|
|
221
251
|
### 生命周期与业务保存
|
|
222
252
|
|
|
223
253
|
hooks.beforeRequest(context,identity) 修改请求副本;beforeCommit(message,commitContext) 修改或返回替代生成 Message;afterCommit(actualMessage,commitContext) 在内存提交后执行;afterRun(result) 在运行结算后执行。hook 可异步,内存提交与业务数据库保存分别处理。
|
|
@@ -228,6 +258,99 @@ hooks.beforeRequest(context,identity) 修改请求副本;beforeCommit(message,
|
|
|
228
258
|
|
|
229
259
|
afterCommit 失败保留已提交内容,停止后续执行;afterRun 失败用 AgentRunError 携带原结果,运行状态仍表示实际执行事实。Agent 通知事件包含 Generator、Executor 事件,以及 runStarted/messageCommitted/runFinished。messageCommitted.message 为提交快照。普通通知异常交给 onHandlerError,不用于转换;显示、保存、发送的内容可以不同。
|
|
230
260
|
|
|
261
|
+
### `runFrom()`
|
|
262
|
+
|
|
263
|
+
`Agent.runFrom(options: RunFromOptions): Promise<RunFromResult>` 支持 `TreeSession`、`ListSession` 和 `AgentSession`。本次执行的位置、上下文和写回方式由 `from`、`context` 和 `commit` 决定。
|
|
264
|
+
|
|
265
|
+
| `from.kind` | 起点和默认行为 |
|
|
266
|
+
| --- | --- |
|
|
267
|
+
| `input` | 在当前路径追加 User 消息,创建 Turn 和回复 |
|
|
268
|
+
| `reply` | 从指定 Assistant 回复接写。首步把新增内容合并到该回复,历史思考以临时 Assistant 文本回传。显式 `fork: true` 时在新分支创建回复 |
|
|
269
|
+
| `run` | 用 `runId` 找到该任务的最新恢复点。先处理遗留工具批次,再创建新模型回复。可用 `afterStepId` 定位到某个已完成步骤及其结算后的工具历史 |
|
|
270
|
+
|
|
271
|
+
树位置由 `nodeId` 指定。列表和 Agent 会话的位置需要行 ID、候选 ID、消息 ID 和从 0 开始的 `messageIndex`。接续时核对当前选中路径、消息位置和请求版本。更早的位置需显式分支,若切点之后已有工具活动,返回 `later_tool_activity`。
|
|
272
|
+
|
|
273
|
+
`context.instruction` 和 `replayThinking` 构造首个新模型请求的临时消息。`replayThinking` 可选 `reply` 或 `turn` 范围及 `assistant` 或 `user` 角色。`context.build` 每步收到历史副本、思考块、请求草稿和 `stepIndex`。`commit` 可为静态决定或回调。静态决定用于首个新步骤,后续创建新消息。回调用 `currentEnd` 核对写入位置,并可按 `partial` 处理保留片段。
|
|
274
|
+
|
|
275
|
+
设置 `context.persistInstruction: true` 会在首次新模型请求前把继续指令保存为当前路径的一条 User 消息。有遗留工具批次时,先把工具结果写入历史,再保存指令。思考回传仍是临时上下文,空字符串关闭本次指令。若恢复点停在已保存的指令上,接手时会复用该消息。保存后会话末尾为 User,所以 `reply` 默认创建新回复。自定义提交可通过 `commit({ currentEnd })` 确认写入位置并返回 `create`。
|
|
276
|
+
|
|
277
|
+
```ts
|
|
278
|
+
import type { Agent, RunFromPosition, RunFromStore } from "@notic/agent-engine";
|
|
279
|
+
|
|
280
|
+
export function startTask(agent: Agent, input: string, store?: RunFromStore) {
|
|
281
|
+
return agent.runFrom({ from: { kind: "input", input }, store });
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
export function finishReply(agent: Agent, nodeId: string, persistInstruction = false, store?: RunFromStore) {
|
|
285
|
+
const position: RunFromPosition = { type: "tree", nodeId };
|
|
286
|
+
return agent.runFrom({
|
|
287
|
+
from: { kind: "reply", position },
|
|
288
|
+
store,
|
|
289
|
+
context: { persistInstruction, replayThinking: { scope: "reply", role: "user" } },
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
```
|
|
293
|
+
|
|
294
|
+
**跨进程接手**
|
|
295
|
+
|
|
296
|
+
默认存档随 Agent 实例保存在内存中。需要在应用重启后接手时,从首次调用起传入持久化 `RunFromStore`。可以在收到 `runStarted` 后保存 `session.id` 和 `runId`,也可以通过 `store.read(sessionId)` 读取存档中的任务链。
|
|
297
|
+
|
|
298
|
+
```ts
|
|
299
|
+
import { Agent, restoreRunFromSaveData } from "@notic/agent-engine/agent";
|
|
300
|
+
import type { RunFromStore, RunFromToolResolution } from "@notic/agent-engine/agent";
|
|
301
|
+
import type { ChatProvider, ToolKit } from "@notic/agent-engine";
|
|
302
|
+
|
|
303
|
+
export async function resumeTask(
|
|
304
|
+
store: RunFromStore,
|
|
305
|
+
sessionId: string,
|
|
306
|
+
runId: string,
|
|
307
|
+
provider: ChatProvider,
|
|
308
|
+
model: string,
|
|
309
|
+
toolkit: ToolKit,
|
|
310
|
+
toolResolutions?: readonly RunFromToolResolution[],
|
|
311
|
+
) {
|
|
312
|
+
const saved = await store.read(sessionId);
|
|
313
|
+
if (!saved) throw new Error("任务存档不存在");
|
|
314
|
+
const { session } = restoreRunFromSaveData(saved.data, sessionId);
|
|
315
|
+
const agent = new Agent({ session, provider, model, toolkit });
|
|
316
|
+
return agent.runFrom({
|
|
317
|
+
from: { kind: "run", runId },
|
|
318
|
+
store,
|
|
319
|
+
toolResolutions,
|
|
320
|
+
context: { replayThinking: { scope: "turn", role: "user" } },
|
|
321
|
+
commit: ({ currentEnd }) => ({ mode: "create", at: currentEnd }),
|
|
322
|
+
});
|
|
323
|
+
}
|
|
324
|
+
```
|
|
325
|
+
|
|
326
|
+
存档中的 `model` 表示可以发起新模型请求,`tools` 表示需要先处理工具批次,`closed` 表示运行已完成。新进程重新装配工具、审批、Provider 和业务回调。从存档恢复时,`RunFromResult.recovery` 给出最新确认的位置。错误通过 `RunFromError.code` 区分。仍被占用的存档返回 `session_busy`,分支或请求不一致返回 `session_conflict`,已完成任务返回 `recovery_closed`。单独读取和校验存档时,`restoreRunFromSaveData()` 会对无效数据抛出 `InvalidRunFromRecoveryError`。
|
|
327
|
+
|
|
328
|
+
**工具结果补录与重试**
|
|
329
|
+
|
|
330
|
+
接手批次时,已结算结果会复用,待执行调用使用当前工具和审批。租约过期后,存档中仍为 `started` 的调用按未知结果处理。`tool_outcome_unknown` 的 `error.tools` 给出对应的执行 ID。应用为每个未知调用提供决定后,批次才能推进。对尚未调用工具时发现的确定失败,`toolErrorPolicy` 默认把结果发给模型,`pause` 或 `throw` 会暂停本批并保留待执行调用。
|
|
331
|
+
|
|
332
|
+
```ts
|
|
333
|
+
import type { JsonValue, RunFromToolResolution, SettledToolStatus } from "@notic/agent-engine";
|
|
334
|
+
|
|
335
|
+
export function toolDecisions(
|
|
336
|
+
confirmedId: string,
|
|
337
|
+
status: SettledToolStatus,
|
|
338
|
+
receipt: JsonValue,
|
|
339
|
+
idempotentId: string,
|
|
340
|
+
): RunFromToolResolution[] {
|
|
341
|
+
return [
|
|
342
|
+
{ executionId: confirmedId, action: "record", status, value: receipt },
|
|
343
|
+
{ executionId: idempotentId, action: "retry" },
|
|
344
|
+
];
|
|
345
|
+
}
|
|
346
|
+
```
|
|
347
|
+
|
|
348
|
+
`record` 接受查证后的 `completed`、`failed` 或 `rejected` 结果。`retry` 沿用原 `ToolContext.toolExecutionId`,由工具把它作为外部服务的幂等键。所有结果确认后按原顺序写回调用所在路径,并保留工具最初所属的 Run 和 Step。
|
|
349
|
+
|
|
350
|
+
应用实现的 `RunFromStore` 以 `RunFromStoreWrite` 一次提交会话、追踪记录和恢复点。`acquire` 核对预期修订号并取得租约,首次写入的 `expectedRevision` 为 `null`。`renew` 和 `write` 校验有效的租约令牌,`write` 同时核对修订号。存档返回 `revision` 和最近的 `lastWriteId`,供写入响应丢失时读回确认。在同一有效租约中,应用可以用相同的 `writeId` 和数据确认最近一次写入。`release` 只释放匹配令牌的租约。`RunFromStoreErrorCode` 区分版本冲突、租约占用、租约失效和写入 ID 冲突。
|
|
351
|
+
|
|
352
|
+
公开类型和存档帮助函数可从包根或 `@notic/agent-engine/agent` 导入。完整字段、原子事务约定和分支规则见 [runFrom 设计](./RUN-FROM-DESIGN.md)。
|
|
353
|
+
|
|
231
354
|
## PromptBuilder:独立临时上下文
|
|
232
355
|
|
|
233
356
|
```ts
|