adhdev 0.6.51 → 0.6.52

package/dist/cli/index.js

@@ -5242,6 +5242,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)
@@ -5567,7 +5637,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;
@@ -5928,16 +5998,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);
@@ -27497,37 +27567,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) {
@@ -27922,10 +27962,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)) {
@@ -28734,7 +28773,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");
@@ -31384,7 +31423,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 = [
@@ -33009,11 +33048,9 @@ function registerProviderCommands(program2) {
       }).catch(async () => {
         const pathMod = await import("path");
         const fsMod = await import("fs");
-        const osMod = await import("os");
         const { ProviderLoader: ProviderLoader2 } = await Promise.resolve().then(() => (init_src(), src_exports));
         const loader = new ProviderLoader2();
-        const bDir = loader.builtinDirs[0];
-        let targetDir = location === "builtin" ? pathMod.join(bDir, category, type) : pathMod.join(osMod.homedir(), ".adhdev", "providers", type);
+        let targetDir = location === "builtin" ? loader.getBuiltinProviderDir(category, type) : loader.getUserProviderDir(category, type);
         if (fsMod.existsSync(targetDir)) return { error: `Provider already exists at ${targetDir}` };
         const isExt = category === "extension";
         const isIde = category === "ide";
@@ -33069,12 +33106,9 @@ function registerProviderCommands(program2) {
       const loader = new ProviderLoader2();
       loader.loadAll();
       const allProviders = loader.getAll();
-      const osMod = await import("os");
-      const pathMod = await import("path");
       const fsMod = await import("fs");
-      const userProviderDir = pathMod.join(osMod.homedir(), ".adhdev", "providers");
       const isUserProvider = (p) => {
-        const dir = pathMod.join(userProviderDir, p.type);
+        const dir = loader.getUserProviderDir(p.category, p.type);
         return fsMod.existsSync(dir) && !dir.includes(".upstream");
       };
       let type = typeArg;
@@ -33119,23 +33153,21 @@ function registerProviderCommands(program2) {
           console.log(import_chalk6.default.red("\n\u2717 Fix aborted.\n"));
           process.exit(1);
         }
-        const pathMod2 = await import("path");
+        const pathMod = await import("path");
         const fsMod2 = await import("fs");
-        const osMod2 = await import("os");
-        const bDir = loader.builtinDirs[0];
-        const builtinSrc = pathMod2.join(bDir, providerToFix.category, type);
-        const downloadedSrc = pathMod2.join(osMod2.homedir(), ".adhdev", "providers", ".upstream", providerToFix.category, type);
+        const builtinSrc = loader.getBuiltinProviderDir(providerToFix.category, type);
+        const downloadedSrc = loader.getUpstreamProviderDir(providerToFix.category, type);
         const sourceDir = fsMod2.existsSync(builtinSrc) ? builtinSrc : downloadedSrc;
         if (actionAnswer.action === "clone") {
           const newType = `my-${type}`;
-          const targetDir = pathMod2.join(osMod2.homedir(), ".adhdev", "providers", newType);
+          const targetDir = loader.getUserProviderDir(providerToFix.category, newType);
           if (fsMod2.existsSync(targetDir)) {
             console.log(import_chalk6.default.red(`
 \u2717 Target directory already exists: ${targetDir}. Please delete it or fix it directly.`));
             process.exit(1);
           }
           fsMod2.cpSync(sourceDir, targetDir, { recursive: true });
-          const pJsonPath = pathMod2.join(targetDir, "provider.json");
+          const pJsonPath = pathMod.join(targetDir, "provider.json");
           if (fsMod2.existsSync(pJsonPath)) {
             const pJson = JSON.parse(fsMod2.readFileSync(pJsonPath, "utf8"));
             pJson.type = newType;
@@ -33146,11 +33178,11 @@ function registerProviderCommands(program2) {
 \u2713 Successfully cloned to [${newType}]`));
           type = newType;
         } else if (actionAnswer.action === "inplace") {
-          const targetDir = pathMod2.join(osMod2.homedir(), ".adhdev", "providers", type);
+          const targetDir = loader.getUserProviderDir(providerToFix.category, type);
           if (!fsMod2.existsSync(targetDir)) {
             fsMod2.cpSync(sourceDir, targetDir, { recursive: true });
           }
-          const pJsonPath = pathMod2.join(targetDir, "provider.json");
+          const pJsonPath = pathMod.join(targetDir, "provider.json");
           if (fsMod2.existsSync(pJsonPath)) {
             const pJson = JSON.parse(fsMod2.readFileSync(pJsonPath, "utf8"));
             pJson.disableUpstream = true;
@@ -33265,11 +33297,14 @@ function registerProviderCommands(program2) {
         if (!startResult.started || !startResult.sseUrl) {
           throw new Error(`Unexpected response: ${JSON.stringify(startResult)}`);
         }
-        const pathMod2 = await import("path");
-        const osPaths = await import("os");
-        const targetDir = pathMod2.join(osPaths.homedir(), ".adhdev", "providers", type);
+        const pathMod = await import("path");
+        const { ProviderLoader: ProviderLoader3 } = await Promise.resolve().then(() => (init_src(), src_exports));
+        const loader2 = new ProviderLoader3();
+        loader2.loadAll();
+        const providerMeta = loader2.getMeta(type);
+        const targetDir = providerMeta ? loader2.getUserProviderDir(providerMeta.category, type) : pathMod.join(loader2.getUserDir(), type);
         const fsMock = await import("fs");
-        const logFile2 = pathMod2.join(targetDir, `auto-impl.log`);
+        const logFile2 = pathMod.join(targetDir, `auto-impl.log`);
         fsMock.writeFileSync(logFile2, `=== Auto-Impl Started ===
 `);
         console.log(import_chalk6.default.gray(`  Agent logs: ${logFile2}`));
@@ -33447,11 +33482,21 @@ function registerProviderCommands(program2) {
       }).catch(async () => {
         const pathMod = await import("path");
         const fsMod = await import("fs");
-        const osMod = await import("os");
+        const { ProviderLoader: ProviderLoader2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+        const loader = new ProviderLoader2();
+        loader.loadAll();
+        const providerMeta = loader.getMeta(type);
         const possiblePaths = [
-          pathMod.join(osMod.homedir(), ".adhdev", "providers", type, "provider.js"),
-          pathMod.join(new (await Promise.resolve().then(() => (init_src(), src_exports))).ProviderLoader().builtinDirs[0], "ide", type, "provider.js"),
-          pathMod.join(new (await Promise.resolve().then(() => (init_src(), src_exports))).ProviderLoader().builtinDirs[0], "extension", type, "provider.js")
+          ...providerMeta ? [
+            pathMod.join(loader.getUserProviderDir(providerMeta.category, type), "provider.js"),
+            pathMod.join(loader.getUpstreamProviderDir(providerMeta.category, type), "provider.js"),
+            pathMod.join(loader.getBuiltinProviderDir(providerMeta.category, type), "provider.js")
+          ] : [],
+          pathMod.join(loader.getUserDir(), type, "provider.js"),
+          pathMod.join(loader.getUpstreamDir(), "ide", type, "provider.js"),
+          pathMod.join(loader.getUpstreamDir(), "extension", type, "provider.js"),
+          pathMod.join(loader.getPrimaryBuiltinDir(), "ide", type, "provider.js"),
+          pathMod.join(loader.getPrimaryBuiltinDir(), "extension", type, "provider.js")
         ];
         for (const p of possiblePaths) {
           if (fsMod.existsSync(p)) {