@standardagents/builder 0.40.2 → 0.40.4

package/dist/runtime.d.ts

@@ -1230,6 +1230,7 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
      */
     deliverClientToolResult(toolCallId: string, ok: boolean, result?: string, error?: string, deliveredByClientId?: string, deliveredGeneration?: number, deliveryToken?: string, internalAuthorization?: typeof INTERNAL_TOOL_DELIVERY): Promise<{
         side: "a" | "b";
+        resume: boolean;
     } | null>;
     /** Default time to wait for the client to accept a stream open. */
     private static readonly CLIENT_STREAM_OPEN_TIMEOUT_MS;
@@ -2787,8 +2788,10 @@ declare class DurableAgentBuilder<Env extends AgentBuilderEnv = AgentBuilderEnv>
     /** Deny a pending device login without creating a user or API key. */
     denyDeviceLogin(codeHash: string): Promise<boolean>;
     /** Approve a pending device login: mint a personal API key for the user and
-     *  park its plaintext for the single claim. Returns false when the code is
-     *  unknown, expired, or not pending. */
+     *  park its plaintext for the single claim. A retry by the same user remains
+     *  successful after the row is approved or claimed, without minting another
+     *  key. Returns false for unknown, expired, denied, or differently-owned
+     *  logins. */
     approveDeviceLogin(params: {
         code_hash: string;
         user_id: string;

package/dist/runtime.js

@@ -21902,17 +21902,23 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
     return cursor.rowsWritten > 0;
   }
   /** Approve a pending device login: mint a personal API key for the user and
-   *  park its plaintext for the single claim. Returns false when the code is
-   *  unknown, expired, or not pending. */
+   *  park its plaintext for the single claim. A retry by the same user remains
+   *  successful after the row is approved or claimed, without minting another
+   *  key. Returns false for unknown, expired, denied, or differently-owned
+   *  logins. */
   async approveDeviceLogin(params) {
     await this.ensureMigrated();
     await this.sweepDeviceLogins();
     const cursor = await this.ctx.storage.sql.exec(
-      `SELECT status FROM device_logins WHERE code_hash = ?`,
+      `SELECT status, user_id FROM device_logins WHERE code_hash = ?`,
       params.code_hash
     );
     const row = cursor.toArray()[0];
-    if (!row || row.status !== "pending") return false;
+    if (!row) return false;
+    if (row.status === "approved" || row.status === "claimed") {
+      return row.user_id === params.user_id;
+    }
+    if (row.status !== "pending") return false;
     await this.createApiKey({
       name: params.key_name,
       key_hash: params.token_hash,
@@ -26071,7 +26077,7 @@ ${resultContent}${attachmentSummary}`;
           void 0,
           INTERNAL_TOOL_DELIVERY
         );
-        if (delivered) sides.add(delivered.side);
+        if (delivered?.resume) sides.add(delivered.side);
       }
       if (threadId) {
         for (const side of sides) {
@@ -26373,14 +26379,17 @@ ${resultContent}${attachmentSummary}`;
   deliveredResultWaiters = /* @__PURE__ */ new Map();
   notifyDeliveredResultWaiters(toolCallId) {
     const waiters = this.deliveredResultWaiters?.get(toolCallId);
-    if (!waiters) return;
+    if (!waiters || waiters.size === 0) return false;
     this.deliveredResultWaiters.delete(toolCallId);
+    let notified = false;
     for (const wake of waiters) {
       try {
         wake();
+        notified = true;
       } catch {
       }
     }
+    return notified;
   }
   /**
    * Await a parked forwarded call's delivered result: one immediate read,
@@ -26525,37 +26534,46 @@ ${resultContent}${attachmentSummary}`;
     const side = pending.side === "b" ? "b" : "a";
     const content = ok ? result ?? "" : `Error: ${error ?? "tool failed"}`;
     const toolStatus = ok ? "success" : "error";
-    await this.ctx.storage.sql.exec(
-      `UPDATE messages SET content = ?, tool_status = ? WHERE tool_call_id = ? AND role = 'tool'`,
-      content,
-      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`,
+    const resultMessageId = crypto.randomUUID();
+    const resultCreatedAt = Date.now() * TIMESTAMP_MULTIPLIER;
+    const accepted = this.ctx.storage.transactionSync(() => {
+      const claimed = this.ctx.storage.sql.exec(
+        `UPDATE pending_client_calls
+            SET status = 'resolved'
+          WHERE tool_call_id = ? AND status = 'pending'`,
         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(),
+      if (claimed.rowsWritten !== 1) return false;
+      this.ctx.storage.sql.exec(
+        `UPDATE messages SET content = ?, tool_status = ? WHERE tool_call_id = ? AND role = 'tool'`,
         content,
-        toolRow.toArray()[0]?.tool ?? null,
-        toolCallId,
         toolStatus,
-        Date.now() * TIMESTAMP_MULTIPLIER
+        toolCallId
       );
-    }
-    await this.ctx.storage.sql.exec(
-      `UPDATE pending_client_calls SET status = 'resolved' WHERE tool_call_id = ?`,
-      toolCallId
-    );
-    this.notifyDeliveredResultWaiters(toolCallId);
+      const updated = 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 = this.ctx.storage.sql.exec(
+          `SELECT tool FROM pending_client_calls WHERE tool_call_id = ? LIMIT 1`,
+          toolCallId
+        );
+        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)`,
+          resultMessageId,
+          content,
+          toolRow.toArray()[0]?.tool ?? null,
+          toolCallId,
+          toolStatus,
+          resultCreatedAt
+        );
+      }
+      return true;
+    });
+    if (!accepted) return null;
+    const resumedInline = this.notifyDeliveredResultWaiters(toolCallId);
     try {
       const msgCursor = await this.ctx.storage.sql.exec(
         `SELECT id, role, content, name, tool_call_id, tool_status, created_at, depth
@@ -26566,7 +26584,7 @@ ${resultContent}${attachmentSummary}`;
       if (msg) this.broadcastMessage(msg);
     } catch {
     }
-    return { side };
+    return { side, resume: !resumedInline };
   }
   // ─── Runtime byte streams ──────────────────────────────────────────────────
   // The existing bridge frames carry opaque capability metadata and bytes