@adhdev/daemon-core 0.6.51 → 0.6.52

package/dist/index.d.ts

@@ -981,6 +981,52 @@ declare class ProviderLoader {
     });
     private log;
     /**
+    * Ordered builtin roots used for local fallback/reference data.
+    */
+    getBuiltinDirs(): string[];
+    /**
+    * Primary builtin root used for local scaffolding/reference flows.
+    */
+    getPrimaryBuiltinDir(): string;
+    /**
+    * User override root (~/.adhdev/providers by default).
+    */
+    getUserDir(): string;
+    /**
+    * Auto-updated upstream root (~/.adhdev/providers/.upstream by default).
+    */
+    getUpstreamDir(): string;
+    /**
+    * Provider search order for on-disk lookups.
+    * Highest-priority editable overrides come first.
+    */
+    getProviderRoots(): string[];
+    /**
+    * Canonical provider directory shape for a given root.
+    */
+    getProviderDir(root: string, category: ProviderCategory, type: string): string;
+    /**
+    * Canonical user override directory for a provider.
+    */
+    getUserProviderDir(category: ProviderCategory, type: string): string;
+    /**
+    * Canonical upstream directory for a provider.
+    */
+    getUpstreamProviderDir(category: ProviderCategory, type: string): string;
+    /**
+    * Canonical builtin directory for a provider.
+    */
+    getBuiltinProviderDir(category: ProviderCategory, type: string): string;
+    /**
+    * Find the on-disk directory for a provider by type.
+    * Search order: user override → upstream → builtin fallback.
+    */
+    findProviderDir(type: string): string | null;
+    /**
+    * Resolve a file within a provider directory.
+    */
+    resolveProviderFile(type: string, ...segments: string[]): string | null;
+    /**
     * Load all providers (3-tier priority)
     * 1. .upstream/ (GitHub auto-download — primary source)
     * 2. User custom (~/.adhdev/providers/ excluding .upstream)
@@ -1156,9 +1202,9 @@ declare class ProviderLoader {
     setSetting(type: string, key: string, value: any): boolean;
     /**
      * Find the on-disk directory for a provider by type.
-     * Checks builtinDir, upstreamDir, userDir in order.
+     * Preferred shape: root/category/type. Legacy flat root/type is kept temporarily for compatibility.
      */
-    private findProviderDir;
+    private findProviderDirInternal;
     /**
      * Build a scripts function map from individual .js files in a directory.
      * Each file is wrapped as: (params?) => fs.readFileSync(filePath, 'utf-8')

package/dist/index.js

@@ -5849,6 +5849,76 @@ var ProviderLoader = class _ProviderLoader {
   }
   // ─── Public API ────────────────────────────────
   /**
+  * Ordered builtin roots used for local fallback/reference data.
+  */
+  getBuiltinDirs() {
+    return [...this.builtinDirs];
+  }
+  /**
+  * Primary builtin root used for local scaffolding/reference flows.
+  */
+  getPrimaryBuiltinDir() {
+    return this.builtinDirs[0];
+  }
+  /**
+  * User override root (~/.adhdev/providers by default).
+  */
+  getUserDir() {
+    return this.userDir;
+  }
+  /**
+  * Auto-updated upstream root (~/.adhdev/providers/.upstream by default).
+  */
+  getUpstreamDir() {
+    return this.upstreamDir;
+  }
+  /**
+  * Provider search order for on-disk lookups.
+  * Highest-priority editable overrides come first.
+  */
+  getProviderRoots() {
+    return [this.userDir, this.upstreamDir, ...this.builtinDirs];
+  }
+  /**
+  * Canonical provider directory shape for a given root.
+  */
+  getProviderDir(root, category, type) {
+    return path6.join(root, category, type);
+  }
+  /**
+  * Canonical user override directory for a provider.
+  */
+  getUserProviderDir(category, type) {
+    return this.getProviderDir(this.userDir, category, type);
+  }
+  /**
+  * Canonical upstream directory for a provider.
+  */
+  getUpstreamProviderDir(category, type) {
+    return this.getProviderDir(this.upstreamDir, category, type);
+  }
+  /**
+  * Canonical builtin directory for a provider.
+  */
+  getBuiltinProviderDir(category, type) {
+    return this.getProviderDir(this.getPrimaryBuiltinDir(), category, type);
+  }
+  /**
+  * Find the on-disk directory for a provider by type.
+  * Search order: user override → upstream → builtin fallback.
+  */
+  findProviderDir(type) {
+    return this.findProviderDirInternal(type);
+  }
+  /**
+  * Resolve a file within a provider directory.
+  */
+  resolveProviderFile(type, ...segments) {
+    const dir = this.findProviderDirInternal(type);
+    if (!dir) return null;
+    return path6.join(dir, ...segments);
+  }
+  /**
   * Load all providers (3-tier priority)
   * 1. .upstream/ (GitHub auto-download — primary source)
   * 2. User custom (~/.adhdev/providers/ excluding .upstream)
@@ -6174,7 +6244,7 @@ var ProviderLoader = class _ProviderLoader {
    * Tries scripts.js first, then individual .js files.
    */
   loadScriptsFromDir(type, scriptDir) {
-    const providerDir = this.findProviderDir(type);
+    const providerDir = this.findProviderDirInternal(type);
     if (!providerDir) {
       this.log(`  [loadScriptsFromDir] ${type}: providerDir not found`);
       return null;
@@ -6535,16 +6605,16 @@ var ProviderLoader = class _ProviderLoader {
   // ─── Private ───────────────────────────────────
   /**
    * Find the on-disk directory for a provider by type.
-   * Checks builtinDir, upstreamDir, userDir in order.
+   * Preferred shape: root/category/type. Legacy flat root/type is kept temporarily for compatibility.
    */
-  findProviderDir(type) {
+  findProviderDirInternal(type) {
     const provider = this.providers.get(type);
     if (!provider) return null;
     const cat = provider.category;
-    const searchRoots = [this.userDir, this.upstreamDir, ...this.builtinDirs];
+    const searchRoots = this.getProviderRoots();
     for (const root of searchRoots) {
       if (!fs5.existsSync(root)) continue;
-      for (const candidate of [path6.join(root, type), path6.join(root, cat, type)]) {
+      for (const candidate of [this.getProviderDir(root, cat, type), path6.join(root, type)]) {
         if (fs5.existsSync(path6.join(candidate, "provider.json"))) return candidate;
       }
       const catDir = path6.join(root, cat);
@@ -11012,37 +11082,7 @@ var DevServer = class _DevServer {
   // ─── Provider File Explorer ───
   /** Find the provider directory on disk */
   findProviderDir(type) {
-    const provider = this.providerLoader.getMeta(type);
-    if (!provider) return null;
-    const cat = provider.category;
-    const builtinDir = this.providerLoader.builtinDirs?.[0] || path12.resolve(__dirname, "../providers/_builtin");
-    const userDir = path12.join(os14.homedir(), ".adhdev", "providers");
-    const directCandidates = [
-      path12.join(userDir, type),
-      path12.join(builtinDir, cat, type),
-      path12.join(builtinDir, type)
-    ];
-    for (const d of directCandidates) {
-      if (fs9.existsSync(path12.join(d, "provider.json"))) return d;
-    }
-    const catDir = path12.join(builtinDir, cat);
-    if (fs9.existsSync(catDir)) {
-      try {
-        for (const entry of fs9.readdirSync(catDir, { withFileTypes: true })) {
-          if (!entry.isDirectory()) continue;
-          const jsonPath = path12.join(catDir, entry.name, "provider.json");
-          if (fs9.existsSync(jsonPath)) {
-            try {
-              const data = JSON.parse(fs9.readFileSync(jsonPath, "utf-8"));
-              if (data.type === type) return path12.join(catDir, entry.name);
-            } catch {
-            }
-          }
-        }
-      } catch {
-      }
-    }
-    return null;
+    return this.providerLoader.findProviderDir(type);
   }
   /** GET /api/providers/:type/files — list all files in provider directory */
   async handleListFiles(type, _req, res) {
@@ -11437,10 +11477,9 @@ var DevServer = class _DevServer {
     }
     let targetDir;
     if (location === "user") {
-      targetDir = path12.join(os14.homedir(), ".adhdev", "providers", type);
+      targetDir = this.providerLoader.getUserProviderDir(category, type);
     } else {
-      const builtinDir = this.providerLoader.builtinDirs?.[0] || path12.resolve(__dirname, "../providers/_builtin");
-      targetDir = path12.join(builtinDir, category, type);
+      targetDir = this.providerLoader.getBuiltinProviderDir(category, type);
     }
     const jsonPath = path12.join(targetDir, "provider.json");
     if (fs9.existsSync(jsonPath)) {
@@ -12249,7 +12288,7 @@ var DevServer = class _DevServer {
       const domContext = null;
       this.sendAutoImplSSE({ event: "progress", data: { function: "_init", status: "loading_reference", message: `\uB808\uD37C\uB7F0\uC2A4 \uC2A4\uD06C\uB9BD\uD2B8 \uB85C\uB4DC \uC911 (${reference})...` } });
       let referenceScripts = {};
-      const builtinDir = this.providerLoader.builtinDirs?.[0] || path12.resolve(__dirname, "../providers/_builtin");
+      const builtinDir = this.providerLoader.getPrimaryBuiltinDir();
       const refDir = path12.join(builtinDir, "ide", reference);
       if (fs9.existsSync(refDir)) {
         const scriptsDir = path12.join(refDir, "scripts");