@standardagents/builder 0.10.1-next.bbd142a → 0.11.0-next.14455ae

package/dist/plugin.js

@@ -1,7 +1,6 @@
 import fs2 from 'fs';
 import path3 from 'path';
 import { fileURLToPath } from 'url';
-import { createRequire } from 'module';
 
 // src/plugin.ts
 var TSCONFIG_CONTENT = `{
@@ -398,6 +397,9 @@ declare module 'virtual:@standardagents/builder' {
     listThreads(params?: {
       agent_name?: string;
       user_id?: string;
+      search?: string;
+      startDate?: number;
+      endDate?: number;
       limit?: number;
       offset?: number;
     }): Promise<{ threads: ThreadRegistryEntry[]; total: number }>;
@@ -579,14 +581,91 @@ function needsRegeneration(config) {
   return false;
 }
 
+// src/utils/model-parser.ts
+function getName(content) {
+  return content.match(/name:\s*['"]([^'"]+)['"]/)?.[1];
+}
+function getProvider(content) {
+  const stringMatch = content.match(/provider:\s*['"]([^'"]+)['"]/)?.[1];
+  if (stringMatch) return stringMatch;
+  const refMatch = content.match(/provider:\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*[,\n}]/)?.[1];
+  return refMatch || void 0;
+}
+function getModel(content) {
+  return content.match(/model:\s*['"]([^'"]+)['"]/)?.[1];
+}
+function getInputPrice(content) {
+  const match = content.match(/inputPrice:\s*([\d.]+)/);
+  return match ? parseFloat(match[1]) : void 0;
+}
+function getOutputPrice(content) {
+  const match = content.match(/outputPrice:\s*([\d.]+)/);
+  return match ? parseFloat(match[1]) : void 0;
+}
+function getCachedPrice(content) {
+  const match = content.match(/cachedPrice:\s*([\d.]+)/);
+  return match ? parseFloat(match[1]) : void 0;
+}
+function getIncludedProviders(content) {
+  const match = content.match(/includedProviders:\s*\[([^\]]*)\]/);
+  if (!match) return void 0;
+  const items = match[1].match(/['"]([^'"]+)['"]/g);
+  return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
+}
+function getFallbacks(content) {
+  const match = content.match(/fallbacks:\s*\[([^\]]*)\]/);
+  if (!match) return [];
+  const items = match[1].match(/['"]([^'"]+)['"]/g);
+  return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
+}
+function getProviderTools(content) {
+  const match = content.match(/providerTools:\s*\[([^\]]*)\]/);
+  if (!match) return [];
+  const items = match[1].match(/['"]([^'"]+)['"]/g);
+  return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
+}
+function getCapabilities(content) {
+  const match = content.match(/capabilities:\s*\{([^}]*)\}/s);
+  if (!match) return void 0;
+  const inner = match[1];
+  const caps = {};
+  const boolMatches = inner.matchAll(/(\w+):\s*(true|false)/g);
+  for (const m of boolMatches) {
+    caps[m[1]] = m[2] === "true";
+  }
+  const numMatches = inner.matchAll(/(\w+):\s*(\d+)/g);
+  for (const m of numMatches) {
+    caps[m[1]] = parseInt(m[2], 10);
+  }
+  return Object.keys(caps).length > 0 ? caps : void 0;
+}
+function parseModelFile(content) {
+  const name = getName(content);
+  if (!name) return null;
+  return {
+    name,
+    provider: getProvider(content),
+    model: getModel(content),
+    inputPrice: getInputPrice(content),
+    outputPrice: getOutputPrice(content),
+    cachedPrice: getCachedPrice(content),
+    includedProviders: getIncludedProviders(content),
+    fallbacks: getFallbacks(content),
+    providerTools: getProviderTools(content),
+    capabilities: getCapabilities(content)
+  };
+}
+
 // src/sdk/generators/generateModelFile.ts
-function generateModelFile(data) {
+function generateModelFile(data, options) {
+  const { providerName, providerPackage } = options;
   const lines = [
     `import { defineModel } from '@standardagents/builder';`,
+    `import { ${providerName} } from '${providerPackage}';`,
     "",
     `export default defineModel({`,
     `  name: '${escapeString(data.name)}',`,
-    `  provider: '${escapeString(data.provider)}',`,
+    `  provider: ${providerName},`,
     `  model: '${escapeString(data.model)}',`
   ];
   if (data.includedProviders && data.includedProviders.length > 0) {
@@ -595,6 +674,9 @@ function generateModelFile(data) {
   if (data.fallbacks && data.fallbacks.length > 0) {
     lines.push(`  fallbacks: ${JSON.stringify(data.fallbacks)},`);
   }
+  if (data.providerTools && data.providerTools.length > 0) {
+    lines.push(`  providerTools: ${JSON.stringify(data.providerTools)},`);
+  }
   if (data.inputPrice !== void 0) {
     lines.push(`  inputPrice: ${data.inputPrice},`);
   }
@@ -604,6 +686,36 @@ function generateModelFile(data) {
   if (data.cachedPrice !== void 0) {
     lines.push(`  cachedPrice: ${data.cachedPrice},`);
   }
+  if (data.capabilities && Object.keys(data.capabilities).length > 0) {
+    const caps = data.capabilities;
+    const capLines = [];
+    if (caps.supportsImages !== void 0) {
+      capLines.push(`    supportsImages: ${caps.supportsImages},`);
+    }
+    if (caps.supportsToolCalls !== void 0) {
+      capLines.push(`    supportsToolCalls: ${caps.supportsToolCalls},`);
+    }
+    if (caps.supportsStreaming !== void 0) {
+      capLines.push(`    supportsStreaming: ${caps.supportsStreaming},`);
+    }
+    if (caps.supportsJsonMode !== void 0) {
+      capLines.push(`    supportsJsonMode: ${caps.supportsJsonMode},`);
+    }
+    if (caps.maxContextTokens !== void 0) {
+      capLines.push(`    maxContextTokens: ${caps.maxContextTokens},`);
+    }
+    if (caps.maxOutputTokens !== void 0) {
+      capLines.push(`    maxOutputTokens: ${caps.maxOutputTokens},`);
+    }
+    if (caps.reasoningLevels !== void 0) {
+      capLines.push(`    reasoningLevels: ${JSON.stringify(caps.reasoningLevels)},`);
+    }
+    if (capLines.length > 0) {
+      lines.push(`  capabilities: {`);
+      lines.push(...capLines);
+      lines.push(`  },`);
+    }
+  }
   lines.push(`});`);
   lines.push("");
   return lines.join("\n");
@@ -813,16 +925,6 @@ function generatePromptFile(data) {
     const toolsCode = formatToolsArray(data.tools);
     lines.push(`  tools: ${toolsCode},`);
   }
-  if (data.handoffAgents && data.handoffAgents.length > 0) {
-    const agentsStr = data.handoffAgents.map((a) => `'${escapeString2(a)}'`).join(", ");
-    lines.push(`  handoffAgents: [${agentsStr}],`);
-  }
-  if (data.beforeTool) {
-    lines.push(`  beforeTool: '${escapeString2(data.beforeTool)}',`);
-  }
-  if (data.afterTool) {
-    lines.push(`  afterTool: '${escapeString2(data.afterTool)}',`);
-  }
   if (data.reasoning && hasNonNullProperties(data.reasoning)) {
     const reasoningCode = formatReasoningConfig(data.reasoning);
     lines.push(`  reasoning: ${reasoningCode},`);
@@ -868,6 +970,12 @@ function formatToolConfig(config) {
   if (config.init_user_message_property !== void 0 && config.init_user_message_property !== null) {
     parts.push(`initUserMessageProperty: '${escapeString2(config.init_user_message_property)}'`);
   }
+  if (config.init_attachments_property !== void 0 && config.init_attachments_property !== null) {
+    parts.push(`initAttachmentsProperty: '${escapeString2(config.init_attachments_property)}'`);
+  }
+  if (config.tenvs && Object.keys(config.tenvs).length > 0) {
+    parts.push(`tenvs: ${JSON.stringify(config.tenvs)}`);
+  }
   return `{ ${parts.join(", ")} }`;
 }
 function formatReasoningConfig(reasoning) {
@@ -987,7 +1095,7 @@ function generateAgentFile(data) {
   if (data.type && data.type !== "ai_human") {
     lines.push(`  type: '${data.type}',`);
   }
-  if (data.maxSessionTurns !== void 0) {
+  if (data.maxSessionTurns !== void 0 && data.maxSessionTurns !== null) {
     lines.push(`  maxSessionTurns: ${data.maxSessionTurns},`);
   }
   lines.push(`  sideA: ${formatSideConfig(data.sideA)},`);
@@ -1000,8 +1108,8 @@ function generateAgentFile(data) {
   if (data.toolDescription) {
     lines.push(`  toolDescription: '${escapeString3(data.toolDescription)}',`);
   }
-  if (data.tags && data.tags.length > 0) {
-    lines.push(`  tags: ${JSON.stringify(data.tags)},`);
+  if (data.tenvs && Object.keys(data.tenvs).length > 0) {
+    lines.push(`  tenvs: ${JSON.stringify(data.tenvs)},`);
   }
   lines.push(`});`);
   lines.push("");
@@ -1022,11 +1130,11 @@ function formatSideConfig(config) {
   if (config.stopToolResponseProperty) {
     parts.push(`    stopToolResponseProperty: '${escapeString3(config.stopToolResponseProperty)}',`);
   }
-  if (config.maxTurns !== void 0) {
-    parts.push(`    maxTurns: ${config.maxTurns},`);
+  if (config.maxSteps !== void 0) {
+    parts.push(`    maxSteps: ${config.maxSteps},`);
   }
-  if (config.endConversationTool) {
-    parts.push(`    endConversationTool: '${escapeString3(config.endConversationTool)}',`);
+  if (config.endSessionTool) {
+    parts.push(`    endSessionTool: '${escapeString3(config.endSessionTool)}',`);
   }
   if (config.manualStopCondition !== void 0) {
     parts.push(`    manualStopCondition: ${config.manualStopCondition},`);
@@ -1039,8 +1147,15 @@ function escapeString3(str) {
 }
 
 // src/sdk/persistence/index.ts
+var PROVIDER_PACKAGE_MAP = {
+  openai: { name: "openai", package: "@standardagents/openai" },
+  openrouter: { name: "openrouter", package: "@standardagents/openrouter" },
+  anthropic: { name: "anthropic", package: "@standardagents/anthropic" },
+  google: { name: "google", package: "@standardagents/google" },
+  test: { name: "test", package: "@standardagents/builder/test" }
+};
 function nameToFilename(name) {
-  return name.replace(/[/\\]/g, "__").replace(/[:*?"<>|]/g, "_").replace(/-/g, "_");
+  return name.replace(/[/\\]/g, "__").replace(/[:*?"<>|.]/g, "_").replace(/-/g, "_");
 }
 function getModelFilePath(modelsDir, name) {
   const filename = nameToFilename(name);
@@ -1062,7 +1177,17 @@ async function saveModel(modelsDir, data, overwrite = false) {
         error: `Model file already exists: ${filePath}. Use update to modify existing models.`
       };
     }
-    const content = generateModelFile(data);
+    const providerInfo = PROVIDER_PACKAGE_MAP[data.provider];
+    if (!providerInfo) {
+      return {
+        success: false,
+        error: `Unknown provider '${data.provider}'. Must be one of: ${Object.keys(PROVIDER_PACKAGE_MAP).join(", ")}`
+      };
+    }
+    const content = generateModelFile(data, {
+      providerName: providerInfo.name,
+      providerPackage: providerInfo.package
+    });
     await fs2.promises.writeFile(filePath, content, "utf-8");
     return {
       success: true,
@@ -1126,7 +1251,7 @@ function validateModelData(data) {
   if (!data.provider || typeof data.provider !== "string") {
     return "Model provider is required and must be a string";
   }
-  const validProviders = ["openai", "openrouter", "anthropic", "google"];
+  const validProviders = Object.keys(PROVIDER_PACKAGE_MAP);
   if (!validProviders.includes(data.provider)) {
     return `Invalid provider '${data.provider}'. Must be one of: ${validProviders.join(", ")}`;
   }
@@ -1173,11 +1298,8 @@ function transformPromptData(data) {
     required_schema: "requiredSchema",
     include_chat: "includeChat",
     include_past_tools: "includePastTools",
-    before_tool: "beforeTool",
-    after_tool: "afterTool",
     parallel_tool_calls: "parallelToolCalls",
     tool_choice: "toolChoice",
-    handoff_agents: "handoffAgents",
     reasoning_effort: "reasoningEffort",
     reasoning_max_tokens: "reasoningMaxTokens",
     reasoning_exclude: "reasoningExclude",
@@ -1328,9 +1450,6 @@ function validatePromptData(data) {
   if (data.tools !== void 0 && !Array.isArray(data.tools)) {
     return "tools must be an array";
   }
-  if (data.handoffAgents !== void 0 && !Array.isArray(data.handoffAgents)) {
-    return "handoffAgents must be an array";
-  }
   if (data.reasoning !== void 0) {
     if (typeof data.reasoning !== "object") {
       return "reasoning must be an object";
@@ -1375,11 +1494,11 @@ function transformAgentData(data) {
   if (data.side_a_stop_tool_response_property) {
     transformed.sideA.stopToolResponseProperty = data.side_a_stop_tool_response_property;
   }
-  if (data.side_a_max_turns !== void 0) {
-    transformed.sideA.maxTurns = data.side_a_max_turns;
+  if (data.side_a_max_steps !== void 0) {
+    transformed.sideA.maxSteps = data.side_a_max_steps;
   }
-  if (data.side_a_end_conversation_tool) {
-    transformed.sideA.endConversationTool = data.side_a_end_conversation_tool;
+  if (data.side_a_end_session_tool) {
+    transformed.sideA.endSessionTool = data.side_a_end_session_tool;
   }
   if (data.side_a_manual_stop_condition !== void 0) {
     transformed.sideA.manualStopCondition = data.side_a_manual_stop_condition;
@@ -1400,11 +1519,11 @@ function transformAgentData(data) {
     if (data.side_b_stop_tool_response_property) {
       transformed.sideB.stopToolResponseProperty = data.side_b_stop_tool_response_property;
     }
-    if (data.side_b_max_turns !== void 0) {
-      transformed.sideB.maxTurns = data.side_b_max_turns;
+    if (data.side_b_max_steps !== void 0) {
+      transformed.sideB.maxSteps = data.side_b_max_steps;
     }
-    if (data.side_b_end_conversation_tool) {
-      transformed.sideB.endConversationTool = data.side_b_end_conversation_tool;
+    if (data.side_b_end_session_tool) {
+      transformed.sideB.endSessionTool = data.side_b_end_session_tool;
     }
     if (data.side_b_manual_stop_condition !== void 0) {
       transformed.sideB.manualStopCondition = data.side_b_manual_stop_condition;
@@ -1416,9 +1535,6 @@ function transformAgentData(data) {
   if (data.tool_description) {
     transformed.toolDescription = data.tool_description;
   }
-  if (data.tags) {
-    transformed.tags = data.tags;
-  }
   return transformed;
 }
 function getAgentFilePath(agentsDir, name) {
@@ -1606,9 +1722,9 @@ function validateAgentData(data) {
   if (data.sideA.stopTool && !data.sideA.stopToolResponseProperty) {
     return "sideA.stopToolResponseProperty is required when sideA.stopTool is set";
   }
-  if (data.sideA.maxTurns !== void 0) {
-    if (typeof data.sideA.maxTurns !== "number" || data.sideA.maxTurns <= 0) {
-      return "sideA.maxTurns must be a positive number";
+  if (data.sideA.maxSteps !== void 0) {
+    if (typeof data.sideA.maxSteps !== "number" || data.sideA.maxSteps <= 0) {
+      return "sideA.maxSteps must be a positive number";
     }
   }
   if (data.type === "dual_ai") {
@@ -1621,35 +1737,24 @@ function validateAgentData(data) {
     if (data.sideB.stopTool && !data.sideB.stopToolResponseProperty) {
       return "sideB.stopToolResponseProperty is required when sideB.stopTool is set";
     }
-    if (data.sideB.maxTurns !== void 0) {
-      if (typeof data.sideB.maxTurns !== "number" || data.sideB.maxTurns <= 0) {
-        return "sideB.maxTurns must be a positive number";
+    if (data.sideB.maxSteps !== void 0) {
+      if (typeof data.sideB.maxSteps !== "number" || data.sideB.maxSteps <= 0) {
+        return "sideB.maxSteps must be a positive number";
       }
     }
   }
   if (data.exposeAsTool && !data.toolDescription) {
     return "toolDescription is required when exposeAsTool is true";
   }
-  if (data.maxSessionTurns !== void 0) {
+  if (data.maxSessionTurns !== void 0 && data.maxSessionTurns !== null) {
     if (typeof data.maxSessionTurns !== "number" || data.maxSessionTurns <= 0) {
       return "maxSessionTurns must be a positive number";
     }
   }
-  if (data.tags !== void 0) {
-    if (!Array.isArray(data.tags)) {
-      return "tags must be an array";
-    }
-    for (const tag of data.tags) {
-      if (typeof tag !== "string") {
-        return "Each tag must be a string";
-      }
-    }
-  }
   return null;
 }
 
 // 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";
@@ -1668,6 +1773,10 @@ var VIRTUAL_PROMPTS_ID = "virtual:@standardagents-prompts";
 var RESOLVED_VIRTUAL_PROMPTS_ID = "\0" + VIRTUAL_PROMPTS_ID;
 var VIRTUAL_AGENTS_ID = "virtual:@standardagents-agents";
 var RESOLVED_VIRTUAL_AGENTS_ID = "\0" + VIRTUAL_AGENTS_ID;
+var VIRTUAL_EFFECTS_ID = "virtual:@standardagents-effects";
+var RESOLVED_VIRTUAL_EFFECTS_ID = "\0" + VIRTUAL_EFFECTS_ID;
+var VIRTUAL_PROVIDERS_ID = "virtual:@standardagents-providers";
+var RESOLVED_VIRTUAL_PROVIDERS_ID = "\0" + VIRTUAL_PROVIDERS_ID;
 var VIRTUAL_BUILDER_ID = "virtual:@standardagents/builder";
 var RESOLVED_VIRTUAL_BUILDER_ID = "\0" + VIRTUAL_BUILDER_ID;
 function scanApiDirectory(dir, baseRoute = "") {
@@ -1843,6 +1952,33 @@ async function scanPromptsDirectory(dir) {
 async function scanAgentsDirectory(dir) {
   return scanConfigDirectory(dir, /export\s+default\s+defineAgent/);
 }
+async function scanEffectsDirectory(dir) {
+  const effects = [];
+  if (!fs2.existsSync(dir)) {
+    return effects;
+  }
+  const entries = await fs2.promises.readdir(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.isFile() && entry.name.endsWith(".ts")) {
+      const fileName = entry.name.replace(".ts", "");
+      const filePath = path3.join(dir, entry.name);
+      const importPath = "./" + path3.relative(process.cwd(), filePath).replace(/\\/g, "/");
+      if (fileName === "CLAUDE" || fileName.startsWith("_")) {
+        continue;
+      }
+      try {
+        const content = fs2.readFileSync(filePath, "utf-8");
+        if (!content.includes("defineEffect")) {
+          continue;
+        }
+      } catch {
+        continue;
+      }
+      effects.push({ name: fileName, importPath });
+    }
+  }
+  return effects;
+}
 function parseRequestBody(req) {
   return new Promise((resolve, reject) => {
     let body = "";
@@ -1873,6 +2009,7 @@ function agentbuilder(options = {}) {
   const modelsDir = options.modelsDir ? path3.resolve(process.cwd(), options.modelsDir) : path3.resolve(process.cwd(), "agents/models");
   const promptsDir = options.promptsDir ? path3.resolve(process.cwd(), options.promptsDir) : path3.resolve(process.cwd(), "agents/prompts");
   const agentsDir = options.agentsDir ? path3.resolve(process.cwd(), options.agentsDir) : path3.resolve(process.cwd(), "agents/agents");
+  const effectsDir = options.effectsDir ? path3.resolve(process.cwd(), options.effectsDir) : path3.resolve(process.cwd(), "agents/effects");
   const outputDir = path3.resolve(process.cwd(), ".agents");
   const typeGenConfig = {
     modelsDir,
@@ -2063,17 +2200,24 @@ function agentbuilder(options = {}) {
         // WASM image processing deps - must be excluded to avoid pre-bundle cache issues
         "@cf-wasm/photon",
         "@cf-wasm/photon/workerd",
+        "@standardagents/sip",
+        // sip's jsquash dependencies (WASM-based decoders)
         "@jsquash/avif",
-        "@jsquash/jpeg",
-        "@jsquash/png",
-        "@jsquash/webp",
-        "@standardagents/sip"
+        "@jsquash/webp"
       ];
       const depsToInclude = [
         "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
@@ -2102,14 +2246,16 @@ function agentbuilder(options = {}) {
         // WASM image processing deps
         "@cf-wasm/photon",
         "@cf-wasm/photon/workerd",
+        "@standardagents/sip",
+        // sip's jsquash dependencies (WASM-based decoders)
         "@jsquash/avif",
-        "@jsquash/jpeg",
-        "@jsquash/png",
-        "@jsquash/webp",
-        "@standardagents/sip"
+        "@jsquash/webp"
       ];
       const depsToInclude = [
         "zod",
+        "zod/v3",
+        "zod/v4",
+        "zod/v4/core",
         "openai"
       ];
       config.optimizeDeps = config.optimizeDeps || {};
@@ -2147,6 +2293,12 @@ function agentbuilder(options = {}) {
       if (id === VIRTUAL_AGENTS_ID) {
         return RESOLVED_VIRTUAL_AGENTS_ID;
       }
+      if (id === VIRTUAL_EFFECTS_ID) {
+        return RESOLVED_VIRTUAL_EFFECTS_ID;
+      }
+      if (id === VIRTUAL_PROVIDERS_ID) {
+        return RESOLVED_VIRTUAL_PROVIDERS_ID;
+      }
       if (id === VIRTUAL_BUILDER_ID) {
         return RESOLVED_VIRTUAL_BUILDER_ID;
       }
@@ -2222,9 +2374,56 @@ function isPublicRoute(routePath) {
     return true;
   }
 
+  // Provider icon routes are public (used by <img src>)
+  if (routePath.startsWith('/api/providers/') && routePath.includes('/icon')) {
+    return true;
+  }
+
   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,
+  };
+}
+
+// Helper to add CORS headers to any Response without touching the body
+function addCorsHeaders(response) {
+  // Skip WebSocket upgrade responses - they can't be wrapped
+  if (response.status === 101) {
+    return response;
+  }
+
+  // Skip if already has CORS headers
+  if (response.headers.has("Access-Control-Allow-Origin")) {
+    return response;
+  }
+
+  // Create new headers with CORS added
+  const newHeaders = new Headers(response.headers);
+  for (const [key, value] of Object.entries(CORS_HEADERS)) {
+    newHeaders.set(key, value);
+  }
+
+  // Return new Response with same body stream (not cloned, just transferred)
+  return new Response(response.body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: newHeaders,
+  });
+}
+
 export async function router(request, env) {
   const url = new URL(request.url);
   const pathname = url.pathname;
@@ -2234,6 +2433,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('/')) {
@@ -2268,7 +2475,7 @@ ${threadRouteCode}
 
       // If requireAuth returns a Response, it's an error (401)
       if (authResult instanceof Response) {
-        return authResult;
+        return addCorsHeaders(authResult);
       }
 
       authContext = authResult;
@@ -2287,16 +2494,17 @@ ${threadRouteCode}
     const result = await controller(context);
 
     if (result instanceof Response) {
-      return result;
+      return addCorsHeaders(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)
@@ -2311,13 +2519,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) {
@@ -2464,6 +2674,55 @@ ${agentsCode}
 };
 
 export const agentNames = ${JSON.stringify(agents.filter((a) => !a.error).map((a) => a.name))};
+`;
+      }
+      if (id === RESOLVED_VIRTUAL_EFFECTS_ID) {
+        const effects = await scanEffectsDirectory(effectsDir);
+        const effectsCode = effects.map(({ name, importPath, error }) => {
+          if (error) {
+            const escapedError = error.replace(/"/g, '\\"').replace(/\n/g, "\\n");
+            return `  "${name}": async () => { throw new Error("${escapedError}"); },`;
+          } else {
+            return `  "${name}": async () => {
+    try {
+      return (await import("${importPath}")).default;
+    } catch (error) {
+      console.error('Failed to import effect ${name}:', error);
+      throw error;
+    }
+  },`;
+          }
+        }).join("\n");
+        return `// Virtual agent effects module
+export const effects = {
+${effectsCode}
+};
+
+export const effectNames = ${JSON.stringify(effects.filter((e) => !e.error).map((e) => e.name))};
+`;
+      }
+      if (id === RESOLVED_VIRTUAL_PROVIDERS_ID) {
+        const firstPartyProviders = [
+          { name: "openai", package: "@standardagents/openai", label: "OpenAI", envKey: "OPENAI_API_KEY" },
+          { name: "openrouter", package: "@standardagents/openrouter", label: "OpenRouter", envKey: "OPENROUTER_API_KEY" }
+        ];
+        const customProviders = (options.providers || []).map((pkg) => ({
+          name: pkg.split("/").pop() || pkg,
+          package: pkg,
+          label: pkg.split("/").pop() || pkg,
+          envKey: `${(pkg.split("/").pop() || pkg).toUpperCase().replace(/-/g, "_")}_API_KEY`,
+          isCustom: true
+        }));
+        const allProviders = [...firstPartyProviders, ...customProviders];
+        return `// Virtual providers module - lists available LLM provider packages
+export const providers = ${JSON.stringify(allProviders, null, 2)};
+
+export const providerNames = ${JSON.stringify(allProviders.map((p) => p.name))};
+
+// Provider factories - dynamic imports for code splitting
+export const providerFactories = {
+${allProviders.map((p) => `  "${p.name}": async () => (await import("${p.package}")).${p.name},`).join("\n")}
+};
 `;
       }
       if (id === RESOLVED_VIRTUAL_BUILDER_ID) {
@@ -2472,6 +2731,7 @@ export const agentNames = ${JSON.stringify(agents.filter((a) => !a.error).map((a
         const models = await scanModelsDirectory(modelsDir);
         const prompts = await scanPromptsDirectory(promptsDir);
         const agents = await scanAgentsDirectory(agentsDir);
+        const effects = await scanEffectsDirectory(effectsDir);
         const toAbsolutePath = (relativePath) => {
           if (relativePath.startsWith("./")) {
             return path3.resolve(process.cwd(), relativePath).replace(/\\/g, "/");
@@ -2550,6 +2810,22 @@ export const agentNames = ${JSON.stringify(agents.filter((a) => !a.error).map((a
       console.error('Failed to import agent ${name}:', error);
       throw error;
     }
+  },`;
+          }
+        }).join("\n");
+        const effectsCode = effects.map(({ name, importPath, error }) => {
+          const absPath = toAbsolutePath(importPath);
+          if (error) {
+            const escapedError = error.replace(/"/g, '\\"').replace(/\n/g, "\\n");
+            return `  "${name}": async () => { throw new Error("${escapedError}"); },`;
+          } else {
+            return `  "${name}": async () => {
+    try {
+      return (await import("${absPath}")).default;
+    } catch (error) {
+      console.error('Failed to import effect ${name}:', error);
+      throw error;
+    }
   },`;
           }
         }).join("\n");
@@ -2560,7 +2836,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
@@ -2587,6 +2864,10 @@ const _agents = {
 ${agentsCode}
 };
 
+const _effects = {
+${effectsCode}
+};
+
 /**
  * DurableThread with all virtual module methods already implemented.
  * Simply extend this class in your agents/Thread.ts file.
@@ -2621,6 +2902,10 @@ export class DurableThread extends _BaseDurableThread {
   agents() {
     return _agents;
   }
+
+  effects() {
+    return _effects;
+  }
 }
 
 /**
@@ -2647,6 +2932,10 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
   agents() {
     return _agents;
   }
+
+  effects() {
+    return _effects;
+  }
 }
 `;
       }
@@ -2659,6 +2948,7 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
       this.addWatchFile(modelsDir);
       this.addWatchFile(promptsDir);
       this.addWatchFile(agentsDir);
+      this.addWatchFile(effectsDir);
     },
     configureServer(server) {
       server.watcher.on("add", async (file) => {
@@ -2686,51 +2976,26 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
               try {
                 const filePath = path3.join(modelsDir, file);
                 const content = fs4.readFileSync(filePath, "utf-8");
-                const getName = (c) => c.match(/name:\s*['"]([^'"]+)['"]/)?.[1];
-                const getProvider = (c) => c.match(/provider:\s*['"]([^'"]+)['"]/)?.[1];
-                const getModel = (c) => c.match(/model:\s*['"]([^'"]+)['"]/)?.[1];
-                const getInputPrice = (c) => {
-                  const match = c.match(/inputPrice:\s*([\d.]+)/);
-                  return match ? parseFloat(match[1]) : void 0;
-                };
-                const getOutputPrice = (c) => {
-                  const match = c.match(/outputPrice:\s*([\d.]+)/);
-                  return match ? parseFloat(match[1]) : void 0;
-                };
-                const getCachedPrice = (c) => {
-                  const match = c.match(/cachedPrice:\s*([\d.]+)/);
-                  return match ? parseFloat(match[1]) : void 0;
-                };
-                const getIncludedProviders = (c) => {
-                  const match = c.match(/includedProviders:\s*\[([^\]]*)\]/);
-                  if (!match) return void 0;
-                  const items = match[1].match(/['"]([^'"]+)['"]/g);
-                  return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
-                };
-                const getFallbacks = (c) => {
-                  const match = c.match(/fallbacks:\s*\[([^\]]*)\]/);
-                  if (!match) return [];
-                  const items = match[1].match(/['"]([^'"]+)['"]/g);
-                  return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
-                };
-                const name = getName(content);
-                if (!name) return null;
-                const fallbacks = getFallbacks(content);
-                const fallbackObjects = fallbacks.map((fallbackName, index) => ({
+                const parsed = parseModelFile(content);
+                if (!parsed || !parsed.name) return null;
+                const fallbackObjects = parsed.fallbacks.map((fallbackName, index) => ({
                   id: fallbackName,
                   name: fallbackName,
                   order: index
                 }));
                 return {
-                  id: name,
-                  name,
-                  provider: getProvider(content),
-                  model: getModel(content),
-                  input_price: getInputPrice(content),
-                  output_price: getOutputPrice(content),
-                  cached_price: getCachedPrice(content),
-                  included_providers: getIncludedProviders(content),
+                  id: parsed.name,
+                  name: parsed.name,
+                  provider: parsed.provider,
+                  provider_id: parsed.provider,
+                  model: parsed.model,
+                  input_price: parsed.inputPrice,
+                  output_price: parsed.outputPrice,
+                  cached_price: parsed.cachedPrice,
+                  included_providers: parsed.includedProviders,
                   fallbacks: fallbackObjects,
+                  providerTools: parsed.providerTools,
+                  capabilities: parsed.capabilities,
                   created_at: Math.floor(Date.now() / 1e3)
                 };
               } catch (error) {
@@ -2896,27 +3161,19 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
               try {
                 const filePath = path3.join(promptsDir, file);
                 const content = fs4.readFileSync(filePath, "utf-8");
-                const getName = (c) => c.match(/name:\s*['"]([^'"]+)['"]/)?.[1];
+                const getName2 = (c) => c.match(/name:\s*['"]([^'"]+)['"]/)?.[1];
                 const getToolDescription = (c) => c.match(/toolDescription:\s*['"]([^'"]+)['"]/)?.[1];
-                const getModel = (c) => c.match(/model:\s*['"]([^'"]+)['"]/)?.[1];
+                const getModel2 = (c) => c.match(/model:\s*['"]([^'"]+)['"]/)?.[1];
                 const getIncludeChat = (c) => c.match(/includeChat:\s*(true|false)/)?.[1] === "true";
                 const getIncludePastTools = (c) => c.match(/includePastTools:\s*(true|false)/)?.[1] === "true";
                 const getParallelToolCalls = (c) => c.match(/parallelToolCalls:\s*(true|false)/)?.[1] === "true";
                 const getToolChoice = (c) => c.match(/toolChoice:\s*['"]([^'"]+)['"]/)?.[1];
-                const getBeforeTool = (c) => c.match(/beforeTool:\s*['"]([^'"]+)['"]/)?.[1];
-                const getAfterTool = (c) => c.match(/afterTool:\s*['"]([^'"]+)['"]/)?.[1];
                 const getTools = (c) => {
                   const match = c.match(/tools:\s*\[([^\]]*)\]/);
                   if (!match) return [];
                   const items = match[1].match(/['"]([^'"]+)['"]/g);
                   return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
                 };
-                const getHandoffAgents = (c) => {
-                  const match = c.match(/handoffAgents:\s*\[([^\]]*)\]/);
-                  if (!match) return [];
-                  const items = match[1].match(/['"]([^'"]+)['"]/g);
-                  return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
-                };
                 const getPrompt = (c) => {
                   const backtickMatch = c.match(/prompt:\s*`([\s\S]*?)`/);
                   if (backtickMatch) return backtickMatch[1];
@@ -2926,9 +3183,9 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
                   if (arrayMatch) return arrayMatch[1];
                   return "";
                 };
-                const name = getName(content);
+                const name = getName2(content);
                 if (!name) return null;
-                const modelId = getModel(content);
+                const modelId = getModel2(content);
                 const modelDef = modelId ? modelMap[modelId] : null;
                 return {
                   id: name,
@@ -2944,10 +3201,7 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
                   include_past_tools: getIncludePastTools(content),
                   parallel_tool_calls: getParallelToolCalls(content),
                   tool_choice: getToolChoice(content) || "auto",
-                  before_tool: getBeforeTool(content) || null,
-                  after_tool: getAfterTool(content) || null,
                   tools: getTools(content),
-                  prompts: getHandoffAgents(content),
                   reasoning: null,
                   // Complex to parse
                   created_at: Math.floor(Date.now() / 1e3)
@@ -3102,7 +3356,7 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
               try {
                 const filePath = path3.join(agentsDir, file);
                 const content = fs4.readFileSync(filePath, "utf-8");
-                const getName = (c) => c.match(/name:\s*['"]([^'"]+)['"]/)?.[1];
+                const getName2 = (c) => c.match(/name:\s*['"]([^'"]+)['"]/)?.[1];
                 const getTitle = (c) => c.match(/title:\s*['"]([^'"]+)['"]/)?.[1];
                 const getType = (c) => c.match(/type:\s*['"]([^'"]+)['"]/)?.[1];
                 const getDefaultPrompt = (c) => c.match(/defaultPrompt:\s*['"]([^'"]+)['"]/)?.[1];
@@ -3113,7 +3367,14 @@ export class DurableAgentBuilder extends _BaseDurableAgentBuilder {
                   const items = match[1].match(/['"]([^'"]+)['"]/g);
                   return items ? items.map((s) => s.replace(/['"]/g, "")) : [];
                 };
-                const name = getName(content);
+                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 = getName2(content);
                 if (!name) return null;
                 return {
                   id: name,
@@ -3123,6 +3384,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) {