@adhdev/daemon-core 0.9.82-rc.139 → 0.9.82-rc.140

package/dist/mesh/coordinator-registry.d.ts

@@ -0,0 +1,25 @@
+/**
+ * MeshCoordinatorRegistry — Persisted record of active mesh coordinator sessions.
+ *
+ * Survives daemon restarts: when a CLI coordinator session is re-attached after
+ * a daemon restart the in-memory `settings.meshCoordinatorFor` on the provider
+ * instance is gone, so the registry file fills the gap.
+ *
+ * Keyed by sessionId (the CLI instance key / runtimeKey).
+ */
+export interface CoordinatorRegistryEntry {
+    meshId: string;
+    sessionId: string;
+    workspace?: string;
+    startedAt: number;
+}
+/** Load persisted coordinator registry from disk into in-memory map. Called once on daemon boot. */
+export declare function loadMeshCoordinatorRegistry(): void;
+/** Register a coordinator session. Persists to disk immediately. */
+export declare function registerMeshCoordinator(entry: CoordinatorRegistryEntry): void;
+/** Remove a coordinator session by sessionId. Persists to disk. */
+export declare function unregisterMeshCoordinator(sessionId: string): void;
+/** Look up a coordinator entry by session ID. Returns undefined if not registered. */
+export declare function getCoordinatorForSession(sessionId: string): CoordinatorRegistryEntry | undefined;
+/** List all coordinator entries for a given workspace path. */
+export declare function listCoordinatorsForWorkspace(workspace: string): CoordinatorRegistryEntry[];

package/dist/shared-types.d.ts

@@ -299,6 +299,11 @@ export interface SessionEntry {
     seenCompletionMarker?: string;
     surfaceHidden?: boolean;
     settings?: Record<string, any>;
+    /** Set when this session is acting as a mesh coordinator for the given mesh. */
+    coordinator?: {
+        meshId: string;
+        role: 'coordinator';
+    };
     meshQueueStats?: {
         total?: number;
         active?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.139",
+  "version": "0.9.82-rc.140",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/boot/daemon-lifecycle.ts

@@ -37,6 +37,7 @@ import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
 import type { IdeProviderInstance } from '../providers/ide-provider-instance.js';
 import { createDefaultGitCommandServices } from '../git/git-commands.js';
 import { setupMeshEventForwarding } from '../mesh/mesh-events.js';
+import { loadMeshCoordinatorRegistry } from '../mesh/coordinator-registry.js';
 
 // ─── Init Config ───
 
@@ -131,6 +132,7 @@ export interface DaemonDevSupportOptions {
 export async function initDaemonComponents(config: DaemonInitConfig): Promise<DaemonComponents> {
     // 1. Global log interceptor
     installGlobalInterceptor();
+    loadMeshCoordinatorRegistry();
 
     // 2. ProviderLoader (provider source mode from config.json)
     const appConfig = loadConfig();

package/src/cli-adapters/cli-state-engine.ts

@@ -107,6 +107,15 @@ export class CliStateEngine {
     // ── Approval ─────────────────────────────────────
     lastApprovalResolvedAt = 0;
     lastResolvedModalMessage = '';
+    /**
+     * When the engine previously held a modal but the latest parse failed
+     * to extract one, we record the timestamp here and only drop the modal
+     * after the configured `approvalCooldown` to avoid flapping between
+     * waiting_approval and generating on every Claude TUI redraw — that
+     * flapping is what fed auto-approve a fresh modal signature on each
+     * paint and made the engine type "1" repeatedly into the prompt.
+     */
+    modalLostAt = 0;
     private approvalExitTimeout: NodeJS.Timeout | null = null;
 
     // ── Response tracking ────────────────────────────
@@ -239,7 +248,17 @@ export class CliStateEngine {
             } catch { /* ignore parse failures */ }
         }
 
-        if (!this.transport.isAlive() || (this.currentStatus !== 'waiting_approval' && !modal)) return;
+        if (!this.transport.isAlive()) return;
+        // (fix) Hard fail-safe: never write an approval key without a concrete
+        // modal that has buttons. The previous gate `currentStatus !== 'WA' &&
+        // !modal` let resolveModal proceed whenever status was still pinned to
+        // waiting_approval, even if parseApproval had returned null. Combined
+        // with auto-approve and Claude's modal flapping (status==WA but modal
+        // briefly null between paints) this typed "1" into the prompt over and
+        // over. Require a real modal with at least one button.
+        const buttonsValid = Array.isArray(modal?.buttons)
+            && modal.buttons.some((b: any) => typeof b === 'string' && b.trim());
+        if (!modal || !buttonsValid) return;
 
         const currentModalMessage = typeof modal?.message === 'string' ? modal.message.trim() : '';
         const inCooldown = !!this.lastApprovalResolvedAt
@@ -617,20 +636,30 @@ export class CliStateEngine {
             if (!modal) {
                 LOG.warn('CLI', `[${this.provider.type}] detectStatus=waiting_approval but parseApproval returned null; ignoring`);
                 // (fix) If we previously surfaced waiting_approval but the
-                // modal extraction is now failing, do NOT keep the status
-                // pinned to waiting_approval forever — the dashboard would
-                // show a "waiting" badge with no buttons (activeModal=null)
-                // and the user perceives the agent as stuck. Drop the modal
-                // and fall back to generating so the rest of the run can
-                // settle normally; a future evaluate with a real modal will
-                // re-enter waiting_approval cleanly.
-                if (this.currentStatus === 'waiting_approval') {
-                    this.activeModal = null;
-                    this.setStatus('generating', 'approval_lost_modal');
-                    this.callbacks.onStatusChange();
+                // modal extraction is now failing, eventually drop the modal
+                // and fall back to generating so the dashboard doesn't show
+                // a "waiting" badge with no buttons. BUT defer the transition
+                // for a hysteresis window — Claude TUI re-renders parts of
+                // the approval frame multiple times per second and the
+                // intermediate parses occasionally lose buttons for a single
+                // pass. Flapping the engine status WA → generating → WA →
+                // generating between paints fed auto-approve a fresh modal
+                // signature each time, which typed the approval key
+                // ("1") into the prompt repeatedly. Wait for the modal to
+                // stay gone for `approvalCooldown` before clearing.
+                if (this.currentStatus === 'waiting_approval' && this.activeModal) {
+                    const lostAt = this.modalLostAt || Date.now();
+                    if (!this.modalLostAt) this.modalLostAt = lostAt;
+                    if (Date.now() - lostAt >= this.timeouts.approvalCooldown) {
+                        this.activeModal = null;
+                        this.modalLostAt = 0;
+                        this.setStatus('generating', 'approval_lost_modal');
+                        this.callbacks.onStatusChange();
+                    }
                 }
                 return;
             }
+            this.modalLostAt = 0;
             this.isWaitingForResponse = true;
             this.setStatus('waiting_approval', 'script_detect');
             // (fix) Don't overwrite an already-captured modal with a fresh

package/src/cli-adapters/provider-cli-adapter.ts

@@ -846,22 +846,19 @@ export class ProviderCliAdapter implements CliAdapter {
             if (liveDetect === 'waiting_approval') {
                 const liveModal = this.runParseApproval(this.terminalScreen.getText())
                     || this.runParseApproval(this.recentOutputBuffer);
-                if (liveModal) {
+                // (fix) Only surface modals that have at least one non-empty
+                // button. Half-rendered approval frames produced
+                // { message, buttons: [] } briefly — auto-approve would then
+                // pick buttonIndex=-1 and resolveModal would write the
+                // provider's index-0 key into the prompt. Skip those frames
+                // and let a later evaluate find the complete modal.
+                const buttonsOk = liveModal && Array.isArray(liveModal.buttons)
+                    && liveModal.buttons.some((b: any) => typeof b === 'string' && b.trim());
+                if (liveModal && buttonsOk) {
                     effectiveModal = liveModal;
-                    // Promote so subsequent calls don't re-walk the buffer.
-                    // Only set if engine hasn't already captured one — keeps
-                    // the first stable modal as authoritative.
                     if (!this.engine.activeModal) this.engine.activeModal = liveModal;
-                } else {
-                    LOG.warn('CLI', `[${this.cliType}] getStatus live re-extract: detect=waiting_approval but parseApproval still null (recentLen=${this.recentOutputBuffer.length} screenLen=${this.terminalScreen.getText().length})`);
                 }
-            } else if (liveDetect && liveDetect !== 'generating' && liveDetect !== 'idle') {
-                LOG.warn('CLI', `[${this.cliType}] getStatus live re-extract: detect=${liveDetect} (not waiting_approval)`);
-            } else if (this.engine.currentStatus === 'waiting_approval' && liveDetect !== 'waiting_approval') {
-                LOG.warn('CLI', `[${this.cliType}] getStatus live re-extract: engine.status=waiting_approval but live detect=${liveDetect}`);
             }
-        } else if (!effectiveModal && this.engine.currentStatus === 'waiting_approval') {
-            LOG.warn('CLI', `[${this.cliType}] getStatus skipped live re-extract: allowParse=${allowParse} isWaitingForResponse=${this.engine.isWaitingForResponse}`);
         }
         // Only surface waiting_approval when we ALSO have a concrete modal
         // (message + buttons). detectStatus alone can fire while parseApproval
@@ -1844,7 +1841,12 @@ export class ProviderCliAdapter implements CliAdapter {
         if (parsedDebugState?.status === 'error') {
             effectiveStatus = 'error';
         }
-        if (startupDetectedStatus === 'waiting_approval') {
+        // (fix) Mirror the getStatus contract: never surface waiting_approval
+        // without a concrete modal. detectStatus alone can fire while
+        // parseApproval is still null, and a bare debugState waiting_approval
+        // confused dashboards reading the debug payload.
+        const debugEffectiveModal = startupModal || this.engine.activeModal;
+        if (startupDetectedStatus === 'waiting_approval' && debugEffectiveModal) {
             effectiveStatus = 'waiting_approval';
         }
         if (

package/src/commands/cli-manager.ts

@@ -18,6 +18,7 @@ import { loadConfig } from '../config/config.js';
 import { loadState, saveState } from '../config/state-store.js';
 import { getWorkspaceState, resolveLaunchDirectory } from '../config/workspaces.js';
 import { appendRecentActivity } from '../config/recent-activity.js';
+import { unregisterMeshCoordinator } from '../mesh/coordinator-registry.js';
 import { upsertSavedProviderSession } from '../config/saved-sessions.js';
 import { buildLegacyModelModeSummaryMetadata, normalizeProviderSummaryMetadata } from '../providers/summary-metadata.js';
 import { CliProviderInstance } from '../providers/cli-provider-instance.js';
@@ -577,6 +578,7 @@ export class DaemonCliManager {
                             this.deps.removeAgentTracking(key);
                             sessionRegistry?.unregisterByInstanceKey(key);
                             instanceManager?.removeInstance(key);
+                            unregisterMeshCoordinator(key);
                             LOG.info('CLI', `🧹 Auto-cleaned ${status.status} CLI: ${cliType}`);
                             this.deps.onStatusChange();
                         }
@@ -903,6 +905,7 @@ export class DaemonCliManager {
             this.deps.removeAgentTracking(key);
             this.deps.getSessionRegistry?.()?.unregisterByInstanceKey(key);
             this.deps.getInstanceManager()?.removeInstance(key);
+            unregisterMeshCoordinator(key);
             LOG.info('CLI', `🛑 Agent stopped: ${adapter.cliType} in ${adapter.workingDir}`);
             this.deps.onStatusChange();
         } else {
@@ -912,6 +915,7 @@ export class DaemonCliManager {
                 this.deps.getSessionRegistry?.()?.unregisterByInstanceKey(key);
                 im.removeInstance(key);
                 this.deps.removeAgentTracking(key);
+                unregisterMeshCoordinator(key);
                 LOG.warn('CLI', `🧹 Force-removed orphan entry: ${key}`);
                 this.deps.onStatusChange();
             }

package/src/commands/router.ts

@@ -38,6 +38,7 @@ import { createInteractionId, getRecentDebugTrace, recordDebugTrace } from '../l
 import { getSessionHostSurfaceKind, partitionSessionHostRecords } from '../session-host/runtime-surface.js';
 import { createHermesManualMeshCoordinatorSetup, resolveMeshCoordinatorSetup } from './mesh-coordinator.js';
 import { buildSessionEntries } from '../status/builders.js';
+import { registerMeshCoordinator } from '../mesh/coordinator-registry.js';
 import { handleMeshForwardEvent, drainPendingMeshCoordinatorEvents, getPendingMeshCoordinatorEvents, queuePendingMeshCoordinatorEvent } from '../mesh/mesh-events.js';
 import { buildMeshHostRequiredFailure, normalizeMeshDaemonRole, resolveMeshHostStatus } from '../mesh/mesh-host-ownership.js';
 import { fastForwardMeshNode } from '../mesh/mesh-fast-forward.js';
@@ -5329,11 +5330,15 @@ export class DaemonCommandRouter {
                         }
 
                         LOG.info('MeshCoordinator', `Launched ${cliType} coordinator (cli_command) for mesh ${meshId}`);
+                        const cliCmdSessionId = cliCmdLaunch.sessionId || cliCmdLaunch.id;
+                        if (cliCmdSessionId) {
+                            registerMeshCoordinator({ meshId, sessionId: cliCmdSessionId, workspace, startedAt: Date.now() });
+                        }
                         try {
                             const { appendLedgerEntry } = await import('../mesh/mesh-ledger.js');
                             appendLedgerEntry(meshId, {
                                 kind: 'coordinator_started',
-                                sessionId: cliCmdLaunch.sessionId || cliCmdLaunch.id,
+                                sessionId: cliCmdSessionId,
                                 providerType: cliType,
                                 payload: { workspace },
                             });
@@ -5344,7 +5349,7 @@ export class DaemonCommandRouter {
                             meshId,
                             cliType,
                             workspace,
-                            sessionId: cliCmdLaunch.sessionId || cliCmdLaunch.id,
+                            sessionId: cliCmdSessionId,
                             mcpRegistered: true,
                         };
                     }
@@ -5510,13 +5515,17 @@ export class DaemonCommandRouter {
                     }
 
                     LOG.info('MeshCoordinator', `Launched ${cliType} coordinator for mesh ${meshId} in ${workspace}`);
+                    const launchSessionId = launchResult.sessionId || launchResult.id;
+                    if (launchSessionId) {
+                        registerMeshCoordinator({ meshId, sessionId: launchSessionId, workspace, startedAt: Date.now() });
+                    }
 
                     // Record coordinator launch in task ledger
                     try {
                         const { appendLedgerEntry } = await import('../mesh/mesh-ledger.js');
                         appendLedgerEntry(meshId, {
                             kind: 'coordinator_started',
-                            sessionId: launchResult.sessionId || launchResult.id,
+                            sessionId: launchSessionId,
                             providerType: cliType,
                             payload: { workspace },
                         });
@@ -5527,7 +5536,7 @@ export class DaemonCommandRouter {
                         meshId,
                         cliType,
                         workspace,
-                        sessionId: launchResult.sessionId || launchResult.id,
+                        sessionId: launchSessionId,
                         mcpConfigWritten: true,
                     };
                 } catch (e: any) {

package/src/config/config.ts

@@ -272,6 +272,18 @@ export function getConfigDir(): string {
     return dir;
 }
 
+/**
+ * Get the daemon runtime data directory (~/.adhdev/daemon/).
+ * Distinct from the user-config dir so runtime state can be cleared independently.
+ */
+export function getDaemonDataDir(): string {
+    const dir = join(getConfigDir(), 'daemon');
+    if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+    }
+    return dir;
+}
+
 /**
  * Get the config file path
  */

package/src/index.ts

@@ -143,7 +143,7 @@ export type RecentSessionBucket = 'needs_attention' | 'working' | 'task_complete
 export type { IDaemonCore, DaemonCoreOptions } from './daemon-core.js';
 
 // ── Config ──
-export { loadConfig, saveConfig, resetConfig, isSetupComplete, markSetupComplete, updateConfig } from './config/config.js';
+export { loadConfig, saveConfig, resetConfig, isSetupComplete, markSetupComplete, updateConfig, getDaemonDataDir } from './config/config.js';
 export { getWorkspaceState } from './config/workspaces.js';
 export { appendRecentActivity, getRecentActivity } from './config/recent-activity.js';
 export type { RecentActivityEntry } from './config/recent-activity.js';
@@ -160,6 +160,8 @@ export type { CreateMeshOptions, UpdateMeshOptions, AddNodeOptions } from './con
 // ── Mesh Coordinator ──
 export { buildCoordinatorSystemPrompt } from './mesh/coordinator-prompt.js';
 export type { CoordinatorPromptContext } from './mesh/coordinator-prompt.js';
+export { loadMeshCoordinatorRegistry, registerMeshCoordinator, unregisterMeshCoordinator, getCoordinatorForSession, listCoordinatorsForWorkspace } from './mesh/coordinator-registry.js';
+export type { CoordinatorRegistryEntry } from './mesh/coordinator-registry.js';
 export {
   MESH_REFINE_CONFIG_LOCATIONS,
   MESH_REFINE_CONFIG_SCHEMA,

package/src/mesh/coordinator-registry.ts

@@ -0,0 +1,75 @@
+/**
+ * MeshCoordinatorRegistry — Persisted record of active mesh coordinator sessions.
+ *
+ * Survives daemon restarts: when a CLI coordinator session is re-attached after
+ * a daemon restart the in-memory `settings.meshCoordinatorFor` on the provider
+ * instance is gone, so the registry file fills the gap.
+ *
+ * Keyed by sessionId (the CLI instance key / runtimeKey).
+ */
+
+import { join } from 'path';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { getDaemonDataDir } from '../config/config.js';
+
+export interface CoordinatorRegistryEntry {
+    meshId: string;
+    sessionId: string;
+    workspace?: string;
+    startedAt: number;
+}
+
+const _registry = new Map<string, CoordinatorRegistryEntry>();
+
+function getRegistryPath(): string {
+    return join(getDaemonDataDir(), 'mesh-coordinators.json');
+}
+
+/** Load persisted coordinator registry from disk into in-memory map. Called once on daemon boot. */
+export function loadMeshCoordinatorRegistry(): void {
+    const path = getRegistryPath();
+    if (!existsSync(path)) return;
+    try {
+        const raw = JSON.parse(readFileSync(path, 'utf-8'));
+        if (!Array.isArray(raw)) return;
+        _registry.clear();
+        for (const entry of raw) {
+            if (typeof entry?.sessionId === 'string' && typeof entry?.meshId === 'string') {
+                _registry.set(entry.sessionId, entry as CoordinatorRegistryEntry);
+            }
+        }
+    } catch { /* ignore corrupt file */ }
+}
+
+function saveRegistry(): void {
+    try {
+        writeFileSync(
+            getRegistryPath(),
+            JSON.stringify([..._registry.values()], null, 2),
+            { encoding: 'utf-8', mode: 0o600 },
+        );
+    } catch { /* best-effort */ }
+}
+
+/** Register a coordinator session. Persists to disk immediately. */
+export function registerMeshCoordinator(entry: CoordinatorRegistryEntry): void {
+    _registry.set(entry.sessionId, entry);
+    saveRegistry();
+}
+
+/** Remove a coordinator session by sessionId. Persists to disk. */
+export function unregisterMeshCoordinator(sessionId: string): void {
+    if (_registry.delete(sessionId)) {
+        saveRegistry();
+    }
+}
+
+/** Look up a coordinator entry by session ID. Returns undefined if not registered. */
+export function getCoordinatorForSession(sessionId: string): CoordinatorRegistryEntry | undefined {
+    return _registry.get(sessionId);
+}
+
+/** List all coordinator entries for a given workspace path. */
+export function listCoordinatorsForWorkspace(workspace: string): CoordinatorRegistryEntry[] {
+    return [..._registry.values()].filter(e => e.workspace === workspace);
+}

package/src/providers/cli-provider-instance.ts

@@ -1052,10 +1052,27 @@ export class CliProviderInstance implements ProviderInstance {
             return autoApproveActive;
         }
         const modal = adapterStatus.activeModal;
-        const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(modal?.buttons, this.provider);
+        // (fix) Do not auto-approve when no concrete modal/buttons are present.
+        // Claude TUI flaps between paints; without this guard adapterStatus
+        // could report status=waiting_approval with activeModal=null (or with
+        // an empty buttons array briefly) and we'd still call
+        // resolveModal(-1) — which used to type "1" into the prompt
+        // repeatedly. Skip until a real modal is captured.
+        const buttons = Array.isArray(modal?.buttons)
+            ? modal.buttons.map((b: any) => String(b || '').trim()).filter(Boolean)
+            : [];
+        if (!modal || buttons.length === 0) {
+            return autoApproveActive;
+        }
+        const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(buttons, this.provider);
+        if (buttonIndex < 0) {
+            // No positive button matched — don't pick a random index, just
+            // surface the modal so the user can decide.
+            return autoApproveActive;
+        }
         const signature = [
             typeof modal?.message === 'string' ? modal.message.trim() : '',
-            Array.isArray(modal?.buttons) ? modal.buttons.join('|') : '',
+            buttons.join('|'),
             buttonIndex,
         ].join('::');
         if (!this.autoApproveBusy || signature !== this.lastAutoApprovalSignature) {

package/src/shared-types.ts

@@ -396,6 +396,8 @@ export interface SessionEntry {
     seenCompletionMarker?: string;
     surfaceHidden?: boolean;
     settings?: Record<string, any>;
+    /** Set when this session is acting as a mesh coordinator for the given mesh. */
+    coordinator?: { meshId: string; role: 'coordinator' };
     meshQueueStats?: {
         total?: number;
         active?: number;

package/src/status/builders.ts

@@ -25,6 +25,7 @@ import {
     type NormalizeActiveChatOptions,
 } from './normalize.js';
 import { getMeshQueueStats } from '../mesh/mesh-work-queue.js';
+import { getCoordinatorForSession } from '../mesh/coordinator-registry.js';
 import { normalizeProviderStateControlValues } from '../providers/provider-patch-state.js';
 import { normalizeProviderSummaryMetadata } from '../providers/summary-metadata.js';
 import {
@@ -164,7 +165,7 @@ const ACP_SESSION_CAPABILITIES: SessionCapability[] = [
     'set_thought_level',
 ];
 
-function buildIdeWorkspaceSession(
+function buildWorkspaceSession(
     state: IdeProviderState,
     cdpManagers: Map<string, DaemonCdpManager>,
     options: SessionEntryBuildOptions,
@@ -179,7 +180,10 @@ function buildIdeWorkspaceSession(
     const git = getGitSummaryForWorkspace(workspace, options);
     const title = activeChat?.title || state.name;
     const meshCoordinatorFor = state.settings?.meshCoordinatorFor as string | undefined;
-    const meshQueueStats = meshCoordinatorFor ? getMeshQueueStats(meshCoordinatorFor) : undefined;
+    const registryEntry = state.instanceId ? getCoordinatorForSession(state.instanceId) : undefined;
+    const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
+    const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
+    const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
     return {
         id: state.instanceId || state.type,
         parentId: null,
@@ -203,6 +207,7 @@ function buildIdeWorkspaceSession(
         errorReason: state.errorReason,
         lastUpdated: state.lastUpdated,
         settings: state.settings,
+        ...(coordinator && { coordinator }),
         ...(meshQueueStats && { meshQueueStats }),
     };
 }
@@ -221,7 +226,10 @@ function buildExtensionAgentSession(
     const workspace = parent.workspace || null;
     const git = getGitSummaryForWorkspace(workspace, options);
     const meshCoordinatorFor = ext.settings?.meshCoordinatorFor as string | undefined;
-    const meshQueueStats = meshCoordinatorFor ? getMeshQueueStats(meshCoordinatorFor) : undefined;
+    const registryEntry = ext.instanceId ? getCoordinatorForSession(ext.instanceId) : undefined;
+    const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
+    const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
+    const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
     return {
         id: ext.instanceId || `${parent.instanceId}:${ext.type}`,
         parentId: parent.instanceId || parent.type,
@@ -245,6 +253,7 @@ function buildExtensionAgentSession(
         errorReason: ext.errorReason,
         lastUpdated: ext.lastUpdated,
         settings: ext.settings,
+        ...(coordinator && { coordinator }),
         ...(meshQueueStats && { meshQueueStats }),
     };
 }
@@ -287,7 +296,10 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
     const workspace = state.workspace || null;
     const git = getGitSummaryForWorkspace(workspace, options);
     const meshCoordinatorFor = state.settings?.meshCoordinatorFor as string | undefined;
-    const meshQueueStats = meshCoordinatorFor ? getMeshQueueStats(meshCoordinatorFor) : undefined;
+    const registryEntry = state.instanceId ? getCoordinatorForSession(state.instanceId) : undefined;
+    const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
+    const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
+    const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
     return {
         id: state.instanceId,
         parentId: null,
@@ -327,6 +339,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
         errorReason: state.errorReason,
         lastUpdated: state.lastUpdated,
         settings: state.settings,
+        ...(coordinator && { coordinator }),
         ...(meshQueueStats && { meshQueueStats }),
     };
 }
@@ -341,7 +354,10 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
     const workspace = state.workspace || null;
     const git = getGitSummaryForWorkspace(workspace, options);
     const meshCoordinatorFor = state.settings?.meshCoordinatorFor as string | undefined;
-    const meshQueueStats = meshCoordinatorFor ? getMeshQueueStats(meshCoordinatorFor) : undefined;
+    const registryEntry = state.instanceId ? getCoordinatorForSession(state.instanceId) : undefined;
+    const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
+    const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
+    const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
     return {
         id: state.instanceId,
         parentId: null,
@@ -364,6 +380,7 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
         errorReason: state.errorReason,
         lastUpdated: state.lastUpdated,
         settings: state.settings,
+        ...(coordinator && { coordinator }),
         ...(meshQueueStats && { meshQueueStats }),
     };
 }
@@ -380,7 +397,7 @@ export function buildSessionEntries(
     const acpStates = allStates.filter((s): s is AcpProviderState => s.category === 'acp');
 
     for (const state of ideStates) {
-        sessions.push(buildIdeWorkspaceSession(state, cdpManagers, options));
+        sessions.push(buildWorkspaceSession(state, cdpManagers, options));
         for (const ext of state.extensions as ExtensionProviderState[]) {
             if (!shouldIncludeExtensionSession(ext)) continue;
             sessions.push(buildExtensionAgentSession(state, ext, options));