@adhdev/daemon-core 0.6.67 → 0.6.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.6.67",
+  "version": "0.6.68",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/agent-stream/poller.ts

@@ -1,8 +1,7 @@
 /**
  * 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)

package/src/boot/daemon-lifecycle.ts

@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -77,7 +77,6 @@ export interface DaemonComponents {
 
 /**
  * Initialize all daemon core components.
- * Shared by both cloud and standalone daemons.
  *
  * Order:
  *   1. Global log interceptor
@@ -99,6 +98,7 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
     const providerLoader = new ProviderLoader({
         logFn: config.providerLogFn,
         disableUpstream,
+        userDir: appConfig.providerDir,
     });
 
     // If no upstream providers exist, fetch them first (blocking — critical for new users)
@@ -244,7 +244,6 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
 
 /**
  * Graceful shutdown of all daemon components.
- * Shared by both cloud and standalone daemons.
  *
  * Order:
  *   1. Stop timers (poller, cdpInitializer)

package/src/cdp/initializer.ts

@@ -1,7 +1,7 @@
 /**
  * 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
@@ -90,6 +90,8 @@ export class DaemonCdpInitializer {
         const targets = await DaemonCdpManager.listAllTargets(port);
 
         if (targets.length === 0) {
+            // Prevent duplicate fallback connection
+            if (cdpManagers.has(ide)) return;
             // Fallback: direct single connection (probeCdpPort first)
             if (!await probeCdpPort(port)) return;
             const provider = providerLoader.getMeta(ide);
@@ -112,13 +114,23 @@ export class DaemonCdpInitializer {
         // 2. Multi-window: create separate CdpManager per page
         for (let i = 0; i < targets.length; i++) {
             const target = targets[i];
-            // Key: single page = ide type as-is, multi-page = ide_workspaceName
+            
+            // Check if ANY existing manager for this IDE is already tracking this target.id
+            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;
+
+            // Stable key using target.id instead of fluctuating window title
             let managerKey: string;
-            if (targets.length === 1) {
+            if (targets.length === 1 && !cdpManagers.has(ide)) {
                 managerKey = ide;
             } else {
-                const workspaceName = (target.title || '').split(' — ')[0].trim() || `window_${i}`;
-                managerKey = `${ide}_${workspaceName}`;
+                managerKey = `${ide}_${target.id}`;
             }
 
             if (cdpManagers.has(managerKey)) continue;
@@ -156,13 +168,7 @@ export class DaemonCdpInitializer {
 
             for (const [ide, ports] of Object.entries(portMap)) {
                 const primaryPort = ports[0];
-
-                // Skip if already connected
-                const alreadyConnected = [...cdpManagers.entries()].some(([key, m]) =>
-                    m.isConnected && (key === ide || key.startsWith(ide + '_'))
-                );
-                if (alreadyConnected) continue;
-
+                // Always try to connect to find new windows
                 await this.connectIdePort(primaryPort, ide);
             }
         }, intervalMs);

package/src/cdp/manager.ts

@@ -107,6 +107,9 @@ export class DaemonCdpManager {
  /** Connected page title (includes workspace name) */
     get pageTitle(): string { return this._pageTitle; }
 
+ /** Connected target ID */
+    get targetId(): string | null { return this._targetId; }
+
  /**
  * Query all workbench pages on port (static)
  * Returns multiple entries if multiple IDE windows are open on same port

package/src/cdp/scanner.ts

@@ -1,7 +1,7 @@
 /**
  * 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
@@ -142,7 +142,7 @@ export class DaemonCdpScanner {
   }
 
   /**
-   * Multi-window connection (cloud mode).
+   * Multi-window connection.
    * Multiple CDP managers per IDE — one per workbench page.
    */
   private async connectMultiWindow(port: number, ide: string): Promise<void> {

package/src/cdp/setup.ts

@@ -1,11 +1,8 @@
 /**
  * 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.
  */
 
 import { DaemonCdpManager } from './manager.js';
@@ -20,7 +17,7 @@ export 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;
 }
 

package/src/commands/router.ts

@@ -1,8 +1,7 @@
 /**
  * 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
@@ -39,13 +38,13 @@ export interface CommandRouterDeps {
     detectedIdes: { value: any[] };
     /** 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;
@@ -234,7 +233,7 @@ export class DaemonCommandRouter {
                         LOG.info('CDP', `Connected: ${result.ideId} (port ${result.port})`);
                         LOG.info('CDP', `${this.deps.cdpManagers.size} IDE(s) connected`);
 
-                        // Notify consumer (cloud: setupCdpManager, standalone: setupIdeInstance)
+                        // Notify consumer (e.g. setupIdeInstance)
                         this.deps.onCdpManagerCreated?.(result.ideId, manager);
                     }
                 }
@@ -271,7 +270,7 @@ export class DaemonCommandRouter {
                 try {
                     const { execSync } = await import('child_process');
 
-                    // Detect package: standalone uses @adhdev/daemon-standalone, cloud uses adhdev
+                    // Detect package name for upgrade
                     const isStandalone = this.deps.packageName === '@adhdev/daemon-standalone'
                         || process.argv[1]?.includes('daemon-standalone');
                     const pkgName = isStandalone ? '@adhdev/daemon-standalone' : 'adhdev';

package/src/config/config.ts

@@ -84,6 +84,9 @@ export interface ADHDevConfig {
  // Disable upstream provider auto-download (use builtin only)
  // Controllable from CLI (--no-upstream) and dashboard (machine page)
     disableUpstream?: boolean;
+
+ // Optional custom provider directory for local development
+    providerDir?: string;
 }
 
 export interface CliHistoryEntry {

package/src/daemon/dev-server.ts

@@ -2405,6 +2405,34 @@ export class DevServer {
       }
     }
 
+    // ── Markdown Guides (Provider Fix) ──
+    const docsDir = path.join(providerDir, '../../docs');
+    const loadGuide = (name: string) => {
+      try {
+        const p = path.join(docsDir, name);
+        if (fs.existsSync(p)) return fs.readFileSync(p, 'utf-8');
+      } catch { /* ignore */ }
+      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('');
+    }
+
     // ── Task ──
     lines.push('## Task');
     lines.push(`Edit files in \`${providerDir}\` to implement: **${functions.join(', ')}**`);
@@ -2629,6 +2657,25 @@ export class DevServer {
       }
     }
 
+    // ── Markdown Guides (Provider Fix) ──
+    const docsDir = path.join(providerDir, '../../docs');
+    const loadGuide = (name: string) => {
+      try {
+        const p = path.join(docsDir, name);
+        if (fs.existsSync(p)) return fs.readFileSync(p, 'utf-8');
+      } catch { /* ignore */ }
+      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.');

package/src/daemon-core.ts

@@ -1,7 +1,7 @@
 /**
  * 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.
  */
 

package/src/index.ts

@@ -2,7 +2,6 @@
  * @adhdev/daemon-core — Public API
  *
  * Core logic for daemon: CDP, Provider, IDE detection, CLI/ACP adapters and more.
- * Used by both daemon-standalone and daemon-cloud.
  */
 
 // ── Types ──

package/src/providers/provider-loader.ts

@@ -59,11 +59,14 @@ export class ProviderLoader {
     } else {
         this.builtinDirs = [];
     }
- // User custom directory: ~/.adhdev/providers/
-    this.userDir = options?.userDir ||
-      path.join(os.homedir(), '.adhdev', 'providers');
- // Upstream auto-download directory: ~/.adhdev/providers/.upstream/
-    this.upstreamDir = path.join(this.userDir, '.upstream');
+ // Default directory for auto-downloads
+    const defaultProvidersDir = path.join(os.homedir(), '.adhdev', 'providers');
+
+ // User custom directory: ~/.adhdev/providers/ or custom via config
+    this.userDir = options?.userDir || defaultProvidersDir;
+
+ // Upstream auto-download directory is always in the default location to avoid polluting custom dirs
+    this.upstreamDir = path.join(defaultProvidersDir, '.upstream');
     this.disableUpstream = options?.disableUpstream ?? false;
     this.logFn = options?.logFn || LOG.forComponent('Provider').asLogFn();
   }
@@ -301,7 +304,8 @@ export class ProviderLoader {
     try {
       const { loadConfig } = require('../config/config.js');
       const config = loadConfig();
-      const val = config.ideSettings?.[ideType]?.extensions?.[type]?.enabled;
+      const baseIdeType = ideType.split('_')[0];
+      const val = config.ideSettings?.[baseIdeType]?.extensions?.[type]?.enabled;
       return val === true; // undefined → false (default inactive)
     } catch {
       return false;
@@ -315,10 +319,11 @@ export class ProviderLoader {
     try {
       const { loadConfig, saveConfig } = require('../config/config.js');
       const config = loadConfig();
+      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 };
       saveConfig(config);
       this.log(`IDE extension setting: ${ideType}.${extensionType}.enabled = ${enabled}`);
       return true;

package/src/shared-types.ts

@@ -1,11 +1,10 @@
 /**
  * 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.
  */
 
 import type {
@@ -50,9 +49,9 @@ export type { WorkspaceEntry } from './config/workspaces.js';
 
 // ─── Managed Entry Types (reporter → server/web) ────────────────────
 // These define the shape of data sent by DaemonStatusReporter
-// and consumed by web-core, web-cloud, and server.
+// and consumed by web-core and downstream consumers.
 
-/** IDE entry as reported by daemon to server/dashboard */
+/** IDE entry as reported by daemon to dashboard */
 export interface ManagedIdeEntry {
     ideType: string;
     ideVersion: string;
@@ -69,7 +68,7 @@ export interface ManagedIdeEntry {
     currentAutoApprove?: string;
 }
 
-/** CLI entry as reported by daemon to server/dashboard */
+/** CLI entry as reported by daemon to dashboard */
 export interface ManagedCliEntry {
     id: string;
     instanceId: string;
@@ -81,7 +80,7 @@ export interface ManagedCliEntry {
     activeChat: _ActiveChatData | null;
 }
 
-/** ACP entry as reported by daemon to server/dashboard */
+/** ACP entry as reported by daemon to dashboard */
 export interface ManagedAcpEntry {
     id: string;
     acpType: string;

package/src/status/builders.ts

@@ -2,11 +2,10 @@
  * 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.
  */
 
 import type { DaemonCdpManager } from '../cdp/manager.js';

package/src/types.ts

@@ -1,7 +1,7 @@
 /**
  * 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.
  */
 import type { StatusReportPayload } from './shared-types.js';