@mcp-abap-adt/llm-agent-libs 33.1.0 → 35.0.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.
Files changed (255) hide show
  1. package/README.md +72 -22
  2. package/dist/adapters/llm-adapter.d.ts +2 -2
  3. package/dist/adapters/llm-adapter.d.ts.map +1 -1
  4. package/dist/adapters/llm-adapter.js +51 -34
  5. package/dist/adapters/llm-adapter.js.map +1 -1
  6. package/dist/adapters/llm-provider-bridge.d.ts.map +1 -1
  7. package/dist/adapters/llm-provider-bridge.js +13 -20
  8. package/dist/adapters/llm-provider-bridge.js.map +1 -1
  9. package/dist/adapters/normalize-finish-reason.d.ts +3 -0
  10. package/dist/adapters/normalize-finish-reason.d.ts.map +1 -0
  11. package/dist/adapters/normalize-finish-reason.js +17 -0
  12. package/dist/adapters/normalize-finish-reason.js.map +1 -0
  13. package/dist/agent/rag-helpers.d.ts +4 -6
  14. package/dist/agent/rag-helpers.d.ts.map +1 -1
  15. package/dist/agent/rag-helpers.js +3 -43
  16. package/dist/agent/rag-helpers.js.map +1 -1
  17. package/dist/agent/rag-orchestrator-types.d.ts +3 -0
  18. package/dist/agent/rag-orchestrator-types.d.ts.map +1 -1
  19. package/dist/agent/rag-orchestrator.d.ts +0 -1
  20. package/dist/agent/rag-orchestrator.d.ts.map +1 -1
  21. package/dist/agent/rag-orchestrator.js +9 -29
  22. package/dist/agent/rag-orchestrator.js.map +1 -1
  23. package/dist/agent.d.ts +12 -3
  24. package/dist/agent.d.ts.map +1 -1
  25. package/dist/agent.js +178 -245
  26. package/dist/agent.js.map +1 -1
  27. package/dist/builder-types.d.ts +1 -1
  28. package/dist/builder-types.d.ts.map +1 -1
  29. package/dist/builder.d.ts +7 -7
  30. package/dist/builder.d.ts.map +1 -1
  31. package/dist/builder.js +16 -26
  32. package/dist/builder.js.map +1 -1
  33. package/dist/config/config-watcher.d.ts +3 -0
  34. package/dist/config/config-watcher.d.ts.map +1 -1
  35. package/dist/config/config-watcher.js +1 -0
  36. package/dist/config/config-watcher.js.map +1 -1
  37. package/dist/context/context-assembler.d.ts.map +1 -1
  38. package/dist/context/context-assembler.js +23 -23
  39. package/dist/context/context-assembler.js.map +1 -1
  40. package/dist/coordinator/adaptive/adaptive-interpreter.d.ts +2 -1
  41. package/dist/coordinator/adaptive/adaptive-interpreter.d.ts.map +1 -1
  42. package/dist/coordinator/adaptive/adaptive-interpreter.js +46 -22
  43. package/dist/coordinator/adaptive/adaptive-interpreter.js.map +1 -1
  44. package/dist/coordinator/adaptive/compose-step-input.d.ts +1 -5
  45. package/dist/coordinator/adaptive/compose-step-input.d.ts.map +1 -1
  46. package/dist/coordinator/adaptive/compose-step-input.js +6 -17
  47. package/dist/coordinator/adaptive/compose-step-input.js.map +1 -1
  48. package/dist/coordinator/adaptive/index.d.ts +2 -2
  49. package/dist/coordinator/adaptive/index.d.ts.map +1 -1
  50. package/dist/coordinator/adaptive/index.js +2 -2
  51. package/dist/coordinator/adaptive/index.js.map +1 -1
  52. package/dist/coordinator/adaptive/llm-adaptive-controller.d.ts.map +1 -1
  53. package/dist/coordinator/adaptive/llm-adaptive-controller.js +14 -20
  54. package/dist/coordinator/adaptive/llm-adaptive-controller.js.map +1 -1
  55. package/dist/coordinator/adaptive/parse-plan.d.ts +0 -2
  56. package/dist/coordinator/adaptive/parse-plan.d.ts.map +1 -1
  57. package/dist/coordinator/adaptive/parse-plan.js +4 -6
  58. package/dist/coordinator/adaptive/parse-plan.js.map +1 -1
  59. package/dist/coordinator/dag/dag-plan-interpreter.d.ts.map +1 -1
  60. package/dist/coordinator/dag/dag-plan-interpreter.js +7 -1
  61. package/dist/coordinator/dag/dag-plan-interpreter.js.map +1 -1
  62. package/dist/coordinator/dag/llm-finalizer.d.ts.map +1 -1
  63. package/dist/coordinator/dag/llm-finalizer.js +5 -2
  64. package/dist/coordinator/dag/llm-finalizer.js.map +1 -1
  65. package/dist/coordinator/dialogue/dialogue-session.d.ts +2 -3
  66. package/dist/coordinator/dialogue/dialogue-session.d.ts.map +1 -1
  67. package/dist/coordinator/dialogue/dialogue-session.js +103 -64
  68. package/dist/coordinator/dialogue/dialogue-session.js.map +1 -1
  69. package/dist/coordinator/dialogue/index.d.ts +2 -2
  70. package/dist/coordinator/dialogue/index.d.ts.map +1 -1
  71. package/dist/coordinator/dialogue/index.js +2 -2
  72. package/dist/coordinator/dialogue/index.js.map +1 -1
  73. package/dist/coordinator/dialogue/planner-context-builder.d.ts +2 -3
  74. package/dist/coordinator/dialogue/planner-context-builder.d.ts.map +1 -1
  75. package/dist/coordinator/dialogue/planner-context-builder.js +13 -73
  76. package/dist/coordinator/dialogue/planner-context-builder.js.map +1 -1
  77. package/dist/coordinator/dialogue/planner-retrieval.d.ts.map +1 -1
  78. package/dist/coordinator/dialogue/planner-retrieval.js +13 -4
  79. package/dist/coordinator/dialogue/planner-retrieval.js.map +1 -1
  80. package/dist/coordinator/dialogue/planner-scope.d.ts +4 -1
  81. package/dist/coordinator/dialogue/planner-scope.d.ts.map +1 -1
  82. package/dist/coordinator/dialogue/planner-scope.js.map +1 -1
  83. package/dist/coordinator/dialogue/planner-tools-client.d.ts.map +1 -1
  84. package/dist/coordinator/dialogue/planner-tools-client.js +47 -26
  85. package/dist/coordinator/dialogue/planner-tools-client.js.map +1 -1
  86. package/dist/coordinator/dialogue/profile-plan-author.d.ts.map +1 -1
  87. package/dist/coordinator/dialogue/profile-plan-author.js +5 -5
  88. package/dist/coordinator/dialogue/profile-plan-author.js.map +1 -1
  89. package/dist/coordinator/dialogue/profile-resolver.d.ts.map +1 -1
  90. package/dist/coordinator/dialogue/profile-resolver.js +8 -0
  91. package/dist/coordinator/dialogue/profile-resolver.js.map +1 -1
  92. package/dist/coordinator/dialogue/structured-plan.d.ts +1 -1
  93. package/dist/coordinator/dialogue/structured-plan.d.ts.map +1 -1
  94. package/dist/coordinator/dialogue/structured-plan.js +6 -7
  95. package/dist/coordinator/dialogue/structured-plan.js.map +1 -1
  96. package/dist/coordinator/dialogue/submit-report-tool.d.ts +1 -1
  97. package/dist/coordinator/dialogue/submit-report-tool.d.ts.map +1 -1
  98. package/dist/coordinator/dialogue/submit-report-tool.js +4 -17
  99. package/dist/coordinator/dialogue/submit-report-tool.js.map +1 -1
  100. package/dist/coordinator/dialogue/task-board.d.ts +11 -3
  101. package/dist/coordinator/dialogue/task-board.d.ts.map +1 -1
  102. package/dist/coordinator/dialogue/task-board.js +42 -12
  103. package/dist/coordinator/dialogue/task-board.js.map +1 -1
  104. package/dist/coordinator/dialogue/task-reference.d.ts +1 -3
  105. package/dist/coordinator/dialogue/task-reference.d.ts.map +1 -1
  106. package/dist/coordinator/dialogue/task-reference.js +3 -10
  107. package/dist/coordinator/dialogue/task-reference.js.map +1 -1
  108. package/dist/coordinator/dialogue/tool-trace-render.d.ts.map +1 -1
  109. package/dist/coordinator/dialogue/tool-trace-render.js +9 -29
  110. package/dist/coordinator/dialogue/tool-trace-render.js.map +1 -1
  111. package/dist/coordinator/dispatch/self.d.ts.map +1 -1
  112. package/dist/coordinator/dispatch/self.js +41 -26
  113. package/dist/coordinator/dispatch/self.js.map +1 -1
  114. package/dist/coordinator/dispatch/subagent.d.ts.map +1 -1
  115. package/dist/coordinator/dispatch/subagent.js +3 -0
  116. package/dist/coordinator/dispatch/subagent.js.map +1 -1
  117. package/dist/coordinator/llm-output-truncation.d.ts +3 -0
  118. package/dist/coordinator/llm-output-truncation.d.ts.map +1 -0
  119. package/dist/coordinator/llm-output-truncation.js +6 -0
  120. package/dist/coordinator/llm-output-truncation.js.map +1 -0
  121. package/dist/coordinator/planning/one-shot.d.ts.map +1 -1
  122. package/dist/coordinator/planning/one-shot.js +4 -0
  123. package/dist/coordinator/planning/one-shot.js.map +1 -1
  124. package/dist/coordinator/planning/replan-on-error.d.ts.map +1 -1
  125. package/dist/coordinator/planning/replan-on-error.js +5 -1
  126. package/dist/coordinator/planning/replan-on-error.js.map +1 -1
  127. package/dist/coordinator/stepper/cyclic-react-executor.d.ts.map +1 -1
  128. package/dist/coordinator/stepper/cyclic-react-executor.js +51 -37
  129. package/dist/coordinator/stepper/cyclic-react-executor.js.map +1 -1
  130. package/dist/coordinator/stepper/llm-evaluator.d.ts.map +1 -1
  131. package/dist/coordinator/stepper/llm-evaluator.js +12 -4
  132. package/dist/coordinator/stepper/llm-evaluator.js.map +1 -1
  133. package/dist/coordinator/stepper/llm-stepper-planner.d.ts.map +1 -1
  134. package/dist/coordinator/stepper/llm-stepper-planner.js +16 -5
  135. package/dist/coordinator/stepper/llm-stepper-planner.js.map +1 -1
  136. package/dist/coordinator/stepper/llm-task-formalizer.d.ts +2 -3
  137. package/dist/coordinator/stepper/llm-task-formalizer.d.ts.map +1 -1
  138. package/dist/coordinator/stepper/llm-task-formalizer.js +14 -8
  139. package/dist/coordinator/stepper/llm-task-formalizer.js.map +1 -1
  140. package/dist/coordinator/stepper/need-resolver.d.ts.map +1 -1
  141. package/dist/coordinator/stepper/need-resolver.js +10 -1
  142. package/dist/coordinator/stepper/need-resolver.js.map +1 -1
  143. package/dist/coordinator/stepper/root-finalizer.d.ts.map +1 -1
  144. package/dist/coordinator/stepper/root-finalizer.js +8 -3
  145. package/dist/coordinator/stepper/root-finalizer.js.map +1 -1
  146. package/dist/coordinator/stepper/stepper-interpreter.d.ts.map +1 -1
  147. package/dist/coordinator/stepper/stepper-interpreter.js +8 -19
  148. package/dist/coordinator/stepper/stepper-interpreter.js.map +1 -1
  149. package/dist/history/history-memory.d.ts +1 -0
  150. package/dist/history/history-memory.d.ts.map +1 -1
  151. package/dist/history/history-memory.js +5 -1
  152. package/dist/history/history-memory.js.map +1 -1
  153. package/dist/history/history-summarizer.js +1 -1
  154. package/dist/history/history-summarizer.js.map +1 -1
  155. package/dist/index.d.ts +4 -1
  156. package/dist/index.d.ts.map +1 -1
  157. package/dist/index.js +4 -1
  158. package/dist/index.js.map +1 -1
  159. package/dist/interfaces/pipeline.d.ts +1 -1
  160. package/dist/interfaces/pipeline.d.ts.map +1 -1
  161. package/dist/pipeline/context/tool-loop-context/window-context-strategy.d.ts +1 -1
  162. package/dist/pipeline/context/tool-loop-context/window-context-strategy.d.ts.map +1 -1
  163. package/dist/pipeline/context/tool-loop-context/window-context-strategy.js +6 -3
  164. package/dist/pipeline/context/tool-loop-context/window-context-strategy.js.map +1 -1
  165. package/dist/pipeline/context/tool-loop-control-history.d.ts +15 -0
  166. package/dist/pipeline/context/tool-loop-control-history.d.ts.map +1 -0
  167. package/dist/pipeline/context/tool-loop-control-history.js +72 -0
  168. package/dist/pipeline/context/tool-loop-control-history.js.map +1 -0
  169. package/dist/pipeline/context.d.ts +5 -2
  170. package/dist/pipeline/context.d.ts.map +1 -1
  171. package/dist/pipeline/default-pipeline.d.ts +2 -2
  172. package/dist/pipeline/default-pipeline.d.ts.map +1 -1
  173. package/dist/pipeline/default-pipeline.js +7 -7
  174. package/dist/pipeline/default-pipeline.js.map +1 -1
  175. package/dist/pipeline/executor.d.ts.map +1 -1
  176. package/dist/pipeline/executor.js +6 -0
  177. package/dist/pipeline/executor.js.map +1 -1
  178. package/dist/pipeline/handlers/adaptive-coordinator.d.ts +1 -1
  179. package/dist/pipeline/handlers/adaptive-coordinator.d.ts.map +1 -1
  180. package/dist/pipeline/handlers/adaptive-coordinator.js +42 -46
  181. package/dist/pipeline/handlers/adaptive-coordinator.js.map +1 -1
  182. package/dist/pipeline/handlers/assemble.d.ts +0 -9
  183. package/dist/pipeline/handlers/assemble.d.ts.map +1 -1
  184. package/dist/pipeline/handlers/assemble.js +7 -11
  185. package/dist/pipeline/handlers/assemble.js.map +1 -1
  186. package/dist/pipeline/handlers/coordinator.d.ts +1 -0
  187. package/dist/pipeline/handlers/coordinator.d.ts.map +1 -1
  188. package/dist/pipeline/handlers/coordinator.js +39 -7
  189. package/dist/pipeline/handlers/coordinator.js.map +1 -1
  190. package/dist/pipeline/handlers/dag-coordinator.d.ts.map +1 -1
  191. package/dist/pipeline/handlers/dag-coordinator.js +17 -13
  192. package/dist/pipeline/handlers/dag-coordinator.js.map +1 -1
  193. package/dist/pipeline/handlers/history-upsert.d.ts +2 -0
  194. package/dist/pipeline/handlers/history-upsert.d.ts.map +1 -1
  195. package/dist/pipeline/handlers/history-upsert.js +6 -1
  196. package/dist/pipeline/handlers/history-upsert.js.map +1 -1
  197. package/dist/pipeline/handlers/pass-through.d.ts +5 -3
  198. package/dist/pipeline/handlers/pass-through.d.ts.map +1 -1
  199. package/dist/pipeline/handlers/pass-through.js +165 -91
  200. package/dist/pipeline/handlers/pass-through.js.map +1 -1
  201. package/dist/pipeline/handlers/subagent.d.ts.map +1 -1
  202. package/dist/pipeline/handlers/subagent.js +4 -1
  203. package/dist/pipeline/handlers/subagent.js.map +1 -1
  204. package/dist/pipeline/handlers/summarize.d.ts +2 -12
  205. package/dist/pipeline/handlers/summarize.d.ts.map +1 -1
  206. package/dist/pipeline/handlers/summarize.js +2 -54
  207. package/dist/pipeline/handlers/summarize.js.map +1 -1
  208. package/dist/pipeline/handlers/tool-loop-core.d.ts +15 -9
  209. package/dist/pipeline/handlers/tool-loop-core.d.ts.map +1 -1
  210. package/dist/pipeline/handlers/tool-loop-core.js +128 -59
  211. package/dist/pipeline/handlers/tool-loop-core.js.map +1 -1
  212. package/dist/pipeline/handlers/tool-loop.d.ts.map +1 -1
  213. package/dist/pipeline/handlers/tool-loop.js +120 -298
  214. package/dist/pipeline/handlers/tool-loop.js.map +1 -1
  215. package/dist/pipeline/handlers/tool-response-round.d.ts +48 -0
  216. package/dist/pipeline/handlers/tool-response-round.d.ts.map +1 -0
  217. package/dist/pipeline/handlers/tool-response-round.js +104 -0
  218. package/dist/pipeline/handlers/tool-response-round.js.map +1 -0
  219. package/dist/pipeline/handlers/tool-select.d.ts.map +1 -1
  220. package/dist/pipeline/handlers/tool-select.js +5 -1
  221. package/dist/pipeline/handlers/tool-select.js.map +1 -1
  222. package/dist/pipeline/pipeline-to-stream.d.ts.map +1 -1
  223. package/dist/pipeline/pipeline-to-stream.js +13 -6
  224. package/dist/pipeline/pipeline-to-stream.js.map +1 -1
  225. package/dist/policy/caller-identity.d.ts +29 -0
  226. package/dist/policy/caller-identity.d.ts.map +1 -0
  227. package/dist/policy/caller-identity.js +79 -0
  228. package/dist/policy/caller-identity.js.map +1 -0
  229. package/dist/policy/mixed-tool-call-handler.d.ts +9 -3
  230. package/dist/policy/mixed-tool-call-handler.d.ts.map +1 -1
  231. package/dist/policy/mixed-tool-call-handler.js +29 -7
  232. package/dist/policy/mixed-tool-call-handler.js.map +1 -1
  233. package/dist/policy/pending-tool-results-registry.d.ts +46 -4
  234. package/dist/policy/pending-tool-results-registry.d.ts.map +1 -1
  235. package/dist/policy/pending-tool-results-registry.js +203 -18
  236. package/dist/policy/pending-tool-results-registry.js.map +1 -1
  237. package/dist/policy/tool-availability-registry.d.ts +6 -5
  238. package/dist/policy/tool-availability-registry.d.ts.map +1 -1
  239. package/dist/policy/tool-availability-registry.js +13 -2
  240. package/dist/policy/tool-availability-registry.js.map +1 -1
  241. package/dist/resilience/retry-llm.d.ts +7 -5
  242. package/dist/resilience/retry-llm.d.ts.map +1 -1
  243. package/dist/resilience/retry-llm.js +93 -58
  244. package/dist/resilience/retry-llm.js.map +1 -1
  245. package/dist/subagent/default-context-builder.d.ts.map +1 -1
  246. package/dist/subagent/default-context-builder.js +9 -2
  247. package/dist/subagent/default-context-builder.js.map +1 -1
  248. package/dist/subagent/direct-llm-subagent.d.ts +1 -1
  249. package/dist/subagent/direct-llm-subagent.d.ts.map +1 -1
  250. package/dist/subagent/direct-llm-subagent.js +12 -3
  251. package/dist/subagent/direct-llm-subagent.js.map +1 -1
  252. package/dist/subagent/smart-agent-subagent.d.ts.map +1 -1
  253. package/dist/subagent/smart-agent-subagent.js +8 -5
  254. package/dist/subagent/smart-agent-subagent.js.map +1 -1
  255. package/package.json +2 -2
@@ -1,7 +1,8 @@
1
1
  import { recordToolInvocation, scopedUsage } from '@mcp-abap-adt/llm-agent';
2
2
  import { guardToolRound, } from '../pipeline/handlers/tool-loop-core.js';
3
- export function fireInternalToolsAsync(content, internalCalls, registry, sessionId, ctx) {
4
- const assistantMessage = {
3
+ import { createPendingToolCallsEntry } from './pending-tool-results-registry.js';
4
+ export function fireInternalToolsAsync(content, internalCalls, registry, identity, ctx) {
5
+ const assistantMessage = ctx.assistantMessage ?? {
5
6
  role: 'assistant',
6
7
  content: content || null,
7
8
  tool_calls: [...internalCalls, ...(ctx.skippedCalls ?? [])].map((tc) => ({
@@ -26,7 +27,11 @@ export function fireInternalToolsAsync(content, internalCalls, registry, session
26
27
  };
27
28
  const client = ctx.toolClientMap.get(tc.name);
28
29
  if (!client) {
29
- return { toolCallId: tc.id, toolName: tc.name, text: '' };
30
+ return {
31
+ toolCallId: tc.id,
32
+ toolName: tc.name,
33
+ text: `Error: Tool "${tc.name}" is unavailable.`,
34
+ };
30
35
  }
31
36
  const res = await recordToolInvocation(ctx.options?.onToolTrace, tc.name, tc.arguments, () => client.callTool(tc.name, tc.arguments, {
32
37
  ...ctx.options,
@@ -62,17 +67,34 @@ export function fireInternalToolsAsync(content, internalCalls, registry, session
62
67
  };
63
68
  }
64
69
  }));
65
- registry.set(sessionId, {
66
- assistantMessage,
70
+ const entry = {
71
+ assistantMessage: structuredClone(assistantMessage),
72
+ precedingMessages: structuredClone(ctx.precedingMessages),
73
+ sourceMessages: structuredClone(ctx.sourceMessages),
74
+ externalCalls: (ctx.externalCalls ?? []).map((call) => ({
75
+ toolCallId: call.id,
76
+ })),
67
77
  promise: internalPromise.then((results) => [
68
78
  ...results,
79
+ ...(ctx.resolvedResults ?? []).map((message) => ({
80
+ toolCallId: message.tool_call_id ?? '',
81
+ toolName: assistantMessage.tool_calls?.find((call) => call.id === message.tool_call_id)?.function.name ?? '',
82
+ text: String(message.content ?? ''),
83
+ })),
69
84
  ...(ctx.skippedCalls ?? []).map((tc) => ({
70
85
  toolCallId: tc.id,
71
86
  toolName: tc.name,
72
87
  text: `Error: not executed: tool-call budget of ${ctx.maxToolCalls} for this request is exhausted; return what you have and report what is missing`,
73
88
  })),
74
- ]),
89
+ ].sort((a, b) => {
90
+ const calls = assistantMessage.tool_calls ?? [];
91
+ return (calls.findIndex((call) => call.id === a.toolCallId) -
92
+ calls.findIndex((call) => call.id === b.toolCallId));
93
+ })),
75
94
  createdAt: Date.now(),
76
- });
95
+ };
96
+ return identity.kind === 'caller'
97
+ ? registry.set(identity.caller, entry)
98
+ : createPendingToolCallsEntry(entry);
77
99
  }
78
100
  //# sourceMappingURL=mixed-tool-call-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"mixed-tool-call-handler.js","sourceRoot":"","sources":["../../src/policy/mixed-tool-call-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mixed-tool-call-handler.js","sourceRoot":"","sources":["../../src/policy/mixed-tool-call-handler.ts"],"names":[],"mappings":"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"}
@@ -1,26 +1,68 @@
1
1
  import type { Message } from '@mcp-abap-adt/llm-agent';
2
+ import { type CallerIdentity } from './caller-identity.js';
2
3
  export interface PendingToolResult {
3
4
  toolCallId: string;
4
5
  toolName: string;
5
6
  text: string;
6
7
  }
8
+ export interface PendingSourceMessages {
9
+ input: Message[];
10
+ /** Completed rounds within this request that the client never received. */
11
+ continuation: Message[];
12
+ }
7
13
  export interface PendingToolCallsEntry {
14
+ exchangeId: string;
8
15
  assistantMessage: Message;
16
+ precedingMessages?: Message[];
17
+ /** Logical history before assembly, without generated system or RAG text. */
18
+ sourceMessages?: PendingSourceMessages;
19
+ /** Client and history use the same globally unique recorded call IDs. */
20
+ externalCalls: Array<{
21
+ toolCallId: string;
22
+ returnedId: string;
23
+ }>;
9
24
  promise: Promise<PendingToolResult[]>;
10
25
  createdAt: number;
11
26
  }
27
+ type PendingToolCallsInput = Omit<PendingToolCallsEntry, 'exchangeId' | 'externalCalls'> & {
28
+ externalCalls?: Array<{
29
+ toolCallId: string;
30
+ }>;
31
+ };
32
+ /** Build the response exchange even when no caller may persist it. */
33
+ export declare function createPendingToolCallsEntry(entry: PendingToolCallsInput): PendingToolCallsEntry;
34
+ /** Each suspension owns fresh IDs, independent of tool names and arguments. */
35
+ export declare function createExternalSuspension(calls: readonly {
36
+ id: string;
37
+ }[]): {
38
+ exchangeId: string;
39
+ externalCalls: PendingToolCallsEntry['externalCalls'];
40
+ };
12
41
  export declare class PendingToolResultsRegistry {
13
42
  private readonly ttlMs;
14
43
  private readonly sessions;
15
- clear(sessionId: string): void;
44
+ private readonly completed;
45
+ clear(caller: CallerIdentity | undefined): void;
46
+ clearSession(sessionId: string): void;
16
47
  constructor(ttlMs?: number);
17
- set(sessionId: string, entry: PendingToolCallsEntry): void;
18
- has(sessionId: string, now?: number): boolean;
19
- consume(sessionId: string, now?: number): Promise<{
48
+ set(caller: CallerIdentity | undefined, entry: PendingToolCallsInput): PendingToolCallsEntry;
49
+ has(caller: CallerIdentity | undefined, now?: number): boolean;
50
+ /** Normalize both resume forms before retrieval and context assembly. */
51
+ prepareInput(caller: CallerIdentity | undefined, input: string | Message[], externalResults?: ReadonlyMap<string, string>): Promise<string | Message[]>;
52
+ /** Retain the full model exchange under this session's client-visible IDs. */
53
+ complete(caller: CallerIdentity | undefined, entry: Pick<PendingToolCallsEntry, 'assistantMessage' | 'externalCalls' | 'sourceMessages'>, toolMessages: Message[]): void;
54
+ private restoreCompletedInput;
55
+ consume(caller: CallerIdentity | undefined, now?: number): Promise<{
56
+ exchangeId: string;
20
57
  assistantMessage: Message;
58
+ precedingMessages?: Message[];
59
+ sourceMessages?: PendingSourceMessages;
60
+ externalCalls: PendingToolCallsEntry['externalCalls'];
21
61
  results: PendingToolResult[];
22
62
  } | null>;
23
63
  get size(): number;
24
64
  private pruneAll;
25
65
  }
66
+ export declare function findPendingAssistant(messages: readonly Message[], externalCalls: PendingToolCallsEntry['externalCalls']): number;
67
+ export {};
26
68
  //# sourceMappingURL=pending-tool-results-registry.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"pending-tool-results-registry.d.ts","sourceRoot":"","sources":["../../src/policy/pending-tool-results-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,0BAA0B;IAOzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IANlC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4C;IAErE,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;gBAID,KAAK,SAAgB;IAElD,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAK1D,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,OAAO;IAU3C,OAAO,CACX,SAAS,EAAE,MAAM,EACjB,GAAG,SAAa,GACf,OAAO,CAAC;QACT,gBAAgB,EAAE,OAAO,CAAC;QAC1B,OAAO,EAAE,iBAAiB,EAAE,CAAC;KAC9B,GAAG,IAAI,CAAC;IAgBT,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,OAAO,CAAC,QAAQ;CAOjB"}
1
+ {"version":3,"file":"pending-tool-results-registry.d.ts","sourceRoot":"","sources":["../../src/policy/pending-tool-results-registry.ts"],"names":[],"mappings":"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"}
@@ -1,43 +1,207 @@
1
+ import { randomUUID } from 'node:crypto';
2
+ import { callerIdentityKey, clearCallerSessionEntries, } from './caller-identity.js';
3
+ /** Build the response exchange even when no caller may persist it. */
4
+ export function createPendingToolCallsEntry(entry) {
5
+ return {
6
+ ...entry,
7
+ exchangeId: randomUUID(),
8
+ externalCalls: (entry.externalCalls ?? []).map((call) => ({
9
+ toolCallId: call.toolCallId,
10
+ returnedId: call.toolCallId,
11
+ })),
12
+ };
13
+ }
14
+ /** Each suspension owns fresh IDs, independent of tool names and arguments. */
15
+ export function createExternalSuspension(calls) {
16
+ const exchangeId = randomUUID();
17
+ return {
18
+ exchangeId,
19
+ externalCalls: calls.map((call, index) => ({
20
+ toolCallId: call.id,
21
+ returnedId: `ext:${exchangeId}:${index}`,
22
+ })),
23
+ };
24
+ }
1
25
  export class PendingToolResultsRegistry {
2
26
  ttlMs;
3
27
  sessions = new Map();
4
- clear(sessionId) {
5
- this.sessions.delete(sessionId);
28
+ // Completed exchanges live until clear() or registry disposal, without limits.
29
+ completed = new Map();
30
+ clear(caller) {
31
+ const key = callerIdentityKey(caller);
32
+ if (key === undefined)
33
+ return;
34
+ this.sessions.delete(key);
35
+ this.completed.delete(key);
36
+ }
37
+ clearSession(sessionId) {
38
+ clearCallerSessionEntries(this.sessions, sessionId);
39
+ clearCallerSessionEntries(this.completed, sessionId);
6
40
  }
7
41
  constructor(ttlMs = 5 * 60 * 1000) {
8
42
  this.ttlMs = ttlMs;
9
43
  }
10
- set(sessionId, entry) {
11
- this.sessions.set(sessionId, entry);
44
+ set(caller, entry) {
45
+ const pending = createPendingToolCallsEntry(entry);
46
+ const key = callerIdentityKey(caller);
47
+ if (key === undefined)
48
+ return pending;
49
+ this.sessions.set(key, pending);
12
50
  if (this.sessions.size > 100)
13
51
  this.pruneAll();
52
+ return pending;
14
53
  }
15
- has(sessionId, now = Date.now()) {
16
- const entry = this.sessions.get(sessionId);
54
+ has(caller, now = Date.now()) {
55
+ const key = callerIdentityKey(caller);
56
+ if (key === undefined)
57
+ return false;
58
+ const entry = this.sessions.get(key);
17
59
  if (!entry)
18
60
  return false;
19
61
  if (now - entry.createdAt > this.ttlMs) {
20
- this.sessions.delete(sessionId);
62
+ this.sessions.delete(key);
21
63
  return false;
22
64
  }
23
65
  return true;
24
66
  }
25
- async consume(sessionId, now = Date.now()) {
26
- const entry = this.sessions.get(sessionId);
67
+ /** Normalize both resume forms before retrieval and context assembly. */
68
+ async prepareInput(caller, input, externalResults) {
69
+ const key = callerIdentityKey(caller);
70
+ if (key === undefined)
71
+ return input;
72
+ if (Array.isArray(input)) {
73
+ input = this.restoreCompletedInput(caller, input);
74
+ }
75
+ if (!this.has(caller))
76
+ return input;
77
+ const entry = this.sessions.get(key);
78
+ if (!entry || entry.externalCalls.length === 0)
79
+ return input;
80
+ const messages = typeof input === 'string' ? [{ role: 'user', content: input }] : input;
81
+ const index = findPendingAssistant(messages, entry.externalCalls);
82
+ const localResults = await entry.promise.catch(() => []);
83
+ const assistant = entry.assistantMessage;
84
+ const results = (assistant.tool_calls ?? []).map((call) => {
85
+ const external = entry.externalCalls.find((candidate) => candidate.returnedId === call.id);
86
+ const supplied = messages.find((message, position) => position > index &&
87
+ message.role === 'tool' &&
88
+ message.tool_call_id === call.id);
89
+ return {
90
+ role: 'tool',
91
+ tool_call_id: call.id,
92
+ content: external
93
+ ? (supplied?.content ??
94
+ externalResults?.get(call.id) ??
95
+ 'Error: external tool result was not provided.')
96
+ : (localResults.find((result) => result.toolCallId === call.id)
97
+ ?.text ?? 'Error: tool result was not provided.'),
98
+ };
99
+ });
100
+ const ids = new Set(results.map((result) => result.tool_call_id));
101
+ let end = index + 1;
102
+ while (messages[end]?.role === 'tool')
103
+ end++;
104
+ const tail = [
105
+ ...messages
106
+ .slice(index + 1, end)
107
+ .filter((message) => !ids.has(message.tool_call_id)),
108
+ ...messages.slice(end),
109
+ ];
110
+ const continuation = entry.sourceMessages?.continuation ?? [];
111
+ // Some hosts send model history, including completed internal rounds.
112
+ // Recorded call IDs identify the exact contiguous continuation before this
113
+ // suspension, independently of repeated model IDs. Text is never compared.
114
+ const includesContinuation = hasContinuation(messages, index, continuation);
115
+ return [
116
+ ...(index >= 0
117
+ ? messages.slice(0, index)
118
+ : this.restoreCompletedInput(caller, entry.sourceMessages?.input ?? entry.precedingMessages ?? [])),
119
+ ...(includesContinuation ? [] : continuation),
120
+ assistant,
121
+ ...results,
122
+ ...(index >= 0 ? tail : messages),
123
+ ];
124
+ }
125
+ /** Retain the full model exchange under this session's client-visible IDs. */
126
+ complete(caller, entry, toolMessages) {
127
+ const key = callerIdentityKey(caller);
128
+ if (key === undefined || entry.externalCalls.length === 0)
129
+ return;
130
+ let exchanges = this.completed.get(key);
131
+ if (!exchanges) {
132
+ exchanges = new Map();
133
+ this.completed.set(key, exchanges);
134
+ }
135
+ const exchange = structuredClone({
136
+ externalCalls: entry.externalCalls,
137
+ assistantMessage: entry.assistantMessage,
138
+ toolMessages,
139
+ continuation: entry.sourceMessages?.continuation ?? [],
140
+ });
141
+ for (const call of entry.externalCalls) {
142
+ exchanges.set(call.returnedId, exchange);
143
+ }
144
+ }
145
+ restoreCompletedInput(caller, messages) {
146
+ const key = callerIdentityKey(caller);
147
+ if (key === undefined)
148
+ return messages;
149
+ const exchanges = this.completed.get(key);
150
+ if (!exchanges)
151
+ return messages;
152
+ const restored = [];
153
+ for (let index = 0; index < messages.length; index++) {
154
+ const message = messages[index];
155
+ const exchange = message.role === 'assistant'
156
+ ? message.tool_calls
157
+ ?.map((call) => exchanges.get(call.id))
158
+ .find((candidate) => candidate !== undefined)
159
+ : undefined;
160
+ if (!exchange?.externalCalls.every((external) => message.tool_calls?.some((call) => call.id === external.returnedId))) {
161
+ restored.push(message);
162
+ continue;
163
+ }
164
+ const continuation = hasContinuation(messages, index, exchange.continuation)
165
+ ? []
166
+ : exchange.continuation;
167
+ restored.push(...structuredClone([
168
+ ...continuation,
169
+ exchange.assistantMessage,
170
+ ...exchange.toolMessages,
171
+ ]));
172
+ const recordedIds = new Set(exchange.assistantMessage.tool_calls?.map((call) => call.id));
173
+ // Drop echoed results only within this exchange's tool block. The
174
+ // restored results carry the very same IDs and must remain in history.
175
+ while (messages[index + 1]?.role === 'tool') {
176
+ const result = messages[++index];
177
+ if (!recordedIds.has(result.tool_call_id ?? '')) {
178
+ restored.push(result);
179
+ }
180
+ }
181
+ }
182
+ return restored;
183
+ }
184
+ async consume(caller, now = Date.now()) {
185
+ const key = callerIdentityKey(caller);
186
+ if (key === undefined)
187
+ return null;
188
+ const entry = this.sessions.get(key);
27
189
  if (!entry)
28
190
  return null;
29
191
  if (now - entry.createdAt > this.ttlMs) {
30
- this.sessions.delete(sessionId);
192
+ this.sessions.delete(key);
31
193
  return null;
32
194
  }
33
- this.sessions.delete(sessionId);
34
- try {
35
- const results = await entry.promise;
36
- return { assistantMessage: entry.assistantMessage, results };
37
- }
38
- catch {
39
- return { assistantMessage: entry.assistantMessage, results: [] };
40
- }
195
+ this.sessions.delete(key);
196
+ const results = await entry.promise.catch(() => []);
197
+ return {
198
+ exchangeId: entry.exchangeId,
199
+ assistantMessage: entry.assistantMessage,
200
+ precedingMessages: entry.precedingMessages,
201
+ sourceMessages: entry.sourceMessages,
202
+ externalCalls: entry.externalCalls,
203
+ results,
204
+ };
41
205
  }
42
206
  get size() {
43
207
  return this.sessions.size;
@@ -50,4 +214,25 @@ export class PendingToolResultsRegistry {
50
214
  }
51
215
  }
52
216
  }
217
+ function hasContinuation(messages, index, continuation) {
218
+ const start = index - continuation.length;
219
+ return (start >= 0 &&
220
+ continuation.some((message) => message.role === 'assistant' && message.tool_calls?.length) &&
221
+ continuation.every((message, offset) => {
222
+ const candidate = messages[start + offset];
223
+ if (message.role !== candidate.role)
224
+ return false;
225
+ if (message.role === 'tool')
226
+ return message.tool_call_id === candidate.tool_call_id;
227
+ if (message.tool_calls?.length)
228
+ return (message.tool_calls.length === candidate.tool_calls?.length &&
229
+ message.tool_calls.every((call, callIndex) => call.id === candidate.tool_calls?.[callIndex].id));
230
+ return !candidate.tool_calls?.length;
231
+ }));
232
+ }
233
+ export function findPendingAssistant(messages, externalCalls) {
234
+ return messages.findIndex((message) => message.role === 'assistant' &&
235
+ externalCalls.length > 0 &&
236
+ externalCalls.every((external) => message.tool_calls?.some((call) => call.id === external.returnedId)));
237
+ }
53
238
  //# sourceMappingURL=pending-tool-results-registry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pending-tool-results-registry.js","sourceRoot":"","sources":["../../src/policy/pending-tool-results-registry.ts"],"names":[],"mappings":"AAcA,MAAM,OAAO,0BAA0B;IAOR;IANZ,QAAQ,GAAG,IAAI,GAAG,EAAiC,CAAC;IAErE,KAAK,CAAC,SAAiB;QACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,YAA6B,QAAQ,CAAC,GAAG,EAAE,GAAG,IAAI;QAArB,UAAK,GAAL,KAAK,CAAgB;IAAG,CAAC;IAEtD,GAAG,CAAC,SAAiB,EAAE,KAA4B;QACjD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG;YAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;IAED,GAAG,CAAC,SAAiB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACzB,IAAI,GAAG,GAAG,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO,CACX,SAAiB,EACjB,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;QAKhB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,GAAG,GAAG,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC;YACpC,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAEO,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;QAC/B,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAClD,IAAI,GAAG,GAAG,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACvC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"pending-tool-results-registry.js","sourceRoot":"","sources":["../../src/policy/pending-tool-results-registry.ts"],"names":[],"mappings":"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"}
@@ -7,12 +7,13 @@ export interface ToolBlockEntry {
7
7
  export declare class ToolAvailabilityRegistry {
8
8
  private readonly defaultTtlMs;
9
9
  private readonly sessions;
10
- clear(sessionId: string): void;
10
+ clear(sessionId: string | undefined): void;
11
+ clearSession(sessionId: string): void;
11
12
  constructor(defaultTtlMs?: number);
12
- getBlockedToolNames(sessionId: string, now?: number): Set<string>;
13
- isBlocked(sessionId: string, toolName: string, now?: number): boolean;
14
- block(sessionId: string, toolName: string, reason: string, ttlMs?: number, now?: number): ToolBlockEntry;
15
- filterTools(sessionId: string, tools: LlmTool[], now?: number): {
13
+ getBlockedToolNames(sessionId: string | undefined, now?: number): Set<string>;
14
+ isBlocked(sessionId: string | undefined, toolName: string, now?: number): boolean;
15
+ block(sessionId: string | undefined, toolName: string, reason: string, ttlMs?: number, now?: number): ToolBlockEntry;
16
+ filterTools(sessionId: string | undefined, tools: LlmTool[], now?: number): {
16
17
  allowed: LlmTool[];
17
18
  blocked: string[];
18
19
  };
@@ -1 +1 @@
1
- {"version":3,"file":"tool-availability-registry.d.ts","sourceRoot":"","sources":["../../src/policy/tool-availability-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,wBAAwB;IAOvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IANzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkD;IAE3E,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;gBAID,YAAY,SAAiB;IAE1D,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,GAAG,CAAC,MAAM,CAAC;IAOrE,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,OAAO;IAazE,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,SAAoB,EACzB,GAAG,SAAa,GACf,cAAc;IAYjB,WAAW,CACT,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EAAE,EAChB,GAAG,SAAa,GACf;QACD,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,CAAC;KACnB;IAeD,OAAO,CAAC,KAAK;CAQd;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAatE"}
1
+ {"version":3,"file":"tool-availability-registry.d.ts","sourceRoot":"","sources":["../../src/policy/tool-availability-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGvD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,wBAAwB;IAWvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAVzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkD;IAE3E,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAI1C,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;gBAIR,YAAY,SAAiB;IAE1D,mBAAmB,CACjB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,GAAG,SAAa,GACf,GAAG,CAAC,MAAM,CAAC;IAQd,SAAS,CACP,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,QAAQ,EAAE,MAAM,EAChB,GAAG,SAAa,GACf,OAAO;IAcV,KAAK,CACH,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,SAAoB,EACzB,GAAG,SAAa,GACf,cAAc;IAajB,WAAW,CACT,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,OAAO,EAAE,EAChB,GAAG,SAAa,GACf;QACD,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,CAAC;KACnB;IAeD,OAAO,CAAC,KAAK;CAQd;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAatE"}
@@ -1,13 +1,20 @@
1
+ import { clearCallerSessionEntries } from './caller-identity.js';
1
2
  export class ToolAvailabilityRegistry {
2
3
  defaultTtlMs;
3
4
  sessions = new Map();
4
5
  clear(sessionId) {
5
- this.sessions.delete(sessionId);
6
+ if (sessionId !== undefined)
7
+ this.sessions.delete(sessionId);
8
+ }
9
+ clearSession(sessionId) {
10
+ clearCallerSessionEntries(this.sessions, sessionId);
6
11
  }
7
12
  constructor(defaultTtlMs = 10 * 60 * 1000) {
8
13
  this.defaultTtlMs = defaultTtlMs;
9
14
  }
10
15
  getBlockedToolNames(sessionId, now = Date.now()) {
16
+ if (sessionId === undefined)
17
+ return new Set();
11
18
  const blocked = this.sessions.get(sessionId);
12
19
  if (!blocked || blocked.size === 0)
13
20
  return new Set();
@@ -15,6 +22,8 @@ export class ToolAvailabilityRegistry {
15
22
  return new Set(this.sessions.get(sessionId)?.keys() ?? []);
16
23
  }
17
24
  isBlocked(sessionId, toolName, now = Date.now()) {
25
+ if (sessionId === undefined)
26
+ return false;
18
27
  const blocked = this.sessions.get(sessionId);
19
28
  if (!blocked)
20
29
  return false;
@@ -31,12 +40,14 @@ export class ToolAvailabilityRegistry {
31
40
  }
32
41
  block(sessionId, toolName, reason, ttlMs = this.defaultTtlMs, now = Date.now()) {
33
42
  const blockedUntil = now + ttlMs;
43
+ const entry = { toolName, blockedUntil, reason };
44
+ if (sessionId === undefined)
45
+ return entry;
34
46
  let blocked = this.sessions.get(sessionId);
35
47
  if (!blocked) {
36
48
  blocked = new Map();
37
49
  this.sessions.set(sessionId, blocked);
38
50
  }
39
- const entry = { toolName, blockedUntil, reason };
40
51
  blocked.set(toolName, entry);
41
52
  return entry;
42
53
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tool-availability-registry.js","sourceRoot":"","sources":["../../src/policy/tool-availability-registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tool-availability-registry.js","sourceRoot":"","sources":["../../src/policy/tool-availability-registry.ts"],"names":[],"mappings":"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"}
@@ -9,11 +9,11 @@
9
9
  import type { ILlm, Message } from '@mcp-abap-adt/llm-agent';
10
10
  import { type CallOptions, LlmError, type LlmResponse, type LlmStreamChunk, type LlmTool, type Result } from '@mcp-abap-adt/llm-agent';
11
11
  export interface RetryOptions {
12
- /** Maximum number of retry attempts (total calls = maxAttempts + 1). Default: 3. */
13
- maxAttempts: number;
12
+ /** Maximum number of non-429 retries. Unlimited when omitted. */
13
+ maxAttempts?: number;
14
14
  /** Initial backoff delay in ms. Doubles each attempt. Default: 2000. */
15
15
  backoffMs: number;
16
- /** HTTP status codes that trigger retry. Default: [429, 500, 502, 503]. */
16
+ /** Transient HTTP statuses to retry. Default: [408, 500, 502, 503]. 429 always retries. */
17
17
  retryOn: number[];
18
18
  /** Substrings in error message that trigger mid-stream retry (replays entire stream). Default: []. */
19
19
  retryOnMidStream: string[];
@@ -33,9 +33,11 @@ export declare class RetryLlm implements ILlm {
33
33
  * a throwing provider goes through the same retry rules as an error chunk.
34
34
  */
35
35
  private attemptStream;
36
- private isRetryable;
36
+ private isThrottled;
37
+ private canRetry;
37
38
  private isMidStreamRetryable;
38
- private backoff;
39
+ private retryDelay;
40
+ private waitForRetry;
39
41
  }
40
42
  /**
41
43
  * Wraps `llm` in a RetryLlm placed UNDER any CircuitBreakerLlm layers it
@@ -1 +1 @@
1
- {"version":3,"file":"retry-llm.d.ts","sourceRoot":"","sources":["../../src/resilience/retry-llm.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EACL,KAAK,WAAW,EAOhB,QAAQ,EACR,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,oFAAoF;IACpF,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;IAClB,2EAA2E;IAC3E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,sGAAsG;IACtG,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AASD,qBAAa,QAAS,YAAW,IAAI;IAMjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6B;IAClD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAe;IACpC,WAAW,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBAGf,KAAK,EAAE,IAAI,EAC5B,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAQjC,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEK,IAAI,CACR,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IA0BlC,UAAU,CACf,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IA0DlD;;;;OAIG;YACY,aAAa;IAY5B,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,oBAAoB;YAMd,OAAO;CAStB;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,IAAI,EACT,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC9B,IAAI,CAQN"}
1
+ {"version":3,"file":"retry-llm.d.ts","sourceRoot":"","sources":["../../src/resilience/retry-llm.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EACL,KAAK,WAAW,EAMhB,QAAQ,EACR,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,MAAM,EAKZ,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;IAClB,2FAA2F;IAC3F,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,sGAAsG;IACtG,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAqBD,qBAAa,QAAS,YAAW,IAAI;IAMjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA6B;IAClD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAe;IACpC,WAAW,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBAGf,KAAK,EAAE,IAAI,EAC5B,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAQjC,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEK,IAAI,CACR,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IA2ClC,UAAU,CACf,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,CAAC,EAAE,OAAO,EAAE,EACjB,OAAO,CAAC,EAAE,WAAW,GACpB,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAwDlD;;;;OAIG;YACY,aAAa;IAY5B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,UAAU;YAOJ,YAAY;CAQ3B;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,IAAI,EACT,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC9B,IAAI,CAQN"}