@adhdev/daemon-core 0.9.82-rc.535 → 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 ? "207830c90b06f2f738a85f74079a2460d53767c8" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "207830c9" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.535" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-15T10:22:51.070Z" : 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;
@@ -24808,7 +24874,11 @@ function buildParseSessionFromTui(spec) {
   const stripLeadingChrome = spec.transcriptPty.stripLeadingChrome ?? true;
   const scope = spec.transcriptPty.scope ?? "buffer";
   const userBgList = Array.isArray(spec.transcriptPty.userBackgroundSgr) ? spec.transcriptPty.userBackgroundSgr.map((s2) => String(s2).trim()).filter(Boolean) : [];
+  const ANY_BG_SENTINELS = /* @__PURE__ */ new Set(["*", "48;*", "bg", "48"]);
   const userBgRes = userBgList.map((code) => {
+    if (ANY_BG_SENTINELS.has(code.toLowerCase())) {
+      return new RegExp("\\x1b\\[[0-9;]*\\b48;(?:5;\\d{1,3}|2;\\d{1,3};\\d{1,3};\\d{1,3})[0-9;]*m");
+    }
     const esc = code.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     return new RegExp(`\\x1b\\[[0-9;]*${esc}[0-9;]*m`);
   });
@@ -26727,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}`;
@@ -44256,7 +44327,7 @@ function executeJsonl(src, input) {
   const mtime = safeMtimeMs(sourcePath);
   const lines = readJsonlLines(sourcePath);
   if (lines.length === 0) return null;
-  const transcriptWorkspace = readSessionMetaWorkspace(lines);
+  const transcriptWorkspace = readSessionMetaWorkspace(lines) ?? (src.workspace_from_input ? workspaceFromInputIfSlugMatches(sourcePath, input) : void 0);
   let providerSessionId;
   if (src.session_id_from === "first_record" && src.session_id_path) {
     const v = jsonPathGet(lines[0], src.session_id_path);
@@ -44339,6 +44410,32 @@ function readSessionMetaWorkspace(lines) {
   }
   return void 0;
 }
+function workspaceFromInputIfSlugMatches(sourcePath, input) {
+  const wsRaw = typeof input.workspace === "string" ? input.workspace.trim() : "";
+  if (!wsRaw) return void 0;
+  let wsReal = wsRaw;
+  try {
+    wsReal = fs17.realpathSync(wsRaw);
+  } catch {
+  }
+  const slugs = /* @__PURE__ */ new Set();
+  for (const w of [wsReal, wsRaw]) {
+    if (!w) continue;
+    slugs.add(claudeProjectDirName(w));
+    slugs.add(claudeProjectDirName(w.replace(/^\/+/, "")));
+  }
+  const segments = sourcePath.split(path24.sep);
+  for (const seg of segments) {
+    if (!seg) continue;
+    for (const slug of slugs) {
+      if (!slug) continue;
+      if (seg === slug) return wsRaw;
+      const m = seg.match(/^(.*)-[0-9a-f]{6,}$/);
+      if (m && m[1] && m[1].length >= 8 && slug.startsWith(m[1])) return wsRaw;
+    }
+  }
+  return void 0;
+}
 function readJsonlLines(p) {
   let text;
   try {