@adhdev/daemon-core 0.5.7 → 0.5.16

package/providers/_builtin/ide/cursor/scripts/0.49/read_chat.js

@@ -1,12 +1,15 @@
 /**
- * Cursor — read_chat
+ * Cursor — read_chat (v2 — thoughts, tools, terminal, DOM-ordered)
  *
  * DOM 구조 (v0.49):
  *   컴포저: [data-composer-id] + [data-composer-status]
  *   메시지 쌍: .composer-human-ai-pair-container
  *   사용자: .composer-human-message
- *   AI: direct children after first (tool/assistant)
- *   입력: .aislash-editor-input[contenteditable="true"]
+ *   AI 텍스트: .composer-rendered-message (assistant content)
+ *   사고: .ui-step-group-collapsible → header에 "Thought briefly" 등
+ *   도구: .composer-tool-former-message (file edits, reads)
+ *   코드블록: .composer-code-block-container (terminal commands)
+ *   Diff: .composer-diff-block (code changes)
  *   승인: .run-command-review-active + button/cursor-pointer 요소
  *
  * → { id, status, title, messages[], inputContent, activeModal }
@@ -20,18 +23,12 @@
     if (rawStatus === 'thinking' || rawStatus === 'streaming') status = 'generating';
     else if (rawStatus === 'completed' || rawStatus === 'idle' || !rawStatus) status = 'idle';
 
-    // Detect approval dialogs
+    // ─── Approval Detection ───
     let activeModal = null;
-
-    // Primary signal: Cursor uses .run-command-review-active on conversations container
     const reviewActive = !!document.querySelector('.run-command-review-active');
-
-    // Also check clickable elements (Cursor uses divs with cursor-pointer, not buttons)
-    // Note: Cursor concatenates button text with shortcut key labels (e.g. "SkipEsc", "Run⏎")
     const clickableEls = [...document.querySelectorAll('button, [role="button"], .cursor-pointer')].filter(b =>
       b.offsetWidth > 0 && /^(accept|reject|approve|deny|run|skip|allow|cancel)/i.test((b.textContent || b.getAttribute('aria-label') || '').trim())
     );
-
     if (reviewActive || clickableEls.length > 0) {
       status = 'waiting_approval';
       const reviewContainer = document.querySelector('.run-command-review-active');
@@ -44,36 +41,278 @@
       };
     }
 
-    const msgs = [];
-    document.querySelectorAll('.composer-human-ai-pair-container').forEach((p, i) => {
-      if (p.children.length === 0) return; // skip virtual-scroll placeholders
-      const h = p.querySelector('.composer-human-message');
-      if (h) {
-        const userText = (h.innerText || '').trim().substring(0, 6000);
-        if (userText) msgs.push({ role: 'user', content: userText, index: msgs.length });
-      }
-      // Iterate direct children after the first (user message block)
-      for (let ci = 1; ci < p.children.length; ci++) {
-        const b = p.children[ci];
-        if ((b.className || '').includes('opacity-50')) continue;
-        const t = (b.innerText || '').trim();
+    // ─── Message Collection ───
+    const collected = [];
+    const seenHashes = new Set();
+
+    // Markdown Extractor to preserve tables/lists structure properly instead of flat innerText
+    function extractMarkdown(node) {
+      if (!node) return '';
+      if (node.nodeType === 3) return node.textContent; 
+      if (node.nodeType !== 1) return ''; 
+
+      const tag = node.tagName.toLowerCase();
+      
+      // Stop extracting into nested block containers that we already process as separate items
+      if (node.classList && (
+          node.classList.contains('composer-tool-former-message') ||
+          node.classList.contains('composer-code-block-container') ||
+          node.classList.contains('composer-diff-block')
+      )) {
+          return '';
+      }
+
+      let res = '';
+      if (tag === 'p' || tag === 'div') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return res + '\n\n';
+      }
+      if (/^h[1-6]$/.test(tag)) {
+        const level = parseInt(tag.charAt(1), 10);
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return '#'.repeat(level) + ' ' + res.trim() + '\n\n';
+      }
+      if (tag === 'ul' || tag === 'ol') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return res + '\n';
+      }
+      if (tag === 'li') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return '- ' + res.trim() + '\n';
+      }
+      if (tag === 'strong' || tag === 'b') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return '**' + res + '**';
+      }
+      if (tag === 'em' || tag === 'i') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return '*' + res + '*';
+      }
+      if (tag === 'code') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return '`' + res + '`';
+      }
+      if (tag === 'pre') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return '\n```\n' + res.trim() + '\n```\n\n';
+      }
+      if (tag === 'a') {
+        let text = '';
+        for (let i = 0; i < node.childNodes.length; i++) text += extractMarkdown(node.childNodes[i]);
+        return '[' + text + '](' + (node.href || '') + ')';
+      }
+      if (tag === 'table') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return '\n' + res.trim() + '\n\n';
+      }
+      if (tag === 'thead') {
+        const tr = node.querySelector('tr');
+        if (tr) {
+          const ths = Array.from(tr.querySelectorAll('th')).map(th => extractMarkdown(th).trim());
+          return '| ' + ths.join(' | ') + ' |\n| ' + ths.map(() => '---').join(' | ') + ' |\n';
+        }
+        return '';
+      }
+      if (tag === 'tbody') {
+        for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+        return res;
+      }
+      if (tag === 'tr' && (!node.parentElement || node.parentElement.tagName.toLowerCase() !== 'thead')) {
+        const tds = Array.from(node.querySelectorAll('td')).map(td => extractMarkdown(td).trim().replace(/\n/g, '<br>'));
+        return '| ' + tds.join(' | ') + ' |\n';
+      }
+
+      // Default
+      for (let i = 0; i < node.childNodes.length; i++) res += extractMarkdown(node.childNodes[i]);
+      return res;
+    }
+
+    document.querySelectorAll('.composer-human-ai-pair-container').forEach((pair) => {
+      if (pair.children.length === 0) return; // virtual-scroll placeholder
+
+      // ─── User Message ───
+      const humanEl = pair.querySelector('.composer-human-message');
+      if (humanEl) {
+        const userText = (humanEl.innerText || '').trim().substring(0, 6000);
+        if (userText) {
+          const hash = 'user:' + userText.slice(0, 200);
+          if (!seenHashes.has(hash)) {
+            seenHashes.add(hash);
+            collected.push({ role: 'user', text: userText, el: humanEl, kind: 'standard' });
+          }
+        }
+      }
+
+      // ─── AI Message Blocks ───
+      const aiBlocks = Array.from(pair.querySelectorAll('.composer-assistant-message, [data-message-role="ai"], [data-message-role="assistant"]'));
+      for (const block of aiBlocks) {
+
+        // ─── Thinking ("Thought briefly", etc) ───
+        const uiStepGroup = block.querySelectorAll('.ui-step-group-collapsible, [class*="collapsible"]');
+        if (uiStepGroup.length > 0) {
+          uiStepGroup.forEach(group => {
+            const collapsibleHeader = group.querySelector('.ui-collapsible-header');
+            const spans = collapsibleHeader?.querySelectorAll('span');
+            const headerText = spans && spans.length > 0
+              ? Array.from(spans).map(s => (s.textContent || '').trim()).filter(Boolean).join(' ')
+              : (collapsibleHeader?.innerText || collapsibleHeader?.textContent || '').trim();
+
+            // "Thought briefly", "Thought for Xs" — thinking content
+            if (headerText && /thought/i.test(headerText)) {
+              // Try to get expanded thought content
+              const contentEl = block.querySelector('.ui-collapsible-content, [class*="collapsible-content"]');
+              const thinkText = contentEl ? (contentEl.innerText || '').trim() : '';
+              const label = headerText;
+              const hash = 'think:' + (thinkText || headerText).slice(0, 200);
+              
+              if (!seenHashes.has(hash)) {
+                seenHashes.add(hash);
+                // Prepend thinking into collected as a special block
+                let combined = `> **${label}**\n> \n`;
+                if (thinkText) {
+                  combined += thinkText.split('\n').map(l => `> ${l}`).join('\n');
+                } else {
+                  combined += '> ...\n'; // collapsed
+                }
+                collected.push({ role: 'assistant', text: combined, el: group, kind: 'thought' });
+              }
+            }
+          });
+          // Note: If the entire block is just a thought, maybe continue, but usually there's rendered text after.
+        }
+
+        // ─── Tools (Reads, Edits, etc) ───
+        const toolMsgs = block.querySelectorAll('.composer-tool-former-message');
+        if (toolMsgs.length > 0) {
+          toolMsgs.forEach(tm => {
+            let cleanText = '';
+            // For file modifications/reads, try to just grab the file path (first line)
+            // It usually looks like: "MachineDetail.tsx+3-1  Read file"
+            const rawText = (tm.innerText || '').trim();
+            if (rawText) {
+              cleanText = rawText.split('\n')[0].substring(0, 80)
+                .replace(/(?:Skip|Run|Accept|Reject)(?:Esc)?$/g, '').trim();
+              // If it looks like code/JSX, truncate further
+              if (/[<>{}()=]/.test(cleanText) && cleanText.length > 50) {
+                cleanText = cleanText.substring(0, 50) + '…';
+              }
+            }
+            if (!cleanText || cleanText.length < 2) return;
+            const hash = 'tool:' + cleanText;
+            if (!seenHashes.has(hash)) {
+              seenHashes.add(hash);
+              collected.push({ role: 'assistant', text: cleanText, el: tm, kind: 'tool' });
+            }
+          });
+        }
+
+        // ─── Code blocks / Terminal ───
+        const codeBlocks = block.querySelectorAll('.composer-code-block-container');
+        if (codeBlocks.length > 0) {
+          codeBlocks.forEach(cb => {
+            let codeText = (cb.textContent || '').trim().substring(0, 3000);
+            // Strip button text noise
+            codeText = codeText.replace(/(?:Skip|Run|Accept|Reject)(?:Esc|⏎|↵)?\s*$/g, '').trim();
+            codeText = codeText.replace(/\n(?:Skip|Run|Accept|Reject)(?:Esc|⏎|↵)?\s*/g, '\n').trim();
+            if (codeText.length < 2) return;
+            // Detect if it's a terminal command vs code block
+            const isTerminal = cb.querySelector('[class*="terminal"]') ||
+              cb.closest('.run-command-review-active') ||
+              /^\$\s/.test(codeText) ||
+              /^(?:cd |npm |node |npx |git |make |docker |curl |wget |ls |cat |mkdir |rm |mv |cp )/i.test(codeText);
+            const hash = (isTerminal ? 'term:' : 'code:') + codeText.slice(0, 200);
+            if (!seenHashes.has(hash)) {
+              seenHashes.add(hash);
+              // For terminal: extract first line as label
+              const label = isTerminal ? codeText.split('\n')[0].substring(0, 100) : undefined;
+              collected.push({
+                role: 'assistant',
+                text: codeText,
+                el: cb,
+                kind: isTerminal ? 'terminal' : 'code',
+                label
+              });
+            }
+          });
+        }
+
+        // ─── Diff Blocks ───
+        const diffBlocks = block.querySelectorAll('.composer-diff-block');
+        if (diffBlocks.length > 0) {
+          diffBlocks.forEach(db => {
+            const diffText = (db.textContent || '').trim().substring(0, 2000);
+            if (diffText.length < 5) return;
+            const hash = 'diff:' + diffText.slice(0, 200);
+            if (!seenHashes.has(hash)) {
+              seenHashes.add(hash);
+              collected.push({ role: 'assistant', text: diffText, el: db, kind: 'tool' });
+            }
+          });
+        }
+
+        // ─── Rendered assistant message ───
+        const rendered = block.classList.contains('composer-rendered-message') ? block : block.querySelector('.composer-rendered-message');
+        if (rendered) {
+          const t = extractMarkdown(rendered).replace(/\n{3,}/g, '\n\n').trim();
+          if (t.length >= 2) {
+            // Strip button noise from end
+            const clean = t.replace(/(?:Skip|Run|Accept|Reject)(?:Esc)?\s*$/g, '').trim();
+            if (clean.length >= 2) {
+              const hash = 'assistant:' + clean.slice(0, 200);
+              if (!seenHashes.has(hash)) {
+                seenHashes.add(hash);
+                collected.push({ role: 'assistant', text: clean.substring(0, 6000), el: rendered, kind: 'standard' });
+              }
+            }
+          }
+          continue;
+        }
+
+        // ─── Fallback: any remaining text block ───
+        const t = (block.innerText || '').trim();
         if (t.length < 2) continue;
-        // Filter noise: "Thought for Xs", "Explored N files", step group timing headers (e.g. "Crafting a minimal response\n1s")
+        // Filter noise
         if (/^Thought\nfor \d+s?$/i.test(t) || /^Explored\n/i.test(t)) continue;
-        if (/^.{1,80}\n\d+s$/.test(t) && !t.includes('\n\n')) continue; // step-group collapsible header with timing
-        // Skip step-group collapsible headers (e.g. "Crafting a minimal response\n1s")
-        if (b.querySelector('.ui-step-group-collapsible, .ui-collapsible-header') &&
-            !b.querySelector('.composer-rendered-message, .composer-tool-former-message, .composer-diff-block')) continue;
-        const hasTool = b.querySelector('.composer-tool-former-message, .composer-diff-block, .composer-code-block-container');
-        msgs.push({ role: hasTool ? 'tool' : 'assistant', content: t.substring(0, 6000), index: msgs.length });
+        if (/^.{1,80}\n\d+s$/.test(t) && !t.includes('\n\n')) continue;
+
+        const hash = 'other:' + t.slice(0, 200);
+        if (!seenHashes.has(hash)) {
+          seenHashes.add(hash);
+          collected.push({ role: 'assistant', text: t.substring(0, 6000), el: block, kind: 'standard' });
+        }
       }
     });
+
+    // ─── DOM Order Sort ───
+    collected.sort((a, b) => {
+      const pos = a.el.compareDocumentPosition(b.el);
+      if (pos & Node.DOCUMENT_POSITION_FOLLOWING) return -1;
+      if (pos & Node.DOCUMENT_POSITION_PRECEDING) return 1;
+      return 0;
+    });
+
+    // Keep last 50 messages
+    const trimmed = collected.length > 50 ? collected.slice(-50) : collected;
+
+    const messages = trimmed.map((m, i) => ({
+      id: 'msg_' + i,
+      role: m.role,
+      content: m.text.length > 6000 ? m.text.slice(0, 6000) + '\n[... truncated]' : m.text,
+      index: i,
+      kind: m.kind || 'standard',
+      meta: m.meta || undefined,
+    }));
+
+    // ─── Input Content ───
     const inputEl = document.querySelector('.aislash-editor-input[contenteditable="true"]');
     const inputContent = inputEl?.textContent?.trim() || '';
+
+    // ─── Title ───
     const titleParts = document.title.split(' — ');
     const projectTitle = (titleParts.length >= 2 ? titleParts[titleParts.length - 2] : titleParts[0] || '').trim();
-    return JSON.stringify({ id, status, title: projectTitle, messages: msgs, inputContent, activeModal });
+
+    return JSON.stringify({ id, status, title: projectTitle, messages, inputContent, activeModal });
   } catch(e) {
-    return JSON.stringify({ id: '', status: 'error', messages: [] });
+    return JSON.stringify({ id: '', status: 'error', error: e.message, messages: [] });
   }
 })()

package/providers/_builtin/registry.json

@@ -1,5 +1,5 @@
 {
-  "version": "2026.03.19",
+  "version": "2026.03.21",
   "providers": {
     "agentpool-acp": {
       "providerVersion": "0.0.0",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -186,12 +186,11 @@ function coercePatternArray(raw: unknown, fallbacks: RegExp[]): RegExp[] {
 const FALLBACK_PROMPT: RegExp[] = [
     /Type your message/i,
     /^>\s*$/m,             // '>' alone on its own line
-    /[›➤]\s*$/,
-    /for shortcuts/i,
-    /\?\s*for help/i,
+    /[›❯]\s*[\r\n]/,       // prompt char followed by line ending (ANSI-stripped may not have $ at end)
+    /[›❯]\s*$/m,           // prompt char at end of line (multiline)
+    /for\s*shortcuts/i,    // Claude Code prompt (ANSI strip may remove spaces → 'forshortcuts')
+    /\?\s*for\s*help/i,
     /Press enter/i,
-    // NOTE: removed /^[\s\u2500-\u257f]*>\s*$/m — the box-drawing char range is too wide and
-    // can match dialog-clearing ANSI output, causing false prompt detection in approval state.
 ];
 
 const FALLBACK_GENERATING: RegExp[] = [
@@ -202,13 +201,14 @@ const FALLBACK_GENERATING: RegExp[] = [
 ];
 
 const FALLBACK_APPROVAL: RegExp[] = [
-    /Allow\s+once/i,
-    /Always\s+allow/i,
+    /Allow\s*once/i,         // ANSI strip may remove spaces
+    /Always\s*allow/i,
     /\(y\/n\)/i,
     /\[Y\/n\]/i,
-    /Run\s+this\s+command/i,
-    // NOTE: removed /Do you want to (?:run|execute|allow)/i — too broad, matches AI explanation
-    // text like "Do you want to allow this feature?" causing false approval notifications.
+    /Run\s*this\s*command/i,
+    /Allow\s*tool/i,         // Claude Code v2 approval
+    /Yes,?\s*don'?t\s*ask/i, // "Yes, don't ask again" (Claude Code)
+    /Deny/i,                 // Deny button presence = approval dialog
 ];
 
 function defaultCleanOutput(raw: string, _lastUserInput?: string): string {
@@ -268,9 +268,24 @@ export class ProviderCliAdapter implements CliAdapter {
  // Resize redraw suppression
     private resizeSuppressUntil: number = 0;
 
+ // Debug: status transition history
+    private statusHistory: { status: string; at: number; trigger?: string }[] = [];
+
+    private setStatus(status: CliSessionStatus['status'], trigger?: string): void {
+        const prev = this.currentStatus;
+        if (prev === status) return;
+        this.currentStatus = status;
+        this.statusHistory.push({ status, at: Date.now(), trigger });
+        if (this.statusHistory.length > 50) this.statusHistory.shift();
+        LOG.info('CLI', `[${this.cliType}] status: ${prev} → ${status}${trigger ? ` (${trigger})` : ''}`);
+    }
+
  // Resolved timeouts (provider defaults + overrides)
     private readonly timeouts: Required<NonNullable<CliProviderModule['timeouts']>>;
 
+ // Provider approval key mapping (e.g. { 0: '1', 1: '2', 2: '3' }) — loaded from provider.json
+    private readonly approvalKeys: Record<number, string>;
+
     constructor(provider: CliProviderModule, workingDir: string, private extraArgs: string[] = []) {
         this.provider = normalizeCliProviderForRuntime(provider);
         this.cliType = provider.type;
@@ -290,6 +305,10 @@ export class ProviderCliAdapter implements CliAdapter {
             maxResponse: t.maxResponse ?? 300000,
             shutdownGrace: t.shutdownGrace ?? 1000,
         };
+
+ // Load approval key mapping from provider (e.g. approvalKeys: {"0":"1","1":"2","2":"3"})
+        const rawKeys = (provider as any).approvalKeys;
+        this.approvalKeys = (rawKeys && typeof rawKeys === 'object') ? rawKeys : {};
     }
 
  // ─── Lifecycle ─────────────────────────────────
@@ -390,12 +409,12 @@ export class ProviderCliAdapter implements CliAdapter {
         this.ptyProcess.onExit(({ exitCode }: { exitCode: number }) => {
             LOG.info('CLI', `[${this.cliType}] Exit code ${exitCode}`);
             this.ptyProcess = null;
-            this.currentStatus = 'stopped';
+            this.setStatus('stopped', 'pty_exit');
             this.ready = false;
             this.onStatusChange?.();
         });
 
-        this.currentStatus = 'starting';
+        this.setStatus('starting', 'spawn');
         this.onStatusChange?.();
     }
 
@@ -423,11 +442,15 @@ export class ProviderCliAdapter implements CliAdapter {
  // ─── Phase 1: Startup — ready status wait
         if (!this.ready) {
             this.startupBuffer += cleanData;
+            LOG.info('CLI', `[${this.cliType}] startup chunk (${cleanData.length} chars): ${cleanData.slice(0, 200).replace(/\n/g, '\\n')}`);
 
  // Startup dialog auto-proceed (Enter)
             const dialogPatterns = [
                 /Do you want to connect/i,
                 /Do you trust the files/i,
+                /Quick safety check/i,
+                /Is this a project/i,
+                /Enter to confirm/i,
             ];
             if (dialogPatterns.some(p => p.test(this.startupBuffer))) {
                 setTimeout(() => this.ptyProcess?.write('\r'), this.timeouts.dialogAccept);
@@ -438,7 +461,7 @@ export class ProviderCliAdapter implements CliAdapter {
  // Prompt → ready
             if (patterns.prompt.some(p => p.test(this.startupBuffer))) {
                 this.ready = true;
-                this.currentStatus = 'idle';
+                this.setStatus('idle', 'prompt_matched');
                 LOG.info('CLI', `[${this.cliType}] ✓ Ready`);
                 this.onStatusChange?.();
             }
@@ -455,12 +478,14 @@ export class ProviderCliAdapter implements CliAdapter {
                 .map(l => l.trim())
                 .filter(l => l && !/^[─═╭╮╰╯│]+$/.test(l));
             this.isWaitingForResponse = true;
-            this.currentStatus = 'waiting_approval';
+            this.setStatus('waiting_approval', 'approval_pattern');
             this.recentOutputBuffer = '';
             this.approvalTransitionBuffer = '';
             this.activeModal = {
                 message: ctxLines.slice(-5).join(' ').slice(0, 200) || 'Approval required',
-                buttons: ['Allow once', 'Always allow', 'Deny'],
+                buttons: this.cliType === 'claude-cli'
+                    ? ['Yes (y)', 'Always allow (a)', 'Deny (Esc)']
+                    : ['Allow once', 'Always allow', 'Deny'],
             };
             if (this.idleTimeout) clearTimeout(this.idleTimeout);
             // Safety timeout — if stuck in waiting_approval, auto-exit after 60s
@@ -473,7 +498,7 @@ export class ProviderCliAdapter implements CliAdapter {
                     this.recentOutputBuffer = '';
                     this.approvalTransitionBuffer = '';
                     this.approvalExitTimeout = null;
-                    this.currentStatus = this.isWaitingForResponse ? 'generating' : 'idle';
+                    this.setStatus(this.isWaitingForResponse ? 'generating' : 'idle', 'approval_cleared');
                     this.onStatusChange?.();
                 }
             }, 60000);
@@ -490,7 +515,7 @@ export class ProviderCliAdapter implements CliAdapter {
             const promptResume = patterns.prompt.some(p => p.test(this.approvalTransitionBuffer));
             if (genResume) {
                 if (this.approvalExitTimeout) { clearTimeout(this.approvalExitTimeout); this.approvalExitTimeout = null; }
-                this.currentStatus = 'generating';
+                this.setStatus('generating', 'approval_gen_resume');
                 this.activeModal = null;
                 this.recentOutputBuffer = '';
                 this.approvalTransitionBuffer = '';
@@ -512,7 +537,7 @@ export class ProviderCliAdapter implements CliAdapter {
             if (patterns.generating.some(p => p.test(cleanData))) {
                 this.isWaitingForResponse = true;
                 this.responseBuffer = '';
-                this.currentStatus = 'generating';
+                this.setStatus('generating', 'autonomous_gen');
                 this.onStatusChange?.();
             }
         }
@@ -524,7 +549,7 @@ export class ProviderCliAdapter implements CliAdapter {
 
             const stillGenerating = patterns.generating.some(p => p.test(cleanData));
             if (stillGenerating) {
-                this.currentStatus = 'generating';
+                this.setStatus('generating', 'still_generating');
                 this.idleTimeout = setTimeout(() => {
                     if (this.isWaitingForResponse) this.finishResponse();
                 }, this.timeouts.generatingIdle);
@@ -575,7 +600,7 @@ export class ProviderCliAdapter implements CliAdapter {
         this.responseBuffer = '';
         this.isWaitingForResponse = false;
         this.activeModal = null;
-        this.currentStatus = 'idle';
+        this.setStatus('idle', 'response_finished');
         this.onStatusChange?.();
     }
 
@@ -598,7 +623,7 @@ export class ProviderCliAdapter implements CliAdapter {
         this.messages.push({ role: 'user', content: text, timestamp: Date.now() });
         this.isWaitingForResponse = true;
         this.responseBuffer = '';
-        this.currentStatus = 'generating';
+        this.setStatus('generating', 'sendMessage');
         this.onStatusChange?.();
 
         this.ptyProcess.write(text + '\r');
@@ -623,7 +648,7 @@ export class ProviderCliAdapter implements CliAdapter {
             setTimeout(() => {
                 try { this.ptyProcess?.kill(); } catch { }
                 this.ptyProcess = null;
-                this.currentStatus = 'stopped';
+                this.setStatus('stopped', 'stop_cmd');
                 this.ready = false;
                 this.onStatusChange?.();
             }, this.timeouts.shutdownGrace);
@@ -649,9 +674,16 @@ export class ProviderCliAdapter implements CliAdapter {
  */
     resolveModal(buttonIndex: number): void {
         if (!this.ptyProcess || this.currentStatus !== 'waiting_approval') return;
-        const DOWN = '\x1B[B'; // Arrow Down
-        const keys = DOWN.repeat(Math.max(0, buttonIndex)) + '\r';
-        this.ptyProcess.write(keys);
+        // Use provider-defined approval keys if available
+        // Each provider.json can define: { "approvalKeys": { "0": "1", "1": "2", "2": "3" } }
+        if (buttonIndex in this.approvalKeys) {
+            this.ptyProcess.write(this.approvalKeys[buttonIndex]);
+        } else {
+            // Generic fallback: Arrow Down to navigate + Enter to select
+            const DOWN = '\x1B[B';
+            const keys = DOWN.repeat(Math.max(0, buttonIndex)) + '\r';
+            this.ptyProcess.write(keys);
+        }
     }
 
     resize(cols: number, rows: number): void {
@@ -664,4 +696,43 @@ export class ProviderCliAdapter implements CliAdapter {
             } catch { }
         }
     }
+
+ /**
+ * Full debug state — exposes all internal buffers, status, and patterns for debugging.
+ * Used by DevServer /api/cli/debug endpoint.
+ */
+    getDebugState(): Record<string, any> {
+        return {
+            type: this.cliType,
+            name: this.cliName,
+            status: this.currentStatus,
+            ready: this.ready,
+            workingDir: this.workingDir,
+            messages: this.messages.slice(-20),
+            messageCount: this.messages.length,
+            // Buffers
+            startupBuffer: this.startupBuffer.slice(-500),
+            recentOutputBuffer: this.recentOutputBuffer.slice(-500),
+            responseBuffer: this.responseBuffer.slice(-500),
+            approvalTransitionBuffer: this.approvalTransitionBuffer.slice(-500),
+            // State
+            isWaitingForResponse: this.isWaitingForResponse,
+            activeModal: this.activeModal,
+            lastApprovalResolvedAt: this.lastApprovalResolvedAt,
+            resizeSuppressUntil: this.resizeSuppressUntil,
+            // Provider patterns (serialized)
+            patterns: {
+                prompt: this.provider.patterns.prompt.map(p => p.toString()),
+                generating: this.provider.patterns.generating.map(p => p.toString()),
+                approval: this.provider.patterns.approval.map(p => p.toString()),
+                ready: this.provider.patterns.ready.map(p => p.toString()),
+            },
+            // Status history
+            statusHistory: this.statusHistory.slice(-30),
+            // Timeouts config
+            timeouts: this.timeouts,
+            // PTY alive
+            ptyAlive: !!this.ptyProcess,
+        };
+    }
 }