@adhdev/daemon-core 0.8.57 → 0.8.58

package/src/providers/provider-loader.d.ts

@@ -14,6 +14,7 @@
  */
 import { VersionArchive } from './version-archive.js';
 import type { ProviderModule, ProviderCategory, ProviderSettingSchema, ResolvedProvider } from './contracts.js';
+import type { ProviderSourceMode } from '../config/config.js';
 export declare class ProviderLoader {
     private providers;
     private providerAvailability;
@@ -31,7 +32,9 @@ export declare class ProviderLoader {
     constructor(options?: {
         userDir?: string;
         logFn?: (msg: string) => void;
-        /** Disable upstream auto-download (for dev/testing/OSS) */
+        /** Explicit machine-level provider source policy */
+        sourceMode?: ProviderSourceMode;
+        /** Deprecated alias for sourceMode='no-upstream' */
         disableUpstream?: boolean;
     });
     private log;

package/src/providers/provider-loader.ts

@@ -30,6 +30,8 @@ import type {
   ResolvedProvider,
 } from './contracts.js';
 import { validateProviderDefinition } from './provider-schema.js';
+import type { ProviderSourceMode } from '../config/config.js';
+import type { ProviderSourceConfigSnapshot } from '../config/provider-source-config.js';
 
 interface ProviderAvailabilityState {
   installed: boolean;
@@ -39,8 +41,11 @@ interface ProviderAvailabilityState {
 export class ProviderLoader {
   private providers = new Map<string, ProviderModule>();
   private providerAvailability = new Map<string, ProviderAvailabilityState>();
+  private defaultProvidersDir: string;
+  private explicitProviderDir: string | null = null;
   private userDir: string;
   private upstreamDir: string;
+  private sourceMode: ProviderSourceMode = 'normal';
   private disableUpstream: boolean;
   private watchers: any[] = [];
   private logFn: (msg: string) => void;
@@ -58,32 +63,24 @@ export class ProviderLoader {
   constructor(options?: {
     userDir?: string;
     logFn?: (msg: string) => void;
-    /** Disable upstream auto-download (for dev/testing/OSS) */
+    /** Explicit machine-level provider source policy */
+    sourceMode?: ProviderSourceMode;
+    /** Deprecated alias for sourceMode='no-upstream' */
     disableUpstream?: boolean;
   }) {
     this.logFn = options?.logFn || LOG.forComponent('Provider').asLogFn();
 
     // Default directory for auto-downloads
-    const defaultProvidersDir = path.join(os.homedir(), '.adhdev', 'providers');
-
-    if (options?.userDir) {
-        this.userDir = options.userDir;
-        this.log(`Config 'providerDir' applied: ${this.userDir}`);
-    } else {
-        // Local dev overrides: Auto-detect local adhdev-providers repo for speed
-        const localRepoPath = path.resolve(__dirname, '../../../../../adhdev-providers');
-        if (fs.existsSync(localRepoPath)) {
-            this.userDir = localRepoPath;
-            this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
-        } else {
-            this.userDir = defaultProvidersDir;
-            this.log(`Using default user providers directory: ${this.userDir}`);
-        }
-    }
-
-    // Upstream auto-download directory is always in the default location
-    this.upstreamDir = path.join(defaultProvidersDir, '.upstream');
-    this.disableUpstream = options?.disableUpstream ?? false;
+    this.defaultProvidersDir = path.join(os.homedir(), '.adhdev', 'providers');
+    this.userDir = this.defaultProvidersDir;
+    this.upstreamDir = path.join(this.defaultProvidersDir, '.upstream');
+    this.disableUpstream = false;
+
+    this.applySourceConfig({
+      userDir: options?.userDir,
+      sourceMode: options?.sourceMode,
+      disableUpstream: options?.disableUpstream,
+    });
   }
 
   private log(msg: string): void {
@@ -114,6 +111,47 @@ export class ProviderLoader {
     return [this.userDir, this.upstreamDir];
   }
 
+  getSourceConfig(): ProviderSourceConfigSnapshot {
+    return {
+      sourceMode: this.sourceMode,
+      disableUpstream: this.disableUpstream,
+      explicitProviderDir: this.explicitProviderDir,
+      userDir: this.userDir,
+      upstreamDir: this.upstreamDir,
+      providerRoots: this.getProviderRoots(),
+    };
+  }
+
+  applySourceConfig(options?: {
+    userDir?: string;
+    sourceMode?: ProviderSourceMode;
+    disableUpstream?: boolean;
+  }): ProviderSourceConfigSnapshot {
+    const nextSourceMode = options?.sourceMode === 'no-upstream'
+      ? 'no-upstream'
+      : (options?.sourceMode === 'normal'
+        ? 'normal'
+        : (options?.disableUpstream ? 'no-upstream' : this.sourceMode || 'normal'));
+
+    if (options && Object.prototype.hasOwnProperty.call(options, 'userDir')) {
+      this.explicitProviderDir = options.userDir?.trim() ? options.userDir : null;
+    }
+
+    this.sourceMode = nextSourceMode;
+    this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
+    this.upstreamDir = path.join(this.defaultProvidersDir, '.upstream');
+    this.disableUpstream = this.sourceMode === 'no-upstream';
+
+    if (this.explicitProviderDir) {
+      this.log(`Config 'providerDir' applied: ${this.userDir}`);
+    } else {
+      this.log(`Using default user providers directory: ${this.userDir}`);
+    }
+    this.log(`Provider source config: mode=${this.sourceMode} explicitProviderDir=${this.explicitProviderDir || '-'} userDir=${this.userDir} upstreamDir=${this.upstreamDir}`);
+
+    return this.getSourceConfig();
+  }
+
  /**
  * Canonical provider directory shape for a given root.
  */
@@ -171,7 +209,7 @@ export class ProviderLoader {
         this.log(`Loaded ${upstreamCount} upstream providers (auto-updated)`);
       }
     } else if (this.disableUpstream) {
-      this.log('Upstream loading disabled (disableUpstream=true)');
+      this.log('Upstream loading disabled (sourceMode=no-upstream)');
     }
 
  // 2. Load user custom (excluding .upstream — highest priority, never auto-updated)
@@ -760,7 +798,7 @@ export class ProviderLoader {
  */
   async fetchLatest(): Promise<{ updated: boolean; error?: string }> {
     if (this.disableUpstream) {
-      this.log('Upstream fetch skipped (disableUpstream=true)');
+      this.log('Upstream fetch skipped (sourceMode=no-upstream)');
       return { updated: false };
     }
     const https = require('https') as typeof import('https');

package/src/providers/provider-schema.ts

@@ -83,6 +83,9 @@ export function validateProviderDefinition(raw: unknown): ProviderValidationResu
       warnings.push(`Unknown provider field: ${key}`)
     }
   }
+  if (provider.disableUpstream !== undefined) {
+    warnings.push('disableUpstream is deprecated in provider definitions; use machine-level provider source policy instead')
+  }
 
   const category = provider.category
   if ((category === 'cli' || category === 'acp')) {