@adhdev/daemon-standalone 1.0.58-rc.59 → 1.0.58-rc.60

package/dist/index.js

@@ -36911,10 +36911,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "6393920b37c3af6cd2678d0e12a58d0eaa9a138f" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "6393920b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.58-rc.59" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-09-01T13:20:53.426Z" : void 0);
+      const commit = readInjected(true ? "678c61dbf9ca5cc67af12ff40ea17210ef9ff661" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "678c61db" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.58-rc.60" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-09-02T02:49:21.672Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -102054,7 +102054,10 @@ ${e?.stderr || ""}`;
         if (!option) continue;
         const { label } = option;
         if (/^Chat about this$/i.test(label)) continue;
-        if (/^Type something\.?$/i.test(label)) allowFreeform = true;
+        if (/^Type something\.?$/i.test(label)) {
+          allowFreeform = true;
+          continue;
+        }
         options.push(option);
       }
       if (options.length === 0) return null;
@@ -102185,7 +102188,7 @@ ${e?.stderr || ""}`;
           steps.push("	");
         } else if (freeformText) {
           const typeOptionIndex = question.options.findIndex((o) => /^Type something\.?$/i.test(o.label));
-          const optionNumber = typeOptionIndex >= 0 ? typeOptionIndex + 1 : question.options.length;
+          const optionNumber = typeOptionIndex >= 0 ? typeOptionIndex + 1 : question.options.length + 1;
           steps.push(String(optionNumber));
           for (const ch of freeformText) steps.push(ch);
           steps.push("\r");
@@ -123579,6 +123582,80 @@ ${text}` : text;
       steps.push("\r");
       return steps;
     }
+    init_logger();
+    var TAIL_BYTES3 = 512 * 1024;
+    function detectClaudePendingQuestion(cfg, input) {
+      if ((input.agentType ?? "").trim() !== "claude-cli") return null;
+      if (!cfg?.source || cfg.source.kind !== "jsonl") return null;
+      let sourcePath;
+      try {
+        sourcePath = resolveJsonlSourcePath(cfg.source, input);
+      } catch {
+        return null;
+      }
+      if (!sourcePath) return null;
+      let records;
+      try {
+        records = readTailJsonlLines(sourcePath, TAIL_BYTES3);
+      } catch {
+        return null;
+      }
+      return detectClaudePendingQuestionFromRecords(records);
+    }
+    function detectClaudePendingQuestionFromRecords(records) {
+      let latestIdx = -1;
+      let latestPrompt = null;
+      for (let i = 0; i < records.length; i++) {
+        const prompt = detectClaudeAskUserQuestionPromptFromJson(records[i]);
+        if (!prompt) continue;
+        applyClaudeFreeformEscape(prompt);
+        if (!prompt.promptId.startsWith("toolu_")) continue;
+        latestIdx = i;
+        latestPrompt = prompt;
+      }
+      if (latestIdx < 0 || !latestPrompt) return null;
+      for (let i = latestIdx + 1; i < records.length; i++) {
+        if (readClaudeToolResultIds(records[i]).includes(latestPrompt.promptId)) return null;
+      }
+      const createdAt = readRecordTimestamp(records[latestIdx]);
+      if (createdAt) latestPrompt.createdAt = createdAt;
+      LOG2.info(
+        "ClaudeQuestion",
+        `pending AskUserQuestion from native JSONL: promptId=${latestPrompt.promptId} questions=${latestPrompt.questions.length}`
+      );
+      return latestPrompt;
+    }
+    function applyClaudeFreeformEscape(prompt) {
+      for (const question of prompt.questions) question.allowFreeform = true;
+    }
+    function readClaudeToolResultIds(record2) {
+      if (!record2 || typeof record2 !== "object") return [];
+      const r = record2;
+      const blocks = [];
+      if (Array.isArray(r.content)) blocks.push(...r.content);
+      const message = r.message;
+      if (message && typeof message === "object" && Array.isArray(message.content)) {
+        blocks.push(...message.content);
+      }
+      if (r.type === "tool_result") blocks.push(r);
+      const ids = [];
+      for (const block2 of blocks) {
+        if (!block2 || typeof block2 !== "object") continue;
+        const b = block2;
+        if (b.type !== "tool_result") continue;
+        const id = typeof b.tool_use_id === "string" ? b.tool_use_id.trim() : "";
+        if (id) ids.push(id);
+      }
+      return ids;
+    }
+    function readRecordTimestamp(record2) {
+      if (!record2 || typeof record2 !== "object") return 0;
+      const value = record2.timestamp;
+      if (typeof value === "number" && Number.isFinite(value) && value > 0) return value;
+      if (typeof value !== "string") return 0;
+      const parsed = Date.parse(value);
+      return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
+    }
     init_dist();
     var ANSI_OSC_DCS_RE = /\x1B\][^\x07]*(?:\x07|\x1B\\)|\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g;
     var ANSI_CSI_RE = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
@@ -124821,6 +124898,34 @@ ${text}` : text;
         }
         return ids;
       }
+      /**
+       * Read the pending AskUserQuestion off claude's native JSONL transcript, or
+       * null when there is none / it cannot be read.
+       *
+       * `ADHDEV_DISABLE_CLAUDE_JSONL_PROMPT=1` forces the legacy screen-scrape
+       * path. It exists so the fallback stays exercisable — both in the injection
+       * test that proves the scrape still produces the (broken) split labels, and
+       * on a live machine where a transcript-format change would otherwise need a
+       * downgrade to diagnose.
+       */
+      detectClaudeNativePendingQuestion() {
+        if (process.env.ADHDEV_DISABLE_CLAUDE_JSONL_PROMPT === "1") return null;
+        if (!this.spec.native_history?.source) return null;
+        try {
+          return detectClaudePendingQuestion(this.spec.native_history, {
+            agentType: this.cliType,
+            providerSessionId: this.providerSessionId || void 0,
+            sessionStartedAtMs: this.spawnedAtMs,
+            envOverrides: this.spawnedEnv,
+            workspace: this.workingDir,
+            // Sidecar-claim owner token — without it resolution fails closed
+            // on ambiguity, same as the kimi wire call site.
+            instanceId: this.owningSessionId || void 0
+          });
+        } catch {
+          return null;
+        }
+      }
       maybeCaptureClaudeTuiPrompt() {
         if (this.interactivePromptScheme() !== "claude_tui" || this.activeInteractivePrompt || this.claudeTuiPromptCaptureInFlight) return;
         if (this.latestState?.status === "generating") return;
@@ -124835,6 +124940,14 @@ ${text}` : text;
           return;
         }
         this.claudeTuiCaptureFooterAbsentAt = null;
+        const nativePrompt = this.detectClaudeNativePendingQuestion();
+        if (nativePrompt) {
+          this.activeInteractivePrompt = nativePrompt;
+          this.interactivePromptTransport = "tui";
+          this.interactivePromptLostAt = null;
+          this.statusCallback?.();
+          return;
+        }
         const headers = this.readClaudeTuiHeaders(screenText);
         if (headers.length === 0) {
           const prompt = detectClaudeAskUserQuestionPromptFromTuiPages([{ screenText }], {
@@ -125548,6 +125661,9 @@ ${text}` : text;
     init_mesh_event_trace();
     init_mesh_events_utils();
     init_runtime_defaults();
+    function meshTaskAttachments(history) {
+      return history ?? [];
+    }
     var MESH_TASK_ATTACHMENT_HISTORY_CAP = 8;
     function pushMeshTaskAttachment(history, attachment) {
       history.push(attachment);
@@ -127877,7 +127993,7 @@ ${buttons.join("\n")}`;
       // injected since boot (ad-hoc/non-mesh turns fall back to the plain turn-started check).
       meshTaskInjectedAt = 0;
       meshTaskAttachmentHistory = [];
-      // WORKER-MCP T2 precursor — mesh-task-attachment.ts, flag-gated, byte-identical off.
+      // WORKER-MCP T2 precursor — mesh-task-attachment.ts, flag-gated, byte-identical off. Always read via meshTaskAttachments(this.meshTaskAttachmentHistory), never raw — see that module's "Constructor-bypassed instances".
       settings = {};
       monitor;
       generatingDebounceTimer = null;
@@ -128336,6 +128452,7 @@ ${buttons.join("\n")}`;
         if (assignment.taskId && assignment.taskId.trim()) {
           this.meshTaskInjectedAt = Date.now();
           if (isWorkerMcpEnabled()) {
+            this.meshTaskAttachmentHistory = meshTaskAttachments(this.meshTaskAttachmentHistory);
             const { droppedTaskId } = pushMeshTaskAttachment(this.meshTaskAttachmentHistory, { taskId: assignment.taskId, attemptId: assignment.attemptId, dispatchNonce: assignment.dispatchNonce, injectedAt: this.meshTaskInjectedAt });
             if (droppedTaskId) LOG2.warn("MeshTaskAttach", `[${this.instanceId}] turn-aware attachment history exceeded cap \u2014 dropped task ${droppedTaskId}.`);
           }
@@ -128392,7 +128509,7 @@ ${buttons.join("\n")}`;
        * keeps the original full clear so an ad-hoc session is never left pinned.
        */
       detachMeshAssignment() {
-        const pending = isWorkerMcpEnabled() ? popCompletedMeshTaskAttachment(this.meshTaskAttachmentHistory) : void 0;
+        const pending = isWorkerMcpEnabled() ? popCompletedMeshTaskAttachment(meshTaskAttachments(this.meshTaskAttachmentHistory)) : void 0;
         if (!this.settings.meshNodeFor && !this.settings.meshActiveTaskId && !this.settings.meshNodeId) return;
         if (this.settings.launchedByCoordinator === true) {
           if (!this.settings.meshActiveTaskId) return;
@@ -129408,7 +129525,7 @@ ${buttons.join("\n")}`;
        * turn completes overwrites it. Returns undefined for a non-task ad-hoc turn.
        */
       completingTurnTaskId() {
-        const fromHistory = isWorkerMcpEnabled() ? resolveCompletingTaskId(this.meshTaskAttachmentHistory) : void 0;
+        const fromHistory = isWorkerMcpEnabled() ? resolveCompletingTaskId(meshTaskAttachments(this.meshTaskAttachmentHistory)) : void 0;
         if (fromHistory) return fromHistory;
         const turnTaskId = this.adapter?.currentTurnTaskId;
         if (typeof turnTaskId === "string" && turnTaskId.trim()) return turnTaskId;
@@ -129442,7 +129559,7 @@ ${buttons.join("\n")}`;
       injectedTaskHasStartedGenerating() {
         const turnStartedAt = typeof this.adapter?.currentTurnStartedAt === "number" ? this.adapter.currentTurnStartedAt : 0;
         const turnStarted = Number.isFinite(turnStartedAt) && turnStartedAt > 0;
-        const injectedAt = (isWorkerMcpEnabled() ? resolvePendingInjectedAt(this.meshTaskAttachmentHistory) : void 0) ?? this.meshTaskInjectedAt;
+        const injectedAt = (isWorkerMcpEnabled() ? resolvePendingInjectedAt(meshTaskAttachments(this.meshTaskAttachmentHistory)) : void 0) ?? this.meshTaskInjectedAt;
         if (injectedAt <= 0) {
           return turnStarted;
         }