@within-7/minto 0.3.10 → 0.4.1

package/dist/utils/pluginLoader.js

@@ -5,27 +5,48 @@ import {
   statSync,
   writeFileSync
 } from "fs";
-import { join, basename } from "path";
+import { debug as debugLogger } from "./debugLogger.js";
+import { join, resolve, basename } from "path";
 import { homedir } from "os";
 import matter from "gray-matter";
+import { validatePluginDirectory } from "../services/plugins/pluginValidation.js";
 import {
   PluginManifestSchema,
   PluginError,
   PluginErrorCode
 } from "../types/plugin.js";
 import { getCwd } from "./state.js";
+let extraPluginDirs = [];
+function addExtraPluginDir(dir) {
+  const resolved = resolve(dir);
+  if (!extraPluginDirs.includes(resolved)) {
+    extraPluginDirs.push(resolved);
+  }
+}
+function getManagedPluginsDir() {
+  if (process.platform === "darwin") {
+    return "/Library/Application Support/Minto/managed-plugins";
+  }
+  return "/etc/minto/managed-plugins";
+}
 function getPluginDirectories() {
   const cwd = getCwd();
   const home = homedir();
   return [
+    getManagedPluginsDir(),
+    // Managed (enterprise, read-only, lowest)
     join(home, ".claude", "plugins"),
     // User global (legacy)
     join(home, ".minto", "plugins"),
     // User global
     join(cwd, ".claude", "plugins"),
     // Project (legacy)
-    join(cwd, ".minto", "plugins")
-    // Project (highest priority)
+    join(cwd, ".minto", "plugins"),
+    // Project
+    join(cwd, ".minto", "plugins.local"),
+    // Project local (gitignored)
+    ...extraPluginDirs
+    // CLI --plugin-dir (highest priority)
   ];
 }
 function discoverPluginPaths() {
@@ -95,7 +116,7 @@ function loadAgents(pluginPath, manifest) {
   for (const agentPath of manifest.agents || []) {
     const fullPath = join(pluginPath, agentPath);
     if (!existsSync(fullPath)) {
-      console.warn(`Agent file not found: ${fullPath}`);
+      debugLogger.warn("PLUGIN_LOADER", `Agent file not found: ${fullPath}`);
       continue;
     }
     try {
@@ -114,7 +135,10 @@ function loadAgents(pluginPath, manifest) {
         pluginName: manifest.name
       });
     } catch (error) {
-      console.error(`Error loading agent ${agentPath}:`, error);
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Error loading agent ${agentPath}: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
   if (existsSync(agentsDir) && statSync(agentsDir).isDirectory()) {
@@ -138,7 +162,10 @@ function loadAgents(pluginPath, manifest) {
           pluginName: manifest.name
         });
       } catch (error) {
-        console.error(`Error loading agent ${file}:`, error);
+        debugLogger.warn(
+          "PLUGIN_LOADER",
+          `Error loading agent ${file}: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
     }
   }
@@ -150,7 +177,7 @@ function loadCommands(pluginPath, manifest) {
   for (const commandPath of manifest.commands || []) {
     const fullPath = join(pluginPath, commandPath);
     if (!existsSync(fullPath)) {
-      console.warn(`Command file not found: ${fullPath}`);
+      debugLogger.warn("PLUGIN_LOADER", `Command file not found: ${fullPath}`);
       continue;
     }
     try {
@@ -173,7 +200,10 @@ function loadCommands(pluginPath, manifest) {
         pluginName: manifest.name
       });
     } catch (error) {
-      console.error(`Error loading command ${commandPath}:`, error);
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Error loading command ${commandPath}: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
   if (existsSync(commandsDir) && statSync(commandsDir).isDirectory()) {
@@ -201,7 +231,10 @@ function loadCommands(pluginPath, manifest) {
           pluginName: manifest.name
         });
       } catch (error) {
-        console.error(`Error loading command ${file}:`, error);
+        debugLogger.warn(
+          "PLUGIN_LOADER",
+          `Error loading command ${file}: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
     }
   }
@@ -213,7 +246,7 @@ function loadSkills(pluginPath, manifest) {
   for (const skillPath of manifest.skills || []) {
     const fullPath = join(pluginPath, skillPath);
     if (!existsSync(fullPath)) {
-      console.warn(`Skill file not found: ${fullPath}`);
+      debugLogger.warn("PLUGIN_LOADER", `Skill file not found: ${fullPath}`);
       continue;
     }
     try {
@@ -231,7 +264,10 @@ function loadSkills(pluginPath, manifest) {
         source: "plugin"
       });
     } catch (error) {
-      console.error(`Error loading skill ${skillPath}:`, error);
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Error loading skill ${skillPath}: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
   if (existsSync(skillsDir) && statSync(skillsDir).isDirectory()) {
@@ -256,7 +292,10 @@ function loadSkills(pluginPath, manifest) {
               source: "plugin"
             });
           } catch (error) {
-            console.error(`Error loading skill from ${skillMdPath}:`, error);
+            debugLogger.warn(
+              "PLUGIN_LOADER",
+              `Error loading skill from ${skillMdPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
           }
         }
       } else if (entry.isFile() && entry.name.endsWith(".md")) {
@@ -277,7 +316,10 @@ function loadSkills(pluginPath, manifest) {
             source: "plugin"
           });
         } catch (error) {
-          console.error(`Error loading skill ${entry.name}:`, error);
+          debugLogger.warn(
+            "PLUGIN_LOADER",
+            `Error loading skill ${entry.name}: ${error instanceof Error ? error.message : String(error)}`
+          );
         }
       }
     }
@@ -295,7 +337,10 @@ function loadHooks(pluginPath, manifest) {
     const content = readFileSync(hooksJsonPath, "utf-8");
     const hooksConfig = JSON.parse(content);
     if (!hooksConfig.hooks || typeof hooksConfig.hooks !== "object") {
-      console.warn(`Invalid hooks.json in ${pluginPath}: missing "hooks" field`);
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Invalid hooks.json in ${pluginPath}: missing "hooks" field`
+      );
       return hooks;
     }
     for (const [eventName, matchers] of Object.entries(
@@ -313,8 +358,7 @@ function loadHooks(pluginPath, manifest) {
               matcher: matcher.matcher,
               type: hookDef.type || "command",
               command: hookDef.command,
-              message: hookDef.prompt,
-              // Claude Code uses "prompt", we use "message" internally
+              prompt: hookDef.prompt,
               blocking: hookDef.type === "prompt",
               timeout: hookDef.timeout || 60
             },
@@ -326,7 +370,10 @@ function loadHooks(pluginPath, manifest) {
       }
     }
   } catch (error) {
-    console.error(`Error loading hooks from ${hooksJsonPath}:`, error);
+    debugLogger.warn(
+      "PLUGIN_LOADER",
+      `Error loading hooks from ${hooksJsonPath}: ${error instanceof Error ? error.message : String(error)}`
+    );
   }
   return hooks;
 }
@@ -389,7 +436,10 @@ function loadMCPServers(pluginPath, manifest) {
         mcpJsonServers = parsed.mcpServers;
       }
     } catch (error) {
-      console.error(`Error loading .mcp.json from ${pluginPath}:`, error);
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Error loading .mcp.json from ${pluginPath}: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
   let inlineServers = {};
@@ -402,13 +452,15 @@ function loadMCPServers(pluginPath, manifest) {
       const expandedConfig = expandServerConfig(config, pluginPath);
       const serverType = expandedConfig.type || "stdio";
       if (serverType === "stdio" && !expandedConfig.command) {
-        console.warn(
+        debugLogger.warn(
+          "PLUGIN_LOADER",
           `MCP server "${name}" in ${manifest.name} is missing required "command" field for stdio type`
         );
         continue;
       }
       if ((serverType === "http" || serverType === "sse") && !expandedConfig.url) {
-        console.warn(
+        debugLogger.warn(
+          "PLUGIN_LOADER",
           `MCP server "${name}" in ${manifest.name} is missing required "url" field for ${serverType} type`
         );
         continue;
@@ -425,14 +477,72 @@ function loadMCPServers(pluginPath, manifest) {
         pluginName: manifest.name
       });
     } catch (error) {
-      console.error(
-        `Error loading MCP server "${name}" from ${manifest.name}:`,
-        error
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Error loading MCP server "${name}" from ${manifest.name}: ${error instanceof Error ? error.message : String(error)}`
       );
     }
   }
   return mcpServers;
 }
+function loadLSPServers(pluginPath, manifest) {
+  const lspServers = [];
+  const lspJsonPath = join(pluginPath, ".lsp.json");
+  let lspJsonServers = {};
+  if (existsSync(lspJsonPath)) {
+    try {
+      const content = readFileSync(lspJsonPath, "utf-8");
+      const parsed = JSON.parse(content);
+      if (parsed.lspServers && typeof parsed.lspServers === "object") {
+        lspJsonServers = parsed.lspServers;
+      } else if (typeof parsed === "object" && !Array.isArray(parsed)) {
+        lspJsonServers = parsed;
+      }
+    } catch (error) {
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Error loading .lsp.json from ${pluginPath}: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  const manifestData = manifest;
+  let inlineServers = {};
+  if (manifestData.lspServers && typeof manifestData.lspServers === "object" && !Array.isArray(manifestData.lspServers)) {
+    inlineServers = manifestData.lspServers;
+  }
+  const allServers = { ...lspJsonServers, ...inlineServers };
+  for (const [name, config] of Object.entries(allServers)) {
+    try {
+      const expandedConfig = expandServerConfig(config, pluginPath);
+      if (!expandedConfig.command) {
+        debugLogger.warn(
+          "PLUGIN_LOADER",
+          `LSP server "${name}" in ${manifest.name} is missing required "command" field`
+        );
+        continue;
+      }
+      lspServers.push({
+        name,
+        filePath: existsSync(lspJsonPath) ? lspJsonPath : join(pluginPath, "plugin.json"),
+        config: {
+          command: expandedConfig.command,
+          args: expandedConfig.args || [],
+          env: expandedConfig.env || {},
+          filePatterns: expandedConfig.filePatterns,
+          languages: expandedConfig.languages,
+          initializationOptions: expandedConfig.initializationOptions
+        },
+        pluginName: manifest.name
+      });
+    } catch (error) {
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Error loading LSP server "${name}" from ${manifest.name}: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  return lspServers;
+}
 function determinePluginSource(pluginPath) {
   const home = homedir();
   const cwd = getCwd();
@@ -461,22 +571,63 @@ function determinePluginSource(pluginPath) {
         };
       }
     } catch (error) {
-      console.warn(
-        `Failed to read marketplace metadata from ${marketplaceMetaPath}:`,
-        error
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Failed to read marketplace metadata from ${marketplaceMetaPath}: ${error instanceof Error ? error.message : String(error)}`
       );
     }
   }
-  if (pluginPath.startsWith(join(home, ".minto", "plugins"))) {
+  const managedDir = getManagedPluginsDir();
+  if (pluginPath.startsWith(managedDir)) {
+    return { type: "local", path: "managed" };
+  } else if (pluginPath.startsWith(join(home, ".minto", "plugins"))) {
     return { type: "local", path: "user-global" };
+  } else if (pluginPath.startsWith(join(cwd, ".minto", "plugins.local"))) {
+    return { type: "local", path: "local" };
   } else if (pluginPath.startsWith(join(cwd, ".minto", "plugins"))) {
     return { type: "local", path: "project" };
   } else {
     return { type: "local", path: pluginPath };
   }
 }
+function loadPluginSettings(pluginPath) {
+  const settingsPaths = [
+    join(pluginPath, ".minto-plugin", "settings.json"),
+    join(pluginPath, ".claude-plugin", "settings.json"),
+    join(pluginPath, "settings.json")
+  ];
+  for (const settingsPath of settingsPaths) {
+    if (!existsSync(settingsPath)) continue;
+    try {
+      const content = readFileSync(settingsPath, "utf-8");
+      const parsed = JSON.parse(content);
+      if (parsed.agent && typeof parsed.agent === "object") {
+        return parsed.agent;
+      }
+      return parsed;
+    } catch (error) {
+      debugLogger.warn(
+        "PLUGIN_LOADER",
+        `Failed to parse plugin settings from ${settingsPath}: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  return null;
+}
 function loadPlugin(pluginPath) {
   const manifest = loadManifest(pluginPath);
+  try {
+    const validation = validatePluginDirectory(pluginPath);
+    if (validation.warnings.length > 0) {
+      for (const warning of validation.warnings) {
+        debugLogger.warn(
+          "PLUGIN_LOADER",
+          `Plugin "${manifest.name}": ${warning}`
+        );
+      }
+    }
+  } catch {
+  }
   const source = determinePluginSource(pluginPath);
   const pluginConfig = loadPluginConfig(pluginPath);
   const agents = loadAgents(pluginPath, manifest);
@@ -484,6 +635,8 @@ function loadPlugin(pluginPath) {
   const skills = loadSkills(pluginPath, manifest);
   const hooks = loadHooks(pluginPath, manifest);
   const mcpServers = loadMCPServers(pluginPath, manifest);
+  const lspServers = loadLSPServers(pluginPath, manifest);
+  const settings = loadPluginSettings(pluginPath);
   return {
     manifest,
     name: manifest.name,
@@ -494,8 +647,10 @@ function loadPlugin(pluginPath) {
     skills,
     hooks,
     mcpServers,
+    lspServers,
     enabled: pluginConfig.enabled,
-    config: pluginConfig.config
+    config: pluginConfig.config,
+    settings
   };
 }
 function loadAllPlugins() {
@@ -507,9 +662,15 @@ function loadAllPlugins() {
       plugins.push(plugin);
     } catch (error) {
       if (error instanceof PluginError) {
-        console.error(`Error loading plugin ${name}:`, error.message);
+        debugLogger.warn(
+          "PLUGIN_LOADER",
+          `Error loading plugin ${name}: ${error.message}`
+        );
       } else {
-        console.error(`Unexpected error loading plugin ${name}:`, error);
+        debugLogger.warn(
+          "PLUGIN_LOADER",
+          `Unexpected error loading plugin ${name}: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
     }
   }
@@ -522,7 +683,10 @@ function getPlugin(name) {
   try {
     return loadPlugin(pluginPath);
   } catch (error) {
-    console.error(`Error loading plugin ${name}:`, error);
+    debugLogger.warn(
+      "PLUGIN_LOADER",
+      `Error loading plugin ${name}: ${error instanceof Error ? error.message : String(error)}`
+    );
     return void 0;
   }
 }
@@ -555,7 +719,10 @@ function loadPluginConfig(pluginPath) {
       config: data.config || {}
     };
   } catch (error) {
-    console.error(`Error loading plugin config from ${configPath}:`, error);
+    debugLogger.warn(
+      "PLUGIN_LOADER",
+      `Error loading plugin config from ${configPath}: ${error instanceof Error ? error.message : String(error)}`
+    );
     return { enabled: true, config: {} };
   }
 }
@@ -620,12 +787,14 @@ function updatePluginConfig(pluginName, config) {
   savePluginConfig(plugin.location, plugin.enabled, config);
 }
 export {
+  addExtraPluginDir,
   disablePlugin,
   enablePlugin,
   getPlugin,
   listPlugins,
   loadAllPlugins,
   loadPlugin,
+  loadPluginSettings,
   togglePluginEnabled,
   updatePluginConfig
 };