@cursor/bdk 0.2.20 → 0.2.22

package/dist/internal/filesystem/walk.js

@@ -6,7 +6,7 @@
  */
 import { posix } from "node:path";
 import { minimatch } from "minimatch";
-import { FILE_SYSTEM_SCAN_LIMIT, normalizeFsPath } from "../../filesystem.js";
+import { FILE_SYSTEM_SCAN_LIMIT, normalizeFsPath, } from "../../filesystem.js";
 import { mergeSorted } from "./merge.js";
 /** Filename-character ingest budget; matches LocalLsExecutor. */
 export const LS_INGEST_CHARACTER_BUDGET = 2_500;

package/dist/internal/host-otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host-otel.d.ts","sourceRoot":"","sources":["../../src/internal/host-otel.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAsB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,aAAa,CAAC;AAGnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAsBzD,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,uEAAuE;AACvE,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,CAAC;CACnD;AAsBD,8DAA8D;AAC9D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,kBAAkB,CAYvF"}
+{"version":3,"file":"host-otel.d.ts","sourceRoot":"","sources":["../../src/internal/host-otel.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAsB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,aAAa,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAsBzD,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,uEAAuE;AACvE,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,CAAC;CACnD;AAsBD,8DAA8D;AAC9D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,kBAAkB,CAYvF"}

package/dist/internal/hosted-delivery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-delivery.d.ts","sourceRoot":"","sources":["../../src/internal/hosted-delivery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hosted-delivery.d.ts","sourceRoot":"","sources":["../../src/internal/hosted-delivery.ts"],"names":[],"mappings":"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"}

package/dist/internal/hosted-delivery.js

@@ -450,6 +450,13 @@ export function registerHostedDeliveryRoute(input) {
             };
         }
     };
+    /** A retried delivery must find its admission for as long as the owner turn it started is addressable. */
+    const holdAdmission = (deliveryId, admissionToken, expiresAt) => {
+        const operation = admissions.get(deliveryId);
+        if (operation?.settledReply?.body.admissionToken === admissionToken) {
+            operation.expiresAt = expiresAt;
+        }
+    };
     const pruneExpired = () => {
         const now = Date.now();
         for (const [token, item] of pending) {
@@ -685,6 +692,7 @@ export function registerHostedDeliveryRoute(input) {
             }
             if (admitted.execution === undefined) {
                 admitted.expiresAt = Date.now() + ownerTurnPendingTtlMs;
+                holdAdmission(admitted.deliveryId, execution.admissionToken, admitted.expiresAt);
             }
             admitted.execution ??= afterHostedWork(input.flushOtel, async () => {
                 const spanAttributes = {
@@ -890,6 +898,7 @@ export function registerHostedDeliveryRoute(input) {
             }).then((reply) => {
                 admitted.settledReply = reply;
                 admitted.expiresAt = Date.now() + pendingTtlMs;
+                holdAdmission(admitted.deliveryId, execution.admissionToken, admitted.expiresAt);
                 return reply;
             }, (error) => {
                 admitted.settledReply = {
@@ -903,6 +912,7 @@ export function registerHostedDeliveryRoute(input) {
                     },
                 };
                 admitted.expiresAt = Date.now() + pendingTtlMs;
+                holdAdmission(admitted.deliveryId, execution.admissionToken, admitted.expiresAt);
                 return admitted.settledReply;
             });
             if (execution.mode === "start") {

package/dist/internal/hosted-eval-cases.js

@@ -11,7 +11,7 @@ import { discoverEvals, runEvalCase } from "./eval-runner.js";
 import { evalCaseOf } from "./http-control-plane-session.js";
 import { RunSessionTimeoutError } from "./run-client.js";
 import { buildTrajectory } from "./trajectory.js";
-/** Under the 26-minute limit the host puts on one delivery. */
+/** Under the 45-minute limit the host puts on one delivery. */
 const CASE_DEADLINE_MS = 20 * 60_000;
 /** Per tool-call input or output kept on the result; the session log keeps all of it. */
 const MAX_TOOL_IO_CHARS = 8 * 1024;

package/dist/internal/memory-dir.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Name of the shared memory directory under the agent state root.
+ *
+ * Kept free of imports so filesystem and workspace modules can reserve the
+ * name without loading the memory backends and their hosted storage graph.
+ */
+export declare const MEMORY_DIR_NAME = "memory";
+//# sourceMappingURL=memory-dir.d.ts.map

package/dist/internal/memory-dir.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory-dir.d.ts","sourceRoot":"","sources":["../../src/internal/memory-dir.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,eAAe,WAAW,CAAC"}

package/dist/internal/memory-dir.js

@@ -0,0 +1,7 @@
+/**
+ * Name of the shared memory directory under the agent state root.
+ *
+ * Kept free of imports so filesystem and workspace modules can reserve the
+ * name without loading the memory backends and their hosted storage graph.
+ */
+export const MEMORY_DIR_NAME = "memory";

package/dist/internal/otel/collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAcH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACzD,KAAK,IAAI,IAAI,CAAC;IACd;;;;;OAKG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E,0FAA0F;IAC1F,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;IAC7D,yEAAyE;IACzE,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;IACrF,mEAAmE;IACnE,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAChF;AAiBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CA2xBf"}
+{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAcH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGhE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACzD,KAAK,IAAI,IAAI,CAAC;IACd;;;;;OAKG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E,0FAA0F;IAC1F,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;IAC7D,yEAAyE;IACzE,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;IACrF,mEAAmE;IACnE,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAChF;AAkBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CAyzBf"}

package/dist/internal/otel/collector.js

@@ -9,9 +9,12 @@
 import { context, ROOT_CONTEXT, SpanKind, SpanStatusCode, trace, } from "@opentelemetry/api";
 import { SeverityNumber } from "@opentelemetry/api-logs";
 import { classifyExpectedDeliveryFailure } from "../expected-delivery-failure.js";
+import { toolCallErrorMessage } from "../tool-result.js";
 import { attrs } from "./attrs.js";
 import { computerUseRequestAttrs, computerUseResultAttrs } from "./computer-use-attrs.js";
+import { classifyToolErrorText } from "./tool-error-class.js";
 const CONTENT_MAX = 2_048;
+const SPAN_STATUS_REASON_MAX = 160;
 export function createOtelCollector(runtime, agentName, log) {
     const sessions = new Map();
     const extraBySession = new Map();
@@ -129,14 +132,22 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
             }
             case "reasoning.completed": {
-                ensureTurn(event, session, startTime)?.span.addEvent("reasoning.completed", attrs({
+                const turn = ensureTurn(event, session, startTime);
+                if (turn === undefined) {
+                    return;
+                }
+                spanFor(turn, event.data.parentCallId).addEvent("reasoning.completed", attrs({
                     "agent_sdk.duration_ms": event.data.durationMs,
                     "agent_sdk.parent_call_id": event.data.parentCallId,
                 }), startTime);
                 return;
             }
             case "message.completed": {
-                ensureTurn(event, session, startTime)?.span.addEvent("message.completed", attrs({
+                const turn = ensureTurn(event, session, startTime);
+                if (turn === undefined) {
+                    return;
+                }
+                spanFor(turn, event.data.parentCallId).addEvent("message.completed", attrs({
                     "agent_sdk.finish_reason": event.data.finishReason,
                     "agent_sdk.parent_call_id": event.data.parentCallId,
                 }), startTime);
@@ -171,18 +182,20 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
             }
             case "action.approval_resolved": {
-                ensureTurn(event, session, startTime)
-                    ?.tools.get(event.data.callId)
-                    ?.addEvent("approval_resolved", attrs({
+                const approvalTurn = ensureTurn(event, session, startTime);
+                if (event.data.decision === "deny") {
+                    approvalTurn?.pendingToolErrors.set(event.data.callId, "denied");
+                }
+                approvalTurn?.tools.get(event.data.callId)?.addEvent("approval_resolved", attrs({
                     "agent_sdk.decision": event.data.decision,
                     "agent_sdk.decision_by": event.data.by,
                 }), startTime);
                 return;
             }
             case "action.auth_requested": {
-                ensureTurn(event, session, startTime)
-                    ?.tools.get(event.data.callId)
-                    ?.addEvent("auth_requested", undefined, startTime);
+                const authTurn = ensureTurn(event, session, startTime);
+                authTurn?.pendingToolErrors.set(event.data.callId, "auth_required");
+                authTurn?.tools.get(event.data.callId)?.addEvent("auth_requested", undefined, startTime);
                 emitLog("action.auth_requested", SeverityNumber.INFO, attrs({
                     ...baseLog(event, session),
                     "cursor.tool.name": event.data.toolName,
@@ -192,9 +205,11 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
             }
             case "action.auth_resolved": {
-                ensureTurn(event, session, startTime)
-                    ?.tools.get(event.data.callId)
-                    ?.addEvent("auth_resolved", attrs({
+                const authTurn = ensureTurn(event, session, startTime);
+                if (event.data.decision === "approve") {
+                    authTurn?.pendingToolErrors.delete(event.data.callId);
+                }
+                authTurn?.tools.get(event.data.callId)?.addEvent("auth_resolved", attrs({
                     "agent_sdk.decision": event.data.decision,
                     "agent_sdk.decision_by": event.data.by,
                     "agent_sdk.mcp_connection": event.data.connection,
@@ -207,18 +222,22 @@ export function createOtelCollector(runtime, agentName, log) {
                 const status = event.data.isError ? "failure" : "success";
                 if (span !== undefined) {
                     span.setAttribute("cursor.tool.status", status);
-                    span.setAttributes(attrs(computerUseResultAttrs(event.data.toolName, event.data.output)));
+                    span.setAttributes(attrs(computerUseResultAttrs(event.data)));
                     if (logOpts?.toolContent === true && event.data.output !== undefined) {
                         span.setAttribute("agent_sdk.tool_output", truncate(json(event.data.output)));
                     }
                     if (event.data.isError) {
+                        const errorClass = turn?.pendingToolErrors.get(event.data.callId) ??
+                            classifyToolErrorText(event.data.output);
+                        span.setAttribute("agent_sdk.tool_error_class", errorClass);
                         span.setStatus({
                             code: SpanStatusCode.ERROR,
-                            message: "tool error",
+                            message: toolFailureReason(event.data.output) ?? "tool error",
                         });
                     }
                     span.end(startTime);
                     turn?.tools.delete(event.data.callId);
+                    turn?.pendingToolErrors.delete(event.data.callId);
                 }
                 metrics?.toolCalls.add(1, join(event.sessionId, {
                     "cursor.tool.name": event.data.toolName,
@@ -274,6 +293,9 @@ export function createOtelCollector(runtime, agentName, log) {
                 const turn = ensureTurn(event, session, startTime);
                 const span = turn?.subagents.get(event.data.callId);
                 if (span !== undefined) {
+                    if (event.data.isError === true) {
+                        span.setStatus({ code: SpanStatusCode.ERROR, message: "subagent error" });
+                    }
                     span.end(startTime);
                     turn?.subagents.delete(event.data.callId);
                 }
@@ -448,20 +470,19 @@ export function createOtelCollector(runtime, agentName, log) {
         const turn = {
             span,
             tools: new Map(),
+            pendingToolErrors: new Map(),
             subagents: new Map(),
             synthetic: args.synthetic,
         };
         args.state.turns.set(args.turnId, turn);
         return turn;
     }
+    // Work inside a subagent belongs to its span, everything else to the turn.
+    function spanFor(turn, parentCallId) {
+        return (parentCallId === undefined ? undefined : turn.subagents.get(parentCallId)) ?? turn.span;
+    }
     function parentCtxFor(turn, parentCallId) {
-        if (parentCallId !== undefined) {
-            const sub = turn.subagents.get(parentCallId);
-            if (sub !== undefined) {
-                return trace.setSpan(context.active(), sub);
-            }
-        }
-        return trace.setSpan(context.active(), turn.span);
+        return trace.setSpan(context.active(), spanFor(turn, parentCallId));
     }
     function openToolSpan(args) {
         const computerUseAttrs = computerUseRequestAttrs(args.call.toolName, args.call.args);
@@ -528,10 +549,20 @@ export function createOtelCollector(runtime, agentName, log) {
     }
     function endOpenChildren(turn, endTime) {
         for (const span of turn.tools.values()) {
+            span.setAttribute("cursor.tool.status", "unknown");
+            span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: "no result",
+            });
             span.end(endTime);
         }
         turn.tools.clear();
+        turn.pendingToolErrors.clear();
         for (const span of turn.subagents.values()) {
+            span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: "no result",
+            });
             span.end(endTime);
         }
         turn.subagents.clear();
@@ -661,11 +692,18 @@ function buildMetrics(meter) {
         }),
     };
 }
-function truncate(value) {
-    if (value.length <= CONTENT_MAX) {
+function truncate(value, max = CONTENT_MAX) {
+    if (value.length <= max) {
         return value;
     }
-    return `${value.slice(0, CONTENT_MAX)}…`;
+    return `${value.slice(0, max)}…`;
+}
+function toolFailureReason(output) {
+    const summary = toolCallErrorMessage(output);
+    if (summary === undefined) {
+        return undefined;
+    }
+    return truncate(summary.replace(/\s+/g, " ").trim(), SPAN_STATUS_REASON_MAX);
 }
 function json(value) {
     try {

package/dist/internal/otel/computer-use-attrs.d.ts

@@ -2,12 +2,17 @@
  * Content-free span attributes for `computerUse` tool calls.
  *
  * Computer use args hold typed text and screen coordinates, so the collector
- * exports them only under `toolContent`. These attributes keep the batch
- * shape visible without that opt-in.
+ * exports them only under `toolContent`. These attributes keep the action
+ * shape visible without that opt-in. On the cloud agent path one
+ * `computerUse` call is one action, so its tool span is the action span.
  */
 import type { AttrValue } from "./attrs.js";
 type Attrs = Record<string, AttrValue | undefined>;
 export declare function computerUseRequestAttrs(toolName: string, args: unknown): Attrs;
-export declare function computerUseResultAttrs(toolName: string, output: unknown): Attrs;
+export declare function computerUseResultAttrs(result: {
+    readonly toolName: string;
+    readonly output?: unknown;
+    readonly isError: boolean;
+}): Attrs;
 export {};
 //# sourceMappingURL=computer-use-attrs.d.ts.map

package/dist/internal/otel/computer-use-attrs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computer-use-attrs.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/computer-use-attrs.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,KAAK,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;AAEnD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK,CAa9E;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,KAAK,CAU/E"}
+{"version":3,"file":"computer-use-attrs.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/computer-use-attrs.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,KAAK,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;AAEnD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK,CAU9E;AAID,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B,GAAG,KAAK,CAWR"}

package/dist/internal/otel/computer-use-attrs.js

@@ -2,8 +2,9 @@
  * Content-free span attributes for `computerUse` tool calls.
  *
  * Computer use args hold typed text and screen coordinates, so the collector
- * exports them only under `toolContent`. These attributes keep the batch
- * shape visible without that opt-in.
+ * exports them only under `toolContent`. These attributes keep the action
+ * shape visible without that opt-in. On the cloud agent path one
+ * `computerUse` call is one action, so its tool span is the action span.
  */
 import { isRecord } from "../is-record.js";
 export function computerUseRequestAttrs(toolName, args) {
@@ -13,17 +14,17 @@ export function computerUseRequestAttrs(toolName, args) {
     // The SDK adapter emits only known action types, so `type` is a fixed
     // literal and carries no content.
     const types = args.actions.map((action) => isRecord(action) && typeof action.type === "string" ? action.type : "other");
-    return {
-        "agent_sdk.computer.action_count": types.length,
-        "agent_sdk.computer.actions": types.join(","),
-    };
+    return { "agent_sdk.computer.actions": types.join(",") };
 }
-export function computerUseResultAttrs(toolName, output) {
-    if (toolName !== "computerUse" || !isRecord(output)) {
+// An error result is rebuilt from the thrown error and reports zero
+// durations, so only a success result carries executor timing.
+export function computerUseResultAttrs(result) {
+    const { toolName, output, isError } = result;
+    if (toolName !== "computerUse" || isError || !isRecord(output)) {
         return {};
     }
     return {
-        "agent_sdk.computer.completed_action_count": typeof output.actionCount === "number" ? output.actionCount : undefined,
         "agent_sdk.computer.executor_duration_ms": typeof output.durationMs === "number" ? output.durationMs : undefined,
+        "agent_sdk.computer.settle_ms": typeof output.settleMs === "number" ? output.settleMs : undefined,
     };
 }

package/dist/internal/otel/config.d.ts

@@ -1,7 +1,7 @@
 /**
  * Merge authored `defineOtel`, `serve({ otel })`, and standard OTel env.
  */
-import type { OtelConfig, OtelDefinition, OtelExporterConfig, OtelLogOptions, OtelMetricOptions, OtelSignal, OtelTraceOptions } from "../../otel.js";
+import { type OtelConfig, type OtelDefinition, type OtelExporterConfig, type OtelLogOptions, type OtelMetricOptions, type OtelSignal, type OtelTraceOptions } from "../../otel.js";
 export interface ResolvedOtelConfig {
     enabled: boolean;
     serviceName: string;

package/dist/internal/otel/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,MAAM,EAAE,KAAK,GAAG,gBAAgB,CAAC;IACjC,OAAO,EAAE,KAAK,GAAG,iBAAiB,CAAC;IACnC,IAAI,EAAE,KAAK,GAAG,cAAc,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,cAAc,CAAA;CAAE,CAAC,GAC3E,cAAc,GAAG,SAAS,CAmB5B;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IACvC,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,kBAAkB,CAkDrB;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBhF;AAED,mEAAmE;AACnE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,kBAAkB,EAAE,EACxC,MAAM,EAAE,UAAU,GACjB,kBAAkB,EAAE,CAItB"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,UAAU,EACf,KAAK,gBAAgB,EAEtB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,MAAM,EAAE,KAAK,GAAG,gBAAgB,CAAC;IACjC,OAAO,EAAE,KAAK,GAAG,iBAAiB,CAAC;IACnC,IAAI,EAAE,KAAK,GAAG,cAAc,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,cAAc,CAAA;CAAE,CAAC,GAC3E,cAAc,GAAG,SAAS,CAmB5B;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IACvC,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,kBAAkB,CAkDrB;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBhF;AAED,mEAAmE;AACnE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,kBAAkB,EAAE,EACxC,MAAM,EAAE,UAAU,GACjB,kBAAkB,EAAE,CAItB"}

package/dist/internal/otel/config.js

@@ -1,7 +1,7 @@
 /**
  * Merge authored `defineOtel`, `serve({ otel })`, and standard OTel env.
  */
-import { resolveOtelDefinition } from "../../otel.js";
+import { resolveOtelDefinition, } from "../../otel.js";
 /**
  * Process-global authored config. OTel SDK is one per serve process — if
  * several mounts ship `agent/otel.ts`, they must be identical.

package/dist/internal/otel/runtime.d.ts

@@ -1,12 +1,8 @@
 /**
  * Process-level OTel SDK (OTLP HTTP exporters for traces / metrics / logs).
- *
- * Refuses to install a second global Tracer/Meter/Logger provider when one
- * already owns the process (CLI, extension host, etc.). Spans still use
- * `trace.getTracer()` so they nest under an existing parent when present.
  */
-import type { Histogram, Meter, Tracer } from "@opentelemetry/api";
-import type { Logger as OtelLogger } from "@opentelemetry/api-logs";
+import { type Histogram, type Meter, type Tracer } from "@opentelemetry/api";
+import { type Logger as OtelLogger } from "@opentelemetry/api-logs";
 import { type ResolvedOtelConfig } from "./config.js";
 /**
  * Hosted v2 pods may be frozen or destroyed as soon as the HTTP reply

package/dist/internal/otel/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEnE,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,yBAAyB,CAAC;AA8BpE,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAK1E;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,OAAQ,CAAC;AAErD,2EAA2E;AAC3E,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,kBAAkB,CAAC;CAC1C;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,kBAAkB,EAC1B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,OAAO,CAAC,EAAE,wBAAwB,GACjC,WAAW,GAAG,SAAS,CA8BzB;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,SAAS,GAAE,MAAoC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAef"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/runtime.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,MAAM,EAKZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,MAAM,IAAI,UAAU,EAAQ,MAAM,yBAAyB,CAAC;AAiC1E,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAK1E;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,OAAQ,CAAC;AAErD,2EAA2E;AAC3E,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,kBAAkB,CAAC;CAC1C;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,kBAAkB,EAC1B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,OAAO,CAAC,EAAE,wBAAwB,GACjC,WAAW,GAAG,SAAS,CA8BzB;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,SAAS,GAAE,MAAoC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAef"}

package/dist/internal/otel/runtime.js

@@ -1,11 +1,7 @@
 /**
  * Process-level OTel SDK (OTLP HTTP exporters for traces / metrics / logs).
- *
- * Refuses to install a second global Tracer/Meter/Logger provider when one
- * already owns the process (CLI, extension host, etc.). Spans still use
- * `trace.getTracer()` so they nest under an existing parent when present.
  */
-import { DiagLogLevel, diag, metrics, trace } from "@opentelemetry/api";
+import { DiagLogLevel, diag, metrics, trace, } from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
 import { ExportResultCode } from "@opentelemetry/core";
 import { OTLPLogExporter as OTLPLogExporterHttp } from "@opentelemetry/exporter-logs-otlp-http";
@@ -17,7 +13,7 @@ import { OTLPTraceExporter as OTLPTraceExporterProto } from "@opentelemetry/expo
 import { resourceFromAttributes } from "@opentelemetry/resources";
 import { BatchLogRecordProcessor, LoggerProvider } from "@opentelemetry/sdk-logs";
 import { AggregationTemporality, MeterProvider, PeriodicExportingMetricReader, } from "@opentelemetry/sdk-metrics";
-import { SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
+import { SimpleSpanProcessor, } from "@opentelemetry/sdk-trace-base";
 import { BatchSpanProcessor, NodeTracerProvider, ParentBasedSampler, TraceIdRatioBasedSampler, } from "@opentelemetry/sdk-trace-node";
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from "@opentelemetry/semantic-conventions";
 import { installOutboundFetchInstrumentation, } from "../../otel.js";
@@ -51,12 +47,12 @@ export function createOtelRuntime(config, log, options) {
     }
     ensureW3cPropagator();
     const sdk = startOtelSdk(config, log, options?.resolveExport);
-    const meter = config.metrics === false ? undefined : metrics.getMeterProvider().getMeter(INSTRUMENTATION);
+    const meter = config.metrics === false ? undefined : (sdk.meter ?? metrics.getMeter(INSTRUMENTATION));
     return {
         config,
-        tracer: trace.getTracer(INSTRUMENTATION),
+        tracer: sdk.tracer,
         meter,
-        logger: config.logs === false ? undefined : logs.getLogger(INSTRUMENTATION),
+        logger: config.logs === false ? undefined : (sdk.logger ?? logs.getLogger(INSTRUMENTATION)),
         httpDuration: meter === undefined
             ? undefined
             : meter.createHistogram("agent_sdk.http.duration", {
@@ -105,20 +101,18 @@ function startOtelSdk(config, logger, resolveExport) {
     const traceOpts = config.traces;
     if (traceOpts !== false) {
         const exporters = exportersForSignal(config.exporters, "traces");
-        if (hasRealTracerProvider()) {
-            logger("[bdk:otel] TracerProvider already registered; reusing global (BDK OTLP exporters not attached)");
-        }
-        else {
-            const spanProcessors = [];
-            if (exporters.length > 0) {
-                for (const exporter of exporters) {
-                    spanProcessors.push(new BatchSpanProcessor(createTraceExporter(exporter, signalUrl(exporter.url, "traces"))));
-                }
-            }
-            else {
-                memoryExporter = new BoundedMemorySpanExporter(OTEL_IN_MEMORY_SPAN_LIMIT);
-                spanProcessors.push(new SimpleSpanProcessor(memoryExporter));
+        const globalTracer = hasRealTracerProvider();
+        const spanProcessors = [];
+        if (exporters.length > 0) {
+            for (const exporter of exporters) {
+                spanProcessors.push(new BatchSpanProcessor(createTraceExporter(exporter, signalUrl(exporter.url, "traces"))));
             }
+        }
+        else if (!globalTracer) {
+            memoryExporter = new BoundedMemorySpanExporter(OTEL_IN_MEMORY_SPAN_LIMIT);
+            spanProcessors.push(new SimpleSpanProcessor(memoryExporter));
+        }
+        if (spanProcessors.length > 0) {
             tracerProvider = new NodeTracerProvider({
                 resource,
                 spanProcessors,
@@ -126,7 +120,12 @@ function startOtelSdk(config, logger, resolveExport) {
                     root: new TraceIdRatioBasedSampler(traceOpts.sampleRatio ?? 1),
                 }),
             });
-            tracerProvider.register();
+            if (globalTracer) {
+                logger("[bdk:otel] TracerProvider already registered; BDK traces export on a local provider");
+            }
+            else {
+                tracerProvider.register();
+            }
         }
     }
     const metricOpts = config.metrics;
@@ -141,12 +140,9 @@ function startOtelSdk(config, logger, resolveExport) {
                     exportIntervalMillis,
                 })),
             });
-            if (metrics.setGlobalMeterProvider(provider)) {
-                meterProvider = provider;
-            }
-            else {
-                logger("[bdk:otel] MeterProvider already registered; reusing global (BDK OTLP exporters not attached)");
-                void provider.shutdown();
+            meterProvider = provider;
+            if (!metrics.setGlobalMeterProvider(provider)) {
+                logger("[bdk:otel] MeterProvider already registered; BDK metrics export on a local provider");
             }
         }
     }
@@ -157,13 +153,10 @@ function startOtelSdk(config, logger, resolveExport) {
                 resource,
                 processors: exporters.map((exporter) => new BatchLogRecordProcessor(createLogExporter(exporter, signalUrl(exporter.url, "logs")))),
             });
+            loggerProvider = provider;
             // api-logs returns the active provider (ours on success, existing otherwise).
-            if (logs.setGlobalLoggerProvider(provider) === provider) {
-                loggerProvider = provider;
-            }
-            else {
-                logger("[bdk:otel] LoggerProvider already registered; reusing global (BDK OTLP exporters not attached)");
-                void provider.shutdown();
+            if (logs.setGlobalLoggerProvider(provider) !== provider) {
+                logger("[bdk:otel] LoggerProvider already registered; BDK logs export on a local provider");
             }
         }
     }
@@ -173,14 +166,17 @@ function startOtelSdk(config, logger, resolveExport) {
     else {
         logger(`[bdk] otel recording service=${config.serviceName} (export on flush when OTLP exporters resolve)`);
     }
-    const flushDeferred = async () => {
+    let draining;
+    const flushDeferred = () => {
+        draining ??= drainDeferred().finally(() => {
+            draining = undefined;
+        });
+        return draining;
+    };
+    const drainDeferred = async () => {
         if (memoryExporter === undefined) {
             return;
         }
-        const spans = memoryExporter.getFinishedSpans();
-        if (spans.length === 0) {
-            return;
-        }
         const exportConfig = resolveExport?.() ?? config;
         const destinations = exportersForSignal(exportConfig.exporters, "traces");
         if (destinations.length === 0) {
@@ -189,12 +185,23 @@ function startOtelSdk(config, logger, resolveExport) {
         // Spans already carry the bake-time Resource. Hosted v2 binds
         // deployment secrets after bake, so env / service extras on
         // exportConfig must replace that Resource on the wire.
-        const ok = await exportQueuedSpans(spans, destinations, logger, buildResource(exportConfig));
-        if (ok) {
-            memoryExporter.reset();
+        const resource = buildResource(exportConfig);
+        for (;;) {
+            const spans = memoryExporter.getFinishedSpans();
+            if (spans.length === 0) {
+                return;
+            }
+            const ok = await exportQueuedSpans(spans, destinations, logger, resource);
+            if (!ok) {
+                return;
+            }
+            memoryExporter.dropExported(spans);
         }
     };
     return {
+        tracer: tracerProvider?.getTracer(INSTRUMENTATION) ?? trace.getTracer(INSTRUMENTATION),
+        meter: meterProvider?.getMeter(INSTRUMENTATION),
+        logger: loggerProvider?.getLogger(INSTRUMENTATION),
         forceFlush: async () => {
             await Promise.allSettled([
                 raceOtelForceFlush(Promise.allSettled([
@@ -306,6 +313,10 @@ class BoundedMemorySpanExporter {
     getFinishedSpans() {
         return this.spans.slice();
     }
+    dropExported(exported) {
+        const exportedSet = new Set(exported);
+        this.spans = this.spans.filter((span) => !exportedSet.has(span));
+    }
     reset() {
         this.spans = [];
     }

package/dist/internal/otel/tool-error-class.d.ts

@@ -0,0 +1,4 @@
+export type ToolErrorTextClass = "not_found" | "rate_limited" | "timeout" | "unauthorized" | "tool_error";
+export type ToolErrorClass = ToolErrorTextClass | "auth_required" | "denied";
+export declare function classifyToolErrorText(output: unknown): ToolErrorTextClass;
+//# sourceMappingURL=tool-error-class.d.ts.map

package/dist/internal/otel/tool-error-class.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-error-class.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/tool-error-class.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,kBAAkB,GAC1B,WAAW,GACX,cAAc,GACd,SAAS,GACT,cAAc,GACd,YAAY,CAAC;AAEjB,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG,eAAe,GAAG,QAAQ,CAAC;AA6B7E,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,kBAAkB,CAWzE"}

package/dist/internal/otel/tool-error-class.js

@@ -0,0 +1,36 @@
+import { toolCallErrorMessage } from "../tool-result.js";
+const MAX_SCANNED_CHARS = 2_000;
+const TEXT_CLASSES = [
+    ["not_found", /\bnot found: \/|path does not exist:|\benoent\b|no such file or directory/i],
+    [
+        "rate_limited",
+        /\b(?:HTTP(?:\/[\d.]+)?|status(?: code)?|code)[\s:=]*429\b|rate limit|too many requests/i,
+    ],
+    ["timeout", /\btimed?\s*out\b|\btimeout\b|\betimedout\b/i],
+    [
+        "unauthorized",
+        /\b(?:HTTP(?:\/[\d.]+)?|status(?: code)?|code)[\s:=]*(?:401|403)\b|\bunauthorized\b|\bforbidden\b/i,
+    ],
+];
+function errorText(output) {
+    const message = toolCallErrorMessage(output);
+    if (message !== undefined || output === null || typeof output !== "object") {
+        return message;
+    }
+    const error = output.error;
+    return typeof error === "string" && error.trim() !== "" ? error : undefined;
+}
+const HOST_TOOL_PREFIX = /^Tool "[^"]*" /;
+const INPUT_ECHO_PREFIX = /^(?:Invalid input for tool "|invalid grep pattern:)/i;
+export function classifyToolErrorText(output) {
+    const text = errorText(output)?.replace(HOST_TOOL_PREFIX, "").slice(0, MAX_SCANNED_CHARS);
+    if (text === undefined || INPUT_ECHO_PREFIX.test(text)) {
+        return "tool_error";
+    }
+    for (const [errorClass, pattern] of TEXT_CLASSES) {
+        if (pattern.test(text)) {
+            return errorClass;
+        }
+    }
+    return "tool_error";
+}