@adhdev/daemon-core 0.8.29 → 0.8.31

package/src/daemon/dev-server.ts

@@ -20,7 +20,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import type { ProviderLoader } from '../providers/provider-loader.js';
-import type { ProviderCategory } from '../providers/contracts.js';
+import type { ProviderCategory, ProviderModule, ProviderScripts, ProviderSettingDef } from '../providers/contracts.js';
 import type { ChildProcess } from 'child_process';
 import type { DaemonCdpManager } from '../cdp/manager.js';
 import type { ProviderInstanceManager } from '../providers/provider-instance-manager.js';
@@ -34,6 +34,64 @@ import { handleAutoImplement, handleAutoImplCancel, handleAutoImplSSE } from './
 
 export const DEV_SERVER_PORT = 19280;
 
+interface ProviderListEntry {
+  type: string;
+  name: string;
+  category: ProviderCategory;
+  icon: string | null;
+  displayName: string;
+  scripts?: string[];
+  inputMethod?: ProviderModule['inputMethod'] | null;
+  inputSelector?: string | null;
+  extensionId?: string | null;
+  cdpPorts?: [number, number] | [];
+  spawn?: ProviderModule['spawn'] | null;
+  auth?: ProviderModule['auth'] | null;
+  install?: string | null;
+  hasSettings?: boolean;
+  settingsCount?: number;
+}
+
+function getScriptNames(scripts?: ProviderScripts): string[] {
+  if (!scripts) return [];
+  return Object.entries(scripts)
+    .filter(([, value]) => typeof value === 'function')
+    .map(([name]) => name);
+}
+
+function toProviderListEntry(provider: ProviderModule): ProviderListEntry {
+  const base: ProviderListEntry = {
+    type: provider.type,
+    name: provider.name,
+    category: provider.category,
+    icon: provider.icon || null,
+    displayName: provider.displayName || provider.name,
+  };
+
+  if (provider.category === 'ide' || provider.category === 'extension') {
+    base.scripts = getScriptNames(provider.scripts);
+    base.inputMethod = provider.inputMethod || null;
+    base.inputSelector = provider.inputSelector || null;
+    base.extensionId = provider.extensionId || null;
+    base.cdpPorts = provider.cdpPorts || [];
+  }
+
+  if (provider.category === 'acp') {
+    base.spawn = provider.spawn || null;
+    base.auth = provider.auth || null;
+    base.install = provider.install || null;
+    base.hasSettings = !!provider.settings;
+    base.settingsCount = provider.settings ? Object.keys(provider.settings).length : 0;
+  }
+
+  if (provider.category === 'cli') {
+    base.spawn = provider.spawn || null;
+    base.install = provider.install || null;
+  }
+
+  return base;
+}
+
 export class DevServer implements DevServerContext {
   private server: http.Server | null = null;
   public providerLoader: ProviderLoader;
@@ -212,41 +270,7 @@ export class DevServer implements DevServerContext {
   // ─── Handlers ───
 
   private async handleListProviders(_req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
-    const providers = this.providerLoader.getAll().map(p => {
-      const base: any = {
-        type: p.type,
-        name: p.name,
-        category: p.category,
-        icon: (p as any).icon || null,
-        displayName: (p as any).displayName || p.name,
-      };
-
-      // IDE/Extension specific
-      if (p.category === 'ide' || p.category === 'extension') {
-        base.scripts = p.scripts ? Object.keys(p.scripts).filter(k => typeof (p.scripts as any)[k] === 'function') : [];
-        base.inputMethod = p.inputMethod || null;
-        base.inputSelector = (p as any).inputSelector || null;
-        base.extensionId = p.extensionId || null;
-        base.cdpPorts = (p as any).cdpPorts || [];
-      }
-
-      // ACP specific
-      if (p.category === 'acp') {
-        base.spawn = (p as any).spawn || null;
-        base.auth = (p as any).auth || null;
-        base.install = (p as any).install || null;
-        base.hasSettings = !!(p as any).settings;
-        base.settingsCount = (p as any).settings ? Object.keys((p as any).settings).length : 0;
-      }
-
-      // CLI specific
-      if (p.category === 'cli') {
-        base.spawn = (p as any).spawn || null;
-        base.install = (p as any).install || null;
-      }
-
-      return base;
-    });
+    const providers = this.providerLoader.getAll().map(toProviderListEntry);
     this.json(res, 200, { providers, count: providers.length });
   }
 
@@ -273,7 +297,7 @@ export class DevServer implements DevServerContext {
       return;
     }
 
-    const spawn = (provider as any).spawn;
+    const spawn = provider.spawn;
     if (!spawn) {
       this.json(res, 400, { error: `Provider ${type} has no spawn config` });
       return;
@@ -330,7 +354,7 @@ export class DevServer implements DevServerContext {
       return;
     }
 
-    const fn = (provider.scripts as any)?.[scriptName];
+    const fn = provider.scripts?.[scriptName];
     if (typeof fn !== 'function') {
       this.json(res, 400, { error: `Script '${scriptName}' not found in provider '${type}'`, available: provider.scripts ? Object.keys(provider.scripts) : [] });
       return;
@@ -446,7 +470,7 @@ export class DevServer implements DevServerContext {
       }));
       for (const cdp of this.cdpManagers.values()) {
         if (!cdp.isConnected) {
-          (cdp as any)._targetId = null;
+          cdp.clearTargetId();
         }
       }
       this.json(res, 200, { reloaded: true, providers });
@@ -569,7 +593,7 @@ export class DevServer implements DevServerContext {
         this.sendSSE({ type: 'watch_error', error: `Provider '${this.watchScriptPath}' not found` });
         return;
       }
-      const fn = (provider.scripts as any)?.[this.watchScriptName!];
+      const fn = provider.scripts?.[this.watchScriptName!];
       if (typeof fn !== 'function') {
         this.sendSSE({ type: 'watch_error', error: `Script '${this.watchScriptName}' not found` });
         return;
@@ -769,7 +793,7 @@ export class DevServer implements DevServerContext {
       // Settings validation
       if (config.settings) {
         for (const [key, val] of Object.entries(config.settings)) {
-          const s = val as any;
+          const s = val as Partial<ProviderSettingDef>;
           if (!s.type) errors.push(`settings.${key}: missing type`);
           else if (!['boolean', 'number', 'string', 'select'].includes(s.type))
             errors.push(`settings.${key}: invalid type '${s.type}'`);
@@ -784,7 +808,7 @@ export class DevServer implements DevServerContext {
       if (config.cdpPorts && Array.isArray(config.cdpPorts)) {
         const allProviders = this.providerLoader.getAll();
         for (const port of config.cdpPorts) {
-          const conflict = allProviders.find(p => p.type !== type && (p as any).cdpPorts?.includes(port));
+          const conflict = allProviders.find(p => p.type !== type && p.cdpPorts?.includes(port));
           if (conflict) warnings.push(`CDP port ${port} conflicts with provider '${conflict.type}'`);
         }
       }
@@ -801,7 +825,7 @@ export class DevServer implements DevServerContext {
     if (!message) { this.json(res, 400, { error: 'message required' }); return; }
     const provider = this.providerLoader.getMeta(type);
     if (!provider) { this.json(res, 404, { error: `Provider not found: ${type}` }); return; }
-    const spawn = (provider as any).spawn;
+    const spawn = provider.spawn;
     if (!spawn) { this.json(res, 400, { error: `Provider ${type} has no spawn config` }); return; }
 
     const { spawn: spawnFn } = await import('child_process');

package/src/providers/acp-provider-instance.ts

@@ -232,7 +232,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 ...(this.currentModel ? { model: this.currentModel } : {}),
                 ...(this.currentMode ? { mode: this.currentMode } : {}),
             },
-            providerControls: this.provider.controls as any,
+            providerControls: this.provider.controls,
         };
     }
 
@@ -600,8 +600,10 @@ export class AcpProviderInstance implements ProviderInstance {
                 }
 
                 // ─── Auto-approve: skip user confirmation ───
-                if (this.settings.autoApprove) {
-                    this.log.info(`[${this.type}] Auto-approving: ${tc.title || tc.toolCallId}`);
+                if (this.settings.autoApprove !== false) {
+                    const toolTitle = tc.title || tc.toolCallId || 'tool call';
+                    this.log.info(`[${this.type}] Auto-approving: ${toolTitle}`);
+                    this.appendSystemMessage(`Auto-approved: ${toolTitle}`);
                     const allowOption = params.options.find(o => o.kind === 'allow_once') || params.options.find(o => o.kind === 'allow_always');
                     if (allowOption) {
                         return { outcome: { outcome: 'selected', optionId: allowOption.optionId } };
@@ -1143,6 +1145,19 @@ export class AcpProviderInstance implements ProviderInstance {
         if (this.events.length > 50) this.events = this.events.slice(-50);
     }
 
+    private appendSystemMessage(content: string, timestamp = Date.now()): void {
+        const normalizedContent = String(content || '').trim();
+        if (!normalizedContent) return;
+        this.messages.push({
+            role: 'system',
+            content: normalizedContent,
+            timestamp,
+        });
+        if (this.messages.length > 200) {
+            this.messages = this.messages.slice(-100);
+        }
+    }
+
     private flushEvents(): ProviderEvent[] {
         const events = [...this.events];
         this.events = [];

package/src/providers/approval-utils.ts

@@ -0,0 +1,66 @@
+import type { ProviderModule } from './contracts.js';
+
+const DEFAULT_APPROVAL_POSITIVE_HINTS = [
+    'run',
+    'approve',
+    'accept',
+    'allow once',
+    'always allow',
+    'allow',
+    'yes',
+    'proceed',
+    'continue',
+    'confirm',
+    'save',
+    'ok',
+    'trust',
+];
+
+function normalizeApprovalLabel(value: string): string {
+    return String(value || '')
+        .toLowerCase()
+        .replace(/[^\p{L}\p{N}]+/gu, ' ')
+        .trim();
+}
+
+export function getApprovalPositiveHints(provider?: Pick<ProviderModule, 'approvalPositiveHints'> | null): string[] {
+    const customHints = Array.isArray(provider?.approvalPositiveHints)
+        ? provider.approvalPositiveHints
+            .map((hint) => normalizeApprovalLabel(String(hint || '')))
+            .filter(Boolean)
+        : [];
+    return customHints.length > 0 ? customHints : DEFAULT_APPROVAL_POSITIVE_HINTS;
+}
+
+export function pickApprovalButton(
+    buttons: string[] | null | undefined,
+    provider?: Pick<ProviderModule, 'approvalPositiveHints'> | null,
+): { index: number; label: string } {
+    const labels = (buttons || []).map((button) => String(button || '').trim()).filter(Boolean);
+    if (labels.length === 0) {
+        return { index: 0, label: 'Approve' };
+    }
+
+    const normalizedButtons = labels.map((label) => normalizeApprovalLabel(label));
+    const hints = getApprovalPositiveHints(provider);
+
+    for (const hint of hints) {
+        const exactIndex = normalizedButtons.findIndex((label) => label === hint);
+        if (exactIndex >= 0) return { index: exactIndex, label: labels[exactIndex] };
+
+        const prefixIndex = normalizedButtons.findIndex((label) => label.startsWith(hint));
+        if (prefixIndex >= 0) return { index: prefixIndex, label: labels[prefixIndex] };
+
+        const includeIndex = normalizedButtons.findIndex((label) => label.includes(hint));
+        if (includeIndex >= 0) return { index: includeIndex, label: labels[includeIndex] };
+    }
+
+    return { index: 0, label: labels[0] };
+}
+
+export function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string {
+    const lines = [`Auto-approved${buttonLabel ? `: ${buttonLabel}` : ''}`];
+    const cleanMessage = String(modalMessage || '').trim();
+    if (cleanMessage) lines.push(cleanMessage);
+    return lines.join('\n');
+}

package/src/providers/cli-provider-instance.ts

@@ -20,6 +20,7 @@ import { ChatHistoryWriter, readChatHistory } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
 import type { ChatMessage } from '../types.js';
 import { extractProviderControlValues, normalizeProviderEffects } from './control-effects.js';
+import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
 
 let CachedDatabaseSync: (new (path: string, options?: { readOnly?: boolean }) => {
     prepare(sql: string): { get(...params: Array<string | number>): unknown };
@@ -100,7 +101,7 @@ export class CliProviderInstance implements ProviderInstance {
         this.providerSessionId = options?.providerSessionId;
         this.launchMode = options?.launchMode || 'new';
         this.onProviderSessionResolved = options?.onProviderSessionResolved;
-        this.adapter = new ProviderCliAdapter(provider as any as CliProviderModule, workingDir, cliArgs, transportFactory);
+        this.adapter = new ProviderCliAdapter(provider as CliProviderModule, workingDir, cliArgs, transportFactory);
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
     }
@@ -249,6 +250,8 @@ export class CliProviderInstance implements ProviderInstance {
     getState(): ProviderState {
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
+        const autoApproveActive = adapterStatus.status === 'waiting_approval' && this.shouldAutoApprove();
+        const visibleStatus = autoApproveActive ? 'generating' : adapterStatus.status;
         const parsedProviderSessionId = typeof parsedStatus?.providerSessionId === 'string'
             ? parsedStatus.providerSessionId.trim()
             : '';
@@ -297,14 +300,16 @@ export class CliProviderInstance implements ProviderInstance {
             type: this.type,
             name: this.provider.name,
             category: 'cli',
-            status: adapterStatus.status,
+            status: visibleStatus,
             mode: this.presentationMode,
             activeChat: {
                 id: `${this.type}_${this.workingDir}`,
                 title: parsedStatus?.title || dirName,
-                status: parsedStatus?.status || adapterStatus.status,
+                status: autoApproveActive && parsedStatus?.status === 'waiting_approval'
+                    ? 'generating'
+                    : (parsedStatus?.status || visibleStatus),
                 messages: mergedMessages,
-                activeModal: parsedStatus?.activeModal ?? adapterStatus.activeModal,
+                activeModal: autoApproveActive ? null : (parsedStatus?.activeModal ?? adapterStatus.activeModal),
                 inputContent: '',
             },
             workspace: this.workingDir,
@@ -323,7 +328,7 @@ export class CliProviderInstance implements ProviderInstance {
             } : undefined,
             resume: this.provider.resume,
             controlValues: this.controlValues,
-            providerControls: this.provider.controls as any,
+            providerControls: this.provider.controls,
         };
     }
 
@@ -375,7 +380,16 @@ export class CliProviderInstance implements ProviderInstance {
         const now = Date.now();
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
-        const newStatus = adapterStatus.status;
+        const rawStatus = adapterStatus.status;
+        const autoApproveActive = rawStatus === 'waiting_approval' && this.shouldAutoApprove();
+        if (autoApproveActive) {
+            const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(adapterStatus.activeModal?.buttons, this.provider);
+            this.recordAutoApproval(adapterStatus.activeModal?.message, buttonLabel, now);
+            setTimeout(() => {
+                this.adapter.resolveModal(buttonIndex);
+            }, 0);
+        }
+        const newStatus = autoApproveActive ? 'generating' : rawStatus;
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
         const chatTitle = `${this.provider.name} · ${dirName}`;
         const partial = this.adapter.getPartialResponse();
@@ -603,6 +617,18 @@ export class CliProviderInstance implements ProviderInstance {
     get cliType(): string { return this.type; }
     get cliName(): string { return this.provider.name; }
 
+    private shouldAutoApprove(): boolean {
+        return this.settings.autoApprove !== false;
+    }
+
+    private recordAutoApproval(modalMessage?: string, buttonLabel?: string, now = Date.now()): void {
+        this.appendRuntimeSystemMessage(
+            formatAutoApprovalMessage(modalMessage, buttonLabel),
+            `auto_approval:${now}:${buttonLabel || 'approve'}`,
+            now,
+        );
+    }
+
     recordApprovalSelection(buttonText: string): void {
         const cleanButton = String(buttonText || '').trim();
         if (!cleanButton) return;

package/src/providers/contracts.d.ts

@@ -253,6 +253,7 @@ export interface ProviderModule {
     };
     cleanOutput?: (raw: string, lastUserInput?: string) => string;
     resume?: ProviderResumeCapability;
+    approvalPositiveHints?: string[];
     scripts?: ProviderScripts;
     vscodeCommands?: {
         focusPanel?: string;

package/src/providers/contracts.ts

@@ -304,6 +304,13 @@ export interface CdpTargetFilter {
   titleExcludes?: string;
 }
 
+export type ProviderVersionCommand = string | Partial<Record<string, string>>;
+
+export interface ProviderCompatibilityEntry {
+  ideVersion: string;
+  scriptDir: string;
+}
+
 export interface ProviderModule {
  /** Unique identifier (e.g. 'cline', 'cursor', 'gemini-cli') */
   type: string;
@@ -328,7 +335,7 @@ export interface ProviderModule {
  /** Install instructions (shown when command is missing) */
   install?: string;
  /** Custom version detection command (e.g. 'cursor --version', 'claude -v') */
-  versionCommand?: string;
+  versionCommand?: ProviderVersionCommand;
  /** Versions tested by provider maintainer (informational) */
   testedVersions?: string[];
   /** Per-OS process names — used by launch.ts to detect/kill IDE processes */
@@ -371,6 +378,9 @@ export interface ProviderModule {
  // ─── Extension category only ───
   extensionId?: string;
   extensionIdPattern?: RegExp;
+  extensionIdPattern_flags?: string;
+  compatibility?: ProviderCompatibilityEntry[];
+  defaultScriptDir?: string;
 
  // ─── CLI category only ───
   binary?: string;
@@ -380,6 +390,7 @@ export interface ProviderModule {
     shell?: boolean;
     env?: Record<string, string>;
   };
+  approvalKeys?: Record<number, string>;
   patterns?: {
     prompt?: RegExp[];
     generating?: RegExp[];
@@ -388,8 +399,10 @@ export interface ProviderModule {
   };
   cleanOutput?: (raw: string, lastUserInput?: string) => string;
   resume?: ProviderResumeCapability;
-  /** Session ID probe config — auto-discovers provider session ID from local SQLite DB */
+ /** Session ID probe config — auto-discovers provider session ID from local SQLite DB */
   sessionProbe?: ProviderSessionProbe;
+  /** Approval button priority hints used when auto-approve must pick a positive action */
+  approvalPositiveHints?: string[];
 
  // ─── CDP scripts (ide/extension category) ───
   scripts?: ProviderScripts;

package/src/providers/extension-provider-instance.ts

@@ -92,7 +92,7 @@ export class ExtensionProviderInstance implements ProviderInstance {
             currentModel: this.currentModel || undefined,
             currentPlan: this.currentMode || undefined,
             controlValues: this.controlValues,
-            providerControls: this.provider.controls as any,
+            providerControls: this.provider.controls,
             agentStreams: this.agentStreams,
             instanceId: this.instanceId,
             lastUpdated: Date.now(),