@rowan-agent/agent 0.20.0 → 0.20.2

package/dist/index.d.ts

@@ -1131,6 +1131,7 @@ interface OwnedStore {
         execution?: ExecutionToken;
         update: ToolCall$1 | ToolCallUpdate;
         external?: boolean;
+        contentIndex?: number;
     }): Promise<DurableRunEvent>;
     snapshotRun(runId: RunId): Promise<RunSnapshot>;
     history(agentId: AgentId): Promise<readonly Message[]>;
@@ -2173,6 +2174,7 @@ type ToolCallSnapshot = ToolCall$1 & Readonly<{
     resultMessageId?: MessageId;
     reason?: string;
     external?: boolean;
+    contentIndex?: number;
     createdAt?: string;
     updatedAt?: string;
 }>;
@@ -2255,6 +2257,8 @@ type ToolStateChanged = (DurableEventBase & Readonly<{
     }>;
     toolCall: ToolCall$1;
     external?: boolean;
+    /** For a provider-reported call: assistant content blocks streamed before it. */
+    contentIndex?: number;
 }>) | Readonly<{
     kind: "tool_state_changed";
     durability: "transient";
@@ -2266,6 +2270,7 @@ type ToolStateChanged = (DurableEventBase & Readonly<{
     }>;
     toolCall: ToolCall$1 | ToolCallUpdate;
     external?: boolean;
+    contentIndex?: number;
 }>;
 type DurableRunEvent = PhaseEntered | MessageCommitted | MessageRevised | RunStateChanged | Extract<ToolStateChanged, {
     durability: "durable";
@@ -2567,6 +2572,7 @@ type StoredToolCall = {
     rawOutput?: JsonValue;
     _meta?: JsonObject;
     external?: boolean;
+    contentIndex?: number;
     result?: DurableToolResult;
     resultMessageId?: MessageId;
     reason?: string;
@@ -2809,6 +2815,7 @@ declare class InMemoryStore implements DurableStore {
         execution?: ExecutionToken;
         update: ToolCall$1 | ToolCallUpdate;
         external?: boolean;
+        contentIndex?: number;
     }): DurableRunEvent;
     snapshotRun(lease: OwnerLease, runId: RunId): RunSnapshot;
     listAgents(lease: OwnerLease): readonly AgentRecord[];
@@ -3063,6 +3070,7 @@ declare class SqliteStore implements DurableStore {
         execution?: ExecutionToken;
         update: ToolCall$1 | ToolCallUpdate;
         external?: boolean;
+        contentIndex?: number;
     }): Promise<DurableRunEvent>;
     snapshotRun(lease: OwnerLease, runId: RunId): Promise<RunSnapshot>;
     history(lease: OwnerLease, agentId: AgentId): Promise<readonly Message[]>;

package/dist/index.js

@@ -1378,43 +1378,23 @@ var LoopGuard = {
 // src/loop/stream-collector.ts
 var MAX_STREAMED_OUTPUT_CHARACTERS = 1024 * 1024;
 async function invokeModel(input) {
-  const callContext = input.callContext ?? {
-    signal: input.config.signal ?? new AbortController().signal,
-    run: {
-      id: input.config.execution.runId,
-      agentId: input.config.execution.agentId,
-      scope: input.config.execution.scope ?? [],
-      cwd: input.config.execution.cwd ?? input.config.context.cwd ?? ""
-    },
-    interact: async (request) => {
-      const handler = input.config.runtime?.interact ?? input.config.interact;
-      if (!handler) {
-        throw new Error("Run interactions are not supported in this runtime.");
-      }
-      return handler(request);
-    },
+  const position = { contentIndex: 0 };
+  const callContext = {
+    ...input.callContext,
     tools: {
-      list: () => {
-        return input.config.context.tools.map((t) => ({
-          name: t.name,
-          description: t.description,
-          parameters: t.parameters,
-          ...t._meta !== void 0 ? { _meta: t._meta } : {}
-        }));
-      },
-      call: async (_name, _args, _options) => {
-        throw new Error("Tool calling is not available in standalone stream collector without callContext.");
-      },
+      ...input.callContext.tools,
       report: (update) => {
         input.config.onToolReport?.({
           runId: input.config.execution.runId,
-          update
+          update,
+          contentIndex: position.contentIndex
         });
       }
     }
   };
   const events = input.config.stream(input.request, callContext);
   const result = await collectStreamResult({
+    position,
     config: input.config,
     message: input.message,
     events,
@@ -1455,6 +1435,7 @@ async function collectStreamResult(input) {
   const toolNames = /* @__PURE__ */ new Map();
   const toolArguments = /* @__PURE__ */ new Map();
   for await (const event of input.events) {
+    if ("partial" in event) input.position.contentIndex = event.partial.contentBlocks.length;
     if (event.type === "text_delta") {
       streamedOutputCharacters += event.text.length;
     } else if (event.type === "thinking_delta") {
@@ -3780,12 +3761,6 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
             };
             const res = await executePhaseTool(phaseContext, toolCall, options2, true);
             return res.ok ? { ok: true, content: res.content } : { ok: false, error: res.error ?? "Tool execution failed", ...res.content !== void 0 ? { content: res.content } : {} };
-          },
-          report: (update) => {
-            config.onToolReport?.({
-              runId: config.execution.runId,
-              update
-            });
           }
         }
       };
@@ -8112,7 +8087,8 @@ var AgentRuntime = class _AgentRuntime {
             executionId: claim.execution.executionId,
             transition: { from: null, to: event.update.status ?? "in_progress" },
             toolCall: event.update,
-            external: true
+            external: true,
+            ...event.contentIndex === void 0 ? {} : { contentIndex: event.contentIndex }
           });
           const task = toolQueue.then(async () => {
             const active2 = this.executions.get(run.id);
@@ -8121,7 +8097,8 @@ var AgentRuntime = class _AgentRuntime {
               runId: run.id,
               execution: claim.execution,
               update: event.update,
-              external: true
+              external: true,
+              ...event.contentIndex === void 0 ? {} : { contentIndex: event.contentIndex }
             });
             executionRevision = recorded.runRevision;
           });
@@ -10716,6 +10693,7 @@ var InMemoryStore = class _InMemoryStore {
         status: toStatus,
         state: toStatus,
         external: input.external ?? false,
+        ...input.contentIndex === void 0 ? {} : { contentIndex: input.contentIndex },
         createdAt: timestamp,
         updatedAt: timestamp
       };
@@ -10741,7 +10719,8 @@ var InMemoryStore = class _InMemoryStore {
       kind: "tool_state_changed",
       transition: { from: fromStatus, to: toStatus },
       toolCall: acpToolCall,
-      ...input.external ? { external: true } : {}
+      ...input.external ? { external: true } : {},
+      ...stored.contentIndex === void 0 ? {} : { contentIndex: stored.contentIndex }
     });
     this.appendEvent(event);
     return event;
@@ -11185,7 +11164,8 @@ ${record.summary}`,
       kind: "tool_state_changed",
       transition,
       toolCall: acpToolCall,
-      ...toolCall.external ? { external: true } : {}
+      ...toolCall.external ? { external: true } : {},
+      ...toolCall.contentIndex === void 0 ? {} : { contentIndex: toolCall.contentIndex }
     });
   }
   baseEvent(run, extra) {

package/package.json

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