fix: address review-work round 3 findings (async shutdown, signal generation, stale test name)

src/create-managers.ts

@@ -53,8 +53,8 @@ export function createManagers(args: {
 
         log("[index] onSubagentSessionCreated callback completed")
       },
-      onShutdown: () => {
+      onShutdown: async () => {
-        tmuxSessionManager.cleanup().catch((error) => {
+        await tmuxSessionManager.cleanup().catch((error) => {
           log("[index] tmux cleanup error during shutdown:", error)
         })
       },

src/features/background-agent/manager.ts

@@ -116,7 +116,7 @@ export class BackgroundManager {
   private config?: BackgroundTaskConfig
   private tmuxEnabled: boolean
   private onSubagentSessionCreated?: OnSubagentSessionCreated
-  private onShutdown?: () => void
+  private onShutdown?: () => void | Promise<void>
 
   private queuesByKey: Map<string, QueueItem[]> = new Map()
   private processingKeys: Set<string> = new Set()
@@ -134,7 +134,7 @@ export class BackgroundManager {
     options?: {
       tmuxConfig?: TmuxConfig
       onSubagentSessionCreated?: OnSubagentSessionCreated
-      onShutdown?: () => void
+      onShutdown?: () => void | Promise<void>
       enableParentSessionNotifications?: boolean
     }
   ) {
@@ -1702,7 +1702,7 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
    * Cancels all pending concurrency waiters and clears timers.
    * Should be called when the plugin is unloaded.
    */
-  shutdown(): void {
+  async shutdown(): Promise<void> {
     if (this.shutdownTriggered) return
     this.shutdownTriggered = true
     log("[background-agent] Shutting down BackgroundManager")
@@ -1720,7 +1720,7 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
     // Notify shutdown listeners (e.g., tmux cleanup)
     if (this.onShutdown) {
       try {
-        this.onShutdown()
+        await this.onShutdown()
       } catch (error) {
         log("[background-agent] Error in onShutdown callback:", error)
       }

src/features/skill-mcp-manager/cleanup.ts

@@ -19,6 +19,7 @@ export function registerProcessCleanup(state: SkillMcpManagerState): void {
   state.cleanupRegistered = true
 
   const cleanup = async (): Promise<void> => {
+    state.shutdownGeneration++
     for (const managed of state.clients.values()) {
       await closeManagedClient(managed)
     }

src/features/skill-mcp-manager/connection-race.test.ts

@@ -142,7 +142,7 @@ describe("getOrCreateClient disconnect race", () => {
     expect(createdTransports[0]?.close).toHaveBeenCalledTimes(1)
   })
 
-  it("#given session A in disconnectedSessions #when new connection is requested for session A #then session A is removed from disconnectedSessions and connection proceeds normally", async () => {
+  it("#given session A in disconnectedSessions #when new connection is requested for session A #then connection proceeds normally and disconnectedSessions entry is retained for pending race protection", async () => {
     const state = createState()
     const info = createClientInfo("session-a")
     const clientKey = createClientKey(info)

src/plugin-dispose.test.ts

@@ -7,7 +7,7 @@ describe("createPluginDispose", () => {
   test("#given plugin with active managers and hooks #when dispose() is called #then backgroundManager.shutdown() is called", async () => {
     // given
     const backgroundManager = {
-      shutdown: (): void => {},
+      shutdown: async (): Promise<void> => {},
     }
     const skillMcpManager = {
       disconnectAll: async (): Promise<void> => {},
@@ -29,7 +29,7 @@ describe("createPluginDispose", () => {
   test("#given plugin with active MCP connections #when dispose() is called #then skillMcpManager.disconnectAll() is called", async () => {
     // given
     const backgroundManager = {
-      shutdown: (): void => {},
+      shutdown: async (): Promise<void> => {},
     }
     const skillMcpManager = {
       disconnectAll: async (): Promise<void> => {},
@@ -64,7 +64,7 @@ describe("createPluginDispose", () => {
     const autoSlashCommandDisposeSpy = spyOn(autoSlashCommand, "dispose")
     const dispose = createPluginDispose({
       backgroundManager: {
-        shutdown: (): void => {},
+      shutdown: async (): Promise<void> => {},
       },
       skillMcpManager: {
         disconnectAll: async (): Promise<void> => {},
@@ -90,7 +90,7 @@ describe("createPluginDispose", () => {
   test("#given dispose already called #when dispose() called again #then no errors", async () => {
     // given
     const backgroundManager = {
-      shutdown: (): void => {},
+      shutdown: async (): Promise<void> => {},
     }
     const skillMcpManager = {
       disconnectAll: async (): Promise<void> => {},

src/plugin-dispose.ts

@@ -2,7 +2,7 @@ export type PluginDispose = () => Promise<void>
 
 export function createPluginDispose(args: {
   backgroundManager: {
-    shutdown: () => void
+    shutdown: () => void | Promise<void>
   }
   skillMcpManager: {
     disconnectAll: () => Promise<void>
@@ -19,7 +19,7 @@ export function createPluginDispose(args: {
     }
 
     disposePromise = (async (): Promise<void> => {
-      backgroundManager.shutdown()
+      await backgroundManager.shutdown()
       await skillMcpManager.disconnectAll()
       disposeHooks()
     })()