@octopi-agent/engine 0.102.10 → 0.121.10
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/builtin-model-info.js +28 -7
- package/dist/config-admin/agent-presets.d.ts +32 -0
- package/dist/config-admin/agent-presets.js +133 -0
- package/dist/config-admin/discover.d.ts +33 -4
- package/dist/config-admin/discover.js +101 -6
- package/dist/config-admin/env.d.ts +11 -0
- package/dist/config-admin/env.js +41 -0
- package/dist/config-admin/error-copy.d.ts +106 -0
- package/dist/config-admin/error-copy.js +287 -0
- package/dist/config-admin/i18n.d.ts +21 -0
- package/dist/config-admin/i18n.js +19 -0
- package/dist/config-admin/index.d.ts +6 -2
- package/dist/config-admin/index.js +3 -1
- package/dist/config-admin/model-presets.d.ts +14 -0
- package/dist/config-admin/model-presets.js +595 -70
- package/dist/config-admin/onboarding-apply.d.ts +71 -0
- package/dist/config-admin/onboarding-apply.js +235 -0
- package/dist/config-admin/onboarding.d.ts +154 -0
- package/dist/config-admin/onboarding.js +270 -0
- package/dist/config-admin/redact.d.ts +42 -9
- package/dist/config-admin/redact.js +69 -5
- package/dist/config-schema/agent.d.ts +5 -1
- package/dist/config-schema/agent.js +20 -2
- package/dist/config-schema/browser.d.ts +62 -0
- package/dist/config-schema/browser.js +89 -0
- package/dist/config-schema/context.d.ts +7 -2
- package/dist/config-schema/context.js +6 -3
- package/dist/config-schema/engine.d.ts +86 -7
- package/dist/config-schema/engine.js +9 -2
- package/dist/config-schema/governance.d.ts +12 -1
- package/dist/config-schema/governance.js +10 -2
- package/dist/config-schema/models.d.ts +12 -8
- package/dist/config-schema/models.js +16 -1
- package/dist/config-schema/run.d.ts +4 -0
- package/dist/config-schema/run.js +10 -0
- package/dist/config-schema/shared.d.ts +1 -0
- package/dist/config-schema/shared.js +4 -2
- package/dist/config-schema/substrate.d.ts +5 -0
- package/dist/config-schema/substrate.js +8 -0
- package/dist/config.d.ts +116 -10
- package/dist/config.js +109 -13
- package/dist/file-mode.d.ts +67 -0
- package/dist/file-mode.js +182 -0
- package/dist/fork-child.d.ts +82 -0
- package/dist/fork-child.js +123 -0
- package/dist/harness/activation/delegated-run.d.ts +42 -0
- package/dist/harness/activation/delegated-run.js +71 -0
- package/dist/harness/activation/dispatcher.js +4 -0
- package/dist/harness/activation/index.d.ts +1 -0
- package/dist/harness/activation/run-backend.d.ts +92 -0
- package/dist/harness/activation/run-backend.js +16 -0
- package/dist/harness/activation/run-protocol.d.ts +392 -0
- package/dist/harness/activation/run-protocol.js +19 -0
- package/dist/harness/activation/runtime.d.ts +33 -0
- package/dist/harness/activation/runtime.js +119 -28
- package/dist/harness/activation/types.d.ts +19 -2
- package/dist/harness/agent/builder.d.ts +12 -0
- package/dist/harness/agent/builder.js +78 -22
- package/dist/harness/agent/config-bridge.d.ts +10 -1
- package/dist/harness/agent/config-bridge.js +15 -3
- package/dist/harness/agent/registered-tool-adapter.d.ts +27 -0
- package/dist/harness/agent/registered-tool-adapter.js +67 -0
- package/dist/harness/agent/wire-agent-builder.d.ts +2 -0
- package/dist/harness/agent/wire-agent-builder.js +9 -2
- package/dist/harness/capabilities/document/backends/plain.js +2 -1
- package/dist/harness/capabilities/document/legacy/factory.js +3 -2
- package/dist/harness/collaboration/autonomous-subsystem/audit/reader.d.ts +17 -0
- package/dist/harness/collaboration/autonomous-subsystem/audit/reader.js +66 -36
- package/dist/harness/collaboration/autonomous-subsystem/audit/writer.d.ts +6 -2
- package/dist/harness/collaboration/autonomous-subsystem/audit/writer.js +27 -7
- package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.js +13 -0
- package/dist/harness/collaboration/autonomous-subsystem/loader.js +1 -0
- package/dist/harness/collaboration/autonomous-subsystem/runtime.d.ts +11 -0
- package/dist/harness/collaboration/autonomous-subsystem/runtime.js +17 -0
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.d.ts +13 -3
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.js +48 -39
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +3 -0
- package/dist/harness/collaboration/autonomous-subsystem/types.d.ts +4 -0
- package/dist/harness/collaboration/delegation/child-run.d.ts +9 -0
- package/dist/harness/collaboration/delegation/child-run.js +34 -2
- package/dist/harness/collaboration/delegation/registry-types.d.ts +2 -0
- package/dist/harness/collaboration/delegation/service.d.ts +9 -4
- package/dist/harness/collaboration/delegation/service.js +33 -12
- package/dist/harness/collaboration/delegation/store.d.ts +2 -0
- package/dist/harness/collaboration/delegation/store.js +1 -0
- package/dist/harness/collaboration/delegation/types.d.ts +11 -0
- package/dist/harness/collaboration/delegation/wiring.d.ts +2 -0
- package/dist/harness/collaboration/delegation/wiring.js +1 -0
- package/dist/harness/context/capabilities/compact/engine.d.ts +44 -5
- package/dist/harness/context/capabilities/compact/engine.js +127 -39
- package/dist/harness/context/capabilities/compact/index.d.ts +2 -1
- package/dist/harness/context/capabilities/compact/index.js +1 -1
- package/dist/harness/context/capabilities/compact/types.d.ts +59 -9
- package/dist/harness/context/capabilities/summary/gate.d.ts +19 -2
- package/dist/harness/context/capabilities/summary/gate.js +53 -6
- package/dist/harness/context/capabilities/summary/registry.js +20 -0
- package/dist/harness/context/capabilities/summary/tool-binding.js +16 -12
- package/dist/harness/context/capabilities/summary/tool-bindings.d.ts +13 -0
- package/dist/harness/context/capabilities/summary/tool-bindings.js +22 -0
- package/dist/harness/context/capabilities/summary/types.d.ts +16 -0
- package/dist/harness/context/constitution/default-agents.md +85 -0
- package/dist/harness/context/context-size-ledger.js +8 -1
- package/dist/harness/context/default-context-engine.d.ts +100 -6
- package/dist/harness/context/default-context-engine.js +382 -89
- package/dist/harness/context/index.d.ts +2 -1
- package/dist/harness/context/index.js +1 -0
- package/dist/harness/context/layer-health.d.ts +4 -0
- package/dist/harness/context/layer-health.js +4 -0
- package/dist/harness/context/layer-types.d.ts +57 -0
- package/dist/harness/context/layer-types.js +73 -1
- package/dist/harness/context/layers.d.ts +3 -0
- package/dist/harness/context/layers.js +13 -6
- package/dist/harness/context/prefix-fingerprint.d.ts +46 -0
- package/dist/harness/context/prefix-fingerprint.js +52 -0
- package/dist/harness/context/summarize.js +18 -0
- package/dist/harness/context/system-prompt-assembler.d.ts +2 -0
- package/dist/harness/context/system-prompt-assembler.js +5 -2
- package/dist/harness/context/tool-result-aging.d.ts +104 -16
- package/dist/harness/context/tool-result-aging.js +211 -57
- package/dist/harness/context/types.d.ts +71 -4
- package/dist/harness/context/types.js +25 -1
- package/dist/harness/extension/execution-environment/effect-policy.d.ts +4 -3
- package/dist/harness/extension/execution-environment/effect-policy.js +2 -2
- package/dist/harness/extension/execution-environment/privileged-exec.js +4 -1
- package/dist/harness/extension/execution-environment/workspace.js +1 -1
- package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +27 -1
- package/dist/harness/extension/plugin-ecosystem/channel-types.js +11 -2
- package/dist/harness/extension/plugin-ecosystem/client-tools/registry.d.ts +12 -0
- package/dist/harness/extension/plugin-ecosystem/client-tools/registry.js +25 -0
- package/dist/harness/extension/plugin-ecosystem/commands/builtin.js +28 -1
- package/dist/harness/extension/plugin-ecosystem/index.d.ts +1 -0
- package/dist/harness/extension/plugin-ecosystem/index.js +1 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/api.d.ts +168 -1
- package/dist/harness/extension/plugin-ecosystem/plugins/api.js +156 -15
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-instances.d.ts +95 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-instances.js +170 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-kinds.d.ts +178 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-kinds.js +314 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-registry.d.ts +40 -5
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-registry.js +45 -26
- package/dist/harness/extension/plugin-ecosystem/plugins/index.d.ts +1 -1
- package/dist/harness/extension/plugin-ecosystem/plugins/loader.d.ts +11 -1
- package/dist/harness/extension/plugin-ecosystem/plugins/loader.js +42 -76
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.d.ts +30 -1
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.js +46 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.d.ts +9 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.js +19 -14
- package/dist/harness/extension/plugin-ecosystem/plugins/staging.d.ts +3 -1
- package/dist/harness/extension/plugin-ecosystem/plugins/staging.js +1 -1
- package/dist/harness/extension/plugin-ecosystem/tools/browser-types.d.ts +333 -0
- package/dist/harness/extension/plugin-ecosystem/tools/browser-types.js +16 -0
- package/dist/harness/extension/plugin-ecosystem/tools/browser.d.ts +64 -0
- package/dist/harness/extension/plugin-ecosystem/tools/browser.js +692 -0
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +0 -37
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +108 -4
- package/dist/harness/extension/plugin-ecosystem/tools/delegation.js +18 -0
- package/dist/harness/extension/plugin-ecosystem/tools/file-edit.js +34 -0
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.d.ts +0 -6
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +57 -4
- package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +81 -13
- package/dist/harness/extension/plugin-ecosystem/tools/http.js +5 -0
- package/dist/harness/extension/plugin-ecosystem/tools/knowledge.js +13 -7
- package/dist/harness/extension/plugin-ecosystem/tools/package-tools.js +126 -14
- package/dist/harness/extension/plugin-ecosystem/tools/platform.d.ts +1 -1
- package/dist/harness/extension/plugin-ecosystem/tools/platform.js +44 -5
- package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.js +10 -24
- package/dist/harness/extension/plugin-ecosystem/tools/tool-set.d.ts +7 -0
- package/dist/harness/extension/plugin-ecosystem/tools/tool-set.js +4 -0
- package/dist/harness/governance/credentials/db.d.ts +9 -0
- package/dist/harness/governance/credentials/db.js +122 -31
- package/dist/harness/governance/credentials/store.d.ts +68 -7
- package/dist/harness/governance/credentials/store.js +177 -64
- package/dist/harness/governance/credentials/types.d.ts +13 -2
- package/dist/harness/governance/index.d.ts +1 -0
- package/dist/harness/governance/index.js +1 -0
- package/dist/harness/governance/registry/db.d.ts +32 -0
- package/dist/harness/governance/registry/db.js +142 -0
- package/dist/harness/governance/registry/index.d.ts +9 -0
- package/dist/harness/governance/registry/index.js +9 -0
- package/dist/harness/governance/registry/service.d.ts +381 -0
- package/dist/harness/governance/registry/service.js +825 -0
- package/dist/harness/governance/registry/types.d.ts +77 -0
- package/dist/harness/governance/registry/types.js +7 -0
- package/dist/harness/governance/security/default-security-guard.d.ts +3 -0
- package/dist/harness/governance/security/default-security-guard.js +12 -1
- package/dist/harness/governance/security/risk-evaluator.d.ts +13 -3
- package/dist/harness/governance/security/risk-evaluator.js +307 -21
- package/dist/harness/governance/security/shell-parser-treesitter.js +12 -4
- package/dist/harness/governance/session-acl/tool-rights.d.ts +1 -0
- package/dist/harness/index.d.ts +5 -3
- package/dist/harness/index.js +2 -2
- package/dist/harness/knowledge/boot-config.d.ts +2 -0
- package/dist/harness/knowledge/boot-config.js +2 -0
- package/dist/harness/knowledge/client.d.ts +53 -7
- package/dist/harness/knowledge/client.js +77 -20
- package/dist/harness/knowledge/db.d.ts +16 -0
- package/dist/harness/knowledge/db.js +107 -41
- package/dist/harness/knowledge/engine-thread.js +5 -7
- package/dist/harness/knowledge/grounding.js +4 -1
- package/dist/harness/knowledge/http-app.d.ts +15 -0
- package/dist/harness/knowledge/http-app.js +82 -21
- package/dist/harness/knowledge/http-bridge.d.ts +15 -0
- package/dist/harness/knowledge/http-bridge.js +19 -0
- package/dist/harness/knowledge/knowledge-serve-child.js +2 -3
- package/dist/harness/knowledge/query-service.d.ts +12 -2
- package/dist/harness/knowledge/query-service.js +75 -41
- package/dist/harness/knowledge/query-worker-client.d.ts +5 -1
- package/dist/harness/knowledge/query-worker-client.js +4 -1
- package/dist/harness/knowledge/query-worker.js +5 -3
- package/dist/harness/knowledge/read-http.d.ts +2 -0
- package/dist/harness/knowledge/read-http.js +9 -2
- package/dist/harness/knowledge/retriever.d.ts +1 -1
- package/dist/harness/knowledge/retriever.js +1 -2
- package/dist/harness/knowledge/serve.d.ts +6 -1
- package/dist/harness/knowledge/serve.js +5 -6
- package/dist/harness/knowledge/source-store.d.ts +101 -5
- package/dist/harness/knowledge/source-store.js +297 -71
- package/dist/harness/knowledge/start-service-process.d.ts +27 -8
- package/dist/harness/knowledge/start-service-process.js +49 -90
- package/dist/harness/knowledge/tenant-gate.d.ts +81 -0
- package/dist/harness/knowledge/tenant-gate.js +167 -0
- package/dist/harness/knowledge/writer-service.d.ts +18 -2
- package/dist/harness/knowledge/writer-service.js +80 -16
- package/dist/harness/knowledge/writer-worker-client.d.ts +9 -2
- package/dist/harness/knowledge/writer-worker-client.js +20 -3
- package/dist/harness/knowledge/writer-worker.js +11 -4
- package/dist/harness/memory/backfill-trigger.d.ts +10 -3
- package/dist/harness/memory/backfill-trigger.js +19 -19
- package/dist/harness/memory/cognition-seeds.d.ts +45 -0
- package/dist/harness/memory/cognition-seeds.js +67 -0
- package/dist/harness/memory/cognition.d.ts +12 -3
- package/dist/harness/memory/cognition.js +55 -35
- package/dist/harness/memory/conceptualizer.d.ts +11 -1
- package/dist/harness/memory/conceptualizer.js +10 -1
- package/dist/harness/memory/context-slice.d.ts +42 -0
- package/dist/harness/memory/context-slice.js +197 -0
- package/dist/harness/memory/health-probe.d.ts +8 -2
- package/dist/harness/memory/health-probe.js +10 -13
- package/dist/harness/memory/index.d.ts +5 -1
- package/dist/harness/memory/index.js +3 -1
- package/dist/harness/memory/sqlite/agent-db.d.ts +1 -0
- package/dist/harness/memory/sqlite/agent-db.js +9 -8
- package/dist/harness/memory/sqlite/cognition-store.d.ts +26 -3
- package/dist/harness/memory/sqlite/cognition-store.js +103 -45
- package/dist/harness/memory/sqlite/memory-store.js +4 -0
- package/dist/harness/memory/sqlite/sqlite-vec.d.ts +24 -1
- package/dist/harness/memory/sqlite/sqlite-vec.js +37 -1
- package/dist/harness/memory/types.d.ts +18 -2
- package/dist/harness/observability/observer/hub.d.ts +10 -0
- package/dist/harness/observability/observer/hub.js +95 -2
- package/dist/harness/run/agent/agent.js +3 -2
- package/dist/harness/run/concurrency/tool-validator.js +4 -3
- package/dist/harness/run/reliability/run-agent.d.ts +22 -0
- package/dist/harness/run/reliability/run-agent.js +79 -10
- package/dist/harness/run/run-host.d.ts +302 -0
- package/dist/harness/run/run-host.js +978 -0
- package/dist/harness/run/run-scope.d.ts +11 -0
- package/dist/harness/run/run-scope.js +19 -1
- package/dist/harness/run/runner.d.ts +149 -22
- package/dist/harness/run/runner.js +352 -35
- package/dist/harness/session/in-memory-store.js +13 -1
- package/dist/harness/session/schedules/service.d.ts +10 -2
- package/dist/harness/session/schedules/service.js +13 -2
- package/dist/harness/session/tasks/tools.js +12 -0
- package/dist/harness/session/types.d.ts +10 -14
- package/dist/harness/shared/events/agent-event-map.d.ts +29 -0
- package/dist/harness/shared/types/agent-definition.d.ts +6 -0
- package/dist/index.d.ts +3 -2
- package/dist/index.js +2 -1
- package/dist/integration/agent-runtime/channel-message-source.d.ts +3 -1
- package/dist/integration/agent-runtime/channel-message-source.js +4 -3
- package/dist/integration/browser/camoufox.d.ts +40 -0
- package/dist/integration/browser/camoufox.js +80 -0
- package/dist/integration/browser/index.d.ts +91 -0
- package/dist/integration/browser/index.js +110 -0
- package/dist/integration/browser/install.d.ts +47 -0
- package/dist/integration/browser/install.js +214 -0
- package/dist/integration/browser/playwright.d.ts +224 -0
- package/dist/integration/browser/playwright.js +925 -0
- package/dist/integration/browser/service.d.ts +41 -0
- package/dist/integration/browser/service.js +181 -0
- package/dist/integration/browser/stealth.d.ts +42 -0
- package/dist/integration/browser/stealth.js +104 -0
- package/dist/integration/providers/anthropic-message-normalize.d.ts +20 -0
- package/dist/integration/providers/anthropic-message-normalize.js +48 -0
- package/dist/integration/providers/anthropic.js +27 -2
- package/dist/integration/providers/fetch-timeout.d.ts +17 -0
- package/dist/integration/providers/fetch-timeout.js +24 -0
- package/dist/integration/providers/openai.d.ts +8 -0
- package/dist/integration/providers/openai.js +41 -1
- package/dist/integration/providers/wire-dump-diff.js +2 -1
- package/dist/integration/providers/wire-dump.d.ts +56 -2
- package/dist/integration/providers/wire-dump.js +119 -6
- package/dist/integration/storage/archive-manager.d.ts +14 -2
- package/dist/integration/storage/archive-manager.js +24 -8
- package/dist/integration/storage/atomic-tmp.d.ts +12 -0
- package/dist/integration/storage/atomic-tmp.js +36 -0
- package/dist/integration/storage/jsonl.d.ts +9 -0
- package/dist/integration/storage/jsonl.js +137 -38
- package/dist/integration/storage/session-index.d.ts +5 -0
- package/dist/integration/storage/session-index.js +25 -4
- package/dist/integration/tools/assemble.d.ts +50 -0
- package/dist/integration/tools/assemble.js +137 -0
- package/dist/paths.d.ts +18 -0
- package/dist/paths.js +36 -0
- package/dist/subsystems/cognition-steward/conceptualize/config.yaml +3 -1
- package/dist/subsystems/cognition-steward/conceptualize/handler.js +74 -5
- package/dist/subsystems/cognition-steward/consolidate/SUBSYSTEM.md +3 -2
- package/dist/subsystems/cognition-steward/consolidate/config.yaml +11 -2
- package/dist/subsystems/cognition-steward/consolidate/handler.d.ts +6 -3
- package/dist/subsystems/cognition-steward/consolidate/handler.js +266 -28
- package/dist/subsystems/memory-steward/backfill/handler.js +3 -2
- package/dist/subsystems/memory-steward/govern/config.yaml +6 -1
- package/dist/subsystems/wisdom-steward/attribute/config.yaml +5 -1
- package/dist/subsystems/wisdom-steward/formation/config.yaml +3 -0
- package/dist/subsystems/wisdom-steward/govern/config.yaml +6 -1
- package/package.json +5 -3
|
@@ -15,6 +15,7 @@ import * as pluginToolPolicyAdapter from '../extension/plugin-ecosystem/tools/pl
|
|
|
15
15
|
import { tightenSessionRights } from '../governance/session-acl/rights.js';
|
|
16
16
|
import { createSessionStateMachine } from '../session/state-machine.js';
|
|
17
17
|
import { HeuristicTokenEstimator } from '../context/index.js';
|
|
18
|
+
import { collectToolAgers, collectToolArgAgers } from '../context/tool-result-aging.js';
|
|
18
19
|
import { OpsAuditJournal, OpsAuditFileExportSink } from '../extension/execution-environment/ops-audit.js';
|
|
19
20
|
import { getOctopiHome } from '../../paths.js';
|
|
20
21
|
import { extractLayerQuery } from '../context/layer-types.js';
|
|
@@ -24,15 +25,46 @@ import { splitRuntimeEnvironmentInjection, withRuntimeEnvironmentInjection } fro
|
|
|
24
25
|
import { loadRootInstructionsInjection } from '../context/root-instructions.js';
|
|
25
26
|
import { extractTaskQueryHints, renderSessionTasksInjection } from '../session/tasks/render.js';
|
|
26
27
|
import { createRunId } from './run-scope.js';
|
|
28
|
+
/**
|
|
29
|
+
* in-run 压缩不可承接(无活跃 run / run 已收尾)——调用方(RunHost)应落回
|
|
30
|
+
* compactSession 锁路径执行。抛此类 = 语义化的 fallback 信号,不是故障。
|
|
31
|
+
*/
|
|
32
|
+
export class InRunCompactUnavailable extends Error {
|
|
33
|
+
constructor(message) {
|
|
34
|
+
super(message);
|
|
35
|
+
this.name = 'InRunCompactUnavailable';
|
|
36
|
+
}
|
|
37
|
+
}
|
|
27
38
|
import { DEFAULT_TOOL_ISOLATION, resolveToolIsolationCwd, } from '../extension/execution-environment/isolation.js';
|
|
28
39
|
import { mkdirSync } from 'node:fs';
|
|
29
40
|
import { join } from 'node:path';
|
|
30
41
|
import { toSessionFileName } from '@octopi-agent/core/session-filename.js';
|
|
31
42
|
import { readSessionCompact } from '../session/compact.js';
|
|
43
|
+
import { contextSizeSnapshot } from '../context/types.js';
|
|
32
44
|
import { toCompactTransport } from '../context/capabilities/compact/types.js';
|
|
33
45
|
import { InProcessSessionLock, } from './concurrency/session-lease.js';
|
|
34
46
|
import { isToolPermitted } from '../governance/session-acl/tool-rights.js';
|
|
35
47
|
import { resolveToolCapabilities } from '../extension/execution-environment/tool-capabilities.js';
|
|
48
|
+
/**
|
|
49
|
+
* principal 归属补全(arch/multi-tenancy.md §4):调用方 claim 优先;
|
|
50
|
+
* tenantId 缺省锚 agent 归属租户(host truth,非 claim)。无任何输入 = undefined。
|
|
51
|
+
*
|
|
52
|
+
* @param principal - 调用方转发的 principal(RunRequest 真源)
|
|
53
|
+
* @param tenantId - agent 归属租户(Runner 配置)
|
|
54
|
+
* @returns 补全后的 principal
|
|
55
|
+
*/
|
|
56
|
+
function withTenantPrincipal(principal, tenantId) {
|
|
57
|
+
if (!principal && !tenantId)
|
|
58
|
+
return undefined;
|
|
59
|
+
// 两者都有且不一致 = fail-loud(评审 MIN-9:不静默换租户身份)
|
|
60
|
+
if (principal?.tenantId && tenantId && principal.tenantId !== tenantId) {
|
|
61
|
+
throw new Error(`principal tenant mismatch: claim=${principal.tenantId} agent=${tenantId} (cross-tenant identity is not accepted)`);
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
...principal,
|
|
65
|
+
...(principal?.tenantId || !tenantId ? {} : { tenantId }),
|
|
66
|
+
};
|
|
67
|
+
}
|
|
36
68
|
/**
|
|
37
69
|
* 失败凭证消息中附带残句的截断上限(显示用途;完整残句在带 error 标记的 step 账本)
|
|
38
70
|
*
|
|
@@ -316,6 +348,12 @@ export class SessionAwareRunner {
|
|
|
316
348
|
config;
|
|
317
349
|
/** Session 状态机缓存 */
|
|
318
350
|
stateMachines = new Map();
|
|
351
|
+
/** 活跃 handle 会话(in-run 压缩承接判定;sessionId → run 归属 agentId,E4 键校验用) */
|
|
352
|
+
activeHandleSessions = new Map();
|
|
353
|
+
/** in-flight 压缩执行(key = sessionId\\0agentId):执行期间的请求 join 当前执行(coalesce 跨缝,评审 del-d0830117 F5) */
|
|
354
|
+
inFlightCompacts = new Map();
|
|
355
|
+
/** in-run 压缩请求槽(sessionId → 队列;消息缝 drain,见 requestInRunCompact) */
|
|
356
|
+
inRunCompactRequests = new Map();
|
|
319
357
|
/** 自主子系统运行时 */
|
|
320
358
|
_subsystemRuntime;
|
|
321
359
|
_backfillTrigger;
|
|
@@ -324,6 +362,8 @@ export class SessionAwareRunner {
|
|
|
324
362
|
_events;
|
|
325
363
|
/** 产品 Observer Hub(Run 现场;可选) */
|
|
326
364
|
_observerHub;
|
|
365
|
+
/** 观测专属事件出口(跨进程桥;见 setObservedEventSink) */
|
|
366
|
+
_observedEventSink;
|
|
327
367
|
/** 工具运行时上下文提供者 */
|
|
328
368
|
toolContextProvider;
|
|
329
369
|
/** 文件式 persona 的 run 时解析器;每次 handle 前解析,实现热更新 */
|
|
@@ -468,15 +508,42 @@ export class SessionAwareRunner {
|
|
|
468
508
|
this._observerHub = hub;
|
|
469
509
|
}
|
|
470
510
|
/**
|
|
471
|
-
*
|
|
511
|
+
* 注入观测专属事件出口(跨进程桥:run 实例 → gateway)。
|
|
512
|
+
*
|
|
513
|
+
* emitObserved 事件分两类:loop adapted 事件(已进 execute 流 yield,`streamed` 标记)
|
|
514
|
+
* 与观测专属事件(context.layers.assembled / tool.exec.update / run.timing 等,
|
|
515
|
+
* 只进 Hub+EventBus、不进事件 yield 流)。进程内 EventBus 的可见性在 run/gateway
|
|
516
|
+
* 拆分后不再跨进程,专属事件经此 sink 转 notify('session_event') 过网线;
|
|
517
|
+
* streamed 事件已在 execute 流中,不得重复过线。
|
|
518
|
+
*
|
|
519
|
+
* @param sink - 专属事件回调(异常 fail-open,不中断 run)
|
|
472
520
|
*/
|
|
473
|
-
|
|
521
|
+
setObservedEventSink(sink) {
|
|
522
|
+
this._observedEventSink = sink;
|
|
523
|
+
}
|
|
524
|
+
/**
|
|
525
|
+
* 发射事件:先采 Observer Hub,再进 EventBus(协调总线)。
|
|
526
|
+
*
|
|
527
|
+
* @param event - §7 事件词表
|
|
528
|
+
* @param opts.streamed - 事件已经 execute 流 yield(loop adapted);此时不再走
|
|
529
|
+
* observedEventSink,防跨进程桥重复过线
|
|
530
|
+
*/
|
|
531
|
+
emitObserved(event, opts) {
|
|
474
532
|
try {
|
|
475
533
|
this._observerHub?.ingestEvent(event);
|
|
476
534
|
}
|
|
477
535
|
catch {
|
|
478
536
|
// 观测 fail-open:不阻断事件广播
|
|
479
537
|
}
|
|
538
|
+
// sink 先于 bus:bus 监听抛错不该吞掉跨进程出口(NIT-1;fail-open 语义完整)
|
|
539
|
+
if (!opts?.streamed) {
|
|
540
|
+
try {
|
|
541
|
+
this._observedEventSink?.(event);
|
|
542
|
+
}
|
|
543
|
+
catch {
|
|
544
|
+
// 观测 fail-open:桥转发失败不中断 run(与 Hub 同语义)
|
|
545
|
+
}
|
|
546
|
+
}
|
|
480
547
|
this._events?.emit(event);
|
|
481
548
|
}
|
|
482
549
|
/**
|
|
@@ -698,10 +765,12 @@ export class SessionAwareRunner {
|
|
|
698
765
|
/** 本 user turn 内第 N 次 LLM 调用(0-based;cache 观测) */
|
|
699
766
|
let llmCallIndexInUserTurn = 0;
|
|
700
767
|
try {
|
|
768
|
+
// in-run 压缩承接面:handle 持锁期间登记(requestInRunCompact 判定锚;带 run 归属 agentId 供 E4 键校验)
|
|
769
|
+
this.activeHandleSessions.set(sessionId, _agentId);
|
|
701
770
|
// 3. 加载或创建 session
|
|
702
771
|
let session = await this.store.load(sessionId);
|
|
703
772
|
if (!session) {
|
|
704
|
-
session = this.createSession(sessionId, _agentId);
|
|
773
|
+
session = this.createSession(sessionId, _agentId, runConfig.principal?.tenantId);
|
|
705
774
|
await this.store.save(sessionId, session);
|
|
706
775
|
await this.config.extensionHooks?.observe('session_start', {
|
|
707
776
|
sessionId,
|
|
@@ -1356,10 +1425,19 @@ export class SessionAwareRunner {
|
|
|
1356
1425
|
const undoRoots = this.config.sessionsDir
|
|
1357
1426
|
? [resolveSessionUndoPaths(this.config.sessionsDir, sessionId).root]
|
|
1358
1427
|
: undefined;
|
|
1428
|
+
// §9.1-6:session 租户 → principal 归属。会话是数据的家——已有会话归属为准;
|
|
1429
|
+
// 派发面 claim(Trigger.tenantId / 委派继承位)只负责给**新**会话育归属。
|
|
1430
|
+
// 渠道锚可比会话粗(ws/宿主面锚=DEFAULT 而会话是租户 REST 所建),
|
|
1431
|
+
// claim≠会话不是错误;真正的跨租户防线在 withTenantPrincipal(vs agent 归属)。
|
|
1359
1432
|
const runScope = {
|
|
1360
1433
|
...runIdentity,
|
|
1361
1434
|
runId,
|
|
1362
|
-
principal
|
|
1435
|
+
// principal 归属补全:调用方 claim 优先;tenantId 缺省锚 agent 归属(host truth,非 claim)。
|
|
1436
|
+
// 凭证域解析(credentials §4)从本字段取归属——无归属 = 宿主面(信任边界,MAJ-3 语义)。
|
|
1437
|
+
principal: withTenantPrincipal({
|
|
1438
|
+
...(effectiveRunConfig.principal ?? {}),
|
|
1439
|
+
...(session.meta.tenantId === undefined ? {} : { tenantId: session.meta.tenantId }),
|
|
1440
|
+
}, this.config.tenantId),
|
|
1363
1441
|
prompt: getTextContent(input.content),
|
|
1364
1442
|
resolvedModel: resolvedModel ?? undefined,
|
|
1365
1443
|
extensionSnapshotBudgetTokens: this.config.extensionSnapshotBudgetTokens,
|
|
@@ -1509,7 +1587,7 @@ export class SessionAwareRunner {
|
|
|
1509
1587
|
turnId: currentTurnId,
|
|
1510
1588
|
slotsXml,
|
|
1511
1589
|
});
|
|
1512
|
-
this.bakeTurnStart(input, currentTurnId, turnContextXml);
|
|
1590
|
+
this.bakeTurnStart(input, currentTurnId, turnContextXml, runId);
|
|
1513
1591
|
// 视图 = detach 切片(含已定形 user);全回放,无条件成为 LLM 窗口
|
|
1514
1592
|
runContext.messages = baseMsgs;
|
|
1515
1593
|
if (runScope.toolRuntime) {
|
|
@@ -1592,6 +1670,9 @@ export class SessionAwareRunner {
|
|
|
1592
1670
|
let lastViewTokensEst = undefined;
|
|
1593
1671
|
let lastRawTokens = undefined;
|
|
1594
1672
|
let lastContextWindow = undefined;
|
|
1673
|
+
/** 当前上下文大小显示槽(持久化 contextSize):只随真实用量更新(stale 不冒名,F4);
|
|
1674
|
+
* 压缩后估算由 manual 压缩持久化 / auto 压缩随该步 usage 覆盖 */
|
|
1675
|
+
let lastContextSize = undefined;
|
|
1595
1676
|
const meta = { agentId: effectiveRunConfig.agentId ?? 'default', sessionId };
|
|
1596
1677
|
/** 本轮起始消息下标(afterStep 只传增量) */
|
|
1597
1678
|
let stepStartIndex = runContext.messages.length;
|
|
@@ -1629,7 +1710,7 @@ export class SessionAwareRunner {
|
|
|
1629
1710
|
this.bakeTurnStart(entry.message, currentTurnId, formatTurnContextXml({
|
|
1630
1711
|
turnId: currentTurnId,
|
|
1631
1712
|
slotsXml: joinSlotXml([{ tag: 'runtime_snapshot', body: runtimeSnapshotText ?? '' }]),
|
|
1632
|
-
}));
|
|
1713
|
+
}), runId);
|
|
1633
1714
|
injected.push(entry.message);
|
|
1634
1715
|
// ack 延到转录同步成功后统一 flush;同步失败/崩溃由 close 的
|
|
1635
1716
|
// unacked 重投兜底(at-least-once,见 SessionInbox)
|
|
@@ -1638,6 +1719,10 @@ export class SessionAwareRunner {
|
|
|
1638
1719
|
entryObservers.add(entry.onEvent);
|
|
1639
1720
|
}
|
|
1640
1721
|
}
|
|
1722
|
+
// in-run 手动压缩(方案 A):下一个消息缝执行已挂起的压缩请求
|
|
1723
|
+
// (run 持锁中,走无锁核心;压缩产物 append-only,下一步装配自然生效;
|
|
1724
|
+
// run abort 透传至摘要调用——F1:压缩不挂满 summarizeTimeoutMs)
|
|
1725
|
+
await this.drainInRunCompacts(sessionId, session, signal);
|
|
1641
1726
|
if (injected.length) {
|
|
1642
1727
|
this.emitObserved({
|
|
1643
1728
|
type: 'session.inbox.appended',
|
|
@@ -1720,6 +1805,13 @@ export class SessionAwareRunner {
|
|
|
1720
1805
|
lastPromptTokensActual = promptActual;
|
|
1721
1806
|
lastPromptWriter = promptWriter;
|
|
1722
1807
|
console.log(`[ctx] session=${sessionId} writer=${promptWriter} field=promptTokensActual value=${promptActual}`);
|
|
1808
|
+
// contextSize 显示槽:只随真实用量更新(stale 回填不冒名新实测,评审 F4)。
|
|
1809
|
+
// 只在更新的这一步随事件携带——无用量步不重发旧值,防覆盖更新的压缩估算
|
|
1810
|
+
if (rawUsage) {
|
|
1811
|
+
lastContextSize = contextSizeSnapshot('usage', promptActual);
|
|
1812
|
+
eventData.contextSize = lastContextSize;
|
|
1813
|
+
console.log(`[ctx] session=${sessionId} writer=usage field=contextSize value=${promptActual}`);
|
|
1814
|
+
}
|
|
1723
1815
|
}
|
|
1724
1816
|
// viewTokensEst = 本请求视图估算(校准后,assemble/pressure 口径);
|
|
1725
1817
|
// rawTokens = 全量原文估算(只进 Run 页签,永不冒充上下文用量)
|
|
@@ -1772,8 +1864,9 @@ export class SessionAwareRunner {
|
|
|
1772
1864
|
this.config.eventSink?.(adapted, meta);
|
|
1773
1865
|
// 事件桥:循环事件同时广播到 EventBus
|
|
1774
1866
|
// 跳过高频流式 delta(每 token 一次),避免 EventBus 拥塞
|
|
1867
|
+
// streamed:adapted 已在上方 yield 进 execute 流,跨进程桥不过重复线
|
|
1775
1868
|
if (adapted.type !== 'llm_stream_delta' && adapted.type !== 'llm_thinking_delta') {
|
|
1776
|
-
this.emitObserved(adapted);
|
|
1869
|
+
this.emitObserved(adapted, { streamed: true });
|
|
1777
1870
|
}
|
|
1778
1871
|
}
|
|
1779
1872
|
// 收集流式内容
|
|
@@ -2051,7 +2144,8 @@ export class SessionAwareRunner {
|
|
|
2051
2144
|
if (lastPromptTokensActual !== undefined ||
|
|
2052
2145
|
lastViewTokensEst !== undefined ||
|
|
2053
2146
|
lastRawTokens !== undefined ||
|
|
2054
|
-
lastContextWindow !== undefined
|
|
2147
|
+
lastContextWindow !== undefined ||
|
|
2148
|
+
lastContextSize !== undefined) {
|
|
2055
2149
|
session.metadata = {
|
|
2056
2150
|
...session.metadata,
|
|
2057
2151
|
// 校准状态持久化(取舍③配套):锚+样本计数随会话落盘,restore 后回填
|
|
@@ -2062,6 +2156,8 @@ export class SessionAwareRunner {
|
|
|
2062
2156
|
...(lastViewTokensEst !== undefined ? { viewTokensEst: lastViewTokensEst } : {}),
|
|
2063
2157
|
...(lastRawTokens !== undefined ? { rawTokens: lastRawTokens } : {}),
|
|
2064
2158
|
...(lastContextWindow !== undefined ? { contextWindow: lastContextWindow } : {}),
|
|
2159
|
+
// contextSize 显示槽(web 顶栏唯一取数源):冷恢复不回退压缩前读数(F8)
|
|
2160
|
+
...(lastContextSize !== undefined ? { contextSize: lastContextSize } : {}),
|
|
2065
2161
|
};
|
|
2066
2162
|
if (lastPromptTokensActual !== undefined) {
|
|
2067
2163
|
console.log(`[ctx] session=${sessionId} writer=${lastPromptWriter} field=promptTokensActual value=${lastPromptTokensActual} (persist)`);
|
|
@@ -2156,6 +2252,17 @@ export class SessionAwareRunner {
|
|
|
2156
2252
|
throw err;
|
|
2157
2253
|
}
|
|
2158
2254
|
finally {
|
|
2255
|
+
// in-run 压缩槽清理:残留请求 reject(InRunCompactUnavailable)→ 调用方
|
|
2256
|
+
// fallback 锁路径执行。不在 finally 执行压缩——那会拖慢 abort 收尾;
|
|
2257
|
+
// 锁路径在本 handle 释放锁后立即可执行,语义无缝(方案 A)。
|
|
2258
|
+
this.activeHandleSessions.delete(sessionId);
|
|
2259
|
+
const pendingCompacts = this.inRunCompactRequests.get(sessionId);
|
|
2260
|
+
if (pendingCompacts) {
|
|
2261
|
+
this.inRunCompactRequests.delete(sessionId);
|
|
2262
|
+
for (const req of pendingCompacts) {
|
|
2263
|
+
req.reject(new InRunCompactUnavailable(`in_run_compact: run for session "${sessionId}" ended before the next seam`));
|
|
2264
|
+
}
|
|
2265
|
+
}
|
|
2159
2266
|
// run 收口:reason = 观测口径,stopReason = 停止闸门。
|
|
2160
2267
|
// 计时进 trace(run.timing);console 保留一条完整生命周期日志——前次事故
|
|
2161
2268
|
// 「run 结束原因零日志、只能靠反推落盘消息定位」,该留痕不随探针删除。
|
|
@@ -2247,6 +2354,82 @@ export class SessionAwareRunner {
|
|
|
2247
2354
|
}
|
|
2248
2355
|
}
|
|
2249
2356
|
}
|
|
2357
|
+
/**
|
|
2358
|
+
* 某会话的 LLM 工具面(wire 面)——「无 run」调用方(manual 压缩)的单一来源。
|
|
2359
|
+
*
|
|
2360
|
+
* 与 run 内组装(`runContext.tools`)同式:`agent.toolsForSession` ∩ `agentToolPolicy`
|
|
2361
|
+
* ∩ session ACL `toolRights`(SEC-2 同一漏斗,禁手抄)。摘要请求要吃到前缀缓存,
|
|
2362
|
+
* 它的 tools 必须与下一主请求逐字节相同——多一个少一个,前缀就从第一字节断开。
|
|
2363
|
+
*
|
|
2364
|
+
* 差异如实声明(不假装等价):run 内还能叠 per-run `rightsCeiling` 与 run 启动时的
|
|
2365
|
+
* 工具集快照;这里取不到 run,只能取配置级天花板。ACL 拒绝时不抛——压缩是用户显式
|
|
2366
|
+
* 操作,不应因参与者授权不可用而整体失效——但要打日志(fail loud,不静默)。
|
|
2367
|
+
*
|
|
2368
|
+
* @param sessionId - 会话 id
|
|
2369
|
+
* @param agentId - 归属 agent(ACL 授权主体)
|
|
2370
|
+
* @returns provider 格式工具定义(顺序与会话面一致)
|
|
2371
|
+
*/
|
|
2372
|
+
async resolveSessionLlmTools(sessionId, agentId) {
|
|
2373
|
+
const { buildToolDefinitions } = await import('@octopi-agent/core/loop/agent-loop.js');
|
|
2374
|
+
return buildToolDefinitions(await this.resolveSessionToolSet(sessionId, agentId));
|
|
2375
|
+
}
|
|
2376
|
+
/**
|
|
2377
|
+
* 会话工具面的唯一过滤点(SEC-2 漏斗,禁手抄)
|
|
2378
|
+
*
|
|
2379
|
+
* `resolveSessionLlmTools`(只要 wire 定义)与 `resolveSessionToolSurface`
|
|
2380
|
+
* (wire 定义 + 老化策略)都必须经过这里——**不允许各自复述一遍过滤链**。
|
|
2381
|
+
* 2026-11-13 的前缀分叉正是因为两条路径各自手抄参数表,改一边忘另一边。
|
|
2382
|
+
*
|
|
2383
|
+
* @param sessionId - 会话 id
|
|
2384
|
+
* @param agentId - 归属 agent(ACL 授权主体)
|
|
2385
|
+
* @returns 经 ACL/策略过滤后的 AgentTool 集合
|
|
2386
|
+
*/
|
|
2387
|
+
async resolveSessionToolSet(sessionId, agentId) {
|
|
2388
|
+
const session = await this.store.load(sessionId);
|
|
2389
|
+
let rights;
|
|
2390
|
+
const acl = this.config.sessionAcl;
|
|
2391
|
+
if (acl && session) {
|
|
2392
|
+
const auth = acl.authorizeRun({
|
|
2393
|
+
session,
|
|
2394
|
+
agentId,
|
|
2395
|
+
agentMax: this.config.agentMaxSessionRights,
|
|
2396
|
+
});
|
|
2397
|
+
if (auth.ok) {
|
|
2398
|
+
rights = auth.rights?.toolRights;
|
|
2399
|
+
}
|
|
2400
|
+
else {
|
|
2401
|
+
// 吞掉拒绝原因并继续:压缩不是新 run,不能因 ACL 拒绝而整体不可用;但绝不静默——
|
|
2402
|
+
// 工具面可能因此比主请求宽,摘要退化为 cache-miss(只慢不坏),留痕便于归因。
|
|
2403
|
+
console.warn(`[Runner] compact tool face: session ACL denied (${auth.reason ?? 'unknown'}) ` +
|
|
2404
|
+
`session=${sessionId} agent=${agentId} — summary prefix may miss cache`);
|
|
2405
|
+
}
|
|
2406
|
+
}
|
|
2407
|
+
return this.filterToolsForSessionRights(this.agent.toolsForSession(sessionId), rights, this.config.agentToolPolicy);
|
|
2408
|
+
}
|
|
2409
|
+
/**
|
|
2410
|
+
* 某会话的 wire 工具面 **同时**带出老化策略(manual 压缩专用)
|
|
2411
|
+
*
|
|
2412
|
+
* 为什么必须成对返回:摘要请求的 messages 前缀要与会话请求逐字节相同,
|
|
2413
|
+
* 而 messages 老化依赖 toolAgers。只给 tools(wire 定义)不给 agers,
|
|
2414
|
+
* 摘要视图就会退回默认机械指针 —— 2026-11-13 生产实测:678 个共同工具结果中
|
|
2415
|
+
* 515 个(76%)形态不同 → 前缀从第 2 条消息起就分叉,缓存 0 命中。
|
|
2416
|
+
*
|
|
2417
|
+
* 单一漏斗:内部仍走 {@link resolveSessionLlmTools} 的同一过滤(`toolsForSession`
|
|
2418
|
+
* ∩ `agentToolPolicy` ∩ session ACL),两边不可能出现两份工具集。
|
|
2419
|
+
*
|
|
2420
|
+
* @param sessionId - 会话 id
|
|
2421
|
+
* @param agentId - 归属 agent
|
|
2422
|
+
* @returns wire 工具定义(顺序与会话面一致)与按名索引的老化器
|
|
2423
|
+
*/
|
|
2424
|
+
async resolveSessionToolSurface(sessionId, agentId) {
|
|
2425
|
+
const { buildToolDefinitions } = await import('@octopi-agent/core/loop/agent-loop.js');
|
|
2426
|
+
const surface = await this.resolveSessionToolSet(sessionId, agentId);
|
|
2427
|
+
return {
|
|
2428
|
+
tools: buildToolDefinitions(surface),
|
|
2429
|
+
toolAgers: collectToolAgers(surface),
|
|
2430
|
+
toolArgAgers: collectToolArgAgers(surface),
|
|
2431
|
+
};
|
|
2432
|
+
}
|
|
2250
2433
|
/**
|
|
2251
2434
|
* Session compact under the same session lock as handle (E1/E4).
|
|
2252
2435
|
*
|
|
@@ -2272,35 +2455,163 @@ export class SessionAwareRunner {
|
|
|
2272
2455
|
summarizeAttempted: false,
|
|
2273
2456
|
};
|
|
2274
2457
|
}
|
|
2275
|
-
|
|
2276
|
-
// (HookedCompactEngine) with the real session identity. Orchestrating a
|
|
2277
|
-
// second vote/observe here double-fired every manual compaction and
|
|
2278
|
-
// observed denials as if they were outcomes.
|
|
2279
|
-
const result = await options.compactStructural({
|
|
2280
|
-
sessionId,
|
|
2281
|
-
agentId,
|
|
2282
|
-
messages: session.messages,
|
|
2283
|
-
summarize: options.summarize,
|
|
2284
|
-
compactTargetTokens: options.compactTargetTokens,
|
|
2285
|
-
// 请求口径计量原料(评审 B1):tools/system 缺失会让 before/after 少算整个
|
|
2286
|
-
// tool schema——「请求口径」名不副实
|
|
2287
|
-
systemPrompt: options.systemPrompt,
|
|
2288
|
-
tools: options.tools,
|
|
2289
|
-
// 交接式摘要素材:task 快照(裸状态块,不含对话引导语)随指令尾部注入
|
|
2290
|
-
taskSnapshot: renderSessionTasksInjection(session.tasks ?? [], { includeGuidance: false }),
|
|
2291
|
-
// 旧压缩快照读口(迁移输入):manual 路也要先迁移再产记录,防旧快照在
|
|
2292
|
-
// 下次 assemble 迁移时以更高 seq 反向覆盖新记录
|
|
2293
|
-
loadCompactState: () => readSessionCompact(session, agentId),
|
|
2294
|
-
});
|
|
2295
|
-
// 压缩产物 = 引擎内持久转换记录(append-only);旧 contextCompact 快照不再写回。
|
|
2296
|
-
// 传输投影:view 不过锁面(大对象,UI 无需)——唯一投影实现在能力层
|
|
2297
|
-
//(禁止手抄字段表:新可选字段会静默丢失,评审 P3 major)
|
|
2298
|
-
return toCompactTransport(result);
|
|
2458
|
+
return await this.runCompactCore(sessionId, agentId, session, options);
|
|
2299
2459
|
}
|
|
2300
2460
|
finally {
|
|
2301
2461
|
release();
|
|
2302
2462
|
}
|
|
2303
2463
|
}
|
|
2464
|
+
/**
|
|
2465
|
+
* 压缩执行核心(**无锁**):两个入口共用——compactSession(锁路径,store 快照)与
|
|
2466
|
+
* in-run 消息缝(run 持锁中,传 handle 内活 session,见 requestInRunCompact)。
|
|
2467
|
+
* 锁语义(E1/E4 单写者)由入口负责,本方法不得再抢锁(自抢即死锁)。
|
|
2468
|
+
*
|
|
2469
|
+
* @param sessionId - 会话 id
|
|
2470
|
+
* @param agentId - compact 视图归属 agent(E4 键)
|
|
2471
|
+
* @param session - 会话数据(消息/任务/compact 快照读口的来源)
|
|
2472
|
+
* @param options - 压缩执行选项(compactStructural 等,已解析)
|
|
2473
|
+
* @param signal - run 中止信号(in-run 路透传至摘要/压缩调用;锁路径不传)
|
|
2474
|
+
* @returns 压缩结果
|
|
2475
|
+
*/
|
|
2476
|
+
async runCompactCore(sessionId, agentId, session, options, signal) {
|
|
2477
|
+
// Compaction Hooks fire exactly once inside the compact engine
|
|
2478
|
+
// (HookedCompactEngine) with the real session identity. Orchestrating a
|
|
2479
|
+
// second vote/observe here double-fired every manual compaction and
|
|
2480
|
+
// observed denials as if they were outcomes.
|
|
2481
|
+
const result = await options.compactStructural({
|
|
2482
|
+
sessionId,
|
|
2483
|
+
agentId,
|
|
2484
|
+
messages: session.messages,
|
|
2485
|
+
summarize: options.summarize,
|
|
2486
|
+
compactTargetTokens: options.compactTargetTokens,
|
|
2487
|
+
// 请求口径计量原料(评审 B1):tools/system 缺失会让 before/after 少算整个
|
|
2488
|
+
// tool schema——「请求口径」名不副实
|
|
2489
|
+
systemPrompt: options.systemPrompt,
|
|
2490
|
+
tools: options.tools,
|
|
2491
|
+
// 老化策略:缺它摘要视图退回默认指针,与会话前缀分叉(2026-11-13 实测 76% 结果形态不同)
|
|
2492
|
+
toolAgers: options.toolAgers,
|
|
2493
|
+
toolArgAgers: options.toolArgAgers,
|
|
2494
|
+
// run 中止信号(F1,评审 del-d0830117):摘要 LLM 调用随 run abort 取消,
|
|
2495
|
+
// 不再挂满 summarizeTimeoutMs(缺省 300s)
|
|
2496
|
+
signal,
|
|
2497
|
+
// 交接式摘要素材:task 快照(裸状态块,不含对话引导语)随指令尾部注入
|
|
2498
|
+
taskSnapshot: renderSessionTasksInjection(session.tasks ?? [], { includeGuidance: false }),
|
|
2499
|
+
// 旧压缩快照读口(迁移输入):manual 路也要先迁移再产记录,防旧快照在
|
|
2500
|
+
// 下次 assemble 迁移时以更高 seq 反向覆盖新记录
|
|
2501
|
+
loadCompactState: () => readSessionCompact(session, agentId),
|
|
2502
|
+
});
|
|
2503
|
+
// 压缩产物 = 引擎内持久转换记录(append-only);旧 contextCompact 快照不再写回。
|
|
2504
|
+
// contextSize 显示槽持久化(F8:刷新不丢压缩后读数)——manual 压缩完成即写即落盘。
|
|
2505
|
+
// 只在真压缩(compacted)时持久化:零覆盖轮的估算不得覆盖旧实测(评审 F-1)。
|
|
2506
|
+
// 走 updateMetadata 目标写(与 save 同会话串行):compactStructural 可达数十秒,
|
|
2507
|
+
// 整包 save 会用陈旧 session 回写并发更新的 metadata 键(浅合并调用方优先)。
|
|
2508
|
+
if (result.compacted && result.contextSize) {
|
|
2509
|
+
const size = result.contextSize;
|
|
2510
|
+
// 活对象同步(评审 del-d0830117 F2):收尾整包 save 的 metadata 浅合并是
|
|
2511
|
+
// incoming 胜——若不同步活对象,run 收尾会用 run 起点的旧 contextSize
|
|
2512
|
+
// 盖回本次写入(title 三键有 titleUpdatedAt 仲裁,contextSize 没有)
|
|
2513
|
+
session.metadata = { ...session.metadata, contextSize: size };
|
|
2514
|
+
if (this.store.updateMetadata) {
|
|
2515
|
+
await this.store.updateMetadata(sessionId, (meta) => {
|
|
2516
|
+
meta.contextSize = size;
|
|
2517
|
+
});
|
|
2518
|
+
console.log(`[ctx] session=${sessionId} writer=compact field=contextSize value=${size.tokens} (persist)`);
|
|
2519
|
+
}
|
|
2520
|
+
else {
|
|
2521
|
+
// 显式降级不静默:缺 updateMetadata 的 store 丢的是「刷新后仍显示压缩后读数」
|
|
2522
|
+
console.warn(`[ctx] session=${sessionId} writer=compact field=contextSize persist skipped: store lacks updateMetadata`);
|
|
2523
|
+
}
|
|
2524
|
+
}
|
|
2525
|
+
// 传输投影:view 不过锁面(大对象,UI 无需)——唯一投影实现在能力层
|
|
2526
|
+
//(禁止手抄字段表:新可选字段会静默丢失,评审 P3 major)
|
|
2527
|
+
return toCompactTransport(result);
|
|
2528
|
+
}
|
|
2529
|
+
/**
|
|
2530
|
+
* mid-run 手动压缩(方案 A,2026-11-20 拍板):请求交**活跃 run** 在下一个消息缝
|
|
2531
|
+
* 执行同一条 compact 路径(同保护/同摘要/同 transform 记录),不抢 session 锁
|
|
2532
|
+
* (run 持锁中,自抢即死锁)。同 (sessionId, agentId) 的并发请求 coalesce 到
|
|
2533
|
+
* 同一次缝执行。无活跃 run / run 已收尾 → 抛 InRunCompactUnavailable,
|
|
2534
|
+
* 调用方落回 compactSession 锁路径(FIFO 立即执行)。
|
|
2535
|
+
*
|
|
2536
|
+
* @param sessionId - 会话 id
|
|
2537
|
+
* @param agentId - compact 视图归属 agent(E4 键)
|
|
2538
|
+
* @param options - 与 compactSession 同形的解析结果(compactStructural 等)
|
|
2539
|
+
* @returns 压缩结果(下一个消息缝执行完成后 resolve)
|
|
2540
|
+
* @throws {InRunCompactUnavailable} 无活跃 run 可承接(调用方 fallback 锁路径)
|
|
2541
|
+
*/
|
|
2542
|
+
requestInRunCompact(sessionId, agentId, options) {
|
|
2543
|
+
const runAgentId = this.activeHandleSessions.get(sessionId);
|
|
2544
|
+
if (runAgentId === undefined) {
|
|
2545
|
+
return Promise.reject(new InRunCompactUnavailable(`in_run_compact: no active run for session "${sessionId}"`));
|
|
2546
|
+
}
|
|
2547
|
+
if (runAgentId !== agentId) {
|
|
2548
|
+
// E4 键(评审 del-d0830117 F4):压缩归属 agent ≠ run 归属 agent 时不得在
|
|
2549
|
+
// 别人 run 的缝里静默执行(用错账本 + 别人的活消息)——落回锁路径自行消歧
|
|
2550
|
+
return Promise.reject(new InRunCompactUnavailable(`in_run_compact: run agent "${runAgentId}" does not match compact agent "${agentId}"`));
|
|
2551
|
+
}
|
|
2552
|
+
const coalesceKey = `${sessionId}\u0000${agentId}`;
|
|
2553
|
+
const inflight = this.inFlightCompacts.get(coalesceKey);
|
|
2554
|
+
// F5:执行期间(已 drain、未完成)的点击 join 当前执行——不重复烧 LLM
|
|
2555
|
+
if (inflight)
|
|
2556
|
+
return inflight;
|
|
2557
|
+
let queue = this.inRunCompactRequests.get(sessionId);
|
|
2558
|
+
if (!queue) {
|
|
2559
|
+
queue = [];
|
|
2560
|
+
this.inRunCompactRequests.set(sessionId, queue);
|
|
2561
|
+
}
|
|
2562
|
+
// coalesce:同键已有未执行请求 → 复用其承诺(压缩语义幂等,重复执行只烧 LLM)
|
|
2563
|
+
const existing = queue.find((r) => r.agentId === agentId);
|
|
2564
|
+
if (existing)
|
|
2565
|
+
return existing.promise;
|
|
2566
|
+
let resolve;
|
|
2567
|
+
let reject;
|
|
2568
|
+
const promise = new Promise((res, rej) => {
|
|
2569
|
+
resolve = res;
|
|
2570
|
+
reject = rej;
|
|
2571
|
+
});
|
|
2572
|
+
queue.push({ agentId, options, resolve, reject, promise });
|
|
2573
|
+
return promise;
|
|
2574
|
+
}
|
|
2575
|
+
/**
|
|
2576
|
+
* 消息缝执行 in-run 压缩队列(consumeMessages 缝上调用;run 持锁,单写者)。
|
|
2577
|
+
* 逐条执行、逐条结算;单条失败只 reject 该条,不拖垮队列。
|
|
2578
|
+
*
|
|
2579
|
+
* @param sessionId - 会话 id
|
|
2580
|
+
* @param session - handle 内活 session(消息/任务最新视图)
|
|
2581
|
+
*/
|
|
2582
|
+
async drainInRunCompacts(sessionId, session, signal) {
|
|
2583
|
+
const queue = this.inRunCompactRequests.get(sessionId);
|
|
2584
|
+
if (!queue?.length)
|
|
2585
|
+
return;
|
|
2586
|
+
this.inRunCompactRequests.delete(sessionId);
|
|
2587
|
+
for (const req of queue) {
|
|
2588
|
+
if (signal?.aborted) {
|
|
2589
|
+
// run 已中止:不在收尾路上执行压缩(不拖 abort),交调用方 fallback 锁路径
|
|
2590
|
+
//(承诺仍兑现;锁路径在本 handle 释放锁后立即执行)
|
|
2591
|
+
req.reject(new InRunCompactUnavailable(`in_run_compact: run for session "${sessionId}" aborted`));
|
|
2592
|
+
continue;
|
|
2593
|
+
}
|
|
2594
|
+
const coalesceKey = `${sessionId}\u0000${req.agentId}`;
|
|
2595
|
+
const exec = this.runCompactCore(sessionId, req.agentId, session, req.options, signal)
|
|
2596
|
+
.then((r) => {
|
|
2597
|
+
req.resolve(r);
|
|
2598
|
+
return r;
|
|
2599
|
+
})
|
|
2600
|
+
.catch((err) => {
|
|
2601
|
+
req.reject(err instanceof Error ? err : new Error(String(err)));
|
|
2602
|
+
throw err;
|
|
2603
|
+
})
|
|
2604
|
+
.finally(() => {
|
|
2605
|
+
this.inFlightCompacts.delete(coalesceKey);
|
|
2606
|
+
});
|
|
2607
|
+
// in-flight 登记在 await 之前(跨缝 coalesce 窗口自 finally 开);顺序承重:
|
|
2608
|
+
// 本方法内 delete map / settle 之间不得插入 await 之外的新结算点(防双结算)
|
|
2609
|
+
this.inFlightCompacts.set(coalesceKey, exec);
|
|
2610
|
+
await exec.catch(() => {
|
|
2611
|
+
// 单条失败不拖垮队列(该条已 settle);吞掉避免 unhandled rejection
|
|
2612
|
+
});
|
|
2613
|
+
}
|
|
2614
|
+
}
|
|
2304
2615
|
/**
|
|
2305
2616
|
* 获取 Session 锁(经 SessionLease;E2 键 = sessionId)
|
|
2306
2617
|
*
|
|
@@ -2334,7 +2645,7 @@ export class SessionAwareRunner {
|
|
|
2334
2645
|
* 模型 2:`primaryAgentId` = 创建时的 agentId(Accountability)。
|
|
2335
2646
|
* 存储主键 = sessionId;agentId 只作归属/参与投影。
|
|
2336
2647
|
*/
|
|
2337
|
-
createSession(sessionId, agentId) {
|
|
2648
|
+
createSession(sessionId, agentId, tenantId) {
|
|
2338
2649
|
return {
|
|
2339
2650
|
id: sessionId,
|
|
2340
2651
|
agentId,
|
|
@@ -2349,6 +2660,9 @@ export class SessionAwareRunner {
|
|
|
2349
2660
|
sessionStartedAt: Date.now(),
|
|
2350
2661
|
lastInteractionAt: Date.now(),
|
|
2351
2662
|
updatedAt: Date.now(),
|
|
2663
|
+
// §9.1-6:新会话归属 = 派发面 claim(渠道锚/租户会话创建方);
|
|
2664
|
+
// 缺省不落 DEFAULT——存量语义(宿主面)由消费侧归一
|
|
2665
|
+
...(tenantId === undefined ? {} : { tenantId: tenantId }),
|
|
2352
2666
|
},
|
|
2353
2667
|
messages: [],
|
|
2354
2668
|
steps: [],
|
|
@@ -2392,9 +2706,10 @@ export class SessionAwareRunner {
|
|
|
2392
2706
|
* @param userMessage - 本 turn 用户消息对象(session.messages 中的同一引用)
|
|
2393
2707
|
* @param turnId - 会话内单调 turn id
|
|
2394
2708
|
* @param turnContextXml - `<turn_context>…</turn_context>` 整段
|
|
2709
|
+
* @param runId - 本 run 归因(`metadata.runId`,tool-result-aging 的 run 起点边界用)
|
|
2395
2710
|
* @throws 若已定形(禁止二次改写)
|
|
2396
2711
|
*/
|
|
2397
|
-
bakeTurnStart(userMessage, turnId, turnContextXml) {
|
|
2712
|
+
bakeTurnStart(userMessage, turnId, turnContextXml, runId) {
|
|
2398
2713
|
const content = userMessage.content;
|
|
2399
2714
|
const text = typeof content === 'string' ? content : getTextContent(content);
|
|
2400
2715
|
if (isTurnStartContent(text)) {
|
|
@@ -2415,7 +2730,9 @@ export class SessionAwareRunner {
|
|
|
2415
2730
|
...content.filter((b) => b.type !== 'text'),
|
|
2416
2731
|
];
|
|
2417
2732
|
}
|
|
2418
|
-
|
|
2733
|
+
// runId:老化的 run 起点归因(tool-result-aging)——同 run 的插话/续 turn
|
|
2734
|
+
// 携带同一 runId,老化边界不随插话推进
|
|
2735
|
+
userMessage.metadata = { ...userMessage.metadata, turnId, runId };
|
|
2419
2736
|
}
|
|
2420
2737
|
/** 构造 turn 闭标消息(write-once 由调用处重复检查保证) */
|
|
2421
2738
|
makeTurnEndMessage(turnId) {
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @layer harness/session — Session 域纯内存默认实现(非生产落盘后端)。
|
|
8
8
|
*/
|
|
9
|
+
import { DEFAULT_TENANT_ID } from '@octopi-agent/core/types.js';
|
|
9
10
|
import { readTitleState, sessionMatchesAgent } from '@octopi-agent/core/types/session.js';
|
|
10
11
|
function toIndexPick(s) {
|
|
11
12
|
return {
|
|
@@ -44,7 +45,13 @@ export class InMemorySessionStore {
|
|
|
44
45
|
metadata.titleSource = freshTitle.titleSource;
|
|
45
46
|
metadata.titleUpdatedAt = freshTitle.titleUpdatedAt;
|
|
46
47
|
}
|
|
47
|
-
|
|
48
|
+
// spawnBy 只增不清(与 JsonlSessionStore.save 同口径):陈旧整包 save 不得抹掉委派关联(D7)
|
|
49
|
+
this.sessions.set(sessionId, {
|
|
50
|
+
...data,
|
|
51
|
+
id: sessionId,
|
|
52
|
+
metadata,
|
|
53
|
+
spawnBy: data.spawnBy ?? prev?.spawnBy,
|
|
54
|
+
});
|
|
48
55
|
}
|
|
49
56
|
async updateMetadata(sessionId, mutate) {
|
|
50
57
|
const prev = this.sessions.get(sessionId);
|
|
@@ -74,8 +81,11 @@ export class InMemorySessionStore {
|
|
|
74
81
|
const values = Array.from(this.sessions.values());
|
|
75
82
|
return values
|
|
76
83
|
.filter((s) => (filter?.agentId ? sessionMatchesAgent(toIndexPick(s), filter.agentId) : true))
|
|
84
|
+
// 历史缺省视作 DEFAULT_TENANT_ID(与 JsonlSessionStore.list 同规则,共享常量保证)
|
|
85
|
+
.filter((s) => (filter?.tenantId ? (s.tenantId ?? DEFAULT_TENANT_ID) === filter.tenantId : true))
|
|
77
86
|
.map((s) => ({
|
|
78
87
|
...s.meta,
|
|
88
|
+
tenantId: s.tenantId,
|
|
79
89
|
primaryAgentId: s.primaryAgentId ?? s.meta.primaryAgentId,
|
|
80
90
|
preferredAgentId: s.preferredAgentId ?? s.meta.preferredAgentId,
|
|
81
91
|
participantAgentIds: toIndexPick(s).participantAgentIds,
|
|
@@ -83,6 +93,8 @@ export class InMemorySessionStore {
|
|
|
83
93
|
pinnedAt: typeof s.metadata?.pinnedAt === 'number' && Number.isFinite(s.metadata.pinnedAt)
|
|
84
94
|
? s.metadata.pinnedAt
|
|
85
95
|
: s.meta.pinnedAt,
|
|
96
|
+
// 与 JsonlSessionStore.buildIndexEntry 同规则:委派来源投影(D7)
|
|
97
|
+
spawnBy: s.spawnBy,
|
|
86
98
|
// 与 JsonlSessionStore.buildIndexEntry 同规则:标题权威在 metadata 三键(无旧数据回退)
|
|
87
99
|
...readTitleState(s.metadata),
|
|
88
100
|
}));
|
|
@@ -71,9 +71,14 @@ export declare class SessionScheduleService {
|
|
|
71
71
|
private coalesceSeen;
|
|
72
72
|
constructor(options?: SessionScheduleServiceOptions);
|
|
73
73
|
/**
|
|
74
|
-
*
|
|
74
|
+
* 打开/建库。幂等(先开者语义为准)。
|
|
75
|
+
*
|
|
76
|
+
* @param options - `arm: false` = 只开 store 不重臂/不起 tick(执行面用:§5.4
|
|
77
|
+
* 触发面唯一在 gateway,run 节点若重臂会把到期作业经空 wakeup 静默消费)
|
|
75
78
|
*/
|
|
76
|
-
open(
|
|
79
|
+
open(options?: {
|
|
80
|
+
arm?: boolean;
|
|
81
|
+
}): Promise<void>;
|
|
77
82
|
/** 兜底扫描:防 timer 丢失(P1) */
|
|
78
83
|
private startTick;
|
|
79
84
|
/**
|
|
@@ -163,6 +168,9 @@ export declare class SessionScheduleService {
|
|
|
163
168
|
*/
|
|
164
169
|
purgeSession(sessionId: string): number;
|
|
165
170
|
private disarm;
|
|
171
|
+
/** store-only 模式(执行面,open({arm:false})):不点火/不起 tick/不自消费——
|
|
172
|
+
* set/update/resume 经本口也不得 arm(否则到期作业被空 wakeup 静默消费)。 */
|
|
173
|
+
private armEnabled;
|
|
166
174
|
private arm;
|
|
167
175
|
private rearmAll;
|
|
168
176
|
/** 测试/手动触发(穿冷却语义:仅 active) */
|