@adhdev/daemon-core 0.8.29 → 0.8.31

package/dist/providers/acp-provider-instance.d.ts

@@ -93,6 +93,7 @@ export declare class AcpProviderInstance implements ProviderInstance {
     private convertToolCallContent;
     private detectStatusTransition;
     private pushEvent;
+    private appendSystemMessage;
     private flushEvents;
     get cliType(): string;
     get cliName(): string;

package/dist/providers/approval-utils.d.ts

@@ -0,0 +1,7 @@
+import type { ProviderModule } from './contracts.js';
+export declare function getApprovalPositiveHints(provider?: Pick<ProviderModule, 'approvalPositiveHints'> | null): string[];
+export declare function pickApprovalButton(buttons: string[] | null | undefined, provider?: Pick<ProviderModule, 'approvalPositiveHints'> | null): {
+    index: number;
+    label: string;
+};
+export declare function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string;

package/dist/providers/cli-provider-instance.d.ts

@@ -71,6 +71,8 @@ export declare class CliProviderInstance implements ProviderInstance {
     getAdapter(): ProviderCliAdapter;
     get cliType(): string;
     get cliName(): string;
+    private shouldAutoApprove;
+    private recordAutoApproval;
     recordApprovalSelection(buttonText: string): void;
     private formatMarkerTimestamp;
     private maybeAppendRuntimeRecoveryMessage;

package/dist/providers/contracts.d.ts

@@ -233,6 +233,11 @@ export interface CdpTargetFilter {
     /** Page title regex pattern for titles to EXCLUDE (e.g. 'Debug Console|Output') */
     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;
@@ -255,7 +260,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 */
@@ -296,6 +301,9 @@ export interface ProviderModule {
     };
     extensionId?: string;
     extensionIdPattern?: RegExp;
+    extensionIdPattern_flags?: string;
+    compatibility?: ProviderCompatibilityEntry[];
+    defaultScriptDir?: string;
     binary?: string;
     spawn?: {
         command: string;
@@ -303,6 +311,7 @@ export interface ProviderModule {
         shell?: boolean;
         env?: Record<string, string>;
     };
+    approvalKeys?: Record<number, string>;
     patterns?: {
         prompt?: RegExp[];
         generating?: RegExp[];
@@ -313,6 +322,8 @@ export interface ProviderModule {
     resume?: ProviderResumeCapability;
     /** 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[];
     scripts?: ProviderScripts;
     vscodeCommands?: {
         focusPanel?: string;

package/dist/providers/ide-provider-instance.d.ts

@@ -65,5 +65,6 @@ export declare class IdeProviderInstance implements ProviderInstance {
     private getEffectDedupKey;
     private flushEvents;
     updateCdp(cdp: InstanceContext['cdp']): void;
+    private canAutoApprove;
     private autoApproveViaScript;
 }

package/dist/providers/provider-loader.d.ts

@@ -266,6 +266,9 @@ export declare class ProviderLoader {
     */
     setSetting(type: string, key: string, value: any): boolean;
     private getOptionalStringSetting;
+    protected readConfig(): any | null;
+    protected writeConfig(config: any): void;
+    private getPlatformVersionCommand;
     private getSettingsSchema;
     private getSyntheticSettings;
     /**

package/dist/status/reporter.d.ts

@@ -4,6 +4,7 @@
  * Collect status from ProviderInstanceManager → assemble payload → transmit
  * Each Instance manages its own status/transition. This module only assembles + transmits.
  */
+import type { DaemonCdpManager } from '../cdp/manager.js';
 import type { ProviderState } from '../providers/provider-instance.js';
 export interface StatusReporterDeps {
     serverConn: {
@@ -11,9 +12,7 @@ export interface StatusReporterDeps {
         sendMessage(type: string, data: any): void;
         getUserPlan(): string;
     } | null;
-    cdpManagers: Map<string, {
-        isConnected: boolean;
-    }>;
+    cdpManagers: Map<string, DaemonCdpManager>;
     p2p: {
         isConnected: boolean;
         isAvailable: boolean;

package/dist/status/snapshot.d.ts

@@ -5,11 +5,12 @@
  * - DaemonStatusReporter (cloud)
  * - daemon-standalone HTTP/WS status responses
  */
+import type { DaemonCdpManager } from '../cdp/manager.js';
 import type { ProviderState } from '../providers/provider-instance.js';
 import type { AvailableProviderInfo, StatusReportPayload } from '../shared-types.js';
 export interface StatusSnapshotOptions {
     allStates: ProviderState[];
-    cdpManagers: Map<string, unknown>;
+    cdpManagers: Map<string, DaemonCdpManager>;
     providerLoader: {
         getAll(): Array<{
             type: string;

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.8.29",
+  "version": "0.8.31",
   "description": "ADHDev local session host core — session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.8.29",
+  "version": "0.8.31",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,6 +22,8 @@
     "build": "tsup && npm run build:types",
     "build:types": "tsc -p tsconfig.json --emitDeclarationOnly --declaration --declarationMap false",
     "dev": "tsup --watch",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "typecheck": "tsc --noEmit -p tsconfig.json"
   },
   "files": [

package/src/agent-stream/manager.ts

@@ -121,6 +121,12 @@ export class DaemonAgentStreamManager {
         return child?.sessionId || null;
     }
 
+    private getStateError(state: AgentStreamState): string {
+        if (typeof state.error === 'string' && state.error.trim()) return state.error.trim();
+        if (typeof state._error === 'string' && state._error.trim()) return state._error.trim();
+        return 'unknown';
+    }
+
     private async connectManagedSession(
         cdp: DaemonCdpManager,
         parentSessionId: string,
@@ -194,8 +200,8 @@ export class DaemonAgentStreamManager {
             const evaluate: AgentEvaluateFn = (expr, timeout) =>
                 cdp.evaluateInSessionFrame(agent.cdpSessionId, expr, timeout);
             const state = await agent.adapter.readChat(evaluate);
-            LOG.debug('AgentStream', `[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${state.model || ''}${state.status === 'error' ? ' error=' + JSON.stringify((state as any).error || (state as any)._error || 'unknown') : ''}`);
-            const stateError = String((state as any).error || (state as any)._error || '');
+            const stateError = this.getStateError(state);
+            LOG.debug('AgentStream', `[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${state.model || ''}${state.status === 'error' ? ' error=' + JSON.stringify(stateError) : ''}`);
             if (state.status === 'error' && this.isRecoverableSessionError(stateError)) {
                 throw new Error(stateError);
             }

package/src/agent-stream/poller.ts

@@ -19,6 +19,21 @@ import type { SessionRegistry } from '../sessions/registry.js';
 import { reconcileIdeRuntimeSessions } from '../sessions/reconcile.js';
 import { LOG } from '../logging/logger.js';
 import type { AgentStreamState } from './types.js';
+import { formatAutoApprovalMessage, pickApprovalButton } from '../providers/approval-utils.js';
+import type { ProviderModule } from '../providers/contracts.js';
+
+interface ExtensionInstanceLike {
+    type?: string;
+    getInstanceId?(): string;
+}
+
+interface IdeInstanceLike {
+    getInstanceId?(): string;
+    getExtensionTypes?(): string[];
+    getExtension?(type: string): ExtensionInstanceLike | undefined;
+    addExtension?(provider: ProviderModule, settings: Record<string, unknown>): void;
+    removeExtension?(type: string): void;
+}
 
 // ─── Types ───
 
@@ -80,7 +95,7 @@ export class AgentStreamPoller {
         if (!agentStreamManager || cdpManagers.size === 0) return;
 
         // Defensive repair: keep SessionRegistry aligned with live IDE/extension instances.
-        reconcileIdeRuntimeSessions(instanceManager as any, sessionRegistry);
+        reconcileIdeRuntimeSessions(instanceManager, sessionRegistry);
 
         // ─── Phase 1: Refresh extension providers + IDE instance extensions ───
         for (const [ideType, cdp] of cdpManagers) {
@@ -88,12 +103,12 @@ export class AgentStreamPoller {
             registerExtensionProviders(providerLoader, cdp, ideType);
 
             // 1b. Dynamically add/remove IDE instance extensions
-            const ideInstance = instanceManager.getInstance(`ide:${ideType}`) as any;
+            const ideInstance = instanceManager.getInstance(`ide:${ideType}`) as IdeInstanceLike | undefined;
             const parentSessionId = ideInstance?.getInstanceId?.();
             if (ideInstance?.getExtensionTypes && ideInstance?.addExtension && ideInstance?.removeExtension) {
-                const currentExtTypes = new Set(ideInstance.getExtensionTypes() as string[]);
+                const currentExtTypes = new Set(ideInstance.getExtensionTypes());
                 const enabledExtTypes = new Set(
-                    providerLoader.getEnabledByCategory('extension', ideType).map((p: any) => p.type)
+                    providerLoader.getEnabledByCategory('extension', ideType).map((p) => p.type)
                 );
 
                 // Remove disabled extensions
@@ -145,7 +160,7 @@ export class AgentStreamPoller {
             const activeSessionId = parentSessionId ? agentStreamManager.getActiveSessionId(parentSessionId) : null;
             if (activeSessionId) {
                 const activeTarget = sessionRegistry.get(activeSessionId);
-                const enabledExtTypes = new Set(providerLoader.getEnabledExtensionProviders(ideType).map((p: any) => p.type));
+                const enabledExtTypes = new Set(providerLoader.getEnabledExtensionProviders(ideType).map((p) => p.type));
                 if (!activeTarget || !enabledExtTypes.has(activeTarget.providerType)) {
                     LOG.info('AgentStream', `Active agent ${activeTarget?.providerType || activeSessionId} was disabled for ${ideType} — detaching`);
                     await agentStreamManager.setActiveSession(cdp, parentSessionId!, null);
@@ -189,7 +204,43 @@ export class AgentStreamPoller {
 
             try {
                 await agentStreamManager.syncActiveSession(cdp, parentSessionId);
-                const stream = await agentStreamManager.collectActiveSession(cdp, parentSessionId);
+                let stream = await agentStreamManager.collectActiveSession(cdp, parentSessionId);
+                if (stream?.status === 'waiting_approval') {
+                    const autoApprove = providerLoader.getSettings(stream.agentType).autoApprove !== false;
+                    if (autoApprove && resolvedActiveSessionId) {
+                        const provider = providerLoader.getMeta(stream.agentType);
+                        const { label: buttonLabel } = pickApprovalButton(stream.activeModal?.buttons, provider);
+                        const approved = await agentStreamManager.resolveSessionAction(cdp, resolvedActiveSessionId, 'approve', buttonLabel);
+                        if (approved) {
+                            const effectId = [
+                                'auto_approval',
+                                resolvedActiveSessionId,
+                                String(stream.messages?.length || 0),
+                                buttonLabel,
+                                String(stream.activeModal?.message || '').trim(),
+                            ].join(':');
+                            stream = {
+                                ...stream,
+                                status: 'streaming',
+                                activeModal: undefined,
+                                effects: [
+                                    ...(stream.effects || []),
+                                    {
+                                        type: 'message',
+                                        id: effectId,
+                                        persist: true,
+                                        message: {
+                                            role: 'system',
+                                            senderName: 'System',
+                                            kind: 'system',
+                                            content: formatAutoApprovalMessage(stream.activeModal?.message, buttonLabel),
+                                        },
+                                    },
+                                ],
+                            };
+                        }
+                    }
+                }
                 this.deps.onStreamsUpdated?.(ideType, stream ? [stream] : []);
             } catch { }
         }

package/src/agent-stream/provider-adapter.ts

@@ -11,7 +11,7 @@ import type {
     AgentChatListItem,
     AgentEvaluateFn,
 } from './types.js';
-import type { ProviderModule } from '../providers/contracts.js';
+import type { ProviderModule, ProviderScripts } from '../providers/contracts.js';
 import { extractProviderControlValues, normalizeProviderEffects } from '../providers/control-effects.js';
 
 export class ProviderStreamAdapter implements IAgentStreamAdapter {
@@ -32,13 +32,17 @@ export class ProviderStreamAdapter implements IAgentStreamAdapter {
     }
 
     private callScript(name: string, ...args: any[]): string | null {
-        const fn = (this.provider.scripts as any)?.[name];
+        const fn = this.provider.scripts?.[name];
         if (typeof fn !== 'function') return null;
         return fn(...args) || null;
     }
 
     private hasScript(name: string): boolean {
-        return typeof (this.provider.scripts as any)?.[name] === 'function';
+        return typeof this.provider.scripts?.[name] === 'function';
+    }
+
+    private getStateTitle(state: AgentStreamState): string {
+        return typeof state.title === 'string' ? state.title : '';
     }
 
     private parseMaybeJson(raw: unknown): any {
@@ -83,7 +87,7 @@ export class ProviderStreamAdapter implements IAgentStreamAdapter {
 
     private lastMessageSignature(state: AgentStreamState | null | undefined): string {
         const messages = Array.isArray(state?.messages) ? state!.messages : [];
-        const last = messages[messages.length - 1] as any;
+        const last = messages[messages.length - 1];
         if (!last) return '';
         return `${last.role || ''}:${String(last.content || '').replace(/\s+/g, ' ').trim()}`;
     }
@@ -155,7 +159,7 @@ export class ProviderStreamAdapter implements IAgentStreamAdapter {
                 activeModal: data.activeModal,
             };
             if (typeof data.title === 'string' && data.title.trim()) {
-                (state as any).title = data.title.trim();
+                state.title = data.title.trim();
             }
             const controlValues = extractProviderControlValues(this.provider.controls, data);
             if (controlValues) state.controlValues = controlValues;
@@ -282,7 +286,7 @@ export class ProviderStreamAdapter implements IAgentStreamAdapter {
         for (let attempt = 0; attempt < 6; attempt += 1) {
             await new Promise((resolve) => setTimeout(resolve, 250));
             const state = await this.readChat(evaluate);
-            const title = typeof (state as any).title === 'string' ? (state as any).title : '';
+            const title = this.getStateTitle(state);
             if (this.titlesMatch(title, sessionId)) return true;
         }
         return false;
@@ -303,6 +307,6 @@ export class ProviderStreamAdapter implements IAgentStreamAdapter {
             messages: [],
             inputContent: '',
             _error: message,
-        } as any;
+        };
     }
 }

package/src/agent-stream/types.ts

@@ -31,11 +31,14 @@ export interface AgentStreamState {
     status: 'idle' | 'streaming' | 'waiting_approval' | 'error' | 'disconnected' | 'panel_hidden' | 'not_monitored';
     messages: AgentChatMessage[];
     inputContent: string;
+    title?: string;
     /** @deprecated Use controlValues['model'] — kept for backward compatibility */
     model?: string;
     /** @deprecated Use controlValues['mode'] — kept for backward compatibility */
     mode?: string;
     activeModal?: { message: string; buttons: string[] };
+    error?: string;
+    _error?: string;
     /** Dynamic control current values (populated from readChat + provider controls schema) */
     controlValues?: Record<string, string | number | boolean>;
     /** Provider-driven UI effects from readChat */

package/src/boot/daemon-lifecycle.ts

@@ -24,12 +24,13 @@ import { ProviderLoader } from '../providers/provider-loader.js';
 import { VersionArchive, detectAllVersions } from '../providers/version-archive.js';
 import { ProviderInstanceManager } from '../providers/provider-instance-manager.js';
 import { DevServer } from '../daemon/dev-server.js';
-import { detectIDEs } from '../detection/ide-detector.js';
+import { detectIDEs, type IDEInfo } from '../detection/ide-detector.js';
 import { detectCLI, detectCLIs } from '../detection/cli-detector.js';
 import { SessionRegistry } from '../sessions/registry.js';
 import { installGlobalInterceptor, LOG } from '../logging/logger.js';
 import { loadConfig } from '../config/config.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
+import type { IdeProviderInstance } from '../providers/ide-provider-instance.js';
 
 // ─── Init Config ───
 
@@ -82,7 +83,7 @@ export interface DaemonComponents {
     cdpInitializer: DaemonCdpInitializer;
     cdpManagers: Map<string, DaemonCdpManager>;
     sessionRegistry: SessionRegistry;
-    detectedIdes: { value: any[] };
+    detectedIdes: { value: IDEInfo[] };
 }
 
 export interface DaemonDevSupportOptions {
@@ -157,7 +158,7 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
     const instanceManager = new ProviderInstanceManager();
     const cdpManagers = new Map<string, DaemonCdpManager>();
     const sessionRegistry = new SessionRegistry();
-    const detectedIdesRef = { value: [] as any[] };
+    const detectedIdesRef: { value: IDEInfo[] } = { value: [] };
     let agentStreamManager: DaemonAgentStreamManager | null = null;
     let poller: AgentStreamPoller | null = null;
 
@@ -193,8 +194,8 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
     // 5. Detect IDEs
     LOG.info('Init', 'Detecting IDEs...');
     await refreshProviderAvailability();
-    const installed = detectedIdesRef.value.filter((i: any) => i.installed);
-    LOG.info('Init', `Found ${installed.length} IDE(s): ${installed.map((i: any) => i.id).join(', ') || 'none'}`);
+    const installed = detectedIdesRef.value.filter((i) => i.installed);
+    LOG.info('Init', `Found ${installed.length} IDE(s): ${installed.map((i) => i.id).join(', ') || 'none'}`);
 
     // 6. CDP Initializer — connect + register instances
     const cdpSetupContext: CdpSetupContext = {
@@ -217,7 +218,7 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
         onDisconnected: async (_ideType, _manager, managerKey) => {
             sessionRegistry.unregisterByManagerKey(managerKey);
             const instanceKey = `ide:${managerKey}`;
-            const ideInstance = instanceManager.getInstance(instanceKey) as any;
+            const ideInstance = instanceManager.getInstance(instanceKey) as IdeProviderInstance | undefined;
 
             if (ideInstance) {
                 instanceManager.removeInstance(instanceKey);

package/src/cdp/initializer.ts

@@ -107,7 +107,7 @@ export class DaemonCdpInitializer {
                 port,
                 LOG.forComponent(`CDP:${ide}`).asLogFn(),
                 undefined,
-                (provider as any)?.targetFilter,
+                provider?.targetFilter,
             );
             const connected = await manager.connect();
             if (connected) {
@@ -148,7 +148,7 @@ export class DaemonCdpInitializer {
                 port,
                 LOG.forComponent(`CDP:${managerKey}`).asLogFn(),
                 target.id,
-                (provider as any)?.targetFilter,
+                provider?.targetFilter,
             );
 
             const connected = await manager.connect();

package/src/cdp/manager.ts

@@ -77,6 +77,11 @@ export class DaemonCdpManager {
         this._targetFilter = filter;
     }
 
+    /** Clear a previously pinned target so the next connect can reselect a page. */
+    clearTargetId(): void {
+        this._targetId = null;
+    }
+
     /**
      * Check if a page title should be excluded (non-main page).
      * Uses provider-configured titleExcludes, falls back to default pattern.

package/src/cdp/setup.ts

@@ -138,7 +138,7 @@ export async function connectCdpManager(
     port,
     logFn,
     targetId,
-    (provider as any)?.targetFilter,
+    provider?.targetFilter,
   );
   const connected = await manager.connect();
   return connected ? manager : null;

package/src/cli-adapter-types.ts

@@ -4,15 +4,44 @@
  * Contract implemented by all CLI adapters (ProviderCliAdapter etc).
  */
 
+import type { ChatMessage } from './types.js';
+
+export interface CliAdapterStatus {
+    status?: string;
+    messages?: ChatMessage[];
+    activeModal?: {
+        message: string;
+        buttons: string[];
+    } | null;
+}
+
+export interface AcpAdapterHandle {
+    onEvent(event: string, data?: unknown): void;
+    getState(): {
+        status: string;
+        activeChat?: {
+            messages?: ChatMessage[];
+            activeModal?: {
+                message: string;
+                buttons: string[];
+            } | null;
+        } | null;
+    };
+    setMode?(mode: string): Promise<void>;
+    setConfigOption?(configId: string, value: string): Promise<void>;
+    resolvePermission?(approved: boolean): Promise<void>;
+}
+
 export interface CliAdapter {
     cliType: string;
     cliName: string;
     workingDir: string;
+    _acpInstance?: AcpAdapterHandle;
     spawn(): Promise<void>;
     sendMessage(text: string): Promise<void>;
-    getStatus(): any;
-    getScriptParsedStatus?(): any;
-    invokeScript?(scriptName: string, args?: any): Promise<any>;
+    getStatus(): CliAdapterStatus;
+    getScriptParsedStatus?(): unknown;
+    invokeScript?(scriptName: string, args?: Record<string, unknown>): Promise<unknown>;
     getPartialResponse(): string;
     saveAndStop?(): Promise<void>;
     shutdown(): void;
@@ -21,8 +50,11 @@ export interface CliAdapter {
     isProcessing(): boolean;
     isReady(): boolean;
     setOnStatusChange(callback: () => void): void;
-    updateRuntimeSettings?(settings: Record<string, any>): void;
-    setServerConn?(serverConn: any): void;
+    updateRuntimeSettings?(settings: Record<string, unknown>): void;
+    setServerConn?(serverConn: unknown): void;
+    clearHistory?(): void;
+    resolveAction?(data: unknown): Promise<void>;
+    resolveModal?(buttonIndex: number): void;
  // Raw PTY I/O (for terminal view)
     setOnPtyData?(callback: (data: string) => void): void;
     writeRaw?(data: string): void;