agentbox-sdk 0.1.303 → 0.1.304

package/dist/agents/index.js

@@ -1,7 +1,7 @@
 import {
   Agent
-} from "../chunk-GBM7LKZF.js";
-import "../chunk-NWAXQ7UD.js";
+} from "../chunk-T7C77LCW.js";
+import "../chunk-EK6GC6YA.js";
 import {
   AGENT_RESERVED_PORTS,
   collectAllAgentReservedPorts

package/dist/{chunk-NWAXQ7UD.js → chunk-EK6GC6YA.js}

@@ -426,7 +426,9 @@ var ClaudeCodeLogAssembler = class {
       }
       const final = extractClaudeAssistantContent(message);
       this.textByMessageId.set(id, final.text);
-      this.thinkingByMessageId.set(id, final.thinking);
+      if (final.thinking) {
+        this.thinkingByMessageId.set(id, final.thinking);
+      }
       const snapshot = this.upsertMessage(id, final.extraBlocks);
       this.currentMessageId = null;
       return [snapshot];

package/dist/{chunk-GBM7LKZF.js → chunk-T7C77LCW.js}

@@ -2,7 +2,7 @@ import {
   createNormalizedEvent,
   normalizeRawAgentEvent,
   toAISDKStream
-} from "./chunk-NWAXQ7UD.js";
+} from "./chunk-EK6GC6YA.js";
 import {
   AgentBoxError,
   AsyncQueue,
@@ -2504,6 +2504,31 @@ async function* streamSse(url, init) {
   })();
   yield* queue;
 }
+async function* streamSseResilient(url, init) {
+  let lastEventId;
+  let attempt = 0;
+  const signal = init?.signal;
+  while (true) {
+    try {
+      const headers = {
+        ...init?.headers ?? {},
+        ...lastEventId ? { "Last-Event-ID": lastEventId } : {}
+      };
+      for await (const ev of streamSse(url, { ...init, headers })) {
+        attempt = 0;
+        if (ev.id) lastEventId = ev.id;
+        yield ev;
+      }
+      return;
+    } catch (err) {
+      if (signal?.aborted) throw err;
+      const delay = Math.min(500 * Math.pow(2, attempt), 5e3);
+      attempt++;
+      await new Promise((resolve) => setTimeout(resolve, delay));
+      if (signal?.aborted) throw err;
+    }
+  }
+}
 async function connectJsonRpcWebSocket(url, options) {
   const notifications = new AsyncQueue();
   const socket = new WebSocket(url, { headers: options?.headers });
@@ -3540,7 +3565,7 @@ var CodexAgentAdapter = class {
             Date.now() - executeStartedAt,
             text?.length ?? 0
           );
-          sink.complete({ text, costData: extractCodexCostData(rawPayloads) });
+          sink.complete({ costData: extractCodexCostData(rawPayloads) });
         }
       }
     } finally {
@@ -3638,73 +3663,6 @@ function toRawEvent3(runId, payload, type) {
     payload
   };
 }
-function extractText(value) {
-  if (!value) {
-    return "";
-  }
-  if (typeof value === "string") {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map(extractText).filter(Boolean).join("");
-  }
-  if (typeof value === "object") {
-    const record = value;
-    if (record.type === "text" && typeof record.text === "string") {
-      return record.text;
-    }
-    if (record.type === "reasoning") {
-      return "";
-    }
-    if (record.message) {
-      return extractText(record.message);
-    }
-    if (record.content) {
-      return extractText(record.content);
-    }
-    if (record.parts) {
-      return extractText(record.parts);
-    }
-    if (record.text) {
-      return extractText(record.text);
-    }
-  }
-  return "";
-}
-function extractAssistantMessageId(response) {
-  if (!response || typeof response !== "object") {
-    return void 0;
-  }
-  const record = response;
-  const info = record.info && typeof record.info === "object" ? record.info : record.message && typeof record.message === "object" ? record.message : void 0;
-  const id = info?.id ?? record.id;
-  return typeof id === "string" ? id : void 0;
-}
-function extractReasoning(value) {
-  if (!value) {
-    return "";
-  }
-  if (Array.isArray(value)) {
-    return value.map(extractReasoning).filter(Boolean).join("");
-  }
-  if (typeof value === "object") {
-    const record = value;
-    if (record.type === "reasoning") {
-      if (typeof record.text === "string") {
-        return record.text;
-      }
-      if (typeof record.reasoning === "string") {
-        return record.reasoning;
-      }
-    }
-    return [
-      extractReasoning(record.message),
-      extractReasoning(record.content),
-      extractReasoning(record.parts)
-    ].filter(Boolean).join("");
-  }
-  return "";
-}
 function toOpenCodeModel(model) {
   if (!model) {
     return void 0;
@@ -3771,6 +3729,14 @@ function buildOpenCodeConfig(options, interactiveApproval) {
   const commandsConfig = buildOpenCodeCommandsConfig(options.commands);
   const baseAgent = {
     mode: "primary",
+    // Suppress opencode's default provider system prompt (e.g.
+    // PROMPT_ANTHROPIC's "You are OpenCode...") so request.run.systemPrompt
+    // is the dominant identity statement the model sees. opencode's
+    // session/llm.ts uses agent.prompt instead of SystemPrompt.provider(model)
+    // when this field is truthy — codex already takes that branch via a
+    // separate options.instructions channel, so this brings anthropic et al.
+    // in line. Constant value, so setupId stays stable.
+    prompt: "You are an AI coding assistant. Follow the user's instructions.",
     permission: buildOpenCodePermissionConfig(interactiveApproval),
     tools: {
       write: true,
@@ -4029,25 +3995,14 @@ var OpenCodeAgentAdapter = class {
       "validateProviderUserInput",
       () => validateProviderUserInput(request.provider, request.run.input)
     );
-    let pendingMessages = 0;
-    let finalText = "";
     let streamedTextFromSse = "";
-    const settledMessageIds = /* @__PURE__ */ new Set();
+    const assistantTextByMessageId = /* @__PURE__ */ new Map();
+    const announcedAssistantCompletions = /* @__PURE__ */ new Set();
     let dispatchError;
     let firstSseEventLogged = false;
-    let resolveAllDone;
-    const allDone = new Promise((resolve) => {
-      resolveAllDone = resolve;
-    });
-    const checkDone = () => {
-      if (pendingMessages === 0) {
-        resolveAllDone();
-      }
-    };
     let sendToSession;
     const queuedParts = [];
     sink.onMessage(async (content) => {
-      pendingMessages++;
       try {
         const parts = await validateProviderUserInput(
           request.provider,
@@ -4060,11 +4015,10 @@ var OpenCodeAgentAdapter = class {
           queuedParts.push(mapped);
         }
       } catch (error) {
-        pendingMessages--;
         if (!dispatchError) {
           dispatchError = error;
         }
-        checkDone();
+        resolveSessionTerminal();
         throw error;
       }
     });
@@ -4083,10 +4037,15 @@ var OpenCodeAgentAdapter = class {
     const rawPayloads = [];
     const sseAbort = new AbortController();
     let sseTask;
-    const dispatchAbort = new AbortController();
     let capturedSessionId;
     let sessionErrorFromSse;
     let sessionAbortedFromSse = false;
+    let sessionIdleFromSse = false;
+    let resolveSessionTerminal;
+    const sessionTerminal = new Promise((resolve) => {
+      resolveSessionTerminal = resolve;
+    });
+    let lastSseActivityAt = Date.now();
     let userAbortRequested = false;
     sink.setAbort(async () => {
       userAbortRequested = true;
@@ -4114,7 +4073,7 @@ var OpenCodeAgentAdapter = class {
         } catch {
         }
       }
-      dispatchAbort.abort();
+      resolveSessionTerminal();
     });
     try {
       const interactiveApproval = isInteractiveApproval(request.options);
@@ -4155,10 +4114,14 @@ var OpenCodeAgentAdapter = class {
       const foreignMessageIds = /* @__PURE__ */ new Set();
       sseTask = (async () => {
         try {
-          for await (const event of streamSse(`${runtime.baseUrl}/event`, {
-            headers: runtime.previewHeaders,
-            signal: sseAbort.signal
-          })) {
+          for await (const event of streamSseResilient(
+            `${runtime.baseUrl}/event`,
+            {
+              headers: runtime.previewHeaders,
+              signal: sseAbort.signal
+            }
+          )) {
+            lastSseActivityAt = Date.now();
             if (!firstSseEventLogged) {
               firstSseEventLogged = true;
               debugOpencode(
@@ -4201,6 +4164,22 @@ var OpenCodeAgentAdapter = class {
                       { messageId: info.id }
                     )
                   );
+                } else if (info.role === "assistant" && !announcedAssistantCompletions.has(info.id)) {
+                  const time2 = info.time;
+                  if (typeof time2?.completed === "number") {
+                    announcedAssistantCompletions.add(info.id);
+                    sink.emitEvent(
+                      createNormalizedEvent(
+                        "message.completed",
+                        {
+                          provider: request.provider,
+                          runId: request.runId,
+                          raw
+                        },
+                        { text: assistantTextByMessageId.get(info.id) ?? "" }
+                      )
+                    );
+                  }
                 }
               }
             }
@@ -4233,7 +4212,7 @@ var OpenCodeAgentAdapter = class {
               continue;
             }
             const payloadRecord = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : null;
-            if ((payloadRecord?.type === "session.idle" || payloadRecord?.type === "session.error") && !dispatchAbort.signal.aborted) {
+            if (payloadRecord?.type === "session.idle" || payloadRecord?.type === "session.error") {
               const properties = payloadRecord.properties;
               const eventSessionId = typeof properties?.sessionID === "string" ? properties.sessionID : void 0;
               if (!eventSessionId || eventSessionId === sessionId) {
@@ -4245,13 +4224,28 @@ var OpenCodeAgentAdapter = class {
                     const errMsg = typeof errData?.data?.message === "string" ? errData.data.message : typeof errData?.message === "string" ? errData.message : "OpenCode session error";
                     sessionErrorFromSse = new Error(errMsg);
                   }
+                } else {
+                  sessionIdleFromSse = true;
                 }
                 debugOpencode(
-                  "\u2605 %s for session=%s \u2014 aborting in-flight dispatch",
+                  "\u2605 %s for session=%s",
                   payloadRecord.type,
                   sessionId
                 );
-                dispatchAbort.abort();
+                resolveSessionTerminal();
+              }
+            }
+            if (payloadRecord?.type === "session.status") {
+              const properties = payloadRecord.properties;
+              const status = properties?.status;
+              const eventSessionId = typeof properties?.sessionID === "string" ? properties.sessionID : void 0;
+              if ((!eventSessionId || eventSessionId === sessionId) && status?.type === "idle") {
+                sessionIdleFromSse = true;
+                debugOpencode(
+                  "\u2605 session.status{idle} for session=%s",
+                  sessionId
+                );
+                resolveSessionTerminal();
               }
             }
             if (payloadRecord?.type === "message.part.delta") {
@@ -4262,12 +4256,15 @@ var OpenCodeAgentAdapter = class {
               if (isForeignSession) {
                 continue;
               }
-              if (eventMessageId !== void 0 && settledMessageIds.has(eventMessageId)) {
-                continue;
-              }
               const delta = typeof properties?.delta === "string" ? properties.delta : "";
               if (delta && properties?.field === "text") {
                 streamedTextFromSse += delta;
+                if (eventMessageId) {
+                  assistantTextByMessageId.set(
+                    eventMessageId,
+                    (assistantTextByMessageId.get(eventMessageId) ?? "") + delta
+                  );
+                }
                 sink.emitEvent(
                   createNormalizedEvent(
                     "text.delta",
@@ -4320,131 +4317,131 @@ var OpenCodeAgentAdapter = class {
         })
       );
       const agentSlug = openCodeAgentSlug(request.run.reasoning);
-      const dispatchMessage = async (parts) => {
-        const sseTextLengthBeforeDispatch = streamedTextFromSse.length;
-        try {
-          const response = await fetchJson(
-            `${runtime.baseUrl}/session/${sessionId}/message`,
-            {
-              method: "POST",
-              signal: dispatchAbort.signal,
-              headers: {
-                "content-type": "application/json",
-                ...runtime.previewHeaders
-              },
-              body: JSON.stringify({
-                ...request.run.model ? { model: toOpenCodeModel(request.run.model) } : {},
-                // Per-message system prompt — keeps systemPrompt out of
-                // the on-disk agent config so changing it doesn't
-                // invalidate setupId. Sent on every dispatch (the field
-                // is per-message, not session-sticky).
-                ...request.run.systemPrompt ? { system: request.run.systemPrompt } : {},
-                agent: agentSlug,
-                parts
-              })
+      const dispatchPrompt = async (parts) => {
+        const body = JSON.stringify({
+          ...request.run.model ? { model: toOpenCodeModel(request.run.model) } : {},
+          // Per-message system prompt — keeps systemPrompt out of
+          // the on-disk agent config so changing it doesn't
+          // invalidate setupId. Sent on every dispatch (the field
+          // is per-message, not session-sticky).
+          ...request.run.systemPrompt ? { system: request.run.systemPrompt } : {},
+          agent: agentSlug,
+          parts
+        });
+        const url = `${runtime.baseUrl}/session/${sessionId}/prompt_async`;
+        const attempt = async () => {
+          return fetch(url, {
+            method: "POST",
+            headers: {
+              "content-type": "application/json",
+              ...runtime.previewHeaders
+            },
+            body
+          });
+        };
+        let lastError;
+        for (let i = 0; i < 2; i++) {
+          try {
+            const response = await attempt();
+            if (response.ok || response.status === 204) {
+              return;
             }
-          );
-          const rawResponse = toRawEvent3(
-            request.runId,
-            response,
-            "message.response"
-          );
-          if (response && typeof response === "object" && !Array.isArray(response)) {
-            rawPayloads.push(response);
-          }
-          sink.emitRaw(rawResponse);
-          for (const event of normalizeRawAgentEvent(rawResponse)) {
-            sink.emitEvent(event);
-          }
-          const reasoning = extractReasoning(response);
-          if (reasoning) {
-            sink.emitEvent(
-              createNormalizedEvent(
-                "reasoning.delta",
-                {
-                  provider: request.provider,
-                  runId: request.runId,
-                  raw: rawResponse
-                },
-                { delta: reasoning }
-              )
+            lastError = new Error(
+              `POST ${url} returned ${response.status}`
             );
+          } catch (error) {
+            lastError = error;
           }
-          const text = extractText(response);
-          if (text) {
-            finalText = text;
-            const sseTextForThisDispatch = streamedTextFromSse.slice(
-              sseTextLengthBeforeDispatch
+          if (i === 0) {
+            debugOpencode(
+              "prompt_async dispatch attempt %d failed (%s); retrying once",
+              i + 1,
+              lastError?.message ?? String(lastError)
             );
-            let missing;
-            if (text.startsWith(sseTextForThisDispatch)) {
-              missing = text.slice(sseTextForThisDispatch.length);
-            } else if (sseTextForThisDispatch.length === 0) {
-              missing = text;
-            } else {
-              missing = "";
-            }
-            if (missing.length > 0) {
-              streamedTextFromSse += missing;
-              sink.emitEvent(
-                createNormalizedEvent(
-                  "text.delta",
-                  {
-                    provider: request.provider,
-                    runId: request.runId
-                  },
-                  { delta: missing }
-                )
-              );
-            }
-            const assistantMessageId = extractAssistantMessageId(response);
-            if (assistantMessageId) {
-              settledMessageIds.add(assistantMessageId);
-            }
+            await sleep(500);
           }
-        } catch (error) {
-          if (!dispatchError) {
-            dispatchError = error;
-          }
-        } finally {
-          pendingMessages--;
-          checkDone();
         }
+        throw lastError instanceof Error ? lastError : new Error(String(lastError));
       };
       sendToSession = (parts) => {
-        void dispatchMessage(parts);
+        void (async () => {
+          try {
+            await dispatchPrompt(parts);
+          } catch (error) {
+            if (!dispatchError) {
+              dispatchError = error;
+            }
+            resolveSessionTerminal();
+          }
+        })();
       };
       for (const queued of queuedParts.splice(0)) {
         sendToSession(queued);
       }
-      pendingMessages++;
-      void dispatchMessage(mapToOpenCodeParts(inputParts));
-      await allDone;
+      try {
+        await dispatchPrompt(mapToOpenCodeParts(inputParts));
+      } catch (error) {
+        if (!dispatchError) {
+          dispatchError = error;
+        }
+        resolveSessionTerminal();
+      }
+      const SSE_SILENCE_THRESHOLD_MS = 18e4;
+      const SSE_POLL_INTERVAL_MS = 5e3;
+      lastSseActivityAt = Date.now();
+      let sseSilent = false;
+      while (!sessionIdleFromSse && !sessionErrorFromSse && !sessionAbortedFromSse && !userAbortRequested && !dispatchError) {
+        const silence = Date.now() - lastSseActivityAt;
+        if (silence > SSE_SILENCE_THRESHOLD_MS) {
+          sseSilent = true;
+          debugOpencode("SSE went silent (%dms) \u2014 giving up", silence);
+          break;
+        }
+        await Promise.race([
+          sessionTerminal,
+          new Promise(
+            (resolve) => setTimeout(resolve, SSE_POLL_INTERVAL_MS)
+          )
+        ]);
+      }
+      sseAbort.abort();
+      await sseTask;
       if (userAbortRequested || sessionAbortedFromSse) {
         debugOpencode(
           "\u2605 run.cancelled (%dms since execute start)",
           Date.now() - executeStartedAt
         );
-        sseAbort.abort();
-        await sseTask;
         sink.cancel({
           text: streamedTextFromSse || void 0,
           costData: extractOpenCodeCostData(rawPayloads)
         });
       } else if (sessionErrorFromSse) {
-        sseAbort.abort();
-        await sseTask;
         sink.fail(sessionErrorFromSse);
-      } else if (dispatchError && !(dispatchAbort.signal.aborted && dispatchError?.name === "AbortError")) {
-        sseAbort.abort();
-        await sseTask;
+      } else if (dispatchError) {
         sink.fail(dispatchError);
-      } else {
+      } else if (sessionIdleFromSse) {
         debugOpencode(
           "\u2605 run.completed (%dms since execute start) chars=%d",
           Date.now() - executeStartedAt,
-          finalText.length
+          streamedTextFromSse.length
         );
+        let lastAssistantText = "";
+        for (const [messageId, text] of assistantTextByMessageId) {
+          lastAssistantText = text;
+          if (!announcedAssistantCompletions.has(messageId)) {
+            announcedAssistantCompletions.add(messageId);
+            sink.emitEvent(
+              createNormalizedEvent(
+                "message.completed",
+                {
+                  provider: request.provider,
+                  runId: request.runId
+                },
+                { text }
+              )
+            );
+          }
+        }
         sink.emitEvent(
           createNormalizedEvent(
             "run.completed",
@@ -4452,15 +4449,23 @@ var OpenCodeAgentAdapter = class {
               provider: request.provider,
               runId: request.runId
             },
-            { text: finalText }
+            { text: lastAssistantText }
           )
         );
-        sseAbort.abort();
-        await sseTask;
         sink.complete({
-          text: finalText,
+          text: lastAssistantText,
           costData: extractOpenCodeCostData(rawPayloads)
         });
+      } else if (sseSilent) {
+        sink.fail(
+          new Error(
+            "opencode SSE went silent before the session reached idle"
+          )
+        );
+      } else {
+        sink.fail(
+          new Error("opencode run ended without a terminal signal")
+        );
       }
     } finally {
       sseAbort.abort();
@@ -4506,10 +4511,10 @@ var OpenCodeAgentAdapter = class {
     }
   }
   /**
-   * Stateless message injection. POST a fresh user message to
-   * `/session/:id/message` with `agent` defaulting to the build agent
-   * — opencode appends it to the running session and the originating
-   * instance picks up the new turn through its existing SSE stream.
+   * Stateless message injection. Fire-and-forget POST to
+   * `/session/:id/prompt_async` (returns 204) — opencode appends the
+   * message to the running session and the originating instance picks
+   * up the new turn through its existing SSE stream.
    */
   async attachSendMessage(request, content) {
     if (!request.sessionId) {
@@ -4523,20 +4528,21 @@ var OpenCodeAgentAdapter = class {
       content
     );
     const parts = mapToOpenCodeParts(inputParts);
-    await fetchJson(
-      `${baseUrl}/session/${request.sessionId}/message`,
-      {
-        method: "POST",
-        headers: {
-          "content-type": "application/json",
-          ...request.sandbox.previewHeaders
-        },
-        body: JSON.stringify({
-          agent: openCodeAgentSlug(void 0),
-          parts
-        })
-      }
-    );
+    const url = `${baseUrl}/session/${request.sessionId}/prompt_async`;
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        ...request.sandbox.previewHeaders
+      },
+      body: JSON.stringify({
+        agent: openCodeAgentSlug(void 0),
+        parts
+      })
+    });
+    if (!response.ok && response.status !== 204) {
+      throw new Error(`POST ${url} returned ${response.status}`);
+    }
   }
 };
 
@@ -4619,6 +4625,7 @@ var AgentRunController = class {
   pendingPermissions = /* @__PURE__ */ new Map();
   messageHandler;
   text = "";
+  observedMessageCompleted = false;
   costData = null;
   settled = false;
   finished;
@@ -4669,6 +4676,9 @@ var AgentRunController = class {
       this.text += event.delta;
     } else if ((event.type === "message.completed" || event.type === "run.completed") && event.text) {
       this.text = event.text;
+      if (event.type === "message.completed") {
+        this.observedMessageCompleted = true;
+      }
     }
     this.eventQueue.push(event);
   }
@@ -4766,7 +4776,7 @@ var AgentRunController = class {
         "Agent run completed before pending permission requests resolved."
       )
     );
-    if (result?.text) {
+    if (result?.text && !this.observedMessageCompleted) {
       this.text = result.text;
     }
     if (result && "costData" in result) {
@@ -4811,7 +4821,7 @@ var AgentRunController = class {
         "Agent run was cancelled before pending permission requests resolved."
       )
     );
-    if (result?.text) {
+    if (result?.text && !this.observedMessageCompleted) {
       this.text = result.text;
     }
     if (result && "costData" in result) {

package/dist/events/index.js

@@ -4,7 +4,7 @@ import {
   normalizeRawAgentEvent,
   toAISDKEvent,
   toAISDKStream
-} from "../chunk-NWAXQ7UD.js";
+} from "../chunk-EK6GC6YA.js";
 import "../chunk-GOFJNFAD.js";
 export {
   ProviderLogAssembler,

package/dist/index.js

@@ -1,13 +1,13 @@
 import {
   Agent
-} from "./chunk-GBM7LKZF.js";
+} from "./chunk-T7C77LCW.js";
 import {
   ProviderLogAssembler,
   createNormalizedEvent,
   normalizeRawAgentEvent,
   toAISDKEvent,
   toAISDKStream
-} from "./chunk-NWAXQ7UD.js";
+} from "./chunk-EK6GC6YA.js";
 import {
   Sandbox,
   SandboxAdapter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentbox-sdk",
-  "version": "0.1.303",
+  "version": "0.1.304",
   "description": "Swappable coding agents and sandbox providers for Bun and TypeScript.",
   "license": "MIT",
   "repository": {