@adhdev/daemon-core 0.8.30 → 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,
         };
     }
 

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

@@ -101,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();
     }
@@ -328,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,
         };
     }
 

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[];

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(),

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

@@ -21,6 +21,24 @@ import { extractProviderControlValues, normalizeProviderEffects } from './contro
 import type { ChatMessage } from '../types.js';
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
 
+type ReadChatModal = {
+    message?: string;
+    buttons?: string[];
+    width?: number;
+    height?: number;
+};
+
+type ReadChatMessage = ChatMessage & { content: string };
+
+type ReadChatPayload = {
+    activeModal?: ReadChatModal;
+    messages?: ReadChatMessage[];
+    controlValues?: Record<string, string | number | boolean>;
+    status?: string;
+    title?: string;
+    [key: string]: unknown;
+};
+
 export class IdeProviderInstance implements ProviderInstance {
     readonly type: string;
     readonly category = 'ide' as const;
@@ -138,7 +156,7 @@ export class IdeProviderInstance implements ProviderInstance {
             currentPlan: this.cachedChat?.mode || undefined,
             currentAutoApprove: this.cachedChat?.autoApprove || undefined,
             controlValues: this.cachedChat?.controlValues || undefined,
-            providerControls: this.provider.controls as any,
+            providerControls: this.provider.controls,
             instanceId: this.instanceId,
             lastUpdated: Date.now(),
             settings: this.settings,
@@ -261,14 +279,14 @@ export class IdeProviderInstance implements ProviderInstance {
         if (!cdp?.isConnected) return;
 
         try {
-            let raw: any = null;
+            let raw: unknown = null;
 
  // path 1: webview iframe internal (Kiro, PearAI etc)
-            const webviewFn = (this.provider.scripts as any)?.webviewReadChat;
+            const webviewFn = this.provider.scripts?.webviewReadChat;
             if (typeof webviewFn === 'function' && cdp.evaluateInWebviewFrame) {
                 const webviewScript = webviewFn();
                 if (webviewScript) {
-                    const matchText = (this.provider as any).webviewMatchText;
+                    const matchText = this.provider.webviewMatchText;
                     const matchFn = matchText ? (body: string) => body.includes(matchText) : undefined;
                     const webviewRaw = await cdp.evaluateInWebviewFrame(webviewScript, matchFn);
                     if (webviewRaw) {
@@ -281,16 +299,17 @@ export class IdeProviderInstance implements ProviderInstance {
             if (!raw) {
                 const readChatScript = this.getReadChatScript();
                 if (!readChatScript) return;
-                raw = await cdp.evaluate(readChatScript, 30000) as any;
+                raw = await cdp.evaluate(readChatScript, 30000);
                 if (typeof raw === 'string') {
                     try { raw = JSON.parse(raw); } catch { return; }
                 }
             }
 
             if (!raw || typeof raw !== 'object') return;
+            const chat = raw as ReadChatPayload;
 
  // Modal filter
-            let { activeModal } = raw;
+            let { activeModal } = chat;
             if (activeModal) {
                 const w = activeModal.width ?? Infinity;
                 const h = activeModal.height ?? Infinity;
@@ -312,33 +331,35 @@ export class IdeProviderInstance implements ProviderInstance {
                 if (pm.receivedAt) prevByHash.set(h, pm.receivedAt);
             }
             const now = Date.now();
-            for (const msg of (raw.messages || [])) {
+            const messages = chat.messages || [];
+            for (const msg of messages) {
                 const h = `${msg.role}:${(msg.content || '').slice(0, 100)}`;
                 msg.receivedAt = prevByHash.get(h) || now;
             }
 
             // Filter messages by provider settings (showThinking, showToolCalls, showTerminal)
-            if (raw.messages?.length > 0) {
+            if (messages.length > 0) {
                 const hiddenKinds = new Set<string>();
                 if (this.settings.showThinking === false) hiddenKinds.add('thought');
                 if (this.settings.showToolCalls === false) hiddenKinds.add('tool');
                 if (this.settings.showTerminal === false) hiddenKinds.add('terminal');
                 if (hiddenKinds.size > 0) {
-                    raw.messages = raw.messages.filter((m: any) => !hiddenKinds.has(m.kind));
+                    chat.messages = messages.filter((m) => !hiddenKinds.has(m.kind || ''));
                 }
             }
 
-            const controlValues = extractProviderControlValues(this.provider.controls, raw);
-            if (controlValues) raw.controlValues = controlValues;
+            const controlValues = extractProviderControlValues(this.provider.controls, chat);
+            if (controlValues) chat.controlValues = controlValues;
 
-            this.cachedChat = { ...raw, activeModal };
-            this.detectAgentTransitions(raw, now);
+            this.cachedChat = { ...chat, activeModal };
+            this.detectAgentTransitions(chat, now);
 
  // Save history (new messageonly append)
  // Exclude last incomplete assistant message during generating status
-            if (raw.messages?.length > 0) {
-                let toSave = raw.messages;
-                if (raw.status === 'generating' || raw.status === 'long_generating') {
+            const persistedMessages = chat.messages || messages;
+            if (persistedMessages.length > 0) {
+                let toSave = persistedMessages;
+                if (chat.status === 'generating' || chat.status === 'long_generating') {
  // Find and exclude last assistant message
                     const lastIdx = toSave.length - 1;
                     if (lastIdx >= 0 && toSave[lastIdx].role === 'assistant') {
@@ -349,7 +370,7 @@ export class IdeProviderInstance implements ProviderInstance {
                     this.historyWriter.appendNewMessages(
                         this.type,
                         toSave,
-                        raw.title,
+                        chat.title,
                         this.instanceId,
                     );
                 }
@@ -368,7 +389,7 @@ export class IdeProviderInstance implements ProviderInstance {
     private getReadChatScript(): string | null {
         const scripts = this.provider.scripts;
         if (!scripts?.readChat) return null;
-        return typeof scripts.readChat === 'function' ? scripts.readChat({}) : scripts.readChat as any;
+        return scripts.readChat({});
     }
 
  // ─── status transition detect ─────────────────────────────