@octopi-agent/engine 0.70.7 → 0.90.11

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 (390) 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 +81 -5
  6. package/dist/config-schema/context.d.ts +24 -5
  7. package/dist/config-schema/context.js +28 -1
  8. package/dist/config-schema/engine.d.ts +205 -13
  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 +93 -1
  12. package/dist/config-schema/models.d.ts +3 -3
  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 +13 -0
  18. package/dist/config-schema/shared.js +22 -0
  19. package/dist/config-schema/substrate.d.ts +2 -2
  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 +201 -8
  23. package/dist/config.js +105 -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 +50 -5
  31. package/dist/harness/agent/builder.js +189 -59
  32. package/dist/harness/agent/config-bridge.d.ts +33 -25
  33. package/dist/harness/agent/config-bridge.js +84 -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 +46 -0
  37. package/dist/harness/agent/tool-purpose.js +127 -0
  38. package/dist/harness/agent/wire-agent-builder.d.ts +133 -0
  39. package/dist/harness/agent/wire-agent-builder.js +370 -0
  40. package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.d.ts +11 -1
  41. package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.js +11 -1
  42. package/dist/harness/collaboration/autonomous-subsystem/loader.d.ts +13 -0
  43. package/dist/harness/collaboration/autonomous-subsystem/loader.js +16 -1
  44. package/dist/harness/collaboration/autonomous-subsystem/runtime.d.ts +8 -1
  45. package/dist/harness/collaboration/autonomous-subsystem/runtime.js +17 -9
  46. package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.d.ts +12 -0
  47. package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.js +19 -0
  48. package/dist/harness/collaboration/autonomous-subsystem/sense/session-lifecycle-bridge.d.ts +6 -0
  49. package/dist/harness/collaboration/autonomous-subsystem/sense/session-lifecycle-bridge.js +24 -7
  50. package/dist/harness/collaboration/autonomous-subsystem/think/executor.d.ts +5 -2
  51. package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +11 -3
  52. package/dist/harness/collaboration/autonomous-subsystem/think/index.d.ts +1 -1
  53. package/dist/harness/collaboration/autonomous-subsystem/think/index.js +1 -1
  54. package/dist/harness/collaboration/autonomous-subsystem/think/llm-port.d.ts +7 -4
  55. package/dist/harness/collaboration/autonomous-subsystem/think/llm-port.js +8 -9
  56. package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.d.ts +36 -10
  57. package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.js +60 -7
  58. package/dist/harness/collaboration/delegation/child-run.d.ts +144 -0
  59. package/dist/harness/collaboration/delegation/child-run.js +241 -0
  60. package/dist/harness/collaboration/delegation/index.d.ts +26 -0
  61. package/dist/harness/collaboration/delegation/index.js +25 -0
  62. package/dist/harness/collaboration/delegation/notifier.d.ts +46 -0
  63. package/dist/harness/collaboration/delegation/notifier.js +84 -0
  64. package/dist/harness/collaboration/delegation/registry-types.d.ts +200 -0
  65. package/dist/harness/collaboration/delegation/registry-types.js +61 -0
  66. package/dist/harness/collaboration/delegation/registry.d.ts +110 -0
  67. package/dist/harness/collaboration/delegation/registry.js +220 -0
  68. package/dist/harness/collaboration/delegation/service.d.ts +249 -0
  69. package/dist/harness/collaboration/delegation/service.js +499 -0
  70. package/dist/harness/collaboration/delegation/store.d.ts +155 -0
  71. package/dist/harness/collaboration/delegation/store.js +271 -0
  72. package/dist/harness/collaboration/delegation/transport.d.ts +73 -0
  73. package/dist/harness/collaboration/delegation/transport.js +61 -0
  74. package/dist/harness/collaboration/delegation/types.d.ts +231 -0
  75. package/dist/harness/collaboration/delegation/types.js +70 -0
  76. package/dist/harness/collaboration/delegation/wiring.d.ts +111 -0
  77. package/dist/harness/collaboration/delegation/wiring.js +145 -0
  78. package/dist/harness/collaboration/orchestration/index.d.ts +11 -13
  79. package/dist/harness/collaboration/orchestration/index.js +11 -11
  80. package/dist/harness/context/assembler.d.ts +2 -2
  81. package/dist/harness/context/assembler.js +12 -7
  82. package/dist/harness/context/capabilities/compact/engine.js +80 -38
  83. package/dist/harness/context/capabilities/compact/types.d.ts +12 -1
  84. package/dist/harness/context/capabilities/summary/registry.js +10 -0
  85. package/dist/harness/context/constitution/default-agents.md +230 -228
  86. package/dist/harness/context/default-context-engine.d.ts +101 -23
  87. package/dist/harness/context/default-context-engine.js +483 -172
  88. package/dist/harness/context/hybrid-compressor.d.ts +3 -3
  89. package/dist/harness/context/hybrid-compressor.js +18 -23
  90. package/dist/harness/context/index.d.ts +5 -1
  91. package/dist/harness/context/index.js +2 -0
  92. package/dist/harness/context/layer-snapshot.d.ts +4 -0
  93. package/dist/harness/context/layer-snapshot.js +30 -18
  94. package/dist/harness/context/layer-types.d.ts +85 -1
  95. package/dist/harness/context/layer-types.js +110 -4
  96. package/dist/harness/context/layers.d.ts +5 -2
  97. package/dist/harness/context/layers.js +11 -5
  98. package/dist/harness/context/llm-summarizer.d.ts +15 -1
  99. package/dist/harness/context/llm-summarizer.js +107 -56
  100. package/dist/harness/context/message-selector.js +6 -2
  101. package/dist/harness/context/root-instructions.d.ts +72 -0
  102. package/dist/harness/context/root-instructions.js +227 -0
  103. package/dist/harness/context/runtime-datetime.d.ts +34 -7
  104. package/dist/harness/context/runtime-datetime.js +66 -10
  105. package/dist/harness/context/smart-router.d.ts +1 -1
  106. package/dist/harness/context/smart-router.js +1 -1
  107. package/dist/harness/context/system-prompt-assembler.d.ts +30 -0
  108. package/dist/harness/context/system-prompt-assembler.js +73 -6
  109. package/dist/harness/context/token-constants.d.ts +2 -2
  110. package/dist/harness/context/token-constants.js +2 -2
  111. package/dist/harness/context/token-estimate-fns.d.ts +1 -3
  112. package/dist/harness/context/token-estimate-fns.js +2 -4
  113. package/dist/harness/context/token-estimator.d.ts +1 -1
  114. package/dist/harness/context/token-estimator.js +14 -6
  115. package/dist/harness/context/tool-result-aging.d.ts +140 -0
  116. package/dist/harness/context/tool-result-aging.js +331 -0
  117. package/dist/harness/context/tool-result-body.d.ts +10 -0
  118. package/dist/harness/context/tool-result-body.js +27 -0
  119. package/dist/harness/context/turn-envelope.d.ts +123 -0
  120. package/dist/harness/context/turn-envelope.js +188 -0
  121. package/dist/harness/context/types.d.ts +35 -47
  122. package/dist/harness/extension/execution-environment/effect-policy.d.ts +258 -0
  123. package/dist/harness/extension/execution-environment/effect-policy.js +358 -0
  124. package/dist/harness/extension/execution-environment/index.d.ts +18 -2
  125. package/dist/harness/extension/execution-environment/index.js +11 -2
  126. package/dist/harness/extension/execution-environment/isolation.js +5 -1
  127. package/dist/harness/extension/execution-environment/memory-undo.d.ts +101 -0
  128. package/dist/harness/extension/execution-environment/memory-undo.js +192 -0
  129. package/dist/harness/extension/execution-environment/process-isolation.d.ts +84 -0
  130. package/dist/harness/extension/execution-environment/process-isolation.js +315 -0
  131. package/dist/harness/extension/execution-environment/resource-limits.d.ts +36 -0
  132. package/dist/harness/extension/execution-environment/resource-limits.js +84 -0
  133. package/dist/harness/extension/execution-environment/sandbox.d.ts +125 -4
  134. package/dist/harness/extension/execution-environment/sandbox.js +521 -51
  135. package/dist/harness/extension/execution-environment/shell-journal.d.ts +100 -0
  136. package/dist/harness/extension/execution-environment/shell-journal.js +299 -0
  137. package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +45 -0
  138. package/dist/harness/extension/execution-environment/tool-capabilities.js +126 -0
  139. package/dist/harness/extension/execution-environment/types.d.ts +67 -39
  140. package/dist/harness/extension/execution-environment/types.js +2 -2
  141. package/dist/harness/extension/execution-environment/undo-log.d.ts +203 -0
  142. package/dist/harness/extension/execution-environment/undo-log.js +627 -0
  143. package/dist/harness/extension/execution-environment/undo-merge.d.ts +40 -0
  144. package/dist/harness/extension/execution-environment/undo-merge.js +167 -0
  145. package/dist/harness/extension/plugin-ecosystem/client-tools/index.d.ts +1 -1
  146. package/dist/harness/extension/plugin-ecosystem/client-tools/types.d.ts +9 -0
  147. package/dist/harness/extension/plugin-ecosystem/mcp/bridge.js +2 -0
  148. package/dist/harness/extension/plugin-ecosystem/plugins/api.d.ts +1 -6
  149. package/dist/harness/extension/plugin-ecosystem/plugins/api.js +3 -8
  150. package/dist/harness/extension/plugin-ecosystem/plugins/capability.d.ts +0 -3
  151. package/dist/harness/extension/plugin-ecosystem/plugins/capability.js +0 -3
  152. package/dist/harness/extension/plugin-ecosystem/plugins/entry.d.ts +2 -10
  153. package/dist/harness/extension/plugin-ecosystem/plugins/entry.js +2 -9
  154. package/dist/harness/extension/plugin-ecosystem/plugins/index.d.ts +1 -3
  155. package/dist/harness/extension/plugin-ecosystem/plugins/index.js +1 -3
  156. package/dist/harness/extension/plugin-ecosystem/plugins/loader.d.ts +2 -4
  157. package/dist/harness/extension/plugin-ecosystem/plugins/loader.js +4 -21
  158. package/dist/harness/extension/plugin-ecosystem/plugins/manager.d.ts +3 -9
  159. package/dist/harness/extension/plugin-ecosystem/plugins/manager.js +4 -8
  160. package/dist/harness/extension/plugin-ecosystem/plugins/manifest.d.ts +1 -4
  161. package/dist/harness/extension/plugin-ecosystem/plugins/manifest.js +1 -3
  162. package/dist/harness/extension/plugin-ecosystem/skills/manager.d.ts +1 -1
  163. package/dist/harness/extension/plugin-ecosystem/skills/manager.js +1 -1
  164. package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.d.ts +51 -0
  165. package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +153 -0
  166. package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +1 -0
  167. package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +18 -3
  168. package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +277 -81
  169. package/dist/harness/extension/plugin-ecosystem/tools/delegation.d.ts +31 -0
  170. package/dist/harness/extension/plugin-ecosystem/tools/delegation.js +291 -0
  171. package/dist/harness/extension/plugin-ecosystem/tools/document-tools.js +10 -2
  172. package/dist/harness/extension/plugin-ecosystem/tools/env-info.js +1 -0
  173. package/dist/harness/extension/plugin-ecosystem/tools/eol.d.ts +35 -0
  174. package/dist/harness/extension/plugin-ecosystem/tools/eol.js +43 -0
  175. package/dist/harness/extension/plugin-ecosystem/tools/file-edit.js +40 -9
  176. package/dist/harness/extension/plugin-ecosystem/tools/file-ops.d.ts +33 -0
  177. package/dist/harness/extension/plugin-ecosystem/tools/file-ops.js +376 -0
  178. package/dist/harness/extension/plugin-ecosystem/tools/file-search.d.ts +12 -2
  179. package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +241 -70
  180. package/dist/harness/extension/plugin-ecosystem/tools/git-runner.d.ts +31 -0
  181. package/dist/harness/extension/plugin-ecosystem/tools/git-runner.js +104 -0
  182. package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.d.ts +111 -0
  183. package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.js +197 -0
  184. package/dist/harness/extension/plugin-ecosystem/tools/git-tools.d.ts +27 -0
  185. package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +463 -0
  186. package/dist/harness/extension/plugin-ecosystem/tools/http.d.ts +10 -6
  187. package/dist/harness/extension/plugin-ecosystem/tools/http.js +41 -47
  188. package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +6 -0
  189. package/dist/harness/extension/plugin-ecosystem/tools/index.js +4 -0
  190. package/dist/harness/extension/plugin-ecosystem/tools/knowledge.js +4 -0
  191. package/dist/harness/extension/plugin-ecosystem/tools/memory.js +25 -1
  192. package/dist/harness/extension/plugin-ecosystem/tools/package-tools.d.ts +13 -0
  193. package/dist/harness/extension/plugin-ecosystem/tools/package-tools.js +391 -0
  194. package/dist/harness/extension/plugin-ecosystem/tools/platform.d.ts +51 -2
  195. package/dist/harness/extension/plugin-ecosystem/tools/platform.js +151 -12
  196. package/dist/harness/extension/plugin-ecosystem/tools/session-history.js +2 -0
  197. package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.d.ts +10 -1
  198. package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.js +35 -19
  199. package/dist/harness/extension/plugin-ecosystem/tools/tool-set.d.ts +8 -0
  200. package/dist/harness/extension/plugin-ecosystem/tools/tool-set.js +5 -0
  201. package/dist/harness/extension/plugin-ecosystem/tools/web-search.js +1 -0
  202. package/dist/harness/governance/credentials/index.d.ts +1 -1
  203. package/dist/harness/governance/credentials/store.d.ts +16 -4
  204. package/dist/harness/governance/credentials/store.js +33 -6
  205. package/dist/harness/governance/credentials/types.d.ts +11 -0
  206. package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +105 -0
  207. package/dist/harness/governance/human-in-the-loop/decision-cache.js +184 -0
  208. package/dist/harness/governance/human-in-the-loop/index.d.ts +5 -5
  209. package/dist/harness/governance/human-in-the-loop/index.js +3 -3
  210. package/dist/harness/governance/human-in-the-loop/types.d.ts +7 -62
  211. package/dist/harness/governance/human-in-the-loop/types.js +6 -2
  212. package/dist/harness/governance/security/capability-enforcer.d.ts +9 -1
  213. package/dist/harness/governance/security/capability-enforcer.js +31 -8
  214. package/dist/harness/governance/security/degradation.js +5 -7
  215. package/dist/harness/governance/security/risk-evaluator.d.ts +1 -1
  216. package/dist/harness/governance/security/risk-evaluator.js +4 -82
  217. package/dist/harness/governance/security/temp-path.d.ts +41 -0
  218. package/dist/harness/governance/security/temp-path.js +117 -0
  219. package/dist/harness/governance/session-acl/index.d.ts +1 -0
  220. package/dist/harness/governance/session-acl/index.js +1 -0
  221. package/dist/harness/governance/session-acl/rights.d.ts +12 -0
  222. package/dist/harness/governance/session-acl/rights.js +89 -7
  223. package/dist/harness/governance/session-acl/seed-roles.js +9 -1
  224. package/dist/harness/governance/session-acl/service.js +21 -29
  225. package/dist/harness/governance/session-acl/tool-rights.d.ts +81 -0
  226. package/dist/harness/governance/session-acl/tool-rights.js +238 -0
  227. package/dist/harness/governance/session-acl/types.d.ts +22 -0
  228. package/dist/harness/index.d.ts +16 -12
  229. package/dist/harness/index.js +10 -6
  230. package/dist/harness/knowledge/file-identity.d.ts +8 -0
  231. package/dist/harness/knowledge/file-identity.js +26 -1
  232. package/dist/harness/knowledge/file-index-store.js +11 -11
  233. package/dist/harness/knowledge/grounding.d.ts +2 -1
  234. package/dist/harness/knowledge/grounding.js +8 -5
  235. package/dist/harness/knowledge/index-store.d.ts +31 -4
  236. package/dist/harness/knowledge/index-store.js +121 -39
  237. package/dist/harness/knowledge/index.d.ts +2 -2
  238. package/dist/harness/knowledge/index.js +1 -1
  239. package/dist/harness/knowledge/ingest.d.ts +115 -115
  240. package/dist/harness/knowledge/ingest.js +154 -151
  241. package/dist/harness/knowledge/job-control-state.js +4 -4
  242. package/dist/harness/knowledge/job-control.js +11 -11
  243. package/dist/harness/knowledge/knowledge-serve-child.js +1 -1
  244. package/dist/harness/knowledge/membership-store.js +11 -11
  245. package/dist/harness/knowledge/network-guard.d.ts +61 -4
  246. package/dist/harness/knowledge/network-guard.js +390 -113
  247. package/dist/harness/knowledge/purge.js +4 -1
  248. package/dist/harness/knowledge/query-service.js +3 -3
  249. package/dist/harness/knowledge/writer-service.d.ts +2 -0
  250. package/dist/harness/knowledge/writer-service.js +14 -13
  251. package/dist/harness/memory/backfill-coverage.js +3 -1
  252. package/dist/harness/memory/backfill-trigger.d.ts +2 -2
  253. package/dist/harness/memory/backfill-trigger.js +4 -4
  254. package/dist/harness/memory/index.d.ts +1 -0
  255. package/dist/harness/memory/index.js +1 -0
  256. package/dist/harness/memory/sqlite/agent-db.js +2 -0
  257. package/dist/harness/memory/sqlite/memory-store.d.ts +1 -0
  258. package/dist/harness/memory/sqlite/memory-store.js +14 -4
  259. package/dist/harness/memory/sqlite/wisdom-store.js +9 -9
  260. package/dist/harness/memory/store.d.ts +1 -0
  261. package/dist/harness/memory/store.js +3 -0
  262. package/dist/harness/memory/time-format.d.ts +28 -0
  263. package/dist/harness/memory/time-format.js +52 -0
  264. package/dist/harness/memory/types.d.ts +12 -0
  265. package/dist/harness/observability/observer/hub.js +53 -2
  266. package/dist/harness/observability/observer/index.d.ts +2 -2
  267. package/dist/harness/observability/observer/index.js +1 -1
  268. package/dist/harness/observability/observer/types.d.ts +80 -0
  269. package/dist/harness/observability/observer/types.js +118 -9
  270. package/dist/harness/run/agent/agent.d.ts +18 -0
  271. package/dist/harness/run/agent/agent.js +26 -0
  272. package/dist/harness/run/concurrency/tool-loop-detection-core.d.ts +1 -1
  273. package/dist/harness/run/concurrency/tool-loop-detection-core.js +1 -1
  274. package/dist/harness/run/reliability/harness-events.d.ts +4 -0
  275. package/dist/harness/run/reliability/run-agent.js +110 -18
  276. package/dist/harness/run/reliability/run-metrics-collector.d.ts +28 -2
  277. package/dist/harness/run/reliability/run-metrics-collector.js +92 -2
  278. package/dist/harness/run/run-guard/default-run-guard.d.ts +0 -5
  279. package/dist/harness/run/run-guard/default-run-guard.js +104 -44
  280. package/dist/harness/run/run-scope.d.ts +52 -0
  281. package/dist/harness/run/runner.d.ts +117 -16
  282. package/dist/harness/run/runner.js +668 -157
  283. package/dist/harness/session/attachments/llm-intent.js +17 -17
  284. package/dist/harness/session/history/port.js +16 -5
  285. package/dist/harness/session/in-memory-store.d.ts +6 -0
  286. package/dist/harness/session/in-memory-store.js +55 -3
  287. package/dist/harness/session/schedules/index.d.ts +10 -0
  288. package/dist/harness/session/schedules/index.js +10 -0
  289. package/dist/harness/session/schedules/render.d.ts +13 -0
  290. package/dist/harness/session/schedules/render.js +63 -0
  291. package/dist/harness/session/schedules/service.d.ts +179 -0
  292. package/dist/harness/session/schedules/service.js +695 -0
  293. package/dist/harness/session/schedules/store.d.ts +119 -0
  294. package/dist/harness/session/schedules/store.js +323 -0
  295. package/dist/harness/session/schedules/tools.d.ts +39 -0
  296. package/dist/harness/session/schedules/tools.js +442 -0
  297. package/dist/harness/session/schedules/types.d.ts +104 -0
  298. package/dist/harness/session/schedules/types.js +97 -0
  299. package/dist/harness/session/tasks/tools.js +22 -0
  300. package/dist/harness/session/title.js +25 -9
  301. package/dist/harness/session/types.d.ts +35 -0
  302. package/dist/harness/shared/events/agent-event-map.d.ts +39 -0
  303. package/dist/harness/shared/events/agent-event-map.js +2 -0
  304. package/dist/harness/shared/types/agent-definition.d.ts +23 -0
  305. package/dist/index.d.ts +25 -9
  306. package/dist/index.js +11 -2
  307. package/dist/integration/observability/run-telemetry.d.ts +8 -0
  308. package/dist/integration/observability/run-telemetry.js +31 -8
  309. package/dist/integration/observability/trace-collector.js +26 -4
  310. package/dist/integration/observability/trace-events.d.ts +1 -0
  311. package/dist/integration/observability/trace-events.js +2 -0
  312. package/dist/integration/observability/trace-logger.js +27 -17
  313. package/dist/integration/providers/anthropic.d.ts +10 -0
  314. package/dist/integration/providers/anthropic.js +44 -1
  315. package/dist/integration/providers/openai.d.ts +10 -0
  316. package/dist/integration/providers/openai.js +58 -2
  317. package/dist/integration/providers/wire-dump-diff.d.ts +191 -0
  318. package/dist/integration/providers/wire-dump-diff.js +351 -0
  319. package/dist/integration/providers/wire-dump.d.ts +178 -0
  320. package/dist/integration/providers/wire-dump.js +396 -0
  321. package/dist/integration/storage/jsonl.d.ts +29 -0
  322. package/dist/integration/storage/jsonl.js +243 -41
  323. package/dist/integration/storage/session-index.js +63 -8
  324. package/dist/paths.d.ts +19 -0
  325. package/dist/paths.js +38 -1
  326. package/dist/subsystems/cognition-steward/conceptualize/SUBSYSTEM.md +43 -43
  327. package/dist/subsystems/cognition-steward/conceptualize/config.yaml +50 -50
  328. package/dist/subsystems/cognition-steward/consolidate/SUBSYSTEM.md +6 -6
  329. package/dist/subsystems/cognition-steward/consolidate/config.yaml +54 -54
  330. package/dist/subsystems/memory-steward/backfill/handler.js +9 -0
  331. package/dist/subsystems/safety-guard/config.yaml +3 -1
  332. package/dist/subsystems/wisdom-steward/evaluate/config.yaml +50 -50
  333. package/dist/subsystems/wisdom-steward/formation/SUBSYSTEM.md +42 -42
  334. package/dist/subsystems/wisdom-steward/formation/config.yaml +54 -54
  335. package/dist/subsystems/wisdom-steward/govern/config.yaml +55 -55
  336. package/package.json +115 -115
  337. package/dist/harness/collaboration/multi-agent/agent-registry-types.d.ts +0 -144
  338. package/dist/harness/collaboration/multi-agent/agent-registry-types.js +0 -25
  339. package/dist/harness/collaboration/multi-agent/index.d.ts +0 -17
  340. package/dist/harness/collaboration/multi-agent/index.js +0 -15
  341. package/dist/harness/collaboration/multi-agent/process.d.ts +0 -167
  342. package/dist/harness/collaboration/multi-agent/process.js +0 -256
  343. package/dist/harness/collaboration/multi-agent/registry.d.ts +0 -36
  344. package/dist/harness/collaboration/multi-agent/registry.js +0 -137
  345. package/dist/harness/collaboration/multi-agent/swarm.d.ts +0 -135
  346. package/dist/harness/collaboration/multi-agent/swarm.js +0 -317
  347. package/dist/harness/collaboration/multi-agent/types.d.ts +0 -66
  348. package/dist/harness/collaboration/multi-agent/types.js +0 -15
  349. package/dist/harness/collaboration/orchestration/async-task-store.d.ts +0 -107
  350. package/dist/harness/collaboration/orchestration/async-task-store.js +0 -12
  351. package/dist/harness/collaboration/orchestration/async-task.d.ts +0 -156
  352. package/dist/harness/collaboration/orchestration/async-task.js +0 -359
  353. package/dist/harness/collaboration/orchestration/planner/hybrid-planner.d.ts +0 -47
  354. package/dist/harness/collaboration/orchestration/planner/hybrid-planner.js +0 -61
  355. package/dist/harness/collaboration/orchestration/planner/index.d.ts +0 -9
  356. package/dist/harness/collaboration/orchestration/planner/index.js +0 -6
  357. package/dist/harness/collaboration/orchestration/planner/llm-planner.d.ts +0 -54
  358. package/dist/harness/collaboration/orchestration/planner/llm-planner.js +0 -167
  359. package/dist/harness/collaboration/orchestration/planner/rule-planner.d.ts +0 -85
  360. package/dist/harness/collaboration/orchestration/planner/rule-planner.js +0 -175
  361. package/dist/harness/collaboration/orchestration/quality/classifier.d.ts +0 -21
  362. package/dist/harness/collaboration/orchestration/quality/classifier.js +0 -235
  363. package/dist/harness/collaboration/orchestration/quality/gate.d.ts +0 -29
  364. package/dist/harness/collaboration/orchestration/quality/gate.js +0 -409
  365. package/dist/harness/collaboration/orchestration/quality/index.d.ts +0 -9
  366. package/dist/harness/collaboration/orchestration/quality/index.js +0 -8
  367. package/dist/harness/collaboration/orchestration/quality/types.d.ts +0 -159
  368. package/dist/harness/collaboration/orchestration/quality/types.js +0 -33
  369. package/dist/harness/collaboration/orchestration/scheduler/index.d.ts +0 -5
  370. package/dist/harness/collaboration/orchestration/scheduler/index.js +0 -4
  371. package/dist/harness/collaboration/orchestration/scheduler/task-scheduler.d.ts +0 -143
  372. package/dist/harness/collaboration/orchestration/scheduler/task-scheduler.js +0 -297
  373. package/dist/harness/collaboration/orchestration/strategy/classifier.d.ts +0 -12
  374. package/dist/harness/collaboration/orchestration/strategy/classifier.js +0 -81
  375. package/dist/harness/collaboration/orchestration/strategy/index.d.ts +0 -3
  376. package/dist/harness/collaboration/orchestration/strategy/index.js +0 -2
  377. package/dist/harness/collaboration/orchestration/strategy/router.d.ts +0 -28
  378. package/dist/harness/collaboration/orchestration/strategy/router.js +0 -105
  379. package/dist/harness/collaboration/orchestration/strategy/types.d.ts +0 -49
  380. package/dist/harness/collaboration/orchestration/strategy/types.js +0 -4
  381. package/dist/harness/collaboration/orchestration/workflow/engine.d.ts +0 -86
  382. package/dist/harness/collaboration/orchestration/workflow/engine.js +0 -298
  383. package/dist/harness/collaboration/orchestration/workflow/index.d.ts +0 -9
  384. package/dist/harness/collaboration/orchestration/workflow/index.js +0 -7
  385. package/dist/harness/collaboration/orchestration/workflow/types.d.ts +0 -143
  386. package/dist/harness/collaboration/orchestration/workflow/types.js +0 -7
  387. package/dist/harness/governance/human-in-the-loop/approval-manager.d.ts +0 -32
  388. package/dist/harness/governance/human-in-the-loop/approval-manager.js +0 -93
  389. /package/dist/harness/collaboration/{multi-agent → delegation}/message-channel-types.d.ts +0 -0
  390. /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
17
  import { extractLayerQuery } from '../context/layer-types.js';
16
- import { withRuntimeEnvironmentInjection } from '../context/runtime-datetime.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') } };
@@ -93,10 +104,13 @@ export function adaptLoopEvent(event, meta, state) {
93
104
  usage: event.usage,
94
105
  truncated: event.truncated,
95
106
  error: event.error,
107
+ llmTiming: event.llmTiming,
96
108
  },
97
109
  };
98
110
  case 'llm_stream_delta':
99
111
  return { type: 'llm_stream_delta', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: event.data };
112
+ case 'llm_thinking_delta':
113
+ return { type: 'llm_thinking_delta', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: event.data };
100
114
  case 'tool_start':
101
115
  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
116
  case 'tool_end':
@@ -112,13 +126,28 @@ export function adaptLoopEvent(event, meta, state) {
112
126
  hasError: !!event.result.isError,
113
127
  result: event.result.content,
114
128
  durationMs: event.result.durationMs,
129
+ purpose: event.result.purpose,
115
130
  },
116
131
  };
117
132
  case 'stream.fallback_to_sync':
118
133
  case 'stream.fallback_failed':
119
134
  // 必须带 session 元数据:gatewayBus.onAll 以 event.sessionId 为 WS 广播前提
120
135
  return { type: event.type, timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: event.data };
121
- case 'budget_exceeded':
136
+ case 'budget_exceeded': {
137
+ // 预算 hard 终态(wall_clock / iteration / tool_calls)——也是「引擎主动停止」,
138
+ // 必须带来可读原因,否则收口只能落到「引擎判定停止」的空泛兜底。
139
+ //
140
+ // 终态事件用赋值(不用 ??=):同一 turn 里若先有非终态信号(如 security_blocked),
141
+ // 最终文案必须归因到真正的停止闸门。
142
+ const budgetReason = event.data?.reason ?? 'wall_clock';
143
+ state.stopReason = 'policy_stopped';
144
+ state.stopDetail = budgetReason;
145
+ state.stopMessage =
146
+ budgetReason === 'wall_clock'
147
+ ? '本轮运行时间达到预算上限,已停止。'
148
+ : budgetReason === 'iteration'
149
+ ? '本轮迭代次数达到预算上限,已停止。'
150
+ : '本轮工具调用次数达到预算上限,已停止。';
122
151
  // 对齐 EventBus BUDGET_EXCEEDED;用户可见停止原因
123
152
  return {
124
153
  type: 'budget.exceeded',
@@ -127,6 +156,7 @@ export function adaptLoopEvent(event, meta, state) {
127
156
  sessionId: meta.sessionId,
128
157
  data: { ...event.data },
129
158
  };
159
+ }
130
160
  // P2 BudgetControlEvent 新形状
131
161
  case 'budget.wrap_up':
132
162
  return {
@@ -144,8 +174,10 @@ export function adaptLoopEvent(event, meta, state) {
144
174
  },
145
175
  };
146
176
  case 'budget.exceeded':
147
- // 跟踪停止原因:context / policy
177
+ // 跟踪停止原因:context / policy(终态;覆盖此前非终态信号)
148
178
  state.stopReason = event.metric === 'context' ? 'context_stopped' : 'policy_stopped';
179
+ state.stopMessage = event.userMessage;
180
+ state.stopDetail = `${event.metric}${event.unit ? `/${event.unit}` : ''}`;
149
181
  return {
150
182
  type: 'budget.exceeded',
151
183
  timestamp: event.timestamp,
@@ -158,8 +190,10 @@ export function adaptLoopEvent(event, meta, state) {
158
190
  },
159
191
  };
160
192
  case 'run_guard_stopped':
161
- // 跟踪停止原因:behavior
193
+ // 跟踪停止原因:behavior(终态;覆盖此前非终态信号)
162
194
  state.stopReason = 'behavior_stopped';
195
+ state.stopMessage = event.data.userMessage;
196
+ state.stopDetail = event.data.reason;
163
197
  return {
164
198
  type: 'run_guard.stopped',
165
199
  timestamp: event.timestamp,
@@ -197,6 +231,24 @@ export function adaptLoopEvent(event, meta, state) {
197
231
  * SessionAwareRunner
198
232
  */
199
233
  export class SessionAwareRunner {
234
+ /** 本 Runner 生效的 L2 级别(由 effectPolicy 展开) */
235
+ effectPathContainment = "none";
236
+ effectChannel = "engine";
237
+ effectAllowRoots = [];
238
+ /** Effective effectPolicy.mode (for Runtime injection / UI) */
239
+ effectMode = 'workspace';
240
+ effectCommitManual = false;
241
+ /** store 缺 syncMessages 通道时只 warn 一次 */
242
+ warnedMissingSync = false;
243
+ effectProcessLimits = true;
244
+ effectNetwork;
245
+ effectRequireJail;
246
+ effectRequireCredentialBindings = false;
247
+ effectHomeWrite;
248
+ effectShellEscape = "allow";
249
+ effectShellJournal = "snapshot";
250
+ effectShellJournalLimit;
251
+ effectUndoLimit;
200
252
  agent;
201
253
  harness;
202
254
  store;
@@ -221,7 +273,7 @@ export class SessionAwareRunner {
221
273
  lastCleanPersonaPrompt;
222
274
  /** 按层契约组装 system prompt(persona + runtime);未设置时退回字符串拼接 */
223
275
  systemPromptAssembler;
224
- /** 会话重置时清理 Assembler 层缓存 */
276
+ /** Assembler 层缓存清理钩子(可选接线;与 contextDetachIndex 无关) */
225
277
  systemPromptAssemblerClear;
226
278
  /** turn 级 Knowledge grounding(可选;arch/knowledge-layer.md §4.4) */
227
279
  groundingAssembler;
@@ -344,6 +396,10 @@ export class SessionAwareRunner {
344
396
  *
345
397
  * 每轮在 persona resolve 与 injectedContext 计算完成后调用,
346
398
  * 替代原先的字符串拼接。未设置时保持旧路径(兼容)。
399
+ *
400
+ * E8 契约:`injectedContext` 保持合并形态(兼容旧 assembler,零能力丢失);
401
+ * 拆分字段 `volatileContext`(易变份→快照)与 `runtimeAnchors`(稳定份→system)同时传入,
402
+ * 默认 assembler 优先用拆分字段;降级/无 assembler 路径同样产出快照(E8 形态不破)。
347
403
  */
348
404
  setSystemPromptAssembler(assembler, clearSession) {
349
405
  this.systemPromptAssembler = assembler;
@@ -365,6 +421,10 @@ export class SessionAwareRunner {
365
421
  * @yields AgentEvent 事件流(向后兼容格式)
366
422
  */
367
423
  async *handle(sessionId, input, runConfig, signal) {
424
+ /** 本轮文件 undo(L3);中止保留,其余出口 commit */
425
+ let turnFileUndo;
426
+ // run 收口计时(`[timing]` 探针转正,F3):wait/build/run_end 走 eventSink → trace
427
+ const timingRunEnter = Date.now();
368
428
  // 1. 并发门控(如果配置了 SessionGate);排队期间响应 abort
369
429
  const gate = this.config.sessionGate;
370
430
  let gateRelease;
@@ -398,19 +458,46 @@ export class SessionAwareRunner {
398
458
  gateRelease?.();
399
459
  return;
400
460
  }
461
+ // run.timing 先落 trace(eventSink 时序保真);Hub 侧投递推迟到 recordRunStart 之后——
462
+ // 否则 run_start/context_ready 早于 run 记录创建,会被 ingestEvent 归到上一轮 run
463
+ const pendingObservedTimings = [];
464
+ const runStartTiming = {
465
+ type: 'run.timing',
466
+ timestamp: Date.now(),
467
+ sessionId,
468
+ agentId: runConfig.agentId ?? 'default',
469
+ data: { stage: 'run_start', waitMs: Date.now() - timingRunEnter },
470
+ };
471
+ this.config.eventSink?.(runStartTiming, { sessionId, agentId: runConfig.agentId ?? 'default' });
472
+ pendingObservedTimings.push(runStartTiming);
473
+ // buildMs 从拿锁后起算(含 wait 会双重计时;F3-d 耗时区按分段展示)
474
+ const runStartTs = Date.now();
401
475
  const _agentId = runConfig.agentId ?? 'default';
402
476
  /** Observer 收口状态(finally 统一关闭,含异常路径) */
403
477
  let observerRunId = '';
404
478
  let observerFinalMessages;
405
479
  let observerEndReason;
480
+ /**
481
+ * 桥接状态(assistant 文本 / 停止原因)。
482
+ *
483
+ * 声明在 try 之外:finally 的 run_end 观测要读 stopReason,
484
+ * 否则「run 为什么结束」在日志里不可见。
485
+ */
486
+ const adaptState = { assistantContent: '', lastUserContent: '' };
406
487
  let observerErrorMsg;
407
488
  let hasTurnEnd = false;
489
+ /** 正常完成时需在持久化后真删 metadata.lastStop(save 浅合并删不掉) */
490
+ let clearLastStop = false;
491
+ /** 本 user turn 内第 N 次 LLM 调用(0-based;cache 观测) */
492
+ let llmCallIndexInUserTurn = 0;
408
493
  try {
409
494
  // 3. 加载或创建 session
410
495
  let session = await this.store.load(sessionId);
411
496
  if (!session) {
412
497
  session = this.createSession(sessionId, runConfig.agentId ?? 'default');
413
498
  }
499
+ /** 上下文租约点之前的 Discourse 前缀(写回时并回,不进默认 LLM 窗口) */
500
+ let contextLeasePrefix = [];
414
501
  // 模型 2:历史数据缺省 primary 时回填(单 agent 行为不变)
415
502
  if (!session.primaryAgentId) {
416
503
  session.primaryAgentId = session.agentId || _agentId;
@@ -419,11 +506,15 @@ export class SessionAwareRunner {
419
506
  session.tasks = [];
420
507
  // E6:可选 ACL(注入时才强制);primary 自动 owner;带入 agent 天花板
421
508
  const acl = this.config.sessionAcl;
509
+ let sessionToolRights;
510
+ // D3:本 Run 的 effective rights,供委派传播(只读,不改共享 harness)
511
+ let runSessionRights;
422
512
  if (acl) {
423
513
  const auth = acl.authorizeRun({
424
514
  session,
425
515
  agentId: _agentId,
426
- agentMax: this.config.agentMaxSessionRights,
516
+ // D3:Run 级天花板与模板天花板取交集,只收紧不放宽
517
+ agentMax: tightenSessionRights(this.config.agentMaxSessionRights, runConfig.rightsCeiling),
427
518
  });
428
519
  if (!auth.ok) {
429
520
  yield {
@@ -435,12 +526,33 @@ export class SessionAwareRunner {
435
526
  };
436
527
  return;
437
528
  }
529
+ sessionToolRights = auth.rights?.toolRights;
530
+ runSessionRights = auth.rights;
531
+ }
532
+ // SEC-2: keep rights on this run only (harness is shared across sessions)
533
+ const runToolRights = sessionToolRights;
534
+ const runToolPolicy = this.config.agentToolPolicy;
535
+ // 4. 上下文租约(opt-in;只标截断点,不改 Discourse)
536
+ this.applyContextLease(session);
537
+ // 4a. 新一轮开始:作废上一轮中止标记(避免已完成轮仍显示编辑重发)
538
+ if (session.metadata?.abortedTurn) {
539
+ session.metadata = { ...session.metadata };
540
+ delete session.metadata.abortedTurn;
541
+ // 与 save 浅合并对齐:立即 updateMetadata 真删,防止本轮 save 又合并回来
542
+ if (this.store.updateMetadata) {
543
+ await this.store.updateMetadata(sessionId, (meta) => {
544
+ delete meta.abortedTurn;
545
+ });
546
+ }
438
547
  }
439
- // 4. 检查 session 是否需要重置
440
- this.checkSessionReset(session);
441
548
  // 4b. 绑定会话任务服务(工具与注入共用同一内存对象)
442
549
  this.config.sessionTaskService?.attachSession(session);
443
- // 5. 追加用户消息
550
+ // 4c. turn 信封:补闭上一 turn;分配本 turn id(t1,t2,… 会话内单调)
551
+ this.ensurePreviousTurnClosed(session);
552
+ const turnSeq = Number(session.metadata?.turnSeq ?? 0) + 1;
553
+ const currentTurnId = formatTurnId(turnSeq);
554
+ session.metadata = { ...session.metadata, turnSeq };
555
+ // 5. 追加用户消息(正文稍后一次定形为 <turn_start>)
444
556
  session.messages.push(input);
445
557
  session.meta.lastInteractionAt = Date.now();
446
558
  session.meta.updatedAt = Date.now();
@@ -481,6 +593,23 @@ export class SessionAwareRunner {
481
593
  };
482
594
  }
483
595
  }
596
+ // 6b. 会话日程注入(arch/session-schedules.md §8)
597
+ if (this.config.sessionScheduleService) {
598
+ const schedules = this.config.sessionScheduleService.list(session.id, {
599
+ activeOnly: true,
600
+ });
601
+ const { renderSessionSchedulesInjection } = await import('../session/schedules/render.js');
602
+ const scheduleInjection = renderSessionSchedulesInjection(schedules);
603
+ if (scheduleInjection) {
604
+ const baseInjected = effectiveRunConfig.injectedContext;
605
+ effectiveRunConfig = {
606
+ ...effectiveRunConfig,
607
+ injectedContext: baseInjected
608
+ ? `${baseInjected}\n\n${scheduleInjection}`
609
+ : scheduleInjection,
610
+ };
611
+ }
612
+ }
484
613
  // 7. 应用自主子系统的待处理注入
485
614
  if (this._subsystemRuntime) {
486
615
  if (this._events) {
@@ -507,8 +636,41 @@ export class SessionAwareRunner {
507
636
  };
508
637
  }
509
638
  }
510
- // Runtime 锚点:时间 + 工具工作目录(模型据此优先在 workspace 找文件,而非全盘扫)
511
- // cwd 与下方 I5 toolRuntime.cwd 同源同构,保证 system prompt 与工具解析一致
639
+ // P3:effectPolicy → L2 path containment + session 临时 root
640
+ // 必须在 Runtime 注入之前,system prompt 才能带上 allowRoots / effectMode
641
+ {
642
+ const { resolveEffectiveEffectPolicy, readSessionEffectOverrides, mergeTransactionRoots, requiresJail } = await import('../extension/execution-environment/effect-policy.js');
643
+ const { probeProcessIsolation } = await import('../extension/execution-environment/process-isolation.js');
644
+ const isolation = await probeProcessIsolation();
645
+ const eff = resolveEffectiveEffectPolicy(this.config.effectPolicy ?? {}, this.config.agentWorkspace ?? effectiveRunConfig.cwd ?? undefined, isolation);
646
+ const sessionExtraRoots = readSessionEffectOverrides(session.metadata).transactionRoots;
647
+ this.effectPathContainment = eff.pathContainment;
648
+ this.effectChannel = eff.effects;
649
+ this.effectAllowRoots = mergeTransactionRoots(eff.allowRoots, sessionExtraRoots);
650
+ this.effectMode = eff.mode;
651
+ this.effectCommitManual = eff.commit === 'manual';
652
+ this.effectProcessLimits = eff.processLimits;
653
+ this.effectShellEscape = eff.shellEscape;
654
+ this.effectShellJournal = eff.shellJournal;
655
+ this.effectNetwork = eff.network;
656
+ this.effectRequireJail = requiresJail(eff);
657
+ this.effectRequireCredentialBindings =
658
+ this.config.requireCredentialBindings === true || requiresJail(eff);
659
+ this.effectHomeWrite = eff.mode === 'project' || eff.mode === 'host';
660
+ this.effectShellJournalLimit = eff.shellJournalLimit;
661
+ this.effectUndoLimit = eff.undoLimit;
662
+ // untrusted admission: reduced surface strips egress/exec tools
663
+ this.harness.toolSurface = eff.toolSurface;
664
+ if (eff.securityDegraded.length > 0) {
665
+ this.harness.securityDegraded = eff.securityDegraded;
666
+ }
667
+ }
668
+ // Runtime 锚点:时间 + 工具工作目录 + 允许根/效应模式
669
+ // cwd 与下方 I5 toolRuntime.cwd 同源同构;allowRoots 含 session 临时 root
670
+ // E8:拆稳定锚点(留 system)与易变注入(进本轮快照)
671
+ let runtimeAnchorsText = '';
672
+ let runtimeVolatileText = '';
673
+ let runtimeSnapshotText = null;
512
674
  {
513
675
  const runtimeIsolationMode = effectiveRunConfig.toolIsolation
514
676
  ?? this.config.toolIsolation
@@ -520,10 +682,24 @@ export class SessionAwareRunner {
520
682
  sessionId,
521
683
  baseCwd: runtimeBaseCwd,
522
684
  }).cwd;
685
+ const rootInstructions = await loadRootInstructionsInjection(this.effectAllowRoots, {
686
+ cwd: runtimeCwd,
687
+ });
688
+ const runtimeSplit = splitRuntimeEnvironmentInjection(effectiveRunConfig.injectedContext, {
689
+ cwd: runtimeCwd,
690
+ allowRoots: this.effectAllowRoots,
691
+ effectMode: this.effectMode,
692
+ rootInstructions,
693
+ });
694
+ runtimeAnchorsText = runtimeSplit.anchors;
695
+ runtimeVolatileText = runtimeSplit.volatile;
523
696
  effectiveRunConfig = {
524
697
  ...effectiveRunConfig,
525
698
  injectedContext: withRuntimeEnvironmentInjection(effectiveRunConfig.injectedContext, {
526
699
  cwd: runtimeCwd,
700
+ allowRoots: this.effectAllowRoots,
701
+ effectMode: this.effectMode,
702
+ rootInstructions,
527
703
  }),
528
704
  };
529
705
  }
@@ -536,7 +712,7 @@ export class SessionAwareRunner {
536
712
  systemPrompt: '',
537
713
  messages: session.messages,
538
714
  // 会话级 tool 面:Client Tool 无 live client 时不进 LLM 列表
539
- tools: this.agent.toolsForSession(sessionId),
715
+ tools: this.filterToolsForSessionRights(this.agent.toolsForSession(sessionId), runToolRights, runToolPolicy),
540
716
  };
541
717
  // 播种压缩状态(E4 键 = sessionId × agentId);供 convertToLlm / 重启重建
542
718
  this.agent.setSessionCompactState(sessionId, _agentId, readSessionCompact(session, _agentId));
@@ -610,11 +786,16 @@ export class SessionAwareRunner {
610
786
  messages: session.messages,
611
787
  persona: basePrompt,
612
788
  injectedContext: effectiveRunConfig.injectedContext,
789
+ volatileContext: runtimeVolatileText,
790
+ runtimeAnchors: runtimeAnchorsText,
613
791
  contextWindow: effectiveRunConfig.contextWindow,
614
792
  topicHints,
615
793
  signal,
616
794
  });
617
795
  runContext.systemPrompt = assembled.systemPrompt;
796
+ runtimeSnapshotText = assembled.runtimeSnapshot?.trim()
797
+ ? assembled.runtimeSnapshot
798
+ : null;
618
799
  if (assembled.manifest) {
619
800
  const assembledAt = Date.now();
620
801
  this.emitObserved({
@@ -637,7 +818,9 @@ export class SessionAwareRunner {
637
818
  // 装配失败:回退拼接,保证本轮可跑
638
819
  const errMsg = err instanceof Error ? err.message : String(err);
639
820
  console.warn(`[octopi] system prompt assemble failed (session=${sessionId}): ${errMsg}; falling back to concat`);
640
- runContext.systemPrompt = this.concatSystemPrompt(basePrompt, effectiveRunConfig.injectedContext, personaFromResolver);
821
+ // F12:降级轮保持 E8 形态——锚点进 system,易变份走**新鲜**快照(防旧快照被 last-only 回放)
822
+ runContext.systemPrompt = this.concatSystemPrompt(basePrompt, runtimeAnchorsText, personaFromResolver);
823
+ runtimeSnapshotText = runtimeVolatileText.trim() ? runtimeVolatileText : null;
641
824
  this.emitObserved({
642
825
  type: 'context.layers.assembled',
643
826
  timestamp: Date.now(),
@@ -661,7 +844,9 @@ export class SessionAwareRunner {
661
844
  }
662
845
  }
663
846
  else {
664
- runContext.systemPrompt = this.concatSystemPrompt(basePrompt, effectiveRunConfig.injectedContext, personaFromResolver);
847
+ // F12:无 assembler 也保持 E8 形态(锚点进 system,易变份走快照)
848
+ runContext.systemPrompt = this.concatSystemPrompt(basePrompt, runtimeAnchorsText, personaFromResolver);
849
+ runtimeSnapshotText = runtimeVolatileText.trim() ? runtimeVolatileText : null;
665
850
  }
666
851
  // system prompt 终装后:turn 级 Knowledge grounding(消息侧插槽,不进 system)
667
852
  // 先算 pack;写入 runScope / 插入消息在 runScope 创建之后
@@ -680,6 +865,25 @@ export class SessionAwareRunner {
680
865
  pendingGrounding = null;
681
866
  }
682
867
  }
868
+ // system prompt 装配 + grounding 全部就绪;buildMs = 组装耗时。
869
+ // 口径注记(arch/b0-cache-stable-context.md §5):sysChars 是稳定前缀规模,
870
+ // E8 后不含易变快照——勿与旧 `[timing]` 基线直接对比。
871
+ const contextReadyTiming = {
872
+ type: 'run.timing',
873
+ timestamp: Date.now(),
874
+ sessionId,
875
+ agentId: _agentId,
876
+ data: {
877
+ stage: 'context_ready',
878
+ buildMs: Date.now() - runStartTs,
879
+ msgs: session.messages.length,
880
+ sysChars: (runContext.systemPrompt ?? '').length,
881
+ groundingTokens: pendingGrounding ? pendingGrounding.tokens : 0,
882
+ },
883
+ };
884
+ this.config.eventSink?.(contextReadyTiming, { sessionId, agentId: _agentId });
885
+ // Hub 投递同样推迟到 recordRunStart 之后(见 run_start 处注释)
886
+ pendingObservedTimings.push(contextReadyTiming);
683
887
  // 更新 harness 的 sessionId/agentId(checkpoint 回退;权威身份在 RunScope ALS)
684
888
  this.harness.sessionId = sessionId;
685
889
  this.harness.agentId = effectiveRunConfig.agentId ?? 'default';
@@ -707,8 +911,24 @@ export class SessionAwareRunner {
707
911
  }
708
912
  // Run 身份与 RunScope 对齐(Observer/审计共用,不另造第二套 ID)
709
913
  const runId = createRunId(sessionId, _agentId);
710
- const attachmentRoots = this.config.sessionAttachmentsBaseDir
711
- ? [join(this.config.sessionAttachmentsBaseDir, toSessionFileName(sessionId), 'attachments')]
914
+ const attachmentRoots = this.config.sessionsDir
915
+ ? [join(this.config.sessionsDir, toSessionFileName(sessionId), 'attachments')]
916
+ : undefined;
917
+ // L3:本轮文件 undo(ToolEffectPolicy)。无 sessionsDir 时 fail-closed,禁止静默免记写盘。
918
+ const { TurnFileUndoLog, createUnconfiguredFileEffects } = await import('../extension/execution-environment/undo-log.js');
919
+ const fileUndo = this.config.sessionsDir
920
+ ? await TurnFileUndoLog.begin({
921
+ sessionsDir: this.config.sessionsDir,
922
+ sessionId,
923
+ undoLimit: this.effectUndoLimit,
924
+ })
925
+ : undefined;
926
+ turnFileUndo = fileUndo;
927
+ const { createUnconfiguredMemoryEffects: unconfMem, resolveSessionUndoPaths, } = await import('../extension/execution-environment/undo-log.js');
928
+ const fileEffects = fileUndo ?? createUnconfiguredFileEffects();
929
+ const memoryEffects = fileUndo?.memoryEffects ?? unconfMem();
930
+ const undoRoots = this.config.sessionsDir
931
+ ? [resolveSessionUndoPaths(this.config.sessionsDir, sessionId).root]
712
932
  : undefined;
713
933
  const runScope = {
714
934
  sessionId,
@@ -723,6 +943,36 @@ export class SessionAwareRunner {
723
943
  cwd: resolvedToolCwd.cwd,
724
944
  isolation: resolvedToolCwd.mode,
725
945
  attachmentRoots,
946
+ fileEffects,
947
+ memoryEffects,
948
+ undoRoots,
949
+ networkPolicy: this.effectNetwork,
950
+ // 单源:effectRequireCredentialBindings 已在解析时含 requiresJail(eff)(= untrusted),
951
+ // 此处再判 effectMode 是等价冗余,已收编。
952
+ requireCredentialBindings: this.effectRequireCredentialBindings,
953
+ requireJail: this.effectRequireJail,
954
+ homeWrite: this.effectHomeWrite,
955
+ noteSecurityDegraded: (reason) => {
956
+ this.harness.securityDegraded = [
957
+ ...(this.harness.securityDegraded ?? []),
958
+ reason,
959
+ ];
960
+ },
961
+ pathRoots: this.effectAllowRoots.length
962
+ ? this.effectAllowRoots
963
+ : resolvedToolCwd.cwd
964
+ ? [resolvedToolCwd.cwd]
965
+ : undefined,
966
+ pathContainment: this.effectPathContainment,
967
+ confirmEffect: this.config.confirmEffect,
968
+ effectChannel: this.effectChannel,
969
+ processLimits: this.effectProcessLimits,
970
+ shellEscape: this.effectShellEscape,
971
+ shellJournal: this.effectShellJournal,
972
+ shellJournalLimit: this.effectShellJournalLimit,
973
+ sessionToolRights: runToolRights,
974
+ sessionRights: runSessionRights,
975
+ agentToolPolicy: runToolPolicy,
726
976
  },
727
977
  };
728
978
  if (pendingGrounding) {
@@ -735,19 +985,20 @@ export class SessionAwareRunner {
735
985
  };
736
986
  }
737
987
  {
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 不同)
988
+ // turn 信封:槽位拼进本 turn user 消息(一次定形),全回放、不再剥插槽。
989
+ // 上下文租约:detach 点之前的历史不进默认 LLM 窗口(Discourse 仍在 session.messages)
990
+ const detachIdx = Math.min(Math.max(session.contextDetachIndex ?? 0, 0), session.messages.length);
991
+ contextLeasePrefix = session.messages.slice(0, detachIdx);
992
+ const baseMsgs = session.messages.slice(detachIdx);
993
+ // OP-15:会话附件资料块(进 turn_context)
743
994
  let attachmentText = null;
744
- if (this.config.sessionAttachmentsBaseDir) {
995
+ if (this.config.sessionsDir) {
745
996
  try {
746
997
  const { SessionAttachmentService, buildAttachmentGroundingText, resolveInjectPlan, createLlmIntentResolver, } = await import('../session/attachments/index.js');
747
998
  const attachSvc = new SessionAttachmentService({
748
- sessionsDir: this.config.sessionAttachmentsBaseDir,
999
+ sessionsDir: this.config.sessionsDir,
749
1000
  });
750
- const lastUser = [...session.messages].reverse().find((m) => m.role === 'user');
1001
+ const lastUser = input;
751
1002
  const attachIds = Array.isArray(lastUser?.metadata?.attachmentIds)
752
1003
  ? lastUser.metadata.attachmentIds.filter((x) => typeof x === 'string')
753
1004
  : [];
@@ -788,54 +1039,38 @@ export class SessionAwareRunner {
788
1039
  console.warn(`[octopi] attachment grounding failed (session=${sessionId}): ${attErr instanceof Error ? attErr.message : String(attErr)}`);
789
1040
  }
790
1041
  }
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
- }
1042
+ const slotsXml = joinSlotXml([
1043
+ {
1044
+ tag: 'runtime_snapshot',
1045
+ body: runtimeSnapshotText ? runtimeSnapshotText : '',
1046
+ },
1047
+ {
1048
+ tag: 'session_attachments',
1049
+ body: attachmentText ?? '',
1050
+ },
1051
+ {
1052
+ tag: 'knowledge_grounding',
1053
+ body: pendingGrounding && pendingGrounding.mode !== 'none' && pendingGrounding.text?.trim()
1054
+ ? pendingGrounding.text
1055
+ : '',
1056
+ },
1057
+ ]);
1058
+ const turnContextXml = formatTurnContextXml({
1059
+ turnId: currentTurnId,
1060
+ slotsXml,
1061
+ });
1062
+ this.bakeTurnStart(input, currentTurnId, turnContextXml);
1063
+ // 视图 = detach 切片(含已定形 user);全回放,无条件成为 LLM 窗口
1064
+ runContext.messages = baseMsgs;
1065
+ if (runScope.toolRuntime) {
1066
+ runScope.toolRuntime.messages = baseMsgs;
837
1067
  }
838
1068
  }
1069
+ // Run 进行中转录增量落盘:turn_start 定形后立即同步一次(此后新消息
1070
+ // 定形随 loop 事件增量同步)。写失败不中断 Run(收尾 save 是权威写),
1071
+ // 失败不推进已同步计数,下个事件重试。
1072
+ const firstSynced = await this.persistRunMessages(sessionId, _agentId, contextLeasePrefix, runContext.messages);
1073
+ let syncedMessageCount = firstSynced ? runContext.messages.length : 0;
839
1074
  // Observer 通道:Run 现场快照(摘要进事件;全文由 Hub/REST 提供)
840
1075
  if (this._observerHub?.isEnabled()) {
841
1076
  observerRunId =
@@ -852,6 +1087,10 @@ export class SessionAwareRunner {
852
1087
  messages: session.messages,
853
1088
  }) || runId;
854
1089
  if (observerRunId) {
1090
+ // run 记录已建:补投 run_start/context_ready 到 Hub(此前投会被归到上一轮 run)
1091
+ for (const pending of pendingObservedTimings.splice(0)) {
1092
+ this.emitObserved(pending);
1093
+ }
855
1094
  const hubSnapshot = this._observerHub.getRunById(observerRunId);
856
1095
  if (hubSnapshot) {
857
1096
  this.emitObserved({
@@ -890,10 +1129,14 @@ export class SessionAwareRunner {
890
1129
  // 10. 运行 Agent(Agent.run = reliability 包装;context/runScope 为本 Run 私有)
891
1130
  let streamedContent = '';
892
1131
  let lastUsage = undefined;
1132
+ /** 最近一次 turn.end 的上下文用量(供收尾持久化;compact 视图值不进此账) */
1133
+ let lastContextTokens = undefined;
1134
+ let lastContextWindow = undefined;
893
1135
  const meta = { agentId: effectiveRunConfig.agentId ?? 'default', sessionId };
894
- const adaptState = { assistantContent: '', lastUserContent: '' };
895
1136
  /** 本轮起始消息下标(afterTurn 只传增量) */
896
1137
  let turnStartIndex = runContext.messages.length;
1138
+ /** 用户中止(编辑重发标记用) */
1139
+ let runAborted = false;
897
1140
  // resolvedModel 已在 system assembler 之前解析;此处只组装 run options
898
1141
  const agentRunOptions = {
899
1142
  resolvedModel: resolvedModel ?? undefined,
@@ -901,6 +1144,22 @@ export class SessionAwareRunner {
901
1144
  runScope,
902
1145
  };
903
1146
  for await (const loopEvent of this.agent.run(signal, undefined, agentRunOptions)) {
1147
+ // 消息数组增长 = 有新消息定形/入列(流式 delta 不 push 消息,不触发)。
1148
+ // 覆盖 assistant/tool/followUp/steering 全部 push 点:push 必发生在
1149
+ // 某个事件 yield 之前,下一迭代开头即可看到。
1150
+ if (runContext.messages.length !== syncedMessageCount) {
1151
+ if (await this.persistRunMessages(sessionId, _agentId, contextLeasePrefix, runContext.messages)) {
1152
+ syncedMessageCount = runContext.messages.length;
1153
+ }
1154
+ }
1155
+ else if (loopEvent.type === 'turn_end') {
1156
+ // 漂移兜底:turn 边界无条件对齐一次(旁路写者整包回退后即使暂无
1157
+ // 新消息也能自愈;无漂移时幂等零写)
1158
+ await this.persistRunMessages(sessionId, _agentId, contextLeasePrefix, runContext.messages);
1159
+ }
1160
+ if (loopEvent.type === 'agent_end' && loopEvent.reason === 'aborted') {
1161
+ runAborted = true;
1162
+ }
904
1163
  // 适配事件格式(向后兼容)
905
1164
  const adapted = adaptLoopEvent(loopEvent, meta, adaptState);
906
1165
  if (adapted) {
@@ -911,20 +1170,39 @@ export class SessionAwareRunner {
911
1170
  if (rawUsage) {
912
1171
  lastUsage = rawUsage;
913
1172
  }
914
- adapted.data.contextTokens =
915
- lastUsage?.inputReportedTokens ??
916
- (lastUsage
917
- ? lastUsage.inputUncachedTokens + lastUsage.inputCachedTokens + lastUsage.inputCacheWriteTokens
918
- : undefined) ??
919
- estimator.estimateMessages(session.messages);
1173
+ const contextTokens = lastUsage?.inputReportedTokens ??
1174
+ (lastUsage
1175
+ ? lastUsage.inputUncachedTokens + lastUsage.inputCachedTokens + lastUsage.inputCacheWriteTokens
1176
+ : undefined) ??
1177
+ estimator.estimateMessages(session.messages);
1178
+ adapted.data.contextTokens = contextTokens;
920
1179
  adapted.data.contextWindow = effectiveRunConfig.contextWindow;
1180
+ // cache 观测:user 轮首调用 vs 同轮后续(跨轮前缀是否命中)
1181
+ if (lastUsage) {
1182
+ const cached = lastUsage.inputCachedTokens ?? 0;
1183
+ const uncached = lastUsage.inputUncachedTokens ?? 0;
1184
+ const cacheWrite = lastUsage.inputCacheWriteTokens ?? 0;
1185
+ const prompt = lastUsage.inputReportedTokens ?? cached + uncached + cacheWrite;
1186
+ const ratio = prompt > 0 ? cached / prompt : 0;
1187
+ adapted.data.userTurnId = currentTurnId;
1188
+ adapted.data.llmCallIndexInUserTurn = llmCallIndexInUserTurn;
1189
+ adapted.data.cachedInputTokens = cached;
1190
+ adapted.data.uncachedInputTokens = uncached;
1191
+ adapted.data.cacheHitRatio = ratio;
1192
+ console.log(`[cache] session=${sessionId} turn=${currentTurnId} call=${llmCallIndexInUserTurn}` +
1193
+ ` cached=${cached} uncached=${uncached} write=${cacheWrite} prompt=${prompt}` +
1194
+ ` ratio=${(ratio * 100).toFixed(1)}% cacheAware=${lastUsage.cacheAware}`);
1195
+ }
1196
+ // 记账供收尾持久化:UI 重开会话恢复显示(口径 = 实际 prompt / 全量估算)
1197
+ lastContextTokens = contextTokens;
1198
+ lastContextWindow = effectiveRunConfig.contextWindow;
921
1199
  }
922
1200
  yield adapted;
923
1201
  // Telemetry 旁路(含 stream delta;由 RunTelemetry 决定采样)
924
1202
  this.config.eventSink?.(adapted, meta);
925
1203
  // 事件桥:循环事件同时广播到 EventBus
926
1204
  // 跳过高频流式 delta(每 token 一次),避免 EventBus 拥塞
927
- if (adapted.type !== 'llm_stream_delta') {
1205
+ if (adapted.type !== 'llm_stream_delta' && adapted.type !== 'llm_thinking_delta') {
928
1206
  this.emitObserved(adapted);
929
1207
  }
930
1208
  }
@@ -946,6 +1224,7 @@ export class SessionAwareRunner {
946
1224
  if (loopEvent.usage) {
947
1225
  lastUsage = loopEvent.usage;
948
1226
  }
1227
+ llmCallIndexInUserTurn += 1;
949
1228
  const turnMessages = runContext.messages.slice(turnStartIndex);
950
1229
  await this.agent.notifyAfterTurn(lastUsage, turnMessages);
951
1230
  turnStartIndex = runContext.messages.length;
@@ -953,7 +1232,7 @@ export class SessionAwareRunner {
953
1232
  if (content) {
954
1233
  session.turns.push({
955
1234
  id: `turn_${Date.now()}`,
956
- input: session.messages.slice(0, -1),
1235
+ inputCount: Math.max(0, session.messages.length - 1),
957
1236
  output: { role: 'assistant', content, timestamp: Date.now(), agentId: _agentId },
958
1237
  usage: lastUsage,
959
1238
  durationMs: 0,
@@ -972,7 +1251,73 @@ export class SessionAwareRunner {
972
1251
  m.agentId = _agentId;
973
1252
  }
974
1253
  }
975
- session.messages = runContext.messages;
1254
+ // 租约点之前的历史必须保留(I2 Discourse);窗口内为 runContext.messages(含本轮新消息)
1255
+ // 全回放:不再剥 grounding/attachment(历史中部删改会打穿前缀缓存)
1256
+ // ephemeral 消息(委派状态等运行期 steering)只属于本次 Run,不落历史——
1257
+ // 否则「当时的状态」会被固化成对话历史,过期后仍占用上下文并打穿前缀缓存。
1258
+ const keptPrefix = contextLeasePrefix;
1259
+ const durableMessages = runContext.messages.filter((m) => m.ephemeral !== true);
1260
+ session.messages = [...keptPrefix, ...durableMessages];
1261
+ // contextDetachIndex 是 messages 下标:写回重排后必须对齐 keptPrefix 长度
1262
+ if (typeof session.contextDetachIndex === 'number') {
1263
+ session.contextDetachIndex = keptPrefix.length;
1264
+ }
1265
+ // 引擎主动终止(RunGuard / Budget / Security)必须留下可见凭证:
1266
+ // 只有事件、没有消息时,UI 看到的就是「跑着跑着突然结束」。
1267
+ //
1268
+ // 触发条件 = loop 的 agent_end.reason === 'should_stop'(唯一权威的「提前停止」信号)。
1269
+ // 不能只看 stopReason:`security_blocked` 单次拦截后 run 会继续跑完,
1270
+ // 那样会把正常完成的 run 误报成「已停止」。
1271
+ //
1272
+ // 该消息不进 LLM 上下文(buildLlmMessages 跳过 source=runStopped),
1273
+ // 但进聊天回放(系统提示条)与 session 审计。
1274
+ // 位置在 turn_end 之前:它属于被终止的这个 turn。
1275
+ if (adaptState.loopEndReason === 'should_stop') {
1276
+ const label = adaptState.stopReason === 'behavior_stopped'
1277
+ ? '引擎监督器判定停止'
1278
+ : adaptState.stopReason === 'policy_stopped'
1279
+ ? '资源策略停止'
1280
+ : adaptState.stopReason === 'context_stopped'
1281
+ ? '上下文压力停止'
1282
+ : adaptState.stopReason === 'security_stopped'
1283
+ ? '安全策略停止'
1284
+ : '引擎判定停止';
1285
+ const detail = adaptState.stopDetail ? `(${adaptState.stopDetail})` : '';
1286
+ const body = adaptState.stopMessage ??
1287
+ '本轮由引擎主动终止,未收到模型的收尾回复。可继续对话,让 agent 从当前状态接着做。';
1288
+ const reason = adaptState.stopReason ?? 'engine_stopped';
1289
+ session.messages.push({
1290
+ role: 'user',
1291
+ content: `${label}${detail}:${body}`,
1292
+ timestamp: Date.now(),
1293
+ metadata: {
1294
+ source: 'runStopped',
1295
+ turnId: currentTurnId,
1296
+ stopReason: reason,
1297
+ ...(adaptState.stopDetail ? { stopDetail: adaptState.stopDetail } : {}),
1298
+ },
1299
+ });
1300
+ session.metadata = {
1301
+ ...session.metadata,
1302
+ lastStop: {
1303
+ reason,
1304
+ detail: adaptState.stopDetail,
1305
+ message: body,
1306
+ turnId: currentTurnId,
1307
+ at: Date.now(),
1308
+ },
1309
+ };
1310
+ }
1311
+ else if (session.metadata?.lastStop) {
1312
+ // 正常完成的 run 必须清掉上次的停止标。
1313
+ // 只从内存对象删不够:save 是 metadata 浅合并({...prev, ...data}),
1314
+ // 磁盘上的 lastStop 会被合并回来——持久化后再 updateMetadata 真删。
1315
+ const { lastStop: _dropLastStop, ...restMeta } = session.metadata;
1316
+ session.metadata = restMeta;
1317
+ clearLastStop = true;
1318
+ }
1319
+ // turn 闭标(write-once)
1320
+ this.appendTurnEnd(session, currentTurnId);
976
1321
  // 11. 引擎异常退出时的 session 一致性修复(须在 Observer final 采样之前)
977
1322
  if (!hasTurnEnd) {
978
1323
  const fallbackContent = streamedContent || '';
@@ -985,7 +1330,7 @@ export class SessionAwareRunner {
985
1330
  });
986
1331
  session.turns.push({
987
1332
  id: `turn_${Date.now()}`,
988
- input: session.messages.slice(0, -1),
1333
+ inputCount: Math.max(0, session.messages.length - 1),
989
1334
  output: { role: 'assistant', content: fallbackContent, timestamp: Date.now(), agentId: _agentId },
990
1335
  usage: lastUsage,
991
1336
  durationMs: 0,
@@ -998,6 +1343,46 @@ export class SessionAwareRunner {
998
1343
  observerFinalMessages = session.messages;
999
1344
  // P5: 使用 stopReason 区分终态(context_stopped / behavior_stopped / policy_stopped / security_stopped / completed)
1000
1345
  observerEndReason = adaptState.stopReason ?? (hasTurnEnd ? 'completed' : 'no_turn_end');
1346
+ // 中止标记:仅在本轮**未完成**被掐断时打标(hasTurnEnd = 正常收尾)。
1347
+ // 迟到 abort / signal 竞态不得给已完成轮贴编辑重发。
1348
+ let clearAbortedTurn = false;
1349
+ const abortedMidTurn = runAborted || (Boolean(signal?.aborted) && !hasTurnEnd);
1350
+ // L3:中止保留 undo(供编辑重发 discard);其余出口 commit(继续对话=隐式提交)
1351
+ if (turnFileUndo) {
1352
+ // Observer tool.effect:效应账本摘要(§5.6)
1353
+ this.emitObserved({
1354
+ type: 'tool.effect.ledger',
1355
+ timestamp: Date.now(),
1356
+ agentId: _agentId,
1357
+ sessionId,
1358
+ data: {
1359
+ entries: turnFileUndo.size,
1360
+ truncated: turnFileUndo.truncated,
1361
+ },
1362
+ });
1363
+ }
1364
+ if (turnFileUndo && !abortedMidTurn && !this.effectCommitManual) {
1365
+ await turnFileUndo.commit();
1366
+ turnFileUndo = undefined;
1367
+ }
1368
+ if (abortedMidTurn) {
1369
+ // 中止轮的用户气泡 = 本轮 input 对象本身(push 于步骤 5,bake 之前就已在列)。
1370
+ // 按对象身份定位而非形状扫描:abort 落在 bake 之前的窗口(上下文装配含 LLM intent)
1371
+ // 时 input 尚未定形 turn_start,形状扫描会误锚到上一轮的开轮信封,截断掉整轮历史
1372
+ const userIdx = session.messages.lastIndexOf(input);
1373
+ if (userIdx >= 0) {
1374
+ session.metadata = {
1375
+ ...session.metadata,
1376
+ abortedTurn: { userMessageIndex: userIdx, at: Date.now() },
1377
+ };
1378
+ }
1379
+ }
1380
+ else if (session.metadata?.abortedTurn) {
1381
+ // save 浅合并删不掉 metadata 键,这里先从对象移除,persist 后再 updateMetadata 真删
1382
+ const { abortedTurn: _drop, ...rest } = session.metadata;
1383
+ session.metadata = rest;
1384
+ clearAbortedTurn = true;
1385
+ }
1001
1386
  // 12. 持久化
1002
1387
  sm.transition('idle');
1003
1388
  session.meta.status = sm.state;
@@ -1005,7 +1390,26 @@ export class SessionAwareRunner {
1005
1390
  // 压缩状态写回 Session(E4 分桶 + primary 兼容视图)
1006
1391
  const compactSnap = this.agent.getSessionCompactState(sessionId, _agentId);
1007
1392
  writeSessionCompact(session, _agentId, compactSnap);
1393
+ // 上下文用量随会话持久化:重开会话恢复显示(不靠 UI 用末页消息猜)。
1394
+ // 只记 turn.end 口径(实际 prompt / 全量估算);compact 视图值不写入。
1395
+ if (lastContextTokens !== undefined || lastContextWindow !== undefined) {
1396
+ session.metadata = {
1397
+ ...session.metadata,
1398
+ ...(lastContextTokens !== undefined ? { contextTokens: lastContextTokens } : {}),
1399
+ ...(lastContextWindow !== undefined ? { contextWindow: lastContextWindow } : {}),
1400
+ };
1401
+ }
1008
1402
  await this.store.save(sessionId, session);
1403
+ if (clearAbortedTurn && this.store.updateMetadata) {
1404
+ await this.store.updateMetadata(sessionId, (meta) => {
1405
+ delete meta.abortedTurn;
1406
+ });
1407
+ }
1408
+ if (clearLastStop && this.store.updateMetadata) {
1409
+ await this.store.updateMetadata(sessionId, (meta) => {
1410
+ delete meta.lastStop;
1411
+ });
1412
+ }
1009
1413
  // 通知子系统:本轮处理完成(保持 active,但刷新 lastInteractionAt)
1010
1414
  this._backfillTrigger?.noteActivity(sessionId, _agentId, session.meta.lastInteractionAt);
1011
1415
  this.emitObserved({
@@ -1023,6 +1427,11 @@ export class SessionAwareRunner {
1023
1427
  catch (err) {
1024
1428
  observerEndReason = 'error';
1025
1429
  observerErrorMsg = err instanceof Error ? err.message : String(err);
1430
+ // 引擎出错:无编辑重发入口,效应保留(commit undo)
1431
+ if (turnFileUndo) {
1432
+ await turnFileUndo.commit().catch(() => undefined);
1433
+ turnFileUndo = undefined;
1434
+ }
1026
1435
  // 引擎出错:状态机转到 error,持久化
1027
1436
  const sm = this.stateMachines.get(sessionId);
1028
1437
  if (sm?.canTransition('error')) {
@@ -1058,6 +1467,36 @@ export class SessionAwareRunner {
1058
1467
  throw err;
1059
1468
  }
1060
1469
  finally {
1470
+ // run 收口:reason = 观测口径,stopReason = 停止闸门。
1471
+ // 计时进 trace(run.timing);console 保留一条完整生命周期日志——前次事故
1472
+ // 「run 结束原因零日志、只能靠反推落盘消息定位」,该留痕不随探针删除。
1473
+ const runEndReason = observerEndReason ?? (signal?.aborted ? 'aborted' : 'unknown');
1474
+ const runEndDurMs = Date.now() - timingRunEnter;
1475
+ try {
1476
+ const runEndTiming = {
1477
+ type: 'run.timing',
1478
+ timestamp: Date.now(),
1479
+ sessionId,
1480
+ agentId: _agentId,
1481
+ data: {
1482
+ stage: 'run_end',
1483
+ durMs: runEndDurMs,
1484
+ reason: runEndReason,
1485
+ loopEnd: adaptState.loopEndReason,
1486
+ stopReason: adaptState.stopReason,
1487
+ },
1488
+ };
1489
+ this.config.eventSink?.(runEndTiming, { sessionId, agentId: _agentId });
1490
+ // Hub 只收有 run 记录的 run_end(recordRunStart 前失败时不发,避免归到上一轮 run)
1491
+ if (observerRunId)
1492
+ this.emitObserved(runEndTiming);
1493
+ }
1494
+ catch {
1495
+ // finally 内的观测失败不得吞掉后续收口(detachSession / ObserverHub)
1496
+ }
1497
+ console.log(`[Runner] run end session=${sessionId} reason=${runEndReason} dur=${runEndDurMs}ms` +
1498
+ ` loopEnd=${adaptState.loopEndReason ?? 'none'}` +
1499
+ (adaptState.stopReason ? ` stopReason=${adaptState.stopReason}` : ''));
1061
1500
  // 清理 task service 的活 session 缓存(避免长时间运行进程内存泄漏)
1062
1501
  this.config.sessionTaskService?.detachSession(_agentId, sessionId);
1063
1502
  // Observer 统一收口:成功/失败都关闭 run,避免僵尸 active
@@ -1130,10 +1569,11 @@ export class SessionAwareRunner {
1130
1569
  summarize: options.summarize,
1131
1570
  compactTargetTokens: options.compactTargetTokens,
1132
1571
  });
1133
- if (result.ok && result.summary) {
1572
+ if (result.ok && result.summary && result.compacted) {
1134
1573
  const snap = {
1135
1574
  summary: result.summary,
1136
1575
  lastProactiveMessageCount: session.messages.length,
1576
+ lastProactiveCoverEnd: result.coveredMessageCount,
1137
1577
  lastProactiveTokens: result.tokensAfter,
1138
1578
  };
1139
1579
  this.agent.setSessionCompactState(sessionId, agentId, snap);
@@ -1157,6 +1597,19 @@ export class SessionAwareRunner {
1157
1597
  async acquireLock(sessionId, signal) {
1158
1598
  return this.sessionLease.acquire(sessionId, signal ? { signal } : undefined);
1159
1599
  }
1600
+ /**
1601
+ * SEC-2: strip tools by agent ToolPolicy ∩ sessionToolRights (narrow-only).
1602
+ * Listing filter; beforeToolCall repeats the same check as defense-in-depth.
1603
+ * Rights are passed per-run (harness is shared across concurrent sessions).
1604
+ */
1605
+ filterToolsForSessionRights(tools, sessionToolRights, agentToolPolicy) {
1606
+ if (!agentToolPolicy && !sessionToolRights)
1607
+ return tools;
1608
+ return tools.filter((t) => isToolPermitted(t.name, resolveToolCapabilities(t.name), [
1609
+ agentToolPolicy,
1610
+ sessionToolRights,
1611
+ ]));
1612
+ }
1160
1613
  /**
1161
1614
  * 创建新 Session
1162
1615
  *
@@ -1185,6 +1638,122 @@ export class SessionAwareRunner {
1185
1638
  tasks: [],
1186
1639
  };
1187
1640
  }
1641
+ /**
1642
+ * 补闭上一 turn(崩溃/中止后无 turn_end 时 write-once 追加)。
1643
+ * 新 turn 禁止在 open 未闭时叠加。
1644
+ */
1645
+ ensurePreviousTurnClosed(session) {
1646
+ let lastStartId;
1647
+ let lastStartIdx = -1;
1648
+ for (let i = session.messages.length - 1; i >= 0; i--) {
1649
+ const m = session.messages[i];
1650
+ if (isTurnStartContent(m.content)) {
1651
+ lastStartId = parseTurnIdFromContent(m.content);
1652
+ lastStartIdx = i;
1653
+ break;
1654
+ }
1655
+ }
1656
+ if (!lastStartId)
1657
+ return;
1658
+ for (let i = lastStartIdx + 1; i < session.messages.length; i++) {
1659
+ const m = session.messages[i];
1660
+ if (m.metadata?.source !== 'turnEnd')
1661
+ continue;
1662
+ if (parseTurnIdFromContent(m.content) === lastStartId)
1663
+ return;
1664
+ }
1665
+ session.messages.push({
1666
+ role: 'user',
1667
+ content: formatTurnEndContent(lastStartId),
1668
+ timestamp: Date.now(),
1669
+ metadata: { source: 'turnEnd', turnId: lastStartId },
1670
+ });
1671
+ }
1672
+ /**
1673
+ * user 消息一次定形为 `<turn_start>…</turn_start>`(write-once)。
1674
+ * @param userMessage - 本 turn 用户消息对象(session.messages 中的同一引用)
1675
+ * @param turnId - 会话内单调 turn id
1676
+ * @param turnContextXml - `<turn_context>…</turn_context>` 整段
1677
+ * @throws 若已定形(禁止二次改写)
1678
+ */
1679
+ bakeTurnStart(userMessage, turnId, turnContextXml) {
1680
+ const content = userMessage.content;
1681
+ const text = typeof content === 'string' ? content : getTextContent(content);
1682
+ if (isTurnStartContent(text)) {
1683
+ throw new Error(`turn_start already baked (turnId=${turnId}); user message is write-once`);
1684
+ }
1685
+ const xml = formatTurnStartContent({
1686
+ turnId,
1687
+ at: new Date().toISOString(),
1688
+ turnContextXml,
1689
+ userText: text,
1690
+ });
1691
+ if (typeof content === 'string' || content == null) {
1692
+ userMessage.content = xml;
1693
+ }
1694
+ else if (Array.isArray(content)) {
1695
+ userMessage.content = [
1696
+ { type: 'text', text: xml },
1697
+ ...content.filter((b) => b.type !== 'text'),
1698
+ ];
1699
+ }
1700
+ userMessage.metadata = { ...userMessage.metadata, turnId };
1701
+ }
1702
+ /** 追加 turn 闭标(write-once;同 id 重复 → throw) */
1703
+ appendTurnEnd(session, turnId) {
1704
+ const exists = session.messages.some((m) => m.metadata?.source === 'turnEnd' &&
1705
+ parseTurnIdFromContent(m.content) === turnId);
1706
+ if (exists) {
1707
+ throw new Error(`turn_end already exists (turnId=${turnId})`);
1708
+ }
1709
+ session.messages.push({
1710
+ role: 'user',
1711
+ content: formatTurnEndContent(turnId),
1712
+ timestamp: Date.now(),
1713
+ metadata: { source: 'turnEnd', turnId },
1714
+ });
1715
+ }
1716
+ /**
1717
+ * Run 进行中转录增量落盘:把 durable 口径的历史对齐到存储。
1718
+ *
1719
+ * 口径与收尾合并一致(ephemeral 运行期消息不落历史);调用方契约:
1720
+ * turn_start 定形之后才可同步(bake 原地改写 user 消息)。尽力而为——
1721
+ * 失败不中断 Run(收尾整包 save 是权威写),store 无 syncMessages 时跳过。
1722
+ *
1723
+ * @param sessionId - 会话 id
1724
+ * @param agentId - 本 Run 身份(assistant/tool 归因,首次同步前补齐)
1725
+ * @param keptPrefix - 上下文租约点之前的 Discourse 前缀(与收尾 keptPrefix 同源)
1726
+ * @param runMessages - 本 Run 视图消息(含 ephemeral,此处过滤)
1727
+ * @returns 是否成功对齐(false 时调用方不得推进已同步计数,待下个事件重试)
1728
+ */
1729
+ async persistRunMessages(sessionId, agentId, keptPrefix, runMessages) {
1730
+ const sync = this.store.syncMessages;
1731
+ if (!sync) {
1732
+ if (!this.warnedMissingSync) {
1733
+ this.warnedMissingSync = true;
1734
+ console.warn('[octopi] SessionStore lacks syncMessages; run transcript incremental persist disabled (final save remains authoritative)');
1735
+ }
1736
+ return true; // 无通道 = 非失败,不需要重试
1737
+ }
1738
+ try {
1739
+ // 模型 2 归因:assistant/tool 消息补齐本 Run 的 agentId。必须发生在该消息
1740
+ // 首次同步之前(已同步前缀不得再原地修改);收尾写回处保留同口径兜底循环。
1741
+ for (const m of runMessages) {
1742
+ if ((m.role === 'assistant' || m.role === 'tool') && m.agentId === undefined) {
1743
+ m.agentId = agentId;
1744
+ }
1745
+ }
1746
+ await sync.call(this.store, sessionId, [
1747
+ ...keptPrefix,
1748
+ ...runMessages.filter((m) => m.ephemeral !== true),
1749
+ ]);
1750
+ return true;
1751
+ }
1752
+ catch (err) {
1753
+ console.warn(`[octopi] run transcript incremental persist failed (session=${sessionId}): ${err instanceof Error ? err.message : String(err)}`);
1754
+ return false;
1755
+ }
1756
+ }
1188
1757
  /** 旧路径:persona + injectedContext 字符串拼接;结果返回给 runContext,不写共享 Agent */
1189
1758
  concatSystemPrompt(basePrompt, injectedContext, personaFromResolver) {
1190
1759
  if (injectedContext) {
@@ -1217,77 +1786,19 @@ export class SessionAwareRunner {
1217
1786
  /**
1218
1787
  * 检查 Session 是否需要重置
1219
1788
  */
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
1789
  /**
1262
- * 将 session 生命周期落到 recent + endedAt,并广播事件。
1263
- * 状态在 SessionData.lifecycle;由后续 save 持久化(meta 索引投影)。
1264
- * 不写 memoryExtraction(进度归 memory.steward);事件仍带 extractionStatus 供 Sense 感知。
1790
+ * 上下文租约(opt-in):闲置超时后仅记录截断点,供 LLM 默认窗口裁剪。
1791
+ *
1792
+ * 不删 Discourse、不碰 compact/memory。冷沉淀归 memory.steward 的 idle 扫描。
1793
+ * 在 push 本轮 input 之前调用,保证新消息落在租约点之后。
1265
1794
  */
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
- });
1795
+ applyContextLease(session) {
1796
+ const leaseMs = this.config.idleExpiryMs;
1797
+ if (!leaseMs || leaseMs <= 0)
1798
+ return;
1799
+ const idle = Date.now() - session.meta.lastInteractionAt;
1800
+ if (idle > leaseMs) {
1801
+ session.contextDetachIndex = session.messages.length;
1802
+ }
1292
1803
  }
1293
1804
  }