fix(coordinator): address PR124 polish nits

Author: brooksc

electron/ipc/register.ts

@@ -1623,14 +1623,12 @@ export function registerAllHandlers(win: BrowserWindow): void {
     // The MCP server process is spawned by the agent CLI via launch args,
     // not by us. We report whether the remote HTTP server that the MCP
     // server connects to is running — if it's up, MCP tools should work.
-    const remoteRunning = remoteServer !== null;
     return {
-      mcpRunning: remoteRunning,
-      remoteRunning,
-      coordinatorRoutesAttached: coordinator !== null,
-      coordinatorRegistered: coordinator?.hasActiveCoordinator() ?? false,
-      serverUrl: remoteServer ? getMCPRemoteServerUrl(remoteServer.port) : null,
-      mcpConfigPath: lastMcpConfigPath,
+      running: remoteServer !== null,
+      port: remoteServer?.port ?? null,
+      // TODO: Surface this from the coordinator map if the UI needs it.
+      coordinatorTaskId: null,
+      mcpConfigPath: lastMcpConfigPath ?? null,
     };
   });
 

src/components/SidebarFooter.tsx

@@ -28,7 +28,7 @@ export function SidebarFooter() {
 
   onCleanup(() => stopMCPStatusPolling());
 
-  const mcpOk = () => store.mcpStatus.mcpRunning;
+  const mcpOk = () => store.mcpStatus.running;
 
   return (
     <>

src/store/autosave.ts

@@ -62,6 +62,7 @@ function persistedSnapshot(): string {
               coordinatedBy: t.coordinatedBy,
               coordinatorMode: t.coordinatorMode,
               mcpConfigPath: t.mcpConfigPath,
+              preambleFileExistedBefore: t.preambleFileExistedBefore,
               signalDoneReceived: t.signalDoneReceived,
               signalDoneAt: t.signalDoneAt,
               signalDoneConsumed: t.signalDoneConsumed,

src/store/core.ts

@@ -80,14 +80,7 @@ export const [store, setStore] = createStore<AppStore>({
   coordinatorModeEnabled: false,
   coordinatorNotificationDelayMs: 60_000,
   coordinatorControlHintDismissed: false,
-  mcpStatus: {
-    mcpRunning: false,
-    remoteRunning: false,
-    coordinatorRoutesAttached: false,
-    coordinatorRegistered: false,
-    serverUrl: null,
-    mcpConfigPath: null,
-  },
+  mcpStatus: { running: false, port: null, coordinatorTaskId: null, mcpConfigPath: null },
 });
 
 type CleanupPanelStore = Pick<

src/store/mcpStatus.ts

@@ -1,6 +1,7 @@
 import { store, setStore } from './core';
 import { invoke } from '../lib/ipc';
 import { IPC } from '../../electron/ipc/channels';
+import type { MCPStatus } from './types';
 
 let pollTimer: ReturnType<typeof setInterval> | null = null;
 const POLL_INTERVAL_MS = 3_000;
@@ -12,18 +13,16 @@ export function hasAnyCoordinatorTask(): boolean {
   return false;
 }
 
-const MCP_STATUS_OFFLINE = {
-  mcpRunning: false,
-  remoteRunning: false,
-  coordinatorRoutesAttached: false,
-  coordinatorRegistered: false,
-  serverUrl: null,
+const MCP_STATUS_OFFLINE: MCPStatus = {
+  running: false,
+  port: null,
+  coordinatorTaskId: null,
   mcpConfigPath: null,
-} as const;
+};
 
 export async function refreshMCPStatus(): Promise<void> {
   try {
-    const result = await invoke<import('./types').MCPStatus>(IPC.GetMCPStatus);
+    const result = await invoke<MCPStatus>(IPC.GetMCPStatus);
     setStore('mcpStatus', result);
   } catch {
     setStore('mcpStatus', MCP_STATUS_OFFLINE);

src/store/tasks.test.ts

@@ -137,6 +137,7 @@ import {
   retryTaskMcpStartup,
 } from './tasks';
 import { getCoordinatorChildren } from './sidebar-order';
+import { markAgentSpawned, rescheduleTaskStatusPolling } from './taskStatus';
 
 // ─── Coordinator listener setup ───────────────────────────────────────────────
 
@@ -147,6 +148,8 @@ const taskStateSyncHandler = ipcHandlers.get('mcp_task_state_sync');
 if (!taskStateSyncHandler) throw new Error('mcp_task_state_sync handler not registered');
 
 beforeEach(() => {
+  vi.clearAllMocks();
+  mockSetStore.mockImplementation((...args: unknown[]) => applySetStore(...args));
   mockTasks = {};
   mockAgents = {};
   mockTaskOrder = [];
@@ -221,6 +224,15 @@ describe('coordinator controlledBy state machine (item 9: UI disabled-state regr
 });
 
 describe('MCP_TaskCreated IPC handler', () => {
+  it('ignores duplicate task-created events without resetting spawn state', () => {
+    taskCreatedHandler(baseEvent);
+    taskCreatedHandler(baseEvent);
+
+    expect(mockTaskOrder).toEqual(['sub-task-1']);
+    expect(markAgentSpawned).toHaveBeenCalledTimes(1);
+    expect(rescheduleTaskStatusPolling).toHaveBeenCalledTimes(1);
+  });
+
   it('sets controlledBy to coordinator on the new sub-task', () => {
     taskCreatedHandler(baseEvent);
     expect(mockTasks['sub-task-1'].controlledBy).toBe('coordinator');

src/store/tasks.ts

@@ -1029,7 +1029,8 @@ export function initMCPListeners(): () => void {
         mcpConfigPath: evt.mcpConfigPath,
         preambleFileExistedBefore: evt.preambleFileExistedBefore,
         skipPermissions: evt.skipPermissions ?? false,
-        // MCP server is already running when the task is created mid-session.
+        // Backend-spawned children are already attached to a live MCP server;
+        // restore-created MCP tasks start pending until hydration marks them ready.
         mcpStartupStatus: 'ready' as const,
       };
 
@@ -1055,18 +1056,23 @@ export function initMCPListeners(): () => void {
         signal: null,
         lastOutput: [],
         generation: 0,
+        attachExisting: true,
       };
 
+      let created = false;
       setStore(
         produce((s) => {
           if (s.tasks[evt.taskId]) return; // idempotent — ignore duplicate events
           s.tasks[evt.taskId] = task;
           s.agents[evt.agentId] = agent;
           s.taskOrder.push(evt.taskId);
+          created = true;
         }),
       );
-      markAgentSpawned(evt.agentId);
-      rescheduleTaskStatusPolling();
+      if (created) {
+        markAgentSpawned(evt.agentId);
+        rescheduleTaskStatusPolling();
+      }
     }),
   );
 

src/store/types.ts

@@ -226,11 +226,9 @@ export interface PersistedState {
 }
 
 export interface MCPStatus {
-  mcpRunning: boolean;
-  remoteRunning: boolean;
-  coordinatorRoutesAttached: boolean;
-  coordinatorRegistered: boolean;
-  serverUrl: string | null;
+  running: boolean;
+  port: number | null;
+  coordinatorTaskId: string | null;
   mcpConfigPath: string | null;
 }