@rowan-agent/agent 0.14.1 → 0.14.3

package/dist/index.d.ts

@@ -545,7 +545,7 @@ type PhaseExecution = {
     }): Promise<ModelInvokeOutput>;
     reportStatus(status: PhaseStatus): Promise<void>;
     executeTool(context: AgentContext, toolCall: ToolCall): Promise<ToolResult>;
-    executeTools(context: AgentContext, toolCalls: readonly ToolCall[]): Promise<readonly ToolResult[]>;
+    executeTools(context: AgentContext, toolCalls: readonly ToolCall[], contentBlocks?: readonly ContentBlock[]): Promise<readonly ToolResult[]>;
     interaction: RunInteractionDriver;
     /** Message lifecycle manager for streaming updates from programmatic phases */
     messages: PhaseMessageManager;
@@ -1442,6 +1442,8 @@ interface OwnedStore {
         expectedRevision: number;
         requestMessageId: MessageId;
         calls: readonly ToolCallReservation[];
+        /** The model response's blocks, so the request message keeps what preceded the Tool Calls. */
+        contentBlocks?: readonly ContentBlock[];
     }): Promise<ToolBatchCommit>;
     startToolCall(input: {
         runId: RunId;
@@ -2388,12 +2390,9 @@ declare class InMemoryStore implements DurableStore {
         execution: ExecutionToken;
         expectedRevision: number;
         requestMessageId: MessageId;
-        calls: readonly Readonly<{
-            providerToolCallId: string;
-            name: string;
-            args: JsonValue;
-            toolCallId?: ToolCallId;
-        }>[];
+        calls: readonly ToolCallReservation[];
+        /** The model response's blocks, so the request message keeps what preceded the Tool Calls. */
+        contentBlocks?: readonly ContentBlock[];
     }): ToolBatchCommit;
     startToolCall(lease: OwnerLease, input: {
         runId: RunId;
@@ -2607,6 +2606,7 @@ declare class SqliteStore implements DurableStore {
             args: JsonValue;
             toolCallId?: ToolCallId;
         }>[];
+        contentBlocks?: readonly ContentBlock[];
     }): Promise<ToolBatchCommit>;
     startToolCall(lease: OwnerLease, input: {
         runId: RunId;

package/dist/index.js

@@ -2537,6 +2537,7 @@ async function executePhaseWithModel(ctx) {
       messages: ctx.messageManager.visible()
     };
     let executableToolCalls;
+    let roundContentBlocks;
     const checkpoint = ctx.execution.interaction.checkpoint();
     if (checkpoint && typeof checkpoint === "object" && checkpoint.kind === "tool_call_suspension") {
       const toolSuspension = checkpoint;
@@ -2575,11 +2576,12 @@ async function executePhaseWithModel(ctx) {
       executableToolCalls = collected.toolCalls.filter(
         (toolCall) => executableToolNames.has(toolCall.name)
       );
+      roundContentBlocks = collected.contentBlocks;
       if (executableToolCalls.length === 0) {
         return output;
       }
     }
-    const results = await ctx.execution.executeTools(roundContext, executableToolCalls);
+    const results = await ctx.execution.executeTools(roundContext, executableToolCalls, roundContentBlocks);
     for (const result of results) {
       const messageId = ctx.messageManager.start("tool", createToolResultContent(result), {
         phase: ctx.phase.name
@@ -3055,6 +3057,7 @@ async function executeToolCall(input) {
     result = await input.config.runtime.tools({
       config: input.config,
       toolCall: input.toolCall,
+      contentBlocks: input.contentBlocks,
       driver: input.driver
     });
   } else {
@@ -3082,6 +3085,7 @@ async function executeToolCalls(input) {
     const results2 = await input.config.runtime.toolsBatch({
       config: input.config,
       toolCalls: input.toolCalls,
+      contentBlocks: input.contentBlocks,
       driver: input.driver
     });
     if (results2.length !== input.toolCalls.length) throw new Error("Runtime returned an invalid Tool batch result");
@@ -3187,7 +3191,7 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
         return result;
       });
     },
-    async executeTools(phaseContext, toolCalls) {
+    async executeTools(phaseContext, toolCalls, contentBlocks) {
       return runTurn(async () => {
         const tools = phaseContext.tools.filter((tool) => tool.name !== PhaseRouteTool);
         for (const toolCall of toolCalls) {
@@ -3204,6 +3208,7 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
           },
           tools,
           toolCalls,
+          contentBlocks,
           driver: interaction
         });
         for (const result of results) {
@@ -6531,7 +6536,7 @@ var AgentRuntime = class _AgentRuntime {
         },
         onContext: assembly.setContext,
         runtime: {
-          tools: ({ toolCall, driver }) => {
+          tools: ({ toolCall, contentBlocks, driver }) => {
             const task = toolQueue.then(async () => {
               const execution = await this.executeToolBatch({
                 run,
@@ -6540,6 +6545,7 @@ var AgentRuntime = class _AgentRuntime {
                 expectedRevision: executionRevision,
                 toolConfig: executionTools,
                 toolCalls: [toolCall],
+                contentBlocks,
                 signal: controller.signal,
                 driver,
                 onRevision: (rev) => {
@@ -6552,7 +6558,7 @@ var AgentRuntime = class _AgentRuntime {
             toolQueue = task.then(() => void 0, () => void 0);
             return task;
           },
-          toolsBatch: ({ toolCalls, driver }) => {
+          toolsBatch: ({ toolCalls, contentBlocks, driver }) => {
             const task = toolQueue.then(async () => {
               const execution = await this.executeToolBatch({
                 run,
@@ -6561,6 +6567,7 @@ var AgentRuntime = class _AgentRuntime {
                 expectedRevision: executionRevision,
                 toolConfig: executionTools,
                 toolCalls,
+                contentBlocks,
                 signal: controller.signal,
                 driver,
                 onRevision: (rev) => {
@@ -6617,7 +6624,7 @@ var AgentRuntime = class _AgentRuntime {
         const isToolCallInteraction = result.interactions?.some((i) => i.toolCallId !== void 0);
         const output = isToolCallInteraction ? void 0 : latestAssistant(
           run,
-          result.messages.slice(modelMessages.length),
+          result.messages,
           modelMessages.length
         );
         const prompt = isToolCallInteraction ? void 0 : output ?? (result.interactions[0]?.prompt ? promptMessage(run, result.interactions[0].prompt, result.messages.length) : void 0);
@@ -6636,7 +6643,7 @@ var AgentRuntime = class _AgentRuntime {
         return;
       }
       if (result.type === "completed") {
-        const output = latestAssistant(run, result.messages.slice(modelMessages.length), modelMessages.length);
+        const output = latestAssistant(run, result.messages, modelMessages.length);
         if (controlKind === "compact" || isCompactionOutcome(result.outcome.payload)) {
           const summary = compactSummary(result.outcome.payload);
           const instructions = compactInstructions2(run) ?? compactOutputInstructions(result.outcome.payload);
@@ -6676,7 +6683,12 @@ var AgentRuntime = class _AgentRuntime {
           execution: claim.execution,
           expectedRevision: executionRevision,
           failure: { code: "execution_failed", message: error instanceof Error ? error.message : "Execution failed." }
-        }).catch(() => void 0);
+        }).catch(async (commitError) => {
+          await this.owned.cancelRun({
+            runId: run.id,
+            reason: commitError instanceof Error ? commitError.message : "Run failure could not be committed."
+          }).catch(() => void 0);
+        });
         return;
       }
       throw error;
@@ -6756,6 +6768,7 @@ var AgentRuntime = class _AgentRuntime {
           execution: input.execution,
           expectedRevision: revision,
           requestMessageId: createId("msg"),
+          contentBlocks: input.contentBlocks,
           calls: input.toolCalls.map((tc, i) => ({
             toolCallId: toolCallIds[i],
             providerToolCallId: tc.id,
@@ -6930,6 +6943,7 @@ var AgentRuntime = class _AgentRuntime {
           execution: input.execution,
           expectedRevision: revision,
           requestMessageId: createId("msg"),
+          contentBlocks: input.contentBlocks,
           calls: [{
             toolCallId,
             providerToolCallId,
@@ -7012,6 +7026,7 @@ var AgentRuntime = class _AgentRuntime {
                 execution: input.execution,
                 expectedRevision: revision,
                 requestMessageId: createId("msg"),
+                contentBlocks: input.contentBlocks,
                 calls: [{ toolCallId, providerToolCallId, name: toolCall.name, args: toJsonValue(toolCall.args) }]
               });
               setRevision(reserved2.run.revision);
@@ -7025,6 +7040,7 @@ var AgentRuntime = class _AgentRuntime {
                 execution: input.execution,
                 expectedRevision: revision,
                 requestMessageId: createId("msg"),
+                contentBlocks: input.contentBlocks,
                 calls: [{ toolCallId, providerToolCallId, name: toolCall.name, args: toJsonValue(toolCall.args) }]
               });
               setRevision(reserved2.run.revision);
@@ -7053,6 +7069,7 @@ var AgentRuntime = class _AgentRuntime {
             execution: input.execution,
             expectedRevision: revision,
             requestMessageId: createId("msg"),
+            contentBlocks: input.contentBlocks,
             calls: [{ toolCallId, providerToolCallId, name: toolCall.name, args: toJsonValue(toolCall.args) }]
           });
           setRevision(reserved2.run.revision);
@@ -7075,6 +7092,7 @@ var AgentRuntime = class _AgentRuntime {
           execution: input.execution,
           expectedRevision: revision,
           requestMessageId: createId("msg"),
+          contentBlocks: input.contentBlocks,
           calls: [{ toolCallId, providerToolCallId, name: toolCall.name, args: toJsonValue(toolCall.args) }]
         });
         setRevision(committed.run.revision);
@@ -7326,10 +7344,10 @@ var DurableRun = class {
 function promptMessage(run, prompt, sequence) {
   return { id: createId("msg"), agentId: run.agentId, runId: run.id, role: "assistant", content: prompt, sequenceWithinRun: sequence, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
-function latestAssistant(run, messages, sequence, interrupted = false) {
-  const message = [...messages].reverse().find((candidate) => candidate.role === "assistant");
+function latestAssistant(run, messages, historyLength, interrupted = false) {
+  const message = [...messages.slice(historyLength)].reverse().find((candidate) => candidate.role === "assistant");
   if (!message) return void 0;
-  return projectAssistantMessage(message, run.agentId, run.id, sequence, { interrupted });
+  return projectAssistantMessage(message, run.agentId, run.id, historyLength, { interrupted });
 }
 function hasVisibleAssistantText(message) {
   return typeof message.content === "string" ? message.content.length > 0 : message.content.some((part) => part.type === "text" && part.text.length > 0);
@@ -7873,7 +7891,10 @@ var InMemoryStore = class _InMemoryStore {
         this.commitInteractionRecord(waitingRun, interaction, "replied", void 0, replyText);
       }
       delete waitingRun.openInteractions;
-      delete waitingRun.interactionAnswers;
+      waitingRun.interactionAnswers = {
+        ...waitingRun.interactionAnswers ?? {},
+        ...Object.fromEntries(openInteractions.map(({ id }) => [id, { status: "replied", reply: replyText }]))
+      };
       if (waitingRun.checkpoint?.data && typeof waitingRun.checkpoint.data === "object") {
         const stored = waitingRun.checkpoint.data.runInteractions ?? waitingRun.checkpoint.data.phaseInteractions;
         if (stored?.requests && Array.isArray(stored.requests)) {
@@ -8145,7 +8166,8 @@ var InMemoryStore = class _InMemoryStore {
       input.expectedRevision,
       input.execution.executionId,
       input.requestMessageId,
-      input.calls
+      input.calls,
+      input.contentBlocks ?? null
     ]);
     const replay = this.replayOperation(operationKey, operationPayload);
     if (replay) return clone(replay);
@@ -8174,13 +8196,7 @@ var InMemoryStore = class _InMemoryStore {
       agentId: run.agentId,
       runId: run.id,
       role: "assistant",
-      content: toolCalls.map((toolCall) => ({
-        type: "tool_use",
-        toolCallId: toolCall.id,
-        providerToolCallId: toolCall.providerToolCallId,
-        name: toolCall.name,
-        input: clone(toolCall.args)
-      })),
+      content: requestMessageContent(toolCalls, input.contentBlocks),
       sequenceWithinRun: this.nextMessageSequence(run.id),
       createdAt: timestamp
     };
@@ -8344,6 +8360,8 @@ var InMemoryStore = class _InMemoryStore {
     const run = this.requireRun(input.runId);
     if (input.expectedRevision !== void 0) this.assertRevision(run, input.expectedRevision);
     if (input.output !== void 0) {
+      const existing = this.messages.get(input.output.id);
+      if (existing && existing.runId !== run.id) throw new TypeError("cancelled output message id belongs to another Run");
       if (!isAssistantMessage(input.output) || input.output.agentId !== run.agentId || input.output.runId !== run.id || input.output.interrupted !== true) {
         throw new TypeError("cancelled output must be an interrupted AssistantMessage from this Run");
       }
@@ -9004,6 +9022,32 @@ function digestToolEffects(toolCalls) {
 function assertToolValue(value, argument) {
   assertUtf8ByteLimit(canonicalJson(value), TOOL_VALUE_JSON_BYTES, argument);
 }
+function requestMessageContent(toolCalls, contentBlocks) {
+  const toolUse = (toolCall) => ({
+    type: "tool_use",
+    toolCallId: toolCall.id,
+    providerToolCallId: toolCall.providerToolCallId,
+    name: toolCall.name,
+    input: clone(toolCall.args)
+  });
+  if (!contentBlocks) return toolCalls.map(toolUse);
+  const reserved = new Map(toolCalls.map((toolCall) => [toolCall.providerToolCallId, toolCall]));
+  const parts = [];
+  for (const block of contentBlocks) {
+    if (block.type === "text") {
+      parts.push({ type: "text", text: block.text });
+    } else if (block.type === "thinking") {
+      parts.push({ type: "thinking", thinking: block.thinking, ...block.signature ? { signature: block.signature } : {} });
+    } else {
+      const toolCall = reserved.get(block.id);
+      if (!toolCall) continue;
+      reserved.delete(block.id);
+      parts.push(toolUse(toolCall));
+    }
+  }
+  for (const toolCall of reserved.values()) parts.push(toolUse(toolCall));
+  return parts;
+}
 
 // src/runtime/sqlite-durable-store.ts
 import { Database } from "bun:sqlite";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.14.1",
+  "version": "0.14.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "build": "tsup && bun scripts/check-public-interface.ts"
   },
   "dependencies": {
-    "@rowan-agent/models": "0.7.0",
+    "@rowan-agent/models": "0.7.1",
     "jiti": "2.7.0",
     "typebox": "^1.0.0",
     "yaml": "^2.7.0"