@adhdev/daemon-standalone 1.0.58-rc.53 → 1.0.58-rc.54

package/dist/index.js

@@ -36911,10 +36911,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "7335576b38c7efe574df77aa232271dca8221f88" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "7335576b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.58-rc.53" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-30T19:29:33.228Z" : void 0);
+      const commit = readInjected(true ? "c269ba93419ec36106d4f3d3d63068b2362fe92b" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "c269ba93" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.58-rc.54" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-31T06:34:22.633Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -124036,6 +124036,10 @@ ${text}` : text;
             }
           }
           await this.assertFocusedClaudeTuiReview(prompt, allowsFreeform);
+          if (!this.activeInteractivePrompt) return;
+          if (this.activeInteractivePrompt.promptId !== prompt.promptId) {
+            throw new Error("Claude TUI active interactive prompt changed before review submission");
+          }
           this.driver.dispatch({ kind: "pty_write", data: "\r" });
           await new Promise((resolve32) => setTimeout(resolve32, 180));
         } else {
@@ -124591,27 +124595,101 @@ ${text}` : text;
        * When the held question text is absent for
        * INTERACTIVE_PROMPT_LOST_GRACE_MS the prompt is genuinely resolved.
        */
-      maybeClearResolvedClaudeTuiPrompt() {
-        if (this.interactivePromptScheme() !== "claude_tui" || !this.activeInteractivePrompt) return;
-        let screenText = "";
-        try {
-          screenText = this.driver.snapshot();
-        } catch {
-          return;
+      maybeClearResolvedClaudeTuiPrompt(options = {}) {
+        if (this.interactivePromptScheme() !== "claude_tui" || !this.activeInteractivePrompt) return "unavailable";
+        let screenText = options.screenText;
+        if (screenText === void 0) {
+          try {
+            screenText = this.driver.snapshot();
+          } catch {
+            return "unavailable";
+          }
         }
         const identifiableQuestions = this.activeInteractivePrompt.questions.filter((q) => !!q.question?.trim());
         const stillOnScreen = identifiableQuestions.length > 0 ? identifiableQuestions.some((q) => this.claudeTuiQuestionTextAppears(q, screenText)) : screenText.includes("Enter to select");
         if (stillOnScreen) {
           this.interactivePromptLostAt = null;
-          return;
+          return "held";
         }
+        const resolvedByBusyAdvance = options.resolveImmediatelyWhenBusy === true && this.latestState?.status === "generating";
+        const resolvedByBoundToolResult = options.resolvedByBoundToolResult === true;
         const lostAt = this.interactivePromptLostAt ?? Date.now();
-        if (this.interactivePromptLostAt === null) this.interactivePromptLostAt = lostAt;
-        if (Date.now() - lostAt < _SpecCliAdapter.INTERACTIVE_PROMPT_LOST_GRACE_MS) return;
+        if (this.interactivePromptLostAt == null) this.interactivePromptLostAt = lostAt;
+        if (!resolvedByBusyAdvance && !resolvedByBoundToolResult && Date.now() - lostAt < _SpecCliAdapter.INTERACTIVE_PROMPT_LOST_GRACE_MS) return "missing";
         this.activeInteractivePrompt = null;
         this.interactivePromptTransport = null;
         this.interactivePromptLostAt = null;
         this.statusCallback?.();
+        return "cleared";
+      }
+      /**
+       * True only when the native Claude JSONL contains a tool_result for the
+       * AskUserQuestion bound to `prompt`. TUI-captured prompts use a stable
+       * content-derived id rather than Claude's tool_use id, so bind the native
+       * call by its exact question/header/option identity first (ignoring only
+       * Claude's synthetic freeform/chat rows) and only then accept its matching
+       * tool_use_id. A later identical unresolved call resets the result, keeping
+       * latest-call-wins semantics.
+       */
+      hasBoundClaudeAskUserQuestionToolResult(prompt) {
+        if (this.cliType !== "claude-cli" || this.spec.native_history?.source?.kind !== "jsonl") return false;
+        try {
+          const history = executeNativeHistory(this.spec.native_history, {
+            agentType: this.cliType,
+            providerSessionId: this.providerSessionId,
+            sessionStartedAtMs: this.spawnedAtMs,
+            envOverrides: this.spawnedEnv,
+            workspace: this.workingDir,
+            instanceId: this.owningSessionId
+          });
+          if (!history?.sourcePath) return false;
+          let boundToolUseId = null;
+          let resolved = false;
+          for (const record2 of readJsonlLines(history.sourcePath)) {
+            const observedPrompt = detectClaudeAskUserQuestionPromptFromJson(record2, this.cliType);
+            if (observedPrompt && (observedPrompt.promptId === prompt.promptId || this.claudeAskUserQuestionPromptsMatch(prompt, observedPrompt))) {
+              boundToolUseId = observedPrompt.promptId;
+              resolved = false;
+            }
+            if (!boundToolUseId) continue;
+            if (this.readClaudeToolResultIds(record2).includes(boundToolUseId)) resolved = true;
+          }
+          return resolved;
+        } catch {
+          return false;
+        }
+      }
+      claudeAskUserQuestionPromptsMatch(expected, observed) {
+        if (expected.questions.length !== observed.questions.length) return false;
+        return expected.questions.every((expectedQuestion, index) => {
+          const observedQuestion = observed.questions[index];
+          if (!observedQuestion || this.normalizeClaudeTuiIdentity(expectedQuestion.question) !== this.normalizeClaudeTuiIdentity(observedQuestion.question)) return false;
+          const observedHeader = this.normalizeClaudeTuiIdentity(observedQuestion.header || "");
+          if (observedHeader && this.normalizeClaudeTuiIdentity(expectedQuestion.header || "") !== observedHeader) return false;
+          const expectedLabels = expectedQuestion.options.map((option) => this.normalizeClaudeTuiIdentity(option.label)).filter((label) => !/^(?:Type something\.?|Chat about this)$/i.test(label));
+          const observedLabels = observedQuestion.options.map((option) => this.normalizeClaudeTuiIdentity(option.label));
+          return expectedLabels.length === observedLabels.length && expectedLabels.every((label, optionIndex) => label === observedLabels[optionIndex]);
+        });
+      }
+      readClaudeToolResultIds(value) {
+        if (!value || typeof value !== "object") return [];
+        const record2 = value;
+        const blocks = [];
+        if (Array.isArray(record2.content)) blocks.push(...record2.content);
+        const message = record2.message;
+        if (message && typeof message === "object" && Array.isArray(message.content)) {
+          blocks.push(...message.content);
+        }
+        if (record2.type === "tool_result") blocks.push(record2);
+        const ids = [];
+        for (const block2 of blocks) {
+          if (!block2 || typeof block2 !== "object") continue;
+          const candidate = block2;
+          if (candidate.type !== "tool_result") continue;
+          const id = typeof candidate.tool_use_id === "string" ? candidate.tool_use_id.trim() : "";
+          if (id) ids.push(id);
+        }
+        return ids;
       }
       maybeCaptureClaudeTuiPrompt() {
         if (this.interactivePromptScheme() !== "claude_tui" || this.activeInteractivePrompt || this.claudeTuiPromptCaptureInFlight) return;
@@ -124747,19 +124825,51 @@ ${text}` : text;
        * the user selects a standard option. The wider budget accounts for this
        * extra layout time when validating the review echo screen.
        */
-      async snapshotSettledClaudeTuiReview(allowsFreeform) {
+      async snapshotSettledClaudeTuiReview(prompt, allowsFreeform) {
         let screenText = this.readClaudeTuiSnapshotForAnswer();
         const budgetMs = allowsFreeform ? _SpecCliAdapter.CLAUDE_TUI_REVIEW_SETTLE_TIMEOUT_MS : _SpecCliAdapter.CLAUDE_TUI_PAGE_SETTLE_TIMEOUT_MS;
         const deadline = Date.now() + budgetMs;
-        while (Date.now() < deadline) {
-          if (!readFocusedClaudeTuiQuestion(screenText) && isClaudeTuiReviewScreen(screenText)) return screenText;
+        let poll = 0;
+        while (true) {
+          poll += 1;
+          const focused = readFocusedClaudeTuiQuestion(screenText);
+          const review = !focused && isClaudeTuiReviewScreen(screenText);
+          let classification;
+          let directSubmitted = false;
+          if (focused) {
+            const boundQuestion = prompt.questions.some((question) => this.claudeTuiQuestionMatches(question, focused));
+            classification = boundQuestion ? "bound_question" : "foreign_question";
+          } else if (review) {
+            classification = "review";
+          } else if (!this.activeInteractivePrompt) {
+            classification = "direct_submit_already_cleared";
+            directSubmitted = true;
+          } else if (this.activeInteractivePrompt.promptId !== prompt.promptId) {
+            classification = "active_prompt_changed";
+          } else {
+            const resolvedByBoundToolResult = this.hasBoundClaudeAskUserQuestionToolResult(prompt);
+            const resolution = this.maybeClearResolvedClaudeTuiPrompt({
+              screenText,
+              resolveImmediatelyWhenBusy: true,
+              resolvedByBoundToolResult
+            });
+            classification = resolution === "cleared" ? resolvedByBoundToolResult ? "direct_submit_tool_result" : "direct_submit_busy" : resolution === "held" ? "bound_question_unparsed" : resolution === "missing" ? "bound_question_missing" : "snapshot_unavailable";
+            directSubmitted = resolution === "cleared";
+          }
+          LOG2.debug(
+            "SpecAdapter",
+            `[${this.cliType}] Claude TUI answer poll=${poll} classification=${classification} screenBytes=${Buffer.byteLength(screenText, "utf8")} providerState=${this.latestState?.id ?? "unknown"} providerStatus=${this.latestState?.status ?? "unknown"} allowsFreeform=${allowsFreeform}`
+          );
+          if (review) return screenText;
+          if (directSubmitted) return null;
+          if (Date.now() >= deadline) return screenText;
           await new Promise((resolve32) => setTimeout(resolve32, _SpecCliAdapter.CLAUDE_TUI_PAGE_POLL_INTERVAL_MS));
           screenText = this.readClaudeTuiSnapshotForAnswer();
         }
-        return screenText;
       }
       async assertFocusedClaudeTuiReview(prompt, allowsFreeform) {
-        const screenText = await this.snapshotSettledClaudeTuiReview(allowsFreeform);
+        const screenText = await this.snapshotSettledClaudeTuiReview(prompt, allowsFreeform);
+        if (screenText === null) return;
         const focused = readFocusedClaudeTuiQuestion(screenText);
         if (focused || !isClaudeTuiReviewScreen(screenText)) {
           const observed = focused?.question ? `; focused question is "${focused.question}"` : "";