@standardagents/builder 0.38.1 → 0.39.0

package/dist/built-in-routes.js

@@ -4247,6 +4247,24 @@ var init_ToolExecutor = __esm({
           }
         } catch {
         }
+        const aliasTarget = this.subagentAliasTarget(state, toolName);
+        if (aliasTarget) {
+          if (packageId) {
+            try {
+              const qualified = aliasTarget.includes("/") ? aliasTarget : `${packageId}/${aliasTarget}`;
+              if (await state.thread.instance.loadAgent(qualified)) {
+                return "agent";
+              }
+            } catch {
+            }
+          }
+          try {
+            if (await state.thread.instance.loadAgent(aliasTarget)) {
+              return "agent";
+            }
+          } catch {
+          }
+        }
         const isInToolsArray = (agentName) => {
           const tools2 = state.prompt._tools || [];
           return tools2.some((t) => typeof t === "string" ? t === agentName : t.name === agentName);
@@ -4762,15 +4780,20 @@ Message one with subagent_message(referenceId, message).`
           const builtinCreateAttachmentValue = createArgs?.attachments;
           const builtinCreateInitialArguments = createArgs?.initialArguments ?? {};
           const registryAgentName = targetAgentForCreate || call.function.name;
+          const aliasConfig = this.resolveSubagentToolConfig(state, registryAgentName);
+          const implementingAgentName = typeof aliasConfig.agent === "string" && aliasConfig.agent.trim().length > 0 ? aliasConfig.agent.trim() : registryAgentName;
           const packageId = getPackageId(state);
           let agentDef = null;
-          let agentName = registryAgentName;
+          let agentName = implementingAgentName;
           if (builtinSubagentAction === "create" && targetAgentForCreate) {
             const availableSubagents = await this.getPromptSubagentNames(state);
             if (!availableSubagents.includes(targetAgentForCreate)) {
+              const configuredDirect = (state.prompt._tools || []).some(
+                (t) => typeof t === "string" ? t === targetAgentForCreate : t?.name === targetAgentForCreate
+              );
               return {
                 status: "error",
-                error: `Subagent "${targetAgentForCreate}" is not available for this prompt. Use one of: ${availableSubagents.join(", ") || "(none)"}.`
+                error: configuredDirect ? `"${targetAgentForCreate}" is not a resumable subagent \u2014 call the ${targetAgentForCreate} tool directly; it runs to completion and returns its result in the tool response. subagent_create manages resumable subagents only: ${availableSubagents.join(", ") || "(none)"}.` : `Subagent "${targetAgentForCreate}" is not available for this prompt. Use one of: ${availableSubagents.join(", ") || "(none)"}.`
               };
             }
           }
@@ -4811,7 +4834,7 @@ Message one with subagent_message(referenceId, message).`
           if (agentType === "ai_human") {
             const parentToolConfigs = state.prompt._tools || [];
             const toolConfig = parentToolConfigs.find(
-              (t) => typeof t === "string" ? t === agentName : t.name === agentName
+              (t) => typeof t === "string" ? t === registryAgentName || t === agentName : t.name === registryAgentName || t.name === agentName
             );
             const subpromptToolConfig = this.getSubpromptToolConfig(toolConfig);
             const targetState = state.rootState || state;
@@ -5389,6 +5412,27 @@ Message one with subagent_message(referenceId, message).`
         }
         return null;
       }
+      /**
+       * The implementing agent behind an aliased subagent tool name, or null when
+       * the name carries no alias (`agent` absent, empty, or equal to the name).
+       */
+      static subagentAliasTarget(state, toolName) {
+        for (const tool3 of state.prompt._tools || []) {
+          if (!tool3 || typeof tool3 !== "object" || tool3.name !== toolName) {
+            continue;
+          }
+          const target = tool3.agent;
+          if (typeof target === "string" && target.trim().length > 0 && target.trim() !== toolName) {
+            return target.trim();
+          }
+        }
+        return null;
+      }
+      /**
+       * Resolve the prompt's subagent tool config for an EXPOSED tool name.
+       * Config entries are keyed by `name` (the model-facing tool name), which
+       * may alias a differently-named implementing agent via `agent`.
+       */
       static resolveSubagentToolConfig(state, agentName) {
         const config = (state.prompt._tools || []).find(
           (tool3) => typeof tool3 === "string" ? tool3 === agentName : tool3.name === agentName
@@ -8842,7 +8886,8 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
                   }
                   if (foundToolNames.has(toolName)) continue;
                   try {
-                    const agentDef = await state.thread.instance.loadAgent(toolName);
+                    const implementingAgent = subagentConfig && typeof subagentConfig.agent === "string" && subagentConfig.agent.trim().length > 0 ? subagentConfig.agent.trim() : toolName;
+                    const agentDef = await state.thread.instance.loadAgent(implementingAgent);
                     if (agentDef && (agentDef.type === "ai_human" || agentDef.type === "dual_ai")) {
                       let parameters;
                       const sideAPromptName = agentDef.sideA?.prompt;
@@ -9056,12 +9101,14 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
           if (!toolName || toolName.startsWith("provider:") || seen.has(toolName)) {
             continue;
           }
-          const agentDef = await this.tryLoadPromptToolAgent(state, toolName, packageId);
+          const subagentConfigForLoad = this.isSubagentToolConfig(configEntry) ? configEntry : void 0;
+          const implementingAgent = subagentConfigForLoad && typeof subagentConfigForLoad.agent === "string" && subagentConfigForLoad.agent.trim().length > 0 ? subagentConfigForLoad.agent.trim() : toolName;
+          const agentDef = await this.tryLoadPromptToolAgent(state, implementingAgent, packageId);
           if (!agentDef || agentDef.type !== "dual_ai") {
             continue;
           }
           seen.add(toolName);
-          const subagentConfig = this.isSubagentToolConfig(configEntry) ? configEntry : void 0;
+          const subagentConfig = subagentConfigForLoad;
           const blocking = subagentConfig?.blocking ?? true;
           const resumable = !!subagentConfig?.resumable && typeof subagentConfig.resumable === "object";
           const receivesMessages = subagentConfig?.resumable && typeof subagentConfig.resumable === "object" ? subagentConfig.resumable.receives_messages : "side_a";
@@ -68323,7 +68370,7 @@ var config_get_default = defineController2(async ({ config, env: env2, req }) =>
 });
 
 // src/version.ts
-var BUILDER_VERSION = "0.38.1".length > 0 ? "0.38.1" : "dev";
+var BUILDER_VERSION = "0.39.0".length > 0 ? "0.39.0" : "dev";
 
 // src/api/diagnostics.get.ts
 init_LLMRequest();
@@ -68442,6 +68489,35 @@ function resolveStreamTimeoutValue(env2, key, fallback) {
   return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
 }
 
+// src/middleware/request-auth.ts
+async function resolveRequestAuth(context) {
+  if (context.auth) return context.auth;
+  if (!isAuthenticationEnv(context.env)) {
+    return new Response(JSON.stringify({ error: "Unauthorized" }), {
+      status: 401,
+      headers: { "Content-Type": "application/json" }
+    });
+  }
+  return requireAuth(context.req, context.env);
+}
+async function resolveRequestPermission(context, permission) {
+  if (context.auth) {
+    if (!hasPermissionInEnvironment(context.auth.user, permission, context.env)) {
+      return Response.json(
+        { error: `Forbidden: '${permission}' access required` },
+        { status: 403 }
+      );
+    }
+    return context.auth;
+  }
+  return requirePermission(context.req, context.env, permission);
+}
+function routerAuthorizedThread(context, threadId) {
+  const access = context.threadAccess;
+  if (!access || !threadId) return null;
+  return access.threadId === threadId ? access.thread : null;
+}
+
 // src/events/access.ts
 var EVENT_STREAM_USER_ID_HEADER = "X-Standard-Agents-Event-User-Id";
 var EVENT_STREAM_SCOPE_HEADER = "X-Standard-Agents-Event-Scope";
@@ -68473,8 +68549,9 @@ function resolveEventStreamSubscription(request, auth) {
 }
 
 // src/api/events.get.ts
-var events_get_default = defineController2(async ({ req, env: env2 }) => {
-  const authResult = await requireAuth(req, env2);
+var events_get_default = defineController2(async (context) => {
+  const { req, env: env2 } = context;
+  const authResult = await resolveRequestAuth(context);
   if (authResult instanceof Response) {
     return authResult;
   }
@@ -68503,9 +68580,10 @@ var events_get_default = defineController2(async ({ req, env: env2 }) => {
     const stub = env2.AGENT_BUILDER.get(agentBuilderId);
     return await stub.fetch(authenticatedUpgrade);
   } catch (error) {
+    const message = error instanceof Error ? error.message : "Failed to establish WebSocket connection";
     console.error("Error establishing events WebSocket:", error);
     return Response.json(
-      { error: error.message || "Failed to establish WebSocket connection" },
+      { error: message },
       { status: 500 }
     );
   }
@@ -70840,35 +70918,6 @@ var id_patch_default = defineController2(async ({ req, env: env2, params }) => {
   }
 });
 
-// src/middleware/request-auth.ts
-async function resolveRequestAuth(context) {
-  if (context.auth) return context.auth;
-  if (!isAuthenticationEnv(context.env)) {
-    return new Response(JSON.stringify({ error: "Unauthorized" }), {
-      status: 401,
-      headers: { "Content-Type": "application/json" }
-    });
-  }
-  return requireAuth(context.req, context.env);
-}
-async function resolveRequestPermission(context, permission) {
-  if (context.auth) {
-    if (!hasPermissionInEnvironment(context.auth.user, permission, context.env)) {
-      return Response.json(
-        { error: `Forbidden: '${permission}' access required` },
-        { status: 403 }
-      );
-    }
-    return context.auth;
-  }
-  return requirePermission(context.req, context.env, permission);
-}
-function routerAuthorizedThread(context, threadId) {
-  const access = context.threadAccess;
-  if (!access || !threadId) return null;
-  return access.threadId === threadId ? access.thread : null;
-}
-
 // src/api/threads/[id].ts
 function resolveIconUrl2(icon, origin) {
   if (!icon) return void 0;
@@ -73832,8 +73881,9 @@ var tools_get_default2 = defineController2(async ({ params, url }) => {
 });
 
 // src/api/threads/[id]/bridge.ts
-var bridge_default = defineController2(async ({ req, params, env: env2 }) => {
-  const authResult = await requireAuth(req, env2);
+var bridge_default = defineController2(async (context) => {
+  const { req, params, env: env2 } = context;
+  const authResult = await resolveRequestAuth(context);
   if (authResult instanceof Response) {
     return authResult;
   }
@@ -73848,22 +73898,31 @@ var bridge_default = defineController2(async ({ req, params, env: env2 }) => {
     );
   }
   try {
-    const agentBuilderId = env2.AGENT_BUILDER.idFromName("singleton");
-    const agentBuilder = env2.AGENT_BUILDER.get(agentBuilderId);
-    const thread = await agentBuilder.getThread(threadId);
-    if (!thread) {
-      return Response.json(
-        { error: `Thread not found: ${threadId}` },
-        { status: 404 }
-      );
+    if (!routerAuthorizedThread(context, threadId)) {
+      const agentBuilderId = env2.AGENT_BUILDER.idFromName("singleton");
+      const agentBuilder = env2.AGENT_BUILDER.get(agentBuilderId);
+      const thread = await agentBuilder.getThread(threadId);
+      if (!thread) {
+        return Response.json(
+          { error: `Thread not found: ${threadId}` },
+          { status: 404 }
+        );
+      }
+      if (!canAccessThread(authResult, thread)) {
+        return Response.json(
+          { error: "Forbidden: You don't have access to this thread" },
+          { status: 403 }
+        );
+      }
     }
     const durableId = env2.AGENT_BUILDER_THREAD.idFromName(threadId);
     const stub = env2.AGENT_BUILDER_THREAD.get(durableId);
     return await stub.fetch(req);
   } catch (error) {
+    const message = error instanceof Error ? error.message : "Failed to establish client bridge";
     console.error(`Error establishing bridge for thread ${threadId}:`, error);
     return Response.json(
-      { error: error.message || "Failed to establish client bridge" },
+      { error: message },
       { status: 500 }
     );
   }
@@ -74789,8 +74848,9 @@ var stop_post_default = defineController2(async ({ params, env: env2 }) => {
 });
 
 // src/api/threads/[id]/stream.ts
-var stream_default = defineController2(async ({ req, params, env: env2 }) => {
-  const authResult = await requireAuth(req, env2);
+var stream_default = defineController2(async (context) => {
+  const { req, params, env: env2 } = context;
+  const authResult = await resolveRequestAuth(context);
   if (authResult instanceof Response) {
     return authResult;
   }
@@ -74805,22 +74865,31 @@ var stream_default = defineController2(async ({ req, params, env: env2 }) => {
     );
   }
   try {
-    const agentBuilderId = env2.AGENT_BUILDER.idFromName("singleton");
-    const agentBuilder = env2.AGENT_BUILDER.get(agentBuilderId);
-    const thread = await agentBuilder.getThread(threadId);
-    if (!thread) {
-      return Response.json(
-        { error: `Thread not found: ${threadId}` },
-        { status: 404 }
-      );
+    if (!routerAuthorizedThread(context, threadId)) {
+      const agentBuilderId = env2.AGENT_BUILDER.idFromName("singleton");
+      const agentBuilder = env2.AGENT_BUILDER.get(agentBuilderId);
+      const thread = await agentBuilder.getThread(threadId);
+      if (!thread) {
+        return Response.json(
+          { error: `Thread not found: ${threadId}` },
+          { status: 404 }
+        );
+      }
+      if (!canAccessThread(authResult, thread)) {
+        return Response.json(
+          { error: "Forbidden: You don't have access to this thread" },
+          { status: 403 }
+        );
+      }
     }
     const durableId = env2.AGENT_BUILDER_THREAD.idFromName(threadId);
     const stub = env2.AGENT_BUILDER_THREAD.get(durableId);
     return await stub.fetch(req);
   } catch (error) {
+    const message = error instanceof Error ? error.message : "Failed to establish message stream";
     console.error(`Error handling message stream for thread ${threadId}:`, error);
     return Response.json(
-      { error: error.message || "Failed to establish message stream" },
+      { error: message },
       { status: 500 }
     );
   }
@@ -75056,8 +75125,9 @@ var env_patch_default = defineController2(async ({ req, env: env2, params }) =>
 });
 
 // src/api/users/[id]/stream.ts
-var stream_default2 = defineController2(async ({ req, env: env2, params }) => {
-  const authResult = await requireAuth(req, env2);
+var stream_default2 = defineController2(async (context) => {
+  const { req, env: env2, params } = context;
+  const authResult = await resolveRequestAuth(context);
   if (authResult instanceof Response) return authResult;
   const isAdmin = authResult.authType === "super_admin" || authResult.user?.role === "admin";
   if (!isAdmin) {
@@ -75485,8 +75555,9 @@ var env_patch_default2 = defineController2(async ({ req, env: env2 }) => {
 });
 
 // src/api/users/me/hub.ts
-var hub_default = defineController2(async ({ req, env: env2 }) => {
-  const authResult = await requireAuth(req, env2);
+var hub_default = defineController2(async (context) => {
+  const { req, env: env2 } = context;
+  const authResult = await resolveRequestAuth(context);
   if (authResult instanceof Response) {
     return authResult;
   }
@@ -75514,9 +75585,10 @@ var hub_default = defineController2(async ({ req, env: env2 }) => {
     const stub = namespace.get(hubId);
     return await stub.fetch(req);
   } catch (error) {
+    const message = error instanceof Error ? error.message : "Failed to establish hub connection";
     console.error("Error establishing user hub socket:", error);
     return Response.json(
-      { error: error.message || "Failed to establish hub connection" },
+      { error: message },
       { status: 500 }
     );
   }
@@ -75658,8 +75730,9 @@ var index_post_default7 = defineController2(async ({ req, env: env2 }) => {
 });
 
 // src/api/users/me/stream.ts
-var stream_default3 = defineController2(async ({ req, env: env2 }) => {
-  const authResult = await requireAuth(req, env2);
+var stream_default3 = defineController2(async (context) => {
+  const { req, env: env2 } = context;
+  const authResult = await resolveRequestAuth(context);
   if (authResult instanceof Response) return authResult;
   if (authResult.authType === "super_admin") {
     return Response.json(