mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 20:11:08 +00:00
* feat: alert when an external MCP approval is waiting Show a system notification and request taskbar or Dock attention so confirm-mode approvals are not missed before the existing timeout. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: stop MCP approval attention when a later window focuses Watch app browser-window-focus while a flash or dock bounce is active so a window created after the alert starts can clear it. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
162 lines
5.3 KiB
JavaScript
162 lines
5.3 KiB
JavaScript
"use strict";
|
|
|
|
const assert = require("node:assert/strict");
|
|
const test = require("node:test");
|
|
|
|
const {
|
|
sanitizeNotificationText,
|
|
showSystemNotification,
|
|
registerSystemNotificationHandlers,
|
|
} = require("./systemNotification.cjs");
|
|
|
|
test("sanitizeNotificationText strips controls and truncates", () => {
|
|
assert.equal(sanitizeNotificationText("hello\u0007world", 20), "helloworld");
|
|
assert.equal(sanitizeNotificationText("abcdefghij", 6), "abcde…");
|
|
assert.equal(sanitizeNotificationText(null, 10), "");
|
|
});
|
|
|
|
test("showSystemNotification focuses the sender window and session on click", () => {
|
|
const sent = [];
|
|
let clickHandler;
|
|
function FakeNotification(payload) {
|
|
this.payload = payload;
|
|
}
|
|
FakeNotification.isSupported = () => true;
|
|
FakeNotification.prototype.on = function on(event, handler) {
|
|
if (event === "click") clickHandler = handler;
|
|
};
|
|
FakeNotification.prototype.show = function show() {};
|
|
|
|
const win = {
|
|
destroyed: false,
|
|
minimized: true,
|
|
isDestroyed() { return this.destroyed; },
|
|
isMinimized() { return this.minimized; },
|
|
restore() { this.minimized = false; this.restored = true; },
|
|
show() { this.shown = true; },
|
|
focus() { this.focused = true; },
|
|
};
|
|
const sender = {
|
|
destroyed: false,
|
|
isDestroyed() { return this.destroyed; },
|
|
send(channel, sessionId) { sent.push([channel, sessionId]); },
|
|
};
|
|
|
|
const result = showSystemNotification({
|
|
Notification: FakeNotification,
|
|
BrowserWindow: { fromWebContents: () => win },
|
|
sender,
|
|
title: "Codex",
|
|
body: "Turn complete",
|
|
sessionId: "session-1",
|
|
});
|
|
|
|
assert.deepEqual(result, { shown: true });
|
|
clickHandler();
|
|
assert.equal(win.restored, true);
|
|
assert.equal(win.shown, true);
|
|
assert.equal(win.focused, true);
|
|
assert.deepEqual(sent, [["netcatty:tray:focusSession", "session-1"]]);
|
|
});
|
|
|
|
test("showSystemNotification reports unsupported platforms", () => {
|
|
function FakeNotification() {}
|
|
FakeNotification.isSupported = () => false;
|
|
assert.deepEqual(
|
|
showSystemNotification({
|
|
Notification: FakeNotification,
|
|
title: "x",
|
|
body: "y",
|
|
}),
|
|
{ shown: false, reason: "unsupported" },
|
|
);
|
|
});
|
|
|
|
test("registerSystemNotificationHandlers skips unfocused alerts while the app is focused", async () => {
|
|
const handlers = new Map();
|
|
const shown = [];
|
|
function FakeNotification(payload) {
|
|
shown.push(payload);
|
|
}
|
|
FakeNotification.isSupported = () => true;
|
|
FakeNotification.prototype.on = () => {};
|
|
FakeNotification.prototype.show = () => {};
|
|
|
|
registerSystemNotificationHandlers({
|
|
handle(channel, handler) { handlers.set(channel, handler); },
|
|
}, {
|
|
electronModule: { Notification: FakeNotification },
|
|
BrowserWindow: { fromWebContents: () => null },
|
|
getAppFocused: () => true,
|
|
});
|
|
|
|
const skipped = await handlers.get("netcatty:notification:show")(
|
|
{ sender: { isDestroyed: () => false, send() {} } },
|
|
{ title: "External MCP approval", body: "sftp.write is waiting", whenUnfocused: true, dedupeKey: "a1" },
|
|
);
|
|
assert.deepEqual(skipped, { shown: false, reason: "focused" });
|
|
assert.equal(shown.length, 0);
|
|
|
|
const forced = await handlers.get("netcatty:notification:show")(
|
|
{ sender: { isDestroyed: () => false, send() {} } },
|
|
{ title: "External MCP approval", body: "sftp.write is waiting", whenUnfocused: false, dedupeKey: "a1" },
|
|
);
|
|
assert.deepEqual(forced, { shown: true });
|
|
assert.equal(shown.length, 1);
|
|
});
|
|
|
|
test("registerSystemNotificationHandlers dedupes the same approval across windows", async () => {
|
|
const handlers = new Map();
|
|
const shown = [];
|
|
function FakeNotification(payload) {
|
|
shown.push(payload);
|
|
}
|
|
FakeNotification.isSupported = () => true;
|
|
FakeNotification.prototype.on = () => {};
|
|
FakeNotification.prototype.show = () => {};
|
|
|
|
registerSystemNotificationHandlers({
|
|
handle(channel, handler) { handlers.set(channel, handler); },
|
|
}, {
|
|
electronModule: { Notification: FakeNotification },
|
|
BrowserWindow: { fromWebContents: () => null },
|
|
getAppFocused: () => false,
|
|
});
|
|
|
|
const show = (dedupeKey) => handlers.get("netcatty:notification:show")(
|
|
{ sender: { isDestroyed: () => false, send() {} } },
|
|
{ title: "External MCP approval", body: "tool", dedupeKey },
|
|
);
|
|
assert.deepEqual(await show("mcp_approval_1"), { shown: true });
|
|
assert.deepEqual(await show("mcp_approval_1"), { shown: false, reason: "duplicate" });
|
|
assert.deepEqual(await show("mcp_approval_2"), { shown: true });
|
|
assert.equal(shown.length, 2);
|
|
});
|
|
|
|
test("registerSystemNotificationHandlers exposes the IPC channel", async () => {
|
|
const handlers = new Map();
|
|
const shown = [];
|
|
function FakeNotification(payload) {
|
|
shown.push(payload);
|
|
}
|
|
FakeNotification.isSupported = () => true;
|
|
FakeNotification.prototype.on = () => {};
|
|
FakeNotification.prototype.show = () => {};
|
|
|
|
registerSystemNotificationHandlers({
|
|
handle(channel, handler) { handlers.set(channel, handler); },
|
|
}, {
|
|
electronModule: { Notification: FakeNotification },
|
|
BrowserWindow: { fromWebContents: () => null },
|
|
});
|
|
|
|
const result = await handlers.get("netcatty:notification:show")(
|
|
{ sender: { isDestroyed: () => false, send() {} } },
|
|
{ title: "Codex", body: "Turn complete", sessionId: "s1" },
|
|
);
|
|
assert.deepEqual(result, { shown: true });
|
|
assert.equal(shown.length, 1);
|
|
assert.equal(shown[0].title, "Codex");
|
|
assert.equal(shown[0].body, "Turn complete");
|
|
});
|