@standardagents/builder 0.29.0 → 0.29.2

package/dist/runtime.d.ts

@@ -1,5 +1,5 @@
-import { e as ThreadEnv, A as Agent, r as ThreadMetadata, t as ToolResult, M as Message, k as ClientToolRequest, l as ClientToolResponse, m as ClientStreamRequest, n as ClientStreamResponse, w as FileRecord, F as FlowState, y as FileStats, G as GrepResult, x as AttachmentRef, J as MessageContent, E as Env, q as ThreadInstance } from './index-Cp_Zcrhy.js';
-export { f as BuilderThreadEndpointHandler, C as CLIENT_STREAM_CHUNK_BYTES, o as ClientDuplex, p as ClientForwarding, B as Controller, a as ControllerContext, u as FlowResult, D as ImageContentPart, I as ImageMetadata, L as LLMResponse, H as MultimodalContent, R as RequestContext, S as StorageBackend, v as TelemetryEvent, z as TextContentPart, b as ThreadEndpointContext, T as ToolCall, g as callClient, h as callClientStream, c as createThreadEndpointHandler, j as decodeStreamChunk, d as defineController, i as encodeStreamChunk, s as supportsClientForwarding } from './index-Cp_Zcrhy.js';
+import { e as ThreadEnv, A as Agent, r as ThreadMetadata, t as ToolResult, M as Message, k as ClientToolRequest, l as ClientToolResponse, m as ClientStreamRequest, n as ClientStreamResponse, w as FileRecord, F as FlowState, y as FileStats, G as GrepResult, x as AttachmentRef, J as MessageContent, E as Env, q as ThreadInstance } from './index-CcnGEkPh.js';
+export { f as BuilderThreadEndpointHandler, C as CLIENT_STREAM_CHUNK_BYTES, o as ClientDuplex, p as ClientForwarding, B as Controller, a as ControllerContext, u as FlowResult, D as ImageContentPart, I as ImageMetadata, L as LLMResponse, H as MultimodalContent, R as RequestContext, S as StorageBackend, v as TelemetryEvent, z as TextContentPart, b as ThreadEndpointContext, T as ToolCall, g as callClient, h as callClientStream, c as createThreadEndpointHandler, j as decodeStreamChunk, d as defineController, i as encodeStreamChunk, s as supportsClientForwarding } from './index-CcnGEkPh.js';
 import { CodeExecutionOptions, CodeExecutionResult, SubagentRegistryEntry, InjectMessageInput, QueueMessageInput, SkillMetadata, SkillFileInput, ModelDefinition as ModelDefinition$1, ToolArgs, PromptTextPart, PromptEnvPart, VariableDefinition, SubpromptConfig as SubpromptConfig$1, PromptToolConfig as PromptToolConfig$1, SubagentToolConfig as SubagentToolConfig$1, ReasoningConfig, SideConfig as SideConfig$1, LLMProviderInterface, ContentPart, TextPart, ImagePart, FilePart, ThreadState, NamespaceContext, DefinitionLoader } from '@standardagents/spec';
 export { AgentType, DefinitionLoader, GlobalNamespaceContext, HookSignatures, ImageContent, ModelCapabilities, ModelProvider, NamespaceContext, PackageSignature, PackedExports, PackedMeta, PackedMetadata, PackedNamespaceContext, PromptInput, PromptTextPart, ProviderAssistantMessage, ProviderError, ProviderErrorCode, ProviderFactory, ProviderFactoryConfig, ProviderFinishReason, ProviderGeneratedImage, ProviderMessage, ProviderMessageContent, ModelCapabilities as ProviderModelCapabilities, ProviderReasoningDetail, ProviderRequest, ProviderResponse, ProviderStreamChunk, ProviderSystemMessage, ProviderTool, ProviderToolCallPart, ProviderToolMessage, ProviderToolResultContent, ProviderUsage, ProviderUserMessage, ReasoningConfig, StructuredPrompt, TextContent, Tool, ToolArgs, ToolArgsNode, ToolArgsRawShape, ToolContent, belongsToPackage, defineAgent, defineHook, defineModel, definePrompt, defineTool, isPacked, isVisibleInNamespace, mapReasoningLevel } from '@standardagents/spec';
 import { DurableObject, WorkerEntrypoint } from 'cloudflare:workers';
@@ -1043,7 +1043,10 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
      * always produce a normal tool error (no client connected, timeout, or user
      * denial) for the model to reason about.
      */
-    callClientTool(request: ClientToolRequest): Promise<ClientToolResponse>;
+    callClientTool(request: ClientToolRequest, durability?: {
+        toolCallId: string;
+        side: "a" | "b";
+    }): Promise<ClientToolResponse>;
     /** Settle a pending forwarded call exactly once, clearing its timers. */
     private settleClientCall;
     /** Close and forget a bridge socket we've deemed dead, failing remaining calls. */
@@ -1112,6 +1115,18 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
     } | null>;
     /** Default time to wait for the client to accept a stream open. */
     private static readonly CLIENT_STREAM_OPEN_TIMEOUT_MS;
+    /** Poll cadence while waiting for a disconnected owner's bridge to return. */
+    private static readonly OWNER_REATTACH_POLL_MS;
+    /**
+     * The thread HAS an elected execution owner, but its bridge socket is gone
+     * (daemon restart, network blip, DO handoff). Summon the owning machine
+     * through the per-user hub and wait for a bridge to re-attach instead of
+     * failing the stream open instantly — that instant failure is what ended
+     * Sama One turns with "workspace unavailable" whenever a slow tool/approval
+     * outlived the socket. Threads with NO recorded owner (subagent children)
+     * still fail fast so ancestor walk-up routing stays immediate.
+     */
+    private awaitOwnerBridgeSocket;
     /** Open a bidirectional byte stream to the connected owner client. */
     openClientStream(request: ClientStreamRequest): Promise<ClientStreamResponse>;
     private proxyStreams;
@@ -1147,6 +1162,9 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
      * instead of a silent hang.
      */
     notifyClientWaiting(toolCallId: string, threadId: string, userId: string | null): Promise<void>;
+    /** Ask the user's hub to summon the owning machine's daemon to a thread.
+     *  Best-effort: wake failure must never fail the caller's own path. */
+    private requestHubWake;
     /**
      * Park TTL expired: if the call is still pending, settle it as a durable,
      * VISIBLE failure — rewrite the waiting placeholder, mark the pending row

package/dist/runtime.js

@@ -13536,7 +13536,10 @@ var init_ThreadStateImpl = __esm({
             data: { deferred: true, toolCallId }
           };
         }
-        const local = await this._threadInstance.callClientTool(request);
+        const local = await this._threadInstance.callClientTool(
+          request,
+          canPark && toolCallId ? { toolCallId, side } : void 0
+        );
         if (local.ok || !this.isNoClient(local)) return local;
         const env = this._threadInstance.env;
         if (env?.AGENT_BUILDER_THREAD) {
@@ -13583,7 +13586,9 @@ var init_ThreadStateImpl = __esm({
             error: "This thread runtime cannot open client streams. Client streaming requires the DurableThread bridge."
           };
         }
-        const local = await instance.openClientStream(request);
+        const wakeUserId = this._metadata.user_id ?? null;
+        const withWake = (threadId) => wakeUserId ? { ...request, wake: { threadId, userId: wakeUserId } } : request;
+        const local = await instance.openClientStream(withWake(this._metadata.id));
         if (local.ok || !this.isNoClient(local)) return local;
         const env = this._threadInstance.env;
         if (!env?.AGENT_BUILDER_THREAD) return local;
@@ -13594,7 +13599,7 @@ var init_ThreadStateImpl = __esm({
           try {
             const stub = env.AGENT_BUILDER_THREAD.get(env.AGENT_BUILDER_THREAD.idFromName(parentId));
             if (typeof stub.proxyStreamOpen === "function") {
-              const opened = await stub.proxyStreamOpen(request);
+              const opened = await stub.proxyStreamOpen(withWake(parentId));
               if (opened.ok && opened.id) {
                 return { ok: true, duplex: this.buildProxyDuplex(stub, opened.id) };
               }
@@ -19936,7 +19941,7 @@ ${resultContent}${attachmentSummary}`;
   }
   /** Whether any forwarded call is mid-flight (blocking await or parked). */
   async hasInFlightClientCalls() {
-    if (this.pendingClientCalls.size > 0) return true;
+    if ((this.pendingClientCalls?.size ?? 0) > 0) return true;
     await this.ensureMigrated();
     await this.ensurePendingClientTable();
     const cursor = await this.ctx.storage.sql.exec(
@@ -19995,7 +20000,7 @@ ${resultContent}${attachmentSummary}`;
    * always produce a normal tool error (no client connected, timeout, or user
    * denial) for the model to reason about.
    */
-  async callClientTool(request) {
+  async callClientTool(request, durability) {
     const owner = await this.getExecutionOwner();
     const socket = this.getOpenBridgeSocket(owner?.client_id ?? null);
     if (!socket) {
@@ -20005,7 +20010,33 @@ ${resultContent}${attachmentSummary}`;
         data: { noClient: true }
       };
     }
-    const id = crypto.randomUUID();
+    if (durability) {
+      try {
+        await this.ensureMigrated();
+        await this.ensurePendingClientTable();
+        const ownerId = owner?.client_id ?? null;
+        const socketClientId = this.bridgeClientInfo.get(socket)?.clientId ?? null;
+        const fenced = owner && socketClientId === owner.client_id;
+        await this.ctx.storage.sql.exec(
+          `INSERT OR REPLACE INTO pending_client_calls
+             (tool_call_id, tool, args, request_permission, risk, side, status, created_at,
+              dispatched_client_id, dispatched_generation)
+           VALUES (?, ?, ?, ?, ?, ?, 'pending', ?, ?, ?)`,
+          durability.toolCallId,
+          request.tool,
+          JSON.stringify(request.args ?? {}),
+          request.requestPermission ?? null,
+          typeof request.risk === "number" ? request.risk : null,
+          durability.side,
+          Date.now(),
+          fenced ? ownerId : null,
+          fenced ? owner.generation : 0
+        );
+      } catch (error) {
+        console.error("[DurableThread] Failed to persist fast-path call (continuing):", error);
+      }
+    }
+    const id = durability?.toolCallId ?? crypto.randomUUID();
     const timeoutMs = typeof request.timeoutMs === "number" && request.timeoutMs > 0 ? request.timeoutMs : DEFAULT_CLIENT_TOOL_TIMEOUT_MS;
     this.bridgeLastSeen.set(socket, Date.now());
     return new Promise((resolve) => {
@@ -20056,6 +20087,13 @@ ${resultContent}${attachmentSummary}`;
     this.pendingClientCalls.delete(id);
     if (pending.timer) clearTimeout(pending.timer);
     if (pending.liveness) clearInterval(pending.liveness);
+    try {
+      void this.ctx.storage.sql.exec(
+        `UPDATE pending_client_calls SET status = 'resolved' WHERE tool_call_id = ? AND status = 'pending'`,
+        id
+      );
+    } catch {
+    }
     pending.resolve(res);
   }
   /** Close and forget a bridge socket we've deemed dead, failing remaining calls. */
@@ -20307,6 +20345,26 @@ ${resultContent}${attachmentSummary}`;
       toolStatus,
       toolCallId
     );
+    const updated = await this.ctx.storage.sql.exec(
+      `SELECT COUNT(*) AS total FROM messages WHERE tool_call_id = ? AND role = 'tool'`,
+      toolCallId
+    );
+    if (Number(updated.toArray()[0]?.total ?? 0) === 0) {
+      const toolRow = await this.ctx.storage.sql.exec(
+        `SELECT tool FROM pending_client_calls WHERE tool_call_id = ? LIMIT 1`,
+        toolCallId
+      );
+      await this.ctx.storage.sql.exec(
+        `INSERT INTO messages (id, role, content, name, tool_call_id, tool_status, created_at, status, prompt)
+         VALUES (?, 'tool', ?, ?, ?, ?, ?, 'completed', NULL)`,
+        crypto.randomUUID(),
+        content,
+        toolRow.toArray()[0]?.tool ?? null,
+        toolCallId,
+        toolStatus,
+        Date.now() * TIMESTAMP_MULTIPLIER
+      );
+    }
     await this.ctx.storage.sql.exec(
       `UPDATE pending_client_calls SET status = 'resolved' WHERE tool_call_id = ?`,
       toolCallId
@@ -20329,10 +20387,40 @@ ${resultContent}${attachmentSummary}`;
   // they are bound to one bridge socket and never park.
   /** Default time to wait for the client to accept a stream open. */
   static CLIENT_STREAM_OPEN_TIMEOUT_MS = 3e4;
+  /** Poll cadence while waiting for a disconnected owner's bridge to return. */
+  static OWNER_REATTACH_POLL_MS = 250;
+  /**
+   * The thread HAS an elected execution owner, but its bridge socket is gone
+   * (daemon restart, network blip, DO handoff). Summon the owning machine
+   * through the per-user hub and wait for a bridge to re-attach instead of
+   * failing the stream open instantly — that instant failure is what ended
+   * Sama One turns with "workspace unavailable" whenever a slow tool/approval
+   * outlived the socket. Threads with NO recorded owner (subagent children)
+   * still fail fast so ancestor walk-up routing stays immediate.
+   */
+  async awaitOwnerBridgeSocket(request) {
+    if (request.wake?.userId) {
+      void this.requestHubWake(request.wake.userId, request.wake.threadId);
+    }
+    const timeoutMs = typeof request.timeoutMs === "number" && request.timeoutMs > 0 ? request.timeoutMs : _DurableThread.CLIENT_STREAM_OPEN_TIMEOUT_MS;
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      await new Promise(
+        (resolve) => setTimeout(resolve, _DurableThread.OWNER_REATTACH_POLL_MS)
+      );
+      const owner = await this.getExecutionOwner();
+      const socket = this.getOpenBridgeSocket(owner?.client_id ?? null);
+      if (socket) return socket;
+    }
+    return null;
+  }
   /** Open a bidirectional byte stream to the connected owner client. */
   async openClientStream(request) {
     const owner = await this.getExecutionOwner();
-    const socket = this.getOpenBridgeSocket(owner?.client_id ?? null);
+    let socket = this.getOpenBridgeSocket(owner?.client_id ?? null);
+    if (!socket && owner) {
+      socket = await this.awaitOwnerBridgeSocket(request);
+    }
     if (!socket) {
       return {
         ok: false,
@@ -20626,6 +20714,11 @@ ${resultContent}${attachmentSummary}`;
       console.error("[DurableThread] Failed to arm park TTL (non-fatal):", error);
     }
     if (!userId) return;
+    await this.requestHubWake(userId, threadId);
+  }
+  /** Ask the user's hub to summon the owning machine's daemon to a thread.
+   *  Best-effort: wake failure must never fail the caller's own path. */
+  async requestHubWake(userId, threadId) {
     try {
       const namespace = this.env.AGENT_BUILDER_USER_HUB;
       if (!namespace) return;
@@ -21209,6 +21302,31 @@ ${resultContent}${attachmentSummary}`;
       `SELECT COUNT(*) AS c FROM message_queue`
     )).toArray()[0]?.c ?? 0;
     if (stopped || finalizedCount === 0 && queued === 0) {
+      let orphanedClientCalls = false;
+      if (!stopped) {
+        try {
+          orphanedClientCalls = await this.hasInFlightClientCalls();
+        } catch {
+          orphanedClientCalls = false;
+        }
+      }
+      if (orphanedClientCalls) {
+        const owner = await this.getExecutionOwner();
+        const socket = this.getOpenBridgeSocket(owner?.client_id ?? null);
+        if (socket) {
+          void this.resendPendingClientCalls(socket);
+        } else if (threadId) {
+          try {
+            const meta = await this.getThreadMetadata(threadId);
+            if (meta.user_id) await this.requestHubWake(meta.user_id, threadId);
+          } catch {
+          }
+        }
+        console.warn(
+          `[DurableThread] Watchdog: pending forwarded call with no executor on ${threadId} \u2014 ${socket ? "re-dispatched to the connected bridge" : "requested owner wake"}`
+        );
+        return report("observing", "none", { queuedMessages: queued });
+      }
       if (finalizedCount > 0) {
         return report("parked", "finalized_parked", {
           queuedMessages: queued,