@adhdev/daemon-core 0.9.76-rc.67 → 0.9.76-rc.69

package/dist/mesh/mesh-events.d.ts

@@ -1,4 +1,13 @@
 import type { DaemonComponents } from '../boot/daemon-lifecycle.js';
+export interface PendingMeshCoordinatorEvent {
+    event: string;
+    meshId: string;
+    nodeLabel: string;
+    metadataEvent: Record<string, unknown>;
+    queuedAt: number;
+}
+/** Drain and return all pending coordinator events, clearing the queue. */
+export declare function drainPendingMeshCoordinatorEvents(): PendingMeshCoordinatorEvent[];
 export declare function handleMeshForwardEvent(components: DaemonComponents, payload: Record<string, unknown>): {
     success: boolean;
     forwarded: number;

package/package.json

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

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

@@ -285,8 +285,10 @@ export class TerminalTranscriptAccumulator {
             return;
         }
         while (line.length < this.col) line.push(' ');
+        const wide = isWideCodePoint(ch);
         line[this.col] = ch;
-        this.col += isWideCodePoint(ch) ? 2 : 1;
+        if (wide) line[this.col + 1] = '';
+        this.col += wide ? 2 : 1;
     }
 
     private consumeEscape(seq: string): number {

package/src/commands/router.ts

@@ -36,7 +36,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 { handleMeshForwardEvent } from '../mesh/mesh-events.js';
+import { handleMeshForwardEvent, drainPendingMeshCoordinatorEvents } from '../mesh/mesh-events.js';
 import { buildMachineInfo, buildStatusSnapshot } from '../status/snapshot.js';
 import { getSessionCompletionMarker } from '../status/snapshot.js';
 import { execNpmCommandSync, resolveCurrentGlobalInstallSurface, spawnDetachedDaemonUpgradeHelper } from './upgrade-helper.js';
@@ -651,6 +651,11 @@ export class DaemonCommandRouter {
                 return handleMeshForwardEvent({ instanceManager: this.deps.instanceManager } as any, args as Record<string, unknown>);
             }
 
+            case 'get_pending_mesh_events': {
+                const events = drainPendingMeshCoordinatorEvents();
+                return { success: true, events };
+            }
+
             case 'launch_cli':
             case 'stop_cli':
             case 'set_cli_view_mode':

package/src/mesh/mesh-events.ts

@@ -2,6 +2,30 @@ import type { DaemonComponents } from '../boot/daemon-lifecycle.js';
 import { getMesh, getMeshByRepo } from '../config/mesh-config.js';
 import { LOG } from '../logging/logger.js';
 
+// ---------------------------------------------------------------------------
+// MCP coordinator pending-event queue
+// ---------------------------------------------------------------------------
+// When a mesh event fires but no CLI coordinator session is registered (e.g.
+// the coordinator is Claude Code running via MCP), we buffer the event here.
+// The MCP server drains this queue on every mesh_status / mesh_send_task poll.
+// ---------------------------------------------------------------------------
+
+export interface PendingMeshCoordinatorEvent {
+    event: string;
+    meshId: string;
+    nodeLabel: string;
+    metadataEvent: Record<string, unknown>;
+    queuedAt: number;
+}
+
+const MAX_PENDING_EVENTS = 50;
+const pendingMeshCoordinatorEvents: PendingMeshCoordinatorEvent[] = [];
+
+/** Drain and return all pending coordinator events, clearing the queue. */
+export function drainPendingMeshCoordinatorEvents(): PendingMeshCoordinatorEvent[] {
+    return pendingMeshCoordinatorEvents.splice(0);
+}
+
 function readNonEmptyString(value: unknown): string {
     return typeof value === 'string' && value.trim() ? value.trim() : '';
 }
@@ -61,7 +85,20 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
         return true;
     });
 
-    if (coordinatorInstances.length === 0) return { success: true, forwarded: 0 };
+    if (coordinatorInstances.length === 0) {
+        // No CLI coordinator session found — buffer for MCP-based coordinators.
+        if (pendingMeshCoordinatorEvents.length < MAX_PENDING_EVENTS) {
+            pendingMeshCoordinatorEvents.push({
+                event: args.event,
+                meshId: args.meshId,
+                nodeLabel: args.nodeLabel,
+                metadataEvent: args.metadataEvent,
+                queuedAt: Date.now(),
+            });
+            LOG.info('MeshEvents', `Queued ${args.event} for MCP coordinator (mesh ${args.meshId})`);
+        }
+        return { success: true, forwarded: 0 };
+    }
 
     const messageText = buildMeshSystemMessage({
         event: args.event,