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,192 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { mkdtempSync, readFileSync, rmSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { DefaultContextManager } from "../context/context-manager.js";
|
|
6
|
+
import { TaskStore } from "../tasks/task-store.js";
|
|
7
|
+
import { createAgentTool, resumeAgentTask } from "./agent-tool.js";
|
|
8
|
+
import { StaticAgentCatalog, GENERAL_PURPOSE_AGENT } from "./agent-definition.js";
|
|
9
|
+
import { ToolRegistry } from "../tools/registry.js";
|
|
10
|
+
import { InMemoryAppState } from "../app/app-state.js";
|
|
11
|
+
import { createTextMessage } from "../types/messages.js";
|
|
12
|
+
// Synthetic public gateway output must carry the same provenance as mapped model output.
|
|
13
|
+
function createVisibleSmokeMessage(text) {
|
|
14
|
+
return { ...createTextMessage("assistant", text), blocks: [{ type: "text", text, displayChannel: "visible" }] };
|
|
15
|
+
}
|
|
16
|
+
const root = mkdtempSync(path.join(tmpdir(), "neo-lifecycle-"));
|
|
17
|
+
const context = { agentId: "parent", messages: [], appState: new InMemoryAppState("parent", root) };
|
|
18
|
+
const tick = () => new Promise((resolve) => setTimeout(resolve, 5));
|
|
19
|
+
async function until(check) { for (let i = 0; i < 500; i++) {
|
|
20
|
+
if (check())
|
|
21
|
+
return;
|
|
22
|
+
await tick();
|
|
23
|
+
} throw new Error("Timed out"); }
|
|
24
|
+
const text = (r) => JSON.stringify(r.messages);
|
|
25
|
+
try {
|
|
26
|
+
const store = new TaskStore();
|
|
27
|
+
const requests = [];
|
|
28
|
+
let releaseFirst;
|
|
29
|
+
const firstGate = new Promise((resolve) => { releaseFirst = resolve; });
|
|
30
|
+
let releaseResume;
|
|
31
|
+
const resumeGate = new Promise((resolve) => { releaseResume = resolve; });
|
|
32
|
+
const gateway = { async *stream(request) {
|
|
33
|
+
requests.push(structuredClone({ ...request, cancellation: undefined }));
|
|
34
|
+
if (requests.length === 1) {
|
|
35
|
+
await firstGate;
|
|
36
|
+
yield { type: "tool_use", toolUse: { id: "echo-1", name: "echo", input: {} } };
|
|
37
|
+
yield { type: "response_completed", stopReason: "tool_calls" };
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
if (requests.length === 3)
|
|
41
|
+
await resumeGate;
|
|
42
|
+
if (requests.length === 2)
|
|
43
|
+
store.queueMessage(store.list()[0].agentId, "terminal-boundary-message");
|
|
44
|
+
yield { type: "assistant_message", message: createVisibleSmokeMessage(requests.length === 2 ? "old-result" : "new-result") };
|
|
45
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
46
|
+
}
|
|
47
|
+
} };
|
|
48
|
+
const tools = new ToolRegistry();
|
|
49
|
+
tools.register({ name: "echo", description: "fake", inputSchema: { type: "object" }, metadata: { readOnly: true, concurrent: true, visible: true }, validate: () => ({}), async call() { return { ok: true, output: "paired" }; } });
|
|
50
|
+
const seenCwds = [];
|
|
51
|
+
const baseContextManager = new DefaultContextManager();
|
|
52
|
+
const runtime = { contextManager: { async build(input) { seenCwds.push(input.cwd); return baseContextManager.build(input); } }, modelGateway: gateway, tools, taskStore: store, agentCatalog: new StaticAgentCatalog([{ ...GENERAL_PURPOSE_AGENT, requiresReport: false }]) };
|
|
53
|
+
const launched = await createAgentTool(runtime).call({ prompt: "original-directive", run_in_background: true, cwd: "child", model: "fake-model" }, context, {});
|
|
54
|
+
assert.equal(launched.ok, true);
|
|
55
|
+
await until(() => requests.length === 1);
|
|
56
|
+
const task = store.list()[0];
|
|
57
|
+
task.outputFile = path.join(root, "task.txt");
|
|
58
|
+
const queued = store.queueMessage(task.agentId, "running-inbox-message");
|
|
59
|
+
assert(queued.ok);
|
|
60
|
+
assert.equal(queued.receipt.status, "queued");
|
|
61
|
+
assert(!text(requests[0]).includes("running-inbox-message"));
|
|
62
|
+
releaseFirst();
|
|
63
|
+
await until(() => task.status === "completed");
|
|
64
|
+
assert.equal(requests.length, 2);
|
|
65
|
+
assert(text(requests[1]).includes("running-inbox-message"));
|
|
66
|
+
const blocks = requests[1].messages.flatMap((m) => m.blocks);
|
|
67
|
+
assert(blocks.findIndex((b) => b.type === "tool_result") < blocks.findIndex((b) => b.type === "text" && b.text === "running-inbox-message"));
|
|
68
|
+
assert.equal(queued.receipt.status, "delivered");
|
|
69
|
+
assert(queued.receipt.deliveredAt);
|
|
70
|
+
assert.equal(task.pendingMessages.length, 1);
|
|
71
|
+
assert.equal(task.messageReceipts?.at(-1)?.status, "queued");
|
|
72
|
+
assert.equal(task.result?.content, "old-result");
|
|
73
|
+
assert.deepEqual(await resumeAgentTask(task.taskId, "resume-directive", runtime, store, context), { ok: true });
|
|
74
|
+
assert.equal(task.runGeneration, 2);
|
|
75
|
+
assert.equal(task.result, undefined);
|
|
76
|
+
assert.equal(task.completedAt, undefined);
|
|
77
|
+
assert.equal(task.runHistory?.[0].result?.content, "old-result");
|
|
78
|
+
assert(!readFileSync(task.outputFile, "utf8").includes("old-result"));
|
|
79
|
+
await until(() => requests.length === 3);
|
|
80
|
+
assert(text(requests[2]).includes("terminal-boundary-message"));
|
|
81
|
+
assert(text(requests[2]).includes("original-directive"));
|
|
82
|
+
assert(text(requests[2]).includes("resume-directive"));
|
|
83
|
+
assert.equal(requests[2].model, "fake-model");
|
|
84
|
+
assert.equal(task.executionOptions?.cwd, path.join(root, "child"));
|
|
85
|
+
assert.equal(seenCwds[2], path.join(root, "child"));
|
|
86
|
+
assert.equal(task.messageReceipts?.at(-1)?.runGeneration, 2);
|
|
87
|
+
assert.equal((await resumeAgentTask(task.taskId, "invalid", runtime, store, context)).ok, false);
|
|
88
|
+
releaseResume();
|
|
89
|
+
await until(() => task.status === "completed");
|
|
90
|
+
assert.equal(store.get(task.taskId)?.result?.content, "new-result");
|
|
91
|
+
console.log("PASS running inbox reaches next fake-model request after paired tool results; terminal inbox retained/resumed; receipts; archived results; output reset");
|
|
92
|
+
let releaseOld;
|
|
93
|
+
let oldClosed = false;
|
|
94
|
+
let calls = 0;
|
|
95
|
+
const oldGate = new Promise((resolve) => { releaseOld = resolve; });
|
|
96
|
+
const racing = { async *stream() {
|
|
97
|
+
calls++;
|
|
98
|
+
if (calls === 1) {
|
|
99
|
+
try {
|
|
100
|
+
await oldGate;
|
|
101
|
+
yield { type: "assistant_message", message: createVisibleSmokeMessage("stale-result") };
|
|
102
|
+
}
|
|
103
|
+
finally {
|
|
104
|
+
oldClosed = true;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else
|
|
108
|
+
yield { type: "assistant_message", message: createVisibleSmokeMessage("winning-generation") };
|
|
109
|
+
yield { type: "response_completed", stopReason: "completed" };
|
|
110
|
+
} };
|
|
111
|
+
const raceStore = new TaskStore();
|
|
112
|
+
const raceRuntime = { ...runtime, modelGateway: racing, taskStore: raceStore };
|
|
113
|
+
await createAgentTool(raceRuntime).call({ prompt: "race", run_in_background: true }, context, {});
|
|
114
|
+
await until(() => calls === 1);
|
|
115
|
+
const raceTask = raceStore.list()[0];
|
|
116
|
+
raceTask.outputFile = path.join(root, "race.txt");
|
|
117
|
+
raceStore.kill(raceTask.taskId);
|
|
118
|
+
const retained = raceStore.queueMessage(raceTask.agentId, "after-cancel");
|
|
119
|
+
assert(retained.ok);
|
|
120
|
+
assert.equal(retained.receipt.status, "queued");
|
|
121
|
+
await resumeAgentTask(raceTask.taskId, undefined, raceRuntime, raceStore, context);
|
|
122
|
+
await until(() => raceTask.status === "completed");
|
|
123
|
+
releaseOld();
|
|
124
|
+
await until(() => oldClosed);
|
|
125
|
+
await tick();
|
|
126
|
+
assert.equal(raceTask.result?.content, "winning-generation");
|
|
127
|
+
assert.equal(raceTask.runGeneration, 2);
|
|
128
|
+
assert.equal(raceTask.runHistory?.[0].status, "killed");
|
|
129
|
+
assert(!JSON.stringify(raceTask.messages).includes("stale-result"));
|
|
130
|
+
console.log("PASS cancelled stream closes; old generation cannot overwrite resumed result/messages");
|
|
131
|
+
for (let i = 0; i < 10; i++) {
|
|
132
|
+
raceStore.prepareResume(raceTask.taskId, new AbortController());
|
|
133
|
+
raceStore.complete(raceTask.taskId, { agent_id: raceTask.agentId, agent_type: "fake", content: "archive", total_duration_ms: 0, total_tool_use_count: 0 });
|
|
134
|
+
}
|
|
135
|
+
assert.equal(raceTask.runHistory?.length, 8);
|
|
136
|
+
raceStore.prepareResume(raceTask.taskId, new AbortController());
|
|
137
|
+
raceStore.markRunning(raceTask.taskId);
|
|
138
|
+
for (let i = 0; i < 140; i++)
|
|
139
|
+
raceStore.queueMessage(raceTask.agentId, `bounded-${i}`);
|
|
140
|
+
raceStore.deliverPendingMessages(raceTask.taskId, raceTask.runGeneration);
|
|
141
|
+
assert.equal(raceTask.messageReceipts?.length, 128);
|
|
142
|
+
for (let i = 0; i < 256; i++)
|
|
143
|
+
assert(raceStore.queueMessage(raceTask.agentId, `pending-${i}`).ok);
|
|
144
|
+
assert.equal(raceStore.queueMessage(raceTask.agentId, "overflow").ok, false);
|
|
145
|
+
assert.equal(raceTask.pendingMessages.length, 256);
|
|
146
|
+
assert.equal(raceStore.deliverPendingMessages(raceTask.taskId, raceTask.runGeneration - 1).length, 0);
|
|
147
|
+
assert.equal(raceTask.pendingMessages.length, 256);
|
|
148
|
+
raceStore.deliverPendingMessages(raceTask.taskId, raceTask.runGeneration);
|
|
149
|
+
assert.equal(raceStore.queueMessage(raceTask.agentId, "x".repeat(16385)).ok, false);
|
|
150
|
+
for (let i = 0; i < 3; i++)
|
|
151
|
+
assert(raceStore.queueMessage(raceTask.agentId, "x".repeat(16384)).ok);
|
|
152
|
+
assert.equal(raceStore.deliverPendingMessages(raceTask.taskId, raceTask.runGeneration).length, 2);
|
|
153
|
+
assert.equal(raceTask.pendingMessages.length, 1);
|
|
154
|
+
assert.equal(raceTask.messageReceipts?.at(-1)?.status, "queued");
|
|
155
|
+
assert.equal(raceStore.deliverPendingMessages(raceTask.taskId, raceTask.runGeneration).length, 1);
|
|
156
|
+
const aborted = new AbortController();
|
|
157
|
+
aborted.abort();
|
|
158
|
+
assert.equal(await raceStore.waitForTerminal(raceTask.taskId, { signal: aborted.signal }), raceTask);
|
|
159
|
+
console.log("PASS bounded delivered receipt/run histories, message/batch character limits and already-aborted waiter");
|
|
160
|
+
const reportStore = new TaskStore();
|
|
161
|
+
let reportCalls = 0;
|
|
162
|
+
const reportGateway = { async *stream(request) {
|
|
163
|
+
reportCalls++;
|
|
164
|
+
if (reportCalls === 2) {
|
|
165
|
+
assert(text(request).includes("old-authoritative-report"));
|
|
166
|
+
assert(text(request).includes("new-report-directive"));
|
|
167
|
+
yield { type: "assistant_message", message: createVisibleSmokeMessage("No new report yet") };
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
if (reportCalls === 3)
|
|
171
|
+
assert(request.toolChoice);
|
|
172
|
+
yield { type: "tool_use", toolUse: { id: `report-${reportCalls}`, name: "subagent_report", input: { status: "completed", content: reportCalls === 1 ? "old-authoritative-report" : "new-authoritative-report" } } };
|
|
173
|
+
}
|
|
174
|
+
yield { type: "response_completed", stopReason: reportCalls === 2 ? "completed" : "tool_calls" };
|
|
175
|
+
} };
|
|
176
|
+
const reportRuntime = { ...runtime, taskStore: reportStore, modelGateway: reportGateway, agentCatalog: new StaticAgentCatalog([GENERAL_PURPOSE_AGENT]) };
|
|
177
|
+
await createAgentTool(reportRuntime).call({ prompt: "report-required", run_in_background: true }, context, {});
|
|
178
|
+
const reportTask = reportStore.list()[0];
|
|
179
|
+
reportTask.outputFile = path.join(root, "report.txt");
|
|
180
|
+
await until(() => reportTask.status === "completed");
|
|
181
|
+
assert.equal(reportTask.result?.content, "old-authoritative-report");
|
|
182
|
+
await resumeAgentTask(reportTask.taskId, "new-report-directive", reportRuntime, reportStore, context);
|
|
183
|
+
await until(() => reportTask.status === "completed");
|
|
184
|
+
assert.equal(reportCalls, 3, "old report must not skip required-report recovery in resumed run");
|
|
185
|
+
assert.equal(reportTask.result?.content, "new-authoritative-report");
|
|
186
|
+
assert.equal(reportTask.runHistory?.[0].result?.content, "old-authoritative-report");
|
|
187
|
+
console.log("PASS report-required resume ignores historical report and requires new authoritative report");
|
|
188
|
+
}
|
|
189
|
+
finally {
|
|
190
|
+
rmSync(root, { recursive: true, force: true });
|
|
191
|
+
}
|
|
192
|
+
//# sourceMappingURL=smoke-agent-lifecycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"smoke-agent-lifecycle.js","sourceRoot":"","sources":["../../src/agents/smoke-agent-lifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,10 @@ const smokePassthroughTool = {
|
|
|
47
47
|
return { ok: true, output: input.text };
|
|
48
48
|
},
|
|
49
49
|
};
|
|
50
|
+
// Synthetic public gateway output must carry the same provenance as mapped model output.
|
|
51
|
+
function createVisibleSmokeMessage(text) {
|
|
52
|
+
return { ...createTextMessage("assistant", text), blocks: [{ type: "text", text, displayChannel: "visible" }] };
|
|
53
|
+
}
|
|
50
54
|
class ParentAndSubagentGateway {
|
|
51
55
|
parentCalls = 0;
|
|
52
56
|
subagentCalls = 0;
|
|
@@ -138,7 +142,7 @@ class ParentAndSubagentGateway {
|
|
|
138
142
|
return;
|
|
139
143
|
}
|
|
140
144
|
if (isExploreSmoke && hasAgentReportResult && !hasFinalAgentReportResult) {
|
|
141
|
-
yield { type: "assistant_message", message:
|
|
145
|
+
yield { type: "assistant_message", message: createVisibleSmokeMessage("我将继续做只读检查,重新获取关键文件内容以避免依赖已清理的上下文。") };
|
|
142
146
|
yield { type: "response_completed", responseId: `sub_${this.subagentCalls}`, stopReason: "completed" };
|
|
143
147
|
return;
|
|
144
148
|
}
|
|
@@ -164,7 +168,7 @@ class ParentAndSubagentGateway {
|
|
|
164
168
|
: isExploreSmoke
|
|
165
169
|
? "我将继续做只读检查,重新获取关键文件内容以避免依赖已清理的上下文。"
|
|
166
170
|
: `worker result: ${lastPrompt.slice(0, 24)}`;
|
|
167
|
-
yield { type: "assistant_message", message:
|
|
171
|
+
yield { type: "assistant_message", message: createVisibleSmokeMessage(content) };
|
|
168
172
|
yield { type: "response_completed", responseId: `sub_${this.subagentCalls}`, stopReason: "completed" };
|
|
169
173
|
return;
|
|
170
174
|
}
|
|
@@ -182,7 +186,7 @@ class ParentAndSubagentGateway {
|
|
|
182
186
|
yield { type: "response_completed", responseId: "parent_1", stopReason: "tool_calls" };
|
|
183
187
|
return;
|
|
184
188
|
}
|
|
185
|
-
yield { type: "assistant_message", message:
|
|
189
|
+
yield { type: "assistant_message", message: createVisibleSmokeMessage("parent done") };
|
|
186
190
|
yield { type: "response_completed", responseId: "parent_2", stopReason: "completed" };
|
|
187
191
|
}
|
|
188
192
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smoke-agents.js","sourceRoot":"","sources":["../../src/agents/smoke-agents.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"smoke-agents.js","sourceRoot":"","sources":["../../src/agents/smoke-agents.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,8 @@ export class DefaultContextManager {
|
|
|
48
48
|
];
|
|
49
49
|
const systemPrompt = buildEffectiveSystemPrompt(promptSections, input);
|
|
50
50
|
const userContext = input.omitProjectMemory ? stripProjectMemory(this.getUserContext(cwd)) : this.getUserContext(cwd);
|
|
51
|
-
const
|
|
51
|
+
const sessionDir = input.toolUseContext?.session?.sessionDir;
|
|
52
|
+
const systemContext = this.getSystemContext(cwd, sessionDir ? resolve(sessionDir) : undefined);
|
|
52
53
|
return { systemPrompt, promptSections, userContext, systemContext };
|
|
53
54
|
}
|
|
54
55
|
getUserContext(cwd) {
|
|
@@ -58,14 +59,17 @@ export class DefaultContextManager {
|
|
|
58
59
|
...(memory.content ? { projectMemory: memory.content, memoryFiles: memory.files } : {}),
|
|
59
60
|
};
|
|
60
61
|
}
|
|
61
|
-
getSystemContext(cwd) {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
getSystemContext(cwd, sessionDir) {
|
|
63
|
+
const cached = this.systemContextCache;
|
|
64
|
+
if (cached?.cwd === cwd && cached.sessionDir === sessionDir)
|
|
65
|
+
return cached.value;
|
|
66
|
+
const value = {
|
|
65
67
|
cwd,
|
|
66
68
|
platform: process.platform,
|
|
69
|
+
...(sessionDir ? { sessionDir } : {}),
|
|
67
70
|
};
|
|
68
|
-
|
|
71
|
+
this.systemContextCache = { cwd, sessionDir, value };
|
|
72
|
+
return value;
|
|
69
73
|
}
|
|
70
74
|
}
|
|
71
75
|
export class NoopContextManager extends DefaultContextManager {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../../src/context/context-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAI1C,OAAO,EACL,gCAAgC,EAChC,0BAA0B,GAG3B,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../../src/context/context-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { resolve } from "node:path";
|
|
1
2
|
import { ModelAPIError } from "../model/errors.js";
|
|
2
3
|
import { QueryEngine } from "../core/query-engine.js";
|
|
3
4
|
import { buildContextMetrics, estimateTextTokens } from "../core/context-metrics.js";
|
|
5
|
+
import { buildPromptCacheIdentity } from "../core/prompt-cache-key.js";
|
|
4
6
|
import { resolveContextWindowTokens } from "../model/context-window.js";
|
|
5
7
|
import { applyRuntimeContextForPromptCache, applyToolResultBudget, ensureToolResultPairing, getMessagesAfterCompactBoundary, hasValidToolResultPairing, insertUserContextBeforeLatestUser } from "../core/message-pipeline.js";
|
|
6
8
|
import { ToolRegistry } from "../tools/registry.js";
|
|
@@ -8,6 +10,14 @@ import { createTextMessage, createThinkingMessage, createToolResultMessage } fro
|
|
|
8
10
|
import { CLEARED_TOOL_RESULT_CONTENT, DeterministicCompactor, ManualOnlyCompactor, microCompactIfNeeded, ModelDrivenCompactor, withCompactionReport } from "./compaction.js";
|
|
9
11
|
import { AdditionalPromptContextManager, DefaultContextManager } from "./context-manager.js";
|
|
10
12
|
import { buildEffectiveSystemPrompt, splitSystemPromptPrefix, SYSTEM_PROMPT_DYNAMIC_BOUNDARY } from "./prompts.js";
|
|
13
|
+
class CapturingGateway {
|
|
14
|
+
requests = [];
|
|
15
|
+
async *stream(request) {
|
|
16
|
+
this.requests.push(request);
|
|
17
|
+
yield { type: "assistant_message", message: createTextMessage("assistant", "ok") };
|
|
18
|
+
yield { type: "response_completed", responseId: `capture_${this.requests.length}`, stopReason: "completed" };
|
|
19
|
+
}
|
|
20
|
+
}
|
|
11
21
|
class ContextOverflowThenSuccessGateway {
|
|
12
22
|
calls = 0;
|
|
13
23
|
sawBoundaryOnRetry = false;
|
|
@@ -85,7 +95,9 @@ async function main() {
|
|
|
85
95
|
split.stablePrefix.includes("cache me") &&
|
|
86
96
|
split.dynamicSuffix.includes("session only");
|
|
87
97
|
const contextManager = new DefaultContextManager({ currentDate: () => "2026-05-05" });
|
|
88
|
-
const
|
|
98
|
+
const sessionDir = resolve(".neo-session-stable");
|
|
99
|
+
const toolUseContext = { session: { sessionId: "stable", sessionDir }, agentId: "main" };
|
|
100
|
+
const runtime = await contextManager.build({ agentId: "main", messages: [createTextMessage("user", "hello")], toolUseContext });
|
|
89
101
|
const extendedRuntime = await new AdditionalPromptContextManager(contextManager, [{
|
|
90
102
|
name: "Web Plugin",
|
|
91
103
|
content: "stable plugin contract",
|
|
@@ -98,31 +110,62 @@ async function main() {
|
|
|
98
110
|
const runtimeContextMessages = applyRuntimeContextForPromptCache(firstHistory, runtime.userContext, runtime.systemContext);
|
|
99
111
|
const nextRuntimeContextMessages = applyRuntimeContextForPromptCache(secondHistory, runtime.userContext, runtime.systemContext);
|
|
100
112
|
const changedCwdMessages = applyRuntimeContextForPromptCache(secondHistory, runtime.userContext, { ...runtime.systemContext, cwd: `${runtime.systemContext.cwd}-next` });
|
|
113
|
+
const changedSessionMessages = applyRuntimeContextForPromptCache(secondHistory, runtime.userContext, { ...runtime.systemContext, sessionDir: `${sessionDir}-next` });
|
|
101
114
|
const cwdTransitionMessages = insertUserContextBeforeLatestUser(changedCwdMessages, { cwdTransition: { paths: ["A", "B", "C"], current: "C" } });
|
|
102
115
|
const lastRuntimeBlock = runtimeContextMessages.at(-1)?.blocks[0];
|
|
103
116
|
const firstRuntimeBlock = runtimeContextMessages[0]?.blocks[0];
|
|
104
117
|
const nextFirstRuntimeBlock = nextRuntimeContextMessages[0]?.blocks[0];
|
|
105
118
|
const changedFirstRuntimeBlock = changedCwdMessages[0]?.blocks[0];
|
|
119
|
+
const changedSessionRuntimeBlock = changedSessionMessages[0]?.blocks[0];
|
|
106
120
|
const cwdTransitionBlock = cwdTransitionMessages.at(-2)?.blocks[0];
|
|
121
|
+
const cacheIdentity = buildPromptCacheIdentity(runtime.systemPrompt, [], "fake", runtimeContextMessages);
|
|
122
|
+
const changedCwdIdentity = buildPromptCacheIdentity(runtime.systemPrompt, [], "fake", changedCwdMessages);
|
|
123
|
+
const changedSessionIdentity = buildPromptCacheIdentity(runtime.systemPrompt, [], "fake", changedSessionMessages);
|
|
107
124
|
const toolBudgetPromptOccurrences = runtime.systemPrompt.split("Tool results use a default context budget").length - 1;
|
|
108
125
|
const contextOk = toolBudgetPromptOccurrences === 1 &&
|
|
109
126
|
runtime.systemPrompt.includes("48000 serialized characters") &&
|
|
110
127
|
runtime.systemPrompt.includes("within 1-200000") &&
|
|
111
128
|
runtime.userContext.currentDate === "2026-05-05" &&
|
|
112
129
|
Boolean(runtime.systemContext.cwd) &&
|
|
130
|
+
runtime.systemContext.sessionDir === sessionDir &&
|
|
113
131
|
!runtime.systemPrompt.includes("## System Context") &&
|
|
114
132
|
runtimeContextMessages[0]?.metadata?.userContext === true &&
|
|
115
133
|
runtimeContextMessages[0]?.metadata?.systemContext === true &&
|
|
116
134
|
firstRuntimeBlock?.type === "text" &&
|
|
117
135
|
nextFirstRuntimeBlock?.type === "text" &&
|
|
118
136
|
changedFirstRuntimeBlock?.type === "text" &&
|
|
137
|
+
changedSessionRuntimeBlock?.type === "text" &&
|
|
119
138
|
firstRuntimeBlock.text === nextFirstRuntimeBlock.text &&
|
|
120
139
|
firstRuntimeBlock.text === changedFirstRuntimeBlock.text &&
|
|
140
|
+
firstRuntimeBlock.text !== changedSessionRuntimeBlock.text &&
|
|
141
|
+
firstRuntimeBlock.text.split(`sessionDir: ${sessionDir}`).length - 1 === 1 &&
|
|
142
|
+
cacheIdentity.key === changedCwdIdentity.key &&
|
|
143
|
+
cacheIdentity.key !== changedSessionIdentity.key &&
|
|
121
144
|
changedCwdMessages.at(-2)?.metadata?.cacheStableRuntimeContext === false &&
|
|
122
145
|
cwdTransitionBlock?.type === "text" &&
|
|
123
146
|
cwdTransitionBlock.text.includes('"paths":["A","B","C"]') === true &&
|
|
124
147
|
lastRuntimeBlock?.type === "text" &&
|
|
125
148
|
lastRuntimeBlock.text === "first";
|
|
149
|
+
const recoveryGateway = new CapturingGateway();
|
|
150
|
+
const recoveryEngine = new QueryEngine({
|
|
151
|
+
modelGateway: recoveryGateway,
|
|
152
|
+
tools: new ToolRegistry(),
|
|
153
|
+
session: { enabled: false },
|
|
154
|
+
});
|
|
155
|
+
let recoveryConsumed = 0;
|
|
156
|
+
recoveryEngine.noteRecoverableSubagents(() => { recoveryConsumed += 1; });
|
|
157
|
+
const preAborted = new AbortController();
|
|
158
|
+
preAborted.abort();
|
|
159
|
+
for await (const _event of recoveryEngine.sendUserText("aborted before model", { abortSignal: preAborted.signal })) { /* consume */ }
|
|
160
|
+
for await (const _event of recoveryEngine.sendUserText("first recovery turn")) { /* consume */ }
|
|
161
|
+
for await (const _event of recoveryEngine.sendUserText("second turn")) { /* consume */ }
|
|
162
|
+
const recoveryFirstText = JSON.stringify(recoveryGateway.requests[0]?.messages ?? []);
|
|
163
|
+
const recoverySecondText = JSON.stringify(recoveryGateway.requests[1]?.messages ?? []);
|
|
164
|
+
const recoveryHintOk = recoveryGateway.requests.length === 2 &&
|
|
165
|
+
recoveryConsumed === 1 &&
|
|
166
|
+
recoveryFirstText.split("Interrupted subagents can be resumed.").length - 1 === 1 &&
|
|
167
|
+
!recoverySecondText.includes("Interrupted subagents can be resumed.") &&
|
|
168
|
+
!JSON.stringify(recoveryGateway.requests[0]?.messages[0]).includes("Interrupted subagents can be resumed.");
|
|
126
169
|
const toolResult = createToolResultMessage({ id: "call_big", name: "big", input: {} }, true, "x".repeat(120));
|
|
127
170
|
const budgeted = applyToolResultBudget([toolResult], { maxSerializedLength: 20 });
|
|
128
171
|
const budgetOk = budgeted[0].metadata?.budgeted === true;
|
|
@@ -445,8 +488,8 @@ async function main() {
|
|
|
445
488
|
thresholdEvents.includes("context.compacted") &&
|
|
446
489
|
thresholdEvents.includes("terminal:completed") &&
|
|
447
490
|
thresholdEngine.getHistoryMessages().some((message) => message.metadata?.compactBoundary === true);
|
|
448
|
-
const ok = promptOk && contextOk && extensionOk && budgetOk && compactOk && compactReportOk && budgetWindowOk && defaultBudgetOk && fallbackQualityOk && consecutiveCompactOk && microOk && pairingOk && grepRegressionOk && modelCompactOk && consecutiveModelCompactOk && gpt56WindowOk && sessionWindowOk && automaticDisabledOk && reactiveOk && reactiveCompactionReportOk && defaultAutomaticEnabledOk && thresholdAutomaticOk && telemetryOk;
|
|
449
|
-
console.log(JSON.stringify({ ok, promptOk, contextOk, extensionOk, budgetOk, compactOk, compactReportOk, budgetWindowOk, defaultBudgetOk, fallbackQualityOk, consecutiveCompactOk, microOk, pairingOk, grepRegressionOk, modelCompactOk, consecutiveModelCompactOk, gpt56WindowOk, sessionWindowOk, automaticDisabledOk, reactiveOk, reactiveCompactionReportOk, defaultAutomaticEnabledOk, thresholdAutomaticOk, telemetryOk, events, defaultEvents, thresholdEvents, calls: gateway.calls, defaultCalls: defaultGateway.calls, thresholdCompactCalls: thresholdGateway.compactCalls }, null, 2));
|
|
491
|
+
const ok = promptOk && contextOk && recoveryHintOk && extensionOk && budgetOk && compactOk && compactReportOk && budgetWindowOk && defaultBudgetOk && fallbackQualityOk && consecutiveCompactOk && microOk && pairingOk && grepRegressionOk && modelCompactOk && consecutiveModelCompactOk && gpt56WindowOk && sessionWindowOk && automaticDisabledOk && reactiveOk && reactiveCompactionReportOk && defaultAutomaticEnabledOk && thresholdAutomaticOk && telemetryOk;
|
|
492
|
+
console.log(JSON.stringify({ ok, promptOk, contextOk, recoveryHintOk, extensionOk, budgetOk, compactOk, compactReportOk, budgetWindowOk, defaultBudgetOk, fallbackQualityOk, consecutiveCompactOk, microOk, pairingOk, grepRegressionOk, modelCompactOk, consecutiveModelCompactOk, gpt56WindowOk, sessionWindowOk, automaticDisabledOk, reactiveOk, reactiveCompactionReportOk, defaultAutomaticEnabledOk, thresholdAutomaticOk, telemetryOk, events, defaultEvents, thresholdEvents, calls: gateway.calls, defaultCalls: defaultGateway.calls, thresholdCompactCalls: thresholdGateway.compactCalls }, null, 2));
|
|
450
493
|
if (!ok)
|
|
451
494
|
process.exitCode = 1;
|
|
452
495
|
}
|