@adhdev/daemon-core 0.6.66 → 0.6.68

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;
@@ -2320,11 +2317,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.
  */
 
 /**
@@ -3051,7 +3047,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 +3097,6 @@ interface DaemonComponents {
 }
 /**
  * Initialize all daemon core components.
- * Shared by both cloud and standalone daemons.
  *
  * Order:
  *   1. Global log interceptor
@@ -3116,7 +3111,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)

package/dist/index.js

@@ -2008,6 +2008,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 +4122,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 +4209,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 +4229,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 +4272,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 +6298,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 +6507,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 +6521,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;
@@ -13029,7 +13040,7 @@ var DevServer = class _DevServer {
         const cleanData = chunk.replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "").replace(/  +/g, " ");
         approvalBuffer = (approvalBuffer + cleanData).slice(-1500);
         const elapsed = Date.now() - spawnedAt;
-        if (elapsed > 15e3 && approvalBuffer.includes("_PIPELINE_COMPLETE_SIGNAL_")) {
+        if (elapsed > 15e3 && cleanData.includes("_PIPELINE_COMPLETE_SIGNAL_")) {
           this.log(`Agent finished task after ${Math.round(elapsed / 1e3)}s. Terminating interactive CLI session to unblock pipeline.`);
           this.sendAutoImplSSE({ event: "output", data: { chunk: `
 [\u{1F916} ADHDev Pipeline] Completion token detected. Proceeding...
@@ -13219,6 +13230,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 +13451,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 +14092,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...");