@bastani/atomic 0.9.12 → 0.9.13-alpha.1

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 (264) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/dist/builtin/intercom/CHANGELOG.md +6 -0
  3. package/dist/builtin/intercom/README.md +5 -12
  4. package/dist/builtin/intercom/broker/client.ts +11 -2
  5. package/dist/builtin/intercom/contact-supervisor-tool.ts +13 -3
  6. package/dist/builtin/intercom/index-heavy.ts +13 -3
  7. package/dist/builtin/intercom/index.ts +43 -19
  8. package/dist/builtin/intercom/intercom-utils.ts +15 -29
  9. package/dist/builtin/intercom/package.json +1 -1
  10. package/dist/builtin/intercom/source-ownership.ts +9 -12
  11. package/dist/builtin/mcp/CHANGELOG.md +6 -0
  12. package/dist/builtin/mcp/README.md +3 -1
  13. package/dist/builtin/mcp/index.ts +10 -16
  14. package/dist/builtin/mcp/package.json +1 -1
  15. package/dist/builtin/mcp/startup-warmup.ts +20 -8
  16. package/dist/builtin/subagents/CHANGELOG.md +30 -0
  17. package/dist/builtin/subagents/README.md +22 -30
  18. package/dist/builtin/subagents/package.json +1 -1
  19. package/dist/builtin/subagents/src/extension/doctor.ts +1 -1
  20. package/dist/builtin/subagents/src/extension/fanout-child.ts +76 -56
  21. package/dist/builtin/subagents/src/extension/index.ts +23 -32
  22. package/dist/builtin/subagents/src/extension/startup-maintenance.ts +25 -44
  23. package/dist/builtin/subagents/src/intercom/result-intercom.ts +7 -7
  24. package/dist/builtin/subagents/src/runs/background/async-job-tracker.ts +166 -434
  25. package/dist/builtin/subagents/src/runs/background/notify.ts +29 -8
  26. package/dist/builtin/subagents/src/runs/foreground/chain-execution-dynamic-step.ts +2 -2
  27. package/dist/builtin/subagents/src/runs/foreground/chain-execution-parallel-runner.ts +4 -4
  28. package/dist/builtin/subagents/src/runs/foreground/chain-execution-parallel-step.ts +2 -2
  29. package/dist/builtin/subagents/src/runs/foreground/chain-execution-sequential-step.ts +2 -2
  30. package/dist/builtin/subagents/src/runs/foreground/execution-run-sync.ts +1 -281
  31. package/dist/builtin/subagents/src/runs/foreground/execution-structured-retries.ts +11 -75
  32. package/dist/builtin/subagents/src/runs/foreground/inprocess-run-sync.ts +457 -0
  33. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-async.ts +119 -246
  34. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-chain.ts +1 -1
  35. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-context.ts +18 -9
  36. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-parallel-task.ts +1 -1
  37. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-parallel.ts +4 -4
  38. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-resume.ts +1 -646
  39. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-runtime.ts +2 -7
  40. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-single.ts +5 -5
  41. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-status.ts +7 -8
  42. package/dist/builtin/subagents/src/runs/foreground/subagent-executor-types.ts +14 -5
  43. package/dist/builtin/subagents/src/runs/foreground/subagent-executor.ts +158 -93
  44. package/dist/builtin/subagents/src/runs/inprocess/background-single.ts +179 -0
  45. package/dist/builtin/subagents/src/runs/inprocess/background.ts +89 -0
  46. package/dist/builtin/subagents/src/runs/inprocess/child-policy.ts +27 -0
  47. package/dist/builtin/subagents/src/runs/inprocess/control-registry.ts +55 -0
  48. package/dist/builtin/subagents/src/runs/inprocess/control-status.ts +106 -0
  49. package/dist/builtin/subagents/src/runs/inprocess/index.ts +50 -0
  50. package/dist/builtin/subagents/src/runs/inprocess/nested-routing.ts +218 -0
  51. package/dist/builtin/subagents/src/runs/{shared/subagent-prompt-runtime.ts → inprocess/prompt-behavior.ts} +37 -75
  52. package/dist/builtin/subagents/src/runs/inprocess/runner.ts +1138 -0
  53. package/dist/builtin/subagents/src/runs/{shared/nested-events.ts → inprocess/runtime-support/nested-api.ts} +13 -7
  54. package/dist/builtin/subagents/src/runs/{shared/nested-events-control.ts → inprocess/runtime-support/nested-control.ts} +18 -17
  55. package/dist/builtin/subagents/src/runs/{shared/nested-events-core.ts → inprocess/runtime-support/nested-core.ts} +14 -61
  56. package/dist/builtin/subagents/src/runs/{shared/nested-events-projection.ts → inprocess/runtime-support/nested-projection.ts} +4 -10
  57. package/dist/builtin/subagents/src/runs/{shared/nested-events-registry.ts → inprocess/runtime-support/nested-registry.ts} +19 -4
  58. package/dist/builtin/subagents/src/runs/{shared/nested-render.ts → inprocess/runtime-support/nested-rendering.ts} +3 -3
  59. package/dist/builtin/subagents/src/runs/{shared/nested-events-sanitize.ts → inprocess/runtime-support/nested-sanitize.ts} +3 -3
  60. package/dist/builtin/subagents/src/runs/inprocess.ts +1 -0
  61. package/dist/builtin/subagents/src/runs/shared/dynamic-fanout.ts +10 -4
  62. package/dist/builtin/subagents/src/runs/shared/model-candidate-filter.ts +0 -1
  63. package/dist/builtin/subagents/src/runs/shared/model-fallback.ts +15 -492
  64. package/dist/builtin/subagents/src/runs/shared/parallel-utils.ts +13 -11
  65. package/dist/builtin/subagents/src/runs/shared/run-history.ts +3 -5
  66. package/dist/builtin/subagents/src/runs/shared/single-output.ts +4 -4
  67. package/dist/builtin/subagents/src/runs/shared/workflow-graph.ts +5 -5
  68. package/dist/builtin/subagents/src/shared/types-async.ts +0 -1
  69. package/dist/builtin/subagents/src/shared/types-config.ts +18 -0
  70. package/dist/builtin/subagents/src/shared/types-results.ts +9 -2
  71. package/dist/builtin/subagents/src/slash/prompt-template-bridge.ts +2 -3
  72. package/dist/builtin/subagents/src/slash/slash-live-state.ts +2 -2
  73. package/dist/builtin/subagents/src/tui/render-chain-graph.ts +10 -4
  74. package/dist/builtin/subagents/src/tui/render-event-formatting.ts +12 -11
  75. package/dist/builtin/subagents/src/tui/render-result-compact.ts +49 -12
  76. package/dist/builtin/subagents/src/tui/render-result.ts +46 -17
  77. package/dist/builtin/subagents/src/tui/render-stable-output.ts +1 -1
  78. package/dist/builtin/subagents/src/tui/render-status-progress.ts +8 -5
  79. package/dist/builtin/subagents/src/tui/render-widget-graph.ts +0 -8
  80. package/dist/builtin/subagents/src/tui/render-widget.ts +0 -24
  81. package/dist/builtin/web-access/package.json +1 -1
  82. package/dist/builtin/workflows/CHANGELOG.md +25 -0
  83. package/dist/builtin/workflows/README.md +13 -3
  84. package/dist/builtin/workflows/package.json +1 -1
  85. package/dist/builtin/workflows/src/durable/backend.ts +7 -0
  86. package/dist/builtin/workflows/src/durable/dbos-metadata.ts +11 -1
  87. package/dist/builtin/workflows/src/durable/resume-runtime.ts +1 -0
  88. package/dist/builtin/workflows/src/durable/tool-primitive.ts +4 -28
  89. package/dist/builtin/workflows/src/durable/types.ts +5 -0
  90. package/dist/builtin/workflows/src/engine/run.ts +17 -1
  91. package/dist/builtin/workflows/src/extension/atomic-stage-session.ts +12 -39
  92. package/dist/builtin/workflows/src/extension/config-file-loader.ts +10 -1
  93. package/dist/builtin/workflows/src/extension/config-loader.ts +1 -1
  94. package/dist/builtin/workflows/src/extension/dispatcher.ts +4 -0
  95. package/dist/builtin/workflows/src/extension/index.bundle.mjs +1151 -737
  96. package/dist/builtin/workflows/src/extension/lifecycle-notifications.ts +303 -38
  97. package/dist/builtin/workflows/src/extension/render-result.ts +4 -0
  98. package/dist/builtin/workflows/src/extension/runtime-durable-resume.ts +6 -3
  99. package/dist/builtin/workflows/src/extension/runtime.ts +7 -1
  100. package/dist/builtin/workflows/src/extension/wiring.ts +53 -11
  101. package/dist/builtin/workflows/src/extension/workflow-command-registration.ts +12 -3
  102. package/dist/builtin/workflows/src/extension/workflow-durable-resume-command.ts +5 -2
  103. package/dist/builtin/workflows/src/extension/workflow-run-control-command.ts +9 -7
  104. package/dist/builtin/workflows/src/extension/workflow-status-summary.ts +11 -0
  105. package/dist/builtin/workflows/src/extension/workflow-tool-content.ts +18 -1
  106. package/dist/builtin/workflows/src/extension/workflow-tool-control.ts +10 -8
  107. package/dist/builtin/workflows/src/extension/workflow-tool.ts +9 -4
  108. package/dist/builtin/workflows/src/runs/background/quit.ts +28 -4
  109. package/dist/builtin/workflows/src/runs/background/resume-acknowledgements.ts +2 -1
  110. package/dist/builtin/workflows/src/runs/background/status.ts +55 -8
  111. package/dist/builtin/workflows/src/runs/foreground/executor-direct-helpers.ts +4 -0
  112. package/dist/builtin/workflows/src/runs/foreground/executor-prompt-nodes.ts +3 -1
  113. package/dist/builtin/workflows/src/runs/foreground/executor-stage-control.ts +1 -1
  114. package/dist/builtin/workflows/src/runs/foreground/stage-runner-context.ts +1 -1
  115. package/dist/builtin/workflows/src/runs/foreground/stage-runner-controller.ts +688 -38
  116. package/dist/builtin/workflows/src/runs/foreground/stage-runner-types.ts +3 -1
  117. package/dist/builtin/workflows/src/runs/shared/model-fallback-failures.ts +19 -514
  118. package/dist/builtin/workflows/src/runs/shared/retry.ts +44 -0
  119. package/dist/builtin/workflows/src/shared/authoring-contract-stage.d.ts +5 -0
  120. package/dist/builtin/workflows/src/shared/authoring-contract-stage.ts +6 -0
  121. package/dist/builtin/workflows/src/shared/authoring-contract-ui.d.ts +5 -1
  122. package/dist/builtin/workflows/src/shared/authoring-contract-ui.ts +5 -0
  123. package/dist/builtin/workflows/src/shared/persistence-restore-helpers.ts +5 -0
  124. package/dist/builtin/workflows/src/shared/persistence-restore.ts +3 -0
  125. package/dist/builtin/workflows/src/shared/persistence-session-entries.ts +4 -0
  126. package/dist/builtin/workflows/src/shared/run-indicator-status.ts +75 -0
  127. package/dist/builtin/workflows/src/shared/store-public-types.ts +43 -7
  128. package/dist/builtin/workflows/src/shared/store-run-methods.ts +42 -8
  129. package/dist/builtin/workflows/src/shared/store-stage-methods.ts +31 -8
  130. package/dist/builtin/workflows/src/shared/store-types.ts +34 -0
  131. package/dist/builtin/workflows/src/shared/timing.ts +10 -0
  132. package/dist/builtin/workflows/src/tui/chat-surface-message.ts +22 -2
  133. package/dist/builtin/workflows/src/tui/session-list.ts +1 -1
  134. package/dist/builtin/workflows/src/tui/session-overlays.ts +14 -10
  135. package/dist/builtin/workflows/src/tui/session-picker.ts +20 -4
  136. package/dist/builtin/workflows/src/tui/status-list.ts +31 -47
  137. package/dist/builtin/workflows/src/tui/store-widget-installer.ts +9 -1
  138. package/dist/builtin/workflows/src/tui/widget.ts +16 -46
  139. package/dist/core/agent-session-auto-compaction.d.ts.map +1 -1
  140. package/dist/core/agent-session-auto-compaction.js +54 -11
  141. package/dist/core/agent-session-auto-compaction.js.map +1 -1
  142. package/dist/core/agent-session-events.d.ts.map +1 -1
  143. package/dist/core/agent-session-events.js +49 -14
  144. package/dist/core/agent-session-events.js.map +1 -1
  145. package/dist/core/agent-session-methods.d.ts +13 -0
  146. package/dist/core/agent-session-methods.d.ts.map +1 -1
  147. package/dist/core/agent-session-methods.js.map +1 -1
  148. package/dist/core/agent-session-models.d.ts.map +1 -1
  149. package/dist/core/agent-session-models.js +12 -1
  150. package/dist/core/agent-session-models.js.map +1 -1
  151. package/dist/core/agent-session-prompt.d.ts.map +1 -1
  152. package/dist/core/agent-session-prompt.js +4 -0
  153. package/dist/core/agent-session-prompt.js.map +1 -1
  154. package/dist/core/agent-session-retry.d.ts +21 -4
  155. package/dist/core/agent-session-retry.d.ts.map +1 -1
  156. package/dist/core/agent-session-retry.js +232 -106
  157. package/dist/core/agent-session-retry.js.map +1 -1
  158. package/dist/core/agent-session-state.d.ts.map +1 -1
  159. package/dist/core/agent-session-state.js +2 -1
  160. package/dist/core/agent-session-state.js.map +1 -1
  161. package/dist/core/agent-session-tool-hooks.d.ts.map +1 -1
  162. package/dist/core/agent-session-tool-hooks.js +12 -0
  163. package/dist/core/agent-session-tool-hooks.js.map +1 -1
  164. package/dist/core/agent-session-tool-registry.d.ts.map +1 -1
  165. package/dist/core/agent-session-tool-registry.js +1 -1
  166. package/dist/core/agent-session-tool-registry.js.map +1 -1
  167. package/dist/core/agent-session-types.d.ts +3 -1
  168. package/dist/core/agent-session-types.d.ts.map +1 -1
  169. package/dist/core/agent-session-types.js.map +1 -1
  170. package/dist/core/agent-session.d.ts +12 -1
  171. package/dist/core/agent-session.d.ts.map +1 -1
  172. package/dist/core/agent-session.js +7 -0
  173. package/dist/core/agent-session.js.map +1 -1
  174. package/dist/core/extensions/context-types.d.ts +25 -0
  175. package/dist/core/extensions/context-types.d.ts.map +1 -1
  176. package/dist/core/extensions/context-types.js.map +1 -1
  177. package/dist/core/extensions/index.d.ts +1 -1
  178. package/dist/core/extensions/index.d.ts.map +1 -1
  179. package/dist/core/extensions/index.js.map +1 -1
  180. package/dist/core/extensions/runner-context.d.ts +2 -1
  181. package/dist/core/extensions/runner-context.d.ts.map +1 -1
  182. package/dist/core/extensions/runner-context.js +4 -0
  183. package/dist/core/extensions/runner-context.js.map +1 -1
  184. package/dist/core/extensions/runner.d.ts +3 -2
  185. package/dist/core/extensions/runner.d.ts.map +1 -1
  186. package/dist/core/extensions/runner.js +3 -1
  187. package/dist/core/extensions/runner.js.map +1 -1
  188. package/dist/core/model-fallback-failures.d.ts +30 -0
  189. package/dist/core/model-fallback-failures.d.ts.map +1 -0
  190. package/dist/core/model-fallback-failures.js +610 -0
  191. package/dist/core/model-fallback-failures.js.map +1 -0
  192. package/dist/core/retry-policy.d.ts +30 -0
  193. package/dist/core/retry-policy.d.ts.map +1 -0
  194. package/dist/core/retry-policy.js +25 -0
  195. package/dist/core/retry-policy.js.map +1 -0
  196. package/dist/core/sdk-types.d.ts +8 -2
  197. package/dist/core/sdk-types.d.ts.map +1 -1
  198. package/dist/core/sdk-types.js.map +1 -1
  199. package/dist/core/sdk.d.ts.map +1 -1
  200. package/dist/core/sdk.js +6 -1
  201. package/dist/core/sdk.js.map +1 -1
  202. package/dist/core/session-manager-core.d.ts +2 -0
  203. package/dist/core/session-manager-core.d.ts.map +1 -1
  204. package/dist/core/session-manager-core.js +7 -0
  205. package/dist/core/session-manager-core.js.map +1 -1
  206. package/dist/index-extensions.d.ts +1 -1
  207. package/dist/index-extensions.d.ts.map +1 -1
  208. package/dist/index-extensions.js.map +1 -1
  209. package/dist/index.d.ts +3 -0
  210. package/dist/index.d.ts.map +1 -1
  211. package/dist/index.js +2 -0
  212. package/dist/index.js.map +1 -1
  213. package/docs/intercom.md +5 -10
  214. package/docs/settings.md +7 -1
  215. package/docs/subagents.md +19 -19
  216. package/docs/workflows.md +21 -5
  217. package/examples/extensions/gondolin/package-lock.json +3 -3
  218. package/npm-shrinkwrap.json +29 -29
  219. package/package.json +2 -2
  220. package/dist/builtin/subagents/src/runs/background/async-event-journal.ts +0 -112
  221. package/dist/builtin/subagents/src/runs/background/async-execution-chain.ts +0 -543
  222. package/dist/builtin/subagents/src/runs/background/async-execution-common.ts +0 -140
  223. package/dist/builtin/subagents/src/runs/background/async-execution-single.ts +0 -279
  224. package/dist/builtin/subagents/src/runs/background/async-execution-types.ts +0 -99
  225. package/dist/builtin/subagents/src/runs/background/async-execution.ts +0 -17
  226. package/dist/builtin/subagents/src/runs/background/async-resume.ts +0 -402
  227. package/dist/builtin/subagents/src/runs/background/async-status.ts +0 -411
  228. package/dist/builtin/subagents/src/runs/background/completion-claims.ts +0 -196
  229. package/dist/builtin/subagents/src/runs/background/completion-dedupe.ts +0 -102
  230. package/dist/builtin/subagents/src/runs/background/parallel-groups.ts +0 -59
  231. package/dist/builtin/subagents/src/runs/background/result-delivery-processor.ts +0 -300
  232. package/dist/builtin/subagents/src/runs/background/result-file-claims.ts +0 -166
  233. package/dist/builtin/subagents/src/runs/background/result-quarantine.ts +0 -77
  234. package/dist/builtin/subagents/src/runs/background/result-retry-scheduler.ts +0 -48
  235. package/dist/builtin/subagents/src/runs/background/result-status.ts +0 -87
  236. package/dist/builtin/subagents/src/runs/background/result-watcher-data.ts +0 -72
  237. package/dist/builtin/subagents/src/runs/background/result-watcher.ts +0 -320
  238. package/dist/builtin/subagents/src/runs/background/run-id-resolver.ts +0 -105
  239. package/dist/builtin/subagents/src/runs/background/run-status.ts +0 -358
  240. package/dist/builtin/subagents/src/runs/background/stale-run-reconciler.ts +0 -457
  241. package/dist/builtin/subagents/src/runs/background/subagent-runner-dynamic.ts +0 -376
  242. package/dist/builtin/subagents/src/runs/background/subagent-runner-finalize.ts +0 -150
  243. package/dist/builtin/subagents/src/runs/background/subagent-runner-output.ts +0 -109
  244. package/dist/builtin/subagents/src/runs/background/subagent-runner-parallel-helpers.ts +0 -128
  245. package/dist/builtin/subagents/src/runs/background/subagent-runner-parallel.ts +0 -309
  246. package/dist/builtin/subagents/src/runs/background/subagent-runner-sequential.ts +0 -173
  247. package/dist/builtin/subagents/src/runs/background/subagent-runner-state.ts +0 -578
  248. package/dist/builtin/subagents/src/runs/background/subagent-runner-step.ts +0 -330
  249. package/dist/builtin/subagents/src/runs/background/subagent-runner-streaming.ts +0 -330
  250. package/dist/builtin/subagents/src/runs/background/subagent-runner-types.ts +0 -210
  251. package/dist/builtin/subagents/src/runs/background/subagent-runner-utils.ts +0 -69
  252. package/dist/builtin/subagents/src/runs/background/subagent-runner.ts +0 -90
  253. package/dist/builtin/subagents/src/runs/background/top-level-async.ts +0 -12
  254. package/dist/builtin/subagents/src/runs/foreground/execution-attempt-control.ts +0 -140
  255. package/dist/builtin/subagents/src/runs/foreground/execution-attempt-finalize.ts +0 -108
  256. package/dist/builtin/subagents/src/runs/foreground/execution-attempt-types.ts +0 -17
  257. package/dist/builtin/subagents/src/runs/foreground/execution-attempt.ts +0 -558
  258. package/dist/builtin/subagents/src/runs/shared/attempt-watchdog.ts +0 -126
  259. package/dist/builtin/subagents/src/runs/shared/final-drain.ts +0 -39
  260. package/dist/builtin/subagents/src/runs/shared/pi-args.ts +0 -339
  261. package/dist/builtin/subagents/src/runs/shared/pi-spawn.ts +0 -165
  262. package/dist/builtin/subagents/src/runs/shared/spawn-env.ts +0 -21
  263. package/dist/builtin/subagents/src/shared/post-exit-stdio-guard.ts +0 -86
  264. /package/dist/builtin/subagents/src/runs/{shared/nested-path.ts → inprocess/runtime-support/nested-paths.ts} +0 -0
@@ -1,402 +0,0 @@
1
- import * as fs from "node:fs";
2
- import * as path from "node:path";
3
- import { resolveSubagentIntercomTarget } from "../../intercom/intercom-bridge.ts";
4
- import { ASYNC_DIR, type AsyncStatus, RESULTS_DIR } from "../../shared/types.ts";
5
- import { reconcileAsyncRun } from "./stale-run-reconciler.ts";
6
-
7
- export interface AsyncResumeParams {
8
- id?: string;
9
- runId?: string;
10
- dir?: string;
11
- index?: number;
12
- }
13
-
14
- export interface AsyncResumeDeps {
15
- asyncDirRoot?: string;
16
- resultsDir?: string;
17
- kill?: (pid: number, signal?: NodeJS.Signals | 0) => boolean;
18
- now?: () => number;
19
- }
20
-
21
- export type AsyncResumeTarget = {
22
- kind: "live" | "revive";
23
- runId: string;
24
- asyncDir?: string;
25
- state: AsyncStatus["state"];
26
- agent: string;
27
- index: number;
28
- intercomTarget: string;
29
- cwd?: string;
30
- sessionFile?: string;
31
- };
32
-
33
- interface AsyncResultFile {
34
- id?: string;
35
- runId?: string;
36
- agent?: string;
37
- mode?: string;
38
- state?: string;
39
- success?: boolean;
40
- cwd?: string;
41
- sessionFile?: string;
42
- results?: Array<{ agent?: string; success?: boolean; sessionFile?: string; intercomTarget?: string }>;
43
- }
44
-
45
- export interface AsyncRunLocation {
46
- asyncDir: string | null;
47
- resultPath: string | null;
48
- resolvedId?: string;
49
- }
50
-
51
- function getErrorMessage(error: unknown): string {
52
- return error instanceof Error ? error.message : String(error);
53
- }
54
-
55
- function ensureObject(value: unknown, source: string): Record<string, unknown> {
56
- if (!value || typeof value !== "object" || Array.isArray(value)) {
57
- throw new Error(`Async result file '${source}' must contain a JSON object.`);
58
- }
59
- return value as Record<string, unknown>;
60
- }
61
-
62
- function validateOptionalString(
63
- value: Record<string, unknown>,
64
- field: string,
65
- source: string,
66
- displayField = field,
67
- ): string | undefined {
68
- const fieldValue = value[field];
69
- if (fieldValue === undefined) return undefined;
70
- if (typeof fieldValue !== "string")
71
- throw new Error(`Invalid async result file '${source}': ${displayField} must be a string.`);
72
- return fieldValue;
73
- }
74
-
75
- function validateResultFile(value: unknown, resultPath: string): AsyncResultFile {
76
- const data = ensureObject(value, resultPath);
77
- const resultsValue = data.results;
78
- let results: AsyncResultFile["results"];
79
- if (resultsValue !== undefined) {
80
- if (!Array.isArray(resultsValue))
81
- throw new Error(`Invalid async result file '${resultPath}': results must be an array.`);
82
- results = resultsValue.map((entry, index) => {
83
- const child = ensureObject(entry, `${resultPath} results[${index}]`);
84
- const agent = validateOptionalString(child, "agent", resultPath, `results[${index}].agent`);
85
- const sessionFile = validateOptionalString(child, "sessionFile", resultPath, `results[${index}].sessionFile`);
86
- const intercomTarget = validateOptionalString(
87
- child,
88
- "intercomTarget",
89
- resultPath,
90
- `results[${index}].intercomTarget`,
91
- );
92
- const success = child.success;
93
- if (success !== undefined && typeof success !== "boolean")
94
- throw new Error(`Invalid async result file '${resultPath}': results[${index}].success must be a boolean.`);
95
- return { agent, sessionFile, intercomTarget, ...(typeof success === "boolean" ? { success } : {}) };
96
- });
97
- }
98
- const success = data.success;
99
- if (success !== undefined && typeof success !== "boolean")
100
- throw new Error(`Invalid async result file '${resultPath}': success must be a boolean.`);
101
- return {
102
- id: validateOptionalString(data, "id", resultPath),
103
- runId: validateOptionalString(data, "runId", resultPath),
104
- agent: validateOptionalString(data, "agent", resultPath),
105
- mode: validateOptionalString(data, "mode", resultPath),
106
- state: validateOptionalString(data, "state", resultPath),
107
- cwd: validateOptionalString(data, "cwd", resultPath),
108
- sessionFile: validateOptionalString(data, "sessionFile", resultPath),
109
- ...(typeof success === "boolean" ? { success } : {}),
110
- ...(results ? { results } : {}),
111
- };
112
- }
113
-
114
- function readResultFile(resultPath: string): AsyncResultFile {
115
- let raw: string;
116
- try {
117
- raw = fs.readFileSync(resultPath, "utf-8");
118
- } catch (error) {
119
- throw new Error(`Failed to read async result file '${resultPath}': ${getErrorMessage(error)}`, {
120
- cause: error instanceof Error ? error : undefined,
121
- });
122
- }
123
- try {
124
- return validateResultFile(JSON.parse(raw), resultPath);
125
- } catch (error) {
126
- if (error instanceof SyntaxError) {
127
- throw new Error(`Failed to parse async result file '${resultPath}': ${getErrorMessage(error)}`, {
128
- cause: error,
129
- });
130
- }
131
- throw error;
132
- }
133
- }
134
-
135
- function assertRunId(value: string | undefined, field: "id" | "runId"): string | undefined {
136
- if (value === undefined) return undefined;
137
- if (value.trim() === "") throw new Error(`${field} must not be empty.`);
138
- if (path.isAbsolute(value) || /[\\/]/.test(value) || value.includes("..")) {
139
- throw new Error(`${field} must be an async run id or prefix, not a path.`);
140
- }
141
- return value;
142
- }
143
-
144
- function assertInsideRoot(root: string, target: string, label: string): void {
145
- const rootPath = path.resolve(root);
146
- const targetPath = path.resolve(target);
147
- const relative = path.relative(rootPath, targetPath);
148
- if (relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))) return;
149
- throw new Error(`${label} must be inside ${rootPath}.`);
150
- }
151
-
152
- function prefixedRunIds(dir: string, prefix: string, suffix = ""): string[] {
153
- if (!fs.existsSync(dir)) return [];
154
- return fs
155
- .readdirSync(dir)
156
- .filter((entry) => entry.startsWith(prefix) && (!suffix || entry.endsWith(suffix)))
157
- .map((entry) => (suffix ? entry.slice(0, -suffix.length) : entry))
158
- .sort();
159
- }
160
-
161
- function exactResultPath(resultsDir: string, runId: string): string | null {
162
- const resultPath = path.join(resultsDir, `${runId}.json`);
163
- assertInsideRoot(resultsDir, resultPath, "Async result file");
164
- return fs.existsSync(resultPath) ? resultPath : null;
165
- }
166
-
167
- export function findAsyncRunPrefixMatches(
168
- prefix: string,
169
- asyncDirRoot: string,
170
- resultsDir: string,
171
- ): Array<{ id: string; location: AsyncRunLocation }> {
172
- const requestedId = assertRunId(prefix, "id");
173
- if (!requestedId) return [];
174
- const asyncRoot = path.resolve(asyncDirRoot);
175
- const resultRoot = path.resolve(resultsDir);
176
- const matchingIds = [
177
- ...new Set([...prefixedRunIds(asyncRoot, requestedId), ...prefixedRunIds(resultRoot, requestedId, ".json")]),
178
- ].sort();
179
- return matchingIds.map((id) => {
180
- const asyncDir = path.join(asyncRoot, id);
181
- assertInsideRoot(asyncRoot, asyncDir, "Async run directory");
182
- return {
183
- id,
184
- location: {
185
- asyncDir: fs.existsSync(asyncDir) ? asyncDir : null,
186
- resultPath: exactResultPath(resultRoot, id),
187
- resolvedId: id,
188
- },
189
- };
190
- });
191
- }
192
-
193
- export function resolveAsyncRunLocation(
194
- params: AsyncResumeParams,
195
- asyncDirRoot: string,
196
- resultsDir: string,
197
- ): AsyncRunLocation {
198
- const asyncRoot = path.resolve(asyncDirRoot);
199
- const resultRoot = path.resolve(resultsDir);
200
- const requestedId = assertRunId(params.id, "id") ?? assertRunId(params.runId, "runId");
201
- if (params.dir) {
202
- const asyncDir = path.resolve(params.dir);
203
- assertInsideRoot(asyncRoot, asyncDir, "Async run directory");
204
- const resolvedId = requestedId ?? path.basename(asyncDir);
205
- if (requestedId && requestedId !== path.basename(asyncDir)) {
206
- throw new Error(`Async run id '${requestedId}' does not match directory '${path.basename(asyncDir)}'.`);
207
- }
208
- return { asyncDir, resultPath: exactResultPath(resultRoot, resolvedId), resolvedId };
209
- }
210
- if (!requestedId) return { asyncDir: null, resultPath: null };
211
-
212
- const directAsyncDir = path.join(asyncRoot, requestedId);
213
- assertInsideRoot(asyncRoot, directAsyncDir, "Async run directory");
214
- const directResultPath = exactResultPath(resultRoot, requestedId);
215
- if (fs.existsSync(directAsyncDir) || directResultPath) {
216
- return {
217
- asyncDir: fs.existsSync(directAsyncDir) ? directAsyncDir : null,
218
- resultPath: directResultPath,
219
- resolvedId: requestedId,
220
- };
221
- }
222
-
223
- const matching = findAsyncRunPrefixMatches(requestedId, asyncRoot, resultRoot);
224
- if (matching.length === 0) return { asyncDir: null, resultPath: null, resolvedId: requestedId };
225
- if (matching.length > 1) {
226
- throw new Error(
227
- `Ambiguous async run id prefix '${requestedId}' matched: ${matching.map((match) => match.id).join(", ")}. Provide a longer id.`,
228
- );
229
- }
230
- return matching[0]!.location;
231
- }
232
-
233
- function resultState(result: AsyncResultFile): AsyncStatus["state"] {
234
- if (
235
- result.state === "complete" ||
236
- result.state === "failed" ||
237
- result.state === "paused" ||
238
- result.state === "running" ||
239
- result.state === "queued"
240
- ) {
241
- return result.state;
242
- }
243
- return result.success ? "complete" : "failed";
244
- }
245
-
246
- function validateStatusForResume(status: AsyncStatus | null, source: string): void {
247
- if (!status) return;
248
- if (typeof status.runId !== "string") throw new Error(`Invalid async status '${source}': runId must be a string.`);
249
- if (status.sessionId !== undefined && typeof status.sessionId !== "string")
250
- throw new Error(`Invalid async status '${source}': sessionId must be a string.`);
251
- if (status.cwd !== undefined && typeof status.cwd !== "string")
252
- throw new Error(`Invalid async status '${source}': cwd must be a string.`);
253
- if (status.sessionFile !== undefined && typeof status.sessionFile !== "string")
254
- throw new Error(`Invalid async status '${source}': sessionFile must be a string.`);
255
- if (status.steps !== undefined) {
256
- if (!Array.isArray(status.steps)) throw new Error(`Invalid async status '${source}': steps must be an array.`);
257
- status.steps.forEach((step, index) => {
258
- if (!step || typeof step !== "object" || Array.isArray(step))
259
- throw new Error(`Invalid async status '${source}': steps[${index}] must be an object.`);
260
- if (typeof step.agent !== "string")
261
- throw new Error(`Invalid async status '${source}': steps[${index}].agent must be a string.`);
262
- if (step.sessionFile !== undefined && typeof step.sessionFile !== "string")
263
- throw new Error(`Invalid async status '${source}': steps[${index}].sessionFile must be a string.`);
264
- });
265
- }
266
- }
267
-
268
- function validateResumeSessionFile(runId: string, sessionFile: string): string {
269
- if (path.extname(sessionFile) !== ".jsonl")
270
- throw new Error(`Async run '${runId}' session file must be a .jsonl file: ${sessionFile}`);
271
- const resolved = path.resolve(sessionFile);
272
- if (!fs.existsSync(resolved)) throw new Error(`Async run '${runId}' session file does not exist: ${sessionFile}`);
273
- return resolved;
274
- }
275
-
276
- export function resolveAsyncResumeTarget(params: AsyncResumeParams, deps: AsyncResumeDeps = {}): AsyncResumeTarget {
277
- const asyncDirRoot = deps.asyncDirRoot ?? ASYNC_DIR;
278
- const resultsDir = deps.resultsDir ?? RESULTS_DIR;
279
- const location = resolveAsyncRunLocation(params, asyncDirRoot, resultsDir);
280
- if (!location.asyncDir && !location.resultPath) {
281
- throw new Error("Async run not found. Provide id or dir.");
282
- }
283
-
284
- const reconciliation = location.asyncDir
285
- ? reconcileAsyncRun(location.asyncDir, { resultsDir, kill: deps.kill, now: deps.now })
286
- : undefined;
287
- const status = reconciliation?.status ?? null;
288
- validateStatusForResume(status, location.asyncDir ? path.join(location.asyncDir, "status.json") : "status.json");
289
- const result = location.resultPath ? readResultFile(location.resultPath) : undefined;
290
- const runId =
291
- status?.runId ??
292
- result?.runId ??
293
- result?.id ??
294
- location.resolvedId ??
295
- (location.asyncDir ? path.basename(location.asyncDir) : "unknown");
296
- const state = status?.state ?? (result ? resultState(result) : undefined);
297
- if (!state) throw new Error(`Status file not found for async run '${runId}'.`);
298
-
299
- const statusSteps = status?.steps ?? [];
300
- const resultSteps = result?.results ?? [];
301
- const stepCount = statusSteps.length || resultSteps.length || (result?.agent ? 1 : 0);
302
- const requestedIndex = params.index;
303
- if (requestedIndex !== undefined && !Number.isInteger(requestedIndex))
304
- throw new Error(`Async run '${runId}' index must be an integer.`);
305
- const terminalStepStatuses = new Set(["complete", "completed", "failed", "paused"]);
306
-
307
- if (state === "running") {
308
- if (requestedIndex !== undefined) {
309
- if (requestedIndex < 0 || requestedIndex >= stepCount)
310
- throw new Error(`Async run '${runId}' has ${stepCount} children. Index ${requestedIndex} is out of range.`);
311
- const selectedStep = statusSteps[requestedIndex];
312
- if (selectedStep?.status === "running") {
313
- return {
314
- kind: "live",
315
- runId,
316
- asyncDir: location.asyncDir ?? undefined,
317
- state,
318
- agent: selectedStep.agent,
319
- index: requestedIndex,
320
- intercomTarget: resolveSubagentIntercomTarget(runId, selectedStep.agent, requestedIndex),
321
- cwd: status?.cwd ?? result?.cwd,
322
- sessionFile: selectedStep.sessionFile ?? status?.sessionFile ?? result?.sessionFile,
323
- };
324
- }
325
- if (selectedStep?.status === "pending")
326
- throw new Error(
327
- `Async run '${runId}' child ${requestedIndex} is pending and has not started yet. Wait for it to run or complete before resuming.`,
328
- );
329
- if (selectedStep && !terminalStepStatuses.has(selectedStep.status))
330
- throw new Error(
331
- `Async run '${runId}' child ${requestedIndex} is ${selectedStep.status} and cannot be revived yet.`,
332
- );
333
- } else {
334
- const running = statusSteps
335
- .map((step, index) => ({ step, index }))
336
- .filter(({ step }) => step.status === "running");
337
- const selected = running.length === 1 ? running[0] : undefined;
338
- if (!selected) {
339
- throw new Error(
340
- `Async run '${runId}' has ${running.length} running children. Provide index to choose one.`,
341
- );
342
- }
343
- return {
344
- kind: "live",
345
- runId,
346
- asyncDir: location.asyncDir ?? undefined,
347
- state,
348
- agent: selected.step.agent,
349
- index: selected.index,
350
- intercomTarget: resolveSubagentIntercomTarget(runId, selected.step.agent, selected.index),
351
- cwd: status?.cwd ?? result?.cwd,
352
- sessionFile: selected.step.sessionFile ?? status?.sessionFile ?? result?.sessionFile,
353
- };
354
- }
355
- }
356
-
357
- if (stepCount > 1 && requestedIndex === undefined) {
358
- throw new Error(`Async run '${runId}' has ${stepCount} children. Provide index to choose one.`);
359
- }
360
- const index = requestedIndex ?? 0;
361
- if (!Number.isInteger(index)) throw new Error(`Async run '${runId}' index must be an integer.`);
362
- if (index < 0 || index >= stepCount)
363
- throw new Error(`Async run '${runId}' has ${stepCount} children. Index ${index} is out of range.`);
364
- const agent = statusSteps[index]?.agent ?? resultSteps[index]?.agent ?? result?.agent;
365
- if (!agent) throw new Error(`Could not determine child agent for async run '${runId}'.`);
366
- const sessionFile =
367
- statusSteps[index]?.sessionFile ??
368
- resultSteps[index]?.sessionFile ??
369
- (stepCount === 1 ? (status?.sessionFile ?? result?.sessionFile) : undefined);
370
- if (!sessionFile)
371
- throw new Error(`Async run '${runId}' child ${index} does not have a persisted session file to resume from.`);
372
- const resolvedSessionFile = validateResumeSessionFile(runId, sessionFile);
373
-
374
- return {
375
- kind: "revive",
376
- runId,
377
- asyncDir: location.asyncDir ?? undefined,
378
- state,
379
- agent,
380
- index,
381
- intercomTarget: resolveSubagentIntercomTarget(runId, agent, index),
382
- cwd: status?.cwd ?? result?.cwd,
383
- sessionFile: resolvedSessionFile,
384
- };
385
- }
386
-
387
- export function buildRevivedAsyncTask(target: AsyncResumeTarget, message: string): string {
388
- return [
389
- "You are reviving a previous subagent conversation.",
390
- "",
391
- `Original run: ${target.runId}`,
392
- `Original agent: ${target.agent}`,
393
- target.sessionFile ? `Original session file: ${target.sessionFile}` : undefined,
394
- "",
395
- "Use the stored session context as background. Answer the orchestrator's follow-up below. Do not assume the original child process is still alive.",
396
- "",
397
- "Follow-up:",
398
- message,
399
- ]
400
- .filter((line): line is string => line !== undefined)
401
- .join("\n");
402
- }