@deepagents/context 7.7.2 → 7.8.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/README.md +1 -1
- package/dist/browser.js +28 -15
- package/dist/browser.js.map +2 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +133 -126
- package/dist/index.js.map +4 -4
- package/dist/lib/agent.d.ts +6 -1
- package/dist/lib/agent.d.ts.map +1 -1
- package/dist/lib/chat.d.ts +7 -1
- package/dist/lib/chat.d.ts.map +1 -1
- package/dist/lib/engine.d.ts +27 -16
- package/dist/lib/engine.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/tool.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/turn.d.ts.map +1 -1
- package/dist/lib/fragments.d.ts.map +1 -1
- package/dist/lib/store/postgres-transaction.d.ts +8 -0
- package/dist/lib/store/postgres-transaction.d.ts.map +1 -0
- package/dist/lib/store/postgres.store.d.ts.map +1 -1
- package/dist/lib/store/sqlite.store.d.ts.map +1 -1
- package/dist/lib/stream/postgres.stream-store.d.ts.map +1 -1
- package/dist/lib/tracing/batch-processor.d.ts +2 -1
- package/dist/lib/tracing/batch-processor.d.ts.map +1 -1
- package/dist/lib/tracing/exporter.d.ts +4 -1
- package/dist/lib/tracing/exporter.d.ts.map +1 -1
- package/dist/lib/tracing/index.js +14 -9
- package/dist/lib/tracing/index.js.map +2 -2
- package/dist/lib/tracing/openai-traces-integration.d.ts.map +1 -1
- package/package.json +8 -8
package/dist/index.d.ts
CHANGED
|
@@ -27,6 +27,7 @@ export * from './lib/skills/index.ts';
|
|
|
27
27
|
export * from './lib/soul/fragments.ts';
|
|
28
28
|
export * from './lib/store/memory.store.ts';
|
|
29
29
|
export * from './lib/store/postgres-schema-lock.ts';
|
|
30
|
+
export * from './lib/store/postgres-transaction.ts';
|
|
30
31
|
export * from './lib/store/postgres.store.ts';
|
|
31
32
|
export * from './lib/store/sqlite.store.ts';
|
|
32
33
|
export * from './lib/store/sqlserver.store.ts';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,sCAAsC,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uCAAuC,CAAC;AACtD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+CAA+C,CAAC;AAC9D,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,sCAAsC,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uCAAuC,CAAC;AACtD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+CAA+C,CAAC;AAC9D,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -216,24 +216,37 @@ function fragment(name, ...children) {
|
|
|
216
216
|
data: children
|
|
217
217
|
};
|
|
218
218
|
}
|
|
219
|
-
function
|
|
220
|
-
const
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
if (
|
|
224
|
-
const
|
|
225
|
-
if (
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
219
|
+
function withReasoningItemsGrouped(message2) {
|
|
220
|
+
const partsByItemId = /* @__PURE__ */ new Map();
|
|
221
|
+
for (const part of message2.parts) {
|
|
222
|
+
const itemId = reasoningItemIdOf(part);
|
|
223
|
+
if (itemId === void 0) continue;
|
|
224
|
+
const itemParts = partsByItemId.get(itemId);
|
|
225
|
+
if (itemParts) {
|
|
226
|
+
itemParts.push(part);
|
|
227
|
+
} else {
|
|
228
|
+
partsByItemId.set(itemId, [part]);
|
|
229
229
|
}
|
|
230
|
-
|
|
231
|
-
|
|
230
|
+
}
|
|
231
|
+
if (partsByItemId.values().every((itemParts) => itemParts.length === 1)) {
|
|
232
|
+
return message2;
|
|
233
|
+
}
|
|
234
|
+
const parts = message2.parts.flatMap((part) => {
|
|
235
|
+
const itemId = reasoningItemIdOf(part);
|
|
236
|
+
if (itemId === void 0) return [part];
|
|
237
|
+
const itemParts = partsByItemId.get(itemId) ?? [];
|
|
238
|
+
partsByItemId.delete(itemId);
|
|
239
|
+
return itemParts;
|
|
232
240
|
});
|
|
233
|
-
return
|
|
241
|
+
return { ...message2, parts };
|
|
242
|
+
}
|
|
243
|
+
function reasoningItemIdOf(part) {
|
|
244
|
+
if (part.type !== "reasoning") return void 0;
|
|
245
|
+
const itemId = part.providerMetadata?.openai?.itemId;
|
|
246
|
+
return typeof itemId === "string" ? itemId : void 0;
|
|
234
247
|
}
|
|
235
248
|
function assistant(message2) {
|
|
236
|
-
const normalized =
|
|
249
|
+
const normalized = withReasoningItemsGrouped(message2);
|
|
237
250
|
return {
|
|
238
251
|
id: normalized.id,
|
|
239
252
|
name: "assistant",
|
|
@@ -380,10 +393,10 @@ var Agent = class _Agent {
|
|
|
380
393
|
}),
|
|
381
394
|
stopWhen: this.#options.stopWhen ?? DEFAULT_STOP_WHEN,
|
|
382
395
|
prepareStep: this.#withPrepareStep(
|
|
383
|
-
this.#options.context.
|
|
396
|
+
this.#options.context.createReminderSession({
|
|
384
397
|
steer: false,
|
|
385
398
|
sandbox: this.#options.sandbox
|
|
386
|
-
})
|
|
399
|
+
}).prepareStep
|
|
387
400
|
),
|
|
388
401
|
experimental_sandbox: this.#options.sandbox.sandbox,
|
|
389
402
|
tools: this.tools,
|
|
@@ -417,12 +430,11 @@ var Agent = class _Agent {
|
|
|
417
430
|
if (!this.#options.model) {
|
|
418
431
|
throw new Error(`Agent ${this.#options.name} is missing a model.`);
|
|
419
432
|
}
|
|
420
|
-
const
|
|
421
|
-
this.#options.
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
);
|
|
433
|
+
const reminders = this.#options.context.createReminderSession({
|
|
434
|
+
additionalInput: this.#options.prepareStepInput,
|
|
435
|
+
sandbox: this.#options.sandbox
|
|
436
|
+
});
|
|
437
|
+
const prepareStep = this.#withPrepareStep(reminders.prepareStep);
|
|
426
438
|
const result = await this.#createRawStream(
|
|
427
439
|
options?.toolsContext,
|
|
428
440
|
options,
|
|
@@ -431,6 +443,7 @@ var Agent = class _Agent {
|
|
|
431
443
|
if (this.#guardrails.length === 0) {
|
|
432
444
|
return {
|
|
433
445
|
result,
|
|
446
|
+
reminders,
|
|
434
447
|
toUIMessageStream: (uiOptions) => toUIMessageStream({
|
|
435
448
|
stream: result.stream,
|
|
436
449
|
tools: this.tools,
|
|
@@ -440,11 +453,13 @@ var Agent = class _Agent {
|
|
|
440
453
|
}
|
|
441
454
|
return {
|
|
442
455
|
result,
|
|
456
|
+
reminders,
|
|
443
457
|
toUIMessageStream: this.#guardedUIMessageStream(
|
|
444
458
|
result,
|
|
445
459
|
options?.toolsContext,
|
|
446
|
-
|
|
447
|
-
prepareStep
|
|
460
|
+
reminders,
|
|
461
|
+
prepareStep,
|
|
462
|
+
options
|
|
448
463
|
)
|
|
449
464
|
};
|
|
450
465
|
}
|
|
@@ -499,9 +514,7 @@ var Agent = class _Agent {
|
|
|
499
514
|
}),
|
|
500
515
|
repairToolCall: createRepairToolCall(model, config?.abortSignal),
|
|
501
516
|
stopWhen: this.#options.stopWhen ?? DEFAULT_STOP_WHEN,
|
|
502
|
-
prepareStep
|
|
503
|
-
sandbox: this.#options.sandbox
|
|
504
|
-
}),
|
|
517
|
+
prepareStep,
|
|
505
518
|
experimental_transform: config?.transform ?? smoothStream(),
|
|
506
519
|
experimental_sandbox: this.#options.sandbox.sandbox,
|
|
507
520
|
tools: this.tools,
|
|
@@ -518,7 +531,7 @@ var Agent = class _Agent {
|
|
|
518
531
|
* 2. A finish-step is emitted, triggering onStepEnd to persist the self-correction
|
|
519
532
|
* 3. A new stream is started and the model continues from the correction
|
|
520
533
|
*/
|
|
521
|
-
#guardedUIMessageStream(result, toolsContext,
|
|
534
|
+
#guardedUIMessageStream(result, toolsContext, reminders, prepareStep, config) {
|
|
522
535
|
const maxRetries = config?.maxRetries ?? this.#options.maxGuardrailRetries ?? 3;
|
|
523
536
|
const context = this.#options.context;
|
|
524
537
|
if (!context) {
|
|
@@ -533,7 +546,7 @@ var Agent = class _Agent {
|
|
|
533
546
|
if (!stepSaved) return;
|
|
534
547
|
const head = await context.headMessage();
|
|
535
548
|
if (head?.name === "assistant") {
|
|
536
|
-
await
|
|
549
|
+
await reminders.writeAssistantSegment(responseMessage);
|
|
537
550
|
} else {
|
|
538
551
|
const message2 = assistantMsgId ? { ...responseMessage, id: assistantMsgId } : responseMessage;
|
|
539
552
|
context.set(assistant(message2));
|
|
@@ -866,7 +879,7 @@ import {
|
|
|
866
879
|
NoSuchToolError,
|
|
867
880
|
ToolCallRepairError,
|
|
868
881
|
createUIMessageStream as createUIMessageStream2,
|
|
869
|
-
isToolUIPart
|
|
882
|
+
isToolUIPart as isToolUIPart2
|
|
870
883
|
} from "ai";
|
|
871
884
|
|
|
872
885
|
// packages/context/src/lib/fragments/reminders/src/reminders.ts
|
|
@@ -2235,7 +2248,10 @@ function once(id) {
|
|
|
2235
2248
|
}
|
|
2236
2249
|
|
|
2237
2250
|
// packages/context/src/lib/fragments/reminders/src/predicates/tool.ts
|
|
2238
|
-
import {
|
|
2251
|
+
import {
|
|
2252
|
+
getToolName,
|
|
2253
|
+
isToolUIPart
|
|
2254
|
+
} from "ai";
|
|
2239
2255
|
var COMPLETED_STATES = /* @__PURE__ */ new Set([
|
|
2240
2256
|
"input-available",
|
|
2241
2257
|
"output-available",
|
|
@@ -2244,12 +2260,9 @@ var COMPLETED_STATES = /* @__PURE__ */ new Set([
|
|
|
2244
2260
|
function matchesName(spec, name) {
|
|
2245
2261
|
return typeof spec === "function" ? spec(name) : spec === name;
|
|
2246
2262
|
}
|
|
2247
|
-
function toolNameOf(part) {
|
|
2248
|
-
return part.type.slice("tool-".length);
|
|
2249
|
-
}
|
|
2250
2263
|
function toolPartsOf(message2) {
|
|
2251
2264
|
if (!message2) return [];
|
|
2252
|
-
return message2.parts.filter(
|
|
2265
|
+
return message2.parts.filter(isToolUIPart);
|
|
2253
2266
|
}
|
|
2254
2267
|
function toolCall(options) {
|
|
2255
2268
|
return (ctx) => {
|
|
@@ -2260,7 +2273,7 @@ function toolCall(options) {
|
|
|
2260
2273
|
} else if (!COMPLETED_STATES.has(part.state)) {
|
|
2261
2274
|
return false;
|
|
2262
2275
|
}
|
|
2263
|
-
if (options.name !== void 0 && !matchesName(options.name,
|
|
2276
|
+
if (options.name !== void 0 && !matchesName(options.name, getToolName(part))) {
|
|
2264
2277
|
return false;
|
|
2265
2278
|
}
|
|
2266
2279
|
if (options.input && !options.input(part.input)) {
|
|
@@ -2272,8 +2285,7 @@ function toolCall(options) {
|
|
|
2272
2285
|
}
|
|
2273
2286
|
if (options.errorText) {
|
|
2274
2287
|
if (part.state !== "output-error") return false;
|
|
2275
|
-
|
|
2276
|
-
if (!options.errorText(text3)) return false;
|
|
2288
|
+
if (!options.errorText(part.errorText)) return false;
|
|
2277
2289
|
}
|
|
2278
2290
|
return true;
|
|
2279
2291
|
});
|
|
@@ -2324,7 +2336,7 @@ function toolCallCount(name, spec) {
|
|
|
2324
2336
|
assertCountSpec(spec);
|
|
2325
2337
|
return (ctx) => {
|
|
2326
2338
|
const count = toolPartsOf(ctx.lastAssistantMessage).filter(
|
|
2327
|
-
(part) => COMPLETED_STATES.has(part.state) && matchesName(name,
|
|
2339
|
+
(part) => COMPLETED_STATES.has(part.state) && matchesName(name, getToolName(part))
|
|
2328
2340
|
).length;
|
|
2329
2341
|
return checkCount(count, spec);
|
|
2330
2342
|
};
|
|
@@ -2341,7 +2353,7 @@ function everyNToolCalls(n) {
|
|
|
2341
2353
|
}
|
|
2342
2354
|
function toolFailureStreak(ctx, name) {
|
|
2343
2355
|
const parts = (ctx.lastAssistantMessages ?? []).flatMap(
|
|
2344
|
-
(message2) => toolPartsOf(message2).filter((part) => matchesName(name,
|
|
2356
|
+
(message2) => toolPartsOf(message2).filter((part) => matchesName(name, getToolName(part)))
|
|
2345
2357
|
);
|
|
2346
2358
|
let streak = 0;
|
|
2347
2359
|
for (const part of parts.toReversed()) {
|
|
@@ -2357,6 +2369,9 @@ function toolFailedStreak(name, spec) {
|
|
|
2357
2369
|
|
|
2358
2370
|
// packages/context/src/lib/fragments/reminders/src/predicates/turn.ts
|
|
2359
2371
|
function everyNTurns(n) {
|
|
2372
|
+
if (!Number.isInteger(n) || n < 1) {
|
|
2373
|
+
throw new Error("everyNTurns(n) requires a positive integer");
|
|
2374
|
+
}
|
|
2360
2375
|
return ({ turn }) => turn % n === 0;
|
|
2361
2376
|
}
|
|
2362
2377
|
function first() {
|
|
@@ -2658,7 +2673,7 @@ import { getErrorMessage } from "@ai-sdk/provider";
|
|
|
2658
2673
|
import {
|
|
2659
2674
|
convertToModelMessages as convertToModelMessages2,
|
|
2660
2675
|
generateId as generateId5,
|
|
2661
|
-
isStaticToolUIPart
|
|
2676
|
+
isStaticToolUIPart,
|
|
2662
2677
|
validateUIMessages
|
|
2663
2678
|
} from "ai";
|
|
2664
2679
|
import pMemoize2 from "p-memoize";
|
|
@@ -3292,7 +3307,7 @@ var SavePipeline = class _SavePipeline {
|
|
|
3292
3307
|
|
|
3293
3308
|
// packages/context/src/lib/store/sqlite.store.ts
|
|
3294
3309
|
import { Declaration } from "@zukhruf/sqlite-drift";
|
|
3295
|
-
import { open } from "@zukhruf/sqlite-open";
|
|
3310
|
+
import { SQLITE_ERROR, open, sqliteResultCode } from "@zukhruf/sqlite-open";
|
|
3296
3311
|
import { transaction } from "@zukhruf/sqlite-transaction";
|
|
3297
3312
|
import { z as z4 } from "zod";
|
|
3298
3313
|
|
|
@@ -3532,7 +3547,7 @@ var SearchQuerySyntaxError = class extends Error {
|
|
|
3532
3547
|
}
|
|
3533
3548
|
};
|
|
3534
3549
|
function isFts5QueryError(error) {
|
|
3535
|
-
return Error.isError(error) &&
|
|
3550
|
+
return Error.isError(error) && sqliteResultCode(error)?.extendedCode === SQLITE_ERROR && /^(fts5: syntax error near |no such column: |unterminated string$|unknown special query: |expected integer, got )/.test(
|
|
3536
3551
|
error.message
|
|
3537
3552
|
);
|
|
3538
3553
|
}
|
|
@@ -4136,7 +4151,7 @@ function terminalToolPartsFromStep(content) {
|
|
|
4136
4151
|
function mergeTerminalToolParts(message2, liveParts) {
|
|
4137
4152
|
const remaining = new Map(liveParts);
|
|
4138
4153
|
const parts = message2.parts.map((part) => {
|
|
4139
|
-
if (!
|
|
4154
|
+
if (!isStaticToolUIPart(part)) return part;
|
|
4140
4155
|
remaining.delete(part.toolCallId);
|
|
4141
4156
|
return part;
|
|
4142
4157
|
});
|
|
@@ -4534,15 +4549,11 @@ var ContextEngine = class _ContextEngine {
|
|
|
4534
4549
|
}
|
|
4535
4550
|
}
|
|
4536
4551
|
/**
|
|
4537
|
-
*
|
|
4538
|
-
*
|
|
4539
|
-
|
|
4540
|
-
|
|
4541
|
-
|
|
4542
|
-
* Build the `prepareStep` hook that injects reminders between model steps.
|
|
4543
|
-
* Tool-output reminders are evaluated against the preceding step's completed
|
|
4544
|
-
* tool results and appended after the SDK's tool-result message. Steer
|
|
4545
|
-
* reminders share the same synthetic user message when both fire together.
|
|
4552
|
+
* Open the reminder session of one model stream. Its `prepareStep` injects
|
|
4553
|
+
* reminders between model steps: tool-output reminders are evaluated against
|
|
4554
|
+
* the preceding step's completed tool results and appended after the SDK's
|
|
4555
|
+
* tool-result message, and steer reminders share the same synthetic user
|
|
4556
|
+
* message when both fire together.
|
|
4546
4557
|
*
|
|
4547
4558
|
* Each eligible boundary evaluates its reminders independently. A predicate
|
|
4548
4559
|
* that remains true fires at every boundary; compose `once()` when a durable
|
|
@@ -4550,12 +4561,11 @@ var ContextEngine = class _ContextEngine {
|
|
|
4550
4561
|
* subsequent steps.
|
|
4551
4562
|
*
|
|
4552
4563
|
* Each injected input is persisted with a following assistant placeholder
|
|
4553
|
-
* before prepareStep returns. writeAssistantSegment fills
|
|
4554
|
-
* so process loss cannot make a delivered reminder eligible
|
|
4555
|
-
* requests reproduce the exact prompt prefix the model saw.
|
|
4564
|
+
* before `prepareStep` returns. The session's `writeAssistantSegment` fills
|
|
4565
|
+
* that placeholder, so process loss cannot make a delivered reminder eligible
|
|
4566
|
+
* again and later requests reproduce the exact prompt prefix the model saw.
|
|
4556
4567
|
*/
|
|
4557
|
-
|
|
4558
|
-
const enableSteer = options.steer ?? true;
|
|
4568
|
+
createReminderSession(options = {}) {
|
|
4559
4569
|
const session = {
|
|
4560
4570
|
firedOnceIds: /* @__PURE__ */ new Set(),
|
|
4561
4571
|
terminalToolParts: /* @__PURE__ */ new Map(),
|
|
@@ -4564,8 +4574,12 @@ var ContextEngine = class _ContextEngine {
|
|
|
4564
4574
|
stepOffset: 0,
|
|
4565
4575
|
lastStepNumber: null
|
|
4566
4576
|
};
|
|
4567
|
-
|
|
4568
|
-
|
|
4577
|
+
const enableSteer = options.steer ?? true;
|
|
4578
|
+
const prepareStep = async ({
|
|
4579
|
+
steps,
|
|
4580
|
+
stepNumber,
|
|
4581
|
+
messages
|
|
4582
|
+
}) => {
|
|
4569
4583
|
if (stepNumber === 0 && session.lastStepNumber !== null) {
|
|
4570
4584
|
session.stepOffset += session.lastStepNumber + 1;
|
|
4571
4585
|
}
|
|
@@ -4628,17 +4642,11 @@ var ContextEngine = class _ContextEngine {
|
|
|
4628
4642
|
const inputModel = await convertToModelMessages2(inputs, {
|
|
4629
4643
|
ignoreIncompleteToolCalls: true
|
|
4630
4644
|
});
|
|
4631
|
-
const
|
|
4632
|
-
if (head?.name !== "assistant") {
|
|
4633
|
-
throw new Error(
|
|
4634
|
-
"createPrepareStep: expected an assistant message at chain head."
|
|
4635
|
-
);
|
|
4636
|
-
}
|
|
4637
|
-
const currentSegmentId = head.id;
|
|
4645
|
+
const currentSegmentId = await this.#assistantHeadId("prepareStep");
|
|
4638
4646
|
const currentSegment = await this.#store.getMessage(currentSegmentId);
|
|
4639
4647
|
if (!currentSegment || currentSegment.name !== "assistant") {
|
|
4640
4648
|
throw new Error(
|
|
4641
|
-
"
|
|
4649
|
+
"prepareStep: expected the open assistant segment to be persisted."
|
|
4642
4650
|
);
|
|
4643
4651
|
}
|
|
4644
4652
|
requireUIMessage(
|
|
@@ -4672,28 +4680,32 @@ var ContextEngine = class _ContextEngine {
|
|
|
4672
4680
|
}
|
|
4673
4681
|
return void 0;
|
|
4674
4682
|
};
|
|
4683
|
+
return {
|
|
4684
|
+
prepareStep,
|
|
4685
|
+
writeAssistantSegment: async (message2) => {
|
|
4686
|
+
const headId = await this.#assistantHeadId("writeAssistantSegment");
|
|
4687
|
+
await this.#writeSessionSegment(session, headId, message2);
|
|
4688
|
+
}
|
|
4689
|
+
};
|
|
4675
4690
|
}
|
|
4676
4691
|
/**
|
|
4677
|
-
* Persist
|
|
4678
|
-
*
|
|
4679
|
-
*
|
|
4680
|
-
* cumulative response message. prepareStep has already persisted reminder
|
|
4681
|
-
* boundaries and reserved the open segment id, so this only updates that
|
|
4682
|
-
* segment in place with the cumulative prefix removed. With no fired reminder
|
|
4683
|
-
* it writes the whole message to the original reserved head.
|
|
4692
|
+
* Persist a streamed assistant message, whole, into the reserved head. A
|
|
4693
|
+
* stream whose reminders split the assistant writes through its
|
|
4694
|
+
* {@link ReminderSession}'s `writeAssistantSegment` instead.
|
|
4684
4695
|
*/
|
|
4685
4696
|
async writeAssistantSegment(message2) {
|
|
4697
|
+
const headId = await this.#assistantHeadId("writeAssistantSegment");
|
|
4698
|
+
this.set(assistant({ ...message2, id: headId }));
|
|
4699
|
+
await this.save({ branch: false });
|
|
4700
|
+
}
|
|
4701
|
+
async #assistantHeadId(caller) {
|
|
4686
4702
|
const head = await this.headMessage();
|
|
4687
4703
|
if (head?.name !== "assistant") {
|
|
4688
4704
|
throw new Error(
|
|
4689
|
-
|
|
4705
|
+
`${caller}: expected an assistant message at chain head.`
|
|
4690
4706
|
);
|
|
4691
4707
|
}
|
|
4692
|
-
|
|
4693
|
-
}
|
|
4694
|
-
async #writeWholeAssistant(headId, message2) {
|
|
4695
|
-
this.set(assistant({ ...message2, id: headId }));
|
|
4696
|
-
await this.save({ branch: false });
|
|
4708
|
+
return head.id;
|
|
4697
4709
|
}
|
|
4698
4710
|
async #writeSessionSegment(session, headId, message2) {
|
|
4699
4711
|
let id = headId;
|
|
@@ -5815,12 +5827,13 @@ async function chat(agent2, ...args) {
|
|
|
5815
5827
|
const initialAssistantMsgId = head.id;
|
|
5816
5828
|
const uiMessages = await context.getMessages();
|
|
5817
5829
|
let result;
|
|
5830
|
+
const writeAssistantSegment = (message2) => (result?.reminders ?? context).writeAssistantSegment(message2);
|
|
5818
5831
|
return createUIMessageStream2({
|
|
5819
5832
|
originalMessages: uiMessages,
|
|
5820
5833
|
generateId: () => initialAssistantMsgId,
|
|
5821
5834
|
onError: options?.onError ?? formatChatError,
|
|
5822
5835
|
onStepEnd: async ({ responseMessage }) => {
|
|
5823
|
-
await
|
|
5836
|
+
await writeAssistantSegment(responseMessage);
|
|
5824
5837
|
},
|
|
5825
5838
|
onEnd: async ({ responseMessage, isAborted }) => {
|
|
5826
5839
|
const settled = isAborted ? {
|
|
@@ -5831,7 +5844,7 @@ async function chat(agent2, ...args) {
|
|
|
5831
5844
|
// A provider can end at its token limit midway through arguments.
|
|
5832
5845
|
// That call failed; it is not waiting for client input or approval.
|
|
5833
5846
|
parts: responseMessage.parts.map((part) => {
|
|
5834
|
-
if (!
|
|
5847
|
+
if (!isToolUIPart2(part) || part.state !== "input-streaming")
|
|
5835
5848
|
return part;
|
|
5836
5849
|
const failed = {
|
|
5837
5850
|
...part,
|
|
@@ -5850,7 +5863,7 @@ async function chat(agent2, ...args) {
|
|
|
5850
5863
|
...finalMetadata ?? {}
|
|
5851
5864
|
};
|
|
5852
5865
|
const message2 = Object.keys(mergedMetadata).length > 0 ? { ...settled, metadata: mergedMetadata } : settled;
|
|
5853
|
-
await
|
|
5866
|
+
await writeAssistantSegment(message2);
|
|
5854
5867
|
const usage = await result?.result.usage;
|
|
5855
5868
|
if (usage !== void 0) {
|
|
5856
5869
|
await context.trackUsage(usage);
|
|
@@ -5889,7 +5902,7 @@ async function chat(agent2, ...args) {
|
|
|
5889
5902
|
function sanitizeAbortedParts(parts) {
|
|
5890
5903
|
const sanitized = [];
|
|
5891
5904
|
for (const part of parts) {
|
|
5892
|
-
if (!
|
|
5905
|
+
if (!isToolUIPart2(part)) {
|
|
5893
5906
|
sanitized.push(part);
|
|
5894
5907
|
continue;
|
|
5895
5908
|
}
|
|
@@ -11107,6 +11120,31 @@ function lockSchemaDDL(ddl, schema) {
|
|
|
11107
11120
|
${ddl}`;
|
|
11108
11121
|
}
|
|
11109
11122
|
|
|
11123
|
+
// packages/context/src/lib/store/postgres-transaction.ts
|
|
11124
|
+
function surfacedThroughQueries() {
|
|
11125
|
+
}
|
|
11126
|
+
async function postgresTransaction(pool, fn) {
|
|
11127
|
+
const client = await pool.connect();
|
|
11128
|
+
client.on("error", surfacedThroughQueries);
|
|
11129
|
+
let broken = false;
|
|
11130
|
+
try {
|
|
11131
|
+
await client.query("BEGIN");
|
|
11132
|
+
const result = await fn(client);
|
|
11133
|
+
await client.query("COMMIT");
|
|
11134
|
+
return result;
|
|
11135
|
+
} catch (error) {
|
|
11136
|
+
try {
|
|
11137
|
+
await client.query("ROLLBACK");
|
|
11138
|
+
} catch {
|
|
11139
|
+
broken = true;
|
|
11140
|
+
}
|
|
11141
|
+
throw error;
|
|
11142
|
+
} finally {
|
|
11143
|
+
client.off("error", surfacedThroughQueries);
|
|
11144
|
+
client.release(broken);
|
|
11145
|
+
}
|
|
11146
|
+
}
|
|
11147
|
+
|
|
11110
11148
|
// packages/context/src/lib/store/postgres.store.ts
|
|
11111
11149
|
import { createRequire } from "node:module";
|
|
11112
11150
|
import { z as z14 } from "zod";
|
|
@@ -11366,24 +11404,6 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
|
|
|
11366
11404
|
async #initialize() {
|
|
11367
11405
|
await this.#pool.query(lockSchemaDDL(storeDDL(this.#schema), this.#schema));
|
|
11368
11406
|
}
|
|
11369
|
-
/**
|
|
11370
|
-
* Execute a function within a transaction.
|
|
11371
|
-
* Automatically commits on success or rolls back on error.
|
|
11372
|
-
*/
|
|
11373
|
-
async #useTransaction(fn) {
|
|
11374
|
-
const client = await this.#pool.connect();
|
|
11375
|
-
try {
|
|
11376
|
-
await client.query("BEGIN");
|
|
11377
|
-
const result = await fn(client);
|
|
11378
|
-
await client.query("COMMIT");
|
|
11379
|
-
return result;
|
|
11380
|
-
} catch (error) {
|
|
11381
|
-
await client.query("ROLLBACK");
|
|
11382
|
-
throw error;
|
|
11383
|
-
} finally {
|
|
11384
|
-
client.release();
|
|
11385
|
-
}
|
|
11386
|
-
}
|
|
11387
11407
|
/**
|
|
11388
11408
|
* Execute a query using the pool (no transaction).
|
|
11389
11409
|
*/
|
|
@@ -11410,7 +11430,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
|
|
|
11410
11430
|
// Chat Operations
|
|
11411
11431
|
// ==========================================================================
|
|
11412
11432
|
async createChat(chat2) {
|
|
11413
|
-
return this.#
|
|
11433
|
+
return postgresTransaction(this.#pool, async (client) => {
|
|
11414
11434
|
const result = await client.query(
|
|
11415
11435
|
`INSERT INTO ${this.#t("chats")} (id, userId, title, metadata)
|
|
11416
11436
|
VALUES ($1, $2, $3, $4)
|
|
@@ -11432,7 +11452,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
|
|
|
11432
11452
|
});
|
|
11433
11453
|
}
|
|
11434
11454
|
async upsertChat(chat2) {
|
|
11435
|
-
return this.#
|
|
11455
|
+
return postgresTransaction(this.#pool, async (client) => {
|
|
11436
11456
|
const result = await client.query(
|
|
11437
11457
|
`INSERT INTO ${this.#t("chats")} (id, userId, title, metadata)
|
|
11438
11458
|
VALUES ($1, $2, $3, $4)
|
|
@@ -11464,7 +11484,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
|
|
|
11464
11484
|
return chat2;
|
|
11465
11485
|
}
|
|
11466
11486
|
async updateChat(chatId, update) {
|
|
11467
|
-
return this.#
|
|
11487
|
+
return postgresTransaction(this.#pool, async (client) => {
|
|
11468
11488
|
const result = await client.query(
|
|
11469
11489
|
`SELECT * FROM ${this.#t("chats")} WHERE id = $1 FOR UPDATE`,
|
|
11470
11490
|
[chatId]
|
|
@@ -11542,7 +11562,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
|
|
|
11542
11562
|
);
|
|
11543
11563
|
}
|
|
11544
11564
|
async deleteChat(chatId, options) {
|
|
11545
|
-
return this.#
|
|
11565
|
+
return postgresTransaction(this.#pool, async (client) => {
|
|
11546
11566
|
let sql = `DELETE FROM ${this.#t("chats")} WHERE id = $1`;
|
|
11547
11567
|
const params = [chatId];
|
|
11548
11568
|
if (options?.userId !== void 0) {
|
|
@@ -11560,7 +11580,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
|
|
|
11560
11580
|
if (message2.parentId === message2.id) {
|
|
11561
11581
|
throw new Error(`Message ${message2.id} cannot be its own parent`);
|
|
11562
11582
|
}
|
|
11563
|
-
await this.#
|
|
11583
|
+
await postgresTransaction(this.#pool, async (client) => {
|
|
11564
11584
|
await client.query(
|
|
11565
11585
|
`INSERT INTO ${this.#t("messages")} (id, chatId, parentId, name, type, data, createdAt)
|
|
11566
11586
|
VALUES ($1, $2, $3, $4, $5, $6, $7)
|
|
@@ -11679,7 +11699,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
|
|
|
11679
11699
|
return branch;
|
|
11680
11700
|
}
|
|
11681
11701
|
async setActiveBranch(chatId, branchId) {
|
|
11682
|
-
await this.#
|
|
11702
|
+
await postgresTransaction(this.#pool, async (client) => {
|
|
11683
11703
|
await client.query(
|
|
11684
11704
|
`UPDATE ${this.#t("branches")} SET isActive = FALSE WHERE chatId = $1`,
|
|
11685
11705
|
[chatId]
|
|
@@ -13507,20 +13527,6 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
|
|
|
13507
13527
|
async #rows(row, sql, params) {
|
|
13508
13528
|
return z18.array(row).parse(await this.#query(sql, params));
|
|
13509
13529
|
}
|
|
13510
|
-
async #useTransaction(fn) {
|
|
13511
|
-
const client = await this.#pool.connect();
|
|
13512
|
-
try {
|
|
13513
|
-
await client.query("BEGIN");
|
|
13514
|
-
const result = await fn(client);
|
|
13515
|
-
await client.query("COMMIT");
|
|
13516
|
-
return result;
|
|
13517
|
-
} catch (error) {
|
|
13518
|
-
await client.query("ROLLBACK");
|
|
13519
|
-
throw error;
|
|
13520
|
-
} finally {
|
|
13521
|
-
client.release();
|
|
13522
|
-
}
|
|
13523
|
-
}
|
|
13524
13530
|
async createStream(stream) {
|
|
13525
13531
|
await this.#query(
|
|
13526
13532
|
`INSERT INTO ${this.#t("streams")}
|
|
@@ -13578,7 +13584,7 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
|
|
|
13578
13584
|
return rows.map((row) => row.id);
|
|
13579
13585
|
}
|
|
13580
13586
|
async updateStream(streamId, update) {
|
|
13581
|
-
return this.#
|
|
13587
|
+
return postgresTransaction(this.#pool, async (client) => {
|
|
13582
13588
|
const selected = await client.query(
|
|
13583
13589
|
`SELECT * FROM ${this.#t("streams")} WHERE id = $1 FOR UPDATE`,
|
|
13584
13590
|
[streamId]
|
|
@@ -13678,7 +13684,7 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
|
|
|
13678
13684
|
await this.#query(insertSql, params);
|
|
13679
13685
|
return;
|
|
13680
13686
|
}
|
|
13681
|
-
await this.#
|
|
13687
|
+
await postgresTransaction(this.#pool, async (client) => {
|
|
13682
13688
|
await client.query(insertSql, params);
|
|
13683
13689
|
const failedAt = Date.now();
|
|
13684
13690
|
for (const failure of failures) {
|
|
@@ -13728,7 +13734,7 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
|
|
|
13728
13734
|
]);
|
|
13729
13735
|
}
|
|
13730
13736
|
async reopenStream(streamId) {
|
|
13731
|
-
return this.#
|
|
13737
|
+
return postgresTransaction(this.#pool, async (client) => {
|
|
13732
13738
|
const result = await client.query(
|
|
13733
13739
|
`SELECT * FROM ${this.#t("streams")} WHERE id = $1 FOR UPDATE`,
|
|
13734
13740
|
[streamId]
|
|
@@ -14624,6 +14630,7 @@ export {
|
|
|
14624
14630
|
pkg,
|
|
14625
14631
|
plan,
|
|
14626
14632
|
policy,
|
|
14633
|
+
postgresTransaction,
|
|
14627
14634
|
preference,
|
|
14628
14635
|
principle,
|
|
14629
14636
|
quirk,
|