neoctl 0.2.35 → 0.2.37
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/agents/agent-report-security.test.d.ts +1 -0
- package/dist/agents/agent-report-security.test.js +301 -0
- package/dist/agents/agent-report-security.test.js.map +1 -0
- package/dist/agents/agent-tool-persistence.test.d.ts +1 -0
- package/dist/agents/agent-tool-persistence.test.js +319 -0
- package/dist/agents/agent-tool-persistence.test.js.map +1 -0
- package/dist/agents/agent-tool.d.ts +3 -0
- package/dist/agents/agent-tool.js +246 -76
- package/dist/agents/agent-tool.js.map +1 -1
- package/dist/agents/live-preview-redaction-security.test.d.ts +1 -0
- package/dist/agents/live-preview-redaction-security.test.js +286 -0
- package/dist/agents/live-preview-redaction-security.test.js.map +1 -0
- package/dist/agents/local-agent-task.d.ts +68 -1
- package/dist/agents/local-agent-task.js +78 -5
- package/dist/agents/local-agent-task.js.map +1 -1
- package/dist/agents/no-nested-delegation.test.d.ts +1 -0
- package/dist/agents/no-nested-delegation.test.js +38 -0
- package/dist/agents/no-nested-delegation.test.js.map +1 -0
- package/dist/agents/obs07-11-run-facts.test.d.ts +1 -0
- package/dist/agents/obs07-11-run-facts.test.js +459 -0
- package/dist/agents/obs07-11-run-facts.test.js.map +1 -0
- package/dist/agents/smoke-agent-lifecycle.d.ts +1 -0
- package/dist/agents/smoke-agent-lifecycle.js +192 -0
- package/dist/agents/smoke-agent-lifecycle.js.map +1 -0
- package/dist/agents/smoke-agents.js +7 -3
- package/dist/agents/smoke-agents.js.map +1 -1
- package/dist/context/context-manager.d.ts +1 -0
- package/dist/context/context-manager.js +10 -6
- package/dist/context/context-manager.js.map +1 -1
- package/dist/context/smoke-context.js +46 -3
- package/dist/context/smoke-context.js.map +1 -1
- package/dist/core/image-registry.js +1 -1
- package/dist/core/image-registry.js.map +1 -1
- package/dist/core/obs04-visible-data.test.d.ts +1 -0
- package/dist/core/obs04-visible-data.test.js +147 -0
- package/dist/core/obs04-visible-data.test.js.map +1 -0
- package/dist/core/query-engine.d.ts +5 -0
- package/dist/core/query-engine.js +36 -3
- package/dist/core/query-engine.js.map +1 -1
- package/dist/core/query.d.ts +5 -1
- package/dist/core/query.js +120 -18
- package/dist/core/query.js.map +1 -1
- package/dist/core/run-agent-pause.test.d.ts +1 -0
- package/dist/core/run-agent-pause.test.js +52 -0
- package/dist/core/run-agent-pause.test.js.map +1 -0
- package/dist/core/run-agent-persistence.test.d.ts +1 -0
- package/dist/core/run-agent-persistence.test.js +222 -0
- package/dist/core/run-agent-persistence.test.js.map +1 -0
- package/dist/core/run-agent.d.ts +13 -0
- package/dist/core/run-agent.js +72 -17
- package/dist/core/run-agent.js.map +1 -1
- package/dist/core/smoke-core-loop.js +8 -7
- package/dist/core/smoke-core-loop.js.map +1 -1
- package/dist/model/model-gateway.d.ts +1 -0
- package/dist/model/openai-native-image-guard.test.d.ts +1 -0
- package/dist/model/openai-native-image-guard.test.js +101 -0
- package/dist/model/openai-native-image-guard.test.js.map +1 -0
- package/dist/model/openai-responses-mapper.js +91 -16
- package/dist/model/openai-responses-mapper.js.map +1 -1
- package/dist/plugins/smoke-plugin-system.js +14 -14
- package/dist/repl/index.js +22 -28
- package/dist/repl/index.js.map +1 -1
- package/dist/secrets/secret-redaction.d.ts +6 -5
- package/dist/secrets/secret-redaction.js +7 -79
- package/dist/secrets/secret-redaction.js.map +1 -1
- package/dist/secrets/secret-types.d.ts +4 -1
- package/dist/secrets/secret-types.js.map +1 -1
- package/dist/session/session-store-safety.test.d.ts +1 -0
- package/dist/session/session-store-safety.test.js +107 -0
- package/dist/session/session-store-safety.test.js.map +1 -0
- package/dist/session/session-store.d.ts +5 -1
- package/dist/session/session-store.js +69 -7
- package/dist/session/session-store.js.map +1 -1
- package/dist/session/tool-result-memory.d.ts +3 -1
- package/dist/session/tool-result-memory.js.map +1 -1
- package/dist/tasks/subagent-tools.d.ts +4 -1
- package/dist/tasks/subagent-tools.js +85 -24
- package/dist/tasks/subagent-tools.js.map +1 -1
- package/dist/tasks/subagent-tools.test.d.ts +1 -0
- package/dist/tasks/subagent-tools.test.js +159 -0
- package/dist/tasks/subagent-tools.test.js.map +1 -0
- package/dist/tasks/task-ack-size.test.d.ts +1 -0
- package/dist/tasks/task-ack-size.test.js +101 -0
- package/dist/tasks/task-ack-size.test.js.map +1 -0
- package/dist/tasks/task-persistence.d.ts +23 -0
- package/dist/tasks/task-persistence.js +216 -0
- package/dist/tasks/task-persistence.js.map +1 -0
- package/dist/tasks/task-persistence.test.d.ts +1 -0
- package/dist/tasks/task-persistence.test.js +331 -0
- package/dist/tasks/task-persistence.test.js.map +1 -0
- package/dist/tasks/task-store.d.ts +51 -7
- package/dist/tasks/task-store.js +333 -31
- package/dist/tasks/task-store.js.map +1 -1
- package/dist/tools/builtins/exec-process-manager.d.ts +97 -2
- package/dist/tools/builtins/exec-process-manager.js +218 -19
- package/dist/tools/builtins/exec-process-manager.js.map +1 -1
- package/dist/tools/builtins/exec-tool.js +14 -1
- package/dist/tools/builtins/exec-tool.js.map +1 -1
- package/dist/tools/builtins/image-generation-tool.js +24 -24
- package/dist/tools/builtins/image-generation-tool.js.map +1 -1
- package/dist/tools/smoke-exec-process.js +2 -1
- package/dist/tools/smoke-exec-process.js.map +1 -1
- package/dist/tools/smoke-terminal-output-chain.d.ts +1 -0
- package/dist/tools/smoke-terminal-output-chain.js +245 -0
- package/dist/tools/smoke-terminal-output-chain.js.map +1 -0
- package/dist/tools/smoke-tool-system.js +6 -6
- package/dist/tools/smoke-tool-system.js.map +1 -1
- package/dist/tools/terminal-output-persistence.test.d.ts +1 -0
- package/dist/tools/terminal-output-persistence.test.js +50 -0
- package/dist/tools/terminal-output-persistence.test.js.map +1 -0
- package/dist/tools/terminal-output-store.d.ts +150 -0
- package/dist/tools/terminal-output-store.js +562 -0
- package/dist/tools/terminal-output-store.js.map +1 -0
- package/dist/tools/terminal-output-store.test.d.ts +1 -0
- package/dist/tools/terminal-output-store.test.js +364 -0
- package/dist/tools/terminal-output-store.test.js.map +1 -0
- package/dist/tools/tool.d.ts +5 -0
- package/dist/tools/tool.js.map +1 -1
- package/dist/types/events.d.ts +1 -0
- package/dist/types/messages.d.ts +1 -0
- package/dist/web/agent-content-detail.d.ts +78 -0
- package/dist/web/agent-content-detail.js +495 -0
- package/dist/web/agent-content-detail.js.map +1 -0
- package/dist/web/agent-content-detail.test.d.ts +1 -0
- package/dist/web/agent-content-detail.test.js +307 -0
- package/dist/web/agent-content-detail.test.js.map +1 -0
- package/dist/web/agent-parent-messages.test.d.ts +1 -0
- package/dist/web/agent-parent-messages.test.js +58 -0
- package/dist/web/agent-parent-messages.test.js.map +1 -0
- package/dist/web/agent-tool-payload-security.test.d.ts +1 -0
- package/dist/web/agent-tool-payload-security.test.js +120 -0
- package/dist/web/agent-tool-payload-security.test.js.map +1 -0
- package/dist/web/index.d.ts +213 -9
- package/dist/web/index.js +260 -108
- package/dist/web/index.js.map +1 -1
- package/dist/web/smoke-agent-content-http.d.ts +1 -0
- package/dist/web/smoke-agent-content-http.js +446 -0
- package/dist/web/smoke-agent-content-http.js.map +1 -0
- package/dist/web/smoke-status-semantics.d.ts +1 -0
- package/dist/web/smoke-status-semantics.js +90 -0
- package/dist/web/smoke-status-semantics.js.map +1 -0
- package/dist/web/smoke-task-session-entrypoints.d.ts +1 -0
- package/dist/web/smoke-task-session-entrypoints.js +96 -0
- package/dist/web/smoke-task-session-entrypoints.js.map +1 -0
- package/dist/web/smoke-terminal-output-http.d.ts +1 -0
- package/dist/web/smoke-terminal-output-http.js +372 -0
- package/dist/web/smoke-terminal-output-http.js.map +1 -0
- package/dist/web/smoke-tool-call-detail.d.ts +1 -0
- package/dist/web/smoke-tool-call-detail.js +106 -0
- package/dist/web/smoke-tool-call-detail.js.map +1 -0
- package/dist/web/smoke-tool-call-http.d.ts +1 -0
- package/dist/web/smoke-tool-call-http.js +100 -0
- package/dist/web/smoke-tool-call-http.js.map +1 -0
- package/dist/web/smoke-tool-detail-fields-http.d.ts +1 -0
- package/dist/web/smoke-tool-detail-fields-http.js +121 -0
- package/dist/web/smoke-tool-detail-fields-http.js.map +1 -0
- package/dist/web/smoke-web-agent-tasks.d.ts +1 -0
- package/dist/web/smoke-web-agent-tasks.js +50 -0
- package/dist/web/smoke-web-agent-tasks.js.map +1 -0
- package/dist/web/smoke-web-terminal-tasks.js +126 -76
- package/dist/web/smoke-web-terminal-tasks.js.map +1 -1
- package/dist/web/status-semantics.d.ts +11 -0
- package/dist/web/status-semantics.js +59 -0
- package/dist/web/status-semantics.js.map +1 -0
- package/dist/web/terminal-presentation.d.ts +15 -0
- package/dist/web/terminal-presentation.js +61 -0
- package/dist/web/terminal-presentation.js.map +1 -0
- package/dist/web/terminal-presentation.test.d.ts +1 -0
- package/dist/web/terminal-presentation.test.js +33 -0
- package/dist/web/terminal-presentation.test.js.map +1 -0
- package/dist/web/tool-call-detail.d.ts +40 -0
- package/dist/web/tool-call-detail.js +167 -0
- package/dist/web/tool-call-detail.js.map +1 -0
- package/dist/web/tool-detail-fields.d.ts +59 -0
- package/dist/web/tool-detail-fields.js +119 -0
- package/dist/web/tool-detail-fields.js.map +1 -0
- package/dist/web/tool-detail-fields.test.d.ts +1 -0
- package/dist/web/tool-detail-fields.test.js +121 -0
- package/dist/web/tool-detail-fields.test.js.map +1 -0
- package/package.json +90 -90
|
@@ -0,0 +1,331 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { mkdtempSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync, symlinkSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { test } from "node:test";
|
|
6
|
+
import { createLocalAgentTask } from "../agents/local-agent-task.js";
|
|
7
|
+
import { createTextMessage } from "../types/messages.js";
|
|
8
|
+
import { TaskStore } from "./task-store.js";
|
|
9
|
+
import { persistTask } from "./task-persistence.js";
|
|
10
|
+
function fixture() {
|
|
11
|
+
const root = mkdtempSync(join(tmpdir(), "neo-task-persistence-"));
|
|
12
|
+
const a = join(root, "a");
|
|
13
|
+
const b = join(root, "b");
|
|
14
|
+
mkdirSync(a);
|
|
15
|
+
mkdirSync(b);
|
|
16
|
+
const task = (id = "one") => createLocalAgentTask({ taskId: `task_${id}`, agentId: `agent_${id}`, description: "test", prompt: "private body", outputFile: join(root, `${id}.txt`), abortController: new AbortController() });
|
|
17
|
+
return { root, a, b, task, dispose: () => rmSync(root, { recursive: true, force: true }) };
|
|
18
|
+
}
|
|
19
|
+
test("new TaskStore restores terminal result/history, pending inbox, aliases and whitelist only", () => {
|
|
20
|
+
const f = fixture();
|
|
21
|
+
try {
|
|
22
|
+
const store = new TaskStore();
|
|
23
|
+
store.bindSession(f.a);
|
|
24
|
+
const task = f.task();
|
|
25
|
+
task.executionOptions = { cwd: f.root, model: "test-model", query: { maxTurns: 9 } };
|
|
26
|
+
Object.assign(task.executionOptions, { apiKey: "SECRET_RUNTIME", runtime: { token: "SECRET_RUNTIME" } });
|
|
27
|
+
Object.assign(task, { runtime: { credentials: "SECRET_RUNTIME" } });
|
|
28
|
+
store.upsert(task);
|
|
29
|
+
store.registerName("worker", task.agentId);
|
|
30
|
+
store.complete(task.id, { agent_id: task.agentId, agent_type: "general", content: "saved result", total_duration_ms: 5, total_tool_use_count: 1 });
|
|
31
|
+
store.prepareResume(task.id, new AbortController());
|
|
32
|
+
store.queueMessage("worker", "pending followup");
|
|
33
|
+
const path = join(f.a, "subagents", task.agentId, "task.json");
|
|
34
|
+
const disk = readFileSync(path, "utf8");
|
|
35
|
+
assert.ok(!disk.includes("SECRET_RUNTIME"));
|
|
36
|
+
const raw = JSON.parse(disk);
|
|
37
|
+
for (const key of ["abortController", "runtime", "ownerSessionDir", "outputFile"])
|
|
38
|
+
assert.ok(!(key in raw));
|
|
39
|
+
const fresh = new TaskStore();
|
|
40
|
+
const summary = fresh.loadSession(f.a);
|
|
41
|
+
assert.deepEqual(summary, { loaded: 1, interrupted: 1, errors: [] });
|
|
42
|
+
const restored = fresh.getActive(task.id);
|
|
43
|
+
assert.notEqual(restored, task);
|
|
44
|
+
assert.equal(restored.status, "killed");
|
|
45
|
+
assert.match(restored.error, /Interrupted/);
|
|
46
|
+
assert.equal(restored.abortController, undefined);
|
|
47
|
+
assert.equal(restored.runGeneration, 2);
|
|
48
|
+
assert.equal(restored.runHistory?.[0]?.result?.content, "saved result");
|
|
49
|
+
assert.equal(restored.pendingMessages[0]?.blocks[0]?.type, "text");
|
|
50
|
+
assert.equal(restored.messageReceipts?.[0]?.status, "queued");
|
|
51
|
+
assert.equal(fresh.resolveAgentName("worker"), task.agentId);
|
|
52
|
+
assert.deepEqual(JSON.parse(JSON.stringify(restored.executionOptions)), { cwd: f.root, model: "test-model", query: { maxTurns: 9 } });
|
|
53
|
+
assert.equal(JSON.parse(readFileSync(path, "utf8")).status, "killed");
|
|
54
|
+
}
|
|
55
|
+
finally {
|
|
56
|
+
f.dispose();
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
test("switching active sessions neither leaks nor kills in-process tasks", () => {
|
|
60
|
+
const f = fixture();
|
|
61
|
+
try {
|
|
62
|
+
const store = new TaskStore();
|
|
63
|
+
store.bindSession(f.a);
|
|
64
|
+
const a = f.task("a");
|
|
65
|
+
store.upsert(a);
|
|
66
|
+
store.registerName("worker", a.agentId);
|
|
67
|
+
store.markRunning(a.id);
|
|
68
|
+
store.bindSession(f.b);
|
|
69
|
+
assert.deepEqual(store.list(), []);
|
|
70
|
+
assert.equal(store.getActive(a.id), undefined);
|
|
71
|
+
assert.equal(store.resolveAgentName("worker"), undefined);
|
|
72
|
+
assert.equal(a.status, "running");
|
|
73
|
+
assert.equal(a.abortController?.signal.aborted, false);
|
|
74
|
+
const b = f.task("b");
|
|
75
|
+
store.upsert(b);
|
|
76
|
+
store.registerName("worker", b.agentId);
|
|
77
|
+
store.fail(a.id, "background finished"); // owner A despite active B
|
|
78
|
+
assert.deepEqual(store.collectUnnotifiedCompletions(), []);
|
|
79
|
+
assert.equal(JSON.parse(readFileSync(join(f.a, "subagents", a.agentId, "task.json"), "utf8")).status, "failed");
|
|
80
|
+
assert.equal(store.resolveAgentName("worker"), b.agentId);
|
|
81
|
+
store.bindSession(f.a);
|
|
82
|
+
assert.equal(store.getActive(a.id), a);
|
|
83
|
+
assert.equal(store.resolveAgentName("worker"), a.agentId);
|
|
84
|
+
assert.equal(store.list().length, 1);
|
|
85
|
+
assert.equal(store.get(b.id), b);
|
|
86
|
+
const fresh = new TaskStore();
|
|
87
|
+
fresh.loadSession(f.b);
|
|
88
|
+
assert.deepEqual(fresh.list().map((t) => t.id), [b.id]);
|
|
89
|
+
store.bindSession();
|
|
90
|
+
assert.deepEqual(store.list(), []);
|
|
91
|
+
const legacy = f.task("legacy");
|
|
92
|
+
store.upsert(legacy);
|
|
93
|
+
assert.equal(store.getActive(legacy.id), legacy);
|
|
94
|
+
}
|
|
95
|
+
finally {
|
|
96
|
+
f.dispose();
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
test("atomic replacements preserve last good snapshot on failure; partial/corrupt/invalid siblings are isolated", () => {
|
|
100
|
+
const f = fixture();
|
|
101
|
+
try {
|
|
102
|
+
const store = new TaskStore();
|
|
103
|
+
store.bindSession(f.a);
|
|
104
|
+
const task = f.task();
|
|
105
|
+
store.upsert(task);
|
|
106
|
+
const dir = join(f.a, "subagents", task.agentId);
|
|
107
|
+
const path = join(dir, "task.json");
|
|
108
|
+
const original = readFileSync(path, "utf8");
|
|
109
|
+
task.messages.push(createTextMessage("user", "update"));
|
|
110
|
+
store.upsert(task);
|
|
111
|
+
assert.notEqual(readFileSync(path, "utf8"), original);
|
|
112
|
+
assert.deepEqual(readdirSync(dir), ["task.json"]);
|
|
113
|
+
const good = readFileSync(path, "utf8");
|
|
114
|
+
const cyclic = {};
|
|
115
|
+
cyclic.self = cyclic;
|
|
116
|
+
task.messages.push({ ...createTextMessage("user", "bad"), blocks: [{ type: "tool_use", id: "x", name: "x", input: cyclic }] });
|
|
117
|
+
assert.throws(() => persistTask(task));
|
|
118
|
+
assert.equal(readFileSync(path, "utf8"), good);
|
|
119
|
+
writeFileSync(join(dir, ".task-crash.tmp"), "{truncated");
|
|
120
|
+
for (const [name, content] of [["agent_bad", "{private body"], ["agent_escape", JSON.stringify({ ...JSON.parse(good), id: "../escape", taskId: "../escape", agentId: "agent_escape" })]]) {
|
|
121
|
+
const bad = join(f.a, "subagents", name);
|
|
122
|
+
mkdirSync(bad);
|
|
123
|
+
writeFileSync(join(bad, "task.json"), content);
|
|
124
|
+
}
|
|
125
|
+
const fresh = new TaskStore();
|
|
126
|
+
const summary = fresh.loadSession(f.a);
|
|
127
|
+
assert.equal(summary.loaded, 1);
|
|
128
|
+
assert.equal(summary.errors.length, 2);
|
|
129
|
+
assert.ok(!summary.errors.join().includes("private body"));
|
|
130
|
+
assert.equal(fresh.list().length, 1);
|
|
131
|
+
const invalid = f.task("invalid");
|
|
132
|
+
invalid.agentId = "../escape";
|
|
133
|
+
invalid.ownerSessionDir = f.a;
|
|
134
|
+
assert.throws(() => persistTask(invalid), /identifier/);
|
|
135
|
+
}
|
|
136
|
+
finally {
|
|
137
|
+
f.dispose();
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
test("junction/symlink descendants cannot read or write outside parent session", () => {
|
|
141
|
+
const f = fixture();
|
|
142
|
+
try {
|
|
143
|
+
mkdirSync(join(f.a, "subagents"));
|
|
144
|
+
symlinkSync(f.b, join(f.a, "subagents", "agent_one"), process.platform === "win32" ? "junction" : "dir");
|
|
145
|
+
const task = f.task();
|
|
146
|
+
task.ownerSessionDir = f.a;
|
|
147
|
+
assert.throws(() => persistTask(task), /Unsafe/);
|
|
148
|
+
const summary = new TaskStore().loadSession(f.a);
|
|
149
|
+
assert.equal(summary.loaded, 0);
|
|
150
|
+
assert.equal(summary.errors.length, 1);
|
|
151
|
+
assert.deepEqual(readdirSync(f.b), []);
|
|
152
|
+
}
|
|
153
|
+
finally {
|
|
154
|
+
f.dispose();
|
|
155
|
+
}
|
|
156
|
+
});
|
|
157
|
+
test("progress writes coalesce, flush and critical boundaries persist immediately", async () => {
|
|
158
|
+
const f = fixture();
|
|
159
|
+
const store = new TaskStore();
|
|
160
|
+
try {
|
|
161
|
+
store.bindSession(f.a);
|
|
162
|
+
const task = f.task();
|
|
163
|
+
store.upsert(task);
|
|
164
|
+
const path = join(f.a, "subagents", task.agentId, "task.json");
|
|
165
|
+
const original = readFileSync(path, "utf8");
|
|
166
|
+
for (let i = 1; i <= 100; i++) {
|
|
167
|
+
task.progress.totalEvents = i;
|
|
168
|
+
store.updateProgress(task);
|
|
169
|
+
}
|
|
170
|
+
assert.equal(readFileSync(path, "utf8"), original);
|
|
171
|
+
await new Promise((resolve) => setTimeout(resolve, 600));
|
|
172
|
+
assert.equal(JSON.parse(readFileSync(path, "utf8")).progress.totalEvents, 100);
|
|
173
|
+
task.progress.totalEvents = 101;
|
|
174
|
+
store.updateProgress(task);
|
|
175
|
+
store.flush();
|
|
176
|
+
assert.equal(JSON.parse(readFileSync(path, "utf8")).progress.totalEvents, 101);
|
|
177
|
+
task.progress.totalEvents = 102;
|
|
178
|
+
store.updateProgress(task);
|
|
179
|
+
store.queueMessage(task.agentId, "critical");
|
|
180
|
+
assert.equal(JSON.parse(readFileSync(path, "utf8")).progress.totalEvents, 102);
|
|
181
|
+
store.bindSession(f.b);
|
|
182
|
+
store.fail(task.id, "done");
|
|
183
|
+
assert.equal(store.collectUnnotifiedCompletions().length, 0);
|
|
184
|
+
assert.equal(store.collectUnnotifiedCompletions(f.a).length, 1);
|
|
185
|
+
assert.equal(store.getInSession(task.id, f.a), task);
|
|
186
|
+
const legacy = f.task("explicit_legacy");
|
|
187
|
+
store.attachTask(legacy, undefined);
|
|
188
|
+
store.fail(legacy.id, "done");
|
|
189
|
+
assert.equal(legacy.ownerSessionDir, undefined);
|
|
190
|
+
assert.equal(store.collectUnnotifiedCompletions(undefined).length, 1);
|
|
191
|
+
}
|
|
192
|
+
finally {
|
|
193
|
+
store.flush();
|
|
194
|
+
f.dispose();
|
|
195
|
+
}
|
|
196
|
+
});
|
|
197
|
+
test("failed inbox persistence rolls back queue and delivery acknowledgements", () => {
|
|
198
|
+
const f = fixture();
|
|
199
|
+
try {
|
|
200
|
+
const store = new TaskStore();
|
|
201
|
+
store.bindSession(f.a);
|
|
202
|
+
const task = f.task();
|
|
203
|
+
store.upsert(task);
|
|
204
|
+
store.markRunning(task.id);
|
|
205
|
+
store.queueMessage(task.agentId, "durable");
|
|
206
|
+
const file = join(f.a, "subagents", task.agentId, "task.json");
|
|
207
|
+
rmSync(file);
|
|
208
|
+
mkdirSync(file); // deterministic write failure on Windows and Unix
|
|
209
|
+
assert.throws(() => store.deliverPendingMessages(task.id, 1), /persist inbox delivery/);
|
|
210
|
+
assert.equal(task.pendingMessages.length, 1);
|
|
211
|
+
assert.equal(task.messages.length, 0);
|
|
212
|
+
assert.equal(task.messageReceipts[0].status, "queued");
|
|
213
|
+
assert.equal(store.queueMessage(task.agentId, "not durable").ok, false);
|
|
214
|
+
assert.equal(task.pendingMessages.length, 1);
|
|
215
|
+
assert.equal(task.messageReceipts.length, 1);
|
|
216
|
+
assert.ok(readdirSync(join(f.a, "subagents", task.agentId)).every((name) => !name.endsWith(".tmp")));
|
|
217
|
+
}
|
|
218
|
+
finally {
|
|
219
|
+
f.dispose();
|
|
220
|
+
}
|
|
221
|
+
});
|
|
222
|
+
test("delivery crash window reconciles against transcript and does not duplicate appended messages", () => {
|
|
223
|
+
const f = fixture();
|
|
224
|
+
try {
|
|
225
|
+
const store = new TaskStore();
|
|
226
|
+
store.bindSession(f.a);
|
|
227
|
+
const task = f.task();
|
|
228
|
+
store.upsert(task);
|
|
229
|
+
store.markRunning(task.id);
|
|
230
|
+
store.queueMessage(task.agentId, "handoff");
|
|
231
|
+
const delivered = store.deliverPendingMessages(task.id, 1);
|
|
232
|
+
assert.equal(delivered.length, 1);
|
|
233
|
+
const fresh = new TaskStore();
|
|
234
|
+
fresh.loadSession(f.a);
|
|
235
|
+
fresh.reconcileMessages(task.id, []);
|
|
236
|
+
assert.equal(fresh.get(task.id).pendingMessages.length, 1);
|
|
237
|
+
assert.equal(fresh.get(task.id).messageReceipts[0].status, "queued");
|
|
238
|
+
const again = new TaskStore();
|
|
239
|
+
again.loadSession(f.a);
|
|
240
|
+
again.reconcileMessages(task.id, delivered);
|
|
241
|
+
assert.equal(again.get(task.id).pendingMessages.length, 0);
|
|
242
|
+
assert.equal(again.get(task.id).messageReceipts[0].status, "delivered");
|
|
243
|
+
assert.deepEqual(again.get(task.id).messages, delivered);
|
|
244
|
+
}
|
|
245
|
+
finally {
|
|
246
|
+
f.dispose();
|
|
247
|
+
}
|
|
248
|
+
});
|
|
249
|
+
test("confirmed handoffs never replay after compaction; unconfirmed appended handoffs dedupe", () => {
|
|
250
|
+
const f = fixture();
|
|
251
|
+
try {
|
|
252
|
+
const store = new TaskStore();
|
|
253
|
+
store.bindSession(f.a);
|
|
254
|
+
const task = f.task();
|
|
255
|
+
store.upsert(task);
|
|
256
|
+
store.markRunning(task.id);
|
|
257
|
+
store.queueMessage(task.agentId, "confirmed");
|
|
258
|
+
const delivered = store.deliverPendingMessages(task.id, 1);
|
|
259
|
+
const path = join(f.a, "subagents", task.agentId, "task.json");
|
|
260
|
+
assert.equal(JSON.parse(readFileSync(path, "utf8")).deliveryRecoveryMessages.length, 1);
|
|
261
|
+
store.confirmDelivery(task.id, delivered.map((m) => m.id), 99);
|
|
262
|
+
assert.equal(JSON.parse(readFileSync(path, "utf8")).deliveryRecoveryMessages.length, 1);
|
|
263
|
+
store.confirmDelivery(task.id, delivered.map((m) => m.id), 1);
|
|
264
|
+
assert.deepEqual(JSON.parse(readFileSync(path, "utf8")).deliveryRecoveryMessages, []);
|
|
265
|
+
const fresh = new TaskStore();
|
|
266
|
+
fresh.loadSession(f.a);
|
|
267
|
+
fresh.reconcileMessages(task.id, []);
|
|
268
|
+
assert.equal(fresh.get(task.id).pendingMessages.length, 0);
|
|
269
|
+
assert.equal(fresh.get(task.id).messageReceipts[0].status, "delivered");
|
|
270
|
+
store.queueMessage(task.agentId, "append then crash before ack");
|
|
271
|
+
const second = store.deliverPendingMessages(task.id, 1);
|
|
272
|
+
const again = new TaskStore();
|
|
273
|
+
again.loadSession(f.a);
|
|
274
|
+
again.reconcileMessages(task.id, [], second.map((m) => m.id));
|
|
275
|
+
assert.equal(again.get(task.id).pendingMessages.length, 0);
|
|
276
|
+
assert.equal(again.get(task.id).messageReceipts.at(-1).status, "delivered");
|
|
277
|
+
}
|
|
278
|
+
finally {
|
|
279
|
+
f.dispose();
|
|
280
|
+
}
|
|
281
|
+
});
|
|
282
|
+
test("legacy delivered receipts missing compacted IDs are not treated as recovery outbox", () => {
|
|
283
|
+
const f = fixture();
|
|
284
|
+
try {
|
|
285
|
+
const store = new TaskStore();
|
|
286
|
+
store.bindSession(f.a);
|
|
287
|
+
const task = f.task();
|
|
288
|
+
store.upsert(task);
|
|
289
|
+
store.markRunning(task.id);
|
|
290
|
+
store.queueMessage(task.agentId, "legacy delivery");
|
|
291
|
+
store.deliverPendingMessages(task.id, 1);
|
|
292
|
+
const path = join(f.a, "subagents", task.agentId, "task.json");
|
|
293
|
+
const raw = JSON.parse(readFileSync(path, "utf8"));
|
|
294
|
+
delete raw.deliveryRecoveryMessages;
|
|
295
|
+
writeFileSync(path, JSON.stringify(raw));
|
|
296
|
+
const fresh = new TaskStore();
|
|
297
|
+
fresh.loadSession(f.a);
|
|
298
|
+
fresh.reconcileMessages(task.id, []);
|
|
299
|
+
assert.equal(fresh.get(task.id).pendingMessages.length, 0);
|
|
300
|
+
}
|
|
301
|
+
finally {
|
|
302
|
+
f.dispose();
|
|
303
|
+
}
|
|
304
|
+
});
|
|
305
|
+
test("confirmation disk failure retains recoverable outbox", () => {
|
|
306
|
+
const f = fixture();
|
|
307
|
+
try {
|
|
308
|
+
const store = new TaskStore();
|
|
309
|
+
store.bindSession(f.a);
|
|
310
|
+
const task = f.task();
|
|
311
|
+
store.upsert(task);
|
|
312
|
+
store.markRunning(task.id);
|
|
313
|
+
store.queueMessage(task.agentId, "durable handoff");
|
|
314
|
+
const delivered = store.deliverPendingMessages(task.id, 1);
|
|
315
|
+
const path = join(f.a, "subagents", task.agentId, "task.json");
|
|
316
|
+
const raw = readFileSync(path, "utf8");
|
|
317
|
+
rmSync(path);
|
|
318
|
+
mkdirSync(path);
|
|
319
|
+
assert.throws(() => store.confirmDelivery(task.id, delivered.map((m) => m.id), 1), /confirmation/);
|
|
320
|
+
rmSync(path, { recursive: true });
|
|
321
|
+
writeFileSync(path, raw);
|
|
322
|
+
store.upsert(task);
|
|
323
|
+
assert.equal(JSON.parse(readFileSync(path, "utf8")).deliveryRecoveryMessages.length, 1);
|
|
324
|
+
store.reconcileMessages(task.id, delivered);
|
|
325
|
+
assert.equal(task.pendingMessages.length, 0);
|
|
326
|
+
}
|
|
327
|
+
finally {
|
|
328
|
+
f.dispose();
|
|
329
|
+
}
|
|
330
|
+
});
|
|
331
|
+
//# sourceMappingURL=task-persistence.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-persistence.test.js","sourceRoot":"","sources":["../../src/tasks/task-persistence.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAChH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,SAAS,OAAO;IACd,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACrD,SAAS,CAAC,CAAC,CAAC,CAAC;IAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,eAAe,EAAE,IAAI,eAAe,EAAE,EAAE,CAAC,CAAC;IAC9N,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;AAC7F,CAAC;AACD,IAAI,CAAC,2FAA2F,EAAE,GAAG,EAAE;IACrG,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,gBAAgB,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QACrF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;QACzG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;QACpE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/D,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAC,CAAC;QACnJ,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,eAAe,EAAE,CAAC,CAAC;QACpD,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,SAAS,EAAE,iBAAiB,EAAE,YAAY,CAAC;YAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;QAC5G,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC;QAC3C,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAChC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAM,EAAE,aAAa,CAAC,CAAC;QACtF,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;QACxE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACnE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACtI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,oEAAoE,EAAE,GAAG,EAAE;IAC9E,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;QAC3G,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrJ,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAChF,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC,2BAA2B;QACpE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAChH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC1D,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC1H,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/G,KAAK,CAAC,WAAW,EAAE,CAAC;QAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1G,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,2GAA2G,EAAE,GAAG,EAAE;IACrH,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjG,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACtF,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5E,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,MAAM,GAAQ,EAAE,CAAC;QAAC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;QAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/H,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QACvF,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAAC;QAC1D,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzL,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAK,CAAC,CAAC;YAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,OAAQ,CAAC,CAAC;QAC7G,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;QACpI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAAC,OAAO,CAAC,OAAO,GAAG,WAAW,CAAC;QAAC,OAAO,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC;QAChG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAC;IAC1D,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,0EAA0E,EAAE,GAAG,EAAE;IACpF,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;QAClC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACzG,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,SAAS,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1H,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;IAC7F,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IAAC,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;IACnD,IAAI,CAAC;QACH,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC;YAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAAC,CAAC;QAC7F,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC/E,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,GAAG,CAAC;QAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3E,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC/E,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,GAAG,CAAC;QAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC1G,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC/E,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,4BAA4B,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAAC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7G,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QAChD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;YAAS,CAAC;QAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,yEAAyE,EAAE,GAAG,EAAE;IACnF,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7H,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,kDAAkD;QACjF,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;QACxF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAgB,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACxE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5F,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACvG,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,8FAA8F,EAAE,GAAG,EAAE;IACxG,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7H,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9F,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAgB,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACnG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAgB,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC3E,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wFAAwF,EAAE,GAAG,EAAE;IAClG,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7H,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACxF,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACxF,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;QACtF,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5F,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAgB,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC3E,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACjF,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,oFAAoF,EAAE,GAAG,EAAE;IAC9F,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7H,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAAC,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9F,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAAC,OAAO,GAAG,CAAC,wBAAwB,CAAC;QAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAClI,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5F,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAChE,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7H,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAAC,MAAM,SAAS,GAAG,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAChH,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QACnG,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5D,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACxF,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;YAAS,CAAC;QAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}
|
|
@@ -1,14 +1,36 @@
|
|
|
1
|
+
import { type TaskLoadSummary } from "./task-persistence.js";
|
|
1
2
|
import { type Message } from "../types/messages.js";
|
|
2
|
-
import { type AgentToolResult, type LocalAgentTask, type LocalAgentTaskStatus } from "../agents/local-agent-task.js";
|
|
3
|
+
import { type AgentMessageReceipt, type AgentToolResult, type LocalAgentTask, type LocalAgentTaskStatus } from "../agents/local-agent-task.js";
|
|
3
4
|
export declare class TaskStore {
|
|
4
5
|
private readonly tasks;
|
|
5
6
|
private readonly agentNames;
|
|
6
7
|
private readonly waiters;
|
|
7
8
|
private readonly subscribers;
|
|
8
|
-
|
|
9
|
+
private sessionDir?;
|
|
10
|
+
private readonly loadedSessions;
|
|
11
|
+
/** Activate a view; background tasks in other sessions retain their lifecycle. */
|
|
12
|
+
bindSession(sessionDir?: string): TaskLoadSummary;
|
|
13
|
+
loadSession(sessionDir: string): TaskLoadSummary;
|
|
14
|
+
get activeSessionDir(): string | undefined;
|
|
15
|
+
getActive(id: string): LocalAgentTask | undefined;
|
|
16
|
+
private isActive;
|
|
17
|
+
private readonly persistenceTimers;
|
|
18
|
+
activateSession(sessionDir?: string): TaskLoadSummary;
|
|
19
|
+
getInSession(id: string, sessionDir?: string): LocalAgentTask | undefined;
|
|
20
|
+
private readonly explicitlyOwnedTasks;
|
|
21
|
+
attachTask(task: LocalAgentTask, sessionDir?: string): void;
|
|
22
|
+
/** Progress only: coalesce token deltas; message and lifecycle methods remain durable. */
|
|
23
|
+
updateProgress(task: LocalAgentTask): void;
|
|
24
|
+
flush(): void;
|
|
25
|
+
upsert(task: LocalAgentTask, options?: {
|
|
26
|
+
persist?: boolean;
|
|
27
|
+
}): void;
|
|
9
28
|
get(id: string): LocalAgentTask | undefined;
|
|
10
29
|
getByAgentId(agentId: string): LocalAgentTask | undefined;
|
|
11
30
|
list(): LocalAgentTask[];
|
|
31
|
+
recoverableInterruptedTasks(sessionDir?: string): LocalAgentTask[];
|
|
32
|
+
/** Explicit query scope; undefined means unowned, never the foreground view. */
|
|
33
|
+
listInSession(sessionDir?: string): LocalAgentTask[];
|
|
12
34
|
activeCount(): number;
|
|
13
35
|
subscribe(listener: () => void): () => void;
|
|
14
36
|
registerName(name: string, agentId: string): void;
|
|
@@ -17,16 +39,37 @@ export declare class TaskStore {
|
|
|
17
39
|
queueMessage(agentNameOrId: string, text: string): {
|
|
18
40
|
ok: true;
|
|
19
41
|
task: LocalAgentTask;
|
|
42
|
+
receipt: AgentMessageReceipt;
|
|
43
|
+
} | {
|
|
44
|
+
ok: false;
|
|
45
|
+
error: string;
|
|
46
|
+
};
|
|
47
|
+
queueMessageInSession(agentNameOrId: string, text: string, sessionDir?: string): {
|
|
48
|
+
ok: true;
|
|
49
|
+
task: LocalAgentTask;
|
|
50
|
+
receipt: AgentMessageReceipt;
|
|
20
51
|
} | {
|
|
21
52
|
ok: false;
|
|
22
53
|
error: string;
|
|
23
54
|
};
|
|
24
55
|
drainPendingMessages(taskId: string): Message[];
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
56
|
+
/** Synchronous handoff at the next model-request boundary, never during tool execution. */
|
|
57
|
+
deliverPendingMessages(taskId: string, runGeneration: number): Message[];
|
|
58
|
+
/** Call after durable transcript append and BEFORE compaction/model execution.
|
|
59
|
+
* A stale generation cannot acknowledge a newer handoff. Failure must stop the run.
|
|
60
|
+
*/
|
|
61
|
+
confirmDelivery(taskId: string, messageIds: readonly string[], runGeneration: number): void;
|
|
62
|
+
/** Only unconfirmed outbox entries may be retried. Missing historical receipt IDs
|
|
63
|
+
* may simply have been compacted, so they NEVER imply an undelivered message.
|
|
64
|
+
* persistedMessageIds can include IDs from the complete append-only transcript log.
|
|
65
|
+
*/
|
|
66
|
+
reconcileMessages(taskId: string, transcript: readonly Message[], persistedMessageIds?: Iterable<string>): void;
|
|
67
|
+
prepareResume(taskId: string, abortController: AbortController): LocalAgentTask;
|
|
68
|
+
collectUnnotifiedCompletions(...scope: [sessionDir?: string]): LocalAgentTask[];
|
|
69
|
+
markRunning(taskId: string, runGeneration?: number): void;
|
|
70
|
+
complete(taskId: string, result: AgentToolResult, runGeneration?: number): void;
|
|
71
|
+
fail(taskId: string, error: string, result?: AgentToolResult, runGeneration?: number): void;
|
|
72
|
+
kill(taskId: string, reason?: string, result?: AgentToolResult, runGeneration?: number): void;
|
|
30
73
|
markNotified(taskId: string): void;
|
|
31
74
|
isTerminal(task: LocalAgentTask): boolean;
|
|
32
75
|
waitForTerminal(taskId: string, options?: {
|
|
@@ -40,4 +83,5 @@ export declare class TaskStore {
|
|
|
40
83
|
private notify;
|
|
41
84
|
}
|
|
42
85
|
export declare function isTerminalStatus(status: LocalAgentTaskStatus): boolean;
|
|
86
|
+
export declare function isRecoverableInterruptedTask(task: LocalAgentTask): boolean;
|
|
43
87
|
export declare const globalTaskStore: TaskStore;
|