fix(watchers): the two review items of #818

The fs.watch failure tests skip on macOS, where chokidar 3 never calls
fs.watch for these watchers (fsevents, or polling without it), so the stub
never fired and the waits timed out. TeamWatcher.stop() clears its outage
set, so a stop() and start() on the same instance warns again about a
watcher that still fails; a new test pins it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Codeman maintainer committed 2026-11-20 04:02:07 +01:00
1 parent 6222444e82
commit 8202e07286
2 files changed
+32 -3

No files matched your search

+1
View File
@@ -137,6 +137,7 @@ export class TeamWatcher extends EventEmitter {
this.taskMtimes.clear(); this.taskMtimes.clear();
this.inboxMtimes.clear(); this.inboxMtimes.clear();
this.sessionToTeam.clear(); this.sessionToTeam.clear();
this.watchersDown.clear();
} }
/** Get all discovered teams */ /** Get all discovered teams */
+31 -3
View File
@@ -19,6 +19,11 @@ const FAILURES = [
] as const; ] as const;
type WatchFailure = { code: string; errno: number; text: string }; type WatchFailure = { code: string; errno: number; text: string };
// On macOS chokidar 3 never calls fs.watch for these watchers: it uses fsevents,
// or polling when fsevents is missing, so the retry loop these tests pin cannot
// happen there and the stubbed fs.watch never fires.
const describeLinuxWatch = describe.skipIf(process.platform === 'darwin');
const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms)); const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
async function waitUntil(predicate: () => boolean, message: string): Promise<void> { async function waitUntil(predicate: () => boolean, message: string): Promise<void> {
@@ -97,7 +102,7 @@ async function writeTeam(teamsDir: string, config: TeamConfig): Promise<void> {
await writeFile(join(dir, 'config.json'), JSON.stringify(config)); await writeFile(join(dir, 'config.json'), JSON.stringify(config));
} }
describe('TeamWatcher fs.watch failure', () => { describeLinuxWatch('TeamWatcher fs.watch failure', () => {
let teamsDir: string; let teamsDir: string;
let tasksDir: string; let tasksDir: string;
let teamWatcher: TeamWatcher; let teamWatcher: TeamWatcher;
@@ -181,6 +186,29 @@ describe('TeamWatcher fs.watch failure', () => {
} }
}); });
it('warns again about a watcher that still fails after stop() and start() on the same instance', async () => {
const failure = FAILURES[0];
const watch = failEveryWatch(failure);
const expectedWarnings = [
`[TeamWatcher] teams watcher stopped, relying on polling: ${watchError(failure, teamsDir).message}`,
`[TeamWatcher] tasks watcher stopped, relying on polling: ${watchError(failure, tasksDir).message}`,
];
try {
teamWatcher.start();
await waitUntil(() => warn.mock.calls.length >= 2, 'timed out waiting for both watcher warnings');
await delay(200);
expectWarnings(expectedWarnings);
teamWatcher.stop();
teamWatcher.start();
await waitUntil(() => warn.mock.calls.length >= 4, 'a restarted watcher stayed silent about the same outage');
await delay(200);
expectWarnings([...expectedWarnings, ...expectedWarnings]);
} finally {
teamWatcher.stop();
watch.mockRestore();
}
});
it('keeps a healthy watcher active and discovers a new team before the poll interval', async () => { it('keeps a healthy watcher active and discovers a new team before the poll interval', async () => {
const watch = vi.spyOn(fs, 'watch'); const watch = vi.spyOn(fs, 'watch');
try { try {
@@ -426,7 +454,7 @@ describe('TeamWatcher fs.watch failure', () => {
); );
}); });
describe('TeamWatcher in-flight fs.watch failure', () => { describeLinuxWatch('TeamWatcher in-flight fs.watch failure', () => {
it('stays stopped when file replacement and deletion race with ENOSPC', async () => { it('stays stopped when file replacement and deletion race with ENOSPC', async () => {
const teamsDir = join(tempDir, 'teams'); const teamsDir = join(tempDir, 'teams');
const tasksDir = join(tempDir, 'tasks'); const tasksDir = join(tempDir, 'tasks');
@@ -534,7 +562,7 @@ const EXPECTED_RUN: WorkflowRunInfo = {
lastActivityAt: RUN_START, lastActivityAt: RUN_START,
}; };
describe('WorkflowRunWatcher fs.watch failure', () => { describeLinuxWatch('WorkflowRunWatcher fs.watch failure', () => {
let runWatcher: WorkflowRunWatcher; let runWatcher: WorkflowRunWatcher;
let workflowsDir: string; let workflowsDir: string;