@bluecopa/harness 0.1.0-snapshot.72 → 0.1.0-snapshot.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bluecopa/harness",
-  "version": "0.1.0-snapshot.72",
+  "version": "0.1.0-snapshot.73",
   "description": "Provider-agnostic TypeScript agent framework",
   "license": "UNLICENSED",
   "scripts": {

package/src/loop/vercel-agent-loop.ts

@@ -5,6 +5,7 @@ import { resolveToolChoice } from '../arc/types';
 import { z } from 'zod';
 
 import type { AgentAction, AgentMessage, AgentLoop, AgentStreamEvent, StepUsage, ToolCallAction, ToolBatchAction, PrepareStepContext, PrepareStepResult } from '../agent/types';
+import { getTextContent } from '../agent/types';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AnyTool = Tool<any, any>;
@@ -171,6 +172,8 @@ export interface VercelAgentLoopConfig {
   /** System prompt — string or structured blocks with cache control markers. */
   systemPrompt?: string | SystemPromptBlock[];
   createModel?: ModelFactory;
+  /** @deprecated Prefer createModel. */
+  apiKey?: string;
   /** Custom tool definitions. If provided, replaces built-in agentTools for LLM calls. */
   tools?: Record<string, AnyTool>;
   /** Tool choice for LLM calls. Supports per-turn callbacks. Default: 'auto'. */
@@ -184,12 +187,11 @@ export interface VercelAgentLoopConfig {
 export class VercelAgentLoop implements AgentLoop {
   private readonly model: string;
   private readonly createModel: ModelFactory;
-  private readonly systemPrompt: string;
+  private readonly systemPrompt: string | SystemPromptBlock[];
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private readonly cachedSystem: any;
   private readonly tools: Record<string, AnyTool>;
   private readonly validToolNames: Set<string>;
-  private readonly toolChoiceConfig?: ToolChoiceConfig;
+  private readonly toolChoiceConfig: ToolChoiceConfig | undefined;
   private readonly providerOptions: Record<string, unknown> | undefined;
   private readonly prepareStep: VercelAgentLoopConfig['prepareStep'];
   /** Track tool names called across steps for prepareStep context. */
@@ -220,11 +222,6 @@ export class VercelAgentLoop implements AgentLoop {
         'When the task is fully complete, respond with a brief text summary (no tool call).',
       ].join(' ');
 
-    this.cachedSystem = [{
-      role: 'system' as const,
-      content: this.systemPrompt,
-    }];
-
     if (config.apiKey) {
       process.env.ANTHROPIC_API_KEY = config.apiKey;
     }
@@ -246,12 +243,11 @@ export class VercelAgentLoop implements AgentLoop {
 
   /** Resolve model + tools for this step via prepareStep callback. */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private resolveStep(): { model: string; tools: Record<string, any>; validNames: Set<string> } {
-    this.stepNumber++;
+  private resolveStep(stepNumber: number): { model: string; tools: Record<string, any>; validNames: Set<string> } {
     if (!this.prepareStep) {
       return { model: this.model, tools: this.tools, validNames: this.validToolNames };
     }
-    const overrides = this.prepareStep({ stepNumber: this.stepNumber, toolCallHistory: this.toolCallHistory });
+    const overrides = this.prepareStep({ stepNumber, toolCallHistory: this.toolCallHistory });
     if (!overrides) {
       return { model: this.model, tools: this.tools, validNames: this.validToolNames };
     }
@@ -285,14 +281,14 @@ export class VercelAgentLoop implements AgentLoop {
   async nextAction(messages: AgentMessage[]): Promise<AgentAction> {
     const currentStep = this.step++;
 
-    const { model, tools, validNames } = this.resolveStep();
+    const { model, tools, validNames } = this.resolveStep(currentStep + 1);
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const result = await (generateText as any)({
-      model: this.createModel(this.model),
-      tools: this.tools,
+      model: this.createModel(model),
+      tools,
       toolChoice: resolveToolChoice(this.toolChoiceConfig, currentStep),
-      system: this.cachedSystem,
+      system: this.buildSystemParam(),
       messages: toModelMessages(messages),
       stopWhen: stepCountIs(1),
       ...(this.providerOptions ? { providerOptions: this.providerOptions } : {}),
@@ -339,14 +335,14 @@ export class VercelAgentLoop implements AgentLoop {
   async *streamAction(messages: AgentMessage[]): AsyncGenerator<AgentStreamEvent> {
     const currentStep = this.step++;
 
-    const { model, tools, validNames } = this.resolveStep();
+    const { model, tools, validNames } = this.resolveStep(currentStep + 1);
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const result = (streamText as any)({
-      model: this.createModel(this.model),
-      tools: this.tools,
+      model: this.createModel(model),
+      tools,
       toolChoice: resolveToolChoice(this.toolChoiceConfig, currentStep),
-      system: this.cachedSystem,
+      system: this.buildSystemParam(),
       messages: toModelMessages(messages),
       stopWhen: stepCountIs(1),
       ...(this.providerOptions ? { providerOptions: this.providerOptions } : {}),