@adhdev/daemon-core 0.9.82-rc.536 → 0.9.82-rc.537

package/dist/index.js

@@ -419,10 +419,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "e7001a2fe5b5af35d3710c964727f7e4d735e852" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "e7001a2f" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.536" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-15T11:34:59.318Z" : void 0);
+  const commit = readInjected(true ? "b47ad45cf2b2ad404d911162a9cadd7db2e274a6" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "b47ad45c" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.537" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-15T13:12:55.213Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -24551,6 +24551,70 @@ function modalMatches(spec, input) {
   if (buttonBlockApprovalCue(spec, text)) return true;
   return false;
 }
+function lastModalCueLine(spec, screenText) {
+  if (!screenText) return -1;
+  const lines = screenText.split("\n");
+  const question = compile2(spec.questionPattern, spec.questionFlags ?? "i");
+  const variants = (spec.questionVariants ?? []).map((v) => compile2(v.regex, v.flags ?? "i"));
+  const buttonFlags = spec.buttonFlags && spec.buttonFlags.includes("m") ? spec.buttonFlags : `${spec.buttonFlags ?? ""}m`;
+  const buttonRe = compile2(spec.buttonPattern, buttonFlags);
+  let last = -1;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    question.lastIndex = 0;
+    if (question.test(line)) {
+      last = i;
+      continue;
+    }
+    if (variants.some((re) => {
+      re.lastIndex = 0;
+      return re.test(line);
+    })) {
+      last = i;
+      continue;
+    }
+    buttonRe.lastIndex = 0;
+    if (buttonRe.test(line)) {
+      last = i;
+      continue;
+    }
+  }
+  return last;
+}
+function modalSupersededBySettledPrompt(modalSpec, settledSpec, settled, input) {
+  if (!settled || !settledSpec) return false;
+  if (settledSpec.scope === "whole-screen") return false;
+  const screenText = input.screenText ?? "";
+  if (!screenText) return false;
+  const modalLine = lastModalCueLine(modalSpec, screenText);
+  if (modalLine < 0) return false;
+  const lines = screenText.split("\n");
+  const below = lines.slice(modalLine + 1);
+  if (below.length === 0) return false;
+  const belowText = below.join("\n");
+  if (!settled.prompt.test(belowText)) return false;
+  if (settled.footers.length > 0 && !settled.footers.every((f) => f.test(belowText))) return false;
+  const question = compile2(modalSpec.questionPattern, modalSpec.questionFlags ?? "i");
+  const variants = (modalSpec.questionVariants ?? []).map((v) => compile2(v.regex, v.flags ?? "i"));
+  const buttonFlags = modalSpec.buttonFlags && modalSpec.buttonFlags.includes("m") ? modalSpec.buttonFlags : `${modalSpec.buttonFlags ?? ""}m`;
+  const buttonRe = compile2(modalSpec.buttonPattern, buttonFlags);
+  const isModalCueLine = (line) => {
+    question.lastIndex = 0;
+    if (question.test(line)) return true;
+    if (variants.some((re) => {
+      re.lastIndex = 0;
+      return re.test(line);
+    })) return true;
+    buttonRe.lastIndex = 0;
+    return buttonRe.test(line);
+  };
+  const settledPromptLineRe = compile2(settledSpec.regex, (settledSpec.flags ?? "m").includes("m") ? settledSpec.flags ?? "m" : `${settledSpec.flags ?? ""}m`);
+  const isSettledLine = (line) => {
+    settledPromptLineRe.lastIndex = 0;
+    return settledPromptLineRe.test(line);
+  };
+  return below.some((line) => line.trim() !== "" && !isModalCueLine(line) && !isSettledLine(line));
+}
 function evaluateGroup(group, spec, input, compiled) {
   switch (group) {
     case "spinner": {
@@ -24560,7 +24624,9 @@ function evaluateGroup(group, spec, input, compiled) {
     }
     case "modal": {
       if (!spec.modal) return null;
-      return modalMatches(spec.modal, input) ? "waiting_approval" : null;
+      if (!modalMatches(spec.modal, input)) return null;
+      if (modalSupersededBySettledPrompt(spec.modal, spec.settledPrompt, compiled.settled, input)) return null;
+      return "waiting_approval";
     }
     case "settled-prompt": {
       if (!spec.settledPrompt || !compiled.settled) return null;
@@ -26731,6 +26797,7 @@ var init_provider_cli_adapter = __esm({
         const staleSnapshotLooksActive = activeScreenPattern.test(lastSnapshot);
         const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:Try\s+["“][^\n\r"”]+["”])?\s*(?:\n|\r|$)/.test(screenText) && !activeScreenPattern.test(screenText);
         if (staleSnapshotLooksActive && currentScreenLooksIdle) return screenText;
+        if (this.runDetectStatus(screenText) === "idle") return screenText;
         if (currentSnapshot.length >= lastSnapshot.length) return screenText;
         return `${screenText}
 ${lastSnapshot}`;