@adhdev/daemon-core 0.9.82-rc.180 → 0.9.82-rc.181

package/dist/index.js

@@ -1694,6 +1694,21 @@ var init_async_batch_writer = __esm({
 });
 
 // src/logging/logger.ts
+var logger_exports = {};
+__export(logger_exports, {
+  LOG: () => LOG,
+  LOG_DIR_PATH: () => LOG_DIR_PATH,
+  LOG_PATH: () => LOG_PATH,
+  daemonLog: () => daemonLog,
+  getCurrentDaemonLogPath: () => getCurrentDaemonLogPath,
+  getDaemonLogDir: () => getDaemonLogDir,
+  getLogBufferSize: () => getLogBufferSize,
+  getLogLevel: () => getLogLevel,
+  getLogPath: () => getLogPath,
+  getRecentLogs: () => getRecentLogs,
+  installGlobalInterceptor: () => installGlobalInterceptor,
+  setLogLevel: () => setLogLevel
+});
 function setLogLevel(level) {
   currentLevel = level;
   daemonLog("Logger", `Log level set to: ${level}`, "info");
@@ -1765,6 +1780,9 @@ function getRecentLogs(count = 50, minLevel = "info") {
   const filtered = ringBuffer.filter((e) => LEVEL_NUM[e.level] >= minNum);
   return filtered.slice(-count);
 }
+function getLogBufferSize() {
+  return ringBuffer.length;
+}
 function ts() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
 }
@@ -1844,7 +1862,10 @@ function installGlobalInterceptor() {
   writeToFile(`Log file: ${currentLogFile}`);
   writeToFile(`Log level: ${currentLevel}`);
 }
-var fs4, path9, os3, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH;
+function getLogPath() {
+  return currentLogFile;
+}
+var fs4, path9, os3, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH, LOG_DIR_PATH;
 var init_logger = __esm({
   "src/logging/logger.ts"() {
     "use strict";
@@ -1905,6 +1926,7 @@ var init_logger = __esm({
     };
     interceptorInstalled = false;
     LOG_PATH = path9.join(LOG_DIR, `daemon-${getDateStr()}.log`);
+    LOG_DIR_PATH = LOG_DIR;
   }
 });
 
@@ -5342,18 +5364,6 @@ function setupMeshEventForwarding(components) {
       } catch {
       }
       if (!meshIdFromDirectDispatch) return;
-    } else {
-      const workspaceMesh = getCachedMeshByWorkspace(workspace);
-      const workspaceMeshId = readNonEmptyString2(workspaceMesh?.id);
-      if (workspaceMeshId) {
-        try {
-          const activeDispatches = getActiveDirectDispatches(workspaceMeshId);
-          if (activeDispatches.some((d) => d.sessionId === instanceId) || hasUnterminalDirectDispatchLedgerEntry(workspaceMeshId, instanceId)) {
-            meshIdFromDirectDispatch = workspaceMeshId;
-          }
-        } catch {
-        }
-      }
     }
     const meshIdFromRuntime = readNonEmptyString2(settings.meshNodeFor) || meshIdFromDirectDispatch;
     const isMeshDelegate = Boolean(meshIdFromRuntime || settings.launchedByCoordinator);
@@ -13259,6 +13269,7 @@ function buildClaudeInteractiveToolResult(response) {
     }
   });
 }
+var CLAUDE_TUI_OPTION_PATTERN = /^\s*(?:[❯›>]\s*)?(\d+)\.\s+(.+?)\s*$/;
 function claudeTuiQuestionHeaders(screenText) {
   const navLine = screenText.split(/\r?\n/).find((line) => line.includes("\u2714 Submit") && /[☐☒]/.test(line));
   if (!navLine) return [];
@@ -13270,6 +13281,88 @@ function claudeTuiQuestionHeaders(screenText) {
   }
   return headers;
 }
+function isClaudeTuiSelectFooter(text) {
+  return /Enter to select/i.test(text) && /Esc to cancel/i.test(text);
+}
+function readClaudeHeaderLine(lines, beforeIndex) {
+  for (let i = beforeIndex; i >= 0; i -= 1) {
+    const candidate = lines[i].trim();
+    if (!candidate) continue;
+    const match = candidate.match(/^[☐☒]\s+(.+?)\s*$/);
+    if (match?.[1]) return readString(match[1]);
+    if (/^─+$/.test(candidate)) break;
+  }
+  return void 0;
+}
+function readClaudeOptionDescription(lines, optionLineIndex) {
+  const nextLine = lines[optionLineIndex + 1];
+  const next = nextLine?.trim();
+  if (!next || CLAUDE_TUI_OPTION_PATTERN.test(nextLine) || /^─+$/.test(next) || /^Enter to select\b/i.test(next) || /^[☐☒]\s+/.test(next)) {
+    return void 0;
+  }
+  return next;
+}
+function parseClaudeHeaderlessInteractiveTuiQuestion(page, index) {
+  if (!isClaudeTuiSelectFooter(page.screenText)) return null;
+  if (!/Type something\.?|Chat about this/i.test(page.screenText)) return null;
+  const lines = page.screenText.split(/\r?\n/);
+  let footerIndex = -1;
+  for (let i = lines.length - 1; i >= 0; i -= 1) {
+    if (/Enter to select/i.test(lines[i])) {
+      footerIndex = i;
+      break;
+    }
+  }
+  if (footerIndex < 0) return null;
+  let optionBlockEnd = footerIndex - 1;
+  for (let i = footerIndex - 1; i >= 0; i -= 1) {
+    if (/^─+$/.test(lines[i].trim())) {
+      optionBlockEnd = i - 1;
+      break;
+    }
+  }
+  const optionLineIndexes = [];
+  for (let i = optionBlockEnd; i >= 0; i -= 1) {
+    const line = lines[i];
+    if (CLAUDE_TUI_OPTION_PATTERN.test(line)) {
+      optionLineIndexes.push(i);
+      continue;
+    }
+    if (optionLineIndexes.length > 0 && (!line.trim() || /^─+$/.test(line.trim()))) break;
+  }
+  optionLineIndexes.reverse();
+  if (optionLineIndexes.length === 0) return null;
+  const firstOptionIndex = optionLineIndexes[0];
+  let question = "";
+  for (let i = firstOptionIndex - 1; i >= 0; i -= 1) {
+    const candidate = lines[i].trim();
+    if (!candidate || /^─+$/.test(candidate) || /^[☐☒]\s+/.test(candidate)) continue;
+    question = candidate;
+    break;
+  }
+  if (!question) return null;
+  const options = [];
+  let allowFreeform = false;
+  for (const optionLineIndex of optionLineIndexes) {
+    const match = lines[optionLineIndex].match(CLAUDE_TUI_OPTION_PATTERN);
+    if (!match) continue;
+    const label = match[2].trim();
+    if (/^Chat about this$/i.test(label)) continue;
+    if (/^Type something\.?$/i.test(label)) allowFreeform = true;
+    const description = readClaudeOptionDescription(lines, optionLineIndex);
+    options.push({ label, ...description ? { description } : {} });
+  }
+  if (options.length === 0) return null;
+  const header = readString(page.header) || readClaudeHeaderLine(lines, firstOptionIndex - 1);
+  return {
+    questionId: `q${index + 1}`,
+    question,
+    ...header ? { header } : {},
+    multiSelect: /Space to select|toggle selections/i.test(page.screenText),
+    options,
+    ...allowFreeform ? { allowFreeform: true } : {}
+  };
+}
 function parseClaudeInteractiveTuiQuestion(page, index) {
   const lines = page.screenText.split(/\r?\n/);
   let navIndex = -1;
@@ -13279,7 +13372,8 @@ function parseClaudeInteractiveTuiQuestion(page, index) {
       break;
     }
   }
-  if (navIndex < 0 || !page.screenText.includes("Enter to select")) return null;
+  if (navIndex < 0) return parseClaudeHeaderlessInteractiveTuiQuestion(page, index);
+  if (!page.screenText.includes("Enter to select")) return null;
   let question = "";
   let questionLineIndex = -1;
   for (let i = navIndex + 1; i < lines.length; i += 1) {
@@ -13293,9 +13387,8 @@ function parseClaudeInteractiveTuiQuestion(page, index) {
   if (!question) return null;
   const options = [];
   let allowFreeform = false;
-  const optionPattern = /^\s*(?:[❯›>]\s*)?(\d+)\.\s+(.+?)\s*$/;
   for (let i = questionLineIndex + 1; i < lines.length; i += 1) {
-    const match = lines[i].match(optionPattern);
+    const match = lines[i].match(CLAUDE_TUI_OPTION_PATTERN);
     if (!match) continue;
     const label = match[2].trim();
     if (/^Type something\.?$/i.test(label)) {
@@ -13305,7 +13398,7 @@ function parseClaudeInteractiveTuiQuestion(page, index) {
     if (/^Chat about this$/i.test(label)) continue;
     let description;
     const nextLine = lines[i + 1]?.trim();
-    if (nextLine && !optionPattern.test(lines[i + 1]) && !/^─+$/.test(nextLine) && !/^Enter to select\b/.test(nextLine)) {
+    if (nextLine && !CLAUDE_TUI_OPTION_PATTERN.test(lines[i + 1]) && !/^─+$/.test(nextLine) && !/^Enter to select\b/.test(nextLine)) {
       description = nextLine;
     }
     options.push({ label, ...description ? { description } : {} });
@@ -28189,7 +28282,11 @@ var SpecCliAdapter = class {
   maybeRefreshNativeHistory() {
   }
   getScriptParsedStatus() {
-    return this.getStatus();
+    const status = this.getStatus();
+    return {
+      ...status,
+      messages: this.readClaudeScreenAssistantMessages()
+    };
   }
   getPartialResponse() {
     return this.partialResponse;
@@ -28416,11 +28513,58 @@ var SpecCliAdapter = class {
       }
     }
   }
+  readCurrentScreenSections(screenText) {
+    try {
+      const ev = evaluate(this.spec, screenText);
+      return Object.fromEntries(ev.sections.map((section) => [section.id, section.text]));
+    } catch {
+      return {};
+    }
+  }
+  readClaudeScreenAssistantMessages() {
+    if (this.cliType !== "claude-cli") return [];
+    let screenText = "";
+    try {
+      screenText = this.driver.snapshot();
+    } catch {
+      return [];
+    }
+    const sections = this.readCurrentScreenSections(screenText);
+    const body = sections.body || screenText;
+    const messages = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const line of body.split(/\r?\n/)) {
+      const match = line.match(/^\s*⏺\s+(.+?)\s*$/);
+      const content = match?.[1]?.trim();
+      if (!content || seen.has(content)) continue;
+      seen.add(content);
+      messages.push({
+        role: "assistant",
+        kind: "standard",
+        content,
+        source: "assistant_text",
+        userFacing: true,
+        bubbleState: "final"
+      });
+    }
+    return messages;
+  }
   maybeCaptureClaudeTuiPrompt() {
     if (this.cliType !== "claude-cli" || this.activeInteractivePrompt || this.claudeTuiPromptCaptureInFlight) return;
     const screenText = this.driver.snapshot();
     const headers = this.readClaudeTuiHeaders(screenText);
-    if (headers.length === 0 || !screenText.includes("Enter to select")) return;
+    if (!screenText.includes("Enter to select")) return;
+    if (headers.length === 0) {
+      const prompt = detectClaudeAskUserQuestionPromptFromTuiPages([{ screenText }], {
+        promptId: `ask-user-${this.providerSessionId || "claude"}-${Date.now()}`,
+        providerType: this.cliType
+      });
+      if (!prompt) return;
+      this.activeInteractivePrompt = prompt;
+      this.interactivePromptTransport = "tui";
+      this.statusCallback?.();
+      return;
+    }
     this.claudeTuiPromptCaptureInFlight = true;
     void this.captureClaudeTuiPrompt(screenText, headers).finally(() => {
       this.claudeTuiPromptCaptureInFlight = false;
@@ -28512,6 +28656,11 @@ function getMessageTime(message) {
 }
 var COMPLETED_FINALIZATION_RETRY_MS = 1e3;
 var COMPLETED_FINALIZATION_MAX_WAIT_MS = 3e4;
+var TERMINAL_MESH_EVENTS = /* @__PURE__ */ new Set([
+  "agent:generating_completed",
+  "agent:stopped",
+  "agent:ready"
+]);
 var IMAGE_MIME_EXTENSIONS = {
   "image/png": ".png",
   "image/jpeg": ".jpg",
@@ -29032,6 +29181,39 @@ var CliProviderInstance = class {
       longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180
     });
   }
+  /**
+   * Stamp a direct-dispatch mesh assignment on this instance.
+   * setupMeshEventForwarding reads settings.meshNodeFor + meshActiveTaskId to
+   * route generating_completed back to the originating coordinator. Without
+   * this stamp, mesh_send_task --direct targets a plain CLI session whose
+   * completion events silently drop because the forwarder has nothing to
+   * match against.
+   */
+  attachMeshAssignment(assignment) {
+    if (!assignment?.meshId) return;
+    this.settings = {
+      ...this.settings,
+      meshNodeFor: assignment.meshId,
+      ...assignment.nodeId ? { meshNodeId: assignment.nodeId } : {},
+      ...assignment.taskId ? { meshActiveTaskId: assignment.taskId } : {}
+    };
+    this.adapter.updateRuntimeSettings?.(this.settings);
+  }
+  /**
+   * Clear a previously-attached mesh assignment after the task reaches a
+   * terminal state. Leaving meshNodeFor pinned would route this session's
+   * subsequent unrelated turns (e.g. ad-hoc dashboard chats) to the
+   * coordinator as if they were task completions.
+   */
+  detachMeshAssignment() {
+    if (!this.settings.meshNodeFor && !this.settings.meshActiveTaskId && !this.settings.meshNodeId) return;
+    const { meshNodeFor, meshNodeId, meshActiveTaskId, ...rest } = this.settings;
+    void meshNodeFor;
+    void meshNodeId;
+    void meshActiveTaskId;
+    this.settings = rest;
+    this.adapter.updateRuntimeSettings?.(this.settings);
+  }
   onEvent(event, data) {
     if (event === "send_message") {
       const input = normalizeInputEnvelope(data);
@@ -29664,9 +29846,15 @@ var CliProviderInstance = class {
     };
     if (this.context?.emitProviderEvent) {
       this.context.emitProviderEvent(enrichedEvent);
-      return;
+    } else {
+      this.events.push(enrichedEvent);
+    }
+    if (TERMINAL_MESH_EVENTS.has(event.event) && this.settings.meshActiveTaskId) {
+      try {
+        this.detachMeshAssignment();
+      } catch {
+      }
     }
-    this.events.push(enrichedEvent);
   }
   flushEvents() {
     const events = [...this.events];
@@ -32321,6 +32509,18 @@ Run 'adhdev doctor' for detailed diagnostics.`
           } else if (currentStatus === "starting") {
             currentStatus = getEffectiveAgentSendStatus(adapter);
           }
+          const meshContext = args?.meshContext;
+          if (meshContext && typeof meshContext === "object" && typeof meshContext.meshId === "string" && meshContext.meshId) {
+            const targetInstanceId = key;
+            try {
+              this.deps.getInstanceManager()?.attachMeshAssignmentToInstance(targetInstanceId, {
+                meshId: meshContext.meshId,
+                ...typeof meshContext.nodeId === "string" && meshContext.nodeId ? { nodeId: meshContext.nodeId } : {},
+                ...typeof meshContext.taskId === "string" && meshContext.taskId ? { taskId: meshContext.taskId } : {}
+              });
+            } catch {
+            }
+          }
           const input = normalizeInputEnvelope(args?.input ? { input: args.input } : args);
           const provider = this.providerLoader.resolve(agentType) || this.providerLoader.getMeta(agentType);
           if (provider?.category === "acp") {
@@ -42709,6 +42909,36 @@ var ProviderInstanceManager = class {
     }
     return updated;
   }
+  /** Stamp a mesh assignment on a single instance (used by mesh_send_task
+   *  --direct so the worker's completion event has a coordinator routing
+   *  marker in state.settings). Returns true if the instance existed and
+   *  the stamp was applied. */
+  attachMeshAssignmentToInstance(instanceId, assignment) {
+    const inst = this.instances.get(instanceId);
+    if (!inst || typeof inst.attachMeshAssignment !== "function") {
+      try {
+        const { LOG: LOG2 } = (init_logger(), __toCommonJS(logger_exports));
+        LOG2.warn?.("MeshDispatch", `attachMeshAssignment skipped: instance ${instanceId} ${inst ? "has no attach method" : "not found"}`);
+      } catch {
+      }
+      return false;
+    }
+    inst.attachMeshAssignment(assignment);
+    try {
+      const { LOG: LOG2 } = (init_logger(), __toCommonJS(logger_exports));
+      LOG2.info?.("MeshDispatch", `stamped mesh assignment on ${instanceId}: mesh=${assignment.meshId} node=${assignment.nodeId || ""} task=${assignment.taskId || ""}`);
+    } catch {
+    }
+    return true;
+  }
+  /** Clear a mesh assignment after the dispatched task reaches a terminal
+   *  state (generating_completed / stopped / failed). */
+  detachMeshAssignmentFromInstance(instanceId) {
+    const inst = this.instances.get(instanceId);
+    if (!inst || typeof inst.detachMeshAssignment !== "function") return false;
+    inst.detachMeshAssignment();
+    return true;
+  }
   refreshProviderDefinitions(resolveProvider) {
     let refreshed = 0;
     for (const instance of this.instances.values()) {