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,319 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import test from "node:test";
|
|
3
|
+
import { mkdtemp, readFile, rm } from "node:fs/promises";
|
|
4
|
+
import os from "node:os";
|
|
5
|
+
import path from "node:path";
|
|
6
|
+
import { createAgentTool, resumeAgentTask } from "./agent-tool.js";
|
|
7
|
+
import { AgentActivityStore } from "./agent-activity.js";
|
|
8
|
+
import { GENERAL_PURPOSE_AGENT, StaticAgentCatalog } from "./agent-definition.js";
|
|
9
|
+
import { TaskStore } from "../tasks/task-store.js";
|
|
10
|
+
import { createSubagentStopTool } from "../tasks/subagent-tools.js";
|
|
11
|
+
import { SessionStore } from "../session/session-store.js";
|
|
12
|
+
import { InMemoryAppState } from "../app/app-state.js";
|
|
13
|
+
import { ToolRegistry } from "../tools/registry.js";
|
|
14
|
+
import { createTextMessage } from "../types/messages.js";
|
|
15
|
+
const tick = () => new Promise((resolve) => setTimeout(resolve, 5));
|
|
16
|
+
async function until(check) {
|
|
17
|
+
for (let i = 0; i < 1000; i++) {
|
|
18
|
+
if (check())
|
|
19
|
+
return;
|
|
20
|
+
await tick();
|
|
21
|
+
}
|
|
22
|
+
throw new Error("Timed out waiting for fake-model lifecycle");
|
|
23
|
+
}
|
|
24
|
+
function context(root) {
|
|
25
|
+
return { agentId: "parent", messages: [], appState: new InMemoryAppState("parent", root),
|
|
26
|
+
session: { sessionId: "parent", sessionDir: root },
|
|
27
|
+
options: { mainLoopModel: "fake-inherited", reasoning: { effort: "high", summary: "detailed" },
|
|
28
|
+
contextWindowTokensOverride: 123456, maxOutputTokensOverride: 2048, serviceTier: "priority" },
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
function runtime(store, gateway) {
|
|
32
|
+
return { taskStore: store, modelGateway: gateway, tools: new ToolRegistry(), agentActivityStore: new AgentActivityStore(),
|
|
33
|
+
agentCatalog: new StaticAgentCatalog([{ ...GENERAL_PURPOSE_AGENT, requiresReport: false }]),
|
|
34
|
+
contextManager: { async build(input) { return { systemPrompt: "fake-model test", promptSections: [], userContext: { currentDate: "2026-09-06" }, systemContext: { cwd: input.cwd ?? process.cwd(), platform: process.platform } }; } },
|
|
35
|
+
compactor: { async compact(messages) { return { messages: [...messages], changed: false }; } },
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
class ProgressStore extends TaskStore {
|
|
39
|
+
progressWrites = 0;
|
|
40
|
+
updateProgress(task) { this.progressWrites++; super.updateProgress(task); }
|
|
41
|
+
}
|
|
42
|
+
for (const background of [false, true])
|
|
43
|
+
test(`${background ? "async" : "sync"} launch persists and fresh TaskStore resumes authoritative child context and parameters`, async () => {
|
|
44
|
+
const root = await mkdtemp(path.join(os.tmpdir(), "neo-agent-tool-restart-"));
|
|
45
|
+
const store = new ProgressStore();
|
|
46
|
+
let restarted;
|
|
47
|
+
try {
|
|
48
|
+
store.bindSession(root);
|
|
49
|
+
const requests = [];
|
|
50
|
+
const gateway = { async *stream(request) {
|
|
51
|
+
requests.push(structuredClone({ ...request, cancellation: undefined }));
|
|
52
|
+
yield { type: "assistant_delta", text: "working" };
|
|
53
|
+
yield { type: "assistant_message", message: { ...createTextMessage("assistant", "FIRST_RESULT"), blocks: [{ type: "text", text: "FIRST_RESULT", displayChannel: "visible" }] } };
|
|
54
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
55
|
+
} };
|
|
56
|
+
const rt = runtime(store, gateway);
|
|
57
|
+
const budgets = [];
|
|
58
|
+
rt.compactor = { async compact(messages, budget) { budgets.push(budget?.contextWindowTokens); return { messages: [...messages], changed: false }; } };
|
|
59
|
+
const parent = context(root);
|
|
60
|
+
const result = await createAgentTool(rt).call({ prompt: "ORIGINAL_DIRECTIVE", name: "worker", cwd: "child", run_in_background: background }, parent, {});
|
|
61
|
+
assert.equal(result.ok, true);
|
|
62
|
+
const taskId = result.output.task_id;
|
|
63
|
+
assert(taskId);
|
|
64
|
+
await until(() => store.get(taskId)?.status === "completed");
|
|
65
|
+
await tick();
|
|
66
|
+
const task = store.get(taskId);
|
|
67
|
+
assert.equal(rt.agentActivityStore?.get(task.agentId)?.taskId, taskId);
|
|
68
|
+
assert.equal(store.resolveAgentName("worker"), task.agentId);
|
|
69
|
+
assert(store.progressWrites > 0);
|
|
70
|
+
const child = await SessionStore.open({ rootDir: path.join(root, "subagents"), sessionId: task.agentId, agentId: task.agentId, resume: true });
|
|
71
|
+
assert.deepEqual(JSON.parse(JSON.stringify(task.messages)), child.getInitialMessages(), "task messages must be exactly the child transcript, without completion notifications");
|
|
72
|
+
// A durable compact checkpoint must win over the deliberately stale task snapshot after restart.
|
|
73
|
+
child.recordCompactCheckpoint([createTextMessage("user", "AUTHORITATIVE_CHECKPOINT")], "autocompact");
|
|
74
|
+
store.flush();
|
|
75
|
+
restarted = new TaskStore();
|
|
76
|
+
assert.equal(restarted.bindSession(root).loaded, 1);
|
|
77
|
+
const restored = restarted.get(taskId);
|
|
78
|
+
assert.notEqual(restored, task);
|
|
79
|
+
assert.equal(restarted.resolveAgentName("worker"), task.agentId);
|
|
80
|
+
assert.equal(restored.executionOptions?.cwd, path.join(root, "child"));
|
|
81
|
+
const resumeRequests = [];
|
|
82
|
+
const resumeRuntime = runtime(restarted, { async *stream(request) {
|
|
83
|
+
resumeRequests.push(structuredClone({ ...request, cancellation: undefined }));
|
|
84
|
+
yield { type: "assistant_message", message: { ...createTextMessage("assistant", "RESUMED_RESULT"), blocks: [{ type: "text", text: "RESUMED_RESULT", displayChannel: "visible" }] } };
|
|
85
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
86
|
+
} });
|
|
87
|
+
const cwds = [];
|
|
88
|
+
const manager = resumeRuntime.contextManager;
|
|
89
|
+
resumeRuntime.contextManager = { async build(input) { cwds.push(input.cwd); return manager.build(input); } };
|
|
90
|
+
resumeRuntime.compactor = rt.compactor;
|
|
91
|
+
const changedParent = context(root);
|
|
92
|
+
changedParent.options = { ...changedParent.options, mainLoopModel: "wrong-parent-model", reasoning: { effort: "low" }, maxOutputTokensOverride: 99, contextWindowTokensOverride: 9999, serviceTier: "default" };
|
|
93
|
+
assert.deepEqual(await resumeAgentTask(taskId, "RESUME_DIRECTIVE", resumeRuntime, restarted, changedParent), { ok: true });
|
|
94
|
+
await until(() => restored.status === "completed");
|
|
95
|
+
await tick();
|
|
96
|
+
assert.equal(restored.runGeneration, 2);
|
|
97
|
+
const transcript = (await readFile(child.transcriptPath, "utf8")).trim().split("\n").map((line) => JSON.parse(line));
|
|
98
|
+
const outputRows = transcript.filter((entry) => entry.type === "message" && entry.message.role === "assistant");
|
|
99
|
+
assert.deepEqual(outputRows.map((entry) => entry.runGeneration), [1, 2], "sync/async launch and prepareResume must pass captured real generation");
|
|
100
|
+
for (const entry of transcript.filter((entry) => entry.type === "message" && entry.message.role === "user")) {
|
|
101
|
+
assert.equal(entry.runGeneration, undefined, "initial/resume context is not new model output");
|
|
102
|
+
}
|
|
103
|
+
assert.equal(restored.result?.content, "RESUMED_RESULT");
|
|
104
|
+
assert.equal(restored.runHistory?.[0].result?.content, "FIRST_RESULT");
|
|
105
|
+
assert.equal(resumeRequests.length, 1);
|
|
106
|
+
const serialized = JSON.stringify(resumeRequests[0].messages);
|
|
107
|
+
assert.match(serialized, /AUTHORITATIVE_CHECKPOINT/);
|
|
108
|
+
assert.doesNotMatch(serialized, /ORIGINAL_DIRECTIVE|FIRST_RESULT|task_notification/);
|
|
109
|
+
assert.equal(serialized.split("RESUME_DIRECTIVE").length - 1, 1);
|
|
110
|
+
for (const request of [...requests, ...resumeRequests]) {
|
|
111
|
+
assert.equal(request.model, "fake-inherited");
|
|
112
|
+
assert.deepEqual(request.reasoning, { effort: "high", summary: "detailed" });
|
|
113
|
+
assert.equal(request.maxOutputTokens, 2048);
|
|
114
|
+
assert.equal(request.serviceTier, "priority");
|
|
115
|
+
assert.equal(request.queryOrigin, "subagent");
|
|
116
|
+
}
|
|
117
|
+
assert(budgets.length >= 2 && budgets.every((budget) => budget === 123456));
|
|
118
|
+
assert(cwds.length > 0 && cwds.every((cwd) => cwd === path.join(root, "child")));
|
|
119
|
+
const reopened = await SessionStore.open({ rootDir: path.join(root, "subagents"), sessionId: task.agentId, agentId: task.agentId, resume: true });
|
|
120
|
+
assert.deepEqual(JSON.parse(JSON.stringify(restored.messages)), reopened.getInitialMessages());
|
|
121
|
+
}
|
|
122
|
+
finally {
|
|
123
|
+
store.flush();
|
|
124
|
+
restarted?.flush();
|
|
125
|
+
await rm(root, { recursive: true, force: true });
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
for (const background of [false, true])
|
|
129
|
+
test(`${background ? "async" : "sync"} ownerless launch does not inherit active session or alias`, async () => {
|
|
130
|
+
const root = await mkdtemp(path.join(os.tmpdir(), "neo-agent-tool-owner-"));
|
|
131
|
+
const store = new TaskStore();
|
|
132
|
+
// Redirect ownerless output before any terminal boundary, avoiding the real user home.
|
|
133
|
+
const attach = store.attachTask.bind(store);
|
|
134
|
+
store.attachTask = (task, owner) => { task.outputFile = path.join(root, "output.txt"); attach(task, owner); };
|
|
135
|
+
try {
|
|
136
|
+
store.bindSession(root);
|
|
137
|
+
const rt = runtime(store, { async *stream() {
|
|
138
|
+
yield { type: "assistant_message", message: createTextMessage("assistant", "done") };
|
|
139
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
140
|
+
} });
|
|
141
|
+
const parent = context(root);
|
|
142
|
+
parent.session = undefined;
|
|
143
|
+
const result = await createAgentTool(rt).call({ prompt: "ownerless", name: "unowned", run_in_background: background }, parent, {});
|
|
144
|
+
const id = result.output.task_id;
|
|
145
|
+
await until(() => store.get(id)?.status === "completed");
|
|
146
|
+
await tick();
|
|
147
|
+
assert.equal(store.get(id)?.ownerSessionDir, undefined);
|
|
148
|
+
assert.equal(store.list().length, 0);
|
|
149
|
+
assert.equal(store.resolveAgentName("unowned"), undefined);
|
|
150
|
+
assert.equal(new TaskStore().bindSession(root).loaded, 0);
|
|
151
|
+
store.bindSession();
|
|
152
|
+
assert.equal(store.resolveAgentName("unowned"), store.get(id)?.agentId);
|
|
153
|
+
}
|
|
154
|
+
finally {
|
|
155
|
+
store.flush();
|
|
156
|
+
await rm(root, { recursive: true, force: true });
|
|
157
|
+
}
|
|
158
|
+
});
|
|
159
|
+
for (const cancellation of ["stop", "parent", "already-aborted", "superseded"])
|
|
160
|
+
test(`sync ${cancellation} cancels model and guards terminal/generation writes`, async () => {
|
|
161
|
+
const root = await mkdtemp(path.join(os.tmpdir(), "neo-agent-tool-cancel-"));
|
|
162
|
+
const store = new TaskStore();
|
|
163
|
+
let release;
|
|
164
|
+
const gate = new Promise((resolve) => { release = resolve; });
|
|
165
|
+
try {
|
|
166
|
+
store.bindSession(root);
|
|
167
|
+
const parent = context(root);
|
|
168
|
+
const controller = new AbortController();
|
|
169
|
+
parent.abortSignal = controller.signal;
|
|
170
|
+
let calls = 0;
|
|
171
|
+
let signal;
|
|
172
|
+
const rt = runtime(store, { async *stream(request) {
|
|
173
|
+
const call = ++calls;
|
|
174
|
+
if (call === 1) {
|
|
175
|
+
signal = request.cancellation;
|
|
176
|
+
await gate;
|
|
177
|
+
}
|
|
178
|
+
yield { type: "assistant_message", message: createTextMessage("assistant", call === 1 ? "STALE" : "WINNER") };
|
|
179
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
180
|
+
} });
|
|
181
|
+
if (cancellation === "already-aborted")
|
|
182
|
+
controller.abort("already cancelled");
|
|
183
|
+
const running = createAgentTool(rt).call({ prompt: "cancel me" }, parent, {});
|
|
184
|
+
await until(() => store.list().length === 1);
|
|
185
|
+
const task = store.list()[0];
|
|
186
|
+
if (cancellation !== "already-aborted") {
|
|
187
|
+
await until(() => !!signal);
|
|
188
|
+
if (cancellation === "parent")
|
|
189
|
+
controller.abort("parent cancelled");
|
|
190
|
+
else
|
|
191
|
+
assert.equal((await createSubagentStopTool(store).call({ task_id: task.taskId }, parent, {})).ok, true);
|
|
192
|
+
assert.equal(signal?.aborted, true);
|
|
193
|
+
assert.equal(task.abortController?.signal.aborted, true);
|
|
194
|
+
}
|
|
195
|
+
if (cancellation === "superseded") {
|
|
196
|
+
await resumeAgentTask(task.taskId, "new generation", rt, store, parent);
|
|
197
|
+
await until(() => task.status === "completed");
|
|
198
|
+
}
|
|
199
|
+
const snapshot = cancellation === "superseded" ? JSON.stringify({ messages: task.messages, progress: task.progress, result: task.result, activity: rt.agentActivityStore?.get(task.agentId) }) : undefined;
|
|
200
|
+
release();
|
|
201
|
+
const result = await running;
|
|
202
|
+
assert.equal(result.ok, false);
|
|
203
|
+
assert.equal(result.output.task_id, task.taskId);
|
|
204
|
+
assert.equal(task.status, cancellation === "superseded" ? "completed" : "killed");
|
|
205
|
+
if (snapshot)
|
|
206
|
+
assert.equal(JSON.stringify({ messages: task.messages, progress: task.progress, result: task.result, activity: rt.agentActivityStore?.get(task.agentId) }), snapshot);
|
|
207
|
+
assert.doesNotMatch(JSON.stringify(task.messages), /STALE/);
|
|
208
|
+
}
|
|
209
|
+
finally {
|
|
210
|
+
release();
|
|
211
|
+
store.flush();
|
|
212
|
+
await rm(root, { recursive: true, force: true });
|
|
213
|
+
}
|
|
214
|
+
});
|
|
215
|
+
for (const boundary of ["before-append", "before-ack", "after-ack-compact"])
|
|
216
|
+
test(`handoff restart at ${boundary}`, async () => {
|
|
217
|
+
const root = await mkdtemp(path.join(os.tmpdir(), "neo-handoff-restart-"));
|
|
218
|
+
const store = new TaskStore();
|
|
219
|
+
let fresh;
|
|
220
|
+
try {
|
|
221
|
+
store.bindSession(root);
|
|
222
|
+
const rt = runtime(store, { async *stream() {
|
|
223
|
+
yield { type: "assistant_message", message: createTextMessage("assistant", "initial done") };
|
|
224
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
225
|
+
} });
|
|
226
|
+
const launched = await createAgentTool(rt).call({ prompt: "initial" }, context(root), {});
|
|
227
|
+
const id = launched.output.task_id;
|
|
228
|
+
const task = store.get(id);
|
|
229
|
+
// Stage a genuine durable queue->delivery transaction, then stop at the crash boundary.
|
|
230
|
+
store.prepareResume(id, new AbortController());
|
|
231
|
+
store.markRunning(id);
|
|
232
|
+
const queued = store.queueMessage(task.agentId, "DURABLE_HANDOFF");
|
|
233
|
+
assert(queued.ok);
|
|
234
|
+
const handedOff = store.deliverPendingMessages(id, task.runGeneration);
|
|
235
|
+
assert.equal(handedOff.length, 1);
|
|
236
|
+
const messageId = handedOff[0].id;
|
|
237
|
+
const child = await SessionStore.open({ rootDir: path.join(root, "subagents"), sessionId: task.agentId, agentId: task.agentId, resume: true });
|
|
238
|
+
if (boundary !== "before-append")
|
|
239
|
+
child.recordMessage(handedOff[0]);
|
|
240
|
+
if (boundary === "after-ack-compact") {
|
|
241
|
+
store.confirmDelivery(id, [messageId], task.runGeneration);
|
|
242
|
+
child.recordCompactCheckpoint([createTextMessage("user", "COMPACTED_SUMMARY")], "autocompact");
|
|
243
|
+
}
|
|
244
|
+
store.flush();
|
|
245
|
+
fresh = new TaskStore();
|
|
246
|
+
assert.equal(fresh.bindSession(root).loaded, 1);
|
|
247
|
+
const requests = [];
|
|
248
|
+
const resumed = runtime(fresh, { async *stream(request) {
|
|
249
|
+
requests.push(structuredClone({ ...request, cancellation: undefined }));
|
|
250
|
+
yield { type: "assistant_message", message: createTextMessage("assistant", "recovered") };
|
|
251
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
252
|
+
} });
|
|
253
|
+
assert.deepEqual(await resumeAgentTask(id, "continue", resumed, fresh, context(root)), { ok: true });
|
|
254
|
+
await until(() => fresh.isTerminal(fresh.get(id)));
|
|
255
|
+
assert.equal(fresh.get(id)?.status, "completed");
|
|
256
|
+
assert.equal(requests.length, 1);
|
|
257
|
+
assert.equal(requests[0].messages.filter((message) => message.id === messageId).length, boundary === "after-ack-compact" ? 0 : 1);
|
|
258
|
+
assert.equal(fresh.get(id)?.pendingMessages.length, 0);
|
|
259
|
+
assert.equal(fresh.get(id)?.messageReceipts?.find((receipt) => receipt.messageId === messageId)?.status, "delivered");
|
|
260
|
+
// Confirm must have durably removed the recovery outbox before a subsequent compact/restart.
|
|
261
|
+
const reopened = await SessionStore.open({ rootDir: path.join(root, "subagents"), sessionId: task.agentId, agentId: task.agentId, resume: true });
|
|
262
|
+
reopened.recordCompactCheckpoint([createTextMessage("user", "NEXT_SUMMARY")], "autocompact");
|
|
263
|
+
fresh.flush();
|
|
264
|
+
const again = new TaskStore();
|
|
265
|
+
again.bindSession(root);
|
|
266
|
+
again.reconcileMessages(id, reopened.getInitialMessages());
|
|
267
|
+
assert.equal(again.get(id)?.pendingMessages.length, 0);
|
|
268
|
+
again.flush();
|
|
269
|
+
}
|
|
270
|
+
finally {
|
|
271
|
+
store.flush();
|
|
272
|
+
fresh?.flush();
|
|
273
|
+
await rm(root, { recursive: true, force: true });
|
|
274
|
+
}
|
|
275
|
+
});
|
|
276
|
+
for (const background of [false, true])
|
|
277
|
+
for (const failure of ["initial", "confirmation"])
|
|
278
|
+
test(`handoff ${failure} failure stops ${background ? "async" : "sync"} before model/compact`, async () => {
|
|
279
|
+
const root = await mkdtemp(path.join(os.tmpdir(), "neo-handoff-fail-"));
|
|
280
|
+
const store = new TaskStore();
|
|
281
|
+
try {
|
|
282
|
+
store.bindSession(root);
|
|
283
|
+
let models = 0, compactions = 0, compactionsAtFailure = 0;
|
|
284
|
+
const rt = runtime(store, { async *stream() { models++; yield { type: "response_completed" }; } });
|
|
285
|
+
rt.compactor = { async compact(messages) { compactions++; return { messages: [...messages], changed: false }; } };
|
|
286
|
+
if (failure === "initial")
|
|
287
|
+
store.reconcileMessages = () => { throw new Error("injected reconciliation failure"); };
|
|
288
|
+
else {
|
|
289
|
+
const attach = store.attachTask.bind(store);
|
|
290
|
+
let queuedId;
|
|
291
|
+
store.attachTask = (task, owner) => {
|
|
292
|
+
attach(task, owner);
|
|
293
|
+
const queued = store.queueMessage(task.agentId, "CONFIRM_BEFORE_MODEL");
|
|
294
|
+
assert(queued.ok);
|
|
295
|
+
queuedId = queued.receipt.messageId;
|
|
296
|
+
};
|
|
297
|
+
const confirm = store.confirmDelivery.bind(store);
|
|
298
|
+
store.confirmDelivery = (id, ids, generation) => {
|
|
299
|
+
if (queuedId && ids.includes(queuedId)) {
|
|
300
|
+
compactionsAtFailure = compactions;
|
|
301
|
+
throw new Error("injected confirmation failure");
|
|
302
|
+
}
|
|
303
|
+
confirm(id, ids, generation);
|
|
304
|
+
};
|
|
305
|
+
}
|
|
306
|
+
const result = await createAgentTool(rt).call({ prompt: "fail closed", run_in_background: background }, context(root), {});
|
|
307
|
+
const id = result.output.task_id;
|
|
308
|
+
await until(() => store.isTerminal(store.get(id)));
|
|
309
|
+
assert.equal(store.get(id)?.status, "failed");
|
|
310
|
+
assert.match(store.get(id)?.error ?? "", failure === "initial" ? /injected/ : /model_error/);
|
|
311
|
+
assert.equal(models, 0);
|
|
312
|
+
assert.equal(compactions, compactionsAtFailure, "no compaction may run after confirmation fails");
|
|
313
|
+
}
|
|
314
|
+
finally {
|
|
315
|
+
store.flush();
|
|
316
|
+
await rm(root, { recursive: true, force: true });
|
|
317
|
+
}
|
|
318
|
+
});
|
|
319
|
+
//# sourceMappingURL=agent-tool-persistence.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-tool-persistence.test.js","sourceRoot":"","sources":["../../src/agents/agent-tool-persistence.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import type { Compactor, ContextBudgetOptions } from "../context/compaction.js";
|
|
|
3
3
|
import type { ModelGateway } from "../model/model-gateway.js";
|
|
4
4
|
import type { Tool, ToolUseContext } from "../tools/tool.js";
|
|
5
5
|
import type { ToolRegistry } from "../tools/registry.js";
|
|
6
|
+
import { runAgent } from "../core/run-agent.js";
|
|
6
7
|
import { type AgentCatalog, type AgentIsolation, type AgentPermissionMode } from "./agent-definition.js";
|
|
7
8
|
import { type TaskStore } from "../tasks/task-store.js";
|
|
8
9
|
import { type AgentActivityStore } from "./agent-activity.js";
|
|
@@ -25,6 +26,8 @@ export interface AgentToolInput {
|
|
|
25
26
|
}
|
|
26
27
|
export interface AgentToolRuntime {
|
|
27
28
|
modelGateway: ModelGateway;
|
|
29
|
+
/** Optional runner adapter; defaults to the production runAgent lifecycle. */
|
|
30
|
+
runAgent?: typeof runAgent;
|
|
28
31
|
tools: ToolRegistry;
|
|
29
32
|
contextManager?: ContextManager;
|
|
30
33
|
compactor?: Compactor;
|