@adhdev/daemon-core 0.5.7 → 0.5.16

package/src/launch.ts

@@ -101,7 +101,7 @@ async function isCdpActive(port: number): Promise<boolean> {
 }
 
 /** Kill IDE process (graceful → force) */
-async function killIdeProcess(ideId: string): Promise<boolean> {
+export async function killIdeProcess(ideId: string): Promise<boolean> {
     const plat = os.platform();
     const appName = getMacAppIdentifiers()[ideId];
     const winProcesses = getWinProcessNames()[ideId];
@@ -158,7 +158,7 @@ async function killIdeProcess(ideId: string): Promise<boolean> {
 }
 
 /** Check if IDE process is running */
-function isIdeRunning(ideId: string): boolean {
+export function isIdeRunning(ideId: string): boolean {
     const plat = os.platform();
 
     try {

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

@@ -43,10 +43,11 @@ import {
     type KillTerminalResponse,
     type SessionUpdate,
     type ToolCallStatus,
+    type SessionConfigOption,
 } from '@agentclientprotocol/sdk';
 import type { ProviderModule, ContentBlock, ToolCallInfo, ToolCallContent as TCC, ToolKind, ToolCallStatus as TCS } from './contracts.js';
 import { normalizeContent, flattenContent } from './contracts.js';
-import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
+import type { ProviderInstance, ProviderState, AcpProviderState, ProviderErrorReason, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
 import { LOG } from '../logging/logger.js';
 
@@ -118,7 +119,7 @@ export class AcpProviderInstance implements ProviderInstance {
 
  // Error tracking
     private errorMessage: string | null = null;
-    private errorReason: 'not_installed' | 'auth_failed' | 'spawn_error' | 'init_failed' | 'crash' | null = null;
+    private errorReason: ProviderErrorReason | null = null;
     private stderrBuffer: string[] = [];
     private spawnedAt = 0;
 
@@ -170,7 +171,7 @@ export class AcpProviderInstance implements ProviderInstance {
         }
     }
 
-    getState(): ProviderState {
+    getState(): AcpProviderState {
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
 
  // Recent 50 messages
@@ -214,7 +215,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 } : null,
                 inputContent: '',
             },
-            workingDir: this.workingDir,
+            workspace: this.workingDir,
             currentModel: this.currentModel,
             currentPlan: this.currentMode,
             instanceId: this.instanceId,
@@ -225,9 +226,9 @@ export class AcpProviderInstance implements ProviderInstance {
             acpConfigOptions: this.configOptions,
             acpModes: this.availableModes,
  // Error details for dashboard display
-            errorMessage: this.errorMessage,
-            errorReason: this.errorReason,
-        } as any;
+            errorMessage: this.errorMessage || undefined,
+            errorReason: this.errorReason || undefined,
+        };
     }
 
     onEvent(event: string, data?: any): void {
@@ -295,7 +296,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 }
             }
 
-            this.configOptions.push({ category: category as any, configId, currentValue, options: flatOptions });
+            this.configOptions.push({ category: category as 'model' | 'mode' | 'thought_level' | 'other', configId, currentValue, options: flatOptions });
 
  // Auto-set currentModel/currentMode from config
             if (category === 'model' && currentValue) this.currentModel = currentValue;
@@ -490,7 +491,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 if (pattern.test(text)) {
                     if (/ENOENT|command not found|not recognized/i.test(text)) {
                         this.errorReason = 'not_installed';
-                        this.errorMessage = `Command '${command}' not found. Install: ${(this.provider as any).install || 'check documentation'}`;
+                        this.errorMessage = `Command '${command}' not found. Install: ${this.provider.install || 'check documentation'}`;
                     } else {
                         this.errorReason = 'auth_failed';
                         this.errorMessage = text.slice(0, 300);
@@ -511,7 +512,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 if (!this.errorReason) {
                     if (code === 127) {
                         this.errorReason = 'not_installed';
-                        this.errorMessage = `Command '${command}' not found (exit code 127). Install: ${(this.provider as any).install || 'check documentation'}`;
+                        this.errorMessage = `Command '${command}' not found (exit code 127). Install: ${this.provider.install || 'check documentation'}`;
                     } else if (elapsed < 3000) {
  // 3-second crash → likely install/auth issue
                         this.errorReason = this.stderrBuffer.length > 0 ? 'crash' : 'spawn_error';
@@ -533,7 +534,7 @@ export class AcpProviderInstance implements ProviderInstance {
             this.log.error(`[${this.type}] Process spawn error: ${err.message}`);
             if (err.message.includes('ENOENT')) {
                 this.errorReason = 'not_installed';
-                this.errorMessage = `Command '${command}' not found. Install: ${(this.provider as any).install || 'check documentation'}`;
+                this.errorMessage = `Command '${command}' not found. Install: ${this.provider.install || 'check documentation'}`;
             } else {
                 this.errorReason = 'spawn_error';
                 this.errorMessage = err.message;
@@ -751,10 +752,10 @@ export class AcpProviderInstance implements ProviderInstance {
         if (contentBlocks && contentBlocks.length > 0) {
             // Rich content — forward ContentBlock[] as ACP prompt parts
             promptParts = contentBlocks.map(b => {
-                if (b.type === 'text') return { type: 'text', text: (b as any).text };
-                if (b.type === 'image') return { type: 'image', data: (b as any).data, mimeType: (b as any).mimeType };
-                if (b.type === 'resource_link') return { type: 'resource_link', uri: (b as any).uri, name: (b as any).name };
-                if (b.type === 'resource') return { type: 'resource', resource: (b as any).resource };
+                if (b.type === 'text') return { type: 'text', text: b.text };
+                if (b.type === 'image') return { type: 'image', data: b.data, mimeType: b.mimeType };
+                if (b.type === 'resource_link') return { type: 'resource_link', uri: b.uri, name: b.name };
+                if (b.type === 'resource') return { type: 'resource', resource: b.resource };
                 return { type: 'text', text: flattenContent([b]) };
             });
         } else {
@@ -828,35 +829,32 @@ export class AcpProviderInstance implements ProviderInstance {
     private handleSessionUpdate(params: SessionNotification): void {
         if (!params) return;
 
-        const update = params.update as SessionUpdate & Record<string, any>;
-        this.log.debug(`[${this.type}] sessionUpdate: ${update.sessionUpdate} | keys=${Object.keys(update).join(',')}`);
+        const update = params.update;
+        this.log.debug(`[${this.type}] sessionUpdate: ${update.sessionUpdate}`);
 
         switch (update.sessionUpdate) {
             case 'agent_message_chunk': {
                 const content = update.content;
-                if (content?.type === 'text' && (content as any).text) {
-                    this.partialContent += (content as any).text;
-                } else if (content?.type === 'image') {
-                    // Collect image block
+                if (content.type === 'text') {
+                    this.partialContent += content.text;
+                } else if (content.type === 'image') {
                     this.partialBlocks.push({
                         type: 'image',
-                        data: (content as any).data || '',
-                        mimeType: (content as any).mimeType || 'image/png',
-                        uri: (content as any).uri,
+                        data: content.data,
+                        mimeType: content.mimeType,
                     });
-                } else if (content?.type === 'resource_link') {
+                } else if (content.type === 'resource_link') {
                     this.partialBlocks.push({
                         type: 'resource_link',
-                        uri: (content as any).uri || '',
-                        name: (content as any).name || 'resource',
-                        title: (content as any).title,
-                        mimeType: (content as any).mimeType,
-                        size: (content as any).size,
+                        uri: content.uri,
+                        name: content.name || 'resource',
+                        title: content.title ?? undefined,
+                        mimeType: content.mimeType ?? undefined,
                     });
-                } else if (content?.type === 'resource') {
+                } else if (content.type === 'resource') {
                     this.partialBlocks.push({
                         type: 'resource',
-                        resource: (content as any).resource,
+                        resource: content.resource,
                     });
                 }
                 this.currentStatus = 'generating';
@@ -868,57 +866,57 @@ export class AcpProviderInstance implements ProviderInstance {
                 break;
             }
             case 'tool_call': {
- // New tool call — collect as ToolCallInfo
-                const tcId = (update as any).toolCallId || `tc_${Date.now()}`;
-                const tcTitle = (update as any).title || 'unknown';
-                const tcKind = (update as any).kind as ToolKind | undefined;
-                const tcStatus = this.mapToolCallStatus((update as any).status);
+ // New tool call — ACP SDK ToolCall has all fields typed
+                const tcId = update.toolCallId || `tc_${Date.now()}`;
+                const tcTitle = update.title || 'unknown';
+                const tcKind = update.kind as ToolKind | undefined;
+                const tcStatus = this.mapToolCallStatus(update.status);
                 
                 this.activeToolCalls.push({
                     id: tcId,
                     name: tcTitle,
                     status: tcStatus,
-                    input: (update as any).rawInput ? (typeof (update as any).rawInput === 'string' ? (update as any).rawInput : JSON.stringify((update as any).rawInput)) : undefined,
+                    input: update.rawInput ? (typeof update.rawInput === 'string' ? update.rawInput : JSON.stringify(update.rawInput)) : undefined,
                 });
                 
                 // Also collect as ToolCallInfo for rich content
-                const acpStatus = (update as any).status as string || 'in_progress';
+                const acpStatus = update.status || 'in_progress';
                 this.turnToolCalls.push({
                     toolCallId: tcId,
                     title: tcTitle,
                     kind: tcKind,
                     status: acpStatus as TCS,
-                    rawInput: (update as any).rawInput,
-                    content: this.convertToolCallContent((update as any).content),
-                    locations: (update as any).locations,
+                    rawInput: update.rawInput,
+                    content: this.convertToolCallContent(update.content),
+                    locations: update.locations,
                 });
                 break;
             }
             case 'tool_call_update': {
- // Update existing tool call
-                const toolCallId = (update as any).toolCallId;
+ // Update existing tool call — ACP SDK ToolCallUpdate typed
+                const toolCallId = update.toolCallId;
                 const existing = this.activeToolCalls.find(t => t.id === toolCallId);
                 if (existing) {
-                    if ((update as any).status) existing.status = this.mapToolCallStatus((update as any).status);
-                    if ((update as any).rawOutput) existing.output = typeof (update as any).rawOutput === 'string' ? (update as any).rawOutput : JSON.stringify((update as any).rawOutput);
+                    if (update.status) existing.status = this.mapToolCallStatus(update.status);
+                    if (update.rawOutput) existing.output = typeof update.rawOutput === 'string' ? update.rawOutput : JSON.stringify(update.rawOutput);
                 }
                 // Update ToolCallInfo too
                 const tcInfo = this.turnToolCalls.find(t => t.toolCallId === toolCallId);
                 if (tcInfo) {
-                    if ((update as any).status) tcInfo.status = (update as any).status as TCS;
-                    if ((update as any).rawOutput) tcInfo.rawOutput = (update as any).rawOutput;
-                    if ((update as any).content) tcInfo.content = this.convertToolCallContent((update as any).content);
-                    if ((update as any).locations) tcInfo.locations = (update as any).locations;
+                    if (update.status) tcInfo.status = update.status as TCS;
+                    if (update.rawOutput) tcInfo.rawOutput = update.rawOutput;
+                    if (update.content) tcInfo.content = this.convertToolCallContent(update.content);
+                    if (update.locations) tcInfo.locations = update.locations;
                 }
                 break;
             }
             case 'current_mode_update': {
-                this.currentMode = (update as any).currentModeId;
+                this.currentMode = update.currentModeId;
                 break;
             }
             case 'config_option_update': {
-                if ((update as any).configOptions) {
-                    this.parseConfigOptions((update as any).configOptions);
+                if (update.configOptions) {
+                    this.parseConfigOptions(update.configOptions);
                 }
                 break;
             }
@@ -930,7 +928,7 @@ export class AcpProviderInstance implements ProviderInstance {
                 break;
             default:
  // Unknown update type — try legacy parsing for backward compatibility
-                this.handleLegacyUpdate(update as any);
+                this.handleLegacyUpdate(update);
                 break;
         }
     }
@@ -1051,13 +1049,13 @@ export class AcpProviderInstance implements ProviderInstance {
                 return { ...b, text: b.text.slice(0, -3) };
             }
             return b;
-        }).filter(b => b.type !== 'text' || (b as any).text.trim());
+        }).filter(b => b.type !== 'text' || (b.type === 'text' && b.text.trim()));
 
         if (finalBlocks.length > 0) {
             this.messages.push({
                 role: 'assistant',
                 content: finalBlocks.length === 1 && finalBlocks[0].type === 'text'
-                    ? (finalBlocks[0] as any).text   // single text → string (backward compat)
+                    ? (finalBlocks[0] as {type: 'text', text: string}).text   // single text → string (backward compat)
                     : finalBlocks,
                 timestamp: Date.now(),
                 toolCalls: this.turnToolCalls.length > 0 ? [...this.turnToolCalls] : undefined,

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

@@ -26,6 +26,8 @@ export class CliProviderInstance implements ProviderInstance {
     private generatingStartedAt: number = 0;
     private settings: Record<string, any> = {};
     private monitor: StatusMonitor;
+    private generatingDebounceTimer: NodeJS.Timeout | null = null;
+    private generatingDebouncePending: { chatTitle: string; timestamp: number } | null = null;
     private historyWriter: ChatHistoryWriter;
     readonly instanceId: string;
 
@@ -126,7 +128,7 @@ export class CliProviderInstance implements ProviderInstance {
                 activeModal: adapterStatus.activeModal,
                 inputContent: '',
             },
-            workingDir: this.workingDir,
+            workspace: this.workingDir,
             instanceId: this.instanceId,
             lastUpdated: Date.now(),
             settings: this.settings,
@@ -160,8 +162,24 @@ export class CliProviderInstance implements ProviderInstance {
             LOG.info('CLI', `[${this.type}] status: ${this.lastStatus} → ${newStatus}`);
             if (this.lastStatus === 'idle' && newStatus === 'generating') {
                 this.generatingStartedAt = now;
-                this.pushEvent({ event: 'agent:generating_started', chatTitle, timestamp: now });
+                // Defer the generating_started event — if idle comes back within 1s,
+                // the whole started→completed pair was a false positive from PTY noise
+                if (this.generatingDebounceTimer) clearTimeout(this.generatingDebounceTimer);
+                this.generatingDebouncePending = { chatTitle, timestamp: now };
+                this.generatingDebounceTimer = setTimeout(() => {
+                    if (this.generatingDebouncePending) {
+                        this.pushEvent({ event: 'agent:generating_started', ...this.generatingDebouncePending });
+                        this.generatingDebouncePending = null;
+                    }
+                    this.generatingDebounceTimer = null;
+                }, 1000);
             } else if (newStatus === 'waiting_approval') {
+                // Flush pending generating_started if debounce still pending
+                if (this.generatingDebouncePending) {
+                    if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }
+                    this.pushEvent({ event: 'agent:generating_started', ...this.generatingDebouncePending });
+                    this.generatingDebouncePending = null;
+                }
                 if (!this.generatingStartedAt) this.generatingStartedAt = now;
                 const modal = adapterStatus.activeModal;
                 LOG.info('CLI', `[${this.type}] approval modal: "${modal?.message?.slice(0, 80) ?? 'none'}"`);
@@ -172,10 +190,20 @@ export class CliProviderInstance implements ProviderInstance {
                 });
             } else if (newStatus === 'idle' && (this.lastStatus === 'generating' || this.lastStatus === 'waiting_approval')) {
                 const duration = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1000) : 0;
-                LOG.info('CLI', `[${this.type}] completed in ${duration}s`);
-                this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now });
+                // If debounce still pending (generating lasted < 1s), cancel both events
+                if (this.generatingDebouncePending) {
+                    LOG.info('CLI', `[${this.type}] suppressed short generating (${now - this.generatingStartedAt}ms)`);
+                    if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }
+                    this.generatingDebouncePending = null;
+                } else {
+                    LOG.info('CLI', `[${this.type}] completed in ${duration}s`);
+                    this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now });
+                }
                 this.generatingStartedAt = 0;
             } else if (newStatus === 'stopped') {
+                // Cancel any pending debounce
+                if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }
+                this.generatingDebouncePending = null;
                 this.pushEvent({ event: 'agent:stopped', chatTitle, timestamp: now });
             }
             this.lastStatus = newStatus;

package/src/providers/contracts.ts

@@ -25,28 +25,11 @@ export interface ReadChatResult {
   isWelcomeScreen?: boolean;
   inputContent?: string;
   model?: string;
-  mode?: string;
   autoApprove?: string;
 }
 
-export interface ChatMessage {
-  role: 'user' | 'assistant' | 'system';
-  /** Plain text (legacy) or rich content blocks (ACP standard) */
-  content: string | ContentBlock[];
- /** Optional: unique message ID */
-  id?: string;
- /** Optional: order index */
-  index?: number;
- /** Optional: timestamp */
-  timestamp?: number;
- /** Optional: receivedAt (assigned by daemon) */
-  receivedAt?: number;
- /** Optional: tool calls associated with this message */
-  toolCalls?: ToolCallInfo[];
- /** Optional: fiber metadata */
-  _type?: string;
-  _sub?: string;
-}
+import type { ChatMessage } from '../types.js';
+export type { ChatMessage };
 
 export type AgentStatus = 
   | 'idle' 
@@ -124,13 +107,13 @@ export interface ResourceBlock {
 export interface TextResourceContents {
   uri: string;
   text: string;
-  mimeType?: string;
+  mimeType?: string | null;
 }
 
 export interface BlobResourceContents {
   uri: string;
   blob: string;      // base64-encoded
-  mimeType?: string;
+  mimeType?: string | null;
 }
 
 export interface ContentAnnotations {
@@ -163,7 +146,7 @@ export type ToolCallContent =
 
 export interface ToolCallLocation {
   path: string;
-  line?: number;
+  line?: number | null;
 }
 
 // ─── Content Helpers ────────────────────────────────────

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

@@ -40,8 +40,7 @@ export class IdeProviderInstance implements ProviderInstance {
  // IDE meta
     private ideVersion: string = '';
     private instanceId: string;
-    private workspaceFolders: { name: string; path: string }[] = [];
-    private activeFile: string | null = null;
+    private workspace: string = '';
 
  // ─── Child Extension Instances ────────────────────
     private extensions = new Map<string, ExtensionProviderInstance>();
@@ -119,8 +118,7 @@ export class IdeProviderInstance implements ProviderInstance {
                 activeModal: this.cachedChat.activeModal || null,
                 inputContent: this.cachedChat.inputContent || '',
             } : null,
-            workspaceFolders: this.workspaceFolders,
-            activeFile: this.activeFile,
+            workspace: this.workspace || null,
             extensions: extensionStates,
             cdpConnected: cdp?.isConnected || false,
             currentModel: this.cachedChat?.model || undefined,
@@ -135,15 +133,10 @@ export class IdeProviderInstance implements ProviderInstance {
 
     onEvent(event: string, data?: any): void {
         if (event === 'cdp_connected') {
- // CDP connectiondone
+ // CDP connection done
         } else if (event === 'cdp_disconnected') {
             this.cachedChat = null;
             this.currentStatus = 'idle';
-        } else if (event === 'extension_data') {
-            if (data?.workspaceFolders) this.workspaceFolders = data.workspaceFolders;
-            if (data?.activeFile) this.activeFile = data.activeFile;
-            if (data?.ideVersion) this.ideVersion = data.ideVersion;
-            if (data?.instanceId) this.instanceId = data.instanceId;
         } else if (event === 'stream_update') {
  // Forward to Extension
             const extType = data?.extensionType;
@@ -211,6 +204,11 @@ export class IdeProviderInstance implements ProviderInstance {
         return [...this.extensions.values()];
     }
 
+ /** Set workspace from daemon launch context */
+    setWorkspace(workspace: string): void {
+        this.workspace = workspace;
+    }
+
  // ─── CDP readChat ───────────────────────────────
 
     private async readChat(): Promise<void> {

package/src/providers/provider-instance.ts

@@ -9,57 +9,94 @@
  */
 
 import type { ProviderModule, ProviderSettingDef } from './contracts.js';
+import type { AcpConfigOption, AcpMode } from '../shared-types.js';
+import type { ChatMessage } from '../types.js';
 
-// ─── ProviderState — Standard status structure ─────────────
+// ─── ProviderState — Discriminated union by category ─────────────
 
-export interface ProviderState {
+export type ProviderStatus = 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
+
+export interface ActiveChatData {
+    id: string;
+    title: string;
+    status: string;
+    messages: ChatMessage[];
+    activeModal: { message: string; buttons: string[] } | null;
+    inputContent?: string;
+}
+
+/** Standardized error reasons across all provider categories */
+export type ProviderErrorReason =
+    | 'not_installed'   // CLI/ACP binary not found
+    | 'auth_failed'     // Authentication/API key error
+    | 'spawn_error'     // Process spawn failure
+    | 'init_failed'     // Initialization/handshake failure
+    | 'crash'           // Unexpected process crash
+    | 'timeout'         // Operation timeout
+    | 'cdp_error'       // CDP connection failure (IDE)
+    | 'disconnected';   // Connection lost
+
+/** Common fields shared by all provider categories */
+interface ProviderStateBase {
  /** Provider type (e.g. 'gemini-cli', 'cursor', 'cline') */
     type: string;
  /** Provider Display name */
     name: string;
- /** category */
-    category: 'cli' | 'ide' | 'extension' | 'acp';
  /** current status */
-    status: 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
-
- /** CLI mode: terminal = PTY stream, chat = parsed conversation */
-    mode?: 'terminal' | 'chat';
-
+    status: ProviderStatus;
  /** chat data */
-    activeChat: {
-        id: string;
-        title: string;
-        status: string;
-        messages: { role: string; content: string; timestamp?: number }[];
-        activeModal: { message: string; buttons: string[] } | null;
-        inputContent?: string;
-    } | null;
-
- /** IDE/Extension -only */
-    workspaceFolders?: { name: string; path: string }[];
-    activeFile?: string | null;
-    agentStreams?: any[];
-    cdpConnected?: boolean;
- /** IDE child Extension Instance status */
-    extensions?: ProviderState[];
-
- /** CLI -only */
-    workingDir?: string;
-
- /** Runtime info (real-time detection from IDE/CLI) */
+    activeChat: ActiveChatData | null;
+ /** Workspace — project path or name (all categories) */
+    workspace?: string | null;
+ /** Runtime info (real-time detection) */
     currentModel?: string;
     currentPlan?: string;
-    currentAutoApprove?: string;
-
+ /** Error details (when status === 'error') */
+    errorMessage?: string;
+    errorReason?: ProviderErrorReason;
  /** meta */
     instanceId: string;
     lastUpdated: number;
     settings: Record<string, any>;
-
  /** Event queue (cleared after daemon collects) */
     pendingEvents: ProviderEvent[];
 }
 
+/** IDE provider state */
+export interface IdeProviderState extends ProviderStateBase {
+    category: 'ide';
+    cdpConnected: boolean;
+ /** IDE child Extension Instance status */
+    extensions: ProviderState[];
+    currentAutoApprove?: string;
+}
+
+/** CLI provider state */
+export interface CliProviderState extends ProviderStateBase {
+    category: 'cli';
+ /** terminal = PTY stream, chat = parsed conversation */
+    mode: 'terminal' | 'chat';
+}
+
+/** ACP provider state */
+export interface AcpProviderState extends ProviderStateBase {
+    category: 'acp';
+    mode: 'chat';
+ /** ACP config options (model/mode selection) */
+    acpConfigOptions?: AcpConfigOption[];
+ /** ACP available modes */
+    acpModes?: AcpMode[];
+}
+
+/** Extension provider state */
+export interface ExtensionProviderState extends ProviderStateBase {
+    category: 'extension';
+    agentStreams?: any[];
+}
+
+/** Discriminated union — switch on `.category` */
+export type ProviderState = IdeProviderState | CliProviderState | AcpProviderState | ExtensionProviderState;
+
 export interface ProviderEvent {
     event: string;
     timestamp: number;