@tyvm/knowhow 0.0.138 → 0.0.140

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 (170) hide show
  1. package/autodoc/chat-guide.md +1 -0
  2. package/package.json +5 -2
  3. package/scripts/build-for-node.sh +4 -4
  4. package/src/agents/base/base.ts +254 -29
  5. package/src/agents/patcher/patcher.ts +1 -1
  6. package/src/agents/researcher/researcher.ts +2 -2
  7. package/src/agents/tools/agentCall.ts +6 -0
  8. package/src/agents/tools/connectAgent.ts +353 -0
  9. package/src/agents/tools/index.ts +6 -0
  10. package/src/agents/tools/list.ts +48 -0
  11. package/src/agents/tools/observe.ts +245 -0
  12. package/src/agents/tools/replyToParent.ts +122 -0
  13. package/src/agents/tools/runGenerate.ts +209 -0
  14. package/src/agents/tools/sendAgentMessage.ts +138 -0
  15. package/src/agents/tools/startAgentTask.ts +92 -5
  16. package/src/agents/tools/waitForAgentCompleted.ts +269 -0
  17. package/src/ai.ts +1 -0
  18. package/src/chat/modules/AgentModule.ts +89 -27
  19. package/src/chat/modules/SessionsModule.ts +6 -10
  20. package/src/clients/contextLimits.ts +26 -0
  21. package/src/clients/pricing/anthropic.ts +12 -0
  22. package/src/commands/agent.ts +22 -0
  23. package/src/commands/agents.ts +83 -0
  24. package/src/commands/misc.ts +6 -0
  25. package/src/commands/services.ts +14 -0
  26. package/src/generate.ts +25 -3
  27. package/src/services/AgentService.ts +21 -3
  28. package/src/services/AgentSyncFs.ts +56 -0
  29. package/src/services/AgentSyncKnowhowWeb.ts +1 -1
  30. package/src/services/EventService.ts +4 -1
  31. package/src/services/KnowhowClient.ts +7 -0
  32. package/src/services/LazyToolsService.ts +7 -3
  33. package/src/services/MinimalToolsService.ts +15 -7
  34. package/src/services/SyncedAgentWatcher.ts +2 -0
  35. package/src/services/SyncerService.ts +35 -6
  36. package/src/services/Tools.ts +43 -3
  37. package/src/services/modules/index.ts +127 -46
  38. package/src/types.ts +5 -0
  39. package/tests/agents/interrupt.test.ts +11 -18
  40. package/tests/agents/observe-base.test.ts +183 -0
  41. package/tests/agents/tools/connectAgent.test.ts +138 -0
  42. package/tests/agents/tools/observe.test.ts +179 -0
  43. package/tests/agents/tools/replyToParent.test.ts +125 -0
  44. package/tests/agents/tools/sendAgentMessage.test.ts +99 -0
  45. package/tests/agents/tools/waitForAgentCompleted.test.ts +147 -0
  46. package/tests/chat/detach-attach-rendering.test.ts +315 -0
  47. package/tests/clients/contextLimits.test.ts +23 -1
  48. package/tests/clients/pricing.test.ts +20 -1
  49. package/tests/services/Tools.test.ts +172 -9
  50. package/tests/unit/modules/moduleLoading.test.ts +69 -0
  51. package/ts_build/package.json +5 -2
  52. package/ts_build/src/agents/base/base.d.ts +24 -1
  53. package/ts_build/src/agents/base/base.js +111 -16
  54. package/ts_build/src/agents/base/base.js.map +1 -1
  55. package/ts_build/src/agents/patcher/patcher.js +1 -1
  56. package/ts_build/src/agents/patcher/patcher.js.map +1 -1
  57. package/ts_build/src/agents/researcher/researcher.js +2 -2
  58. package/ts_build/src/agents/researcher/researcher.js.map +1 -1
  59. package/ts_build/src/agents/tools/agentCall.js.map +1 -1
  60. package/ts_build/src/agents/tools/connectAgent.d.ts +21 -0
  61. package/ts_build/src/agents/tools/connectAgent.js +284 -0
  62. package/ts_build/src/agents/tools/connectAgent.js.map +1 -0
  63. package/ts_build/src/agents/tools/index.d.ts +6 -0
  64. package/ts_build/src/agents/tools/index.js +6 -0
  65. package/ts_build/src/agents/tools/index.js.map +1 -1
  66. package/ts_build/src/agents/tools/list.js +40 -0
  67. package/ts_build/src/agents/tools/list.js.map +1 -1
  68. package/ts_build/src/agents/tools/observe.d.ts +20 -0
  69. package/ts_build/src/agents/tools/observe.js +144 -0
  70. package/ts_build/src/agents/tools/observe.js.map +1 -0
  71. package/ts_build/src/agents/tools/replyToParent.d.ts +4 -0
  72. package/ts_build/src/agents/tools/replyToParent.js +118 -0
  73. package/ts_build/src/agents/tools/replyToParent.js.map +1 -0
  74. package/ts_build/src/agents/tools/runGenerate.d.ts +19 -0
  75. package/ts_build/src/agents/tools/runGenerate.js +138 -0
  76. package/ts_build/src/agents/tools/runGenerate.js.map +1 -0
  77. package/ts_build/src/agents/tools/sendAgentMessage.d.ts +11 -0
  78. package/ts_build/src/agents/tools/sendAgentMessage.js +118 -0
  79. package/ts_build/src/agents/tools/sendAgentMessage.js.map +1 -0
  80. package/ts_build/src/agents/tools/startAgentTask.d.ts +7 -0
  81. package/ts_build/src/agents/tools/startAgentTask.js +53 -6
  82. package/ts_build/src/agents/tools/startAgentTask.js.map +1 -1
  83. package/ts_build/src/agents/tools/waitForAgentCompleted.d.ts +10 -0
  84. package/ts_build/src/agents/tools/waitForAgentCompleted.js +229 -0
  85. package/ts_build/src/agents/tools/waitForAgentCompleted.js.map +1 -0
  86. package/ts_build/src/ai.d.ts +1 -0
  87. package/ts_build/src/ai.js.map +1 -1
  88. package/ts_build/src/chat/modules/AgentModule.d.ts +3 -1
  89. package/ts_build/src/chat/modules/AgentModule.js +46 -21
  90. package/ts_build/src/chat/modules/AgentModule.js.map +1 -1
  91. package/ts_build/src/chat/modules/SessionsModule.js +1 -6
  92. package/ts_build/src/chat/modules/SessionsModule.js.map +1 -1
  93. package/ts_build/src/clients/contextLimits.js +21 -0
  94. package/ts_build/src/clients/contextLimits.js.map +1 -1
  95. package/ts_build/src/clients/pricing/anthropic.d.ts +2 -0
  96. package/ts_build/src/clients/pricing/anthropic.js +9 -0
  97. package/ts_build/src/clients/pricing/anthropic.js.map +1 -1
  98. package/ts_build/src/commands/agent.js +11 -0
  99. package/ts_build/src/commands/agent.js.map +1 -1
  100. package/ts_build/src/commands/agents.js +61 -0
  101. package/ts_build/src/commands/agents.js.map +1 -1
  102. package/ts_build/src/commands/misc.js +2 -0
  103. package/ts_build/src/commands/misc.js.map +1 -1
  104. package/ts_build/src/commands/services.js +10 -0
  105. package/ts_build/src/commands/services.js.map +1 -1
  106. package/ts_build/src/generate.d.ts +2 -0
  107. package/ts_build/src/generate.js +11 -3
  108. package/ts_build/src/generate.js.map +1 -1
  109. package/ts_build/src/services/AgentService.d.ts +4 -1
  110. package/ts_build/src/services/AgentService.js +9 -2
  111. package/ts_build/src/services/AgentService.js.map +1 -1
  112. package/ts_build/src/services/AgentSyncFs.d.ts +2 -0
  113. package/ts_build/src/services/AgentSyncFs.js +35 -0
  114. package/ts_build/src/services/AgentSyncFs.js.map +1 -1
  115. package/ts_build/src/services/AgentSyncKnowhowWeb.d.ts +1 -1
  116. package/ts_build/src/services/EventService.d.ts +4 -1
  117. package/ts_build/src/services/EventService.js.map +1 -1
  118. package/ts_build/src/services/KnowhowClient.js +3 -0
  119. package/ts_build/src/services/KnowhowClient.js.map +1 -1
  120. package/ts_build/src/services/LazyToolsService.d.ts +2 -2
  121. package/ts_build/src/services/LazyToolsService.js +2 -2
  122. package/ts_build/src/services/LazyToolsService.js.map +1 -1
  123. package/ts_build/src/services/MinimalToolsService.d.ts +2 -2
  124. package/ts_build/src/services/MinimalToolsService.js +6 -6
  125. package/ts_build/src/services/MinimalToolsService.js.map +1 -1
  126. package/ts_build/src/services/SyncedAgentWatcher.d.ts +1 -0
  127. package/ts_build/src/services/SyncedAgentWatcher.js.map +1 -1
  128. package/ts_build/src/services/SyncerService.d.ts +2 -1
  129. package/ts_build/src/services/SyncerService.js +8 -2
  130. package/ts_build/src/services/SyncerService.js.map +1 -1
  131. package/ts_build/src/services/Tools.d.ts +6 -1
  132. package/ts_build/src/services/Tools.js +9 -3
  133. package/ts_build/src/services/Tools.js.map +1 -1
  134. package/ts_build/src/services/modules/index.d.ts +1 -1
  135. package/ts_build/src/services/modules/index.js +67 -27
  136. package/ts_build/src/services/modules/index.js.map +1 -1
  137. package/ts_build/src/types.d.ts +3 -0
  138. package/ts_build/src/types.js.map +1 -1
  139. package/ts_build/tests/agents/interrupt.test.d.ts +0 -1
  140. package/ts_build/tests/agents/interrupt.test.js +3 -13
  141. package/ts_build/tests/agents/interrupt.test.js.map +1 -1
  142. package/ts_build/tests/agents/observe-base.test.d.ts +1 -0
  143. package/ts_build/tests/agents/observe-base.test.js +149 -0
  144. package/ts_build/tests/agents/observe-base.test.js.map +1 -0
  145. package/ts_build/tests/agents/tools/connectAgent.test.d.ts +1 -0
  146. package/ts_build/tests/agents/tools/connectAgent.test.js +142 -0
  147. package/ts_build/tests/agents/tools/connectAgent.test.js.map +1 -0
  148. package/ts_build/tests/agents/tools/observe.test.d.ts +1 -0
  149. package/ts_build/tests/agents/tools/observe.test.js +148 -0
  150. package/ts_build/tests/agents/tools/observe.test.js.map +1 -0
  151. package/ts_build/tests/agents/tools/replyToParent.test.d.ts +1 -0
  152. package/ts_build/tests/agents/tools/replyToParent.test.js +116 -0
  153. package/ts_build/tests/agents/tools/replyToParent.test.js.map +1 -0
  154. package/ts_build/tests/agents/tools/sendAgentMessage.test.d.ts +1 -0
  155. package/ts_build/tests/agents/tools/sendAgentMessage.test.js +112 -0
  156. package/ts_build/tests/agents/tools/sendAgentMessage.test.js.map +1 -0
  157. package/ts_build/tests/agents/tools/waitForAgentCompleted.test.d.ts +1 -0
  158. package/ts_build/tests/agents/tools/waitForAgentCompleted.test.js +147 -0
  159. package/ts_build/tests/agents/tools/waitForAgentCompleted.test.js.map +1 -0
  160. package/ts_build/tests/chat/detach-attach-rendering.test.d.ts +1 -0
  161. package/ts_build/tests/chat/detach-attach-rendering.test.js +168 -0
  162. package/ts_build/tests/chat/detach-attach-rendering.test.js.map +1 -0
  163. package/ts_build/tests/clients/contextLimits.test.js +11 -1
  164. package/ts_build/tests/clients/contextLimits.test.js.map +1 -1
  165. package/ts_build/tests/clients/pricing.test.js +10 -1
  166. package/ts_build/tests/clients/pricing.test.js.map +1 -1
  167. package/ts_build/tests/services/Tools.test.js +126 -8
  168. package/ts_build/tests/services/Tools.test.js.map +1 -1
  169. package/ts_build/tests/unit/modules/moduleLoading.test.js +84 -0
  170. package/ts_build/tests/unit/modules/moduleLoading.test.js.map +1 -1
@@ -0,0 +1,147 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
35
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ const fs = __importStar(require("fs"));
37
+ const os = __importStar(require("os"));
38
+ const path = __importStar(require("path"));
39
+ const waitForAgentCompleted_1 = require("../../../src/agents/tools/waitForAgentCompleted");
40
+ describe("waitForAgentCompleted", () => {
41
+ let tmpCwd;
42
+ let originalCwd;
43
+ let agentsDir;
44
+ beforeEach(() => {
45
+ originalCwd = process.cwd();
46
+ tmpCwd = fs.mkdtempSync(path.join(os.tmpdir(), "wait-agent-"));
47
+ process.chdir(tmpCwd);
48
+ agentsDir = path.join(tmpCwd, ".knowhow", "processes", "agents");
49
+ fs.mkdirSync(agentsDir, { recursive: true });
50
+ });
51
+ afterEach(() => {
52
+ process.chdir(originalCwd);
53
+ fs.rmSync(tmpCwd, { recursive: true, force: true });
54
+ });
55
+ function makeTask(taskId, meta = {}, status) {
56
+ const dir = path.join(agentsDir, taskId);
57
+ fs.mkdirSync(dir, { recursive: true });
58
+ fs.writeFileSync(path.join(dir, "metadata.json"), JSON.stringify({ taskId, ...meta }, null, 2), "utf8");
59
+ if (status !== undefined) {
60
+ fs.writeFileSync(path.join(dir, "status.txt"), status, "utf8");
61
+ }
62
+ return dir;
63
+ }
64
+ it("returns error when taskId missing", async () => {
65
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "" }));
66
+ expect(res.status).toBe("error");
67
+ expect(res.error).toMatch(/taskId is required/);
68
+ });
69
+ it("returns error when task directory does not exist", async () => {
70
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "nope" }));
71
+ expect(res.status).toBe("error");
72
+ expect(res.error).toMatch(/No agent task directory/);
73
+ });
74
+ it("returns immediately with structured result for a completed task", async () => {
75
+ makeTask("done-1", {
76
+ status: "completed",
77
+ totalCostUsd: 1.23,
78
+ result: "the final answer",
79
+ artifacts: ["a.txt"],
80
+ });
81
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "done-1" }));
82
+ expect(res.status).toBe("completed");
83
+ expect(res.costUsd).toBe(1.23);
84
+ expect(res.finalAnswer).toBe("the final answer");
85
+ expect(res.artifacts).toEqual(["a.txt"]);
86
+ });
87
+ it("falls back to last assistant message when no result field", async () => {
88
+ makeTask("done-2", {
89
+ status: "completed",
90
+ totalCostUsd: 0.5,
91
+ threads: [
92
+ [
93
+ { role: "user", content: "do it" },
94
+ { role: "assistant", content: "I did it" },
95
+ ],
96
+ ],
97
+ });
98
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "done-2" }));
99
+ expect(res.finalAnswer).toBe("I did it");
100
+ });
101
+ it("treats inProgress:false with no status as completed", async () => {
102
+ makeTask("done-3", { inProgress: false, totalCostUsd: 0.1, result: "ok" });
103
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "done-3" }));
104
+ expect(res.status).toBe("completed");
105
+ });
106
+ it("times out on a still-running task", async () => {
107
+ makeTask("running-1", { status: "running", totalCostUsd: 0.2 });
108
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({
109
+ taskId: "running-1",
110
+ timeoutMs: 300,
111
+ pollIntervalMs: 100,
112
+ }));
113
+ expect(res.timedOut).toBe(true);
114
+ expect(res.status).toBe("running");
115
+ expect(res.costUsd).toBe(0.2);
116
+ });
117
+ it("resolves when a running task transitions to completed mid-poll", async () => {
118
+ const dir = makeTask("running-2", { status: "running", totalCostUsd: 0 });
119
+ setTimeout(() => {
120
+ fs.writeFileSync(path.join(dir, "metadata.json"), JSON.stringify({
121
+ taskId: "running-2",
122
+ status: "completed",
123
+ totalCostUsd: 2.0,
124
+ result: "eventually done",
125
+ }, null, 2), "utf8");
126
+ }, 150);
127
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({
128
+ taskId: "running-2",
129
+ timeoutMs: 3000,
130
+ pollIntervalMs: 100,
131
+ }));
132
+ expect(res.status).toBe("completed");
133
+ expect(res.finalAnswer).toBe("eventually done");
134
+ expect(res.costUsd).toBe(2.0);
135
+ });
136
+ it("fails a task whose pid is dead without a terminal status", async () => {
137
+ makeTask("crashed-1", { status: "running", totalCostUsd: 0.3, pid: 999999 });
138
+ const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({
139
+ taskId: "crashed-1",
140
+ timeoutMs: 5000,
141
+ pollIntervalMs: 100,
142
+ }));
143
+ expect(res.status).toBe("failed");
144
+ expect(res.error).toMatch(/exited without writing a terminal status/);
145
+ });
146
+ });
147
+ //# sourceMappingURL=waitForAgentCompleted.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"waitForAgentCompleted.test.js","sourceRoot":"","sources":["../../../../tests/agents/tools/waitForAgentCompleted.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,168 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const EventService_1 = require("../../src/services/EventService");
4
+ const EVENT_TYPES = {
5
+ done: "done",
6
+ toolCall: "tool:pre_call",
7
+ toolUsed: "tool:post_call",
8
+ agentSay: "agent:say",
9
+ threadUpdate: "thread_update",
10
+ };
11
+ class RenderingHarness {
12
+ _wireAgentEvents;
13
+ _wireTaskId;
14
+ _wireAgentName;
15
+ _wireEventTypes;
16
+ rendered = [];
17
+ wireAgentRendering(taskId, agentEvents, eventTypes, agentName) {
18
+ if (eventTypes.toolCall) {
19
+ agentEvents.setListener({ key: "agentModule:render:toolCall", event: eventTypes.toolCall }, (data) => this.rendered.push({ type: "toolCall", taskId, agentName, data }));
20
+ }
21
+ if (eventTypes.toolUsed) {
22
+ agentEvents.setListener({ key: "agentModule:render:toolUsed", event: eventTypes.toolUsed }, (data) => this.rendered.push({ type: "toolResult", taskId, agentName, data }));
23
+ }
24
+ if (eventTypes.agentSay) {
25
+ agentEvents.setListener({ key: "agentModule:render:agentSay", event: eventTypes.agentSay }, (data) => this.rendered.push({ type: "agentMessage", taskId, agentName, data }));
26
+ }
27
+ this._wireAgentEvents = agentEvents;
28
+ this._wireTaskId = taskId;
29
+ this._wireAgentName = agentName;
30
+ this._wireEventTypes = eventTypes;
31
+ }
32
+ unwireAgentRendering() {
33
+ if (this._wireAgentEvents) {
34
+ this._wireAgentEvents.removeManagedListenersByPrefix("agentModule:render:");
35
+ this._wireAgentEvents = undefined;
36
+ }
37
+ this._wireTaskId = undefined;
38
+ this._wireAgentName = undefined;
39
+ this._wireEventTypes = undefined;
40
+ }
41
+ reset() {
42
+ this.rendered = [];
43
+ }
44
+ }
45
+ describe("detach / re-attach rendering", () => {
46
+ let harness;
47
+ beforeEach(() => {
48
+ harness = new RenderingHarness();
49
+ });
50
+ it("emitted events reach the renderer after wireAgentRendering", () => {
51
+ const events = new EventService_1.EventService();
52
+ harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
53
+ events.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "execCommand" } } });
54
+ events.emit(EVENT_TYPES.agentSay, { message: "hello" });
55
+ events.emit(EVENT_TYPES.toolUsed, { toolCall: {}, functionResp: "output" });
56
+ expect(harness.rendered).toHaveLength(3);
57
+ expect(harness.rendered[0].type).toBe("toolCall");
58
+ expect(harness.rendered[1].type).toBe("agentMessage");
59
+ expect(harness.rendered[2].type).toBe("toolResult");
60
+ });
61
+ it("old EventService does NOT render after unwireAgentRendering (detach)", () => {
62
+ const events = new EventService_1.EventService();
63
+ harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
64
+ events.emit(EVENT_TYPES.toolCall, { toolCall: {} });
65
+ expect(harness.rendered).toHaveLength(1);
66
+ harness.reset();
67
+ harness.unwireAgentRendering();
68
+ events.emit(EVENT_TYPES.toolCall, { toolCall: {} });
69
+ events.emit(EVENT_TYPES.agentSay, { message: "zombie" });
70
+ events.emit(EVENT_TYPES.toolUsed, { toolCall: {}, functionResp: "output" });
71
+ expect(harness.rendered).toHaveLength(0);
72
+ });
73
+ it("events on a NEW EventService render after re-wiring (re-attach)", () => {
74
+ const oldEvents = new EventService_1.EventService();
75
+ harness.wireAgentRendering("task-1", oldEvents, EVENT_TYPES, "Dev");
76
+ harness.unwireAgentRendering();
77
+ const newEvents = new EventService_1.EventService();
78
+ harness.wireAgentRendering("task-1", newEvents, EVENT_TYPES, "Dev");
79
+ newEvents.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "readFile" } } });
80
+ newEvents.emit(EVENT_TYPES.agentSay, { message: "re-attached message" });
81
+ expect(harness.rendered).toHaveLength(2);
82
+ expect(harness.rendered[0].type).toBe("toolCall");
83
+ expect(harness.rendered[0].data.toolCall.function.name).toBe("readFile");
84
+ expect(harness.rendered[1].type).toBe("agentMessage");
85
+ expect(harness.rendered[1].data.message).toBe("re-attached message");
86
+ });
87
+ it("old EventService stays silent after re-attach on new EventService", () => {
88
+ const oldEvents = new EventService_1.EventService();
89
+ harness.wireAgentRendering("task-1", oldEvents, EVENT_TYPES, "Dev");
90
+ harness.unwireAgentRendering();
91
+ const newEvents = new EventService_1.EventService();
92
+ harness.wireAgentRendering("task-1", newEvents, EVENT_TYPES, "Dev");
93
+ newEvents.emit(EVENT_TYPES.agentSay, { message: "new" });
94
+ expect(harness.rendered).toHaveLength(1);
95
+ oldEvents.emit(EVENT_TYPES.toolCall, { toolCall: {} });
96
+ oldEvents.emit(EVENT_TYPES.agentSay, { message: "old" });
97
+ expect(harness.rendered).toHaveLength(1);
98
+ });
99
+ it("calling wireAgentRendering twice on same EventService does NOT double-render", () => {
100
+ const events = new EventService_1.EventService();
101
+ harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
102
+ harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
103
+ events.emit(EVENT_TYPES.toolCall, { toolCall: {} });
104
+ expect(harness.rendered).toHaveLength(1);
105
+ });
106
+ it("full attach → detach → re-attach cycle: all phases render correctly", () => {
107
+ const watcher1 = new EventService_1.EventService();
108
+ harness.wireAgentRendering("task-A", watcher1, EVENT_TYPES, "Developer");
109
+ watcher1.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "execCommand" } } });
110
+ watcher1.emit(EVENT_TYPES.agentSay, { message: "initial work" });
111
+ expect(harness.rendered).toHaveLength(2);
112
+ harness.reset();
113
+ harness.unwireAgentRendering();
114
+ watcher1.emit(EVENT_TYPES.toolCall, { toolCall: {} });
115
+ watcher1.emit(EVENT_TYPES.agentSay, { message: "zombie message" });
116
+ expect(harness.rendered).toHaveLength(0);
117
+ const watcher2 = new EventService_1.EventService();
118
+ harness.wireAgentRendering("task-A", watcher2, EVENT_TYPES, "Developer");
119
+ watcher2.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "readFile" } } });
120
+ watcher2.emit(EVENT_TYPES.agentSay, { message: "continuing after re-attach" });
121
+ expect(harness.rendered).toHaveLength(2);
122
+ expect(harness.rendered[0].type).toBe("toolCall");
123
+ expect(harness.rendered[0].data.toolCall.function.name).toBe("readFile");
124
+ expect(harness.rendered[1].type).toBe("agentMessage");
125
+ expect(harness.rendered[1].data.message).toBe("continuing after re-attach");
126
+ });
127
+ it("toolResult events render after re-attach", () => {
128
+ const events1 = new EventService_1.EventService();
129
+ harness.wireAgentRendering("task-1", events1, EVENT_TYPES, "Dev");
130
+ harness.unwireAgentRendering();
131
+ const events2 = new EventService_1.EventService();
132
+ harness.wireAgentRendering("task-1", events2, EVENT_TYPES, "Dev");
133
+ events2.emit(EVENT_TYPES.toolUsed, {
134
+ toolCall: { function: { name: "execCommand" } },
135
+ functionResp: "$ echo hello\nhello",
136
+ });
137
+ expect(harness.rendered).toHaveLength(1);
138
+ expect(harness.rendered[0].type).toBe("toolResult");
139
+ expect(harness.rendered[0].data.functionResp).toBe("$ echo hello\nhello");
140
+ });
141
+ it("3 sequential attach/detach cycles all render correctly", () => {
142
+ for (let i = 0; i < 3; i++) {
143
+ harness.reset();
144
+ const events = new EventService_1.EventService();
145
+ harness.wireAgentRendering(`task-${i}`, events, EVENT_TYPES, "Dev");
146
+ events.emit(EVENT_TYPES.agentSay, { message: `cycle ${i}` });
147
+ expect(harness.rendered).toHaveLength(1);
148
+ expect(harness.rendered[0].data.message).toBe(`cycle ${i}`);
149
+ expect(harness.rendered[0].taskId).toBe(`task-${i}`);
150
+ harness.unwireAgentRendering();
151
+ events.emit(EVENT_TYPES.agentSay, { message: "should not render" });
152
+ expect(harness.rendered).toHaveLength(1);
153
+ }
154
+ });
155
+ it("hasManagedListener reflects wired/unwired state correctly", () => {
156
+ const events = new EventService_1.EventService();
157
+ expect(events.hasManagedListener("agentModule:render:toolCall")).toBe(false);
158
+ expect(events.hasManagedListener("agentModule:render:agentSay")).toBe(false);
159
+ harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
160
+ expect(events.hasManagedListener("agentModule:render:toolCall")).toBe(true);
161
+ expect(events.hasManagedListener("agentModule:render:toolUsed")).toBe(true);
162
+ expect(events.hasManagedListener("agentModule:render:agentSay")).toBe(true);
163
+ harness.unwireAgentRendering();
164
+ expect(events.hasManagedListener("agentModule:render:toolCall")).toBe(false);
165
+ expect(events.hasManagedListener("agentModule:render:agentSay")).toBe(false);
166
+ });
167
+ });
168
+ //# sourceMappingURL=detach-attach-rendering.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"detach-attach-rendering.test.js","sourceRoot":"","sources":["../../../tests/chat/detach-attach-rendering.test.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const types_1 = require("../../src/types");
4
4
  const contextLimits_1 = require("../../src/clients/contextLimits");
5
+ const pricing_1 = require("../../src/clients/pricing");
6
+ const deprecatedModelIds = new Set(Object.entries({
7
+ ...pricing_1.OpenAiTextPricing,
8
+ ...pricing_1.GeminiTextPricing,
9
+ ...pricing_1.AnthropicTextPricing,
10
+ ...pricing_1.XaiTextPricing,
11
+ })
12
+ .filter(([, p]) => p && p.deprecated === true)
13
+ .map(([id]) => id));
5
14
  describe("ContextLimits", () => {
6
15
  describe("coverage - all Models.* values have a recorded context limit", () => {
7
16
  const providers = Object.keys(types_1.Models);
@@ -13,7 +22,8 @@ describe("ContextLimits", () => {
13
22
  expect(modelEntries.length).toBeGreaterThan(0);
14
23
  });
15
24
  for (const [key, modelId] of modelEntries) {
16
- it(`${provider}.${key} (${modelId}) should have a context limit`, () => {
25
+ const testFn = deprecatedModelIds.has(modelId) ? it.skip : it;
26
+ testFn(`${provider}.${key} (${modelId}) should have a context limit`, () => {
17
27
  const limit = contextLimits_1.ContextLimits[modelId];
18
28
  expect(limit).toBeDefined();
19
29
  expect(typeof limit).toBe("number");
@@ -1 +1 @@
1
- {"version":3,"file":"contextLimits.test.js","sourceRoot":"","sources":["../../../tests/clients/contextLimits.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contextLimits.test.js","sourceRoot":"","sources":["../../../tests/clients/contextLimits.test.ts"],"names":[],"mappings":"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"}
@@ -87,10 +87,19 @@ describe("Model Pricing Coverage", () => {
87
87
  }
88
88
  describe("Model Catalog Coverage", () => {
89
89
  const catalogIds = new Set(pricing_1.ALL_MODEL_CATALOG.map((m) => m.id));
90
+ const deprecatedModelIds = new Set(Object.entries({
91
+ ...pricing_1.OpenAiTextPricing,
92
+ ...pricing_1.GeminiTextPricing,
93
+ ...pricing_1.AnthropicTextPricing,
94
+ ...pricing_1.XaiTextPricing,
95
+ })
96
+ .filter(([, p]) => p && p.deprecated === true)
97
+ .map(([id]) => id));
90
98
  describe("All Models.* entries are in the catalog", () => {
91
99
  for (const [provider, providerModels] of Object.entries(types_1.Models)) {
92
100
  for (const [modelKey, modelId] of Object.entries(providerModels)) {
93
- it(`Models.${provider}.${modelKey} (${modelId}) is in ALL_MODEL_CATALOG`, () => {
101
+ const testFn = deprecatedModelIds.has(modelId) ? it.skip : it;
102
+ testFn(`Models.${provider}.${modelKey} (${modelId}) is in ALL_MODEL_CATALOG`, () => {
94
103
  expect(catalogIds.has(modelId)).toBe(true);
95
104
  });
96
105
  }
@@ -1 +1 @@
1
- {"version":3,"file":"pricing.test.js","sourceRoot":"","sources":["../../../tests/clients/pricing.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pricing.test.js","sourceRoot":"","sources":["../../../tests/clients/pricing.test.ts"],"names":[],"mappings":";;AAYA,2CAayB;AAEzB,uDAQmC;AAEnC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAMtC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS;QACpC,GAAG,yBAAiB;QACpB,GAAG,yBAAiB;QACpB,GAAG,uBAAe;QAClB,GAAG,yBAAiB;QACpB,GAAG,yBAAiB;QACpB,GAAG,uBAAe;QAClB,GAAG,iCAAyB;QAC5B,GAAG,4BAAoB;QACvB,GAAG,sBAAc;QACjB,GAAG,sBAAc;QAEjB,cAAM,CAAC,MAAM,CAAC,oBAAoB;KACnC,CAAC,CAAC;IAEH,MAAM,cAAc,GAA4B;QAC9C,GAAG,2BAAiB;QACpB,GAAG,2BAAiB;QACpB,GAAG,8BAAoB;QACvB,GAAG,wBAAc;KAClB,CAAC;IAEF,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;QACnD,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAM,CAAC,EAAE,CAAC;YAChE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;gBACF,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBAE/B,SAAS;gBACX,CAAC;gBAED,EAAE,CAAC,GAAG,QAAQ,IAAI,QAAQ,KAAK,OAAO,oBAAoB,EAAE,GAAG,EAAE;oBAC/D,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;oBACtC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;oBAC5B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CACnB,MAAM,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CACvD,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;QAC7C,MAAM,mBAAmB,GAA4B;YACnD,GAAG,2BAAiB;YACpB,GAAG,2BAAiB;SACrB,CAAC;QAEF,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAe,CAAC,EAAE,CAAC;YACzE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;gBACF,EAAE,CAAC,mBAAmB,QAAQ,IAAI,QAAQ,KAAK,OAAO,eAAe,EAAE,GAAG,EAAE;oBAC1E,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;oBAC3C,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC9B,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;QACnD,MAAM,eAAe,GAAG,yBAA0C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,sBAAc,EAAE,CAAC;YACrC,EAAE,CAAC,oBAAoB,OAAO,qBAAqB,EAAE,GAAG,EAAE;gBACxD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;QACnD,MAAM,eAAe,GAAG,yBAA0C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,sBAAc,EAAE,CAAC;YACrC,EAAE,CAAC,oBAAoB,OAAO,qBAAqB,EAAE,GAAG,EAAE;gBACxD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAChD,MAAM,aAAa,GAAG,2BAA4C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,yBAAiB,EAAE,CAAC;YACxC,EAAE,CAAC,uBAAuB,OAAO,oCAAoC,EAAE,GAAG,EAAE;gBAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;gBACrC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAChD,MAAM,aAAa,GAAG,2BAA4C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,yBAAiB,EAAE,CAAC;YACxC,EAAE,CAAC,uBAAuB,OAAO,oCAAoC,EAAE,GAAG,EAAE;gBAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;gBACrC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;QAEL,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAYtC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,2BAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAG/D,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,MAAM,CAAC,OAAO,CAAC;gBACb,GAAG,2BAAiB;gBACpB,GAAG,2BAAiB;gBACpB,GAAG,8BAAoB;gBACvB,GAAG,wBAAc;aAC0B,CAAC;iBAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;iBAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CACrB,CAAC;YAEF,QAAQ,CAAC,yCAAyC,EAAE,GAAG,EAAE;gBACvD,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAM,CAAC,EAAE,CAAC;oBAChE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;wBACF,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC9D,MAAM,CAAC,UAAU,QAAQ,IAAI,QAAQ,KAAK,OAAO,2BAA2B,EAAE,GAAG,EAAE;4BACjF,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7C,CAAC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBAChE,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAe,CAAC,EAAE,CAAC;oBACzE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;wBACF,EAAE,CAAC,mBAAmB,QAAQ,IAAI,QAAQ,KAAK,OAAO,2BAA2B,EAAE,GAAG,EAAE;4BACtF,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7C,CAAC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -216,7 +216,8 @@ describe("ToolsService", () => {
216
216
  const mockFunction = jest.fn().mockResolvedValue("success result");
217
217
  toolsService.setFunction("testTool", mockFunction);
218
218
  const result = await toolsService.callTool(mockToolCall);
219
- expect(mockFunction).toHaveBeenCalledWith({ input: "test value" });
219
+ expect(mockFunction).toHaveBeenCalledWith(expect.objectContaining({ input: "test value" }));
220
+ expect(mockFunction.mock.calls[0][0]._ctx).toBeDefined();
220
221
  expect(result.toolMessages).toHaveLength(1);
221
222
  expect(result.toolMessages[0]).toEqual({
222
223
  tool_call_id: "call_123",
@@ -254,7 +255,7 @@ describe("ToolsService", () => {
254
255
  toolsService.addTool(positionalTool);
255
256
  toolsService.setFunction("positionalTool", mockFunction);
256
257
  await toolsService.callTool(positionalCall);
257
- expect(mockFunction).toHaveBeenCalledWith("hello", 42);
258
+ expect(mockFunction).toHaveBeenCalledWith("hello", 42, expect.objectContaining({ Tools: expect.anything() }));
258
259
  });
259
260
  it("should handle tool not enabled error", async () => {
260
261
  const mockFunction = jest.fn();
@@ -346,7 +347,8 @@ describe("ToolsService", () => {
346
347
  const mockFunction = jest.fn().mockResolvedValue("success");
347
348
  toolsService.setFunction("testTool", mockFunction);
348
349
  await toolsService.callTool(toolCallWithStringArgs);
349
- expect(mockFunction).toHaveBeenCalledWith({ input: "escaped\nstring" });
350
+ expect(mockFunction).toHaveBeenCalledWith(expect.objectContaining({ input: "escaped\nstring" }));
351
+ expect(mockFunction.mock.calls[0][0]._ctx).toBeDefined();
350
352
  });
351
353
  });
352
354
  describe("Tool Override System", () => {
@@ -393,7 +395,7 @@ describe("ToolsService", () => {
393
395
  },
394
396
  };
395
397
  const result = await toolsService.callTool(toolCall);
396
- expect(overrideFunction).toHaveBeenCalledWith([{ input: "test" }], expect.any(Object));
398
+ expect(overrideFunction).toHaveBeenCalledWith([expect.objectContaining({ input: "test" })], expect.any(Object));
397
399
  expect(originalFunction).not.toHaveBeenCalled();
398
400
  expect(result.functionResp).toBe("override result");
399
401
  });
@@ -489,7 +491,7 @@ describe("ToolsService", () => {
489
491
  };
490
492
  const result = await toolsService.callTool(toolCall);
491
493
  expect(wrapperFunction).toHaveBeenCalled();
492
- expect(originalFunction).toHaveBeenCalledWith({ input: "test" });
494
+ expect(originalFunction).toHaveBeenCalledWith(expect.objectContaining({ input: "test" }));
493
495
  expect(result.functionResp).toBe("wrapped: original result");
494
496
  });
495
497
  it("should handle wrapper priority ordering", () => {
@@ -649,7 +651,8 @@ describe("ToolsService", () => {
649
651
  toolsService.addTool(noParamTool);
650
652
  toolsService.setFunction("noParamTool", mockFunction);
651
653
  const result = await toolsService.callTool(noParamCall);
652
- expect(mockFunction).toHaveBeenCalledWith({});
654
+ expect(mockFunction).toHaveBeenCalledWith(expect.any(Object));
655
+ expect(mockFunction.mock.calls[0][0]._ctx).toBeDefined();
653
656
  expect(result.functionResp).toBe("no param result");
654
657
  });
655
658
  it("should handle tools with complex nested parameter structures", async () => {
@@ -699,14 +702,14 @@ describe("ToolsService", () => {
699
702
  toolsService.addTool(complexTool);
700
703
  toolsService.setFunction("complexTool", mockFunction);
701
704
  const result = await toolsService.callTool(complexCall);
702
- expect(mockFunction).toHaveBeenCalledWith({
705
+ expect(mockFunction).toHaveBeenCalledWith(expect.objectContaining({
703
706
  config: {
704
707
  settings: [
705
708
  { key: "timeout", value: 5000 },
706
709
  { key: "retries", value: 3 },
707
710
  ],
708
711
  },
709
- });
712
+ }));
710
713
  expect(result.functionResp).toBe("complex result");
711
714
  });
712
715
  it("should handle concurrent tool calls", async () => {
@@ -1241,5 +1244,120 @@ describe("ToolsService", () => {
1241
1244
  expect(foundTools.map(t => t.function.name)).toContain("tool2");
1242
1245
  });
1243
1246
  });
1247
+ describe("_ctx per-call context threading", () => {
1248
+ const positionalTool = {
1249
+ type: "function",
1250
+ function: {
1251
+ name: "posCtxTool",
1252
+ parameters: {
1253
+ type: "object",
1254
+ positional: true,
1255
+ properties: {
1256
+ arg1: { type: "string" },
1257
+ },
1258
+ required: ["arg1"],
1259
+ },
1260
+ },
1261
+ };
1262
+ const nonPositionalTool = {
1263
+ type: "function",
1264
+ function: {
1265
+ name: "nonPosCtxTool",
1266
+ parameters: {
1267
+ type: "object",
1268
+ properties: {
1269
+ input: { type: "string" },
1270
+ },
1271
+ required: ["input"],
1272
+ },
1273
+ },
1274
+ };
1275
+ it("passes _ctx as the last positional argument for positional tools", async () => {
1276
+ const fn = jest.fn().mockResolvedValue("ok");
1277
+ toolsService.addTool(positionalTool);
1278
+ toolsService.setFunction("posCtxTool", fn);
1279
+ const caller = { name: "TestAgent" };
1280
+ await toolsService.callTool({
1281
+ id: "c1",
1282
+ type: "function",
1283
+ function: {
1284
+ name: "posCtxTool",
1285
+ arguments: JSON.stringify({ arg1: "hello" }),
1286
+ },
1287
+ }, undefined, { caller, taskId: "task-123" });
1288
+ const callArgs = fn.mock.calls[0];
1289
+ expect(callArgs[0]).toBe("hello");
1290
+ const ctx = callArgs[1];
1291
+ expect(ctx).toBeDefined();
1292
+ expect(ctx.caller).toBe(caller);
1293
+ expect(ctx.taskId).toBe("task-123");
1294
+ expect(ctx.Tools).toBe(toolsService);
1295
+ });
1296
+ it("merges _ctx onto the args object for non-positional tools", async () => {
1297
+ const fn = jest.fn().mockResolvedValue("ok");
1298
+ toolsService.addTool(nonPositionalTool);
1299
+ toolsService.setFunction("nonPosCtxTool", fn);
1300
+ const caller = { name: "TestAgent" };
1301
+ await toolsService.callTool({
1302
+ id: "c2",
1303
+ type: "function",
1304
+ function: {
1305
+ name: "nonPosCtxTool",
1306
+ arguments: JSON.stringify({ input: "value" }),
1307
+ },
1308
+ }, undefined, { caller, taskId: "task-456" });
1309
+ const argObj = fn.mock.calls[0][0];
1310
+ expect(argObj.input).toBe("value");
1311
+ expect(argObj._ctx).toBeDefined();
1312
+ expect(argObj._ctx.caller).toBe(caller);
1313
+ expect(argObj._ctx.taskId).toBe("task-456");
1314
+ expect(argObj._ctx.Tools).toBe(toolsService);
1315
+ });
1316
+ it("still provides a _ctx (with Tools) when no callContext is passed", async () => {
1317
+ const fn = jest.fn().mockResolvedValue("ok");
1318
+ toolsService.addTool(nonPositionalTool);
1319
+ toolsService.setFunction("nonPosCtxTool", fn);
1320
+ await toolsService.callTool({
1321
+ id: "c3",
1322
+ type: "function",
1323
+ function: {
1324
+ name: "nonPosCtxTool",
1325
+ arguments: JSON.stringify({ input: "value" }),
1326
+ },
1327
+ });
1328
+ const argObj = fn.mock.calls[0][0];
1329
+ expect(argObj._ctx).toBeDefined();
1330
+ expect(argObj._ctx.Tools).toBe(toolsService);
1331
+ expect(argObj._ctx.caller).toBeUndefined();
1332
+ });
1333
+ it("does not leak _ctx into the multi_tool_use.parallel extraction", async () => {
1334
+ const parallelTool = {
1335
+ type: "function",
1336
+ function: {
1337
+ name: "multi_tool_use.parallel",
1338
+ parameters: { type: "object", properties: {} },
1339
+ },
1340
+ };
1341
+ const inner = jest
1342
+ .fn()
1343
+ .mockResolvedValue(["r1", "r2"]);
1344
+ toolsService.addTool(parallelTool);
1345
+ toolsService.setFunction("multi_tool_use.parallel", inner);
1346
+ const result = await toolsService.callTool({
1347
+ id: "c4",
1348
+ type: "function",
1349
+ function: {
1350
+ name: "multi_tool_use.parallel",
1351
+ arguments: JSON.stringify([
1352
+ { recipient_name: "functions.a", parameters: {} },
1353
+ { recipient_name: "functions.b", parameters: {} },
1354
+ ]),
1355
+ },
1356
+ }, undefined, { caller: {}, taskId: "t" });
1357
+ expect(result.toolMessages).toHaveLength(2);
1358
+ expect(result.toolMessages[0].name).toBe("a");
1359
+ expect(result.toolMessages[1].name).toBe("b");
1360
+ });
1361
+ });
1244
1362
  });
1245
1363
  //# sourceMappingURL=Tools.test.js.map