@adhdev/daemon-core 0.6.79 → 0.7.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as StatusResponse, D as DaemonEvent, C as CommandResult$2, M as ManagedIdeEntry, a as ManagedCliEntry, b as ManagedAcpEntry, P as ProviderCategory, c as ProviderModule, R as ResolvedProvider, d as ProviderSettingSchema, e as CdpTargetFilter, f as ProviderInstance, I as InstanceContext, g as ProviderState, h as ProviderEvent, A as AcpProviderState, i as CliProviderState, j as IdeProviderState, k as StatusReportPayload, l as AvailableProviderInfo, m as ContentBlock } from './normalize-igHDb198.js';
-export { n as AcpConfigOption, o as AcpMode, p as ActiveChatData, q as AgentEntry, r as ChatMessage, s as DetectedIde, t as DetectedIdeInfo, E as ExtensionInfo, u as ExtensionProviderState, v as MachineInfo, w as ManagedAgentStream, x as ManagedStatus, y as ProviderConfig, z as ProviderErrorReason, B as ProviderInfo, F as ProviderStatus, G as SystemInfo, W as WorkspaceActivity, H as WorkspaceEntry, J as addCliHistory, K as getWorkspaceActivity, L as getWorkspaceState, N as isManagedStatusWaiting, O as isManagedStatusWorking, Q as isSetupComplete, T as loadConfig, U as markSetupComplete, V as normalizeActiveChatData, X as normalizeManagedStatus, Y as resetConfig, Z as saveConfig, _ as updateConfig } from './normalize-igHDb198.js';
+import { S as StatusResponse, D as DaemonEvent, C as CommandResult$2, a as SessionEntry, P as ProviderCategory, b as ProviderModule, R as ResolvedProvider, c as ProviderSettingSchema, d as CdpTargetFilter, e as ProviderInstance, I as InstanceContext, f as ProviderState, g as ProviderEvent, h as SessionTransport, i as StatusReportPayload, A as AvailableProviderInfo, j as AcpProviderState, k as ContentBlock } from './normalize-S2PmiRgB.js';
+export { l as AcpConfigOption, m as AcpMode, n as ActiveChatData, o as AgentEntry, p as AgentSessionStream, q as ChatMessage, r as CliProviderState, s as DetectedIde, t as DetectedIdeInfo, E as ExtensionInfo, u as ExtensionProviderState, v as IdeProviderState, M as MachineInfo, w as ManagedStatus, x as ProviderConfig, y as ProviderErrorReason, z as ProviderInfo, B as ProviderStatus, F as SessionCapability, G as SessionKind, H as SystemInfo, W as WorkspaceActivity, J as WorkspaceEntry, K as addCliHistory, L as getWorkspaceActivity, N as getWorkspaceState, O as isManagedStatusWaiting, Q as isManagedStatusWorking, T as isSetupComplete, U as loadConfig, V as markSetupComplete, X as normalizeActiveChatData, Y as normalizeManagedStatus, Z as resetConfig, _ as saveConfig, $ as updateConfig } from './normalize-S2PmiRgB.js';
 
 /**
  * DaemonCore — Core daemon orchestrator interface
@@ -33,12 +33,8 @@ interface IDaemonCore {
     onEvent(callback: (event: DaemonEvent) => void): () => void;
     /** Execute a command (send_chat, new_session, etc.) */
     executeCommand(type: string, payload: any, target?: string): Promise<CommandResult$2>;
-    /** Get currently detected/managed IDEs */
-    getManagedIdes(): ManagedIdeEntry[];
-    /** Get currently detected/managed CLIs */
-    getManagedClis(): ManagedCliEntry[];
-    /** Get currently detected/managed ACP agents */
-    getManagedAcps(): ManagedAcpEntry[];
+    /** Get current canonical runtime sessions */
+    getSessions(): SessionEntry[];
 }
 
 /**
@@ -654,6 +650,31 @@ declare class ProviderInstanceManager {
     disposeAll(): void;
 }
 
+interface SessionRuntimeTarget {
+    sessionId: string;
+    parentSessionId: string | null;
+    providerType: string;
+    providerCategory: 'ide' | 'extension' | 'cli' | 'acp';
+    transport: SessionTransport;
+    cdpManagerKey?: string;
+    adapterKey?: string;
+    instanceKey?: string;
+}
+declare class SessionRegistry {
+    private readonly bySessionId;
+    private readonly byManagerKey;
+    private readonly byInstanceKey;
+    private readonly byParentSessionId;
+    register(target: SessionRuntimeTarget): void;
+    get(sessionId: string | undefined | null): SessionRuntimeTarget | undefined;
+    unregister(sessionId: string | undefined | null): void;
+    unregisterByManagerKey(managerKey: string): void;
+    unregisterByInstanceKey(instanceKey: string): void;
+    listChildren(parentSessionId: string): SessionRuntimeTarget[];
+    private addIndex;
+    private removeIndex;
+}
+
 /**
  * Agent Stream Types — ported for Daemon (identical to original)
  *
@@ -718,42 +739,48 @@ type AgentEvaluateFn = (expression: string, timeoutMs?: number) => Promise<unkno
 
 interface ManagedAgent {
     adapter: IAgentStreamAdapter;
-    sessionId: string;
+    runtimeSessionId: string;
+    parentSessionId: string;
+    cdpSessionId: string;
     target: AgentWebviewTarget;
     lastState: AgentStreamState | null;
     lastError: string | null;
     lastHiddenCheckTime: number;
 }
 declare class DaemonAgentStreamManager {
-    private allAdapters;
-    private managedByScope;
+    private readonly sessionRegistry?;
+    private adaptersByType;
+    private managedBySessionId;
     private enabled;
     private logFn;
-    private lastDiscoveryTimeByScope;
-    private discoveryIntervalMsByScope;
-    private activeAgentTypeByScope;
-    constructor(logFn?: (msg: string) => void, providerLoader?: ProviderLoader);
+    private lastDiscoveryTimeByParent;
+    private discoveryIntervalMsByParent;
+    private activeSessionIdByParent;
+    constructor(logFn?: (msg: string) => void, providerLoader?: ProviderLoader, sessionRegistry?: SessionRegistry | undefined);
     setEnabled(enabled: boolean): void;
     get isEnabled(): boolean;
-    getActiveAgentType(scopeKey: string): string | null;
-    private getManagedScope;
-    resetScope(scopeKey: string): void;
+    getActiveSessionId(parentSessionId: string): string | null;
+    private getSessionTarget;
+    resetParentSession(parentSessionId: string): void;
     /** Panel focus based on provider.js focusPanel or extensionId (currently no-op) */
-    ensureAgentPanelOpen(agentType: string, targetIdeType?: string): Promise<void>;
-    switchActiveAgent(cdp: DaemonCdpManager, scopeKey: string, agentType: string | null): Promise<void>;
+    ensureSessionPanelOpen(_sessionId: string): Promise<void>;
+    setActiveSession(cdp: DaemonCdpManager, parentSessionId: string, sessionId: string | null): Promise<void>;
+    private resolveSessionIdForTarget;
+    private connectManagedSession;
     /** Agent webview discovery + session connection */
-    syncAgentSessions(cdp: DaemonCdpManager, scopeKey: string): Promise<void>;
-    /** Collect active agent status */
-    collectAgentStreams(cdp: DaemonCdpManager, scopeKey: string): Promise<AgentStreamState[]>;
-    sendToAgent(cdp: DaemonCdpManager, scopeKey: string, agentType: string, text: string, targetIdeType?: string): Promise<boolean>;
-    resolveAgentAction(cdp: DaemonCdpManager, scopeKey: string, agentType: string, action: 'approve' | 'reject', targetIdeType?: string): Promise<boolean>;
-    newAgentSession(cdp: DaemonCdpManager, scopeKey: string, agentType: string, targetIdeType?: string): Promise<boolean>;
-    listAgentChats(cdp: DaemonCdpManager, scopeKey: string, agentType: string): Promise<AgentChatListItem[]>;
-    switchAgentSession(cdp: DaemonCdpManager, scopeKey: string, agentType: string, sessionId: string): Promise<boolean>;
-    focusAgentEditor(cdp: DaemonCdpManager, scopeKey: string, agentType: string): Promise<boolean>;
-    getConnectedAgents(scopeKey?: string): string[];
-    getManagedAgent(agentType: string, scopeKey: string): ManagedAgent | undefined;
+    syncActiveSession(cdp: DaemonCdpManager, parentSessionId: string): Promise<void>;
+    /** Collect active extension session state */
+    collectActiveSession(cdp: DaemonCdpManager, parentSessionId: string): Promise<AgentStreamState | null>;
+    sendToSession(cdp: DaemonCdpManager, sessionId: string, text: string): Promise<boolean>;
+    resolveSessionAction(cdp: DaemonCdpManager, sessionId: string, action: 'approve' | 'reject'): Promise<boolean>;
+    newSession(cdp: DaemonCdpManager, sessionId: string): Promise<boolean>;
+    listSessionChats(cdp: DaemonCdpManager, sessionId: string): Promise<AgentChatListItem[]>;
+    switchConversation(cdp: DaemonCdpManager, sessionId: string, conversationId: string): Promise<boolean>;
+    focusSession(cdp: DaemonCdpManager, sessionId: string): Promise<boolean>;
+    getConnectedSessions(parentSessionId?: string): string[];
+    getManagedSession(sessionId: string): ManagedAgent | undefined;
     dispose(cdpManagers: Map<string, DaemonCdpManager>): Promise<void>;
+    resolveSessionForAgent(parentSessionId: string, agentType: string): string | null;
 }
 
 /**
@@ -773,6 +800,7 @@ interface AgentStreamPollerDeps {
     providerLoader: ProviderLoader;
     instanceManager: ProviderInstanceManager;
     cdpManagers: Map<string, DaemonCdpManager>;
+    sessionRegistry: SessionRegistry;
     /** Callback when agent streams are updated */
     onStreamsUpdated?: (ideType: string, streams: AgentStreamState[]) => void;
 }
@@ -783,7 +811,7 @@ declare class AgentStreamPoller {
     /** Currently active IDE type for agent streaming */
     get activeIde(): string | null;
     /** Reset active IDE tracking (e.g., when IDE is stopped) */
-    resetActiveIde(ideType: string): void;
+    resetActiveIde(parentSessionId: string): void;
     /** Start polling (idempotent — ignored if already started) */
     start(intervalMs?: number): void;
     /** Stop polling */
@@ -859,7 +887,7 @@ declare function readChatHistory(agentType: string, offset?: number, limit?: num
  * the correct CDP manager or CLI adapter.
  *
  * Key concepts:
- *   - extractIdeType(): determines target IDE from _targetInstance
+ *   - extractIdeType(): determines target IDE from targetSessionId or ideType
  *   - getCdp(): returns the DaemonCdpManager for current command
  *   - getProvider(): returns the ProviderModule for current command
  *   - handle(): main entry point, sets context then dispatches
@@ -876,8 +904,7 @@ interface CommandContext {
     providerLoader?: ProviderLoader;
     /** ProviderInstanceManager — for runtime settings propagation */
     instanceManager?: ProviderInstanceManager;
-    /** UUID instanceId → CDP manager key (ideType) mapping */
-    instanceIdMap?: Map<string, string>;
+    sessionRegistry?: SessionRegistry;
 }
 /**
  * Shared helpers interface — passed to sub-module command functions
@@ -892,8 +919,10 @@ interface CommandHelpers {
         category: string;
     } | null>;
     getCliAdapter(type?: string): any | null;
+    readonly currentManagerKey: string | undefined;
     readonly currentIdeType: string | undefined;
     readonly currentProviderType: string | undefined;
+    readonly currentSession: SessionRuntimeTarget | undefined;
     readonly agentStream: DaemonAgentStreamManager | null;
     readonly ctx: CommandContext;
     readonly historyWriter: ChatHistoryWriter;
@@ -903,19 +932,17 @@ declare class DaemonCommandHandler implements CommandHelpers {
     private _agentStream;
     private domHandlers;
     private _historyWriter;
-    /** Current IDE type extracted from command args (per-request) */
-    private _currentIdeType;
-    /** Current provider type — agentType priority, ideType use */
-    private _currentProviderType;
+    /** Current request route context */
+    private _currentRoute;
     constructor(ctx: CommandContext);
     get ctx(): CommandContext;
     get agentStream(): DaemonAgentStreamManager | null;
     get historyWriter(): ChatHistoryWriter;
+    get currentManagerKey(): string | undefined;
     get currentIdeType(): string | undefined;
     get currentProviderType(): string | undefined;
-    /** Get CDP manager for a specific ideType or managerKey.
-     * Supports exact match, multi-window prefix match, and instanceIdMap UUID lookup.
-     * Returns null if no match — never falls back to another IDE. */
+    get currentSession(): SessionRuntimeTarget | undefined;
+    /** Get CDP manager for a specific session or manager key. */
     getCdp(ideType?: string): DaemonCdpManager | null;
     /**
      * Get provider module — _currentProviderType (agentType priority) use.
@@ -934,9 +961,9 @@ declare class DaemonCommandHandler implements CommandHelpers {
     } | null>;
     /** CLI adapter search */
     getCliAdapter(type?: string): any | null;
-    private getExtensionSessionId;
-    private resolveManagerKeyFromInstanceId;
-    /** Extract ideType from _targetInstance or explicit ideType */
+    private inferProviderType;
+    private resolveRoute;
+    /** Extract CDP scope key from target session or explicit ideType */
     private extractIdeType;
     setAgentStreamManager(manager: DaemonAgentStreamManager): void;
     handle(cmd: string, args: any): Promise<CommandResult$1>;
@@ -1107,8 +1134,7 @@ interface CdpSetupContext {
     providerLoader: ProviderLoader;
     instanceManager: ProviderInstanceManager;
     cdpManagers: Map<string, DaemonCdpManager>;
-    /** UUID instanceId → CDP manager key mapping */
-    instanceIdMap: Map<string, string>;
+    sessionRegistry: SessionRegistry;
     /** Server connection (optional) */
     serverConn?: any;
 }
@@ -1135,7 +1161,7 @@ declare function registerExtensionProviders(providerLoader: ProviderLoader, mana
  * 2. Create IdeProviderInstance
  * 3. Register in InstanceManager
  * 4. Register enabled extensions
- * 5. Update instanceIdMap (IDE + extension UUIDs)
+ * 5. Register runtime sessions (workspace + extension children)
  *
  * @returns The created IdeProviderInstance, or null if provider not found
  */
@@ -1228,6 +1254,8 @@ interface CdpInitializerConfig {
     enabledIdes?: string[];
     /** Callback when a new CDP manager is connected */
     onConnected?: (ideType: string, manager: DaemonCdpManager, managerKey: string) => void | Promise<void>;
+    /** Callback when a stale/disconnected CDP manager is removed */
+    onDisconnected?: (ideType: string, manager: DaemonCdpManager, managerKey: string, reason: 'ide_closed' | 'target_closed' | 'target_rekeyed') => void | Promise<void>;
 }
 declare class DaemonCdpInitializer {
     private config;
@@ -1244,6 +1272,7 @@ declare class DaemonCdpInitializer {
      * Tries multi-window first (listAllTargets), falls back to direct connect.
      */
     private connectIdePort;
+    private pruneStaleManagers;
     /**
      * Start periodic scanning for newly opened IDEs.
      * Idempotent — ignored if already started.
@@ -1300,6 +1329,7 @@ interface CliManagerDeps {
     removeAgentTracking(key: string): void;
     /** InstanceManager — register in CLI unified status */
     getInstanceManager(): ProviderInstanceManager | null;
+    getSessionRegistry?(): SessionRegistry | null;
 }
 type CommandResult = {
     success: boolean;
@@ -1318,7 +1348,7 @@ declare class DaemonCliManager {
     shutdownAll(): void;
     /**
     * Search for CLI adapter. Priority order:
-    * 0. instanceKey (UUID direct match) — extracted from _targetInstance / composite ID
+    * 0. sessionId (UUID direct match)
     * 1. agentType + dir (iteration match)
     * 2. agentType fuzzy match (⚠ returns first match when multiple sessions exist)
     */
@@ -1353,8 +1383,7 @@ interface CommandRouterDeps {
     detectedIdes: {
         value: any[];
     };
-    /** UUID instanceId → CDP manager key mapping */
-    instanceIdMap: Map<string, string>;
+    sessionRegistry: SessionRegistry;
     /** Callback for CDP manager creation after launch_ide */
     onCdpManagerCreated?: (ideType: string, manager: DaemonCdpManager) => void;
     /** Callback after IDE connected (e.g., startAgentStreamPolling) */
@@ -1498,40 +1527,7 @@ declare function hasCdpManager(cdpManagers: Map<string, DaemonCdpManager>, key:
  * Check if any CDP manager matching the key is connected.
  */
 declare function isCdpConnected(cdpManagers: Map<string, DaemonCdpManager>, key: string): boolean;
-/**
- * Convert IdeProviderState[] → ManagedIdeEntry[]
- *
- * @param ideStates - from instanceManager.collectAllStates() filtered to ide
- * @param cdpManagers - for cdpConnected lookup
- * @param opts.detectedIdes - include CDPs that have no instance yet
- */
-declare function buildManagedIdes(ideStates: IdeProviderState[], cdpManagers: Map<string, DaemonCdpManager>, opts?: {
-    detectedIdes?: {
-        id: string;
-        installed: boolean;
-    }[];
-}): ManagedIdeEntry[];
-/**
- * Convert CliProviderState[] → ManagedCliEntry[]
- */
-declare function buildManagedClis(cliStates: CliProviderState[]): ManagedCliEntry[];
-/**
- * Convert AcpProviderState[] → ManagedAcpEntry[]
- */
-declare function buildManagedAcps(acpStates: AcpProviderState[]): ManagedAcpEntry[];
-/**
- * Convenience: collect & build all managed entries from instanceManager
- */
-declare function buildAllManagedEntries(allStates: ProviderState[], cdpManagers: Map<string, DaemonCdpManager>, opts?: {
-    detectedIdes?: {
-        id: string;
-        installed: boolean;
-    }[];
-}): {
-    managedIdes: ManagedIdeEntry[];
-    managedClis: ManagedCliEntry[];
-    managedAcps: ManagedAcpEntry[];
-};
+declare function buildSessionEntries(allStates: ProviderState[], cdpManagers: Map<string, DaemonCdpManager>): SessionEntry[];
 
 /**
  * Shared status snapshot builders.
@@ -2049,6 +2045,7 @@ declare class AcpProviderInstance implements ProviderInstance {
     onTick(): Promise<void>;
     getState(): AcpProviderState;
     onEvent(event: string, data?: any): void;
+    getInstanceId(): string;
     private parseConfigOptions;
     private parseModes;
     setConfigOption(category: string, value: string): Promise<void>;
@@ -2301,7 +2298,7 @@ interface DaemonComponents {
     poller: AgentStreamPoller;
     cdpInitializer: DaemonCdpInitializer;
     cdpManagers: Map<string, DaemonCdpManager>;
-    instanceIdMap: Map<string, string>;
+    sessionRegistry: SessionRegistry;
     detectedIdes: {
         value: any[];
     };
@@ -2342,4 +2339,4 @@ declare function startDaemonDevSupport(options: DaemonDevSupportOptions): Promis
  */
 declare function shutdownDaemonComponents(components: DaemonComponents): Promise<void>;
 
-export { AcpProviderInstance, AcpProviderState, AgentStreamPoller, type AgentStreamPollerDeps, AvailableProviderInfo, CdpDomHandlers, type CdpInitializerConfig, type CdpScannerOptions, type CdpSetupContext, CdpTargetFilter, type CliAdapter, CliProviderInstance, CliProviderState, type CommandContext, type CommandResult$1 as CommandResult, type CommandRouterDeps, type CommandRouterResult, CommandResult$2 as CoreCommandResult, DAEMON_WS_PATH, DEFAULT_DAEMON_PORT, DaemonAgentStreamManager, DaemonCdpInitializer, DaemonCdpManager, DaemonCdpScanner, DaemonCliManager, DaemonCommandHandler, DaemonCommandRouter, type DaemonComponents, type DaemonCoreOptions, type DaemonDevSupportOptions, DaemonEvent, type DaemonInitConfig, DaemonStatusReporter, DevServer, type HostMemorySnapshot, type IDEInfo, type IDaemonCore, IdeProviderInstance, IdeProviderState, type ExtensionInfo as InstallerExtensionInfo, LOG, type LogEntry, type LogLevel, ManagedAcpEntry, ManagedCliEntry, ManagedIdeEntry, ProviderCliAdapter, ProviderInstanceManager, ProviderLoader, ProviderModule, type ProviderVersionInfo, type ScopedLogger, type SetupIdeInstanceOptions, StatusReportPayload, StatusResponse, type StatusSnapshot, type StatusSnapshotOptions, VersionArchive, type VersionHistory, buildAllManagedEntries, buildManagedAcps, buildManagedClis, buildManagedIdes, buildStatusSnapshot, connectCdpManager, detectAllVersions, detectCLIs, detectIDEs, findCdpManager, forwardAgentStreamsToIdeInstance, getAIExtensions, getAvailableIdeIds, getHostMemorySnapshot, getLogLevel, getRecentCommands, getRecentLogs, hasCdpManager, initDaemonComponents, installExtensions, installGlobalInterceptor, isCdpConnected, isExtensionInstalled, isIdeRunning, killIdeProcess, launchIDE, launchWithCdp, logCommand, probeCdpPort, readChatHistory, registerExtensionProviders, setLogLevel, setupIdeInstance, shutdownDaemonComponents, startDaemonDevSupport };
+export { AcpProviderInstance, AcpProviderState, AgentStreamPoller, type AgentStreamPollerDeps, AvailableProviderInfo, CdpDomHandlers, type CdpInitializerConfig, type CdpScannerOptions, type CdpSetupContext, CdpTargetFilter, type CliAdapter, CliProviderInstance, type CommandContext, type CommandResult$1 as CommandResult, type CommandRouterDeps, type CommandRouterResult, CommandResult$2 as CoreCommandResult, DAEMON_WS_PATH, DEFAULT_DAEMON_PORT, DaemonAgentStreamManager, DaemonCdpInitializer, DaemonCdpManager, DaemonCdpScanner, DaemonCliManager, DaemonCommandHandler, DaemonCommandRouter, type DaemonComponents, type DaemonCoreOptions, type DaemonDevSupportOptions, DaemonEvent, type DaemonInitConfig, DaemonStatusReporter, DevServer, type HostMemorySnapshot, type IDEInfo, type IDaemonCore, IdeProviderInstance, type ExtensionInfo as InstallerExtensionInfo, LOG, type LogEntry, type LogLevel, ProviderCliAdapter, ProviderInstanceManager, ProviderLoader, ProviderModule, type ProviderVersionInfo, type ScopedLogger, SessionEntry, SessionTransport, type SetupIdeInstanceOptions, StatusReportPayload, StatusResponse, type StatusSnapshot, type StatusSnapshotOptions, VersionArchive, type VersionHistory, buildSessionEntries, buildStatusSnapshot, connectCdpManager, detectAllVersions, detectCLIs, detectIDEs, findCdpManager, forwardAgentStreamsToIdeInstance, getAIExtensions, getAvailableIdeIds, getHostMemorySnapshot, getLogLevel, getRecentCommands, getRecentLogs, hasCdpManager, initDaemonComponents, installExtensions, installGlobalInterceptor, isCdpConnected, isExtensionInstalled, isIdeRunning, killIdeProcess, launchIDE, launchWithCdp, logCommand, probeCdpPort, readChatHistory, registerExtensionProviders, setLogLevel, setupIdeInstance, shutdownDaemonComponents, startDaemonDevSupport };