@n8n/agents 0.23.1 → 0.24.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/runtime/loop/runtime-helpers.js +26 -1
- package/dist/runtime/loop/runtime-helpers.js.map +1 -1
- package/dist/runtime/memory/memory-orchestrator.d.ts +5 -2
- package/dist/runtime/memory/memory-orchestrator.js +84 -15
- package/dist/runtime/memory/memory-orchestrator.js.map +1 -1
- package/dist/runtime/memory/observation-log-observer.d.ts +0 -5
- package/dist/runtime/memory/observation-log-observer.js +3 -6
- package/dist/runtime/memory/observation-log-observer.js.map +1 -1
- package/dist/runtime/model/messages.js +64 -35
- package/dist/runtime/model/messages.js.map +1 -1
- package/dist/runtime/model/model-factory.js +12 -2
- package/dist/runtime/model/model-factory.js.map +1 -1
- package/dist/runtime/model/provider-credentials.d.ts +24 -4
- package/dist/runtime/model/provider-credentials.js +24 -2
- package/dist/runtime/model/provider-credentials.js.map +1 -1
- package/dist/runtime/model/provider-quirks.d.ts +1 -0
- package/dist/runtime/model/provider-quirks.js +1 -0
- package/dist/runtime/model/provider-quirks.js.map +1 -1
- package/dist/runtime/streaming/stream-writer-guard.d.ts +1 -0
- package/dist/runtime/streaming/stream-writer-guard.js +5 -1
- package/dist/runtime/streaming/stream-writer-guard.js.map +1 -1
- package/dist/sdk/agent.d.ts +1 -0
- package/dist/sdk/agent.js +9 -2
- package/dist/sdk/agent.js.map +1 -1
- package/dist/sdk/mcp-client.js +5 -1
- package/dist/sdk/mcp-client.js.map +1 -1
- package/dist/workspace/sandbox/base-sandbox.d.ts +0 -1
- package/dist/workspace/sandbox/base-sandbox.js +2 -8
- package/dist/workspace/sandbox/base-sandbox.js.map +1 -1
- package/dist/workspace/sandbox/daytona-sandbox.js +2 -9
- package/dist/workspace/sandbox/daytona-sandbox.js.map +1 -1
- package/dist/workspace/sandbox/n8n-sandbox-sandbox.js +2 -9
- package/dist/workspace/sandbox/n8n-sandbox-sandbox.js.map +1 -1
- package/dist/workspace/sandbox/shell-command.d.ts +2 -0
- package/dist/workspace/sandbox/shell-command.js +13 -0
- package/dist/workspace/sandbox/shell-command.js.map +1 -0
- package/dist/workspace/scoped-workspace.js +6 -2
- package/dist/workspace/scoped-workspace.js.map +1 -1
- package/dist/workspace/tools/read-file.js +3 -1
- package/dist/workspace/tools/read-file.js.map +1 -1
- package/dist/workspace/tools/str-replace-file.js +3 -1
- package/dist/workspace/tools/str-replace-file.js.map +1 -1
- package/dist/workspace/tools/write-file.js +3 -1
- package/dist/workspace/tools/write-file.js.map +1 -1
- package/package.json +9 -9
|
@@ -27,7 +27,12 @@ ${lines}
|
|
|
27
27
|
If this affects the user's request, briefly let them know which server is unavailable.
|
|
28
28
|
</mcp-connection-status>`;
|
|
29
29
|
}
|
|
30
|
-
const EMPTY_RESPONSE_ERROR_FINISH_REASONS = new Set([
|
|
30
|
+
const EMPTY_RESPONSE_ERROR_FINISH_REASONS = new Set([
|
|
31
|
+
'length',
|
|
32
|
+
'other',
|
|
33
|
+
'unknown',
|
|
34
|
+
'content-filter',
|
|
35
|
+
]);
|
|
31
36
|
function hasActionableContent(messages) {
|
|
32
37
|
return messages.some((m) => 'content' in m &&
|
|
33
38
|
Array.isArray(m.content) &&
|
|
@@ -35,12 +40,29 @@ function hasActionableContent(messages) {
|
|
|
35
40
|
c.type === 'tool-call' ||
|
|
36
41
|
c.type === 'file'));
|
|
37
42
|
}
|
|
43
|
+
function hasReasoningContent(messages) {
|
|
44
|
+
return messages.some((message) => 'content' in message &&
|
|
45
|
+
Array.isArray(message.content) &&
|
|
46
|
+
message.content.some((content) => content.type === 'reasoning' || content.type === 'reasoning-file'));
|
|
47
|
+
}
|
|
38
48
|
function classifyModelTurnError(turn) {
|
|
39
49
|
if (hasActionableContent(turn.newMessages))
|
|
40
50
|
return undefined;
|
|
51
|
+
if (turn.aiFinishReason === 'stop' && hasReasoningContent(turn.newMessages)) {
|
|
52
|
+
return {
|
|
53
|
+
type: 'no_output',
|
|
54
|
+
message: 'The model finished without returning an answer. Try again or use another model.',
|
|
55
|
+
};
|
|
56
|
+
}
|
|
41
57
|
if (!EMPTY_RESPONSE_ERROR_FINISH_REASONS.has(turn.aiFinishReason))
|
|
42
58
|
return undefined;
|
|
43
59
|
const guidance = 'This can be a provider-side false positive — try rephrasing the message, clearing the chat history, or switching models.';
|
|
60
|
+
if (turn.aiFinishReason === 'length') {
|
|
61
|
+
return {
|
|
62
|
+
type: 'no_output',
|
|
63
|
+
message: 'The model reached its output token limit before it returned an answer. Reduce the request scope or use another model.',
|
|
64
|
+
};
|
|
65
|
+
}
|
|
44
66
|
if (turn.providerError) {
|
|
45
67
|
return {
|
|
46
68
|
type: turn.providerError.type,
|
|
@@ -57,6 +79,9 @@ function isEmptyModelTurn(turn) {
|
|
|
57
79
|
return false;
|
|
58
80
|
if (turn.structuredOutput !== undefined)
|
|
59
81
|
return false;
|
|
82
|
+
if (turn.errorReason && (turn.aiFinishReason === 'stop' || turn.aiFinishReason === 'length')) {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
60
85
|
if (turn.errorReason?.type === 'prompt_blocked')
|
|
61
86
|
return false;
|
|
62
87
|
return !hasActionableContent(turn.newMessages);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-helpers.js","sourceRoot":"","sources":["../../../src/runtime/loop/runtime-helpers.ts"],"names":[],"mappings":";;;;;;;;;;AAaA,wBAA+B,KAA8B;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAGD,wBAA+B,KAAc;IAC5C,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnF,CAAC;AASD,iCACC,QAA6C;IAE7C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1E,OAAO;;EAEN,KAAK;;yBAEkB,CAAC;AAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime-helpers.js","sourceRoot":"","sources":["../../../src/runtime/loop/runtime-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,8 @@ export declare class MemoryOrchestrator {
|
|
|
15
15
|
private readonly tokenCounter;
|
|
16
16
|
private memoryTasks;
|
|
17
17
|
private episodicMemoryTasksByResource;
|
|
18
|
-
private
|
|
18
|
+
private visibleTokenEstimates;
|
|
19
|
+
private visibleTokenEstimateTotal;
|
|
19
20
|
private midRunObserverTask;
|
|
20
21
|
private midRunNonAdvancingAttempts;
|
|
21
22
|
private lastPersistedTurnKeyset;
|
|
@@ -30,14 +31,16 @@ export declare class MemoryOrchestrator {
|
|
|
30
31
|
persistTurnDelta(list: AgentMessageList, options: (RunOptions & ExecutionOptions) | undefined): Promise<void>;
|
|
31
32
|
saveToMemory(list: AgentMessageList, options: (RunOptions & ExecutionOptions) | undefined): Promise<void>;
|
|
32
33
|
maybeObserveMidRun(list: AgentMessageList, options: (RunOptions & ExecutionOptions) | undefined): Promise<void>;
|
|
33
|
-
private
|
|
34
|
+
private resetRunState;
|
|
34
35
|
private noteMidRunObserverResult;
|
|
35
36
|
private observeMidRun;
|
|
36
37
|
private estimateVisibleBudget;
|
|
38
|
+
private pruneVisibleTokenEstimates;
|
|
37
39
|
private activateObservations;
|
|
38
40
|
applyObservationMask(list: AgentMessageList, persistence: AgentPersistenceOptions | undefined): Promise<void>;
|
|
39
41
|
private scheduleObserverTask;
|
|
40
42
|
private scheduleObservationLogJobs;
|
|
43
|
+
private shouldScheduleObserver;
|
|
41
44
|
private scheduleEpisodicMemoryJob;
|
|
42
45
|
private scheduleEpisodicMemoryTask;
|
|
43
46
|
private runEpisodicMemoryTask;
|
|
@@ -18,6 +18,32 @@ const DEFAULT_MEMORY_TASK_LOCK_TTL_MS = 30_000;
|
|
|
18
18
|
const MID_RUN_SOFT_THRESHOLD_RATIO = 0.7;
|
|
19
19
|
const MID_RUN_MAX_NON_ADVANCING_ATTEMPTS = 3;
|
|
20
20
|
const logger = (0, logger_1.createFilteredLogger)();
|
|
21
|
+
function stringifyForBudget(value) {
|
|
22
|
+
try {
|
|
23
|
+
return JSON.stringify(value) ?? '';
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
return '';
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
function serializeMessageForBudget(message) {
|
|
30
|
+
if (!('role' in message) || !Array.isArray(message.content))
|
|
31
|
+
return '';
|
|
32
|
+
const parts = [];
|
|
33
|
+
for (const content of message.content) {
|
|
34
|
+
if (content.type === 'text') {
|
|
35
|
+
parts.push(content.text);
|
|
36
|
+
}
|
|
37
|
+
else if (content.type === 'tool-call') {
|
|
38
|
+
parts.push(content.toolName, stringifyForBudget(content.input));
|
|
39
|
+
if (content.state === 'resolved')
|
|
40
|
+
parts.push(stringifyForBudget(content.output));
|
|
41
|
+
else if (content.state === 'rejected')
|
|
42
|
+
parts.push(content.error);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return parts.join('\n');
|
|
46
|
+
}
|
|
21
47
|
function hasFunctionProperty(value, property) {
|
|
22
48
|
return property in value && typeof Reflect.get(value, property) === 'function';
|
|
23
49
|
}
|
|
@@ -38,7 +64,8 @@ class MemoryOrchestrator {
|
|
|
38
64
|
this.runtimeTelemetry = runtimeTelemetry;
|
|
39
65
|
this.tokenCounter = tokenCounter;
|
|
40
66
|
this.episodicMemoryTasksByResource = new Map();
|
|
41
|
-
this.
|
|
67
|
+
this.visibleTokenEstimates = new Map();
|
|
68
|
+
this.visibleTokenEstimateTotal = 0;
|
|
42
69
|
this.midRunNonAdvancingAttempts = 0;
|
|
43
70
|
}
|
|
44
71
|
async loadHistoryMessages(persistence, telemetry) {
|
|
@@ -79,7 +106,7 @@ class MemoryOrchestrator {
|
|
|
79
106
|
return observations.length > 0;
|
|
80
107
|
}
|
|
81
108
|
async loadInto(list, options) {
|
|
82
|
-
this.
|
|
109
|
+
this.resetRunState();
|
|
83
110
|
if (this.config.memory && options?.persistence?.threadId) {
|
|
84
111
|
const telemetry = this.runtimeTelemetry.resolve(options);
|
|
85
112
|
const memMessages = await this.loadHistoryMessages(options.persistence, telemetry);
|
|
@@ -187,7 +214,7 @@ class MemoryOrchestrator {
|
|
|
187
214
|
return;
|
|
188
215
|
const telemetry = this.runtimeTelemetry.resolve(options);
|
|
189
216
|
await this.saveMessagesWithSpan(memory, options.persistence.threadId, options.persistence.resourceId, delta, telemetry);
|
|
190
|
-
const observationTasks = this.scheduleObservationLogJobs(options.persistence, options.executionCounter, telemetry);
|
|
217
|
+
const observationTasks = await this.scheduleObservationLogJobs(list, options.persistence, options.executionCounter, telemetry);
|
|
191
218
|
this.scheduleEpisodicMemoryJob(options.persistence, observationTasks, options.executionCounter, telemetry);
|
|
192
219
|
}
|
|
193
220
|
async maybeObserveMidRun(list, options) {
|
|
@@ -201,9 +228,11 @@ class MemoryOrchestrator {
|
|
|
201
228
|
});
|
|
202
229
|
}
|
|
203
230
|
}
|
|
204
|
-
|
|
231
|
+
resetRunState() {
|
|
205
232
|
this.midRunNonAdvancingAttempts = 0;
|
|
206
233
|
this.lastPersistedTurnKeyset = undefined;
|
|
234
|
+
this.visibleTokenEstimates.clear();
|
|
235
|
+
this.visibleTokenEstimateTotal = 0;
|
|
207
236
|
}
|
|
208
237
|
noteMidRunObserverResult(result, threadId) {
|
|
209
238
|
if (didAdvanceCursor(result)) {
|
|
@@ -268,7 +297,7 @@ class MemoryOrchestrator {
|
|
|
268
297
|
if (this.midRunObserverTask)
|
|
269
298
|
return;
|
|
270
299
|
await this.persistTurnDelta(list, options);
|
|
271
|
-
const handle = this.scheduleObserverTask(options.persistence, options.executionCounter, telemetry
|
|
300
|
+
const handle = this.scheduleObserverTask(options.persistence, options.executionCounter, telemetry);
|
|
272
301
|
if (!handle)
|
|
273
302
|
return;
|
|
274
303
|
const entry = { handle };
|
|
@@ -280,11 +309,22 @@ class MemoryOrchestrator {
|
|
|
280
309
|
async estimateVisibleBudget(list) {
|
|
281
310
|
const visible = list.llmVisibleMessages();
|
|
282
311
|
for (const message of visible) {
|
|
283
|
-
if (!this.
|
|
284
|
-
|
|
312
|
+
if (!this.visibleTokenEstimates.has(message.id)) {
|
|
313
|
+
const estimate = await this.tokenCounter(serializeMessageForBudget(message));
|
|
314
|
+
this.visibleTokenEstimates.set(message.id, estimate);
|
|
315
|
+
this.visibleTokenEstimateTotal += estimate;
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
return this.visibleTokenEstimateTotal;
|
|
319
|
+
}
|
|
320
|
+
pruneVisibleTokenEstimates(list) {
|
|
321
|
+
const visibleIds = new Set(list.llmVisibleMessages().map((message) => message.id));
|
|
322
|
+
for (const [messageId, estimate] of this.visibleTokenEstimates) {
|
|
323
|
+
if (!visibleIds.has(messageId)) {
|
|
324
|
+
this.visibleTokenEstimates.delete(messageId);
|
|
325
|
+
this.visibleTokenEstimateTotal -= estimate;
|
|
285
326
|
}
|
|
286
327
|
}
|
|
287
|
-
return visible.reduce((sum, m) => sum + (this.midRunTokenCounts.get(m.id) ?? 0), 0);
|
|
288
328
|
}
|
|
289
329
|
async activateObservations(list, persistence) {
|
|
290
330
|
const memory = this.config.memory;
|
|
@@ -294,10 +334,11 @@ class MemoryOrchestrator {
|
|
|
294
334
|
if (!cursor)
|
|
295
335
|
return;
|
|
296
336
|
list.maskObservedMessages(cursor);
|
|
337
|
+
this.pruneVisibleTokenEstimates(list);
|
|
297
338
|
await this.setListObservationLogMemory(list, persistence);
|
|
298
339
|
}
|
|
299
340
|
async applyObservationMask(list, persistence) {
|
|
300
|
-
this.
|
|
341
|
+
this.resetRunState();
|
|
301
342
|
const { memory, observationalMemory } = this.config;
|
|
302
343
|
if (!observationalMemory)
|
|
303
344
|
return;
|
|
@@ -310,7 +351,7 @@ class MemoryOrchestrator {
|
|
|
310
351
|
return;
|
|
311
352
|
list.maskObservedMessages(cursor);
|
|
312
353
|
}
|
|
313
|
-
scheduleObserverTask(persistence, executionCounter, telemetry
|
|
354
|
+
scheduleObserverTask(persistence, executionCounter, telemetry) {
|
|
314
355
|
const { memory, observationalMemory } = this.config;
|
|
315
356
|
if (!memory || !observationalMemory || !hasObservationLogObserverMemory(memory)) {
|
|
316
357
|
return undefined;
|
|
@@ -324,7 +365,6 @@ class MemoryOrchestrator {
|
|
|
324
365
|
return runner.schedule({ ...scope, taskKind: 'observer' }, async () => await (0, observation_log_observer_1.runObservationLogObserver)({
|
|
325
366
|
memory,
|
|
326
367
|
...scope,
|
|
327
|
-
observerThresholdTokens: effectiveThresholdTokens ?? observerThresholdTokens,
|
|
328
368
|
observationLogTailLimit: observationalMemory.observationLogTailLimit ?? 0,
|
|
329
369
|
observe,
|
|
330
370
|
tokenCounter: this.tokenCounter,
|
|
@@ -332,16 +372,30 @@ class MemoryOrchestrator {
|
|
|
332
372
|
telemetry,
|
|
333
373
|
}));
|
|
334
374
|
}
|
|
335
|
-
scheduleObservationLogJobs(persistence, executionCounter, telemetry) {
|
|
375
|
+
async scheduleObservationLogJobs(list, persistence, executionCounter, telemetry) {
|
|
336
376
|
const { memory, observationalMemory } = this.config;
|
|
337
377
|
if (!memory || !observationalMemory || !(0, observation_log_store_1.hasObservationLogStore)(memory))
|
|
338
378
|
return [];
|
|
339
379
|
const scope = this.getObservationLogScope(persistence);
|
|
340
380
|
const runner = this.getMemoryTaskRunner(memory, observationalMemory.lockTtlMs);
|
|
341
381
|
const tasks = [];
|
|
342
|
-
const
|
|
343
|
-
if (
|
|
344
|
-
|
|
382
|
+
const midRunTask = this.midRunObserverTask;
|
|
383
|
+
if (midRunTask?.result)
|
|
384
|
+
this.midRunObserverTask = undefined;
|
|
385
|
+
if (midRunTask &&
|
|
386
|
+
!midRunTask.result &&
|
|
387
|
+
midRunTask.handle.observationScopeId === scope.observationScopeId) {
|
|
388
|
+
tasks.push(midRunTask.handle.done);
|
|
389
|
+
void midRunTask.handle.done.then(() => {
|
|
390
|
+
if (this.midRunObserverTask === midRunTask)
|
|
391
|
+
this.midRunObserverTask = undefined;
|
|
392
|
+
});
|
|
393
|
+
}
|
|
394
|
+
else if (await this.shouldScheduleObserver(list, persistence.threadId)) {
|
|
395
|
+
const observerHandle = this.scheduleObserverTask(persistence, executionCounter, telemetry);
|
|
396
|
+
if (observerHandle)
|
|
397
|
+
tasks.push(observerHandle.done);
|
|
398
|
+
}
|
|
345
399
|
const reflect = observationalMemory.reflect;
|
|
346
400
|
const reflectorThresholdTokens = observationalMemory.reflectorThresholdTokens;
|
|
347
401
|
if (reflect && reflectorThresholdTokens !== undefined) {
|
|
@@ -357,6 +411,21 @@ class MemoryOrchestrator {
|
|
|
357
411
|
}
|
|
358
412
|
return tasks;
|
|
359
413
|
}
|
|
414
|
+
async shouldScheduleObserver(list, threadId) {
|
|
415
|
+
const observerThresholdTokens = this.config.observationalMemory?.observerThresholdTokens;
|
|
416
|
+
if (observerThresholdTokens === undefined)
|
|
417
|
+
return false;
|
|
418
|
+
try {
|
|
419
|
+
return (await this.estimateVisibleBudget(list)) >= observerThresholdTokens;
|
|
420
|
+
}
|
|
421
|
+
catch (error) {
|
|
422
|
+
logger.warn('Post-turn observer gating failed; skipping observation this turn', {
|
|
423
|
+
error,
|
|
424
|
+
threadId,
|
|
425
|
+
});
|
|
426
|
+
return false;
|
|
427
|
+
}
|
|
428
|
+
}
|
|
360
429
|
scheduleEpisodicMemoryJob(persistence, observationTasks, executionCounter, telemetry) {
|
|
361
430
|
const { memory, episodicMemory } = this.config;
|
|
362
431
|
if (!memory ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-orchestrator.js","sourceRoot":"","sources":["../../../src/runtime/memory/memory-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"memory-orchestrator.js","sourceRoot":"","sources":["../../../src/runtime/memory/memory-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,6 @@ export interface ObservationLogObserverMemory extends BuiltMemory, BuiltObservat
|
|
|
34
34
|
export interface RunObservationLogObserverOpts {
|
|
35
35
|
memory: ObservationLogObserverMemory;
|
|
36
36
|
observationScopeId: string;
|
|
37
|
-
observerThresholdTokens: number;
|
|
38
37
|
observationLogTailLimit: number;
|
|
39
38
|
observe: ObservationLogObserveFn;
|
|
40
39
|
tokenCounter?: TokenCounter;
|
|
@@ -46,10 +45,6 @@ export interface RunObservationLogObserverOpts {
|
|
|
46
45
|
export type RunObservationLogObserverResult = {
|
|
47
46
|
status: 'skipped';
|
|
48
47
|
reason: 'no-delta' | 'pending-tool-call';
|
|
49
|
-
} | {
|
|
50
|
-
status: 'skipped';
|
|
51
|
-
reason: 'below-threshold';
|
|
52
|
-
tokenCount: number;
|
|
53
48
|
} | {
|
|
54
49
|
status: 'ran';
|
|
55
50
|
observationsWritten: number;
|
|
@@ -102,9 +102,6 @@ async function runObservationLogObserver(opts) {
|
|
|
102
102
|
const tokenCounter = opts.tokenCounter ?? model_token_counter_1.estimateObservationTokens;
|
|
103
103
|
const transcript = renderObserverTranscript(observable);
|
|
104
104
|
const tokenCount = await tokenCounter(transcript);
|
|
105
|
-
if (tokenCount < opts.observerThresholdTokens) {
|
|
106
|
-
return { status: 'skipped', reason: 'below-threshold', tokenCount };
|
|
107
|
-
}
|
|
108
105
|
const observationLogTail = (await memory.getActiveObservationLog({
|
|
109
106
|
observationScopeId,
|
|
110
107
|
limit: opts.observationLogTailLimit,
|
|
@@ -206,7 +203,7 @@ function compactForObserver(value, options) {
|
|
|
206
203
|
if (isSensitiveKey(key)) {
|
|
207
204
|
result[key] = REDACTED_VALUE;
|
|
208
205
|
}
|
|
209
|
-
else if (shouldStripBlob(key, entryValue)) {
|
|
206
|
+
else if (shouldStripBlob(key, entryValue, maxStringChars)) {
|
|
210
207
|
result[key] = '[omitted large blob]';
|
|
211
208
|
}
|
|
212
209
|
else {
|
|
@@ -221,10 +218,10 @@ function compactForObserver(value, options) {
|
|
|
221
218
|
function isSensitiveKey(key) {
|
|
222
219
|
return SENSITIVE_KEY_PATTERN.test(key);
|
|
223
220
|
}
|
|
224
|
-
function shouldStripBlob(key, value) {
|
|
221
|
+
function shouldStripBlob(key, value, maxStringChars) {
|
|
225
222
|
if (typeof value !== 'string')
|
|
226
223
|
return false;
|
|
227
|
-
if (value.length <=
|
|
224
|
+
if (value.length <= maxStringChars)
|
|
228
225
|
return false;
|
|
229
226
|
return /blob|base64|data|file|image/i.test(key);
|
|
230
227
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observation-log-observer.js","sourceRoot":"","sources":["../../../src/runtime/memory/observation-log-observer.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAuD;AAEvD,yEAAkE;AAClE,qDAAkD;AAalD,sEAA4F;AAI5F,MAAM,eAAe,GAAyC;IAC7D,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;IACtB,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,YAAY;CACxB,CAAC;AAEF,MAAM,cAAc,GACnB,oFAAoF,CAAC;AACtF,MAAM,4BAA4B,GAAG,KAAK,CAAC;AAC3C,MAAM,wBAAwB,GAAG,GAAG,CAAC;AACrC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AACnC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AACnC,MAAM,cAAc,GAAG,YAAY,CAAC;AAKpC,MAAM,qBAAqB,GAAG,IAAI,MAAM,CACvC,gBAAgB,2BAAW,wEAAwE,EACnG,GAAG,CACH,CAAC;
|
|
1
|
+
{"version":3,"file":"observation-log-observer.js","sourceRoot":"","sources":["../../../src/runtime/memory/observation-log-observer.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,6 +85,11 @@ function hasReplayableReasoningProviderOptions(providerOptions) {
|
|
|
85
85
|
return hasEntries(options);
|
|
86
86
|
});
|
|
87
87
|
}
|
|
88
|
+
function isReasoningMergedByProvider(part) {
|
|
89
|
+
if (part.type !== 'reasoning')
|
|
90
|
+
return false;
|
|
91
|
+
return Object.keys(part.providerOptions ?? {}).some((namespace) => (0, provider_quirks_1.getProviderQuirks)(namespace).mergesAdjacentAssistantMessages === true);
|
|
92
|
+
}
|
|
88
93
|
function isContentToolResultOutput(value) {
|
|
89
94
|
return ((0, is_record_1.isRecord)(value) &&
|
|
90
95
|
value.type === 'content' &&
|
|
@@ -211,7 +216,9 @@ function toolCallToResultPart(block) {
|
|
|
211
216
|
type: 'tool-result',
|
|
212
217
|
toolCallId: block.toolCallId,
|
|
213
218
|
toolName: block.toolName,
|
|
214
|
-
output:
|
|
219
|
+
output: block.providerExecuted
|
|
220
|
+
? { type: 'error-json', value: errorValue }
|
|
221
|
+
: { type: 'error-text', value: errorValue },
|
|
215
222
|
};
|
|
216
223
|
}
|
|
217
224
|
return {
|
|
@@ -323,7 +330,10 @@ function toAiMessageList(msg) {
|
|
|
323
330
|
...(block.providerOptions && { providerOptions: block.providerOptions }),
|
|
324
331
|
});
|
|
325
332
|
const resultPart = toolCallToResultPart(block);
|
|
326
|
-
|
|
333
|
+
if (block.providerExecuted)
|
|
334
|
+
assistantParts.push(resultPart);
|
|
335
|
+
else
|
|
336
|
+
resultMessages.push({ role: 'tool', content: [resultPart] });
|
|
327
337
|
}
|
|
328
338
|
else {
|
|
329
339
|
const part = toAiContent(block);
|
|
@@ -355,45 +365,62 @@ function toAiMessageList(msg) {
|
|
|
355
365
|
}
|
|
356
366
|
}
|
|
357
367
|
function toAiMessages(messages) {
|
|
358
|
-
|
|
368
|
+
const modelMessages = messages.flatMap(toAiMessageList);
|
|
369
|
+
const result = [];
|
|
370
|
+
for (const [index, message] of modelMessages.entries()) {
|
|
371
|
+
if (message.role !== 'assistant' ||
|
|
372
|
+
typeof message.content === 'string' ||
|
|
373
|
+
modelMessages[index + 1]?.role !== 'assistant') {
|
|
374
|
+
result.push(message);
|
|
375
|
+
continue;
|
|
376
|
+
}
|
|
377
|
+
const content = message.content.filter((part) => !isReasoningMergedByProvider(part));
|
|
378
|
+
if (content.length > 0)
|
|
379
|
+
result.push({ ...message, content });
|
|
380
|
+
}
|
|
381
|
+
return result;
|
|
359
382
|
}
|
|
360
383
|
function fromAiMessages(messages) {
|
|
361
384
|
const toolCallIndex = new Map();
|
|
362
385
|
const result = [];
|
|
386
|
+
const settleToolCalls = (parts) => {
|
|
387
|
+
for (const part of parts) {
|
|
388
|
+
if (part.type !== 'tool-result')
|
|
389
|
+
continue;
|
|
390
|
+
const block = toolCallIndex.get(part.toolCallId);
|
|
391
|
+
if (!block)
|
|
392
|
+
continue;
|
|
393
|
+
const { output } = part;
|
|
394
|
+
if (output.type === 'json' || output.type === 'text') {
|
|
395
|
+
const mutableBlock = block;
|
|
396
|
+
mutableBlock.state = 'resolved';
|
|
397
|
+
mutableBlock.output = output.value;
|
|
398
|
+
}
|
|
399
|
+
else if (output.type === 'content') {
|
|
400
|
+
const mutableBlock = block;
|
|
401
|
+
mutableBlock.state = 'resolved';
|
|
402
|
+
mutableBlock.output = output;
|
|
403
|
+
}
|
|
404
|
+
else if (output.type === 'error-json') {
|
|
405
|
+
const mutableBlock = block;
|
|
406
|
+
mutableBlock.state = 'rejected';
|
|
407
|
+
mutableBlock.error = JSON.stringify(output.value);
|
|
408
|
+
}
|
|
409
|
+
else if (output.type === 'error-text') {
|
|
410
|
+
const mutableBlock = block;
|
|
411
|
+
mutableBlock.state = 'rejected';
|
|
412
|
+
mutableBlock.error = output.value;
|
|
413
|
+
}
|
|
414
|
+
else {
|
|
415
|
+
const mutableBlock = block;
|
|
416
|
+
mutableBlock.state = 'rejected';
|
|
417
|
+
mutableBlock.error = JSON.stringify(output);
|
|
418
|
+
}
|
|
419
|
+
}
|
|
420
|
+
};
|
|
363
421
|
for (const msg of messages) {
|
|
364
422
|
if (msg.role === 'tool') {
|
|
365
|
-
|
|
366
|
-
for (const part of toolParts) {
|
|
367
|
-
const block = toolCallIndex.get(part.toolCallId);
|
|
368
|
-
if (!block)
|
|
369
|
-
continue;
|
|
370
|
-
const { output } = part;
|
|
371
|
-
if (output.type === 'json' || output.type === 'text') {
|
|
372
|
-
const mutableBlock = block;
|
|
373
|
-
mutableBlock.state = 'resolved';
|
|
374
|
-
mutableBlock.output = output.value;
|
|
375
|
-
}
|
|
376
|
-
else if (output.type === 'content') {
|
|
377
|
-
const mutableBlock = block;
|
|
378
|
-
mutableBlock.state = 'resolved';
|
|
379
|
-
mutableBlock.output = output;
|
|
380
|
-
}
|
|
381
|
-
else if (output.type === 'error-json') {
|
|
382
|
-
const mutableBlock = block;
|
|
383
|
-
mutableBlock.state = 'rejected';
|
|
384
|
-
mutableBlock.error = JSON.stringify(output.value);
|
|
385
|
-
}
|
|
386
|
-
else if (output.type === 'error-text') {
|
|
387
|
-
const mutableBlock = block;
|
|
388
|
-
mutableBlock.state = 'rejected';
|
|
389
|
-
mutableBlock.error = output.value;
|
|
390
|
-
}
|
|
391
|
-
else {
|
|
392
|
-
const mutableBlock = block;
|
|
393
|
-
mutableBlock.state = 'rejected';
|
|
394
|
-
mutableBlock.error = JSON.stringify(output);
|
|
395
|
-
}
|
|
396
|
-
}
|
|
423
|
+
settleToolCalls(msg.content);
|
|
397
424
|
continue;
|
|
398
425
|
}
|
|
399
426
|
const rawContent = msg.content;
|
|
@@ -411,6 +438,8 @@ function fromAiMessages(messages) {
|
|
|
411
438
|
toolCallIndex.set(block.toolCallId, block);
|
|
412
439
|
}
|
|
413
440
|
}
|
|
441
|
+
if (typeof rawContent !== 'string')
|
|
442
|
+
settleToolCalls(rawContent);
|
|
414
443
|
}
|
|
415
444
|
}
|
|
416
445
|
return result;
|