@octopi-agent/engine 0.90.11 → 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.
- package/dist/config-admin/agent-presets.d.ts +70 -0
- package/dist/config-admin/agent-presets.js +243 -0
- package/dist/config-admin/discover.d.ts +30 -0
- package/dist/config-admin/discover.js +48 -0
- package/dist/config-admin/env.d.ts +22 -0
- package/dist/config-admin/env.js +41 -0
- package/dist/config-admin/index.d.ts +20 -0
- package/dist/config-admin/index.js +15 -0
- package/dist/config-admin/model-presets.d.ts +75 -0
- package/dist/config-admin/model-presets.js +249 -0
- package/dist/config-admin/name-guard.d.ts +14 -0
- package/dist/config-admin/name-guard.js +24 -0
- package/dist/config-admin/patch.d.ts +56 -0
- package/dist/config-admin/patch.js +201 -0
- package/dist/config-admin/port.d.ts +68 -0
- package/dist/config-admin/port.js +21 -0
- package/dist/config-admin/redact.d.ts +39 -0
- package/dist/config-admin/redact.js +42 -0
- package/dist/config-schema/agent.d.ts +43 -1
- package/dist/config-schema/context.d.ts +6 -1
- package/dist/config-schema/context.js +8 -0
- package/dist/config-schema/engine.d.ts +106 -4
- package/dist/config-schema/governance.d.ts +43 -1
- package/dist/config-schema/governance.js +157 -0
- package/dist/config-schema/models.d.ts +5 -2
- package/dist/config-schema/models.js +4 -1
- package/dist/config-schema/observability.d.ts +9 -0
- package/dist/config-schema/observability.js +29 -0
- package/dist/config-schema/run.d.ts +3 -0
- package/dist/config-schema/run.js +14 -0
- package/dist/config.d.ts +29 -4
- package/dist/config.js +15 -4
- package/dist/harness/activation/dispatcher.d.ts +8 -2
- package/dist/harness/activation/dispatcher.js +33 -5
- package/dist/harness/activation/inbox.d.ts +87 -0
- package/dist/harness/activation/inbox.js +169 -0
- package/dist/harness/activation/runtime.d.ts +9 -8
- package/dist/harness/activation/runtime.js +100 -8
- package/dist/harness/activation/types.d.ts +19 -0
- package/dist/harness/activation/types.js +2 -0
- package/dist/harness/agent/builder.d.ts +15 -1
- package/dist/harness/agent/builder.js +31 -10
- package/dist/harness/agent/config-bridge.d.ts +5 -0
- package/dist/harness/agent/config-bridge.js +3 -0
- package/dist/harness/agent/config-integrity.d.ts +72 -0
- package/dist/harness/agent/config-integrity.js +146 -0
- package/dist/harness/agent/wire-agent-builder.js +2 -1
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +3 -1
- package/dist/harness/collaboration/delegation/child-run.js +21 -5
- package/dist/harness/collaboration/delegation/notifier.js +4 -3
- package/dist/harness/collaboration/delegation/service.js +2 -3
- package/dist/harness/collaboration/delegation/wiring.js +6 -5
- package/dist/harness/collaboration/orchestration/reflector/llm-reflector.d.ts +1 -1
- package/dist/harness/collaboration/orchestration/reflector/llm-reflector.js +1 -1
- package/dist/harness/context/capabilities/compact/engine.d.ts +30 -0
- package/dist/harness/context/capabilities/compact/engine.js +198 -46
- package/dist/harness/context/capabilities/compact/handover.d.ts +78 -0
- package/dist/harness/context/capabilities/compact/handover.js +107 -0
- package/dist/harness/context/capabilities/compact/index.d.ts +3 -1
- package/dist/harness/context/capabilities/compact/index.js +2 -1
- package/dist/harness/context/capabilities/compact/types.d.ts +30 -1
- package/dist/harness/context/capabilities/summary/executor.js +2 -1
- package/dist/harness/context/capabilities/summary/policies.js +8 -5
- package/dist/harness/context/constitution/default-agents.md +11 -10
- package/dist/harness/context/default-context-engine.d.ts +34 -4
- package/dist/harness/context/default-context-engine.js +194 -49
- package/dist/harness/context/hybrid-compressor.js +6 -0
- package/dist/harness/context/llm-summarizer.d.ts +2 -8
- package/dist/harness/context/llm-summarizer.js +69 -91
- package/dist/harness/context/message-selector.js +4 -3
- package/dist/harness/context/summarize.d.ts +2 -0
- package/dist/harness/context/summarize.js +7 -2
- package/dist/harness/context/truncate-compressor.js +7 -0
- package/dist/harness/context/turn-envelope.d.ts +3 -2
- package/dist/harness/context/turn-envelope.js +3 -2
- package/dist/harness/context/types.d.ts +33 -1
- package/dist/harness/extension/execution-environment/dangerous-commands.d.ts +28 -0
- package/dist/harness/extension/execution-environment/dangerous-commands.js +129 -0
- package/dist/harness/extension/execution-environment/effect-policy.d.ts +127 -8
- package/dist/harness/extension/execution-environment/effect-policy.js +244 -19
- package/dist/harness/extension/execution-environment/index.d.ts +4 -2
- package/dist/harness/extension/execution-environment/index.js +2 -1
- package/dist/harness/extension/execution-environment/kill-switch.d.ts +34 -0
- package/dist/harness/extension/execution-environment/kill-switch.js +46 -0
- package/dist/harness/extension/execution-environment/ops-audit.d.ts +200 -0
- package/dist/harness/extension/execution-environment/ops-audit.js +338 -0
- package/dist/harness/extension/execution-environment/privileged-exec.d.ts +158 -0
- package/dist/harness/extension/execution-environment/privileged-exec.js +418 -0
- package/dist/harness/extension/execution-environment/process-info.d.ts +180 -0
- package/dist/harness/extension/execution-environment/process-info.js +466 -0
- package/dist/harness/extension/execution-environment/process-isolation.d.ts +7 -0
- package/dist/harness/extension/execution-environment/process-isolation.js +9 -0
- package/dist/harness/extension/execution-environment/sandbox.d.ts +109 -0
- package/dist/harness/extension/execution-environment/sandbox.js +228 -21
- package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +1 -1
- package/dist/harness/extension/execution-environment/tool-capabilities.js +6 -0
- package/dist/harness/extension/execution-environment/types.d.ts +19 -0
- package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +5 -0
- package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +33 -0
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.d.ts +4 -5
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +5 -15
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +3 -0
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +53 -2
- package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +2 -0
- package/dist/harness/extension/plugin-ecosystem/tools/index.js +2 -0
- package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.d.ts +43 -0
- package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.js +350 -0
- package/dist/harness/extension/plugin-ecosystem/tools/process-tools.d.ts +30 -0
- package/dist/harness/extension/plugin-ecosystem/tools/process-tools.js +137 -0
- package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +54 -4
- package/dist/harness/governance/human-in-the-loop/decision-cache.js +42 -16
- package/dist/harness/governance/security/temp-path.d.ts +9 -0
- package/dist/harness/governance/security/temp-path.js +13 -2
- package/dist/harness/governance/session-acl/seed-roles.js +14 -0
- package/dist/harness/index.d.ts +2 -0
- package/dist/harness/index.js +2 -0
- package/dist/harness/knowledge/fts.js +1 -2
- package/dist/harness/knowledge/index-store.js +59 -9
- package/dist/harness/memory/sqlite/keyword-search.d.ts +1 -0
- package/dist/harness/memory/sqlite/keyword-search.js +4 -3
- package/dist/harness/observability/observer/hub.js +8 -0
- package/dist/harness/observability/observer/run-snapshot.js +1 -0
- package/dist/harness/observability/observer/types.d.ts +4 -0
- package/dist/harness/run/agent/agent.d.ts +7 -0
- package/dist/harness/run/agent/agent.js +23 -1
- package/dist/harness/run/reliability/fallback-provider.d.ts +117 -5
- package/dist/harness/run/reliability/fallback-provider.js +262 -22
- package/dist/harness/run/reliability/harness-events.d.ts +24 -1
- package/dist/harness/run/reliability/model-error-policy.d.ts +32 -0
- package/dist/harness/run/reliability/model-error-policy.js +42 -0
- package/dist/harness/run/reliability/provider-wrapper.js +29 -2
- package/dist/harness/run/reliability/refusal-guard.d.ts +20 -0
- package/dist/harness/run/reliability/refusal-guard.js +102 -0
- package/dist/harness/run/reliability/run-agent.js +231 -33
- package/dist/harness/run/run-guard/default-run-guard.js +1 -1
- package/dist/harness/run/run-scope.d.ts +31 -0
- package/dist/harness/run/runner.d.ts +116 -2
- package/dist/harness/run/runner.js +547 -41
- package/dist/harness/session/attachments/llm-intent.js +2 -1
- package/dist/harness/session/tasks/render.d.ts +4 -1
- package/dist/harness/session/tasks/render.js +10 -7
- package/dist/harness/shared/events/agent-event-map.d.ts +66 -0
- package/dist/harness/shared/events/agent-event-map.js +5 -0
- package/dist/index.d.ts +3 -3
- package/dist/index.js +2 -2
- package/dist/integration/agent-runtime/channel-message-source.js +19 -1
- package/dist/integration/index.d.ts +2 -0
- package/dist/integration/index.js +1 -0
- package/dist/integration/observability/loop-watchdog.d.ts +56 -0
- package/dist/integration/observability/loop-watchdog.js +177 -0
- package/dist/integration/observability/metrics.d.ts +3 -0
- package/dist/integration/observability/metrics.js +18 -7
- package/dist/integration/providers/anthropic.d.ts +23 -0
- package/dist/integration/providers/anthropic.js +97 -12
- package/dist/integration/providers/fetch-timeout.d.ts +42 -0
- package/dist/integration/providers/fetch-timeout.js +51 -0
- package/dist/integration/providers/openai.d.ts +10 -0
- package/dist/integration/providers/openai.js +58 -11
- package/dist/integration/providers/provider-diagnostics.d.ts +80 -0
- package/dist/integration/providers/provider-diagnostics.js +89 -0
- package/dist/integration/providers/timeout-coherence.d.ts +52 -0
- package/dist/integration/providers/timeout-coherence.js +68 -0
- package/dist/integration/providers/wire-dump.d.ts +62 -0
- package/dist/integration/providers/wire-dump.js +111 -2
- package/dist/integration/storage/jsonl.js +4 -1
- package/dist/subsystems/cognition-steward/conceptualize/handler.js +1 -1
- package/dist/subsystems/memory-steward/backfill/handler.js +1 -1
- package/dist/subsystems/wisdom-steward/formation/handler.js +1 -1
- package/package.json +3 -2
|
@@ -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({
|
package/dist/config.d.ts
CHANGED
|
@@ -457,10 +457,16 @@ export interface SchedulesJsonConfig {
|
|
|
457
457
|
export interface ContextEngineConfig {
|
|
458
458
|
/** 引擎类型(默认 'default') */
|
|
459
459
|
type?: 'default' | 'custom';
|
|
460
|
-
/** 头部保护消息数(默认
|
|
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
|
|
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
|
|
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 提取的扁平模型列表 */
|
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);
|
|
@@ -163,6 +173,7 @@ export async function createWireDumpSinkFromConfig(cfg) {
|
|
|
163
173
|
dir: cfg.dir,
|
|
164
174
|
maxCallsPerSession: cfg.maxCallsPerSession,
|
|
165
175
|
maxBodyBytes: cfg.maxBodyBytes,
|
|
176
|
+
maxResponseChars: cfg.maxResponseChars,
|
|
166
177
|
resolveContext: () => {
|
|
167
178
|
const scope = getRunScope();
|
|
168
179
|
return scope
|
|
@@ -184,7 +195,7 @@ export async function createWireDumpSinkFromConfig(cfg) {
|
|
|
184
195
|
*/
|
|
185
196
|
export async function createProviderFromConfig(name, pc, options) {
|
|
186
197
|
const apiType = pc.api === 'anthropic-messages' ? 'anthropic' : 'openai';
|
|
187
|
-
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 }));
|
|
188
199
|
const defaultModel = pc.models[0]?.name ?? pc.models[0]?.id;
|
|
189
200
|
let decorate = (inner) => inner;
|
|
190
201
|
if (options?.wireDump) {
|
|
@@ -196,10 +207,10 @@ export async function createProviderFromConfig(name, pc, options) {
|
|
|
196
207
|
}
|
|
197
208
|
if (apiType === 'anthropic') {
|
|
198
209
|
const { AnthropicProvider } = await import('./integration/providers/anthropic.js');
|
|
199
|
-
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 }));
|
|
200
211
|
}
|
|
201
212
|
const { OpenAIProvider } = await import('./integration/providers/openai.js');
|
|
202
|
-
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 }));
|
|
203
214
|
}
|
|
204
215
|
/**
|
|
205
216
|
* 按 `observability` 配置构造 RunTelemetry 工厂(F3/D5 接线,组合根)
|
|
@@ -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
|
-
|
|
24
|
-
|
|
25
|
-
|
|
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
|
-
|
|
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
|
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SessionInbox — 给持锁的活跃 Run 接续消息。
|
|
3
|
+
*
|
|
4
|
+
* 原 Trigger 是唤醒/重试凭证:offer 未被活跃 Run 接收时,调用方照常 dispatch;
|
|
5
|
+
* 被接收后由活跃 Run 在下一个合法消息边界消费,Run 关闭仍未消费/未确认
|
|
6
|
+
* (ack = 已入父上下文且转录同步成功)则按原 Trigger 重投。
|
|
7
|
+
* 本队列不是第二执行引擎——不持锁不开箱,不改写已发出的模型请求。
|
|
8
|
+
*/
|
|
9
|
+
import type { AgentEvent } from '@octopi-agent/core/primitives/event-bus.js';
|
|
10
|
+
import type { Message } from '@octopi-agent/core/types.js';
|
|
11
|
+
import type { Trigger } from './types.js';
|
|
12
|
+
export type InboxOfferResult = 'steered' | 'dispatched' | 'duplicate';
|
|
13
|
+
export interface SessionInboxSignal {
|
|
14
|
+
agentId: string;
|
|
15
|
+
sessionId: string;
|
|
16
|
+
message: Message;
|
|
17
|
+
/** trigger.id / delegationId 去重;同 id 只进一次父上下文。 */
|
|
18
|
+
entryId?: string;
|
|
19
|
+
/** 真人输入优先于机器结果。 */
|
|
20
|
+
human?: boolean;
|
|
21
|
+
triggerType?: Trigger['type'];
|
|
22
|
+
/** 消息级模型覆盖;与活跃 Run 同模型时仍可接续(会话级选择 ≠ 显式换模型)。 */
|
|
23
|
+
modelOverride?: string;
|
|
24
|
+
modelProvider?: string;
|
|
25
|
+
/** 原 Trigger:Run 关闭未确认时按它重投,保留附件等完整来源。 */
|
|
26
|
+
trigger?: Trigger;
|
|
27
|
+
/** 调用方的收尾通道(频道回复捕获等);消费时由 Runner 转发事件。 */
|
|
28
|
+
onEvent?: (event: AgentEvent) => void;
|
|
29
|
+
onAdmitted?: (delivery: 'steered') => void;
|
|
30
|
+
}
|
|
31
|
+
export interface SessionInboxEntry {
|
|
32
|
+
readonly id: string;
|
|
33
|
+
readonly agentId: string;
|
|
34
|
+
readonly sessionId: string;
|
|
35
|
+
readonly message: Message;
|
|
36
|
+
readonly human: boolean;
|
|
37
|
+
readonly triggerType?: Trigger['type'];
|
|
38
|
+
readonly modelOverride?: string;
|
|
39
|
+
readonly modelProvider?: string;
|
|
40
|
+
readonly trigger?: Trigger;
|
|
41
|
+
readonly onEvent?: (event: AgentEvent) => void;
|
|
42
|
+
readonly receivedAt: number;
|
|
43
|
+
}
|
|
44
|
+
export interface SessionInboxRun {
|
|
45
|
+
readonly runId: string;
|
|
46
|
+
readonly inbox: SessionInbox;
|
|
47
|
+
readonly closed: boolean;
|
|
48
|
+
drain(): SessionInboxEntry[];
|
|
49
|
+
take(entryId: string): SessionInboxEntry | undefined;
|
|
50
|
+
close(): void;
|
|
51
|
+
}
|
|
52
|
+
/** Dispatcher 创建;Runner 拿锁后 open,释放锁前 close(生命周期 ⊂ session 锁)。 */
|
|
53
|
+
export interface SessionInboxBinding {
|
|
54
|
+
readonly inbox: SessionInbox;
|
|
55
|
+
readonly runId: string;
|
|
56
|
+
readonly entries: SessionInboxEntry[];
|
|
57
|
+
}
|
|
58
|
+
interface RunModelFingerprint {
|
|
59
|
+
model?: string;
|
|
60
|
+
provider?: string;
|
|
61
|
+
}
|
|
62
|
+
export declare class SessionInbox {
|
|
63
|
+
private readonly redispatch;
|
|
64
|
+
private readonly idLimit;
|
|
65
|
+
private readonly active;
|
|
66
|
+
private readonly pending;
|
|
67
|
+
private readonly redispatching;
|
|
68
|
+
private readonly owned;
|
|
69
|
+
private readonly delivered;
|
|
70
|
+
/** drain/take 出队但尚未 ack 的条目;Run 关闭未确认时回队重投(at-least-once)。 */
|
|
71
|
+
private readonly unacked;
|
|
72
|
+
constructor(redispatch: (entry: SessionInboxEntry) => void | Promise<unknown>, idLimit?: number);
|
|
73
|
+
/**
|
|
74
|
+
* 有兼容的活跃接收端才接收(返回 steered);否则调用方继续原 Trigger。
|
|
75
|
+
* duplicate = 同 id 已被接收或已入上下文,不得再次执行。
|
|
76
|
+
* 兼容性:显式换模型(≠ 活跃 Run 模型)/ 带附件输入不接续,走完整新 Run。
|
|
77
|
+
*/
|
|
78
|
+
offer(signal: SessionInboxSignal): InboxOfferResult;
|
|
79
|
+
/** 仅 Runner 持锁后调用;同 (agent, session) 同时只有一个接收端。 */
|
|
80
|
+
open(sessionId: string, agentId: string, runId: string, entries: SessionInboxEntry[], runModel?: RunModelFingerprint): SessionInboxRun;
|
|
81
|
+
/** 消息已进父上下文且转录同步成功才调用;送达去重与 surfaced 的因果锚点。 */
|
|
82
|
+
ack(entry: SessionInboxEntry): void;
|
|
83
|
+
isDelivered(entryId: string): boolean;
|
|
84
|
+
/** close 重投:每个待投项独立 await;重复投递由 offer 的 delivered 检查兜底。 */
|
|
85
|
+
private schedule;
|
|
86
|
+
}
|
|
87
|
+
export {};
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SessionInbox — 给持锁的活跃 Run 接续消息。
|
|
3
|
+
*
|
|
4
|
+
* 原 Trigger 是唤醒/重试凭证:offer 未被活跃 Run 接收时,调用方照常 dispatch;
|
|
5
|
+
* 被接收后由活跃 Run 在下一个合法消息边界消费,Run 关闭仍未消费/未确认
|
|
6
|
+
* (ack = 已入父上下文且转录同步成功)则按原 Trigger 重投。
|
|
7
|
+
* 本队列不是第二执行引擎——不持锁不开箱,不改写已发出的模型请求。
|
|
8
|
+
*/
|
|
9
|
+
import { randomUUID } from 'node:crypto';
|
|
10
|
+
function keyOf(agentId, sessionId) {
|
|
11
|
+
return JSON.stringify([agentId, sessionId]);
|
|
12
|
+
}
|
|
13
|
+
function compareEntries(a, b) {
|
|
14
|
+
// 人话先于机器结果;同来源保持到达顺序。
|
|
15
|
+
if (a.human !== b.human)
|
|
16
|
+
return a.human ? -1 : 1;
|
|
17
|
+
return a.receivedAt - b.receivedAt;
|
|
18
|
+
}
|
|
19
|
+
export class SessionInbox {
|
|
20
|
+
redispatch;
|
|
21
|
+
idLimit;
|
|
22
|
+
active = new Map();
|
|
23
|
+
pending = new Map();
|
|
24
|
+
redispatching = new Map();
|
|
25
|
+
owned = new Set();
|
|
26
|
+
delivered = new Set();
|
|
27
|
+
/** drain/take 出队但尚未 ack 的条目;Run 关闭未确认时回队重投(at-least-once)。 */
|
|
28
|
+
unacked = new Map();
|
|
29
|
+
constructor(redispatch, idLimit = 4096) {
|
|
30
|
+
this.redispatch = redispatch;
|
|
31
|
+
this.idLimit = idLimit;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* 有兼容的活跃接收端才接收(返回 steered);否则调用方继续原 Trigger。
|
|
35
|
+
* duplicate = 同 id 已被接收或已入上下文,不得再次执行。
|
|
36
|
+
* 兼容性:显式换模型(≠ 活跃 Run 模型)/ 带附件输入不接续,走完整新 Run。
|
|
37
|
+
*/
|
|
38
|
+
offer(signal) {
|
|
39
|
+
const id = signal.entryId ?? signal.trigger?.id ?? `inbox-${randomUUID()}`;
|
|
40
|
+
if (this.owned.has(id) || this.delivered.has(id))
|
|
41
|
+
return 'duplicate';
|
|
42
|
+
const active = this.active.get(keyOf(signal.agentId, signal.sessionId));
|
|
43
|
+
const modelSwitch = signal.modelOverride !== undefined &&
|
|
44
|
+
(signal.modelOverride !== active?.runModel?.model ||
|
|
45
|
+
signal.modelProvider !== active?.runModel?.provider);
|
|
46
|
+
if (!active || modelSwitch || signal.message.metadata?.attachmentIds != null) {
|
|
47
|
+
return 'dispatched';
|
|
48
|
+
}
|
|
49
|
+
const entry = {
|
|
50
|
+
id,
|
|
51
|
+
agentId: signal.agentId,
|
|
52
|
+
sessionId: signal.sessionId,
|
|
53
|
+
message: signal.message,
|
|
54
|
+
human: signal.human ?? false,
|
|
55
|
+
triggerType: signal.triggerType ?? signal.trigger?.type,
|
|
56
|
+
modelOverride: signal.modelOverride,
|
|
57
|
+
modelProvider: signal.modelProvider,
|
|
58
|
+
trigger: signal.trigger,
|
|
59
|
+
onEvent: signal.onEvent,
|
|
60
|
+
receivedAt: Date.now(),
|
|
61
|
+
};
|
|
62
|
+
this.owned.add(id);
|
|
63
|
+
active.state.pending.push(entry);
|
|
64
|
+
signal.onAdmitted?.('steered');
|
|
65
|
+
return 'steered';
|
|
66
|
+
}
|
|
67
|
+
/** 仅 Runner 持锁后调用;同 (agent, session) 同时只有一个接收端。 */
|
|
68
|
+
open(sessionId, agentId, runId, entries, runModel) {
|
|
69
|
+
const key = keyOf(agentId, sessionId);
|
|
70
|
+
if (this.active.has(key))
|
|
71
|
+
throw new Error(`inbox run already open: ${key}`);
|
|
72
|
+
const state = {
|
|
73
|
+
closed: false,
|
|
74
|
+
pending: entries.filter((entry) => !this.delivered.has(entry.id)),
|
|
75
|
+
};
|
|
76
|
+
for (const entry of state.pending)
|
|
77
|
+
this.owned.add(entry.id);
|
|
78
|
+
this.active.set(key, { runId, runModel, state });
|
|
79
|
+
const claim = (entry) => {
|
|
80
|
+
this.unacked.set(entry.id, { entry, runId });
|
|
81
|
+
return entry;
|
|
82
|
+
};
|
|
83
|
+
return {
|
|
84
|
+
runId,
|
|
85
|
+
inbox: this,
|
|
86
|
+
get closed() {
|
|
87
|
+
return state.closed;
|
|
88
|
+
},
|
|
89
|
+
drain: () => state.pending.splice(0).sort(compareEntries).map(claim),
|
|
90
|
+
take: (entryId) => {
|
|
91
|
+
const index = state.pending.findIndex((entry) => entry.id === entryId);
|
|
92
|
+
if (index < 0)
|
|
93
|
+
return undefined;
|
|
94
|
+
const entry = state.pending.splice(index, 1)[0];
|
|
95
|
+
// 初始输入由本次 Run 全权负责(失败走 RUN_FAILED/上层重试),
|
|
96
|
+
// 不进 unacked 重投;此处释放 owned 防首同步前退出时 id 残留(评审 F8)
|
|
97
|
+
this.owned.delete(entry.id);
|
|
98
|
+
return entry;
|
|
99
|
+
},
|
|
100
|
+
close: () => {
|
|
101
|
+
if (state.closed)
|
|
102
|
+
return;
|
|
103
|
+
state.closed = true;
|
|
104
|
+
this.active.delete(key);
|
|
105
|
+
// 未消费(pending)+ 已取走但未确认(unacked)都按原 Trigger 重投:
|
|
106
|
+
// ack 只认「已入父上下文且转录同步成功」,其余一律 at-least-once。
|
|
107
|
+
const requeue = [...state.pending.splice(0)];
|
|
108
|
+
for (const [id, record] of this.unacked) {
|
|
109
|
+
if (record.runId !== runId)
|
|
110
|
+
continue;
|
|
111
|
+
this.unacked.delete(id);
|
|
112
|
+
if (this.delivered.has(id))
|
|
113
|
+
continue;
|
|
114
|
+
requeue.push(record.entry);
|
|
115
|
+
}
|
|
116
|
+
for (const entry of requeue) {
|
|
117
|
+
this.owned.delete(entry.id);
|
|
118
|
+
if (this.delivered.has(entry.id))
|
|
119
|
+
continue;
|
|
120
|
+
const queue = this.pending.get(key) ?? [];
|
|
121
|
+
if (!queue.some((item) => item.id === entry.id))
|
|
122
|
+
queue.push(entry);
|
|
123
|
+
this.pending.set(key, queue);
|
|
124
|
+
}
|
|
125
|
+
this.schedule(key);
|
|
126
|
+
},
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
/** 消息已进父上下文且转录同步成功才调用;送达去重与 surfaced 的因果锚点。 */
|
|
130
|
+
ack(entry) {
|
|
131
|
+
this.unacked.delete(entry.id);
|
|
132
|
+
this.owned.delete(entry.id);
|
|
133
|
+
this.delivered.add(entry.id);
|
|
134
|
+
while (this.delivered.size > this.idLimit) {
|
|
135
|
+
const oldest = this.delivered.values().next().value;
|
|
136
|
+
if (oldest === undefined)
|
|
137
|
+
break;
|
|
138
|
+
this.delivered.delete(oldest);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
isDelivered(entryId) {
|
|
142
|
+
return this.delivered.has(entryId);
|
|
143
|
+
}
|
|
144
|
+
/** close 重投:每个待投项独立 await;重复投递由 offer 的 delivered 检查兜底。 */
|
|
145
|
+
schedule(key) {
|
|
146
|
+
if (this.redispatching.has(key) || !this.pending.get(key)?.length)
|
|
147
|
+
return;
|
|
148
|
+
const task = (async () => {
|
|
149
|
+
while (true) {
|
|
150
|
+
const entry = this.pending.get(key)?.shift();
|
|
151
|
+
if (!entry)
|
|
152
|
+
break;
|
|
153
|
+
if (!this.pending.get(key)?.length)
|
|
154
|
+
this.pending.delete(key);
|
|
155
|
+
if (this.delivered.has(entry.id))
|
|
156
|
+
continue;
|
|
157
|
+
await this.redispatch(entry);
|
|
158
|
+
}
|
|
159
|
+
})()
|
|
160
|
+
.catch((error) => {
|
|
161
|
+
console.warn(`[SessionInbox] redispatch failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
162
|
+
})
|
|
163
|
+
.finally(() => {
|
|
164
|
+
this.redispatching.delete(key);
|
|
165
|
+
this.schedule(key);
|
|
166
|
+
});
|
|
167
|
+
this.redispatching.set(key, task);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
* 设计:arch/agent-runtime.md
|
|
8
8
|
*/
|
|
9
9
|
import type { EventBus } from '@octopi-agent/core/index.js';
|
|
10
|
-
import type { AgentEvent } from '@octopi-agent/core/primitives/event-bus.js';
|
|
11
10
|
import type { AgentRouter, DispatchResult, FanoutDispatchResult, RuntimeAgent, RuntimeEventListener, Trigger, TriggerSource } from './types.js';
|
|
12
11
|
export interface AgentRuntimeConfig {
|
|
13
12
|
events?: EventBus;
|
|
@@ -69,16 +68,18 @@ export declare class AgentRuntime {
|
|
|
69
68
|
on(listener: RuntimeEventListener): () => void;
|
|
70
69
|
on(type: string, listener: RuntimeEventListener): () => void;
|
|
71
70
|
/** 串行 dispatch 多条 Trigger */
|
|
72
|
-
dispatchMany(triggers: Trigger[], options?:
|
|
73
|
-
onEvent?: (event: AgentEvent) => void;
|
|
74
|
-
}): Promise<Array<DispatchResult | FanoutDispatchResult>>;
|
|
71
|
+
dispatchMany(triggers: Trigger[], options?: import('./types.js').DispatchOptions): Promise<Array<DispatchResult | FanoutDispatchResult>>;
|
|
75
72
|
/**
|
|
76
|
-
* 模型 A:await 至 Run 结束(或 skipped / failed)
|
|
73
|
+
* 模型 A:await 至 Run 结束(或 skipped / failed / accepted)
|
|
77
74
|
* @param options.onEvent - 转发 Run 事件流(Gateway 流式广播);不变量 #6
|
|
75
|
+
* @param options.onDelivery - 活跃 Run 接收即回执(早于 Run 结束)
|
|
78
76
|
*/
|
|
79
|
-
dispatch(trigger: Trigger, options?:
|
|
80
|
-
|
|
81
|
-
|
|
77
|
+
dispatch(trigger: Trigger, options?: import('./types.js').DispatchOptions): Promise<DispatchResult | FanoutDispatchResult>;
|
|
78
|
+
/**
|
|
79
|
+
* 路由目标的活跃 inbox 接收(human 与 delegation signal 共用)。
|
|
80
|
+
* 仅 message / agent_signal 可接续;其余类型与带附件/换模型输入走完整新 Run。
|
|
81
|
+
*/
|
|
82
|
+
private offerToTarget;
|
|
82
83
|
private dispatchToTarget;
|
|
83
84
|
private executeTriggers;
|
|
84
85
|
private emitRuntime;
|