@adhdev/daemon-core 0.9.82-rc.294 → 0.9.82-rc.295

package/dist/providers/spec/cli-adapter.d.ts

@@ -144,6 +144,15 @@ export declare class SpecCliAdapter implements CliAdapter {
      * question to multi-select and re-emit status. Promotion is one-way
      * (false→true only) — once a question is known multi-select we never demote
      * it, since the glyph column can scroll out of view on later frames.
+     *
+     * For MULTI-question prompts the per-page Tab capture is the actual source
+     * of the bug: pages 2..N are snapshotted ~120ms after the Tab keypress,
+     * before their option-row glyph column has redrawn, so those questions
+     * freeze as single-select while page 1 (already settled) is correct. We
+     * cannot upgrade blindly — the live snapshot shows only ONE focused page —
+     * but we CAN read that page's question text/header and upgrade the matching
+     * question. As the user navigates the picker (or it settles), each page is
+     * eventually re-read and repaired.
      */
     private maybeUpgradeClaudeTuiMultiSelect;
     private readClaudeTuiHeaders;

package/dist/providers/types/interactive-prompt.d.ts

@@ -52,6 +52,23 @@ export interface ClaudeInteractiveTuiPage {
  * as a secondary signal for layouts that render markers differently.
  */
 export declare function detectClaudeTuiMultiSelect(screenText: string): boolean;
+/**
+ * Read the question the live claude TUI picker is CURRENTLY focused on, plus
+ * whether that focused page renders multi-select checkbox markers.
+ *
+ * Used to repair a multi-question prompt after the fact: when the daemon
+ * Tab-captures pages 2..N it snapshots ~120ms after the Tab keypress, before
+ * the newly-focused page's option-row checkbox column has redrawn — so those
+ * questions get frozen as multiSelect:false even though the picker is
+ * multi-select. Re-reading the focused page on a later status tick (once it has
+ * settled) lets us attribute the now-visible glyphs to the matching question
+ * and upgrade just that one. Returns null when no picker question is on screen.
+ */
+export declare function readFocusedClaudeTuiQuestion(screenText: string): {
+    question: string;
+    header?: string;
+    multiSelect: boolean;
+} | null;
 export declare function detectClaudeAskUserQuestionPromptFromTuiPages(pages: ClaudeInteractiveTuiPage[], options: {
     promptId: string;
     providerType?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.294",
+  "version": "0.9.82-rc.295",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,7 +46,7 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@adhdev/mesh-shared": "0.9.82-rc.294",
+    "@adhdev/mesh-shared": "0.9.82-rc.295",
     "@adhdev/session-host-core": "*",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",

package/src/providers/spec/cli-adapter.ts

@@ -32,6 +32,7 @@ import {
     detectClaudeAskUserQuestionPromptFromJson,
     detectClaudeAskUserQuestionPromptFromTuiPages,
     detectClaudeTuiMultiSelect,
+    readFocusedClaudeTuiQuestion,
     type ClaudeInteractiveTuiPage,
     type InteractivePrompt,
     type InteractivePromptResponse,
@@ -629,19 +630,22 @@ export class SpecCliAdapter implements CliAdapter {
      * question to multi-select and re-emit status. Promotion is one-way
      * (false→true only) — once a question is known multi-select we never demote
      * it, since the glyph column can scroll out of view on later frames.
+     *
+     * For MULTI-question prompts the per-page Tab capture is the actual source
+     * of the bug: pages 2..N are snapshotted ~120ms after the Tab keypress,
+     * before their option-row glyph column has redrawn, so those questions
+     * freeze as single-select while page 1 (already settled) is correct. We
+     * cannot upgrade blindly — the live snapshot shows only ONE focused page —
+     * but we CAN read that page's question text/header and upgrade the matching
+     * question. As the user navigates the picker (or it settles), each page is
+     * eventually re-read and repaired.
      */
     private maybeUpgradeClaudeTuiMultiSelect(): void {
         if (this.cliType !== 'claude-cli'
             || this.interactivePromptTransport !== 'tui'
             || !this.activeInteractivePrompt) return;
         const questions = this.activeInteractivePrompt.questions;
-        // The live snapshot only shows the CURRENTLY focused question's rows, so
-        // we can only attribute the glyphs to a specific question when there is
-        // exactly one. Multi-question prompts are tab-captured per page at
-        // capture time and aren't re-evaluated here to avoid cross-contaminating
-        // a mixed single/multi prompt.
-        if (questions.length !== 1) return;
-        if (questions[0].multiSelect) return;
+        if (questions.every(q => q.multiSelect)) return;
         let screenText = '';
         try {
             screenText = this.driver.snapshot();
@@ -649,8 +653,25 @@ export class SpecCliAdapter implements CliAdapter {
             return;
         }
         if (!screenText.includes('Enter to select')) return;
-        if (!detectClaudeTuiMultiSelect(screenText)) return;
-        questions[0].multiSelect = true;
+
+        if (questions.length === 1) {
+            if (questions[0].multiSelect) return;
+            if (!detectClaudeTuiMultiSelect(screenText)) return;
+            questions[0].multiSelect = true;
+            this.statusCallback?.();
+            return;
+        }
+
+        // Multi-question: attribute the focused page's glyphs to its question by
+        // matching header (preferred) or question text, then upgrade just that
+        // one. Never demote — a settled non-multi page is left as captured.
+        const focused = readFocusedClaudeTuiQuestion(screenText);
+        if (!focused || !focused.multiSelect) return;
+        const match = questions.find(q =>
+            (focused.header && q.header && q.header === focused.header)
+            || q.question === focused.question);
+        if (!match || match.multiSelect) return;
+        match.multiSelect = true;
         this.statusCallback?.();
     }
 

package/src/providers/types/interactive-prompt.ts

@@ -184,15 +184,19 @@ export function detectClaudeTuiMultiSelect(screenText: string): boolean {
   if (/Space to (?:select|toggle)|toggle selection|select multiple|select all that apply/i.test(screenText)) {
     return true;
   }
-  // A checkbox glyph sitting in front of a NUMBERED option row only appears in
-  // the multi-select picker (e.g. "❯ [ ] 1. TypeScript" / "☐ 2. Python"). We
-  // require the numbered "N." option marker so we don't false-positive on the
-  // `✔ Submit` nav line (per-question answered-state ☐/☒) or on the headerless
-  // variant where the QUESTION line itself begins with `☐ ` (single-select).
-  const optionCheckbox = /^\s*(?:[❯›>]\s*)?(?:\[[ xX]\]|[☐☒◻◼])\s*\d+\.\s+\S/;
+  // A checkbox glyph on a NUMBERED option row only appears in the multi-select
+  // picker. The glyph sits EITHER before the number ("❯ [ ] 1. TypeScript" /
+  // "☐ 2. Python") OR after it ("❯ 1. [ ] 계란말이" — claude-cli >=2.1's layout).
+  // We require the numbered "N." option marker either way so we don't
+  // false-positive on the `✔ Submit` nav line (per-question answered-state
+  // ☐/☒) or on the headerless variant where the QUESTION line itself begins
+  // with `☐ ` (single-select).
+  const optionCheckbox = `(?:\\[[ xX]\\]|[☐☒◻◼])`;
+  const beforeNumber = new RegExp(`^\\s*(?:[❯›>]\\s*)?${optionCheckbox}\\s*\\d+\\.\\s+\\S`);
+  const afterNumber = new RegExp(`^\\s*(?:[❯›>]\\s*)?\\d+\\.\\s*${optionCheckbox}\\s+\\S`);
   for (const line of screenText.split(/\r?\n/)) {
     if (line.includes('✔ Submit')) continue; // header/nav line
-    if (optionCheckbox.test(line)) return true;
+    if (beforeNumber.test(line) || afterNumber.test(line)) return true;
   }
   return false;
 }
@@ -361,6 +365,31 @@ function parseClaudeInteractiveTuiQuestion(page: ClaudeInteractiveTuiPage, index
   };
 }
 
+/**
+ * Read the question the live claude TUI picker is CURRENTLY focused on, plus
+ * whether that focused page renders multi-select checkbox markers.
+ *
+ * Used to repair a multi-question prompt after the fact: when the daemon
+ * Tab-captures pages 2..N it snapshots ~120ms after the Tab keypress, before
+ * the newly-focused page's option-row checkbox column has redrawn — so those
+ * questions get frozen as multiSelect:false even though the picker is
+ * multi-select. Re-reading the focused page on a later status tick (once it has
+ * settled) lets us attribute the now-visible glyphs to the matching question
+ * and upgrade just that one. Returns null when no picker question is on screen.
+ */
+export function readFocusedClaudeTuiQuestion(
+  screenText: string,
+): { question: string; header?: string; multiSelect: boolean } | null {
+  if (!screenText.includes('Enter to select')) return null;
+  const parsed = parseClaudeInteractiveTuiQuestion({ screenText }, 0);
+  if (!parsed) return null;
+  return {
+    question: parsed.question,
+    ...(parsed.header ? { header: parsed.header } : {}),
+    multiSelect: parsed.multiSelect,
+  };
+}
+
 export function detectClaudeAskUserQuestionPromptFromTuiPages(
   pages: ClaudeInteractiveTuiPage[],
   options: { promptId: string; providerType?: string; createdAt?: number },