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

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

@@ -118,6 +118,15 @@ export declare class SpecCliAdapter implements CliAdapter {
      * spirit as the approval FSM's `approvalCooldown` modal-lost hysteresis.
      */
     private static readonly INTERACTIVE_PROMPT_LOST_GRACE_MS;
+    /**
+     * Multi-question TUI capture: after Tabbing to a page, re-snapshot at this
+     * interval until its checkbox glyph column has settled, up to the timeout.
+     * The interval matches the legacy single fixed wait (120ms); the timeout
+     * bounds total capture time so a single-select page (which never shows
+     * glyphs) doesn't stall the capture indefinitely.
+     */
+    private static readonly CLAUDE_TUI_PAGE_POLL_INTERVAL_MS;
+    private static readonly CLAUDE_TUI_PAGE_SETTLE_TIMEOUT_MS;
     /**
      * Clear a held interactive prompt once the user has resolved it directly
      * in the terminal (the choice picker leaves the screen without going
@@ -156,6 +165,20 @@ export declare class SpecCliAdapter implements CliAdapter {
      */
     private maybeUpgradeClaudeTuiMultiSelect;
     private readClaudeTuiHeaders;
+    /**
+     * Snapshot the currently-focused claude TUI page, polling until its
+     * option-row checkbox glyph column has settled (or a bounded timeout).
+     *
+     * Why poll: right after a Tab keypress the newly-focused page's glyph
+     * column has not redrawn yet, so an immediate snapshot shows the question +
+     * option labels but NO per-option checkbox markers — freezing that page as
+     * single-select. A fixed delay either races (too short) or is wasteful (too
+     * long). Instead we re-snapshot at a fixed interval and stop as soon as the
+     * frame shows multi-select glyphs, falling back to the last frame at the
+     * timeout. Single-select pages never show glyphs, so they always poll to the
+     * timeout — bounded small to keep capture snappy.
+     */
+    private snapshotSettledClaudeTuiPage;
     private captureClaudeTuiPrompt;
     getDebugState(): Record<string, any>;
     getTraceState(limit?: number): Record<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.295",
+  "version": "0.9.82-rc.296",
   "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.295",
+    "@adhdev/mesh-shared": "0.9.82-rc.296",
     "@adhdev/session-host-core": "*",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",

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

@@ -552,6 +552,16 @@ export class SpecCliAdapter implements CliAdapter {
      */
     private static readonly INTERACTIVE_PROMPT_LOST_GRACE_MS = 1500;
 
+    /**
+     * Multi-question TUI capture: after Tabbing to a page, re-snapshot at this
+     * interval until its checkbox glyph column has settled, up to the timeout.
+     * The interval matches the legacy single fixed wait (120ms); the timeout
+     * bounds total capture time so a single-select page (which never shows
+     * glyphs) doesn't stall the capture indefinitely.
+     */
+    private static readonly CLAUDE_TUI_PAGE_POLL_INTERVAL_MS = 120;
+    private static readonly CLAUDE_TUI_PAGE_SETTLE_TIMEOUT_MS = 600;
+
     /**
      * Clear a held interactive prompt once the user has resolved it directly
      * in the terminal (the choice picker leaves the screen without going
@@ -686,16 +696,53 @@ export class SpecCliAdapter implements CliAdapter {
         return headers;
     }
 
+    /**
+     * Snapshot the currently-focused claude TUI page, polling until its
+     * option-row checkbox glyph column has settled (or a bounded timeout).
+     *
+     * Why poll: right after a Tab keypress the newly-focused page's glyph
+     * column has not redrawn yet, so an immediate snapshot shows the question +
+     * option labels but NO per-option checkbox markers — freezing that page as
+     * single-select. A fixed delay either races (too short) or is wasteful (too
+     * long). Instead we re-snapshot at a fixed interval and stop as soon as the
+     * frame shows multi-select glyphs, falling back to the last frame at the
+     * timeout. Single-select pages never show glyphs, so they always poll to the
+     * timeout — bounded small to keep capture snappy.
+     */
+    private async snapshotSettledClaudeTuiPage(): Promise<string> {
+        let screenText = this.driver.snapshot();
+        const deadline = Date.now() + SpecCliAdapter.CLAUDE_TUI_PAGE_SETTLE_TIMEOUT_MS;
+        while (!detectClaudeTuiMultiSelect(screenText) && Date.now() < deadline) {
+            await new Promise(resolve => setTimeout(resolve, SpecCliAdapter.CLAUDE_TUI_PAGE_POLL_INTERVAL_MS));
+            screenText = this.driver.snapshot();
+        }
+        return screenText;
+    }
+
     private async captureClaudeTuiPrompt(firstScreen: string, headers: string[]): Promise<void> {
         const pages: ClaudeInteractiveTuiPage[] = [{ screenText: firstScreen, header: headers[0] }];
+        // Forward pass: Tab to each page 2..N and snapshot once its glyph column
+        // has settled, so pages 2+ capture their checkbox markers (not a racy
+        // pre-redraw frame).
         for (let index = 1; index < headers.length; index += 1) {
             this.driver.dispatch({ kind: 'pty_write', data: '\t' });
-            await new Promise(resolve => setTimeout(resolve, 120));
-            pages.push({ screenText: this.driver.snapshot(), header: headers[index] });
+            await new Promise(resolve => setTimeout(resolve, SpecCliAdapter.CLAUDE_TUI_PAGE_POLL_INTERVAL_MS));
+            pages.push({ screenText: await this.snapshotSettledClaudeTuiPage(), header: headers[index] });
         }
+        // Return pass: Shift-Tab back through pages N..2. As we land on each page
+        // again re-read it and OR-in any now-visible multi-select glyphs — a
+        // second chance to repair a page whose forward-pass frame was still racy.
         for (let index = headers.length - 1; index > 0; index -= 1) {
             this.driver.dispatch({ kind: 'pty_write', data: '\x1b[Z' });
-            await new Promise(resolve => setTimeout(resolve, 80));
+            await new Promise(resolve => setTimeout(resolve, SpecCliAdapter.CLAUDE_TUI_PAGE_POLL_INTERVAL_MS));
+            const reread = await this.snapshotSettledClaudeTuiPage();
+            // The page we just Shift-Tab'd ONTO is index-1 (we move backwards).
+            const landed = pages[index - 1];
+            if (landed
+                && !detectClaudeTuiMultiSelect(landed.screenText)
+                && detectClaudeTuiMultiSelect(reread)) {
+                landed.screenText = reread;
+            }
         }
 
         const prompt = detectClaudeAskUserQuestionPromptFromTuiPages(pages, {

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

@@ -421,7 +421,18 @@ export function buildClaudeInteractiveTuiAnswerSteps(
     if (!answer) throw new Error(`Missing answer for ${question.questionId}`);
     const freeformText = answer.freeformText?.trim() ?? '';
 
-    if (question.multiSelect) {
+    // Defensive multi-select fallback: a checkbox picker is the ONLY way an
+    // answer can carry more than one selected label, so treat any such answer
+    // as multi-select even when `question.multiSelect` was captured as false.
+    // This guards the multi-question capture race: pages 2..N can freeze as
+    // single-select (their glyph column hadn't redrawn at Tab-snapshot time),
+    // and the old single-select branch would then either throw on 2+ checked
+    // boxes or emit a bare digit (cursor move, no toggle) for 1 box — silently
+    // dropping that page's selection. Keying off the answer's label count makes
+    // the keystroke protocol correct regardless of the captured flag.
+    const treatAsMultiSelect = question.multiSelect || answer.selectedLabels.length > 1;
+
+    if (treatAsMultiSelect) {
       // Multi-select: Claude TUI renders each option as a checkbox and the
       // footer reads "Space to select". A numeric digit jumps the cursor to
       // that option; Space toggles its checkbox. So for every selected label