@standardagents/builder 0.36.3 → 0.37.0

package/dist/built-in-routes.js

@@ -6522,22 +6522,8 @@ var init_context = __esm({
 var FlowEngine_exports = {};
 __export(FlowEngine_exports, {
   FlowEngine: () => FlowEngine,
-  HookBlockedExecutionError: () => HookBlockedExecutionError,
-  stepBudgetMessage: () => stepBudgetMessage
+  HookBlockedExecutionError: () => HookBlockedExecutionError
 });
-function stepBudgetMessage(stepsRemaining) {
-  if (stepsRemaining > 20) return null;
-  if (stepsRemaining === 0) {
-    return "[STEP BUDGET] \u26A0\uFE0F CRITICAL: You must complete your task NOW or an error will be thrown. This is your final step.";
-  }
-  if (stepsRemaining === 1) {
-    return "[STEP BUDGET] \u26A0\uFE0F CRITICAL: Only 1 step available after this before an error will be thrown. Reach completion immediately.";
-  }
-  if (stepsRemaining <= 3) {
-    return `[STEP BUDGET] \u26A0\uFE0F WARNING: Only ${stepsRemaining} steps available before an error will be thrown. Reach completion as soon as possible.`;
-  }
-  return `[STEP BUDGET] ${stepsRemaining} steps available before an error will be thrown. Work efficiently toward completion.`;
-}
 var IMMEDIATE_BOOTSTRAP_TOOL_NAME, HookBlockedExecutionError, FlowEngine;
 var init_FlowEngine = __esm({
   "src/agents/FlowEngine.ts"() {
@@ -6651,7 +6637,8 @@ var init_FlowEngine = __esm({
         try {
           const detail = error instanceof Error ? error.message : String(error);
           await state.thread.instance.settleTerminalFailure?.(
-            `The agent run failed unexpectedly: ${detail}`
+            `The agent run failed unexpectedly: ${detail}`,
+            state.threadId
           );
         } catch (settleError) {
           console.error("[FlowEngine] Failed to settle terminal failure (non-fatal):", settleError);
@@ -8160,6 +8147,17 @@ This usually points to something I can't fix from here \u2014 for example the wo
         if (hidden.size === 0) return registry;
         return registry.filter((entry) => !hidden.has(entry.name));
       }
+      /**
+       * True when the prompt declares any resumable subagent config — the exact
+       * condition under which the runtime injects `subagent_create` and the
+       * `subagents` query tool, i.e. the pull path for child state exists.
+       */
+      static hasResumableSubagentConfigs(state) {
+        const configs = state.prompt?._tools ?? [];
+        return configs.some(
+          (t) => typeof t === "object" && t !== null && Boolean(t.resumable)
+        );
+      }
       /** Public snapshot for the `subagents` built-in tool (ToolExecutor). */
       static async listModelVisibleSubagents(state) {
         return _FlowEngine.filterModelVisibleSubagents(
@@ -8420,43 +8418,11 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
           }
           messages.push(messageToAdd);
         }
-        const maxSteps = state.currentSide === "a" ? state.agentConfig.side_a_max_steps : state.agentConfig.side_b_max_steps;
-        if (typeof maxSteps === "number" && !isNaN(maxSteps)) {
-          const currentSideStepCount = state.currentSide === "a" ? state.sideAStepCount : state.sideBStepCount;
-          const stepsRemaining = maxSteps - currentSideStepCount;
-          const budgetMessage = stepBudgetMessage(stepsRemaining);
-          if (budgetMessage) {
-            messages.push({
-              role: "system",
-              content: budgetMessage
-            });
-          }
-        }
-        const subagentRegistry = _FlowEngine.filterModelVisibleSubagents(
+        state.currentSide === "a" ? state.agentConfig.side_a_max_steps : state.agentConfig.side_b_max_steps;
+        _FlowEngine.filterModelVisibleSubagents(
           await this.getSubagentRegistry(state),
           state.prompt?._tools
         );
-        const suppressRegistryMessage = Array.isArray(state.prompt?.hooks) ? state.prompt.hooks.includes("append_static_session_env") : false;
-        if (subagentRegistry.length > 0 && !suppressRegistryMessage) {
-          const fallbackNameMap = await this.resolveRegistryThreadNameMap(state, subagentRegistry);
-          const lines = subagentRegistry.map((entry) => {
-            const threadName = this.getRegistryThreadName(entry) ?? fallbackNameMap.get(entry.reference) ?? null;
-            const displayName = threadName ? `${entry.name} (${threadName})` : entry.name;
-            const initialArguments = this.getRegistryInitialArguments(entry);
-            const argumentsLine = initialArguments ? `
-  Initial arguments: ${this.formatInitialArgumentsForPrompt(initialArguments)}` : "";
-            return `- Reference: ${entry.reference}
-  Name: ${displayName}
-  Description: ${entry.description}
-  Status: ${entry.status}${argumentsLine}`;
-          });
-          messages.push({
-            role: "system",
-            content: `Active subagent instances:
-
-${lines.join("\n\n")}`
-          });
-        }
         const tools = await this.getToolsForPrompt(state, state.prompt);
         let finalToolChoice;
         if (toolChoice === "function" && tools.length === 1) {
@@ -8796,16 +8762,16 @@ ${lines.join("\n\n")}`
           }
           if (resumablePromptSubagents.length > 0 && !tools.some((tool3) => tool3.function.name === "subagent_create")) {
             tools.push(this.buildSubagentCreateTool(resumablePromptSubagents));
-            if (!tools.some((tool3) => tool3.function.name === "subagents")) {
-              tools.push({
-                type: "function",
-                function: {
-                  name: "subagents",
-                  description: "List your active subagent instances: reference id, name, status, and working-status text. Use when you need to check on children you created; completions also arrive as messages.",
-                  parameters: { type: "object", properties: {} }
-                }
-              });
-            }
+          }
+          if ((resumablePromptSubagents.length > 0 || childrenRegistry.length > 0) && !tools.some((tool3) => tool3.function.name === "subagents")) {
+            tools.push({
+              type: "function",
+              function: {
+                name: "subagents",
+                description: "List your active subagent instances: reference id, name, status, and working-status text. Call this BEFORE subagent_create to see whether an existing instance already covers the work, and whenever you need to check on children you created; completions also arrive as messages.",
+                parameters: { type: "object", properties: {} }
+              }
+            });
           }
           const hasActiveResumable = childrenRegistry.some(
             (entry) => entry.status !== "terminated"
@@ -9109,6 +9075,7 @@ ${lines.join("\n\n")}`
               "Available resumable subagents:",
               ...descriptionLines,
               "Provide any required invocation arguments via `arguments`; they persist for the life of the subagent thread.",
+              "Before creating a new instance, call `subagents` to check the status of instances you already have \u2014 an existing one may already cover the work, and instance caps count live children.",
               "Use subagent_message for follow-up communication with resumable instances."
             ].join("\n"),
             parameters: {
@@ -13337,6 +13304,25 @@ var init_ThreadStateImpl = __esm({
         const mustParkForApproval = request.requestPermission != null && await this.forwardedCallNeedsApproval(request);
         if (mustParkForApproval && canPark && toolCallId && typeof instance.hasBridge === "function" && await instance.hasBridge()) {
           await instance.dispatchClientTool(request, toolCallId, side);
+          const getDelivered = instance.getDeliveredClientToolResult;
+          if (typeof getDelivered === "function") {
+            const graceDeadline = Date.now() + 4e3;
+            while (Date.now() < graceDeadline) {
+              await new Promise((r) => setTimeout(r, 150));
+              try {
+                const delivered = await getDelivered.call(instance, toolCallId);
+                if (delivered) {
+                  return {
+                    ok: delivered.toolStatus !== "error",
+                    result: delivered.content,
+                    data: { toolCallId }
+                  };
+                }
+              } catch {
+                break;
+              }
+            }
+          }
           this._executionState.stop();
           return {
             ok: true,
@@ -67831,7 +67817,7 @@ var config_get_default = defineController2(async ({ config, env: env2, req }) =>
 });
 
 // src/version.ts
-var BUILDER_VERSION = "0.36.3".length > 0 ? "0.36.3" : "dev";
+var BUILDER_VERSION = "0.37.0".length > 0 ? "0.37.0" : "dev";
 
 // src/api/diagnostics.get.ts
 init_LLMRequest();
@@ -68985,10 +68971,22 @@ var migration16 = {
   }
 };
 
+// src/durable-objects/agentbuilder-migrations/0017_add_thread_message_recency.ts
+var migration17 = {
+  version: 17,
+  async up(sql) {
+    sql.exec(`ALTER TABLE threads ADD COLUMN last_message_at INTEGER`);
+    sql.exec(`UPDATE threads SET last_message_at = created_at`);
+    sql.exec(`
+      INSERT OR REPLACE INTO _metadata (key, value) VALUES ('schema_version', '17')
+    `);
+  }
+};
+
 // src/durable-objects/agentbuilder-migrations/index.ts
-var migrations = [migration, migration2, migration3, migration4, migration5, migration6, migration7, migration8, migration9, migration10, migration11, migration12, migration13, migration14, migration15, migration16];
+var migrations = [migration, migration2, migration3, migration4, migration5, migration6, migration7, migration8, migration9, migration10, migration11, migration12, migration13, migration14, migration15, migration16, migration17];
 migrations.reduce(
-  (max, migration17) => Math.max(max, migration17.version),
+  (max, migration18) => Math.max(max, migration18.version),
   0
 );
 
@@ -69110,6 +69108,7 @@ var threads_default = defineController2(async ({ req, env: env2 }) => {
           last_activity_at: thread.last_activity_at ?? thread.created_at,
           executing: thread.executing === true,
           last_message_preview: thread.last_message_preview ?? null,
+          last_message_at: thread.last_message_at ?? null,
           agent: agentDetails
         };
       })
@@ -70438,6 +70437,110 @@ var bootstrap_post_default = defineController2(async ({ env: env2 }) => {
   }
 });
 
+// src/utils/platform-signed-payload.ts
+var encoder = new TextEncoder();
+var decoder = new TextDecoder();
+function base64UrlToBytes(value) {
+  const padded = value.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat((4 - value.length % 4) % 4);
+  const binary = atob(padded);
+  const bytes = new Uint8Array(binary.length);
+  for (let index = 0; index < binary.length; index += 1) {
+    bytes[index] = binary.charCodeAt(index);
+  }
+  return bytes;
+}
+function decodeJson(value) {
+  return JSON.parse(decoder.decode(base64UrlToBytes(value)));
+}
+function parsePublicJwk(value) {
+  if (typeof value !== "string" || !value.trim()) return null;
+  try {
+    const parsed = JSON.parse(value);
+    if (parsed.kty !== "EC" || parsed.crv !== "P-256" || !parsed.x || !parsed.y) {
+      return null;
+    }
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+async function importPublicKey(jwk) {
+  return crypto.subtle.importKey(
+    "jwk",
+    jwk,
+    { name: "ECDSA", namedCurve: "P-256" },
+    false,
+    ["verify"]
+  );
+}
+async function verifyPlatformSignedPayload(token, publicJwkValue, options) {
+  const publicJwk = parsePublicJwk(publicJwkValue);
+  if (!publicJwk) return null;
+  const normalized = token.startsWith("sap_") ? token.slice(4) : token;
+  const parts = normalized.split(".");
+  if (parts.length !== 3) return null;
+  const [headerB64, payloadB64, signatureB64] = parts;
+  let header;
+  let payload;
+  try {
+    header = decodeJson(headerB64);
+    payload = decodeJson(payloadB64);
+  } catch {
+    return null;
+  }
+  if (header.alg !== "ES256" || payload.kind !== options.kind) return null;
+  if (options.projectId && payload.project_id !== options.projectId) return null;
+  if (typeof payload.exp !== "number" || payload.exp < Math.floor(Date.now() / 1e3)) {
+    return null;
+  }
+  const key = await importPublicKey(publicJwk);
+  const signed = encoder.encode(`${headerB64}.${payloadB64}`);
+  const signature = base64UrlToBytes(signatureB64);
+  const verified = await crypto.subtle.verify(
+    { name: "ECDSA", hash: "SHA-256" },
+    key,
+    signature,
+    signed
+  );
+  return verified ? payload : null;
+}
+
+// src/api/auth/brolly-control.post.ts
+var brolly_control_post_default = defineController2(async ({ req, env: env2 }) => {
+  const authorization = req.headers.get("Authorization") ?? "";
+  const token = authorization.startsWith("Brolly ") ? authorization.slice("Brolly ".length) : null;
+  if (!token) return Response.json({ error: "Missing Brolly control token" }, { status: 400 });
+  const projectId = typeof env2.STANDARD_AGENTS_PROJECT_ID === "string" ? env2.STANDARD_AGENTS_PROJECT_ID : void 0;
+  const payload = await verifyPlatformSignedPayload(
+    token,
+    env2.BROLLY_CONTROL_PUBLIC_KEY_JWK,
+    { kind: "brolly_runtime_control", projectId }
+  );
+  if (!payload) return Response.json({ error: "Invalid Brolly control token" }, { status: 401 });
+  const configuredAccount = typeof env2.BROLLY_ACCOUNT_ID === "string" ? env2.BROLLY_ACCOUNT_ID : typeof env2.CLOUDFLARE_ACCOUNT_ID === "string" ? env2.CLOUDFLARE_ACCOUNT_ID : void 0;
+  if (configuredAccount && payload.account_id !== configuredAccount) {
+    return Response.json({ error: "Brolly account mismatch" }, { status: 403 });
+  }
+  if (payload.version !== 1 || !/^[0-9a-f]{64}$/i.test(payload.object_id) || !payload.action_id || !payload.reason) {
+    return Response.json({ error: "Invalid Brolly control payload" }, { status: 400 });
+  }
+  const stub = env2.AGENT_BUILDER_THREAD.get(
+    env2.AGENT_BUILDER_THREAD.idFromString(payload.object_id)
+  );
+  let status;
+  if (payload.action === "quarantine") {
+    if (typeof stub.emergencyQuarantine !== "function") return Response.json({ error: "Runtime quarantine is unsupported" }, { status: 501 });
+    status = await stub.emergencyQuarantine({ actionId: payload.action_id, reason: payload.reason, source: "brolly", forensicHold: payload.forensic_hold, observed: payload.observed });
+  } else if (payload.action === "resume") {
+    if (typeof stub.emergencyResume !== "function") return Response.json({ error: "Runtime resume is unsupported" }, { status: 501 });
+    status = await stub.emergencyResume({ actionId: payload.action_id, reason: payload.reason, releaseForensicHold: payload.release_forensic_hold });
+  } else {
+    if (typeof stub.getRuntimeSafetyStatus !== "function") return Response.json({ error: "Runtime status is unsupported" }, { status: 501 });
+    status = await stub.getRuntimeSafetyStatus();
+  }
+  return Response.json({ ok: true, object_id: payload.object_id, action_id: payload.action_id, status });
+});
+
 // src/api/auth/config.get.ts
 var config_get_default2 = defineController2(async ({ req, env: env2 }) => {
   const githubConfigured = !!(env2.GITHUB_CLIENT_ID && env2.GITHUB_CLIENT_SECRET);
@@ -70624,74 +70727,6 @@ var me_get_default = defineController2(async ({ req, env: env2 }) => {
   }
 });
 
-// src/utils/platform-signed-payload.ts
-var encoder = new TextEncoder();
-var decoder = new TextDecoder();
-function base64UrlToBytes(value) {
-  const padded = value.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat((4 - value.length % 4) % 4);
-  const binary = atob(padded);
-  const bytes = new Uint8Array(binary.length);
-  for (let index = 0; index < binary.length; index += 1) {
-    bytes[index] = binary.charCodeAt(index);
-  }
-  return bytes;
-}
-function decodeJson(value) {
-  return JSON.parse(decoder.decode(base64UrlToBytes(value)));
-}
-function parsePublicJwk(value) {
-  if (typeof value !== "string" || !value.trim()) return null;
-  try {
-    const parsed = JSON.parse(value);
-    if (parsed.kty !== "EC" || parsed.crv !== "P-256" || !parsed.x || !parsed.y) {
-      return null;
-    }
-    return parsed;
-  } catch {
-    return null;
-  }
-}
-async function importPublicKey(jwk) {
-  return crypto.subtle.importKey(
-    "jwk",
-    jwk,
-    { name: "ECDSA", namedCurve: "P-256" },
-    false,
-    ["verify"]
-  );
-}
-async function verifyPlatformSignedPayload(token, publicJwkValue, options) {
-  const publicJwk = parsePublicJwk(publicJwkValue);
-  if (!publicJwk) return null;
-  const normalized = token.startsWith("sap_") ? token.slice(4) : token;
-  const parts = normalized.split(".");
-  if (parts.length !== 3) return null;
-  const [headerB64, payloadB64, signatureB64] = parts;
-  let header;
-  let payload;
-  try {
-    header = decodeJson(headerB64);
-    payload = decodeJson(payloadB64);
-  } catch {
-    return null;
-  }
-  if (header.alg !== "ES256" || payload.kind !== options.kind) return null;
-  if (options.projectId && payload.project_id !== options.projectId) return null;
-  if (typeof payload.exp !== "number" || payload.exp < Math.floor(Date.now() / 1e3)) {
-    return null;
-  }
-  const key = await importPublicKey(publicJwk);
-  const signed = encoder.encode(`${headerB64}.${payloadB64}`);
-  const signature = base64UrlToBytes(signatureB64);
-  const verified = await crypto.subtle.verify(
-    { name: "ECDSA", hash: "SHA-256" },
-    key,
-    signature,
-    signed
-  );
-  return verified ? payload : null;
-}
-
 // src/api/auth/platform-cleanup.post.ts
 var platform_cleanup_post_default = defineController2(async ({ req, env: env2 }) => {
   const body = await req.json().catch(() => null);
@@ -75738,6 +75773,7 @@ var routeHandlers = {
   "DELETE:/users/:id": id_delete_default3,
   "PUT:/users/:id": id_put_default,
   "POST:/auth/bootstrap": bootstrap_post_default,
+  "POST:/auth/brolly-control": brolly_control_post_default,
   "GET:/auth/config": config_get_default2,
   "POST:/auth/login": login_post_default,
   "GET:/auth/logout": logout_get_default,