mixdog 1.4.3 → 1.4.5

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 (281) hide show
  1. package/package.json +1 -2
  2. package/src/cli.mjs +5 -1
  3. package/src/defaults/shipped-history.json +30 -2
  4. package/src/defaults/skills/browser-use/SKILL.md +148 -273
  5. package/src/defaults/skills/browser-use/references/devtools.md +14 -0
  6. package/src/defaults/skills/browser-use/references/page-flows.md +66 -0
  7. package/src/defaults/skills/browser-use/references/sign-in.md +70 -0
  8. package/src/defaults/skills/code-tidy/SKILL.md +60 -84
  9. package/src/defaults/skills/code-tidy/references/agent-cleanup.md +27 -2
  10. package/src/defaults/skills/computer-use/SKILL.md +145 -229
  11. package/src/defaults/skills/computer-use/references/flows.md +35 -0
  12. package/src/defaults/skills/computer-use/references/operations.md +22 -0
  13. package/src/defaults/skills/computer-use/references/platforms.md +12 -0
  14. package/src/defaults/skills/docx/SKILL.md +23 -31
  15. package/src/defaults/skills/docx/references/native-authoring.md +26 -3
  16. package/src/defaults/skills/docx/references/redlining.md +15 -0
  17. package/src/defaults/skills/image/SKILL.md +37 -77
  18. package/src/defaults/skills/image/references/prompt-forms.md +51 -0
  19. package/src/defaults/skills/image/references/text.md +6 -0
  20. package/src/defaults/skills/local-provider/SKILL.md +75 -105
  21. package/src/defaults/skills/local-provider/references/lifecycle.md +14 -0
  22. package/src/defaults/skills/local-provider/references/maintenance.md +19 -0
  23. package/src/defaults/skills/local-provider/references/recovery.md +30 -0
  24. package/src/defaults/skills/memory-management/SKILL.md +22 -21
  25. package/src/defaults/skills/pdf/SKILL.md +21 -23
  26. package/src/defaults/skills/pdf/references/blocks.md +20 -0
  27. package/src/defaults/skills/pdf/references/forms.md +12 -0
  28. package/src/defaults/skills/pdf/references/html.md +2 -2
  29. package/src/defaults/skills/pdf/references/ocr.md +7 -0
  30. package/src/defaults/skills/pdf/references/security.md +8 -0
  31. package/src/defaults/skills/pptx/SKILL.md +30 -109
  32. package/src/defaults/skills/pptx/references/audit.md +45 -0
  33. package/src/defaults/skills/pptx/references/brief-critique.md +47 -0
  34. package/src/defaults/skills/pptx/references/editing.md +24 -0
  35. package/src/defaults/skills/pptx/references/html.md +1 -1
  36. package/src/defaults/skills/pptx/references/script.md +33 -0
  37. package/src/defaults/skills/setup/SKILL.md +34 -102
  38. package/src/defaults/skills/setup/references/actions.md +73 -14
  39. package/src/defaults/skills/setup/references/surfaces.md +23 -8
  40. package/src/defaults/skills/setup-guide/SKILL.md +28 -115
  41. package/src/defaults/skills/setup-guide/references/features.md +36 -0
  42. package/src/defaults/skills/setup-guide/references/glossary.md +38 -0
  43. package/src/defaults/skills/setup-guide/references/workflow-models.md +62 -0
  44. package/src/defaults/skills/test-suite/SKILL.md +15 -127
  45. package/src/defaults/skills/test-suite/references/case-management.md +17 -9
  46. package/src/defaults/skills/test-suite/references/diagnose.md +23 -0
  47. package/src/defaults/skills/test-suite/references/prune.md +27 -0
  48. package/src/defaults/skills/test-suite/references/write.md +44 -0
  49. package/src/defaults/skills/video/SKILL.md +28 -42
  50. package/src/defaults/skills/video/references/prompting.md +31 -0
  51. package/src/defaults/skills/visualize/SKILL.md +73 -107
  52. package/src/defaults/skills/visualize/references/craft.md +1 -2
  53. package/src/defaults/skills/visualize/references/feedback.md +36 -0
  54. package/src/defaults/skills/visualize/references/showing.md +13 -0
  55. package/src/defaults/skills/xlsx/SKILL.md +23 -50
  56. package/src/defaults/skills/xlsx/references/editing.md +15 -0
  57. package/src/defaults/skills/xlsx/references/model-conventions.md +1 -1
  58. package/src/defaults/skills/xlsx/references/recalculation.md +37 -0
  59. package/src/defaults/skills/xlsx/references/report-design.md +18 -2
  60. package/src/lib/keychain-cjs.cjs +22 -1
  61. package/src/lib/rules-builder.cjs +1 -1
  62. package/src/rules/agent/AGENT.md +3 -0
  63. package/src/rules/agent-mode/MIXY.md +5 -3
  64. package/src/rules/lead/LEAD.md +3 -1
  65. package/src/runtime/agent/orchestrator/agent-runtime/cache-strategy.mjs +8 -30
  66. package/src/runtime/agent/orchestrator/agent-runtime/title-completion.mjs +5 -0
  67. package/src/runtime/agent/orchestrator/mcp/oauth-request.mjs +21 -2
  68. package/src/runtime/agent/orchestrator/providers/account-pool.mjs +3 -0
  69. package/src/runtime/agent/orchestrator/providers/admission-scheduler.mjs +4 -3
  70. package/src/runtime/agent/orchestrator/providers/anthropic-api-request.mjs +11 -1
  71. package/src/runtime/agent/orchestrator/providers/anthropic-api-transport.mjs +2 -0
  72. package/src/runtime/agent/orchestrator/providers/anthropic-message-threads.mjs +583 -0
  73. package/src/runtime/agent/orchestrator/providers/anthropic-oauth-client-version.mjs +1 -1
  74. package/src/runtime/agent/orchestrator/providers/anthropic-oauth.mjs +81 -19
  75. package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-start.mjs +4 -0
  76. package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-outcome.mjs +2 -0
  77. package/src/runtime/agent/orchestrator/providers/anthropic-sse.mjs +180 -13
  78. package/src/runtime/agent/orchestrator/providers/anthropic-turn-result.mjs +2 -0
  79. package/src/runtime/agent/orchestrator/providers/anthropic.mjs +58 -6
  80. package/src/runtime/agent/orchestrator/providers/cursor-wire.mjs +4 -2
  81. package/src/runtime/agent/orchestrator/providers/custom-provider-config.mjs +121 -9
  82. package/src/runtime/agent/orchestrator/providers/custom-provider.mjs +4 -1
  83. package/src/runtime/agent/orchestrator/providers/gemini-error-contract.mjs +6 -6
  84. package/src/runtime/agent/orchestrator/providers/gemini-model-redirect.mjs +44 -0
  85. package/src/runtime/agent/orchestrator/providers/gemini-reasoning-relay.mjs +5 -0
  86. package/src/runtime/agent/orchestrator/providers/gemini-request-body.mjs +34 -5
  87. package/src/runtime/agent/orchestrator/providers/gemini-response.mjs +10 -0
  88. package/src/runtime/agent/orchestrator/providers/gemini-schema.mjs +11 -6
  89. package/src/runtime/agent/orchestrator/providers/gemini-sdk-request.mjs +4 -100
  90. package/src/runtime/agent/orchestrator/providers/gemini-stream.mjs +3 -227
  91. package/src/runtime/agent/orchestrator/providers/gemini.mjs +226 -118
  92. package/src/runtime/agent/orchestrator/providers/lib/anthropic-request-utils.mjs +11 -1
  93. package/src/runtime/agent/orchestrator/providers/lib/claude-bridge-schema.mjs +15 -3
  94. package/src/runtime/agent/orchestrator/providers/lib/gemini-model-catalog.mjs +2 -1
  95. package/src/runtime/agent/orchestrator/providers/lib/generation-window.mjs +9 -0
  96. package/src/runtime/agent/orchestrator/providers/openai-compat-chat-send.mjs +9 -1
  97. package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-result.mjs +2 -0
  98. package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-state.mjs +5 -0
  99. package/src/runtime/agent/orchestrator/providers/openai-compat-options.mjs +3 -0
  100. package/src/runtime/agent/orchestrator/providers/openai-compat-response-normalization.mjs +2 -0
  101. package/src/runtime/agent/orchestrator/providers/openai-compat-responses.mjs +10 -1
  102. package/src/runtime/agent/orchestrator/providers/openai-direct-request.mjs +5 -28
  103. package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-events.mjs +3 -0
  104. package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-outcome.mjs +2 -0
  105. package/src/runtime/agent/orchestrator/providers/openai-ws-pool.mjs +50 -28
  106. package/src/runtime/agent/orchestrator/providers/openai-ws-response-state.mjs +9 -2
  107. package/src/runtime/agent/orchestrator/providers/openai-ws-stream/socket-handlers.mjs +14 -10
  108. package/src/runtime/agent/orchestrator/providers/openai-ws.mjs +1 -3
  109. package/src/runtime/agent/orchestrator/providers/openrouter-provider-routing.mjs +28 -0
  110. package/src/runtime/agent/orchestrator/providers/openrouter.mjs +4 -1
  111. package/src/runtime/agent/orchestrator/providers/registry.mjs +30 -25
  112. package/src/runtime/agent/orchestrator/providers/stream-json-pool/worker-slots/slot-spawn.mjs +8 -3
  113. package/src/runtime/agent/orchestrator/providers/vertex-ai-maas.mjs +2 -2
  114. package/src/runtime/agent/orchestrator/runtime-core/ask-user-result.mjs +66 -0
  115. package/src/runtime/agent/orchestrator/runtime-core/config-helpers.mjs +4 -5
  116. package/src/runtime/agent/orchestrator/runtime-core/goal-tool-defs.mjs +2 -2
  117. package/src/runtime/agent/orchestrator/runtime-core/provider-request-tools.mjs +15 -8
  118. package/src/runtime/agent/orchestrator/runtime-core/session-title.mjs +1 -0
  119. package/src/runtime/agent/orchestrator/runtime-core/todo-list.mjs +9 -32
  120. package/src/runtime/agent/orchestrator/runtime-core/todo-tool-defs.mjs +4 -5
  121. package/src/runtime/agent/orchestrator/session/compact/summary-route.mjs +1 -3
  122. package/src/runtime/agent/orchestrator/session/loop/compact-policy.mjs +5 -2
  123. package/src/runtime/agent/orchestrator/session/loop/no-tool-turn/todo-check.mjs +2 -17
  124. package/src/runtime/agent/orchestrator/session/loop/usage.mjs +7 -3
  125. package/src/runtime/agent/orchestrator/session/manager/ask-turn-settle.mjs +9 -2
  126. package/src/runtime/agent/orchestrator/session/manager/runtime-liveness.mjs +8 -1
  127. package/src/runtime/agent/orchestrator/session/manager/session-close.mjs +26 -13
  128. package/src/runtime/agent/orchestrator/session/manager/session-lifecycle.mjs +4 -5
  129. package/src/runtime/agent/orchestrator/session/manager/usage-metrics.mjs +16 -5
  130. package/src/runtime/agent/orchestrator/session/store/lifecycle-barriers.mjs +22 -1
  131. package/src/runtime/agent/orchestrator/session/store/live-state.mjs +4 -0
  132. package/src/runtime/agent/orchestrator/session/store.mjs +12 -6
  133. package/src/runtime/agent/orchestrator/tools/builtin/cache-layers.mjs +11 -9
  134. package/src/runtime/agent/orchestrator/tools/builtin/grep-formatting.mjs +2 -8
  135. package/src/runtime/agent/orchestrator/tools/builtin/lib/search-input-helpers.mjs +1 -9
  136. package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-output-silence.mjs +64 -0
  137. package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-task-output.mjs +20 -6
  138. package/src/runtime/agent/orchestrator/tools/builtin/local-search-telemetry.mjs +2 -2
  139. package/src/runtime/agent/orchestrator/tools/builtin/native-search-client.mjs +1 -1
  140. package/src/runtime/agent/orchestrator/tools/builtin/runtime-capabilities.mjs +12 -3
  141. package/src/runtime/agent/orchestrator/tools/builtin/task-tool.mjs +12 -1
  142. package/src/runtime/agent/orchestrator/tools/code-graph/ast-calls.mjs +9 -2
  143. package/src/runtime/agent/orchestrator/tools/code-graph/build.mjs +137 -7
  144. package/src/runtime/agent/orchestrator/tools/code-graph/calls-cache.mjs +43 -14
  145. package/src/runtime/agent/orchestrator/tools/code-graph/calls-sidecar-worker.mjs +33 -0
  146. package/src/runtime/agent/orchestrator/tools/code-graph/disk-cache.mjs +146 -11
  147. package/src/runtime/agent/orchestrator/tools/code-graph/dispatch.mjs +31 -24
  148. package/src/runtime/agent/orchestrator/tools/code-graph/graph-binary/spawn-jsonl.mjs +172 -25
  149. package/src/runtime/agent/orchestrator/tools/code-graph/graph-model.mjs +100 -2
  150. package/src/runtime/agent/orchestrator/tools/code-graph/main-thread-slice.mjs +18 -0
  151. package/src/runtime/agent/orchestrator/tools/code-graph/mask-pool.mjs +219 -0
  152. package/src/runtime/agent/orchestrator/tools/code-graph/mask-worker.mjs +12 -0
  153. package/src/runtime/agent/orchestrator/tools/code-graph/memory-cache.mjs +6 -1
  154. package/src/runtime/agent/orchestrator/tools/code-graph/modes/calls.mjs +9 -2
  155. package/src/runtime/agent/orchestrator/tools/code-graph/modes/dependents.mjs +5 -1
  156. package/src/runtime/agent/orchestrator/tools/code-graph/modes/structure.mjs +8 -2
  157. package/src/runtime/agent/orchestrator/tools/code-graph/modes/symbols.mjs +14 -11
  158. package/src/runtime/agent/orchestrator/tools/code-graph/search-references.mjs +41 -18
  159. package/src/runtime/agent/orchestrator/tools/code-graph/search.mjs +391 -83
  160. package/src/runtime/agent/orchestrator/tools/code-graph/symbol-index.mjs +109 -9
  161. package/src/runtime/agent/orchestrator/tools/code-graph/text-mask.mjs +73 -29
  162. package/src/runtime/agent/orchestrator/tools/code-graph-prewarm-worker.mjs +6 -5
  163. package/src/runtime/agent/orchestrator/tools/lib/native-spawn-client.mjs +7 -3
  164. package/src/runtime/channels/lib/crash-log.mjs +21 -1
  165. package/src/runtime/channels/lib/routines-db.mjs +35 -0
  166. package/src/runtime/channels/lib/schedules-db.mjs +4 -0
  167. package/src/runtime/channels/lib/webhooks-db.mjs +4 -0
  168. package/src/runtime/channels/lib/worker-main.mjs +8 -25
  169. package/src/runtime/computer-bridge/action-schema.mjs +2 -2
  170. package/src/runtime/computer-bridge/core-actions.mjs +16 -2
  171. package/src/runtime/computer-bridge/result-canonical.mjs +6 -0
  172. package/src/runtime/media/jobs.mjs +5 -0
  173. package/src/runtime/media/store.mjs +146 -3
  174. package/src/runtime/memory/tool-defs.mjs +1 -1
  175. package/src/runtime/office/core/office-write-ledger.mjs +2 -2
  176. package/src/runtime/shared/agent-reap-state.mjs +19 -0
  177. package/src/runtime/shared/desktop-notice-host.d.mts +13 -0
  178. package/src/runtime/shared/desktop-notice-host.mjs +87 -0
  179. package/src/runtime/shared/file-lock.mjs +2 -2
  180. package/src/runtime/shared/heap-cap.mjs +9 -11
  181. package/src/runtime/shared/llm/http-agent.mjs +11 -1
  182. package/src/runtime/shared/llm/system-proxy.mjs +100 -25
  183. package/src/runtime/shared/llm/usage-accounting.mjs +121 -19
  184. package/src/runtime/shared/llm/usage-context.mjs +3 -3
  185. package/src/runtime/shared/llm/usage-ledger-quota.mjs +2 -0
  186. package/src/runtime/shared/llm/usage-ledger-requests.mjs +190 -0
  187. package/src/runtime/shared/llm/usage-ledger-rollup.mjs +7 -3
  188. package/src/runtime/shared/llm/usage-ledger-worker.mjs +2 -0
  189. package/src/runtime/shared/llm/usage-ledger.mjs +69 -1
  190. package/src/runtime/shared/llm/usage-request-status.mjs +48 -0
  191. package/src/runtime/shared/provider-accounts.mjs +22 -0
  192. package/src/runtime/shared/provider-auth-binding.mjs +2 -2
  193. package/src/runtime/shared/resource-admission.mjs +2 -2
  194. package/src/runtime/shared/root-async-context.mjs +51 -0
  195. package/src/runtime/shared/run-child.mjs +18 -1
  196. package/src/runtime/shared/slow-span.mjs +2 -2
  197. package/src/runtime/shared/tool-execution-owner.mjs +2 -2
  198. package/src/runtime/shared/tool-result-summary.mjs +1 -1
  199. package/src/runtime/shared/tool-work-units.mjs +2 -0
  200. package/src/runtime/shared/turn-snapshot-store.mjs +75 -18
  201. package/src/runtime/shared/turn-worktree-snapshot.mjs +38 -8
  202. package/src/runtime/shared/user-cwd.mjs +2 -2
  203. package/src/runtime/shared/worker-requests.mjs +3 -1
  204. package/src/runtime/shared/worktrees/lock.mjs +2 -2
  205. package/src/runtime/visualize-bridge/client.mjs +26 -4
  206. package/src/runtime/visualize-bridge/tool-defs.mjs +46 -5
  207. package/src/session-runtime/agent-home-delivery.mjs +76 -8
  208. package/src/session-runtime/agent-task-sessions.mjs +63 -22
  209. package/src/session-runtime/boot/apis.mjs +16 -0
  210. package/src/session-runtime/boot/begin.mjs +2 -0
  211. package/src/session-runtime/boot/tools.mjs +8 -2
  212. package/src/session-runtime/internal-tool-executor/ask-user-tool.mjs +3 -58
  213. package/src/session-runtime/media-api.mjs +15 -0
  214. package/src/session-runtime/model-route/route-persist.mjs +12 -4
  215. package/src/session-runtime/provider-models/row-hydration.mjs +2 -0
  216. package/src/session-runtime/provider-readiness.mjs +10 -2
  217. package/src/session-runtime/routine-owner.mjs +9 -3
  218. package/src/session-runtime/runtime-core.mjs +35 -8
  219. package/src/session-runtime/runtime-review-api.mjs +3 -1
  220. package/src/session-runtime/services/agent-task-status.mjs +29 -1
  221. package/src/session-runtime/services/agent-tool/close-flow.mjs +6 -1
  222. package/src/session-runtime/services/agent-tool/execute-resume.mjs +94 -0
  223. package/src/session-runtime/services/agent-tool/execute-send.mjs +77 -27
  224. package/src/session-runtime/services/agent-tool/execute-spawn.mjs +28 -7
  225. package/src/session-runtime/services/agent-tool/execute.mjs +6 -1
  226. package/src/session-runtime/services/agent-tool/helpers.mjs +11 -0
  227. package/src/session-runtime/services/agent-tool/job-views/job-render.mjs +13 -10
  228. package/src/session-runtime/services/agent-tool/job-views/session-progress.mjs +3 -0
  229. package/src/session-runtime/services/agent-tool/render.mjs +8 -1
  230. package/src/session-runtime/services/agent-tool/send-flow.mjs +1 -0
  231. package/src/session-runtime/services/agent-tool/spawn-flow/spawn-prep.mjs +6 -0
  232. package/src/session-runtime/services/agent-tool/spawn-flow/spawn-run.mjs +2 -1
  233. package/src/session-runtime/services/agent-tool/tag-registry/reaped-sessions.mjs +82 -0
  234. package/src/session-runtime/services/agent-tool/tag-registry/record-facts-worker.mjs +36 -0
  235. package/src/session-runtime/services/agent-tool/tag-registry.mjs +4 -0
  236. package/src/session-runtime/services/agent-tool/terminal-reaper/row-helpers.mjs +29 -0
  237. package/src/session-runtime/services/agent-tool/terminal-reaper/scan-admission.mjs +11 -3
  238. package/src/session-runtime/services/agent-tool/terminal-reaper/stale-rows.mjs +19 -8
  239. package/src/session-runtime/services/agent-tool/terminal-reaper.mjs +5 -2
  240. package/src/session-runtime/services/agent-tool/worker-index.mjs +1 -0
  241. package/src/session-runtime/services/channel-admin.mjs +44 -3
  242. package/src/session-runtime/services/daemon-crash-capture/daemon-exit-record.mjs +2 -2
  243. package/src/session-runtime/services/plugin-admin.mjs +46 -7
  244. package/src/session-runtime/services/provider-admin.mjs +5 -0
  245. package/src/session-runtime/session-create.mjs +5 -0
  246. package/src/session-runtime/setup-tool/agent-settings-actions.mjs +1 -1
  247. package/src/session-runtime/setup-tool/executor.mjs +1 -1
  248. package/src/session-runtime/setup-tool/extended-actions.mjs +1 -1
  249. package/src/session-runtime/setup-tool/settings-contract.mjs +4 -2
  250. package/src/session-runtime/usage-stats-api.mjs +120 -1
  251. package/src/session-runtime/workflow-agents-api/agent-connectors.mjs +36 -29
  252. package/src/session-runtime/workflow-agents-api/agent-editor.mjs +183 -23
  253. package/src/session-runtime/workspace/admission-gate.mjs +25 -7
  254. package/src/session-runtime/workspace/transitions.mjs +4 -0
  255. package/src/standalone/daemon-log.mjs +28 -4
  256. package/src/standalone/daemon-owner.mjs +41 -7
  257. package/src/standalone/daemon-work-gate.mjs +139 -0
  258. package/src/standalone/daemon.mjs +80 -11
  259. package/src/standalone/desktop-service-registry.mjs +11 -4
  260. package/src/standalone/session-client.mjs +57 -5
  261. package/src/standalone/session-protocol.mjs +6 -0
  262. package/src/standalone/session-service/agent-tree/agent-cancel.mjs +17 -1
  263. package/src/standalone/session-service/agent-tree.mjs +7 -0
  264. package/src/standalone/session-service/retention/busy.mjs +3 -2
  265. package/src/standalone/session-service/session-calls/session-turns.mjs +12 -5
  266. package/src/standalone/session-transport/call-route.mjs +10 -4
  267. package/src/standalone/session-transport/routes.mjs +21 -0
  268. package/src/standalone/session-transport/stack.mjs +3 -1
  269. package/src/standalone/session-transport.mjs +5 -0
  270. package/src/tui/app/model-picker/model-footer.mjs +1 -1
  271. package/src/tui/app/model-picker/provider-models-list.mjs +7 -3
  272. package/src/tui/app/model-picker/route-selection/fast-parameters.mjs +23 -3
  273. package/src/tui/app/model-picker/route-selection.mjs +1 -0
  274. package/src/tui/dist/index.mjs +536 -484
  275. package/src/tui/session/session-api/integrations.mjs +3 -0
  276. package/src/tui/session/session-api/media.mjs +5 -0
  277. package/src/tui/session/tool-approval-settle.mjs +24 -4
  278. package/src/tui/session/tool-approval.mjs +35 -10
  279. package/src/tui/session/turn.mjs +13 -0
  280. package/src/runtime/agent/orchestrator/providers/gemini-sdk-stream/cancellation.mjs +0 -71
  281. package/src/runtime/agent/orchestrator/providers/gemini-sdk-stream/reader.mjs +0 -108
@@ -202,11 +202,10 @@ const AUTO_CLEAR_DEFAULT_IDLE_MS = 60 * 60 * 1000;
202
202
  // reusable. Gemini, xAI and Mistral
203
203
  // caches run ~1h, Groq's implicit cache persists ~2h, and DeepSeek's
204
204
  // implicit cache is evicted after "a few hours to a few days" (kept at 24h).
205
- // OpenAI public API (GPT-5.6+ Responses, cache-strategy.mjs): the moving tail
206
- // is written with ttl "30m" and only the Lead-class stable prefix with "12h",
207
- // so the sweep matches the 30m tail — a clear after that costs nothing extra
208
- // (the tail is cold anyway) and the cleared session restarts on the warm 12h
209
- // prefix. Earlier OpenAI models (prompt_cache_retention, typically ~30 min)
205
+ // OpenAI public API (GPT-5.6+ Responses, cache-strategy.mjs): every request
206
+ // is written with ttl "30m", so the sweep matches it — a clear after that
207
+ // costs nothing extra (the cache is cold anyway). Earlier OpenAI models
208
+ // (prompt_cache_retention, typically ~30 min)
210
209
  // are not distinguished: these call sites only know the provider.
211
210
  // OpenAI OAuth (Codex/ChatGPT login) keeps the cache of logged-in users
212
211
  // indefinitely (2026-10-20), so its built-in window is unlimited: no idle
@@ -6,7 +6,7 @@ export const GOAL_TOOL_DEFS = Object.freeze([
6
6
  name: 'goal',
7
7
  title: 'Goal',
8
8
  description:
9
- 'A durable objective the runtime keeps working on across turns until you complete or block it, with an optional time cap (an upper bound, never a minimum). Create one only for an explicit Goal request or approved multi-turn work (staged refactors, migrations, open-ended objectives); never for single-turn tasks, plans, estimates or unaccepted proposals. One Goal at a time; its steps live in todo, not here. complete only after auditing every user condition against current evidence (files, command output, tests) — never because time is low, the cap was reached or the turn is ending, and never for a smaller objective than the one stated. block only for an impasse that only the user or external state can clear. Pause, resume, stop and edits are the user’s controls.',
9
+ 'A durable objective the runtime keeps working on across turns until you complete or block it, with an optional time cap (an upper bound, never a minimum). Create one only for an explicit Goal request or approved multi-turn work (staged refactors, migrations, open-ended objectives); never for single-turn tasks, plans, estimates or unaccepted proposals. One Goal at a time; its steps live in todo, not here. complete only after auditing every user condition against current evidence — never because time is low, the cap was reached or the turn is ending, and never for a smaller objective than the one stated. block only when the same blocking condition has recurred for at least three consecutive Goal turns (first turn and continuations count) and no progress is possible without the user or a change in external state; never because the work is hard, slow, uncertain, unfinished or would benefit from clarification. A resumed Goal counts afresh; once the threshold is met, block rather than report the impasse. Pause, resume, stop and edits are the user’s controls.',
10
10
  annotations: {
11
11
  title: 'Goal',
12
12
  readOnlyHint: false,
@@ -34,7 +34,7 @@ export const GOAL_TOOL_DEFS = Object.freeze([
34
34
  type: 'string',
35
35
  minLength: 1,
36
36
  maxLength: 1_000,
37
- description: 'block: the impasse; stops the Goal.',
37
+ description: 'block: the impasse that recurred for three consecutive Goal turns; stops the Goal.',
38
38
  },
39
39
  },
40
40
  required: ['action'],
@@ -1,6 +1,6 @@
1
- import { AsyncLocalStorage } from 'node:async_hooks';
1
+ import { runtimeAsyncLocalStorage } from '../../../shared/root-async-context.mjs';
2
2
 
3
- const requestToolScope = new AsyncLocalStorage();
3
+ const requestToolScope = runtimeAsyncLocalStorage();
4
4
  const NATIVE_PREFIX_COUNT = Symbol('mixdog.providerNativeToolPrefixCount');
5
5
  const finalizedProviderRequestTools = new WeakSet();
6
6
  let requestToolScopeGeneration = 0;
@@ -49,21 +49,28 @@ export function runWithProviderRequestToolsScope(scope, callback) {
49
49
  try {
50
50
  result = callback();
51
51
  } catch (error) {
52
- store.active = false;
52
+ deactivate(store);
53
53
  throw error;
54
54
  }
55
55
  if (result && typeof result.then === 'function') {
56
- return Promise.resolve(result).finally(() => {
57
- store.active = false;
58
- });
56
+ return Promise.resolve(result).finally(() => deactivate(store));
59
57
  }
60
- store.active = false;
58
+ deactivate(store);
61
59
  return result;
62
60
  });
63
61
  }
64
62
 
63
+ // An inactive scope is never read again, but any handle, timer or listener
64
+ // created under it keeps the store: drop what pins the session.
65
+ function deactivate(store) {
66
+ store.active = false;
67
+ store.session = null;
68
+ store.messages = null;
69
+ store.requestTools = null;
70
+ }
71
+
65
72
  export function invalidateProviderRequestToolsScope(scope = requestToolScope.getStore()) {
66
- if (scope && typeof scope === 'object') scope.active = false;
73
+ if (scope && typeof scope === 'object') deactivate(scope);
67
74
  }
68
75
 
69
76
  export function scopedProviderRequestTools(session, provider, messages) {
@@ -189,6 +189,7 @@ export function createSessionTitleController(deps = {}) {
189
189
  deps.generateSessionTitle || (await import('../agent-runtime/title-completion.mjs')).generateSessionTitle;
190
190
  if (disposed) return '';
191
191
  return complete(source, {
192
+ sessionId,
192
193
  signal: abort.signal,
193
194
  locale: String(deps.systemLocale?.() || resolvedSystemLocale()),
194
195
  });
@@ -31,9 +31,9 @@ function normalizeTask(raw) {
31
31
  if (!raw || typeof raw !== 'object') return null;
32
32
  const content = oneLine(raw.content);
33
33
  if (!content) return null;
34
+ // Stored lists from when `blocked` existed load as pending.
34
35
  const status = TODO_STATUSES.includes(raw.status) ? raw.status : 'pending';
35
36
  const task = { content, status };
36
- if (status === 'blocked' && oneLine(raw.blocker)) task.blocker = oneLine(raw.blocker);
37
37
  if (oneLine(raw.note)) task.note = oneLine(raw.note);
38
38
  return task;
39
39
  }
@@ -52,7 +52,7 @@ export function todoPhases(session) {
52
52
  const allTasks = (phases) => phases.flatMap((phase) => phase.tasks);
53
53
 
54
54
  /** Exactly one in_progress while actionable work exists: several keep the
55
- * earliest, none starts the earliest pending. Blocked never starts itself. */
55
+ * earliest, none starts the earliest pending. */
56
56
  function normalizeTodoPhases(phases) {
57
57
  const tasks = allTasks(phases);
58
58
  const active = tasks.filter((task) => task.status === 'in_progress');
@@ -78,8 +78,8 @@ export function openTodoItems(session) {
78
78
  return allTasks(todoPhases(session)).filter((task) => OPEN_STATUSES.has(task.status));
79
79
  }
80
80
 
81
- /** Every item not completed or dropped (blocked included): what an agent
82
- * leaves undone when it ends. */
81
+ /** Every item not completed or dropped: what an agent leaves undone when it
82
+ * ends. */
83
83
  export function unfinishedTodoItems(session) {
84
84
  return allTasks(todoPhases(session)).filter((task) => task.status !== 'completed' && task.status !== 'abandoned');
85
85
  }
@@ -145,7 +145,7 @@ function publish(session) {
145
145
  }
146
146
  }
147
147
 
148
- const MARKS = { completed: 'x', in_progress: '>', pending: ' ', blocked: '!', abandoned: '-' };
148
+ const MARKS = { completed: 'x', in_progress: '>', pending: ' ', abandoned: '-' };
149
149
 
150
150
  function progressLabel(phases) {
151
151
  const { completed, abandoned, total } = todoCounts(phases);
@@ -159,7 +159,7 @@ function renderTodoList(phases) {
159
159
  for (const phase of phases) {
160
160
  lines.push(phase.name);
161
161
  for (const task of phase.tasks) {
162
- const detail = task.blocker ? ` — blocked: ${task.blocker}` : task.note ? ` — ${task.note}` : '';
162
+ const detail = task.note ? ` — ${task.note}` : '';
163
163
  lines.push(` [${MARKS[task.status]}] ${task.content}${detail}`);
164
164
  }
165
165
  }
@@ -171,7 +171,6 @@ function summaryLine(phases, op, content) {
171
171
  const parts = [progressLabel(phases), `${op}: ${content}`];
172
172
  const current = tasks.find((task) => task.status === 'in_progress');
173
173
  if (current) parts.push(`next: ${current.content}`);
174
- else if (tasks.some((task) => task.status === 'blocked')) parts.push('next: none (blocked items wait)');
175
174
  else parts.push('all closed');
176
175
  return parts.join(' · ');
177
176
  }
@@ -218,7 +217,6 @@ const OPS = {
218
217
  start(phases, args) {
219
218
  const { task } = findTask(phases, args.item);
220
219
  if (task.status === 'completed') throw new Error(`todo: "${task.content}" is completed and stays closed`);
221
- if (task.status === 'blocked') throw new Error(`todo: "${task.content}" is blocked; unblock it first`);
222
220
  for (const other of allTasks(phases)) if (other.status === 'in_progress') other.status = 'pending';
223
221
  task.status = 'in_progress';
224
222
  return task.content;
@@ -226,7 +224,6 @@ const OPS = {
226
224
  done(phases, args) {
227
225
  const { task } = findTask(phases, args.item);
228
226
  task.status = 'completed';
229
- delete task.blocker;
230
227
  const note = oneLine(args.note);
231
228
  if (note) task.note = note;
232
229
  return task.content;
@@ -235,23 +232,6 @@ const OPS = {
235
232
  const { task } = findTask(phases, args.item);
236
233
  if (task.status === 'completed') throw new Error(`todo: "${task.content}" is completed and stays closed`);
237
234
  task.status = 'abandoned';
238
- delete task.blocker;
239
- return task.content;
240
- },
241
- block(phases, args) {
242
- const { task } = findTask(phases, args.item);
243
- if (task.status === 'completed' || task.status === 'abandoned') {
244
- throw new Error(`todo: "${task.content}" is ${task.status}; only open items can block`);
245
- }
246
- task.status = 'blocked';
247
- task.blocker = itemText(args.reason, 'block reason');
248
- return task.content;
249
- },
250
- unblock(phases, args) {
251
- const { task } = findTask(phases, args.item);
252
- if (task.status !== 'blocked') throw new Error(`todo: "${task.content}" is not blocked`);
253
- task.status = 'pending';
254
- delete task.blocker;
255
235
  return task.content;
256
236
  },
257
237
  append(phases, args) {
@@ -312,10 +292,7 @@ export function executeTodoTool(session, args = {}) {
312
292
  export function notDoneReport(session) {
313
293
  const unfinished = unfinishedTodoItems(session);
314
294
  if (!unfinished.length) return '';
315
- return [
316
- 'Not done:',
317
- ...unfinished.map((task) => `- ${task.content}${task.blocker ? ` (blocked: ${task.blocker})` : ''}`),
318
- ].join('\n');
295
+ return ['Not done:', ...unfinished.map((task) => `- ${task.content}`)].join('\n');
319
296
  }
320
297
 
321
298
  /** The open list as a hidden reminder (after compaction, or appended to a
@@ -335,7 +312,7 @@ const LEGACY_GOAL_TASK_STATUS = {
335
312
  in_progress: 'in_progress',
336
313
  completed: 'completed',
337
314
  dropped: 'abandoned',
338
- awaiting_approval: 'blocked',
315
+ awaiting_approval: 'pending',
339
316
  };
340
317
 
341
318
  /** Move a legacy Goal record's tasks into the session's list (once; the Goal
@@ -352,7 +329,7 @@ export function adoptLegacyGoalTasks(session, legacyTasks) {
352
329
  if (!content || existing.has(content)) continue;
353
330
  existing.add(content);
354
331
  const status = LEGACY_GOAL_TASK_STATUS[oneLine(raw?.status).toLowerCase()] || 'pending';
355
- adopted.push(status === 'blocked' ? { content, status, blocker: 'awaiting user approval' } : { content, status });
332
+ adopted.push({ content, status });
356
333
  }
357
334
  if (!adopted.length) return false;
358
335
  const name = phases.length ? 'Goal' : DEFAULT_TODO_PHASE;
@@ -1,7 +1,7 @@
1
1
  // The model-facing `todo` step list. Its description is the only guidance the
2
2
  // model gets about it: nothing is added to the system prompt or rules.
3
- export const TODO_OPS = Object.freeze(['init', 'start', 'done', 'drop', 'block', 'unblock', 'append', 'rm', 'view']);
4
- export const TODO_STATUSES = Object.freeze(['pending', 'in_progress', 'completed', 'abandoned', 'blocked']);
3
+ export const TODO_OPS = Object.freeze(['init', 'start', 'done', 'drop', 'append', 'rm', 'view']);
4
+ export const TODO_STATUSES = Object.freeze(['pending', 'in_progress', 'completed', 'abandoned']);
5
5
  export const MAX_TODO_ITEMS = 50;
6
6
  export const MAX_TODO_TEXT_LENGTH = 200;
7
7
 
@@ -19,7 +19,7 @@ export const TODO_TOOL = Object.freeze({
19
19
  agentHidden: false,
20
20
  },
21
21
  description:
22
- 'The step list for this request; the Lead and each agent keep their own. Use it whenever the work has three or more steps or several asks (a delegated brief with several parts counts); skip it only for a single step or a plain answer. Create it before the first real action: init with every ask as its own item, in order, covering investigation through verification. A follow-up that adds to the request: append its asks and any steps you discover; init is for a new, unrelated request and refuses while items are open. An item is named by its outcome in 3-8 words and keeps that exact wording; it is how you refer to it — lost the wording: view, never guess. Keep it current while you work, not at the end: the moment an item is finished and its result is read, mark it done with your next call — never batch completions. The runtime keeps exactly one item in progress; done moves it to the next. Send todo beside your next real tool call; when no real call is due, call it alone rather than skip the update. Waiting on the user, an agent or a shell: block it with a reason; unblock when it can move; done only after reading the result.',
22
+ 'The step list for this request; the Lead and each agent keep their own. Use it whenever the work has three or more steps or several asks (a delegated brief with several parts counts); skip it only for a single step or a plain answer. Create it before the first real action: init with every ask as its own item, in order, covering investigation through verification. A follow-up that adds to the request: append its asks and any steps you discover; init is for a new, unrelated request and refuses while items are open. An item is named by its outcome in 3-8 words and keeps that exact wording; it is how you refer to it — lost the wording: view, never guess. Keep it current while you work, not at the end: the moment an item is finished and its result is read, mark it done with your next call — never batch completions. The runtime keeps exactly one item in progress; done moves it to the next. Send todo beside your next real tool call; when no real call is due, call it alone rather than skip the update. Mark an item done only after reading its result; an item waiting on the user, an agent or a shell stays open.',
23
23
  inputSchema: {
24
24
  type: 'object',
25
25
  properties: {
@@ -36,10 +36,9 @@ export const TODO_TOOL = Object.freeze({
36
36
  },
37
37
  description: 'init: named phases instead of items.',
38
38
  },
39
- item: { type: 'string', description: 'start/done/drop/block/unblock/rm: exact item wording.' },
39
+ item: { type: 'string', description: 'start/done/drop/rm: exact item wording.' },
40
40
  phase: { type: 'string', description: 'append: target phase (default last; new name adds one).' },
41
41
  note: { type: 'string', description: 'done: optional one-line evidence.' },
42
- reason: { type: 'string', description: 'block: what it waits on.' },
43
42
  },
44
43
  required: ['op'],
45
44
  additionalProperties: false,
@@ -21,9 +21,7 @@ const WARM_MARGIN_RATIO = 0.1;
21
21
 
22
22
  /** How long the cache a saved request wrote or read stays readable, in ms:
23
23
  * Infinity when it does not expire (openai-oauth), 0 when it is not cached.
24
- * Anthropic: the request's message-tail tier (5m / 1h); OpenAI: the 30m tail
25
- * that holds the conversation (the Lead's 12h breakpoint covers only the
26
- * stable tools/instructions prefix). */
24
+ * Anthropic: the request's message-tail tier (5m / 1h); OpenAI: 30m. */
27
25
  function requestCacheLifetimeMs(request) {
28
26
  const name = request?.provider?.name;
29
27
  if (name === 'openai-oauth') return Infinity;
@@ -319,10 +319,13 @@ export function invalidateContextUsageSnapshot(sessionRef) {
319
319
 
320
320
  function providerPressureTokens(sessionRef, usage) {
321
321
  if (!usage || typeof usage !== 'object') return 0;
322
- const input = Math.max(0, Number(usage.inputTokens) || 0);
322
+ // Billed input can repeat context (Gemini long decode); the context input
323
+ // the provider reports then replaces both billed prompt figures.
324
+ const contextInput = Math.max(0, Number(usage.contextInputTokens) || 0);
325
+ const input = contextInput || Math.max(0, Number(usage.inputTokens) || 0);
323
326
  const cachedRead = Math.max(0, Number(usage.cachedTokens) || 0);
324
327
  const cacheWrite = Math.max(0, Number(usage.cacheWriteTokens) || 0);
325
- const explicitPrompt = Math.max(0, Number(usage.promptTokens) || 0);
328
+ const explicitPrompt = contextInput || Math.max(0, Number(usage.promptTokens) || 0);
326
329
  const normalizedPrompt = providerInputExcludesCache(sessionRef?.provider) ? input + cachedRead + cacheWrite : input;
327
330
  const prompt = Math.max(explicitPrompt, normalizedPrompt);
328
331
  const output = Math.max(0, Number(usage.outputTokens) || 0);
@@ -15,13 +15,7 @@
15
15
  import { resolvePluginData } from '../../../../../shared/plugin-paths.mjs';
16
16
  import { awaitingBackgroundWork, beginUserCycle } from '../../../../../shared/background-wait.mjs';
17
17
  import { readStoredGoalSnapshot } from '../../../runtime-core/goal-storage.mjs';
18
- import {
19
- clearTodo,
20
- openTodoItems,
21
- todoAllClosed,
22
- todoPhases,
23
- unfinishedTodoItems,
24
- } from '../../../runtime-core/todo-list.mjs';
18
+ import { clearTodo, openTodoItems, todoAllClosed, todoPhases } from '../../../runtime-core/todo-list.mjs';
25
19
  import { TODO_TOOL } from '../../../runtime-core/todo-tool-defs.mjs';
26
20
  import { HIDDEN_AGENT_NAMES } from '../hidden-agents.mjs';
27
21
  import { _isMutationTool, _isShellTool } from '../tool-classify.mjs';
@@ -67,15 +61,6 @@ export function todoStartReminder(session) {
67
61
  if (HIDDEN_AGENT_NAMES.has(session.agent)) return null;
68
62
  if (!session.tools?.some((tool) => tool?.name === TODO_TOOL.name)) return null;
69
63
  if (openTodoItems(session).length) return null;
70
- // `init` refuses while any item is unfinished (blocked included), so such a
71
- // list is reconciled or appended to, never re-initialized.
72
- if (unfinishedTodoItems(session).length) {
73
- return [
74
- '<system-reminder>',
75
- 'The todo list still has blocked items. If this brief adds asks, append them; first done, drop or unblock each blocked item that this brief settles. Do not init over them. Do not mention this reminder.',
76
- '</system-reminder>',
77
- ].join('\n');
78
- }
79
64
  return [
80
65
  '<system-reminder>',
81
66
  'If this brief has three or more steps or several asks, init the todo list with every ask as its own item in the same response as your first tool call; each item the brief lists is its own todo item, never folded into one. A single step or a plain answer needs none. Do not mention this reminder.',
@@ -159,7 +144,7 @@ function openItemsReminder(open, count) {
159
144
  '<system-reminder>',
160
145
  `You ended the turn with ${open.length} open todo item(s):`,
161
146
  ...open.map((task) => `- ${task.content}`),
162
- 'Continue them, or close each with the todo tool (done, drop, or block with its reason).',
147
+ 'Continue them, or close each with the todo tool (done or drop).',
163
148
  `(Reminder ${count}/${MAX_TODO_REMINDERS})`,
164
149
  '</system-reminder>',
165
150
  ].join('\n');
@@ -69,12 +69,16 @@ export function usageDeltaEvent({
69
69
  // callers that ignore these fields keep working.
70
70
  deltaCachedRead: usage.cachedTokens || 0,
71
71
  deltaCacheWrite: usage.cacheWriteTokens || 0,
72
- contextInputTokens: usage.inputTokens ?? 0,
72
+ // A provider whose billed input repeats context (Gemini long decode)
73
+ // reports the input the context really holds; the billed figures above
74
+ // stay untouched.
75
+ contextInputTokens: usage.contextInputTokens ?? usage.inputTokens ?? 0,
73
76
  contextOutputTokens: usage.outputTokens ?? 0,
74
- contextPromptTokens: usage.promptTokens ?? 0,
75
- contextCachedReadTokens: usage.cachedTokens ?? 0,
77
+ contextPromptTokens: usage.contextInputTokens ?? usage.promptTokens ?? 0,
78
+ contextCachedReadTokens: usage.contextCachedTokens ?? usage.cachedTokens ?? 0,
76
79
  contextCacheWriteTokens: usage.cacheWriteTokens ?? 0,
77
80
  contextMeasuredTokens: measuredContextTokens(usage),
81
+ ...(usage.contextInputTokens != null ? { contextOutputInWindow: true } : {}),
78
82
  sendTools,
79
83
  ts: Date.now(),
80
84
  };
@@ -25,6 +25,7 @@ import { holdTurnUntilDurable } from './turn-durability.mjs';
25
25
  import { recordProviderContextBaseline } from '../loop/compact-policy.mjs';
26
26
  import { throwIfAborted } from '../../../../shared/abort-race.mjs';
27
27
  import { appendAssistantTurnMessage, persistProviderState, recordAskUsage } from './ask-turn-commit.mjs';
28
+ import { CLOSE_PROVENANCE_VERSION } from '../../../../shared/agent-reap-state.mjs';
28
29
 
29
30
  export function attachAssistantTranscriptCompletion(messages, completion, turnStartedAt = 0) {
30
31
  if (!Array.isArray(messages) || !completion || typeof completion !== 'object') return false;
@@ -127,8 +128,14 @@ export async function commitAskTurn({ sessionId, opened, prepared, result, rawTr
127
128
  if (runtime.prepareCloseSnapshot === prepareCloseSnapshot) {
128
129
  runtime.prepareCloseSnapshot = null;
129
130
  }
130
- session.updatedAt = Date.now();
131
- session.lastUsedAt = Date.now();
131
+ const completedAt = Date.now();
132
+ session.updatedAt = completedAt;
133
+ session.lastUsedAt = completedAt;
134
+ // Owner closes from here on are recorded on this record, and only a
135
+ // completed turn (never a rewind or other bookkeeping that moves
136
+ // lastUsedAt) lifts an earlier one (agent-reap-state.mjs).
137
+ session.closeProvenance = CLOSE_PROVENANCE_VERSION;
138
+ session.lastTurnCompletedAt = completedAt;
132
139
  applyAskTerminalUsageTotals(session, result, {
133
140
  skipTotalsIfIncremental: runtime?.usageMetricsTurnIncremental === true,
134
141
  });
@@ -222,6 +222,7 @@ export function markSessionAskStart(id) {
222
222
  entry.lastProgressAt = now;
223
223
  entry.updatedAt = now;
224
224
  entry.taskWaits = 0;
225
+ entry.taskWaitJobIds = [];
225
226
  emitSessionTurnStart(id);
226
227
  emitSessionActivityChange(id);
227
228
  }
@@ -400,15 +401,20 @@ export function beginSessionApprovalWait(id) {
400
401
  // `awaitingTask` so status surfaces show the session waiting, not working.
401
402
  // Counted like approval waits; never creates an entry. Returns the idempotent
402
403
  // release.
403
- export function beginSessionTaskWait(id) {
404
+ // `taskId` names the job being waited on, so status can report that job's
405
+ // output silence as the tool-level silence the activity heartbeat hides.
406
+ export function beginSessionTaskWait(id, taskId = null) {
404
407
  const entry = id ? _runtimeState.get(id) : null;
405
408
  if (!entry) return () => {};
406
409
  entry.taskWaits = (entry.taskWaits || 0) + 1;
410
+ if (taskId) (entry.taskWaitJobIds ||= []).push(taskId);
407
411
  if (entry.taskWaits === 1) emitSessionActivityChange(id);
408
412
  let released = false;
409
413
  return () => {
410
414
  if (released) return;
411
415
  released = true;
416
+ const at = taskId && entry.taskWaitJobIds ? entry.taskWaitJobIds.indexOf(taskId) : -1;
417
+ if (at >= 0) entry.taskWaitJobIds.splice(at, 1);
412
418
  entry.taskWaits = Math.max(0, (entry.taskWaits || 0) - 1);
413
419
  if (entry.taskWaits === 0) emitSessionActivityChange(id);
414
420
  };
@@ -428,6 +434,7 @@ function _settleTerminalEntry(entry, stage, lastError) {
428
434
  entry.lastProgressAt = settledAt;
429
435
  entry.updatedAt = settledAt;
430
436
  entry.taskWaits = 0;
437
+ entry.taskWaitJobIds = [];
431
438
  emitSessionActivityChange(entry.session?.id || '');
432
439
  }
433
440
  export function markSessionDone(id, { empty = false } = {}) {
@@ -33,6 +33,8 @@ import { noteShellOwnerSessionClosed } from '../../tools/builtin/lib/shell-job-r
33
33
  import { forgetSideQuestion } from '../side-question-store.mjs';
34
34
  import { cancelBackgroundTasks } from '../../../../shared/background-tasks.mjs';
35
35
  import { releaseWorkerSnapshots } from '../../../../shared/worktrees/worker-snapshots.mjs';
36
+ import { accountScopedSessionIdsOf } from '../../../../shared/provider-accounts.mjs';
37
+ import { registerSessionPurgeHook } from '../store/session-observers.mjs';
36
38
 
37
39
  /**
38
40
  * Close a session. Plants a `closed=true` tombstone on disk with a bumped
@@ -56,7 +58,7 @@ export function closeSession(id, reason = 'manual', opts = {}) {
56
58
  const outcome = { absent: false };
57
59
  const newGen = tombstone
58
60
  ? markSessionClosed(id, reason, { outcome })
59
- : bumpSessionGeneration(id, reason, { outcome });
61
+ : bumpSessionGeneration(id, reason, { outcome, ownerClose: opts.ownerClose === true });
60
62
  return finishClose({ id, reason, tombstone, entry, closeSnapshot, newGen, outcome });
61
63
  }
62
64
 
@@ -79,7 +81,7 @@ export async function closeSessionAsync(id, reason = 'manual', opts = {}) {
79
81
  const outcome = { absent: false };
80
82
  const newGen = tombstone
81
83
  ? markSessionClosedAttempt(id, reason, { outcome }, attempt)
82
- : bumpSessionGenerationAttempt(id, reason, { outcome }, attempt);
84
+ : bumpSessionGenerationAttempt(id, reason, { outcome, ownerClose: opts.ownerClose === true }, attempt);
83
85
  if (!isLifecycleRetry(newGen)) {
84
86
  return finishClose({ id, reason, tombstone, entry, closeSnapshot, newGen, outcome });
85
87
  }
@@ -283,14 +285,25 @@ function teardownSessionRuntime({ id, entry, reason, tombstone, newGen }) {
283
285
  });
284
286
  }
285
287
 
286
- function closeProviderConnections(id, cause) {
287
- try {
288
- globalThis.__mixdogCloseProviderConnectionsForSession?.(id, cause);
289
- } catch {
290
- /* ignore */
288
+ // The session's own connections and those an account pool keyed by its
289
+ // account-scoped ids. A close, delete or reap ends the session: every
290
+ // connection goes and the record is dropped. A turn abort ends one turn: only
291
+ // a connection mid-response goes; idle ones keep their response chain.
292
+ function closeProviderConnections(id, cause, { inFlightOnly = false } = {}) {
293
+ const options = inFlightOnly ? { inFlightOnly } : undefined;
294
+ for (const key of [id, ...accountScopedSessionIdsOf(id, { forget: !inFlightOnly })]) {
295
+ try {
296
+ globalThis.__mixdogCloseProviderConnectionsForSession?.(key, cause, options);
297
+ } catch {
298
+ /* ignore */
299
+ }
291
300
  }
292
301
  }
293
302
 
303
+ // Reap: a stored session deleted without a runtime close (sub-agent retention,
304
+ // tombstone sweep) takes its connections and record along.
305
+ registerSessionPurgeHook((id) => closeProviderConnections(id, 'session-deleted'));
306
+
294
307
  // Session-scoped read caches: pure caches a resumed turn rebuilds from the
295
308
  // transcript/disk. The save delta baselines (parent and save-worker thread)
296
309
  // are one of them: a resumed session's next save simply goes out full; the
@@ -333,17 +346,18 @@ export function abortSessionTurn(id, reason = 'turn-abort') {
333
346
  } catch {
334
347
  /* ignore */
335
348
  }
336
- closeProviderConnections(id, `turn-abort:${reason}`);
349
+ closeProviderConnections(id, `turn-abort:${reason}`, { inFlightOnly: true });
337
350
  return true;
338
351
  }
339
352
 
340
353
  /**
341
354
  * Runtime-only unload for a session whose work is DONE.
342
355
  *
343
- * Releases the heavy process-local runtime a finished agent still pins —
344
- * pooled provider connections, the read-dedup cache, and the liveness/metric
345
- * runtime entry — WITHOUT
346
- * touching lifecycle state. Deliberately NOT a close:
356
+ * Releases the heavy process-local runtime a finished agent still pins — the
357
+ * read-dedup cache and the liveness/metric runtime entry — WITHOUT
358
+ * touching lifecycle state. Pooled provider connections stay: a follow-up
359
+ * continues its response chain on them, and their idle and liveness eviction
360
+ * still apply; close, delete and reap release them. Deliberately NOT a close:
347
361
  * - no markSessionClosed() tombstone and no bumpSessionGeneration(): the
348
362
  * session file stays open and resumable, so a same-tag follow-up
349
363
  * (`agent type=send`) resumes the SAME session with its full transcript
@@ -377,7 +391,6 @@ export function unloadSessionRuntime(id, reason = 'runtime-unload') {
377
391
  }
378
392
  _stopToolActivityHeartbeat(id);
379
393
  forgetSideQuestion(id, { cancel: true });
380
- closeProviderConnections(id, `runtime-unload:${reason}`);
381
394
  releaseSessionReadCaches(id);
382
395
  _clearSessionRuntime(id);
383
396
  // A settled worker turn's read-only snapshots go with it (only ones it made).
@@ -64,9 +64,8 @@ export { prefetchSession, prepareSessionProjection } from './prepared-resume-cac
64
64
  function buildSessionProviderCacheOpts(providerName, sessionId, agent = null, config = null, session = null) {
65
65
  // Keep this in sync with createSession's provider-cache policy: only
66
66
  // explicit-breakpoint providers get BP cache opts here; key-prefix
67
- // providers use promptCacheKey and request-time strategy instead (plus the
68
- // OpenAI API's Lead-class 12h prefix TTL and a one-shot role's shared
69
- // prompt-cache scope).
67
+ // providers use promptCacheKey and request-time strategy instead (plus a
68
+ // one-shot role's shared prompt-cache scope).
70
69
  if (cacheCapabilityForProvider(providerName) !== 'explicit-breakpoint') {
71
70
  return roleProviderCacheOpts(providerName, agent, { session });
72
71
  }
@@ -259,8 +258,8 @@ export function createSession(createOpts) {
259
258
  // today, so that branch never fires); build it directly here so every
260
259
  // session still gets a cache strategy. Lead-class sessions (the Lead, raw
261
260
  // callers, bot home threads and other agent-mode Leads) get their BP4
262
- // message tail TTL linked to the user's autoClear idle-sweep config and,
263
- // on the OpenAI API, the 12h stable-prefix TTL; sub-agents and hidden roles
261
+ // message tail TTL linked to the user's autoClear idle-sweep config;
262
+ // sub-agents and hidden roles
264
263
  // keep the agent defaults (see cache-strategy.mjs docs).
265
264
  const providerCacheOpts =
266
265
  resolved.providerCacheOpts || buildSessionProviderCacheOpts(providerName, id, opts.agent, null, { ...opts, id });
@@ -399,7 +399,8 @@ export function applyAskTerminalUsageTotals(session, result, options = {}) {
399
399
  });
400
400
  }
401
401
  const lastTurn = result.lastTurnUsage || result.usage || {};
402
- const measuredInput = Number(lastTurn.inputTokens) || 0;
402
+ const contextInput = lastTurn.contextInputTokens ?? lastTurn.inputTokens;
403
+ const measuredInput = Number(contextInput) || 0;
403
404
  const measuredCache = providerInputExcludesCache(session.provider)
404
405
  ? (Number(lastTurn.cachedTokens) || 0) + (Number(lastTurn.cacheWriteTokens) || 0)
405
406
  : 0;
@@ -414,10 +415,11 @@ export function applyAskTerminalUsageTotals(session, result, options = {}) {
414
415
  return;
415
416
  }
416
417
  setLastContextTokens(session, {
417
- input: lastTurn.inputTokens ?? 0,
418
+ input: contextInput ?? 0,
418
419
  output: lastTurn.outputTokens ?? 0,
419
- cachedRead: lastTurn.cachedTokens ?? 0,
420
+ cachedRead: lastTurn.contextCachedTokens ?? lastTurn.cachedTokens ?? 0,
420
421
  cacheWrite: lastTurn.cacheWriteTokens ?? 0,
422
+ outputInWindow: lastTurn.contextInputTokens != null,
421
423
  });
422
424
  }
423
425
 
@@ -440,13 +442,18 @@ function clearLastContextTokens(session, ts) {
440
442
  // cache (cache_read is a separate field), so the cached portion must be
441
443
  // added back to reflect real context size; openai/grok/gemini already fold
442
444
  // cached tokens INTO the input count, so input alone is the footprint.
443
- function setLastContextTokens(session, { input, output, cachedRead, cacheWrite, ts }) {
445
+ // `outputInWindow`: the input is the context's prompt part and the generated
446
+ // output is in the window too (a billed input that repeats hop input, Gemini
447
+ // long decode), so the footprint adds it as the compaction pressure does.
448
+ function setLastContextTokens(session, { input, output, cachedRead, cacheWrite, outputInWindow = false, ts }) {
444
449
  session.lastInputTokens = input;
445
450
  session.lastOutputTokens = output;
446
451
  session.lastCachedReadTokens = cachedRead;
447
452
  session.lastCacheWriteTokens = cacheWrite;
448
453
  session.lastUncachedInputTokens = uncachedInputTokensForProvider(session.provider, input, cachedRead, cacheWrite);
449
- session.lastContextTokens = providerInputExcludesCache(session.provider) ? input + cachedRead + cacheWrite : input;
454
+ session.lastContextTokens =
455
+ (providerInputExcludesCache(session.provider) ? input + cachedRead + cacheWrite : input) +
456
+ (outputInWindow ? output : 0);
450
457
  session.lastContextTokensUpdatedAt = ts || Date.now();
451
458
  session.lastContextTokensStaleAfterCompact = false;
452
459
  }
@@ -485,6 +492,7 @@ function recordLastContextTokens(session, context) {
485
492
  contextCachedReadTokens,
486
493
  contextCacheWriteTokens,
487
494
  contextMeasuredTokens,
495
+ contextOutputInWindow,
488
496
  ts,
489
497
  } = context;
490
498
  const inputExcludesCache = providerInputExcludesCache(session.provider);
@@ -504,6 +512,7 @@ function recordLastContextTokens(session, context) {
504
512
  output: contextOutputTokens || 0,
505
513
  cachedRead: contextCachedReadTokens || 0,
506
514
  cacheWrite: contextCacheWriteTokens || 0,
515
+ outputInWindow: contextOutputInWindow === true,
507
516
  ts,
508
517
  });
509
518
  }
@@ -522,6 +531,7 @@ function iterationContext(delta) {
522
531
  contextCachedReadTokens = delta.deltaCachedRead,
523
532
  contextCacheWriteTokens = delta.deltaCacheWrite,
524
533
  contextMeasuredTokens = null,
534
+ contextOutputInWindow = false,
525
535
  ts,
526
536
  } = delta;
527
537
  return {
@@ -530,6 +540,7 @@ function iterationContext(delta) {
530
540
  contextCachedReadTokens,
531
541
  contextCacheWriteTokens,
532
542
  contextMeasuredTokens,
543
+ contextOutputInWindow,
533
544
  ts,
534
545
  };
535
546
  }
@@ -289,6 +289,8 @@ function _markSessionClosed(id, reason, options, attempt) {
289
289
  * late write's own _shouldDrop() check (generation-as-ownership-counter
290
290
  * rule, see store/write-admission.mjs) sees disk generation > expected and drops itself instead
291
291
  * of clobbering whatever the resumed session writes next.
292
+ * `options.ownerClose` (the agent tool's owner close) also stamps
293
+ * `ownerClosedAt` on the record.
292
294
  * Returns the new generation, or null if the session file doesn't exist.
293
295
  */
294
296
  export function bumpSessionGeneration(id, reason = 'detach', options = {}) {
@@ -322,7 +324,16 @@ function _bumpSessionGeneration(id, reason, options, attempt) {
322
324
  const existing = loadSession(id);
323
325
  if (!existing) return _recordAbsent(options);
324
326
  const newGen = (typeof existing.generation === 'number' ? existing.generation : 0) + 1;
325
- const detached = { ...existing, generation: newGen, updatedAt: Date.now(), detachedReason: reason };
327
+ const now = Date.now();
328
+ const detached = {
329
+ ...existing,
330
+ generation: newGen,
331
+ updatedAt: now,
332
+ detachedReason: reason,
333
+ // The agent's owner closed it: the record keeps that for its lifetime
334
+ // (agent-reap-state.mjs ownerClosedSinceLastTurn).
335
+ ...(options.ownerClose === true ? { ownerClosedAt: now } : {}),
336
+ };
326
337
  const wrote = _writeLifecycleRecord(id, detached, existing, reason, attempt);
327
338
  if (wrote !== true) return wrote || null;
328
339
  _savePending.delete(id);
@@ -371,6 +382,16 @@ async function _runBarrierAttempts(run) {
371
382
  }
372
383
  }
373
384
 
385
+ /** Stamp the agent owner's close (`ownerClosedAt`) on a session record that
386
+ * stays open: bumpSessionGeneration with `ownerClose`, never blocking the
387
+ * event loop on a rename retry. For a close whose runtime close wrote no such
388
+ * stamp (already terminal, or closed earlier for another reason). */
389
+ export function markSessionOwnerClosedAsync(id, reason = 'cli-agent-close', options = {}) {
390
+ return _runBarrierAttempts((attempt) =>
391
+ _bumpSessionGeneration(id, reason, { ...options, ownerClose: true }, attempt)
392
+ );
393
+ }
394
+
374
395
  /** markSessionClosed without ever blocking the event loop on a rename retry. */
375
396
  export function markSessionClosedAsync(id, reason = 'manual', options = {}) {
376
397
  return _runBarrierAttempts((attempt) => _markSessionClosed(id, reason, options, attempt));