b373c54cd7
Bug: Ctrl+C on the ask tool selector threw ToolAbortError, the turn ended with stopReason === "aborted", and handleBackgroundEvent fired sendCompletionNotification() unconditionally — producing a misleading "Task complete" desktop toast for a turn that never actually completed. Fix mirrors the stopReason filter already used by #currentContextTokens, #handleMessageEnd, and the retry / TTSR / compaction skip paths across agent-session.ts: check the most recent assistant message via session.getLastAssistantMessage() and return early when stopReason is "aborted" or "error". Test coverage (event-controller-abort-guard.test.ts, 6 cases): - aborted -> 0 sendNotification calls - error -> 0 calls - stop -> 1 call (normal completion) - no last assistant message -> proceeds (defensive) - isBackgrounded=false (foreground) -> still 0 - completion.notify=off -> still 0 Matching guard applied to the standalone desktop-notify extension (~/.omp/agent/extensions/desktop-notify/index.ts) which is currently the live producer of completion toasts after Phase 1 of seed_0ca7e1143ac1.
116 lines
4.8 KiB
TypeScript
116 lines
4.8 KiB
TypeScript
/**
|
|
* Regression test for the abort-guard on `EventController.sendCompletionNotification`.
|
|
*
|
|
* Bug: a user Ctrl+C on the `ask` tool selector throws `ToolAbortError`,
|
|
* the turn ends with `stopReason === "aborted"`, and `handleBackgroundEvent`
|
|
* fires `sendCompletionNotification()` unconditionally. The pre-fix code
|
|
* then produced a misleading "Task complete" desktop toast for a turn that
|
|
* never actually completed. The fix mirrors the `stopReason !== "aborted"`
|
|
* pattern already used by `#currentContextTokens`, `#handleMessageEnd`, and
|
|
* the retry / TTSR / compaction skip paths in `agent-session.ts`.
|
|
*/
|
|
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "bun:test";
|
|
import * as fs from "node:fs";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import type { AssistantMessage } from "@oh-my-pi/pi-ai";
|
|
import { resetSettingsForTest, Settings, settings } from "@oh-my-pi/pi-coding-agent/config/settings";
|
|
import { EventController } from "@oh-my-pi/pi-coding-agent/modes/controllers/event-controller";
|
|
import { initTheme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
|
|
import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
|
|
import { TERMINAL } from "@oh-my-pi/pi-tui";
|
|
|
|
beforeAll(() => {
|
|
initTheme();
|
|
});
|
|
|
|
beforeEach(async () => {
|
|
resetSettingsForTest();
|
|
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "omp-abortguard-"));
|
|
await Settings.init({ inMemory: true, cwd: tempDir });
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
resetSettingsForTest();
|
|
});
|
|
|
|
type StopReason = "stop" | "aborted" | "error";
|
|
|
|
function makeAssistantMessage(stopReason: StopReason): AssistantMessage {
|
|
return {
|
|
role: "assistant",
|
|
content: [{ type: "text", text: "hello" }],
|
|
stopReason,
|
|
usage: { inputTokens: 0, outputTokens: 0 },
|
|
timestamp: Date.now(),
|
|
} as unknown as AssistantMessage;
|
|
}
|
|
|
|
function makeContext(lastMessage: AssistantMessage | undefined): InteractiveModeContext {
|
|
return {
|
|
// sendCompletionNotification only fires when backgrounded.
|
|
isBackgrounded: true,
|
|
sessionManager: {
|
|
getSessionName: () => "test-session",
|
|
},
|
|
session: {
|
|
getLastAssistantMessage: () => lastMessage,
|
|
},
|
|
} as unknown as InteractiveModeContext;
|
|
}
|
|
|
|
describe("EventController.sendCompletionNotification — abort guard", () => {
|
|
it("skips notification when the last assistant message stopReason === 'aborted'", () => {
|
|
const spy = vi.spyOn(TERMINAL, "sendNotification").mockImplementation(() => {});
|
|
settings.override("completion.notify", "on");
|
|
const controller = new EventController(makeContext(makeAssistantMessage("aborted")));
|
|
controller.sendCompletionNotification();
|
|
expect(spy).toHaveBeenCalledTimes(0);
|
|
});
|
|
|
|
it("skips notification when the last assistant message stopReason === 'error'", () => {
|
|
const spy = vi.spyOn(TERMINAL, "sendNotification").mockImplementation(() => {});
|
|
settings.override("completion.notify", "on");
|
|
const controller = new EventController(makeContext(makeAssistantMessage("error")));
|
|
controller.sendCompletionNotification();
|
|
expect(spy).toHaveBeenCalledTimes(0);
|
|
});
|
|
|
|
it("fires notification when stopReason === 'stop' (normal completion)", () => {
|
|
const spy = vi.spyOn(TERMINAL, "sendNotification").mockImplementation(() => {});
|
|
settings.override("completion.notify", "on");
|
|
const controller = new EventController(makeContext(makeAssistantMessage("stop")));
|
|
controller.sendCompletionNotification();
|
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
expect(spy).toHaveBeenCalledWith(expect.stringContaining("Complete"));
|
|
});
|
|
|
|
it("fires notification when getLastAssistantMessage is absent (e.g. brand-new session)", () => {
|
|
// Defensive: optional-chain `?.()` returns undefined; treat as 'no abort flag', proceed.
|
|
const spy = vi.spyOn(TERMINAL, "sendNotification").mockImplementation(() => {});
|
|
settings.override("completion.notify", "on");
|
|
const controller = new EventController(makeContext(undefined));
|
|
controller.sendCompletionNotification();
|
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("honors the existing isBackgrounded gate (no notification when foreground)", () => {
|
|
const spy = vi.spyOn(TERMINAL, "sendNotification").mockImplementation(() => {});
|
|
settings.override("completion.notify", "on");
|
|
const ctx = makeContext(makeAssistantMessage("stop"));
|
|
(ctx as unknown as { isBackgrounded: boolean }).isBackgrounded = false;
|
|
const controller = new EventController(ctx);
|
|
controller.sendCompletionNotification();
|
|
expect(spy).toHaveBeenCalledTimes(0);
|
|
});
|
|
|
|
it("honors the existing completion.notify=off gate", () => {
|
|
const spy = vi.spyOn(TERMINAL, "sendNotification").mockImplementation(() => {});
|
|
settings.override("completion.notify", "off");
|
|
const controller = new EventController(makeContext(makeAssistantMessage("stop")));
|
|
controller.sendCompletionNotification();
|
|
expect(spy).toHaveBeenCalledTimes(0);
|
|
});
|
|
});
|