@adhdev/daemon-core 0.5.25 → 0.5.26

package/providers/_builtin/ide/pearai/provider.json

@@ -63,5 +63,7 @@
       "min": 30,
       "max": 600
     }
-  }
-}
+  },
+  "defaultScriptDir": "scripts/1.0",
+  "compatibility": []
+}

package/providers/_builtin/ide/trae/provider.json

@@ -62,5 +62,7 @@
       "min": 30,
       "max": 600
     }
-  }
-}
+  },
+  "defaultScriptDir": "scripts/1.0",
+  "compatibility": []
+}

package/providers/_builtin/ide/windsurf/provider.json

@@ -49,5 +49,7 @@
       "min": 30,
       "max": 600
     }
-  }
-}
+  },
+  "defaultScriptDir": "scripts/1.0",
+  "compatibility": []
+}

package/providers/_builtin/registry.json

@@ -1,5 +1,5 @@
 {
-  "version": "2026.03.22",
+  "version": "2026.03.23",
   "providers": {
     "agentpool-acp": {
       "providerVersion": "0.0.0",

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

@@ -301,7 +301,7 @@ export class ProviderCliAdapter implements CliAdapter {
         this.timeouts = {
             ptyFlush: t.ptyFlush ?? 50,
             dialogAccept: t.dialogAccept ?? 300,
-            approvalCooldown: t.approvalCooldown ?? 2000,
+            approvalCooldown: t.approvalCooldown ?? 500,
             generatingIdle: t.generatingIdle ?? 6000,
             idleFinish: t.idleFinish ?? 5000,
             maxResponse: t.maxResponse ?? 300000,
@@ -473,39 +473,41 @@ export class ProviderCliAdapter implements CliAdapter {
  // ─── Phase 2: Approval detect
         const hasApproval = patterns.approval.some(p => p.test(this.recentOutputBuffer));
         if (hasApproval && this.currentStatus !== 'waiting_approval') {
-            if (this.lastApprovalResolvedAt && (Date.now() - this.lastApprovalResolvedAt) < this.timeouts.approvalCooldown) return;
-
-            // Capture context before clearing (recentOutputBuffer still has content here)
-            const ctxLines = this.recentOutputBuffer.split('\n')
-                .map(l => l.trim())
-                .filter(l => l && !/^[─═╭╮╰╯│]+$/.test(l));
-            this.isWaitingForResponse = true;
-            this.setStatus('waiting_approval', 'approval_pattern');
-            this.recentOutputBuffer = '';
-            this.approvalTransitionBuffer = '';
-            this.activeModal = {
-                message: ctxLines.slice(-5).join(' ').slice(0, 200) || 'Approval required',
-                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
-            if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
-            this.approvalExitTimeout = setTimeout(() => {
-                if (this.currentStatus === 'waiting_approval') {
-                    LOG.warn('CLI', `[${this.cliType}] Approval timeout — auto-exiting waiting_approval`);
-                    this.activeModal = null;
-                    this.lastApprovalResolvedAt = Date.now();
-                    this.recentOutputBuffer = '';
-                    this.approvalTransitionBuffer = '';
-                    this.approvalExitTimeout = null;
-                    this.setStatus(this.isWaitingForResponse ? 'generating' : 'idle', 'approval_cleared');
-                    this.onStatusChange?.();
-                }
-            }, 60000);
-            this.onStatusChange?.();
-            return;
+            const inCooldown = this.lastApprovalResolvedAt && (Date.now() - this.lastApprovalResolvedAt) < this.timeouts.approvalCooldown;
+            if (!inCooldown) {
+                // Capture context before clearing (recentOutputBuffer still has content here)
+                const ctxLines = this.recentOutputBuffer.split('\n')
+                    .map(l => l.trim())
+                    .filter(l => l && !/^[─═╭╮╰╯│]+$/.test(l));
+                this.isWaitingForResponse = true;
+                this.setStatus('waiting_approval', 'approval_pattern');
+                this.recentOutputBuffer = '';
+                this.approvalTransitionBuffer = '';
+                this.activeModal = {
+                    message: ctxLines.slice(-5).join(' ').slice(0, 200) || 'Approval required',
+                    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
+                if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
+                this.approvalExitTimeout = setTimeout(() => {
+                    if (this.currentStatus === 'waiting_approval') {
+                        LOG.warn('CLI', `[${this.cliType}] Approval timeout — auto-exiting waiting_approval`);
+                        this.activeModal = null;
+                        this.lastApprovalResolvedAt = Date.now();
+                        this.recentOutputBuffer = '';
+                        this.approvalTransitionBuffer = '';
+                        this.approvalExitTimeout = null;
+                        this.setStatus(this.isWaitingForResponse ? 'generating' : 'idle', 'approval_cleared');
+                        this.onStatusChange?.();
+                    }
+                }, 60000);
+                this.onStatusChange?.();
+                return;
+            }
+            // In cooldown — don't set approval, but DO continue to other phases
         }
 
  // ─── Phase 3: Approval release
@@ -565,7 +567,12 @@ export class ProviderCliAdapter implements CliAdapter {
  // has '>' in code blocks, shell examples, or mid-response lines.
             const trailingLines = cleanData.split('\n').slice(-2).join('\n');
             if (patterns.prompt.some(p => p.test(trailingLines))) {
-                this.finishResponse();
+                // Guard: don't finishResponse if approval text is also present —
+                // Claude Code's approval UI can contain prompt-like characters
+                const hasApprovalHere = patterns.approval.some(p => p.test(this.recentOutputBuffer));
+                if (!hasApprovalHere) {
+                    this.finishResponse();
+                }
             } else {
                 this.idleTimeout = setTimeout(() => {
                     if (this.isWaitingForResponse && this.responseBuffer.trim()) {

package/providers/_builtin/extension/cline/scripts.js

@@ -1,73 +0,0 @@
-/**
- * CDP Scripts for Cline
- */
-
-const fs = require('fs');
-const path = require('path');
-const SCRIPTS_DIR = path.join(__dirname, 'scripts');
-function loadScript(name) {
-  try { return fs.readFileSync(path.join(SCRIPTS_DIR, name), 'utf8'); }
-  catch { return null; }
-}
-
-
-module.exports.readChat = function readChat() {
-      return loadScript('read_chat.js');
-    };
-
-module.exports.sendMessage = function sendMessage(text) {
-      const script = loadScript('send_message.js');
-      if (!script) return null;
-      return script.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text));
-    };
-
-module.exports.listSessions = function listSessions() {
-      return loadScript('list_chats.js');
-    };
-
-module.exports.switchSession = function switchSession(sessionId) {
-      const script = loadScript('switch_session.js');
-      if (!script) return null;
-      return script.replace(/\$\{\s*SESSION_ID\s*\}/g, JSON.stringify(sessionId));
-    };
-
-module.exports.newSession = function newSession() {
-      return loadScript('new_session.js');
-    };
-
-module.exports.resolveAction = function resolveAction(action) {
-      const script = loadScript('resolve_action.js');
-      if (!script) return null;
-      return script.replace(/\$\{\s*ACTION\s*\}/g, JSON.stringify(action));
-    };
-
-module.exports.focusEditor = function focusEditor() {
-      return loadScript('focus_editor.js');
-    };
-
-module.exports.openPanel = function openPanel() {
-      return loadScript('open_panel.js');
-    };
-
-module.exports.listModels = function listModels() {
-      return loadScript('list_models.js');
-    };
-
-module.exports.setModel = function setModel(params) {
-      const model = params?.model || params;
-      const script = loadScript('set_model.js');
-      if (!script) return null;
-      return script.replace(/\$\{\s*MODEL\s*\}/g, JSON.stringify(model));
-    };
-
-module.exports.listModes = function listModes() {
-      return loadScript('list_modes.js');
-    };
-
-module.exports.setMode = function setMode(params) {
-      const mode = params?.mode || params;
-      const script = loadScript('set_mode.js');
-      if (!script) return null;
-      return script.replace(/\$\{\s*MODE\s*\}/g, JSON.stringify(mode));
-    };
-

package/providers/_builtin/extension/codex/scripts.js

@@ -1,94 +0,0 @@
-/**
- * CDP Scripts for Codex (openai.chatgpt)
- *
- * All scripts run inside the Codex webview frame via evaluateInWebviewFrame.
- * Script names containing "Webview" are automatically routed through
- * evaluateInWebviewFrame by DevServer.
- *
- * For production (ProviderInstance), the AgentStreamAdapter calls
- * evaluateInWebviewFrame directly using the provider's webviewMatchText.
- */
-
-const fs = require('fs');
-const path = require('path');
-const SCRIPTS_DIR = path.join(__dirname, 'scripts');
-function loadScript(name) {
-  try { return fs.readFileSync(path.join(SCRIPTS_DIR, name), 'utf8'); }
-  catch { return null; }
-}
-
-// ─── Production scripts ───
-
-module.exports.readChat = function readChat() {
-  return loadScript('read_chat.js');
-};
-
-module.exports.sendMessage = function sendMessage(text) {
-  const script = loadScript('send_message.js');
-  if (!script) return null;
-  return script.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text));
-};
-
-module.exports.resolveAction = function resolveAction(action) {
-  const script = loadScript('resolve_action.js');
-  if (!script) return null;
-  return script.replace(/\$\{\s*ACTION\s*\}/g, JSON.stringify(action));
-};
-
-module.exports.listModels = function listModels() {
-  return loadScript('list_models.js');
-};
-
-module.exports.setModel = function setModel(params) {
-  const model = params?.model || params;
-  const script = loadScript('set_model.js');
-  if (!script) return null;
-  return script.replace(/\$\{\s*MODEL\s*\}/g, JSON.stringify(model));
-};
-
-module.exports.newSession = function newSession() {
-  return loadScript('new_session.js');
-};
-
-// ─── DevConsole debug helpers (names contain "Webview" for auto-routing) ───
-
-module.exports.readChatWebview = function readChatWebview() {
-  return loadScript('read_chat.js');
-};
-
-module.exports.sendMessageWebview = function sendMessageWebview(text) {
-  const script = loadScript('send_message.js');
-  if (!script) return null;
-  return script.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text));
-};
-
-module.exports.listModelsWebview = function listModelsWebview() {
-  return loadScript('list_models.js');
-};
-
-module.exports.setModelWebview = function setModelWebview(params) {
-  const model = params?.model || params;
-  const script = loadScript('set_model.js');
-  if (!script) return null;
-  return script.replace(/\$\{\s*MODEL\s*\}/g, JSON.stringify(model));
-};
-
-module.exports.newSessionWebview = function newSessionWebview() {
-  return loadScript('new_session.js');
-};
-
-module.exports.exploreWebview = function exploreWebview() {
-  return loadScript('explore_dom.js');
-};
-
-module.exports.exploreControlsWebview = function exploreControlsWebview() {
-  return loadScript('explore_controls_webview.js');
-};
-
-module.exports.exploreDropdownWebview = function exploreDropdownWebview() {
-  return loadScript('explore_dropdown_webview.js');
-};
-
-module.exports.inspectCodeWebview = function inspectCodeWebview() {
-  return loadScript('inspect_code_webview.js');
-};

package/providers/_builtin/ide/kiro/scripts.js

@@ -1,62 +0,0 @@
-/**
- * CDP Scripts for Kiro
- */
-
-const fs = require('fs');
-const path = require('path');
-const SCRIPTS_DIR = path.join(__dirname, 'scripts');
-function loadScript(name) {
-  try { return fs.readFileSync(path.join(SCRIPTS_DIR, name), 'utf8'); }
-  catch { return null; }
-}
-
-
-module.exports.webviewReadChat = function webviewReadChat() { return loadScript('webview_read_chat.js'); };
-
-module.exports.webviewSendMessage = function webviewSendMessage(text) {
-      const s = loadScript('webview_send_message.js');
-      return s ? s.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text)) : null;
-    };
-
-module.exports.sendMessage = function sendMessage(text) {
-      const s = loadScript('send_message.js');
-      return s ? s.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text)) : null;
-    };
-
-module.exports.resolveAction = function resolveAction(params) {
-      const action = typeof params === 'string' ? params : params?.action || 'approve';
-      const buttonText = params?.button || params?.buttonText
-        || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : action);
-      const s = loadScript('resolve_action.js');
-      return s ? s.replace(/\$\{\s*BUTTON_TEXT\s*\}/g, JSON.stringify(buttonText)) : null;
-    };
-
-module.exports.openPanel = function openPanel() { return loadScript('open_panel.js'); };
-
-module.exports.focusEditor = function focusEditor() { return loadScript('focus_editor.js'); };
-
-module.exports.webviewListSessions = function webviewListSessions() { return loadScript('webview_list_sessions.js'); };
-
-module.exports.webviewNewSession = function webviewNewSession() { return loadScript('webview_new_session.js'); };
-
-module.exports.webviewSwitchSession = function webviewSwitchSession(sessionId) {
-      const s = loadScript('webview_switch_session.js');
-      return s ? s.replace(/\$\{\s*SESSION_ID\s*\}/g, JSON.stringify(sessionId)) : null;
-    };
-
-module.exports.webviewListModels = function webviewListModels() { return loadScript('webview_list_models.js'); };
-
-module.exports.webviewSetModel = function webviewSetModel(params) {
-      const model = typeof params === 'string' ? params : params?.model;
-      const s = loadScript('webview_set_model.js');
-      return s ? s.replace(/\$\{\s*MODEL\s*\}/g, JSON.stringify(model)) : null;
-    };
-
-module.exports.webviewListModes = function webviewListModes() { return loadScript('webview_list_modes.js'); };
-
-module.exports.webviewSetMode = function webviewSetMode(params) {
-      const mode = typeof params === 'string' ? params : params?.mode;
-      const s = loadScript('webview_set_mode.js');
-      return s ? s.replace(/\$\{\s*MODE\s*\}/g, JSON.stringify(mode)) : null;
-    };
-

package/providers/_builtin/ide/pearai/scripts.js

@@ -1,74 +0,0 @@
-/**
- * CDP Scripts for PearAI
- */
-
-const fs = require('fs');
-const path = require('path');
-const SCRIPTS_DIR = path.join(__dirname, 'scripts');
-function loadScript(name) {
-  try { return fs.readFileSync(path.join(SCRIPTS_DIR, name), 'utf8'); }
-  catch { return null; }
-}
-
-
-module.exports.webviewReadChat = function webviewReadChat() { return loadScript('webview_read_chat.js'); };
-
-module.exports.webviewSendMessage = function webviewSendMessage(text) {
-      const s = loadScript('webview_send_message.js');
-      return s ? s.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text)) : null;
-    };
-
-module.exports.sendMessage = function sendMessage(text) {
-      const s = loadScript('send_message.js');
-      return s ? s.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text)) : null;
-    };
-
-module.exports.resolveAction = function resolveAction(params) {
-      const action = typeof params === 'string' ? params : params?.action || 'approve';
-      const buttonText = params?.button || params?.buttonText
-        || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : action);
-      const s = loadScript('resolve_action.js');
-      return s ? s.replace(/\$\{\s*BUTTON_TEXT\s*\}/g, JSON.stringify(buttonText)) : null;
-    };
-
-module.exports.webviewResolveAction = function webviewResolveAction(params) {
-      const action = typeof params === 'string' ? params : params?.action || 'approve';
-      const buttonText = params?.button || params?.buttonText
-        || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : action);
-      const s = loadScript('webview_resolve_action.js');
-      return s ? s.replace(/\$\{\s*BUTTON_TEXT\s*\}/g, JSON.stringify(buttonText)) : null;
-    };
-
-module.exports.openPanel = function openPanel() { return loadScript('open_panel.js'); };
-
-module.exports.focusEditor = function focusEditor() { return loadScript('focus_editor.js'); };
-
-module.exports.newSession = function newSession() { return loadScript('new_session.js'); };
-
-module.exports.listSessions = function listSessions() { return loadScript('list_sessions.js'); };
-
-module.exports.webviewNewSession = function webviewNewSession() { return loadScript('webview_new_session.js'); };
-
-module.exports.webviewListSessions = function webviewListSessions() { return loadScript('webview_list_sessions.js'); };
-
-module.exports.webviewSwitchSession = function webviewSwitchSession(sessionId) {
-      const s = loadScript('webview_switch_session.js');
-      return s ? s.replace(/\$\{\s*SESSION_ID\s*\}/g, JSON.stringify(sessionId)) : null;
-    };
-
-module.exports.webviewListModels = function webviewListModels() { return loadScript('webview_list_models.js'); };
-
-module.exports.webviewSetModel = function webviewSetModel(params) {
-      const model = typeof params === 'string' ? params : params?.model;
-      const s = loadScript('webview_set_model.js');
-      return s ? s.replace(/\$\{\s*MODEL\s*\}/g, JSON.stringify(model)) : null;
-    };
-
-module.exports.webviewListModes = function webviewListModes() { return loadScript('webview_list_modes.js'); };
-
-module.exports.webviewSetMode = function webviewSetMode(params) {
-      const mode = typeof params === 'string' ? params : params?.mode;
-      const s = loadScript('webview_set_mode.js');
-      return s ? s.replace(/\$\{\s*MODE\s*\}/g, JSON.stringify(mode)) : null;
-    };
-

package/providers/_builtin/ide/trae/scripts.js

@@ -1,57 +0,0 @@
-/**
- * CDP Scripts for Trae
- */
-
-const fs = require('fs');
-const path = require('path');
-const SCRIPTS_DIR = path.join(__dirname, 'scripts');
-function loadScript(name) {
-  try { return fs.readFileSync(path.join(SCRIPTS_DIR, name), 'utf8'); }
-  catch { return null; }
-}
-
-
-module.exports.readChat = function readChat() { return loadScript('read_chat.js'); };
-
-module.exports.sendMessage = function sendMessage(text) {
-      const s = loadScript('send_message.js');
-      return s ? s.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text)) : null;
-    };
-
-module.exports.resolveAction = function resolveAction(params) {
-      const action = typeof params === 'string' ? params : params?.action || 'approve';
-      const buttonText = params?.button || params?.buttonText
-        || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : action);
-      const s = loadScript('resolve_action.js');
-      return s ? s.replace(/\$\{\s*BUTTON_TEXT\s*\}/g, JSON.stringify(buttonText)) : null;
-    };
-
-module.exports.openPanel = function openPanel() { return loadScript('open_panel.js'); };
-
-module.exports.focusEditor = function focusEditor() { return loadScript('focus_editor.js'); };
-
-module.exports.newSession = function newSession() { return loadScript('new_session.js'); };
-
-module.exports.listSessions = function listSessions() { return loadScript('list_chats.js'); };
-
-module.exports.switchSession = function switchSession(sessionId) {
-      const s = loadScript('switch_session.js');
-      return s ? s.replace(/\$\{\s*SESSION_ID\s*\}/g, JSON.stringify(sessionId)) : null;
-    };
-
-module.exports.listModels = function listModels() { return loadScript('list_models.js'); };
-
-module.exports.setModel = function setModel(params) {
-      const model = typeof params === 'string' ? params : params?.model;
-      const s = loadScript('set_model.js');
-      return s ? s.replace(/\$\{\s*MODEL\s*\}/g, JSON.stringify(model)) : null;
-    };
-
-module.exports.listModes = function listModes() { return loadScript('list_modes.js'); };
-
-module.exports.setMode = function setMode(params) {
-      const mode = typeof params === 'string' ? params : params?.mode;
-      const s = loadScript('set_mode.js');
-      return s ? s.replace(/\$\{\s*MODE\s*\}/g, JSON.stringify(mode)) : null;
-    };
-

package/providers/_builtin/ide/windsurf/scripts.js

@@ -1,57 +0,0 @@
-/**
- * CDP Scripts for Windsurf
- */
-
-const fs = require('fs');
-const path = require('path');
-const SCRIPTS_DIR = path.join(__dirname, 'scripts');
-function loadScript(name) {
-  try { return fs.readFileSync(path.join(SCRIPTS_DIR, name), 'utf8'); }
-  catch { return null; }
-}
-
-
-module.exports.readChat = function readChat() { return loadScript('read_chat.js'); };
-
-module.exports.sendMessage = function sendMessage(text) {
-      const s = loadScript('send_message.js');
-      return s ? s.replace(/\$\{\s*MESSAGE\s*\}/g, JSON.stringify(text)) : null;
-    };
-
-module.exports.listSessions = function listSessions() { return loadScript('list_chats.js'); };
-
-module.exports.switchSession = function switchSession(sessionId) {
-      const s = loadScript('switch_session.js');
-      return s ? s.replace(/\$\{\s*SESSION_ID\s*\}/g, JSON.stringify(sessionId)) : null;
-    };
-
-module.exports.newSession = function newSession() { return loadScript('new_session.js'); };
-
-module.exports.resolveAction = function resolveAction(params) {
-      const action = typeof params === 'string' ? params : params?.action || 'approve';
-      const buttonText = params?.button || params?.buttonText
-        || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : action);
-      const s = loadScript('resolve_action.js');
-      return s ? s.replace(/\$\{\s*BUTTON_TEXT\s*\}/g, JSON.stringify(buttonText)) : null;
-    };
-
-module.exports.focusEditor = function focusEditor() { return loadScript('focus_editor.js'); };
-
-module.exports.listModels = function listModels() { return loadScript('list_models.js'); };
-
-module.exports.setModel = function setModel(params) {
-      const model = typeof params === 'string' ? params : params?.model;
-      const s = loadScript('set_model.js');
-      return s ? s.replace(/\$\{\s*MODEL\s*\}/g, JSON.stringify(model)) : null;
-    };
-
-module.exports.listModes = function listModes() { return loadScript('list_modes.js'); };
-
-module.exports.setMode = function setMode(params) {
-      const mode = typeof params === 'string' ? params : params?.mode;
-      const s = loadScript('set_mode.js');
-      return s ? s.replace(/\$\{\s*MODE\s*\}/g, JSON.stringify(mode)) : null;
-    };
-
-module.exports.openPanel = function openPanel() { return loadScript('open_panel.js'); };
-