@webless/agent 0.6.7 → 0.6.9

package/dist/index.js

@@ -268,6 +268,203 @@ function clearPersistedAgentSession(visitorSessionId, options) {
   sessionStorage.removeItem(runtimeLastMessageKey(visitorSessionId, prefix));
 }
 
+// src/runtime/subagent-child-stream.ts
+var INITIAL_RETRY_DELAY_MS = 100;
+var MAX_RETRY_DELAY_MS = 2e3;
+var MAX_CONSECUTIVE_RETRIES = 6;
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseError(value) {
+  if (!isRecord2(value)) return void 0;
+  const { code, message } = value;
+  if (typeof code !== "string" || typeof message !== "string") {
+    return void 0;
+  }
+  return { code, message };
+}
+function parseChildStreamEvent(value) {
+  if (!isRecord2(value) || typeof value.type !== "string") {
+    return { type: "other" };
+  }
+  if (value.type === "session.waiting" || value.type === "session.completed" || value.type === "session.failed") {
+    return { type: "session.boundary" };
+  }
+  if (value.type === "subagent.event" && isRecord2(value.data) && Object.hasOwn(value.data, "event")) {
+    return parseChildStreamEvent(value.data.event);
+  }
+  if (value.type === "subagent.called" && isRecord2(value.data)) {
+    const { childStreamPath } = value.data;
+    if (typeof childStreamPath === "string") {
+      return { childStreamPath, type: "subagent.called" };
+    }
+  }
+  if (value.type !== "action.result" || !isRecord2(value.data)) {
+    return { type: "other" };
+  }
+  const { data } = value;
+  if (data.status !== "completed" && data.status !== "failed" && data.status !== "rejected") {
+    return { type: "other" };
+  }
+  if (!isRecord2(data.result) || data.result.kind !== "tool-result") {
+    return { type: "other" };
+  }
+  const result = data.result;
+  if (typeof result.callId !== "string" || typeof result.toolName !== "string") {
+    return { type: "other" };
+  }
+  const error = parseError(data.error);
+  return {
+    type: "action.result",
+    hasOutput: Object.hasOwn(result, "output"),
+    result: {
+      callId: result.callId,
+      toolName: result.toolName,
+      status: data.status,
+      ...Object.hasOwn(result, "output") ? { output: result.output } : {},
+      ...error ? { error } : {}
+    }
+  };
+}
+async function* readNdjsonStream(body) {
+  const reader = body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      buffer += decoder.decode(value, { stream: !done });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        const trimmed2 = line.trim();
+        if (!trimmed2) continue;
+        try {
+          const parsed = JSON.parse(trimmed2);
+          yield parsed;
+        } catch {
+        }
+      }
+      if (done) break;
+    }
+    const trimmed = buffer.trim();
+    if (trimmed) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        yield parsed;
+      } catch {
+      }
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
+function streamPathAt(path, streamIndex) {
+  if (streamIndex === 0) return path;
+  return `${path}${path.includes("?") ? "&" : "?"}startIndex=${streamIndex}`;
+}
+function abortableDelay(delayMs, signal) {
+  if (signal.aborted) return Promise.resolve();
+  return new Promise((resolve) => {
+    const finish = () => {
+      clearTimeout(timeout);
+      signal.removeEventListener("abort", finish);
+      resolve();
+    };
+    const timeout = setTimeout(finish, delayMs);
+    signal.addEventListener("abort", finish, { once: true });
+  });
+}
+var SubagentChildStreamCoordinator = class {
+  constructor(client, handlers, parentSignal) {
+    this.client = client;
+    this.handlers = handlers;
+    this.parentSignal = parentSignal;
+  }
+  client;
+  handlers;
+  parentSignal;
+  controllers = /* @__PURE__ */ new Map();
+  tasks = /* @__PURE__ */ new Map();
+  begin(event) {
+    this.beginPath(event.data.childStreamPath);
+  }
+  async waitForAll() {
+    let observedTaskCount = -1;
+    while (observedTaskCount !== this.tasks.size) {
+      observedTaskCount = this.tasks.size;
+      await Promise.all(this.tasks.values());
+    }
+  }
+  abortAll() {
+    for (const controller of this.controllers.values()) controller.abort();
+    this.controllers.clear();
+  }
+  beginPath(childStreamPath) {
+    if (this.tasks.has(childStreamPath)) return;
+    const controller = new AbortController();
+    const abort = () => controller.abort();
+    if (this.parentSignal.aborted) {
+      controller.abort();
+    } else {
+      this.parentSignal.addEventListener("abort", abort, { once: true });
+    }
+    this.controllers.set(childStreamPath, controller);
+    const task = this.consume(childStreamPath, controller.signal).finally(
+      () => {
+        this.parentSignal.removeEventListener("abort", abort);
+        if (this.controllers.get(childStreamPath) === controller) {
+          this.controllers.delete(childStreamPath);
+        }
+      }
+    );
+    this.tasks.set(childStreamPath, task);
+  }
+  async consume(path, signal) {
+    let streamIndex = 0;
+    let consecutiveRetries = 0;
+    let retryDelayMs = INITIAL_RETRY_DELAY_MS;
+    while (!signal.aborted && consecutiveRetries < MAX_CONSECUTIVE_RETRIES) {
+      let receivedEvent = false;
+      try {
+        const response = await this.client.fetch(
+          streamPathAt(path, streamIndex),
+          {
+            cache: "no-store",
+            signal
+          }
+        );
+        if (!response.ok || response.body === null) {
+          await response.body?.cancel().catch(() => {
+          });
+          throw new Error(`Child stream returned ${response.status}.`);
+        }
+        for await (const rawEvent of readNdjsonStream(response.body)) {
+          if (signal.aborted) return;
+          receivedEvent = true;
+          streamIndex += 1;
+          const event = parseChildStreamEvent(rawEvent);
+          if (event.type === "session.boundary") return;
+          if (event.type === "subagent.called") {
+            this.beginPath(event.childStreamPath);
+            continue;
+          }
+          if (event.type !== "action.result") continue;
+          this.handlers.onToolResult?.(event.result);
+          if (event.hasOutput) {
+            this.handlers.onActionResult?.(event.result.output);
+          }
+        }
+      } catch {
+        if (signal.aborted) return;
+      }
+      consecutiveRetries = receivedEvent ? 0 : consecutiveRetries + 1;
+      retryDelayMs = receivedEvent ? INITIAL_RETRY_DELAY_MS : Math.min(retryDelayMs * 2, MAX_RETRY_DELAY_MS);
+      await abortableDelay(retryDelayMs, signal);
+    }
+  }
+};
+
 // src/runtime/tool-ui.ts
 var AGENT_TOOL_UI_SCHEMA_VERSION = "webless.tool-ui.v1";
 var AGENT_STRUCTURED_TOOL_INPUT_SCHEMA_VERSION = "webless.structured-tool-input.v1";
@@ -281,7 +478,7 @@ function formatAgentStructuredToolInput(surface, values) {
   };
   return `${AGENT_STRUCTURED_TOOL_INPUT_HEADER} ${JSON.stringify(payload)}`;
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isJsonValue(value, seen = /* @__PURE__ */ new Set()) {
@@ -330,7 +527,7 @@ function isFieldKind(value) {
   ].includes(value);
 }
 function parseField(value) {
-  if (!isRecord2(value)) return null;
+  if (!isRecord3(value)) return null;
   if (!hasOnlyKeys(value, [
     "description",
     "kind",
@@ -381,7 +578,7 @@ function parseField(value) {
     if (!Array.isArray(value.options) || value.options.length > 100)
       return null;
     for (const option of value.options) {
-      if (!isRecord2(option) || !boundedString(option.label, 160) || !isJsonValue(option.value)) {
+      if (!isRecord3(option) || !boundedString(option.label, 160) || !isJsonValue(option.value)) {
         return null;
       }
     }
@@ -404,7 +601,7 @@ function parseField(value) {
   };
 }
 function parseStep(value) {
-  if (!isRecord2(value)) return null;
+  if (!isRecord3(value)) return null;
   if (!hasOnlyKeys(value, ["description", "fieldPaths", "id", "label"])) {
     return null;
   }
@@ -424,7 +621,7 @@ function parseStep(value) {
   };
 }
 function parseAction(value) {
-  if (!isRecord2(value)) return null;
+  if (!isRecord3(value)) return null;
   if (!hasOnlyKeys(value, ["id", "label"])) return null;
   const label = boundedString(value.label, 80);
   if (value.id !== "submit" && value.id !== "back" && value.id !== "next" && value.id !== "reset" || !label) {
@@ -436,7 +633,7 @@ function parseAction(value) {
   };
 }
 function parseAgentToolUiSurface(value) {
-  if (!isRecord2(value) || value.schemaVersion !== AGENT_TOOL_UI_SCHEMA_VERSION)
+  if (!isRecord3(value) || value.schemaVersion !== AGENT_TOOL_UI_SCHEMA_VERSION)
     return null;
   if (!hasOnlyKeys(value, [
     "actions",
@@ -474,7 +671,7 @@ function parseAgentToolUiSurface(value) {
   if (value.operationId !== void 0 && !operationId) return null;
   if (value.requestId !== void 0 && !requestId) return null;
   if (value.submitLabel !== void 0 && !submitLabel) return null;
-  const values = value.values !== void 0 && isRecord2(value.values) ? value.values : void 0;
+  const values = value.values !== void 0 && isRecord3(value.values) ? value.values : void 0;
   if (value.values !== void 0) {
     if (!values || !Object.values(values).every((item) => isJsonValue(item)))
       return null;
@@ -511,8 +708,7 @@ function applyMessageEvent(event, rendered, handlers, workItems) {
   if (event.type === "message.completed") {
     handlers.onComplete?.();
   }
-  if (event.type === "action.result") emitActionResult(event, handlers);
-  if (event.type === "input.requested") emitInputRequests(event, handlers);
+  emitVisitorInteractionEvent(event, handlers);
   if (event.type !== "message.appended") return rendered;
   const { messageDelta, messageSoFar } = event.data;
   let delta = messageDelta;
@@ -562,6 +758,13 @@ function emitInputRequests(event, handlers) {
     })
   );
 }
+function emitVisitorInteractionEvent(event, handlers) {
+  if (event.type === "action.result") emitActionResult(event, handlers);
+  if (event.type === "input.requested") emitInputRequests(event, handlers);
+  if (event.type === "subagent.event") {
+    emitVisitorInteractionEvent(event.data.event, handlers);
+  }
+}
 function isResumeTurnMessage(received, candidate) {
   if (received === candidate) return true;
   return Boolean(candidate) && received.endsWith(`
@@ -734,11 +937,14 @@ var AgentSession = class {
   clientHost;
   session;
   activeResponse;
+  childStreams;
   capability;
   getActiveSessionId() {
     return this.session?.state.sessionId ?? loadPersistedAgentSession(this.visitorSessionId, this.storeOptions)?.sessionId;
   }
   reset() {
+    this.childStreams?.abortAll();
+    this.childStreams = void 0;
     if (this.activeResponse) {
       void this.activeResponse.cancel().catch(() => {
       });
@@ -834,6 +1040,12 @@ var AgentSession = class {
       this.persistSessionCursor(session);
     }
     this.activeResponse = response;
+    const childStreams = new SubagentChildStreamCoordinator(
+      client,
+      handlers,
+      signal
+    );
+    this.childStreams = childStreams;
     let streamIndex = session?.state.streamIndex ?? 0;
     let rendered = "";
     const workItems = /* @__PURE__ */ new Map();
@@ -841,6 +1053,7 @@ var AgentSession = class {
     try {
       for await (const event of response) {
         if (signal.aborted) break;
+        if (event.type === "subagent.called") childStreams.begin(event);
         if (event.type === "input.requested") requestedInput = true;
         rendered = applyMessageEvent(event, rendered, handlers, workItems);
         streamIndex += 1;
@@ -853,8 +1066,11 @@ var AgentSession = class {
           );
         }
       }
+      await childStreams.waitForAll();
     } finally {
+      childStreams.abortAll();
       this.activeResponse = void 0;
+      if (this.childStreams === childStreams) this.childStreams = void 0;
       if (session) {
         this.persistSessionCursor(session);
       }
@@ -890,64 +1106,80 @@ var AgentSession = class {
     }
     let rendered = renderTurn(turnEvents);
     const workItems = /* @__PURE__ */ new Map();
-    for (const event of turnEvents) {
-      applyWorkEvent(event, handlers, workItems);
-      if (event.type === "input.requested") emitInputRequests(event, handlers);
-      if (event.type === "action.result") emitActionResult(event, handlers);
-    }
-    if (rendered.startsWith(initialText)) {
-      const missedText = rendered.slice(initialText.length);
-      if (missedText) handlers.onDelta(missedText);
-    } else if (initialText.startsWith(rendered)) {
-      rendered = initialText;
-    } else if (!initialText.startsWith(rendered)) {
-      rendered = initialText + rendered;
-    }
-    let session = client.sessions.attach(snapshot.session.sessionId, {
-      streamIndex: snapshot.session.streamIndex
-    });
-    this.session = session;
-    this.persistSessionCursor(session);
-    let snapshotBoundary;
-    for (let index = turnEvents.length - 1; index >= 0; index -= 1) {
-      const event = turnEvents[index];
-      if (event && isTurnBoundary(event)) {
-        snapshotBoundary = event;
-        break;
+    const childStreams = new SubagentChildStreamCoordinator(
+      client,
+      handlers,
+      signal
+    );
+    this.childStreams = childStreams;
+    try {
+      for (const event of turnEvents) {
+        if (event.type === "subagent.called") childStreams.begin(event);
+        applyWorkEvent(event, handlers, workItems);
+        emitVisitorInteractionEvent(event, handlers);
       }
-    }
-    if (snapshotBoundary) {
-      if (snapshotBoundary.type === "session.failed") {
-        throw new Error(
-          snapshotBoundary.data.message || snapshotBoundary.data.code
+      if (rendered.startsWith(initialText)) {
+        const missedText = rendered.slice(initialText.length);
+        if (missedText) handlers.onDelta(missedText);
+      } else if (initialText.startsWith(rendered)) {
+        rendered = initialText;
+      } else if (!initialText.startsWith(rendered)) {
+        rendered = initialText + rendered;
+      }
+      let session = client.sessions.attach(snapshot.session.sessionId, {
+        streamIndex: snapshot.session.streamIndex
+      });
+      this.session = session;
+      this.persistSessionCursor(session);
+      let snapshotBoundary;
+      for (let index = turnEvents.length - 1; index >= 0; index -= 1) {
+        const event = turnEvents[index];
+        if (event && isTurnBoundary(event)) {
+          snapshotBoundary = event;
+          break;
+        }
+      }
+      if (snapshotBoundary) {
+        if (snapshotBoundary.type === "session.failed") {
+          throw new Error(
+            snapshotBoundary.data.message || snapshotBoundary.data.code
+          );
+        }
+        handlers.onComplete?.();
+        await childStreams.waitForAll();
+        if (!rendered.trim() && !hasInputRequest) {
+          throw new Error("Empty response from runtime");
+        }
+        return rendered.trim();
+      }
+      let streamIndex = snapshot.session.streamIndex;
+      for await (const event of session.stream({ signal })) {
+        if (signal.aborted) break;
+        if (event.type === "subagent.called") childStreams.begin(event);
+        rendered = applyMessageEvent(event, rendered, handlers, workItems);
+        streamIndex += 1;
+        savePersistedAgentSession(
+          this.visitorSessionId,
+          session.state.sessionId,
+          streamIndex,
+          this.storeOptions
         );
+        if (isTurnBoundary(event)) break;
       }
-      handlers.onComplete?.();
-      if (!rendered.trim() && !hasInputRequest) {
+      await childStreams.waitForAll();
+      session = client.sessions.attach(session.state.sessionId, {
+        streamIndex
+      });
+      this.session = session;
+      this.persistSessionCursor(session);
+      if (!rendered.trim() && !signal.aborted && !hasInputRequest) {
         throw new Error("Empty response from runtime");
       }
       return rendered.trim();
+    } finally {
+      childStreams.abortAll();
+      if (this.childStreams === childStreams) this.childStreams = void 0;
     }
-    let streamIndex = snapshot.session.streamIndex;
-    for await (const event of session.stream({ signal })) {
-      if (signal.aborted) break;
-      rendered = applyMessageEvent(event, rendered, handlers, workItems);
-      streamIndex += 1;
-      savePersistedAgentSession(
-        this.visitorSessionId,
-        session.state.sessionId,
-        streamIndex,
-        this.storeOptions
-      );
-      if (isTurnBoundary(event)) break;
-    }
-    session = client.sessions.attach(session.state.sessionId, { streamIndex });
-    this.session = session;
-    this.persistSessionCursor(session);
-    if (!rendered.trim() && !signal.aborted && !hasInputRequest) {
-      throw new Error("Empty response from runtime");
-    }
-    return rendered.trim();
   }
   async respondTurn(responses, signal, handlers) {
     const client = this.ensureClient();
@@ -968,6 +1200,12 @@ var AgentSession = class {
       () => session.respond(inputResponses, { signal })
     );
     this.activeResponse = response;
+    const childStreams = new SubagentChildStreamCoordinator(
+      client,
+      handlers,
+      signal
+    );
+    this.childStreams = childStreams;
     let streamIndex = session.state.streamIndex;
     let rendered = "";
     let requestedInput = false;
@@ -975,6 +1213,7 @@ var AgentSession = class {
     try {
       for await (const event of response) {
         if (signal.aborted) break;
+        if (event.type === "subagent.called") childStreams.begin(event);
         if (event.type === "input.requested") requestedInput = true;
         rendered = applyMessageEvent(event, rendered, handlers, workItems);
         streamIndex += 1;
@@ -985,8 +1224,11 @@ var AgentSession = class {
           this.storeOptions
         );
       }
+      await childStreams.waitForAll();
     } finally {
+      childStreams.abortAll();
       this.activeResponse = void 0;
+      if (this.childStreams === childStreams) this.childStreams = void 0;
       this.session = client.sessions.attach(session.state.sessionId, {
         streamIndex
       });
@@ -998,6 +1240,7 @@ var AgentSession = class {
     return rendered.trim();
   }
   cancelActive() {
+    this.childStreams?.abortAll();
     if (this.activeResponse) {
       this.activeResponse.cancel().catch(() => {
       });
@@ -1113,7 +1356,7 @@ var ENVELOPE_KEYS = /* @__PURE__ */ new Set([
   "presentationKinds",
   "ui"
 ]);
-function isRecord3(value) {
+function isRecord4(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isJsonValue2(value, seen = /* @__PURE__ */ new Set()) {
@@ -1140,7 +1383,7 @@ function decodeEnvelope(value) {
 }
 function parseAgentToolResultEnvelope(value) {
   const decoded = decodeEnvelope(value);
-  if (!isRecord3(decoded)) return null;
+  if (!isRecord4(decoded)) return null;
   const keys = Object.keys(decoded);
   if (keys.some((key) => !ENVELOPE_KEYS.has(key)) || decoded.schemaVersion !== "webless.tool-result.v1" || !isJsonValue2(decoded.output) || !Array.isArray(decoded.presentationKinds) || decoded.presentationKinds.length < 1 || decoded.presentationKinds.length > 16) {
     return null;