@strands-agents/sdk 1.0.0 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/__fixtures__/agent-helpers.d.ts +16 -1
- package/dist/src/__fixtures__/agent-helpers.d.ts.map +1 -1
- package/dist/src/__fixtures__/agent-helpers.js +42 -0
- package/dist/src/__fixtures__/agent-helpers.js.map +1 -1
- package/dist/src/__fixtures__/tool-helpers.d.ts +2 -1
- package/dist/src/__fixtures__/tool-helpers.d.ts.map +1 -1
- package/dist/src/__fixtures__/tool-helpers.js +20 -3
- package/dist/src/__fixtures__/tool-helpers.js.map +1 -1
- package/dist/src/__tests__/interrupt.test.d.ts +2 -0
- package/dist/src/__tests__/interrupt.test.d.ts.map +1 -0
- package/dist/src/__tests__/interrupt.test.js +259 -0
- package/dist/src/__tests__/interrupt.test.js.map +1 -0
- package/dist/src/__tests__/mcp.test.js +226 -0
- package/dist/src/__tests__/mcp.test.js.map +1 -1
- package/dist/src/agent/__tests__/agent.hook.test.js +551 -1
- package/dist/src/agent/__tests__/agent.hook.test.js.map +1 -1
- package/dist/src/agent/__tests__/agent.interrupt.test.d.ts +2 -0
- package/dist/src/agent/__tests__/agent.interrupt.test.d.ts.map +1 -0
- package/dist/src/agent/__tests__/agent.interrupt.test.js +730 -0
- package/dist/src/agent/__tests__/agent.interrupt.test.js.map +1 -0
- package/dist/src/agent/__tests__/agent.model-retry.test.d.ts +2 -0
- package/dist/src/agent/__tests__/agent.model-retry.test.d.ts.map +1 -0
- package/dist/src/agent/__tests__/agent.model-retry.test.js +161 -0
- package/dist/src/agent/__tests__/agent.model-retry.test.js.map +1 -0
- package/dist/src/agent/__tests__/agent.test.js +118 -0
- package/dist/src/agent/__tests__/agent.test.js.map +1 -1
- package/dist/src/agent/__tests__/snapshot.test.js +50 -4
- package/dist/src/agent/__tests__/snapshot.test.js.map +1 -1
- package/dist/src/agent/agent.d.ts +35 -4
- package/dist/src/agent/agent.d.ts.map +1 -1
- package/dist/src/agent/agent.js +548 -222
- package/dist/src/agent/agent.js.map +1 -1
- package/dist/src/agent/snapshot.d.ts +2 -2
- package/dist/src/agent/snapshot.d.ts.map +1 -1
- package/dist/src/agent/snapshot.js +14 -2
- package/dist/src/agent/snapshot.js.map +1 -1
- package/dist/src/conversation-manager/__tests__/conversation-manager.test.js +230 -9
- package/dist/src/conversation-manager/__tests__/conversation-manager.test.js.map +1 -1
- package/dist/src/conversation-manager/__tests__/null-conversation-manager.test.js +19 -6
- package/dist/src/conversation-manager/__tests__/null-conversation-manager.test.js.map +1 -1
- package/dist/src/conversation-manager/__tests__/sliding-window-conversation-manager.test.js +51 -2
- package/dist/src/conversation-manager/__tests__/sliding-window-conversation-manager.test.js.map +1 -1
- package/dist/src/conversation-manager/__tests__/summarizing-conversation-manager.test.js +75 -1
- package/dist/src/conversation-manager/__tests__/summarizing-conversation-manager.test.js.map +1 -1
- package/dist/src/conversation-manager/conversation-manager.d.ts +67 -22
- package/dist/src/conversation-manager/conversation-manager.d.ts.map +1 -1
- package/dist/src/conversation-manager/conversation-manager.js +65 -13
- package/dist/src/conversation-manager/conversation-manager.js.map +1 -1
- package/dist/src/conversation-manager/index.d.ts +1 -1
- package/dist/src/conversation-manager/index.d.ts.map +1 -1
- package/dist/src/conversation-manager/index.js +1 -1
- package/dist/src/conversation-manager/index.js.map +1 -1
- package/dist/src/conversation-manager/sliding-window-conversation-manager.d.ts +17 -3
- package/dist/src/conversation-manager/sliding-window-conversation-manager.d.ts.map +1 -1
- package/dist/src/conversation-manager/sliding-window-conversation-manager.js +10 -4
- package/dist/src/conversation-manager/sliding-window-conversation-manager.js.map +1 -1
- package/dist/src/conversation-manager/summarizing-conversation-manager.d.ts +23 -1
- package/dist/src/conversation-manager/summarizing-conversation-manager.d.ts.map +1 -1
- package/dist/src/conversation-manager/summarizing-conversation-manager.js +39 -17
- package/dist/src/conversation-manager/summarizing-conversation-manager.js.map +1 -1
- package/dist/src/hooks/__tests__/events.test.js +99 -12
- package/dist/src/hooks/__tests__/events.test.js.map +1 -1
- package/dist/src/hooks/__tests__/registry.test.js +166 -2
- package/dist/src/hooks/__tests__/registry.test.js.map +1 -1
- package/dist/src/hooks/events.d.ts +102 -30
- package/dist/src/hooks/events.d.ts.map +1 -1
- package/dist/src/hooks/events.js +87 -6
- package/dist/src/hooks/events.js.map +1 -1
- package/dist/src/hooks/index.d.ts +3 -2
- package/dist/src/hooks/index.d.ts.map +1 -1
- package/dist/src/hooks/index.js +1 -0
- package/dist/src/hooks/index.js.map +1 -1
- package/dist/src/hooks/registry.d.ts +12 -12
- package/dist/src/hooks/registry.d.ts.map +1 -1
- package/dist/src/hooks/registry.js +55 -15
- package/dist/src/hooks/registry.js.map +1 -1
- package/dist/src/hooks/types.d.ts +23 -0
- package/dist/src/hooks/types.d.ts.map +1 -1
- package/dist/src/hooks/types.js +17 -1
- package/dist/src/hooks/types.js.map +1 -1
- package/dist/src/index.d.ts +9 -5
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +4 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/interrupt.d.ts +220 -0
- package/dist/src/interrupt.d.ts.map +1 -0
- package/dist/src/interrupt.js +274 -0
- package/dist/src/interrupt.js.map +1 -0
- package/dist/src/mcp.d.ts +23 -2
- package/dist/src/mcp.d.ts.map +1 -1
- package/dist/src/mcp.js +77 -18
- package/dist/src/mcp.js.map +1 -1
- package/dist/src/models/__tests__/anthropic.test.js +55 -0
- package/dist/src/models/__tests__/anthropic.test.js.map +1 -1
- package/dist/src/models/__tests__/bedrock.test.js +115 -0
- package/dist/src/models/__tests__/bedrock.test.js.map +1 -1
- package/dist/src/models/__tests__/defaults.test.d.ts +2 -0
- package/dist/src/models/__tests__/defaults.test.d.ts.map +1 -0
- package/dist/src/models/__tests__/defaults.test.js +36 -0
- package/dist/src/models/__tests__/defaults.test.js.map +1 -0
- package/dist/src/models/__tests__/google.test.js +58 -0
- package/dist/src/models/__tests__/google.test.js.map +1 -1
- package/dist/src/models/anthropic.d.ts +8 -0
- package/dist/src/models/anthropic.d.ts.map +1 -1
- package/dist/src/models/anthropic.js +4 -2
- package/dist/src/models/anthropic.js.map +1 -1
- package/dist/src/models/bedrock.d.ts +15 -0
- package/dist/src/models/bedrock.d.ts.map +1 -1
- package/dist/src/models/bedrock.js +58 -4
- package/dist/src/models/bedrock.js.map +1 -1
- package/dist/src/models/defaults.d.ts +10 -0
- package/dist/src/models/defaults.d.ts.map +1 -1
- package/dist/src/models/defaults.js +129 -0
- package/dist/src/models/defaults.js.map +1 -1
- package/dist/src/models/google/model.d.ts.map +1 -1
- package/dist/src/models/google/model.js +4 -2
- package/dist/src/models/google/model.js.map +1 -1
- package/dist/src/models/google/types.d.ts +8 -0
- package/dist/src/models/google/types.d.ts.map +1 -1
- package/dist/src/models/model.d.ts +15 -0
- package/dist/src/models/model.d.ts.map +1 -1
- package/dist/src/models/model.js +18 -0
- package/dist/src/models/model.js.map +1 -1
- package/dist/src/models/openai/__tests__/chat.test.js +45 -0
- package/dist/src/models/openai/__tests__/chat.test.js.map +1 -1
- package/dist/src/models/openai/model.d.ts.map +1 -1
- package/dist/src/models/openai/model.js +2 -2
- package/dist/src/models/openai/model.js.map +1 -1
- package/dist/src/multiagent/__tests__/graph.test.js +69 -0
- package/dist/src/multiagent/__tests__/graph.test.js.map +1 -1
- package/dist/src/multiagent/__tests__/nodes.test.js +13 -0
- package/dist/src/multiagent/__tests__/nodes.test.js.map +1 -1
- package/dist/src/multiagent/__tests__/swarm.test.js +77 -0
- package/dist/src/multiagent/__tests__/swarm.test.js.map +1 -1
- package/dist/src/multiagent/graph.d.ts +22 -2
- package/dist/src/multiagent/graph.d.ts.map +1 -1
- package/dist/src/multiagent/graph.js +42 -3
- package/dist/src/multiagent/graph.js.map +1 -1
- package/dist/src/multiagent/multiagent.d.ts +5 -3
- package/dist/src/multiagent/multiagent.d.ts.map +1 -1
- package/dist/src/multiagent/nodes.d.ts +18 -0
- package/dist/src/multiagent/nodes.d.ts.map +1 -1
- package/dist/src/multiagent/nodes.js +14 -1
- package/dist/src/multiagent/nodes.js.map +1 -1
- package/dist/src/multiagent/swarm.d.ts +15 -1
- package/dist/src/multiagent/swarm.d.ts.map +1 -1
- package/dist/src/multiagent/swarm.js +46 -3
- package/dist/src/multiagent/swarm.js.map +1 -1
- package/dist/src/registry/__tests__/tool-registry.test.js +11 -0
- package/dist/src/registry/__tests__/tool-registry.test.js.map +1 -1
- package/dist/src/registry/tool-registry.d.ts +4 -0
- package/dist/src/registry/tool-registry.d.ts.map +1 -1
- package/dist/src/registry/tool-registry.js +6 -0
- package/dist/src/registry/tool-registry.js.map +1 -1
- package/dist/src/retry/__tests__/backoff-strategy.test.d.ts +2 -0
- package/dist/src/retry/__tests__/backoff-strategy.test.d.ts.map +1 -0
- package/dist/src/retry/__tests__/backoff-strategy.test.js +116 -0
- package/dist/src/retry/__tests__/backoff-strategy.test.js.map +1 -0
- package/dist/src/retry/__tests__/default-model-retry-strategy.test.d.ts +2 -0
- package/dist/src/retry/__tests__/default-model-retry-strategy.test.d.ts.map +1 -0
- package/dist/src/retry/__tests__/default-model-retry-strategy.test.js +225 -0
- package/dist/src/retry/__tests__/default-model-retry-strategy.test.js.map +1 -0
- package/dist/src/retry/backoff-strategy.d.ts +108 -0
- package/dist/src/retry/backoff-strategy.d.ts.map +1 -0
- package/dist/src/retry/backoff-strategy.js +86 -0
- package/dist/src/retry/backoff-strategy.js.map +1 -0
- package/dist/src/retry/default-model-retry-strategy.d.ts +76 -0
- package/dist/src/retry/default-model-retry-strategy.d.ts.map +1 -0
- package/dist/src/retry/default-model-retry-strategy.js +104 -0
- package/dist/src/retry/default-model-retry-strategy.js.map +1 -0
- package/dist/src/retry/index.d.ts +8 -0
- package/dist/src/retry/index.d.ts.map +1 -0
- package/dist/src/retry/index.js +7 -0
- package/dist/src/retry/index.js.map +1 -0
- package/dist/src/retry/model-retry-strategy.d.ts +80 -0
- package/dist/src/retry/model-retry-strategy.d.ts.map +1 -0
- package/dist/src/retry/model-retry-strategy.js +85 -0
- package/dist/src/retry/model-retry-strategy.js.map +1 -0
- package/dist/src/retry/retry-strategy.d.ts +34 -0
- package/dist/src/retry/retry-strategy.d.ts.map +1 -0
- package/dist/src/retry/retry-strategy.js +25 -0
- package/dist/src/retry/retry-strategy.js.map +1 -0
- package/dist/src/session/__tests__/session-manager.test.js +39 -0
- package/dist/src/session/__tests__/session-manager.test.js.map +1 -1
- package/dist/src/session/session-manager.d.ts +6 -0
- package/dist/src/session/session-manager.d.ts.map +1 -1
- package/dist/src/session/session-manager.js +8 -0
- package/dist/src/session/session-manager.js.map +1 -1
- package/dist/src/tools/__tests__/tool.test.js +24 -1
- package/dist/src/tools/__tests__/tool.test.js.map +1 -1
- package/dist/src/tools/function-tool.d.ts.map +1 -1
- package/dist/src/tools/function-tool.js +6 -1
- package/dist/src/tools/function-tool.js.map +1 -1
- package/dist/src/tools/tool.d.ts +10 -1
- package/dist/src/tools/tool.d.ts.map +1 -1
- package/dist/src/tools/tool.js +12 -0
- package/dist/src/tools/tool.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/types/agent.d.ts +22 -3
- package/dist/src/types/agent.d.ts.map +1 -1
- package/dist/src/types/agent.js +8 -0
- package/dist/src/types/agent.js.map +1 -1
- package/dist/src/types/interrupt.d.ts +103 -0
- package/dist/src/types/interrupt.d.ts.map +1 -0
- package/dist/src/types/interrupt.js +63 -0
- package/dist/src/types/interrupt.js.map +1 -0
- package/dist/src/types/messages.d.ts +2 -1
- package/dist/src/types/messages.d.ts.map +1 -1
- package/dist/src/types/messages.js.map +1 -1
- package/dist/src/vended-plugins/context-offloader/__tests__/plugin.test.d.ts +2 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/plugin.test.d.ts.map +1 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/plugin.test.js +292 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/plugin.test.js.map +1 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.d.ts +2 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.d.ts.map +1 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.js +148 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.js.map +1 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.node.d.ts +2 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.node.d.ts.map +1 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.node.js +78 -0
- package/dist/src/vended-plugins/context-offloader/__tests__/storage.test.node.js.map +1 -0
- package/dist/src/vended-plugins/context-offloader/index.d.ts +23 -0
- package/dist/src/vended-plugins/context-offloader/index.d.ts.map +1 -0
- package/dist/src/vended-plugins/context-offloader/index.js +21 -0
- package/dist/src/vended-plugins/context-offloader/index.js.map +1 -0
- package/dist/src/vended-plugins/context-offloader/plugin.d.ts +48 -0
- package/dist/src/vended-plugins/context-offloader/plugin.d.ts.map +1 -0
- package/dist/src/vended-plugins/context-offloader/plugin.js +244 -0
- package/dist/src/vended-plugins/context-offloader/plugin.js.map +1 -0
- package/dist/src/vended-plugins/context-offloader/storage.d.ts +114 -0
- package/dist/src/vended-plugins/context-offloader/storage.d.ts.map +1 -0
- package/dist/src/vended-plugins/context-offloader/storage.js +204 -0
- package/dist/src/vended-plugins/context-offloader/storage.js.map +1 -0
- package/dist/src/vended-plugins/skills/__tests__/agent-skills.test.node.js +12 -0
- package/dist/src/vended-plugins/skills/__tests__/agent-skills.test.node.js.map +1 -1
- package/dist/src/vended-tools/bash/__tests__/bash.test.node.js +3 -0
- package/dist/src/vended-tools/bash/__tests__/bash.test.node.js.map +1 -1
- package/dist/src/vended-tools/bash/bash.d.ts.map +1 -1
- package/dist/src/vended-tools/bash/bash.js +0 -3
- package/dist/src/vended-tools/bash/bash.js.map +1 -1
- package/dist/src/vended-tools/file-editor/__tests__/file-editor.test.node.js +3 -0
- package/dist/src/vended-tools/file-editor/__tests__/file-editor.test.node.js.map +1 -1
- package/dist/src/vended-tools/notebook/__tests__/notebook.test.js +3 -0
- package/dist/src/vended-tools/notebook/__tests__/notebook.test.js.map +1 -1
- package/package.json +9 -5
|
@@ -0,0 +1,730 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { Agent } from '../agent.js';
|
|
3
|
+
import { MockMessageModel } from '../../__fixtures__/mock-message-model.js';
|
|
4
|
+
import { createMockTool } from '../../__fixtures__/tool-helpers.js';
|
|
5
|
+
import { ToolResultBlock } from '../../types/messages.js';
|
|
6
|
+
import { AfterToolCallEvent, BeforeToolCallEvent, BeforeToolsEvent } from '../../hooks/events.js';
|
|
7
|
+
import { FunctionTool } from '../../tools/function-tool.js';
|
|
8
|
+
import { InterruptResponseContent } from '../../types/interrupt.js';
|
|
9
|
+
/** Access the agent's internal interrupt state for test assertions. */
|
|
10
|
+
function getPendingToolExecution(agent) {
|
|
11
|
+
// yes it's dirty, but we don't want to expose this publicly
|
|
12
|
+
return agent._interruptState.pendingToolExecution;
|
|
13
|
+
}
|
|
14
|
+
describe('Agent interrupt system', () => {
|
|
15
|
+
describe('interrupt from tool callback', () => {
|
|
16
|
+
it('returns stopReason interrupt when tool calls interrupt()', async () => {
|
|
17
|
+
// Model returns tool use first, then text block (following standard test pattern)
|
|
18
|
+
const model = new MockMessageModel()
|
|
19
|
+
.addTurn({
|
|
20
|
+
type: 'toolUseBlock',
|
|
21
|
+
name: 'confirmTool',
|
|
22
|
+
toolUseId: 'tool-1',
|
|
23
|
+
input: {},
|
|
24
|
+
})
|
|
25
|
+
.addTurn({ type: 'textBlock', text: 'Should not reach this' });
|
|
26
|
+
const tool = createMockTool('confirmTool', (context) => {
|
|
27
|
+
context.interrupt({ name: 'confirm', reason: 'Please confirm' });
|
|
28
|
+
});
|
|
29
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
30
|
+
const result = await agent.invoke('Test');
|
|
31
|
+
expect(result).toMatchObject({
|
|
32
|
+
stopReason: 'interrupt',
|
|
33
|
+
interrupts: [{ name: 'confirm', reason: 'Please confirm' }],
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
describe('interrupt from BeforeToolCallEvent hook', () => {
|
|
38
|
+
it('returns stopReason interrupt when hook calls interrupt()', async () => {
|
|
39
|
+
// Model returns tool use first, then text block (following standard test pattern)
|
|
40
|
+
const model = new MockMessageModel()
|
|
41
|
+
.addTurn({
|
|
42
|
+
type: 'toolUseBlock',
|
|
43
|
+
name: 'testTool',
|
|
44
|
+
toolUseId: 'tool-1',
|
|
45
|
+
input: {},
|
|
46
|
+
})
|
|
47
|
+
.addTurn({ type: 'textBlock', text: 'Should not reach this' });
|
|
48
|
+
const tool = createMockTool('testTool', () => 'Success');
|
|
49
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
50
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
51
|
+
if (event.toolUse.name === 'testTool') {
|
|
52
|
+
event.interrupt({ name: 'confirm_tool', reason: 'Confirm tool execution?' });
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
const result = await agent.invoke('Test');
|
|
56
|
+
expect(result).toMatchObject({
|
|
57
|
+
stopReason: 'interrupt',
|
|
58
|
+
interrupts: [{ name: 'confirm_tool', reason: 'Confirm tool execution?' }],
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
it('stores pending state and resumes correctly after interrupt', async () => {
|
|
62
|
+
const model = new MockMessageModel()
|
|
63
|
+
.addTurn({
|
|
64
|
+
type: 'toolUseBlock',
|
|
65
|
+
name: 'deleteTool',
|
|
66
|
+
toolUseId: 'tool-1',
|
|
67
|
+
input: { key: 'X' },
|
|
68
|
+
})
|
|
69
|
+
.addTurn({ type: 'textBlock', text: 'Deleted' });
|
|
70
|
+
let toolExecuted = false;
|
|
71
|
+
const tool = createMockTool('deleteTool', () => {
|
|
72
|
+
toolExecuted = true;
|
|
73
|
+
return 'deleted';
|
|
74
|
+
});
|
|
75
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
76
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
77
|
+
if (event.toolUse.name === 'deleteTool') {
|
|
78
|
+
const approval = event.interrupt({ name: 'approve_delete', reason: 'Confirm delete?' });
|
|
79
|
+
if (approval !== 'yes') {
|
|
80
|
+
event.cancel = 'not approved';
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
// First invocation — hook interrupts before tool runs
|
|
85
|
+
const interruptResult = await agent.invoke('Delete X');
|
|
86
|
+
expect(interruptResult.stopReason).toBe('interrupt');
|
|
87
|
+
expect(interruptResult.interrupts).toEqual([
|
|
88
|
+
{ id: expect.any(String), name: 'approve_delete', reason: 'Confirm delete?' },
|
|
89
|
+
]);
|
|
90
|
+
expect(toolExecuted).toBe(false);
|
|
91
|
+
expect(model.callCount).toBe(1);
|
|
92
|
+
// Verify pending execution state was stored (the core of pgrayy's concern:
|
|
93
|
+
// the InterruptError thrown back into the generator at `yield beforeToolCallEvent`
|
|
94
|
+
// must propagate to executeTools' catch block which stores this state)
|
|
95
|
+
const pendingExecution = getPendingToolExecution(agent);
|
|
96
|
+
expect(pendingExecution).toEqual({
|
|
97
|
+
assistantMessageData: {
|
|
98
|
+
role: 'assistant',
|
|
99
|
+
content: [{ toolUse: { name: 'deleteTool', toolUseId: 'tool-1', input: { key: 'X' } } }],
|
|
100
|
+
},
|
|
101
|
+
completedToolResults: {},
|
|
102
|
+
});
|
|
103
|
+
// Resume with approval — tool should now execute
|
|
104
|
+
const finalResult = await agent.invoke([
|
|
105
|
+
new InterruptResponseContent({
|
|
106
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
107
|
+
response: 'yes',
|
|
108
|
+
}),
|
|
109
|
+
]);
|
|
110
|
+
expect(finalResult.stopReason).toBe('endTurn');
|
|
111
|
+
expect(toolExecuted).toBe(true);
|
|
112
|
+
expect(model.callCount).toBe(2);
|
|
113
|
+
});
|
|
114
|
+
it('preserves completed tool results when interrupt fires on a later tool', async () => {
|
|
115
|
+
// Tools A, B, C — hook interrupts on B's BeforeToolCallEvent
|
|
116
|
+
// A should complete, B and C should not execute
|
|
117
|
+
// On resume, A is skipped, B and C execute
|
|
118
|
+
const model = new MockMessageModel()
|
|
119
|
+
.addTurn([
|
|
120
|
+
{ type: 'toolUseBlock', name: 'toolA', toolUseId: 'tool-a', input: {} },
|
|
121
|
+
{ type: 'toolUseBlock', name: 'toolB', toolUseId: 'tool-b', input: {} },
|
|
122
|
+
{ type: 'toolUseBlock', name: 'toolC', toolUseId: 'tool-c', input: {} },
|
|
123
|
+
])
|
|
124
|
+
.addTurn({ type: 'textBlock', text: 'All done' });
|
|
125
|
+
const executionLog = [];
|
|
126
|
+
const toolA = createMockTool('toolA', () => {
|
|
127
|
+
executionLog.push('A');
|
|
128
|
+
return 'A result';
|
|
129
|
+
});
|
|
130
|
+
const toolB = createMockTool('toolB', () => {
|
|
131
|
+
executionLog.push('B');
|
|
132
|
+
return 'B result';
|
|
133
|
+
});
|
|
134
|
+
const toolC = createMockTool('toolC', () => {
|
|
135
|
+
executionLog.push('C');
|
|
136
|
+
return 'C result';
|
|
137
|
+
});
|
|
138
|
+
const agent = new Agent({ model, tools: [toolA, toolB, toolC], toolExecutor: 'sequential', printer: false });
|
|
139
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
140
|
+
if (event.toolUse.name === 'toolB') {
|
|
141
|
+
event.interrupt({ name: 'approve_b', reason: 'Approve B?' });
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
const interruptResult = await agent.invoke('Run all');
|
|
145
|
+
expect(interruptResult.stopReason).toBe('interrupt');
|
|
146
|
+
expect(executionLog).toEqual(['A']);
|
|
147
|
+
// Verify pending state includes A's completed result
|
|
148
|
+
const pendingExecution = getPendingToolExecution(agent);
|
|
149
|
+
expect(Object.keys(pendingExecution.completedToolResults)).toEqual(['tool-a']);
|
|
150
|
+
expect(pendingExecution.completedToolResults['tool-a'].toolResult.toolUseId).toBe('tool-a');
|
|
151
|
+
// Resume — A should be skipped, B and C should execute
|
|
152
|
+
const finalResult = await agent.invoke([
|
|
153
|
+
new InterruptResponseContent({
|
|
154
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
155
|
+
response: 'approved',
|
|
156
|
+
}),
|
|
157
|
+
]);
|
|
158
|
+
expect(finalResult.stopReason).toBe('endTurn');
|
|
159
|
+
expect(executionLog).toEqual(['A', 'B', 'C']);
|
|
160
|
+
expect(model.callCount).toBe(2);
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
describe('interrupt from BeforeToolsEvent hook', () => {
|
|
164
|
+
it('returns stopReason interrupt when hook calls interrupt()', async () => {
|
|
165
|
+
// Model returns tool use first, then text block (following standard test pattern)
|
|
166
|
+
const model = new MockMessageModel()
|
|
167
|
+
.addTurn({
|
|
168
|
+
type: 'toolUseBlock',
|
|
169
|
+
name: 'testTool',
|
|
170
|
+
toolUseId: 'tool-1',
|
|
171
|
+
input: {},
|
|
172
|
+
})
|
|
173
|
+
.addTurn({ type: 'textBlock', text: 'Should not reach this' });
|
|
174
|
+
const tool = createMockTool('testTool', () => 'Success');
|
|
175
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
176
|
+
agent.addHook(BeforeToolsEvent, (event) => {
|
|
177
|
+
event.interrupt({ name: 'batch_approval', reason: 'Approve all tools?' });
|
|
178
|
+
});
|
|
179
|
+
const result = await agent.invoke('Test');
|
|
180
|
+
expect(result).toMatchObject({
|
|
181
|
+
stopReason: 'interrupt',
|
|
182
|
+
interrupts: [{ name: 'batch_approval', reason: 'Approve all tools?' }],
|
|
183
|
+
});
|
|
184
|
+
});
|
|
185
|
+
});
|
|
186
|
+
describe('resume flow - interrupt → response → continue', () => {
|
|
187
|
+
it('resumes tool callback execution without re-calling model', async () => {
|
|
188
|
+
// Turn 0: Model returns tool use (will be interrupted)
|
|
189
|
+
// Turn 1: Model returns final response (after tool completes on resume)
|
|
190
|
+
// Note: Resume skips model call and uses stored message
|
|
191
|
+
const model = new MockMessageModel()
|
|
192
|
+
.addTurn({
|
|
193
|
+
type: 'toolUseBlock',
|
|
194
|
+
name: 'confirmTool',
|
|
195
|
+
toolUseId: 'tool-1',
|
|
196
|
+
input: { amount: 5000 },
|
|
197
|
+
})
|
|
198
|
+
.addTurn({ type: 'textBlock', text: 'Transfer completed' });
|
|
199
|
+
let callCount = 0;
|
|
200
|
+
let receivedResponse;
|
|
201
|
+
const tool = new FunctionTool({
|
|
202
|
+
name: 'confirmTool',
|
|
203
|
+
description: 'Tool that requires confirmation',
|
|
204
|
+
inputSchema: {
|
|
205
|
+
type: 'object',
|
|
206
|
+
properties: { amount: { type: 'number' } },
|
|
207
|
+
},
|
|
208
|
+
callback: (rawInput, context) => {
|
|
209
|
+
callCount++;
|
|
210
|
+
const input = rawInput;
|
|
211
|
+
const response = context.interrupt({
|
|
212
|
+
name: 'confirm_transfer',
|
|
213
|
+
reason: `Confirm transfer of $${input.amount}?`,
|
|
214
|
+
});
|
|
215
|
+
receivedResponse = response;
|
|
216
|
+
return response?.approved ? 'Transfer approved' : 'Transfer denied';
|
|
217
|
+
},
|
|
218
|
+
});
|
|
219
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
220
|
+
// First invocation - triggers interrupt
|
|
221
|
+
const interruptResult = await agent.invoke('Transfer $5000');
|
|
222
|
+
expect(interruptResult).toMatchObject({
|
|
223
|
+
stopReason: 'interrupt',
|
|
224
|
+
interrupts: [{ name: 'confirm_transfer', reason: 'Confirm transfer of $5000?' }],
|
|
225
|
+
});
|
|
226
|
+
expect(callCount).toBe(1); // Tool was called once before interrupt
|
|
227
|
+
expect(model.callCount).toBe(1); // Model was called once
|
|
228
|
+
// Resume with user response
|
|
229
|
+
const finalResult = await agent.invoke([
|
|
230
|
+
new InterruptResponseContent({
|
|
231
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
232
|
+
response: { approved: true },
|
|
233
|
+
}),
|
|
234
|
+
]);
|
|
235
|
+
expect(finalResult.stopReason).toBe('endTurn');
|
|
236
|
+
expect(receivedResponse).toEqual({ approved: true });
|
|
237
|
+
expect(callCount).toBe(2);
|
|
238
|
+
expect(model.callCount).toBe(2);
|
|
239
|
+
// Verify tool result was added to messages
|
|
240
|
+
const toolResultMessage = agent.messages.find((m) => m.role === 'user' && m.content.some((b) => b.type === 'toolResultBlock'));
|
|
241
|
+
expect(toolResultMessage).toBeDefined();
|
|
242
|
+
const toolResult = toolResultMessage?.content.find((b) => b.type === 'toolResultBlock');
|
|
243
|
+
expect(toolResult?.content[0]).toMatchObject({ type: 'textBlock', text: 'Transfer approved' });
|
|
244
|
+
});
|
|
245
|
+
it('skips already-completed tools when resuming from partial execution', async () => {
|
|
246
|
+
// Scenario: Tools A, B, C where A & B succeed but C interrupts
|
|
247
|
+
// On resume: A & B should NOT re-execute, only C should execute
|
|
248
|
+
const model = new MockMessageModel()
|
|
249
|
+
.addTurn([
|
|
250
|
+
{ type: 'toolUseBlock', name: 'toolA', toolUseId: 'tool-a', input: {} },
|
|
251
|
+
{ type: 'toolUseBlock', name: 'toolB', toolUseId: 'tool-b', input: {} },
|
|
252
|
+
{ type: 'toolUseBlock', name: 'toolC', toolUseId: 'tool-c', input: {} },
|
|
253
|
+
])
|
|
254
|
+
.addTurn({ type: 'textBlock', text: 'All tools completed' });
|
|
255
|
+
const executionLog = [];
|
|
256
|
+
const toolA = createMockTool('toolA', () => {
|
|
257
|
+
executionLog.push('A');
|
|
258
|
+
return 'A result';
|
|
259
|
+
});
|
|
260
|
+
const toolB = createMockTool('toolB', () => {
|
|
261
|
+
executionLog.push('B');
|
|
262
|
+
return 'B result';
|
|
263
|
+
});
|
|
264
|
+
const toolC = createMockTool('toolC', (context) => {
|
|
265
|
+
const response = context.interrupt({
|
|
266
|
+
name: 'confirm_c',
|
|
267
|
+
reason: 'Confirm tool C?',
|
|
268
|
+
});
|
|
269
|
+
executionLog.push('C');
|
|
270
|
+
return response?.approved ? 'C approved' : 'C denied';
|
|
271
|
+
});
|
|
272
|
+
const agent = new Agent({ model, tools: [toolA, toolB, toolC], printer: false });
|
|
273
|
+
// First invocation - A & B execute, C interrupts
|
|
274
|
+
const interruptResult = await agent.invoke('Run all tools');
|
|
275
|
+
expect(interruptResult).toMatchObject({
|
|
276
|
+
stopReason: 'interrupt',
|
|
277
|
+
interrupts: [{ name: 'confirm_c', reason: 'Confirm tool C?' }],
|
|
278
|
+
});
|
|
279
|
+
expect(executionLog).toEqual(['A', 'B']);
|
|
280
|
+
expect(model.callCount).toBe(1);
|
|
281
|
+
// Resume with response for C
|
|
282
|
+
const finalResult = await agent.invoke([
|
|
283
|
+
new InterruptResponseContent({
|
|
284
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
285
|
+
response: { approved: true },
|
|
286
|
+
}),
|
|
287
|
+
]);
|
|
288
|
+
expect(finalResult.stopReason).toBe('endTurn');
|
|
289
|
+
expect(executionLog).toEqual(['A', 'B', 'C']);
|
|
290
|
+
expect(model.callCount).toBe(2);
|
|
291
|
+
// Verify all tool results are present in messages
|
|
292
|
+
const toolResultMessage = agent.messages.find((m) => m.role === 'user' && m.content.filter((b) => b.type === 'toolResultBlock').length === 3);
|
|
293
|
+
expect(toolResultMessage).toBeDefined();
|
|
294
|
+
});
|
|
295
|
+
it('throws TypeError when sending a new message while in interrupted state', async () => {
|
|
296
|
+
const model = new MockMessageModel()
|
|
297
|
+
.addTurn({
|
|
298
|
+
type: 'toolUseBlock',
|
|
299
|
+
name: 'confirmTool',
|
|
300
|
+
toolUseId: 'tool-1',
|
|
301
|
+
input: {},
|
|
302
|
+
})
|
|
303
|
+
.addTurn({ type: 'textBlock', text: 'Different response' });
|
|
304
|
+
const tool = createMockTool('confirmTool', (context) => {
|
|
305
|
+
context.interrupt({ name: 'confirm', reason: 'Confirm?' });
|
|
306
|
+
});
|
|
307
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
308
|
+
// First invocation - triggers interrupt
|
|
309
|
+
const interruptResult = await agent.invoke('First message');
|
|
310
|
+
expect(interruptResult).toMatchObject({ stopReason: 'interrupt' });
|
|
311
|
+
// Sending a new message instead of interrupt responses should throw
|
|
312
|
+
await expect(agent.invoke('Different question')).rejects.toThrow(TypeError);
|
|
313
|
+
await expect(agent.invoke('Different question')).rejects.toThrow('Agent is in an interrupted state');
|
|
314
|
+
});
|
|
315
|
+
});
|
|
316
|
+
describe('error handling', () => {
|
|
317
|
+
it('throws error when interrupt() called on event with non-Agent implementation', async () => {
|
|
318
|
+
const mockLocalAgent = { id: 'mock' };
|
|
319
|
+
const event = new BeforeToolCallEvent({
|
|
320
|
+
agent: mockLocalAgent,
|
|
321
|
+
toolUse: { name: 'test', toolUseId: 'id', input: {} },
|
|
322
|
+
tool: undefined,
|
|
323
|
+
invocationState: {},
|
|
324
|
+
});
|
|
325
|
+
expect(() => {
|
|
326
|
+
event.interrupt({ name: 'test', reason: 'test' });
|
|
327
|
+
}).toThrow('Interrupt state not available');
|
|
328
|
+
});
|
|
329
|
+
it('throws TypeError when interrupt responses are mixed with other content blocks', async () => {
|
|
330
|
+
const model = new MockMessageModel()
|
|
331
|
+
.addTurn({
|
|
332
|
+
type: 'toolUseBlock',
|
|
333
|
+
name: 'confirmTool',
|
|
334
|
+
toolUseId: 'tool-1',
|
|
335
|
+
input: {},
|
|
336
|
+
})
|
|
337
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
338
|
+
const tool = createMockTool('confirmTool', (context) => {
|
|
339
|
+
context.interrupt({ name: 'confirm', reason: 'Confirm?' });
|
|
340
|
+
});
|
|
341
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
342
|
+
// First invocation - triggers interrupt
|
|
343
|
+
const interruptResult = await agent.invoke('Test');
|
|
344
|
+
expect(interruptResult.stopReason).toBe('interrupt');
|
|
345
|
+
// Resume with mixed content: interrupt response + text block
|
|
346
|
+
await expect(agent.invoke([
|
|
347
|
+
new InterruptResponseContent({
|
|
348
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
349
|
+
response: 'yes',
|
|
350
|
+
}),
|
|
351
|
+
{ type: 'textBlock', text: 'extra text' },
|
|
352
|
+
])).rejects.toThrow(TypeError);
|
|
353
|
+
await expect(agent.invoke([
|
|
354
|
+
new InterruptResponseContent({
|
|
355
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
356
|
+
response: 'yes',
|
|
357
|
+
}),
|
|
358
|
+
{ type: 'textBlock', text: 'extra text' },
|
|
359
|
+
])).rejects.toThrow('Must resume from interrupt with a list of interruptResponse content blocks only');
|
|
360
|
+
});
|
|
361
|
+
it('allows pure interrupt response arrays without error', async () => {
|
|
362
|
+
const model = new MockMessageModel()
|
|
363
|
+
.addTurn({
|
|
364
|
+
type: 'toolUseBlock',
|
|
365
|
+
name: 'confirmTool',
|
|
366
|
+
toolUseId: 'tool-1',
|
|
367
|
+
input: {},
|
|
368
|
+
})
|
|
369
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
370
|
+
const tool = createMockTool('confirmTool', (context) => {
|
|
371
|
+
const response = context.interrupt({ name: 'confirm', reason: 'Confirm?' });
|
|
372
|
+
return `Got: ${response}`;
|
|
373
|
+
});
|
|
374
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
375
|
+
const interruptResult = await agent.invoke('Test');
|
|
376
|
+
expect(interruptResult.stopReason).toBe('interrupt');
|
|
377
|
+
// Resume with pure interrupt responses — should succeed
|
|
378
|
+
const finalResult = await agent.invoke([
|
|
379
|
+
new InterruptResponseContent({
|
|
380
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
381
|
+
response: 'approved',
|
|
382
|
+
}),
|
|
383
|
+
]);
|
|
384
|
+
expect(finalResult.stopReason).toBe('endTurn');
|
|
385
|
+
});
|
|
386
|
+
});
|
|
387
|
+
describe('multiple hook interrupts', () => {
|
|
388
|
+
it('collects interrupts from multiple BeforeToolCallEvent hooks', async () => {
|
|
389
|
+
const model = new MockMessageModel()
|
|
390
|
+
.addTurn({
|
|
391
|
+
type: 'toolUseBlock',
|
|
392
|
+
name: 'testTool',
|
|
393
|
+
toolUseId: 'tool-1',
|
|
394
|
+
input: {},
|
|
395
|
+
})
|
|
396
|
+
.addTurn({ type: 'textBlock', text: 'Should not reach this' });
|
|
397
|
+
const tool = createMockTool('testTool', () => 'Success');
|
|
398
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
399
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
400
|
+
event.interrupt({ name: 'security_check', reason: 'Security review required' });
|
|
401
|
+
});
|
|
402
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
403
|
+
event.interrupt({ name: 'budget_check', reason: 'Budget approval required' });
|
|
404
|
+
});
|
|
405
|
+
const result = await agent.invoke('Test');
|
|
406
|
+
expect(result).toMatchObject({
|
|
407
|
+
stopReason: 'interrupt',
|
|
408
|
+
interrupts: expect.arrayContaining([
|
|
409
|
+
expect.objectContaining({ name: 'security_check', reason: 'Security review required' }),
|
|
410
|
+
expect.objectContaining({ name: 'budget_check', reason: 'Budget approval required' }),
|
|
411
|
+
]),
|
|
412
|
+
});
|
|
413
|
+
});
|
|
414
|
+
it('collects interrupts from multiple BeforeToolsEvent hooks', async () => {
|
|
415
|
+
const model = new MockMessageModel()
|
|
416
|
+
.addTurn({
|
|
417
|
+
type: 'toolUseBlock',
|
|
418
|
+
name: 'testTool',
|
|
419
|
+
toolUseId: 'tool-1',
|
|
420
|
+
input: {},
|
|
421
|
+
})
|
|
422
|
+
.addTurn({ type: 'textBlock', text: 'Should not reach this' });
|
|
423
|
+
const tool = createMockTool('testTool', () => 'Success');
|
|
424
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
425
|
+
agent.addHook(BeforeToolsEvent, (event) => {
|
|
426
|
+
event.interrupt({ name: 'approval_a', reason: 'First approval' });
|
|
427
|
+
});
|
|
428
|
+
agent.addHook(BeforeToolsEvent, (event) => {
|
|
429
|
+
event.interrupt({ name: 'approval_b', reason: 'Second approval' });
|
|
430
|
+
});
|
|
431
|
+
const result = await agent.invoke('Test');
|
|
432
|
+
expect(result).toMatchObject({
|
|
433
|
+
stopReason: 'interrupt',
|
|
434
|
+
interrupts: expect.arrayContaining([
|
|
435
|
+
expect.objectContaining({ name: 'approval_a', reason: 'First approval' }),
|
|
436
|
+
expect.objectContaining({ name: 'approval_b', reason: 'Second approval' }),
|
|
437
|
+
]),
|
|
438
|
+
});
|
|
439
|
+
});
|
|
440
|
+
it('resumes correctly after multiple interrupts are answered', async () => {
|
|
441
|
+
const model = new MockMessageModel()
|
|
442
|
+
.addTurn({
|
|
443
|
+
type: 'toolUseBlock',
|
|
444
|
+
name: 'testTool',
|
|
445
|
+
toolUseId: 'tool-1',
|
|
446
|
+
input: {},
|
|
447
|
+
})
|
|
448
|
+
.addTurn({ type: 'textBlock', text: 'All approved' });
|
|
449
|
+
let securityResponse;
|
|
450
|
+
let budgetResponse;
|
|
451
|
+
let hookCallCount = 0;
|
|
452
|
+
const tool = createMockTool('testTool', () => 'Success');
|
|
453
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
454
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
455
|
+
hookCallCount++;
|
|
456
|
+
securityResponse = event.interrupt({ name: 'security_check', reason: 'Security review' });
|
|
457
|
+
});
|
|
458
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
459
|
+
hookCallCount++;
|
|
460
|
+
budgetResponse = event.interrupt({ name: 'budget_check', reason: 'Budget review' });
|
|
461
|
+
});
|
|
462
|
+
// First invocation — both hooks interrupt
|
|
463
|
+
const interruptResult = await agent.invoke('Test');
|
|
464
|
+
expect(interruptResult).toMatchObject({
|
|
465
|
+
stopReason: 'interrupt',
|
|
466
|
+
interrupts: expect.arrayContaining([
|
|
467
|
+
expect.objectContaining({ name: 'security_check' }),
|
|
468
|
+
expect.objectContaining({ name: 'budget_check' }),
|
|
469
|
+
]),
|
|
470
|
+
});
|
|
471
|
+
expect(interruptResult.interrupts).toHaveLength(2);
|
|
472
|
+
expect(hookCallCount).toBe(2);
|
|
473
|
+
expect(model.callCount).toBe(1);
|
|
474
|
+
// Resume with responses for both interrupts
|
|
475
|
+
const finalResult = await agent.invoke(interruptResult.interrupts.map((interrupt) => new InterruptResponseContent({
|
|
476
|
+
interruptId: interrupt.id,
|
|
477
|
+
response: `approved:${interrupt.name}`,
|
|
478
|
+
})));
|
|
479
|
+
expect(finalResult.stopReason).toBe('endTurn');
|
|
480
|
+
expect(model.callCount).toBe(2);
|
|
481
|
+
expect(securityResponse).toBe('approved:security_check');
|
|
482
|
+
expect(budgetResponse).toBe('approved:budget_check');
|
|
483
|
+
});
|
|
484
|
+
});
|
|
485
|
+
describe('multi-cycle interrupts', () => {
|
|
486
|
+
it('interrupts again on cycle 2 after resuming from cycle 1 (BeforeToolsEvent)', async () => {
|
|
487
|
+
// Cycle 1: model returns tool use → hook interrupts → user resumes → tool executes
|
|
488
|
+
// Cycle 2: model returns another tool use → same hook should interrupt again
|
|
489
|
+
const model = new MockMessageModel()
|
|
490
|
+
.addTurn({ type: 'toolUseBlock', name: 'testTool', toolUseId: 'tool-1', input: {} })
|
|
491
|
+
.addTurn({ type: 'toolUseBlock', name: 'testTool', toolUseId: 'tool-2', input: {} })
|
|
492
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
493
|
+
const tool = createMockTool('testTool', () => 'ok');
|
|
494
|
+
let interruptCount = 0;
|
|
495
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
496
|
+
agent.addHook(BeforeToolsEvent, (event) => {
|
|
497
|
+
interruptCount++;
|
|
498
|
+
event.interrupt({ name: 'approval', reason: 'Approve?' });
|
|
499
|
+
});
|
|
500
|
+
// Cycle 1: interrupt
|
|
501
|
+
const result1 = await agent.invoke('Go');
|
|
502
|
+
expect(result1).toMatchObject({
|
|
503
|
+
stopReason: 'interrupt',
|
|
504
|
+
interrupts: [{ name: 'approval', reason: 'Approve?' }],
|
|
505
|
+
});
|
|
506
|
+
expect(interruptCount).toBe(1);
|
|
507
|
+
// Resume cycle 1
|
|
508
|
+
const result2 = await agent.invoke(result1.interrupts.map((i) => new InterruptResponseContent({
|
|
509
|
+
interruptId: i.id,
|
|
510
|
+
response: 'yes',
|
|
511
|
+
})));
|
|
512
|
+
// Cycle 2: should interrupt again, not silently pass through
|
|
513
|
+
expect(result2).toMatchObject({ stopReason: 'interrupt' });
|
|
514
|
+
expect(interruptCount).toBe(3);
|
|
515
|
+
});
|
|
516
|
+
});
|
|
517
|
+
describe('event contract during interrupt', () => {
|
|
518
|
+
it('does not fire AfterToolCallEvent when BeforeToolCallEvent interrupt triggers', async () => {
|
|
519
|
+
const model = new MockMessageModel()
|
|
520
|
+
.addTurn({
|
|
521
|
+
type: 'toolUseBlock',
|
|
522
|
+
name: 'testTool',
|
|
523
|
+
toolUseId: 'tool-1',
|
|
524
|
+
input: {},
|
|
525
|
+
})
|
|
526
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
527
|
+
const tool = createMockTool('testTool', () => 'Success');
|
|
528
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
529
|
+
const firedEvents = [];
|
|
530
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
531
|
+
firedEvents.push('BeforeToolCallEvent');
|
|
532
|
+
event.interrupt({ name: 'confirm', reason: 'Confirm?' });
|
|
533
|
+
});
|
|
534
|
+
agent.addHook(AfterToolCallEvent, () => {
|
|
535
|
+
firedEvents.push('AfterToolCallEvent');
|
|
536
|
+
});
|
|
537
|
+
const result = await agent.invoke('Test');
|
|
538
|
+
expect(result.stopReason).toBe('interrupt');
|
|
539
|
+
expect(firedEvents).toContain('BeforeToolCallEvent');
|
|
540
|
+
expect(firedEvents).not.toContain('AfterToolCallEvent');
|
|
541
|
+
});
|
|
542
|
+
it('does not fire AfterToolCallEvent when tool callback interrupts', async () => {
|
|
543
|
+
const model = new MockMessageModel()
|
|
544
|
+
.addTurn({
|
|
545
|
+
type: 'toolUseBlock',
|
|
546
|
+
name: 'confirmTool',
|
|
547
|
+
toolUseId: 'tool-1',
|
|
548
|
+
input: {},
|
|
549
|
+
})
|
|
550
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
551
|
+
const tool = createMockTool('confirmTool', (context) => {
|
|
552
|
+
context.interrupt({ name: 'confirm', reason: 'Confirm?' });
|
|
553
|
+
});
|
|
554
|
+
const agent = new Agent({ model, tools: [tool], printer: false });
|
|
555
|
+
const firedEvents = [];
|
|
556
|
+
agent.addHook(BeforeToolCallEvent, () => {
|
|
557
|
+
firedEvents.push('BeforeToolCallEvent');
|
|
558
|
+
});
|
|
559
|
+
agent.addHook(AfterToolCallEvent, () => {
|
|
560
|
+
firedEvents.push('AfterToolCallEvent');
|
|
561
|
+
});
|
|
562
|
+
const result = await agent.invoke('Test');
|
|
563
|
+
expect(result.stopReason).toBe('interrupt');
|
|
564
|
+
expect(firedEvents).toContain('BeforeToolCallEvent');
|
|
565
|
+
expect(firedEvents).not.toContain('AfterToolCallEvent');
|
|
566
|
+
});
|
|
567
|
+
});
|
|
568
|
+
describe('concurrent tool execution with interrupts', () => {
|
|
569
|
+
it('allows in-flight tool to complete when sibling interrupts', async () => {
|
|
570
|
+
// Use gated tools to prove concurrency: A completes AFTER B interrupts,
|
|
571
|
+
// demonstrating that the executor waits for in-flight tools.
|
|
572
|
+
const model = new MockMessageModel()
|
|
573
|
+
.addTurn([
|
|
574
|
+
{ type: 'toolUseBlock', name: 'toolA', toolUseId: 'tool-a', input: {} },
|
|
575
|
+
{ type: 'toolUseBlock', name: 'toolB', toolUseId: 'tool-b', input: {} },
|
|
576
|
+
])
|
|
577
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
578
|
+
let toolACompleted = false;
|
|
579
|
+
let toolAResolve;
|
|
580
|
+
const toolAGate = new Promise((resolve) => (toolAResolve = resolve));
|
|
581
|
+
let toolAStartedResolve;
|
|
582
|
+
const toolAStarted = new Promise((resolve) => (toolAStartedResolve = resolve));
|
|
583
|
+
const toolA = new FunctionTool({
|
|
584
|
+
name: 'toolA',
|
|
585
|
+
description: 'Gated tool A',
|
|
586
|
+
inputSchema: { type: 'object', properties: {} },
|
|
587
|
+
callback: async () => {
|
|
588
|
+
toolAStartedResolve();
|
|
589
|
+
await toolAGate;
|
|
590
|
+
toolACompleted = true;
|
|
591
|
+
return 'A done';
|
|
592
|
+
},
|
|
593
|
+
});
|
|
594
|
+
const toolB = new FunctionTool({
|
|
595
|
+
name: 'toolB',
|
|
596
|
+
description: 'Interrupting tool B',
|
|
597
|
+
inputSchema: { type: 'object', properties: {} },
|
|
598
|
+
callback: (_input, context) => {
|
|
599
|
+
// Interrupt immediately — A is still in-flight
|
|
600
|
+
context.interrupt({ name: 'confirm_b', reason: 'Approve B?' });
|
|
601
|
+
return 'B done';
|
|
602
|
+
},
|
|
603
|
+
});
|
|
604
|
+
const agent = new Agent({
|
|
605
|
+
model,
|
|
606
|
+
tools: [toolA, toolB],
|
|
607
|
+
toolExecutor: 'concurrent',
|
|
608
|
+
printer: false,
|
|
609
|
+
});
|
|
610
|
+
const invocation = agent.invoke('Go');
|
|
611
|
+
// Wait for A to start (proves both tools launched concurrently)
|
|
612
|
+
await toolAStarted;
|
|
613
|
+
// B has already interrupted, but A is still in-flight
|
|
614
|
+
expect(toolACompleted).toBe(false);
|
|
615
|
+
// Release A — executor should let it finish
|
|
616
|
+
toolAResolve();
|
|
617
|
+
const result = await invocation;
|
|
618
|
+
expect(result.stopReason).toBe('interrupt');
|
|
619
|
+
expect(toolACompleted).toBe(true);
|
|
620
|
+
expect(result.interrupts).toEqual([{ id: expect.any(String), name: 'confirm_b', reason: 'Approve B?' }]);
|
|
621
|
+
// Verify A's result was captured in pending state
|
|
622
|
+
const pendingExecution = getPendingToolExecution(agent);
|
|
623
|
+
expect(pendingExecution.completedToolResults['tool-a']).toEqual({
|
|
624
|
+
toolResult: { toolUseId: 'tool-a', status: 'success', content: [{ text: 'A done' }] },
|
|
625
|
+
});
|
|
626
|
+
});
|
|
627
|
+
it('stores completed tool results and resumes only the interrupted tool', async () => {
|
|
628
|
+
const model = new MockMessageModel()
|
|
629
|
+
.addTurn([
|
|
630
|
+
{ type: 'toolUseBlock', name: 'toolA', toolUseId: 'tool-a', input: {} },
|
|
631
|
+
{ type: 'toolUseBlock', name: 'toolB', toolUseId: 'tool-b', input: {} },
|
|
632
|
+
])
|
|
633
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
634
|
+
let toolAResolve;
|
|
635
|
+
const toolAGate = new Promise((resolve) => (toolAResolve = resolve));
|
|
636
|
+
const executionLog = [];
|
|
637
|
+
const toolA = new FunctionTool({
|
|
638
|
+
name: 'toolA',
|
|
639
|
+
description: 'Gated tool A',
|
|
640
|
+
inputSchema: { type: 'object', properties: {} },
|
|
641
|
+
callback: async () => {
|
|
642
|
+
executionLog.push('A');
|
|
643
|
+
await toolAGate;
|
|
644
|
+
return 'A result';
|
|
645
|
+
},
|
|
646
|
+
});
|
|
647
|
+
const toolB = new FunctionTool({
|
|
648
|
+
name: 'toolB',
|
|
649
|
+
description: 'Interrupting tool B',
|
|
650
|
+
inputSchema: { type: 'object', properties: {} },
|
|
651
|
+
callback: (_input, context) => {
|
|
652
|
+
executionLog.push('B');
|
|
653
|
+
const response = context.interrupt({ name: 'confirm_b', reason: 'Approve?' });
|
|
654
|
+
return `B: ${response}`;
|
|
655
|
+
},
|
|
656
|
+
});
|
|
657
|
+
const agent = new Agent({
|
|
658
|
+
model,
|
|
659
|
+
tools: [toolA, toolB],
|
|
660
|
+
toolExecutor: 'concurrent',
|
|
661
|
+
printer: false,
|
|
662
|
+
});
|
|
663
|
+
// Release A immediately so it completes
|
|
664
|
+
toolAResolve();
|
|
665
|
+
const interruptResult = await agent.invoke('Go');
|
|
666
|
+
expect(interruptResult.stopReason).toBe('interrupt');
|
|
667
|
+
expect(executionLog).toEqual(['A', 'B']);
|
|
668
|
+
// Verify pending state has A's result
|
|
669
|
+
const pendingExecution = getPendingToolExecution(agent);
|
|
670
|
+
expect(Object.keys(pendingExecution.completedToolResults)).toEqual(['tool-a']);
|
|
671
|
+
// Resume — only B should re-execute
|
|
672
|
+
executionLog.length = 0;
|
|
673
|
+
const finalResult = await agent.invoke([
|
|
674
|
+
{
|
|
675
|
+
interruptResponse: {
|
|
676
|
+
interruptId: interruptResult.interrupts[0].id,
|
|
677
|
+
response: 'approved',
|
|
678
|
+
},
|
|
679
|
+
},
|
|
680
|
+
]);
|
|
681
|
+
expect(finalResult.stopReason).toBe('endTurn');
|
|
682
|
+
expect(executionLog).toEqual(['B']);
|
|
683
|
+
});
|
|
684
|
+
it('handles BeforeToolCallEvent interrupt in concurrent mode', async () => {
|
|
685
|
+
const model = new MockMessageModel()
|
|
686
|
+
.addTurn([
|
|
687
|
+
{ type: 'toolUseBlock', name: 'toolA', toolUseId: 'tool-a', input: {} },
|
|
688
|
+
{ type: 'toolUseBlock', name: 'toolB', toolUseId: 'tool-b', input: {} },
|
|
689
|
+
])
|
|
690
|
+
.addTurn({ type: 'textBlock', text: 'Done' });
|
|
691
|
+
const executionLog = [];
|
|
692
|
+
const toolA = new FunctionTool({
|
|
693
|
+
name: 'toolA',
|
|
694
|
+
description: 'Tool A',
|
|
695
|
+
inputSchema: { type: 'object', properties: {} },
|
|
696
|
+
callback: async () => {
|
|
697
|
+
executionLog.push('A');
|
|
698
|
+
return 'A result';
|
|
699
|
+
},
|
|
700
|
+
});
|
|
701
|
+
const toolB = new FunctionTool({
|
|
702
|
+
name: 'toolB',
|
|
703
|
+
description: 'Tool B',
|
|
704
|
+
inputSchema: { type: 'object', properties: {} },
|
|
705
|
+
callback: async () => {
|
|
706
|
+
executionLog.push('B');
|
|
707
|
+
return 'B result';
|
|
708
|
+
},
|
|
709
|
+
});
|
|
710
|
+
const agent = new Agent({
|
|
711
|
+
model,
|
|
712
|
+
tools: [toolA, toolB],
|
|
713
|
+
toolExecutor: 'concurrent',
|
|
714
|
+
printer: false,
|
|
715
|
+
});
|
|
716
|
+
agent.addHook(BeforeToolCallEvent, (event) => {
|
|
717
|
+
if (event.toolUse.name === 'toolB') {
|
|
718
|
+
event.interrupt({ name: 'approve_b', reason: 'Approve B?' });
|
|
719
|
+
}
|
|
720
|
+
});
|
|
721
|
+
const interruptResult = await agent.invoke('Go');
|
|
722
|
+
expect(interruptResult.stopReason).toBe('interrupt');
|
|
723
|
+
expect(interruptResult.interrupts).toEqual([{ id: expect.any(String), name: 'approve_b', reason: 'Approve B?' }]);
|
|
724
|
+
// A should have executed, B should not (interrupted before execution)
|
|
725
|
+
expect(executionLog).toContain('A');
|
|
726
|
+
expect(executionLog).not.toContain('B');
|
|
727
|
+
});
|
|
728
|
+
});
|
|
729
|
+
});
|
|
730
|
+
//# sourceMappingURL=agent.interrupt.test.js.map
|