@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
|
@@ -11,8 +11,10 @@
|
|
|
11
11
|
* 可选 `index`:可重建检索投影(失败不阻断权威写)。禁止把 index 当权威。
|
|
12
12
|
* `sessions.json` parse 失败会拒绝写回,避免清空 meta。
|
|
13
13
|
*/
|
|
14
|
-
import { access, mkdir, readFile,
|
|
14
|
+
import { access, mkdir, readFile, unlink, appendFile, stat } from 'node:fs/promises';
|
|
15
15
|
import { join } from 'node:path';
|
|
16
|
+
import { atomicWriteFile } from './atomic-tmp.js';
|
|
17
|
+
import { DEFAULT_TENANT_ID } from '@octopi-agent/core/types.js';
|
|
16
18
|
import { toSessionFileName } from '@octopi-agent/core/session-filename.js';
|
|
17
19
|
import { readTitleState, sessionMatchesAgent } from '@octopi-agent/core/types/session.js';
|
|
18
20
|
async function fileExists(path) {
|
|
@@ -61,6 +63,30 @@ function slimSteps(steps) {
|
|
|
61
63
|
return [rest];
|
|
62
64
|
});
|
|
63
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* `sessions.json` 元索引 read-modify-write 串行队列,按 meta 文件路径在**进程内**
|
|
68
|
+
* 共享(模块级:同进程多 store 实例也互斥——daemon 同进程就有双实例)。
|
|
69
|
+
*
|
|
70
|
+
* T5 演练实锤 2026-11-14:元索引是全店共享文件,per-session 的 withWriteLock 挡不住
|
|
71
|
+
* 跨 session 并发 read-modify-write——读旧写旧丢条目,且截断直写曾让并发 delete 6ms
|
|
72
|
+
* 即损坏整份元索引(评审 del-3c3fcfeb MAJ-1/2)。锁序恒为 session 锁 → meta 锁;
|
|
73
|
+
* meta 锁内不取任何 session 锁,无死锁环。回归锚 tests/session-store-write-race.test.ts。
|
|
74
|
+
*
|
|
75
|
+
* 已知边界(勿当已闭):**跨进程**窗口仍在——gateway 与 run-serve 子进程同写一份
|
|
76
|
+
* sessions.json,本锁不跨进程;收口走 P2-1 session-serve 或 flock,登记
|
|
77
|
+
* arch/multi-tenancy.md §9.1-14。
|
|
78
|
+
*
|
|
79
|
+
* @param metaPath - 元索引文件路径(锁键)
|
|
80
|
+
* @param fn - 元索引 RMW 整段(read → mutate → write)
|
|
81
|
+
* @returns fn 的结果
|
|
82
|
+
*/
|
|
83
|
+
const metaWriteQueues = new Map();
|
|
84
|
+
function withMetaLock(metaPath, fn) {
|
|
85
|
+
const prev = metaWriteQueues.get(metaPath) ?? Promise.resolve();
|
|
86
|
+
const run = prev.then(fn, fn);
|
|
87
|
+
metaWriteQueues.set(metaPath, run.then(() => undefined, () => undefined));
|
|
88
|
+
return run;
|
|
89
|
+
}
|
|
64
90
|
export class JsonlSessionStore {
|
|
65
91
|
sessionsDir;
|
|
66
92
|
index;
|
|
@@ -132,9 +158,7 @@ export class JsonlSessionStore {
|
|
|
132
158
|
}
|
|
133
159
|
async writeMetaIndex(index) {
|
|
134
160
|
await mkdir(this.sessionsDir, { recursive: true });
|
|
135
|
-
|
|
136
|
-
await writeFile(tmpPath, JSON.stringify(index, null, 2));
|
|
137
|
-
await rename(tmpPath, this.metaFile());
|
|
161
|
+
await atomicWriteFile(this.metaFile(), JSON.stringify(index, null, 2));
|
|
138
162
|
}
|
|
139
163
|
buildIndexEntry(data) {
|
|
140
164
|
const participantAgentIds = data.meta.participantAgentIds ??
|
|
@@ -142,6 +166,8 @@ export class JsonlSessionStore {
|
|
|
142
166
|
const lifecycle = data.lifecycle?.lifecycle ?? data.meta.lifecycle ?? 'active';
|
|
143
167
|
return {
|
|
144
168
|
...data.meta,
|
|
169
|
+
// 投影取值单一来源:SessionData.tenantId ?? meta.tenantId(legacy);显式放 spread 后
|
|
170
|
+
tenantId: data.tenantId ?? data.meta.tenantId,
|
|
145
171
|
id: data.id,
|
|
146
172
|
agentId: data.agentId || data.meta.agentId,
|
|
147
173
|
primaryAgentId: data.primaryAgentId ?? data.meta.primaryAgentId,
|
|
@@ -153,6 +179,9 @@ export class JsonlSessionStore {
|
|
|
153
179
|
// 置顶是用户数据:权威在 metadata.pinnedAt(受 save 浅合并保护,
|
|
154
180
|
// 长驻 run 对象的整包 save 抹不掉);meta.pinnedAt 仅作旧数据回退
|
|
155
181
|
pinnedAt: readPinnedAt(data.metadata?.pinnedAt) ?? readPinnedAt(data.meta.pinnedAt),
|
|
182
|
+
// 委派来源投影(D7):历史隐藏子会话 / 父子归组(右栏"子会话")依赖本字段;
|
|
183
|
+
// 权威在 state.json 的 spawnBy(存量条目由 ensureSpawnLinkBackfill 补投影)
|
|
184
|
+
spawnBy: data.spawnBy,
|
|
156
185
|
// 标题是用户数据:权威在 metadata 三键(同 pinnedAt 通道,save 按 titleUpdatedAt 仲裁);
|
|
157
186
|
// 投影必须覆盖 ...data.meta 展开带出的陈旧 meta.title,不做旧数据回退
|
|
158
187
|
...readTitleState(data.metadata),
|
|
@@ -192,6 +221,7 @@ export class JsonlSessionStore {
|
|
|
192
221
|
: undefined);
|
|
193
222
|
return {
|
|
194
223
|
id: sessionId,
|
|
224
|
+
tenantId: state.tenantId ?? meta?.tenantId,
|
|
195
225
|
agentId,
|
|
196
226
|
primaryAgentId: state.primaryAgentId ?? meta?.primaryAgentId ?? agentId,
|
|
197
227
|
preferredAgentId: state.preferredAgentId ?? meta?.preferredAgentId,
|
|
@@ -220,6 +250,18 @@ export class JsonlSessionStore {
|
|
|
220
250
|
};
|
|
221
251
|
}
|
|
222
252
|
async removeSessionFiles(sessionId) {
|
|
253
|
+
// 元索引先摘(meta RMW 归锁 + 原子写)、数据文件后删(MAJ-1,评审 del-3c3fcfeb):
|
|
254
|
+
// 旧序「先删文件、后截断写回索引」曾让并发 delete 6ms 即损坏整份元索引,且读旧
|
|
255
|
+
// 写回会复活/吞掉他人条目。新序 crash 只会留孤儿文件(磁盘清理兜底),不留幽灵
|
|
256
|
+
// 条目。摘除失败如实上抛:吞错只会把「delete 假成功」和「索引损坏」都藏起来。
|
|
257
|
+
const metaPath = this.metaFile();
|
|
258
|
+
if (await fileExists(metaPath)) {
|
|
259
|
+
await withMetaLock(metaPath, async () => {
|
|
260
|
+
const allMeta = await this.readMetaIndex();
|
|
261
|
+
delete allMeta[sessionId];
|
|
262
|
+
await this.writeMetaIndex(allMeta);
|
|
263
|
+
});
|
|
264
|
+
}
|
|
223
265
|
for (const p of [this.sessionFile(sessionId), this.sessionStateFile(sessionId)]) {
|
|
224
266
|
if (await fileExists(p)) {
|
|
225
267
|
await unlink(p);
|
|
@@ -240,15 +282,6 @@ export class JsonlSessionStore {
|
|
|
240
282
|
catch {
|
|
241
283
|
// 附件/转换记录清理失败不阻断 session 删除;残留由磁盘清理兜底
|
|
242
284
|
}
|
|
243
|
-
const metaPath = this.metaFile();
|
|
244
|
-
if (await fileExists(metaPath)) {
|
|
245
|
-
try {
|
|
246
|
-
const allMeta = await this.readMetaIndex();
|
|
247
|
-
delete allMeta[sessionId];
|
|
248
|
-
await writeFile(metaPath, JSON.stringify(allMeta, null, 2));
|
|
249
|
-
}
|
|
250
|
-
catch { /* ignore */ }
|
|
251
|
-
}
|
|
252
285
|
}
|
|
253
286
|
async load(sessionId) {
|
|
254
287
|
const messagesPath = this.sessionFile(sessionId);
|
|
@@ -268,7 +301,9 @@ export class JsonlSessionStore {
|
|
|
268
301
|
// 写数据文件在前,索引在后:crash 时索引最多缺条目(load 仍能直接读文件),
|
|
269
302
|
// 不会出现索引有但数据没写完的不一致
|
|
270
303
|
const jsonl = data.messages.map(msg => JSON.stringify(msg)).join('\n') + '\n';
|
|
271
|
-
|
|
304
|
+
// tmp+rename 原子写(MAJ-2,评审 del-3c3fcfeb):截断直写曾让并发 load 读到
|
|
305
|
+
// 0 条消息(实测 254/320),load→save 放大链路会把转录永久清空
|
|
306
|
+
await atomicWriteFile(this.sessionFile(sessionId), jsonl);
|
|
272
307
|
// 全量重写后同步增量缓存(防止下一次 syncMessages 误判漂移)
|
|
273
308
|
this.noteSyncCache(sessionId, Buffer.byteLength(jsonl, 'utf-8'), data.messages.slice());
|
|
274
309
|
// metadata 浅合并:长驻 run 对象上的陈旧/空 metadata 不得抹掉
|
|
@@ -291,12 +326,16 @@ export class JsonlSessionStore {
|
|
|
291
326
|
metadata.titleSource = fresh.titleSource;
|
|
292
327
|
metadata.titleUpdatedAt = fresh.titleUpdatedAt;
|
|
293
328
|
}
|
|
294
|
-
await
|
|
329
|
+
await atomicWriteFile(this.sessionStateFile(sessionId), JSON.stringify({
|
|
330
|
+
// 字段集必须与 updateMetadata() 的 state 重写保持一致:漏写即静默清字段
|
|
331
|
+
tenantId: data.tenantId ?? data.meta.tenantId,
|
|
295
332
|
agentId: data.agentId,
|
|
296
333
|
primaryAgentId: data.primaryAgentId ?? data.agentId,
|
|
297
334
|
preferredAgentId: data.preferredAgentId,
|
|
298
335
|
switchAudit: data.switchAudit ?? [],
|
|
299
|
-
spawnBy
|
|
336
|
+
// spawnBy 只增不清:陈旧整包 save(从零构造 SessionData)不得抹掉委派关联(D7),
|
|
337
|
+
// 与 metadata 浅合并 / 标题仲裁同哲学;删关联不做(子会话归属是审计链)
|
|
338
|
+
spawnBy: data.spawnBy ?? prevState?.spawnBy,
|
|
300
339
|
participants: data.participants ?? [],
|
|
301
340
|
contextDetachIndex: data.contextDetachIndex,
|
|
302
341
|
contextCompact: data.contextCompact,
|
|
@@ -307,10 +346,18 @@ export class JsonlSessionStore {
|
|
|
307
346
|
metadata,
|
|
308
347
|
}, null, 2));
|
|
309
348
|
// 索引携带 lifecycle 投影:list 过滤 / 归档扫描不必打开 state
|
|
310
|
-
//
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
349
|
+
// 索引最后更新:数据就绪才写入(meta RMW 进程内串行,见模块级 withMetaLock)
|
|
350
|
+
await withMetaLock(this.metaFile(), async () => {
|
|
351
|
+
const index = await this.readMetaIndex();
|
|
352
|
+
index[sessionId] = this.buildIndexEntry({
|
|
353
|
+
...data,
|
|
354
|
+
id: sessionId,
|
|
355
|
+
metadata,
|
|
356
|
+
// 与 state 写同口径:陈旧整包 save 不得抹掉委派关联投影
|
|
357
|
+
spawnBy: data.spawnBy ?? prevState?.spawnBy,
|
|
358
|
+
});
|
|
359
|
+
await this.writeMetaIndex(index);
|
|
360
|
+
});
|
|
314
361
|
// 可搜投影(失败不阻断;权威已落盘,可 rebuild)
|
|
315
362
|
if (this.index) {
|
|
316
363
|
try {
|
|
@@ -339,10 +386,12 @@ export class JsonlSessionStore {
|
|
|
339
386
|
const replaced = mutate(meta);
|
|
340
387
|
const metadata = replaced === undefined ? meta : replaced;
|
|
341
388
|
await mkdir(this.sessionsDir, { recursive: true });
|
|
342
|
-
await
|
|
389
|
+
await atomicWriteFile(this.sessionStateFile(sessionId), JSON.stringify({
|
|
390
|
+
tenantId: prev?.tenantId,
|
|
343
391
|
agentId: prev?.agentId,
|
|
344
392
|
// 字段集必须与 save() 的 state 重写保持一致:漏写即静默清字段
|
|
345
|
-
//(contextDetachIndex 曾被漏掉——updateMetadata
|
|
393
|
+
//(contextDetachIndex 曾被漏掉——updateMetadata 后租约截断点归零,续跑全量灌窗;
|
|
394
|
+
// tenantId 曾被漏掉——load→save 一轮往返把租户会话擦进 default 桶)
|
|
346
395
|
primaryAgentId: prev?.primaryAgentId ?? prev?.agentId,
|
|
347
396
|
preferredAgentId: prev?.preferredAgentId,
|
|
348
397
|
switchAudit: prev?.switchAudit ?? [],
|
|
@@ -357,19 +406,23 @@ export class JsonlSessionStore {
|
|
|
357
406
|
metadata,
|
|
358
407
|
}, null, 2));
|
|
359
408
|
try {
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
409
|
+
await withMetaLock(this.metaFile(), async () => {
|
|
410
|
+
const index = await this.readMetaIndex();
|
|
411
|
+
const entry = index[sessionId];
|
|
412
|
+
if (entry) {
|
|
413
|
+
index[sessionId] = {
|
|
414
|
+
...entry,
|
|
415
|
+
// pinnedAt 投影与 buildIndexEntry 同规则(置顶/取消即时可见于 list)
|
|
416
|
+
pinnedAt: readPinnedAt(metadata.pinnedAt),
|
|
417
|
+
// 委派关联投影同规则(MIN-5:只经历 updateMetadata 的会话也补投影)
|
|
418
|
+
spawnBy: entry.spawnBy ?? prev?.spawnBy,
|
|
419
|
+
// 标题投影同规则(rename / 自动标题即时可见于 list)
|
|
420
|
+
...readTitleState(metadata),
|
|
421
|
+
updatedAt: Date.now(),
|
|
422
|
+
};
|
|
423
|
+
await this.writeMetaIndex(index);
|
|
424
|
+
}
|
|
425
|
+
});
|
|
373
426
|
}
|
|
374
427
|
catch {
|
|
375
428
|
// 索引投影可重建;metadata 权威已落盘
|
|
@@ -410,14 +463,60 @@ export class JsonlSessionStore {
|
|
|
410
463
|
}
|
|
411
464
|
// 整文件对齐走 tmp+rename:读侧(浏览器刷新 load)不得撞见写半截的转录
|
|
412
465
|
const jsonl = messages.map((m) => JSON.stringify(m)).join('\n') + '\n';
|
|
413
|
-
|
|
414
|
-
await writeFile(tmpPath, jsonl);
|
|
415
|
-
await rename(tmpPath, path);
|
|
466
|
+
await atomicWriteFile(path, jsonl);
|
|
416
467
|
this.noteSyncCache(sessionId, Buffer.byteLength(jsonl, 'utf-8'), messages.slice());
|
|
417
468
|
});
|
|
418
469
|
}
|
|
470
|
+
/**
|
|
471
|
+
* spawnBy 投影 backfill(每实例一次):升级前落盘的会话其索引条目缺 `spawnBy`
|
|
472
|
+
* (权威值在 state.json),历史隐藏子会话 / 父子归组依赖该投影。
|
|
473
|
+
* 只补缺失条目,幂等;失败不阻断 list(显式降级 = 子会话暂在历史露出),
|
|
474
|
+
* warn 后清缓存待下次 list 重试,不静默吞。
|
|
475
|
+
*/
|
|
476
|
+
spawnLinkBackfill;
|
|
477
|
+
ensureSpawnLinkBackfill() {
|
|
478
|
+
this.spawnLinkBackfill ??= this.backfillSpawnLinks().then(() => undefined, (err) => {
|
|
479
|
+
this.spawnLinkBackfill = undefined;
|
|
480
|
+
console.warn(`[JsonlSessionStore] spawnBy backfill failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
481
|
+
});
|
|
482
|
+
return this.spawnLinkBackfill;
|
|
483
|
+
}
|
|
484
|
+
async backfillSpawnLinks() {
|
|
485
|
+
const snapshot = await this.readMetaIndex();
|
|
486
|
+
const missing = Object.values(snapshot).filter((e) => !e.spawnBy);
|
|
487
|
+
if (missing.length === 0)
|
|
488
|
+
return;
|
|
489
|
+
// state 读取放锁外(只读;state 原子写保证不读到半截);meta 锁内只做短 RMW 补写
|
|
490
|
+
const patches = new Map();
|
|
491
|
+
for (const entry of missing) {
|
|
492
|
+
const spawnBy = (await this.readStateData(entry.id))?.spawnBy;
|
|
493
|
+
if (spawnBy)
|
|
494
|
+
patches.set(entry.id, spawnBy);
|
|
495
|
+
}
|
|
496
|
+
if (patches.size === 0)
|
|
497
|
+
return;
|
|
498
|
+
await withMetaLock(this.metaFile(), async () => {
|
|
499
|
+
const index = await this.readMetaIndex();
|
|
500
|
+
let changed = false;
|
|
501
|
+
for (const [id, spawnBy] of patches) {
|
|
502
|
+
const entry = index[id];
|
|
503
|
+
if (entry && !entry.spawnBy) {
|
|
504
|
+
entry.spawnBy = spawnBy;
|
|
505
|
+
changed = true;
|
|
506
|
+
}
|
|
507
|
+
}
|
|
508
|
+
if (changed)
|
|
509
|
+
await this.writeMetaIndex(index);
|
|
510
|
+
});
|
|
511
|
+
}
|
|
419
512
|
async list(filter) {
|
|
513
|
+
await this.ensureSpawnLinkBackfill();
|
|
420
514
|
let entries = Object.values(await this.readMetaIndex());
|
|
515
|
+
if (filter?.tenantId) {
|
|
516
|
+
const tenantId = filter.tenantId;
|
|
517
|
+
// 历史缺省视作 'default'(multi-tenancy §5 渐进迁移)
|
|
518
|
+
entries = entries.filter((e) => (e.tenantId ?? DEFAULT_TENANT_ID) === tenantId);
|
|
519
|
+
}
|
|
421
520
|
if (filter?.agentId) {
|
|
422
521
|
const agentId = filter.agentId;
|
|
423
522
|
entries = entries.filter((e) => sessionMatchesAgent(e, agentId));
|
|
@@ -21,6 +21,11 @@ export declare function createSqliteSessionIndex(options: {
|
|
|
21
21
|
wal?: boolean;
|
|
22
22
|
/** 默认自动探测 FTS5;false 则只用 LIKE */
|
|
23
23
|
fts?: boolean;
|
|
24
|
+
/**
|
|
25
|
+
* 只读打开(P1-1a / MAJ-6):不写 WAL、不做 DDL(schema 归写者门面首建)——
|
|
26
|
+
* run 侧 prefilter 消费用本模式,保证 sessions.index.db 单写者纪律。
|
|
27
|
+
*/
|
|
28
|
+
readOnly?: boolean;
|
|
24
29
|
}): Promise<SessionIndexBackend>;
|
|
25
30
|
/**
|
|
26
31
|
* 从 JsonlSessionStore 全量重建投影。
|
|
@@ -57,8 +57,13 @@ export async function createSqliteSessionIndex(options) {
|
|
|
57
57
|
catch {
|
|
58
58
|
throw new Error(`SqliteSessionIndex requires Node.js >= 24 built-in "node:sqlite". Current process.version=${process.version}`);
|
|
59
59
|
}
|
|
60
|
-
const index = new SqliteSessionIndex(DatabaseSyncCtor, options.dbPath, options.wal !== false, options.fts !== false);
|
|
61
|
-
|
|
60
|
+
const index = new SqliteSessionIndex(DatabaseSyncCtor, options.dbPath, options.readOnly === true ? false : options.wal !== false, options.fts !== false, options.readOnly === true);
|
|
61
|
+
if (options.readOnly === true) {
|
|
62
|
+
await index.probeFtsReadOnly();
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
await index.ensureSchema();
|
|
66
|
+
}
|
|
62
67
|
return index;
|
|
63
68
|
}
|
|
64
69
|
/** FTS5 字面量:双引号包裹,内部引号翻倍 */
|
|
@@ -72,16 +77,32 @@ class SqliteSessionIndex {
|
|
|
72
77
|
db;
|
|
73
78
|
wantFts;
|
|
74
79
|
fts = false;
|
|
75
|
-
|
|
76
|
-
|
|
80
|
+
readOnly;
|
|
81
|
+
constructor(Ctor, dbPath, wal, wantFts, readOnly = false) {
|
|
82
|
+
this.db = new Ctor(dbPath, {
|
|
83
|
+
timeout: 5000,
|
|
84
|
+
enableForeignKeyConstraints: false,
|
|
85
|
+
...(readOnly ? { readOnly: true } : {}),
|
|
86
|
+
});
|
|
77
87
|
if (wal)
|
|
78
88
|
this.db.exec('PRAGMA journal_mode = WAL');
|
|
79
89
|
this.wantFts = wantFts;
|
|
90
|
+
this.readOnly = readOnly;
|
|
91
|
+
}
|
|
92
|
+
/** 只读模式的 FTS 探测(不建表;缺表 = 纯 LIKE) */
|
|
93
|
+
async probeFtsReadOnly() {
|
|
94
|
+
const row = this.db
|
|
95
|
+
.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='messages_fts'")
|
|
96
|
+
.get();
|
|
97
|
+
this.fts = this.wantFts && row !== undefined;
|
|
80
98
|
}
|
|
81
99
|
get ftsEnabled() {
|
|
82
100
|
return this.fts;
|
|
83
101
|
}
|
|
84
102
|
async ensureSchema() {
|
|
103
|
+
if (this.readOnly) {
|
|
104
|
+
throw new Error('SqliteSessionIndex: ensureSchema refused on readOnly handle (schema belongs to the writer facade)');
|
|
105
|
+
}
|
|
85
106
|
this.db.exec(`
|
|
86
107
|
CREATE TABLE IF NOT EXISTS index_meta (
|
|
87
108
|
key TEXT PRIMARY KEY,
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* assemble-global-tools — 全局工具面装配单源(daemon 与 run 节点共用)。
|
|
3
|
+
*
|
|
4
|
+
* 面分割(arch/service-topology.md §4/§10):工具(tool)面随执行节点——生产执行在
|
|
5
|
+
* run 实例进程内,工具必须在该进程构建(gateway 侧 `globalTools: []` 不是缺省而是无面)。
|
|
6
|
+
* 本工厂把原 daemon 内联装配(summary L1/L2 端口 → session 历史端口 → 凭证库 →
|
|
7
|
+
* web search → createToolSet)抽为共用单源,daemon 与 run-serve-child 各带一套调用点。
|
|
8
|
+
*
|
|
9
|
+
* 失败降级形态随原装配冻结(每块 try/catch + 显式 warn:L1-only / scan-only / 无凭证),
|
|
10
|
+
* 降级是「真实尝试失败后」的兜底,不是占位返回。
|
|
11
|
+
*/
|
|
12
|
+
import type { RegisteredTool } from '@octopi-agent/core/types.js';
|
|
13
|
+
import type { ModelProvider } from '@octopi-agent/core/interfaces/model-provider.js';
|
|
14
|
+
import type { SessionHistoryOptions } from '../../harness/session/history/index.js';
|
|
15
|
+
import type { ToolSetConfig } from '../../harness/extension/plugin-ecosystem/tools/tool-set.js';
|
|
16
|
+
import type { AskUserCallback } from '../../harness/extension/plugin-ecosystem/tools/ask-user.js';
|
|
17
|
+
export interface GlobalToolSetContext {
|
|
18
|
+
/** LLM provider 注册表(summary 压缩模型面;fallback = 首个注册值) */
|
|
19
|
+
providers: Map<string, ModelProvider>;
|
|
20
|
+
/** session_search / session_read 历史端口依赖(store 必填;index 缺省 = scan-only) */
|
|
21
|
+
sessionHistory: SessionHistoryOptions;
|
|
22
|
+
/** DocumentPort(gateway 共享实例 / run 节点自建);null = document_* 不注册 */
|
|
23
|
+
documentPort: NonNullable<ToolSetConfig['documentPort']> | null;
|
|
24
|
+
/** ask_user 桥(daemon: gateway.askUser;run 节点: 跨通道配对) */
|
|
25
|
+
askUser: AskUserCallback;
|
|
26
|
+
/** OCTOPI_HOME(凭证库位置) */
|
|
27
|
+
octopiHome: string;
|
|
28
|
+
/** octopi.json summary 块(形状透传;内部按原装配收窄) */
|
|
29
|
+
summary?: unknown;
|
|
30
|
+
/** octopi.json models.level(summary 档位表) */
|
|
31
|
+
levelMap?: unknown;
|
|
32
|
+
/** octopi.json webSearch 块 */
|
|
33
|
+
webSearch?: Parameters<typeof import('../web-search/factory.js').resolveWebSearchProviders>[0];
|
|
34
|
+
/**
|
|
35
|
+
* octopi.json browser 块(缺省 = 默认开,engine auto)。
|
|
36
|
+
* 显式 `enabled: false` 不注册 browser_*;未实现引擎 fail-loud 拒装配。
|
|
37
|
+
*/
|
|
38
|
+
browser?: Parameters<typeof import('../browser/index.js').createBrowserService>[0];
|
|
39
|
+
/** credentials.requireBindings */
|
|
40
|
+
requireCredentialBindings?: boolean;
|
|
41
|
+
/** security.network.allowPrivateNetwork */
|
|
42
|
+
allowPrivateNetwork?: boolean;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* 装配全局工具面。
|
|
46
|
+
*
|
|
47
|
+
* @param ctx - 装配依赖(provider/store/端口/配置块)
|
|
48
|
+
* @returns 全局工具清单(builtin + extensions,形态同 createToolSet().all)
|
|
49
|
+
*/
|
|
50
|
+
export declare function assembleGlobalTools(ctx: GlobalToolSetContext): Promise<RegisteredTool[]>;
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* assemble-global-tools — 全局工具面装配单源(daemon 与 run 节点共用)。
|
|
3
|
+
*
|
|
4
|
+
* 面分割(arch/service-topology.md §4/§10):工具(tool)面随执行节点——生产执行在
|
|
5
|
+
* run 实例进程内,工具必须在该进程构建(gateway 侧 `globalTools: []` 不是缺省而是无面)。
|
|
6
|
+
* 本工厂把原 daemon 内联装配(summary L1/L2 端口 → session 历史端口 → 凭证库 →
|
|
7
|
+
* web search → createToolSet)抽为共用单源,daemon 与 run-serve-child 各带一套调用点。
|
|
8
|
+
*
|
|
9
|
+
* 失败降级形态随原装配冻结(每块 try/catch + 显式 warn:L1-only / scan-only / 无凭证),
|
|
10
|
+
* 降级是「真实尝试失败后」的兜底,不是占位返回。
|
|
11
|
+
*/
|
|
12
|
+
import { join } from 'node:path';
|
|
13
|
+
import { resolveSummaryToolBindings } from '../../harness/context/capabilities/summary/tool-bindings.js';
|
|
14
|
+
/**
|
|
15
|
+
* 装配全局工具面。
|
|
16
|
+
*
|
|
17
|
+
* @param ctx - 装配依赖(provider/store/端口/配置块)
|
|
18
|
+
* @returns 全局工具清单(builtin + extensions,形态同 createToolSet().all)
|
|
19
|
+
*/
|
|
20
|
+
export async function assembleGlobalTools(ctx) {
|
|
21
|
+
// ── Summary L1/L2 端口(http_request / file_read 压缩) ──
|
|
22
|
+
let summarySupport;
|
|
23
|
+
try {
|
|
24
|
+
const { createSummaryPort, createToolSummarySupport, createMemorySummaryCache } = await import('../../harness/context/capabilities/summary/index.js');
|
|
25
|
+
const fallbackProvider = [...ctx.providers.values()][0];
|
|
26
|
+
if (fallbackProvider) {
|
|
27
|
+
const summaryCfg = ctx.summary;
|
|
28
|
+
const toolsCfg = summaryCfg?.tools;
|
|
29
|
+
let cache;
|
|
30
|
+
let cacheEnabled = false;
|
|
31
|
+
if (summaryCfg?.cache?.enabled) {
|
|
32
|
+
cache = createMemorySummaryCache({
|
|
33
|
+
maxEntries: summaryCfg.cache.maxEntries,
|
|
34
|
+
defaultTtlMs: summaryCfg.cache.ttlMs,
|
|
35
|
+
});
|
|
36
|
+
cacheEnabled = true;
|
|
37
|
+
}
|
|
38
|
+
const portOptions = {
|
|
39
|
+
providers: ctx.providers,
|
|
40
|
+
levelMap: ctx.levelMap,
|
|
41
|
+
fallbackProvider,
|
|
42
|
+
model: summaryCfg?.model,
|
|
43
|
+
modelLevel: summaryCfg?.modelLevel,
|
|
44
|
+
gate: summaryCfg?.gate,
|
|
45
|
+
defaultInputBudgetTokens: summaryCfg?.defaultInputBudgetTokens,
|
|
46
|
+
safetyMarginTokens: summaryCfg?.safetyMarginTokens,
|
|
47
|
+
oversizedStrategy: summaryCfg?.oversizedStrategy,
|
|
48
|
+
policyOverrides: summaryCfg?.policies,
|
|
49
|
+
cache,
|
|
50
|
+
cacheEnabled,
|
|
51
|
+
cacheTtlMs: summaryCfg?.cache?.ttlMs,
|
|
52
|
+
maxReturnCharsDefault: toolsCfg?.maxReturnChars,
|
|
53
|
+
toolBindings: resolveSummaryToolBindings(toolsCfg),
|
|
54
|
+
};
|
|
55
|
+
const port = createSummaryPort(portOptions);
|
|
56
|
+
summarySupport = createToolSummarySupport(port, portOptions);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
catch (err) {
|
|
60
|
+
// 降级 = L1-only tools(真实尝试失败);显式 warn 不静默
|
|
61
|
+
console.warn(`[tools] summary capability wiring failed (L1-only tools): ${err instanceof Error ? err.message : String(err)}`);
|
|
62
|
+
}
|
|
63
|
+
// ── session_search / session_read(Information 历史检索) ──
|
|
64
|
+
let sessionHistory;
|
|
65
|
+
try {
|
|
66
|
+
const { createSessionHistoryPort } = await import('../../harness/session/history/index.js');
|
|
67
|
+
sessionHistory = createSessionHistoryPort(ctx.sessionHistory);
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
console.warn(`[tools] session history tools unavailable: ${err instanceof Error ? err.message : String(err)}`);
|
|
71
|
+
}
|
|
72
|
+
// ── SEC-3c: named credentials(http_request.credential) ──
|
|
73
|
+
let credentialStore = null;
|
|
74
|
+
try {
|
|
75
|
+
const { CredentialStore } = await import('../../harness/governance/credentials/store.js');
|
|
76
|
+
credentialStore = await CredentialStore.openDefault(ctx.octopiHome, {
|
|
77
|
+
requireBindings: ctx.requireCredentialBindings ?? false,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
catch (err) {
|
|
81
|
+
console.warn(`[tools] CredentialStore unavailable: ${err instanceof Error ? err.message : String(err)}`);
|
|
82
|
+
}
|
|
83
|
+
// ── web_search(未配置不注册) ──
|
|
84
|
+
let webSearch;
|
|
85
|
+
if (ctx.webSearch?.providers && Object.keys(ctx.webSearch.providers).length > 0) {
|
|
86
|
+
const { resolveWebSearchProviders, createWebSearchWithFallback } = await import('../web-search/factory.js');
|
|
87
|
+
const resolved = resolveWebSearchProviders(ctx.webSearch);
|
|
88
|
+
if (resolved.primary) {
|
|
89
|
+
webSearch = {
|
|
90
|
+
provider: createWebSearchWithFallback(resolved.primary, resolved.fallbacks),
|
|
91
|
+
defaultLimit: resolved.defaultLimit,
|
|
92
|
+
timeoutMs: resolved.timeoutMs,
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
// ── browser_*(默认开;enabled:false 显式关闭;未实现引擎 fail-loud 不 try/catch) ──
|
|
97
|
+
let browser;
|
|
98
|
+
if (ctx.browser?.enabled !== false) {
|
|
99
|
+
const { createBrowserService } = await import('../browser/index.js');
|
|
100
|
+
const browserCfg = ctx.browser ?? {};
|
|
101
|
+
if (browserCfg.profiles?.persist && !browserCfg.profiles.defaultProfile) {
|
|
102
|
+
// persist 无 defaultProfile = 没有任何会话带 profileId:配置静默不生效,必须出声(评审 F20)
|
|
103
|
+
console.warn('[tools] browser.profiles.persist is set without defaultProfile — no session will archive/restore state');
|
|
104
|
+
}
|
|
105
|
+
browser = {
|
|
106
|
+
service: createBrowserService(browserCfg),
|
|
107
|
+
options: {
|
|
108
|
+
engine: browserCfg.engine,
|
|
109
|
+
timeoutMs: browserCfg.timeoutMs,
|
|
110
|
+
snapshotMaxChars: browserCfg.snapshotMaxChars,
|
|
111
|
+
confirm: browserCfg.confirm,
|
|
112
|
+
stealth: browserCfg.stealth,
|
|
113
|
+
profiles: browserCfg.profiles,
|
|
114
|
+
// profile 存储按运行时 home 归位(OCTOPI_HOME/browser-profiles,不进 agent home)
|
|
115
|
+
profileDir: join(ctx.octopiHome, 'browser-profiles'),
|
|
116
|
+
urlPolicy: {
|
|
117
|
+
allow: browserCfg.network?.domains?.allow,
|
|
118
|
+
deny: browserCfg.network?.domains?.deny,
|
|
119
|
+
},
|
|
120
|
+
allowPrivateNetwork: browserCfg.network?.allowPrivateNetwork ?? ctx.allowPrivateNetwork ?? false,
|
|
121
|
+
},
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
const { createToolSet } = await import('../../harness/extension/plugin-ecosystem/tools/tool-set.js');
|
|
125
|
+
const { all } = createToolSet({
|
|
126
|
+
webSearch,
|
|
127
|
+
browser,
|
|
128
|
+
summary: summarySupport,
|
|
129
|
+
sessionHistory,
|
|
130
|
+
documentPort: ctx.documentPort,
|
|
131
|
+
credentials: credentialStore,
|
|
132
|
+
network: { allowPrivateNetwork: ctx.allowPrivateNetwork ?? false },
|
|
133
|
+
requireCredentialBindings: ctx.requireCredentialBindings ?? false,
|
|
134
|
+
askUser: ctx.askUser,
|
|
135
|
+
});
|
|
136
|
+
return all;
|
|
137
|
+
}
|
package/dist/paths.d.ts
CHANGED
|
@@ -31,3 +31,21 @@ export declare const OCTOPI_HOME_ENV = "OCTOPI_HOME";
|
|
|
31
31
|
* @returns 绝对路径
|
|
32
32
|
*/
|
|
33
33
|
export declare function getOctopiHome(): string;
|
|
34
|
+
/**
|
|
35
|
+
* agent home 物化路径(§4:`agents/<agentId>/`,registry 标注 tenantId)。
|
|
36
|
+
*
|
|
37
|
+
* @param octopiHome - OCTOPI_HOME 绝对路径
|
|
38
|
+
* @param agentId - agent id(registry 管理的为 UUID;配置 agent 为配置 id)
|
|
39
|
+
* @returns agent home 目录
|
|
40
|
+
*/
|
|
41
|
+
export declare function agentHomeDir(octopiHome: string, agentId: string): string;
|
|
42
|
+
/**
|
|
43
|
+
* agent workspace 物化路径(§4:`workspace/<tenantId>/<agentId>/` 路径前缀隔离)。
|
|
44
|
+
* 显式配置的 `agents[].workspace` 优先于本派生(§5 渐进迁移:存量配置不搬家)。
|
|
45
|
+
*
|
|
46
|
+
* @param octopiHome - OCTOPI_HOME 绝对路径
|
|
47
|
+
* @param tenantId - 归属租户;缺省 `DEFAULT_TENANT_ID`(存量/未接身份层)
|
|
48
|
+
* @param agentId - agent id
|
|
49
|
+
* @returns agent workspace 目录
|
|
50
|
+
*/
|
|
51
|
+
export declare function agentWorkspaceDir(octopiHome: string, tenantId: string | undefined, agentId: string): string;
|
package/dist/paths.js
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { isAbsolute, join, resolve } from 'node:path';
|
|
9
9
|
import { homedir } from 'node:os';
|
|
10
|
+
import { DEFAULT_TENANT_ID } from '@octopi-agent/core/types.js';
|
|
10
11
|
/**
|
|
11
12
|
* 展开 `~` 前缀为用户主目录(Windows/Linux/macOS 通用)。
|
|
12
13
|
* 接受 `~`、`~/rest`、`~\rest`(Windows 形态,剩余分隔符归一为 `/` 后按平台 join);
|
|
@@ -57,3 +58,38 @@ export const OCTOPI_HOME_ENV = 'OCTOPI_HOME';
|
|
|
57
58
|
export function getOctopiHome() {
|
|
58
59
|
return resolve(process.env[OCTOPI_HOME_ENV] ?? DEFAULT_OCTOPI_HOME);
|
|
59
60
|
}
|
|
61
|
+
// ── 家当路径派生(arch/multi-tenancy.md §4 隔离矩阵的单一来源) ──
|
|
62
|
+
/** 路径段守卫:目录名不得为空 / 含分隔符 / 含 `..`(containment 安全判定点) */
|
|
63
|
+
function assertPathSegment(segment, label) {
|
|
64
|
+
if (!segment ||
|
|
65
|
+
segment === '.' ||
|
|
66
|
+
segment === '..' ||
|
|
67
|
+
segment.includes('/') ||
|
|
68
|
+
segment.includes('\\') ||
|
|
69
|
+
segment.includes('\0')) {
|
|
70
|
+
throw new Error(`invalid ${label} path segment: ${JSON.stringify(segment)}`);
|
|
71
|
+
}
|
|
72
|
+
return segment;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* agent home 物化路径(§4:`agents/<agentId>/`,registry 标注 tenantId)。
|
|
76
|
+
*
|
|
77
|
+
* @param octopiHome - OCTOPI_HOME 绝对路径
|
|
78
|
+
* @param agentId - agent id(registry 管理的为 UUID;配置 agent 为配置 id)
|
|
79
|
+
* @returns agent home 目录
|
|
80
|
+
*/
|
|
81
|
+
export function agentHomeDir(octopiHome, agentId) {
|
|
82
|
+
return join(octopiHome, 'agents', assertPathSegment(agentId, 'agent id'));
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* agent workspace 物化路径(§4:`workspace/<tenantId>/<agentId>/` 路径前缀隔离)。
|
|
86
|
+
* 显式配置的 `agents[].workspace` 优先于本派生(§5 渐进迁移:存量配置不搬家)。
|
|
87
|
+
*
|
|
88
|
+
* @param octopiHome - OCTOPI_HOME 绝对路径
|
|
89
|
+
* @param tenantId - 归属租户;缺省 `DEFAULT_TENANT_ID`(存量/未接身份层)
|
|
90
|
+
* @param agentId - agent id
|
|
91
|
+
* @returns agent workspace 目录
|
|
92
|
+
*/
|
|
93
|
+
export function agentWorkspaceDir(octopiHome, tenantId, agentId) {
|
|
94
|
+
return join(octopiHome, 'workspace', assertPathSegment(tenantId ?? DEFAULT_TENANT_ID, 'tenant id'), assertPathSegment(agentId, 'agent id'));
|
|
95
|
+
}
|
|
@@ -40,7 +40,7 @@ lifecycle:
|
|
|
40
40
|
maxDurationMs: 120000
|
|
41
41
|
|
|
42
42
|
runtimeInject:
|
|
43
|
-
requires: ['conceptGraphStore']
|
|
43
|
+
requires: ['conceptGraphStore', 'sessionStore']
|
|
44
44
|
|
|
45
45
|
observability:
|
|
46
46
|
eventPrefix: cognition.steward.conceptualize
|
|
@@ -50,3 +50,5 @@ metadata:
|
|
|
50
50
|
maxNodesPerProposition: 6
|
|
51
51
|
maxEdgesPerProposition: 12
|
|
52
52
|
maxTokens: 8192
|
|
53
|
+
contextWindowMessages: 2
|
|
54
|
+
contextSliceMaxChars: 4000
|