@octopi-agent/engine 0.86.38 → 0.97.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config-admin/agent-presets.d.ts +70 -0
- package/dist/config-admin/agent-presets.js +243 -0
- package/dist/config-admin/discover.d.ts +30 -0
- package/dist/config-admin/discover.js +48 -0
- package/dist/config-admin/env.d.ts +22 -0
- package/dist/config-admin/env.js +41 -0
- package/dist/config-admin/index.d.ts +20 -0
- package/dist/config-admin/index.js +15 -0
- package/dist/config-admin/model-presets.d.ts +75 -0
- package/dist/config-admin/model-presets.js +249 -0
- package/dist/config-admin/name-guard.d.ts +14 -0
- package/dist/config-admin/name-guard.js +24 -0
- package/dist/config-admin/patch.d.ts +56 -0
- package/dist/config-admin/patch.js +201 -0
- package/dist/config-admin/port.d.ts +68 -0
- package/dist/config-admin/port.js +21 -0
- package/dist/config-admin/redact.d.ts +39 -0
- package/dist/config-admin/redact.js +42 -0
- package/dist/config-schema/agent.d.ts +43 -1
- package/dist/config-schema/agent.js +12 -5
- package/dist/config-schema/context.d.ts +7 -2
- package/dist/config-schema/context.js +8 -0
- package/dist/config-schema/engine.d.ts +110 -8
- package/dist/config-schema/governance.d.ts +43 -1
- package/dist/config-schema/governance.js +160 -2
- package/dist/config-schema/models.d.ts +7 -4
- package/dist/config-schema/models.js +4 -1
- package/dist/config-schema/observability.d.ts +9 -0
- package/dist/config-schema/observability.js +29 -0
- package/dist/config-schema/run.d.ts +3 -0
- package/dist/config-schema/run.js +14 -0
- package/dist/config-schema/shared.d.ts +3 -0
- package/dist/config-schema/shared.js +12 -0
- package/dist/config-schema/substrate.d.ts +1 -1
- package/dist/config.d.ts +60 -13
- package/dist/config.js +81 -78
- package/dist/harness/activation/dispatcher.d.ts +8 -2
- package/dist/harness/activation/dispatcher.js +33 -5
- package/dist/harness/activation/inbox.d.ts +87 -0
- package/dist/harness/activation/inbox.js +169 -0
- package/dist/harness/activation/runtime.d.ts +9 -8
- package/dist/harness/activation/runtime.js +100 -8
- package/dist/harness/activation/types.d.ts +19 -0
- package/dist/harness/activation/types.js +2 -0
- package/dist/harness/agent/builder.d.ts +18 -3
- package/dist/harness/agent/builder.js +42 -17
- package/dist/harness/agent/config-bridge.d.ts +5 -0
- package/dist/harness/agent/config-bridge.js +7 -1
- package/dist/harness/agent/config-integrity.d.ts +72 -0
- package/dist/harness/agent/config-integrity.js +146 -0
- package/dist/harness/agent/tool-purpose.d.ts +9 -1
- package/dist/harness/agent/tool-purpose.js +11 -2
- package/dist/harness/agent/wire-agent-builder.js +11 -3
- package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.d.ts +11 -1
- package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.js +11 -1
- package/dist/harness/collaboration/autonomous-subsystem/loader.d.ts +13 -0
- package/dist/harness/collaboration/autonomous-subsystem/loader.js +16 -1
- package/dist/harness/collaboration/autonomous-subsystem/runtime.d.ts +4 -0
- package/dist/harness/collaboration/autonomous-subsystem/runtime.js +3 -1
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +3 -1
- package/dist/harness/collaboration/delegation/child-run.js +21 -5
- package/dist/harness/collaboration/delegation/notifier.js +4 -3
- package/dist/harness/collaboration/delegation/service.js +2 -3
- package/dist/harness/collaboration/delegation/wiring.js +6 -5
- package/dist/harness/collaboration/orchestration/reflector/llm-reflector.d.ts +1 -1
- package/dist/harness/collaboration/orchestration/reflector/llm-reflector.js +1 -1
- package/dist/harness/context/capabilities/compact/engine.d.ts +30 -0
- package/dist/harness/context/capabilities/compact/engine.js +198 -46
- package/dist/harness/context/capabilities/compact/handover.d.ts +78 -0
- package/dist/harness/context/capabilities/compact/handover.js +107 -0
- package/dist/harness/context/capabilities/compact/index.d.ts +3 -1
- package/dist/harness/context/capabilities/compact/index.js +2 -1
- package/dist/harness/context/capabilities/compact/types.d.ts +30 -1
- package/dist/harness/context/capabilities/summary/executor.js +2 -1
- package/dist/harness/context/capabilities/summary/policies.js +8 -5
- package/dist/harness/context/constitution/default-agents.md +11 -10
- package/dist/harness/context/default-context-engine.d.ts +34 -4
- package/dist/harness/context/default-context-engine.js +198 -53
- package/dist/harness/context/hybrid-compressor.js +6 -0
- package/dist/harness/context/layer-types.d.ts +36 -0
- package/dist/harness/context/layer-types.js +38 -0
- package/dist/harness/context/llm-summarizer.d.ts +2 -8
- package/dist/harness/context/llm-summarizer.js +69 -91
- package/dist/harness/context/message-selector.js +4 -3
- package/dist/harness/context/root-instructions.js +1 -1
- package/dist/harness/context/summarize.d.ts +2 -0
- package/dist/harness/context/summarize.js +7 -2
- package/dist/harness/context/system-prompt-assembler.js +10 -4
- package/dist/harness/context/tool-result-aging.js +2 -2
- package/dist/harness/context/truncate-compressor.js +7 -0
- package/dist/harness/context/turn-envelope.d.ts +4 -3
- package/dist/harness/context/turn-envelope.js +4 -3
- package/dist/harness/context/types.d.ts +33 -1
- package/dist/harness/extension/execution-environment/dangerous-commands.d.ts +28 -0
- package/dist/harness/extension/execution-environment/dangerous-commands.js +129 -0
- package/dist/harness/extension/execution-environment/effect-policy.d.ts +133 -4
- package/dist/harness/extension/execution-environment/effect-policy.js +263 -14
- package/dist/harness/extension/execution-environment/index.d.ts +4 -2
- package/dist/harness/extension/execution-environment/index.js +2 -1
- package/dist/harness/extension/execution-environment/isolation.js +5 -1
- package/dist/harness/extension/execution-environment/kill-switch.d.ts +34 -0
- package/dist/harness/extension/execution-environment/kill-switch.js +46 -0
- package/dist/harness/extension/execution-environment/ops-audit.d.ts +200 -0
- package/dist/harness/extension/execution-environment/ops-audit.js +338 -0
- package/dist/harness/extension/execution-environment/privileged-exec.d.ts +158 -0
- package/dist/harness/extension/execution-environment/privileged-exec.js +418 -0
- package/dist/harness/extension/execution-environment/process-info.d.ts +180 -0
- package/dist/harness/extension/execution-environment/process-info.js +466 -0
- package/dist/harness/extension/execution-environment/process-isolation.d.ts +7 -0
- package/dist/harness/extension/execution-environment/process-isolation.js +9 -0
- package/dist/harness/extension/execution-environment/sandbox.d.ts +109 -0
- package/dist/harness/extension/execution-environment/sandbox.js +264 -29
- package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +1 -1
- package/dist/harness/extension/execution-environment/tool-capabilities.js +6 -0
- package/dist/harness/extension/execution-environment/types.d.ts +19 -0
- package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +5 -0
- package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.d.ts +6 -0
- package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +50 -0
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.d.ts +4 -5
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +5 -15
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +3 -0
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +53 -2
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +10 -17
- package/dist/harness/extension/plugin-ecosystem/tools/git-runner.d.ts +31 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-runner.js +104 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.d.ts +111 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.js +197 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-tools.d.ts +8 -8
- package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +9 -100
- package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +6 -0
- package/dist/harness/extension/plugin-ecosystem/tools/index.js +4 -0
- package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.d.ts +43 -0
- package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.js +350 -0
- package/dist/harness/extension/plugin-ecosystem/tools/process-tools.d.ts +30 -0
- package/dist/harness/extension/plugin-ecosystem/tools/process-tools.js +137 -0
- package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +54 -4
- package/dist/harness/governance/human-in-the-loop/decision-cache.js +42 -16
- package/dist/harness/governance/security/temp-path.d.ts +9 -0
- package/dist/harness/governance/security/temp-path.js +13 -2
- package/dist/harness/governance/session-acl/seed-roles.js +14 -0
- package/dist/harness/index.d.ts +4 -0
- package/dist/harness/index.js +3 -0
- package/dist/harness/knowledge/file-identity.d.ts +8 -0
- package/dist/harness/knowledge/file-identity.js +26 -1
- package/dist/harness/knowledge/fts.js +1 -2
- package/dist/harness/knowledge/grounding.js +5 -5
- package/dist/harness/knowledge/index-store.d.ts +31 -4
- package/dist/harness/knowledge/index-store.js +180 -48
- package/dist/harness/knowledge/ingest.d.ts +115 -115
- package/dist/harness/knowledge/ingest.js +150 -150
- package/dist/harness/knowledge/knowledge-serve-child.js +1 -1
- package/dist/harness/knowledge/purge.js +4 -1
- package/dist/harness/memory/backfill-coverage.js +3 -1
- package/dist/harness/memory/sqlite/keyword-search.d.ts +1 -0
- package/dist/harness/memory/sqlite/keyword-search.js +4 -3
- package/dist/harness/observability/observer/hub.js +38 -1
- package/dist/harness/observability/observer/run-snapshot.js +1 -0
- package/dist/harness/observability/observer/types.d.ts +27 -0
- package/dist/harness/run/agent/agent.d.ts +7 -0
- package/dist/harness/run/agent/agent.js +23 -1
- package/dist/harness/run/reliability/fallback-provider.d.ts +117 -5
- package/dist/harness/run/reliability/fallback-provider.js +262 -22
- package/dist/harness/run/reliability/harness-events.d.ts +24 -1
- package/dist/harness/run/reliability/model-error-policy.d.ts +32 -0
- package/dist/harness/run/reliability/model-error-policy.js +42 -0
- package/dist/harness/run/reliability/provider-wrapper.js +29 -2
- package/dist/harness/run/reliability/refusal-guard.d.ts +20 -0
- package/dist/harness/run/reliability/refusal-guard.js +102 -0
- package/dist/harness/run/reliability/run-agent.js +231 -33
- package/dist/harness/run/run-guard/default-run-guard.js +1 -1
- package/dist/harness/run/run-scope.d.ts +31 -0
- package/dist/harness/run/runner.d.ts +132 -2
- package/dist/harness/run/runner.js +679 -60
- package/dist/harness/session/attachments/llm-intent.js +2 -1
- package/dist/harness/session/history/port.js +15 -5
- package/dist/harness/session/in-memory-store.d.ts +5 -0
- package/dist/harness/session/in-memory-store.js +33 -2
- package/dist/harness/session/tasks/render.d.ts +4 -1
- package/dist/harness/session/tasks/render.js +10 -7
- package/dist/harness/session/title.js +25 -9
- package/dist/harness/shared/events/agent-event-map.d.ts +92 -0
- package/dist/harness/shared/events/agent-event-map.js +7 -0
- package/dist/index.d.ts +6 -4
- package/dist/index.js +4 -3
- package/dist/integration/agent-runtime/channel-message-source.js +19 -1
- package/dist/integration/index.d.ts +2 -0
- package/dist/integration/index.js +1 -0
- package/dist/integration/observability/loop-watchdog.d.ts +56 -0
- package/dist/integration/observability/loop-watchdog.js +177 -0
- package/dist/integration/observability/metrics.d.ts +3 -0
- package/dist/integration/observability/metrics.js +18 -7
- package/dist/integration/observability/run-telemetry.d.ts +8 -0
- package/dist/integration/observability/run-telemetry.js +31 -8
- package/dist/integration/observability/trace-collector.js +26 -4
- package/dist/integration/observability/trace-events.d.ts +1 -0
- package/dist/integration/observability/trace-events.js +2 -0
- package/dist/integration/observability/trace-logger.js +27 -17
- package/dist/integration/providers/anthropic.d.ts +23 -0
- package/dist/integration/providers/anthropic.js +97 -12
- package/dist/integration/providers/fetch-timeout.d.ts +42 -0
- package/dist/integration/providers/fetch-timeout.js +51 -0
- package/dist/integration/providers/openai.d.ts +10 -0
- package/dist/integration/providers/openai.js +58 -11
- package/dist/integration/providers/provider-diagnostics.d.ts +80 -0
- package/dist/integration/providers/provider-diagnostics.js +89 -0
- package/dist/integration/providers/timeout-coherence.d.ts +52 -0
- package/dist/integration/providers/timeout-coherence.js +68 -0
- package/dist/integration/providers/wire-dump.d.ts +62 -0
- package/dist/integration/providers/wire-dump.js +111 -2
- package/dist/integration/storage/jsonl.d.ts +19 -1
- package/dist/integration/storage/jsonl.js +100 -4
- package/dist/paths.d.ts +19 -0
- package/dist/paths.js +38 -1
- package/dist/subsystems/cognition-steward/conceptualize/handler.js +1 -1
- package/dist/subsystems/memory-steward/backfill/handler.js +1 -1
- package/dist/subsystems/safety-guard/config.yaml +3 -1
- package/dist/subsystems/wisdom-steward/formation/handler.js +1 -1
- package/package.json +3 -2
|
@@ -11,10 +11,10 @@
|
|
|
11
11
|
* 可选 `index`:可重建检索投影(失败不阻断权威写)。禁止把 index 当权威。
|
|
12
12
|
* `sessions.json` parse 失败会拒绝写回,避免清空 meta。
|
|
13
13
|
*/
|
|
14
|
-
import { access, mkdir, readFile, writeFile, unlink, rename } from 'node:fs/promises';
|
|
14
|
+
import { access, mkdir, readFile, writeFile, unlink, rename, appendFile, stat } from 'node:fs/promises';
|
|
15
15
|
import { join } from 'node:path';
|
|
16
16
|
import { toSessionFileName } from '@octopi-agent/core/session-filename.js';
|
|
17
|
-
import { sessionMatchesAgent } from '@octopi-agent/core/types/session.js';
|
|
17
|
+
import { readTitleState, sessionMatchesAgent } from '@octopi-agent/core/types/session.js';
|
|
18
18
|
async function fileExists(path) {
|
|
19
19
|
try {
|
|
20
20
|
await access(path);
|
|
@@ -28,6 +28,22 @@ async function fileExists(path) {
|
|
|
28
28
|
function readPinnedAt(value) {
|
|
29
29
|
return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
|
|
30
30
|
}
|
|
31
|
+
/** 已同步序列上限(LRU):缓存只服务于增量判定,不得把全会话转录常驻钉在堆里 */
|
|
32
|
+
const MAX_SYNC_CACHES = 64;
|
|
33
|
+
/**
|
|
34
|
+
* 已同步序列是否为给定序列的引用相等前缀。
|
|
35
|
+
* 调用方契约:已同步消息不再原地修改(原地修改 = 视为新序列,须由调用方
|
|
36
|
+
* 保证不发生在首同步之前,如 turn_start 定形)。
|
|
37
|
+
*/
|
|
38
|
+
function isRefPrefix(synced, incoming) {
|
|
39
|
+
if (incoming.length < synced.length)
|
|
40
|
+
return false;
|
|
41
|
+
for (let i = 0; i < synced.length; i++) {
|
|
42
|
+
if (synced[i] !== incoming[i])
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
31
47
|
/**
|
|
32
48
|
* 历史 state.json 的 turns[].input(全量历史快照)已废弃:读取即剥,
|
|
33
49
|
* 下次 save 自然瘦身。输入正文的唯一权威是 messages JSONL(Discourse)。
|
|
@@ -48,8 +64,25 @@ function slimTurns(turns) {
|
|
|
48
64
|
export class JsonlSessionStore {
|
|
49
65
|
sessionsDir;
|
|
50
66
|
index;
|
|
51
|
-
/** 同 sessionId 读改写串行(save / updateMetadata / delete) */
|
|
67
|
+
/** 同 sessionId 读改写串行(save / updateMetadata / syncMessages / delete) */
|
|
52
68
|
writeQueues = new Map();
|
|
69
|
+
/**
|
|
70
|
+
* syncMessages 增量判定缓存:本实例最近一次写下的消息文件状态。
|
|
71
|
+
* size(字节数)抓「旁路整包 save / 外部改动」造成的文件漂移;refs(消息对象
|
|
72
|
+
* 引用序列)抓「同一实例的序列分歧」。任一不符即整文件对齐重写,自愈。
|
|
73
|
+
* LRU 上限防长驻进程把全量转录引用常驻堆内存。
|
|
74
|
+
*/
|
|
75
|
+
syncCaches = new Map();
|
|
76
|
+
/** 记录/刷新增量判定缓存(LRU:超限淘汰最旧条目) */
|
|
77
|
+
noteSyncCache(sessionId, size, refs) {
|
|
78
|
+
this.syncCaches.delete(sessionId);
|
|
79
|
+
if (this.syncCaches.size >= MAX_SYNC_CACHES) {
|
|
80
|
+
const oldest = this.syncCaches.keys().next().value;
|
|
81
|
+
if (oldest !== undefined)
|
|
82
|
+
this.syncCaches.delete(oldest);
|
|
83
|
+
}
|
|
84
|
+
this.syncCaches.set(sessionId, { size, refs });
|
|
85
|
+
}
|
|
53
86
|
/**
|
|
54
87
|
* @param options - sessionsDir + 可选 index
|
|
55
88
|
*/
|
|
@@ -120,6 +153,9 @@ export class JsonlSessionStore {
|
|
|
120
153
|
// 置顶是用户数据:权威在 metadata.pinnedAt(受 save 浅合并保护,
|
|
121
154
|
// 长驻 run 对象的整包 save 抹不掉);meta.pinnedAt 仅作旧数据回退
|
|
122
155
|
pinnedAt: readPinnedAt(data.metadata?.pinnedAt) ?? readPinnedAt(data.meta.pinnedAt),
|
|
156
|
+
// 标题是用户数据:权威在 metadata 三键(同 pinnedAt 通道,save 按 titleUpdatedAt 仲裁);
|
|
157
|
+
// 投影必须覆盖 ...data.meta 展开带出的陈旧 meta.title,不做旧数据回退
|
|
158
|
+
...readTitleState(data.metadata),
|
|
123
159
|
};
|
|
124
160
|
}
|
|
125
161
|
async readSession(sessionId, resolved) {
|
|
@@ -231,6 +267,8 @@ export class JsonlSessionStore {
|
|
|
231
267
|
// 不会出现索引有但数据没写完的不一致
|
|
232
268
|
const jsonl = data.messages.map(msg => JSON.stringify(msg)).join('\n') + '\n';
|
|
233
269
|
await writeFile(this.sessionFile(sessionId), jsonl);
|
|
270
|
+
// 全量重写后同步增量缓存(防止下一次 syncMessages 误判漂移)
|
|
271
|
+
this.noteSyncCache(sessionId, Buffer.byteLength(jsonl, 'utf-8'), data.messages.slice());
|
|
234
272
|
// metadata 浅合并:长驻 run 对象上的陈旧/空 metadata 不得抹掉
|
|
235
273
|
// 并发 updateMetadata 写入的键(clientToolCalls / fileReleases…)。
|
|
236
274
|
// 删键必须走 updateMetadata。
|
|
@@ -239,6 +277,18 @@ export class JsonlSessionStore {
|
|
|
239
277
|
...(prevState?.metadata ?? {}),
|
|
240
278
|
...(data.metadata ?? {}),
|
|
241
279
|
};
|
|
280
|
+
// 标题三键按 titleUpdatedAt 仲裁:浅合并只护「缺键」,不护「旧值」——
|
|
281
|
+
// 长驻 run 对象上 run 开始时的旧 trio 不得回滚运行期间 rename/标题生成写入的新 trio。
|
|
282
|
+
// incoming 缺时间戳视为陈旧(写端恒打三键;缺戳 = 半写/外来写),同样归磁盘胜
|
|
283
|
+
const fresh = readTitleState(prevState?.metadata);
|
|
284
|
+
const incomingTitle = readTitleState(data.metadata);
|
|
285
|
+
if (fresh.titleUpdatedAt !== undefined &&
|
|
286
|
+
(incomingTitle.titleUpdatedAt === undefined ||
|
|
287
|
+
incomingTitle.titleUpdatedAt < fresh.titleUpdatedAt)) {
|
|
288
|
+
metadata.title = fresh.title;
|
|
289
|
+
metadata.titleSource = fresh.titleSource;
|
|
290
|
+
metadata.titleUpdatedAt = fresh.titleUpdatedAt;
|
|
291
|
+
}
|
|
242
292
|
await writeFile(this.sessionStateFile(sessionId), JSON.stringify({
|
|
243
293
|
agentId: data.agentId,
|
|
244
294
|
primaryAgentId: data.primaryAgentId ?? data.agentId,
|
|
@@ -289,11 +339,14 @@ export class JsonlSessionStore {
|
|
|
289
339
|
await mkdir(this.sessionsDir, { recursive: true });
|
|
290
340
|
await writeFile(this.sessionStateFile(sessionId), JSON.stringify({
|
|
291
341
|
agentId: prev?.agentId,
|
|
292
|
-
|
|
342
|
+
// 字段集必须与 save() 的 state 重写保持一致:漏写即静默清字段
|
|
343
|
+
//(contextDetachIndex 曾被漏掉——updateMetadata 后租约截断点归零,续跑全量灌窗)
|
|
344
|
+
primaryAgentId: prev?.primaryAgentId ?? prev?.agentId,
|
|
293
345
|
preferredAgentId: prev?.preferredAgentId,
|
|
294
346
|
switchAudit: prev?.switchAudit ?? [],
|
|
295
347
|
spawnBy: prev?.spawnBy,
|
|
296
348
|
participants: prev?.participants ?? [],
|
|
349
|
+
contextDetachIndex: prev?.contextDetachIndex,
|
|
297
350
|
contextCompact: prev?.contextCompact,
|
|
298
351
|
contextCompacts: prev?.contextCompacts,
|
|
299
352
|
lifecycle: prev?.lifecycle,
|
|
@@ -309,6 +362,8 @@ export class JsonlSessionStore {
|
|
|
309
362
|
...entry,
|
|
310
363
|
// pinnedAt 投影与 buildIndexEntry 同规则(置顶/取消即时可见于 list)
|
|
311
364
|
pinnedAt: readPinnedAt(metadata.pinnedAt),
|
|
365
|
+
// 标题投影同规则(rename / 自动标题即时可见于 list)
|
|
366
|
+
...readTitleState(metadata),
|
|
312
367
|
updatedAt: Date.now(),
|
|
313
368
|
};
|
|
314
369
|
await this.writeMetaIndex(index);
|
|
@@ -319,6 +374,46 @@ export class JsonlSessionStore {
|
|
|
319
374
|
}
|
|
320
375
|
});
|
|
321
376
|
}
|
|
377
|
+
/**
|
|
378
|
+
* 消息序列对齐(Run 进行中转录增量落盘)。契约见 SessionStore.syncMessages。
|
|
379
|
+
*
|
|
380
|
+
* 增量判定:文件字节数与上次本实例写入一致,且给定序列以已同步序列为
|
|
381
|
+
* 引用相等前缀 → 只追加尾差;任一不成立(旁路整包 save / 外部改动 /
|
|
382
|
+
* 前缀分歧 / 冷缓存)→ 整文件对齐重写。漂移不是错误路径:旁路写者
|
|
383
|
+
* 整包 save 是常态动作,对齐即自愈。
|
|
384
|
+
*/
|
|
385
|
+
async syncMessages(sessionId, messages) {
|
|
386
|
+
return this.withWriteLock(sessionId, async () => {
|
|
387
|
+
await mkdir(this.sessionsDir, { recursive: true });
|
|
388
|
+
const path = this.sessionFile(sessionId);
|
|
389
|
+
const cache = this.syncCaches.get(sessionId);
|
|
390
|
+
let size = -1;
|
|
391
|
+
try {
|
|
392
|
+
size = (await stat(path)).size;
|
|
393
|
+
}
|
|
394
|
+
catch {
|
|
395
|
+
// 文件不存在 → 走整文件对齐
|
|
396
|
+
}
|
|
397
|
+
// 增量通道不是会话创建通道:会话完全不存在时跳过(创建/重建由 save 负责)
|
|
398
|
+
if (size < 0 && !(await fileExists(this.sessionStateFile(sessionId))))
|
|
399
|
+
return;
|
|
400
|
+
if (cache && size === cache.size && isRefPrefix(cache.refs, messages)) {
|
|
401
|
+
const added = messages.slice(cache.refs.length);
|
|
402
|
+
if (added.length === 0)
|
|
403
|
+
return;
|
|
404
|
+
const jsonl = added.map((m) => JSON.stringify(m)).join('\n') + '\n';
|
|
405
|
+
await appendFile(path, jsonl);
|
|
406
|
+
this.noteSyncCache(sessionId, size + Buffer.byteLength(jsonl, 'utf-8'), messages.slice());
|
|
407
|
+
return;
|
|
408
|
+
}
|
|
409
|
+
// 整文件对齐走 tmp+rename:读侧(浏览器刷新 load)不得撞见写半截的转录
|
|
410
|
+
const jsonl = messages.map((m) => JSON.stringify(m)).join('\n') + '\n';
|
|
411
|
+
const tmpPath = `${path}.${process.pid}.${Date.now()}.tmp`;
|
|
412
|
+
await writeFile(tmpPath, jsonl);
|
|
413
|
+
await rename(tmpPath, path);
|
|
414
|
+
this.noteSyncCache(sessionId, Buffer.byteLength(jsonl, 'utf-8'), messages.slice());
|
|
415
|
+
});
|
|
416
|
+
}
|
|
322
417
|
async list(filter) {
|
|
323
418
|
let entries = Object.values(await this.readMetaIndex());
|
|
324
419
|
if (filter?.agentId) {
|
|
@@ -338,6 +433,7 @@ export class JsonlSessionStore {
|
|
|
338
433
|
async delete(sessionId) {
|
|
339
434
|
return this.withWriteLock(sessionId, async () => {
|
|
340
435
|
await this.removeSessionFiles(sessionId);
|
|
436
|
+
this.syncCaches.delete(sessionId);
|
|
341
437
|
if (this.index) {
|
|
342
438
|
try {
|
|
343
439
|
await this.index.remove(sessionId);
|
package/dist/paths.d.ts
CHANGED
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 展开 `~` 前缀为用户主目录(Windows/Linux/macOS 通用)。
|
|
3
|
+
* 接受 `~`、`~/rest`、`~\rest`(Windows 形态,剩余分隔符归一为 `/` 后按平台 join);
|
|
4
|
+
* `~user/…` 等其他形态不展开(无跨平台语义)。已是绝对路径的原样返回(幂等)。
|
|
5
|
+
*
|
|
6
|
+
* @param p - 配置原文路径
|
|
7
|
+
* @returns 展开后的路径
|
|
8
|
+
*/
|
|
9
|
+
export declare function expandHomePath(p: string): string;
|
|
10
|
+
/**
|
|
11
|
+
* 配置路径合法形态:绝对路径,或 `~` / `~/…` / `~\…`。
|
|
12
|
+
* win32 上「绝对」要求盘符(`C:\`/`C:/`)或 UNC(`\\server\share`)——
|
|
13
|
+
* `\foo` 这类盘符相对路径会按当前盘隐式解析,属于要消灭的隐式行为。
|
|
14
|
+
* 相对路径直接拒绝:被 resolve 到进程 cwd 属于隐式行为,加载即报错。
|
|
15
|
+
*
|
|
16
|
+
* @param p - 配置原文路径
|
|
17
|
+
* @returns 形态合法与否
|
|
18
|
+
*/
|
|
19
|
+
export declare function isConfigPathShape(p: string): boolean;
|
|
1
20
|
/** 默认系统根目录 */
|
|
2
21
|
export declare const DEFAULT_OCTOPI_HOME: string;
|
|
3
22
|
/** 环境变量名 */
|
package/dist/paths.js
CHANGED
|
@@ -1,9 +1,46 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Runtime home path helpers (OCTOPI_HOME).
|
|
3
3
|
* Shared by gateway / suite so neither depends on the other for path resolution.
|
|
4
|
+
*
|
|
5
|
+
* This module must stay zod-free: harness runtime code imports it for path
|
|
6
|
+
* semantics without pulling in the config-schema layer.
|
|
4
7
|
*/
|
|
5
|
-
import { join, resolve } from 'node:path';
|
|
8
|
+
import { isAbsolute, join, resolve } from 'node:path';
|
|
6
9
|
import { homedir } from 'node:os';
|
|
10
|
+
/**
|
|
11
|
+
* 展开 `~` 前缀为用户主目录(Windows/Linux/macOS 通用)。
|
|
12
|
+
* 接受 `~`、`~/rest`、`~\rest`(Windows 形态,剩余分隔符归一为 `/` 后按平台 join);
|
|
13
|
+
* `~user/…` 等其他形态不展开(无跨平台语义)。已是绝对路径的原样返回(幂等)。
|
|
14
|
+
*
|
|
15
|
+
* @param p - 配置原文路径
|
|
16
|
+
* @returns 展开后的路径
|
|
17
|
+
*/
|
|
18
|
+
export function expandHomePath(p) {
|
|
19
|
+
if (p === '~')
|
|
20
|
+
return homedir();
|
|
21
|
+
if (p.startsWith('~/') || p.startsWith('~\\')) {
|
|
22
|
+
// `~\a\b` 多段:把剩余的 `\` 归一为 `/`,避免 POSIX 上把 `\` 当文件名字符
|
|
23
|
+
return join(homedir(), p.slice(2).replace(/\\/g, '/'));
|
|
24
|
+
}
|
|
25
|
+
return p;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* 配置路径合法形态:绝对路径,或 `~` / `~/…` / `~\…`。
|
|
29
|
+
* win32 上「绝对」要求盘符(`C:\`/`C:/`)或 UNC(`\\server\share`)——
|
|
30
|
+
* `\foo` 这类盘符相对路径会按当前盘隐式解析,属于要消灭的隐式行为。
|
|
31
|
+
* 相对路径直接拒绝:被 resolve 到进程 cwd 属于隐式行为,加载即报错。
|
|
32
|
+
*
|
|
33
|
+
* @param p - 配置原文路径
|
|
34
|
+
* @returns 形态合法与否
|
|
35
|
+
*/
|
|
36
|
+
export function isConfigPathShape(p) {
|
|
37
|
+
if (p === '~' || p.startsWith('~/') || p.startsWith('~\\'))
|
|
38
|
+
return true;
|
|
39
|
+
if (process.platform === 'win32') {
|
|
40
|
+
return /^[A-Za-z]:[\\/]/.test(p) || p.startsWith('\\\\');
|
|
41
|
+
}
|
|
42
|
+
return isAbsolute(p);
|
|
43
|
+
}
|
|
7
44
|
/** 默认系统根目录 */
|
|
8
45
|
export const DEFAULT_OCTOPI_HOME = join(homedir(), '.octopi');
|
|
9
46
|
/** 环境变量名 */
|
|
@@ -71,7 +71,7 @@ async function handler(input, deps) {
|
|
|
71
71
|
const res = await llmPort.chat({
|
|
72
72
|
systemPrompt: systemPrompt || undefined,
|
|
73
73
|
messages: [{ role: 'user', content: userText }],
|
|
74
|
-
|
|
74
|
+
// 温度留空:由模型配置(ModelInfo.temperature)或服务端默认决定
|
|
75
75
|
maxTokens: 2048,
|
|
76
76
|
});
|
|
77
77
|
if (res.finishReason === 'error') {
|
|
@@ -256,7 +256,7 @@ async function handler(input, deps) {
|
|
|
256
256
|
role: 'user',
|
|
257
257
|
content: `## Session evidence (session=${sessionId})\n${sessionText}\n\nExtract long-term memory propositions. Output strict JSON array only.`,
|
|
258
258
|
}],
|
|
259
|
-
|
|
259
|
+
// 温度留空:由模型配置(ModelInfo.temperature)或服务端默认决定
|
|
260
260
|
maxTokens: 2048,
|
|
261
261
|
});
|
|
262
262
|
if (res.finishReason === 'error') {
|
|
@@ -160,7 +160,7 @@ async function handler(_input, deps) {
|
|
|
160
160
|
const res = await llmPort.chat({
|
|
161
161
|
systemPrompt: systemPrompt || undefined,
|
|
162
162
|
messages: [{ role: 'user', content: `${pack.text}${conceptHint}` }],
|
|
163
|
-
|
|
163
|
+
// 温度留空:由模型配置(ModelInfo.temperature)或服务端默认决定
|
|
164
164
|
maxTokens: 2048,
|
|
165
165
|
});
|
|
166
166
|
if (res.finishReason === 'error') {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@octopi-agent/engine",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.97.15",
|
|
4
4
|
"description": "Octopi Engine — Harness product domains, library integrations, and embeddable Agent.run()",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -80,8 +80,9 @@
|
|
|
80
80
|
},
|
|
81
81
|
"dependencies": {
|
|
82
82
|
"@modelcontextprotocol/sdk": "^1.29.0",
|
|
83
|
-
"@octopi-agent/core": "0.
|
|
83
|
+
"@octopi-agent/core": "0.97.15",
|
|
84
84
|
"js-yaml": "^4.3.2",
|
|
85
|
+
"undici": "^8.12.3",
|
|
85
86
|
"zod": "^4.4.3"
|
|
86
87
|
},
|
|
87
88
|
"optionalDependencies": {
|