@deepagents/context 7.9.0 → 7.10.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 +8 -6
- package/dist/bash.d.ts.map +1 -1
- package/dist/browser.d.ts.map +1 -1
- package/dist/browser.js +92 -48
- package/dist/browser.js.map +3 -3
- package/dist/index.d.ts +0 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +267 -285
- package/dist/index.js.map +4 -4
- package/dist/lib/advisor.d.ts.map +1 -1
- package/dist/lib/agent.d.ts.map +1 -1
- package/dist/lib/chain-summary.d.ts.map +1 -1
- package/dist/lib/chat.d.ts.map +1 -1
- package/dist/lib/codec/codec.d.ts.map +1 -1
- package/dist/lib/codec/serialized-codec.d.ts.map +1 -1
- package/dist/lib/codec/serialized-fragments.d.ts.map +1 -1
- package/dist/lib/demo.d.ts.map +1 -1
- package/dist/lib/engine.d.ts +3 -0
- package/dist/lib/engine.d.ts.map +1 -1
- package/dist/lib/estimate.d.ts.map +1 -1
- package/dist/lib/fragments/domain.d.ts.map +1 -1
- package/dist/lib/fragments/message/user.d.ts.map +1 -1
- package/dist/lib/fragments/plan-shared.d.ts +5 -5
- package/dist/lib/fragments/plan-shared.d.ts.map +1 -1
- package/dist/lib/fragments/plan.d.ts.map +1 -1
- package/dist/lib/fragments/reasoning.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/index.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/evaluate.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/index.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/classifier.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/combinators.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/content.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/index.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/message.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/predicates/once.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/reminders/src/predicates/usage.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/reminders.d.ts +2 -1
- package/dist/lib/fragments/reminders/src/reminders.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/src/types.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/temporal/elapsed.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/temporal/index.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/temporal/predicates.d.ts.map +1 -1
- package/dist/lib/fragments/reminders/temporal/reminder.d.ts.map +1 -1
- package/dist/lib/fragments/socratic-inquiry.d.ts.map +1 -1
- package/dist/lib/fragments/socratic-plan.d.ts.map +1 -1
- package/dist/lib/fragments/socratic.d.ts.map +1 -1
- package/dist/lib/fragments/user.d.ts.map +1 -1
- package/dist/lib/fragments.d.ts.map +1 -1
- package/dist/lib/guardrail.d.ts.map +1 -1
- package/dist/lib/guardrails/error-recovery.guardrail.d.ts.map +1 -1
- package/dist/lib/models.generated.d.ts.map +1 -1
- package/dist/lib/render.d.ts.map +1 -1
- package/dist/lib/renderers/abstract.renderer.d.ts.map +1 -1
- package/dist/lib/resolvers/async-resolver.d.ts.map +1 -1
- package/dist/lib/resolvers/function-resolver.d.ts.map +1 -1
- package/dist/lib/resolvers/generator-resolver.d.ts.map +1 -1
- package/dist/lib/resolvers/index.d.ts.map +1 -1
- package/dist/lib/resolvers/iterable-resolver.d.ts.map +1 -1
- package/dist/lib/resolvers/loader-resolver.d.ts.map +1 -1
- package/dist/lib/resolvers/types.d.ts.map +1 -1
- package/dist/lib/sandbox/apple-container-sandbox-errors.d.ts.map +1 -1
- package/dist/lib/sandbox/apple-container-sandbox.d.ts.map +1 -1
- package/dist/lib/sandbox/ast-utils.d.ts.map +1 -1
- package/dist/lib/sandbox/bash-exception.d.ts.map +1 -1
- package/dist/lib/sandbox/bash-tool.d.ts.map +1 -1
- package/dist/lib/sandbox/binary-bridges.d.ts.map +1 -1
- package/dist/lib/sandbox/container-engine.d.ts.map +1 -1
- package/dist/lib/sandbox/container-sandbox-errors.d.ts.map +1 -1
- package/dist/lib/sandbox/container-sandbox.d.ts.map +1 -1
- package/dist/lib/sandbox/container-session.d.ts.map +1 -1
- package/dist/lib/sandbox/daytona-sandbox.d.ts.map +1 -1
- package/dist/lib/sandbox/docker-sandbox-errors.d.ts.map +1 -1
- package/dist/lib/sandbox/docker-sandbox.d.ts.map +1 -1
- package/dist/lib/sandbox/gcs.d.ts.map +1 -1
- package/dist/lib/sandbox/index.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/bin.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/github-release.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/index.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/installer.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/npm.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/package-manager.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/pip.d.ts.map +1 -1
- package/dist/lib/sandbox/installers/url-binary.d.ts.map +1 -1
- package/dist/lib/sandbox/microsandbox-sandbox.d.ts.map +1 -1
- package/dist/lib/sandbox/read-file-tool/binary.d.ts.map +1 -1
- package/dist/lib/sandbox/read-file-tool/format.d.ts.map +1 -1
- package/dist/lib/sandbox/read-file-tool/image.d.ts.map +1 -1
- package/dist/lib/sandbox/read-file-tool/index.d.ts.map +1 -1
- package/dist/lib/sandbox/read-file-tool/ooxml.d.ts.map +1 -1
- package/dist/lib/sandbox/read-file-tool/pdf.d.ts.map +1 -1
- package/dist/lib/sandbox/read-file-tool/text.d.ts.map +1 -1
- package/dist/lib/sandbox/session.d.ts.map +1 -1
- package/dist/lib/sandbox/shell-quote.d.ts.map +1 -1
- package/dist/lib/sandbox/strace/file-change.d.ts.map +1 -1
- package/dist/lib/sandbox/strace/file-changes.d.ts.map +1 -1
- package/dist/lib/sandbox/strace/index.d.ts.map +1 -1
- package/dist/lib/sandbox/subcommand.d.ts.map +1 -1
- package/dist/lib/sandbox/types.d.ts.map +1 -1
- package/dist/lib/sandbox/virtual-sandbox.d.ts.map +1 -1
- package/dist/lib/save/save-pipeline.d.ts.map +1 -1
- package/dist/lib/skills/fragments.d.ts.map +1 -1
- package/dist/lib/skills/frontmatter.d.ts.map +1 -1
- package/dist/lib/skills/index.d.ts.map +1 -1
- package/dist/lib/skills/skill-reminder.d.ts.map +1 -1
- package/dist/lib/skills/types.d.ts.map +1 -1
- package/dist/lib/soul/fragments.d.ts.map +1 -1
- package/dist/lib/store/columns.d.ts.map +1 -1
- package/dist/lib/store/ddl.postgres.d.ts.map +1 -1
- package/dist/lib/store/ddl.sqlite.d.ts.map +1 -1
- package/dist/lib/store/ddl.sqlserver.d.ts.map +1 -1
- package/dist/lib/store/memory.store.d.ts.map +1 -1
- package/dist/lib/store/postgres-schema-lock.d.ts.map +1 -1
- package/dist/lib/store/postgres-store-database.d.ts.map +1 -1
- package/dist/lib/store/postgres-transaction.d.ts.map +1 -1
- 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/store/sqlserver-schema-lock.d.ts.map +1 -1
- package/dist/lib/store/sqlserver.store.d.ts.map +1 -1
- package/dist/lib/store/store.d.ts.map +1 -1
- package/dist/lib/stream/change-source.d.ts.map +1 -1
- package/dist/lib/stream/ddl.stream.postgres-notify.d.ts.map +1 -1
- package/dist/lib/stream/ddl.stream.postgres.d.ts.map +1 -1
- package/dist/lib/stream/ddl.stream.sqlite.d.ts.map +1 -1
- package/dist/lib/stream/polling-change-source.d.ts +5 -2
- package/dist/lib/stream/polling-change-source.d.ts.map +1 -1
- package/dist/lib/stream/postgres-notify-change-source.d.ts.map +1 -1
- package/dist/lib/stream/postgres.stream-store.d.ts.map +1 -1
- package/dist/lib/stream/rows.d.ts +3 -3
- package/dist/lib/stream/rows.d.ts.map +1 -1
- package/dist/lib/stream/sqlite.stream-store.d.ts.map +1 -1
- package/dist/lib/stream/stream-manager.d.ts +1 -2
- package/dist/lib/stream/stream-manager.d.ts.map +1 -1
- package/dist/lib/stream/stream-store.d.ts.map +1 -1
- package/dist/lib/stream/types.d.ts.map +1 -1
- package/dist/lib/stream-buffer.d.ts +6 -8
- package/dist/lib/stream-buffer.d.ts.map +1 -1
- package/dist/lib/telemetry/console-telemetry.d.ts.map +1 -1
- package/dist/lib/telemetry/create-telemetry-integration.d.ts.map +1 -1
- package/dist/lib/telemetry/file/file-telemetry.d.ts.map +1 -1
- package/dist/lib/telemetry/file/index.d.ts.map +1 -1
- package/dist/lib/telemetry/file/index.js +1 -3
- package/dist/lib/telemetry/file/index.js.map +2 -2
- package/dist/lib/telemetry/index.d.ts.map +1 -1
- package/dist/lib/telemetry/index.js +1 -3
- package/dist/lib/telemetry/index.js.map +2 -2
- package/dist/lib/telemetry/redact-telemetry-event.d.ts +0 -1
- package/dist/lib/telemetry/redact-telemetry-event.d.ts.map +1 -1
- package/dist/lib/telemetry/safe-serialize.d.ts.map +1 -1
- package/dist/lib/text.d.ts.map +1 -1
- package/dist/lib/title.d.ts.map +1 -1
- package/dist/lib/tracing/batch-processor.d.ts.map +1 -1
- package/dist/lib/tracing/exporter.d.ts.map +1 -1
- package/dist/lib/tracing/ids.d.ts.map +1 -1
- package/dist/lib/tracing/index.d.ts.map +1 -1
- package/dist/lib/tracing/index.js +82 -86
- package/dist/lib/tracing/index.js.map +3 -3
- package/dist/lib/tracing/openai-traces-integration.d.ts.map +1 -1
- package/dist/lib/tracing/processor.d.ts.map +1 -1
- package/dist/lib/tracing/serialization.d.ts.map +1 -1
- package/dist/lib/tracing/types.d.ts.map +1 -1
- package/dist/lib/ui-message-guards.d.ts.map +1 -1
- package/dist/lib/visualize.d.ts.map +1 -1
- package/dist/usage.d.ts.map +1 -1
- package/package.json +3 -3
- package/dist/lib/stream/polling-policy.d.ts +0 -22
- package/dist/lib/stream/polling-policy.d.ts.map +0 -1
package/dist/index.js
CHANGED
|
@@ -158,7 +158,6 @@ import {
|
|
|
158
158
|
import { styleText } from "node:util";
|
|
159
159
|
import z from "zod";
|
|
160
160
|
import {
|
|
161
|
-
createRepairToolCall,
|
|
162
161
|
withHostOnlyToolMetadata
|
|
163
162
|
} from "@deepagents/agent";
|
|
164
163
|
|
|
@@ -387,10 +386,7 @@ var Agent = class _Agent {
|
|
|
387
386
|
runtimeContext: this.#options.runtimeContext,
|
|
388
387
|
model: this.#options.model,
|
|
389
388
|
instructions: systemPrompt,
|
|
390
|
-
messages: await
|
|
391
|
-
ignoreIncompleteToolCalls: true,
|
|
392
|
-
tools: this.tools
|
|
393
|
-
}),
|
|
389
|
+
messages: await toModelPrompt(messages, this.tools),
|
|
394
390
|
stopWhen: this.#options.stopWhen ?? DEFAULT_STOP_WHEN,
|
|
395
391
|
prepareStep: this.#withPrepareStep(
|
|
396
392
|
this.#options.context.createReminderSession({
|
|
@@ -402,10 +398,6 @@ var Agent = class _Agent {
|
|
|
402
398
|
tools: this.tools,
|
|
403
399
|
toolsContext: options?.toolsContext,
|
|
404
400
|
experimental_toolCallers: this.#options.experimental_toolCallers,
|
|
405
|
-
repairToolCall: createRepairToolCall(
|
|
406
|
-
this.#options.model,
|
|
407
|
-
options?.abortSignal
|
|
408
|
-
),
|
|
409
401
|
toolChoice: this.#options.toolChoice
|
|
410
402
|
});
|
|
411
403
|
}
|
|
@@ -508,11 +500,7 @@ var Agent = class _Agent {
|
|
|
508
500
|
runtimeContext: this.#options.runtimeContext,
|
|
509
501
|
model,
|
|
510
502
|
instructions: systemPrompt,
|
|
511
|
-
messages: await
|
|
512
|
-
ignoreIncompleteToolCalls: true,
|
|
513
|
-
tools: this.tools
|
|
514
|
-
}),
|
|
515
|
-
repairToolCall: createRepairToolCall(model, config?.abortSignal),
|
|
503
|
+
messages: await toModelPrompt(messages, this.tools),
|
|
516
504
|
stopWhen: this.#options.stopWhen ?? DEFAULT_STOP_WHEN,
|
|
517
505
|
prepareStep,
|
|
518
506
|
experimental_transform: config?.transform ?? smoothStream(),
|
|
@@ -792,15 +780,8 @@ function structuredOutput(options) {
|
|
|
792
780
|
telemetry: options.telemetry,
|
|
793
781
|
model: options.model,
|
|
794
782
|
instructions: systemPrompt,
|
|
795
|
-
messages: await
|
|
796
|
-
ignoreIncompleteToolCalls: true,
|
|
797
|
-
tools
|
|
798
|
-
}),
|
|
783
|
+
messages: await toModelPrompt(messages, tools),
|
|
799
784
|
stopWhen: options.stopWhen ?? DEFAULT_STOP_WHEN,
|
|
800
|
-
repairToolCall: createRepairToolCall(
|
|
801
|
-
options.model,
|
|
802
|
-
callOptions?.abortSignal
|
|
803
|
-
),
|
|
804
785
|
toolsContext: callOptions?.toolsContext,
|
|
805
786
|
output: Output.object({ schema: options.schema }),
|
|
806
787
|
tools
|
|
@@ -830,14 +811,7 @@ function structuredOutput(options) {
|
|
|
830
811
|
telemetry: options.telemetry,
|
|
831
812
|
model: options.model,
|
|
832
813
|
instructions: systemPrompt,
|
|
833
|
-
|
|
834
|
-
options.model,
|
|
835
|
-
callOptions?.abortSignal
|
|
836
|
-
),
|
|
837
|
-
messages: await convertToModelMessages(messages, {
|
|
838
|
-
ignoreIncompleteToolCalls: true,
|
|
839
|
-
tools
|
|
840
|
-
}),
|
|
814
|
+
messages: await toModelPrompt(messages, tools),
|
|
841
815
|
stopWhen: options.stopWhen ?? DEFAULT_STOP_WHEN,
|
|
842
816
|
experimental_transform: callOptions?.transform ?? smoothStream(),
|
|
843
817
|
toolsContext: callOptions?.toolsContext,
|
|
@@ -847,6 +821,44 @@ function structuredOutput(options) {
|
|
|
847
821
|
}
|
|
848
822
|
};
|
|
849
823
|
}
|
|
824
|
+
async function toModelPrompt(messages, tools) {
|
|
825
|
+
return withReasoningItemsOnce(
|
|
826
|
+
await convertToModelMessages(messages, {
|
|
827
|
+
ignoreIncompleteToolCalls: true,
|
|
828
|
+
tools
|
|
829
|
+
})
|
|
830
|
+
);
|
|
831
|
+
}
|
|
832
|
+
function withReasoningItemsOnce(messages) {
|
|
833
|
+
const contentByItemId = /* @__PURE__ */ new Map();
|
|
834
|
+
return messages.flatMap((message2) => {
|
|
835
|
+
if (message2.role !== "assistant" || typeof message2.content === "string") {
|
|
836
|
+
return [message2];
|
|
837
|
+
}
|
|
838
|
+
const content = [];
|
|
839
|
+
for (const part of message2.content) {
|
|
840
|
+
const itemId = reasoningItemIdOf2(part);
|
|
841
|
+
const owner = itemId === void 0 ? void 0 : contentByItemId.get(itemId);
|
|
842
|
+
if (itemId === void 0) {
|
|
843
|
+
content.push(part);
|
|
844
|
+
} else if (owner === void 0) {
|
|
845
|
+
contentByItemId.set(itemId, content);
|
|
846
|
+
content.push(part);
|
|
847
|
+
} else {
|
|
848
|
+
const lastOfItem = owner.findLastIndex(
|
|
849
|
+
(other) => reasoningItemIdOf2(other) === itemId
|
|
850
|
+
);
|
|
851
|
+
owner.splice(lastOfItem + 1, 0, part);
|
|
852
|
+
}
|
|
853
|
+
}
|
|
854
|
+
return content.length === 0 ? [] : [{ ...message2, content }];
|
|
855
|
+
});
|
|
856
|
+
}
|
|
857
|
+
function reasoningItemIdOf2(part) {
|
|
858
|
+
if (part.type !== "reasoning") return void 0;
|
|
859
|
+
const itemId = part.providerOptions?.openai?.itemId;
|
|
860
|
+
return typeof itemId === "string" ? itemId : void 0;
|
|
861
|
+
}
|
|
850
862
|
function chunkId(chunk) {
|
|
851
863
|
if (typeof chunk !== "object" || chunk === null || !("id" in chunk)) {
|
|
852
864
|
return void 0;
|
|
@@ -876,6 +888,7 @@ function writeText(writer, text3, openPartId) {
|
|
|
876
888
|
import {
|
|
877
889
|
APICallError as APICallError2,
|
|
878
890
|
InvalidToolInputError,
|
|
891
|
+
NoOutputGeneratedError,
|
|
879
892
|
NoSuchToolError,
|
|
880
893
|
ToolCallRepairError,
|
|
881
894
|
createUIMessageStream as createUIMessageStream2,
|
|
@@ -883,6 +896,7 @@ import {
|
|
|
883
896
|
} from "ai";
|
|
884
897
|
|
|
885
898
|
// packages/context/src/lib/fragments/reminders/src/reminders.ts
|
|
899
|
+
import { isRecord } from "@ai-sdk/provider-utils";
|
|
886
900
|
import { generateId as generateId4 } from "ai";
|
|
887
901
|
|
|
888
902
|
// packages/context/src/lib/renderers/abstract.renderer.ts
|
|
@@ -1405,7 +1419,7 @@ ${this.renderEntries(data, { depth: 0, path: [] }).join("\n")}`;
|
|
|
1405
1419
|
return [header, children].join("\n");
|
|
1406
1420
|
}
|
|
1407
1421
|
};
|
|
1408
|
-
var TomlRenderer = class extends ContextRenderer {
|
|
1422
|
+
var TomlRenderer = class _TomlRenderer extends ContextRenderer {
|
|
1409
1423
|
render(fragments) {
|
|
1410
1424
|
const rendered = [];
|
|
1411
1425
|
for (const it of this.sanitizeFragments(fragments)) {
|
|
@@ -1526,8 +1540,20 @@ var TomlRenderer = class extends ContextRenderer {
|
|
|
1526
1540
|
}
|
|
1527
1541
|
return "";
|
|
1528
1542
|
}
|
|
1543
|
+
static #shortEscapes = {
|
|
1544
|
+
"\b": "\\b",
|
|
1545
|
+
" ": "\\t",
|
|
1546
|
+
"\n": "\\n",
|
|
1547
|
+
"\f": "\\f",
|
|
1548
|
+
"\r": "\\r",
|
|
1549
|
+
'"': '\\"',
|
|
1550
|
+
"\\": "\\\\"
|
|
1551
|
+
};
|
|
1529
1552
|
#escape(value) {
|
|
1530
|
-
return value.replace(
|
|
1553
|
+
return value.replace(
|
|
1554
|
+
/[\p{Cc}"\\]/gu,
|
|
1555
|
+
(char) => _TomlRenderer.#shortEscapes[char] ?? `\\u${char.charCodeAt(0).toString(16).toUpperCase().padStart(4, "0")}`
|
|
1556
|
+
);
|
|
1531
1557
|
}
|
|
1532
1558
|
#formatValue(value) {
|
|
1533
1559
|
if (typeof value === "string") {
|
|
@@ -1870,9 +1896,6 @@ function stripReminders(message2) {
|
|
|
1870
1896
|
}
|
|
1871
1897
|
return nextMessage;
|
|
1872
1898
|
}
|
|
1873
|
-
function isRecord(value) {
|
|
1874
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
1875
|
-
}
|
|
1876
1899
|
function assertReminderText(text3) {
|
|
1877
1900
|
if (text3.trim().length === 0) {
|
|
1878
1901
|
throw new Error("Reminder text must not be empty");
|
|
@@ -2679,9 +2702,7 @@ import {
|
|
|
2679
2702
|
import pMemoize2 from "p-memoize";
|
|
2680
2703
|
|
|
2681
2704
|
// packages/context/src/lib/ui-message-guards.ts
|
|
2682
|
-
|
|
2683
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
2684
|
-
}
|
|
2705
|
+
import { isRecord as isRecord2 } from "@ai-sdk/provider-utils";
|
|
2685
2706
|
function isUIMessage(value) {
|
|
2686
2707
|
return isRecord2(value) && typeof value.id === "string" && (value.role === "system" || value.role === "user" || value.role === "assistant") && Array.isArray(value.parts);
|
|
2687
2708
|
}
|
|
@@ -3825,8 +3846,14 @@ var SqliteContextStore = class extends ContextStore {
|
|
|
3825
3846
|
);
|
|
3826
3847
|
}
|
|
3827
3848
|
async setActiveBranch(chatId, branchId) {
|
|
3828
|
-
|
|
3829
|
-
|
|
3849
|
+
transaction(
|
|
3850
|
+
this.#db,
|
|
3851
|
+
() => {
|
|
3852
|
+
this.#db.prepare("UPDATE branches SET isActive = 0 WHERE chatId = ?").run(chatId);
|
|
3853
|
+
this.#db.prepare("UPDATE branches SET isActive = 1 WHERE id = ?").run(branchId);
|
|
3854
|
+
},
|
|
3855
|
+
{ mode: "deferred" }
|
|
3856
|
+
);
|
|
3830
3857
|
}
|
|
3831
3858
|
async updateBranchHead(branchId, messageId, expectedHeadMessageId) {
|
|
3832
3859
|
const result = this.#sql.run`UPDATE branches SET headMessageId = ${messageId} WHERE id = ${branchId} AND headMessageId IS ${expectedHeadMessageId}`;
|
|
@@ -4180,8 +4207,10 @@ var OpenChat = class {
|
|
|
4180
4207
|
var ContextEngine = class _ContextEngine {
|
|
4181
4208
|
/** Non-message fragments (role, hints, etc.) - not persisted in graph */
|
|
4182
4209
|
#fragments = [];
|
|
4183
|
-
/**
|
|
4210
|
+
/** Message fragments not yet committed to the graph, including those a save() is writing */
|
|
4184
4211
|
#pendingMessages = [];
|
|
4212
|
+
/** Pending fragments an in-flight save() is writing; they stay pending until it commits */
|
|
4213
|
+
#savingMessages = /* @__PURE__ */ new Set();
|
|
4185
4214
|
#store;
|
|
4186
4215
|
#chatId;
|
|
4187
4216
|
#userId;
|
|
@@ -4388,19 +4417,19 @@ var ContextEngine = class _ContextEngine {
|
|
|
4388
4417
|
*/
|
|
4389
4418
|
async getMessages() {
|
|
4390
4419
|
const open3 = await this.#open();
|
|
4420
|
+
const headMessageId = open3.branch.headMessageId;
|
|
4421
|
+
const pending = [...this.#pendingMessages];
|
|
4391
4422
|
const messages = [];
|
|
4392
4423
|
const indexById = /* @__PURE__ */ new Map();
|
|
4393
|
-
if (
|
|
4394
|
-
const chain = await this.#store.getMessageChain(
|
|
4395
|
-
open3.branch.headMessageId
|
|
4396
|
-
);
|
|
4424
|
+
if (headMessageId) {
|
|
4425
|
+
const chain = await this.#store.getMessageChain(headMessageId);
|
|
4397
4426
|
for (const msg of chain) {
|
|
4398
4427
|
const data = requireUIMessage(msg.data, `Stored message "${msg.id}"`);
|
|
4399
4428
|
if (isEmptyAssistantPlaceholder(data)) continue;
|
|
4400
4429
|
indexById.set(data.id, messages.push(data) - 1);
|
|
4401
4430
|
}
|
|
4402
4431
|
}
|
|
4403
|
-
for (const fragment2 of
|
|
4432
|
+
for (const fragment2 of pending) {
|
|
4404
4433
|
if (!fragment2.codec) {
|
|
4405
4434
|
throw new Error(`Fragment "${fragment2.name}" is missing codec.`);
|
|
4406
4435
|
}
|
|
@@ -4519,6 +4548,9 @@ var ContextEngine = class _ContextEngine {
|
|
|
4519
4548
|
* Each message is added as a node with parentId pointing to the previous message.
|
|
4520
4549
|
* The branch head is updated to point to the last message.
|
|
4521
4550
|
*
|
|
4551
|
+
* The messages stay pending until the head commits, so `getMessages()`
|
|
4552
|
+
* during the save still returns them; a failed save leaves them pending.
|
|
4553
|
+
*
|
|
4522
4554
|
* @example
|
|
4523
4555
|
* ```ts
|
|
4524
4556
|
* context.set(user('Hello'));
|
|
@@ -4529,11 +4561,14 @@ var ContextEngine = class _ContextEngine {
|
|
|
4529
4561
|
*/
|
|
4530
4562
|
async save(options) {
|
|
4531
4563
|
const open3 = await this.#open();
|
|
4532
|
-
|
|
4564
|
+
const taken = this.#pendingMessages.filter(
|
|
4565
|
+
(fragment2) => !this.#savingMessages.has(fragment2)
|
|
4566
|
+
);
|
|
4567
|
+
if (taken.length === 0) {
|
|
4533
4568
|
return { headMessageId: open3.branch.headMessageId ?? void 0 };
|
|
4534
4569
|
}
|
|
4535
|
-
const
|
|
4536
|
-
|
|
4570
|
+
for (const fragment2 of taken) this.#savingMessages.add(fragment2);
|
|
4571
|
+
const pending = [...taken];
|
|
4537
4572
|
const pipeline = new SavePipeline(
|
|
4538
4573
|
this.#asSavePipelineEngine(open3),
|
|
4539
4574
|
pending,
|
|
@@ -4542,10 +4577,14 @@ var ContextEngine = class _ContextEngine {
|
|
|
4542
4577
|
try {
|
|
4543
4578
|
await pipeline.applyUpdateBranching();
|
|
4544
4579
|
await this.#foldUserReminders(pending);
|
|
4545
|
-
|
|
4546
|
-
|
|
4547
|
-
this.#pendingMessages.
|
|
4548
|
-
|
|
4580
|
+
const result = await pipeline.persist();
|
|
4581
|
+
const committed = new Set(taken);
|
|
4582
|
+
this.#pendingMessages = this.#pendingMessages.filter(
|
|
4583
|
+
(fragment2) => !committed.has(fragment2)
|
|
4584
|
+
);
|
|
4585
|
+
return result;
|
|
4586
|
+
} finally {
|
|
4587
|
+
for (const fragment2 of taken) this.#savingMessages.delete(fragment2);
|
|
4549
4588
|
}
|
|
4550
4589
|
}
|
|
4551
4590
|
/**
|
|
@@ -5864,7 +5903,12 @@ async function chat(agent2, ...args) {
|
|
|
5864
5903
|
};
|
|
5865
5904
|
const message2 = Object.keys(mergedMetadata).length > 0 ? { ...settled, metadata: mergedMetadata } : settled;
|
|
5866
5905
|
await writeAssistantSegment(message2);
|
|
5867
|
-
const usage = await result?.result.usage
|
|
5906
|
+
const usage = await Promise.resolve(result?.result.usage).catch(
|
|
5907
|
+
(error) => {
|
|
5908
|
+
if (NoOutputGeneratedError.isInstance(error)) return void 0;
|
|
5909
|
+
throw error;
|
|
5910
|
+
}
|
|
5911
|
+
);
|
|
5868
5912
|
if (usage !== void 0) {
|
|
5869
5913
|
await context.trackUsage(usage);
|
|
5870
5914
|
}
|
|
@@ -7178,9 +7222,6 @@ function render(tag, ...fragments) {
|
|
|
7178
7222
|
return renderer.render([wrapped]);
|
|
7179
7223
|
}
|
|
7180
7224
|
|
|
7181
|
-
// packages/context/src/index.ts
|
|
7182
|
-
import { createRepairToolCall as createRepairToolCall2 } from "@deepagents/agent";
|
|
7183
|
-
|
|
7184
7225
|
// packages/context/src/lib/sandbox/apple-container-sandbox.ts
|
|
7185
7226
|
import { TemporaryFiles } from "@zukhruf/fs";
|
|
7186
7227
|
import spawn, { SubprocessError } from "nano-spawn";
|
|
@@ -8558,6 +8599,7 @@ var BashException = class extends Error {
|
|
|
8558
8599
|
};
|
|
8559
8600
|
|
|
8560
8601
|
// packages/context/src/lib/sandbox/bash-tool.ts
|
|
8602
|
+
import { experimental_createBashTool } from "@ai-sdk/tool-bash";
|
|
8561
8603
|
import { tool as tool3 } from "ai";
|
|
8562
8604
|
import fg from "fast-glob";
|
|
8563
8605
|
import { BashTransformPipeline, TeePlugin } from "just-bash";
|
|
@@ -8759,12 +8801,10 @@ var TEE_OUTPUT_DIR = "/tmp/bash-tool";
|
|
|
8759
8801
|
var MAX_CONCURRENT_WRITES = 20;
|
|
8760
8802
|
var COMMAND_TIMEOUT_EXIT_CODE = 124;
|
|
8761
8803
|
var REASONING_INSTRUCTION = 'Every bash tool call must include a brief non-empty "reasoning" input explaining why the command is needed.';
|
|
8762
|
-
function truncateOutput(output, maxLength
|
|
8804
|
+
function truncateOutput(output, maxLength) {
|
|
8763
8805
|
if (output.length <= maxLength) return output;
|
|
8764
|
-
const removed = output.length - maxLength;
|
|
8765
8806
|
return `${output.slice(0, maxLength)}
|
|
8766
|
-
|
|
8767
|
-
[${streamName} truncated: ${removed} characters removed]`;
|
|
8807
|
+
[Output truncated: ${output.length - maxLength} characters omitted.]`;
|
|
8768
8808
|
}
|
|
8769
8809
|
function makeTeeScriptPortable(script) {
|
|
8770
8810
|
const withoutStatusAssignments = script.replace(
|
|
@@ -8818,64 +8858,49 @@ async function uploadInitialFiles(sandbox, workingDirectory, files) {
|
|
|
8818
8858
|
);
|
|
8819
8859
|
}
|
|
8820
8860
|
}
|
|
8821
|
-
function createBashDescription(options) {
|
|
8822
|
-
return [
|
|
8823
|
-
"Run Bash commands in the sandbox. " + (options.workingDirectory !== void 0 ? `Every command starts in ${options.workingDirectory}. ` : "Commands run in the sandbox's default working directory. ") + "Use ls to discover files and commands such as cat, grep, sort, awk, and jq to inspect and transform them. Pipes and redirections are supported. Returns stdout, stderr, and exitCode; long output is truncated.",
|
|
8824
|
-
options.sandboxDescription,
|
|
8825
|
-
options.experimentalTeeTransform && `Pipeline stdout is captured under ${TEE_OUTPUT_DIR}/. Use the returned teeFiles paths to inspect full intermediate output.`,
|
|
8826
|
-
options.extraInstructions,
|
|
8827
|
-
REASONING_INSTRUCTION
|
|
8828
|
-
].filter(Boolean).join("\n\n");
|
|
8829
|
-
}
|
|
8830
8861
|
async function createBashTool(options) {
|
|
8831
8862
|
const { workingDirectory, sandbox } = options;
|
|
8832
8863
|
const initialFiles = await listInitialFiles(options);
|
|
8833
|
-
|
|
8834
|
-
|
|
8835
|
-
|
|
8836
|
-
|
|
8837
|
-
if (created.exitCode !== 0) {
|
|
8838
|
-
throw new Error(
|
|
8839
|
-
`Could not set up working directory ${workingDirectory}: ${created.stderr}`
|
|
8840
|
-
);
|
|
8841
|
-
}
|
|
8842
|
-
}
|
|
8864
|
+
const aiSdkBash = await experimental_createBashTool({
|
|
8865
|
+
sandbox,
|
|
8866
|
+
workingDirectory
|
|
8867
|
+
});
|
|
8843
8868
|
await uploadInitialFiles(sandbox, workingDirectory, initialFiles);
|
|
8844
8869
|
const experimentalTeeTransform = options.experimentalTeeTransform ?? false;
|
|
8845
8870
|
const bash = tool3({
|
|
8846
|
-
description:
|
|
8847
|
-
|
|
8848
|
-
|
|
8849
|
-
|
|
8850
|
-
|
|
8851
|
-
|
|
8871
|
+
description: [
|
|
8872
|
+
aiSdkBash.description,
|
|
8873
|
+
experimentalTeeTransform && `Pipeline stdout is captured under ${TEE_OUTPUT_DIR}/. Use the returned teeFiles paths to inspect full intermediate output.`,
|
|
8874
|
+
options.extraInstructions,
|
|
8875
|
+
REASONING_INSTRUCTION
|
|
8876
|
+
].filter(Boolean).join("\n\n"),
|
|
8852
8877
|
inputSchema: z12.object({
|
|
8853
8878
|
command: z12.string().describe("The bash command to execute"),
|
|
8854
8879
|
reasoning: z12.string().trim().min(1).describe("Brief reason for executing this command")
|
|
8855
8880
|
}),
|
|
8856
8881
|
execute: async ({ command: originalCommand }, executionOptions) => {
|
|
8857
8882
|
let command = originalCommand;
|
|
8858
|
-
const before = options.onBeforeBashCall?.({ command });
|
|
8859
|
-
if (before?.command !== void 0) command = before.command;
|
|
8860
|
-
let script = command;
|
|
8861
8883
|
let teeFiles;
|
|
8862
|
-
if (experimentalTeeTransform) {
|
|
8863
|
-
const pipeline = new BashTransformPipeline().use(
|
|
8864
|
-
new TeePlugin({ outputDir: TEE_OUTPUT_DIR })
|
|
8865
|
-
);
|
|
8866
|
-
const transformed = pipeline.transform(command);
|
|
8867
|
-
script = `mkdir -p ${shellQuote(TEE_OUTPUT_DIR)} && ${makeTeeScriptPortable(transformed.script)}`;
|
|
8868
|
-
teeFiles = transformed.metadata.teeFiles.map(
|
|
8869
|
-
(file) => ({
|
|
8870
|
-
command: file.command,
|
|
8871
|
-
stdoutFile: file.stdoutFile
|
|
8872
|
-
})
|
|
8873
|
-
);
|
|
8874
|
-
}
|
|
8875
8884
|
const { abortSignal } = executionOptions;
|
|
8876
8885
|
const startedAt = performance.now();
|
|
8877
8886
|
let result;
|
|
8878
8887
|
try {
|
|
8888
|
+
const before = options.onBeforeBashCall?.({ command });
|
|
8889
|
+
if (before?.command !== void 0) command = before.command;
|
|
8890
|
+
let script = command;
|
|
8891
|
+
if (experimentalTeeTransform) {
|
|
8892
|
+
const pipeline = new BashTransformPipeline().use(
|
|
8893
|
+
new TeePlugin({ outputDir: TEE_OUTPUT_DIR })
|
|
8894
|
+
);
|
|
8895
|
+
const transformed = pipeline.transform(command);
|
|
8896
|
+
script = `mkdir -p ${shellQuote(TEE_OUTPUT_DIR)} && ${makeTeeScriptPortable(transformed.script)}`;
|
|
8897
|
+
teeFiles = transformed.metadata.teeFiles.map(
|
|
8898
|
+
(file) => ({
|
|
8899
|
+
command: file.command,
|
|
8900
|
+
stdoutFile: file.stdoutFile
|
|
8901
|
+
})
|
|
8902
|
+
);
|
|
8903
|
+
}
|
|
8879
8904
|
result = await sandbox.run({
|
|
8880
8905
|
command: script,
|
|
8881
8906
|
...workingDirectory !== void 0 ? { workingDirectory } : {},
|
|
@@ -8897,8 +8922,8 @@ async function createBashTool(options) {
|
|
|
8897
8922
|
const maxOutputLength = options.maxOutputLength ?? DEFAULT_MAX_OUTPUT_LENGTH;
|
|
8898
8923
|
result = {
|
|
8899
8924
|
...result,
|
|
8900
|
-
stdout: truncateOutput(result.stdout, maxOutputLength
|
|
8901
|
-
stderr: truncateOutput(result.stderr, maxOutputLength
|
|
8925
|
+
stdout: truncateOutput(result.stdout, maxOutputLength),
|
|
8926
|
+
stderr: truncateOutput(result.stderr, maxOutputLength),
|
|
8902
8927
|
...teeFiles ? { teeFiles } : {}
|
|
8903
8928
|
};
|
|
8904
8929
|
const executionMeta = result.meta;
|
|
@@ -11126,23 +11151,32 @@ import { z as z14 } from "zod";
|
|
|
11126
11151
|
// packages/context/src/lib/store/postgres-transaction.ts
|
|
11127
11152
|
function surfacedThroughQueries() {
|
|
11128
11153
|
}
|
|
11129
|
-
|
|
11130
|
-
|
|
11131
|
-
|
|
11132
|
-
var
|
|
11154
|
+
function classNotLoaded() {
|
|
11155
|
+
throw new Error("PostgresTransaction: the class has not loaded");
|
|
11156
|
+
}
|
|
11157
|
+
var bridge = {
|
|
11158
|
+
open: classNotLoaded,
|
|
11159
|
+
finish: classNotLoaded,
|
|
11160
|
+
openSavepoint: classNotLoaded,
|
|
11161
|
+
closeSavepoint: classNotLoaded
|
|
11162
|
+
};
|
|
11133
11163
|
var PostgresTransaction = class _PostgresTransaction {
|
|
11164
|
+
static #savepoints = 0;
|
|
11134
11165
|
static {
|
|
11135
|
-
|
|
11136
|
-
|
|
11166
|
+
bridge.open = (client) => new _PostgresTransaction(client, void 0);
|
|
11167
|
+
bridge.finish = (tx) => {
|
|
11137
11168
|
tx.#finished = true;
|
|
11138
11169
|
};
|
|
11139
|
-
openSavepoint = (parent) => {
|
|
11170
|
+
bridge.openSavepoint = (parent) => {
|
|
11140
11171
|
parent.#assertUsable();
|
|
11141
11172
|
const child = new _PostgresTransaction(parent.#client, parent);
|
|
11142
11173
|
parent.#child = child;
|
|
11143
|
-
return
|
|
11174
|
+
return {
|
|
11175
|
+
child,
|
|
11176
|
+
savepoint: `deepagents_savepoint_${++_PostgresTransaction.#savepoints}`
|
|
11177
|
+
};
|
|
11144
11178
|
};
|
|
11145
|
-
closeSavepoint = (parent, child) => {
|
|
11179
|
+
bridge.closeSavepoint = (parent, child) => {
|
|
11146
11180
|
child.#finished = true;
|
|
11147
11181
|
parent.#child = void 0;
|
|
11148
11182
|
};
|
|
@@ -11176,14 +11210,13 @@ var PostgresTransaction = class _PostgresTransaction {
|
|
|
11176
11210
|
return this.#finished || parent !== void 0 && parent.#isFinished();
|
|
11177
11211
|
}
|
|
11178
11212
|
};
|
|
11179
|
-
var savepoints = 0;
|
|
11180
11213
|
async function postgresTransaction(db, fn) {
|
|
11181
11214
|
if (db instanceof PostgresTransaction) {
|
|
11182
11215
|
return inSavepoint(db, fn);
|
|
11183
11216
|
}
|
|
11184
11217
|
const client = await db.connect();
|
|
11185
11218
|
client.on("error", surfacedThroughQueries);
|
|
11186
|
-
const tx =
|
|
11219
|
+
const tx = bridge.open(client);
|
|
11187
11220
|
let broken = false;
|
|
11188
11221
|
try {
|
|
11189
11222
|
await client.query("BEGIN");
|
|
@@ -11191,7 +11224,7 @@ async function postgresTransaction(db, fn) {
|
|
|
11191
11224
|
try {
|
|
11192
11225
|
result = await fn(tx);
|
|
11193
11226
|
} finally {
|
|
11194
|
-
|
|
11227
|
+
bridge.finish(tx);
|
|
11195
11228
|
}
|
|
11196
11229
|
await client.query("COMMIT");
|
|
11197
11230
|
return result;
|
|
@@ -11208,18 +11241,17 @@ async function postgresTransaction(db, fn) {
|
|
|
11208
11241
|
}
|
|
11209
11242
|
}
|
|
11210
11243
|
async function inSavepoint(parent, fn) {
|
|
11211
|
-
const savepoint =
|
|
11212
|
-
const child = openSavepoint(parent);
|
|
11244
|
+
const { child, savepoint } = bridge.openSavepoint(parent);
|
|
11213
11245
|
let result;
|
|
11214
11246
|
try {
|
|
11215
11247
|
await child.query(`SAVEPOINT ${savepoint}`);
|
|
11216
11248
|
result = await fn(child);
|
|
11217
11249
|
} catch (error) {
|
|
11218
|
-
closeSavepoint(parent, child);
|
|
11250
|
+
bridge.closeSavepoint(parent, child);
|
|
11219
11251
|
await parent.query(`ROLLBACK TO SAVEPOINT ${savepoint}`);
|
|
11220
11252
|
throw error;
|
|
11221
11253
|
}
|
|
11222
|
-
closeSavepoint(parent, child);
|
|
11254
|
+
bridge.closeSavepoint(parent, child);
|
|
11223
11255
|
await parent.query(`RELEASE SAVEPOINT ${savepoint}`);
|
|
11224
11256
|
return result;
|
|
11225
11257
|
}
|
|
@@ -12889,60 +12921,94 @@ var StreamStore = class {
|
|
|
12889
12921
|
};
|
|
12890
12922
|
|
|
12891
12923
|
// packages/context/src/lib/stream-buffer.ts
|
|
12924
|
+
var MAX_QUEUED_CHUNKS = 128;
|
|
12892
12925
|
async function persistedWriter(options) {
|
|
12893
|
-
const {
|
|
12894
|
-
writer,
|
|
12895
|
-
store,
|
|
12896
|
-
streamId,
|
|
12897
|
-
strategy = "buffered",
|
|
12898
|
-
flushSize = 20
|
|
12899
|
-
} = options;
|
|
12926
|
+
const { writer, store, streamId } = options;
|
|
12900
12927
|
let seq = 0;
|
|
12901
|
-
let
|
|
12928
|
+
let queue = [];
|
|
12929
|
+
let appending;
|
|
12930
|
+
let appendSettled = Promise.resolve();
|
|
12931
|
+
let failure;
|
|
12902
12932
|
let failedByChunk = false;
|
|
12903
12933
|
let abortedByChunk = false;
|
|
12904
|
-
|
|
12905
|
-
if (
|
|
12906
|
-
|
|
12907
|
-
|
|
12908
|
-
await appendBatch(batch);
|
|
12909
|
-
}
|
|
12910
|
-
function makeChunk(part) {
|
|
12911
|
-
return {
|
|
12912
|
-
streamId,
|
|
12913
|
-
seq: seq++,
|
|
12914
|
-
data: part,
|
|
12915
|
-
createdAt: Date.now()
|
|
12916
|
-
};
|
|
12917
|
-
}
|
|
12918
|
-
async function appendBatch(batch) {
|
|
12919
|
-
await store.appendChunks(batch);
|
|
12920
|
-
failedByChunk ||= collectStreamFailures(batch).length > 0;
|
|
12921
|
-
}
|
|
12922
|
-
async function persistChunk(chunk) {
|
|
12923
|
-
if (chunk.data.type === "abort") {
|
|
12924
|
-
abortedByChunk = true;
|
|
12934
|
+
function enqueue(part, committed, failed) {
|
|
12935
|
+
if (failure) {
|
|
12936
|
+
failed(failure.error);
|
|
12937
|
+
return;
|
|
12925
12938
|
}
|
|
12926
|
-
|
|
12927
|
-
|
|
12928
|
-
|
|
12929
|
-
|
|
12930
|
-
|
|
12931
|
-
|
|
12939
|
+
queue.push({
|
|
12940
|
+
chunk: { streamId, seq: seq++, data: part, createdAt: Date.now() },
|
|
12941
|
+
committed,
|
|
12942
|
+
failed
|
|
12943
|
+
});
|
|
12944
|
+
appending ??= appendQueued();
|
|
12945
|
+
}
|
|
12946
|
+
async function appendQueued() {
|
|
12947
|
+
while (queue.length > 0) {
|
|
12948
|
+
const batch = queue;
|
|
12949
|
+
queue = [];
|
|
12950
|
+
const chunks = batch.map(({ chunk }) => chunk);
|
|
12951
|
+
const append = Promise.try(() => store.appendChunks(chunks));
|
|
12952
|
+
appendSettled = append.then(
|
|
12953
|
+
() => void 0,
|
|
12954
|
+
() => void 0
|
|
12955
|
+
);
|
|
12956
|
+
try {
|
|
12957
|
+
await append;
|
|
12958
|
+
} catch (error) {
|
|
12959
|
+
failure = { error };
|
|
12960
|
+
const rejected = [...batch, ...queue];
|
|
12961
|
+
queue = [];
|
|
12962
|
+
for (const entry of rejected) entry.failed(error);
|
|
12963
|
+
break;
|
|
12932
12964
|
}
|
|
12965
|
+
failedByChunk ||= collectStreamFailures(chunks).length > 0;
|
|
12966
|
+
abortedByChunk ||= chunks.some(({ data }) => data.type === "abort");
|
|
12967
|
+
for (const entry of batch) entry.committed();
|
|
12933
12968
|
}
|
|
12969
|
+
appending = void 0;
|
|
12970
|
+
}
|
|
12971
|
+
async function settle() {
|
|
12972
|
+
while (appending) await appending;
|
|
12973
|
+
}
|
|
12974
|
+
async function flush() {
|
|
12975
|
+
await settle();
|
|
12976
|
+
if (failure) throw failure.error;
|
|
12934
12977
|
}
|
|
12935
12978
|
const wrappedWriter = {
|
|
12936
12979
|
onError: writer.onError,
|
|
12937
|
-
|
|
12938
|
-
|
|
12939
|
-
|
|
12980
|
+
write(part) {
|
|
12981
|
+
const { promise, resolve: resolve3, reject } = Promise.withResolvers();
|
|
12982
|
+
enqueue(
|
|
12983
|
+
part,
|
|
12984
|
+
() => {
|
|
12985
|
+
writer.write(part);
|
|
12986
|
+
resolve3();
|
|
12987
|
+
},
|
|
12988
|
+
reject
|
|
12989
|
+
);
|
|
12990
|
+
return promise;
|
|
12940
12991
|
},
|
|
12941
12992
|
merge(stream) {
|
|
12993
|
+
let cancelled = false;
|
|
12942
12994
|
const transform = new TransformStream({
|
|
12943
|
-
async transform(
|
|
12944
|
-
|
|
12945
|
-
|
|
12995
|
+
async transform(part, controller) {
|
|
12996
|
+
enqueue(
|
|
12997
|
+
part,
|
|
12998
|
+
() => {
|
|
12999
|
+
if (!cancelled) controller.enqueue(part);
|
|
13000
|
+
},
|
|
13001
|
+
(error) => {
|
|
13002
|
+
if (!cancelled) controller.error(error);
|
|
13003
|
+
}
|
|
13004
|
+
);
|
|
13005
|
+
while (queue.length >= MAX_QUEUED_CHUNKS && !failure) {
|
|
13006
|
+
await appendSettled;
|
|
13007
|
+
}
|
|
13008
|
+
},
|
|
13009
|
+
flush: () => flush(),
|
|
13010
|
+
cancel() {
|
|
13011
|
+
cancelled = true;
|
|
12946
13012
|
}
|
|
12947
13013
|
});
|
|
12948
13014
|
writer.merge(stream.pipeThrough(transform));
|
|
@@ -12961,7 +13027,7 @@ async function persistedWriter(options) {
|
|
|
12961
13027
|
);
|
|
12962
13028
|
},
|
|
12963
13029
|
async fail(error) {
|
|
12964
|
-
await
|
|
13030
|
+
await settle();
|
|
12965
13031
|
if (failedByChunk) return;
|
|
12966
13032
|
await store.updateStreamStatus(streamId, "failed", { error });
|
|
12967
13033
|
},
|
|
@@ -12972,105 +13038,27 @@ async function persistedWriter(options) {
|
|
|
12972
13038
|
}
|
|
12973
13039
|
|
|
12974
13040
|
// packages/context/src/lib/stream/polling-change-source.ts
|
|
13041
|
+
import { Backoff } from "@zukhruf/async";
|
|
12975
13042
|
import { setTimeout as delay2 } from "node:timers/promises";
|
|
12976
|
-
|
|
12977
|
-
// packages/context/src/lib/stream/polling-policy.ts
|
|
12978
|
-
var DEFAULT_WATCH_POLLING = {
|
|
12979
|
-
minMs: 25,
|
|
12980
|
-
maxMs: 500,
|
|
12981
|
-
multiplier: 2,
|
|
12982
|
-
jitterRatio: 0.15,
|
|
12983
|
-
statusCheckEvery: 3
|
|
12984
|
-
};
|
|
12985
|
-
var DEFAULT_CANCEL_POLLING = {
|
|
12986
|
-
minMs: 50,
|
|
12987
|
-
maxMs: 500,
|
|
12988
|
-
multiplier: 2,
|
|
12989
|
-
jitterRatio: 0.15
|
|
12990
|
-
};
|
|
12991
|
-
function normalizeWatchPolling(polling, fallback = DEFAULT_WATCH_POLLING) {
|
|
12992
|
-
const merged = {
|
|
12993
|
-
...fallback,
|
|
12994
|
-
...polling
|
|
12995
|
-
};
|
|
12996
|
-
const normalizedBase = normalizeAdaptivePolling(merged, fallback);
|
|
12997
|
-
return {
|
|
12998
|
-
...normalizedBase,
|
|
12999
|
-
statusCheckEvery: clampInt(merged.statusCheckEvery, 1, 1e4)
|
|
13000
|
-
};
|
|
13001
|
-
}
|
|
13002
|
-
function normalizeCancelPolling(polling, fallback = DEFAULT_CANCEL_POLLING) {
|
|
13003
|
-
return normalizeAdaptivePolling(polling, fallback);
|
|
13004
|
-
}
|
|
13005
|
-
function createAdaptivePollingState(config) {
|
|
13006
|
-
return {
|
|
13007
|
-
config,
|
|
13008
|
-
currentMs: config.minMs
|
|
13009
|
-
};
|
|
13010
|
-
}
|
|
13011
|
-
function resetAdaptivePolling(state) {
|
|
13012
|
-
state.currentMs = state.config.minMs;
|
|
13013
|
-
}
|
|
13014
|
-
function nextAdaptivePollingDelay(state) {
|
|
13015
|
-
const current = clampInt(
|
|
13016
|
-
state.currentMs,
|
|
13017
|
-
state.config.minMs,
|
|
13018
|
-
state.config.maxMs
|
|
13019
|
-
);
|
|
13020
|
-
const delay3 = applyJitter(
|
|
13021
|
-
current,
|
|
13022
|
-
state.config.jitterRatio,
|
|
13023
|
-
state.config.minMs,
|
|
13024
|
-
state.config.maxMs
|
|
13025
|
-
);
|
|
13026
|
-
state.currentMs = clampInt(
|
|
13027
|
-
Math.ceil(current * state.config.multiplier),
|
|
13028
|
-
state.config.minMs,
|
|
13029
|
-
state.config.maxMs
|
|
13030
|
-
);
|
|
13031
|
-
return delay3;
|
|
13032
|
-
}
|
|
13033
|
-
function normalizeAdaptivePolling(polling, fallback) {
|
|
13034
|
-
const merged = {
|
|
13035
|
-
...fallback,
|
|
13036
|
-
...polling
|
|
13037
|
-
};
|
|
13038
|
-
const minMs = clampInt(merged.minMs, 1, 6e4);
|
|
13039
|
-
const maxMs = clampInt(merged.maxMs, minMs, 6e4);
|
|
13040
|
-
return {
|
|
13041
|
-
minMs,
|
|
13042
|
-
maxMs,
|
|
13043
|
-
multiplier: clampFloat(merged.multiplier, 1, 10),
|
|
13044
|
-
jitterRatio: clampFloat(merged.jitterRatio, 0, 1)
|
|
13045
|
-
};
|
|
13046
|
-
}
|
|
13047
|
-
function applyJitter(value, jitterRatio, min, max) {
|
|
13048
|
-
if (jitterRatio <= 0) return value;
|
|
13049
|
-
const radius = value * jitterRatio;
|
|
13050
|
-
const lowerBound = Math.max(0, value - radius);
|
|
13051
|
-
const upperBound = value + radius;
|
|
13052
|
-
const jittered = Math.round(
|
|
13053
|
-
lowerBound + Math.random() * (upperBound - lowerBound)
|
|
13054
|
-
);
|
|
13055
|
-
return clampInt(jittered, min, max);
|
|
13056
|
-
}
|
|
13057
|
-
function clampInt(value, min, max) {
|
|
13058
|
-
if (!Number.isFinite(value)) return min;
|
|
13059
|
-
return Math.min(max, Math.max(min, Math.round(value)));
|
|
13060
|
-
}
|
|
13061
|
-
function clampFloat(value, min, max) {
|
|
13062
|
-
if (!Number.isFinite(value)) return min;
|
|
13063
|
-
return Math.min(max, Math.max(min, value));
|
|
13064
|
-
}
|
|
13065
|
-
|
|
13066
|
-
// packages/context/src/lib/stream/polling-change-source.ts
|
|
13067
13043
|
var PollingChangeSource = class {
|
|
13068
13044
|
#reads;
|
|
13069
|
-
#
|
|
13045
|
+
#backoff;
|
|
13046
|
+
#statusCheckEvery;
|
|
13070
13047
|
#onPoll;
|
|
13071
13048
|
constructor(options) {
|
|
13049
|
+
const statusCheckEvery = options.statusCheckEvery ?? 3;
|
|
13050
|
+
if (!(Number.isInteger(statusCheckEvery) && statusCheckEvery >= 1))
|
|
13051
|
+
throw new RangeError(
|
|
13052
|
+
`statusCheckEvery must be a positive integer, not ${statusCheckEvery}`
|
|
13053
|
+
);
|
|
13072
13054
|
this.#reads = options.reads;
|
|
13073
|
-
this.#
|
|
13055
|
+
this.#backoff = options.backoff ?? new Backoff({
|
|
13056
|
+
initial: 25,
|
|
13057
|
+
multiplier: 2,
|
|
13058
|
+
max: 500,
|
|
13059
|
+
jitter: { kind: "ratio", ratio: 0.15 }
|
|
13060
|
+
});
|
|
13061
|
+
this.#statusCheckEvery = statusCheckEvery;
|
|
13074
13062
|
this.#onPoll = options.onPoll;
|
|
13075
13063
|
}
|
|
13076
13064
|
async *subscribe(streamId, signal) {
|
|
@@ -13080,15 +13068,15 @@ var PollingChangeSource = class {
|
|
|
13080
13068
|
}
|
|
13081
13069
|
yield { kind: "tick" };
|
|
13082
13070
|
if (isTerminal(initialStatus)) return;
|
|
13083
|
-
|
|
13071
|
+
let retries = 0;
|
|
13084
13072
|
let pollsSinceStatus = 0;
|
|
13085
13073
|
let lastStatus = initialStatus;
|
|
13086
13074
|
while (!signal.aborted) {
|
|
13087
|
-
const delayMs =
|
|
13075
|
+
const delayMs = this.#backoff.duration(retries++);
|
|
13088
13076
|
this.#emit({ type: "idle", streamId, delayMs });
|
|
13089
13077
|
if (!await waitForDelay(delayMs, signal)) return;
|
|
13090
13078
|
pollsSinceStatus += 1;
|
|
13091
|
-
const shouldCheckStatus = pollsSinceStatus >= this.#
|
|
13079
|
+
const shouldCheckStatus = pollsSinceStatus >= this.#statusCheckEvery;
|
|
13092
13080
|
if (!shouldCheckStatus) {
|
|
13093
13081
|
yield { kind: "chunks" };
|
|
13094
13082
|
continue;
|
|
@@ -13106,7 +13094,7 @@ var PollingChangeSource = class {
|
|
|
13106
13094
|
return;
|
|
13107
13095
|
}
|
|
13108
13096
|
if (status === "running" && lastStatus !== "running") {
|
|
13109
|
-
|
|
13097
|
+
retries = 0;
|
|
13110
13098
|
}
|
|
13111
13099
|
lastStatus = status;
|
|
13112
13100
|
if (isTerminal(status)) {
|
|
@@ -14032,7 +14020,16 @@ var SqliteStreamStore = class extends StreamStore {
|
|
|
14032
14020
|
};
|
|
14033
14021
|
|
|
14034
14022
|
// packages/context/src/lib/stream/stream-manager.ts
|
|
14023
|
+
import { Backoff as Backoff2 } from "@zukhruf/async";
|
|
14035
14024
|
import { createUIMessageStream as createUIMessageStream3 } from "ai";
|
|
14025
|
+
import { setTimeout as delay3 } from "node:timers/promises";
|
|
14026
|
+
var CANCEL_WATCHER_RETRY_MAX_MS = 500;
|
|
14027
|
+
var CANCEL_WATCHER_RETRY = new Backoff2({
|
|
14028
|
+
initial: 50,
|
|
14029
|
+
multiplier: 2,
|
|
14030
|
+
max: CANCEL_WATCHER_RETRY_MAX_MS,
|
|
14031
|
+
jitter: { kind: "ratio", ratio: 0.15 }
|
|
14032
|
+
});
|
|
14036
14033
|
function isTerminal3(status) {
|
|
14037
14034
|
return status !== "queued" && status !== "running";
|
|
14038
14035
|
}
|
|
@@ -14115,9 +14112,7 @@ var StreamManager = class {
|
|
|
14115
14112
|
pw = await persistedWriter({
|
|
14116
14113
|
writer,
|
|
14117
14114
|
store: this.#store,
|
|
14118
|
-
streamId
|
|
14119
|
-
strategy: options?.strategy,
|
|
14120
|
-
flushSize: options?.flushSize
|
|
14115
|
+
streamId
|
|
14121
14116
|
});
|
|
14122
14117
|
pw.writer.merge(stream);
|
|
14123
14118
|
}
|
|
@@ -14161,7 +14156,7 @@ var StreamManager = class {
|
|
|
14161
14156
|
ac.abort();
|
|
14162
14157
|
await this.#notifyCancellation(streamId, options);
|
|
14163
14158
|
};
|
|
14164
|
-
|
|
14159
|
+
let retries = 0;
|
|
14165
14160
|
const listeners = this.#localCancellationListeners.get(streamId) ?? /* @__PURE__ */ new Set();
|
|
14166
14161
|
listeners.add(detect);
|
|
14167
14162
|
this.#localCancellationListeners.set(streamId, listeners);
|
|
@@ -14184,8 +14179,8 @@ var StreamManager = class {
|
|
|
14184
14179
|
streamId,
|
|
14185
14180
|
ac.signal
|
|
14186
14181
|
)) {
|
|
14187
|
-
if (!subscriptionStabilized && Date.now() - subscribedAt >=
|
|
14188
|
-
|
|
14182
|
+
if (!subscriptionStabilized && Date.now() - subscribedAt >= CANCEL_WATCHER_RETRY_MAX_MS) {
|
|
14183
|
+
retries = 0;
|
|
14189
14184
|
subscriptionStabilized = true;
|
|
14190
14185
|
}
|
|
14191
14186
|
if (change.kind === "chunks") continue;
|
|
@@ -14203,7 +14198,10 @@ var StreamManager = class {
|
|
|
14203
14198
|
} catch {
|
|
14204
14199
|
if (ac.signal.aborted || detected) return;
|
|
14205
14200
|
}
|
|
14206
|
-
if (!await waitForDelay2(
|
|
14201
|
+
if (!await waitForDelay2(
|
|
14202
|
+
CANCEL_WATCHER_RETRY.duration(retries++),
|
|
14203
|
+
ac.signal
|
|
14204
|
+
)) {
|
|
14207
14205
|
return;
|
|
14208
14206
|
}
|
|
14209
14207
|
}
|
|
@@ -14340,17 +14338,9 @@ var StreamManager = class {
|
|
|
14340
14338
|
}
|
|
14341
14339
|
};
|
|
14342
14340
|
function waitForDelay2(ms, signal) {
|
|
14343
|
-
|
|
14344
|
-
|
|
14345
|
-
|
|
14346
|
-
signal.removeEventListener("abort", onAbort);
|
|
14347
|
-
resolve3(true);
|
|
14348
|
-
}, ms);
|
|
14349
|
-
const onAbort = () => {
|
|
14350
|
-
globalThis.clearTimeout(timeout);
|
|
14351
|
-
resolve3(false);
|
|
14352
|
-
};
|
|
14353
|
-
signal.addEventListener("abort", onAbort, { once: true });
|
|
14341
|
+
return delay3(ms, true, { signal }).catch((err) => {
|
|
14342
|
+
if (signal.aborted) return false;
|
|
14343
|
+
throw err;
|
|
14354
14344
|
});
|
|
14355
14345
|
}
|
|
14356
14346
|
async function drainAvailable(controller, store, streamId, lastSeqRef, pageSize, onPage) {
|
|
@@ -14456,9 +14446,7 @@ export {
|
|
|
14456
14446
|
ContextEngine,
|
|
14457
14447
|
ContextRenderer,
|
|
14458
14448
|
ContextStore,
|
|
14459
|
-
DEFAULT_CANCEL_POLLING,
|
|
14460
14449
|
DEFAULT_STOP_WHEN,
|
|
14461
|
-
DEFAULT_WATCH_POLLING,
|
|
14462
14450
|
DaytonaCreationError,
|
|
14463
14451
|
DaytonaSandboxError,
|
|
14464
14452
|
DockerEngine,
|
|
@@ -14539,7 +14527,6 @@ export {
|
|
|
14539
14527
|
contentMatches,
|
|
14540
14528
|
contentPattern,
|
|
14541
14529
|
correction,
|
|
14542
|
-
createAdaptivePollingState,
|
|
14543
14530
|
createAppleContainerSandbox,
|
|
14544
14531
|
createBashTool,
|
|
14545
14532
|
createBinaryBridges,
|
|
@@ -14547,7 +14534,6 @@ export {
|
|
|
14547
14534
|
createDockerSandbox,
|
|
14548
14535
|
createInstallerContext,
|
|
14549
14536
|
createMicrosandboxSandbox,
|
|
14550
|
-
createRepairToolCall2 as createRepairToolCall,
|
|
14551
14537
|
createVirtualSandbox,
|
|
14552
14538
|
dateReminder,
|
|
14553
14539
|
dayChanged,
|
|
@@ -14606,9 +14592,6 @@ export {
|
|
|
14606
14592
|
message,
|
|
14607
14593
|
monthChanged,
|
|
14608
14594
|
monthReminder,
|
|
14609
|
-
nextAdaptivePollingDelay,
|
|
14610
|
-
normalizeCancelPolling,
|
|
14611
|
-
normalizeWatchPolling,
|
|
14612
14595
|
not,
|
|
14613
14596
|
npm,
|
|
14614
14597
|
nullUsage,
|
|
@@ -14630,7 +14613,6 @@ export {
|
|
|
14630
14613
|
reminder,
|
|
14631
14614
|
render,
|
|
14632
14615
|
repairQuotedArg,
|
|
14633
|
-
resetAdaptivePolling,
|
|
14634
14616
|
resolveReminder,
|
|
14635
14617
|
resolveReminderAsync,
|
|
14636
14618
|
resolveTz,
|