@notic/agent-engine 3.0.0 → 3.0.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/CHANGELOG.md +7 -0
- package/dist/agent/Agent.d.ts +6 -0
- package/dist/agent/Agent.d.ts.map +1 -1
- package/dist/agent/Agent.js +13 -10
- package/dist/agent/Agent.js.map +1 -1
- package/dist/generator/Generator.d.ts +4 -0
- package/dist/generator/Generator.d.ts.map +1 -1
- package/dist/generator/Generator.js +21 -3
- package/dist/generator/Generator.js.map +1 -1
- package/docs/API.md +5 -2
- package/docs/CE-FEEDBACK-3.0.md +1 -1
- package/package.json +37 -37
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 3.0.1 - 2026-10-27
|
|
4
|
+
|
|
5
|
+
- Retain partial replies when a later model request fails during a continuation tool loop. The initial failed continuation still rolls back; cancellation and timeouts retain partial progress, and concurrent content edits still take precedence. Later commit hooks receive a create context without the original continuation target.
|
|
6
|
+
- `execution.maxSteps: 0` now means unlimited model steps. Positive limits and the default of 10 are unchanged; cancellation and timeouts still stop unlimited loops.
|
|
7
|
+
- Add `requestTimeoutMs` to Agent/Generator defaults and per-call options. It bounds each complete model request, including streaming, without counting tool or approval waits. `0` disables the request timeout. Request timeouts cancel the transport and retain available partial output.
|
|
8
|
+
- `execution.timeoutMs: 0` now disables the total run deadline. Request and total timeouts remain separate; negative and non-finite timeout values are rejected.
|
|
9
|
+
|
|
3
10
|
## 3.0.0 - 2026-10-26
|
|
4
11
|
|
|
5
12
|
- CE feedback: business Message metadata/tags and Session metadata can change during runs without invalidating request leases; content and protocol edits still conflict. Custom request metadata keys persist alongside separate request revisions.
|
package/dist/agent/Agent.d.ts
CHANGED
|
@@ -5,7 +5,9 @@ import { PromptBuilder, PromptContext } from "../prompt";
|
|
|
5
5
|
import { SessionLike, TokenUsage } from "../session";
|
|
6
6
|
import { ToolEvent, ToolExecutor, ToolExecutorOptions, ToolKit } from "../tool";
|
|
7
7
|
export interface AgentExecutionConfig {
|
|
8
|
+
/** Maximum model steps; 0 means unlimited. Default: 10. */
|
|
8
9
|
maxSteps?: number;
|
|
10
|
+
/** Total run timeout in milliseconds; 0 means unlimited. */
|
|
9
11
|
timeoutMs?: number;
|
|
10
12
|
toolErrorPolicy?: "return" | "pause" | "throw";
|
|
11
13
|
toolConcurrency?: "sequential" | "parallel";
|
|
@@ -16,6 +18,8 @@ export interface RunOptions {
|
|
|
16
18
|
generation?: GenerationConfig;
|
|
17
19
|
execution?: AgentExecutionConfig;
|
|
18
20
|
thinking?: ThinkingConfig;
|
|
21
|
+
/** Timeout for each model request in milliseconds; 0 means unlimited. Excludes tool/approval time. */
|
|
22
|
+
requestTimeoutMs?: number;
|
|
19
23
|
}
|
|
20
24
|
export interface ContinueOptions extends RunOptions {
|
|
21
25
|
targetMessageId?: string;
|
|
@@ -76,6 +80,8 @@ type SessionOptions<S extends SessionLike> = {
|
|
|
76
80
|
};
|
|
77
81
|
};
|
|
78
82
|
export type AgentOptions<S extends SessionLike = SessionLike> = ModelOptions & SessionOptions<S> & {
|
|
83
|
+
/** Per-model-request timeout; run options override this, then Generator defaults. 0 means unlimited. */
|
|
84
|
+
requestTimeoutMs?: number;
|
|
79
85
|
promptBuilder?: PromptBuilder;
|
|
80
86
|
toolkit?: ToolKit;
|
|
81
87
|
toolExecutor?: ToolExecutor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../../src/agent/Agent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../../src/agent/Agent.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/Agent.js
CHANGED
|
@@ -154,16 +154,16 @@ class Agent {
|
|
|
154
154
|
}
|
|
155
155
|
async execute(kind, options, target, instruction, carryThinking = false, resumedFrom) {
|
|
156
156
|
const config = { maxSteps: 10, ...this.options.execution, ...options.execution };
|
|
157
|
-
(0, data_1.assert)(Number.isSafeInteger(config.maxSteps) && config.maxSteps
|
|
157
|
+
(0, data_1.assert)(Number.isSafeInteger(config.maxSteps) && config.maxSteps >= 0, "maxSteps must be a non-negative integer (0 means unlimited)");
|
|
158
158
|
if (config.timeoutMs !== undefined)
|
|
159
|
-
(0, data_1.assert)(Number.isFinite(config.timeoutMs) && config.timeoutMs
|
|
159
|
+
(0, data_1.assert)(Number.isFinite(config.timeoutMs) && config.timeoutMs >= 0, "timeoutMs must be non-negative (0 means unlimited)");
|
|
160
160
|
const controller = new AbortController();
|
|
161
161
|
this.controller = controller;
|
|
162
162
|
const externalAbort = () => controller.abort(options.signal?.reason);
|
|
163
163
|
options.signal?.addEventListener("abort", externalAbort, { once: true });
|
|
164
164
|
if (options.signal?.aborted)
|
|
165
165
|
externalAbort();
|
|
166
|
-
const timer = config.timeoutMs
|
|
166
|
+
const timer = !config.timeoutMs ? undefined : setTimeout(() => controller.abort(new DOMException("Agent run timed out", "TimeoutError")), config.timeoutMs);
|
|
167
167
|
const session = this.session;
|
|
168
168
|
const trace = session.trace;
|
|
169
169
|
const turnId = resumedFrom ? trace.records.runs.find(r => r.id === resumedFrom)?.turnId : session.currentTurnId;
|
|
@@ -185,7 +185,7 @@ class Agent {
|
|
|
185
185
|
session.beginGeneration();
|
|
186
186
|
started = true;
|
|
187
187
|
await this.notify({ type: "runStarted", runId: run.id });
|
|
188
|
-
for (let index = 0; index < config.maxSteps; index++) {
|
|
188
|
+
for (let index = 0; config.maxSteps === 0 || index < config.maxSteps; index++) {
|
|
189
189
|
controller.signal.throwIfAborted();
|
|
190
190
|
session.assertGenerationUnchanged();
|
|
191
191
|
const step = trace.step(run.id);
|
|
@@ -195,7 +195,7 @@ class Agent {
|
|
|
195
195
|
const context = await (0, data_1.abortable)(this.promptBuilder.buildContext(input.messages, input.options), controller.signal);
|
|
196
196
|
await (0, data_1.abortable)(Promise.resolve(this.options.hooks?.beforeRequest?.(context, { runId: run.id, stepId })), controller.signal);
|
|
197
197
|
session.assertGenerationUnchanged();
|
|
198
|
-
const response = await this.generator.generate({ messages: context.messages, tools: this.toolExecutor.toolkit.definitions, generation: options.generation, signal: controller.signal, stream: options.stream,
|
|
198
|
+
const response = await this.generator.generate({ messages: context.messages, tools: this.toolExecutor.toolkit.definitions, generation: options.generation, signal: controller.signal, stream: options.stream, requestTimeoutMs: options.requestTimeoutMs ?? this.options.requestTimeoutMs,
|
|
199
199
|
thinking: { mode: "auto", scope: "tool_call", ...this.generator.options.thinking, ...this.options.thinking, ...options.thinking }, identity: { runId: run.id, stepId }, onEvent: event => this.notify(event) });
|
|
200
200
|
generated = response.message;
|
|
201
201
|
modelCompleted = true;
|
|
@@ -269,14 +269,17 @@ class Agent {
|
|
|
269
269
|
}
|
|
270
270
|
catch (error) {
|
|
271
271
|
const partial = error instanceof provider_1.GenerationError ? error.partial?.message : undefined;
|
|
272
|
-
const
|
|
272
|
+
const timedOut = (0, data_1.errorOf)(controller.signal.aborted ? controller.signal.reason : error instanceof provider_1.GenerationError ? error.cause : error).name === "TimeoutError";
|
|
273
|
+
const interrupted = controller.signal.aborted || timedOut;
|
|
273
274
|
let conflict = error instanceof session_1.SessionConflictError;
|
|
274
275
|
let unappliedPartial = partial;
|
|
275
276
|
if (stepId && !modelCompleted)
|
|
276
277
|
trace.updateStep(stepId, { status: interrupted ? "interrupted" : "failed", error: (0, data_1.errorOf)(error).message });
|
|
277
|
-
|
|
278
|
+
// Only the initial failed continuation segment rolls back. Later tool-loop steps
|
|
279
|
+
// create independent replies and retain partial output just like an ordinary run.
|
|
280
|
+
if (partial && !partial.isEmpty && (!target || !first || interrupted) && started && stepId) {
|
|
278
281
|
try {
|
|
279
|
-
const commitContext = { runId: run.id, stepId, operation: target && first ? "append" : "create", targetMessageId: target
|
|
282
|
+
const commitContext = { runId: run.id, stepId, operation: target && first ? "append" : "create", targetMessageId: target && first ? target.id : undefined };
|
|
280
283
|
const prepared = await this.prepareCommit(partial, commitContext);
|
|
281
284
|
const transformed = prepared.generated;
|
|
282
285
|
lastMessage = target && first ? session.appendContinuation(target.id, transformed, prepared.append) : session.appendGenerated(transformed);
|
|
@@ -309,13 +312,13 @@ class Agent {
|
|
|
309
312
|
catch { /* External edits take precedence over protocol repairs. */
|
|
310
313
|
}
|
|
311
314
|
}
|
|
312
|
-
result = { runId: run.id, turnId, status: interrupted ? "interrupted" : "failed", stopReason: conflict ? "conflict" : interrupted ?
|
|
315
|
+
result = { runId: run.id, turnId, status: interrupted ? "interrupted" : "failed", stopReason: conflict ? "conflict" : interrupted ? timedOut ? "timeout" : "abort" : error instanceof tool_1.ToolExecutionError ? "toolError" : (0, data_1.errorOf)(error).message.includes("maxSteps") ? "maxSteps" : "error", message: lastMessage, usage: trace.usage(run.id), error: (0, data_1.errorOf)(error), unapplied: generated ?? unappliedPartial, unappliedToolResults: unappliedToolResults.length ? unappliedToolResults : undefined };
|
|
313
316
|
}
|
|
314
317
|
finally {
|
|
315
318
|
if (started)
|
|
316
319
|
session.endGeneration();
|
|
317
320
|
toolEvents();
|
|
318
|
-
if (timer)
|
|
321
|
+
if (timer !== undefined)
|
|
319
322
|
clearTimeout(timer);
|
|
320
323
|
options.signal?.removeEventListener("abort", externalAbort);
|
|
321
324
|
this.controller = undefined;
|
package/dist/agent/Agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.js","sourceRoot":"","sources":["../../src/agent/Agent.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Agent.js","sourceRoot":"","sources":["../../src/agent/Agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ export interface GeneratorOptions {
|
|
|
14
14
|
model: string;
|
|
15
15
|
generation?: GenerationConfig;
|
|
16
16
|
thinking?: ThinkingConfig;
|
|
17
|
+
/** Timeout for one complete model request (including streaming), in milliseconds; 0 means unlimited. */
|
|
18
|
+
requestTimeoutMs?: number;
|
|
17
19
|
}
|
|
18
20
|
export interface GenerateInput {
|
|
19
21
|
messages: readonly Message[];
|
|
@@ -21,6 +23,8 @@ export interface GenerateInput {
|
|
|
21
23
|
generation?: GenerationConfig;
|
|
22
24
|
stream?: boolean;
|
|
23
25
|
signal?: AbortSignal;
|
|
26
|
+
/** Overrides the Generator's per-request timeout; 0 means unlimited. */
|
|
27
|
+
requestTimeoutMs?: number;
|
|
24
28
|
thinking?: ModelRequest["thinking"];
|
|
25
29
|
identity?: Partial<GenerationIdentity>;
|
|
26
30
|
onEvent?: (event: GenerationEvent) => unknown | Promise<unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAiC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACrK,MAAM,WAAW,kBAAkB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC;IAC/D,IAAI,EAAE,gBAAgB,GAAG,kBAAkB,CAAC;IAC5C,MAAM,CAAC,EAAE,aAAa,CAAC;CAC1B,GAAG,kBAAkB,CAAC,CAAC;AACxB,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC7B;AACD,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,KAAK,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAClC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACpE;AACD,2FAA2F;AAC3F,qBAAa,SAAS;IAEN,QAAQ,CAAC,OAAO,EAAE,gBAAgB;IAD9C,OAAO,CAAC,MAAM,CAAiC;gBAC1B,OAAO,EAAE,gBAAgB;IAG9C,EAAE,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,GAAG,MAAM,IAAI;IAGjG,eAAe,CAAC,SAAS,CAAC,EAAE,gBAAgB,GAAG,gBAAgB;IAazD,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAiC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACrK,MAAM,WAAW,kBAAkB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC;IAC/D,IAAI,EAAE,gBAAgB,GAAG,kBAAkB,CAAC;IAC5C,MAAM,CAAC,EAAE,aAAa,CAAC;CAC1B,GAAG,kBAAkB,CAAC,CAAC;AACxB,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,wGAAwG;IACxG,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AACD,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,KAAK,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAClC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,wEAAwE;IACxE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACpE;AACD,2FAA2F;AAC3F,qBAAa,SAAS;IAEN,QAAQ,CAAC,OAAO,EAAE,gBAAgB;IAD9C,OAAO,CAAC,MAAM,CAAiC;gBAC1B,OAAO,EAAE,gBAAgB;IAG9C,EAAE,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,GAAG,MAAM,IAAI;IAGjG,eAAe,CAAC,SAAS,CAAC,EAAE,gBAAgB,GAAG,gBAAgB;IAazD,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;CAoD/D"}
|
|
@@ -29,6 +29,8 @@ class Generator {
|
|
|
29
29
|
return config;
|
|
30
30
|
}
|
|
31
31
|
async generate(input) {
|
|
32
|
+
const requestTimeoutMs = input.requestTimeoutMs ?? this.options.requestTimeoutMs ?? 0;
|
|
33
|
+
(0, data_1.assert)(Number.isFinite(requestTimeoutMs) && requestTimeoutMs >= 0, "requestTimeoutMs must be non-negative (0 means unlimited)");
|
|
32
34
|
const identity = { runId: input.identity?.runId, stepId: input.identity?.stepId ?? (0, data_1.id)("step"), messageId: input.identity?.messageId ?? (0, data_1.id)("msg") };
|
|
33
35
|
const emit = async (event) => {
|
|
34
36
|
await this.events.emit(event);
|
|
@@ -37,11 +39,21 @@ class Generator {
|
|
|
37
39
|
const assign = (response) => ({ ...response, message: message_1.Message.fromJSON({ ...response.message.toJSON(), id: identity.messageId }) });
|
|
38
40
|
input.signal?.throwIfAborted();
|
|
39
41
|
await emit({ type: "messageStarted", ...identity });
|
|
42
|
+
const controller = requestTimeoutMs > 0 ? new AbortController() : undefined;
|
|
43
|
+
const signal = controller?.signal ?? input.signal;
|
|
44
|
+
const externalAbort = () => controller?.abort(input.signal?.reason);
|
|
45
|
+
if (controller) {
|
|
46
|
+
input.signal?.addEventListener("abort", externalAbort, { once: true });
|
|
47
|
+
if (input.signal?.aborted)
|
|
48
|
+
externalAbort();
|
|
49
|
+
}
|
|
50
|
+
const timer = controller ? setTimeout(() => controller.abort(new DOMException("Model request timed out", "TimeoutError")), requestTimeoutMs) : undefined;
|
|
40
51
|
const partial = message_1.Message.assistant();
|
|
41
52
|
let finished = false;
|
|
42
53
|
try {
|
|
54
|
+
signal?.throwIfAborted();
|
|
43
55
|
const thinking = this.options.thinking || input.thinking ? { ...this.options.thinking, ...input.thinking } : undefined;
|
|
44
|
-
const work = this.options.provider.generate({ model: this.options.model, messages: input.messages.map(m => m.snapshot()), tools: (0, data_1.copy)(input.tools), generation: this.effectiveConfig(input.generation), thinking }, { signal
|
|
56
|
+
const work = this.options.provider.generate({ model: this.options.model, messages: input.messages.map(m => m.snapshot()), tools: (0, data_1.copy)(input.tools), generation: this.effectiveConfig(input.generation), thinking }, { signal, stream: input.stream ?? true }, async (event) => {
|
|
45
57
|
if (finished)
|
|
46
58
|
return;
|
|
47
59
|
if (event.type === "textDelta")
|
|
@@ -51,19 +63,25 @@ class Generator {
|
|
|
51
63
|
await emit({ ...event, ...identity });
|
|
52
64
|
});
|
|
53
65
|
// Built-in HTTP providers retain native parser state while cancelling their reader.
|
|
54
|
-
const result = assign(await (this.options.provider instanceof provider_1.HttpProvider ? work : (0, data_1.abortable)(work,
|
|
66
|
+
const result = assign(await (this.options.provider instanceof provider_1.HttpProvider ? work : (0, data_1.abortable)(work, signal)));
|
|
67
|
+
if (timer !== undefined)
|
|
68
|
+
clearTimeout(timer);
|
|
55
69
|
await emit({ type: "messageGenerated", result, ...identity });
|
|
56
70
|
return result;
|
|
57
71
|
}
|
|
58
72
|
catch (error) {
|
|
59
73
|
if (error instanceof provider_1.GenerationError)
|
|
60
74
|
throw new provider_1.GenerationError(error.cause, error.partial ? assign(error.partial) : undefined);
|
|
61
|
-
if (
|
|
75
|
+
if (signal?.aborted && !partial.isEmpty)
|
|
62
76
|
throw new provider_1.GenerationError(error, assign({ message: partial }));
|
|
63
77
|
throw error;
|
|
64
78
|
}
|
|
65
79
|
finally {
|
|
66
80
|
finished = true;
|
|
81
|
+
if (timer !== undefined)
|
|
82
|
+
clearTimeout(timer);
|
|
83
|
+
if (controller)
|
|
84
|
+
input.signal?.removeEventListener("abort", externalAbort);
|
|
67
85
|
}
|
|
68
86
|
}
|
|
69
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":";;;AAAA,uCAAmE;AACnE,wCAAqC;AACrC,0CAAqK;
|
|
1
|
+
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"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"}
|
package/docs/API.md
CHANGED
|
@@ -119,7 +119,7 @@ generation 字段:temperature、topP、topK、maxOutputTokens、stop、frequen
|
|
|
119
119
|
|
|
120
120
|
不支持或统一/原生冲突的参数会报错;具体模型可能进一步限制取值。Anthropic 未指定输出上限时使用 4096。providerOptions 是平台扩展,不配置运行超时、审批或上下文;不能覆盖 model/messages/input/contents/tools/stream/system。框架不会自动重试模型请求。
|
|
121
121
|
|
|
122
|
-
transport 接收 `{url,method,headers,body?,signal,stream,purpose?}` 并返回标准 Response,支持 GET/POST/PUT/PATCH/DELETE 和 JSON、multipart、二进制 body。stream 始终为显式 boolean,内置聊天请求的 purpose 为 chat;子类可设置 image/audio/video/embedding/models/custom,未指定时基类采用 custom。这些字段是传输描述,不写入请求 body
|
|
122
|
+
transport 接收 `{url,method,headers,body?,signal,stream,purpose?}` 并返回标准 Response,支持 GET/POST/PUT/PATCH/DELETE 和 JSON、multipart、二进制 body。stream 始终为显式 boolean,内置聊天请求的 purpose 为 chat;子类可设置 image/audio/video/embedding/models/custom,未指定时基类采用 custom。这些字段是传输描述,不写入请求 body。3.0.1 起可用 Agent / Generator 的 requestTimeoutMs 限制单次完整模型请求,超时通过 signal 取消 transport,与 execution.timeoutMs 的整次运行预算分别处理。
|
|
123
123
|
|
|
124
124
|
业务可桥接代理/Tauri;流式 Response 的 body 需提供 Web ReadableStream。mediaResolver.resolve(url) 返回 `{base64,mimeType}`,可处理业务附件地址。浏览器默认 BrowserMediaResolver,本地文件解析器从 /node 导入 DefaultMediaResolver。
|
|
125
125
|
|
|
@@ -179,6 +179,7 @@ Executor 配置 approval=auto/manual/policy、approvalTimeoutMs、errorPolicy=re
|
|
|
179
179
|
const agent = new Agent({
|
|
180
180
|
provider, model: "your-model", session, promptBuilder, toolkit,
|
|
181
181
|
tools: { approval: "manual", approvalTimeoutMs: 60_000 },
|
|
182
|
+
requestTimeoutMs: 60_000,
|
|
182
183
|
execution: { maxSteps: 10, timeoutMs: 120_000, toolConcurrency: "sequential", toolErrorPolicy: "return" },
|
|
183
184
|
});
|
|
184
185
|
const result = await agent.chat("完成任务");
|
|
@@ -195,7 +196,9 @@ const result = await agent.chat("完成任务");
|
|
|
195
196
|
| abort(reason?) | 取消当前运行 |
|
|
196
197
|
| previewContext(options?) | 无消耗预览 run、continue 或 resume 请求上下文 |
|
|
197
198
|
|
|
198
|
-
options 支持 signal、stream、generation、execution、thinking。maxSteps 默认 10
|
|
199
|
+
options 支持 signal、stream、generation、execution、thinking、requestTimeoutMs。execution.maxSteps 默认 10,3.0.1 起 0 表示不限轮数;负数、非整数和非有限值无效。execution.timeoutMs 覆盖整次运行的模型、工具和审批等待,0 或不设置表示不限时。工具默认 sequential,也可 parallel,与 toolErrorPolicy 独立。return 将异常回传模型;pause/throw 保存失败工具结果后结束,应用决定是否 resume。审批拒绝是工具结果。
|
|
200
|
+
|
|
201
|
+
requestTimeoutMs 是单次完整模型请求(包括整段流式响应)的毫秒上限,不是流式空闲超时,也不包含提示词准备、工具或审批等待。每个模型步骤重新计时。优先级为单次 chat/run/continue/resume 选项 > Agent 配置 > Generator 配置;Generator.generate 也可直接覆盖默认值。0 明确关闭继承的请求超时,未配置则不限时。负数及非有限值无效。达到请求或总运行超时后,AgentResult.status 为 interrupted、stopReason 为 timeout;保留可提交的片段,编辑冲突时保留到 unapplied。调用方 signal 的取消仍然有效。
|
|
199
202
|
|
|
200
203
|
AgentResult 包含 runId/turnId?/status/stopReason/message?/usage/error?/unapplied?/unappliedToolResults?。失败、取消、超时、maxSteps、输出长度限制抛 AgentRunError,其 result 保存进度;lastRunState 保存最近结果。一个 Agent 或一个 Session 同时只允许一个活动 Agent 执行,重叠 chat 在添加输入前被拒绝。
|
|
201
204
|
|
package/docs/CE-FEEDBACK-3.0.md
CHANGED
|
@@ -126,7 +126,7 @@ roots 指定根节点顺序,children 指定兄弟顺序,nodes 表顺序不
|
|
|
126
126
|
|
|
127
127
|
## 传输与思考配置
|
|
128
128
|
|
|
129
|
-
transport 可直接用 request.stream / request.purpose 决定联网策略,不必解析平台 body 或 URL。执行预算 execution.timeoutMs
|
|
129
|
+
transport 可直接用 request.stream / request.purpose 决定联网策略,不必解析平台 body 或 URL。执行预算 execution.timeoutMs 仍涵盖整次模型、工具和审批等待。3.0.1 新增 requestTimeoutMs 限制单次完整模型请求(含流式),0 表示不限时;CE 原有只对非流式请求计时的策略可继续保留在自己的 transport 中。transport 应继续传递 signal。
|
|
130
130
|
|
|
131
131
|
```ts
|
|
132
132
|
const agent = new Agent({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@notic/agent-engine",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.1",
|
|
4
4
|
"description": "A lightweight, elegant, and feature-complete TypeScript AI Agent framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -13,37 +13,37 @@
|
|
|
13
13
|
"types": "./dist/provider/index.d.ts",
|
|
14
14
|
"default": "./dist/provider/index.js"
|
|
15
15
|
},
|
|
16
|
-
"./generator": {
|
|
17
|
-
"types": "./dist/generator/index.d.ts",
|
|
18
|
-
"default": "./dist/generator/index.js"
|
|
19
|
-
},
|
|
20
|
-
"./agent": {
|
|
21
|
-
"types": "./dist/agent/index.d.ts",
|
|
22
|
-
"default": "./dist/agent/index.js"
|
|
23
|
-
},
|
|
24
|
-
"./message": {
|
|
25
|
-
"types": "./dist/message/index.d.ts",
|
|
26
|
-
"default": "./dist/message/index.js"
|
|
27
|
-
},
|
|
28
|
-
"./session": {
|
|
29
|
-
"types": "./dist/session/index.d.ts",
|
|
30
|
-
"default": "./dist/session/index.js"
|
|
31
|
-
},
|
|
32
|
-
"./tool": {
|
|
33
|
-
"types": "./dist/tool/index.d.ts",
|
|
34
|
-
"default": "./dist/tool/index.js"
|
|
35
|
-
},
|
|
36
|
-
"./prompt": {
|
|
37
|
-
"types": "./dist/prompt/index.d.ts",
|
|
38
|
-
"default": "./dist/prompt/index.js"
|
|
39
|
-
},
|
|
40
|
-
"./legacy": {
|
|
41
|
-
"types": "./dist/legacy/index.d.ts",
|
|
42
|
-
"default": "./dist/legacy/index.js"
|
|
43
|
-
},
|
|
44
|
-
"./legacy/*": {
|
|
45
|
-
"types": "./dist/legacy/*/index.d.ts",
|
|
46
|
-
"default": "./dist/legacy/*/index.js"
|
|
16
|
+
"./generator": {
|
|
17
|
+
"types": "./dist/generator/index.d.ts",
|
|
18
|
+
"default": "./dist/generator/index.js"
|
|
19
|
+
},
|
|
20
|
+
"./agent": {
|
|
21
|
+
"types": "./dist/agent/index.d.ts",
|
|
22
|
+
"default": "./dist/agent/index.js"
|
|
23
|
+
},
|
|
24
|
+
"./message": {
|
|
25
|
+
"types": "./dist/message/index.d.ts",
|
|
26
|
+
"default": "./dist/message/index.js"
|
|
27
|
+
},
|
|
28
|
+
"./session": {
|
|
29
|
+
"types": "./dist/session/index.d.ts",
|
|
30
|
+
"default": "./dist/session/index.js"
|
|
31
|
+
},
|
|
32
|
+
"./tool": {
|
|
33
|
+
"types": "./dist/tool/index.d.ts",
|
|
34
|
+
"default": "./dist/tool/index.js"
|
|
35
|
+
},
|
|
36
|
+
"./prompt": {
|
|
37
|
+
"types": "./dist/prompt/index.d.ts",
|
|
38
|
+
"default": "./dist/prompt/index.js"
|
|
39
|
+
},
|
|
40
|
+
"./legacy": {
|
|
41
|
+
"types": "./dist/legacy/index.d.ts",
|
|
42
|
+
"default": "./dist/legacy/index.js"
|
|
43
|
+
},
|
|
44
|
+
"./legacy/*": {
|
|
45
|
+
"types": "./dist/legacy/*/index.d.ts",
|
|
46
|
+
"default": "./dist/legacy/*/index.js"
|
|
47
47
|
},
|
|
48
48
|
"./node": {
|
|
49
49
|
"types": "./dist/node.d.ts",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"build": "tsc",
|
|
63
63
|
"clean": "rimraf dist",
|
|
64
64
|
"test": "rimraf .test-dist && tsc -p tsconfig.test.json && node --test .test-dist/**/*.test.js && npm run test:browser && npm run test:exports",
|
|
65
|
-
"test:browser": "rimraf .browser-dist && esbuild ./test/browser-smoke.ts --bundle --platform=browser --format=esm --outfile=./.browser-dist/index.js && node test/browser-runtime.cjs",
|
|
65
|
+
"test:browser": "rimraf .browser-dist && esbuild ./test/browser-smoke.ts --bundle --platform=browser --format=esm --outfile=./.browser-dist/index.js && node test/browser-runtime.cjs",
|
|
66
66
|
"test:exports": "npm run clean && npm run build && node test/package-exports.cjs",
|
|
67
67
|
"test:real:deepseek": "rimraf .test-dist && tsc -p tsconfig.test.json && node --test .test-dist/test/agent/agent.real.test.js",
|
|
68
68
|
"prepublishOnly": "npm test && npm run clean && npm run build"
|
|
@@ -93,10 +93,10 @@
|
|
|
93
93
|
"engines": {
|
|
94
94
|
"node": ">=18.0.0"
|
|
95
95
|
},
|
|
96
|
-
"dependencies": {
|
|
97
|
-
"ajv": "^8.18.0",
|
|
98
|
-
"ajv-formats": "^3.0.1"
|
|
99
|
-
},
|
|
96
|
+
"dependencies": {
|
|
97
|
+
"ajv": "^8.18.0",
|
|
98
|
+
"ajv-formats": "^3.0.1"
|
|
99
|
+
},
|
|
100
100
|
"devDependencies": {
|
|
101
101
|
"@modelcontextprotocol/sdk": "^1.29.0",
|
|
102
102
|
"@modelcontextprotocol/server-filesystem": "^2026.1.14",
|