can1357
408a92d91a
- Enabled granular task execution by allowing batches to interleave blocking items with non-blocking async background spawns. - Updated task orchestration to support simultaneous inline result collection and persistent background job tracking. - Improved agent visibility in the job tool by reporting running subagents even when not explicitly linked to a backing job ID. - Enhanced terminal state handling to prevent premature tool block closures while async background operations remain active.
272 lines
8.8 KiB
TypeScript
272 lines
8.8 KiB
TypeScript
/**
|
|
* The job tool's TUI preview must not leak the model-facing `<task-result>`
|
|
* envelope (prompts/tools/task-summary.md): a settled task job previews the
|
|
* inner <output>/<preview> body, while non-envelope result text (bash jobs)
|
|
* passes through unchanged.
|
|
*/
|
|
import { afterAll, beforeAll, describe, expect, it } from "bun:test";
|
|
import { resetSettingsForTest, Settings } from "@oh-my-pi/pi-coding-agent/config/settings";
|
|
import { initTheme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
|
|
import { jobToolRenderer } from "@oh-my-pi/pi-coding-agent/tools/job";
|
|
import { prompt } from "@oh-my-pi/pi-utils";
|
|
import taskSummaryTemplate from "../src/prompts/tools/task-summary.md" with { type: "text" };
|
|
|
|
function renderLines(resultText: string): string {
|
|
const result = {
|
|
content: [{ type: "text", text: "" }],
|
|
details: {
|
|
jobs: [
|
|
{
|
|
id: "SpawnProbe",
|
|
type: "task" as const,
|
|
status: "completed" as const,
|
|
label: "SpawnProbe",
|
|
durationMs: 8_700,
|
|
resultText,
|
|
},
|
|
],
|
|
},
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
);
|
|
return (component.render(120) as readonly string[]).join("\n");
|
|
}
|
|
|
|
describe("job renderer task-result preview", () => {
|
|
beforeAll(async () => {
|
|
resetSettingsForTest();
|
|
await Settings.init({ inMemory: true });
|
|
await initTheme();
|
|
});
|
|
|
|
afterAll(() => {
|
|
resetSettingsForTest();
|
|
});
|
|
|
|
it("previews the envelope body, not the wrapper markup", () => {
|
|
const summary = prompt.render(taskSummaryTemplate, {
|
|
agentName: "sonic",
|
|
id: "SpawnProbe",
|
|
status: "completed",
|
|
duration: "8.7s",
|
|
preview: "Probe finished: spawned worker, ping ok.",
|
|
truncated: false,
|
|
meta: { lineCount: 3, charSize: "120 B" },
|
|
mergeSummary: "",
|
|
});
|
|
const deliveryText = `${summary}\n\nSpawnProbe is now idle — message it via \`irc\` to follow up; transcript at history://SpawnProbe`;
|
|
|
|
const output = renderLines(deliveryText);
|
|
expect(output).toContain("Probe finished: spawned worker, ping ok.");
|
|
expect(output).not.toContain("<task-result");
|
|
expect(output).not.toContain("<output>");
|
|
});
|
|
|
|
it("previews the truncated <preview> body the same way", () => {
|
|
const summary = prompt.render(taskSummaryTemplate, {
|
|
agentName: "task",
|
|
id: "BigOne",
|
|
status: "completed",
|
|
duration: "2m",
|
|
preview: "first line of long output",
|
|
truncated: true,
|
|
mergeSummary: "",
|
|
});
|
|
|
|
const output = renderLines(summary);
|
|
expect(output).toContain("first line of long output");
|
|
expect(output).not.toContain("<task-result");
|
|
});
|
|
|
|
it("flattens a pretty-printed JSON body instead of previewing a lone brace", () => {
|
|
const summary = prompt.render(taskSummaryTemplate, {
|
|
agentName: "sonic",
|
|
id: "EchoAlpha",
|
|
status: "completed",
|
|
duration: "11.6s",
|
|
preview: '{\n "echo": "alpha",\n "ok": true\n}',
|
|
truncated: false,
|
|
mergeSummary: "",
|
|
});
|
|
|
|
const output = Bun.stripANSI(renderLines(summary));
|
|
expect(output).toContain('{ "echo": "alpha", "ok": true }');
|
|
expect(output.split("\n").some(line => line.trim() === "{")).toBe(false);
|
|
});
|
|
|
|
it("passes non-envelope result text through unchanged", () => {
|
|
const output = renderLines("42 pass, 0 fail (18.4s)");
|
|
expect(output).toContain("42 pass, 0 fail (18.4s)");
|
|
});
|
|
|
|
it("drops the id column when the label repeats it", () => {
|
|
// Task jobs label themselves with their agent id; rendering both columns
|
|
// stutters ("SpawnProbe ⟨task⟩ SpawnProbe").
|
|
const output = Bun.stripANSI(renderLines("done"));
|
|
const header = output.split("\n").find(line => line.includes("SpawnProbe"));
|
|
expect(header).toBeDefined();
|
|
expect(header!.match(/SpawnProbe/g)).toHaveLength(1);
|
|
});
|
|
|
|
describe("collapse and filter when turned into a result", () => {
|
|
const jobsData = [
|
|
{
|
|
id: "Job1",
|
|
type: "task" as const,
|
|
status: "running" as const,
|
|
label: "Job1 running",
|
|
durationMs: 1200,
|
|
},
|
|
{
|
|
id: "Job2",
|
|
type: "task" as const,
|
|
status: "completed" as const,
|
|
label: "Job2 completed",
|
|
durationMs: 3400,
|
|
resultText: "Job2 result",
|
|
},
|
|
{
|
|
id: "Job3",
|
|
type: "task" as const,
|
|
status: "running" as const,
|
|
label: "Job3 running",
|
|
durationMs: 500,
|
|
},
|
|
];
|
|
|
|
it("shows all jobs when isPartial is true", () => {
|
|
const result = {
|
|
content: [{ type: "text" as const, text: "" }],
|
|
details: { jobs: jobsData },
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true, isPartial: true } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
{ poll: [] },
|
|
);
|
|
const output = Bun.stripANSI((component.render(120) as readonly string[]).join("\n"));
|
|
expect(output).toContain("Job1 running");
|
|
expect(output).toContain("Job2 completed");
|
|
expect(output).toContain("Job3 running");
|
|
expect(output).toContain("waiting on 2 of 3 jobs");
|
|
});
|
|
|
|
it("shows only finished jobs when isPartial is false and it is a poll call", () => {
|
|
const result = {
|
|
content: [{ type: "text" as const, text: "" }],
|
|
details: { jobs: jobsData },
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true, isPartial: false } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
{ poll: [] },
|
|
);
|
|
const output = Bun.stripANSI((component.render(120) as readonly string[]).join("\n"));
|
|
expect(output).not.toContain("Job1 running");
|
|
expect(output).toContain("Job2 completed");
|
|
expect(output).not.toContain("Job3 running");
|
|
expect(output).toContain("1 job settled");
|
|
});
|
|
|
|
it("shows nothing when isPartial is false and all jobs are running and it is a poll call", () => {
|
|
const runningJobsOnly = [
|
|
{
|
|
id: "Job1",
|
|
type: "task" as const,
|
|
status: "running" as const,
|
|
label: "Job1 running",
|
|
durationMs: 1200,
|
|
},
|
|
];
|
|
const result = {
|
|
content: [{ type: "text" as const, text: "" }],
|
|
details: { jobs: runningJobsOnly },
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true, isPartial: false } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
{ poll: [] },
|
|
);
|
|
const lines = component.render(120) as readonly string[];
|
|
expect(lines).toHaveLength(0);
|
|
});
|
|
|
|
it("does not collapse running jobs when isPartial is false and list is true", () => {
|
|
const result = {
|
|
content: [{ type: "text" as const, text: "" }],
|
|
details: { jobs: jobsData },
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true, isPartial: false } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
{ list: true },
|
|
);
|
|
const output = Bun.stripANSI((component.render(120) as readonly string[]).join("\n"));
|
|
expect(output).toContain("Job1 running");
|
|
expect(output).toContain("Job2 completed");
|
|
expect(output).toContain("Job3 running");
|
|
expect(output).toContain("waiting on 2 of 3 jobs");
|
|
});
|
|
|
|
it("does not collapse running jobs when isPartial is false and cancel-only is true", () => {
|
|
const result = {
|
|
content: [{ type: "text" as const, text: "" }],
|
|
details: { jobs: jobsData },
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true, isPartial: false } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
{ cancel: ["Job1"] },
|
|
);
|
|
const output = Bun.stripANSI((component.render(120) as readonly string[]).join("\n"));
|
|
expect(output).toContain("Job1 running");
|
|
expect(output).toContain("Job2 completed");
|
|
expect(output).toContain("Job3 running");
|
|
expect(output).toContain("waiting on 2 of 3 jobs");
|
|
});
|
|
|
|
it("renders agent rows for running agents outside job control", () => {
|
|
const result = {
|
|
content: [{ type: "text" as const, text: "" }],
|
|
details: {
|
|
jobs: [],
|
|
agents: [{ id: "Worker", parentId: "Main", activity: "grepping the tree", ageMs: 65_000 }],
|
|
},
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true, isPartial: false } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
{ list: true },
|
|
);
|
|
const output = Bun.stripANSI((component.render(120) as readonly string[]).join("\n"));
|
|
expect(output).toContain("1 running agent — no jobs");
|
|
expect(output).toContain("Worker");
|
|
expect(output).toContain("grepping the tree");
|
|
});
|
|
|
|
it("keeps a sealed bare-poll result visible when it carries an agent roster", () => {
|
|
const result = {
|
|
content: [{ type: "text" as const, text: "No running background jobs to wait for." }],
|
|
details: { jobs: [], agents: [{ id: "Worker", ageMs: 1_000 }] },
|
|
};
|
|
const component = jobToolRenderer.renderResult(
|
|
result,
|
|
{ expanded: true, isPartial: false } as Parameters<typeof jobToolRenderer.renderResult>[1],
|
|
theme,
|
|
{ poll: [] },
|
|
);
|
|
const output = Bun.stripANSI((component.render(120) as readonly string[]).join("\n"));
|
|
expect(output).toContain("Worker");
|
|
});
|
|
});
|
|
});
|