@adhdev/daemon-core 0.9.82-rc.224 → 0.9.82-rc.225

package/package.json

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

package/src/commands/router.ts

@@ -6142,26 +6142,34 @@ export class DaemonCommandRouter {
                     const emitBootstrapEvent = (eventStatus: 'bootstrap_complete' | 'bootstrap_failed', bootstrapState: WorktreeBootstrapState, startedAtMs: number, extraPayload?: Record<string, unknown>): void => {
                         try {
                             const durationMs = Date.now() - startedAtMs;
-                            const eventPayload: PendingMeshCoordinatorEvent = {
-                                event: `worktree_${eventStatus}`,
+                            const event = `worktree_${eventStatus}` as const;
+                            const metadataEvent = {
+                                source: 'clone_mesh_node_bootstrap',
+                                nodeId: node.id,
+                                status: eventStatus,
+                                worktreePath: result.worktreePath,
+                                durationMs,
+                                bootstrapStatus: bootstrapState.status,
+                                ...(bootstrapState.error ? { error: bootstrapState.error } : {}),
+                                ...(bootstrapState.exitCode !== undefined ? { exitCode: bootstrapState.exitCode } : {}),
+                                ...(extraPayload || {}),
+                            };
+                            if (typeof this.deps.instanceManager?.getByCategory === 'function') {
+                                const forwarded = handleMeshForwardEvent(
+                                    { instanceManager: this.deps.instanceManager } as any,
+                                    { event, meshId, nodeId: node.id, workspace: result.worktreePath, metadataEvent },
+                                );
+                                if (forwarded?.success === true) return;
+                            }
+                            queuePendingMeshCoordinatorEvent({
+                                event,
                                 meshId,
                                 nodeLabel: node.id,
                                 nodeId: node.id,
                                 workspace: result.worktreePath,
-                                metadataEvent: {
-                                    source: 'clone_mesh_node_bootstrap',
-                                    nodeId: node.id,
-                                    status: eventStatus,
-                                    worktreePath: result.worktreePath,
-                                    durationMs,
-                                    bootstrapStatus: bootstrapState.status,
-                                    ...(bootstrapState.error ? { error: bootstrapState.error } : {}),
-                                    ...(bootstrapState.exitCode !== undefined ? { exitCode: bootstrapState.exitCode } : {}),
-                                    ...(extraPayload || {}),
-                                },
+                                metadataEvent,
                                 queuedAt: Date.now(),
-                            };
-                            queuePendingMeshCoordinatorEvent(eventPayload);
+                            });
                         } catch { /* event emission is best-effort */ }
                     };
 

package/src/mesh/mesh-events-coordinator.ts

@@ -870,6 +870,8 @@ const MESH_COORDINATOR_EVENTS = new Set([
     'refine:accepted',
     'refine:completed',
     'refine:failed',
+    'worktree_bootstrap_complete',
+    'worktree_bootstrap_failed',
 ]);
 
 const EVENT_TO_LEDGER_KIND: Record<string, MeshLedgerKind> = {

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

@@ -1483,9 +1483,14 @@ export class CliProviderInstance implements ProviderInstance {
         const rawStatus = adapterStatus.status;
         const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, now);
         const externalNativeFinal = this.getExternalNativeFinalReconciliation(undefined, adapterStatus);
+        // During the autoApproveBusy window (2s after firing approval key), the PTY
+        // can briefly report 'idle' before the next generating phase starts. Treat that
+        // transient idle as 'generating' to suppress a spurious agent:generating_completed
+        // push notification. externalNativeFinal still wins to allow hard-stop overrides.
+        const autoApproveHoldIdle = this.autoApproveBusy && rawStatus === 'idle';
         const newStatus = externalNativeFinal && isCliGeneratingLikeStatus(rawStatus)
             ? 'idle'
-            : (autoApproveActive ? 'generating' : rawStatus);
+            : (autoApproveActive || autoApproveHoldIdle ? 'generating' : rawStatus);
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
         const chatTitle = `${this.provider.name} · ${dirName}`;
         const partial = this.adapter.getPartialResponse();