@rowan-agent/agent 0.16.1 → 0.17.0

package/dist/index.d.ts

@@ -946,6 +946,8 @@ type ToolCallContext = Readonly<{
     agentMetadata?: Metadata;
     runMetadata?: Metadata;
     toolCallId: ToolCallId;
+    /** The model's id for this call, matching `tool_call_delta` events; absent when a host runs the tool itself. */
+    providerToolCallId?: string;
     scope?: ScopeRef;
     turn?: JsonObject;
     reportProgress(progress: JsonValue): void;
@@ -1365,6 +1367,8 @@ type AgentRuntimeOptions = Readonly<{
     concurrency?: number;
     bootstrap?: (registry: RuntimeBootstrapRegistry) => void | Promise<void>;
     host?: ExtensionHost;
+    /** @internal Private / testing parameter to override retry delay */
+    retryDelayMs?: number;
 }>;
 type DurableConsumer = Readonly<{
     caughtUp: Promise<void>;
@@ -1683,9 +1687,14 @@ type Outcome = Readonly<{
     toolResults?: readonly DurableToolResult[];
 }>;
 type RunState = "queued" | "running" | "input_required" | "completed" | "failed" | "cancelled";
+type WithdrawnUserInput = Readonly<{
+    messageId: MessageId;
+    content: UserContent;
+}>;
 type RunFailure = Readonly<{
     code: "configuration_unavailable";
     message: string;
+    withdrawnInput?: WithdrawnUserInput;
 }> | Readonly<{
     code: "checkpoint_incompatible";
     message: string;
@@ -1697,18 +1706,22 @@ type RunFailure = Readonly<{
         codec: string;
         version: number;
     }>;
+    withdrawnInput?: WithdrawnUserInput;
 }> | Readonly<{
     code: "runtime_interrupted";
     message: string;
     ownerEpoch: number;
+    withdrawnInput?: WithdrawnUserInput;
 }> | Readonly<{
     code: "tool_indeterminate";
     message: string;
     toolCallIds: readonly [ToolCallId, ...ToolCallId[]];
+    withdrawnInput?: WithdrawnUserInput;
 }> | Readonly<{
     code: "execution_failed";
     message: string;
     details?: JsonValue;
+    withdrawnInput?: WithdrawnUserInput;
 }>;
 type QueuedRunFailure = Extract<RunFailure, {
     code: "configuration_unavailable" | "checkpoint_incompatible";
@@ -1811,11 +1824,13 @@ type RunStateChanged = DurableEventBase & (Readonly<{
     from: "queued";
     to: "failed";
     failure: QueuedRunFailure;
+    withdrawnInput?: WithdrawnUserInput;
 }> | Readonly<{
     kind: "run_state_changed";
     from: "running";
     to: "failed";
     failure: RunningRunFailure;
+    withdrawnInput?: WithdrawnUserInput;
 }> | Readonly<{
     kind: "run_state_changed";
     from: "queued" | "running" | "input_required";
@@ -1915,6 +1930,17 @@ type ThinkingDelta = Readonly<{
     offset: number;
     text: string;
 }>;
+type ToolCallDelta = Readonly<{
+    kind: "tool_call_delta";
+    durability: "transient";
+    runId: RunId;
+    executionId: ExecutionId;
+    messageId: MessageId;
+    providerToolCallId: string;
+    toolName: string;
+    arguments: string;
+    args: JsonValue | undefined;
+}>;
 type ToolProgress = Readonly<{
     kind: "tool_progress";
     durability: "transient";
@@ -1931,7 +1957,17 @@ type PhaseStatusEvent = Readonly<{
     phaseId: string;
     status: PhaseStatus;
 }>;
-type RunEvent = DurableRunEvent | MessageDelta | ThinkingDelta | ToolProgress | PhaseStatusEvent;
+type ModelRetry = Readonly<{
+    kind: "model_retry";
+    durability: "transient";
+    runId: RunId;
+    executionId: ExecutionId;
+    attempt: number;
+    maxRetries: number;
+    delayMs: number;
+    error: string;
+}>;
+type RunEvent = DurableRunEvent | MessageDelta | ThinkingDelta | ToolCallDelta | ToolProgress | PhaseStatusEvent | ModelRetry;
 
 type PhaseStatusState = "running" | "completed";
 /** Normalized status event exposed to Runtime consumers. */
@@ -2306,6 +2342,7 @@ declare class AgentRuntime implements AgentRuntime$1 {
     private heartbeat?;
     private pumping;
     private closed;
+    private readonly retryDelayMs?;
     private constructor();
     static init(options: AgentRuntimeOptions): Promise<AgentRuntime>;
     private handleRunEnd;
@@ -2701,6 +2738,7 @@ declare class InMemoryStore implements DurableStore {
     private nextReady;
     private nextMessageSequence;
     private messagesForRun;
+    private withdrawUserInputIfNoOutput;
     history(lease: OwnerLease, agentId: AgentId): readonly Message[];
     contextStatus(lease: OwnerLease, agentId: AgentId, contextWindow: number): ContextStatus;
     contextMessages(lease: OwnerLease, agentId: AgentId, recentTokenBudget?: number): readonly Message[];
@@ -3138,4 +3176,4 @@ declare function parseFrontmatter<T = Record<string, unknown>>(raw: string): Fro
 
 declare function createCoreTools(input?: CoreToolContext): Tool$1[];
 
-export { type AfterToolCall, type AgentConfiguration, type AgentDefinition, type AgentId, type AgentListCursor, type AgentRecord, type AgentRun, AgentRuntime, type AgentRuntimeOptions, type AgentSummary, type AnyRuntimeError, type AssistantContent, type AssistantMessage, type BeforeToolCall, COMPACT_PHASE_ID, type ConfigProvider, type ConfigPutResult, type ConfigResolution, type ConfigToken, type ConfigurationSnapshot, type ContextCandidate, type ContextCompactionRecord, type ContextStatus, type CoreToolContext, DEFAULT_PHASE_ID, type DefinitionLayer, type DurableConsumer, type DurableRunEvent, type DurableStore, type DurableToolResult, type EntryPhaseSpec, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionCapability, type ExtensionCapabilityContribution, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, type ExtensionHost, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type ExtensionStateStore, type ExtensionToolContribution, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, InMemoryConfigProvider, InMemoryExtensionHost, InMemoryStore, type InteractionRecord, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LoadExtensionsResult, type LoadInput, type LoadResult, type LoadedExtension, type Message, type MessageBase, type MessageCommitted, type MessageContent, type MessageDelta, type MessageId, type MessageRevised, type MessageRevisionResult, type Metadata, type OpaqueId, type Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, type PhaseSettingsBadge, type PhaseSettingsContext, type PhaseSettingsControl, type PhaseSettingsDefinition, type PhaseSettingsItem, type PhaseSettingsOption, type PhaseSettingsProvider, type PhaseSettingsSection, type PhaseState, type PhaseStatus, type PhaseStatusState, type ResolvedResourceView, type ResourceDiagnostic, type ResourceKind, type ResourceRef, ResourceRegistry, ResourceRegistryError, type ResourceRegistryErrorCode, type ResourceSourceId, type ResourceView, type RetentionResult, type RunBoundary, type RunClaim, type RunEndEvent, type RunEvent, type RunFailure, type RunId, type RunInteraction, RunInteractionBoundary, RunInteractionCancelledError, type RunInteractionDriver, type RunInteractionKind, type RunInteractionRequest, type RunInteractionState, type RunInteractionStatus, type RunListCursor, type RunRecord, type RunSnapshot, type RunStartEvent, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type ScopeRef, type Skill, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool$1 as Tool, type ToolCallContext, type ToolCallId, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolProgress, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhaseSettings, loadPhases, loadSkill, loadSkills, parseAgentDefinition, parseFrontmatter, resolveConfigurationSnapshot };
+export { type AfterToolCall, type AgentConfiguration, type AgentDefinition, type AgentId, type AgentListCursor, type AgentRecord, type AgentRun, AgentRuntime, type AgentRuntimeOptions, type AgentSummary, type AnyRuntimeError, type AssistantContent, type AssistantMessage, type BeforeToolCall, COMPACT_PHASE_ID, type ConfigProvider, type ConfigPutResult, type ConfigResolution, type ConfigToken, type ConfigurationSnapshot, type ContextCandidate, type ContextCompactionRecord, type ContextStatus, type CoreToolContext, DEFAULT_PHASE_ID, type DefinitionLayer, type DurableConsumer, type DurableRunEvent, type DurableStore, type DurableToolResult, type EntryPhaseSpec, type EventCursor, type EventId, type ExecutionCheckpoint, type ExecutionId, type ExecutionToken, type ExtensionAPI, type ExtensionActivationError, type ExtensionActivationResult, type ExtensionCapability, type ExtensionCapabilityContribution, type ExtensionContribution, type ExtensionDisposer, type ExtensionFactory, type ExtensionFactoryResult, type ExtensionHost, ExtensionLifetimeError, type ExtensionLifetimeErrorCode, type ExtensionLoadInput, type ExtensionStateStore, type ExtensionToolContribution, type FrontmatterResult, type HistorySeed, type HookEvent, type HookEventType, type HookHandler, InMemoryConfigProvider, InMemoryExtensionHost, InMemoryStore, type InteractionRecord, type InvocationCatalogEntry, type InvocationSource, type JsonObject, type JsonPrimitive, type JsonValue, type LoadExtensionsResult, type LoadInput, type LoadResult, type LoadedExtension, type Message, type MessageBase, type MessageCommitted, type MessageContent, type MessageDelta, type MessageId, type MessageRevised, type MessageRevisionResult, type Metadata, type ModelRetry, type OpaqueId, type Outcome, type OwnerLease, type OwnerToken, type Page, type Phase, type PhaseContext, type PhaseContribution, type PhaseExecution, type PhaseExecutionIdentity, type PhaseInput, type PhaseInvocation, type PhaseMessageManager, type PhaseOutput, type PhaseRegistry, type PhaseRegistrySelection, type PhaseSettingsBadge, type PhaseSettingsContext, type PhaseSettingsControl, type PhaseSettingsDefinition, type PhaseSettingsItem, type PhaseSettingsOption, type PhaseSettingsProvider, type PhaseSettingsSection, type PhaseState, type PhaseStatus, type PhaseStatusState, type ResolvedResourceView, type ResourceDiagnostic, type ResourceKind, type ResourceRef, ResourceRegistry, ResourceRegistryError, type ResourceRegistryErrorCode, type ResourceSourceId, type ResourceView, type RetentionResult, type RunBoundary, type RunClaim, type RunEndEvent, type RunEvent, type RunFailure, type RunId, type RunInteraction, RunInteractionBoundary, RunInteractionCancelledError, type RunInteractionDriver, type RunInteractionKind, type RunInteractionRequest, type RunInteractionState, type RunInteractionStatus, type RunListCursor, type RunRecord, type RunSnapshot, type RunStartEvent, type RunState, type RunStateChanged, type RunSummary, RuntimeBootstrapRegistry, RuntimeError, type RuntimeErrorCode, type RuntimeErrorDetails, RuntimeExtensionLifetime, STOP_PHASE_ID, type ScopeRef, type Skill, SqliteStore, type TextContent, type ThinkingContent, type ThinkingDelta, type Tool$1 as Tool, type ToolCallContext, type ToolCallDelta, type ToolCallId, type ToolCallSnapshot, type ToolCallState, type ToolContribution, type ToolDefinition, type ToolExecutionResult, type ToolInvocationContext, type ToolMessage, type ToolMessageContent, type ToolProgress, type ToolResultContent, type ToolStateChanged, type ToolUseContent, type UserContent, type UserInput, type UserMessage, type WithdrawnUserInput, brandConfigToken, createCompactPhase, createCorePhases, createCoreTools, createDefaultPhase, createStopPhase, isConfigurationSnapshot, isRuntimeError, loadExtensionsFromPath as loadExtensions, loadPhase, loadPhaseSettings, loadPhases, loadSkill, loadSkills, parseAgentDefinition, parseFrontmatter, resolveConfigurationSnapshot };

package/dist/index.js

@@ -738,8 +738,8 @@ function createReadTool(context) {
 [truncated]` : formatted;
       const archivePath = await spillResult(context, "read", fullFormatted);
       content += `
-Full result: ${archivePath}
-Offset: 0`;
+
+[Full result: ${archivePath}, offset 0]`;
       if (lineTruncated) {
         content += `
 Showing lines ${requestedOffset}-${selectedLineEnd} of ${sourceLines.length}. Use offset=${selectedLineEnd + 1} to continue.`;
@@ -896,8 +896,8 @@ function createBashTool(context) {
 [truncated]` : output;
         const archivePath = await spillResult(context, "bash", output);
         content += `
-Full result: ${archivePath}
-Offset: 0`;
+
+[Full result: ${archivePath}, offset 0]`;
         return toolResult({
           context: toolContext,
           toolName: "bash",
@@ -1009,6 +1009,296 @@ function validateMaxAttempts(value) {
   return value;
 }
 
+// src/loop/partial-json.ts
+var COMPLETE_NUMBER_REGEX = /^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$/;
+function escapeRawControlChars(s) {
+  let result = "";
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    const code = ch.charCodeAt(0);
+    if (code === 10) result += "\\n";
+    else if (code === 13) result += "\\r";
+    else if (code === 9) result += "\\t";
+    else if (code < 32) result += "\\u" + code.toString(16).padStart(4, "0");
+    else result += ch;
+  }
+  return result;
+}
+function cleanOpenString(raw) {
+  let s = raw;
+  let backslashes = 0;
+  while (s.length - 1 - backslashes >= 0 && s[s.length - 1 - backslashes] === "\\") {
+    backslashes++;
+  }
+  if (backslashes % 2 === 1) {
+    s = s.slice(0, -1);
+  } else {
+    s = s.replace(/(^|[^\\])(?:\\\\)*\\u[0-9a-fA-F]{0,3}$/, (match) => {
+      const uIndex = match.lastIndexOf("\\u");
+      return match.slice(0, uIndex);
+    });
+  }
+  return escapeRawControlChars(s) + '"';
+}
+function repairPartialJson(input) {
+  const stack = [];
+  let i = 0;
+  let hasTopLevelValue = false;
+  let topLevelSafeEnd = 0;
+  function finishWithSafeEnd(safeEnd) {
+    let result = input.slice(0, safeEnd);
+    for (let j = stack.length - 1; j >= 0; j--) {
+      result += stack[j].kind === "object" ? "}" : "]";
+    }
+    return result;
+  }
+  function closeStackWithPrefix(prefix) {
+    let result = prefix;
+    for (let j = stack.length - 1; j >= 0; j--) {
+      result += stack[j].kind === "object" ? "}" : "]";
+    }
+    return result;
+  }
+  function popContainer(endIndex) {
+    stack.pop();
+    const parent = stack[stack.length - 1];
+    if (parent) {
+      parent.safeEnd = endIndex;
+      parent.state = "after_value";
+    } else {
+      hasTopLevelValue = true;
+      topLevelSafeEnd = endIndex;
+    }
+  }
+  while (i < input.length) {
+    const ch = input[i];
+    if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
+      i++;
+      continue;
+    }
+    const current = stack[stack.length - 1];
+    if (!current) {
+      if (hasTopLevelValue) break;
+      if (ch === "{") {
+        stack.push({ kind: "object", safeEnd: i + 1, state: "expect_key" });
+        i++;
+      } else if (ch === "[") {
+        stack.push({ kind: "array", safeEnd: i + 1, state: "expect_value" });
+        i++;
+      } else if (ch === '"') {
+        const strStart = i;
+        i++;
+        let closed = false;
+        while (i < input.length) {
+          if (input[i] === "\\") {
+            i += 2;
+          } else if (input[i] === '"') {
+            i++;
+            closed = true;
+            break;
+          } else {
+            i++;
+          }
+        }
+        if (closed) {
+          hasTopLevelValue = true;
+          topLevelSafeEnd = i;
+        } else {
+          return cleanOpenString(input.slice(strStart));
+        }
+      } else {
+        const tokStart = i;
+        while (i < input.length && !/[\s,}\]]/.test(input[i])) {
+          i++;
+        }
+        const tok = input.slice(tokStart, i);
+        if (tok === "true" || tok === "false" || tok === "null" || COMPLETE_NUMBER_REGEX.test(tok)) {
+          hasTopLevelValue = true;
+          topLevelSafeEnd = i;
+        } else {
+          return void 0;
+        }
+      }
+      continue;
+    }
+    if (current.kind === "object") {
+      if (current.state === "expect_key") {
+        if (ch === "}") {
+          i++;
+          popContainer(i);
+        } else if (ch === '"') {
+          i++;
+          let closed = false;
+          while (i < input.length) {
+            if (input[i] === "\\") {
+              i += 2;
+            } else if (input[i] === '"') {
+              i++;
+              closed = true;
+              break;
+            } else {
+              i++;
+            }
+          }
+          if (closed) {
+            current.state = "expect_colon";
+          } else {
+            return finishWithSafeEnd(current.safeEnd);
+          }
+        } else {
+          return finishWithSafeEnd(current.safeEnd);
+        }
+      } else if (current.state === "expect_colon") {
+        if (ch === ":") {
+          current.state = "expect_value";
+          i++;
+        } else {
+          return finishWithSafeEnd(current.safeEnd);
+        }
+      } else if (current.state === "expect_value") {
+        if (ch === '"') {
+          const valStart = i;
+          i++;
+          let closed = false;
+          while (i < input.length) {
+            if (input[i] === "\\") {
+              i += 2;
+            } else if (input[i] === '"') {
+              i++;
+              closed = true;
+              break;
+            } else {
+              i++;
+            }
+          }
+          if (closed) {
+            current.safeEnd = i;
+            current.state = "after_value";
+          } else {
+            const prefix = input.slice(0, valStart);
+            const repairedStr = cleanOpenString(input.slice(valStart));
+            return closeStackWithPrefix(prefix + repairedStr);
+          }
+        } else if (ch === "{") {
+          stack.push({ kind: "object", safeEnd: i + 1, state: "expect_key" });
+          i++;
+        } else if (ch === "[") {
+          stack.push({ kind: "array", safeEnd: i + 1, state: "expect_value" });
+          i++;
+        } else if (ch === "}" || ch === "]") {
+          return finishWithSafeEnd(current.safeEnd);
+        } else {
+          const tokStart = i;
+          while (i < input.length && !/[\s,}\]]/.test(input[i])) {
+            i++;
+          }
+          const tok = input.slice(tokStart, i);
+          if (tok === "true" || tok === "false" || tok === "null" || COMPLETE_NUMBER_REGEX.test(tok)) {
+            current.safeEnd = i;
+            current.state = "after_value";
+          } else {
+            return finishWithSafeEnd(current.safeEnd);
+          }
+        }
+      } else if (current.state === "after_value") {
+        if (ch === ",") {
+          current.state = "expect_key";
+          i++;
+        } else if (ch === "}") {
+          i++;
+          popContainer(i);
+        } else {
+          return finishWithSafeEnd(current.safeEnd);
+        }
+      }
+    } else {
+      if (current.state === "expect_value") {
+        if (ch === "]") {
+          i++;
+          popContainer(i);
+        } else if (ch === '"') {
+          const valStart = i;
+          i++;
+          let closed = false;
+          while (i < input.length) {
+            if (input[i] === "\\") {
+              i += 2;
+            } else if (input[i] === '"') {
+              i++;
+              closed = true;
+              break;
+            } else {
+              i++;
+            }
+          }
+          if (closed) {
+            current.safeEnd = i;
+            current.state = "after_value";
+          } else {
+            const prefix = input.slice(0, valStart);
+            const repairedStr = cleanOpenString(input.slice(valStart));
+            return closeStackWithPrefix(prefix + repairedStr);
+          }
+        } else if (ch === "{") {
+          stack.push({ kind: "object", safeEnd: i + 1, state: "expect_key" });
+          i++;
+        } else if (ch === "[") {
+          stack.push({ kind: "array", safeEnd: i + 1, state: "expect_value" });
+          i++;
+        } else if (ch === "}") {
+          return finishWithSafeEnd(current.safeEnd);
+        } else {
+          const tokStart = i;
+          while (i < input.length && !/[\s,}\]]/.test(input[i])) {
+            i++;
+          }
+          const tok = input.slice(tokStart, i);
+          if (tok === "true" || tok === "false" || tok === "null" || COMPLETE_NUMBER_REGEX.test(tok)) {
+            current.safeEnd = i;
+            current.state = "after_value";
+          } else {
+            return finishWithSafeEnd(current.safeEnd);
+          }
+        }
+      } else if (current.state === "after_value") {
+        if (ch === ",") {
+          current.state = "expect_value";
+          i++;
+        } else if (ch === "]") {
+          i++;
+          popContainer(i);
+        } else {
+          return finishWithSafeEnd(current.safeEnd);
+        }
+      }
+    }
+  }
+  if (stack.length > 0) {
+    const current = stack[stack.length - 1];
+    return finishWithSafeEnd(current.safeEnd);
+  }
+  if (hasTopLevelValue) {
+    return input.slice(0, topLevelSafeEnd);
+  }
+  return void 0;
+}
+function parsePartialJson(input) {
+  if (typeof input !== "string") return void 0;
+  if (!input.trim()) return void 0;
+  const source = input.trimStart();
+  try {
+    return JSON.parse(source);
+  } catch {
+  }
+  const repaired = repairPartialJson(source);
+  if (repaired === void 0) return void 0;
+  try {
+    return JSON.parse(repaired);
+  } catch {
+    return void 0;
+  }
+}
+
 // src/loop/errors.ts
 var EmptyResponseError = class extends Error {
   code = "empty_response";
@@ -1046,7 +1336,8 @@ async function invokeModel(input) {
     events,
     metadataPhase: input.phaseId,
     output: input.output,
-    onThinkingDelta: input.onThinkingDelta
+    onThinkingDelta: input.onThinkingDelta,
+    onToolCallDelta: input.onToolCallDelta
   });
   const response = result.doneResponse ?? {
     content: result.text,
@@ -1077,6 +1368,8 @@ async function collectStreamResult(input) {
   let streamedOutputCharacters = 0;
   const toolCallsWithDeltas = /* @__PURE__ */ new Set();
   const thinkingOffsets = /* @__PURE__ */ new Map();
+  const toolNames = /* @__PURE__ */ new Map();
+  const toolArguments = /* @__PURE__ */ new Map();
   for await (const event of input.events) {
     if (event.type === "text_delta") {
       streamedOutputCharacters += event.text.length;
@@ -1127,6 +1420,26 @@ async function collectStreamResult(input) {
       }
       lastPartial = event.partial;
     }
+    if (event.type === "tool_call_start") {
+      toolNames.set(event.id, event.name);
+    }
+    if (event.type === "tool_call_delta") {
+      const accumulated = (toolArguments.get(event.id) ?? "") + event.arguments;
+      toolArguments.set(event.id, accumulated);
+      const toolName = toolNames.get(event.id) ?? event.partial.contentBlocks.find((b) => b.type === "tool_call" && b.id === event.id)?.name ?? "";
+      if (toolName && !toolNames.has(event.id)) {
+        toolNames.set(event.id, toolName);
+      }
+      if (persistAssistant && activeMessageId) {
+        input.onToolCallDelta?.({
+          messageId: activeMessageId,
+          providerToolCallId: event.id,
+          toolName,
+          arguments: accumulated,
+          args: parsePartialJson(accumulated)
+        });
+      }
+    }
     if (event.type === "thinking_delta") {
       if (persistAssistant && !activeMessageId) {
         activeMessageId = input.message.reserve("assistant", {
@@ -3069,9 +3382,8 @@ async function runPhaseLoop(config, state, registry) {
   }
   throw new Error("Phase machine exited without a stop or abort transition.");
 }
-var DEFAULT_MAX_RETRIES = 3;
-var DEFAULT_BASE_DELAY_MS = 1e3;
-var DEFAULT_MAX_DELAY_MS = 3e4;
+var DEFAULT_MAX_RETRIES = 10;
+var DEFAULT_RETRY_DELAY_MS = 5e3;
 function isRetryableError(error) {
   if (!(error instanceof Error)) return false;
   const message = error.message.toLowerCase();
@@ -3082,21 +3394,36 @@ function isRetryableError(error) {
   if (message.includes("service unavailable") || message.includes("503")) return true;
   if (message.includes("gateway timeout") || message.includes("504")) return true;
   if (message.includes("econnreset") || message.includes("econnrefused")) return true;
+  if (message.includes("socket connection was closed") || message.includes("socket hang up")) return true;
+  if (message.includes("fetch failed") || message.includes("etimedout")) return true;
+  if (message.includes("network") || message.includes("connection reset")) return true;
   if ("code" in error) {
     const code = error.code;
     if (code === "invalid_model_schema" || code === "empty_response") return true;
   }
   return false;
 }
-function getRetryDelay(attempt, baseMs, maxMs) {
-  const exponential = baseMs * Math.pow(2, attempt);
-  const jitter = exponential * (0.5 + Math.random() * 0.5);
-  return Math.min(jitter, maxMs);
+function sleepAbortable(delayMs, signal) {
+  return new Promise((resolve9) => {
+    if (signal?.aborted) {
+      resolve9();
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
+      resolve9();
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve9();
+    }, delayMs);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
 }
 async function withRetry(fn, options = {}) {
   const maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
-  const baseDelayMs = options.baseDelayMs ?? DEFAULT_BASE_DELAY_MS;
-  const maxDelayMs = options.maxDelayMs ?? DEFAULT_MAX_DELAY_MS;
+  const retryDelayMs = options.retryDelayMs ?? DEFAULT_RETRY_DELAY_MS;
   let lastError;
   for (let attempt = 0; attempt <= maxRetries; attempt++) {
     try {
@@ -3109,9 +3436,9 @@ async function withRetry(fn, options = {}) {
       if (options.signal?.aborted) {
         throw error;
       }
-      const delayMs = getRetryDelay(attempt, baseDelayMs, maxDelayMs);
-      options.onRetry?.(attempt, error, delayMs);
-      await new Promise((resolve9) => setTimeout(resolve9, delayMs));
+      const retryAttempt = attempt + 1;
+      options.onRetry?.(retryAttempt, error, retryDelayMs, maxRetries);
+      await sleepAbortable(retryDelayMs, options.signal);
       if (options.signal?.aborted) {
         throw lastError;
       }
@@ -3272,12 +3599,20 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
             request,
             phaseId: phase.name,
             output: options.output,
-            onThinkingDelta: config.onThinkingDelta
+            onThinkingDelta: config.onThinkingDelta,
+            onToolCallDelta: config.onToolCallDelta
           }),
           {
             signal: config.signal,
-            onRetry: () => {
+            retryDelayMs: config.retryDelayMs,
+            onRetry: (attempt, error, delayMs, maxRetries) => {
               state.metrics.retryCount++;
+              config.onModelRetry?.({
+                attempt,
+                maxRetries,
+                delayMs,
+                error: error instanceof Error ? error.message : String(error)
+              });
             }
           }
         )
@@ -3571,6 +3906,9 @@ async function executeOnce(input) {
     onParallelPhaseOutput: input.onParallelPhaseOutput,
     onMessageDelta: input.onMessageDelta,
     onThinkingDelta: input.onThinkingDelta,
+    onToolCallDelta: input.onToolCallDelta,
+    onModelRetry: input.onModelRetry,
+    retryDelayMs: input.retryDelayMs,
     onOutcome: input.onOutcome,
     onModelTranscript: input.onModelTranscript,
     onPhaseEntered: input.onPhaseEntered,
@@ -4567,6 +4905,7 @@ function projectTool(tool, agentId, runId) {
         agentId,
         runId,
         toolCallId: context.toolCallId,
+        providerToolCallId: context.toolCallId,
         reportProgress: () => void 0,
         interaction: context.interaction ?? inertRunInteraction(signal)
       }, signal ?? new AbortController().signal);
@@ -4709,6 +5048,11 @@ var TransientRunEventSubscription = class {
         ...previous,
         text: previous.text + event.text
       };
+    } else if (
+      // `arguments` accumulates, so the latest delta of a call replaces the one before.
+      previous?.kind === "tool_call_delta" && event.kind === "tool_call_delta" && previous.executionId === event.executionId && previous.providerToolCallId === event.providerToolCallId
+    ) {
+      this.queue[this.queue.length - 1] = event;
     } else {
       if (this.queue.length >= MAX_BUFFERED_EVENTS) this.queue.shift();
       this.queue.push(event);
@@ -4734,7 +5078,7 @@ var TransientRunEventSubscription = class {
   clearMessage(messageId) {
     for (let index = this.queue.length - 1; index >= 0; index -= 1) {
       const event = this.queue[index];
-      if ((event?.kind === "message_delta" || event?.kind === "thinking_delta") && event.messageId === messageId) this.queue.splice(index, 1);
+      if ((event?.kind === "message_delta" || event?.kind === "thinking_delta" || event?.kind === "tool_call_delta") && event.messageId === messageId) this.queue.splice(index, 1);
     }
     this.notify();
   }
@@ -6576,7 +6920,7 @@ async function spillLargeToolResult(result, archiveDir, toolName) {
   const serialized = typeof result.content === "string" ? result.content : JSON.stringify(result.content, null, 2);
   if (serialized === void 0) return result;
   const bytes = new TextEncoder().encode(serialized);
-  if (bytes.byteLength <= MAX_INLINE_TOOL_RESULT_BYTES || /\nFull result:\s+\S+/.test(serialized)) {
+  if (bytes.byteLength <= MAX_INLINE_TOOL_RESULT_BYTES || /(?:\[Full result:\s+[^\]]+\]|\nFull result:\s+\S+)/.test(serialized)) {
     return result;
   }
   const toolDir = archiveDir;
@@ -6591,8 +6935,8 @@ async function spillLargeToolResult(result, archiveDir, toolName) {
     ...result,
     content: `${preview}
 [truncated]
-Full result: ${path}
-Offset: 0`
+
+[Full result: ${path}, offset 0]`
   };
 }
 var AgentRuntime = class _AgentRuntime {
@@ -6614,6 +6958,7 @@ var AgentRuntime = class _AgentRuntime {
   heartbeat;
   pumping = false;
   closed = false;
+  retryDelayMs;
   constructor(options, owned, resources) {
     this.host = options.host;
     this.owned = owned;
@@ -6621,6 +6966,7 @@ var AgentRuntime = class _AgentRuntime {
     this.storeIncarnation = String(owned.lease.token).split(":")[0];
     this.concurrency = options.concurrency ?? DEFAULT_CONCURRENCY;
     this.resources = resources;
+    this.retryDelayMs = options.retryDelayMs;
   }
   static async init(options) {
     if (!options.store) throw new TypeError("AgentRuntime requires a DurableStore");
@@ -7101,9 +7447,9 @@ var AgentRuntime = class _AgentRuntime {
         interactionAnswers: claim.run.interactionAnswers,
         signal: controller.signal,
         beforePhase: assembly.beforePhase,
-        afterPhase: async (phaseId, output) => {
-          const extAfter = assembly.afterPhase ? await assembly.afterPhase(phaseId, output) : {};
-          const effectiveOutput = extAfter.output ?? output;
+        afterPhase: async (phaseId, output2) => {
+          const extAfter = assembly.afterPhase ? await assembly.afterPhase(phaseId, output2) : {};
+          const effectiveOutput = extAfter.output ?? output2;
           if (!extAfter.abort && (phaseId === COMPACT_PHASE_ID || isCompactionOutcome(effectiveOutput.payload))) {
             const active = this.executions.get(run.id);
             if (active?.executionId === claim.execution.executionId && !this.cancellationRequested.has(run.id) && !controller.signal.aborted) {
@@ -7155,7 +7501,7 @@ var AgentRuntime = class _AgentRuntime {
             const active = this.executions.get(run.id);
             if (this.closed || controller.signal.aborted || active?.executionId !== claim.execution.executionId) return;
             const projected = projectAssistantMessage(message, run.agentId, run.id, 0);
-            const committed = await this.owned.commitPhaseOutput({
+            const committed2 = await this.owned.commitPhaseOutput({
               runId: run.id,
               execution: claim.execution,
               expectedRevision: executionRevision,
@@ -7172,7 +7518,7 @@ var AgentRuntime = class _AgentRuntime {
                 }
               }
             });
-            executionRevision = committed.revision;
+            executionRevision = committed2.revision;
           });
           toolQueue = task.then(() => void 0, () => void 0);
           return task;
@@ -7204,6 +7550,36 @@ var AgentRuntime = class _AgentRuntime {
             text: event.text
           });
         },
+        onToolCallDelta: (event) => {
+          const active = this.executions.get(run.id);
+          if (this.closed || controller.signal.aborted || active?.executionId !== claim.execution.executionId) return;
+          this.transientEvents.publish({
+            kind: "tool_call_delta",
+            durability: "transient",
+            runId: run.id,
+            executionId: claim.execution.executionId,
+            messageId: event.messageId,
+            providerToolCallId: event.providerToolCallId,
+            toolName: event.toolName,
+            arguments: event.arguments,
+            args: event.args
+          });
+        },
+        onModelRetry: (event) => {
+          const active = this.executions.get(run.id);
+          if (this.closed || controller.signal.aborted || active?.executionId !== claim.execution.executionId) return;
+          this.transientEvents.publish({
+            kind: "model_retry",
+            durability: "transient",
+            runId: run.id,
+            executionId: claim.execution.executionId,
+            attempt: event.attempt,
+            maxRetries: event.maxRetries,
+            delayMs: event.delayMs,
+            error: event.error
+          });
+        },
+        retryDelayMs: this.retryDelayMs,
         onContext: assembly.setContext,
         runtime: {
           tools: ({ toolCall, contentBlocks, driver }) => {
@@ -7264,13 +7640,13 @@ var AgentRuntime = class _AgentRuntime {
         }
       }
       if (this.cancellationRequested.has(run.id) || controller.signal.aborted) {
-        const output = latestAssistant(run, result.messages, executionContext.messages.length, true);
+        const output2 = latestAssistant(run, result.messages, executionContext.messages.length, true);
         const reason = this.cancellationReasons.get(run.id) ?? "Agent run stopped.";
         await this.owned.cancelRun({
           runId: run.id,
           expectedRevision: executionRevision,
           reason,
-          ...output && hasVisibleAssistantText(output) ? { output } : {}
+          ...output2 && hasVisibleAssistantText(output2) ? { output: output2 } : {}
         });
         this.transientEvents.clear(run.id, claim.execution.executionId);
         await this.handleRunEnd(run.id, run.agentId, {
@@ -7289,12 +7665,12 @@ var AgentRuntime = class _AgentRuntime {
           pendingToolCallIds = result.interactions.map(({ toolCallId }) => toolCallId);
         }
         const isToolCallInteraction = result.interactions?.some((i) => i.toolCallId !== void 0);
-        const output = isToolCallInteraction ? void 0 : latestAssistant(
+        const output2 = isToolCallInteraction ? void 0 : latestAssistant(
           run,
           result.messages,
           executionContext.messages.length
         );
-        const prompt = isToolCallInteraction ? void 0 : output ?? (result.interactions[0]?.prompt ? promptMessage(run, result.interactions[0].prompt, result.messages.length) : void 0);
+        const prompt = isToolCallInteraction ? void 0 : output2 ?? (result.interactions[0]?.prompt ? promptMessage(run, result.interactions[0].prompt, result.messages.length) : void 0);
         await this.owned.commitInputRequired({
           runId: run.id,
           execution: claim.execution,
@@ -7310,20 +7686,27 @@ var AgentRuntime = class _AgentRuntime {
         return;
       }
       if (result.type === "completed") {
-        const output = latestAssistant(run, result.messages, executionContext.messages.length);
-        await this.owned.commitOutcome({ runId: run.id, execution: claim.execution, expectedRevision: executionRevision, outcome: durableOutcome(result.outcome), ...output ? { output } : {} });
+        const output2 = latestAssistant(run, result.messages, executionContext.messages.length);
+        await this.owned.commitOutcome({ runId: run.id, execution: claim.execution, expectedRevision: executionRevision, outcome: durableOutcome(result.outcome), ...output2 ? { output: output2 } : {} });
         this.transientEvents.clear(run.id, claim.execution.executionId, true);
         await this.handleRunEnd(run.id, run.agentId, result.outcome);
         return;
       }
+      const output = latestAssistant(run, result.messages, executionContext.messages.length);
       const failure = { code: "execution_failed", message: result.error instanceof Error ? result.error.message : "Execution failed." };
-      await this.owned.commitOutcome({ runId: run.id, execution: claim.execution, expectedRevision: executionRevision, failure });
+      const committed = await this.owned.commitOutcome({
+        runId: run.id,
+        execution: claim.execution,
+        expectedRevision: executionRevision,
+        failure,
+        ...output ? { output } : {}
+      });
       this.transientEvents.clear(run.id, claim.execution.executionId);
       await this.handleRunEnd(run.id, run.agentId, {
         id: createId("out"),
         status: "failed",
         message: failure.message,
-        error: failure
+        error: committed.failure ?? failure
       });
     } catch (error) {
       if (!claim && error instanceof RuntimeError && ["run_state_conflict", "runtime_ownership_lost", "run_not_found"].includes(error.code)) return;
@@ -7343,7 +7726,7 @@ var AgentRuntime = class _AgentRuntime {
           return;
         }
         const failureMessage = error instanceof Error ? error.message : "Execution failed.";
-        await this.owned.commitOutcome({
+        const committed = await this.owned.commitOutcome({
           runId: run.id,
           execution: claim.execution,
           expectedRevision: executionRevision,
@@ -7353,12 +7736,13 @@ var AgentRuntime = class _AgentRuntime {
             runId: run.id,
             reason: commitError instanceof Error ? commitError.message : "Run failure could not be committed."
           }).catch(() => void 0);
+          return void 0;
         });
         await this.handleRunEnd(run.id, run.agentId, {
           id: createId("out"),
           status: "failed",
           message: failureMessage,
-          error: { code: "execution_failed", message: failureMessage }
+          error: committed?.failure ?? { code: "execution_failed", message: failureMessage }
         });
         return;
       }
@@ -7410,6 +7794,7 @@ var AgentRuntime = class _AgentRuntime {
           ...input.agentMetadata === void 0 ? {} : { agentMetadata: input.agentMetadata },
           ...input.run.metadata === void 0 ? {} : { runMetadata: input.run.metadata },
           toolCallId,
+          providerToolCallId: toolCall.id,
           scope,
           turn,
           interaction: createRunInteractionDriver({
@@ -7499,6 +7884,7 @@ var AgentRuntime = class _AgentRuntime {
             ...input.agentMetadata === void 0 ? {} : { agentMetadata: input.agentMetadata },
             ...input.run.metadata === void 0 ? {} : { runMetadata: input.run.metadata },
             toolCallId,
+            providerToolCallId,
             scope,
             turn,
             interaction: createToolInteractionDriver(input.driver, {
@@ -7655,6 +8041,7 @@ var AgentRuntime = class _AgentRuntime {
         ...input.agentMetadata === void 0 ? {} : { agentMetadata: input.agentMetadata },
         ...input.run.metadata === void 0 ? {} : { runMetadata: input.run.metadata },
         toolCallId,
+        providerToolCallId,
         scope,
         turn,
         interaction: createToolInteractionDriver(input.driver, {
@@ -9203,7 +9590,11 @@ var InMemoryStore = class _InMemoryStore {
     }
     run.state = nextState;
     if (input.outcome) run.outcome = clone(input.outcome);
-    if (input.failure) run.failure = clone(input.failure);
+    let failure = input.failure ? clone(input.failure) : void 0;
+    if (nextState === "failed" && failure) {
+      failure = this.withdrawUserInputIfNoOutput(run, failure, output);
+      run.failure = failure;
+    }
     this.dropClaimReceipt(run.execution);
     delete run.execution;
     delete run.openInteractions;
@@ -9211,7 +9602,7 @@ var InMemoryStore = class _InMemoryStore {
     run.revision += 1;
     run.updatedAt = createTimestamp();
     this.touchRun(run);
-    this.appendTransition(run, "running", nextState, { outcome: input.outcome, failure: input.failure, output });
+    this.appendTransition(run, "running", nextState, { outcome: input.outcome, failure, output });
     this.dropRunOperationReceipts(run.id);
     const result = clone(run);
     return result;
@@ -9586,6 +9977,28 @@ var InMemoryStore = class _InMemoryStore {
   messagesForRun(runId) {
     return [...this.messages.values()].filter((message) => message.runId === runId).sort((a, b) => a.sequenceWithinRun - b.sequenceWithinRun);
   }
+  withdrawUserInputIfNoOutput(run, failure, output) {
+    const runMessages = this.messagesForRun(run.id);
+    const hasAssistantMessage = runMessages.some((m) => m.role === "assistant") || output !== void 0;
+    const hasToolMessage = runMessages.some((m) => m.role === "tool");
+    const hasToolCalls = [...this.toolCalls.values()].some((tc) => tc.runId === run.id);
+    if (hasAssistantMessage || hasToolMessage || hasToolCalls) {
+      return failure;
+    }
+    const userInputMessage = runMessages.find((m) => m.role === "user");
+    if (!userInputMessage) {
+      return failure;
+    }
+    this.messages.delete(userInputMessage.id);
+    this.recorder?.onMessageDelete(userInputMessage.id);
+    return {
+      ...failure,
+      withdrawnInput: {
+        messageId: userInputMessage.id,
+        content: clone(userInputMessage.content)
+      }
+    };
+  }
   history(lease, agentId) {
     this.assertOwner(lease);
     this.requireAgent(agentId);
@@ -9678,7 +10091,10 @@ ${record.summary}`,
       to,
       ...to === "input_required" ? { interactions: clone(options?.interactions ?? []), answers: clone(options?.answers ?? {}) } : {},
       ...to === "completed" && options?.outcome ? { outcome: options.outcome, ...options.output ? { output: options.output } : {} } : {},
-      ...to === "failed" && options?.failure ? { failure: options.failure } : {},
+      ...to === "failed" && options?.failure ? {
+        failure: options.failure,
+        ...options.failure.withdrawnInput ? { withdrawnInput: options.failure.withdrawnInput } : {}
+      } : {},
       ...to === "cancelled" && options?.reason ? { reason: options.reason } : {}
     };
     this.touchRun(run);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "license": "MIT",
   "repository": {
     "type": "git",