@agentfield/sdk 0.1.143-rc.2 → 0.1.143-rc.4

package/dist/index.d.ts

@@ -334,6 +334,8 @@ declare class AIClient {
     private readonly config;
     private rateLimiter?;
     constructor(config?: AIConfig);
+    /** Prompt-template overrides configured on this agent, if any (issue #229). */
+    get promptTemplates(): AIConfig['promptTemplates'];
     generate<T>(prompt: string, options: AIRequestOptions & {
         schema: ZodSchema<T>;
     }): Promise<T>;
@@ -1137,6 +1139,85 @@ declare class DidInterface {
     exportAuditTrail(filters?: AuditTrailFilters): Promise<AuditTrailExport>;
 }
 
+/**
+ * Configurable templates for the text and tool-message framing the SDK injects
+ * into LLM calls (issue #229).
+ *
+ * Field names line up with the Python SDK's `PromptTemplates` and the Go SDK's
+ * `PromptConfig` (`toolCallLimitReached`, `toolErrorFormatter`,
+ * `toolResultFormatter`). Defaults reproduce the SDK's prior output exactly, so
+ * a reasoner that never sets `promptTemplates` sees no change.
+ *
+ * The TypeScript SDK uses the Vercel AI SDK's native structured output
+ * (`generateObject`) and injects no schema instruction, so, unlike Python,
+ * there is no `schemaInstruction` field here.
+ */
+/** Formats a failed tool call before it is returned to the model. */
+type ToolErrorFormatter = (toolName: string, error: string) => unknown;
+/** Formats a successful tool call before it is returned to the model. */
+type ToolResultFormatter = (toolName: string, result: unknown) => unknown;
+interface PromptTemplates {
+    /**
+     * Optional system prompt describing how to use tools, appended after the
+     * caller's system prompt. Undefined means nothing is injected (the default),
+     * so existing `tools=` calls are unchanged; set it to opt in.
+     */
+    toolSystemPrompt?: string;
+    /** Message returned to the model when the tool-call limit is reached. */
+    toolCallLimitReached?: string;
+    /**
+     * Formats a failed tool call `(toolName, error)` before it is sent back to
+     * the model. Return a string to send verbatim, or any value to be returned
+     * as-is (the AI SDK serializes it).
+     */
+    toolErrorFormatter?: ToolErrorFormatter;
+    /**
+     * Formats a successful tool call `(toolName, result)` before it is sent back
+     * to the model. Return a string to send verbatim, or any value to be
+     * returned as-is.
+     */
+    toolResultFormatter?: ToolResultFormatter;
+}
+declare const DEFAULT_TOOL_CALL_LIMIT_REACHED = "Tool call limit reached. Please provide a final response.";
+/** Default tool-error framing: the prior `{ error, tool }` object. */
+declare const defaultToolErrorFormatter: ToolErrorFormatter;
+/** Default tool-result framing: the raw result, unframed. */
+declare const defaultToolResultFormatter: ToolResultFormatter;
+/** A fully-populated set of templates with every default filled in. */
+interface ResolvedPromptTemplates {
+    toolSystemPrompt?: string;
+    toolCallLimitReached: string;
+    toolErrorFormatter: ToolErrorFormatter;
+    toolResultFormatter: ToolResultFormatter;
+}
+/**
+ * Merges a partial override over the built-in defaults. An undefined field
+ * (or an undefined `overrides`) keeps the default; `toolSystemPrompt` stays
+ * undefined unless explicitly set.
+ */
+declare function resolvePromptTemplates(overrides?: Partial<PromptTemplates>): ResolvedPromptTemplates;
+/**
+ * Cross-SDK message-source taxonomy, shared with the Python and Go SDKs so a
+ * trace tagged in one SDK reads the same in another (issue #229).
+ * `sdk.schema_instruction` exists only in the Python SDK (which injects it;
+ * TypeScript uses native structured output).
+ */
+type MessageSource = 'user' | 'assistant' | 'sdk.tool_system_prompt' | 'sdk.tool_result' | 'sdk.tool_error' | 'sdk.tool_limit';
+declare const TRACE_SOURCE_USER = "user";
+declare const TRACE_SOURCE_ASSISTANT = "assistant";
+declare const TRACE_SOURCE_TOOL_SYSTEM_PROMPT = "sdk.tool_system_prompt";
+declare const TRACE_SOURCE_TOOL_RESULT = "sdk.tool_result";
+declare const TRACE_SOURCE_TOOL_ERROR = "sdk.tool_error";
+declare const TRACE_SOURCE_TOOL_LIMIT = "sdk.tool_limit";
+/**
+ * Tags a message the loop sent with where it came from. `message` references
+ * the wire content (not a reshaped copy); `source` uses the taxonomy above.
+ */
+interface TracedMessage {
+    message: unknown;
+    source: MessageSource;
+}
+
 /**
  * Tool calling support for AgentField agents.
  *
@@ -1163,6 +1244,11 @@ interface ToolCallConfig {
     agentIds?: string[];
     /** Filter by health status (default: "healthy"). */
     healthStatus?: string;
+    /**
+     * Overridable text and tool-message framing. Defaults reproduce the SDK's
+     * prior output byte-for-byte (issue #229).
+     */
+    promptTemplates?: Partial<PromptTemplates>;
 }
 interface ToolCallRecord {
     toolName: string;
@@ -1177,6 +1263,12 @@ interface ToolCallTrace {
     totalTurns: number;
     totalToolCalls: number;
     finalResponse?: string;
+    /**
+     * Each message the loop sent, tagged with its source. Optional and additive
+     * so callers that build a ToolCallTrace in their own tests are unaffected
+     * (issue #229).
+     */
+    messages?: TracedMessage[];
 }
 /**
  * Options for tool-calling in ctx.ai().
@@ -1714,6 +1806,11 @@ interface AIConfig {
     rateLimitJitterFactor?: number;
     rateLimitCircuitBreakerThreshold?: number;
     rateLimitCircuitBreakerTimeout?: number;
+    /**
+     * Overridable templates for text and tool-message framing the SDK injects
+     * into LLM calls. Merged over the defaults per call (issue #229).
+     */
+    promptTemplates?: Partial<PromptTemplates>;
 }
 interface MemoryConfig {
     defaultScope?: MemoryScope;
@@ -3186,4 +3283,4 @@ declare function simulateSchedule<R>(handler: (ctx: SimulatedContext) => R | Pro
  */
 declare function loadFixture(source: string): Record<string, unknown>;
 
-export { ACTIVE_STATUSES, AIClient, type AIConfig, type AIEmbeddingOptions, type AIRequestOptions, type AIStream, type AIToolRequestOptions, Agent, type AgentCapability, type AgentConfig, type AgentHandler, AgentRouter, type AgentRouterOptions, type AgentState, ApprovalClient, type ApprovalDecision, type ApprovalRequestResponse, ApprovalResult, type ApprovalStatusResponse, Audio, type AudioOutput, type AudioRequest, type AuditTrailExport, type AuditTrailFilters, type Awaitable, type BinaryResolver, CANONICAL_STATUSES, type CompactCapability, type CompactDiscoveryResponse, type CostEntry, type CostEntryInit, CostTracker, DEFAULT_HARNESS_PROVIDER, DIDAuthenticator, type DIDIdentity, type DIDIdentityPackage, type DIDRegistrationRequest, type DIDRegistrationResponse, type DeploymentType, DidClient, DidInterface, DidManager, type DidResolver, type DiscoveryFormat, type DiscoveryOptions, type DiscoveryPagination, type DiscoveryResponse, type DiscoveryResult, type EventTriggerBinding, type EventTriggerSpec, ExecutionContext, type ExecutionCredential, type ExecutionLogAttributes, type ExecutionLogBatchPayload, type ExecutionLogContext, type ExecutionLogEmitOptions, type ExecutionLogEntry, type ExecutionLogLevel, type ExecutionLogTransport, type ExecutionLogTransportPayload, type ExecutionLogWireEntry, ExecutionLogger, type ExecutionLoggerOptions, type ExecutionMetadata, ExecutionStatus, type ExecutionStatusValue, File, type FileOutput, type GenerateCredentialOptions, type GenerateCredentialParams, HARNESS_PROVIDER_ENV_VAR, HEADER_CALLER_DID, HEADER_DID_NONCE, HEADER_DID_SIGNATURE, HEADER_DID_TIMESTAMP, type HarnessConfig, type HarnessDoctorOptions, type HarnessOptions, type HarnessProvider, type HarnessProviderName, HarnessProviderUnavailable, type HarnessResult, HarnessRunner, type HealthStatus, Image, type ImageOutput, type ImageRequest, JWE_ALG, JWE_ENC, KEY_AGREEMENT_TYPE, MODEL_VARIANT_SEP, type MediaProvider, MediaProviderError, type MediaResponse, MediaRouter, type MemoryChangeEvent, MemoryClient, MemoryClientBase, type MemoryConfig, MemoryEventClient, type MemoryEventHandler, type MemoryEventHistoryOptions, type MemoryEventSubscriptionOptions, MemoryInterface, type MemoryRequestMetadata, type MemoryRequestOptions, type MemoryScope, type MemoryWatchHandler, type Metrics, type ModelVariant, type MultimodalContent, MultimodalResponse, OpenRouterMediaProvider, type OpenRouterMediaProviderOptions, PauseClock, PauseManager, type Payload, PayloadEncryptionError, type ProviderHealth, RateLimitError, type RateLimiterOptions, type RawExecutionContext, type RawResult, RealtimeSession, type ReasonerCapability, ReasonerContext, type ReasonerDefinition, type ReasonerHandler, type ReasonerOptions, type RequestApprovalPayload, SUPPORTED_PROVIDERS, SUPPORTED_PROVIDER_NAMES, SUPPORTED_SESSION_TRANSPORTS, type ScheduleTriggerBinding, type ScheduleTriggerSpec, type ServerlessAdapter, type ServerlessEvent, type ServerlessResponse, type SessionDefinition, type SessionOptions, type SessionProvider, type SessionTransport, type SessionTransportCapability, SessionTransportError, type SessionTurn, type SimulateScheduleOptions, type SimulateTriggerOptions, type SimulatedContext, type SkillCapability, SkillContext, type SkillDefinition, type SkillHandler, type SkillOptions, StatelessRateLimiter, TERMINAL_STATUSES, Text, type ToolCallConfig, type ToolCallRecord, type ToolCallTrace, type ToolsOption, type TriggerBinding, type TriggerContext, type TriggerEnvelope, type TurnDetection, USAGE_ENVELOPE_KEY, type UnwrapResult, type UsageEntryWire, type UsageSummaryWire, type VectorSearchOptions, type VectorSearchResult, type VersionProbe, Video, type VideoFrameImage, type VideoInputReference, type VideoRequest, type WaitForApprovalOptions, type WorkflowCredential, type WorkflowMetadata, type WorkflowProgressOptions, WorkflowReporter, type WrapperProbe, type ZodSchema, applyTriggerTransform, attachUsageToSyncResult, audioFromBase64, audioFromBuffer, audioFromFile, audioFromUrl, audioMediaType, buildProvider, buildSessionDefinition, buildToolConfig, capabilitiesToTools, capabilityToMetadataTool, capabilityToTool, createExecutionLogger, createHarnessResult, createMetrics, createMultimodalResponse, createRawResult, decrypt, decryptToString, deriveProvider, encryptForDid, encryptToJwk, ensureCliAvailable, eventTrigger, executeToolCallLoop, extractKeyAgreementJwk, fileFromBase64, fileFromBuffer, fileFromPath, fileFromUrl, findExecutable, generateX25519KeyPair, getCurrentContext, getCurrentSkillContext, guessUrlMimeType, harnessDoctor, imageFromBase64, imageFromBuffer, imageFromFile, imageFromUrl, installApprovalWebhookRoute, isActive, isExecutionLogBatchPayload, isTerminal, isTriggerEnvelope, loadFixture, normalizeExecutionLogEntry, normalizeSessionTransportValue, normalizeStatus, normalizeTurnDetection, resolveModelAndVariant, resolveProviderName, scheduleTrigger, serializeExecutionLogEntry, simulateSchedule, simulateTrigger, splitModelVariant, text, triggerToPayload, unwrapEnvelope, usageSummaryOrNull, validateSessionTransport, videoFromBase64, videoFromBuffer, videoFromFile, videoFromUrl };
+export { ACTIVE_STATUSES, AIClient, type AIConfig, type AIEmbeddingOptions, type AIRequestOptions, type AIStream, type AIToolRequestOptions, Agent, type AgentCapability, type AgentConfig, type AgentHandler, AgentRouter, type AgentRouterOptions, type AgentState, ApprovalClient, type ApprovalDecision, type ApprovalRequestResponse, ApprovalResult, type ApprovalStatusResponse, Audio, type AudioOutput, type AudioRequest, type AuditTrailExport, type AuditTrailFilters, type Awaitable, type BinaryResolver, CANONICAL_STATUSES, type CompactCapability, type CompactDiscoveryResponse, type CostEntry, type CostEntryInit, CostTracker, DEFAULT_HARNESS_PROVIDER, DEFAULT_TOOL_CALL_LIMIT_REACHED, DIDAuthenticator, type DIDIdentity, type DIDIdentityPackage, type DIDRegistrationRequest, type DIDRegistrationResponse, type DeploymentType, DidClient, DidInterface, DidManager, type DidResolver, type DiscoveryFormat, type DiscoveryOptions, type DiscoveryPagination, type DiscoveryResponse, type DiscoveryResult, type EventTriggerBinding, type EventTriggerSpec, ExecutionContext, type ExecutionCredential, type ExecutionLogAttributes, type ExecutionLogBatchPayload, type ExecutionLogContext, type ExecutionLogEmitOptions, type ExecutionLogEntry, type ExecutionLogLevel, type ExecutionLogTransport, type ExecutionLogTransportPayload, type ExecutionLogWireEntry, ExecutionLogger, type ExecutionLoggerOptions, type ExecutionMetadata, ExecutionStatus, type ExecutionStatusValue, File, type FileOutput, type GenerateCredentialOptions, type GenerateCredentialParams, HARNESS_PROVIDER_ENV_VAR, HEADER_CALLER_DID, HEADER_DID_NONCE, HEADER_DID_SIGNATURE, HEADER_DID_TIMESTAMP, type HarnessConfig, type HarnessDoctorOptions, type HarnessOptions, type HarnessProvider, type HarnessProviderName, HarnessProviderUnavailable, type HarnessResult, HarnessRunner, type HealthStatus, Image, type ImageOutput, type ImageRequest, JWE_ALG, JWE_ENC, KEY_AGREEMENT_TYPE, MODEL_VARIANT_SEP, type MediaProvider, MediaProviderError, type MediaResponse, MediaRouter, type MemoryChangeEvent, MemoryClient, MemoryClientBase, type MemoryConfig, MemoryEventClient, type MemoryEventHandler, type MemoryEventHistoryOptions, type MemoryEventSubscriptionOptions, MemoryInterface, type MemoryRequestMetadata, type MemoryRequestOptions, type MemoryScope, type MemoryWatchHandler, type MessageSource, type Metrics, type ModelVariant, type MultimodalContent, MultimodalResponse, OpenRouterMediaProvider, type OpenRouterMediaProviderOptions, PauseClock, PauseManager, type Payload, PayloadEncryptionError, type PromptTemplates, type ProviderHealth, RateLimitError, type RateLimiterOptions, type RawExecutionContext, type RawResult, RealtimeSession, type ReasonerCapability, ReasonerContext, type ReasonerDefinition, type ReasonerHandler, type ReasonerOptions, type RequestApprovalPayload, type ResolvedPromptTemplates, SUPPORTED_PROVIDERS, SUPPORTED_PROVIDER_NAMES, SUPPORTED_SESSION_TRANSPORTS, type ScheduleTriggerBinding, type ScheduleTriggerSpec, type ServerlessAdapter, type ServerlessEvent, type ServerlessResponse, type SessionDefinition, type SessionOptions, type SessionProvider, type SessionTransport, type SessionTransportCapability, SessionTransportError, type SessionTurn, type SimulateScheduleOptions, type SimulateTriggerOptions, type SimulatedContext, type SkillCapability, SkillContext, type SkillDefinition, type SkillHandler, type SkillOptions, StatelessRateLimiter, TERMINAL_STATUSES, TRACE_SOURCE_ASSISTANT, TRACE_SOURCE_TOOL_ERROR, TRACE_SOURCE_TOOL_LIMIT, TRACE_SOURCE_TOOL_RESULT, TRACE_SOURCE_TOOL_SYSTEM_PROMPT, TRACE_SOURCE_USER, Text, type ToolCallConfig, type ToolCallRecord, type ToolCallTrace, type ToolErrorFormatter, type ToolResultFormatter, type ToolsOption, type TracedMessage, type TriggerBinding, type TriggerContext, type TriggerEnvelope, type TurnDetection, USAGE_ENVELOPE_KEY, type UnwrapResult, type UsageEntryWire, type UsageSummaryWire, type VectorSearchOptions, type VectorSearchResult, type VersionProbe, Video, type VideoFrameImage, type VideoInputReference, type VideoRequest, type WaitForApprovalOptions, type WorkflowCredential, type WorkflowMetadata, type WorkflowProgressOptions, WorkflowReporter, type WrapperProbe, type ZodSchema, applyTriggerTransform, attachUsageToSyncResult, audioFromBase64, audioFromBuffer, audioFromFile, audioFromUrl, audioMediaType, buildProvider, buildSessionDefinition, buildToolConfig, capabilitiesToTools, capabilityToMetadataTool, capabilityToTool, createExecutionLogger, createHarnessResult, createMetrics, createMultimodalResponse, createRawResult, decrypt, decryptToString, defaultToolErrorFormatter, defaultToolResultFormatter, deriveProvider, encryptForDid, encryptToJwk, ensureCliAvailable, eventTrigger, executeToolCallLoop, extractKeyAgreementJwk, fileFromBase64, fileFromBuffer, fileFromPath, fileFromUrl, findExecutable, generateX25519KeyPair, getCurrentContext, getCurrentSkillContext, guessUrlMimeType, harnessDoctor, imageFromBase64, imageFromBuffer, imageFromFile, imageFromUrl, installApprovalWebhookRoute, isActive, isExecutionLogBatchPayload, isTerminal, isTriggerEnvelope, loadFixture, normalizeExecutionLogEntry, normalizeSessionTransportValue, normalizeStatus, normalizeTurnDetection, resolveModelAndVariant, resolvePromptTemplates, resolveProviderName, scheduleTrigger, serializeExecutionLogEntry, simulateSchedule, simulateTrigger, splitModelVariant, text, triggerToPayload, unwrapEnvelope, usageSummaryOrNull, validateSessionTransport, videoFromBase64, videoFromBuffer, videoFromFile, videoFromUrl };

package/dist/index.js

@@ -2968,6 +2968,29 @@ function recordAiSdkUsage(params) {
   }
 }
 
+// src/ai/PromptTemplates.ts
+var DEFAULT_TOOL_CALL_LIMIT_REACHED = "Tool call limit reached. Please provide a final response.";
+var defaultToolErrorFormatter = (toolName, error) => ({
+  error,
+  tool: toolName
+});
+var defaultToolResultFormatter = (_toolName, result) => result;
+function resolvePromptTemplates(overrides) {
+  const limit = overrides?.toolCallLimitReached;
+  return {
+    toolSystemPrompt: overrides?.toolSystemPrompt,
+    toolCallLimitReached: limit && limit.length > 0 ? limit : DEFAULT_TOOL_CALL_LIMIT_REACHED,
+    toolErrorFormatter: overrides?.toolErrorFormatter ?? defaultToolErrorFormatter,
+    toolResultFormatter: overrides?.toolResultFormatter ?? defaultToolResultFormatter
+  };
+}
+var TRACE_SOURCE_USER = "user";
+var TRACE_SOURCE_ASSISTANT = "assistant";
+var TRACE_SOURCE_TOOL_SYSTEM_PROMPT = "sdk.tool_system_prompt";
+var TRACE_SOURCE_TOOL_RESULT = "sdk.tool_result";
+var TRACE_SOURCE_TOOL_ERROR = "sdk.tool_error";
+var TRACE_SOURCE_TOOL_LIMIT = "sdk.tool_limit";
+
 // src/ai/ToolCalling.ts
 var DEFAULT_MAX_TURNS = 10;
 var DEFAULT_MAX_TOOL_CALLS = 25;
@@ -3095,7 +3118,8 @@ function isToolCallConfig(obj) {
     "healthStatus",
     "fallbackBroadening",
     "maxCandidateTools",
-    "maxHydratedTools"
+    "maxHydratedTools",
+    "promptTemplates"
   ];
   return typeof obj === "object" && !Array.isArray(obj) && keys.some((k) => k in obj);
 }
@@ -3138,7 +3162,7 @@ async function buildToolConfig(toolsParam, agent) {
     `Invalid tools parameter: expected "discover", ToolCallConfig, DiscoveryResult, capability array, or tool map, got ${typeof toolsParam}`
   );
 }
-function wrapToolsWithObservability(toolMap, agent, trace, maxToolCalls, getCurrentTurn) {
+function wrapToolsWithObservability(toolMap, agent, trace, maxToolCalls, getCurrentTurn, templates, toolMessageSources) {
   let totalCalls = 0;
   const observableTools = {};
   for (const [name, t] of Object.entries(toolMap)) {
@@ -3146,9 +3170,13 @@ function wrapToolsWithObservability(toolMap, agent, trace, maxToolCalls, getCurr
     observableTools[name] = tool({
       description: originalTool.description ?? "",
       inputSchema: originalTool.inputSchema,
-      execute: async (args) => {
+      execute: async (args, opts) => {
         totalCalls++;
         trace.totalToolCalls = totalCalls;
+        const toolCallId = opts?.toolCallId;
+        const recordSource = (source) => {
+          if (toolCallId) toolMessageSources.set(toolCallId, source);
+        };
         if (totalCalls > maxToolCalls) {
           const record2 = {
             toolName: name,
@@ -3158,7 +3186,9 @@ function wrapToolsWithObservability(toolMap, agent, trace, maxToolCalls, getCurr
             turn: getCurrentTurn()
           };
           trace.calls.push(record2);
-          return { error: "Tool call limit reached. Please provide a final response." };
+          recordSource(TRACE_SOURCE_TOOL_LIMIT);
+          const limitContent = { error: templates.toolCallLimitReached };
+          return limitContent;
         }
         const record = {
           toolName: name,
@@ -3174,12 +3204,17 @@ function wrapToolsWithObservability(toolMap, agent, trace, maxToolCalls, getCurr
           record.result = result;
           record.latencyMs = Date.now() - start;
           trace.calls.push(record);
-          return result;
+          recordSource(TRACE_SOURCE_TOOL_RESULT);
+          const resultContent = templates.toolResultFormatter(name, result);
+          return resultContent;
         } catch (err) {
-          record.error = err.message ?? String(err);
+          const message = err.message ?? String(err);
+          record.error = message;
           record.latencyMs = Date.now() - start;
           trace.calls.push(record);
-          return { error: record.error, tool: name };
+          recordSource(TRACE_SOURCE_TOOL_ERROR);
+          const errorContent = templates.toolErrorFormatter(name, message);
+          return errorContent;
         }
       }
     });
@@ -3189,6 +3224,10 @@ function wrapToolsWithObservability(toolMap, agent, trace, maxToolCalls, getCurr
 async function executeToolCallLoop(agent, prompt, toolMap, config, needsLazyHydration, buildModel, options = {}, modelChoice) {
   const maxTurns = config.maxTurns ?? DEFAULT_MAX_TURNS;
   const maxToolCalls = config.maxToolCalls ?? DEFAULT_MAX_TOOL_CALLS;
+  const templates = resolvePromptTemplates(config.promptTemplates);
+  const effectiveSystem = templates.toolSystemPrompt ? options.system ? `${options.system}
+
+${templates.toolSystemPrompt}` : templates.toolSystemPrompt : options.system;
   const usageModel = modelChoice?.modelName ?? options.model;
   const recordLoopUsage = (result2) => {
     if (usageModel) {
@@ -3200,6 +3239,16 @@ async function executeToolCallLoop(agent, prompt, toolMap, config, needsLazyHydr
     totalTurns: 0,
     totalToolCalls: 0
   };
+  if (effectiveSystem) {
+    (trace.messages ??= []).push({
+      message: { role: "system", content: effectiveSystem },
+      source: templates.toolSystemPrompt ? TRACE_SOURCE_TOOL_SYSTEM_PROMPT : TRACE_SOURCE_USER
+    });
+  }
+  (trace.messages ??= []).push({
+    message: { role: "user", content: prompt },
+    source: TRACE_SOURCE_USER
+  });
   let activeTools = toolMap;
   if (needsLazyHydration) {
     const selectionTools = {};
@@ -3214,7 +3263,7 @@ async function executeToolCallLoop(agent, prompt, toolMap, config, needsLazyHydr
     const selectionResult = await generateText({
       model: buildModel(),
       prompt,
-      system: options.system,
+      system: effectiveSystem,
       temperature: options.temperature,
       maxOutputTokens: options.maxTokens,
       tools: selectionTools,
@@ -3229,6 +3278,7 @@ async function executeToolCallLoop(agent, prompt, toolMap, config, needsLazyHydr
       }
     }
     if (selectedNames.size > 0) {
+      appendResponseMessages(trace, selectionResult);
       const hydratedTools = await hydrateSelectedTools(
         agent,
         config,
@@ -3240,22 +3290,26 @@ async function executeToolCallLoop(agent, prompt, toolMap, config, needsLazyHydr
     } else {
       trace.totalTurns = selectionResult.steps.length;
       trace.finalResponse = selectionResult.text;
+      appendResponseMessages(trace, selectionResult);
       return { text: selectionResult.text, trace };
     }
   }
   let currentTurn = 0;
+  const toolMessageSources = /* @__PURE__ */ new Map();
   const { tools: observableTools } = wrapToolsWithObservability(
     activeTools,
     agent,
     trace,
     maxToolCalls,
-    () => currentTurn
+    () => currentTurn,
+    templates,
+    toolMessageSources
   );
   const model = buildModel();
   const result = await generateText({
     model,
     prompt,
-    system: options.system,
+    system: effectiveSystem,
     temperature: options.temperature,
     maxOutputTokens: options.maxTokens,
     tools: observableTools,
@@ -3268,8 +3322,53 @@ async function executeToolCallLoop(agent, prompt, toolMap, config, needsLazyHydr
   recordLoopUsage(result);
   trace.finalResponse = result.text;
   trace.totalTurns = result.steps.length;
+  appendResponseMessages(trace, result, toolMessageSources);
   return { text: result.text, trace };
 }
+function appendResponseMessages(trace, result, toolMessageSources) {
+  const responseMessages = result.response?.messages;
+  if (!Array.isArray(responseMessages)) {
+    return;
+  }
+  for (const message of responseMessages) {
+    const role = message?.role;
+    let source;
+    if (role === "assistant") {
+      source = TRACE_SOURCE_ASSISTANT;
+    } else if (role === "tool") {
+      source = toolSourceForMessage(message, toolMessageSources);
+    } else if (role === "system") {
+      source = TRACE_SOURCE_TOOL_SYSTEM_PROMPT;
+    } else {
+      source = TRACE_SOURCE_USER;
+    }
+    (trace.messages ??= []).push({ message, source });
+  }
+}
+function toolSourceForMessage(message, toolMessageSources) {
+  const parts = Array.isArray(message?.content) ? message.content : [];
+  let sawNativeError = false;
+  let fallback = TRACE_SOURCE_TOOL_RESULT;
+  for (const part of parts) {
+    const id = part?.toolCallId;
+    if (id && toolMessageSources?.has(id)) {
+      const recorded = toolMessageSources.get(id);
+      if (recorded !== TRACE_SOURCE_TOOL_RESULT) {
+        return recorded;
+      }
+      fallback = recorded;
+      continue;
+    }
+    const outputType = part?.output?.type ?? part?.type;
+    if (typeof outputType === "string" && outputType.startsWith("error")) {
+      sawNativeError = true;
+    }
+  }
+  if (sawNativeError) {
+    return TRACE_SOURCE_TOOL_ERROR;
+  }
+  return fallback;
+}
 
 // src/context/ReasonerContext.ts
 var ReasonerContext = class {
@@ -3360,7 +3459,9 @@ var ReasonerContext = class {
     const mergedConfig = {
       ...config,
       maxTurns: options.maxTurns ?? config.maxTurns ?? 10,
-      maxToolCalls: options.maxToolCalls ?? config.maxToolCalls ?? 25
+      maxToolCalls: options.maxToolCalls ?? config.maxToolCalls ?? 25,
+      // Carry the agent's prompt-template overrides into the loop (issue #229).
+      promptTemplates: this.aiClient.promptTemplates ?? config.promptTemplates
     };
     const modelChoice = typeof this.aiClient.resolveModelChoice === "function" ? this.aiClient.resolveModelChoice(options) : void 0;
     return executeToolCallLoop(
@@ -4060,6 +4161,10 @@ var AIClient = class {
       ...config
     };
   }
+  /** Prompt-template overrides configured on this agent, if any (issue #229). */
+  get promptTemplates() {
+    return this.config.promptTemplates;
+  }
   async generate(prompt, options = {}) {
     const { provider, modelName, routingProvider: routingProvider2 } = this.resolveModelChoice(options);
     const model = this.buildModel(options);
@@ -9579,6 +9684,6 @@ function loadFixture(source) {
   );
 }
 
-export { ACTIVE_STATUSES, AIClient, Agent, AgentRouter, ApprovalClient, ApprovalResult, Audio, CANONICAL_STATUSES, CostTracker, DEFAULT_HARNESS_PROVIDER, DIDAuthenticator, DidClient, DidInterface, DidManager, ExecutionContext, ExecutionLogger, ExecutionStatus, File, HARNESS_PROVIDER_ENV_VAR, HEADER_CALLER_DID, HEADER_DID_NONCE, HEADER_DID_SIGNATURE, HEADER_DID_TIMESTAMP, HarnessProviderUnavailable, HarnessRunner, Image, JWE_ALG, JWE_ENC, KEY_AGREEMENT_TYPE, MODEL_VARIANT_SEP, MediaProviderError, MediaRouter, MemoryClient, MemoryClientBase, MemoryEventClient, MemoryInterface, MultimodalResponse, OpenRouterMediaProvider, PauseClock, PauseManager, PayloadEncryptionError, RateLimitError, RealtimeSession, ReasonerContext, SUPPORTED_PROVIDERS, SUPPORTED_PROVIDER_NAMES, SUPPORTED_SESSION_TRANSPORTS, SessionTransportError, SkillContext, StatelessRateLimiter, TERMINAL_STATUSES, Text, USAGE_ENVELOPE_KEY, Video, WorkflowReporter, applyTriggerTransform, attachUsageToSyncResult, audioFromBase64, audioFromBuffer, audioFromFile, audioFromUrl, audioMediaType, buildProvider, buildSessionDefinition, buildToolConfig, capabilitiesToTools, capabilityToMetadataTool, capabilityToTool, createExecutionLogger, createHarnessResult, createMetrics, createMultimodalResponse, createRawResult, decrypt, decryptToString, deriveProvider, encryptForDid, encryptToJwk, ensureCliAvailable, eventTrigger, executeToolCallLoop, extractKeyAgreementJwk, fileFromBase64, fileFromBuffer, fileFromPath, fileFromUrl, findExecutable, generateX25519KeyPair, getCurrentContext, getCurrentSkillContext, guessUrlMimeType, harnessDoctor, imageFromBase64, imageFromBuffer, imageFromFile, imageFromUrl, installApprovalWebhookRoute, isActive, isExecutionLogBatchPayload, isTerminal, isTriggerEnvelope, loadFixture, normalizeExecutionLogEntry, normalizeSessionTransportValue, normalizeStatus, normalizeTurnDetection, resolveModelAndVariant, resolveProviderName, scheduleTrigger, serializeExecutionLogEntry, simulateSchedule, simulateTrigger, splitModelVariant, text, triggerToPayload, unwrapEnvelope, usageSummaryOrNull, validateSessionTransport, videoFromBase64, videoFromBuffer, videoFromFile, videoFromUrl };
+export { ACTIVE_STATUSES, AIClient, Agent, AgentRouter, ApprovalClient, ApprovalResult, Audio, CANONICAL_STATUSES, CostTracker, DEFAULT_HARNESS_PROVIDER, DEFAULT_TOOL_CALL_LIMIT_REACHED, DIDAuthenticator, DidClient, DidInterface, DidManager, ExecutionContext, ExecutionLogger, ExecutionStatus, File, HARNESS_PROVIDER_ENV_VAR, HEADER_CALLER_DID, HEADER_DID_NONCE, HEADER_DID_SIGNATURE, HEADER_DID_TIMESTAMP, HarnessProviderUnavailable, HarnessRunner, Image, JWE_ALG, JWE_ENC, KEY_AGREEMENT_TYPE, MODEL_VARIANT_SEP, MediaProviderError, MediaRouter, MemoryClient, MemoryClientBase, MemoryEventClient, MemoryInterface, MultimodalResponse, OpenRouterMediaProvider, PauseClock, PauseManager, PayloadEncryptionError, RateLimitError, RealtimeSession, ReasonerContext, SUPPORTED_PROVIDERS, SUPPORTED_PROVIDER_NAMES, SUPPORTED_SESSION_TRANSPORTS, SessionTransportError, SkillContext, StatelessRateLimiter, TERMINAL_STATUSES, TRACE_SOURCE_ASSISTANT, TRACE_SOURCE_TOOL_ERROR, TRACE_SOURCE_TOOL_LIMIT, TRACE_SOURCE_TOOL_RESULT, TRACE_SOURCE_TOOL_SYSTEM_PROMPT, TRACE_SOURCE_USER, Text, USAGE_ENVELOPE_KEY, Video, WorkflowReporter, applyTriggerTransform, attachUsageToSyncResult, audioFromBase64, audioFromBuffer, audioFromFile, audioFromUrl, audioMediaType, buildProvider, buildSessionDefinition, buildToolConfig, capabilitiesToTools, capabilityToMetadataTool, capabilityToTool, createExecutionLogger, createHarnessResult, createMetrics, createMultimodalResponse, createRawResult, decrypt, decryptToString, defaultToolErrorFormatter, defaultToolResultFormatter, deriveProvider, encryptForDid, encryptToJwk, ensureCliAvailable, eventTrigger, executeToolCallLoop, extractKeyAgreementJwk, fileFromBase64, fileFromBuffer, fileFromPath, fileFromUrl, findExecutable, generateX25519KeyPair, getCurrentContext, getCurrentSkillContext, guessUrlMimeType, harnessDoctor, imageFromBase64, imageFromBuffer, imageFromFile, imageFromUrl, installApprovalWebhookRoute, isActive, isExecutionLogBatchPayload, isTerminal, isTriggerEnvelope, loadFixture, normalizeExecutionLogEntry, normalizeSessionTransportValue, normalizeStatus, normalizeTurnDetection, resolveModelAndVariant, resolvePromptTemplates, resolveProviderName, scheduleTrigger, serializeExecutionLogEntry, simulateSchedule, simulateTrigger, splitModelVariant, text, triggerToPayload, unwrapEnvelope, usageSummaryOrNull, validateSessionTransport, videoFromBase64, videoFromBuffer, videoFromFile, videoFromUrl };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map