@standardagents/builder 0.40.5-next.3b25e2a → 0.40.5

package/dist/index.js

@@ -5083,9 +5083,7 @@ Message one with subagent_message(referenceId, message).`
             if (resumable) {
               await this.settleResumableChildAfterRun(
                 state,
-                stub,
-                childThreadId,
-                childResult
+                childThreadId
               );
             } else if (stub.terminateThread) {
               await stub.terminateThread(childThreadId);
@@ -5097,7 +5095,7 @@ Message one with subagent_message(referenceId, message).`
               attachments: copiedAttachments,
               subagent_id: childThreadId
             };
-            return resumable && !this.isTerminalSubagentResult(childResult) ? this.withReferenceInToolResult(toolResult, childThreadId) : toolResult;
+            return resumable ? this.withReferenceInToolResult(toolResult, childThreadId) : toolResult;
           }
           const backgroundRun = (async () => {
             try {
@@ -5132,9 +5130,7 @@ Message one with subagent_message(referenceId, message).`
               if (resumable) {
                 await this.settleResumableChildAfterRun(
                   state,
-                  stub,
-                  childThreadId,
-                  childResult
+                  childThreadId
                 );
               } else if (stub.terminateThread) {
                 await stub.terminateThread(childThreadId);
@@ -5529,18 +5525,8 @@ Message one with subagent_message(referenceId, message).`
           JSON.stringify(next)
         );
       }
-      static isTerminalSubagentResult(result) {
-        return result.terminal === true;
-      }
-      static async settleResumableChildAfterRun(state, childThread, reference, result) {
-        if (!this.isTerminalSubagentResult(result)) {
-          await this.updateChildStatus(state, reference, "idle");
-          return;
-        }
-        await this.updateChildStatus(state, reference, "terminated");
-        if (typeof childThread.terminateThread === "function") {
-          await childThread.terminateThread(reference);
-        }
+      static async settleResumableChildAfterRun(state, reference) {
+        await this.updateChildStatus(state, reference, "idle");
       }
       static async buildChildInvocationMessages(state, childThread, content, receivesMessages, parentAttachments, initialArguments) {
         const copiedAttachments = await this.copyAttachmentsBetweenThreads(
@@ -16819,7 +16805,7 @@ function createHmrReloader() {
       const isConfigFile = isModelFile || isProviderFile || isPromptFile || isAgentFile || isEffectFile;
       if (!isToolFile && !isThreadApiFile && !isHookFile && !isConfigFile && !isUserEndpointFile) return;
       reloader.invalidateSourceFileModule(server, file);
-      if (isConfigFile || isToolFile) regenerateTypes();
+      if (isConfigFile || isToolFile || isHookFile) regenerateTypes();
       if (isToolFile) await reloader.reloadToolsModule(server);
       if (isModelFile) await reloader.reloadModelsModule(server);
       if (isProviderFile) await reloader.reloadProvidersModule(server);
@@ -18947,6 +18933,29 @@ async function scanPromptsDirectory(dir) {
 async function scanAgentsDirectory(dir) {
   return scanConfigDirectory(dir, /export\s+default\s+defineAgent/);
 }
+function findLegacyRootAgentFiles(agentsDir) {
+  const agentsRoot = path9__default.dirname(agentsDir);
+  if (path9__default.basename(agentsDir) !== "agents" || path9__default.basename(agentsRoot) !== "agents") {
+    return [];
+  }
+  if (!fs9__default.existsSync(agentsRoot)) return [];
+  return fs9__default.readdirSync(agentsRoot, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".ts")).map((entry) => path9__default.join(agentsRoot, entry.name)).filter((filePath) => {
+    try {
+      return /export\s+default\s+defineAgent/.test(fs9__default.readFileSync(filePath, "utf8"));
+    } catch {
+      return false;
+    }
+  }).sort();
+}
+function warnLegacyRootAgentFiles(agentsDir) {
+  const expectedDir = path9__default.relative(process.cwd(), agentsDir).replace(/\\/g, "/");
+  for (const filePath of findLegacyRootAgentFiles(agentsDir)) {
+    const source = path9__default.relative(process.cwd(), filePath).replace(/\\/g, "/");
+    console.warn(
+      `[agentbuilder] Agent definition "${source}" is outside the scanned agent directory. Move it to "${expectedDir}/" so it is registered.`
+    );
+  }
+}
 async function scanEffectsDirectory(dir) {
   const effects = [];
   if (!fs9__default.existsSync(dir)) {
@@ -22657,7 +22666,32 @@ function isHostedInstance(env) {
   }
   return Boolean(value);
 }
-function isTrustedLocalDevelopmentRequest(request, env) {
+function normalizeTrustedDevHosts(hosts) {
+  const normalized = /* @__PURE__ */ new Set();
+  for (const rawHost of hosts ?? []) {
+    const candidate = rawHost.trim().toLowerCase().replace(/\.$/, "");
+    try {
+      const parsed = new URL(`http://${candidate}`);
+      if (!candidate || candidate.includes("*") || parsed.hostname.toLowerCase().replace(/\.$/, "") !== candidate || parsed.port || parsed.username || parsed.password || parsed.pathname !== "/" || parsed.search || parsed.hash) {
+        throw new Error("invalid hostname");
+      }
+    } catch {
+      throw new Error(
+        `Invalid trusted development hostname "${rawHost}". Use an exact hostname without a scheme, port, path, or wildcard.`
+      );
+    }
+    normalized.add(candidate);
+  }
+  return [...normalized];
+}
+function compiledTrustedDevHosts() {
+  try {
+    return typeof __STANDARD_AGENTS_TRUSTED_DEV_HOSTS__ !== "undefined" && Array.isArray(__STANDARD_AGENTS_TRUSTED_DEV_HOSTS__) ? __STANDARD_AGENTS_TRUSTED_DEV_HOSTS__ : [];
+  } catch {
+    return [];
+  }
+}
+function isTrustedLocalDevelopmentRequest(request, env, trustedDevHosts = compiledTrustedDevHosts()) {
   if (isHostedInstance(env)) return false;
   let hostname;
   try {
@@ -22665,7 +22699,7 @@ function isTrustedLocalDevelopmentRequest(request, env) {
   } catch {
     return false;
   }
-  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname.endsWith(".localhost") || hostname.endsWith(".orb.local");
+  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname.endsWith(".localhost") || hostname.endsWith(".orb.local") || trustedDevHosts.some((trusted) => trusted.trim().toLowerCase() === hostname);
 }
 function isPublicApiRoute(routePath, request, env) {
   if (PUBLIC_ROUTES.has(routePath)) return true;
@@ -22814,7 +22848,8 @@ function createDevMiddleware(server, context) {
     installedProviderPackageMap,
     hmr,
     sourceDirs,
-    regenerateTypes
+    regenerateTypes,
+    trustedDevHosts
   } = context;
   server.watcher.on("add", async (file) => {
     await hmr.handleFileChange(file, server, sourceDirs, regenerateTypes);
@@ -22848,7 +22883,8 @@ function createDevMiddleware(server, context) {
     try {
       trustedLocalHost = isTrustedLocalDevelopmentRequest(
         new Request(`http://${req.headers.host || "invalid.remote"}${routePath}`),
-        {}
+        {},
+        trustedDevHosts
       );
     } catch {
     }
@@ -24082,7 +24118,7 @@ var firstPartyProviderPackages = [
   "@standardagents/openrouter",
   "@standardagents/xai"
 ];
-var depsToInclude = [
+var baseDepsToInclude = [
   "zod",
   "zod/v3",
   "zod/v4",
@@ -24093,17 +24129,24 @@ var depsToInclude = [
   // a root dep). The `parent > child` form pre-bundles it at startup so Vite
   // doesn't discover it mid-request and reload the worker (which would destroy
   // an in-flight Durable Object execution and drop the client bridge).
-  "@standardagents/openrouter > @openrouter/sdk",
   "magic-string",
   "@standardagents/spec",
   // Incremental JSON reader used by the runtime to surface a tool's progress
   // argument from partial streamed tool-call arguments (tool_call_started).
-  "@formkit/jsonreader",
-  // Pre-bundle the provider packages themselves so their whole subtree (SDKs,
-  // pricing tables) lands in the initial optimized bundle and nothing is
-  // discovered lazily by workerd.
-  ...firstPartyProviderPackages
+  "@formkit/jsonreader"
 ];
+function depsToInclude(options = {}) {
+  const installedProviders = options.isPackageInstalled ? firstPartyProviderPackages.filter(options.isPackageInstalled) : firstPartyProviderPackages;
+  const openRouterTransitive = installedProviders.includes("@standardagents/openrouter") ? ["@standardagents/openrouter > @openrouter/sdk"] : [];
+  return [...baseDepsToInclude, ...openRouterTransitive, ...installedProviders];
+}
+function trustedDevHostDefines(options) {
+  return {
+    __STANDARD_AGENTS_TRUSTED_DEV_HOSTS__: JSON.stringify(
+      normalizeTrustedDevHosts(options.trustedDevHosts)
+    )
+  };
+}
 var packingDeps = [
   "rollup",
   "@rollup/plugin-commonjs",
@@ -24112,7 +24155,7 @@ var packingDeps = [
   "fsevents",
   "typescript"
 ];
-function createPluginViteConfig(pluginModuleUrl) {
+function createPluginViteConfig(pluginModuleUrl, options = {}) {
   const currentDir = path9__default.dirname(fileURLToPath(pluginModuleUrl));
   const isInDist = currentDir.endsWith("dist");
   const builderClientDir = path9__default.resolve(
@@ -24120,6 +24163,7 @@ function createPluginViteConfig(pluginModuleUrl) {
     isInDist ? "./client" : "../dist/client"
   );
   return {
+    define: trustedDevHostDefines(options),
     publicDir: fs9__default.existsSync(builderClientDir) ? builderClientDir : void 0,
     build: {
       rollupOptions: {
@@ -24135,7 +24179,7 @@ function createPluginViteConfig(pluginModuleUrl) {
       // `npm run dev` ("There is a new version of the pre-bundle for X").
       holdUntilCrawlEnd: true,
       exclude: depsToExclude,
-      include: depsToInclude.filter((dep) => dep !== "zod/v3" && dep !== "zod/v4" && dep !== "zod/v4/core")
+      include: depsToInclude(options).filter((dep) => dep !== "zod/v3" && dep !== "zod/v4" && dep !== "zod/v4/core")
     },
     ssr: {
       noExternal: [
@@ -24240,7 +24284,11 @@ function createAgentBuilderCloudflarePlugins(options) {
     }
   });
 }
-function applyPluginEnvironmentConfig(config) {
+function applyPluginEnvironmentConfig(config, options = {}) {
+  config.define = {
+    ...config.define || {},
+    ...trustedDevHostDefines(options)
+  };
   config.optimizeDeps = config.optimizeDeps || {};
   config.optimizeDeps.holdUntilCrawlEnd = true;
   config.optimizeDeps.exclude = [
@@ -24249,7 +24297,7 @@ function applyPluginEnvironmentConfig(config) {
   ];
   config.optimizeDeps.include = [
     ...config.optimizeDeps.include || [],
-    ...depsToInclude.filter((dep) => !config.optimizeDeps?.include?.includes(dep))
+    ...depsToInclude(options).filter((dep) => !config.optimizeDeps?.include?.includes(dep))
   ];
   config.build = config.build || {};
   config.build.rollupOptions = config.build.rollupOptions || {};
@@ -24309,6 +24357,7 @@ function normalizeDeviceApprovalBrand(value) {
 // src/plugin.ts
 function agentbuilder(options = {}) {
   const deviceApproval = normalizeDeviceApprovalBrand(options.deviceApproval);
+  const trustedDevHosts = normalizeTrustedDevHosts(options.trustedDevHosts);
   const toolsDir = options.toolsDir ? path9__default.resolve(process.cwd(), options.toolsDir) : path9__default.resolve(process.cwd(), "agents/tools");
   const hooksDir = options.hooksDir ? path9__default.resolve(process.cwd(), options.hooksDir) : path9__default.resolve(process.cwd(), "agents/hooks");
   const threadApiDir = options.apiDir ? path9__default.resolve(process.cwd(), options.apiDir) : path9__default.resolve(process.cwd(), "agents/api");
@@ -24413,7 +24462,8 @@ export { CodeExecutionBridge, DurableAgentBuilder, DurableThread, ThreadWatchdog
     installedProviderPackageMap,
     hmr,
     sourceDirs,
-    regenerateTypes
+    regenerateTypes,
+    trustedDevHosts
   };
   const workerEntry = path9__default.relative(process.cwd(), generatedWorkerEntry).split(path9__default.sep).join("/");
   const corePlugin = {
@@ -24421,12 +24471,18 @@ export { CodeExecutionBridge, DurableAgentBuilder, DurableThread, ThreadWatchdog
     enforce: "pre",
     config() {
       writeGeneratedWorkerEntry();
-      const viteConfig = createPluginViteConfig(import.meta.url);
+      const viteConfig = createPluginViteConfig(import.meta.url, {
+        isPackageInstalled: isProviderPackageInstalled,
+        trustedDevHosts
+      });
       return viteConfig;
     },
     // Apply exclusions and inclusions to ALL environments including Cloudflare worker
     configEnvironment(_name, config) {
-      applyPluginEnvironmentConfig(config);
+      applyPluginEnvironmentConfig(config, {
+        isPackageInstalled: isProviderPackageInstalled,
+        trustedDevHosts
+      });
     },
     resolveId(id) {
       if (id === VIRTUAL_TOOLS_ID) {
@@ -24471,6 +24527,7 @@ export { CodeExecutionBridge, DurableAgentBuilder, DurableThread, ThreadWatchdog
     },
     buildStart() {
       writeGeneratedWorkerEntry();
+      warnLegacyRootAgentFiles(agentsDir);
       regenerateTypes();
       this.addWatchFile(toolsDir);
       this.addWatchFile(threadApiDir);
@@ -29242,12 +29299,9 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
             await parentThread.updateChildRegistryStatus(
               params.parent_thread_id,
               childThread.id,
-              childResult.terminal ? "terminated" : "idle"
+              "idle"
             );
           }
-          if (childResult.terminal && typeof childThreadStub.terminateThread === "function") {
-            await childThreadStub.terminateThread(childThread.id);
-          }
         } else if (typeof childThreadStub.terminateThread === "function") {
           await childThreadStub.terminateThread(childThread.id);
         }
@@ -33243,11 +33297,13 @@ ${paths.join("\n")}`;
     try {
       const parentId = this.env.AGENT_BUILDER_THREAD.idFromName(parentThreadId);
       const parentStub = this.env.AGENT_BUILDER_THREAD.get(parentId);
-      const parentCommunication = await this.getParentCommunicationModeForChild(
+      const childRegistryEntry = await this.getParentRegistryEntryForChild(
         parentStub,
         parentThreadId,
         threadId
       );
+      const parentCommunication = childRegistryEntry?.parentCommunication === "explicit" ? "explicit" : "implicit";
+      const resumableChild = childRegistryEntry?.resumable === true;
       const copiedRefs = await this.copyAttachmentRefsToThread(
         refs,
         parentStub,
@@ -33270,10 +33326,11 @@ ${resultContent}${attachmentSummary}`;
         });
       }
       const terminalChildRun = sessionStopped || hasTerminalSessionTools;
+      const terminateChildThread = terminalChildRun && !resumableChild;
       await parentStub.updateChildRegistryStatus(
         parentThreadId,
         threadId,
-        terminalChildRun ? "terminated" : "idle"
+        terminateChildThread ? "terminated" : "idle"
       );
       if (parentCommunication !== "explicit") {
         await this.persistParentHandoffStatusMessage(
@@ -33281,23 +33338,22 @@ ${resultContent}${attachmentSummary}`;
           isErrorTerminal ? "failure" : "result"
         );
       }
-      if (terminalChildRun) {
+      if (terminateChildThread) {
         await this.terminateThread(threadId);
       }
     } catch (error) {
       console.error("[DurableThread] Failed to deliver subagent completion to parent:", error);
     }
   }
-  async getParentCommunicationModeForChild(parentStub, parentThreadId, childThreadId) {
+  async getParentRegistryEntryForChild(parentStub, parentThreadId, childThreadId) {
     if (typeof parentStub.getChildrenRegistry !== "function") {
-      return "implicit";
+      return void 0;
     }
     try {
       const entries = await parentStub.getChildrenRegistry(parentThreadId);
-      const childEntry = entries.find((entry) => entry.reference === childThreadId);
-      return childEntry?.parentCommunication === "explicit" ? "explicit" : "implicit";
+      return entries.find((entry) => entry.reference === childThreadId);
     } catch {
-      return "implicit";
+      return void 0;
     }
   }
   /**
@@ -34845,7 +34901,7 @@ ${resultContent}${attachmentSummary}`;
           void 0,
           INTERNAL_TOOL_DELIVERY
         );
-        if (delivered?.resume) sides.add(delivered.side);
+        if (delivered) sides.add(delivered.side);
       }
       if (threadId) {
         for (const side of sides) {
@@ -35147,17 +35203,14 @@ ${resultContent}${attachmentSummary}`;
   deliveredResultWaiters = /* @__PURE__ */ new Map();
   notifyDeliveredResultWaiters(toolCallId) {
     const waiters = this.deliveredResultWaiters?.get(toolCallId);
-    if (!waiters || waiters.size === 0) return false;
+    if (!waiters) return;
     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,
@@ -35302,46 +35355,37 @@ ${resultContent}${attachmentSummary}`;
     const side = pending.side === "b" ? "b" : "a";
     const content = ok ? result ?? "" : `Error: ${error ?? "tool failed"}`;
     const toolStatus = ok ? "success" : "error";
-    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'`,
+    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`,
         toolCallId
       );
-      if (claimed.rowsWritten !== 1) return false;
-      this.ctx.storage.sql.exec(
-        `UPDATE messages SET content = ?, tool_status = ? WHERE tool_call_id = ? AND role = 'tool'`,
+      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,
-        toolCallId
-      );
-      const updated = this.ctx.storage.sql.exec(
-        `SELECT COUNT(*) AS total FROM messages WHERE tool_call_id = ? AND role = 'tool'`,
-        toolCallId
+        Date.now() * TIMESTAMP_MULTIPLIER
       );
-      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);
+    }
+    await this.ctx.storage.sql.exec(
+      `UPDATE pending_client_calls SET status = 'resolved' WHERE tool_call_id = ?`,
+      toolCallId
+    );
+    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
@@ -35352,7 +35396,7 @@ ${resultContent}${attachmentSummary}`;
       if (msg) this.broadcastMessage(msg);
     } catch {
     }
-    return { side, resume: !resumedInline };
+    return { side };
   }
   // ─── Runtime byte streams ──────────────────────────────────────────────────
   // The existing bridge frames carry opaque capability metadata and bytes
@@ -36526,11 +36570,12 @@ ${resultContent}${attachmentSummary}`;
       if (!parentThreadId) return;
       const parentId = this.env.AGENT_BUILDER_THREAD.idFromName(parentThreadId);
       const parentStub = this.env.AGENT_BUILDER_THREAD.get(parentId);
-      const parentCommunication = await this.getParentCommunicationModeForChild(
+      const childRegistryEntry = await this.getParentRegistryEntryForChild(
         parentStub,
         parentThreadId,
         threadId
       );
+      const parentCommunication = childRegistryEntry?.parentCommunication === "explicit" ? "explicit" : "implicit";
       if (parentCommunication !== "explicit") {
         await parentStub.queueMessage(parentThreadId, {
           role: "user",