@cursor/july 0.1.26 → 0.1.28

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 (324) hide show
  1. package/dist/ab.d.ts +6 -0
  2. package/dist/ab.d.ts.map +1 -1
  3. package/dist/ab.js +1 -0
  4. package/dist/artifacts.d.ts +34 -0
  5. package/dist/artifacts.d.ts.map +1 -0
  6. package/dist/artifacts.js +57 -0
  7. package/dist/bin/agent-serve.js +43 -12
  8. package/dist/channels/github/github-channel.d.ts +1 -1
  9. package/dist/channels/github/github-channel.d.ts.map +1 -1
  10. package/dist/channels/github/github-channel.js +14 -1
  11. package/dist/channels/github/types.d.ts +6 -1
  12. package/dist/channels/github/types.d.ts.map +1 -1
  13. package/dist/channels/slack/api.d.ts +2 -1
  14. package/dist/channels/slack/api.d.ts.map +1 -1
  15. package/dist/channels/slack/api.js +1 -0
  16. package/dist/channels/slack/auth.d.ts +13 -13
  17. package/dist/channels/slack/auth.d.ts.map +1 -1
  18. package/dist/channels/slack/auth.js +19 -10
  19. package/dist/channels/slack/cursor-account.d.ts +2 -1
  20. package/dist/channels/slack/cursor-account.d.ts.map +1 -1
  21. package/dist/channels/slack/cursor-account.js +3 -1
  22. package/dist/channels/slack/defaults.d.ts +7 -4
  23. package/dist/channels/slack/defaults.d.ts.map +1 -1
  24. package/dist/channels/slack/defaults.js +14 -4
  25. package/dist/channels/slack/dispatch.d.ts +10 -1
  26. package/dist/channels/slack/dispatch.d.ts.map +1 -1
  27. package/dist/channels/slack/dispatch.js +59 -21
  28. package/dist/channels/slack/external-policy.d.ts +27 -0
  29. package/dist/channels/slack/external-policy.d.ts.map +1 -0
  30. package/dist/channels/slack/external-policy.js +53 -0
  31. package/dist/channels/slack/index.d.ts +1 -0
  32. package/dist/channels/slack/index.d.ts.map +1 -1
  33. package/dist/channels/slack/index.js +1 -0
  34. package/dist/channels/slack/interactive.d.ts +8 -1
  35. package/dist/channels/slack/interactive.d.ts.map +1 -1
  36. package/dist/channels/slack/interactive.js +43 -15
  37. package/dist/channels/slack/slack-channel.d.ts.map +1 -1
  38. package/dist/channels/slack/slack-channel.js +22 -8
  39. package/dist/channels/slack/types.d.ts +16 -1
  40. package/dist/channels/slack/types.d.ts.map +1 -1
  41. package/dist/docs/404.html +2 -2
  42. package/dist/docs/ab.html +3 -3
  43. package/dist/docs/assets/{app.DYcC9FY-.js → app.CqjrYaT2.js} +1 -1
  44. package/dist/docs/assets/chunks/@localSearchIndexroot.VWQoPFJ1.js +1 -0
  45. package/dist/docs/assets/chunks/{VPLocalSearchBox.o4N_knTV.js → VPLocalSearchBox.ag-MwUel.js} +1 -1
  46. package/dist/docs/assets/chunks/{theme.DQ-njyo0.js → theme.BS-DJWat.js} +2 -2
  47. package/dist/docs/assets/{guides_slack.md.D_xFKlnF.js → guides_slack.md.CjmJSvZS.js} +8 -4
  48. package/dist/docs/assets/guides_slack.md.CjmJSvZS.lean.js +1 -0
  49. package/dist/docs/assets/guides_webhooks.md.wSOYas3X.js +183 -0
  50. package/dist/docs/assets/{guides_webhooks.md.B1EswtUu.lean.js → guides_webhooks.md.wSOYas3X.lean.js} +1 -1
  51. package/dist/docs/assets/{index.md.Dfv5ic9t.js → index.md.CH_s5uZe.js} +1 -1
  52. package/dist/docs/assets/{reference_channels.md.DdmiKgqf.js → reference_channels.md.CDhTRfUz.js} +2 -2
  53. package/dist/docs/assets/{reference_channels.md.DdmiKgqf.lean.js → reference_channels.md.CDhTRfUz.lean.js} +1 -1
  54. package/dist/docs/building-with-agents.html +3 -3
  55. package/dist/docs/concepts.html +3 -3
  56. package/dist/docs/deployment.html +3 -3
  57. package/dist/docs/evals.html +3 -3
  58. package/dist/docs/example-agents/approval-buddy.html +3 -3
  59. package/dist/docs/example-agents/benny.html +3 -3
  60. package/dist/docs/example-agents/bugbot.html +3 -3
  61. package/dist/docs/example-agents/codebase-wiki.html +3 -3
  62. package/dist/docs/example-agents/codeowners-review.html +3 -3
  63. package/dist/docs/example-agents/concierge.html +3 -3
  64. package/dist/docs/example-agents/fsd.html +3 -3
  65. package/dist/docs/example-agents/index.html +3 -3
  66. package/dist/docs/example-agents/knowledge-base.html +3 -3
  67. package/dist/docs/example-agents/oncall.html +3 -3
  68. package/dist/docs/example-agents/security-reviewer.html +3 -3
  69. package/dist/docs/example-agents/slack-agent.html +3 -3
  70. package/dist/docs/example-agents/weather-agent.html +3 -3
  71. package/dist/docs/guides/agent-to-agent.html +3 -3
  72. package/dist/docs/guides/cloud-runtime.html +3 -3
  73. package/dist/docs/guides/github.html +3 -3
  74. package/dist/docs/guides/human-in-the-loop.html +3 -3
  75. package/dist/docs/guides/mcp-oauth.html +3 -3
  76. package/dist/docs/guides/slack.html +11 -7
  77. package/dist/docs/guides/webhooks.html +138 -5
  78. package/dist/docs/hashmap.json +1 -1
  79. package/dist/docs/hillclimbing.html +3 -3
  80. package/dist/docs/index.html +5 -5
  81. package/dist/docs/quickstart.html +3 -3
  82. package/dist/docs/reference/agent-config.html +3 -3
  83. package/dist/docs/reference/channels.html +5 -5
  84. package/dist/docs/reference/cli.html +3 -3
  85. package/dist/docs/reference/connections.html +3 -3
  86. package/dist/docs/reference/hooks.html +3 -3
  87. package/dist/docs/reference/http-api.html +3 -3
  88. package/dist/docs/reference/instructions.html +3 -3
  89. package/dist/docs/reference/playground.html +3 -3
  90. package/dist/docs/reference/project-layout.html +3 -3
  91. package/dist/docs/reference/prompt.html +3 -3
  92. package/dist/docs/reference/schedules.html +3 -3
  93. package/dist/docs/reference/sessions.html +3 -3
  94. package/dist/docs/reference/skills.html +3 -3
  95. package/dist/docs/reference/subagents.html +3 -3
  96. package/dist/docs/reference/tools.html +3 -3
  97. package/dist/docs/scaffolding-agents.html +3 -3
  98. package/dist/docs/storage.html +3 -3
  99. package/dist/docs/troubleshooting.html +3 -3
  100. package/dist/evals/assertions.d.ts +10 -1
  101. package/dist/evals/assertions.d.ts.map +1 -1
  102. package/dist/evals/assertions.js +12 -0
  103. package/dist/evals.d.ts +1 -1
  104. package/dist/evals.d.ts.map +1 -1
  105. package/dist/index.d.ts +1 -0
  106. package/dist/index.d.ts.map +1 -1
  107. package/dist/index.js +1 -0
  108. package/dist/internal/ab-fold.d.ts.map +1 -1
  109. package/dist/internal/ab-fold.js +4 -0
  110. package/dist/internal/ab-snapshot.d.ts.map +1 -1
  111. package/dist/internal/ab-snapshot.js +1 -0
  112. package/dist/internal/artifacts-store.d.ts +45 -0
  113. package/dist/internal/artifacts-store.d.ts.map +1 -0
  114. package/dist/internal/artifacts-store.js +250 -0
  115. package/dist/internal/builtin-tools/artifacts.d.ts +10 -0
  116. package/dist/internal/builtin-tools/artifacts.d.ts.map +1 -0
  117. package/dist/internal/builtin-tools/artifacts.js +73 -0
  118. package/dist/internal/builtin-tools/index.d.ts +8 -1
  119. package/dist/internal/builtin-tools/index.d.ts.map +1 -1
  120. package/dist/internal/builtin-tools/index.js +15 -0
  121. package/dist/internal/cli-ax.d.ts +19 -0
  122. package/dist/internal/cli-ax.d.ts.map +1 -1
  123. package/dist/internal/cli-ax.js +196 -57
  124. package/dist/internal/cli-slack.d.ts.map +1 -1
  125. package/dist/internal/cli-slack.js +14 -6
  126. package/dist/internal/cursor-slack-relay.d.ts +2 -0
  127. package/dist/internal/cursor-slack-relay.d.ts.map +1 -1
  128. package/dist/internal/cursor-slack-relay.js +1 -0
  129. package/dist/internal/deploy-client.d.ts +2 -0
  130. package/dist/internal/deploy-client.d.ts.map +1 -1
  131. package/dist/internal/deploy-client.js +1 -0
  132. package/dist/internal/discovery.d.ts.map +1 -1
  133. package/dist/internal/discovery.js +91 -3
  134. package/dist/internal/distribution.d.ts.map +1 -1
  135. package/dist/internal/distribution.js +1 -0
  136. package/dist/internal/model-pricing.d.ts +49 -0
  137. package/dist/internal/model-pricing.d.ts.map +1 -0
  138. package/dist/internal/model-pricing.js +377 -0
  139. package/dist/internal/reminder-runner.d.ts.map +1 -1
  140. package/dist/internal/reminder-runner.js +1 -0
  141. package/dist/internal/schedule-runner.d.ts.map +1 -1
  142. package/dist/internal/schedule-runner.js +1 -0
  143. package/dist/internal/sdk-runner.d.ts.map +1 -1
  144. package/dist/internal/sdk-runner.js +9 -1
  145. package/dist/internal/server.d.ts.map +1 -1
  146. package/dist/internal/server.js +49 -5
  147. package/dist/internal/session-cost.d.ts +49 -0
  148. package/dist/internal/session-cost.d.ts.map +1 -0
  149. package/dist/internal/session-cost.js +175 -0
  150. package/dist/internal/session-engine.d.ts +35 -1
  151. package/dist/internal/session-engine.d.ts.map +1 -1
  152. package/dist/internal/session-engine.js +128 -7
  153. package/dist/internal/storage-coordinator.d.ts +15 -0
  154. package/dist/internal/storage-coordinator.d.ts.map +1 -1
  155. package/dist/internal/storage-coordinator.js +52 -0
  156. package/dist/internal/trajectory.d.ts +9 -1
  157. package/dist/internal/trajectory.d.ts.map +1 -1
  158. package/dist/internal/trajectory.js +32 -5
  159. package/dist/playground/assets/index-Bul1WfrB.css +1 -0
  160. package/dist/playground/assets/index-CkN74U_L.js +87 -0
  161. package/dist/playground/index.html +2 -2
  162. package/dist/storage.d.ts +4 -0
  163. package/dist/storage.d.ts.map +1 -1
  164. package/dist/storage.js +4 -0
  165. package/dist/types.d.ts +164 -1
  166. package/dist/types.d.ts.map +1 -1
  167. package/docs/README.md +1 -0
  168. package/docs/guides/slack.md +32 -7
  169. package/docs/guides/webhooks.md +183 -0
  170. package/docs/reference/channels.md +2 -1
  171. package/package.json +26 -26
  172. package/skills/setup-slack/SKILL.md +3 -0
  173. package/src/ab.ts +7 -0
  174. package/src/bin/agent-serve.ts +42 -5
  175. package/src/channels/slack/auth.ts +29 -22
  176. package/src/channels/slack/cursor-account.ts +2 -0
  177. package/src/channels/slack/defaults.ts +24 -4
  178. package/src/channels/slack/dispatch.ts +42 -1
  179. package/src/channels/slack/external-policy.ts +62 -0
  180. package/src/channels/slack/index.ts +1 -0
  181. package/src/channels/slack/interactive.ts +42 -10
  182. package/src/channels/slack/slack-channel.ts +20 -3
  183. package/src/channels/slack/types.ts +12 -0
  184. package/src/internal/ab-fold.ts +4 -0
  185. package/src/internal/ab-snapshot.ts +1 -0
  186. package/src/internal/cli-ax.ts +205 -34
  187. package/src/internal/cursor-slack-relay.ts +3 -0
  188. package/src/internal/deploy-client.ts +3 -0
  189. package/src/internal/discovery.ts +8 -1
  190. package/src/internal/model-pricing.ts +426 -0
  191. package/src/internal/sdk-runner.ts +10 -2
  192. package/src/internal/server.ts +9 -5
  193. package/src/internal/session-cost.ts +231 -0
  194. package/src/internal/session-engine.ts +28 -0
  195. package/src/internal/trajectory.ts +45 -3
  196. package/src/types.ts +24 -1
  197. package/dist/channels/github/instrument.d.ts +0 -20
  198. package/dist/channels/github/instrument.d.ts.map +0 -1
  199. package/dist/docs/assets/chunks/@localSearchIndexroot.BQTzJjR_.js +0 -1
  200. package/dist/docs/assets/guides_slack.md.D_xFKlnF.lean.js +0 -1
  201. package/dist/docs/assets/guides_webhooks.md.B1EswtUu.js +0 -50
  202. package/dist/internal/json-dir-store.d.ts +0 -32
  203. package/dist/internal/json-dir-store.d.ts.map +0 -1
  204. package/dist/internal/json-dir-store.js +0 -100
  205. package/dist/playground/assets/index-CjOQ4hN9.css +0 -1
  206. package/dist/playground/assets/index-DqXdAFGa.js +0 -85
  207. package/src/bin/agent-serve.version.test.ts +0 -64
  208. package/src/channels/github/api.test.ts +0 -64
  209. package/src/channels/github/auth.test.ts +0 -105
  210. package/src/channels/github/cursor-account.test.ts +0 -204
  211. package/src/channels/github/forward.test.ts +0 -457
  212. package/src/channels/github/github.test.ts +0 -985
  213. package/src/channels/github/replay.test.ts +0 -179
  214. package/src/channels/slack/api.post-message.test.ts +0 -148
  215. package/src/channels/slack/approvals.test.ts +0 -328
  216. package/src/channels/slack/block-actions.test.ts +0 -469
  217. package/src/channels/slack/bot-mentions.test.ts +0 -267
  218. package/src/channels/slack/channel-watch.test.ts +0 -363
  219. package/src/channels/slack/cursor-account.test.ts +0 -301
  220. package/src/channels/slack/defaults.final-post.test.ts +0 -182
  221. package/src/channels/slack/dispatch.test.ts +0 -875
  222. package/src/channels/slack/eval-directive.test.ts +0 -273
  223. package/src/channels/slack/message-body.test.ts +0 -54
  224. package/src/channels/slack/nudge-store.test.ts +0 -143
  225. package/src/channels/slack/slack.test.ts +0 -391
  226. package/src/channels/slack/stop.test.ts +0 -23
  227. package/src/channels/slack/thread-context.test.ts +0 -202
  228. package/src/evals/assertions.test.ts +0 -617
  229. package/src/evals/expect.test.ts +0 -144
  230. package/src/evals/judge.test.ts +0 -181
  231. package/src/evals/loaders.test.ts +0 -132
  232. package/src/evals/matchers.test.ts +0 -95
  233. package/src/evals/reporters.test.ts +0 -303
  234. package/src/evals/run-facts.test.ts +0 -259
  235. package/src/internal/ab-snapshot.test.ts +0 -325
  236. package/src/internal/approval-gate.test.ts +0 -49
  237. package/src/internal/approvals.integration.test.ts +0 -383
  238. package/src/internal/artifacts-store.test.ts +0 -283
  239. package/src/internal/authored-loaders.test.ts +0 -31
  240. package/src/internal/builtin-tools/artifacts.test.ts +0 -247
  241. package/src/internal/builtin-tools/reminders.test.ts +0 -201
  242. package/src/internal/channel-route-schema.test.ts +0 -294
  243. package/src/internal/chat-attach.test.ts +0 -262
  244. package/src/internal/cli-deploy.test.ts +0 -1991
  245. package/src/internal/cli-docs.test.ts +0 -161
  246. package/src/internal/cli-mcp.test.ts +0 -789
  247. package/src/internal/cli-skills.test.ts +0 -133
  248. package/src/internal/cli-slack.test.ts +0 -1654
  249. package/src/internal/cloud-merge.test.ts +0 -74
  250. package/src/internal/cron.test.ts +0 -22
  251. package/src/internal/cursor/account-mcp.test.ts +0 -807
  252. package/src/internal/cursor/backend-client.test.ts +0 -591
  253. package/src/internal/cursor/credentials.test.ts +0 -351
  254. package/src/internal/cursor/github-credentials.test.ts +0 -136
  255. package/src/internal/cursor-account-mcp-auth.test.ts +0 -310
  256. package/src/internal/cursor-account.integration.test.ts +0 -441
  257. package/src/internal/cursor-event-relay.test.ts +0 -746
  258. package/src/internal/cursor-github-credentials.integration.test.ts +0 -271
  259. package/src/internal/cursor-slack-relay.test.ts +0 -525
  260. package/src/internal/deploy-source.test.ts +0 -111
  261. package/src/internal/discovery.artifact-tool.test.ts +0 -136
  262. package/src/internal/discovery.artifacts.test.ts +0 -119
  263. package/src/internal/discovery.builtin-tools.test.ts +0 -94
  264. package/src/internal/discovery.concurrency.test.ts +0 -60
  265. package/src/internal/discovery.cursor-account.test.ts +0 -133
  266. package/src/internal/discovery.cwd.test.ts +0 -83
  267. package/src/internal/discovery.hosting.test.ts +0 -80
  268. package/src/internal/discovery.identity.test.ts +0 -44
  269. package/src/internal/docs-site.test.ts +0 -66
  270. package/src/internal/duration.test.ts +0 -29
  271. package/src/internal/eval-judge-model.test.ts +0 -187
  272. package/src/internal/eval-run-store.cancel.test.ts +0 -142
  273. package/src/internal/eval-run-store.storage.test.ts +0 -211
  274. package/src/internal/eval-runner.http.test.ts +0 -403
  275. package/src/internal/eval-runner.run.test.ts +0 -928
  276. package/src/internal/evals-client.test.ts +0 -307
  277. package/src/internal/event-mapper.test.ts +0 -243
  278. package/src/internal/github-fanout.test.ts +0 -213
  279. package/src/internal/handleAgentServeTrigger.test.ts +0 -185
  280. package/src/internal/host-kv.test.ts +0 -82
  281. package/src/internal/host-platforms.test.ts +0 -126
  282. package/src/internal/http-channel.test.ts +0 -402
  283. package/src/internal/init-project.test.ts +0 -270
  284. package/src/internal/install-cursor-skills.test.ts +0 -262
  285. package/src/internal/local-env.test.ts +0 -120
  286. package/src/internal/log-ring.test.ts +0 -31
  287. package/src/internal/logs-client.test.ts +0 -350
  288. package/src/internal/mcp-endpoint.test.ts +0 -436
  289. package/src/internal/mcp-host.test.ts +0 -298
  290. package/src/internal/mcp-oauth.test.ts +0 -148
  291. package/src/internal/net.test.ts +0 -17
  292. package/src/internal/peer-connections.test.ts +0 -128
  293. package/src/internal/peer-mcp.integration.test.ts +0 -289
  294. package/src/internal/playground/toolchain.test.ts +0 -53
  295. package/src/internal/playground-cli.test.ts +0 -187
  296. package/src/internal/playground-proxy.test.ts +0 -376
  297. package/src/internal/prompt-context.integration.test.ts +0 -232
  298. package/src/internal/prompt-context.test.ts +0 -127
  299. package/src/internal/reminder-runner.test.ts +0 -432
  300. package/src/internal/reminder-store.test.ts +0 -53
  301. package/src/internal/request-headers.test.ts +0 -27
  302. package/src/internal/resolve-prod-target.test.ts +0 -787
  303. package/src/internal/resolved-connections.test.ts +0 -295
  304. package/src/internal/router.test.ts +0 -57
  305. package/src/internal/sdk-runner.test.ts +0 -290
  306. package/src/internal/server.artifacts.test.ts +0 -334
  307. package/src/internal/session-engine.artifacts.test.ts +0 -293
  308. package/src/internal/session-engine.coalesce.test.ts +0 -169
  309. package/src/internal/session-engine.concurrency.test.ts +0 -250
  310. package/src/internal/session-engine.host-oauth-mcp.test.ts +0 -110
  311. package/src/internal/session-engine.interrupt.test.ts +0 -577
  312. package/src/internal/session-engine.storage.test.ts +0 -547
  313. package/src/internal/session-urls.test.ts +0 -28
  314. package/src/internal/sessions-client.test.ts +0 -518
  315. package/src/internal/storage-coordinator.test.ts +0 -517
  316. package/src/internal/tool-call.test.ts +0 -458
  317. package/src/internal/tool-result.test.ts +0 -52
  318. package/src/internal/trajectory.approvals.test.ts +0 -83
  319. package/src/internal/trajectory.subagents.test.ts +0 -198
  320. package/src/internal/turn-governor.test.ts +0 -137
  321. package/src/internal/update-check.test.ts +0 -485
  322. package/src/internal/workspace.test.ts +0 -207
  323. package/src/storage-backends/cursor-hosted.test.ts +0 -121
  324. /package/dist/docs/assets/{index.md.Dfv5ic9t.lean.js → index.md.CH_s5uZe.lean.js} +0 -0
@@ -1,198 +0,0 @@
1
- import { describe, expect, it } from "vitest";
2
- import type { SessionEvent } from "../types.js";
3
- import { buildTrajectory, formatTrajectoryText } from "./trajectory.js";
4
-
5
- function ev(
6
- partial: Omit<SessionEvent, "index" | "sessionId" | "at"> & {
7
- index?: number;
8
- }
9
- ): SessionEvent {
10
- return {
11
- index: partial.index ?? 0,
12
- sessionId: "sess_1",
13
- at: "2026-01-01T00:00:00.000Z",
14
- ...partial,
15
- } as SessionEvent;
16
- }
17
-
18
- describe("buildTrajectory subagent progress", () => {
19
- it("keeps bare top-level task in toolCalls for calledTool evals", () => {
20
- const traj = buildTrajectory([
21
- ev({ type: "session.started", data: { channelId: "http" } }),
22
- ev({
23
- type: "message.received",
24
- turnId: "turn_1",
25
- data: { text: "review this" },
26
- }),
27
- ev({
28
- type: "actions.requested",
29
- turnId: "turn_1",
30
- data: {
31
- calls: [
32
- {
33
- callId: "task-1",
34
- toolName: "task",
35
- args: { description: "deep review" },
36
- },
37
- ],
38
- },
39
- }),
40
- ev({
41
- type: "subagent.called",
42
- turnId: "turn_1",
43
- data: {
44
- callId: "task-1",
45
- name: "reviewer",
46
- description: "deep review",
47
- },
48
- }),
49
- ev({
50
- type: "actions.requested",
51
- turnId: "turn_1",
52
- data: {
53
- parentCallId: "task-1",
54
- calls: [
55
- {
56
- callId: "shell-1",
57
- toolName: "shell",
58
- args: { command: "ls" },
59
- parentCallId: "task-1",
60
- },
61
- ],
62
- },
63
- }),
64
- ev({
65
- type: "action.result",
66
- turnId: "turn_1",
67
- data: {
68
- callId: "shell-1",
69
- toolName: "shell",
70
- output: "ok",
71
- isError: false,
72
- parentCallId: "task-1",
73
- },
74
- }),
75
- ev({
76
- type: "subagent.completed",
77
- turnId: "turn_1",
78
- data: { callId: "task-1", name: "reviewer" },
79
- }),
80
- ev({
81
- type: "action.result",
82
- turnId: "turn_1",
83
- data: {
84
- callId: "task-1",
85
- toolName: "task",
86
- output: { done: true },
87
- isError: false,
88
- },
89
- }),
90
- ev({
91
- type: "message.completed",
92
- turnId: "turn_1",
93
- data: { text: "Parent reply.", finishReason: "stop" },
94
- }),
95
- ev({ type: "turn.completed", turnId: "turn_1", data: {} }),
96
- ]);
97
-
98
- const turn = traj.turns[0]!;
99
- expect(turn.toolCalls.map((c) => c.toolName)).toContain("task");
100
- expect(turn.toolCalls.find((c) => c.toolName === "task")).toMatchObject({
101
- callId: "task-1",
102
- output: { done: true },
103
- });
104
- expect(turn.subagents).toHaveLength(1);
105
- expect(turn.subagents[0]?.toolCalls.map((c) => c.toolName)).toEqual([
106
- "shell",
107
- ]);
108
- expect(turn.assistantText).toBe("Parent reply.");
109
- expect(traj.finalText).toBe("Parent reply.");
110
- });
111
-
112
- it("does not let nested message.completed overwrite parent assistantText", () => {
113
- const traj = buildTrajectory([
114
- ev({
115
- type: "message.received",
116
- turnId: "turn_1",
117
- data: { text: "hi" },
118
- }),
119
- ev({
120
- type: "subagent.called",
121
- turnId: "turn_1",
122
- data: { callId: "task-1", name: "worker" },
123
- }),
124
- ev({
125
- type: "message.completed",
126
- turnId: "turn_1",
127
- data: {
128
- text: "Nested says hi.",
129
- finishReason: "stop",
130
- parentCallId: "task-1",
131
- },
132
- }),
133
- ev({
134
- type: "message.completed",
135
- turnId: "turn_1",
136
- data: { text: "Parent final.", finishReason: "stop" },
137
- }),
138
- ev({ type: "turn.completed", turnId: "turn_1", data: {} }),
139
- ]);
140
-
141
- expect(traj.turns[0]?.assistantText).toBe("Parent final.");
142
- expect(traj.finalText).toBe("Parent final.");
143
- });
144
-
145
- it("does not let nested reasoning.appended overwrite parent reasoningText", () => {
146
- const traj = buildTrajectory([
147
- ev({
148
- type: "reasoning.appended",
149
- turnId: "turn_1",
150
- data: {
151
- delta: "parent think",
152
- text: "parent think",
153
- },
154
- }),
155
- ev({
156
- type: "reasoning.appended",
157
- turnId: "turn_1",
158
- data: {
159
- delta: "nested think",
160
- text: "nested think",
161
- parentCallId: "task-1",
162
- },
163
- }),
164
- ev({ type: "turn.completed", turnId: "turn_1", data: {} }),
165
- ]);
166
-
167
- expect(traj.turns[0]?.reasoningText).toBe("parent think");
168
- });
169
-
170
- it("formatTrajectoryText includes nested subagent tools", () => {
171
- const traj = buildTrajectory([
172
- ev({
173
- type: "subagent.called",
174
- turnId: "turn_1",
175
- data: { callId: "task-1", name: "worker", description: "do work" },
176
- }),
177
- ev({
178
- type: "actions.requested",
179
- turnId: "turn_1",
180
- data: {
181
- calls: [
182
- {
183
- callId: "read-1",
184
- toolName: "read",
185
- args: { path: "a.ts" },
186
- parentCallId: "task-1",
187
- },
188
- ],
189
- },
190
- }),
191
- ev({ type: "turn.completed", turnId: "turn_1", data: {} }),
192
- ]);
193
-
194
- const text = formatTrajectoryText(traj);
195
- expect(text).toContain("task worker");
196
- expect(text).toContain("read");
197
- });
198
- });
@@ -1,137 +0,0 @@
1
- import { describe, expect, it } from "vitest";
2
- import { TurnGovernor, type TurnPermit } from "./turn-governor.js";
3
-
4
- describe("TurnGovernor", () => {
5
- it("grants immediately with no limit configured", async () => {
6
- const governor = new TurnGovernor(undefined);
7
- expect(governor.limited).toBe(false);
8
- const permit = await governor.acquire({ sessionId: "s1" });
9
- expect(permit).toBeDefined();
10
- expect(governor.queuedCount).toBe(0);
11
- permit?.release();
12
- });
13
-
14
- it("queues FIFO beyond the limit and wakes waiters in order", async () => {
15
- const governor = new TurnGovernor({ maxRunningTurns: 2 });
16
- const first = await governor.acquire({ sessionId: "s1" });
17
- const second = await governor.acquire({ sessionId: "s2" });
18
- expect(governor.runningCount).toBe(2);
19
-
20
- const positions: Array<{ sessionId: string; position: number }> = [];
21
- const grants: string[] = [];
22
- const third = governor
23
- .acquire({
24
- sessionId: "s3",
25
- onQueued: (position) => positions.push({ sessionId: "s3", position }),
26
- })
27
- .then((permit) => {
28
- grants.push("s3");
29
- return permit;
30
- });
31
- const fourth = governor
32
- .acquire({
33
- sessionId: "s4",
34
- onQueued: (position) => positions.push({ sessionId: "s4", position }),
35
- })
36
- .then((permit) => {
37
- grants.push("s4");
38
- return permit;
39
- });
40
-
41
- expect(positions).toEqual([
42
- { sessionId: "s3", position: 1 },
43
- { sessionId: "s4", position: 2 },
44
- ]);
45
- expect(governor.queuedCount).toBe(2);
46
- expect(governor.isQueued("s3")).toBe(true);
47
- expect(governor.isQueued("s4")).toBe(true);
48
-
49
- first?.release();
50
- const thirdPermit = await third;
51
- expect(grants).toEqual(["s3"]);
52
- expect(governor.isQueued("s3")).toBe(false);
53
- expect(governor.runningCount).toBe(2);
54
-
55
- second?.release();
56
- const fourthPermit = await fourth;
57
- expect(grants).toEqual(["s3", "s4"]);
58
- expect(governor.queuedCount).toBe(0);
59
-
60
- thirdPermit?.release();
61
- fourthPermit?.release();
62
- expect(governor.runningCount).toBe(0);
63
- });
64
-
65
- it("resolves undefined when the signal aborts while waiting", async () => {
66
- const governor = new TurnGovernor({ maxRunningTurns: 1 });
67
- const holder = await governor.acquire({ sessionId: "s1" });
68
-
69
- const abort = new AbortController();
70
- const waiting = governor.acquire({
71
- sessionId: "s2",
72
- signal: abort.signal,
73
- });
74
- expect(governor.isQueued("s2")).toBe(true);
75
-
76
- abort.abort();
77
- expect(await waiting).toBeUndefined();
78
- expect(governor.isQueued("s2")).toBe(false);
79
- expect(governor.queuedCount).toBe(0);
80
-
81
- // The abandoned wait must not consume the slot when it frees.
82
- holder?.release();
83
- const next = await governor.acquire({ sessionId: "s3" });
84
- expect(next).toBeDefined();
85
- next?.release();
86
- });
87
-
88
- it("resolves undefined without enqueuing when already aborted", async () => {
89
- const governor = new TurnGovernor({ maxRunningTurns: 1 });
90
- const holder = await governor.acquire({ sessionId: "s1" });
91
- const abort = new AbortController();
92
- abort.abort();
93
- let queued = false;
94
- const permit = await governor.acquire({
95
- sessionId: "s2",
96
- signal: abort.signal,
97
- onQueued: () => {
98
- queued = true;
99
- },
100
- });
101
- expect(permit).toBeUndefined();
102
- expect(queued).toBe(false);
103
- holder?.release();
104
- });
105
-
106
- it("release is idempotent", async () => {
107
- const governor = new TurnGovernor({ maxRunningTurns: 1 });
108
- const first = (await governor.acquire({ sessionId: "s1" })) as TurnPermit;
109
- first.release();
110
- first.release();
111
- expect(governor.runningCount).toBe(0);
112
- const second = await governor.acquire({ sessionId: "s2" });
113
- expect(second).toBeDefined();
114
- expect(governor.runningCount).toBe(1);
115
- second?.release();
116
- });
117
-
118
- it("keeps FIFO order over grants freed by aborted waiters", async () => {
119
- const governor = new TurnGovernor({ maxRunningTurns: 1 });
120
- const holder = await governor.acquire({ sessionId: "s1" });
121
- const abortSecond = new AbortController();
122
- const second = governor.acquire({
123
- sessionId: "s2",
124
- signal: abortSecond.signal,
125
- });
126
- const third = governor.acquire({ sessionId: "s3" });
127
-
128
- abortSecond.abort();
129
- expect(await second).toBeUndefined();
130
-
131
- holder?.release();
132
- const thirdPermit = await third;
133
- expect(thirdPermit).toBeDefined();
134
- expect(governor.queuedCount).toBe(0);
135
- thirdPermit?.release();
136
- });
137
- });