@standardagents/builder 0.11.0-next.41deba4 → 0.11.0-next.5d2e71b

package/dist/index.d.ts

@@ -240,6 +240,10 @@ interface ThreadInstance {
     }>;
     getLogs(limit?: number, offset?: number, order?: "asc" | "desc"): Promise<LogData[]>;
     getThreadMeta(threadId: string): Promise<ThreadMetadata | null>;
+    deleteMessage(messageId: string): Promise<{
+        success: boolean;
+        error?: string;
+    }>;
     shouldStop(): Promise<boolean>;
     tools(): Record<string, () => Promise<NativeToolModule>>;
     hooks(): HookRegistry;
@@ -264,6 +268,7 @@ interface ThreadInstance {
         data?: string;
         error?: string;
     }>;
+    runAgent(threadId: string, agentName: string): Promise<void>;
     scheduleEffect(threadId: string, effectName: string, effectArgs: Record<string, unknown>, delayMs?: number): Promise<string>;
     getScheduledEffects(name?: string): Promise<Array<{
         id: string;
@@ -1066,6 +1071,16 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
      * Used for creating ThreadState outside of flow execution.
      */
     getThreadMetadata(threadId: string): Promise<ThreadMetadata>;
+    /**
+     * Trigger an agent to run on this thread.
+     *
+     * Queues an agent execution via the alarm queue. The execution
+     * runs asynchronously in the background.
+     *
+     * @param threadId - Thread ID for the execution
+     * @param agentName - Name of the agent to run
+     */
+    runAgent(threadId: string, agentName: string): Promise<void>;
     /**
      * Schedule an effect for future execution.
      *

package/dist/index.js

@@ -2,7 +2,6 @@ import { sip } from '@standardagents/sip';
 import fs2 from 'fs';
 import path3 from 'path';
 import { fileURLToPath } from 'url';
-import { createRequire } from 'module';
 export { defineAgent, defineHook, defineModel, definePrompt, defineThreadEndpoint, defineTool } from '@standardagents/spec';
 import { DurableObject } from 'cloudflare:workers';
 
@@ -1996,7 +1995,7 @@ async function getMessages(flow, limit = 100, offset = 0, order = "asc") {
       parent_id,
       depth
     FROM messages
-    ORDER BY created_at ${orderClause}
+    ORDER BY created_at ${orderClause}, rowid ${orderClause}
     LIMIT ? OFFSET ?`,
     limit,
     offset
@@ -2312,6 +2311,10 @@ var init_ThreadStateImpl = __esm({
       async updateMessage(messageId, updates) {
         throw new Error("updateMessage not yet implemented");
       }
+      async deleteMessage(messageId) {
+        const result = await this._threadInstance.deleteMessage(messageId);
+        return result.success;
+      }
       // ─────────────────────────────────────────────────────────────────────────
       // Logs
       // ─────────────────────────────────────────────────────────────────────────
@@ -2496,6 +2499,12 @@ var init_ThreadStateImpl = __esm({
         return this._executionState;
       }
       // ─────────────────────────────────────────────────────────────────────────
+      // Agent Execution
+      // ─────────────────────────────────────────────────────────────────────────
+      async runAgent(agentName) {
+        await this._threadInstance.runAgent(this._metadata.id, agentName);
+      }
+      // ─────────────────────────────────────────────────────────────────────────
       // Effect Scheduling
       // ─────────────────────────────────────────────────────────────────────────
       async scheduleEffect(name, args, delay = 0) {
@@ -5824,14 +5833,14 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             ${columns.join(", ")}
           FROM messages
           WHERE parent_id IS NULL
-          ORDER BY created_at ASC
+          ORDER BY created_at ASC, rowid ASC
         `;
             const cursor = await storage.sql.exec(query);
             rows = cursor.toArray();
           }
           if (state.extraMessages && state.extraMessages.length > 0) {
             rows.push(...state.extraMessages);
-            rows.sort((a, b) => a.created_at - b.created_at);
+            rows.sort((a, b) => a.created_at - b.created_at || (a.id < b.id ? -1 : a.id > b.id ? 1 : 0));
           }
           const messages = rows.map((row) => ({
             id: row.id,
@@ -7688,7 +7697,6 @@ function validateAgentData(data) {
 }
 
 // src/plugin.ts
-createRequire(import.meta.url);
 var VIRTUAL_TOOLS_ID = "virtual:@standardagents-tools";
 var RESOLVED_VIRTUAL_TOOLS_ID = "\0" + VIRTUAL_TOOLS_ID;
 var VIRTUAL_ROUTES_ID = "virtual:@standardagents-routes";
@@ -8141,7 +8149,15 @@ function agentbuilder(options = {}) {
         "zod",
         "openai"
       ];
+      const currentDir = path3.dirname(fileURLToPath(import.meta.url));
+      const isInDist = currentDir.endsWith("dist");
+      const builderClientDir = path3.resolve(
+        currentDir,
+        isInDist ? "./client" : "../dist/client"
+      );
       return {
+        // Set publicDir to builder's client assets so Cloudflare plugin preserves assets config
+        publicDir: fs2.existsSync(builderClientDir) ? builderClientDir : void 0,
         optimizeDeps: {
           // Exclude our packages from pre-bundling - they contain cloudflare:workers imports
           // that cannot be resolved during dependency optimization
@@ -8295,6 +8311,22 @@ function isPublicRoute(routePath) {
   return false;
 }
 
+// CORS headers for API responses
+const CORS_HEADERS = {
+  "Access-Control-Allow-Origin": "*",
+  "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+  "Access-Control-Allow-Headers": "Content-Type, Authorization, X-Requested-With",
+  "Access-Control-Max-Age": "86400",
+};
+
+// Helper to create headers with CORS
+function corsHeaders(contentType) {
+  return {
+    "Content-Type": contentType,
+    ...CORS_HEADERS,
+  };
+}
+
 export async function router(request, env) {
   const url = new URL(request.url);
   const pathname = url.pathname;
@@ -8304,6 +8336,14 @@ export async function router(request, env) {
     return null;
   }
 
+  // Handle CORS preflight requests
+  if (request.method === "OPTIONS") {
+    return new Response(null, {
+      status: 204,
+      headers: CORS_HEADERS,
+    });
+  }
+
   // Strip mount point prefix for route matching, ensuring we keep the leading slash
   let routePath = pathname.slice(MOUNT_POINT.length) || "/";
   if (!routePath.startsWith('/')) {
@@ -8357,16 +8397,21 @@ ${threadRouteCode}
     const result = await controller(context);
 
     if (result instanceof Response) {
+      // Return Response objects as-is - CORS headers can't be safely added
+      // to Response objects in the workerd environment without issues.
+      // Controllers that return streaming/binary responses should add
+      // CORS headers themselves if needed.
       return result;
     }
     if (typeof result === "string") {
       return new Response(result, {
-        headers: {
-          "Content-Type": "text/plain",
-        },
+        headers: corsHeaders("text/plain"),
       });
     }
-    return Response.json(result);
+    // JSON responses get CORS headers
+    return new Response(JSON.stringify(result), {
+      headers: corsHeaders("application/json"),
+    });
   }
 
   // Serve UI for all other routes (SPA fallback)
@@ -8381,13 +8426,15 @@ async function serveUI(pathname, env) {
         // Create a proper request for the asset path
         // Use a dummy origin since we only care about the path
         // Re-add mount point since pathname was stripped by router
-        const assetUrl = \`http://localhost\${MOUNT_POINT}\${pathname}\`;
+        // Handle root mountPoint "/" specially to avoid double slashes
+        const mountPrefix = MOUNT_POINT === "/" ? "" : MOUNT_POINT;
+        const assetUrl = \`http://localhost\${mountPrefix}\${pathname}\`;
         let response = await env.ASSETS.fetch(assetUrl);
 
         // If not found, fall back to index.html for SPA routing
         const isIndexHtml = response.status === 404 || pathname === "/" || !pathname.includes(".");
         if (isIndexHtml) {
-          response = await env.ASSETS.fetch(\`http://localhost\${MOUNT_POINT}/index.html\`);
+          response = await env.ASSETS.fetch(\`http://localhost\${mountPrefix}/index.html\`);
 
           // Transform HTML to use configured mount point
           if (response.status === 200) {
@@ -8672,7 +8719,8 @@ import { DurableAgentBuilder as _BaseDurableAgentBuilder } from '@standardagents
 
 // Import sip WASM module and initializer
 // Static import allows workerd to pre-compile the WASM at bundle time
-import _sipWasm from '@standardagents/sip/dist/sip.wasm';
+// WASM is bundled in builder's dist to avoid transitive dependency resolution issues
+import _sipWasm from '@standardagents/builder/dist/sip.wasm';
 import { initWithWasmModule as _initSipWasm } from '@standardagents/sip';
 
 // Re-export router from virtual:@standardagents-routes
@@ -9227,6 +9275,13 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
                   const items = match[1].match(/['"]([^'"]+)['"]/g);
                   return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
                 };
+                const getSidePrompt = (c, side) => {
+                  const sideRegex = new RegExp(`${side}:\\s*\\{([^}]+)\\}`, "s");
+                  const sideMatch = c.match(sideRegex);
+                  if (!sideMatch) return null;
+                  const promptMatch = sideMatch[1].match(/prompt:\s*['"]([^'"]+)['"]/);
+                  return promptMatch ? promptMatch[1] : null;
+                };
                 const name = getName(content);
                 if (!name) return null;
                 return {
@@ -9237,6 +9292,8 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
                   default_prompt: getDefaultPrompt(content) || "",
                   default_model: getDefaultModel(content) || "",
                   tools: getTools(content),
+                  side_a_agent_prompt: getSidePrompt(content, "sideA"),
+                  side_b_agent_prompt: getSidePrompt(content, "sideB"),
                   created_at: Math.floor(Date.now() / 1e3)
                 };
               } catch (error) {
@@ -10659,6 +10716,33 @@ var DurableThread = class extends DurableObject {
     };
   }
   // ============================================================
+  // Agent Execution Methods (for use by ThreadStateImpl)
+  // ============================================================
+  /**
+   * Trigger an agent to run on this thread.
+   *
+   * Queues an agent execution via the alarm queue. The execution
+   * runs asynchronously in the background.
+   *
+   * @param threadId - Thread ID for the execution
+   * @param agentName - Name of the agent to run
+   */
+  async runAgent(threadId, agentName) {
+    const agents = this.agents();
+    if (!agents[agentName]) {
+      throw new Error(`Agent not found: ${agentName}`);
+    }
+    await this.alarmQueue.enqueue(
+      "executeFlow",
+      {
+        threadId,
+        agentId: agentName
+      },
+      0
+      // Execute immediately
+    );
+  }
+  // ============================================================
   // Effect Scheduling Methods (for use by ThreadStateImpl)
   // ============================================================
   /**
@@ -11025,7 +11109,7 @@ var DurableThread = class extends DurableObject {
         SELECT id, role, content, name, tool_calls, tool_call_id, tool_status, log_id, created_at, silent, parent_id, depth, status, reasoning_content, reasoning_details, attachments
         FROM messages
         ${whereClause}
-        ORDER BY created_at ${order === "ASC" ? "ASC" : "DESC"}
+        ORDER BY created_at ${order === "ASC" ? "ASC" : "DESC"}, rowid ${order === "ASC" ? "ASC" : "DESC"}
         LIMIT ? OFFSET ?
       `,
         limit,
@@ -13581,7 +13665,7 @@ var FlowStateSdk = class _FlowStateSdk {
         parent_id,
         depth
       FROM messages
-      ORDER BY created_at ${orderClause}
+      ORDER BY created_at ${orderClause}, rowid ${orderClause}
       LIMIT ? OFFSET ?`,
       limit,
       offset