neoctl 0.2.40 → 0.2.42
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/README.md +43 -585
- package/dist/context/prompts.js +2 -1
- package/dist/context/prompts.js.map +1 -1
- package/dist/core/run-agent.js +2 -0
- package/dist/core/run-agent.js.map +1 -1
- package/dist/repl/index.js +13 -1
- package/dist/repl/index.js.map +1 -1
- package/dist/tools/builtins/image-capabilities.d.ts +21 -0
- package/dist/tools/builtins/image-capabilities.js +97 -0
- package/dist/tools/builtins/image-capabilities.js.map +1 -0
- package/dist/tools/builtins/image-generation-tool.d.ts +14 -7
- package/dist/tools/builtins/image-generation-tool.js +141 -143
- package/dist/tools/builtins/image-generation-tool.js.map +1 -1
- package/dist/tools/builtins/image-output-verification.d.ts +14 -0
- package/dist/tools/builtins/image-output-verification.js +183 -0
- package/dist/tools/builtins/image-output-verification.js.map +1 -0
- package/dist/tools/registry.d.ts +2 -0
- package/dist/tools/registry.js +6 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/run-tool-use.js +5 -0
- package/dist/tools/run-tool-use.js.map +1 -1
- package/dist/web/image-result-metadata.d.ts +20 -0
- package/dist/web/image-result-metadata.js +20 -0
- package/dist/web/image-result-metadata.js.map +1 -0
- package/dist/web/index.d.ts +4 -1
- package/dist/web/index.js +20 -5
- package/dist/web/index.js.map +1 -1
- package/docs/prompt-config.md +1 -1
- package/package.json +22 -20
- package/dist/agents/agent-report-security.test.d.ts +0 -1
- package/dist/agents/agent-report-security.test.js +0 -301
- package/dist/agents/agent-report-security.test.js.map +0 -1
- package/dist/agents/agent-tool-persistence.test.d.ts +0 -1
- package/dist/agents/agent-tool-persistence.test.js +0 -319
- package/dist/agents/agent-tool-persistence.test.js.map +0 -1
- package/dist/agents/coordination-boundary.test.d.ts +0 -1
- package/dist/agents/coordination-boundary.test.js +0 -58
- package/dist/agents/coordination-boundary.test.js.map +0 -1
- package/dist/agents/live-preview-redaction-security.test.d.ts +0 -1
- package/dist/agents/live-preview-redaction-security.test.js +0 -286
- package/dist/agents/live-preview-redaction-security.test.js.map +0 -1
- package/dist/agents/no-nested-delegation.test.d.ts +0 -1
- package/dist/agents/no-nested-delegation.test.js +0 -38
- package/dist/agents/no-nested-delegation.test.js.map +0 -1
- package/dist/agents/obs07-11-run-facts.test.d.ts +0 -1
- package/dist/agents/obs07-11-run-facts.test.js +0 -459
- package/dist/agents/obs07-11-run-facts.test.js.map +0 -1
- package/dist/agents/smoke-agent-lifecycle.d.ts +0 -1
- package/dist/agents/smoke-agent-lifecycle.js +0 -192
- package/dist/agents/smoke-agent-lifecycle.js.map +0 -1
- package/dist/agents/smoke-agents.d.ts +0 -1
- package/dist/agents/smoke-agents.js +0 -362
- package/dist/agents/smoke-agents.js.map +0 -1
- package/dist/context/prompt-config.test.d.ts +0 -1
- package/dist/context/prompt-config.test.js +0 -128
- package/dist/context/prompt-config.test.js.map +0 -1
- package/dist/context/smoke-context.d.ts +0 -1
- package/dist/context/smoke-context.js +0 -502
- package/dist/context/smoke-context.js.map +0 -1
- package/dist/core/obs04-visible-data.test.d.ts +0 -1
- package/dist/core/obs04-visible-data.test.js +0 -147
- package/dist/core/obs04-visible-data.test.js.map +0 -1
- package/dist/core/query-session-settings.test.d.ts +0 -1
- package/dist/core/query-session-settings.test.js +0 -252
- package/dist/core/query-session-settings.test.js.map +0 -1
- package/dist/core/run-agent-pause.test.d.ts +0 -1
- package/dist/core/run-agent-pause.test.js +0 -52
- package/dist/core/run-agent-pause.test.js.map +0 -1
- package/dist/core/run-agent-persistence.test.d.ts +0 -1
- package/dist/core/run-agent-persistence.test.js +0 -222
- package/dist/core/run-agent-persistence.test.js.map +0 -1
- package/dist/core/session-prompt-inheritance.test.d.ts +0 -1
- package/dist/core/session-prompt-inheritance.test.js +0 -132
- package/dist/core/session-prompt-inheritance.test.js.map +0 -1
- package/dist/core/session-settings-prompt.test.d.ts +0 -1
- package/dist/core/session-settings-prompt.test.js +0 -266
- package/dist/core/session-settings-prompt.test.js.map +0 -1
- package/dist/core/smoke-core-loop.d.ts +0 -1
- package/dist/core/smoke-core-loop.js +0 -290
- package/dist/core/smoke-core-loop.js.map +0 -1
- package/dist/core/smoke-image-integrity.d.ts +0 -1
- package/dist/core/smoke-image-integrity.js +0 -67
- package/dist/core/smoke-image-integrity.js.map +0 -1
- package/dist/execution/docker.test.d.ts +0 -1
- package/dist/execution/docker.test.js +0 -57
- package/dist/execution/docker.test.js.map +0 -1
- package/dist/model/openai-native-image-guard.test.d.ts +0 -1
- package/dist/model/openai-native-image-guard.test.js +0 -101
- package/dist/model/openai-native-image-guard.test.js.map +0 -1
- package/dist/model/openai-responses-instructions.test.d.ts +0 -1
- package/dist/model/openai-responses-instructions.test.js +0 -64
- package/dist/model/openai-responses-instructions.test.js.map +0 -1
- package/dist/model/smoke-openai.d.ts +0 -1
- package/dist/model/smoke-openai.js +0 -44
- package/dist/model/smoke-openai.js.map +0 -1
- package/dist/model/smoke-responses-mapper.d.ts +0 -1
- package/dist/model/smoke-responses-mapper.js +0 -156
- package/dist/model/smoke-responses-mapper.js.map +0 -1
- package/dist/plugins/smoke-plugin-system.d.ts +0 -1
- package/dist/plugins/smoke-plugin-system.js +0 -63
- package/dist/plugins/smoke-plugin-system.js.map +0 -1
- package/dist/repl/smoke-run-command.d.ts +0 -1
- package/dist/repl/smoke-run-command.js +0 -43
- package/dist/repl/smoke-run-command.js.map +0 -1
- package/dist/secrets/smoke-secrets.d.ts +0 -1
- package/dist/secrets/smoke-secrets.js +0 -73
- package/dist/secrets/smoke-secrets.js.map +0 -1
- package/dist/session/session-store-safety.test.d.ts +0 -1
- package/dist/session/session-store-safety.test.js +0 -107
- package/dist/session/session-store-safety.test.js.map +0 -1
- package/dist/session/smoke-session.d.ts +0 -1
- package/dist/session/smoke-session.js +0 -233
- package/dist/session/smoke-session.js.map +0 -1
- package/dist/skills/smoke-skills.d.ts +0 -1
- package/dist/skills/smoke-skills.js +0 -109
- package/dist/skills/smoke-skills.js.map +0 -1
- package/dist/tasks/subagent-tools.test.d.ts +0 -1
- package/dist/tasks/subagent-tools.test.js +0 -159
- package/dist/tasks/subagent-tools.test.js.map +0 -1
- package/dist/tasks/task-ack-size.test.d.ts +0 -1
- package/dist/tasks/task-ack-size.test.js +0 -101
- package/dist/tasks/task-ack-size.test.js.map +0 -1
- package/dist/tasks/task-persistence.test.d.ts +0 -1
- package/dist/tasks/task-persistence.test.js +0 -331
- package/dist/tasks/task-persistence.test.js.map +0 -1
- package/dist/tools/smoke-exec-process.d.ts +0 -1
- package/dist/tools/smoke-exec-process.js +0 -127
- package/dist/tools/smoke-exec-process.js.map +0 -1
- package/dist/tools/smoke-terminal-output-chain.d.ts +0 -1
- package/dist/tools/smoke-terminal-output-chain.js +0 -245
- package/dist/tools/smoke-terminal-output-chain.js.map +0 -1
- package/dist/tools/smoke-tool-system.d.ts +0 -1
- package/dist/tools/smoke-tool-system.js +0 -412
- package/dist/tools/smoke-tool-system.js.map +0 -1
- package/dist/tools/terminal-background-history.test.d.ts +0 -1
- package/dist/tools/terminal-background-history.test.js +0 -77
- package/dist/tools/terminal-background-history.test.js.map +0 -1
- package/dist/tools/terminal-output-persistence.test.d.ts +0 -1
- package/dist/tools/terminal-output-persistence.test.js +0 -50
- package/dist/tools/terminal-output-persistence.test.js.map +0 -1
- package/dist/tools/terminal-output-store.test.d.ts +0 -1
- package/dist/tools/terminal-output-store.test.js +0 -364
- package/dist/tools/terminal-output-store.test.js.map +0 -1
- package/dist/web/agent-content-detail.test.d.ts +0 -1
- package/dist/web/agent-content-detail.test.js +0 -307
- package/dist/web/agent-content-detail.test.js.map +0 -1
- package/dist/web/agent-parent-messages.test.d.ts +0 -1
- package/dist/web/agent-parent-messages.test.js +0 -58
- package/dist/web/agent-parent-messages.test.js.map +0 -1
- package/dist/web/agent-tool-payload-security.test.d.ts +0 -1
- package/dist/web/agent-tool-payload-security.test.js +0 -120
- package/dist/web/agent-tool-payload-security.test.js.map +0 -1
- package/dist/web/prompt-config-protocol.test.d.ts +0 -1
- package/dist/web/prompt-config-protocol.test.js +0 -78
- package/dist/web/prompt-config-protocol.test.js.map +0 -1
- package/dist/web/session-prompt-integration.test.d.ts +0 -1
- package/dist/web/session-prompt-integration.test.js +0 -57
- package/dist/web/session-prompt-integration.test.js.map +0 -1
- package/dist/web/session-settings.test.d.ts +0 -1
- package/dist/web/session-settings.test.js +0 -254
- package/dist/web/session-settings.test.js.map +0 -1
- package/dist/web/smoke-agent-content-http.d.ts +0 -1
- package/dist/web/smoke-agent-content-http.js +0 -446
- package/dist/web/smoke-agent-content-http.js.map +0 -1
- package/dist/web/smoke-plan-payload.d.ts +0 -1
- package/dist/web/smoke-plan-payload.js +0 -30
- package/dist/web/smoke-plan-payload.js.map +0 -1
- package/dist/web/smoke-runtime-context-protocol.d.ts +0 -1
- package/dist/web/smoke-runtime-context-protocol.js +0 -42
- package/dist/web/smoke-runtime-context-protocol.js.map +0 -1
- package/dist/web/smoke-status-semantics.d.ts +0 -1
- package/dist/web/smoke-status-semantics.js +0 -90
- package/dist/web/smoke-status-semantics.js.map +0 -1
- package/dist/web/smoke-task-session-entrypoints.d.ts +0 -1
- package/dist/web/smoke-task-session-entrypoints.js +0 -96
- package/dist/web/smoke-task-session-entrypoints.js.map +0 -1
- package/dist/web/smoke-terminal-output-http.d.ts +0 -1
- package/dist/web/smoke-terminal-output-http.js +0 -377
- package/dist/web/smoke-terminal-output-http.js.map +0 -1
- package/dist/web/smoke-tool-call-detail.d.ts +0 -1
- package/dist/web/smoke-tool-call-detail.js +0 -106
- package/dist/web/smoke-tool-call-detail.js.map +0 -1
- package/dist/web/smoke-tool-call-http.d.ts +0 -1
- package/dist/web/smoke-tool-call-http.js +0 -100
- package/dist/web/smoke-tool-call-http.js.map +0 -1
- package/dist/web/smoke-tool-detail-fields-http.d.ts +0 -1
- package/dist/web/smoke-tool-detail-fields-http.js +0 -121
- package/dist/web/smoke-tool-detail-fields-http.js.map +0 -1
- package/dist/web/smoke-web-agent-tasks.d.ts +0 -1
- package/dist/web/smoke-web-agent-tasks.js +0 -50
- package/dist/web/smoke-web-agent-tasks.js.map +0 -1
- package/dist/web/smoke-web-history.d.ts +0 -1
- package/dist/web/smoke-web-history.js +0 -183
- package/dist/web/smoke-web-history.js.map +0 -1
- package/dist/web/smoke-web-queue.d.ts +0 -1
- package/dist/web/smoke-web-queue.js +0 -7
- package/dist/web/smoke-web-queue.js.map +0 -1
- package/dist/web/smoke-web-terminal-tasks.d.ts +0 -1
- package/dist/web/smoke-web-terminal-tasks.js +0 -238
- package/dist/web/smoke-web-terminal-tasks.js.map +0 -1
- package/dist/web/terminal-presentation.test.d.ts +0 -1
- package/dist/web/terminal-presentation.test.js +0 -33
- package/dist/web/terminal-presentation.test.js.map +0 -1
- package/dist/web/tool-detail-fields.test.d.ts +0 -1
- package/dist/web/tool-detail-fields.test.js +0 -121
- package/dist/web/tool-detail-fields.test.js.map +0 -1
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
import fs from "node:fs/promises";
|
|
2
|
-
import os from "node:os";
|
|
3
|
-
import path from "node:path";
|
|
4
|
-
import { InMemoryAppState } from "../app/app-state.js";
|
|
5
|
-
import { ToolRegistry } from "../tools/registry.js";
|
|
6
|
-
import { runToolUse } from "../tools/run-tool-use.js";
|
|
7
|
-
import { FileSystemSkillCatalog, parseSkillMarkdown } from "./skill-filesystem.js";
|
|
8
|
-
import { createSkillCreateTool, createSkillListTool, createSkillReadTool, createSkillValidateTool } from "./skill-management-tools.js";
|
|
9
|
-
import { createSkillAwareCanUseTool, createSkillTool, InMemorySkillCatalog } from "./skill-tool.js";
|
|
10
|
-
async function main() {
|
|
11
|
-
const catalog = new InMemorySkillCatalog([
|
|
12
|
-
{
|
|
13
|
-
name: "review-plan",
|
|
14
|
-
description: "Review a plan before implementation.",
|
|
15
|
-
entrypoint: "Review the supplied plan for correctness and missing validation.",
|
|
16
|
-
execution: "inline",
|
|
17
|
-
allowedTools: ["plan_update"],
|
|
18
|
-
model: "gpt-5.5",
|
|
19
|
-
effort: "high",
|
|
20
|
-
},
|
|
21
|
-
{
|
|
22
|
-
name: "fork-docs",
|
|
23
|
-
description: "Long-running docs workflow.",
|
|
24
|
-
entrypoint: "Analyze docs independently.",
|
|
25
|
-
execution: "fork",
|
|
26
|
-
},
|
|
27
|
-
]);
|
|
28
|
-
const tools = new ToolRegistry();
|
|
29
|
-
tools.register(createSkillTool(catalog));
|
|
30
|
-
tools.register(createSkillListTool(catalog));
|
|
31
|
-
tools.register(createSkillReadTool(catalog));
|
|
32
|
-
tools.register(createSkillValidateTool());
|
|
33
|
-
const context = {
|
|
34
|
-
agentId: "main",
|
|
35
|
-
tools,
|
|
36
|
-
appState: new InMemoryAppState("main"),
|
|
37
|
-
emit: () => undefined,
|
|
38
|
-
};
|
|
39
|
-
const inline = await runToolUse({
|
|
40
|
-
id: "skill_inline",
|
|
41
|
-
name: "skill",
|
|
42
|
-
input: { skill: "/review-plan", args: "Plan A" },
|
|
43
|
-
}, context);
|
|
44
|
-
const fork = await runToolUse({
|
|
45
|
-
id: "skill_fork",
|
|
46
|
-
name: "skill",
|
|
47
|
-
input: { name: "fork-docs" },
|
|
48
|
-
}, context);
|
|
49
|
-
const missing = await runToolUse({
|
|
50
|
-
id: "skill_missing",
|
|
51
|
-
name: "skill",
|
|
52
|
-
input: { skill: "missing" },
|
|
53
|
-
}, context);
|
|
54
|
-
const listed = await runToolUse({ id: "skill_list", name: "skill_list", input: {} }, context);
|
|
55
|
-
const read = await runToolUse({ id: "skill_read", name: "skill_read", input: { name: "review-plan", includeEntrypoint: true } }, context);
|
|
56
|
-
const root = await fs.mkdtemp(path.join(os.tmpdir(), "neo-skills-"));
|
|
57
|
-
await fs.mkdir(path.join(root, "summarize"), { recursive: true });
|
|
58
|
-
await fs.writeFile(path.join(root, "summarize", "SKILL.md"), `---\nname: summarize\ndescription: Summarize text\nallowed-tools:\n - read\ntags:\n - writing\n---\n\nSummarize the provided text into crisp bullets.\n`, "utf8");
|
|
59
|
-
const fsCatalog = new FileSystemSkillCatalog([root]);
|
|
60
|
-
const parsed = parseSkillMarkdown(`---\ndescription: Demo\n---\n\nDo demo work.\n`, "demo");
|
|
61
|
-
const fsSkill = await fsCatalog.get("summarize");
|
|
62
|
-
const createTool = createSkillCreateTool(fsCatalog, { requireApproval: false });
|
|
63
|
-
const fsTools = new ToolRegistry();
|
|
64
|
-
fsTools.register(createTool);
|
|
65
|
-
const fsContext = { agentId: "main", tools: fsTools, appState: new InMemoryAppState("main"), emit: () => undefined };
|
|
66
|
-
const created = await runToolUse({
|
|
67
|
-
id: "skill_create",
|
|
68
|
-
name: "skill_create",
|
|
69
|
-
input: {
|
|
70
|
-
skill: {
|
|
71
|
-
name: "generated-review",
|
|
72
|
-
description: "Generated review workflow",
|
|
73
|
-
entrypoint: "Review generated output and list risks.",
|
|
74
|
-
execution: "inline",
|
|
75
|
-
allowedTools: ["file_read"],
|
|
76
|
-
},
|
|
77
|
-
},
|
|
78
|
-
}, fsContext);
|
|
79
|
-
const createdSkill = await fsCatalog.get("generated-review");
|
|
80
|
-
const guard = createSkillAwareCanUseTool(catalog);
|
|
81
|
-
const allowedDecision = await guard({ id: "allowed", name: "plan_update", input: {} }, {
|
|
82
|
-
...context,
|
|
83
|
-
options: { activeSkill: { name: "review-plan", allowedTools: ["plan_update"] } },
|
|
84
|
-
});
|
|
85
|
-
const deniedDecision = await guard({ id: "denied", name: "exec", input: {} }, {
|
|
86
|
-
...context,
|
|
87
|
-
options: { activeSkill: { name: "review-plan", allowedTools: ["plan_update"] } },
|
|
88
|
-
});
|
|
89
|
-
const inlineResult = inline.find((update) => update.message.blocks.some((block) => block.type === "tool_result"));
|
|
90
|
-
const injected = inline.some((update) => update.message.metadata?.skill === "review-plan");
|
|
91
|
-
const contextUpdated = inline.some((update) => update.context?.options?.mainLoopModel === "gpt-5.5" && update.context.options.activeSkill?.name === "review-plan");
|
|
92
|
-
const forkRejected = fork.some((update) => update.message.blocks.some((block) => block.type === "tool_result" && !block.ok));
|
|
93
|
-
const missingRejected = missing.some((update) => update.message.blocks.some((block) => block.type === "tool_result" && !block.ok));
|
|
94
|
-
const listWorked = listed.some((update) => update.message.blocks.some((block) => block.type === "tool_result" && block.ok));
|
|
95
|
-
const readWorked = read.some((update) => update.message.blocks.some((block) => block.type === "tool_result" && block.ok));
|
|
96
|
-
const filesystemWorked = fsSkill?.name === "summarize" && parsed.name === "demo";
|
|
97
|
-
const createWorked = createdSkill?.name === "generated-review" && created.some((update) => update.message.metadata?.skillManagement === "created");
|
|
98
|
-
const guardWorked = (typeof allowedDecision === "boolean" ? allowedDecision : allowedDecision.allowed) === true &&
|
|
99
|
-
typeof deniedDecision !== "boolean" && deniedDecision.allowed === false;
|
|
100
|
-
const ok = Boolean(inlineResult && injected && contextUpdated && forkRejected && missingRejected && listWorked && readWorked && filesystemWorked && createWorked && guardWorked);
|
|
101
|
-
console.log(JSON.stringify({ ok, injected, contextUpdated, forkRejected, missingRejected, listWorked, readWorked, filesystemWorked, createWorked, guardWorked }, null, 2));
|
|
102
|
-
if (!ok)
|
|
103
|
-
process.exitCode = 1;
|
|
104
|
-
}
|
|
105
|
-
main().catch((error) => {
|
|
106
|
-
console.error(error instanceof Error ? error.stack ?? error.message : String(error));
|
|
107
|
-
process.exitCode = 1;
|
|
108
|
-
});
|
|
109
|
-
//# sourceMappingURL=smoke-skills.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"smoke-skills.js","sourceRoot":"","sources":["../../src/skills/smoke-skills.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACvI,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEpG,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC;QACvC;YACE,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,sCAAsC;YACnD,UAAU,EAAE,kEAAkE;YAC9E,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,CAAC,aAAa,CAAC;YAC7B,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,MAAM;SACf;QACD;YACE,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,6BAA6B;YAC1C,UAAU,EAAE,6BAA6B;YACzC,SAAS,EAAE,MAAM;SAClB;KACF,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;IACjC,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACzC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,KAAK,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAmB;QAC9B,OAAO,EAAE,MAAM;QACf,KAAK;QACL,QAAQ,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS;KACtB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;QAC9B,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE;KACjD,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC;QAC5B,EAAE,EAAE,YAAY;QAChB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;KAC7B,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC;QAC/B,EAAE,EAAE,eAAe;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;KAC5B,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC9F,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAE1I,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,2JAA2J,EAAE,MAAM,CAAC,CAAC;IAClO,MAAM,SAAS,GAAG,IAAI,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,kBAAkB,CAAC,gDAAgD,EAAE,MAAM,CAAC,CAAC;IAC5F,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,qBAAqB,CAAC,SAAS,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,SAAS,GAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;IACrI,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC;QAC/B,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,IAAI,EAAE,kBAAkB;gBACxB,WAAW,EAAE,2BAA2B;gBACxC,UAAU,EAAE,yCAAyC;gBACrD,SAAS,EAAE,QAAQ;gBACnB,YAAY,EAAE,CAAC,WAAW,CAAC;aAC5B;SACF;KACF,EAAE,SAAS,CAAC,CAAC;IACd,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAE7D,MAAM,KAAK,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QACrF,GAAG,OAAO;QACV,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE;KACjF,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QAC5E,GAAG,OAAO;QACV,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE;KACjF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;IAClH,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,KAAK,aAAa,CAAC,CAAC;IAC3F,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,KAAK,aAAa,CAAC,CAAC;IACnK,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7H,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACnI,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5H,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1H,MAAM,gBAAgB,GAAG,OAAO,EAAE,IAAI,KAAK,WAAW,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC;IACjF,MAAM,YAAY,GAAG,YAAY,EAAE,IAAI,KAAK,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,KAAK,SAAS,CAAC,CAAC;IACnJ,MAAM,WAAW,GAAG,CAAC,OAAO,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,IAAI;QAC7G,OAAO,cAAc,KAAK,SAAS,IAAI,cAAc,CAAC,OAAO,KAAK,KAAK,CAAC;IAC1E,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,IAAI,QAAQ,IAAI,cAAc,IAAI,YAAY,IAAI,eAAe,IAAI,UAAU,IAAI,UAAU,IAAI,gBAAgB,IAAI,YAAY,IAAI,WAAW,CAAC,CAAC;IAEjL,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3K,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AAChC,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACrF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,159 +0,0 @@
|
|
|
1
|
-
import assert from 'node:assert/strict';
|
|
2
|
-
import { mkdtempSync, mkdirSync, rmSync } 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 { TaskStore } from './task-store.js';
|
|
8
|
-
import { createSubagentGetTool, createSubagentListTool, createSubagentMessageTool, createSubagentOutputTool, createSubagentStopTool, createSubagentResumeTool } from './subagent-tools.js';
|
|
9
|
-
const call = async (tool, input) => tool.call(input, {}, {});
|
|
10
|
-
function fixture() {
|
|
11
|
-
const dir = mkdtempSync(join(tmpdir(), 'neo-task-tools-'));
|
|
12
|
-
const store = new TaskStore();
|
|
13
|
-
const task = createLocalAgentTask({ taskId: 'task-test', agentId: 'agent-test', description: 'task', prompt: 'PRIVATE_PROMPT'.repeat(1000), outputFile: join(dir, 'task.txt') });
|
|
14
|
-
store.upsert(task);
|
|
15
|
-
return { store, task, cleanup: () => rmSync(dir, { recursive: true, force: true }) };
|
|
16
|
-
}
|
|
17
|
-
test('default get/list are bounded and omit full prompt/result/usage; detail remains explicit', async () => {
|
|
18
|
-
const f = fixture();
|
|
19
|
-
try {
|
|
20
|
-
f.task.status = 'completed';
|
|
21
|
-
f.task.result = { agent_id: f.task.agentId, agent_type: 'test', content: 'LARGE_RESULT'.repeat(10000), total_duration_ms: 10, total_tool_use_count: 1, usage: { raw: 'USAGE'.repeat(10000) } };
|
|
22
|
-
f.task.progress.lastText = 'x'.repeat(10000);
|
|
23
|
-
const get = await call(createSubagentGetTool(f.store), { task_id: f.task.id });
|
|
24
|
-
const summary = get.output;
|
|
25
|
-
assert.equal(summary.run_generation, 1);
|
|
26
|
-
assert.equal(summary.result_available, true);
|
|
27
|
-
assert.equal(summary.prompt, undefined);
|
|
28
|
-
assert.equal(summary.result, undefined);
|
|
29
|
-
assert.ok(JSON.stringify(summary).length < 2500);
|
|
30
|
-
const list = await call(createSubagentListTool(f.store), {});
|
|
31
|
-
assert.ok(JSON.stringify(list.output).length < 2600);
|
|
32
|
-
const detail = await call(createSubagentGetTool(f.store), { task_id: f.task.id, detail: true });
|
|
33
|
-
assert.equal(detail.output.result.content, f.task.result.content);
|
|
34
|
-
assert.equal(detail.output.prompt, f.task.prompt);
|
|
35
|
-
}
|
|
36
|
-
finally {
|
|
37
|
-
f.cleanup();
|
|
38
|
-
}
|
|
39
|
-
});
|
|
40
|
-
test('running output never mistakes legacy previous result for current completion', async () => {
|
|
41
|
-
const f = fixture();
|
|
42
|
-
try {
|
|
43
|
-
f.task.status = 'running';
|
|
44
|
-
f.task.runGeneration = 2;
|
|
45
|
-
f.task.result = { agent_id: f.task.agentId, agent_type: 'test', content: 'OLD_COMPLETION', total_duration_ms: 1, total_tool_use_count: 0 };
|
|
46
|
-
f.task.progress.lastText = 'current <progress>';
|
|
47
|
-
const output = await call(createSubagentOutputTool(f.store), { task_id: f.task.id });
|
|
48
|
-
assert.match(String(output.output), /<retrieval_status>not_ready/);
|
|
49
|
-
assert.match(String(output.output), /<run_generation>2/);
|
|
50
|
-
assert.match(String(output.output), /current <progress>/);
|
|
51
|
-
assert.doesNotMatch(String(output.output), /OLD_COMPLETION/);
|
|
52
|
-
const detail = await call(createSubagentGetTool(f.store), { task_id: f.task.id, detail: true });
|
|
53
|
-
assert.equal(detail.output.result, undefined);
|
|
54
|
-
assert.equal(f.task.notified, false);
|
|
55
|
-
}
|
|
56
|
-
finally {
|
|
57
|
-
f.cleanup();
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
|
-
test('pending tasks are queued, terminal tasks explicitly require resume, never imply implementation', async () => {
|
|
61
|
-
const f = fixture();
|
|
62
|
-
try {
|
|
63
|
-
for (const status of ['pending', 'running', 'completed', 'failed', 'killed']) {
|
|
64
|
-
f.task.status = status;
|
|
65
|
-
const result = await call(createSubagentMessageTool(f.store), { target: f.task.agentId, message: 'extra requirement' });
|
|
66
|
-
const output = result.output;
|
|
67
|
-
const terminal = ['completed', 'failed', 'killed'].includes(status);
|
|
68
|
-
assert.equal(output.status, terminal ? 'queued_for_resume' : 'queued');
|
|
69
|
-
assert.equal(output.requires_resume, terminal);
|
|
70
|
-
assert.equal(output.delivery_status, 'queued');
|
|
71
|
-
assert.equal(typeof output.message_id, 'string');
|
|
72
|
-
assert.ok(output.queued_at);
|
|
73
|
-
assert.match(output.note, /not proof of implementation/);
|
|
74
|
-
}
|
|
75
|
-
assert.equal(f.task.pendingMessages.length, 5);
|
|
76
|
-
f.task.status = 'running';
|
|
77
|
-
f.store.deliverPendingMessages(f.task.id, f.task.runGeneration);
|
|
78
|
-
const summary = (await call(createSubagentGetTool(f.store), { task_id: f.task.id })).output;
|
|
79
|
-
assert.equal(summary.message_delivery.queued, 0);
|
|
80
|
-
assert.equal(summary.message_delivery.delivered_this_run_retained, 5);
|
|
81
|
-
assert.equal(summary.message_delivery.recent.length, 5);
|
|
82
|
-
assert.equal(summary.message_delivery.recent[0].status, 'delivered');
|
|
83
|
-
assert.equal(JSON.stringify(summary).includes('extra requirement'), false);
|
|
84
|
-
}
|
|
85
|
-
finally {
|
|
86
|
-
f.cleanup();
|
|
87
|
-
}
|
|
88
|
-
});
|
|
89
|
-
test('calling parent scope survives A to B foreground switch without granting B or child access', async () => {
|
|
90
|
-
const root = mkdtempSync(join(tmpdir(), 'neo-task-scope-'));
|
|
91
|
-
const a = join(root, 'a'), b = join(root, 'b');
|
|
92
|
-
mkdirSync(a);
|
|
93
|
-
mkdirSync(b);
|
|
94
|
-
const store = new TaskStore();
|
|
95
|
-
const context = (dir, isSubagent = false) => ({
|
|
96
|
-
isSubagent, session: dir ? { sessionId: dir, sessionDir: dir } : undefined,
|
|
97
|
-
});
|
|
98
|
-
const invoke = (tool, input, ctx = context(a)) => tool.call(input, ctx, {});
|
|
99
|
-
const make = (dir, id) => {
|
|
100
|
-
store.bindSession(dir);
|
|
101
|
-
const task = createLocalAgentTask({ taskId: `task-${id}`, agentId: `child-${id}`, description: id, prompt: id, outputFile: join(dir, 'output.txt') });
|
|
102
|
-
store.upsert(task);
|
|
103
|
-
store.registerName('worker', task.agentId);
|
|
104
|
-
store.markRunning(task.id);
|
|
105
|
-
return task;
|
|
106
|
-
};
|
|
107
|
-
try {
|
|
108
|
-
const ta = make(a, 'a'), tb = make(b, 'b');
|
|
109
|
-
const list = await invoke(createSubagentListTool(store), {});
|
|
110
|
-
assert.deepEqual(list.output.tasks.map((task) => task.task_id), [ta.id]);
|
|
111
|
-
assert.equal((await invoke(createSubagentGetTool(store), { task_id: ta.id })).ok, true);
|
|
112
|
-
for (const tool of [createSubagentGetTool(store), createSubagentOutputTool(store), createSubagentStopTool(store)]) {
|
|
113
|
-
assert.equal((await invoke(tool, { task_id: tb.id })).ok, false);
|
|
114
|
-
}
|
|
115
|
-
assert.equal((await invoke(createSubagentMessageTool(store), { target: 'worker', message: 'only A' })).ok, true);
|
|
116
|
-
assert.equal(ta.pendingMessages.length, 1);
|
|
117
|
-
assert.equal(tb.pendingMessages.length, 0);
|
|
118
|
-
assert.equal((await invoke(createSubagentMessageTool(store), { target: tb.agentId, message: 'wrong owner' })).ok, false);
|
|
119
|
-
assert.equal(store.activeSessionDir, b, 'tools must not switch global active view');
|
|
120
|
-
const waiting = invoke(createSubagentOutputTool(store), { task_id: ta.id, block: true, timeout_ms: 1000 });
|
|
121
|
-
store.bindSession(a);
|
|
122
|
-
store.bindSession(b);
|
|
123
|
-
store.fail(ta.id, 'A result');
|
|
124
|
-
const output = await waiting;
|
|
125
|
-
assert.equal(output.ok, true);
|
|
126
|
-
assert.match(String(output.output), /A result/);
|
|
127
|
-
assert.equal(ta.notified, true);
|
|
128
|
-
assert.equal(tb.notified, false);
|
|
129
|
-
let resumed = 0;
|
|
130
|
-
const resume = createSubagentResumeTool(store, async () => { resumed++; return { ok: true }; });
|
|
131
|
-
assert.equal((await invoke(resume, { task_id: ta.id })).ok, false, 'legacy foreground-bound handler rejected for detached A');
|
|
132
|
-
store.fail(tb.id, 'B result');
|
|
133
|
-
assert.equal((await invoke(resume, { task_id: tb.id })).ok, false, 'A cannot resume B');
|
|
134
|
-
assert.equal(resumed, 0);
|
|
135
|
-
store.bindSession(a);
|
|
136
|
-
assert.equal((await invoke(resume, { task_id: ta.id })).ok, true);
|
|
137
|
-
assert.equal(resumed, 1);
|
|
138
|
-
const child = context(join(a, 'subagents', ta.agentId), true);
|
|
139
|
-
assert.deepEqual((await invoke(createSubagentListTool(store), {}, child)).output, { tasks: [] });
|
|
140
|
-
assert.equal((await invoke(createSubagentGetTool(store), { task_id: ta.id }, child)).ok, false);
|
|
141
|
-
assert.equal((await invoke(createSubagentMessageTool(store), { target: ta.agentId, message: 'no parent escalation' }, child)).ok, false);
|
|
142
|
-
assert.equal((await invoke(resume, { task_id: ta.id }, child)).ok, false);
|
|
143
|
-
assert.equal((await invoke(resume, { task_id: ta.id }, { ...context(a), agentType: 'fork' })).ok, false);
|
|
144
|
-
assert.equal(resumed, 1);
|
|
145
|
-
assert.deepEqual((await invoke(createSubagentListTool(store), {}, context())).output, { tasks: [] }, 'missing context is unowned, not active');
|
|
146
|
-
store.prepareResume(ta.id, new AbortController());
|
|
147
|
-
store.markRunning(ta.id);
|
|
148
|
-
store.bindSession(b);
|
|
149
|
-
assert.equal((await invoke(createSubagentStopTool(store), { task_id: ta.id })).ok, true);
|
|
150
|
-
assert.equal(ta.status, 'killed', 'detached A can stop its own running child');
|
|
151
|
-
assert.equal(tb.status, 'failed');
|
|
152
|
-
assert.equal(store.activeSessionDir, b);
|
|
153
|
-
}
|
|
154
|
-
finally {
|
|
155
|
-
store.flush();
|
|
156
|
-
rmSync(root, { recursive: true, force: true });
|
|
157
|
-
}
|
|
158
|
-
});
|
|
159
|
-
//# sourceMappingURL=subagent-tools.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-tools.test.js","sourceRoot":"","sources":["../../src/tasks/subagent-tools.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,101 +0,0 @@
|
|
|
1
|
-
import assert from "node:assert/strict";
|
|
2
|
-
import { mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } 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 { TaskStore } from "./task-store.js";
|
|
8
|
-
import { persistTask, MAX_TASK_RECORD_BYTES } from "./task-persistence.js";
|
|
9
|
-
function fixture() {
|
|
10
|
-
const dir = mkdtempSync(join(tmpdir(), "neo-ack-size-"));
|
|
11
|
-
const store = new TaskStore();
|
|
12
|
-
store.bindSession(dir);
|
|
13
|
-
const make = (id) => {
|
|
14
|
-
const task = createLocalAgentTask({ taskId: id, agentId: `agent-${id}`, description: id, prompt: id, outputFile: join(dir, `${id}.txt`) });
|
|
15
|
-
store.upsert(task);
|
|
16
|
-
return task;
|
|
17
|
-
};
|
|
18
|
-
const reload = () => { const next = new TaskStore(); next.loadSession(dir); return next; };
|
|
19
|
-
return { dir, store, make, reload, cleanup: () => rmSync(dir, { recursive: true, force: true }) };
|
|
20
|
-
}
|
|
21
|
-
test("ack persists, collection is read-only, interrupted runs remain recoverable, legacy defaults unacknowledged", () => {
|
|
22
|
-
const f = fixture();
|
|
23
|
-
try {
|
|
24
|
-
const done = f.make("done"), pending = f.make("pending"), running = f.make("running");
|
|
25
|
-
f.store.fail(done.id, "done");
|
|
26
|
-
f.store.markRunning(running.id);
|
|
27
|
-
const file = join(f.dir, "subagents", done.agentId, "task.json");
|
|
28
|
-
const before = readFileSync(file, "utf8");
|
|
29
|
-
assert.deepEqual(f.store.collectUnnotifiedCompletions().map(t => t.id), [done.id]);
|
|
30
|
-
assert.equal(readFileSync(file, "utf8"), before);
|
|
31
|
-
f.store.markNotified(done.id);
|
|
32
|
-
assert.equal(JSON.parse(readFileSync(file, "utf8")).notified, true);
|
|
33
|
-
for (const task of [pending, running]) {
|
|
34
|
-
task.notified = true;
|
|
35
|
-
persistTask(task);
|
|
36
|
-
}
|
|
37
|
-
const fresh = f.reload();
|
|
38
|
-
assert.equal(fresh.get(done.id)?.notified, true);
|
|
39
|
-
assert.deepEqual(fresh.collectUnnotifiedCompletions(), []);
|
|
40
|
-
assert.deepEqual(fresh.recoverableInterruptedTasks().map(t => t.id).sort(), [pending.id, running.id].sort());
|
|
41
|
-
for (const task of fresh.recoverableInterruptedTasks())
|
|
42
|
-
fresh.markNotified(task.id);
|
|
43
|
-
assert.deepEqual(f.reload().recoverableInterruptedTasks(), []);
|
|
44
|
-
fresh.prepareResume(done.id, new AbortController());
|
|
45
|
-
assert.deepEqual(f.reload().recoverableInterruptedTasks().map(t => t.id), [done.id]);
|
|
46
|
-
const legacy = JSON.parse(readFileSync(file, "utf8"));
|
|
47
|
-
delete legacy.notified;
|
|
48
|
-
writeFileSync(file, JSON.stringify(legacy));
|
|
49
|
-
assert.equal(f.reload().get(done.id)?.notified, false);
|
|
50
|
-
}
|
|
51
|
-
finally {
|
|
52
|
-
f.cleanup();
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
test("failed ack write preserves memory and disk retryability", () => {
|
|
56
|
-
const f = fixture();
|
|
57
|
-
try {
|
|
58
|
-
const task = f.make("done");
|
|
59
|
-
f.store.fail(task.id, "result");
|
|
60
|
-
const file = join(f.dir, "subagents", task.agentId, "task.json");
|
|
61
|
-
const before = readFileSync(file, "utf8"), updatedAt = task.updatedAt;
|
|
62
|
-
const agentId = task.agentId;
|
|
63
|
-
task.agentId = "../invalid";
|
|
64
|
-
assert.throws(() => f.store.markNotified(task.id), /identifier/);
|
|
65
|
-
task.agentId = agentId;
|
|
66
|
-
assert.equal(task.notified, false);
|
|
67
|
-
assert.equal(task.updatedAt, updatedAt);
|
|
68
|
-
assert.equal(readFileSync(file, "utf8"), before);
|
|
69
|
-
assert.deepEqual(f.store.collectUnnotifiedCompletions().map(t => t.id), [task.id]);
|
|
70
|
-
assert.equal(f.reload().get(task.id)?.notified, false);
|
|
71
|
-
f.store.markNotified(task.id);
|
|
72
|
-
assert.deepEqual(f.reload().collectUnnotifiedCompletions(), []);
|
|
73
|
-
}
|
|
74
|
-
finally {
|
|
75
|
-
f.cleanup();
|
|
76
|
-
}
|
|
77
|
-
});
|
|
78
|
-
test("over-64MiB UTF-8 write preserves previous snapshot and accepted pending messages", () => {
|
|
79
|
-
const f = fixture();
|
|
80
|
-
try {
|
|
81
|
-
const task = f.make("large");
|
|
82
|
-
assert.equal(f.store.queueMessage(task.agentId, "accepted followup").ok, true);
|
|
83
|
-
const dir = join(f.dir, "subagents", task.agentId), file = join(dir, "task.json");
|
|
84
|
-
const before = readFileSync(file, "utf8"), entries = readdirSync(dir);
|
|
85
|
-
const prompt = task.prompt;
|
|
86
|
-
task.prompt = "界".repeat(Math.ceil(MAX_TASK_RECORD_BYTES / 3));
|
|
87
|
-
assert.ok(task.prompt.length < MAX_TASK_RECORD_BYTES);
|
|
88
|
-
assert.throws(() => persistTask(task), /Oversized task record/);
|
|
89
|
-
assert.equal(readFileSync(file, "utf8"), before);
|
|
90
|
-
assert.deepEqual(readdirSync(dir), entries);
|
|
91
|
-
assert.equal(task.pendingMessages.length, 1);
|
|
92
|
-
task.prompt = prompt;
|
|
93
|
-
const fresh = f.reload();
|
|
94
|
-
assert.equal(fresh.get(task.id)?.pendingMessages.length, 1);
|
|
95
|
-
assert.deepEqual(fresh.get(task.id)?.pendingMessages[0]?.blocks, task.pendingMessages[0]?.blocks);
|
|
96
|
-
}
|
|
97
|
-
finally {
|
|
98
|
-
f.cleanup();
|
|
99
|
-
}
|
|
100
|
-
});
|
|
101
|
-
//# sourceMappingURL=task-ack-size.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"task-ack-size.test.js","sourceRoot":"","sources":["../../src/tasks/task-ack-size.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|