@adhdev/daemon-core 0.9.82-rc.44 → 0.9.82-rc.441

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

@@ -306,6 +306,77 @@ export class ProviderInstanceManager {
         return updated;
     }
 
+    /** Stamp a mesh assignment on a single instance (used by mesh_send_task
+     *  --direct so the worker's completion event has a coordinator routing
+     *  marker in state.settings). Returns `{ stamped: true }` when the stamp was
+     *  applied, or `{ stamped: false, reason }` when it was refused — the instance
+     *  was missing / has no attach method, or the DOUBLE-DISPATCH idempotence guard
+     *  fired (the same task is already running on another live session here). */
+    attachMeshAssignmentToInstance(instanceId: string, assignment: { meshId: string; nodeId?: string; taskId?: string; coordinatorDaemonId?: string; coordinatorSessionId?: string }): { stamped: boolean; reason?: string } {
+        const inst = this.instances.get(instanceId);
+        if (!inst || typeof inst.attachMeshAssignment !== 'function') {
+            LOG.warn('MeshDispatch', `attachMeshAssignment skipped: instance ${instanceId} ${inst ? 'has no attach method' : 'not found'}`);
+            return { stamped: false, reason: inst ? 'instance_has_no_attach_method' : 'instance_not_found' };
+        }
+        // DOUBLE-DISPATCH stamp idempotence guard (defense in depth): refuse to stamp this
+        // (meshId, taskId) onto a SECOND instance when a DIFFERENT, still-live and actively
+        // working instance already holds the exact same task. Two sessions carrying one taskId
+        // double-execute the work (the auto-launch race RCA: a delayed claim by the original
+        // session plus the new session's post-boot claim sequentially stamp the same task —
+        // the atomic claim only blocks SIMULTANEOUS claims). A stale/dead/idle prior holder is
+        // NOT a conflict — a legitimate re-dispatch after a dispatch failure must still stamp.
+        if (assignment.taskId) {
+            const conflict = this.findLiveWorkingTaskHolder(assignment.meshId, assignment.taskId, instanceId);
+            if (conflict) {
+                LOG.warn('MeshDispatch', `attachMeshAssignment refused: task ${assignment.taskId} (mesh ${assignment.meshId}) is already being worked by live session ${conflict} — skipping duplicate stamp on ${instanceId}`);
+                return { stamped: false, reason: 'task_already_stamped_on_live_instance' };
+            }
+        }
+        inst.attachMeshAssignment(assignment);
+        LOG.info('MeshDispatch', `stamped mesh assignment on ${instanceId}: mesh=${assignment.meshId} node=${assignment.nodeId || ''} task=${assignment.taskId || ''} coordinator=${assignment.coordinatorDaemonId || ''}`);
+        return { stamped: true };
+    }
+
+    /**
+     * DOUBLE-DISPATCH support: the id of another LIVE, actively-working instance that already
+     * holds (meshId, taskId), or null. "Live working" = stamped with this exact mesh+task AND
+     * currently mid-turn / booting toward it (generating / waiting on approval-or-choice /
+     * starting) — NOT idle, stopped, or errored. A stale/dead/idle holder is deliberately
+     * ignored so a legitimate re-dispatch (e.g. after a dispatch failure) is never blocked.
+     * The instance being stamped (excludeInstanceId) is skipped so re-stamping the same
+     * session stays idempotent. O(n) over instances — the count is small.
+     */
+    private findLiveWorkingTaskHolder(meshId: string, taskId: string, excludeInstanceId: string): string | null {
+        // Mid-turn / booting statuses (top-level or activeChat). Anything else — idle, stopped,
+        // error — is not a live worker actively holding the task.
+        const working = new Set(['generating', 'waiting_approval', 'waiting_choice', 'starting', 'streaming', 'working', 'no_progress', 'long_generating']);
+        for (const [id, inst] of this.instances) {
+            if (id === excludeInstanceId) continue;
+            let state: ProviderState;
+            try {
+                state = inst.getState();
+            } catch {
+                continue;
+            }
+            const settings = (state.settings as Record<string, unknown>) || {};
+            if (settings.meshNodeFor !== meshId) continue;
+            if (settings.meshActiveTaskId !== taskId) continue;
+            const status = (typeof state.status === 'string' ? state.status : '').toLowerCase();
+            const chatStatus = (typeof state.activeChat?.status === 'string' ? state.activeChat.status : '').toLowerCase();
+            if (working.has(status) || working.has(chatStatus)) return id;
+        }
+        return null;
+    }
+
+    /** Clear a mesh assignment after the dispatched task reaches a terminal
+     *  state (generating_completed / stopped / failed). */
+    detachMeshAssignmentFromInstance(instanceId: string): boolean {
+        const inst = this.instances.get(instanceId);
+        if (!inst || typeof inst.detachMeshAssignment !== 'function') return false;
+        inst.detachMeshAssignment();
+        return true;
+    }
+
     refreshProviderDefinitions(resolveProvider: (providerType: string) => unknown): number {
         let refreshed = 0;
         for (const instance of this.instances.values()) {

package/src/providers/provider-instance.ts

@@ -12,10 +12,11 @@ import type { ProviderModule, ProviderSettingDef, ProviderResumeCapability } fro
 import type { AcpConfigOption, AcpMode, ProviderControlSchema, ProviderSummaryMetadata, SessionCapability } from '../shared-types.js';
 import type { MessageInputSupport } from './provider-input-support.js';
 import type { ChatMessage } from '../types.js';
+import type { InteractivePrompt } from './types/interactive-prompt.js';
 
 // ─── ProviderState — Discriminated union by category ─────────────
 
-export type ProviderStatus = 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
+export type ProviderStatus = 'idle' | 'generating' | 'waiting_approval' | 'waiting_choice' | 'error' | 'stopped' | 'starting';
 
 export interface ProviderRuntimeWriteOwner {
     clientId: string;
@@ -47,6 +48,7 @@ export interface ActiveChatData {
     status: string;
     messages: ChatMessage[];
     activeModal: { message: string; buttons: string[] } | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     inputContent?: string;
 }
 
@@ -72,6 +74,7 @@ interface ProviderStateBase {
     status: ProviderStatus;
  /** chat data */
     activeChat: ActiveChatData | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
  /** Workspace — project path or name (all categories) */
     workspace?: string | null;
     /** Runtime info (real-time detection) */
@@ -214,9 +217,24 @@ export interface ProviderInstance {
  /** Update settings at runtime (called when user changes settings from dashboard) */
     updateSettings?(newSettings: Record<string, any>): void;
 
+    /** Stamp a direct-dispatch mesh task assignment so generating_completed
+     *  events route back to the originating coordinator. Cleared by
+     *  detachMeshAssignment when the task reaches a terminal state. */
+    attachMeshAssignment?(assignment: { meshId: string; nodeId?: string; taskId?: string; coordinatorDaemonId?: string; coordinatorSessionId?: string }): void;
+    detachMeshAssignment?(): void;
+
     /** Refresh static provider definition/scripts without restarting the live runtime. */
     refreshProviderDefinition?(provider: ProviderModule): void;
 
+    /**
+     * Record that a human is actively attending this session by hand right now
+     * (foreground tab selection, controlbar use, manual approval, terminal
+     * input). Provider-common signal that suppresses auto-approve for a short
+     * window so the user can drive the session manually; background mesh worker
+     * sessions never receive it, so their delegated auto-approve is unaffected.
+     */
+    noteManualInteraction?(now?: number): void;
+
  /** cleanup */
     dispose(): void;
 }