@octopi-agent/engine 0.86.38 → 0.97.15

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 (218) hide show
  1. package/dist/config-admin/agent-presets.d.ts +70 -0
  2. package/dist/config-admin/agent-presets.js +243 -0
  3. package/dist/config-admin/discover.d.ts +30 -0
  4. package/dist/config-admin/discover.js +48 -0
  5. package/dist/config-admin/env.d.ts +22 -0
  6. package/dist/config-admin/env.js +41 -0
  7. package/dist/config-admin/index.d.ts +20 -0
  8. package/dist/config-admin/index.js +15 -0
  9. package/dist/config-admin/model-presets.d.ts +75 -0
  10. package/dist/config-admin/model-presets.js +249 -0
  11. package/dist/config-admin/name-guard.d.ts +14 -0
  12. package/dist/config-admin/name-guard.js +24 -0
  13. package/dist/config-admin/patch.d.ts +56 -0
  14. package/dist/config-admin/patch.js +201 -0
  15. package/dist/config-admin/port.d.ts +68 -0
  16. package/dist/config-admin/port.js +21 -0
  17. package/dist/config-admin/redact.d.ts +39 -0
  18. package/dist/config-admin/redact.js +42 -0
  19. package/dist/config-schema/agent.d.ts +43 -1
  20. package/dist/config-schema/agent.js +12 -5
  21. package/dist/config-schema/context.d.ts +7 -2
  22. package/dist/config-schema/context.js +8 -0
  23. package/dist/config-schema/engine.d.ts +110 -8
  24. package/dist/config-schema/governance.d.ts +43 -1
  25. package/dist/config-schema/governance.js +160 -2
  26. package/dist/config-schema/models.d.ts +7 -4
  27. package/dist/config-schema/models.js +4 -1
  28. package/dist/config-schema/observability.d.ts +9 -0
  29. package/dist/config-schema/observability.js +29 -0
  30. package/dist/config-schema/run.d.ts +3 -0
  31. package/dist/config-schema/run.js +14 -0
  32. package/dist/config-schema/shared.d.ts +3 -0
  33. package/dist/config-schema/shared.js +12 -0
  34. package/dist/config-schema/substrate.d.ts +1 -1
  35. package/dist/config.d.ts +60 -13
  36. package/dist/config.js +81 -78
  37. package/dist/harness/activation/dispatcher.d.ts +8 -2
  38. package/dist/harness/activation/dispatcher.js +33 -5
  39. package/dist/harness/activation/inbox.d.ts +87 -0
  40. package/dist/harness/activation/inbox.js +169 -0
  41. package/dist/harness/activation/runtime.d.ts +9 -8
  42. package/dist/harness/activation/runtime.js +100 -8
  43. package/dist/harness/activation/types.d.ts +19 -0
  44. package/dist/harness/activation/types.js +2 -0
  45. package/dist/harness/agent/builder.d.ts +18 -3
  46. package/dist/harness/agent/builder.js +42 -17
  47. package/dist/harness/agent/config-bridge.d.ts +5 -0
  48. package/dist/harness/agent/config-bridge.js +7 -1
  49. package/dist/harness/agent/config-integrity.d.ts +72 -0
  50. package/dist/harness/agent/config-integrity.js +146 -0
  51. package/dist/harness/agent/tool-purpose.d.ts +9 -1
  52. package/dist/harness/agent/tool-purpose.js +11 -2
  53. package/dist/harness/agent/wire-agent-builder.js +11 -3
  54. package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.d.ts +11 -1
  55. package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.js +11 -1
  56. package/dist/harness/collaboration/autonomous-subsystem/loader.d.ts +13 -0
  57. package/dist/harness/collaboration/autonomous-subsystem/loader.js +16 -1
  58. package/dist/harness/collaboration/autonomous-subsystem/runtime.d.ts +4 -0
  59. package/dist/harness/collaboration/autonomous-subsystem/runtime.js +3 -1
  60. package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +3 -1
  61. package/dist/harness/collaboration/delegation/child-run.js +21 -5
  62. package/dist/harness/collaboration/delegation/notifier.js +4 -3
  63. package/dist/harness/collaboration/delegation/service.js +2 -3
  64. package/dist/harness/collaboration/delegation/wiring.js +6 -5
  65. package/dist/harness/collaboration/orchestration/reflector/llm-reflector.d.ts +1 -1
  66. package/dist/harness/collaboration/orchestration/reflector/llm-reflector.js +1 -1
  67. package/dist/harness/context/capabilities/compact/engine.d.ts +30 -0
  68. package/dist/harness/context/capabilities/compact/engine.js +198 -46
  69. package/dist/harness/context/capabilities/compact/handover.d.ts +78 -0
  70. package/dist/harness/context/capabilities/compact/handover.js +107 -0
  71. package/dist/harness/context/capabilities/compact/index.d.ts +3 -1
  72. package/dist/harness/context/capabilities/compact/index.js +2 -1
  73. package/dist/harness/context/capabilities/compact/types.d.ts +30 -1
  74. package/dist/harness/context/capabilities/summary/executor.js +2 -1
  75. package/dist/harness/context/capabilities/summary/policies.js +8 -5
  76. package/dist/harness/context/constitution/default-agents.md +11 -10
  77. package/dist/harness/context/default-context-engine.d.ts +34 -4
  78. package/dist/harness/context/default-context-engine.js +198 -53
  79. package/dist/harness/context/hybrid-compressor.js +6 -0
  80. package/dist/harness/context/layer-types.d.ts +36 -0
  81. package/dist/harness/context/layer-types.js +38 -0
  82. package/dist/harness/context/llm-summarizer.d.ts +2 -8
  83. package/dist/harness/context/llm-summarizer.js +69 -91
  84. package/dist/harness/context/message-selector.js +4 -3
  85. package/dist/harness/context/root-instructions.js +1 -1
  86. package/dist/harness/context/summarize.d.ts +2 -0
  87. package/dist/harness/context/summarize.js +7 -2
  88. package/dist/harness/context/system-prompt-assembler.js +10 -4
  89. package/dist/harness/context/tool-result-aging.js +2 -2
  90. package/dist/harness/context/truncate-compressor.js +7 -0
  91. package/dist/harness/context/turn-envelope.d.ts +4 -3
  92. package/dist/harness/context/turn-envelope.js +4 -3
  93. package/dist/harness/context/types.d.ts +33 -1
  94. package/dist/harness/extension/execution-environment/dangerous-commands.d.ts +28 -0
  95. package/dist/harness/extension/execution-environment/dangerous-commands.js +129 -0
  96. package/dist/harness/extension/execution-environment/effect-policy.d.ts +133 -4
  97. package/dist/harness/extension/execution-environment/effect-policy.js +263 -14
  98. package/dist/harness/extension/execution-environment/index.d.ts +4 -2
  99. package/dist/harness/extension/execution-environment/index.js +2 -1
  100. package/dist/harness/extension/execution-environment/isolation.js +5 -1
  101. package/dist/harness/extension/execution-environment/kill-switch.d.ts +34 -0
  102. package/dist/harness/extension/execution-environment/kill-switch.js +46 -0
  103. package/dist/harness/extension/execution-environment/ops-audit.d.ts +200 -0
  104. package/dist/harness/extension/execution-environment/ops-audit.js +338 -0
  105. package/dist/harness/extension/execution-environment/privileged-exec.d.ts +158 -0
  106. package/dist/harness/extension/execution-environment/privileged-exec.js +418 -0
  107. package/dist/harness/extension/execution-environment/process-info.d.ts +180 -0
  108. package/dist/harness/extension/execution-environment/process-info.js +466 -0
  109. package/dist/harness/extension/execution-environment/process-isolation.d.ts +7 -0
  110. package/dist/harness/extension/execution-environment/process-isolation.js +9 -0
  111. package/dist/harness/extension/execution-environment/sandbox.d.ts +109 -0
  112. package/dist/harness/extension/execution-environment/sandbox.js +264 -29
  113. package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +1 -1
  114. package/dist/harness/extension/execution-environment/tool-capabilities.js +6 -0
  115. package/dist/harness/extension/execution-environment/types.d.ts +19 -0
  116. package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +5 -0
  117. package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.d.ts +6 -0
  118. package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +50 -0
  119. package/dist/harness/extension/plugin-ecosystem/tools/ask-user.d.ts +4 -5
  120. package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +5 -15
  121. package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +3 -0
  122. package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +53 -2
  123. package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +10 -17
  124. package/dist/harness/extension/plugin-ecosystem/tools/git-runner.d.ts +31 -0
  125. package/dist/harness/extension/plugin-ecosystem/tools/git-runner.js +104 -0
  126. package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.d.ts +111 -0
  127. package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.js +197 -0
  128. package/dist/harness/extension/plugin-ecosystem/tools/git-tools.d.ts +8 -8
  129. package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +9 -100
  130. package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +6 -0
  131. package/dist/harness/extension/plugin-ecosystem/tools/index.js +4 -0
  132. package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.d.ts +43 -0
  133. package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.js +350 -0
  134. package/dist/harness/extension/plugin-ecosystem/tools/process-tools.d.ts +30 -0
  135. package/dist/harness/extension/plugin-ecosystem/tools/process-tools.js +137 -0
  136. package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +54 -4
  137. package/dist/harness/governance/human-in-the-loop/decision-cache.js +42 -16
  138. package/dist/harness/governance/security/temp-path.d.ts +9 -0
  139. package/dist/harness/governance/security/temp-path.js +13 -2
  140. package/dist/harness/governance/session-acl/seed-roles.js +14 -0
  141. package/dist/harness/index.d.ts +4 -0
  142. package/dist/harness/index.js +3 -0
  143. package/dist/harness/knowledge/file-identity.d.ts +8 -0
  144. package/dist/harness/knowledge/file-identity.js +26 -1
  145. package/dist/harness/knowledge/fts.js +1 -2
  146. package/dist/harness/knowledge/grounding.js +5 -5
  147. package/dist/harness/knowledge/index-store.d.ts +31 -4
  148. package/dist/harness/knowledge/index-store.js +180 -48
  149. package/dist/harness/knowledge/ingest.d.ts +115 -115
  150. package/dist/harness/knowledge/ingest.js +150 -150
  151. package/dist/harness/knowledge/knowledge-serve-child.js +1 -1
  152. package/dist/harness/knowledge/purge.js +4 -1
  153. package/dist/harness/memory/backfill-coverage.js +3 -1
  154. package/dist/harness/memory/sqlite/keyword-search.d.ts +1 -0
  155. package/dist/harness/memory/sqlite/keyword-search.js +4 -3
  156. package/dist/harness/observability/observer/hub.js +38 -1
  157. package/dist/harness/observability/observer/run-snapshot.js +1 -0
  158. package/dist/harness/observability/observer/types.d.ts +27 -0
  159. package/dist/harness/run/agent/agent.d.ts +7 -0
  160. package/dist/harness/run/agent/agent.js +23 -1
  161. package/dist/harness/run/reliability/fallback-provider.d.ts +117 -5
  162. package/dist/harness/run/reliability/fallback-provider.js +262 -22
  163. package/dist/harness/run/reliability/harness-events.d.ts +24 -1
  164. package/dist/harness/run/reliability/model-error-policy.d.ts +32 -0
  165. package/dist/harness/run/reliability/model-error-policy.js +42 -0
  166. package/dist/harness/run/reliability/provider-wrapper.js +29 -2
  167. package/dist/harness/run/reliability/refusal-guard.d.ts +20 -0
  168. package/dist/harness/run/reliability/refusal-guard.js +102 -0
  169. package/dist/harness/run/reliability/run-agent.js +231 -33
  170. package/dist/harness/run/run-guard/default-run-guard.js +1 -1
  171. package/dist/harness/run/run-scope.d.ts +31 -0
  172. package/dist/harness/run/runner.d.ts +132 -2
  173. package/dist/harness/run/runner.js +679 -60
  174. package/dist/harness/session/attachments/llm-intent.js +2 -1
  175. package/dist/harness/session/history/port.js +15 -5
  176. package/dist/harness/session/in-memory-store.d.ts +5 -0
  177. package/dist/harness/session/in-memory-store.js +33 -2
  178. package/dist/harness/session/tasks/render.d.ts +4 -1
  179. package/dist/harness/session/tasks/render.js +10 -7
  180. package/dist/harness/session/title.js +25 -9
  181. package/dist/harness/shared/events/agent-event-map.d.ts +92 -0
  182. package/dist/harness/shared/events/agent-event-map.js +7 -0
  183. package/dist/index.d.ts +6 -4
  184. package/dist/index.js +4 -3
  185. package/dist/integration/agent-runtime/channel-message-source.js +19 -1
  186. package/dist/integration/index.d.ts +2 -0
  187. package/dist/integration/index.js +1 -0
  188. package/dist/integration/observability/loop-watchdog.d.ts +56 -0
  189. package/dist/integration/observability/loop-watchdog.js +177 -0
  190. package/dist/integration/observability/metrics.d.ts +3 -0
  191. package/dist/integration/observability/metrics.js +18 -7
  192. package/dist/integration/observability/run-telemetry.d.ts +8 -0
  193. package/dist/integration/observability/run-telemetry.js +31 -8
  194. package/dist/integration/observability/trace-collector.js +26 -4
  195. package/dist/integration/observability/trace-events.d.ts +1 -0
  196. package/dist/integration/observability/trace-events.js +2 -0
  197. package/dist/integration/observability/trace-logger.js +27 -17
  198. package/dist/integration/providers/anthropic.d.ts +23 -0
  199. package/dist/integration/providers/anthropic.js +97 -12
  200. package/dist/integration/providers/fetch-timeout.d.ts +42 -0
  201. package/dist/integration/providers/fetch-timeout.js +51 -0
  202. package/dist/integration/providers/openai.d.ts +10 -0
  203. package/dist/integration/providers/openai.js +58 -11
  204. package/dist/integration/providers/provider-diagnostics.d.ts +80 -0
  205. package/dist/integration/providers/provider-diagnostics.js +89 -0
  206. package/dist/integration/providers/timeout-coherence.d.ts +52 -0
  207. package/dist/integration/providers/timeout-coherence.js +68 -0
  208. package/dist/integration/providers/wire-dump.d.ts +62 -0
  209. package/dist/integration/providers/wire-dump.js +111 -2
  210. package/dist/integration/storage/jsonl.d.ts +19 -1
  211. package/dist/integration/storage/jsonl.js +100 -4
  212. package/dist/paths.d.ts +19 -0
  213. package/dist/paths.js +38 -1
  214. package/dist/subsystems/cognition-steward/conceptualize/handler.js +1 -1
  215. package/dist/subsystems/memory-steward/backfill/handler.js +1 -1
  216. package/dist/subsystems/safety-guard/config.yaml +3 -1
  217. package/dist/subsystems/wisdom-steward/formation/handler.js +1 -1
  218. package/package.json +3 -2
@@ -11,7 +11,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
11
11
  }>>;
12
12
  providers: z.ZodRecord<z.ZodString, z.ZodObject<{
13
13
  baseUrl: z.ZodString;
14
- apiKey: z.ZodString;
14
+ apiKey: z.ZodOptional<z.ZodString>;
15
15
  api: z.ZodEnum<{
16
16
  "openai-completions": "openai-completions";
17
17
  "anthropic-messages": "anthropic-messages";
@@ -28,6 +28,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
28
28
  }>>>;
29
29
  contextWindow: z.ZodOptional<z.ZodNumber>;
30
30
  maxTokens: z.ZodOptional<z.ZodNumber>;
31
+ temperature: z.ZodOptional<z.ZodNumber>;
31
32
  }, z.core.$strip>>;
32
33
  timeoutSeconds: z.ZodOptional<z.ZodNumber>;
33
34
  }, z.core.$strip>>;
@@ -39,9 +40,9 @@ export declare const ModelsConfigSchema: z.ZodObject<{
39
40
  enabled: z.ZodOptional<z.ZodBoolean>;
40
41
  type: z.ZodOptional<z.ZodEnum<{
41
42
  openai: "openai";
43
+ http: "http";
42
44
  custom: "custom";
43
45
  ollama: "ollama";
44
- http: "http";
45
46
  }>>;
46
47
  provider: z.ZodOptional<z.ZodString>;
47
48
  model: z.ZodString;
@@ -92,9 +93,9 @@ export declare const EmbeddingModelConfigSchemaExport: z.ZodObject<{
92
93
  enabled: z.ZodOptional<z.ZodBoolean>;
93
94
  type: z.ZodOptional<z.ZodEnum<{
94
95
  openai: "openai";
96
+ http: "http";
95
97
  custom: "custom";
96
98
  ollama: "ollama";
97
- http: "http";
98
99
  }>>;
99
100
  provider: z.ZodOptional<z.ZodString>;
100
101
  model: z.ZodString;
@@ -124,7 +125,7 @@ export declare const EmbeddingModelConfigSchemaExport: z.ZodObject<{
124
125
  }, z.core.$strip>;
125
126
  export declare const ModelProviderConfigSchemaExport: z.ZodObject<{
126
127
  baseUrl: z.ZodString;
127
- apiKey: z.ZodString;
128
+ apiKey: z.ZodOptional<z.ZodString>;
128
129
  api: z.ZodEnum<{
129
130
  "openai-completions": "openai-completions";
130
131
  "anthropic-messages": "anthropic-messages";
@@ -141,6 +142,7 @@ export declare const ModelProviderConfigSchemaExport: z.ZodObject<{
141
142
  }>>>;
142
143
  contextWindow: z.ZodOptional<z.ZodNumber>;
143
144
  maxTokens: z.ZodOptional<z.ZodNumber>;
145
+ temperature: z.ZodOptional<z.ZodNumber>;
144
146
  }, z.core.$strip>>;
145
147
  timeoutSeconds: z.ZodOptional<z.ZodNumber>;
146
148
  }, z.core.$strip>;
@@ -156,4 +158,5 @@ export declare const ModelCapabilitySchemaExport: z.ZodObject<{
156
158
  }>>>;
157
159
  contextWindow: z.ZodOptional<z.ZodNumber>;
158
160
  maxTokens: z.ZodOptional<z.ZodNumber>;
161
+ temperature: z.ZodOptional<z.ZodNumber>;
159
162
  }, z.core.$strip>;
@@ -13,10 +13,13 @@ const ModelCapabilitySchema = z.object({
13
13
  input: z.array(ModelInputTypeSchema).optional(),
14
14
  contextWindow: z.number().positive().optional(),
15
15
  maxTokens: z.number().positive().optional(),
16
+ /** 模型级采样温度:子系统与辅助调用未显式指定时采用;未配置则不发送 */
17
+ temperature: z.number().min(0).max(2).optional(),
16
18
  });
17
19
  const ModelProviderConfigSchema = z.object({
18
20
  baseUrl: z.string().min(1),
19
- apiKey: z.string().min(1),
21
+ /** API Key;省略 = upsert 时保留现有值;'' = 明确无鉴权(keyless,如 Ollama);推荐 `${ENV_VAR}` 引用 */
22
+ apiKey: z.string().optional(),
20
23
  api: z.enum(['openai-completions', 'anthropic-messages']),
21
24
  models: z.array(ModelCapabilitySchema).min(1),
22
25
  timeoutSeconds: z.number().positive().optional(),
@@ -15,6 +15,15 @@ export declare const ObservabilityConfigSchema: z.ZodObject<{
15
15
  dir: z.ZodOptional<z.ZodString>;
16
16
  maxCallsPerSession: z.ZodOptional<z.ZodNumber>;
17
17
  maxBodyBytes: z.ZodOptional<z.ZodNumber>;
18
+ maxResponseChars: z.ZodOptional<z.ZodNumber>;
19
+ }, z.core.$strip>>;
20
+ loopWatchdog: z.ZodOptional<z.ZodObject<{
21
+ enabled: z.ZodOptional<z.ZodBoolean>;
22
+ intervalMs: z.ZodOptional<z.ZodNumber>;
23
+ stallThresholdMs: z.ZodOptional<z.ZodNumber>;
24
+ reportFile: z.ZodOptional<z.ZodString>;
25
+ captureSample: z.ZodOptional<z.ZodBoolean>;
26
+ footprintThresholdMb: z.ZodOptional<z.ZodNumber>;
18
27
  }, z.core.$strip>>;
19
28
  }, z.core.$strip>;
20
29
  /**
@@ -24,6 +24,35 @@ export const ObservabilityConfigSchema = z.object({
24
24
  maxCallsPerSession: z.number().int().positive().max(5000).optional(),
25
25
  /** 单次请求体落盘上限(字节,缺省 8_000_000) */
26
26
  maxBodyBytes: z.number().int().positive().optional(),
27
+ /** 响应留痕(正文+finishReason)截断上限(字符,缺省 2_000) */
28
+ maxResponseChars: z.number().int().positive().optional(),
29
+ })
30
+ .optional(),
31
+ /**
32
+ * 事件循环停滞看门狗(缺省开启)
33
+ *
34
+ * worker 心跳检测主循环冻结,报告落 `<OCTOPI_HOME>/logs/loop-watchdog.jsonl`;
35
+ * macOS 缺省自动 `sample` 抓阻塞栈。存在合法长同步作业的部署应放宽
36
+ * `stallThresholdMs`(缺省 30_000)。
37
+ */
38
+ loopWatchdog: z
39
+ .object({
40
+ enabled: z.boolean().optional(),
41
+ /** 心跳间隔(毫秒,缺省 5_000) */
42
+ intervalMs: z.number().int().positive().optional(),
43
+ /** 主循环静默多久判停滞(毫秒,缺省 30_000) */
44
+ stallThresholdMs: z.number().int().positive().optional(),
45
+ /** 报告落盘路径(缺省 `<OCTOPI_HOME>/logs/loop-watchdog.jsonl`) */
46
+ reportFile: z.string().optional(),
47
+ /** 停滞时自动 `sample` 抓主线程栈(macOS 专属;缺省 true) */
48
+ captureSample: z.boolean().optional(),
49
+ /**
50
+ * 进程 RSS 阈值(MB,缺省 4096;0 关闭)
51
+ *
52
+ * 越过即写 `footprint` 事件并采栈,用于在内存失控早期抓现场,
53
+ * 不必等事件循环冻死(2026-10-30 网关 30.5G 事故的教训)。
54
+ */
55
+ footprintThresholdMb: z.number().int().min(0).optional(),
27
56
  })
28
57
  .optional(),
29
58
  });
@@ -50,6 +50,9 @@ export declare const RunGuardJsonConfigSchema: z.ZodObject<{
50
50
  export declare const ModelCallConfigSchema: z.ZodObject<{
51
51
  idleTimeoutMs: z.ZodOptional<z.ZodNumber>;
52
52
  absoluteTimeoutMs: z.ZodOptional<z.ZodNumber>;
53
+ fallbackAttemptTtftMs: z.ZodOptional<z.ZodNumber>;
54
+ fallbackDegradeTtlMs: z.ZodOptional<z.ZodNumber>;
55
+ fallbackChatAttemptMs: z.ZodOptional<z.ZodNumber>;
53
56
  }, z.core.$strip>;
54
57
  export declare const AgentRuntimeJsonConfigSchema: z.ZodObject<{
55
58
  coalesceWindowMs: z.ZodOptional<z.ZodNumber>;
@@ -50,6 +50,20 @@ export const ModelCallConfigSchema = z.object({
50
50
  idleTimeoutMs: z.number().positive().optional(),
51
51
  /** 单次模型调用总时长上限,毫秒 */
52
52
  absoluteTimeoutMs: z.number().positive().optional(),
53
+ /**
54
+ * 回退链单节点等待首个内容 chunk 的上限(毫秒)。
55
+ * 仅在存在下一个候选时生效:超时即切下一个模型,不再让慢节点独占整个 watchdog 窗口。
56
+ */
57
+ fallbackAttemptTtftMs: z.number().positive().optional(),
58
+ /** 回退链失败节点的降级窗口(毫秒);缺省等于 fallbackAttemptTtftMs */
59
+ fallbackDegradeTtlMs: z.number().positive().optional(),
60
+ /**
61
+ * 回退链单节点非流式(chat)整响应上限(毫秒),缺省 240000。
62
+ *
63
+ * chat 没有「首块」概念,不能复用 fallbackAttemptTtftMs 的 90s:
64
+ * 合法的长响应会被误判为节点故障。取 240s 使其早于 undici 的 300s bodyTimeout。
65
+ */
66
+ fallbackChatAttemptMs: z.number().positive().optional(),
53
67
  });
54
68
  // ── Agent Runtime(消息路径始终经 Runtime;Source 按配置块挂载)──
55
69
  export const AgentRuntimeJsonConfigSchema = z.object({
@@ -4,6 +4,9 @@
4
4
  * @module
5
5
  */
6
6
  import { z } from 'zod';
7
+ export { expandHomePath, isConfigPathShape } from '../paths.js';
8
+ /** 配置路径字段(workspace / transactionRoots 等):绝对路径或 ~ 形态 */
9
+ export declare const ConfigPathSchema: z.ZodString;
7
10
  /** 监听 host:local(默认仅本机)| lan(局域网)| 具体 IP/主机名 */
8
11
  export declare const NetworkHostSchema: z.ZodUnion<readonly [z.ZodEnum<{
9
12
  local: "local";
@@ -4,6 +4,18 @@
4
4
  * @module
5
5
  */
6
6
  import { z } from 'zod';
7
+ import { isConfigPathShape } from '../paths.js';
8
+ // 路径语义的唯一实现在 zod-free 的 paths.ts(harness 运行时同样引用);此处转出
9
+ // 保持 schema 消费方的导入面不变。
10
+ export { expandHomePath, isConfigPathShape } from '../paths.js';
11
+ /** 配置路径字段(workspace / transactionRoots 等):绝对路径或 ~ 形态 */
12
+ export const ConfigPathSchema = z
13
+ .string()
14
+ .min(1)
15
+ .refine(isConfigPathShape, {
16
+ message: 'must be an absolute path or ~-prefixed (~/…, ~\\…, or bare ~)',
17
+ })
18
+ .describe('Absolute path or ~-prefixed (~/…, ~\\…, bare ~); ~user is not supported');
7
19
  /** 监听 host:local(默认仅本机)| lan(局域网)| 具体 IP/主机名 */
8
20
  export const NetworkHostSchema = z.union([
9
21
  z.enum(['local', 'lan']),
@@ -52,8 +52,8 @@ export declare const KnowledgeConfigSchema: z.ZodObject<{
52
52
  hybridKeyword: z.ZodOptional<z.ZodBoolean>;
53
53
  embedSecretPolicy: z.ZodOptional<z.ZodEnum<{
54
54
  allow: "allow";
55
- redact: "redact";
56
55
  skip: "skip";
56
+ redact: "redact";
57
57
  }>>;
58
58
  phaseA: z.ZodOptional<z.ZodObject<{
59
59
  concurrency: z.ZodOptional<z.ZodNumber>;
package/dist/config.d.ts CHANGED
@@ -20,7 +20,7 @@ export interface AgentConfig {
20
20
  id: string;
21
21
  /** Agent home 目录:persona、skills 的根目录(session 在 OCTOPI_HOME/sessions;memory/wisdom 走 AgentDatabase SQLite) */
22
22
  home?: string;
23
- /** 沙箱工作目录:agent 工具操作的 cwd,默认为 home 下的 workspace 子目录 */
23
+ /** 沙箱工作目录:agent 工具操作的 cwd,默认为 home 下的 workspace 子目录;支持 ~ 形态(使用点展开) */
24
24
  workspace?: string;
25
25
  /** ToolEffectPolicy(P3) */
26
26
  effectPolicy?: import('./harness/extension/execution-environment/effect-policy.js').EffectPolicyConfig;
@@ -457,10 +457,16 @@ export interface SchedulesJsonConfig {
457
457
  export interface ContextEngineConfig {
458
458
  /** 引擎类型(默认 'default') */
459
459
  type?: 'default' | 'custom';
460
- /** 头部保护消息数(默认 3) */
460
+ /** 头部保护消息数(默认 5) */
461
461
  protectFirstN?: number;
462
462
  /** 尾部保护消息数(默认 20) */
463
463
  protectLastN?: number;
464
+ /** 摘要软目标预算(P1c 缺省 clamp(2%, 2k, 8k)):可配置 ratioPct/minTokens/maxTokens */
465
+ summaryBudget?: {
466
+ ratioPct?: number;
467
+ minTokens?: number;
468
+ maxTokens?: number;
469
+ };
464
470
  /**
465
471
  * 窗口比例线:消息 token / messagesBudget 超过该比例时,
466
472
  * 在硬溢出前先主动压缩(默认 0.6)。
@@ -678,13 +684,15 @@ export interface ModelCapability {
678
684
  contextWindow?: number;
679
685
  /** 最大输出 token 数 */
680
686
  maxTokens?: number;
687
+ /** 模型级采样温度:请求未显式指定时由 provider 采用;未配置则不发送 */
688
+ temperature?: number;
681
689
  }
682
690
  /** Provider 定义(新格式,嵌入在 models.providers 中) */
683
691
  export interface ModelProviderConfig {
684
692
  /** API 基础 URL */
685
693
  baseUrl: string;
686
- /** API Key(支持 ${ENV_VAR} 语法) */
687
- apiKey: string;
694
+ /** API Key(支持 ${ENV_VAR} 语法);省略/空 = 不发鉴权(keyless) */
695
+ apiKey?: string;
688
696
  /** API 协议类型 */
689
697
  api: 'openai-completions' | 'anthropic-messages';
690
698
  /** 此 provider 下的模型列表 */
@@ -775,6 +783,12 @@ export interface ModelCallConfig {
775
783
  idleTimeoutMs?: number;
776
784
  /** 单次模型调用总时长上限,毫秒 */
777
785
  absoluteTimeoutMs?: number;
786
+ /** 回退链单节点等待首个内容 chunk 的上限,毫秒 */
787
+ fallbackAttemptTtftMs?: number;
788
+ /** 回退链失败节点的降级窗口,毫秒(缺省等于 fallbackAttemptTtftMs) */
789
+ fallbackDegradeTtlMs?: number;
790
+ /** 回退链单节点非流式整响应上限,毫秒(缺省 240000) */
791
+ fallbackChatAttemptMs?: number;
778
792
  }
779
793
  export interface SubsystemsConfig {
780
794
  /**
@@ -1096,6 +1110,14 @@ export interface HarnessConfig {
1096
1110
  * 配置面只含纯数据(不含 `resolveContext` 等运行时钩子)。
1097
1111
  */
1098
1112
  llmRequestDump?: import('./integration/providers/wire-dump.js').WireDumpConfig;
1113
+ /**
1114
+ * 事件循环停滞看门狗(缺省开启)
1115
+ *
1116
+ * worker 心跳检测主循环冻结(2026-10-28 事故的自检器官);报告落
1117
+ * `<OCTOPI_HOME>/logs/loop-watchdog.jsonl`,macOS 缺省自动 `sample` 抓阻塞栈。
1118
+ * 存在合法长同步作业的部署应放宽 `stallThresholdMs`。
1119
+ */
1120
+ loopWatchdog?: import('./integration/observability/loop-watchdog.js').LoopWatchdogOptions;
1099
1121
  };
1100
1122
  }
1101
1123
  /**
@@ -1105,7 +1127,10 @@ export interface HarnessConfig {
1105
1127
  * 从 ModelsConfig 提取所有模型的扁平列表(供 resolveModelConfig 查找)
1106
1128
  */
1107
1129
  export declare function flattenModels(config: ModelsConfig): NormalizedModelInfo[];
1108
- export declare function resolveModelConfig(modelRef: string | _ModelConfig, models: NormalizedModelInfo[], defaults?: Defaults): _ModelConfig;
1130
+ export declare function resolveModelConfig(modelRef: string | _ModelConfig, models: NormalizedModelInfo[], defaults?: Defaults, levelMap?: Record<string, {
1131
+ primary: string;
1132
+ fallback?: string[];
1133
+ }>): _ModelConfig;
1109
1134
  /** 内部使用的规范化配置(loadConfig 输出) */
1110
1135
  export interface NormalizedHarnessConfig extends HarnessConfig {
1111
1136
  /** 从 models.providers 提取的扁平模型列表 */
@@ -1121,13 +1146,6 @@ export interface NormalizedModelInfo {
1121
1146
  contextWindow?: number;
1122
1147
  maxTokens?: number;
1123
1148
  }
1124
- /**
1125
- * 包一层计时探针:llm_start / llm_first_token(TTFT)/ llm_end
1126
- *
1127
- * @param inner - 真实 provider
1128
- * @returns 透传装饰器
1129
- */
1130
- export declare function withTimingProbe(inner: ModelProvider): ModelProvider;
1131
1149
  /**
1132
1150
  * 按 `observability.llmRequestDump` 配置构造 wire dump sink
1133
1151
  *
@@ -1148,8 +1166,37 @@ export declare function createWireDumpSinkFromConfig(cfg?: import('./integration
1148
1166
  * @param name - provider 名称
1149
1167
  * @param pc - provider 配置
1150
1168
  * @param options - 可选:wire dump sink(诊断用,见 `observability.llmRequestDump`)
1151
- * @returns provider 实例(计时探针 → wire dump → 原生 provider 的装饰链)
1169
+ * @returns provider 实例(wire dump → 原生 provider 的装饰链;LLM 计时已 observability 化进 model.call.*)
1152
1170
  */
1153
1171
  export declare function createProviderFromConfig(name: string, pc: ModelProviderConfig, options?: {
1154
1172
  wireDump?: import('./integration/providers/wire-dump.js').WireDumpSink;
1155
1173
  }): Promise<ModelProvider>;
1174
+ /**
1175
+ * 按 `observability` 配置构造 RunTelemetry 工厂(F3/D5 接线,组合根)
1176
+ *
1177
+ * TraceCollector → TraceLogger 按 `outputDir` 逐条同步落 JSONL(即 `traceDir`,无缓冲丢失风险);
1178
+ * `level` / `consoleLevel` 与配置的 0–5 数值同构(FATAL=0 … TRACE=5,schema 已校验范围)。
1179
+ * `consoleLevel` 缺省 null:trace 走文件通道,不向 gateway.log 混入控制台副本(要副本显式配置)。
1180
+ *
1181
+ * @param cfg - `observability` 配置段(level / consoleLevel / traceDir / capture*)
1182
+ * @param options - 可选:trace 文件名前缀(多 agent 归属标识)
1183
+ * @returns RunTelemetry 工厂(供 `AgentBuilder.telemetryFactory()` 注入)
1184
+ */
1185
+ export declare function createTelemetryFactoryFromConfig(cfg: NonNullable<HarnessConfig['observability']>, options?: {
1186
+ filePrefix?: string;
1187
+ }): Promise<import('./harness/observability/run-telemetry.js').RunTelemetryFactory>;
1188
+ /**
1189
+ * 按 `observability` 配置接线 AgentBuilder 观测装配(F3/D5)
1190
+ *
1191
+ * - 落盘:`traceDir / level / consoleLevel` → TraceCollector → JSONL
1192
+ * - 采集意图:`captureStreamDeltas / captureModelRequest` → `AgentBuilder.trace()`
1193
+ * - 工厂显式注入,不依赖包入口 `setRunTelemetryFactory` 副作用
1194
+ * (serve / 子路径 import 时该副作用未必执行过,不能拿它当接线)
1195
+ *
1196
+ * @param builder - 目标 builder(`build()` 之前调用)
1197
+ * @param cfg - `observability` 配置段;缺省时不做任何事
1198
+ * @param options - 可选:trace 文件名前缀(一般传 agentId)
1199
+ */
1200
+ export declare function wireObservability(builder: import('./harness/agent/builder.js').AgentBuilder, cfg: HarnessConfig['observability'] | undefined, options?: {
1201
+ filePrefix?: string;
1202
+ }): Promise<void>;
package/dist/config.js CHANGED
@@ -62,7 +62,7 @@ export function flattenModels(config) {
62
62
  }
63
63
  return result;
64
64
  }
65
- export function resolveModelConfig(modelRef, models, defaults) {
65
+ export function resolveModelConfig(modelRef, models, defaults, levelMap) {
66
66
  // 仅当用户配置了 defaults.contextWindow 时才作为兜底;不自动猜 200k
67
67
  const defaultContextWindow = defaults?.contextWindow;
68
68
  // 内联对象(向后兼容)— 未写的 contextWindow 保持 undefined(未知)
@@ -74,6 +74,16 @@ export function resolveModelConfig(modelRef, models, defaults) {
74
74
  resolved.fallbackModels = resolveFallbackModels(resolved.fallbackModels, models, defaults, 1);
75
75
  return resolved;
76
76
  }
77
+ // level 档位名(如 "standard")→ 按 levelMap primary 解析(递归不传 levelMap,禁止 level→level 链)
78
+ const level = levelMap?.[modelRef];
79
+ if (level) {
80
+ const resolved = resolveModelConfig(level.primary, models, defaults);
81
+ const fallbacks = (level.fallback ?? []).map((f) => resolveModelConfig(f, models, defaults));
82
+ if (fallbacks.length > 0) {
83
+ resolved.fallbackModels = fallbacks;
84
+ }
85
+ return resolved;
86
+ }
77
87
  // string 引用:按 id 查找(格式为 "provider/modelId")
78
88
  const ref = modelRef;
79
89
  const found = models.find(m => m.id === ref);
@@ -143,76 +153,7 @@ function resolveFallbackModels(fallbacks, models, defaults, depth = 0) {
143
153
  });
144
154
  }
145
155
  // ── Provider 工厂 ──
146
- // [timing probe] 长 session 首 run 延迟定位:LLM 调用计时装饰器(诊断后移除或转正)
147
- /**
148
- * 估算请求规模(字符近似值,仅用于计时日志)
149
- *
150
- * @param request - LLM 请求
151
- * @returns msgs/chars/toolChars 计数串
152
- */
153
- function timingReqSize(request) {
154
- let chars = 0;
155
- for (const m of request.messages ?? []) {
156
- const c = m.content;
157
- chars += typeof c === 'string' ? c.length : JSON.stringify(c ?? '').length;
158
- }
159
- const toolChars = request.tools ? JSON.stringify(request.tools).length : 0;
160
- return `msgs=${request.messages?.length ?? 0} chars=${chars} toolChars=${toolChars}`;
161
- }
162
- /**
163
- * 包一层计时探针:llm_start / llm_first_token(TTFT)/ llm_end
164
- *
165
- * @param inner - 真实 provider
166
- * @returns 透传装饰器
167
- */
168
- // [timing probe] 临时导出供 CLI daemon 的第二处 provider 工厂复用(诊断后随探针一起收)
169
- export function withTimingProbe(inner) {
170
- return {
171
- name: inner.name,
172
- defaultModel: inner.defaultModel,
173
- models: inner.models,
174
- isAvailable: () => inner.isAvailable(),
175
- getModelInfo: (modelName) => inner.getModelInfo(modelName),
176
- getModelInfos: () => inner.getModelInfos(),
177
- chat: async (request) => {
178
- const t0 = Date.now();
179
- console.log(`[timing] stage=llm_start ms=${t0} provider=${inner.name} mode=chat model=${request.model ?? inner.defaultModel ?? '?'} ${timingReqSize(request)}`);
180
- try {
181
- const res = await inner.chat(request);
182
- console.log(`[timing] stage=llm_end ms=${Date.now()} dur=${Date.now() - t0} provider=${inner.name} mode=chat outcome=ok finish=${res.finishReason ?? '?'} outChars=${(res.content ?? '').length}`);
183
- return res;
184
- }
185
- catch (err) {
186
- console.log(`[timing] stage=llm_end ms=${Date.now()} dur=${Date.now() - t0} provider=${inner.name} mode=chat outcome=error`);
187
- throw err;
188
- }
189
- },
190
- stream: async function* (request) {
191
- const t0 = Date.now();
192
- const model = request.model ?? inner.defaultModel ?? '?';
193
- console.log(`[timing] stage=llm_start ms=${t0} provider=${inner.name} mode=stream model=${model} ${timingReqSize(request)}`);
194
- let first = true;
195
- let outcome = 'abandoned';
196
- try {
197
- for await (const chunk of inner.stream(request)) {
198
- if (first) {
199
- first = false;
200
- console.log(`[timing] stage=llm_first_token ms=${Date.now()} ttft=${Date.now() - t0} provider=${inner.name} model=${model}`);
201
- }
202
- yield chunk;
203
- }
204
- outcome = 'ok';
205
- }
206
- catch (err) {
207
- outcome = 'error';
208
- throw err;
209
- }
210
- finally {
211
- console.log(`[timing] stage=llm_end ms=${Date.now()} dur=${Date.now() - t0} provider=${inner.name} mode=stream outcome=${outcome}`);
212
- }
213
- },
214
- };
215
- }
156
+ // ── 观测装配(F3/D5)──
216
157
  /**
217
158
  * 按 `observability.llmRequestDump` 配置构造 wire dump sink
218
159
  *
@@ -232,6 +173,7 @@ export async function createWireDumpSinkFromConfig(cfg) {
232
173
  dir: cfg.dir,
233
174
  maxCallsPerSession: cfg.maxCallsPerSession,
234
175
  maxBodyBytes: cfg.maxBodyBytes,
176
+ maxResponseChars: cfg.maxResponseChars,
235
177
  resolveContext: () => {
236
178
  const scope = getRunScope();
237
179
  return scope
@@ -249,23 +191,84 @@ export async function createWireDumpSinkFromConfig(cfg) {
249
191
  * @param name - provider 名称
250
192
  * @param pc - provider 配置
251
193
  * @param options - 可选:wire dump sink(诊断用,见 `observability.llmRequestDump`)
252
- * @returns provider 实例(计时探针 → wire dump → 原生 provider 的装饰链)
194
+ * @returns provider 实例(wire dump → 原生 provider 的装饰链;LLM 计时已 observability 化进 model.call.*)
253
195
  */
254
196
  export async function createProviderFromConfig(name, pc, options) {
255
197
  const apiType = pc.api === 'anthropic-messages' ? 'anthropic' : 'openai';
256
- const models = pc.models.map(m => ({ name: m.name ?? m.id, contextWindow: m.contextWindow, maxOutputTokens: m.maxTokens }));
198
+ const models = pc.models.map(m => ({ name: m.name ?? m.id, contextWindow: m.contextWindow, maxOutputTokens: m.maxTokens, temperature: m.temperature }));
257
199
  const defaultModel = pc.models[0]?.name ?? pc.models[0]?.id;
258
- let decorate = withTimingProbe;
200
+ let decorate = (inner) => inner;
259
201
  if (options?.wireDump) {
260
- // 仅诊断路径才加载 wire dump(fs/crypto 不进入常规 provider 创建)
202
+ // 仅诊断路径才加载 wire dump(fs/crypto 不进入常规 provider 创建)。
203
+ // dump 必须贴在真实 provider 上才能拿到 `wireBodyFor`。
261
204
  const { withWireDump } = await import('./integration/providers/wire-dump.js');
262
205
  const sink = options.wireDump;
263
- decorate = (inner) => withTimingProbe(withWireDump(inner, sink));
206
+ decorate = (inner) => withWireDump(inner, sink);
264
207
  }
265
208
  if (apiType === 'anthropic') {
266
209
  const { AnthropicProvider } = await import('./integration/providers/anthropic.js');
267
- return decorate(new AnthropicProvider({ name, apiKey: pc.apiKey, baseUrl: pc.baseUrl, models, defaultModel, timeoutMs: pc.timeoutSeconds ? pc.timeoutSeconds * 1000 : undefined }));
210
+ return decorate(new AnthropicProvider({ name, apiKey: pc.apiKey ?? '', baseUrl: pc.baseUrl, models, defaultModel, timeoutMs: pc.timeoutSeconds ? pc.timeoutSeconds * 1000 : undefined }));
268
211
  }
269
212
  const { OpenAIProvider } = await import('./integration/providers/openai.js');
270
- return decorate(new OpenAIProvider({ name, apiKey: pc.apiKey, baseUrl: pc.baseUrl, models, defaultModel, timeoutMs: pc.timeoutSeconds ? pc.timeoutSeconds * 1000 : undefined }));
213
+ return decorate(new OpenAIProvider({ name, apiKey: pc.apiKey ?? '', baseUrl: pc.baseUrl, models, defaultModel, timeoutMs: pc.timeoutSeconds ? pc.timeoutSeconds * 1000 : undefined }));
214
+ }
215
+ /**
216
+ * 按 `observability` 配置构造 RunTelemetry 工厂(F3/D5 接线,组合根)
217
+ *
218
+ * TraceCollector → TraceLogger 按 `outputDir` 逐条同步落 JSONL(即 `traceDir`,无缓冲丢失风险);
219
+ * `level` / `consoleLevel` 与配置的 0–5 数值同构(FATAL=0 … TRACE=5,schema 已校验范围)。
220
+ * `consoleLevel` 缺省 null:trace 走文件通道,不向 gateway.log 混入控制台副本(要副本显式配置)。
221
+ *
222
+ * @param cfg - `observability` 配置段(level / consoleLevel / traceDir / capture*)
223
+ * @param options - 可选:trace 文件名前缀(多 agent 归属标识)
224
+ * @returns RunTelemetry 工厂(供 `AgentBuilder.telemetryFactory()` 注入)
225
+ */
226
+ export async function createTelemetryFactoryFromConfig(cfg, options) {
227
+ const { createRunTelemetry } = await import('./integration/observability/run-telemetry.js');
228
+ const { TraceCollector } = await import('./integration/observability/trace-collector.js');
229
+ const { getRunScope } = await import('./harness/run/run-scope.js');
230
+ // 配置 0–5 与 TraceLevel 数值同构;schema 保证 0-5 整数
231
+ const level = (cfg.level ?? 3);
232
+ const consoleLevel = (cfg.consoleLevel ?? null);
233
+ // 前缀进文件名:非法字符替换,防 agentId 越界成路径
234
+ const filePrefix = options?.filePrefix?.replace(/[^\w.-]/g, '_');
235
+ return (traceOptions) => createRunTelemetry({
236
+ ...traceOptions,
237
+ // model.call.* 归因:LoopObserver 路径经 RunScope ALS 取 sessionId/agentId(与 wire dump 同法)
238
+ resolveContext: () => {
239
+ const scope = getRunScope();
240
+ return scope ? { sessionId: scope.sessionId, agentId: scope.agentId } : {};
241
+ },
242
+ collector: new TraceCollector({
243
+ ...traceOptions,
244
+ level,
245
+ consoleLevel,
246
+ outputDir: cfg.traceDir ?? null,
247
+ ...(filePrefix ? { filePrefix } : {}),
248
+ }),
249
+ });
250
+ }
251
+ /**
252
+ * 按 `observability` 配置接线 AgentBuilder 观测装配(F3/D5)
253
+ *
254
+ * - 落盘:`traceDir / level / consoleLevel` → TraceCollector → JSONL
255
+ * - 采集意图:`captureStreamDeltas / captureModelRequest` → `AgentBuilder.trace()`
256
+ * - 工厂显式注入,不依赖包入口 `setRunTelemetryFactory` 副作用
257
+ * (serve / 子路径 import 时该副作用未必执行过,不能拿它当接线)
258
+ *
259
+ * @param builder - 目标 builder(`build()` 之前调用)
260
+ * @param cfg - `observability` 配置段;缺省时不做任何事
261
+ * @param options - 可选:trace 文件名前缀(一般传 agentId)
262
+ */
263
+ export async function wireObservability(builder, cfg, options) {
264
+ if (!cfg)
265
+ return;
266
+ builder.telemetryFactory(await createTelemetryFactoryFromConfig(cfg, options));
267
+ builder.trace({
268
+ captureStreamDeltas: cfg.captureStreamDeltas,
269
+ captureModelRequest: cfg.captureModelRequest,
270
+ // metrics 读取口未暴露(Builder 无 getTelemetry)且 LatencyTracker 无界:
271
+ // 暴露读取口前不启用,避免长驻 serve 只写不读的内存增长
272
+ enableMetrics: false,
273
+ });
271
274
  }
@@ -2,18 +2,24 @@
2
2
  * SessionRunnerDispatcher — RunDispatcher 默认实现
3
3
  *
4
4
  * 包装 SessionAwareRunner;模型 A:串行互斥归 Runner 锁,本类不建队列。
5
+ * inbox 只加速当前持锁 Run;原 Trigger 保留唤醒/重试语义(未消费项按原 Trigger 重投)。
5
6
  */
6
7
  import type { AgentEvent } from '@octopi-agent/core/primitives/event-bus.js';
7
8
  import type { SessionAwareRunner, RunConfig } from '../run/runner.js';
8
- import type { RunDispatcher, RunRequest } from './types.js';
9
+ import type { RunDispatcher, RunRequest, Trigger } from './types.js';
10
+ import { SessionInbox } from './inbox.js';
9
11
  export interface SessionRunnerDispatcherOptions {
10
12
  runner: SessionAwareRunner;
11
- /** 供 RunConfig.systemPrompt 等 */
12
13
  runConfigDefaults?: Partial<RunConfig>;
14
+ /** 未消费项回到 Runtime 的原 Trigger 路径(registerAgent 注入)。 */
15
+ redispatch?: (trigger: Trigger, options?: {
16
+ onEvent?: (event: AgentEvent) => void;
17
+ }) => void | Promise<unknown>;
13
18
  }
14
19
  export declare class SessionRunnerDispatcher implements RunDispatcher {
15
20
  private readonly runner;
16
21
  private readonly defaults;
22
+ readonly inbox: SessionInbox;
17
23
  constructor(options: SessionRunnerDispatcherOptions);
18
24
  execute(req: RunRequest, signal?: AbortSignal): AsyncIterable<AgentEvent>;
19
25
  }
@@ -2,13 +2,22 @@
2
2
  * SessionRunnerDispatcher — RunDispatcher 默认实现
3
3
  *
4
4
  * 包装 SessionAwareRunner;模型 A:串行互斥归 Runner 锁,本类不建队列。
5
+ * inbox 只加速当前持锁 Run;原 Trigger 保留唤醒/重试语义(未消费项按原 Trigger 重投)。
5
6
  */
7
+ import { SessionInbox } from './inbox.js';
6
8
  export class SessionRunnerDispatcher {
7
9
  runner;
8
10
  defaults;
11
+ inbox;
9
12
  constructor(options) {
10
13
  this.runner = options.runner;
11
14
  this.defaults = options.runConfigDefaults ?? {};
15
+ this.inbox = new SessionInbox(async (entry) => {
16
+ if (!entry.trigger) {
17
+ throw new Error(`inbox entry ${entry.id} has no original trigger for redispatch`);
18
+ }
19
+ await options.redispatch?.(entry.trigger, entry.onEvent ? { onEvent: entry.onEvent } : undefined);
20
+ });
12
21
  }
13
22
  async *execute(req, signal) {
14
23
  const runConfig = {
@@ -16,16 +25,35 @@ export class SessionRunnerDispatcher {
16
25
  ...this.defaults,
17
26
  agentId: req.agentId,
18
27
  sessionId: req.sessionId,
19
- // model 仅表示消息级覆盖;勿用 defaults.model 预填 agent 默认(会吞掉 session.metadata.model)
20
28
  model: req.modelOverride,
21
29
  modelProvider: req.modelProvider,
22
30
  };
23
- // 合批多条:按序各 handle 一次(同 session,Runner 锁保证串行)
24
- // 无 coalesceKey 的单条路径与今日 Gateway 一致
25
- for (const message of req.messages) {
31
+ const entries = req.triggers.map((trigger, index) => ({
32
+ id: trigger.id,
33
+ agentId: req.agentId,
34
+ sessionId: req.sessionId,
35
+ message: req.messages[index],
36
+ human: trigger.type === 'message' && trigger.payload.kind === 'user_message',
37
+ triggerType: trigger.type,
38
+ modelOverride: index === req.triggers.length - 1 ? req.modelOverride : undefined,
39
+ modelProvider: index === req.triggers.length - 1 ? req.modelProvider : undefined,
40
+ receivedAt: trigger.timestamp ?? Date.now(),
41
+ }));
42
+ for (const entry of entries) {
26
43
  if (signal?.aborted)
27
44
  return;
28
- yield* this.runner.handle(req.sessionId, message, runConfig, signal);
45
+ const config = {
46
+ ...runConfig,
47
+ model: entry.modelOverride ?? runConfig.model,
48
+ modelProvider: entry.modelProvider ?? runConfig.modelProvider,
49
+ };
50
+ // 每条各开各关:inbox 生命周期 ⊂ session 锁;合批后续条目不进前一条的接收队列
51
+ const binding = {
52
+ inbox: this.inbox,
53
+ runId: `${req.requestId}:${entry.id}`,
54
+ entries: [entry],
55
+ };
56
+ yield* this.runner.handle(req.sessionId, entry.message, config, signal, binding, entry);
29
57
  }
30
58
  }
31
59
  }