@adhdev/daemon-core 0.6.67 → 0.6.69

package/dist/index.d.ts

@@ -178,6 +178,7 @@ interface ADHDevConfig {
         }>;
     }>;
     disableUpstream?: boolean;
+    providerDir?: string;
 }
 interface CliHistoryEntry {
     category?: 'ide' | 'cli' | 'acp';
@@ -238,14 +239,13 @@ declare function getWorkspaceState(config: ADHDevConfig): {
 /**
  * ADHDev Shared Types — Cross-package type definitions
  *
- * Types used across daemon-core, web-core, web-cloud, server, etc.
+ * Types used across daemon-core, web-core, and downstream consumers.
  * Import via: import type { ... } from '@adhdev/daemon-core/types'
  *
  * IMPORTANT: This file must remain runtime-free (types only).
- * Cloudflare Workers (server) can import type-only modules safely.
  */
 
-/** IDE entry as reported by daemon to server/dashboard */
+/** IDE entry as reported by daemon to dashboard */
 interface ManagedIdeEntry {
     ideType: string;
     ideVersion: string;
@@ -261,7 +261,7 @@ interface ManagedIdeEntry {
     currentPlan?: string;
     currentAutoApprove?: string;
 }
-/** CLI entry as reported by daemon to server/dashboard */
+/** CLI entry as reported by daemon to dashboard */
 interface ManagedCliEntry {
     id: string;
     instanceId: string;
@@ -272,7 +272,7 @@ interface ManagedCliEntry {
     workspace: string;
     activeChat: ActiveChatData | null;
 }
-/** ACP entry as reported by daemon to server/dashboard */
+/** ACP entry as reported by daemon to dashboard */
 interface ManagedAcpEntry {
     id: string;
     acpType: string;
@@ -705,7 +705,7 @@ interface ProviderSettingSchema extends ProviderSettingDef {
 /**
  * ADHDev Daemon Core — Shared Types
  *
- * Shared types referenced by daemon-core, daemon-standalone, daemon-cloud, web-core.
+ * Shared types referenced by daemon-core, daemon-standalone, and web-core.
  * When modifying this file, also update interface contracts in AGENT_PROTOCOL.md.
  */
 
@@ -833,7 +833,7 @@ interface AgentEntry {
 /**
  * DaemonCore — Core daemon orchestrator interface
  *
- * Both daemon-standalone and daemon-cloud use this interface via daemon-core.
+ * Provides the core daemon orchestrator interface consumed by daemon-standalone.
  * Actual implementation extracted from launcher and placed in this package.
  */
 
@@ -1337,6 +1337,8 @@ declare class DaemonCdpManager {
     private isMainPageUrl;
     /** Connected page title (includes workspace name) */
     get pageTitle(): string;
+    /** Connected target ID */
+    get targetId(): string | null;
     /**
     * Query all workbench pages on port (static)
     * Returns multiple entries if multiple IDE windows are open on same port
@@ -1595,8 +1597,7 @@ declare class DaemonAgentStreamManager {
 /**
  * AgentStreamPoller — Periodic agent stream polling + extension dynamic management
  *
- * Extracted from cloud daemon's startAgentStreamPolling() logic.
- * Used by both daemon-cloud and daemon-standalone.
+ * Handles periodic agent stream polling and extension dynamic management.
  *
  * Responsibilities:
  *   1. Refresh extension providers in CDP managers (config changes take effect immediately)
@@ -1936,11 +1937,8 @@ declare class IdeProviderInstance implements ProviderInstance {
 /**
  * DaemonCdpSetup — Shared CDP initialization helpers
  *
- * Extracted from daemon-cloud/adhdev-daemon.ts setupCdpManager()
- * and daemon-standalone/index.ts inline CDP setup logic.
- *
- * Used by both daemon-cloud and daemon-standalone to ensure
- * consistent CDP → ProviderInstance registration.
+ * Common CDP setup logic for consistent
+ * CDP → ProviderInstance registration.
  */
 
 interface CdpSetupContext {
@@ -1949,7 +1947,7 @@ interface CdpSetupContext {
     cdpManagers: Map<string, DaemonCdpManager>;
     /** UUID instanceId → CDP manager key mapping */
     instanceIdMap: Map<string, string>;
-    /** Server connection (optional, cloud-only) */
+    /** Server connection (optional) */
     serverConn?: any;
 }
 interface SetupIdeInstanceOptions {
@@ -1995,7 +1993,7 @@ declare function probeCdpPort(port: number, timeoutMs?: number): Promise<boolean
 /**
  * DaemonCdpScanner — Periodic CDP port scanning & auto-connect
  *
- * Extracted from daemon-cloud initCdp() and daemon-standalone initCdp().
+ * Periodic CDP port scanning and auto-connect for IDE discovery.
  * Provides a unified approach to:
  * 1. Initial CDP port discovery
  * 2. Periodic scanning for newly launched IDEs
@@ -2044,7 +2042,7 @@ declare class DaemonCdpScanner {
      */
     private connectSingleWindow;
     /**
-     * Multi-window connection (cloud mode).
+     * Multi-window connection.
      * Multiple CDP managers per IDE — one per workbench page.
      */
     private connectMultiWindow;
@@ -2053,7 +2051,7 @@ declare class DaemonCdpScanner {
 /**
  * DaemonCdpInitializer — Unified CDP initialization + periodic scanning
  *
- * Replaces initCdp() in both cloud and standalone daemons.
+ * Unified CDP initialization + periodic scanning.
  *
  * Features:
  *   1. Initial connection: connectAll() — multi-window aware
@@ -2175,8 +2173,7 @@ declare class DaemonCliManager {
 /**
  * DaemonCommandRouter — Unified command routing for daemon-level commands
  *
- * Extracted from cloud daemon's executeDaemonCommand() logic.
- * Used by both daemon-cloud and daemon-standalone.
+ * Unified command routing for daemon-level commands.
  *
  * Routing flow:
  *   1. Daemon-level commands (launch_ide, stop_ide, restart_ide, etc.) → handled here
@@ -2196,13 +2193,13 @@ interface CommandRouterDeps {
     };
     /** UUID instanceId → CDP manager key mapping */
     instanceIdMap: Map<string, string>;
-    /** Callback for CDP manager creation after launch_ide (cloud: setupCdpManager, standalone: no-op) */
+    /** Callback for CDP manager creation after launch_ide */
     onCdpManagerCreated?: (ideType: string, manager: DaemonCdpManager) => void;
     /** Callback after IDE connected (e.g., startAgentStreamPolling) */
     onIdeConnected?: () => void;
     /** Callback after status change (stop_ide, restart) */
     onStatusChange?: () => void;
-    /** Callback after chat-related commands (cloud: throttled report) */
+    /** Callback after chat-related commands */
     onPostChatCommand?: () => void;
     /** Get a connected CDP manager (for agent stream reset check) */
     getCdpLogFn?: (ideType: string) => (msg: string) => void;
@@ -2267,15 +2264,8 @@ interface StatusReporterDeps {
         resolve(type: string): any;
         getAll(): any[];
     };
-    adapters: Map<string, {
-        cliType: string;
-        cliName: string;
-        workingDir: string;
-        getStatus(): any;
-        getPartialResponse(): string;
-    }>;
     detectedIdes: any[];
-    ideType: string;
+    instanceId: string;
     daemonVersion?: string;
     instanceManager: {
         collectAllStates(): ProviderState[];
@@ -2320,11 +2310,10 @@ declare class DaemonStatusReporter {
  * Status Builders — shared conversion functions for ProviderState → ManagedEntry
  *
  * Used by:
- *   - daemon-cloud (DaemonStatusReporter)
  *   - daemon-standalone (StandaloneServer.getStatus)
+ *   - DaemonStatusReporter
  *
- * Consolidates duplicated ProviderState→ManagedEntry mapping that was
- * previously copy-pasted between cloud and standalone codebases.
+ * Consolidates ProviderState→ManagedEntry mapping logic.
  */
 
 /**
@@ -2382,6 +2371,44 @@ declare function buildAllManagedEntries(allStates: ProviderState[], cdpManagers:
     managedAcps: ManagedAcpEntry[];
 };
 
+/**
+ * Shared status snapshot builders.
+ *
+ * Used by:
+ * - DaemonStatusReporter (cloud)
+ * - daemon-standalone HTTP/WS status responses
+ */
+
+interface StatusSnapshotOptions {
+    allStates: ProviderState[];
+    cdpManagers: Map<string, unknown>;
+    providerLoader: {
+        getAll(): Array<{
+            type: string;
+            icon?: string;
+            displayName?: string;
+            category: 'ide' | 'extension' | 'cli' | 'acp';
+        }>;
+    };
+    detectedIdes: Array<{
+        id: string;
+        name?: string;
+        displayName?: string;
+        installed?: boolean;
+        path?: string;
+    }>;
+    instanceId: string;
+    version: string;
+    daemonMode: boolean;
+    timestamp?: number;
+    p2p?: StatusReportPayload['p2p'];
+    machineNickname?: string | null;
+}
+interface StatusSnapshot extends StatusReportPayload {
+    availableProviders: AvailableProviderInfo[];
+}
+declare function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnapshot;
+
 /**
  * ADHDev Daemon — unified logger (v2)
  *
@@ -2538,6 +2565,15 @@ declare function getAvailableIdeIds(): string[];
 declare const DEFAULT_DAEMON_PORT = 19222;
 declare const DAEMON_WS_PATH = "/ipc";
 
+/**
+ * Shared helper for forwarding agent stream snapshots into the IDE instance.
+ *
+ * Both cloud and standalone daemons use the same InstanceManager wiring.
+ */
+declare function forwardAgentStreamsToIdeInstance(instanceManager: {
+    getInstance: (key: string) => any;
+}, ideType: string, streams: any[]): void;
+
 /**
  * ProviderCliAdapter — Script-based CLI Adapter
  *
@@ -3051,7 +3087,7 @@ declare function getAIExtensions(): ExtensionInfo[];
 declare function launchIDE(ide: IDEInfo, workspacePath?: string): boolean;
 
 /**
- * Daemon Lifecycle — Shared init + shutdown for cloud/standalone
+ * Daemon Lifecycle — Shared init + shutdown logic
  *
  * initDaemonComponents(): Creates all core daemon components in correct order.
  * shutdownDaemonComponents(): Graceful shutdown of all components.
@@ -3101,7 +3137,6 @@ interface DaemonComponents {
 }
 /**
  * Initialize all daemon core components.
- * Shared by both cloud and standalone daemons.
  *
  * Order:
  *   1. Global log interceptor
@@ -3116,7 +3151,6 @@ interface DaemonComponents {
 declare function initDaemonComponents(config: DaemonInitConfig): Promise<DaemonComponents>;
 /**
  * Graceful shutdown of all daemon components.
- * Shared by both cloud and standalone daemons.
  *
  * Order:
  *   1. Stop timers (poller, cdpInitializer)
@@ -3127,4 +3161,4 @@ declare function initDaemonComponents(config: DaemonInitConfig): Promise<DaemonC
  */
 declare function shutdownDaemonComponents(components: DaemonComponents): Promise<void>;
 
-export { type AcpConfigOption, type AcpMode, AcpProviderInstance, type AcpProviderState, type ActiveChatData, type AgentEntry, AgentStreamPoller, type AgentStreamPollerDeps, type AvailableProviderInfo, CdpDomHandlers, type CdpInitializerConfig, type CdpScannerOptions, type CdpSetupContext, type CdpTargetFilter, type ChatMessage, type CliAdapter, CliProviderInstance, type CliProviderState, type CommandContext, type CommandResult$1 as CommandResult, type CommandRouterDeps, type CommandRouterResult, type CommandResult$2 as CoreCommandResult, DAEMON_WS_PATH, DEFAULT_DAEMON_PORT, DaemonAgentStreamManager, DaemonCdpInitializer, DaemonCdpManager, DaemonCdpScanner, DaemonCliManager, DaemonCommandHandler, DaemonCommandRouter, type DaemonComponents, type DaemonCoreOptions, type DaemonEvent, type DaemonInitConfig, DaemonStatusReporter, type DetectedIde, type DetectedIdeInfo, DevServer, type ExtensionInfo$1 as ExtensionInfo, type ExtensionProviderState, type HostMemorySnapshot, type IDEInfo, type IDaemonCore, IdeProviderInstance, type IdeProviderState, type ExtensionInfo as InstallerExtensionInfo, LOG, type LogEntry, type LogLevel, type MachineInfo, type ManagedAcpEntry, type ManagedAgentStream, type ManagedCliEntry, type ManagedIdeEntry, ProviderCliAdapter, type ProviderConfig, type ProviderErrorReason, type ProviderInfo, ProviderInstanceManager, ProviderLoader, type ProviderModule, type ProviderStatus, type ProviderVersionInfo, type ScopedLogger, type SetupIdeInstanceOptions, type StatusReportPayload, type StatusResponse, type SystemInfo, VersionArchive, type VersionHistory, type WorkspaceActivity, type WorkspaceEntry, addCliHistory, buildAllManagedEntries, buildManagedAcps, buildManagedClis, buildManagedIdes, connectCdpManager, detectAllVersions, detectCLIs, detectIDEs, findCdpManager, getAIExtensions, getAvailableIdeIds, getHostMemorySnapshot, getLogLevel, getRecentCommands, getRecentLogs, getWorkspaceActivity, getWorkspaceState, hasCdpManager, initDaemonComponents, installExtensions, installGlobalInterceptor, isCdpConnected, isExtensionInstalled, isIdeRunning, isSetupComplete, killIdeProcess, launchIDE, launchWithCdp, loadConfig, logCommand, markSetupComplete, probeCdpPort, readChatHistory, registerExtensionProviders, resetConfig, saveConfig, setLogLevel, setupIdeInstance, shutdownDaemonComponents, updateConfig };
+export { type AcpConfigOption, type AcpMode, AcpProviderInstance, type AcpProviderState, type ActiveChatData, type AgentEntry, AgentStreamPoller, type AgentStreamPollerDeps, type AvailableProviderInfo, CdpDomHandlers, type CdpInitializerConfig, type CdpScannerOptions, type CdpSetupContext, type CdpTargetFilter, type ChatMessage, type CliAdapter, CliProviderInstance, type CliProviderState, type CommandContext, type CommandResult$1 as CommandResult, type CommandRouterDeps, type CommandRouterResult, type CommandResult$2 as CoreCommandResult, DAEMON_WS_PATH, DEFAULT_DAEMON_PORT, DaemonAgentStreamManager, DaemonCdpInitializer, DaemonCdpManager, DaemonCdpScanner, DaemonCliManager, DaemonCommandHandler, DaemonCommandRouter, type DaemonComponents, type DaemonCoreOptions, type DaemonEvent, type DaemonInitConfig, DaemonStatusReporter, type DetectedIde, type DetectedIdeInfo, DevServer, type ExtensionInfo$1 as ExtensionInfo, type ExtensionProviderState, type HostMemorySnapshot, type IDEInfo, type IDaemonCore, IdeProviderInstance, type IdeProviderState, type ExtensionInfo as InstallerExtensionInfo, LOG, type LogEntry, type LogLevel, type MachineInfo, type ManagedAcpEntry, type ManagedAgentStream, type ManagedCliEntry, type ManagedIdeEntry, ProviderCliAdapter, type ProviderConfig, type ProviderErrorReason, type ProviderInfo, ProviderInstanceManager, ProviderLoader, type ProviderModule, type ProviderStatus, type ProviderVersionInfo, type ScopedLogger, type SetupIdeInstanceOptions, type StatusReportPayload, type StatusResponse, type StatusSnapshot, type StatusSnapshotOptions, type SystemInfo, VersionArchive, type VersionHistory, type WorkspaceActivity, type WorkspaceEntry, addCliHistory, buildAllManagedEntries, buildManagedAcps, buildManagedClis, buildManagedIdes, buildStatusSnapshot, connectCdpManager, detectAllVersions, detectCLIs, detectIDEs, findCdpManager, forwardAgentStreamsToIdeInstance, getAIExtensions, getAvailableIdeIds, getHostMemorySnapshot, getLogLevel, getRecentCommands, getRecentLogs, getWorkspaceActivity, getWorkspaceState, hasCdpManager, initDaemonComponents, installExtensions, installGlobalInterceptor, isCdpConnected, isExtensionInstalled, isIdeRunning, isSetupComplete, killIdeProcess, launchIDE, launchWithCdp, loadConfig, logCommand, markSetupComplete, probeCdpPort, readChatHistory, registerExtensionProviders, resetConfig, saveConfig, setLogLevel, setupIdeInstance, shutdownDaemonComponents, updateConfig };

package/dist/index.js

@@ -1666,11 +1666,13 @@ __export(index_exports, {
   buildManagedAcps: () => buildManagedAcps,
   buildManagedClis: () => buildManagedClis,
   buildManagedIdes: () => buildManagedIdes,
+  buildStatusSnapshot: () => buildStatusSnapshot,
   connectCdpManager: () => connectCdpManager,
   detectAllVersions: () => detectAllVersions,
   detectCLIs: () => detectCLIs,
   detectIDEs: () => detectIDEs,
   findCdpManager: () => findCdpManager,
+  forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance,
   getAIExtensions: () => getAIExtensions,
   getAvailableIdeIds: () => getAvailableIdeIds,
   getHostMemorySnapshot: () => getHostMemorySnapshot,
@@ -2008,6 +2010,10 @@ var DaemonCdpManager = class {
   get pageTitle() {
     return this._pageTitle;
   }
+  /** Connected target ID */
+  get targetId() {
+    return this._targetId;
+  }
   /**
   * Query all workbench pages on port (static)
   * Returns multiple entries if multiple IDE windows are open on same port
@@ -4118,7 +4124,7 @@ var DaemonCdpScanner = class {
     this.opts.onConnected?.(ide, ide, manager);
   }
   /**
-   * Multi-window connection (cloud mode).
+   * Multi-window connection.
    * Multiple CDP managers per IDE — one per workbench page.
    */
   async connectMultiWindow(port, ide) {
@@ -4205,6 +4211,7 @@ var DaemonCdpInitializer = class {
     const { providerLoader, cdpManagers } = this.config;
     const targets = await DaemonCdpManager.listAllTargets(port);
     if (targets.length === 0) {
+      if (cdpManagers.has(ide)) return;
       if (!await probeCdpPort(port)) return;
       const provider = providerLoader.getMeta(ide);
       const manager = new DaemonCdpManager(
@@ -4224,12 +4231,19 @@ var DaemonCdpInitializer = class {
     }
     for (let i = 0; i < targets.length; i++) {
       const target = targets[i];
+      let alreadyTracked = false;
+      for (const [key, m] of cdpManagers.entries()) {
+        if ((key === ide || key.startsWith(`${ide}_`)) && m.targetId === target.id) {
+          alreadyTracked = true;
+          break;
+        }
+      }
+      if (alreadyTracked) continue;
       let managerKey;
-      if (targets.length === 1) {
+      if (targets.length === 1 && !cdpManagers.has(ide)) {
         managerKey = ide;
       } else {
-        const workspaceName = (target.title || "").split(" \u2014 ")[0].trim() || `window_${i}`;
-        managerKey = `${ide}_${workspaceName}`;
+        managerKey = `${ide}_${target.id}`;
       }
       if (cdpManagers.has(managerKey)) continue;
       const provider = providerLoader.getMeta(ide);
@@ -4260,10 +4274,6 @@ var DaemonCdpInitializer = class {
       const portMap = providerLoader.getCdpPortMap();
       for (const [ide, ports] of Object.entries(portMap)) {
         const primaryPort = ports[0];
-        const alreadyConnected = [...cdpManagers.entries()].some(
-          ([key, m]) => m.isConnected && (key === ide || key.startsWith(ide + "_"))
-        );
-        if (alreadyConnected) continue;
         await this.connectIdePort(primaryPort, ide);
       }
     }, intervalMs);
@@ -6290,8 +6300,9 @@ var ProviderLoader = class _ProviderLoader {
     } else {
       this.builtinDirs = [];
     }
-    this.userDir = options?.userDir || path6.join(os7.homedir(), ".adhdev", "providers");
-    this.upstreamDir = path6.join(this.userDir, ".upstream");
+    const defaultProvidersDir = path6.join(os7.homedir(), ".adhdev", "providers");
+    this.userDir = options?.userDir || defaultProvidersDir;
+    this.upstreamDir = path6.join(defaultProvidersDir, ".upstream");
     this.disableUpstream = options?.disableUpstream ?? false;
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
   }
@@ -6498,7 +6509,8 @@ var ProviderLoader = class _ProviderLoader {
     try {
       const { loadConfig: loadConfig2 } = (init_config(), __toCommonJS(config_exports));
       const config = loadConfig2();
-      const val = config.ideSettings?.[ideType]?.extensions?.[type]?.enabled;
+      const baseIdeType = ideType.split("_")[0];
+      const val = config.ideSettings?.[baseIdeType]?.extensions?.[type]?.enabled;
       return val === true;
     } catch {
       return false;
@@ -6511,10 +6523,11 @@ var ProviderLoader = class _ProviderLoader {
     try {
       const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = (init_config(), __toCommonJS(config_exports));
       const config = loadConfig2();
+      const baseIdeType = ideType.split("_")[0];
       if (!config.ideSettings) config.ideSettings = {};
-      if (!config.ideSettings[ideType]) config.ideSettings[ideType] = {};
-      if (!config.ideSettings[ideType].extensions) config.ideSettings[ideType].extensions = {};
-      config.ideSettings[ideType].extensions[extensionType] = { enabled };
+      if (!config.ideSettings[baseIdeType]) config.ideSettings[baseIdeType] = {};
+      if (!config.ideSettings[baseIdeType].extensions) config.ideSettings[baseIdeType].extensions = {};
+      config.ideSettings[baseIdeType].extensions[extensionType] = { enabled };
       saveConfig2(config);
       this.log(`IDE extension setting: ${ideType}.${extensionType}.enabled = ${enabled}`);
       return true;
@@ -8050,10 +8063,76 @@ var DaemonCommandRouter = class {
 };
 
 // src/status/reporter.ts
+init_logger();
+
+// src/status/snapshot.ts
 var os10 = __toESM(require("os"));
 init_config();
 init_workspaces();
-init_logger();
+function buildDetectedIdeInfos(detectedIdes, cdpManagers) {
+  return detectedIdes.filter((ide) => ide.installed !== false).map((ide) => ({
+    id: ide.id,
+    type: ide.id,
+    name: ide.displayName || ide.name || ide.id,
+    running: isCdpConnected(cdpManagers, ide.id),
+    ...ide.path ? { path: ide.path } : {}
+  }));
+}
+function buildAvailableProviders(providerLoader) {
+  return providerLoader.getAll().map((provider) => ({
+    type: provider.type,
+    name: provider.displayName || provider.type,
+    displayName: provider.displayName || provider.type,
+    icon: provider.icon || "\u{1F4BB}",
+    category: provider.category
+  }));
+}
+function buildStatusSnapshot(options) {
+  const cfg = loadConfig();
+  const wsState = getWorkspaceState(cfg);
+  const memSnap = getHostMemorySnapshot();
+  const { managedIdes, managedClis, managedAcps } = buildAllManagedEntries(
+    options.allStates,
+    options.cdpManagers,
+    {
+      detectedIdes: options.detectedIdes.map((ide) => ({
+        id: ide.id,
+        installed: ide.installed !== false
+      }))
+    }
+  );
+  return {
+    instanceId: options.instanceId,
+    version: options.version,
+    daemonMode: options.daemonMode,
+    machine: {
+      hostname: os10.hostname(),
+      platform: os10.platform(),
+      arch: os10.arch(),
+      cpus: os10.cpus().length,
+      totalMem: memSnap.totalMem,
+      freeMem: memSnap.freeMem,
+      availableMem: memSnap.availableMem,
+      loadavg: os10.loadavg(),
+      uptime: os10.uptime(),
+      release: os10.release()
+    },
+    machineNickname: options.machineNickname ?? cfg.machineNickname ?? null,
+    timestamp: options.timestamp ?? Date.now(),
+    detectedIdes: buildDetectedIdeInfos(options.detectedIdes, options.cdpManagers),
+    ...options.p2p ? { p2p: options.p2p } : {},
+    managedIdes,
+    managedClis,
+    managedAcps,
+    workspaces: wsState.workspaces,
+    defaultWorkspaceId: wsState.defaultWorkspaceId,
+    defaultWorkspacePath: wsState.defaultWorkspacePath,
+    workspaceActivity: getWorkspaceActivity(cfg, 15),
+    availableProviders: buildAvailableProviders(options.providerLoader)
+  };
+}
+
+// src/status/reporter.ts
 var DaemonStatusReporter = class {
   deps;
   log;
@@ -8160,46 +8239,25 @@ var DaemonStatusReporter = class {
       allStates,
       this.deps.cdpManagers
     );
-    const cfg = loadConfig();
-    const wsState = getWorkspaceState(cfg);
-    const memSnap = getHostMemorySnapshot();
     const payload = {
-      daemonMode: true,
-      version: this.deps.daemonVersion || "unknown",
-      workspaces: wsState.workspaces,
-      defaultWorkspaceId: wsState.defaultWorkspaceId,
-      defaultWorkspacePath: wsState.defaultWorkspacePath,
-      workspaceActivity: getWorkspaceActivity(cfg, 15),
-      machine: {
-        hostname: os10.hostname(),
-        platform: os10.platform(),
-        arch: os10.arch(),
-        cpus: os10.cpus().length,
-        totalMem: memSnap.totalMem,
-        freeMem: memSnap.freeMem,
-        availableMem: memSnap.availableMem,
-        loadavg: os10.loadavg(),
-        uptime: os10.uptime()
-      },
-      managedIdes,
-      managedClis,
-      managedAcps,
-      p2p: {
-        available: p2p?.isAvailable || false,
-        state: p2p?.connectionState || "unavailable",
-        peers: p2p?.connectedPeerCount || 0,
-        screenshotActive: p2p?.screenshotActive || false
-      },
+      ...buildStatusSnapshot({
+        allStates,
+        cdpManagers: this.deps.cdpManagers,
+        providerLoader: this.deps.providerLoader,
+        detectedIdes: this.deps.detectedIdes || [],
+        instanceId: this.deps.instanceId,
+        version: this.deps.daemonVersion || "unknown",
+        daemonMode: true,
+        timestamp: now,
+        p2p: {
+          available: p2p?.isAvailable || false,
+          state: p2p?.connectionState || "unavailable",
+          peers: p2p?.connectedPeerCount || 0,
+          screenshotActive: p2p?.screenshotActive || false
+        }
+      }),
       screenshotUsage: this.deps.getScreenshotUsage?.() || null,
-      connectedExtensions: [],
-      detectedIdes: this.deps.detectedIdes || [],
-      availableProviders: this.deps.providerLoader.getAll().map((p) => ({
-        type: p.type,
-        icon: p.icon || "\u{1F4BB}",
-        displayName: p.displayName || p.type,
-        category: p.category
-      })),
-      timestamp: now
+      connectedExtensions: []
     };
     const p2pSent = this.sendP2PPayload(payload);
     if (p2pSent) {
@@ -10235,6 +10293,23 @@ var AgentStreamPoller = class {
   }
 };
 
+// src/agent-stream/forward.ts
+function forwardAgentStreamsToIdeInstance(instanceManager, ideType, streams) {
+  const ideInstance = instanceManager.getInstance(`ide:${ideType}`);
+  if (!ideInstance?.onEvent) return;
+  for (const stream of streams) {
+    ideInstance.onEvent("stream_update", {
+      extensionType: stream.agentType,
+      streams: [stream],
+      messages: stream.messages || [],
+      status: stream.status || "idle",
+      activeModal: stream.activeModal || null,
+      model: stream.model || void 0,
+      mode: stream.mode || void 0
+    });
+  }
+}
+
 // src/providers/provider-instance-manager.ts
 init_logger();
 var ProviderInstanceManager = class {
@@ -13219,6 +13294,31 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
+    const docsDir = path12.join(providerDir, "../../docs");
+    const loadGuide = (name) => {
+      try {
+        const p = path12.join(docsDir, name);
+        if (fs9.existsSync(p)) return fs9.readFileSync(p, "utf-8");
+      } catch {
+      }
+      return null;
+    };
+    const providerGuide = loadGuide("PROVIDER_GUIDE.md");
+    if (providerGuide) {
+      lines.push("## Documentation: PROVIDER_GUIDE.md");
+      lines.push("```markdown");
+      lines.push(providerGuide);
+      lines.push("```");
+      lines.push("");
+    }
+    const cdpGuide = loadGuide("CDP_SELECTOR_GUIDE.md");
+    if (cdpGuide) {
+      lines.push("## Documentation: CDP_SELECTOR_GUIDE.md");
+      lines.push("```markdown");
+      lines.push(cdpGuide);
+      lines.push("```");
+      lines.push("");
+    }
     lines.push("## Task");
     lines.push(`Edit files in \`${providerDir}\` to implement: **${functions.join(", ")}**`);
     lines.push("");
@@ -13415,6 +13515,23 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
+    const docsDir = path12.join(providerDir, "../../docs");
+    const loadGuide = (name) => {
+      try {
+        const p = path12.join(docsDir, name);
+        if (fs9.existsSync(p)) return fs9.readFileSync(p, "utf-8");
+      } catch {
+      }
+      return null;
+    };
+    const providerGuide = loadGuide("PROVIDER_GUIDE.md");
+    if (providerGuide) {
+      lines.push("## Documentation: PROVIDER_GUIDE.md");
+      lines.push("```markdown");
+      lines.push(providerGuide);
+      lines.push("```");
+      lines.push("");
+    }
     lines.push("## Runtime Contract");
     lines.push("The daemon runtime is already implemented in `packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts`.");
     lines.push("Your scripts receive PTY-derived input and must return plain JS objects.");
@@ -14039,7 +14156,8 @@ async function initDaemonComponents(config) {
   const disableUpstream = appConfig.disableUpstream ?? false;
   const providerLoader = new ProviderLoader({
     logFn: config.providerLogFn,
-    disableUpstream
+    disableUpstream,
+    userDir: appConfig.providerDir
   });
   if (!disableUpstream && !providerLoader.hasUpstream()) {
     LOG.info("Provider", "No upstream providers found \u2014 downloading from GitHub...");
@@ -14213,11 +14331,13 @@ async function shutdownDaemonComponents(components) {
   buildManagedAcps,
   buildManagedClis,
   buildManagedIdes,
+  buildStatusSnapshot,
   connectCdpManager,
   detectAllVersions,
   detectCLIs,
   detectIDEs,
   findCdpManager,
+  forwardAgentStreamsToIdeInstance,
   getAIExtensions,
   getAvailableIdeIds,
   getHostMemorySnapshot,