@octopi-agent/engine 0.70.7 → 0.86.38

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 (362) hide show
  1. package/LICENSE +201 -201
  2. package/NOTICE +7 -7
  3. package/README.md +64 -26
  4. package/dist/config-schema/agent.d.ts +89 -1
  5. package/dist/config-schema/agent.js +69 -0
  6. package/dist/config-schema/context.d.ts +23 -4
  7. package/dist/config-schema/context.js +28 -1
  8. package/dist/config-schema/engine.d.ts +201 -9
  9. package/dist/config-schema/engine.js +31 -2
  10. package/dist/config-schema/governance.d.ts +95 -0
  11. package/dist/config-schema/governance.js +91 -0
  12. package/dist/config-schema/models.d.ts +1 -1
  13. package/dist/config-schema/observability.d.ts +6 -0
  14. package/dist/config-schema/observability.js +16 -0
  15. package/dist/config-schema/run.d.ts +10 -0
  16. package/dist/config-schema/run.js +18 -0
  17. package/dist/config-schema/shared.d.ts +10 -0
  18. package/dist/config-schema/shared.js +10 -0
  19. package/dist/config-schema/substrate.d.ts +1 -1
  20. package/dist/config-schema/subsystems.d.ts +1 -1
  21. package/dist/config-schema/subsystems.js +2 -1
  22. package/dist/config.d.ts +178 -7
  23. package/dist/config.js +113 -3
  24. package/dist/harness/activation/compiler.js +3 -0
  25. package/dist/harness/activation/runtime.d.ts +7 -0
  26. package/dist/harness/activation/runtime.js +60 -2
  27. package/dist/harness/activation/sources/agent-signal.d.ts +11 -0
  28. package/dist/harness/activation/sources/agent-signal.js +33 -0
  29. package/dist/harness/activation/types.d.ts +6 -1
  30. package/dist/harness/agent/builder.d.ts +47 -3
  31. package/dist/harness/agent/builder.js +180 -54
  32. package/dist/harness/agent/config-bridge.d.ts +33 -25
  33. package/dist/harness/agent/config-bridge.js +81 -291
  34. package/dist/harness/agent/index.d.ts +3 -1
  35. package/dist/harness/agent/index.js +2 -1
  36. package/dist/harness/agent/tool-purpose.d.ts +38 -0
  37. package/dist/harness/agent/tool-purpose.js +118 -0
  38. package/dist/harness/agent/wire-agent-builder.d.ts +133 -0
  39. package/dist/harness/agent/wire-agent-builder.js +363 -0
  40. package/dist/harness/collaboration/autonomous-subsystem/runtime.d.ts +4 -1
  41. package/dist/harness/collaboration/autonomous-subsystem/runtime.js +14 -8
  42. package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.d.ts +12 -0
  43. package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.js +19 -0
  44. package/dist/harness/collaboration/autonomous-subsystem/sense/session-lifecycle-bridge.d.ts +6 -0
  45. package/dist/harness/collaboration/autonomous-subsystem/sense/session-lifecycle-bridge.js +24 -7
  46. package/dist/harness/collaboration/autonomous-subsystem/think/executor.d.ts +5 -2
  47. package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +11 -3
  48. package/dist/harness/collaboration/autonomous-subsystem/think/index.d.ts +1 -1
  49. package/dist/harness/collaboration/autonomous-subsystem/think/index.js +1 -1
  50. package/dist/harness/collaboration/autonomous-subsystem/think/llm-port.d.ts +7 -4
  51. package/dist/harness/collaboration/autonomous-subsystem/think/llm-port.js +8 -9
  52. package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.d.ts +36 -10
  53. package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.js +60 -7
  54. package/dist/harness/collaboration/delegation/child-run.d.ts +144 -0
  55. package/dist/harness/collaboration/delegation/child-run.js +241 -0
  56. package/dist/harness/collaboration/delegation/index.d.ts +26 -0
  57. package/dist/harness/collaboration/delegation/index.js +25 -0
  58. package/dist/harness/collaboration/delegation/notifier.d.ts +46 -0
  59. package/dist/harness/collaboration/delegation/notifier.js +84 -0
  60. package/dist/harness/collaboration/delegation/registry-types.d.ts +200 -0
  61. package/dist/harness/collaboration/delegation/registry-types.js +61 -0
  62. package/dist/harness/collaboration/delegation/registry.d.ts +110 -0
  63. package/dist/harness/collaboration/delegation/registry.js +220 -0
  64. package/dist/harness/collaboration/delegation/service.d.ts +249 -0
  65. package/dist/harness/collaboration/delegation/service.js +499 -0
  66. package/dist/harness/collaboration/delegation/store.d.ts +155 -0
  67. package/dist/harness/collaboration/delegation/store.js +271 -0
  68. package/dist/harness/collaboration/delegation/transport.d.ts +73 -0
  69. package/dist/harness/collaboration/delegation/transport.js +61 -0
  70. package/dist/harness/collaboration/delegation/types.d.ts +231 -0
  71. package/dist/harness/collaboration/delegation/types.js +70 -0
  72. package/dist/harness/collaboration/delegation/wiring.d.ts +111 -0
  73. package/dist/harness/collaboration/delegation/wiring.js +145 -0
  74. package/dist/harness/collaboration/orchestration/index.d.ts +11 -13
  75. package/dist/harness/collaboration/orchestration/index.js +11 -11
  76. package/dist/harness/context/assembler.d.ts +2 -2
  77. package/dist/harness/context/assembler.js +12 -7
  78. package/dist/harness/context/capabilities/compact/engine.js +80 -38
  79. package/dist/harness/context/capabilities/compact/types.d.ts +12 -1
  80. package/dist/harness/context/capabilities/summary/registry.js +10 -0
  81. package/dist/harness/context/constitution/default-agents.md +230 -228
  82. package/dist/harness/context/default-context-engine.d.ts +101 -23
  83. package/dist/harness/context/default-context-engine.js +483 -172
  84. package/dist/harness/context/hybrid-compressor.d.ts +3 -3
  85. package/dist/harness/context/hybrid-compressor.js +18 -23
  86. package/dist/harness/context/index.d.ts +5 -1
  87. package/dist/harness/context/index.js +2 -0
  88. package/dist/harness/context/layer-snapshot.d.ts +4 -0
  89. package/dist/harness/context/layer-snapshot.js +30 -18
  90. package/dist/harness/context/layer-types.d.ts +49 -1
  91. package/dist/harness/context/layer-types.js +72 -4
  92. package/dist/harness/context/layers.d.ts +5 -2
  93. package/dist/harness/context/layers.js +11 -5
  94. package/dist/harness/context/llm-summarizer.d.ts +15 -1
  95. package/dist/harness/context/llm-summarizer.js +107 -56
  96. package/dist/harness/context/message-selector.js +6 -2
  97. package/dist/harness/context/root-instructions.d.ts +72 -0
  98. package/dist/harness/context/root-instructions.js +227 -0
  99. package/dist/harness/context/runtime-datetime.d.ts +34 -7
  100. package/dist/harness/context/runtime-datetime.js +66 -10
  101. package/dist/harness/context/smart-router.d.ts +1 -1
  102. package/dist/harness/context/smart-router.js +1 -1
  103. package/dist/harness/context/system-prompt-assembler.d.ts +30 -0
  104. package/dist/harness/context/system-prompt-assembler.js +67 -6
  105. package/dist/harness/context/token-constants.d.ts +2 -2
  106. package/dist/harness/context/token-constants.js +2 -2
  107. package/dist/harness/context/token-estimate-fns.d.ts +1 -3
  108. package/dist/harness/context/token-estimate-fns.js +2 -4
  109. package/dist/harness/context/token-estimator.d.ts +1 -1
  110. package/dist/harness/context/token-estimator.js +14 -6
  111. package/dist/harness/context/tool-result-aging.d.ts +140 -0
  112. package/dist/harness/context/tool-result-aging.js +331 -0
  113. package/dist/harness/context/tool-result-body.d.ts +10 -0
  114. package/dist/harness/context/tool-result-body.js +27 -0
  115. package/dist/harness/context/turn-envelope.d.ts +123 -0
  116. package/dist/harness/context/turn-envelope.js +188 -0
  117. package/dist/harness/context/types.d.ts +35 -47
  118. package/dist/harness/extension/execution-environment/effect-policy.d.ts +248 -0
  119. package/dist/harness/extension/execution-environment/effect-policy.js +334 -0
  120. package/dist/harness/extension/execution-environment/index.d.ts +18 -2
  121. package/dist/harness/extension/execution-environment/index.js +11 -2
  122. package/dist/harness/extension/execution-environment/memory-undo.d.ts +101 -0
  123. package/dist/harness/extension/execution-environment/memory-undo.js +192 -0
  124. package/dist/harness/extension/execution-environment/process-isolation.d.ts +84 -0
  125. package/dist/harness/extension/execution-environment/process-isolation.js +315 -0
  126. package/dist/harness/extension/execution-environment/resource-limits.d.ts +36 -0
  127. package/dist/harness/extension/execution-environment/resource-limits.js +84 -0
  128. package/dist/harness/extension/execution-environment/sandbox.d.ts +125 -4
  129. package/dist/harness/extension/execution-environment/sandbox.js +493 -51
  130. package/dist/harness/extension/execution-environment/shell-journal.d.ts +100 -0
  131. package/dist/harness/extension/execution-environment/shell-journal.js +299 -0
  132. package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +45 -0
  133. package/dist/harness/extension/execution-environment/tool-capabilities.js +126 -0
  134. package/dist/harness/extension/execution-environment/types.d.ts +67 -39
  135. package/dist/harness/extension/execution-environment/types.js +2 -2
  136. package/dist/harness/extension/execution-environment/undo-log.d.ts +203 -0
  137. package/dist/harness/extension/execution-environment/undo-log.js +627 -0
  138. package/dist/harness/extension/execution-environment/undo-merge.d.ts +40 -0
  139. package/dist/harness/extension/execution-environment/undo-merge.js +167 -0
  140. package/dist/harness/extension/plugin-ecosystem/client-tools/index.d.ts +1 -1
  141. package/dist/harness/extension/plugin-ecosystem/client-tools/types.d.ts +9 -0
  142. package/dist/harness/extension/plugin-ecosystem/mcp/bridge.js +2 -0
  143. package/dist/harness/extension/plugin-ecosystem/plugins/api.d.ts +1 -6
  144. package/dist/harness/extension/plugin-ecosystem/plugins/api.js +3 -8
  145. package/dist/harness/extension/plugin-ecosystem/plugins/capability.d.ts +0 -3
  146. package/dist/harness/extension/plugin-ecosystem/plugins/capability.js +0 -3
  147. package/dist/harness/extension/plugin-ecosystem/plugins/entry.d.ts +2 -10
  148. package/dist/harness/extension/plugin-ecosystem/plugins/entry.js +2 -9
  149. package/dist/harness/extension/plugin-ecosystem/plugins/index.d.ts +1 -3
  150. package/dist/harness/extension/plugin-ecosystem/plugins/index.js +1 -3
  151. package/dist/harness/extension/plugin-ecosystem/plugins/loader.d.ts +2 -4
  152. package/dist/harness/extension/plugin-ecosystem/plugins/loader.js +4 -21
  153. package/dist/harness/extension/plugin-ecosystem/plugins/manager.d.ts +3 -9
  154. package/dist/harness/extension/plugin-ecosystem/plugins/manager.js +4 -8
  155. package/dist/harness/extension/plugin-ecosystem/plugins/manifest.d.ts +1 -4
  156. package/dist/harness/extension/plugin-ecosystem/plugins/manifest.js +1 -3
  157. package/dist/harness/extension/plugin-ecosystem/skills/manager.d.ts +1 -1
  158. package/dist/harness/extension/plugin-ecosystem/skills/manager.js +1 -1
  159. package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.d.ts +45 -0
  160. package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +136 -0
  161. package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +1 -0
  162. package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +18 -3
  163. package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +277 -81
  164. package/dist/harness/extension/plugin-ecosystem/tools/delegation.d.ts +31 -0
  165. package/dist/harness/extension/plugin-ecosystem/tools/delegation.js +291 -0
  166. package/dist/harness/extension/plugin-ecosystem/tools/document-tools.js +10 -2
  167. package/dist/harness/extension/plugin-ecosystem/tools/env-info.js +1 -0
  168. package/dist/harness/extension/plugin-ecosystem/tools/eol.d.ts +35 -0
  169. package/dist/harness/extension/plugin-ecosystem/tools/eol.js +43 -0
  170. package/dist/harness/extension/plugin-ecosystem/tools/file-edit.js +40 -9
  171. package/dist/harness/extension/plugin-ecosystem/tools/file-ops.d.ts +33 -0
  172. package/dist/harness/extension/plugin-ecosystem/tools/file-ops.js +376 -0
  173. package/dist/harness/extension/plugin-ecosystem/tools/file-search.d.ts +12 -2
  174. package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +239 -61
  175. package/dist/harness/extension/plugin-ecosystem/tools/git-tools.d.ts +27 -0
  176. package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +554 -0
  177. package/dist/harness/extension/plugin-ecosystem/tools/http.d.ts +10 -6
  178. package/dist/harness/extension/plugin-ecosystem/tools/http.js +41 -47
  179. package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +2 -0
  180. package/dist/harness/extension/plugin-ecosystem/tools/index.js +2 -0
  181. package/dist/harness/extension/plugin-ecosystem/tools/knowledge.js +4 -0
  182. package/dist/harness/extension/plugin-ecosystem/tools/memory.js +25 -1
  183. package/dist/harness/extension/plugin-ecosystem/tools/package-tools.d.ts +13 -0
  184. package/dist/harness/extension/plugin-ecosystem/tools/package-tools.js +391 -0
  185. package/dist/harness/extension/plugin-ecosystem/tools/platform.d.ts +51 -2
  186. package/dist/harness/extension/plugin-ecosystem/tools/platform.js +151 -12
  187. package/dist/harness/extension/plugin-ecosystem/tools/session-history.js +2 -0
  188. package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.d.ts +10 -1
  189. package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.js +35 -19
  190. package/dist/harness/extension/plugin-ecosystem/tools/tool-set.d.ts +8 -0
  191. package/dist/harness/extension/plugin-ecosystem/tools/tool-set.js +5 -0
  192. package/dist/harness/extension/plugin-ecosystem/tools/web-search.js +1 -0
  193. package/dist/harness/governance/credentials/index.d.ts +1 -1
  194. package/dist/harness/governance/credentials/store.d.ts +16 -4
  195. package/dist/harness/governance/credentials/store.js +33 -6
  196. package/dist/harness/governance/credentials/types.d.ts +11 -0
  197. package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +105 -0
  198. package/dist/harness/governance/human-in-the-loop/decision-cache.js +184 -0
  199. package/dist/harness/governance/human-in-the-loop/index.d.ts +5 -5
  200. package/dist/harness/governance/human-in-the-loop/index.js +3 -3
  201. package/dist/harness/governance/human-in-the-loop/types.d.ts +7 -62
  202. package/dist/harness/governance/human-in-the-loop/types.js +6 -2
  203. package/dist/harness/governance/security/capability-enforcer.d.ts +9 -1
  204. package/dist/harness/governance/security/capability-enforcer.js +31 -8
  205. package/dist/harness/governance/security/degradation.js +5 -7
  206. package/dist/harness/governance/security/risk-evaluator.d.ts +1 -1
  207. package/dist/harness/governance/security/risk-evaluator.js +4 -82
  208. package/dist/harness/governance/security/temp-path.d.ts +41 -0
  209. package/dist/harness/governance/security/temp-path.js +117 -0
  210. package/dist/harness/governance/session-acl/index.d.ts +1 -0
  211. package/dist/harness/governance/session-acl/index.js +1 -0
  212. package/dist/harness/governance/session-acl/rights.d.ts +12 -0
  213. package/dist/harness/governance/session-acl/rights.js +89 -7
  214. package/dist/harness/governance/session-acl/seed-roles.js +9 -1
  215. package/dist/harness/governance/session-acl/service.js +21 -29
  216. package/dist/harness/governance/session-acl/tool-rights.d.ts +81 -0
  217. package/dist/harness/governance/session-acl/tool-rights.js +238 -0
  218. package/dist/harness/governance/session-acl/types.d.ts +22 -0
  219. package/dist/harness/index.d.ts +14 -12
  220. package/dist/harness/index.js +9 -6
  221. package/dist/harness/knowledge/file-index-store.js +11 -11
  222. package/dist/harness/knowledge/grounding.d.ts +2 -1
  223. package/dist/harness/knowledge/grounding.js +6 -3
  224. package/dist/harness/knowledge/index.d.ts +2 -2
  225. package/dist/harness/knowledge/index.js +1 -1
  226. package/dist/harness/knowledge/ingest.js +4 -1
  227. package/dist/harness/knowledge/job-control-state.js +4 -4
  228. package/dist/harness/knowledge/job-control.js +11 -11
  229. package/dist/harness/knowledge/membership-store.js +11 -11
  230. package/dist/harness/knowledge/network-guard.d.ts +61 -4
  231. package/dist/harness/knowledge/network-guard.js +390 -113
  232. package/dist/harness/knowledge/query-service.js +3 -3
  233. package/dist/harness/knowledge/writer-service.d.ts +2 -0
  234. package/dist/harness/knowledge/writer-service.js +14 -13
  235. package/dist/harness/memory/backfill-trigger.d.ts +2 -2
  236. package/dist/harness/memory/backfill-trigger.js +4 -4
  237. package/dist/harness/memory/index.d.ts +1 -0
  238. package/dist/harness/memory/index.js +1 -0
  239. package/dist/harness/memory/sqlite/agent-db.js +2 -0
  240. package/dist/harness/memory/sqlite/memory-store.d.ts +1 -0
  241. package/dist/harness/memory/sqlite/memory-store.js +14 -4
  242. package/dist/harness/memory/sqlite/wisdom-store.js +9 -9
  243. package/dist/harness/memory/store.d.ts +1 -0
  244. package/dist/harness/memory/store.js +3 -0
  245. package/dist/harness/memory/time-format.d.ts +28 -0
  246. package/dist/harness/memory/time-format.js +52 -0
  247. package/dist/harness/memory/types.d.ts +12 -0
  248. package/dist/harness/observability/observer/hub.js +23 -1
  249. package/dist/harness/observability/observer/index.d.ts +2 -2
  250. package/dist/harness/observability/observer/index.js +1 -1
  251. package/dist/harness/observability/observer/types.d.ts +57 -0
  252. package/dist/harness/observability/observer/types.js +118 -9
  253. package/dist/harness/run/agent/agent.d.ts +18 -0
  254. package/dist/harness/run/agent/agent.js +26 -0
  255. package/dist/harness/run/concurrency/tool-loop-detection-core.d.ts +1 -1
  256. package/dist/harness/run/concurrency/tool-loop-detection-core.js +1 -1
  257. package/dist/harness/run/reliability/harness-events.d.ts +4 -0
  258. package/dist/harness/run/reliability/run-agent.js +110 -18
  259. package/dist/harness/run/reliability/run-metrics-collector.d.ts +28 -2
  260. package/dist/harness/run/reliability/run-metrics-collector.js +92 -2
  261. package/dist/harness/run/run-guard/default-run-guard.d.ts +0 -5
  262. package/dist/harness/run/run-guard/default-run-guard.js +104 -44
  263. package/dist/harness/run/run-scope.d.ts +52 -0
  264. package/dist/harness/run/runner.d.ts +101 -16
  265. package/dist/harness/run/runner.js +556 -158
  266. package/dist/harness/session/attachments/llm-intent.js +17 -17
  267. package/dist/harness/session/history/port.js +1 -0
  268. package/dist/harness/session/in-memory-store.d.ts +1 -0
  269. package/dist/harness/session/in-memory-store.js +22 -1
  270. package/dist/harness/session/schedules/index.d.ts +10 -0
  271. package/dist/harness/session/schedules/index.js +10 -0
  272. package/dist/harness/session/schedules/render.d.ts +13 -0
  273. package/dist/harness/session/schedules/render.js +63 -0
  274. package/dist/harness/session/schedules/service.d.ts +179 -0
  275. package/dist/harness/session/schedules/service.js +695 -0
  276. package/dist/harness/session/schedules/store.d.ts +119 -0
  277. package/dist/harness/session/schedules/store.js +323 -0
  278. package/dist/harness/session/schedules/tools.d.ts +39 -0
  279. package/dist/harness/session/schedules/tools.js +442 -0
  280. package/dist/harness/session/schedules/types.d.ts +104 -0
  281. package/dist/harness/session/schedules/types.js +97 -0
  282. package/dist/harness/session/tasks/tools.js +22 -0
  283. package/dist/harness/session/types.d.ts +35 -0
  284. package/dist/harness/shared/events/agent-event-map.d.ts +13 -0
  285. package/dist/harness/shared/types/agent-definition.d.ts +23 -0
  286. package/dist/index.d.ts +23 -9
  287. package/dist/index.js +10 -2
  288. package/dist/integration/providers/anthropic.d.ts +10 -0
  289. package/dist/integration/providers/anthropic.js +44 -1
  290. package/dist/integration/providers/openai.d.ts +10 -0
  291. package/dist/integration/providers/openai.js +58 -2
  292. package/dist/integration/providers/wire-dump-diff.d.ts +191 -0
  293. package/dist/integration/providers/wire-dump-diff.js +351 -0
  294. package/dist/integration/providers/wire-dump.d.ts +178 -0
  295. package/dist/integration/providers/wire-dump.js +396 -0
  296. package/dist/integration/storage/jsonl.d.ts +11 -0
  297. package/dist/integration/storage/jsonl.js +148 -39
  298. package/dist/integration/storage/session-index.js +63 -8
  299. package/dist/subsystems/cognition-steward/conceptualize/SUBSYSTEM.md +43 -43
  300. package/dist/subsystems/cognition-steward/conceptualize/config.yaml +50 -50
  301. package/dist/subsystems/cognition-steward/consolidate/SUBSYSTEM.md +6 -6
  302. package/dist/subsystems/cognition-steward/consolidate/config.yaml +54 -54
  303. package/dist/subsystems/memory-steward/backfill/handler.js +9 -0
  304. package/dist/subsystems/wisdom-steward/evaluate/config.yaml +50 -50
  305. package/dist/subsystems/wisdom-steward/formation/SUBSYSTEM.md +42 -42
  306. package/dist/subsystems/wisdom-steward/formation/config.yaml +54 -54
  307. package/dist/subsystems/wisdom-steward/govern/config.yaml +55 -55
  308. package/package.json +115 -115
  309. package/dist/harness/collaboration/multi-agent/agent-registry-types.d.ts +0 -144
  310. package/dist/harness/collaboration/multi-agent/agent-registry-types.js +0 -25
  311. package/dist/harness/collaboration/multi-agent/index.d.ts +0 -17
  312. package/dist/harness/collaboration/multi-agent/index.js +0 -15
  313. package/dist/harness/collaboration/multi-agent/process.d.ts +0 -167
  314. package/dist/harness/collaboration/multi-agent/process.js +0 -256
  315. package/dist/harness/collaboration/multi-agent/registry.d.ts +0 -36
  316. package/dist/harness/collaboration/multi-agent/registry.js +0 -137
  317. package/dist/harness/collaboration/multi-agent/swarm.d.ts +0 -135
  318. package/dist/harness/collaboration/multi-agent/swarm.js +0 -317
  319. package/dist/harness/collaboration/multi-agent/types.d.ts +0 -66
  320. package/dist/harness/collaboration/multi-agent/types.js +0 -15
  321. package/dist/harness/collaboration/orchestration/async-task-store.d.ts +0 -107
  322. package/dist/harness/collaboration/orchestration/async-task-store.js +0 -12
  323. package/dist/harness/collaboration/orchestration/async-task.d.ts +0 -156
  324. package/dist/harness/collaboration/orchestration/async-task.js +0 -359
  325. package/dist/harness/collaboration/orchestration/planner/hybrid-planner.d.ts +0 -47
  326. package/dist/harness/collaboration/orchestration/planner/hybrid-planner.js +0 -61
  327. package/dist/harness/collaboration/orchestration/planner/index.d.ts +0 -9
  328. package/dist/harness/collaboration/orchestration/planner/index.js +0 -6
  329. package/dist/harness/collaboration/orchestration/planner/llm-planner.d.ts +0 -54
  330. package/dist/harness/collaboration/orchestration/planner/llm-planner.js +0 -167
  331. package/dist/harness/collaboration/orchestration/planner/rule-planner.d.ts +0 -85
  332. package/dist/harness/collaboration/orchestration/planner/rule-planner.js +0 -175
  333. package/dist/harness/collaboration/orchestration/quality/classifier.d.ts +0 -21
  334. package/dist/harness/collaboration/orchestration/quality/classifier.js +0 -235
  335. package/dist/harness/collaboration/orchestration/quality/gate.d.ts +0 -29
  336. package/dist/harness/collaboration/orchestration/quality/gate.js +0 -409
  337. package/dist/harness/collaboration/orchestration/quality/index.d.ts +0 -9
  338. package/dist/harness/collaboration/orchestration/quality/index.js +0 -8
  339. package/dist/harness/collaboration/orchestration/quality/types.d.ts +0 -159
  340. package/dist/harness/collaboration/orchestration/quality/types.js +0 -33
  341. package/dist/harness/collaboration/orchestration/scheduler/index.d.ts +0 -5
  342. package/dist/harness/collaboration/orchestration/scheduler/index.js +0 -4
  343. package/dist/harness/collaboration/orchestration/scheduler/task-scheduler.d.ts +0 -143
  344. package/dist/harness/collaboration/orchestration/scheduler/task-scheduler.js +0 -297
  345. package/dist/harness/collaboration/orchestration/strategy/classifier.d.ts +0 -12
  346. package/dist/harness/collaboration/orchestration/strategy/classifier.js +0 -81
  347. package/dist/harness/collaboration/orchestration/strategy/index.d.ts +0 -3
  348. package/dist/harness/collaboration/orchestration/strategy/index.js +0 -2
  349. package/dist/harness/collaboration/orchestration/strategy/router.d.ts +0 -28
  350. package/dist/harness/collaboration/orchestration/strategy/router.js +0 -105
  351. package/dist/harness/collaboration/orchestration/strategy/types.d.ts +0 -49
  352. package/dist/harness/collaboration/orchestration/strategy/types.js +0 -4
  353. package/dist/harness/collaboration/orchestration/workflow/engine.d.ts +0 -86
  354. package/dist/harness/collaboration/orchestration/workflow/engine.js +0 -298
  355. package/dist/harness/collaboration/orchestration/workflow/index.d.ts +0 -9
  356. package/dist/harness/collaboration/orchestration/workflow/index.js +0 -7
  357. package/dist/harness/collaboration/orchestration/workflow/types.d.ts +0 -143
  358. package/dist/harness/collaboration/orchestration/workflow/types.js +0 -7
  359. package/dist/harness/governance/human-in-the-loop/approval-manager.d.ts +0 -32
  360. package/dist/harness/governance/human-in-the-loop/approval-manager.js +0 -93
  361. /package/dist/harness/collaboration/{multi-agent → delegation}/message-channel-types.d.ts +0 -0
  362. /package/dist/harness/collaboration/{multi-agent → delegation}/message-channel-types.js +0 -0
@@ -2,18 +2,22 @@
2
2
  * SessionAwareRunner — Session 感知的运行器
3
3
  *
4
4
  * Harness 层组件。在 Agent.run()(自带 reliability)之上管理 Session 生命周期:
5
- * - 消息持久化
5
+ * - 消息持久化(Discourse 追加日志;不因 idle/跨日清空)
6
6
  * - Session 锁(同一 session 同时只有一个运行)
7
- * - Daily reset / Idle reset
7
+ * - 上下文租约(`idleExpiryMs` opt-in:只截 LLM 默认窗口)
8
+ * - 中止轮标记(`abortedTurn`,供 UI 编辑重发)
8
9
  * - 并发控制
9
10
  *
10
11
  * Agent 是 Harness 运行时门面;不要再手拼 runAgentWithReliability。
11
12
  */
12
13
  import { getTextContent } from '@octopi-agent/core/types.js';
14
+ import { tightenSessionRights } from '../governance/session-acl/rights.js';
13
15
  import { createSessionStateMachine } from '../session/state-machine.js';
14
16
  import { HeuristicTokenEstimator } from '../context/index.js';
15
- import { extractLayerQuery } from '../context/layer-types.js';
16
- import { withRuntimeEnvironmentInjection } from '../context/runtime-datetime.js';
17
+ import { extractLayerQuery, isEngineCarrierSource } from '../context/layer-types.js';
18
+ import { formatTurnEndContent, formatTurnId, formatTurnStartContent, formatTurnContextXml, isTurnStartContent, joinSlotXml, parseTurnIdFromContent, } from '../context/turn-envelope.js';
19
+ import { splitRuntimeEnvironmentInjection, withRuntimeEnvironmentInjection } from '../context/runtime-datetime.js';
20
+ import { loadRootInstructionsInjection } from '../context/root-instructions.js';
17
21
  import { extractTaskQueryHints, renderSessionTasksInjection } from '../session/tasks/render.js';
18
22
  import { createRunId } from './run-scope.js';
19
23
  import { DEFAULT_TOOL_ISOLATION, resolveToolIsolationCwd, } from '../extension/execution-environment/isolation.js';
@@ -22,10 +26,10 @@ import { join } from 'node:path';
22
26
  import { toSessionFileName } from '@octopi-agent/core/session-filename.js';
23
27
  import { readSessionCompact, writeSessionCompact } from '../session/compact.js';
24
28
  import { InProcessSessionLock, } from './concurrency/session-lease.js';
29
+ import { isToolPermitted } from '../governance/session-acl/tool-rights.js';
30
+ import { resolveToolCapabilities } from '../extension/execution-environment/tool-capabilities.js';
25
31
  const DEFAULT_CONFIG = {
26
- sessionExpiryMs: 24 * 60 * 60 * 1000, // 24 小时
27
- idleExpiryMs: 2 * 60 * 60 * 1000, // 2 小时
28
- enableDailyReset: true,
32
+ // idleExpiryMs 缺省关闭:上下文租约 opt-in,续聊默认带全量窗口
29
33
  };
30
34
  /**
31
35
  * 适配 HarnessLoopEvent → AgentEvent(向后兼容)
@@ -56,7 +60,12 @@ export function adaptLoopEvent(event, meta, state) {
56
60
  };
57
61
  case 'security_blocked':
58
62
  // 跟踪停止原因:security
63
+ //
64
+ // 注意:单次拦截**不是终态**——reject/confirm 路径 `terminate: false`,
65
+ // run 会继续跑完。所以这里只描述拦截事实,不宣称「已停止」;
66
+ // 是否真的停了由 loopEndReason 决定。
59
67
  state.stopReason = 'security_stopped';
68
+ state.stopMessage ??= '安全策略拦截了工具调用。';
60
69
  return {
61
70
  type: 'security.blocked',
62
71
  timestamp: event.timestamp,
@@ -67,6 +76,8 @@ export function adaptLoopEvent(event, meta, state) {
67
76
  case 'agent_start':
68
77
  return { type: 'engine.start', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: {} };
69
78
  case 'agent_end':
79
+ // 记录 loop 终止原因:是否「引擎主动提前停止」的唯一权威来源
80
+ state.loopEndReason = event.reason;
70
81
  // reason='error' 时映射为 engine.error(向后兼容旧引擎行为)
71
82
  if (event.reason === 'error') {
72
83
  return { type: 'engine.error', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: { error: event.error instanceof Error ? event.error.message : String(event.error ?? 'Unknown error') } };
@@ -97,6 +108,8 @@ export function adaptLoopEvent(event, meta, state) {
97
108
  };
98
109
  case 'llm_stream_delta':
99
110
  return { type: 'llm_stream_delta', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: event.data };
111
+ case 'llm_thinking_delta':
112
+ return { type: 'llm_thinking_delta', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: event.data };
100
113
  case 'tool_start':
101
114
  return { type: 'tool.exec.start', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: { toolCallId: event.toolCall.id, toolName: event.toolCall.name, args: event.toolCall.arguments } };
102
115
  case 'tool_end':
@@ -112,13 +125,28 @@ export function adaptLoopEvent(event, meta, state) {
112
125
  hasError: !!event.result.isError,
113
126
  result: event.result.content,
114
127
  durationMs: event.result.durationMs,
128
+ purpose: event.result.purpose,
115
129
  },
116
130
  };
117
131
  case 'stream.fallback_to_sync':
118
132
  case 'stream.fallback_failed':
119
133
  // 必须带 session 元数据:gatewayBus.onAll 以 event.sessionId 为 WS 广播前提
120
134
  return { type: event.type, timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: event.data };
121
- case 'budget_exceeded':
135
+ case 'budget_exceeded': {
136
+ // 预算 hard 终态(wall_clock / iteration / tool_calls)——也是「引擎主动停止」,
137
+ // 必须带来可读原因,否则收口只能落到「引擎判定停止」的空泛兜底。
138
+ //
139
+ // 终态事件用赋值(不用 ??=):同一 turn 里若先有非终态信号(如 security_blocked),
140
+ // 最终文案必须归因到真正的停止闸门。
141
+ const budgetReason = event.data?.reason ?? 'wall_clock';
142
+ state.stopReason = 'policy_stopped';
143
+ state.stopDetail = budgetReason;
144
+ state.stopMessage =
145
+ budgetReason === 'wall_clock'
146
+ ? '本轮运行时间达到预算上限,已停止。'
147
+ : budgetReason === 'iteration'
148
+ ? '本轮迭代次数达到预算上限,已停止。'
149
+ : '本轮工具调用次数达到预算上限,已停止。';
122
150
  // 对齐 EventBus BUDGET_EXCEEDED;用户可见停止原因
123
151
  return {
124
152
  type: 'budget.exceeded',
@@ -127,6 +155,7 @@ export function adaptLoopEvent(event, meta, state) {
127
155
  sessionId: meta.sessionId,
128
156
  data: { ...event.data },
129
157
  };
158
+ }
130
159
  // P2 BudgetControlEvent 新形状
131
160
  case 'budget.wrap_up':
132
161
  return {
@@ -144,8 +173,10 @@ export function adaptLoopEvent(event, meta, state) {
144
173
  },
145
174
  };
146
175
  case 'budget.exceeded':
147
- // 跟踪停止原因:context / policy
176
+ // 跟踪停止原因:context / policy(终态;覆盖此前非终态信号)
148
177
  state.stopReason = event.metric === 'context' ? 'context_stopped' : 'policy_stopped';
178
+ state.stopMessage = event.userMessage;
179
+ state.stopDetail = `${event.metric}${event.unit ? `/${event.unit}` : ''}`;
149
180
  return {
150
181
  type: 'budget.exceeded',
151
182
  timestamp: event.timestamp,
@@ -158,8 +189,10 @@ export function adaptLoopEvent(event, meta, state) {
158
189
  },
159
190
  };
160
191
  case 'run_guard_stopped':
161
- // 跟踪停止原因:behavior
192
+ // 跟踪停止原因:behavior(终态;覆盖此前非终态信号)
162
193
  state.stopReason = 'behavior_stopped';
194
+ state.stopMessage = event.data.userMessage;
195
+ state.stopDetail = event.data.reason;
163
196
  return {
164
197
  type: 'run_guard.stopped',
165
198
  timestamp: event.timestamp,
@@ -197,6 +230,22 @@ export function adaptLoopEvent(event, meta, state) {
197
230
  * SessionAwareRunner
198
231
  */
199
232
  export class SessionAwareRunner {
233
+ /** 本 Runner 生效的 L2 级别(由 effectPolicy 展开) */
234
+ effectPathContainment = "none";
235
+ effectChannel = "engine";
236
+ effectAllowRoots = [];
237
+ /** Effective effectPolicy.mode (for Runtime injection / UI) */
238
+ effectMode = 'workspace';
239
+ effectCommitManual = false;
240
+ effectProcessLimits = true;
241
+ effectNetwork;
242
+ effectRequireJail;
243
+ effectRequireCredentialBindings = false;
244
+ effectHomeWrite;
245
+ effectShellEscape = "allow";
246
+ effectShellJournal = "snapshot";
247
+ effectShellJournalLimit;
248
+ effectUndoLimit;
200
249
  agent;
201
250
  harness;
202
251
  store;
@@ -221,7 +270,7 @@ export class SessionAwareRunner {
221
270
  lastCleanPersonaPrompt;
222
271
  /** 按层契约组装 system prompt(persona + runtime);未设置时退回字符串拼接 */
223
272
  systemPromptAssembler;
224
- /** 会话重置时清理 Assembler 层缓存 */
273
+ /** Assembler 层缓存清理钩子(可选接线;与 contextDetachIndex 无关) */
225
274
  systemPromptAssemblerClear;
226
275
  /** turn 级 Knowledge grounding(可选;arch/knowledge-layer.md §4.4) */
227
276
  groundingAssembler;
@@ -344,6 +393,10 @@ export class SessionAwareRunner {
344
393
  *
345
394
  * 每轮在 persona resolve 与 injectedContext 计算完成后调用,
346
395
  * 替代原先的字符串拼接。未设置时保持旧路径(兼容)。
396
+ *
397
+ * E8 契约:`injectedContext` 保持合并形态(兼容旧 assembler,零能力丢失);
398
+ * 拆分字段 `volatileContext`(易变份→快照)与 `runtimeAnchors`(稳定份→system)同时传入,
399
+ * 默认 assembler 优先用拆分字段;降级/无 assembler 路径同样产出快照(E8 形态不破)。
347
400
  */
348
401
  setSystemPromptAssembler(assembler, clearSession) {
349
402
  this.systemPromptAssembler = assembler;
@@ -365,6 +418,11 @@ export class SessionAwareRunner {
365
418
  * @yields AgentEvent 事件流(向后兼容格式)
366
419
  */
367
420
  async *handle(sessionId, input, runConfig, signal) {
421
+ /** 本轮文件 undo(L3);中止保留,其余出口 commit */
422
+ let turnFileUndo;
423
+ // [timing probe] 长 session 首 run 延迟定位(诊断后移除或转正)
424
+ const timingRunEnter = Date.now();
425
+ console.log(`[timing] stage=run_enter ms=${timingRunEnter} session=${sessionId}`);
368
426
  // 1. 并发门控(如果配置了 SessionGate);排队期间响应 abort
369
427
  const gate = this.config.sessionGate;
370
428
  let gateRelease;
@@ -398,19 +456,34 @@ export class SessionAwareRunner {
398
456
  gateRelease?.();
399
457
  return;
400
458
  }
459
+ // [timing probe] 排队/等锁耗时 = wait
460
+ console.log(`[timing] stage=run_start ms=${Date.now()} session=${sessionId} wait=${Date.now() - timingRunEnter}`);
401
461
  const _agentId = runConfig.agentId ?? 'default';
402
462
  /** Observer 收口状态(finally 统一关闭,含异常路径) */
403
463
  let observerRunId = '';
404
464
  let observerFinalMessages;
405
465
  let observerEndReason;
466
+ /**
467
+ * 桥接状态(assistant 文本 / 停止原因)。
468
+ *
469
+ * 声明在 try 之外:finally 的 run_end 观测要读 stopReason,
470
+ * 否则「run 为什么结束」在日志里不可见。
471
+ */
472
+ const adaptState = { assistantContent: '', lastUserContent: '' };
406
473
  let observerErrorMsg;
407
474
  let hasTurnEnd = false;
475
+ /** 正常完成时需在持久化后真删 metadata.lastStop(save 浅合并删不掉) */
476
+ let clearLastStop = false;
477
+ /** 本 user turn 内第 N 次 LLM 调用(0-based;cache 观测) */
478
+ let llmCallIndexInUserTurn = 0;
408
479
  try {
409
480
  // 3. 加载或创建 session
410
481
  let session = await this.store.load(sessionId);
411
482
  if (!session) {
412
483
  session = this.createSession(sessionId, runConfig.agentId ?? 'default');
413
484
  }
485
+ /** 上下文租约点之前的 Discourse 前缀(写回时并回,不进默认 LLM 窗口) */
486
+ let contextLeasePrefix = [];
414
487
  // 模型 2:历史数据缺省 primary 时回填(单 agent 行为不变)
415
488
  if (!session.primaryAgentId) {
416
489
  session.primaryAgentId = session.agentId || _agentId;
@@ -419,11 +492,15 @@ export class SessionAwareRunner {
419
492
  session.tasks = [];
420
493
  // E6:可选 ACL(注入时才强制);primary 自动 owner;带入 agent 天花板
421
494
  const acl = this.config.sessionAcl;
495
+ let sessionToolRights;
496
+ // D3:本 Run 的 effective rights,供委派传播(只读,不改共享 harness)
497
+ let runSessionRights;
422
498
  if (acl) {
423
499
  const auth = acl.authorizeRun({
424
500
  session,
425
501
  agentId: _agentId,
426
- agentMax: this.config.agentMaxSessionRights,
502
+ // D3:Run 级天花板与模板天花板取交集,只收紧不放宽
503
+ agentMax: tightenSessionRights(this.config.agentMaxSessionRights, runConfig.rightsCeiling),
427
504
  });
428
505
  if (!auth.ok) {
429
506
  yield {
@@ -435,12 +512,33 @@ export class SessionAwareRunner {
435
512
  };
436
513
  return;
437
514
  }
515
+ sessionToolRights = auth.rights?.toolRights;
516
+ runSessionRights = auth.rights;
517
+ }
518
+ // SEC-2: keep rights on this run only (harness is shared across sessions)
519
+ const runToolRights = sessionToolRights;
520
+ const runToolPolicy = this.config.agentToolPolicy;
521
+ // 4. 上下文租约(opt-in;只标截断点,不改 Discourse)
522
+ this.applyContextLease(session);
523
+ // 4a. 新一轮开始:作废上一轮中止标记(避免已完成轮仍显示编辑重发)
524
+ if (session.metadata?.abortedTurn) {
525
+ session.metadata = { ...session.metadata };
526
+ delete session.metadata.abortedTurn;
527
+ // 与 save 浅合并对齐:立即 updateMetadata 真删,防止本轮 save 又合并回来
528
+ if (this.store.updateMetadata) {
529
+ await this.store.updateMetadata(sessionId, (meta) => {
530
+ delete meta.abortedTurn;
531
+ });
532
+ }
438
533
  }
439
- // 4. 检查 session 是否需要重置
440
- this.checkSessionReset(session);
441
534
  // 4b. 绑定会话任务服务(工具与注入共用同一内存对象)
442
535
  this.config.sessionTaskService?.attachSession(session);
443
- // 5. 追加用户消息
536
+ // 4c. turn 信封:补闭上一 turn;分配本 turn id(t1,t2,… 会话内单调)
537
+ this.ensurePreviousTurnClosed(session);
538
+ const turnSeq = Number(session.metadata?.turnSeq ?? 0) + 1;
539
+ const currentTurnId = formatTurnId(turnSeq);
540
+ session.metadata = { ...session.metadata, turnSeq };
541
+ // 5. 追加用户消息(正文稍后一次定形为 <turn_start>)
444
542
  session.messages.push(input);
445
543
  session.meta.lastInteractionAt = Date.now();
446
544
  session.meta.updatedAt = Date.now();
@@ -481,6 +579,23 @@ export class SessionAwareRunner {
481
579
  };
482
580
  }
483
581
  }
582
+ // 6b. 会话日程注入(arch/session-schedules.md §8)
583
+ if (this.config.sessionScheduleService) {
584
+ const schedules = this.config.sessionScheduleService.list(session.id, {
585
+ activeOnly: true,
586
+ });
587
+ const { renderSessionSchedulesInjection } = await import('../session/schedules/render.js');
588
+ const scheduleInjection = renderSessionSchedulesInjection(schedules);
589
+ if (scheduleInjection) {
590
+ const baseInjected = effectiveRunConfig.injectedContext;
591
+ effectiveRunConfig = {
592
+ ...effectiveRunConfig,
593
+ injectedContext: baseInjected
594
+ ? `${baseInjected}\n\n${scheduleInjection}`
595
+ : scheduleInjection,
596
+ };
597
+ }
598
+ }
484
599
  // 7. 应用自主子系统的待处理注入
485
600
  if (this._subsystemRuntime) {
486
601
  if (this._events) {
@@ -507,8 +622,42 @@ export class SessionAwareRunner {
507
622
  };
508
623
  }
509
624
  }
510
- // Runtime 锚点:时间 + 工具工作目录(模型据此优先在 workspace 找文件,而非全盘扫)
511
- // cwd 与下方 I5 toolRuntime.cwd 同源同构,保证 system prompt 与工具解析一致
625
+ // P3:effectPolicy → L2 path containment + session 临时 root
626
+ // 必须在 Runtime 注入之前,system prompt 才能带上 allowRoots / effectMode
627
+ {
628
+ const { resolveEffectiveEffectPolicy, readSessionEffectOverrides, mergeTransactionRoots } = await import('../extension/execution-environment/effect-policy.js');
629
+ const { probeProcessIsolation } = await import('../extension/execution-environment/process-isolation.js');
630
+ const isolation = await probeProcessIsolation();
631
+ const eff = resolveEffectiveEffectPolicy(this.config.effectPolicy ?? {}, this.config.agentWorkspace ?? effectiveRunConfig.cwd ?? undefined, isolation);
632
+ const sessionExtraRoots = readSessionEffectOverrides(session.metadata).transactionRoots;
633
+ this.effectPathContainment = eff.pathContainment;
634
+ this.effectChannel = eff.effects;
635
+ this.effectAllowRoots = mergeTransactionRoots(eff.allowRoots, sessionExtraRoots);
636
+ this.effectMode = eff.mode;
637
+ this.effectCommitManual = eff.commit === 'manual';
638
+ this.effectProcessLimits = eff.processLimits;
639
+ this.effectShellEscape = eff.shellEscape;
640
+ this.effectShellJournal = eff.shellJournal;
641
+ this.effectNetwork = eff.network;
642
+ this.effectRequireJail = eff.requestedMode === 'untrusted' && eff.mode === 'untrusted';
643
+ this.effectRequireCredentialBindings =
644
+ this.config.requireCredentialBindings === true ||
645
+ (eff.requestedMode === 'untrusted' && eff.mode === 'untrusted');
646
+ this.effectHomeWrite = eff.mode === 'project' || eff.mode === 'host';
647
+ this.effectShellJournalLimit = eff.shellJournalLimit;
648
+ this.effectUndoLimit = eff.undoLimit;
649
+ // untrusted admission: reduced surface strips egress/exec tools
650
+ this.harness.toolSurface = eff.toolSurface;
651
+ if (eff.securityDegraded.length > 0) {
652
+ this.harness.securityDegraded = eff.securityDegraded;
653
+ }
654
+ }
655
+ // Runtime 锚点:时间 + 工具工作目录 + 允许根/效应模式
656
+ // cwd 与下方 I5 toolRuntime.cwd 同源同构;allowRoots 含 session 临时 root
657
+ // E8:拆稳定锚点(留 system)与易变注入(进本轮快照)
658
+ let runtimeAnchorsText = '';
659
+ let runtimeVolatileText = '';
660
+ let runtimeSnapshotText = null;
512
661
  {
513
662
  const runtimeIsolationMode = effectiveRunConfig.toolIsolation
514
663
  ?? this.config.toolIsolation
@@ -520,10 +669,24 @@ export class SessionAwareRunner {
520
669
  sessionId,
521
670
  baseCwd: runtimeBaseCwd,
522
671
  }).cwd;
672
+ const rootInstructions = await loadRootInstructionsInjection(this.effectAllowRoots, {
673
+ cwd: runtimeCwd,
674
+ });
675
+ const runtimeSplit = splitRuntimeEnvironmentInjection(effectiveRunConfig.injectedContext, {
676
+ cwd: runtimeCwd,
677
+ allowRoots: this.effectAllowRoots,
678
+ effectMode: this.effectMode,
679
+ rootInstructions,
680
+ });
681
+ runtimeAnchorsText = runtimeSplit.anchors;
682
+ runtimeVolatileText = runtimeSplit.volatile;
523
683
  effectiveRunConfig = {
524
684
  ...effectiveRunConfig,
525
685
  injectedContext: withRuntimeEnvironmentInjection(effectiveRunConfig.injectedContext, {
526
686
  cwd: runtimeCwd,
687
+ allowRoots: this.effectAllowRoots,
688
+ effectMode: this.effectMode,
689
+ rootInstructions,
527
690
  }),
528
691
  };
529
692
  }
@@ -536,7 +699,7 @@ export class SessionAwareRunner {
536
699
  systemPrompt: '',
537
700
  messages: session.messages,
538
701
  // 会话级 tool 面:Client Tool 无 live client 时不进 LLM 列表
539
- tools: this.agent.toolsForSession(sessionId),
702
+ tools: this.filterToolsForSessionRights(this.agent.toolsForSession(sessionId), runToolRights, runToolPolicy),
540
703
  };
541
704
  // 播种压缩状态(E4 键 = sessionId × agentId);供 convertToLlm / 重启重建
542
705
  this.agent.setSessionCompactState(sessionId, _agentId, readSessionCompact(session, _agentId));
@@ -610,11 +773,16 @@ export class SessionAwareRunner {
610
773
  messages: session.messages,
611
774
  persona: basePrompt,
612
775
  injectedContext: effectiveRunConfig.injectedContext,
776
+ volatileContext: runtimeVolatileText,
777
+ runtimeAnchors: runtimeAnchorsText,
613
778
  contextWindow: effectiveRunConfig.contextWindow,
614
779
  topicHints,
615
780
  signal,
616
781
  });
617
782
  runContext.systemPrompt = assembled.systemPrompt;
783
+ runtimeSnapshotText = assembled.runtimeSnapshot?.trim()
784
+ ? assembled.runtimeSnapshot
785
+ : null;
618
786
  if (assembled.manifest) {
619
787
  const assembledAt = Date.now();
620
788
  this.emitObserved({
@@ -637,7 +805,9 @@ export class SessionAwareRunner {
637
805
  // 装配失败:回退拼接,保证本轮可跑
638
806
  const errMsg = err instanceof Error ? err.message : String(err);
639
807
  console.warn(`[octopi] system prompt assemble failed (session=${sessionId}): ${errMsg}; falling back to concat`);
640
- runContext.systemPrompt = this.concatSystemPrompt(basePrompt, effectiveRunConfig.injectedContext, personaFromResolver);
808
+ // F12:降级轮保持 E8 形态——锚点进 system,易变份走**新鲜**快照(防旧快照被 last-only 回放)
809
+ runContext.systemPrompt = this.concatSystemPrompt(basePrompt, runtimeAnchorsText, personaFromResolver);
810
+ runtimeSnapshotText = runtimeVolatileText.trim() ? runtimeVolatileText : null;
641
811
  this.emitObserved({
642
812
  type: 'context.layers.assembled',
643
813
  timestamp: Date.now(),
@@ -661,7 +831,9 @@ export class SessionAwareRunner {
661
831
  }
662
832
  }
663
833
  else {
664
- runContext.systemPrompt = this.concatSystemPrompt(basePrompt, effectiveRunConfig.injectedContext, personaFromResolver);
834
+ // F12:无 assembler 也保持 E8 形态(锚点进 system,易变份走快照)
835
+ runContext.systemPrompt = this.concatSystemPrompt(basePrompt, runtimeAnchorsText, personaFromResolver);
836
+ runtimeSnapshotText = runtimeVolatileText.trim() ? runtimeVolatileText : null;
665
837
  }
666
838
  // system prompt 终装后:turn 级 Knowledge grounding(消息侧插槽,不进 system)
667
839
  // 先算 pack;写入 runScope / 插入消息在 runScope 创建之后
@@ -680,6 +852,8 @@ export class SessionAwareRunner {
680
852
  pendingGrounding = null;
681
853
  }
682
854
  }
855
+ // [timing probe] system prompt 装配 + grounding 全部就绪;build = 组装耗时
856
+ console.log(`[timing] stage=context_ready ms=${Date.now()} session=${sessionId} build=${Date.now() - timingRunEnter} msgs=${session.messages.length} sysChars=${(runContext.systemPrompt ?? '').length} grounding=${pendingGrounding ? pendingGrounding.tokens : 0}`);
683
857
  // 更新 harness 的 sessionId/agentId(checkpoint 回退;权威身份在 RunScope ALS)
684
858
  this.harness.sessionId = sessionId;
685
859
  this.harness.agentId = effectiveRunConfig.agentId ?? 'default';
@@ -707,8 +881,24 @@ export class SessionAwareRunner {
707
881
  }
708
882
  // Run 身份与 RunScope 对齐(Observer/审计共用,不另造第二套 ID)
709
883
  const runId = createRunId(sessionId, _agentId);
710
- const attachmentRoots = this.config.sessionAttachmentsBaseDir
711
- ? [join(this.config.sessionAttachmentsBaseDir, toSessionFileName(sessionId), 'attachments')]
884
+ const attachmentRoots = this.config.sessionsDir
885
+ ? [join(this.config.sessionsDir, toSessionFileName(sessionId), 'attachments')]
886
+ : undefined;
887
+ // L3:本轮文件 undo(ToolEffectPolicy)。无 sessionsDir 时 fail-closed,禁止静默免记写盘。
888
+ const { TurnFileUndoLog, createUnconfiguredFileEffects } = await import('../extension/execution-environment/undo-log.js');
889
+ const fileUndo = this.config.sessionsDir
890
+ ? await TurnFileUndoLog.begin({
891
+ sessionsDir: this.config.sessionsDir,
892
+ sessionId,
893
+ undoLimit: this.effectUndoLimit,
894
+ })
895
+ : undefined;
896
+ turnFileUndo = fileUndo;
897
+ const { createUnconfiguredMemoryEffects: unconfMem, resolveSessionUndoPaths, } = await import('../extension/execution-environment/undo-log.js');
898
+ const fileEffects = fileUndo ?? createUnconfiguredFileEffects();
899
+ const memoryEffects = fileUndo?.memoryEffects ?? unconfMem();
900
+ const undoRoots = this.config.sessionsDir
901
+ ? [resolveSessionUndoPaths(this.config.sessionsDir, sessionId).root]
712
902
  : undefined;
713
903
  const runScope = {
714
904
  sessionId,
@@ -723,6 +913,34 @@ export class SessionAwareRunner {
723
913
  cwd: resolvedToolCwd.cwd,
724
914
  isolation: resolvedToolCwd.mode,
725
915
  attachmentRoots,
916
+ fileEffects,
917
+ memoryEffects,
918
+ undoRoots,
919
+ networkPolicy: this.effectNetwork,
920
+ requireCredentialBindings: this.effectMode === 'untrusted' || this.effectRequireCredentialBindings,
921
+ requireJail: this.effectRequireJail,
922
+ homeWrite: this.effectHomeWrite,
923
+ noteSecurityDegraded: (reason) => {
924
+ this.harness.securityDegraded = [
925
+ ...(this.harness.securityDegraded ?? []),
926
+ reason,
927
+ ];
928
+ },
929
+ pathRoots: this.effectAllowRoots.length
930
+ ? this.effectAllowRoots
931
+ : resolvedToolCwd.cwd
932
+ ? [resolvedToolCwd.cwd]
933
+ : undefined,
934
+ pathContainment: this.effectPathContainment,
935
+ confirmEffect: this.config.confirmEffect,
936
+ effectChannel: this.effectChannel,
937
+ processLimits: this.effectProcessLimits,
938
+ shellEscape: this.effectShellEscape,
939
+ shellJournal: this.effectShellJournal,
940
+ shellJournalLimit: this.effectShellJournalLimit,
941
+ sessionToolRights: runToolRights,
942
+ sessionRights: runSessionRights,
943
+ agentToolPolicy: runToolPolicy,
726
944
  },
727
945
  };
728
946
  if (pendingGrounding) {
@@ -735,19 +953,20 @@ export class SessionAwareRunner {
735
953
  };
736
954
  }
737
955
  {
738
- // turn 级:先剥历史 grounding,再视本轮 mode 决定是否插入
739
- // mode=none 时不保留上轮 grounding(避免陈旧内容长期回放)
740
- const baseMsgs = session.messages.filter((m) => m.metadata?.source !== 'knowledgeGrounding' &&
741
- m.metadata?.source !== 'sessionAttachment');
742
- // OP-15:会话附件资料块(与 Knowledge grounding 同槽位气质,source 不同)
956
+ // turn 信封:槽位拼进本 turn user 消息(一次定形),全回放、不再剥插槽。
957
+ // 上下文租约:detach 点之前的历史不进默认 LLM 窗口(Discourse 仍在 session.messages)
958
+ const detachIdx = Math.min(Math.max(session.contextDetachIndex ?? 0, 0), session.messages.length);
959
+ contextLeasePrefix = session.messages.slice(0, detachIdx);
960
+ const baseMsgs = session.messages.slice(detachIdx);
961
+ // OP-15:会话附件资料块(进 turn_context)
743
962
  let attachmentText = null;
744
- if (this.config.sessionAttachmentsBaseDir) {
963
+ if (this.config.sessionsDir) {
745
964
  try {
746
965
  const { SessionAttachmentService, buildAttachmentGroundingText, resolveInjectPlan, createLlmIntentResolver, } = await import('../session/attachments/index.js');
747
966
  const attachSvc = new SessionAttachmentService({
748
- sessionsDir: this.config.sessionAttachmentsBaseDir,
967
+ sessionsDir: this.config.sessionsDir,
749
968
  });
750
- const lastUser = [...session.messages].reverse().find((m) => m.role === 'user');
969
+ const lastUser = input;
751
970
  const attachIds = Array.isArray(lastUser?.metadata?.attachmentIds)
752
971
  ? lastUser.metadata.attachmentIds.filter((x) => typeof x === 'string')
753
972
  : [];
@@ -788,52 +1007,31 @@ export class SessionAwareRunner {
788
1007
  console.warn(`[octopi] attachment grounding failed (session=${sessionId}): ${attErr instanceof Error ? attErr.message : String(attErr)}`);
789
1008
  }
790
1009
  }
791
- if (attachmentText) {
792
- const attachMsg = {
793
- role: 'user',
794
- content: attachmentText,
795
- timestamp: Date.now(),
796
- metadata: { source: 'sessionAttachment' },
797
- };
798
- let insertAt = baseMsgs.length;
799
- for (let i = baseMsgs.length - 1; i >= 0; i--) {
800
- if (baseMsgs[i].role === 'user') {
801
- insertAt = i;
802
- break;
803
- }
804
- }
805
- baseMsgs.splice(insertAt, 0, attachMsg);
806
- }
807
- if (pendingGrounding && pendingGrounding.mode !== 'none' && pendingGrounding.text?.trim()) {
808
- const groundingMsg = {
809
- role: 'user',
810
- content: pendingGrounding.text,
811
- timestamp: Date.now(),
812
- metadata: {
813
- source: 'knowledgeGrounding',
814
- mode: pendingGrounding.mode,
815
- query: pendingGrounding.query,
816
- coverage: pendingGrounding.coverage,
817
- },
818
- };
819
- let insertAt = baseMsgs.length;
820
- for (let i = baseMsgs.length - 1; i >= 0; i--) {
821
- if (baseMsgs[i].role === 'user') {
822
- insertAt = i;
823
- break;
824
- }
825
- }
826
- baseMsgs.splice(insertAt, 0, groundingMsg);
827
- runContext.messages = baseMsgs;
828
- if (runScope.toolRuntime) {
829
- runScope.toolRuntime.messages = baseMsgs;
830
- }
831
- }
832
- else if (baseMsgs.length !== session.messages.length) {
833
- runContext.messages = baseMsgs;
834
- if (runScope.toolRuntime) {
835
- runScope.toolRuntime.messages = baseMsgs;
836
- }
1010
+ const slotsXml = joinSlotXml([
1011
+ {
1012
+ tag: 'runtime_snapshot',
1013
+ body: runtimeSnapshotText ? runtimeSnapshotText : '',
1014
+ },
1015
+ {
1016
+ tag: 'session_attachments',
1017
+ body: attachmentText ?? '',
1018
+ },
1019
+ {
1020
+ tag: 'knowledge_grounding',
1021
+ body: pendingGrounding && pendingGrounding.mode !== 'none' && pendingGrounding.text?.trim()
1022
+ ? pendingGrounding.text
1023
+ : '',
1024
+ },
1025
+ ]);
1026
+ const turnContextXml = formatTurnContextXml({
1027
+ turnId: currentTurnId,
1028
+ slotsXml,
1029
+ });
1030
+ this.bakeTurnStart(input, currentTurnId, turnContextXml);
1031
+ // 视图 = detach 切片(含已定形 user);全回放,无条件成为 LLM 窗口
1032
+ runContext.messages = baseMsgs;
1033
+ if (runScope.toolRuntime) {
1034
+ runScope.toolRuntime.messages = baseMsgs;
837
1035
  }
838
1036
  }
839
1037
  // Observer 通道:Run 现场快照(摘要进事件;全文由 Hub/REST 提供)
@@ -890,10 +1088,14 @@ export class SessionAwareRunner {
890
1088
  // 10. 运行 Agent(Agent.run = reliability 包装;context/runScope 为本 Run 私有)
891
1089
  let streamedContent = '';
892
1090
  let lastUsage = undefined;
1091
+ /** 最近一次 turn.end 的上下文用量(供收尾持久化;compact 视图值不进此账) */
1092
+ let lastContextTokens = undefined;
1093
+ let lastContextWindow = undefined;
893
1094
  const meta = { agentId: effectiveRunConfig.agentId ?? 'default', sessionId };
894
- const adaptState = { assistantContent: '', lastUserContent: '' };
895
1095
  /** 本轮起始消息下标(afterTurn 只传增量) */
896
1096
  let turnStartIndex = runContext.messages.length;
1097
+ /** 用户中止(编辑重发标记用) */
1098
+ let runAborted = false;
897
1099
  // resolvedModel 已在 system assembler 之前解析;此处只组装 run options
898
1100
  const agentRunOptions = {
899
1101
  resolvedModel: resolvedModel ?? undefined,
@@ -901,6 +1103,9 @@ export class SessionAwareRunner {
901
1103
  runScope,
902
1104
  };
903
1105
  for await (const loopEvent of this.agent.run(signal, undefined, agentRunOptions)) {
1106
+ if (loopEvent.type === 'agent_end' && loopEvent.reason === 'aborted') {
1107
+ runAborted = true;
1108
+ }
904
1109
  // 适配事件格式(向后兼容)
905
1110
  const adapted = adaptLoopEvent(loopEvent, meta, adaptState);
906
1111
  if (adapted) {
@@ -911,20 +1116,39 @@ export class SessionAwareRunner {
911
1116
  if (rawUsage) {
912
1117
  lastUsage = rawUsage;
913
1118
  }
914
- adapted.data.contextTokens =
915
- lastUsage?.inputReportedTokens ??
916
- (lastUsage
917
- ? lastUsage.inputUncachedTokens + lastUsage.inputCachedTokens + lastUsage.inputCacheWriteTokens
918
- : undefined) ??
919
- estimator.estimateMessages(session.messages);
1119
+ const contextTokens = lastUsage?.inputReportedTokens ??
1120
+ (lastUsage
1121
+ ? lastUsage.inputUncachedTokens + lastUsage.inputCachedTokens + lastUsage.inputCacheWriteTokens
1122
+ : undefined) ??
1123
+ estimator.estimateMessages(session.messages);
1124
+ adapted.data.contextTokens = contextTokens;
920
1125
  adapted.data.contextWindow = effectiveRunConfig.contextWindow;
1126
+ // cache 观测:user 轮首调用 vs 同轮后续(跨轮前缀是否命中)
1127
+ if (lastUsage) {
1128
+ const cached = lastUsage.inputCachedTokens ?? 0;
1129
+ const uncached = lastUsage.inputUncachedTokens ?? 0;
1130
+ const cacheWrite = lastUsage.inputCacheWriteTokens ?? 0;
1131
+ const prompt = lastUsage.inputReportedTokens ?? cached + uncached + cacheWrite;
1132
+ const ratio = prompt > 0 ? cached / prompt : 0;
1133
+ adapted.data.userTurnId = currentTurnId;
1134
+ adapted.data.llmCallIndexInUserTurn = llmCallIndexInUserTurn;
1135
+ adapted.data.cachedInputTokens = cached;
1136
+ adapted.data.uncachedInputTokens = uncached;
1137
+ adapted.data.cacheHitRatio = ratio;
1138
+ console.log(`[cache] session=${sessionId} turn=${currentTurnId} call=${llmCallIndexInUserTurn}` +
1139
+ ` cached=${cached} uncached=${uncached} write=${cacheWrite} prompt=${prompt}` +
1140
+ ` ratio=${(ratio * 100).toFixed(1)}% cacheAware=${lastUsage.cacheAware}`);
1141
+ }
1142
+ // 记账供收尾持久化:UI 重开会话恢复显示(口径 = 实际 prompt / 全量估算)
1143
+ lastContextTokens = contextTokens;
1144
+ lastContextWindow = effectiveRunConfig.contextWindow;
921
1145
  }
922
1146
  yield adapted;
923
1147
  // Telemetry 旁路(含 stream delta;由 RunTelemetry 决定采样)
924
1148
  this.config.eventSink?.(adapted, meta);
925
1149
  // 事件桥:循环事件同时广播到 EventBus
926
1150
  // 跳过高频流式 delta(每 token 一次),避免 EventBus 拥塞
927
- if (adapted.type !== 'llm_stream_delta') {
1151
+ if (adapted.type !== 'llm_stream_delta' && adapted.type !== 'llm_thinking_delta') {
928
1152
  this.emitObserved(adapted);
929
1153
  }
930
1154
  }
@@ -946,6 +1170,7 @@ export class SessionAwareRunner {
946
1170
  if (loopEvent.usage) {
947
1171
  lastUsage = loopEvent.usage;
948
1172
  }
1173
+ llmCallIndexInUserTurn += 1;
949
1174
  const turnMessages = runContext.messages.slice(turnStartIndex);
950
1175
  await this.agent.notifyAfterTurn(lastUsage, turnMessages);
951
1176
  turnStartIndex = runContext.messages.length;
@@ -953,7 +1178,7 @@ export class SessionAwareRunner {
953
1178
  if (content) {
954
1179
  session.turns.push({
955
1180
  id: `turn_${Date.now()}`,
956
- input: session.messages.slice(0, -1),
1181
+ inputCount: Math.max(0, session.messages.length - 1),
957
1182
  output: { role: 'assistant', content, timestamp: Date.now(), agentId: _agentId },
958
1183
  usage: lastUsage,
959
1184
  durationMs: 0,
@@ -972,7 +1197,73 @@ export class SessionAwareRunner {
972
1197
  m.agentId = _agentId;
973
1198
  }
974
1199
  }
975
- session.messages = runContext.messages;
1200
+ // 租约点之前的历史必须保留(I2 Discourse);窗口内为 runContext.messages(含本轮新消息)
1201
+ // 全回放:不再剥 grounding/attachment(历史中部删改会打穿前缀缓存)
1202
+ // ephemeral 消息(委派状态等运行期 steering)只属于本次 Run,不落历史——
1203
+ // 否则「当时的状态」会被固化成对话历史,过期后仍占用上下文并打穿前缀缓存。
1204
+ const keptPrefix = contextLeasePrefix;
1205
+ const durableMessages = runContext.messages.filter((m) => m.ephemeral !== true);
1206
+ session.messages = [...keptPrefix, ...durableMessages];
1207
+ // contextDetachIndex 是 messages 下标:写回重排后必须对齐 keptPrefix 长度
1208
+ if (typeof session.contextDetachIndex === 'number') {
1209
+ session.contextDetachIndex = keptPrefix.length;
1210
+ }
1211
+ // 引擎主动终止(RunGuard / Budget / Security)必须留下可见凭证:
1212
+ // 只有事件、没有消息时,UI 看到的就是「跑着跑着突然结束」。
1213
+ //
1214
+ // 触发条件 = loop 的 agent_end.reason === 'should_stop'(唯一权威的「提前停止」信号)。
1215
+ // 不能只看 stopReason:`security_blocked` 单次拦截后 run 会继续跑完,
1216
+ // 那样会把正常完成的 run 误报成「已停止」。
1217
+ //
1218
+ // 该消息不进 LLM 上下文(buildLlmMessages 跳过 source=runStopped),
1219
+ // 但进聊天回放(系统提示条)与 session 审计。
1220
+ // 位置在 turn_end 之前:它属于被终止的这个 turn。
1221
+ if (adaptState.loopEndReason === 'should_stop') {
1222
+ const label = adaptState.stopReason === 'behavior_stopped'
1223
+ ? '引擎监督器判定停止'
1224
+ : adaptState.stopReason === 'policy_stopped'
1225
+ ? '资源策略停止'
1226
+ : adaptState.stopReason === 'context_stopped'
1227
+ ? '上下文压力停止'
1228
+ : adaptState.stopReason === 'security_stopped'
1229
+ ? '安全策略停止'
1230
+ : '引擎判定停止';
1231
+ const detail = adaptState.stopDetail ? `(${adaptState.stopDetail})` : '';
1232
+ const body = adaptState.stopMessage ??
1233
+ '本轮由引擎主动终止,未收到模型的收尾回复。可继续对话,让 agent 从当前状态接着做。';
1234
+ const reason = adaptState.stopReason ?? 'engine_stopped';
1235
+ session.messages.push({
1236
+ role: 'user',
1237
+ content: `${label}${detail}:${body}`,
1238
+ timestamp: Date.now(),
1239
+ metadata: {
1240
+ source: 'runStopped',
1241
+ turnId: currentTurnId,
1242
+ stopReason: reason,
1243
+ ...(adaptState.stopDetail ? { stopDetail: adaptState.stopDetail } : {}),
1244
+ },
1245
+ });
1246
+ session.metadata = {
1247
+ ...session.metadata,
1248
+ lastStop: {
1249
+ reason,
1250
+ detail: adaptState.stopDetail,
1251
+ message: body,
1252
+ turnId: currentTurnId,
1253
+ at: Date.now(),
1254
+ },
1255
+ };
1256
+ }
1257
+ else if (session.metadata?.lastStop) {
1258
+ // 正常完成的 run 必须清掉上次的停止标。
1259
+ // 只从内存对象删不够:save 是 metadata 浅合并({...prev, ...data}),
1260
+ // 磁盘上的 lastStop 会被合并回来——持久化后再 updateMetadata 真删。
1261
+ const { lastStop: _dropLastStop, ...restMeta } = session.metadata;
1262
+ session.metadata = restMeta;
1263
+ clearLastStop = true;
1264
+ }
1265
+ // turn 闭标(write-once)
1266
+ this.appendTurnEnd(session, currentTurnId);
976
1267
  // 11. 引擎异常退出时的 session 一致性修复(须在 Observer final 采样之前)
977
1268
  if (!hasTurnEnd) {
978
1269
  const fallbackContent = streamedContent || '';
@@ -985,7 +1276,7 @@ export class SessionAwareRunner {
985
1276
  });
986
1277
  session.turns.push({
987
1278
  id: `turn_${Date.now()}`,
988
- input: session.messages.slice(0, -1),
1279
+ inputCount: Math.max(0, session.messages.length - 1),
989
1280
  output: { role: 'assistant', content: fallbackContent, timestamp: Date.now(), agentId: _agentId },
990
1281
  usage: lastUsage,
991
1282
  durationMs: 0,
@@ -998,6 +1289,51 @@ export class SessionAwareRunner {
998
1289
  observerFinalMessages = session.messages;
999
1290
  // P5: 使用 stopReason 区分终态(context_stopped / behavior_stopped / policy_stopped / security_stopped / completed)
1000
1291
  observerEndReason = adaptState.stopReason ?? (hasTurnEnd ? 'completed' : 'no_turn_end');
1292
+ // 中止标记:仅在本轮**未完成**被掐断时打标(hasTurnEnd = 正常收尾)。
1293
+ // 迟到 abort / signal 竞态不得给已完成轮贴编辑重发。
1294
+ let clearAbortedTurn = false;
1295
+ const abortedMidTurn = runAborted || (Boolean(signal?.aborted) && !hasTurnEnd);
1296
+ // L3:中止保留 undo(供编辑重发 discard);其余出口 commit(继续对话=隐式提交)
1297
+ if (turnFileUndo) {
1298
+ // Observer tool.effect:效应账本摘要(§5.6)
1299
+ this.emitObserved({
1300
+ type: 'tool.effect.ledger',
1301
+ timestamp: Date.now(),
1302
+ agentId: _agentId,
1303
+ sessionId,
1304
+ data: {
1305
+ entries: turnFileUndo.size,
1306
+ truncated: turnFileUndo.truncated,
1307
+ },
1308
+ });
1309
+ }
1310
+ if (turnFileUndo && !abortedMidTurn && !this.effectCommitManual) {
1311
+ await turnFileUndo.commit();
1312
+ turnFileUndo = undefined;
1313
+ }
1314
+ if (abortedMidTurn) {
1315
+ let userIdx = -1;
1316
+ for (let i = session.messages.length - 1; i >= 0; i--) {
1317
+ const m = session.messages[i];
1318
+ // 与 isMidTurn / extractLayerQuery 同口径:引擎载体(含 turnEnd)不是真实 user
1319
+ if (m.role === 'user' && !isEngineCarrierSource(m.metadata?.source)) {
1320
+ userIdx = i;
1321
+ break;
1322
+ }
1323
+ }
1324
+ if (userIdx >= 0) {
1325
+ session.metadata = {
1326
+ ...session.metadata,
1327
+ abortedTurn: { userMessageIndex: userIdx, at: Date.now() },
1328
+ };
1329
+ }
1330
+ }
1331
+ else if (session.metadata?.abortedTurn) {
1332
+ // save 浅合并删不掉 metadata 键,这里先从对象移除,persist 后再 updateMetadata 真删
1333
+ const { abortedTurn: _drop, ...rest } = session.metadata;
1334
+ session.metadata = rest;
1335
+ clearAbortedTurn = true;
1336
+ }
1001
1337
  // 12. 持久化
1002
1338
  sm.transition('idle');
1003
1339
  session.meta.status = sm.state;
@@ -1005,7 +1341,26 @@ export class SessionAwareRunner {
1005
1341
  // 压缩状态写回 Session(E4 分桶 + primary 兼容视图)
1006
1342
  const compactSnap = this.agent.getSessionCompactState(sessionId, _agentId);
1007
1343
  writeSessionCompact(session, _agentId, compactSnap);
1344
+ // 上下文用量随会话持久化:重开会话恢复显示(不靠 UI 用末页消息猜)。
1345
+ // 只记 turn.end 口径(实际 prompt / 全量估算);compact 视图值不写入。
1346
+ if (lastContextTokens !== undefined || lastContextWindow !== undefined) {
1347
+ session.metadata = {
1348
+ ...session.metadata,
1349
+ ...(lastContextTokens !== undefined ? { contextTokens: lastContextTokens } : {}),
1350
+ ...(lastContextWindow !== undefined ? { contextWindow: lastContextWindow } : {}),
1351
+ };
1352
+ }
1008
1353
  await this.store.save(sessionId, session);
1354
+ if (clearAbortedTurn && this.store.updateMetadata) {
1355
+ await this.store.updateMetadata(sessionId, (meta) => {
1356
+ delete meta.abortedTurn;
1357
+ });
1358
+ }
1359
+ if (clearLastStop && this.store.updateMetadata) {
1360
+ await this.store.updateMetadata(sessionId, (meta) => {
1361
+ delete meta.lastStop;
1362
+ });
1363
+ }
1009
1364
  // 通知子系统:本轮处理完成(保持 active,但刷新 lastInteractionAt)
1010
1365
  this._backfillTrigger?.noteActivity(sessionId, _agentId, session.meta.lastInteractionAt);
1011
1366
  this.emitObserved({
@@ -1023,6 +1378,11 @@ export class SessionAwareRunner {
1023
1378
  catch (err) {
1024
1379
  observerEndReason = 'error';
1025
1380
  observerErrorMsg = err instanceof Error ? err.message : String(err);
1381
+ // 引擎出错:无编辑重发入口,效应保留(commit undo)
1382
+ if (turnFileUndo) {
1383
+ await turnFileUndo.commit().catch(() => undefined);
1384
+ turnFileUndo = undefined;
1385
+ }
1026
1386
  // 引擎出错:状态机转到 error,持久化
1027
1387
  const sm = this.stateMachines.get(sessionId);
1028
1388
  if (sm?.canTransition('error')) {
@@ -1058,6 +1418,13 @@ export class SessionAwareRunner {
1058
1418
  throw err;
1059
1419
  }
1060
1420
  finally {
1421
+ // [timing probe] run 收口必须留痕:本次事故里「run 结束原因」零日志,
1422
+ // 只能靠反推落盘消息定位。reason = 观测口径,stopReason = 停止闸门。
1423
+ console.log(`[timing] stage=run_end ms=${Date.now()} session=${sessionId}` +
1424
+ ` dur=${Date.now() - timingRunEnter}` +
1425
+ ` reason=${observerEndReason ?? (signal?.aborted ? 'aborted' : 'unknown')}` +
1426
+ ` loopEnd=${adaptState.loopEndReason ?? 'none'}` +
1427
+ (adaptState.stopReason ? ` stopReason=${adaptState.stopReason}` : ''));
1061
1428
  // 清理 task service 的活 session 缓存(避免长时间运行进程内存泄漏)
1062
1429
  this.config.sessionTaskService?.detachSession(_agentId, sessionId);
1063
1430
  // Observer 统一收口:成功/失败都关闭 run,避免僵尸 active
@@ -1130,10 +1497,11 @@ export class SessionAwareRunner {
1130
1497
  summarize: options.summarize,
1131
1498
  compactTargetTokens: options.compactTargetTokens,
1132
1499
  });
1133
- if (result.ok && result.summary) {
1500
+ if (result.ok && result.summary && result.compacted) {
1134
1501
  const snap = {
1135
1502
  summary: result.summary,
1136
1503
  lastProactiveMessageCount: session.messages.length,
1504
+ lastProactiveCoverEnd: result.coveredMessageCount,
1137
1505
  lastProactiveTokens: result.tokensAfter,
1138
1506
  };
1139
1507
  this.agent.setSessionCompactState(sessionId, agentId, snap);
@@ -1157,6 +1525,19 @@ export class SessionAwareRunner {
1157
1525
  async acquireLock(sessionId, signal) {
1158
1526
  return this.sessionLease.acquire(sessionId, signal ? { signal } : undefined);
1159
1527
  }
1528
+ /**
1529
+ * SEC-2: strip tools by agent ToolPolicy ∩ sessionToolRights (narrow-only).
1530
+ * Listing filter; beforeToolCall repeats the same check as defense-in-depth.
1531
+ * Rights are passed per-run (harness is shared across concurrent sessions).
1532
+ */
1533
+ filterToolsForSessionRights(tools, sessionToolRights, agentToolPolicy) {
1534
+ if (!agentToolPolicy && !sessionToolRights)
1535
+ return tools;
1536
+ return tools.filter((t) => isToolPermitted(t.name, resolveToolCapabilities(t.name), [
1537
+ agentToolPolicy,
1538
+ sessionToolRights,
1539
+ ]));
1540
+ }
1160
1541
  /**
1161
1542
  * 创建新 Session
1162
1543
  *
@@ -1185,6 +1566,81 @@ export class SessionAwareRunner {
1185
1566
  tasks: [],
1186
1567
  };
1187
1568
  }
1569
+ /**
1570
+ * 补闭上一 turn(崩溃/中止后无 turn_end 时 write-once 追加)。
1571
+ * 新 turn 禁止在 open 未闭时叠加。
1572
+ */
1573
+ ensurePreviousTurnClosed(session) {
1574
+ let lastStartId;
1575
+ let lastStartIdx = -1;
1576
+ for (let i = session.messages.length - 1; i >= 0; i--) {
1577
+ const m = session.messages[i];
1578
+ if (isTurnStartContent(m.content)) {
1579
+ lastStartId = parseTurnIdFromContent(m.content);
1580
+ lastStartIdx = i;
1581
+ break;
1582
+ }
1583
+ }
1584
+ if (!lastStartId)
1585
+ return;
1586
+ for (let i = lastStartIdx + 1; i < session.messages.length; i++) {
1587
+ const m = session.messages[i];
1588
+ if (m.metadata?.source !== 'turnEnd')
1589
+ continue;
1590
+ if (parseTurnIdFromContent(m.content) === lastStartId)
1591
+ return;
1592
+ }
1593
+ session.messages.push({
1594
+ role: 'user',
1595
+ content: formatTurnEndContent(lastStartId),
1596
+ timestamp: Date.now(),
1597
+ metadata: { source: 'turnEnd', turnId: lastStartId },
1598
+ });
1599
+ }
1600
+ /**
1601
+ * user 消息一次定形为 `<turn_start>…</turn_start>`(write-once)。
1602
+ * @param userMessage - 本 turn 用户消息对象(session.messages 中的同一引用)
1603
+ * @param turnId - 会话内单调 turn id
1604
+ * @param turnContextXml - `<turn_context>…</turn_context>` 整段
1605
+ * @throws 若已定形(禁止二次改写)
1606
+ */
1607
+ bakeTurnStart(userMessage, turnId, turnContextXml) {
1608
+ const content = userMessage.content;
1609
+ const text = typeof content === 'string' ? content : getTextContent(content);
1610
+ if (isTurnStartContent(text)) {
1611
+ throw new Error(`turn_start already baked (turnId=${turnId}); user message is write-once`);
1612
+ }
1613
+ const xml = formatTurnStartContent({
1614
+ turnId,
1615
+ at: new Date().toISOString(),
1616
+ turnContextXml,
1617
+ userText: text,
1618
+ });
1619
+ if (typeof content === 'string' || content == null) {
1620
+ userMessage.content = xml;
1621
+ }
1622
+ else if (Array.isArray(content)) {
1623
+ userMessage.content = [
1624
+ { type: 'text', text: xml },
1625
+ ...content.filter((b) => b.type !== 'text'),
1626
+ ];
1627
+ }
1628
+ userMessage.metadata = { ...userMessage.metadata, turnId };
1629
+ }
1630
+ /** 追加 turn 闭标(write-once;同 id 重复 → throw) */
1631
+ appendTurnEnd(session, turnId) {
1632
+ const exists = session.messages.some((m) => m.metadata?.source === 'turnEnd' &&
1633
+ parseTurnIdFromContent(m.content) === turnId);
1634
+ if (exists) {
1635
+ throw new Error(`turn_end already exists (turnId=${turnId})`);
1636
+ }
1637
+ session.messages.push({
1638
+ role: 'user',
1639
+ content: formatTurnEndContent(turnId),
1640
+ timestamp: Date.now(),
1641
+ metadata: { source: 'turnEnd', turnId },
1642
+ });
1643
+ }
1188
1644
  /** 旧路径:persona + injectedContext 字符串拼接;结果返回给 runContext,不写共享 Agent */
1189
1645
  concatSystemPrompt(basePrompt, injectedContext, personaFromResolver) {
1190
1646
  if (injectedContext) {
@@ -1217,77 +1673,19 @@ export class SessionAwareRunner {
1217
1673
  /**
1218
1674
  * 检查 Session 是否需要重置
1219
1675
  */
1220
- checkSessionReset(session) {
1221
- const now = Date.now();
1222
- let didReset = false;
1223
- // Daily reset
1224
- if (this.config.enableDailyReset) {
1225
- const sessionDay = new Date(session.meta.sessionStartedAt).toDateString();
1226
- const today = new Date(now).toDateString();
1227
- if (sessionDay !== today) {
1228
- session.messages = [];
1229
- session.turns = [];
1230
- session.meta.sessionStartedAt = now;
1231
- didReset = true;
1232
- }
1233
- }
1234
- // Idle reset:历史清空前把会话标为 recent+pending,供 memory extract 触发
1235
- if (this.config.idleExpiryMs) {
1236
- const idle = now - session.meta.lastInteractionAt;
1237
- if (idle > this.config.idleExpiryMs) {
1238
- this.markSessionRecent(session, now);
1239
- session.messages = [];
1240
- session.turns = [];
1241
- session.meta.sessionStartedAt = now;
1242
- didReset = true;
1243
- }
1244
- }
1245
- if (didReset) {
1246
- // 历史清空后,层指纹与压缩快照一并失效(E4:清全部 agent 桶)
1247
- this.systemPromptAssemblerClear?.(session.id);
1248
- writeSessionCompact(session, session.primaryAgentId ?? session.agentId, undefined);
1249
- const resetAgentIds = new Set([
1250
- session.primaryAgentId ?? session.agentId,
1251
- session.agentId,
1252
- ...Object.keys(session.contextCompacts ?? {}),
1253
- ]);
1254
- for (const aid of resetAgentIds) {
1255
- this.agent.setSessionCompactState(session.id, aid, undefined);
1256
- }
1257
- delete session.contextCompact;
1258
- delete session.contextCompacts;
1259
- }
1260
- }
1261
1676
  /**
1262
- * 将 session 生命周期落到 recent + endedAt,并广播事件。
1263
- * 状态在 SessionData.lifecycle;由后续 save 持久化(meta 索引投影)。
1264
- * 不写 memoryExtraction(进度归 memory.steward);事件仍带 extractionStatus 供 Sense 感知。
1677
+ * 上下文租约(opt-in):闲置超时后仅记录截断点,供 LLM 默认窗口裁剪。
1678
+ *
1679
+ * 不删 Discourse、不碰 compact/memory。冷沉淀归 memory.steward 的 idle 扫描。
1680
+ * 在 push 本轮 input 之前调用,保证新消息落在租约点之后。
1265
1681
  */
1266
- markSessionRecent(session, now) {
1267
- // 补录快照:idle reset 会清空 messages,必须在清空前固化 sessionText
1268
- const sessionText = (session.messages ?? [])
1269
- .filter((m) => {
1270
- const kind = m.metadata?.kind;
1271
- return kind !== 'command' && kind !== 'command_result';
1272
- })
1273
- .map((m) => `[${m.role}] ${typeof m.content === 'string' ? m.content : JSON.stringify(m.content ?? '')}`)
1274
- .join('\n')
1275
- .slice(0, 8000);
1276
- session.lifecycle = {
1277
- lifecycle: 'recent',
1278
- endedAt: now,
1279
- };
1280
- this.emitObserved({
1281
- type: 'session.lifecycle.updated',
1282
- timestamp: now,
1283
- agentId: session.agentId,
1284
- sessionId: session.id,
1285
- data: {
1286
- lifecycle: 'recent',
1287
- extractionStatus: 'pending',
1288
- lastInteractionAt: session.meta.lastInteractionAt,
1289
- sessionText,
1290
- },
1291
- });
1682
+ applyContextLease(session) {
1683
+ const leaseMs = this.config.idleExpiryMs;
1684
+ if (!leaseMs || leaseMs <= 0)
1685
+ return;
1686
+ const idle = Date.now() - session.meta.lastInteractionAt;
1687
+ if (idle > leaseMs) {
1688
+ session.contextDetachIndex = session.messages.length;
1689
+ }
1292
1690
  }
1293
1691
  }