@adhdev/daemon-core 0.9.77-rc.50 → 0.9.77-rc.51

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

@@ -8,6 +8,10 @@ export interface PendingMeshCoordinatorEvent {
 }
 /** Drain and return all pending coordinator events, clearing the queue. */
 export declare function drainPendingMeshCoordinatorEvents(): PendingMeshCoordinatorEvent[];
+/** Peek at pending coordinator events without draining (non-destructive). */
+export declare function getPendingMeshCoordinatorEvents(): readonly PendingMeshCoordinatorEvent[];
+/** Explicitly clear all pending coordinator events. */
+export declare function clearPendingMeshCoordinatorEvents(): void;
 export declare function tryAssignQueueTask(components: DaemonComponents, meshId: string, nodeId: string, sessionId: string, providerType: string): boolean;
 /**
  * Triggers a queue check for all nodes in the mesh.

package/dist/mesh/mesh-work-queue.d.ts

@@ -32,6 +32,8 @@ export interface MeshWorkQueueEntry {
         sessionId?: string;
         updatedAt: string;
     };
+    /** ISO timestamp when the task was dispatched (assigned) to a node/session. Used for precise matching on completion. */
+    dispatchTimestamp?: string;
     createdAt: string;
     updatedAt: string;
 }

package/dist/providers/chat-message-normalization.d.ts

@@ -1,4 +1,5 @@
 import type { ChatMessage } from '../types.js';
+export declare function extractFinalSummaryFromMessages(messages: ChatMessage[] | null | undefined, maxChars?: number): string;
 export declare const BUILTIN_CHAT_MESSAGE_KINDS: readonly ["standard", "thought", "tool", "terminal", "system"];
 export type BuiltinChatMessageKind = typeof BUILTIN_CHAT_MESSAGE_KINDS[number];
 export type ChatMessageKind = BuiltinChatMessageKind | (string & {});

package/package.json

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

package/src/index.ts

@@ -160,7 +160,8 @@ export { enqueueTask, getQueue, claimNextTask, updateTaskStatus, updateSessionTa
 export type { MeshWorkQueueEntry, MeshTaskStatus, MeshWorkQueueStats } from './mesh/mesh-work-queue.js';
 
 // ── Mesh Events ──
-export { triggerMeshQueue } from './mesh/mesh-events.js';
+export { triggerMeshQueue, drainPendingMeshCoordinatorEvents, getPendingMeshCoordinatorEvents, clearPendingMeshCoordinatorEvents } from './mesh/mesh-events.js';
+export type { PendingMeshCoordinatorEvent } from './mesh/mesh-events.js';
 
 // ── Mesh P2P Relay Failure Classification ──
 export {

package/src/mesh/mesh-events.ts

@@ -44,6 +44,16 @@ export function drainPendingMeshCoordinatorEvents(): PendingMeshCoordinatorEvent
     return pendingMeshCoordinatorEvents.splice(0);
 }
 
+/** Peek at pending coordinator events without draining (non-destructive). */
+export function getPendingMeshCoordinatorEvents(): readonly PendingMeshCoordinatorEvent[] {
+    return pendingMeshCoordinatorEvents.slice();
+}
+
+/** Explicitly clear all pending coordinator events. */
+export function clearPendingMeshCoordinatorEvents(): void {
+    pendingMeshCoordinatorEvents.splice(0);
+}
+
 function readNonEmptyString(value: unknown): string {
     return typeof value === 'string' && value.trim() ? value.trim() : '';
 }

package/src/mesh/mesh-work-queue.ts

@@ -39,6 +39,8 @@ export interface MeshWorkQueueEntry {
         sessionId?: string;
         updatedAt: string;
     };
+    /** ISO timestamp when the task was dispatched (assigned) to a node/session. Used for precise matching on completion. */
+    dispatchTimestamp?: string;
     createdAt: string;
     updatedAt: string;
 }
@@ -132,6 +134,7 @@ export function claimNextTask(meshId: string, nodeId: string, sessionId: string)
     entry.status = 'assigned';
     entry.assignedNodeId = nodeId;
     entry.assignedSessionId = sessionId;
+    entry.dispatchTimestamp = new Date().toISOString();
     entry.updatedAt = new Date().toISOString();
 
     writeQueue(meshId, queue);
@@ -243,17 +246,27 @@ export function updateSessionTaskStatus(
     status: MeshTaskStatus,
 ): MeshWorkQueueEntry | null {
     const queue = readQueue(meshId);
-    // Find the most recently assigned task for this session that isn't already terminal
-    // (In case multiple tasks were assigned to the same session over time, though rare)
+    // Collect all assigned tasks for this session, then pick the one with the
+    // most recent dispatchTimestamp (or updatedAt fallback for legacy entries).
+    // This prevents completing the wrong task when multiple tasks were assigned
+    // to the same session in rapid succession.
+    let bestIdx = -1;
+    let bestTime = 0;
     for (let i = queue.length - 1; i >= 0; i--) {
         if (queue[i].assignedSessionId === sessionId && queue[i].status === 'assigned') {
-            queue[i].status = status;
-            queue[i].updatedAt = new Date().toISOString();
-            writeQueue(meshId, queue);
-            return queue[i];
+            const time = new Date(queue[i].dispatchTimestamp || queue[i].updatedAt).getTime();
+            if (time > bestTime) {
+                bestTime = time;
+                bestIdx = i;
+            }
         }
     }
-    return null;
+    if (bestIdx === -1) return null;
+
+    queue[bestIdx].status = status;
+    queue[bestIdx].updatedAt = new Date().toISOString();
+    writeQueue(meshId, queue);
+    return queue[bestIdx];
 }
 
 export interface MeshWorkQueueStats {

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

@@ -61,6 +61,7 @@ import {
     buildToolChatMessage,
     buildUserChatMessage,
     normalizeChatMessages,
+    extractFinalSummaryFromMessages,
 } from './chat-message-normalization.js';
 import { LOG } from '../logging/logger.js';
 import type { ChatMessage } from '../types.js';
@@ -1507,7 +1508,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 });
             } else if (newStatus === 'idle' && (this.lastStatus === 'generating' || this.lastStatus === 'waiting_approval')) {
                 const duration = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1000) : 0;
-                this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now });
+                this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now, finalSummary: extractFinalSummaryFromMessages(this.messages) });
                 this.generatingStartedAt = 0;
             } else if (newStatus === 'stopped') {
                 this.pushEvent({ event: 'agent:stopped', chatTitle, timestamp: now });

package/src/providers/chat-message-normalization.ts

@@ -1,4 +1,36 @@
 import type { ChatMessage } from '../types.js';
+import { flattenContent } from './contracts.js';
+
+export function extractFinalSummaryFromMessages(
+  messages: ChatMessage[] | null | undefined,
+  maxChars: number = 500,
+): string {
+  if (!Array.isArray(messages) || messages.length === 0) return '';
+
+  // Find last user-facing assistant message
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const classification = classifyChatMessageVisibility(msg);
+    if (classification.isUserFacing && (msg.role === 'assistant' || msg.role === 'model')) {
+      const text = flattenContent(msg.content).trim();
+      if (text) return text.slice(0, maxChars);
+    }
+  }
+
+  // Fallback: last user-facing message of any role
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const classification = classifyChatMessageVisibility(msg);
+    if (classification.isUserFacing) {
+      const text = flattenContent(msg.content).trim();
+      if (text) return text.slice(0, maxChars);
+    }
+  }
+
+  return '';
+}
 
 export const BUILTIN_CHAT_MESSAGE_KINDS = ['standard', 'thought', 'tool', 'terminal', 'system'] as const;
 

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

@@ -25,7 +25,7 @@ import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.
 import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 import { normalizeProviderSessionId } from './provider-session-id.js';
-import { buildChatMessage, buildRuntimeSystemChatMessage, isUserFacingChatMessage, normalizeChatMessages, resolveChatMessageKind } from './chat-message-normalization.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage, isUserFacingChatMessage, normalizeChatMessages, resolveChatMessageKind, extractFinalSummaryFromMessages } from './chat-message-normalization.js';
 
 type PersistableCliHistoryMessage = {
     role: string;
@@ -841,6 +841,7 @@ export class CliProviderInstance implements ProviderInstance {
             chatTitle: pending.chatTitle,
             duration: pending.duration,
             timestamp: pending.timestamp,
+            finalSummary: extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages),
         });
         this.completedDebouncePending = null;
         this.completedDebounceTimer = null;

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

@@ -12,7 +12,7 @@ import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from '.
 import { ChatHistoryWriter } from '../config/chat-history.js';
 import type { ChatMessage } from '../types.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
-import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages } from './chat-message-normalization.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages, extractFinalSummaryFromMessages } from './chat-message-normalization.js';
 import { getProviderSessionCapabilities, EXTENSION_PROVIDER_SESSION_CAPABILITIES_BASE } from './open-panel-support.js';
 
 export class ExtensionProviderInstance implements ProviderInstance {
@@ -234,6 +234,7 @@ export class ExtensionProviderInstance implements ProviderInstance {
                     agentType: this.type,
                     agentName: this.agentName || this.provider.name,
                     extensionId: this.extensionId || this.type,
+                    finalSummary: extractFinalSummaryFromMessages(data?.messages),
                 });
                 this.generatingStartedAt = 0;
             }

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

@@ -22,7 +22,7 @@ import { validateReadChatResultPayload } from './read-chat-contract.js';
 import type { ChatMessage } from '../types.js';
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
-import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages } from './chat-message-normalization.js';
+import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages, extractFinalSummaryFromMessages } from './chat-message-normalization.js';
 import { getProviderSessionCapabilities, IDE_PROVIDER_SESSION_CAPABILITIES_BASE } from './open-panel-support.js';
 
 type ReadChatModal = {
@@ -470,7 +470,7 @@ export class IdeProviderInstance implements ProviderInstance {
             } else if (agentStatus === 'idle' && (lastStatus === 'generating' || lastStatus === 'waiting_approval')) {
                 const startedAt = this.generatingStartedAt.get(agentKey);
                 const duration = startedAt ? Math.round((now - startedAt) / 1000) : 0;
-                this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now, ideType: this.type });
+                this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now, ideType: this.type, finalSummary: extractFinalSummaryFromMessages(chatData?.messages) });
                 this.generatingStartedAt.delete(agentKey);
             }