Add inline file attachment support for sessions_spawn (subagent runtime only): - Schema: attachments[] (name, content, encoding, mimeType) and attachAs.mountPath hint - Materialization: files written to .openclaw/attachments/<uuid>/ with manifest.json - Validation: strict base64 decode, filename checks, size limits, duplicate detection - Transcript redaction: sanitizeToolCallInputs redacts attachment content from persisted transcripts - Lifecycle cleanup: safeRemoveAttachmentsDir with symlink-safe path containment check - Config: tools.sessions_spawn.attachments (enabled, maxFiles, maxFileBytes, maxTotalBytes, retainOnSessionKeep) - Registry: attachmentsDir/attachmentsRootDir/retainAttachmentsOnKeep on SubagentRunRecord - ACP rejection: attachments rejected for runtime=acp with clear error message - Docs: updated tools/index.md, concepts/session-tool.md, configuration-reference.md - Tests: 85 new/updated tests across 5 test files Fixes: - Guard fs.rm in materialization catch block with try/catch (review concern #1) - Remove unreachable fallback in safeRemoveAttachmentsDir (review concern #7) - Move attachment cleanup out of retry path to avoid timing issues with announce loop Co-authored-by: Tyler Yust <TYTYYUST@YAHOO.COM> Co-authored-by: napetrov <napetrov@users.noreply.github.com>
143 lines
4.1 KiB
TypeScript
143 lines
4.1 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const hoisted = vi.hoisted(() => {
|
|
const spawnSubagentDirectMock = vi.fn();
|
|
const spawnAcpDirectMock = vi.fn();
|
|
return {
|
|
spawnSubagentDirectMock,
|
|
spawnAcpDirectMock,
|
|
};
|
|
});
|
|
|
|
vi.mock("../subagent-spawn.js", () => ({
|
|
SUBAGENT_SPAWN_MODES: ["run", "session"],
|
|
spawnSubagentDirect: (...args: unknown[]) => hoisted.spawnSubagentDirectMock(...args),
|
|
}));
|
|
|
|
vi.mock("../acp-spawn.js", () => ({
|
|
ACP_SPAWN_MODES: ["run", "session"],
|
|
spawnAcpDirect: (...args: unknown[]) => hoisted.spawnAcpDirectMock(...args),
|
|
}));
|
|
|
|
const { createSessionsSpawnTool } = await import("./sessions-spawn-tool.js");
|
|
|
|
describe("sessions_spawn tool", () => {
|
|
beforeEach(() => {
|
|
hoisted.spawnSubagentDirectMock.mockReset().mockResolvedValue({
|
|
status: "accepted",
|
|
childSessionKey: "agent:main:subagent:1",
|
|
runId: "run-subagent",
|
|
});
|
|
hoisted.spawnAcpDirectMock.mockReset().mockResolvedValue({
|
|
status: "accepted",
|
|
childSessionKey: "agent:codex:acp:1",
|
|
runId: "run-acp",
|
|
});
|
|
});
|
|
|
|
it("uses subagent runtime by default", async () => {
|
|
const tool = createSessionsSpawnTool({
|
|
agentSessionKey: "agent:main:main",
|
|
agentChannel: "discord",
|
|
agentAccountId: "default",
|
|
agentTo: "channel:123",
|
|
agentThreadId: "456",
|
|
});
|
|
|
|
const result = await tool.execute("call-1", {
|
|
task: "build feature",
|
|
agentId: "main",
|
|
model: "anthropic/claude-sonnet-4-6",
|
|
thinking: "medium",
|
|
runTimeoutSeconds: 5,
|
|
thread: true,
|
|
mode: "session",
|
|
cleanup: "keep",
|
|
});
|
|
|
|
expect(result.details).toMatchObject({
|
|
status: "accepted",
|
|
childSessionKey: "agent:main:subagent:1",
|
|
runId: "run-subagent",
|
|
});
|
|
expect(hoisted.spawnSubagentDirectMock).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
task: "build feature",
|
|
agentId: "main",
|
|
model: "anthropic/claude-sonnet-4-6",
|
|
thinking: "medium",
|
|
runTimeoutSeconds: 5,
|
|
thread: true,
|
|
mode: "session",
|
|
cleanup: "keep",
|
|
}),
|
|
expect.objectContaining({
|
|
agentSessionKey: "agent:main:main",
|
|
}),
|
|
);
|
|
expect(hoisted.spawnAcpDirectMock).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("routes to ACP runtime when runtime=acp", async () => {
|
|
const tool = createSessionsSpawnTool({
|
|
agentSessionKey: "agent:main:main",
|
|
agentChannel: "discord",
|
|
agentAccountId: "default",
|
|
agentTo: "channel:123",
|
|
agentThreadId: "456",
|
|
});
|
|
|
|
const result = await tool.execute("call-2", {
|
|
runtime: "acp",
|
|
task: "investigate the failing CI run",
|
|
agentId: "codex",
|
|
cwd: "/workspace",
|
|
thread: true,
|
|
mode: "session",
|
|
});
|
|
|
|
expect(result.details).toMatchObject({
|
|
status: "accepted",
|
|
childSessionKey: "agent:codex:acp:1",
|
|
runId: "run-acp",
|
|
});
|
|
expect(hoisted.spawnAcpDirectMock).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
task: "investigate the failing CI run",
|
|
agentId: "codex",
|
|
cwd: "/workspace",
|
|
thread: true,
|
|
mode: "session",
|
|
}),
|
|
expect.objectContaining({
|
|
agentSessionKey: "agent:main:main",
|
|
}),
|
|
);
|
|
expect(hoisted.spawnSubagentDirectMock).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects attachments for ACP runtime", async () => {
|
|
const tool = createSessionsSpawnTool({
|
|
agentSessionKey: "agent:main:main",
|
|
agentChannel: "discord",
|
|
agentAccountId: "default",
|
|
agentTo: "channel:123",
|
|
agentThreadId: "456",
|
|
});
|
|
|
|
const result = await tool.execute("call-3", {
|
|
runtime: "acp",
|
|
task: "analyze file",
|
|
attachments: [{ name: "a.txt", content: "hello", encoding: "utf8" }],
|
|
});
|
|
|
|
expect(result.details).toMatchObject({
|
|
status: "error",
|
|
});
|
|
const details = result.details as { error?: string };
|
|
expect(details.error).toContain("attachments are currently unsupported for runtime=acp");
|
|
expect(hoisted.spawnAcpDirectMock).not.toHaveBeenCalled();
|
|
expect(hoisted.spawnSubagentDirectMock).not.toHaveBeenCalled();
|
|
});
|
|
});
|