fix(gateway): preserve stale channel restart diagnostics

clawsweeper[bot] · clawsweeper[bot] · commit 53b37e507390 · 2026-06-08T03:58:40.000Z
diff --git a/src/gateway/server-channels.test.ts b/src/gateway/server-channels.test.ts
@@ -300,6 +300,40 @@ describe("server-channels auto restart", () => {
     expect(account?.lastError).toBeNull();
   });
 
+  it("lets stop hooks update status after aborting the running task", async () => {
+    const startAccount = vi.fn(async (ctx: ChannelGatewayContext<TestAccount>) => {
+      ctx.setStatus({
+        accountId: DEFAULT_ACCOUNT_ID,
+        running: true,
+        connected: true,
+        lastError: "startup warning",
+      });
+      await new Promise<void>((resolve) => {
+        ctx.abortSignal.addEventListener("abort", () => resolve(), { once: true });
+      });
+    });
+    const stopAccount = vi.fn(async (ctx: ChannelGatewayContext<TestAccount>) => {
+      ctx.setStatus({
+        accountId: DEFAULT_ACCOUNT_ID,
+        connected: false,
+        lastError: null,
+      });
+    });
+    installTestRegistry(createTestPlugin({ startAccount, stopAccount }));
+    const manager = createManager();
+
+    await manager.startChannels();
+    await flushMicrotasks();
+    await manager.stopChannel("discord", DEFAULT_ACCOUNT_ID);
+
+    const snapshot = manager.getRuntimeSnapshot();
+    const account = snapshot.channelAccounts.discord?.[DEFAULT_ACCOUNT_ID];
+    expect(stopAccount).toHaveBeenCalledTimes(1);
+    expect(account?.running).toBe(false);
+    expect(account?.connected).toBe(false);
+    expect(account?.lastError).toBeNull();
+  });
+
   it("does not enumerate configured accounts when stopping a never-started channel", async () => {
     const listAccountIds = vi.fn(() => [DEFAULT_ACCOUNT_ID]);
     const resolveAccount = vi.fn(() => ({ enabled: true, configured: true }));
diff --git a/src/gateway/server-channels.ts b/src/gateway/server-channels.ts
@@ -825,7 +825,7 @@ export function createChannelManager(opts: ChannelManagerOptions): ChannelManage
             abortSignal: abort?.signal ?? new AbortController().signal,
             log,
             getStatus: () => getRuntime(channelId, id),
-            setStatus: (next) => setRuntimeFromTaskStatus(channelId, id, next, abort?.signal),
+            setStatus: (next) => setRuntime(channelId, id, next),
           });
         }
         const stoppedCleanly = await waitForChannelStopGracefully(

Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,7 @@ export function createChannelManager(opts: ChannelManagerOptions): ChannelManage`
`825`	`825`	`abortSignal: abort?.signal ?? new AbortController().signal,`
`826`	`826`	`log,`
`827`	`827`	`getStatus: () => getRuntime(channelId, id),`
`828`		`- setStatus: (next) => setRuntimeFromTaskStatus(channelId, id, next, abort?.signal),`
	`828`	`+ setStatus: (next) => setRuntime(channelId, id, next),`
`829`	`829`	`});`
`830`	`830`	`}`
`831`	`831`	`const stoppedCleanly = await waitForChannelStopGracefully(`