@adhdev/daemon-core 0.9.82-rc.166 → 0.9.82-rc.167

package/dist/providers/sdk/v1/builders/cli/parse-approval.d.ts

@@ -31,6 +31,7 @@ export interface ModalTuiSpec {
     questionVariants?: ModalQuestionVariant[];
     buttonPattern: string;
     buttonFlags?: string;
+    buttonLabelGroup?: number;
     /**
      * Optional fallback for terminals that render all options on a single line
      * (e.g. Antigravity feedback survey: `[0] skip [1] yes [2] no [3] still using`).

package/package.json

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

package/src/mesh/mesh-events.ts

@@ -556,6 +556,24 @@ function hasDispatchAfterTerminal(meshId: string, sessionId: string, terminalId:
     return false;
 }
 
+function hasUnterminalDirectDispatchLedgerEntry(meshId: string, sessionId: string): boolean {
+    // Some dispatch paths can persist task_dispatched before the direct-dispatch DB row is
+    // available. Recover routing from ledger order so coordinator self-targets still emit
+    // task_completed and pendingCoordinatorEvents.
+    const entries = readLedgerEntries(meshId, { tail: 200 });
+    for (let i = entries.length - 1; i >= 0; i--) {
+        const entry = entries[i];
+        if (entry.sessionId !== sessionId) continue;
+        if (entry.kind === 'task_completed' || entry.kind === 'task_failed' || entry.kind === 'task_stalled') {
+            return false;
+        }
+        if (entry.kind === 'task_dispatched' && entry.payload?.source === 'direct') {
+            return true;
+        }
+    }
+    return false;
+}
+
 function buildLongGeneratingCompletionReconciliation(args: {
     meshId: string;
     nodeId?: string;
@@ -1627,7 +1645,7 @@ export function setupMeshEventForwarding(components: DaemonComponents) {
         if (coordinatorMeshId) {
             try {
                 const activeDispatches = getActiveDirectDispatches(coordinatorMeshId);
-                if (activeDispatches.some(d => d.sessionId === instanceId)) {
+                if (activeDispatches.some(d => d.sessionId === instanceId) || hasUnterminalDirectDispatchLedgerEntry(coordinatorMeshId, instanceId)) {
                     meshIdFromDirectDispatch = coordinatorMeshId;
                 }
             } catch { /* best-effort */ }

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

@@ -729,7 +729,7 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     getSessionModalState(sessionId?: string): SessionModalState {
-        const adapterStatus = this.adapter.getStatus({ allowParse: false });
+        const adapterStatus = this.adapter.getStatus({ allowParse: true });
         const autoApproveActive = adapterStatus.status === 'waiting_approval' && this.shouldAutoApprove();
         const visibleStatus = autoApproveActive ? 'generating' : adapterStatus.status;
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';

package/src/providers/provider-loader.ts

@@ -30,6 +30,10 @@ import type {
   ResolvedProvider,
 } from './contracts.js';
 import { validateProviderDefinition } from './provider-schema.js';
+import {
+  loadProvidersActive,
+  resolveActiveSource,
+} from './external-sources.js';
 import type { ProviderSourceMode } from '../config/config.js';
 import type { ProviderSourceConfigSnapshot, ProviderUserDirSource } from '../config/provider-source-config.js';
 
@@ -430,10 +434,6 @@ export class ProviderLoader {
         }
       } else {
         // New layout: external/<source-name>/<category>/<type>/…
-        const {
-          loadProvidersActive,
-          resolveActiveSource,
-        } = require('./external-sources.js') as typeof import('./external-sources.js');
         const activeFile = loadProvidersActive();
         let totalLoaded = 0;
         const ambiguousTypes: { type: string; chosen: string; candidates: string[] }[] = [];

package/src/providers/sdk/v1/builders/cli/parse-approval.ts

@@ -44,6 +44,7 @@ export interface ModalTuiSpec {
   questionVariants?: ModalQuestionVariant[];
   buttonPattern: string;
   buttonFlags?: string;
+  buttonLabelGroup?: number;
   /**
    * Optional fallback for terminals that render all options on a single line
    * (e.g. Antigravity feedback survey: `[0] skip [1] yes [2] no [3] still using`).
@@ -136,12 +137,16 @@ function extractButtons(
 ): string[] {
   const buttonRe = compile(spec.buttonPattern, spec.buttonFlags ?? 'm');
   const out: string[] = [];
+  const labelGroup = Number.isInteger(spec.buttonLabelGroup) && (spec.buttonLabelGroup ?? 0) > 0
+    ? spec.buttonLabelGroup!
+    : 1;
   let i = windowStart;
   while (i < windowEnd) {
     const line = lines[i];
     const m = buttonRe.exec(line);
-    if (m && m[1]) {
-      let label = m[1].trim();
+    const captured = m?.[labelGroup] ?? (labelGroup === 1 && m && m.length > 2 ? m[m.length - 1] : undefined);
+    if (m && captured) {
+      let label = captured.trim();
       // Continuation lines: when enabled, append indented lines below until
       // the next button or blank.
       if (spec.continuationLines) {

package/src/providers/sdk/v1/schemas/primitives/tui-modal-v1.json

@@ -36,6 +36,12 @@
       "type": "string",
       "description": "Regex source matching a single button line. Capture group 1 is the button label. Example: `^[\\s❯>]*\\d+\\.\\s+(.+)$`."
     },
+    "buttonLabelGroup": {
+      "type": "integer",
+      "minimum": 1,
+      "default": 1,
+      "description": "Capture group number to use as the button label when `buttonPattern` contains non-label groups such as selected-row markers."
+    },
     "buttonFlags": {
       "type": "string",
       "pattern": "^[gimsuy]*$",