@rowan-agent/agent 0.19.2 → 0.20.1

package/dist/index.js

@@ -1378,7 +1378,7 @@ var LoopGuard = {
 // src/loop/stream-collector.ts
 var MAX_STREAMED_OUTPUT_CHARACTERS = 1024 * 1024;
 async function invokeModel(input) {
-  const callContext = input.callContext ?? {
+  const baseContext = input.callContext ?? {
     signal: input.config.signal ?? new AbortController().signal,
     run: {
       id: input.config.execution.runId,
@@ -1413,8 +1413,23 @@ async function invokeModel(input) {
       }
     }
   };
+  const position = { contentIndex: 0 };
+  const callContext = {
+    ...baseContext,
+    tools: {
+      ...baseContext.tools,
+      report: (update) => {
+        input.config.onToolReport?.({
+          runId: input.config.execution.runId,
+          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 +1470,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") {
@@ -2680,6 +2696,16 @@ function serializeSkills(skills) {
 function conversationMessages(messages) {
   return messages.flatMap((message) => {
     if (message.role === "user") {
+      if (message.contexts && message.contexts.length > 0) {
+        const turnContextText = `<turn_context>
+${buildContextDescription(message.contexts)}
+</turn_context>`;
+        const contentParts = [
+          { type: "text", text: turnContextText },
+          ...typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content
+        ];
+        return [{ role: "user", content: contentParts }];
+      }
       return [{ role: "user", content: message.content }];
     }
     if (message.role === "assistant") {
@@ -2714,6 +2740,7 @@ function buildModelRequest(input, options) {
   return {
     model: options?.model ?? { provider: "", id: "" },
     ...options?.thinkingLevel === void 0 ? {} : { thinkingLevel: options.thinkingLevel },
+    ...options?.providerOptions === void 0 ? {} : { providerOptions: options.providerOptions },
     system: systemText,
     messages,
     tools: modelTools.length > 0 ? modelTools : void 0
@@ -3721,7 +3748,8 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
         appendSystemPrompt: phaseContext.appendSystemPrompt
       }, {
         model: phase.model ?? config.model,
-        ...config.thinkingLevel === void 0 ? {} : { thinkingLevel: config.thinkingLevel }
+        ...config.thinkingLevel === void 0 ? {} : { thinkingLevel: config.thinkingLevel },
+        ...config.providerOptions === void 0 ? {} : { providerOptions: config.providerOptions }
       });
       if (!request.tools) {
         if (phaseContext.tools.length > 0) {
@@ -4061,6 +4089,7 @@ async function executeOnce(input) {
     execution: input.execution,
     model: input.model,
     ...input.thinkingLevel === void 0 ? {} : { thinkingLevel: input.thinkingLevel },
+    ...input.providerOptions === void 0 ? {} : { providerOptions: input.providerOptions },
     stream: input.stream,
     maxAttempts: input.maxAttempts,
     signal: input.signal,
@@ -4224,6 +4253,9 @@ var THINKING_LEVELS = [
 function thinkingLevelFromUserInput(input) {
   return typeof input === "string" ? void 0 : input.thinkingLevel;
 }
+function providerOptionsFromUserInput(input) {
+  return typeof input === "string" ? void 0 : input.providerOptions;
+}
 var METADATA_LIMIT = 64 * 1024;
 var IDENTITY_LIMIT = 256;
 function isRecord3(value) {
@@ -4278,13 +4310,16 @@ function isAssistantContent(value) {
 }
 function normalizeUserInput(input) {
   const normalized = typeof input === "string" ? { content: input } : input;
-  if (!isRecord3(normalized) || !hasOnlyKeys(normalized, ["content", "metadata", "thinkingLevel"]) || !isUserContent(normalized.content)) {
+  if (!isRecord3(normalized) || !hasOnlyKeys(normalized, ["content", "metadata", "thinkingLevel", "providerOptions"]) || !isUserContent(normalized.content)) {
     throw new TypeError("input must contain only valid UserContent");
   }
   if (normalized.metadata !== void 0) assertMetadata(normalized.metadata, "input.metadata");
   if (normalized.thinkingLevel !== void 0 && !THINKING_LEVELS.includes(normalized.thinkingLevel)) {
     throw new TypeError("input.thinkingLevel must be a valid ThinkingLevel");
   }
+  if (normalized.providerOptions !== void 0 && (!isRecord3(normalized.providerOptions) || !isJsonValue(normalized.providerOptions))) {
+    throw new TypeError("input.providerOptions must be a JSON object");
+  }
   assertJsonValue(normalized, "input");
   return normalized;
 }
@@ -5015,7 +5050,14 @@ function durableInterruptedAssistantContent(content) {
 function projectMessage(message) {
   switch (message.role) {
     case "user":
-      return { id: message.id, role: message.role, content: projectUserContent(message.content), createdAt: message.createdAt, ...message.metadata ? { metadata: message.metadata } : {} };
+      return {
+        id: message.id,
+        role: message.role,
+        content: projectUserContent(message.content),
+        createdAt: message.createdAt,
+        ...message.metadata ? { metadata: message.metadata } : {},
+        ...message.contexts && message.contexts.length > 0 ? { contexts: message.contexts } : {}
+      };
     case "assistant":
       return { id: message.id, role: message.role, content: projectAssistantContent(message.content), createdAt: message.createdAt, ...message.metadata ? { metadata: message.metadata } : {} };
     case "tool":
@@ -5200,10 +5242,7 @@ function resolveDefinitionContext(snapshot, assembled) {
     selectNamedResources(snapshot.resources.skills, snapshot.definition.skills, "Skill"),
     snapshot.definition.bundledSkills
   );
-  const contexts = [
-    ...selectNamedResources(snapshot.contexts, snapshot.definition.contexts, "Context"),
-    ...snapshot.additionalContexts
-  ];
+  const contexts = selectNamedResources(snapshot.contexts, snapshot.definition.contexts, "Context");
   const phaseCandidates = [...snapshot.resources.phases?.phases.values() ?? []];
   const corePhases = phaseCandidates.filter((phase) => phase.core);
   const authoredPhases = phaseCandidates.filter((phase) => !phase.core);
@@ -7864,7 +7903,8 @@ var AgentRuntime = class _AgentRuntime {
         runId: run.id,
         expectedRevision: run.revision,
         executionId,
-        configToken: token
+        configToken: token,
+        ...config.additionalContexts && config.additionalContexts.length > 0 ? { additionalContexts: config.additionalContexts } : {}
       });
       executionRevision = claim.run.revision;
       const controller = new AbortController();
@@ -7937,6 +7977,7 @@ var AgentRuntime = class _AgentRuntime {
         },
         model,
         thinkingLevel: thinkingLevelFromUserInput(run.input),
+        providerOptions: providerOptionsFromUserInput(run.input),
         stream,
         maxAttempts: config.maxAttempts,
         checkpoint: claim.run.checkpoint,
@@ -8087,7 +8128,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);
@@ -8096,7 +8138,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;
           });
@@ -10093,7 +10136,8 @@ var InMemoryStore = class _InMemoryStore {
       input.runId,
       input.expectedRevision,
       input.messageId ?? null,
-      input.configToken ?? null
+      input.configToken ?? null,
+      input.additionalContexts ?? null
     ]);
     const replay = this.replayOperation(operationKey, operationPayload);
     if (replay) return clone(replay);
@@ -10113,6 +10157,7 @@ var InMemoryStore = class _InMemoryStore {
     const committedMessages = [];
     if (!run.checkpoint && !run.initialMessageId && (!isControlRun(run) || hasUserInput(run.input))) {
       const userInput = normalizeUserInput(run.input);
+      const turnContexts = input.additionalContexts ?? [];
       const message = {
         id: input.messageId ?? createId("msg"),
         agentId: run.agentId,
@@ -10120,6 +10165,7 @@ var InMemoryStore = class _InMemoryStore {
         role: "user",
         content: userInputContent(userInput),
         ...userInputMetadata(userInput) ? { metadata: clone(userInputMetadata(userInput)) } : {},
+        ...turnContexts.length > 0 ? { contexts: clone(turnContexts) } : {},
         sequenceWithinRun: this.nextMessageSequence(run.id),
         createdAt: createTimestamp()
       };
@@ -10688,6 +10734,7 @@ var InMemoryStore = class _InMemoryStore {
         status: toStatus,
         state: toStatus,
         external: input.external ?? false,
+        ...input.contentIndex === void 0 ? {} : { contentIndex: input.contentIndex },
         createdAt: timestamp,
         updatedAt: timestamp
       };
@@ -10713,7 +10760,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;
@@ -11157,7 +11205,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.19.2",
+  "version": "0.20.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "build": "tsup && bun scripts/check-public-interface.ts"
   },
   "dependencies": {
-    "@rowan-agent/models": "0.8.0",
+    "@rowan-agent/models": "0.9.0",
     "jiti": "2.7.0",
     "typebox": "^1.0.0",
     "yaml": "^2.7.0"