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

package/dist/index.js

@@ -3699,6 +3699,20 @@ function hasDispatchAfterTerminal(meshId, sessionId, terminalId) {
   }
   return false;
 }
+function hasUnterminalDirectDispatchLedgerEntry(meshId, sessionId) {
+  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) {
   const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
   const nodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
@@ -4566,7 +4580,7 @@ function setupMeshEventForwarding(components) {
     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 {
@@ -6402,12 +6416,14 @@ function scopeLines(spec, lines, questionIndex) {
 function extractButtons(spec, lines, windowStart, windowEnd) {
   const buttonRe = compile3(spec.buttonPattern, spec.buttonFlags ?? "m");
   const out = [];
+  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] : void 0);
+    if (m && captured) {
+      let label = captured.trim();
       if (spec.continuationLines) {
         let j = i + 1;
         while (j < windowEnd) {
@@ -28397,7 +28413,7 @@ var CliProviderInstance = class {
     };
   }
   getSessionModalState(sessionId) {
-    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";
@@ -31930,6 +31946,7 @@ function validateControl(control, errors) {
 }
 
 // src/providers/provider-loader.ts
+init_external_sources();
 function registerProviderScriptRootSafely(root) {
   if (!root || typeof root !== "string") return;
   try {
@@ -32187,11 +32204,7 @@ var ProviderLoader = class _ProviderLoader {
           this.log(`Loaded ${externalCount} external providers (legacy unnamed source)`);
         }
       } else {
-        const {
-          loadProvidersActive: loadProvidersActive2,
-          resolveActiveSource: resolveActiveSource2
-        } = (init_external_sources(), __toCommonJS(external_sources_exports));
-        const activeFile = loadProvidersActive2();
+        const activeFile = loadProvidersActive();
         let totalLoaded = 0;
         const ambiguousTypes = [];
         for (const sourceEntry of rootEntries) {
@@ -32206,7 +32219,7 @@ var ProviderLoader = class _ProviderLoader {
         for (const [type] of this.providers) {
           const prov = this.providers.get(type);
           if (!prov) continue;
-          const resolved = resolveActiveSource2(prov.category, type, activeFile);
+          const resolved = resolveActiveSource(prov.category, type, activeFile);
           if (resolved.candidates.length <= 1) continue;
           if (resolved.ambiguous) {
             ambiguousTypes.push({ type, chosen: resolved.source ?? "?", candidates: resolved.candidates });