fix(hooks): use delivery-neutral Gmail watch warning

joshp123 · joshp123 · commit c2aa369930b0 · 2026-06-06T13:38:01.000+02:00
diff --git a/src/hooks/gmail-watcher.test.ts b/src/hooks/gmail-watcher.test.ts
@@ -4,6 +4,11 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const mocks = vi.hoisted(() => ({
   hasBinary: vi.fn(() => true),
+  logger: {
+    error: vi.fn(),
+    info: vi.fn(),
+    warn: vi.fn(),
+  },
   resolveExecutable: vi.fn((name: string) => name),
   runCommandWithTimeout: vi.fn(),
   spawn: vi.fn(),
@@ -29,6 +34,10 @@ vi.mock("../process/exec.js", () => ({
   runCommandWithTimeout: mocks.runCommandWithTimeout,
 }));
 
+vi.mock("../logging/subsystem.js", () => ({
+  createSubsystemLogger: () => mocks.logger,
+}));
+
 const { startGmailWatcher, stopGmailWatcher } = await import("./gmail-watcher.js");
 
 function createGmailConfig(account = "me@example.com") {
@@ -74,6 +83,9 @@ describe("startGmailWatcher", () => {
   beforeEach(async () => {
     await stopGmailWatcher();
     mocks.hasBinary.mockReturnValue(true);
+    mocks.logger.error.mockClear();
+    mocks.logger.info.mockClear();
+    mocks.logger.warn.mockClear();
     mocks.resolveExecutable.mockImplementation((name: string) => name);
     mocks.runCommandWithTimeout.mockReset();
     mocks.spawn.mockReset();
@@ -123,6 +135,21 @@ describe("startGmailWatcher", () => {
     );
   });
 
+  it("uses pull wording when watch registration fails before pull runner start", async () => {
+    mocks.runCommandWithTimeout
+      .mockResolvedValueOnce({ code: 0, stdout: "", stderr: "" })
+      .mockResolvedValueOnce({ code: 1, stdout: "", stderr: "watch failed" });
+
+    await expect(startGmailWatcher(createGmailPullConfig())).resolves.toEqual({
+      started: true,
+    });
+
+    expect(mocks.spawn).toHaveBeenCalledTimes(1);
+    expect(mocks.logger.warn).toHaveBeenCalledWith(
+      "gmail watch start failed, but continuing with pull delivery runner",
+    );
+  });
+
   it("does not spawn pull delivery when installed gog lacks pull support", async () => {
     mocks.runCommandWithTimeout.mockResolvedValue({
       code: 1,
diff --git a/src/hooks/gmail-watcher.ts b/src/hooks/gmail-watcher.ts
@@ -370,7 +370,8 @@ export async function startGmailWatcher(
     return cancelledGmailWatcherStart(runtimeConfig);
   }
   if (!watchStarted) {
-    log.warn("gmail watch start failed, but continuing with serve");
+    const deliveryMode = isGmailHookPushRuntimeConfig(runtimeConfig) ? "push" : "pull";
+    log.warn(`gmail watch start failed, but continuing with ${deliveryMode} delivery runner`);
   }
 
   // Spawn the gog delivery process

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,8 @@ export async function startGmailWatcher(`
`370`	`370`	`return cancelledGmailWatcherStart(runtimeConfig);`
`371`	`371`	`}`
`372`	`372`	`if (!watchStarted) {`
`373`		`- log.warn("gmail watch start failed, but continuing with serve");`
	`373`	`+ const deliveryMode = isGmailHookPushRuntimeConfig(runtimeConfig) ? "push" : "pull";`
	`374`	+ log.warn(`gmail watch start failed, but continuing with ${deliveryMode} delivery runner`);
`374`	`375`	`}`
`375`	`376`
`376`	`377`	`// Spawn the gog delivery process`