@standardagents/builder 0.41.22 → 0.41.26

package/dist/built-in-routes.js

@@ -3414,6 +3414,153 @@ var init_remoteAttachment = __esm({
   }
 });
 
+// src/agents/strictToolSchema.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isObjectSchema(schema) {
+  const type = schema.type;
+  return type === "object" || Array.isArray(type) && type.includes("object") || type === void 0 && isRecord(schema.properties);
+}
+function acceptsNull(schema) {
+  if (schema.type === "null") return true;
+  if (Array.isArray(schema.type) && schema.type.includes("null")) return true;
+  return Array.isArray(schema.anyOf) && schema.anyOf.some((v) => isRecord(v) && acceptsNull(v));
+}
+function nullableStrictSchema(schema) {
+  if (acceptsNull(schema)) return schema;
+  const { description, title, ...rest } = schema;
+  const variants = Array.isArray(rest.anyOf) && Object.keys(rest).length === 1 ? [...rest.anyOf] : [rest];
+  return {
+    anyOf: [...variants, { type: "null" }],
+    ...description !== void 0 ? { description } : {},
+    ...title !== void 0 ? { title } : {}
+  };
+}
+function toStrictSchema(value) {
+  if (!isRecord(value)) return {};
+  if (Array.isArray(value.anyOf)) {
+    const node2 = { anyOf: value.anyOf.map((v) => toStrictSchema(v)) };
+    if (typeof value.description === "string") node2.description = value.description;
+    if (typeof value.title === "string") node2.title = value.title;
+    return node2;
+  }
+  const node = {};
+  for (const [key, child] of Object.entries(value)) {
+    if (!SUPPORTED_KEYWORDS.has(key)) continue;
+    if (key === "properties" || key === "required" || key === "additionalProperties") continue;
+    if (key === "items") node.items = toStrictSchema(child);
+    else if (key === "$defs" && isRecord(child)) {
+      node.$defs = Object.fromEntries(
+        Object.entries(child).map(([name15, def]) => [name15, toStrictSchema(def)])
+      );
+    } else node[key] = child;
+  }
+  if (isObjectSchema(value)) {
+    const properties = isRecord(value.properties) ? value.properties : {};
+    const required = new Set(
+      Array.isArray(value.required) ? value.required.filter((item) => typeof item === "string") : []
+    );
+    node.type = "object";
+    node.properties = Object.fromEntries(
+      Object.entries(properties).map(([name15, child]) => {
+        const strict = toStrictSchema(child);
+        return [name15, required.has(name15) ? strict : nullableStrictSchema(strict)];
+      })
+    );
+    node.required = Object.keys(properties);
+    node.additionalProperties = false;
+  }
+  return node;
+}
+function stripNullArguments(value) {
+  if (Array.isArray(value)) {
+    return value.map((item) => isRecord(item) ? stripNullArguments(item) : item);
+  }
+  if (!isRecord(value)) return value;
+  const out = {};
+  for (const [key, child] of Object.entries(value)) {
+    if (child === null) continue;
+    out[key] = stripNullArguments(child);
+  }
+  return out;
+}
+function buildSubagentArgumentsSchema(sources) {
+  const merged = /* @__PURE__ */ new Map();
+  for (const source of sources) {
+    const schema = isRecord(source.argumentSchema) ? source.argumentSchema : {};
+    const properties2 = isRecord(schema.properties) ? schema.properties : {};
+    const required = new Set(
+      Array.isArray(schema.required) ? schema.required.filter((item) => typeof item === "string") : []
+    );
+    for (const [prop, child] of Object.entries(properties2)) {
+      const entry = merged.get(prop) ?? {
+        variants: /* @__PURE__ */ new Map(),
+        declaredBy: [],
+        requiredBy: []
+      };
+      const strict = toStrictSchema(child);
+      entry.variants.set(JSON.stringify(strict), strict);
+      entry.declaredBy.push(source.name);
+      if (required.has(prop)) entry.requiredBy.push(source.name);
+      merged.set(prop, entry);
+    }
+  }
+  const multiple = sources.length > 1;
+  const properties = {};
+  for (const [prop, entry] of merged) {
+    const variants = [...entry.variants.values()];
+    let schema = variants.length === 1 ? variants[0] : { anyOf: variants };
+    if (multiple) {
+      const usage = [`Used by: ${entry.declaredBy.join(", ")}.`];
+      usage.push(
+        entry.requiredBy.length === sources.length ? "Required." : entry.requiredBy.length > 0 ? `Required for: ${entry.requiredBy.join(", ")}; pass null for other agents.` : "Optional; pass null to omit."
+      );
+      const own = typeof schema.description === "string" ? `${schema.description} ` : "";
+      schema = { ...schema, description: `${own}${usage.join(" ")}` };
+    }
+    const alwaysRequired = entry.variants.size === 1 && sources.every((source) => entry.requiredBy.includes(source.name));
+    properties[prop] = alwaysRequired ? schema : nullableStrictSchema(schema);
+  }
+  return {
+    type: "object",
+    description: multiple ? "Initial arguments for the selected agent; they persist for the child thread lifetime. Fill the properties the selected agent uses and pass null for the rest." : `Initial arguments for ${sources[0]?.name ?? "the subagent"}; they persist for the child thread lifetime.`,
+    properties,
+    required: Object.keys(properties),
+    additionalProperties: false
+  };
+}
+var SUPPORTED_KEYWORDS;
+var init_strictToolSchema = __esm({
+  "src/agents/strictToolSchema.ts"() {
+    SUPPORTED_KEYWORDS = /* @__PURE__ */ new Set([
+      "type",
+      "properties",
+      "required",
+      "additionalProperties",
+      "items",
+      "enum",
+      "const",
+      "anyOf",
+      "description",
+      "title",
+      "pattern",
+      "format",
+      "minLength",
+      "maxLength",
+      "minimum",
+      "maximum",
+      "exclusiveMinimum",
+      "exclusiveMaximum",
+      "multipleOf",
+      "minItems",
+      "maxItems",
+      "$ref",
+      "$defs"
+    ]);
+  }
+});
+
 // src/durable-objects/files.ts
 var files_exports = {};
 __export(files_exports, {
@@ -4152,6 +4299,7 @@ var init_ToolExecutor = __esm({
     init_ThreadStateImpl();
     init_sessionTools();
     init_remoteAttachment();
+    init_strictToolSchema();
     SUBAGENT_CREATE_TOOL = "subagent_create";
     SUBAGENT_MESSAGE_TOOL = "subagent_message";
     SUBAGENTS_LIST_TOOL = "subagents";
@@ -5072,16 +5220,26 @@ Message one with subagent_message(referenceId, message).`
             args,
             initAttachmentsProperty
           );
-          const initialArguments = builtinSubagentAction === "create" ? builtinCreateInitialArguments : args;
-          const argumentValidationError = await this.validateSubagentArguments(
+          const validationOptions = { agentName, packageId };
+          let initialArguments = builtinSubagentAction === "create" ? stripNullArguments(builtinCreateInitialArguments) : args;
+          let argumentValidationError = await this.validateSubagentArguments(
             state,
             agentDef,
             initialArguments,
-            {
-              agentName,
-              packageId
-            }
+            validationOptions
           );
+          if (argumentValidationError && builtinSubagentAction === "create") {
+            const rawError = await this.validateSubagentArguments(
+              state,
+              agentDef,
+              builtinCreateInitialArguments,
+              validationOptions
+            );
+            if (!rawError) {
+              argumentValidationError = null;
+              initialArguments = builtinCreateInitialArguments;
+            }
+          }
           if (argumentValidationError) {
             return argumentValidationError;
           }
@@ -5391,7 +5549,7 @@ Message one with subagent_message(referenceId, message).`
             error: `${SUBAGENT_CREATE_TOOL} requires agent.`
           };
         }
-        if (rawArguments !== void 0 && (typeof rawArguments !== "object" || rawArguments === null || Array.isArray(rawArguments))) {
+        if (rawArguments !== void 0 && rawArguments !== null && (typeof rawArguments !== "object" || rawArguments === null || Array.isArray(rawArguments))) {
           return {
             agent,
             message,
@@ -15750,10 +15908,15 @@ ${resultContent}${attachmentSummary}`;
         }
       }
       /**
-       * This thread's OWN request-log cost summary (no descendants), aggregated
-       * in SQL so subtree cost reporting doesn't page full log rows out of every
-       * thread in the tree. Used by GET /api/threads/:id/cost, which merges these
-       * across the thread and all of its subagent descendants.
+       * This thread's OWN cost summary (no descendants), aggregated in SQL so
+       * subtree cost reporting doesn't page full log rows out of every thread in
+       * the tree. Used by GET /api/threads/:id/cost, which merges these across
+       * the thread and all of its subagent descendants.
+       *
+       * `totalCost` is everything the thread cost: LLM request rows (`cost_total`)
+       * plus application log rows (`kind = 'app'`, ThreadState.log() `cost`,
+       * stored as `app_cost`). `appCost` reports the application share apart;
+       * the per-model breakdown, component sums and `requestCount` stay LLM-only.
        */
       async getCostSummary() {
         await this.ensureMigrated();
@@ -15774,7 +15937,7 @@ ${resultContent}${attachmentSummary}`;
              SUM(cost_router_fee) AS router_fee_cost,
              COUNT(*) AS request_count
       FROM logs
-      WHERE cost_total IS NOT NULL
+      WHERE cost_total IS NOT NULL AND (kind IS NULL OR kind != '${APP_LOG_KIND}')
       GROUP BY model_key
       `
         );
@@ -15794,12 +15957,21 @@ ${resultContent}${attachmentSummary}`;
           routerFeeCost += row.router_fee_cost ?? 0;
           requestCount += row.request_count;
         }
+        const appRow = await this.ctx.storage.sql.exec(
+          `SELECT SUM(app_cost) AS app_cost FROM logs WHERE kind = ? AND app_cost IS NOT NULL`,
+          APP_LOG_KIND
+        );
+        const appCost = appRow.one().app_cost ?? 0;
+        totalCost += appCost;
         const messageRow = await this.ctx.storage.sql.exec(
-          `SELECT COUNT(DISTINCT message_id) AS message_count FROM logs WHERE cost_total IS NOT NULL`
+          `SELECT COUNT(DISTINCT message_id) AS message_count FROM logs
+       WHERE cost_total IS NOT NULL OR (kind = ? AND app_cost IS NOT NULL)`,
+          APP_LOG_KIND
         );
         const messageCount = messageRow.one().message_count || 0;
         return {
           totalCost,
+          appCost,
           inputCost,
           cachedCost,
           outputCost,
@@ -19557,6 +19729,7 @@ var init_FlowEngine = __esm({
     init_sessionTools();
     init_ThreadStateImpl();
     init_ParentHookResolver();
+    init_strictToolSchema();
     IMMEDIATE_BOOTSTRAP_TOOL_NAME = "bootstrap_immediate_subagent";
     HookBlockedExecutionError = class extends Error {
       constructor(message) {
@@ -22329,22 +22502,6 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
         }
         return parts.length > 0 ? parts.join("; ") : "no extra initial arguments";
       }
-      static buildSubagentArgumentsSchema(sideSubagentDescriptors) {
-        const variants = sideSubagentDescriptors.map((entry) => ({
-          ...this.normalizeSubagentArgumentSchema(entry.argumentSchema),
-          title: `${entry.name} initial arguments`,
-          description: `Initial arguments for ${entry.name}. These values persist for the child thread lifetime.`
-        }));
-        if (variants.length === 1) {
-          return variants[0];
-        }
-        return {
-          type: "object",
-          description: "Agent-specific initial arguments for the selected subagent. Use the schema matching the selected agent.",
-          additionalProperties: false,
-          anyOf: variants
-        };
-      }
       static buildSubagentCreateTool(sideSubagentDescriptors) {
         const agentNames = sideSubagentDescriptors.map((entry) => entry.name);
         const descriptionLines = sideSubagentDescriptors.map((entry) => {
@@ -22361,7 +22518,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
               "Create and run a configured subagent. Every instance is a persistent, addressable thread.",
               "Available subagents:",
               ...descriptionLines,
-              "Provide any required invocation arguments via `arguments`; they persist for the life of the subagent thread.",
+              "Provide the selected agent's invocation arguments via `arguments` (null for properties it does not use); 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 existing instances."
             ].join("\n"),
@@ -22388,10 +22545,14 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
                   type: "string",
                   description: "Required human-readable instance name for the spawned subagent thread. Use a concise stable label that identifies this child instance."
                 },
-                arguments: this.buildSubagentArgumentsSchema(sideSubagentDescriptors)
+                // One strict object (union of every relationship's arguments,
+                // optional ones nullable) — see strictToolSchema.ts for the
+                // provider rules this satisfies. Required like every property
+                // under strict mode; the model passes {} when there are none.
+                arguments: buildSubagentArgumentsSchema(sideSubagentDescriptors)
               },
               additionalProperties: false,
-              required: ["agent", "message", "attachments", "name"]
+              required: ["agent", "message", "attachments", "name", "arguments"]
             }
           }
         };
@@ -22415,8 +22576,8 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
           sanitized[key] = this.sanitizeToolJsonSchema(child);
         }
         const type = sanitized.type;
-        const isObjectSchema = type === "object" || Array.isArray(type) && type.includes("object");
-        if (isObjectSchema) {
+        const isObjectSchema2 = type === "object" || Array.isArray(type) && type.includes("object");
+        if (isObjectSchema2) {
           sanitized.additionalProperties = false;
         }
         return sanitized;
@@ -30167,11 +30328,11 @@ ${msg.content}` : msg.content;
   flushToolResults();
   return { anthropicMessages, system };
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function transformTool(tool3) {
-  const parameters = isRecord(tool3.function.parameters) ? tool3.function.parameters : { type: "object", properties: {} };
+  const parameters = isRecord2(tool3.function.parameters) ? tool3.function.parameters : { type: "object", properties: {} };
   return {
     name: tool3.function.name,
     ...tool3.function.description ? { description: tool3.function.description } : {},
@@ -30271,23 +30432,23 @@ function extractToolCalls(content) {
       toolCalls.push({
         id: block.id,
         name: block.name,
-        arguments: isRecord(block.input) ? block.input : {}
+        arguments: isRecord2(block.input) ? block.input : {}
       });
     }
   }
   return toolCalls.length > 0 ? toolCalls : void 0;
 }
 function webSearchToolResult(id, input, resultContent) {
-  const query = isRecord(input) && typeof input.query === "string" ? input.query : void 0;
+  const query = isRecord2(input) && typeof input.query === "string" ? input.query : void 0;
   let status = "completed";
   let sources;
   if (Array.isArray(resultContent)) {
-    sources = resultContent.filter(isRecord).filter((item) => item.type === "web_search_result" && typeof item.url === "string").map((item) => ({
+    sources = resultContent.filter(isRecord2).filter((item) => item.type === "web_search_result" && typeof item.url === "string").map((item) => ({
       type: "url",
       url: item.url,
       ...typeof item.title === "string" ? { title: item.title } : {}
     }));
-  } else if (isRecord(resultContent) && resultContent.type === "web_search_tool_result_error") {
+  } else if (isRecord2(resultContent) && resultContent.type === "web_search_tool_result_error") {
     status = "failed";
   }
   return {
@@ -30366,7 +30527,7 @@ function transformResponse(message) {
   };
 }
 function resolveThinkingOverride(value) {
-  if (!isRecord(value)) return void 0;
+  if (!isRecord2(value)) return void 0;
   const display = value.display === "summarized" || value.display === "omitted" ? value.display : void 0;
   if (value.type === "adaptive") {
     return { type: "adaptive", ...display ? { display } : {} };
@@ -30399,7 +30560,7 @@ function buildCreateParams(request, reasoningLevels = DEFAULT_REASONING_LEVELS,
     max_tokens: maxTokens,
     messages: anthropicMessages
   };
-  const providerOptions = isRecord(request.providerOptions) ? request.providerOptions : {};
+  const providerOptions = isRecord2(request.providerOptions) ? request.providerOptions : {};
   const {
     cacheSystemPrompt,
     thinking: thinkingOverride,
@@ -30507,7 +30668,7 @@ function createStreamState() {
 function parseToolCallArguments(argumentsJson) {
   try {
     const parsed = argumentsJson ? JSON.parse(argumentsJson) : {};
-    return isRecord(parsed) ? parsed : {};
+    return isRecord2(parsed) ? parsed : {};
   } catch {
     return {};
   }
@@ -31466,20 +31627,20 @@ function transformChatMessages2(messages) {
   }
   return result;
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function normalizeStrictJsonSchema(schema) {
   if (Array.isArray(schema)) {
     return schema.map((item) => normalizeStrictJsonSchema(item));
   }
-  if (!isRecord2(schema)) {
+  if (!isRecord3(schema)) {
     return schema;
   }
   const normalized = {};
   for (const [key, value] of Object.entries(schema)) {
     if (STRICT_UNSUPPORTED_KEYWORDS.has(key)) continue;
-    if (key === "properties" && isRecord2(value)) {
+    if (key === "properties" && isRecord3(value)) {
       const props = {};
       for (const [propName, propSchema] of Object.entries(value)) {
         props[propName] = normalizeStrictJsonSchema(propSchema);
@@ -31491,10 +31652,10 @@ function normalizeStrictJsonSchema(schema) {
       normalized[key] = normalizeStrictJsonSchema(value);
     }
   }
-  const properties = isRecord2(normalized.properties) ? normalized.properties : void 0;
+  const properties = isRecord3(normalized.properties) ? normalized.properties : void 0;
   const type = normalized.type;
-  const isObjectSchema = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
-  if (isObjectSchema) {
+  const isObjectSchema2 = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
+  if (isObjectSchema2) {
     if (normalized.type === void 0) {
       normalized.type = "object";
     }
@@ -31505,7 +31666,7 @@ function normalizeStrictJsonSchema(schema) {
   return normalized;
 }
 function normalizeStrictToolParameters(parameters) {
-  const base = isRecord2(parameters) ? { ...parameters } : {};
+  const base = isRecord3(parameters) ? { ...parameters } : {};
   if (base.type === void 0) base.type = "object";
   if (base.properties === void 0) base.properties = {};
   return normalizeStrictJsonSchema(base);
@@ -32415,20 +32576,20 @@ function transformChatMessages3(messages) {
   }
   return result;
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function normalizeStrictJsonSchema2(schema) {
   if (Array.isArray(schema)) {
     return schema.map((item) => normalizeStrictJsonSchema2(item));
   }
-  if (!isRecord3(schema)) {
+  if (!isRecord4(schema)) {
     return schema;
   }
   const normalized = {};
   for (const [key, value] of Object.entries(schema)) {
     if (STRICT_UNSUPPORTED_KEYWORDS2.has(key)) continue;
-    if (key === "properties" && isRecord3(value)) {
+    if (key === "properties" && isRecord4(value)) {
       const props = {};
       for (const [propName, propSchema] of Object.entries(value)) {
         props[propName] = normalizeStrictJsonSchema2(propSchema);
@@ -32440,10 +32601,10 @@ function normalizeStrictJsonSchema2(schema) {
       normalized[key] = normalizeStrictJsonSchema2(value);
     }
   }
-  const properties = isRecord3(normalized.properties) ? normalized.properties : void 0;
+  const properties = isRecord4(normalized.properties) ? normalized.properties : void 0;
   const type = normalized.type;
-  const isObjectSchema = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
-  if (isObjectSchema) {
+  const isObjectSchema2 = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
+  if (isObjectSchema2) {
     if (normalized.type === void 0) {
       normalized.type = "object";
     }
@@ -32454,7 +32615,7 @@ function normalizeStrictJsonSchema2(schema) {
   return normalized;
 }
 function normalizeStrictToolParameters2(parameters) {
-  const base = isRecord3(parameters) ? { ...parameters } : {};
+  const base = isRecord4(parameters) ? { ...parameters } : {};
   if (base.type === void 0) base.type = "object";
   if (base.properties === void 0) base.properties = {};
   return normalizeStrictJsonSchema2(base);
@@ -55032,20 +55193,20 @@ function transformChatMessages4(messages) {
   }
   return result;
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function normalizeStrictJsonSchema3(schema) {
   if (Array.isArray(schema)) {
     return schema.map((item) => normalizeStrictJsonSchema3(item));
   }
-  if (!isRecord4(schema)) {
+  if (!isRecord5(schema)) {
     return schema;
   }
   const normalized = {};
   for (const [key, value] of Object.entries(schema)) {
     if (STRICT_UNSUPPORTED_KEYWORDS3.has(key)) continue;
-    if (key === "properties" && isRecord4(value)) {
+    if (key === "properties" && isRecord5(value)) {
       const props = {};
       for (const [propName, propSchema] of Object.entries(value)) {
         props[propName] = normalizeStrictJsonSchema3(propSchema);
@@ -55057,10 +55218,10 @@ function normalizeStrictJsonSchema3(schema) {
       normalized[key] = normalizeStrictJsonSchema3(value);
     }
   }
-  const properties = isRecord4(normalized.properties) ? normalized.properties : void 0;
+  const properties = isRecord5(normalized.properties) ? normalized.properties : void 0;
   const type = normalized.type;
-  const isObjectSchema = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
-  if (isObjectSchema) {
+  const isObjectSchema2 = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
+  if (isObjectSchema2) {
     if (normalized.type === void 0) {
       normalized.type = "object";
     }
@@ -55071,7 +55232,7 @@ function normalizeStrictJsonSchema3(schema) {
   return normalized;
 }
 function normalizeStrictToolParameters3(parameters) {
-  const base = isRecord4(parameters) ? { ...parameters } : {};
+  const base = isRecord5(parameters) ? { ...parameters } : {};
   if (base.type === void 0) base.type = "object";
   if (base.properties === void 0) base.properties = {};
   return normalizeStrictJsonSchema3(base);
@@ -56169,7 +56330,7 @@ ${msg.content}` : msg.content;
   }
   return { input, instructions };
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isObjectJsonSchema(schema) {
@@ -56180,15 +56341,24 @@ function normalizeStrictFunctionSchema(value) {
   if (Array.isArray(value)) {
     return value.map((item) => normalizeStrictFunctionSchema(item));
   }
-  if (!isRecord5(value)) {
+  if (!isRecord6(value)) {
     return value;
   }
+  if (Array.isArray(value.anyOf)) {
+    const normalized2 = {
+      anyOf: value.anyOf.map((item) => normalizeStrictFunctionSchema(item))
+    };
+    for (const key of ANY_OF_ANNOTATION_KEYS) {
+      if (key in value) normalized2[key] = value[key];
+    }
+    return normalized2;
+  }
   const normalized = {};
   for (const [key, child] of Object.entries(value)) {
     normalized[key] = normalizeStrictFunctionSchema(child);
   }
   if (isObjectJsonSchema(normalized)) {
-    const properties = isRecord5(normalized.properties) ? normalized.properties : {};
+    const properties = isRecord6(normalized.properties) ? normalized.properties : {};
     normalized.properties = properties;
     normalized.required = Object.keys(properties);
     normalized.additionalProperties = false;
@@ -56196,12 +56366,12 @@ function normalizeStrictFunctionSchema(value) {
   return normalized;
 }
 function normalizeStrictFunctionParameters(inputParams) {
-  const schema = isRecord5(inputParams) ? inputParams : {
+  const schema = isRecord6(inputParams) ? inputParams : {
     type: "object",
     properties: {}
   };
   const normalized = normalizeStrictFunctionSchema(schema);
-  return isRecord5(normalized) ? normalized : { type: "object", properties: {}, required: [], additionalProperties: false };
+  return isRecord6(normalized) ? normalized : { type: "object", properties: {}, required: [], additionalProperties: false };
 }
 function transformTool2(tool3) {
   const inputParams = tool3.function.parameters;
@@ -56262,6 +56432,24 @@ function mapFinishReason5(response) {
   }
   return "stop";
 }
+function unusableResponseError(response) {
+  if (response.status === "failed") {
+    return {
+      message: response.error?.message || "Response generation failed",
+      code: response.error?.code || "server_error"
+    };
+  }
+  if (response.status !== "incomplete") return null;
+  const output = Array.isArray(response.output) ? response.output : [];
+  const hasToolCalls = output.some((item) => item.type === "function_call");
+  const text2 = extractTextContent2(output);
+  if (hasToolCalls || text2 !== null && text2.length > 0) return null;
+  const reason = response.incomplete_details?.reason ?? "unknown";
+  return {
+    message: `OpenAI returned an incomplete response with no output (reason: ${reason})` + (response.error?.message ? `: ${response.error.message}` : ""),
+    code: response.error?.code || "invalid_request"
+  };
+}
 function extractTextContent2(output) {
   const textParts = [];
   for (const item of output) {
@@ -56340,15 +56528,15 @@ function getStringValue(record24, key) {
   return typeof value === "string" ? value : void 0;
 }
 function extractOpenAIWebSearchActions(item) {
-  if (!isRecord5(item)) return void 0;
+  if (!isRecord6(item)) return void 0;
   const action = item.action;
-  if (!isRecord5(action)) return void 0;
+  if (!isRecord6(action)) return void 0;
   const type = getStringValue(action, "type") ?? "search";
   const query = getStringValue(action, "query");
   const url = getStringValue(action, "url");
   const pattern = getStringValue(action, "pattern");
   const rawSources = action.sources;
-  const sources = Array.isArray(rawSources) ? rawSources.filter(isRecord5).map((source) => ({
+  const sources = Array.isArray(rawSources) ? rawSources.filter(isRecord6).map((source) => ({
     type: getStringValue(source, "type"),
     url: getStringValue(source, "url") ?? "",
     title: getStringValue(source, "title")
@@ -56364,7 +56552,7 @@ function extractOpenAIWebSearchActions(item) {
   };
 }
 function extractOpenAIFileSearchResult(item) {
-  if (!isRecord5(item)) return void 0;
+  if (!isRecord6(item)) return void 0;
   const queries = item.queries;
   const results = item.results;
   return {
@@ -56373,11 +56561,11 @@ function extractOpenAIFileSearchResult(item) {
   };
 }
 function extractOpenAICodeInterpreterResult(item) {
-  if (!isRecord5(item)) return void 0;
+  if (!isRecord6(item)) return void 0;
   const code = getStringValue(item, "code");
   const containerId = getStringValue(item, "container_id");
   const outputs = item.outputs;
-  const logs = Array.isArray(outputs) ? outputs.filter(isRecord5).map((output) => getStringValue(output, "logs")).filter((value) => typeof value === "string").join("\n") : "";
+  const logs = Array.isArray(outputs) ? outputs.filter(isRecord6).map((output) => getStringValue(output, "logs")).filter((value) => typeof value === "string").join("\n") : "";
   return {
     ...code || containerId ? { input: { ...code ? { code } : {}, ...containerId ? { containerId } : {} } } : {},
     ...logs ? { output: logs } : {},
@@ -56397,7 +56585,7 @@ function providerToolResult(name15, id, status, result) {
 function extractProviderToolResults2(output) {
   const providerTools = [];
   for (const item of output) {
-    if (!isRecord5(item)) continue;
+    if (!isRecord6(item)) continue;
     const type = getStringValue(item, "type");
     const id = getStringValue(item, "id");
     if (!type || !id) continue;
@@ -56463,6 +56651,12 @@ function transformUsage5(usage, modelId) {
   return transformed;
 }
 function transformResponse2(response) {
+  const unusable = unusableResponseError(response);
+  if (unusable) {
+    throw new ProviderError(unusable.message, toProviderErrorCode(unusable.code), void 0, void 0, {
+      cause: response
+    });
+  }
   const content = extractTextContent2(response.output);
   const { reasoning, reasoningDetails } = extractReasoningContent2(response.output);
   const toolCalls = extractToolCalls4(response.output);
@@ -56585,11 +56779,12 @@ function createStreamState2() {
     hasContent: false,
     hasReasoning: false,
     currentItemId: null,
-    imageIndex: 0
+    imageIndex: 0,
+    terminal: false
   };
 }
 function isCurrentReasoningDeltaEvent(event) {
-  return isRecord5(event) && event.type === "response.reasoning.delta" && typeof event.delta === "string";
+  return isRecord6(event) && event.type === "response.reasoning.delta" && typeof event.delta === "string";
 }
 function resolveToolCallId(state, itemId) {
   return state.toolCallIdsByItemId.get(itemId) ?? itemId;
@@ -56600,13 +56795,13 @@ function getToolCallForItem(state, itemId) {
 function parseToolCallArguments2(argumentsJson) {
   try {
     const parsed = argumentsJson ? JSON.parse(argumentsJson) : {};
-    return isRecord5(parsed) ? parsed : {};
+    return isRecord6(parsed) ? parsed : {};
   } catch {
     return {};
   }
 }
 function getFunctionCallItemField(event, field) {
-  if (!isRecord5(event) || !isRecord5(event.item)) {
+  if (!isRecord6(event) || !isRecord6(event.item)) {
     return void 0;
   }
   const value = event.item[field];
@@ -56632,7 +56827,7 @@ function processStreamEvent2(event, state) {
     // Reasoning streaming
     case "response.reasoning_text.delta":
       state.hasReasoning = true;
-      if (isRecord5(event) && typeof event.delta === "string") {
+      if (isRecord6(event) && typeof event.delta === "string") {
         state.reasoningContent += event.delta;
         chunks.push({ type: "reasoning-delta", delta: event.delta });
       }
@@ -56772,6 +56967,7 @@ function processStreamEvent2(event, state) {
     }
     // Response completion
     case "response.completed": {
+      state.terminal = true;
       if (state.hasContent) {
         chunks.push({ type: "content-done" });
       }
@@ -56788,13 +56984,21 @@ function processStreamEvent2(event, state) {
       break;
     }
     case "response.failed":
-      chunks.push({
-        type: "error",
-        error: event.response.error?.message || "Response generation failed",
-        code: event.response.error?.code
-      });
+      state.terminal = true;
+      chunks.push(
+        upstreamErrorChunk(
+          event.response.error?.message || "Response generation failed",
+          event.response.error?.code
+        )
+      );
       break;
     case "response.incomplete": {
+      state.terminal = true;
+      const unusable = state.hasContent || state.toolCalls.size > 0 ? null : unusableResponseError(event.response);
+      if (unusable) {
+        chunks.push(upstreamErrorChunk(unusable.message, unusable.code));
+        break;
+      }
       if (state.hasContent) {
         chunks.push({ type: "content-done" });
       }
@@ -56810,9 +57014,51 @@ function processStreamEvent2(event, state) {
       });
       break;
     }
+    // Stream-level error event (`{ type: "error", code, message }`): the
+    // upstream aborted the response. Previously ignored, which let the stream
+    // end silently and read as an empty successful completion.
+    case "error": {
+      state.terminal = true;
+      const errorEvent = event;
+      chunks.push(upstreamErrorChunk(errorEvent.message || "OpenAI stream error", errorEvent.code));
+      break;
+    }
   }
   return chunks;
 }
+function upstreamErrorChunk(message, rawCode) {
+  const code = toProviderErrorCode(rawCode);
+  const error = rawCode && rawCode !== code ? `${message} (${rawCode})` : message;
+  return { type: "error", error, code };
+}
+function unterminatedStreamError(state) {
+  if (state.terminal) return null;
+  return {
+    type: "error",
+    error: "OpenAI stream ended without a terminal response event",
+    code: "server_error"
+  };
+}
+function toProviderErrorCode(code) {
+  switch (code) {
+    case "rate_limit":
+    case "rate_limit_exceeded":
+      return "rate_limit";
+    case "server_error":
+    case "server_is_overloaded":
+    case "internal_error":
+      return "server_error";
+    case "timeout":
+      return "timeout";
+    case "auth_error":
+    case "invalid_api_key":
+      return "auth_error";
+    case "unknown":
+      return "unknown";
+    default:
+      return "invalid_request";
+  }
+}
 function createErrorChunk2(error, code) {
   return { type: "error", error, code };
 }
@@ -56864,7 +57110,7 @@ function normalizeIcon6(icon) {
 function getOpenAIIconDataUri() {
   return normalizeIcon6(OPENAI_ICON3);
 }
-var DEFAULT_REASONING_LEVELS2, OPENAI_NATIVE_TOOLS, openai_default6, OPENAI_ICON3, OpenAIProvider, openaiProviderOptions, openai;
+var DEFAULT_REASONING_LEVELS2, OPENAI_NATIVE_TOOLS, ANY_OF_ANNOTATION_KEYS, openai_default6, OPENAI_ICON3, OpenAIProvider, openaiProviderOptions, openai;
 var init_dist7 = __esm({
   "../openai/dist/index.js"() {
     init_chunk_ESFAYEBL();
@@ -56880,6 +57126,7 @@ var init_dist7 = __esm({
       "code_interpreter",
       "file_search"
     ]);
+    ANY_OF_ANNOTATION_KEYS = ["description", "title"];
     openai_default6 = 'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none" viewBox="0 0 128 128"><g clip-path="url(%23clip0_2138_504)"><g clip-path="url(%23clip1_2138_504)"><path fill="%23000" d="M118.824 52.388a31.9 31.9 0 0 0-2.74-26.192 32.25 32.25 0 0 0-34.736-15.472A31.9 31.9 0 0 0 57.296 0C43.28-.032 30.844 8.992 26.532 22.328A31.9 31.9 0 0 0 5.208 37.796C-1.828 49.924-.224 65.212 9.176 75.612a31.9 31.9 0 0 0 2.74 26.192 32.25 32.25 0 0 0 34.736 15.472 31.88 31.88 0 0 0 24.052 10.72c14.024.036 26.464-8.996 30.776-22.344a31.9 31.9 0 0 0 21.324-15.468 32.26 32.26 0 0 0-3.976-37.804zm-48.112 67.244a23.9 23.9 0 0 1-15.356-5.552c.196-.104.536-.292.756-.428L81.6 98.932a4.14 4.14 0 0 0 2.096-3.628V59.372l10.772 6.22a.38.38 0 0 1 .208.296v29.756c-.016 13.232-10.732 23.96-23.964 23.988M19.176 97.62a23.88 23.88 0 0 1-2.86-16.072c.188.112.52.316.756.452L42.56 96.72a4.15 4.15 0 0 0 4.188 0l31.116-17.968v12.44a.4.4 0 0 1-.152.332L51.948 106.4c-11.476 6.608-26.132 2.68-32.768-8.78zm-6.708-55.636a23.9 23.9 0 0 1 12.484-10.516c0 .22-.012.608-.012.88v29.444a4.15 4.15 0 0 0 2.092 3.624L58.148 83.38 47.376 89.6a.38.38 0 0 1-.364.032L21.244 74.744c-11.452-6.632-15.38-21.284-8.78-32.756zm88.504 20.596L69.856 44.612l10.772-6.216a.38.38 0 0 1 .364-.032L106.76 53.24c11.472 6.628 15.404 21.304 8.776 32.776a23.98 23.98 0 0 1-12.48 10.512V66.204a4.14 4.14 0 0 0-2.08-3.624zm10.72-16.136c-.188-.116-.52-.316-.756-.452l-25.488-14.72a4.15 4.15 0 0 0-4.188 0L50.144 49.24V36.8a.4.4 0 0 1 .152-.332L76.06 21.604c11.476-6.62 26.148-2.68 32.764 8.8a23.98 23.98 0 0 1 2.86 16.04zM44.288 68.616l-10.776-6.22a.38.38 0 0 1-.208-.296V32.344C33.312 19.096 44.06 8.36 57.308 8.368a23.98 23.98 0 0 1 15.336 5.552c-.196.104-.532.292-.756.428L46.4 29.068a4.14 4.14 0 0 0-2.096 3.624l-.016 35.916zM50.14 56 64 47.996l13.86 8V72L64 80l-13.86-8z"/></g></g><defs><clipPath id="clip0_2138_504"><path fill="%23fff" d="M0 0h128v128H0z"/></clipPath><clipPath id="clip1_2138_504"><path fill="%23fff" d="M0 0h128v128H0z"/></clipPath></defs></svg>';
     OPENAI_ICON3 = openai_default6;
     OpenAIProvider = class _OpenAIProvider {
@@ -57343,6 +57590,8 @@ var init_dist7 = __esm({
                     yield chunk;
                   }
                 }
+                const unterminated = request.signal?.aborted ? null : unterminatedStreamError(state);
+                if (unterminated) yield unterminated;
               } catch (error) {
                 const providerError = self.toProviderError(error);
                 yield createErrorChunk2(providerError.message, providerError.code);
@@ -58735,24 +58984,24 @@ var init_claude_constants = __esm({
 });
 
 // ../../node_modules/.pnpm/@openrouter+sdk@0.3.12/node_modules/@openrouter/sdk/esm/lib/claude-type-guards.js
-function isRecord6(value) {
+function isRecord7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isNonClaudeRole(role) {
   return role === NonClaudeMessageRole.System || role === NonClaudeMessageRole.Developer || role === NonClaudeMessageRole.Tool;
 }
 function isClaudeToolResultBlock(block) {
-  if (!isRecord6(block))
+  if (!isRecord7(block))
     return false;
   return block["type"] === ClaudeContentBlockType.ToolResult;
 }
 function isClaudeImageBlockWithSource(block) {
-  if (!isRecord6(block))
+  if (!isRecord7(block))
     return false;
-  return block["type"] === ClaudeContentBlockType.Image && "source" in block && isRecord6(block["source"]);
+  return block["type"] === ClaudeContentBlockType.Image && "source" in block && isRecord7(block["source"]);
 }
 function isClaudeToolUseBlockWithId(block) {
-  if (!isRecord6(block))
+  if (!isRecord7(block))
     return false;
   return block["type"] === ClaudeContentBlockType.ToolUse && "id" in block && typeof block["id"] === "string";
 }
@@ -58772,7 +59021,7 @@ function isClaudeStyleMessages(input) {
     return false;
   }
   for (const msg of input) {
-    if (!isRecord6(msg))
+    if (!isRecord7(msg))
       continue;
     if (!("role" in msg))
       continue;
@@ -59085,7 +59334,7 @@ var init_http = __esm({
 });
 
 // ../../node_modules/.pnpm/@openrouter+sdk@0.3.12/node_modules/@openrouter/sdk/esm/lib/next-turn-params.js
-function isRecord7(value) {
+function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function buildNextTurnParamsContext(request) {
@@ -59111,7 +59360,7 @@ async function executeNextTurnParamsFunctions(toolCalls, tools, currentRequest)
     const callsForTool = toolCalls.filter((tc) => tc.name === tool3.function.name);
     for (const call of callsForTool) {
       const nextParams = tool3.function.nextTurnParams;
-      if (!isRecord7(call.arguments)) {
+      if (!isRecord8(call.arguments)) {
         const typeStr = Array.isArray(call.arguments) ? "array" : typeof call.arguments;
         throw new Error(`Tool call arguments for ${tool3.function.name} must be an object, got ${typeStr}`);
       }
@@ -69730,7 +69979,7 @@ function isOpenRouterServerTool(value) {
 function isOpenRouterProviderTool(tool3) {
   return tool3.executionMode === "provider" && tool3.executionProvider === "openrouter" && isOpenRouterServerToolName(tool3.function.name);
 }
-function isRecord8(value) {
+function isRecord9(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function readNumber(value) {
@@ -69738,9 +69987,9 @@ function readNumber(value) {
 }
 function getServerToolParameters(providerOptions, toolName) {
   const rawConfig = providerOptions?.serverTools ?? providerOptions?.server_tools;
-  if (!isRecord8(rawConfig)) return void 0;
+  if (!isRecord9(rawConfig)) return void 0;
   const rawParameters = rawConfig[toolName];
-  if (!isRecord8(rawParameters) || Object.keys(rawParameters).length === 0) {
+  if (!isRecord9(rawParameters) || Object.keys(rawParameters).length === 0) {
     return void 0;
   }
   return rawParameters;
@@ -69767,9 +70016,9 @@ function serverToolNameFromUsageKey(key) {
   return isOpenRouterServerToolName(name15) ? name15 : void 0;
 }
 function extractServerToolUse(usage) {
-  if (!isRecord8(usage)) return void 0;
+  if (!isRecord9(usage)) return void 0;
   const raw = usage.server_tool_use ?? usage.serverToolUse;
-  return isRecord8(raw) ? raw : void 0;
+  return isRecord9(raw) ? raw : void 0;
 }
 function providerToolResultsFromServerToolUse(usage) {
   const serverToolUse = extractServerToolUse(usage);
@@ -69800,9 +70049,9 @@ function extractWebSearchCitations(value) {
   if (!Array.isArray(value)) return [];
   const citations = [];
   for (const annotation of value) {
-    if (!isRecord8(annotation)) continue;
+    if (!isRecord9(annotation)) continue;
     const rawCitation = annotation.url_citation ?? annotation.urlCitation;
-    if (!isRecord8(rawCitation)) continue;
+    if (!isRecord9(rawCitation)) continue;
     const url = rawCitation.url;
     if (typeof url !== "string" || url.length === 0) continue;
     citations.push({
@@ -70063,8 +70312,8 @@ function normalizeStrictJsonSchema4(schema) {
   }
   const properties = isRecord22(normalized.properties) ? normalized.properties : void 0;
   const type = normalized.type;
-  const isObjectSchema = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
-  if (isObjectSchema) {
+  const isObjectSchema2 = type === "object" || Array.isArray(type) && type.includes("object") || !!properties;
+  if (isObjectSchema2) {
     if (normalized.type === void 0) {
       normalized.type = "object";
     }
@@ -80197,7 +80446,7 @@ var config_get_default = defineController2(async ({ config, env: env2, req }) =>
 });
 
 // src/version.ts
-var BUILDER_VERSION = "0.41.22".length > 0 ? "0.41.22" : "dev";
+var BUILDER_VERSION = "0.41.26".length > 0 ? "0.41.26" : "dev";
 
 // src/api/diagnostics.get.ts
 init_LLMRequest();
@@ -85313,6 +85562,7 @@ var continue_post_default = defineController2(async ({ req, params, env: env2 })
 function emptyCostSummary() {
   return {
     totalCost: 0,
+    appCost: 0,
     inputCost: 0,
     cachedCost: 0,
     outputCost: 0,
@@ -85347,6 +85597,7 @@ function mergeByModel(summaries) {
 }
 function sumSummaries(summaries) {
   let totalCost = 0;
+  let appCost = 0;
   let inputCost = 0;
   let cachedCost = 0;
   let outputCost = 0;
@@ -85355,6 +85606,7 @@ function sumSummaries(summaries) {
   let messageCount = 0;
   for (const summary of summaries) {
     totalCost += summary.totalCost;
+    appCost += summary.appCost ?? 0;
     inputCost += summary.inputCost ?? 0;
     cachedCost += summary.cachedCost ?? 0;
     outputCost += summary.outputCost ?? 0;
@@ -85362,7 +85614,7 @@ function sumSummaries(summaries) {
     requestCount += summary.requestCount;
     messageCount += summary.messageCount;
   }
-  return { totalCost, inputCost, cachedCost, outputCost, routerFeeCost, requestCount, messageCount };
+  return { totalCost, appCost, inputCost, cachedCost, outputCost, routerFeeCost, requestCount, messageCount };
 }
 function buildModelBreakdown(byModel) {
   return Object.entries(byModel).map(([modelName, acc]) => ({
@@ -85376,6 +85628,28 @@ function buildModelBreakdown(byModel) {
     avgCostPerRequest: acc.count > 0 ? acc.totalCost / acc.count : 0
   })).sort((a, b) => b.totalCost - a.totalCost);
 }
+function threadCostRow(thread, summary, isRoot) {
+  return {
+    threadId: thread.id,
+    agentName: thread.agent_name ?? null,
+    threadName: threadNameFromTags(thread.tags),
+    parent: isRoot ? null : thread.parent,
+    isRoot,
+    totalCost: summary?.totalCost ?? 0,
+    appCost: summary?.appCost ?? 0,
+    inputCost: summary?.inputCost ?? 0,
+    cachedCost: summary?.cachedCost ?? 0,
+    outputCost: summary?.outputCost ?? 0,
+    routerFeeCost: summary?.routerFeeCost ?? 0,
+    requestCount: summary?.requestCount ?? 0
+  };
+}
+function buildThreadCostRows(root, rootSummary, descendants, descendantSummaries) {
+  return [
+    threadCostRow(root, rootSummary, true),
+    ...descendants.map((child, index) => threadCostRow(child, descendantSummaries[index], false)).filter((row) => row.requestCount > 0 || row.totalCost > 0)
+  ];
+}
 function threadNameFromTags(tags) {
   for (const tag of tags ?? []) {
     if (typeof tag === "string" && tag.startsWith("name:")) {
@@ -85438,36 +85712,15 @@ var cost_get_default = defineController2(async ({ req, params, env: env2 }) => {
         messageCount: entry.requestCount
       };
     }
-    const threads = [
-      {
-        threadId,
-        agentName: thread.agent_name ?? null,
-        threadName: threadNameFromTags(thread.tags),
-        parent: null,
-        isRoot: true,
-        totalCost: ownSummary.totalCost,
-        inputCost: ownSummary.inputCost ?? 0,
-        cachedCost: ownSummary.cachedCost ?? 0,
-        outputCost: ownSummary.outputCost ?? 0,
-        routerFeeCost: ownSummary.routerFeeCost ?? 0,
-        requestCount: ownSummary.requestCount
-      },
-      ...descendants.map((child, index) => ({
-        threadId: child.id,
-        agentName: child.agent_name ?? null,
-        threadName: threadNameFromTags(child.tags),
-        parent: child.parent,
-        isRoot: false,
-        totalCost: descendantSummaries[index]?.totalCost ?? 0,
-        inputCost: descendantSummaries[index]?.inputCost ?? 0,
-        cachedCost: descendantSummaries[index]?.cachedCost ?? 0,
-        outputCost: descendantSummaries[index]?.outputCost ?? 0,
-        routerFeeCost: descendantSummaries[index]?.routerFeeCost ?? 0,
-        requestCount: descendantSummaries[index]?.requestCount ?? 0
-      })).filter((row) => row.requestCount > 0)
-    ];
+    const threads = buildThreadCostRows(
+      { id: threadId, agent_name: thread.agent_name, parent: null, tags: thread.tags },
+      ownSummary,
+      descendants,
+      descendantSummaries
+    );
     return Response.json({
       totalCost: totals.totalCost,
+      appCost: totals.appCost,
       inputCost: totals.inputCost,
       cachedCost: totals.cachedCost,
       outputCost: totals.outputCost,