@strands-agents/sdk 1.13.0 → 1.14.0

package/dist/src/agent/agent-as-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-as-tool.d.ts","sourceRoot":"","sources":["../../../src/agent/agent-as-tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAIvC,OAAO,EAAqB,IAAI,EAAmB,MAAM,kBAAkB,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AACxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,6BAA6B,yIAC8F,CAAA;AAExI;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED;;GAEG;AACH,UAAU,eAAgB,SAAQ,kBAAkB;IAClD,KAAK,EAAE,KAAK,CAAA;CACb;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,WAAY,SAAQ,IAAI;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAE1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsB;IACvD,OAAO,CAAC,KAAK,CAAQ;gBAET,MAAM,EAAE,eAAe;IA6CnC;;OAEG;IACH,IAAI,KAAK,IAAI,KAAK,CAEjB;IAEM,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;CAuD7D"}
+{"version":3,"file":"agent-as-tool.d.ts","sourceRoot":"","sources":["../../../src/agent/agent-as-tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAIvC,OAAO,EAAqB,IAAI,EAAmB,MAAM,kBAAkB,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AACxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,6BAA6B,yIAC8F,CAAA;AAExI;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED;;GAEG;AACH,UAAU,eAAgB,SAAQ,kBAAkB;IAClD,KAAK,EAAE,KAAK,CAAA;CACb;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,WAAY,SAAQ,IAAI;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAE1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsB;IACvD,OAAO,CAAC,KAAK,CAAQ;gBAET,MAAM,EAAE,eAAe;IA6CnC;;OAEG;IACH,IAAI,KAAK,IAAI,KAAK,CAEjB;IAEM,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;CA8D7D"}

package/dist/src/agent/agent-as-tool.js

@@ -98,7 +98,7 @@ export class AgentAsTool extends Tool {
         return this._agent;
     }
     async *stream(toolContext) {
-        const { toolUse } = toolContext;
+        const { toolUse, invocationState, cancelSignal } = toolContext;
         const toolUseId = toolUse.toolUseId;
         // Concurrency guard: loadSnapshot + agent.stream() must not overlap.
         if (this._busy) {
@@ -114,7 +114,10 @@ export class AgentAsTool extends Tool {
             // Stream the sub-agent, forwarding the outer invocation's state so
             // mutations in the inner agent's hooks/tools are visible to the outer
             // agent's downstream callbacks and final AgentResult.
-            const gen = this._agent.stream(input, { invocationState: toolContext.invocationState });
+            const gen = this._agent.stream(input, {
+                invocationState,
+                cancelSignal,
+            });
             let next = await gen.next();
             while (!next.done) {
                 const event = next.value;
@@ -127,6 +130,9 @@ export class AgentAsTool extends Tool {
                 next = await gen.next();
             }
             const result = next.value;
+            if (result.stopReason === 'cancelled') {
+                return createErrorResult(`Agent '${this.name}' cancelled`, toolUseId);
+            }
             // Build the tool result
             if (result.structuredOutput !== undefined) {
                 return new ToolResultBlock({

package/dist/src/agent/agent-as-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-as-tool.js","sourceRoot":"","sources":["../../../src/agent/agent-as-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-as-tool.js","sourceRoot":"","sources":["../../../src/agent/agent-as-tool.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/agent.d.ts

@@ -29,6 +29,7 @@ import { InterruptState } from '../interrupt.js';
 import type { TakeSnapshotOptions } from './snapshot.js';
 import type { Snapshot } from '../types/snapshot.js';
 import type { Sandbox } from '../sandbox/base.js';
+import { ContextManager } from '../context-manager/context-manager.js';
 /**
  * Recursive type definition for nested tool arrays.
  * Allows tools to be organized in nested arrays of any depth.
@@ -47,16 +48,25 @@ export type ToolList = (Tool | McpClient | Agent | ToolList)[];
  * - `'sequential'` — runs tool calls one at a time
  *
  * Cancellation works identically in both modes: {@link Agent.cancel} flips
- * {@link Agent.cancelSignal} and tools must observe it cooperatively to stop early.
+ * {@link Agent.cancelSignal}, which SDK-managed tool contexts expose as `context.cancelSignal`.
  * In concurrent mode, prompt batch-wide cancellation requires every in-flight tool
  * to honor the signal.
  */
 export type ToolExecutorStrategy = 'sequential' | 'concurrent';
 /**
- * Supported values for the `contextManager` parameter.
+ * Supported string presets for the `contextManager` parameter.
  */
 export declare const CONTEXT_MANAGER_STRATEGIES: readonly ["auto", "agentic"];
-export type ContextManagerStrategy = (typeof CONTEXT_MANAGER_STRATEGIES)[number];
+type ContextManagerPreset = (typeof CONTEXT_MANAGER_STRATEGIES)[number];
+/**
+ * Supported values for the `contextManager` parameter.
+ *
+ * - `"auto"`: Managed context with proactive compression + offloading.
+ * - `"agentic"`: Model-driven context management via injected tools.
+ * - `ContextManager` instance: Full control over strategy-driven offloading.
+ * - `false`: Explicitly disable all context management (no compression, no offloading).
+ */
+export type ContextManagerStrategy = ContextManagerPreset | ContextManager | false;
 /**
  * Configuration object for creating a new Agent.
  */
@@ -115,13 +125,15 @@ export type AgentConfig = {
      */
     conversationManager?: ConversationManager;
     /**
-     * Context management strategy.
+     * Context management strategy that controls how messages are compressed and offloaded.
      *
      * - `"auto"`: SummarizingConversationManager with proactive compression + ContextOffloader.
      * - `"agentic"`: (Experimental) Lets the model drive context management via injected tools.
      *   This mode may change in future versions.
+     * - `ContextManager` instance: Strategy-driven offloading with overflow recovery.
+     * - `false`: Explicitly disable context management (no compression, no offloading).
      *
-     * If `conversationManager` is also provided, the user's conversation manager is used instead.
+     * When a `ContextManager` instance is provided, any co-provided `conversationManager` is ignored.
      * Defaults to undefined (SlidingWindowConversationManager, no offloader).
      *
      * @remarks The offloader uses in-memory storage by default. When an agent-level
@@ -270,6 +282,10 @@ export declare class Agent implements LocalAgent, InvokableAgent {
      * Optional description of what the agent does.
      */
     readonly description?: string;
+    /**
+     * The context manager for strategy-driven offloading, if configured.
+     */
+    readonly contextManager?: ContextManager | undefined;
     /**
      * The session manager for saving and restoring agent sessions, if configured.
      */
@@ -480,7 +496,7 @@ export declare class Agent implements LocalAgent, InvokableAgent {
     /**
      * The cancellation signal for the current invocation.
      *
-     * Tools can pass this to cancellable operations (e.g., `fetch(url, { signal: agent.cancelSignal })`).
+     * SDK-managed tool contexts receive this as `context.cancelSignal` for cancellable operations.
      * Hooks can check `event.agent.cancelSignal.aborted` to detect cancellation.
      */
     get cancelSignal(): AbortSignal;
@@ -494,7 +510,7 @@ export declare class Agent implements LocalAgent, InvokableAgent {
      * - At the top of each agent loop cycle
      *
      * If a tool is already executing, it will run to completion unless
-     * the tool checks {@link LocalAgent.cancelSignal | cancelSignal} internally.
+     * the tool checks `context.cancelSignal` internally.
      *
      * Hook callbacks can check `event.agent.cancelSignal.aborted` to detect
      * cancellation and adjust their behavior accordingly.
@@ -748,6 +764,7 @@ export declare class Agent implements LocalAgent, InvokableAgent {
      * These are separate event classes because they represent different granularities
      * (partial deltas vs finished blocks). Both are yielded in the stream and hookable.
      *
+     * @param model - Model selected for this call
      * @param messages - Messages to send to the model
      * @param streamOptions - Options for streaming
      * @returns StreamAggregatedResult containing message, stop reason, and optional redaction message
@@ -808,5 +825,8 @@ export declare class Agent implements LocalAgent, InvokableAgent {
      * @returns MessageAddedEvent to be yielded
      */
     private _appendMessage;
+    private _appendContinuationMessages;
+    private _hasOpenUserTurn;
 }
+export {};
 //# sourceMappingURL=agent.d.ts.map

package/dist/src/agent/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../src/agent/agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../src/agent/agent.ts"],"names":[],"mappings":"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"}

package/dist/src/agent/agent.js

@@ -30,6 +30,7 @@ import { ConcurrentToolExecutor } from '../tools/executors/concurrent.js';
 import { SequentialToolExecutor } from '../tools/executors/sequential.js';
 import { AgentAsTool } from './agent-as-tool.js';
 import { ToolCaller } from './tool-caller.js';
+import { continuations } from './continuation.js';
 import { MemoryManager } from '../memory/memory-manager.js';
 import { SessionManager } from '../session/session-manager.js';
 import { Tracer } from '../telemetry/tracer.js';
@@ -44,8 +45,9 @@ import { isInterruptResponseContent } from '../types/interrupt.js';
 import { takeSnapshot as takeSnapshotInternal, loadSnapshot as loadSnapshotInternal } from './snapshot.js';
 import { defaultSandbox } from '../sandbox/default.js';
 import { summarizeContextTool, truncateContextTool, pinContextTool, createTokenUsageMiddleware, } from '../context-manager/modes/agentic/agentic-context.js';
+import { ContextManager } from '../context-manager/context-manager.js';
 /**
- * Supported values for the `contextManager` parameter.
+ * Supported string presets for the `contextManager` parameter.
  */
 export const CONTEXT_MANAGER_STRATEGIES = ['auto', 'agentic'];
 /** Benchmark-validated token threshold for offloading tool results. */
@@ -65,8 +67,16 @@ const CONTEXT_MANAGER_COMPRESSION_THRESHOLD = 0.85;
  * When "auto", uses SummarizingConversationManager with proactive compression.
  * When "agentic", uses SummarizingConversationManager without proactive compression
  * (the agent manages its context via tools; the context manager is only a reactive safety net).
+ * When a ContextManager instance, uses NullConversationManager — the ContextManager owns
+ * overflow recovery via apply().
  */
 function resolveConversationManager(contextManager, conversationManager) {
+    if (contextManager === false) {
+        return conversationManager ?? new NullConversationManager();
+    }
+    if (contextManager instanceof ContextManager) {
+        return new NullConversationManager();
+    }
     if (contextManager === 'agentic') {
         return (conversationManager ??
             new SummarizingConversationManager({
@@ -148,6 +158,10 @@ export class Agent {
      * Optional description of what the agent does.
      */
     description;
+    /**
+     * The context manager for strategy-driven offloading, if configured.
+     */
+    contextManager;
     /**
      * The session manager for saving and restoring agent sessions, if configured.
      */
@@ -207,6 +221,7 @@ export class Agent {
         this.id = config?.id ?? DEFAULT_AGENT_ID;
         if (config?.description !== undefined)
             this.description = config.description;
+        this.contextManager = config?.contextManager instanceof ContextManager ? config.contextManager : undefined;
         this.sessionManager = config?.sessionManager;
         this.storage = config?.storage;
         this.memoryManager =
@@ -244,7 +259,7 @@ export class Agent {
         // Initialize middleware registry
         this._middlewareRegistry = new MiddlewareRegistry();
         if (config?.contextManager === 'agentic') {
-            this._middlewareRegistry.addInput(InvokeModelStage.Input, createTokenUsageMiddleware(this.model));
+            this._middlewareRegistry.addInput(InvokeModelStage.Input, createTokenUsageMiddleware());
         }
         // `undefined` (omitted) → install the default; `null`/`[]` → explicit opt-out.
         const retryStrategies = config?.retryStrategy === null
@@ -268,6 +283,7 @@ export class Agent {
         // when a delegate tool is added (construction, plugin getTools, MCP, runtime).
         // The plugin is a no-op when no delegation tools fire.
         const hasAgentDelegation = (config?.plugins ?? []).some((p) => p.name === 'strands:agent-delegation');
+        const contextManagerPlugin = config?.contextManager instanceof ContextManager ? config.contextManager : undefined;
         this._pluginRegistry = new PluginRegistry([
             this._conversationManager,
             ...retryStrategies,
@@ -284,6 +300,7 @@ export class Agent {
                 ]
                 : []),
             ...(this.memoryManager ? [this.memoryManager] : []),
+            ...(contextManagerPlugin ? [contextManagerPlugin] : []),
             ...(config?.sessionManager ? [config.sessionManager] : []),
             new ModelPlugin(this.model),
         ]);
@@ -533,7 +550,7 @@ export class Agent {
     /**
      * The cancellation signal for the current invocation.
      *
-     * Tools can pass this to cancellable operations (e.g., `fetch(url, { signal: agent.cancelSignal })`).
+     * SDK-managed tool contexts receive this as `context.cancelSignal` for cancellable operations.
      * Hooks can check `event.agent.cancelSignal.aborted` to detect cancellation.
      */
     get cancelSignal() {
@@ -549,7 +566,7 @@ export class Agent {
      * - At the top of each agent loop cycle
      *
      * If a tool is already executing, it will run to completion unless
-     * the tool checks {@link LocalAgent.cancelSignal | cancelSignal} internally.
+     * the tool checks `context.cancelSignal` internally.
      *
      * Hook callbacks can check `event.agent.cancelSignal.aborted` to detect
      * cancellation and adjust their behavior accordingly.
@@ -637,6 +654,7 @@ export class Agent {
      */
     async *stream(args, options) {
         this.acquireLock();
+        let continuationEvent;
         try {
             await this.initialize();
             // Thread the resolved invocationState so all layers share the same reference.
@@ -664,6 +682,8 @@ export class Agent {
                     const message = new Message({ role: 'assistant', content: [new TextBlock(cancelText)] });
                     yield this._appendMessage(message, invocationState);
                     const afterEvent = new AfterInvocationEvent({ agent: this, invocationState });
+                    await continuations.abandon(continuationEvent, new Error('Continuation was not incorporated into agent history'));
+                    continuationEvent = afterEvent;
                     await this._invokeCallbacks(afterEvent);
                     yield afterEvent;
                     return new AgentResult({
@@ -678,7 +698,7 @@ export class Agent {
                 let caughtError;
                 const afterInvocationEvent = new AfterInvocationEvent({ agent: this, invocationState });
                 try {
-                    result = yield* this._streamWithMiddleware(currentArgs, resolvedOptions, invocationState);
+                    result = yield* this._streamWithMiddleware(currentArgs, resolvedOptions, invocationState, continuationEvent);
                 }
                 catch (error) {
                     caughtError = error;
@@ -687,6 +707,8 @@ export class Agent {
                     // AfterInvocationEvent always fires — even on error or consumer break. Outside middleware.
                     // Invoke hooks (so .resume can be set) but don't yield in finally (yields in finally
                     // suspend the generator on consumer break instead of completing cleanup).
+                    await continuations.abandon(continuationEvent, new Error('Continuation was not incorporated into agent history'));
+                    continuationEvent = afterInvocationEvent;
                     await this._invokeCallbacks(afterInvocationEvent);
                 }
                 // Yield outside finally — in JS, a `yield` inside `finally` suspends the generator
@@ -697,9 +719,15 @@ export class Agent {
                 if (caughtError) {
                     throw caughtError;
                 }
-                // Resume only on a clean invocation — errors propagate above.
-                if (afterInvocationEvent.resume !== undefined) {
-                    currentArgs = afterInvocationEvent.resume;
+                const stopReason = result.stopReason;
+                const allowsContinuation = stopReason === 'endTurn' || stopReason === 'stopSequence';
+                if (!allowsContinuation && stopReason !== 'interrupt') {
+                    await continuations.abandon(afterInvocationEvent, new Error(`Continuation abandoned after ${stopReason}`));
+                }
+                const hasContinuation = (await continuations.prepare(afterInvocationEvent, (continuationArgs) => this._normalizeInput(continuationArgs), stopReason)) !== undefined;
+                continuationEvent = hasContinuation ? afterInvocationEvent : undefined;
+                if (hasContinuation || afterInvocationEvent.resume !== undefined) {
+                    currentArgs = afterInvocationEvent.resume ?? [];
                     continue;
                 }
                 // Only emit AgentResultEvent on the final iteration (not on resumed ones).
@@ -712,6 +740,7 @@ export class Agent {
             }
         }
         finally {
+            await continuations.abandon(continuationEvent, new Error('Agent stream closed before continuation input was incorporated into agent history'));
             this._isInvoking = false;
         }
     }
@@ -719,7 +748,7 @@ export class Agent {
      * Invokes the AgentStreamStage middleware chain.
      * Hooks fire outside this method (in stream()'s resume loop).
      */
-    async *_streamWithMiddleware(args, options, invocationState) {
+    async *_streamWithMiddleware(args, options, invocationState, continuationEvent) {
         // Snapshot so a gate that re-reads its response after next() still resolves even if a tool cycle called deactivate().
         const interruptsSnapshot = { ...this._interruptState.interrupts };
         const context = {
@@ -733,7 +762,8 @@ export class Agent {
         const self = this;
         try {
             const { result } = yield* this._middlewareRegistry.invoke(AgentStreamStage, context, async function* (ctx) {
-                const result = yield* self._streamCore(ctx.args, ctx.options);
+                const streamArgs = continuations.combine(continuationEvent, ctx.args, (continuationArgs) => self._normalizeInput(continuationArgs));
+                const result = yield* self._streamCore(streamArgs, ctx.options, streamArgs === ctx.args ? undefined : continuationEvent);
                 return { result };
             });
             if (this._interruptState.activated &&
@@ -770,8 +800,8 @@ export class Agent {
      * Single-pass stream through _stream() with event processing.
      * No resume loop, no lifecycle events — those are handled by stream()'s resume loop.
      */
-    async *_streamCore(args, options) {
-        const streamGenerator = this._stream(args, options);
+    async *_streamCore(args, options, continuationEvent) {
+        const streamGenerator = this._stream(args, options, continuationEvent);
         let caughtError;
         let iterationResult;
         try {
@@ -933,7 +963,7 @@ export class Agent {
      * @param options - Optional per-invocation options
      * @returns Async generator that yields AgentStreamEvent objects and returns AgentResult
      */
-    async *_stream(args, options) {
+    async *_stream(args, options, continuationEvent) {
         let currentArgs = args;
         let result;
         this._validateLimits(options);
@@ -1016,8 +1046,13 @@ export class Agent {
                     // Normalize input and append user messages on first invocation only
                     if (currentArgs !== undefined) {
                         const messagesToAppend = this._normalizeInput(currentArgs);
-                        for (const message of messagesToAppend) {
-                            yield this._appendMessage(message, invocationState);
+                        if (continuationEvent) {
+                            yield* await this._appendContinuationMessages(messagesToAppend, continuationEvent, invocationState);
+                        }
+                        else {
+                            for (const message of messagesToAppend) {
+                                yield this._appendMessage(message, invocationState);
+                            }
                         }
                         currentArgs = undefined;
                     }
@@ -1203,7 +1238,9 @@ export class Agent {
                     role: 'assistant',
                     content: [new TextBlock('Cancelled by user')],
                 });
-                yield this._appendMessage(cancelMessage, invocationState);
+                if (this._hasOpenUserTurn()) {
+                    yield this._appendMessage(cancelMessage, invocationState);
+                }
                 result = new AgentResult({
                     stopReason: 'cancelled',
                     lastMessage: cancelMessage,
@@ -1233,14 +1270,16 @@ export class Agent {
         }
         finally {
             // If cancelled but the catch block was bypassed (generator terminated
-            // via .return() when the consumer breaks out of for-await), append an
-            // assistant message so the agent can be reinvoked with a new user prompt.
+            // via .return() when the consumer breaks out of for-await), close an
+            // existing user turn so the agent can be reinvoked.
             if (!caughtError && !result && this.isCancelled) {
                 const cancelMessage = new Message({
                     role: 'assistant',
                     content: [new TextBlock('Cancelled by user')],
                 });
-                yield this._appendMessage(cancelMessage, invocationState);
+                if (this._hasOpenUserTurn()) {
+                    yield this._appendMessage(cancelMessage, invocationState);
+                }
             }
             this._tracer.endAgentSpan(agentSpan, {
                 ...(caughtError && { error: caughtError }),
@@ -1432,8 +1471,18 @@ export class Agent {
                 invocationState,
                 ...(projectedInputTokens !== undefined && { projectedInputTokens }),
             });
-            yield beforeModelCallEvent;
+            let modelContinuation;
+            try {
+                yield beforeModelCallEvent;
+                modelContinuation = await continuations.prepare(beforeModelCallEvent, (continuationArgs) => this._normalizeInput(continuationArgs));
+            }
+            finally {
+                if (modelContinuation === undefined) {
+                    await continuations.abandon(beforeModelCallEvent, new Error('Agent stream closed before continuation input was incorporated into agent history'));
+                }
+            }
             if (beforeModelCallEvent.cancel) {
+                await continuations.abandon(beforeModelCallEvent, new Error('Continuation abandoned by BeforeModelCallEvent'));
                 const cancelText = typeof beforeModelCallEvent.cancel === 'string' ? beforeModelCallEvent.cancel : 'model call denied by hook';
                 const message = new Message({ role: 'assistant', content: [new TextBlock(cancelText)] });
                 const stopData = { message, stopReason: 'endTurn' };
@@ -1451,6 +1500,16 @@ export class Agent {
                 }
                 return { message, stopReason: 'endTurn' };
             }
+            yield* await this._appendContinuationMessages(modelContinuation ?? [], beforeModelCallEvent, invocationState);
+            if (modelContinuation !== undefined) {
+                try {
+                    projectedInputTokens = await this._estimateInputTokens(streamOptions);
+                }
+                catch (error) {
+                    projectedInputTokens = undefined;
+                    logger.debug(`error=<${error}> | token estimation failed after continuation input, proceeding without estimate`);
+                }
+            }
             try {
                 const result = yield* this._invokeModelWithMiddleware(invocationState, toolChoice, projectedInputTokens);
                 // Accumulate token usage and model latency metrics
@@ -1524,6 +1583,7 @@ export class Agent {
     async *_invokeModelWithMiddleware(invocationState, toolChoice, projectedInputTokens) {
         const context = {
             agent: this,
+            model: this.model,
             messages: this.messages.map((msg) => msg.clone()),
             ...(this.systemPrompt !== undefined && { systemPrompt: cloneSystemPrompt(this.systemPrompt) }),
             toolSpecs: deepCopy(this._toolRegistry.list().map((tool) => tool.toolSpec)),
@@ -1540,7 +1600,7 @@ export class Agent {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         const middlewareResult = yield* this._middlewareRegistry.invoke(InvokeModelStage, context, async function* (ctx) {
-            const modelId = self.model.modelId;
+            const modelId = ctx.model.modelId;
             const modelSpan = self._tracer.startModelInvokeSpan({
                 messages: ctx.messages,
                 ...(modelId && { modelId }),
@@ -1556,8 +1616,10 @@ export class Agent {
                     modelState: tempModelState,
                     ...(ctx.systemPrompt !== undefined && { systemPrompt: ctx.systemPrompt }),
                     ...(ctx.toolChoice && { toolChoice: ctx.toolChoice }),
+                    // Omitted when zero, so an ordinary call's options are unchanged.
+                    ...(ctx.dynamicTrailingBlocks ? { dynamicTrailingBlocks: ctx.dynamicTrailingBlocks } : {}),
                 };
-                const gen = self._streamFromModel(ctx.messages, streamOptions, ctx.invocationState);
+                const gen = self._streamFromModel(ctx.model, ctx.messages, streamOptions, ctx.invocationState);
                 let iterResult = await gen.next();
                 while (!iterResult.done) {
                     yield iterResult.value;
@@ -1598,13 +1660,14 @@ export class Agent {
      * These are separate event classes because they represent different granularities
      * (partial deltas vs finished blocks). Both are yielded in the stream and hookable.
      *
+     * @param model - Model selected for this call
      * @param messages - Messages to send to the model
      * @param streamOptions - Options for streaming
      * @returns StreamAggregatedResult containing message, stop reason, and optional redaction message
      */
-    async *_streamFromModel(messages, streamOptions, invocationState) {
+    async *_streamFromModel(model, messages, streamOptions, invocationState) {
         messages = normalizeToolUseNames(messages);
-        const streamGenerator = this.model.streamAggregated(messages, streamOptions);
+        const streamGenerator = model.streamAggregated(messages, streamOptions);
         try {
             let result = await streamGenerator.next();
             while (!result.done) {
@@ -1685,6 +1748,7 @@ export class Agent {
                     middlewareRegistry: this._middlewareRegistry,
                     tracer: this._tracer,
                     meter: this._meter,
+                    cancelSignal: this._abortSignal,
                 }, {
                     toolUseBlocks,
                     toolResultBlocks,
@@ -1821,6 +1885,36 @@ export class Agent {
         this.messages.push(message);
         return new MessageAddedEvent({ agent: this, message, invocationState });
     }
+    async _appendContinuationMessages(messages, continuationEvent, invocationState) {
+        const events = [];
+        for (const message of messages) {
+            const lastMessage = this.messages.at(-1);
+            if (lastMessage?.role !== message.role) {
+                events.push(this._appendMessage(message, invocationState));
+                continue;
+            }
+            const appendedMessage = new Message({
+                role: message.role,
+                content: [...lastMessage.content, ...message.content],
+                trackingId: lastMessage.trackingId,
+                ...(lastMessage.metadata !== undefined && { metadata: lastMessage.metadata }),
+            });
+            this.messages[this.messages.length - 1] = appendedMessage;
+            const messageEvent = new MessageAddedEvent({ agent: this, message: appendedMessage, invocationState });
+            if (events.at(-1)?.message === lastMessage) {
+                events[events.length - 1] = messageEvent;
+            }
+            else {
+                events.push(messageEvent);
+            }
+        }
+        await continuations.markAppended(continuationEvent);
+        return events;
+    }
+    _hasOpenUserTurn() {
+        const lastMessage = this.messages[this.messages.length - 1];
+        return lastMessage?.role === 'user';
+    }
 }
 const INVALID_TOOL_NAME_PLACEHOLDER = 'INVALID_TOOL_NAME';
 /**