@deepagents/context 0.35.0 → 0.36.0

package/dist/index.js

@@ -83,22 +83,6 @@ function assistantText(content, options) {
     parts: [{ type: "text", text: content }]
   });
 }
-var LAZY_ID = Symbol.for("@deepagents/context:lazy-id");
-function isLazyFragment(fragment2) {
-  return LAZY_ID in fragment2;
-}
-function lastAssistantMessage(content) {
-  return {
-    name: "assistant",
-    type: "message",
-    persist: true,
-    data: "content",
-    [LAZY_ID]: {
-      type: "last-assistant",
-      content
-    }
-  };
-}
 
 // packages/context/src/lib/guardrail.ts
 function pass(part) {
@@ -149,6 +133,7 @@ var Agent = class _Agent {
     return generateText({
       abortSignal: config?.abortSignal,
       providerOptions: this.#options.providerOptions,
+      experimental_telemetry: this.#options.experimental_telemetry,
       model: this.#options.model,
       system: systemPrompt,
       messages: await convertToModelMessages(messages, {
@@ -157,7 +142,10 @@ var Agent = class _Agent {
       stopWhen: stepCountIs(200),
       tools: this.#options.tools,
       experimental_context: contextVariables,
-      experimental_repairToolCall: createRepairToolCall(this.#options.model),
+      experimental_repairToolCall: createRepairToolCall(
+        this.#options.model,
+        config?.abortSignal
+      ),
       toolChoice: this.#options.toolChoice,
       onStepFinish: (step) => {
         const toolCall = step.toolCalls.at(-1);
@@ -218,12 +206,16 @@ var Agent = class _Agent {
     return streamText({
       abortSignal: config?.abortSignal,
       providerOptions: this.#options.providerOptions,
+      experimental_telemetry: this.#options.experimental_telemetry,
       model,
       system: systemPrompt,
       messages: await convertToModelMessages(messages, {
         ignoreIncompleteToolCalls: true
       }),
-      experimental_repairToolCall: createRepairToolCall(model),
+      experimental_repairToolCall: createRepairToolCall(
+        model,
+        config?.abortSignal
+      ),
       stopWhen: stepCountIs(200),
       experimental_transform: config?.transform ?? smoothStream(),
       tools: this.#options.tools,
@@ -243,8 +235,8 @@ var Agent = class _Agent {
    * Wrap a StreamTextResult with guardrail protection on toUIMessageStream().
    *
    * When a guardrail fails:
-   * 1. Accumulated text + feedback is appended as the assistant's self-correction
-   * 2. The feedback is written to the output stream (user sees the correction)
+   * 1. The feedback is written to the output stream (user sees the correction)
+   * 2. A finish-step is emitted, triggering onStepFinish to persist the self-correction
    * 3. A new stream is started and the model continues from the correction
    */
   #wrapWithGuardrails(result, contextVariables, config) {
@@ -255,8 +247,18 @@ var Agent = class _Agent {
     }
     const originalToUIMessageStream = result.toUIMessageStream.bind(result);
     result.toUIMessageStream = (options) => {
+      const assistantMsgId = options?.generateMessageId?.();
+      let stepSaved = null;
       return createUIMessageStream({
-        generateId: generateId2,
+        generateId: assistantMsgId ? () => assistantMsgId : generateId2,
+        onStepFinish: async ({ responseMessage }) => {
+          if (!stepSaved) return;
+          const normalizedMessage = assistantMsgId ? { ...responseMessage, id: assistantMsgId } : responseMessage;
+          context.set(assistant(normalizedMessage));
+          await context.save({ branch: false });
+          stepSaved.resolve();
+          stepSaved = null;
+        },
         execute: async ({ writer }) => {
           let currentResult = result;
           let attempt = 0;
@@ -271,7 +273,6 @@ var Agent = class _Agent {
               return;
             }
             attempt++;
-            let accumulatedText = "";
             let guardrailFailed = false;
             let failureFeedback = "";
             const uiStream = currentResult === result ? originalToUIMessageStream(options) : currentResult.toUIMessageStream(options);
@@ -301,9 +302,6 @@ var Agent = class _Agent {
                 writer.write({ type: "finish" });
                 return;
               }
-              if (checkResult.part.type === "text-delta") {
-                accumulatedText += checkResult.part.delta;
-              }
               writer.write(part);
             }
             if (!guardrailFailed) {
@@ -320,9 +318,9 @@ var Agent = class _Agent {
               return;
             }
             writeText(writer, failureFeedback);
-            const selfCorrectionText = accumulatedText + " " + failureFeedback;
-            context.set(lastAssistantMessage(selfCorrectionText));
-            await context.save({ branch: false });
+            stepSaved = Promise.withResolvers();
+            writer.write({ type: "finish-step" });
+            await stepSaved.promise;
             currentResult = await this.#createRawStream(
               contextVariables,
               config
@@ -362,13 +360,17 @@ function structuredOutput(options) {
       const result = await generateText({
         abortSignal: config?.abortSignal,
         providerOptions: options.providerOptions,
+        experimental_telemetry: options.experimental_telemetry,
         model: options.model,
         system: systemPrompt,
         messages: await convertToModelMessages(messages, {
           ignoreIncompleteToolCalls: true
         }),
         stopWhen: stepCountIs(200),
-        experimental_repairToolCall: createRepairToolCall(options.model),
+        experimental_repairToolCall: createRepairToolCall(
+          options.model,
+          config?.abortSignal
+        ),
         experimental_context: contextVariables,
         output: Output.object({ schema: options.schema }),
         tools: options.tools
@@ -388,9 +390,13 @@ function structuredOutput(options) {
       return streamText({
         abortSignal: config?.abortSignal,
         providerOptions: options.providerOptions,
+        experimental_telemetry: options.experimental_telemetry,
         model: options.model,
         system: systemPrompt,
-        experimental_repairToolCall: createRepairToolCall(options.model),
+        experimental_repairToolCall: createRepairToolCall(
+          options.model,
+          config?.abortSignal
+        ),
         messages: await convertToModelMessages(messages, {
           ignoreIncompleteToolCalls: true
         }),
@@ -1999,7 +2005,7 @@ var ContextEngine = class {
     let messageCount = 0;
     let lastMessageAt;
     let lastMessage;
-    let lastAssistantMessage2;
+    let lastAssistantMessage;
     if (this.#branch?.headMessageId) {
       const chain = await this.#store.getMessageChain(
         this.#branch.headMessageId
@@ -2007,7 +2013,7 @@ var ContextEngine = class {
       for (const msg of chain) {
         messageCount++;
         if (msg.name === "assistant") {
-          lastAssistantMessage2 = msg.data;
+          lastAssistantMessage = msg.data;
         }
         if (msg.name !== "user") {
           continue;
@@ -2026,7 +2032,7 @@ var ContextEngine = class {
       messageCount,
       lastMessageAt,
       lastMessage,
-      lastAssistantMessage: lastAssistantMessage2
+      lastAssistantMessage
     };
   }
   async getTurnCount() {
@@ -2088,17 +2094,9 @@ var ContextEngine = class {
         messages.push(msg.data);
       }
     }
-    for (let i = 0; i < this.#pendingMessages.length; i++) {
-      const fragment2 = this.#pendingMessages[i];
-      if (isLazyFragment(fragment2)) {
-        this.#pendingMessages[i] = await this.#resolveLazyFragment(fragment2);
-      }
-    }
     for (const fragment2 of this.#pendingMessages) {
       if (!fragment2.codec) {
-        throw new Error(
-          `Fragment "${fragment2.name}" is missing codec. Lazy fragments must be resolved before encode.`
-        );
+        throw new Error(`Fragment "${fragment2.name}" is missing codec.`);
       }
       messages.push(fragment2.codec.encode());
     }
@@ -2127,12 +2125,6 @@ var ContextEngine = class {
       return { headMessageId: this.#branch?.headMessageId ?? void 0 };
     }
     const shouldBranch = options?.branch ?? true;
-    for (let i = 0; i < this.#pendingMessages.length; i++) {
-      const fragment2 = this.#pendingMessages[i];
-      if (isLazyFragment(fragment2)) {
-        this.#pendingMessages[i] = await this.#resolveLazyFragment(fragment2);
-      }
-    }
     if (shouldBranch) {
       for (const fragment2 of this.#pendingMessages) {
         if (fragment2.id) {
@@ -2162,7 +2154,7 @@ var ContextEngine = class {
             messageCount,
             lastMessageAt,
             lastMessage,
-            lastAssistantMessage: lastAssistantMessage2
+            lastAssistantMessage
           } = await this.#getChainContext();
           const original = lastUserFragment.codec.encode();
           const plainText = extractPlainText(original);
@@ -2179,7 +2171,7 @@ var ContextEngine = class {
             branch: this.#branchName,
             elapsed,
             messageCount,
-            lastAssistantMessage: lastAssistantMessage2
+            lastAssistantMessage
           };
           const configs = conditionalReminders.map(getConditionalReminder);
           const whenResults = await Promise.all(
@@ -2211,9 +2203,7 @@ var ContextEngine = class {
     const now = Date.now();
     for (const fragment2 of this.#pendingMessages) {
       if (!fragment2.codec) {
-        throw new Error(
-          `Fragment "${fragment2.name}" is missing codec. Lazy fragments must be resolved before encode.`
-        );
+        throw new Error(`Fragment "${fragment2.name}" is missing codec.`);
       }
       const msgId = fragment2.id ?? crypto.randomUUID();
       let msgParentId = parentId;
@@ -2240,39 +2230,6 @@ var ContextEngine = class {
     this.#pendingMessages = [];
     return { headMessageId: this.#activeBranch.headMessageId ?? void 0 };
   }
-  /**
-   * Resolve a lazy fragment by finding the appropriate ID.
-   */
-  async #resolveLazyFragment(fragment2) {
-    const lazy = fragment2[LAZY_ID];
-    if (lazy.type === "last-assistant") {
-      const lastId = await this.#getLastAssistantId();
-      return assistantText(lazy.content, { id: lastId ?? crypto.randomUUID() });
-    }
-    throw new Error(`Unknown lazy fragment type: ${lazy.type}`);
-  }
-  /**
-   * Find the most recent assistant message ID (pending or persisted).
-   */
-  async #getLastAssistantId() {
-    for (let i = this.#pendingMessages.length - 1; i >= 0; i--) {
-      const msg = this.#pendingMessages[i];
-      if (msg.name === "assistant" && !isLazyFragment(msg)) {
-        return msg.id;
-      }
-    }
-    if (this.#branch?.headMessageId) {
-      const chain = await this.#store.getMessageChain(
-        this.#branch.headMessageId
-      );
-      for (let i = chain.length - 1; i >= 0; i--) {
-        if (chain[i].name === "assistant") {
-          return chain[i].id;
-        }
-      }
-    }
-    return void 0;
-  }
   /**
    * Estimate token count and cost for the full context.
    *
@@ -7965,7 +7922,6 @@ export {
   DockerfileBuildError,
   DockerfileStrategy,
   InMemoryContextStore,
-  LAZY_ID,
   MarkdownRenderer,
   ModelsRegistry,
   MountPathError,
@@ -8033,10 +7989,8 @@ export {
   isDockerfileOptions,
   isFragment,
   isFragmentObject,
-  isLazyFragment,
   isMessageFragment,
   isRecord,
-  lastAssistantMessage,
   loadSkillMetadata,
   localeReminder,
   mergeMessageMetadata,