adhdev 0.6.51 → 0.6.52

package/dist/index.js

@@ -5074,6 +5074,76 @@ var init_provider_loader = __esm({
       }
       // ─── 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)
@@ -5399,7 +5469,7 @@ var init_provider_loader = __esm({
        * 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;
@@ -5760,16 +5830,16 @@ var init_provider_loader = __esm({
       // ─── 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);
@@ -27300,37 +27370,7 @@ var init_dev_server = __esm({
       // ─── 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) {
@@ -27725,10 +27765,9 @@ var init_dev_server = __esm({
         }
         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)) {
@@ -28537,7 +28576,7 @@ var init_dev_server = __esm({
           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");
@@ -30944,7 +30983,7 @@ var init_adhdev_daemon = __esm({
     fs11 = __toESM(require("fs"));
     path14 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.6.51";
+    pkgVersion = "0.6.52";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [