@ada-mcp/mcp-server 0.1.24 → 0.1.25

package/dist/cli.cjs

@@ -5578,15 +5578,60 @@ function isPluginModule(mod) {
   const m = mod.manifest;
   return !!m && typeof m.id === "string" && Array.isArray(m.platforms);
 }
+function entryScriptDir() {
+  const argv1 = process.argv[1]?.trim();
+  if (!argv1) {
+    return void 0;
+  }
+  try {
+    return import_node_path6.default.dirname(import_node_path6.default.resolve(argv1));
+  } catch {
+    return void 0;
+  }
+}
 function resolvePluginDirs(explicitPluginDir) {
-  const fromEnv = process.env.ADA_PLUGIN_DIR?.trim();
-  const execDir = import_node_path6.default.dirname(process.execPath);
+  const ordered = [];
+  const push = (dir) => {
+    const trimmed = dir?.trim();
+    if (!trimmed) {
+      return;
+    }
+    ordered.push(import_node_path6.default.resolve(trimmed));
+  };
+  push(explicitPluginDir);
+  push(process.env.ADA_PLUGIN_DIR);
+  const entryDir = entryScriptDir();
+  if (entryDir) {
+    push(import_node_path6.default.join(entryDir, "plugins"));
+    push(import_node_path6.default.join(entryDir, "..", "plugins"));
+  }
+  if (typeof __filename === "string") {
+    const fromModule = import_node_path6.default.dirname(__filename);
+    push(import_node_path6.default.join(fromModule, "plugins"));
+    push(import_node_path6.default.join(fromModule, "..", "plugins"));
+  }
+  const initCwd = process.env.INIT_CWD?.trim();
+  if (initCwd) {
+    push(import_node_path6.default.join(initCwd, "plugins"));
+    push(import_node_path6.default.join(initCwd, "release", "plugins"));
+  }
   const cwd = process.cwd();
-  return Array.from(
-    new Set(
-      [fromEnv, explicitPluginDir, import_node_path6.default.join(execDir, "plugins"), import_node_path6.default.join(cwd, "plugins"), import_node_path6.default.join(cwd, "release", "plugins")].filter((x) => Boolean(x && x.trim())).map((x) => import_node_path6.default.resolve(x))
-    )
-  );
+  push(import_node_path6.default.join(cwd, "plugins"));
+  push(import_node_path6.default.join(cwd, "release", "plugins"));
+  const seen = /* @__PURE__ */ new Set();
+  return ordered.filter((dir) => {
+    if (seen.has(dir)) {
+      return false;
+    }
+    seen.add(dir);
+    return true;
+  });
+}
+function pluginDirHasModules(pluginDir) {
+  if (!import_node_fs2.default.existsSync(pluginDir)) {
+    return false;
+  }
+  return import_node_fs2.default.readdirSync(pluginDir, { withFileTypes: true }).some((ent) => ent.isFile() && (ent.name.endsWith(".cjs") || ent.name.endsWith(".js")));
 }
 function loadPluginFromModule(requireFn, moduleId) {
   try {
@@ -5612,6 +5657,9 @@ function registerPluginsFromDirectory(host, pluginDir) {
     if (!plugin) {
       continue;
     }
+    if (host.listManifests().some((m) => m.id === plugin.manifest.id)) {
+      continue;
+    }
     host.register(plugin);
     loaded.push(plugin.manifest);
   }
@@ -5631,12 +5679,14 @@ function registerPluginsFromModuleIds(host, moduleIds) {
   return loaded;
 }
 function registerRuntimePlugins(host, options) {
-  const manifests2 = [];
   for (const pluginDir of resolvePluginDirs(options?.pluginDir)) {
-    manifests2.push(...registerPluginsFromDirectory(host, pluginDir));
-  }
-  if (manifests2.length > 0) {
-    return manifests2;
+    if (!pluginDirHasModules(pluginDir)) {
+      continue;
+    }
+    const loaded = registerPluginsFromDirectory(host, pluginDir);
+    if (loaded.length > 0) {
+      return loaded;
+    }
   }
   const fallbackModuleIds = options?.moduleIds?.length ? options.moduleIds : DEFAULT_PLUGIN_MODULE_IDS;
   return registerPluginsFromModuleIds(host, fallbackModuleIds);
@@ -18136,53 +18186,72 @@ var init_streamableHttp = __esm({
 });
 
 // src/executor.ts
-function ensureBundledPluginDir() {
-  if (process.env.ADA_PLUGIN_DIR?.trim()) {
-    return;
-  }
+function resolveBundledPluginDir() {
   const candidates = [];
-  try {
-    const here = import_node_path11.default.dirname((0, import_node_url3.fileURLToPath)(import_meta.url));
-    candidates.push(import_node_path11.default.join(here, "..", "plugins"));
-  } catch {
+  const argv1 = process.argv[1]?.trim();
+  if (argv1) {
+    const entryDir = import_node_path11.default.dirname(import_node_path11.default.resolve(argv1));
+    candidates.push(import_node_path11.default.join(entryDir, "plugins"));
+    candidates.push(import_node_path11.default.join(entryDir, "..", "plugins"));
   }
   const dirname = globalThis.__dirname;
   if (typeof dirname === "string") {
+    candidates.push(import_node_path11.default.join(dirname, "plugins"));
     candidates.push(import_node_path11.default.join(dirname, "..", "plugins"));
   }
+  try {
+    const here = import_node_path11.default.dirname((0, import_node_url3.fileURLToPath)(import_meta.url));
+    candidates.push(import_node_path11.default.join(here, "plugins"));
+    candidates.push(import_node_path11.default.join(here, "..", "plugins"));
+  } catch {
+  }
+  const seen = /* @__PURE__ */ new Set();
   for (const dir of candidates) {
-    if ((0, import_node_fs4.existsSync)(dir)) {
-      process.env.ADA_PLUGIN_DIR = dir;
-      return;
+    const resolved = import_node_path11.default.resolve(dir);
+    if (seen.has(resolved) || !(0, import_node_fs4.existsSync)(resolved)) {
+      continue;
     }
+    seen.add(resolved);
+    return resolved;
   }
+  return void 0;
 }
-function buildPluginHost2() {
-  ensureBundledPluginDir();
+function getPluginHost() {
+  if (sharedHost) {
+    return sharedHost;
+  }
+  const bundledDir = resolveBundledPluginDir();
   const host = new PluginHost();
-  registerRuntimePlugins(host);
+  registerRuntimePlugins(host, bundledDir ? { pluginDir: bundledDir } : void 0);
+  sharedHost = host;
   return host;
 }
+function getExecutor() {
+  if (!sharedExecutor) {
+    sharedExecutor = new TaskExecutor(getPluginHost());
+  }
+  return sharedExecutor;
+}
 async function runCommand3(command) {
-  return sharedExecutor.execute(command);
+  return getExecutor().execute(command);
 }
 async function runTaskset2(commands) {
   const results = [];
   for (const command of commands) {
-    results.push(await sharedExecutor.execute(command));
+    results.push(await runCommand3(command));
   }
   return results;
 }
 function listActiveSessions() {
-  return sharedExecutor.listSessions();
+  return getExecutor().listSessions();
 }
 async function closeSession(platform, sessionId, options) {
-  return sharedExecutor.closeSession(platform, sessionId, options);
+  return getExecutor().closeSession(platform, sessionId, options);
 }
 async function closeAllSessions() {
-  return sharedExecutor.closeAllSessions();
+  return getExecutor().closeAllSessions();
 }
-var import_node_fs4, import_node_path11, import_node_url3, import_meta, manifests, sharedExecutor;
+var import_node_fs4, import_node_path11, import_node_url3, import_meta, sharedHost, sharedExecutor;
 var init_executor = __esm({
   "src/executor.ts"() {
     "use strict";
@@ -18192,8 +18261,8 @@ var init_executor = __esm({
     init_src7();
     init_src4();
     import_meta = {};
-    manifests = registerRuntimePlugins(new PluginHost());
-    sharedExecutor = new TaskExecutor(buildPluginHost2());
+    sharedHost = null;
+    sharedExecutor = null;
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-mcp/mcp-server",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "ADA MCP server for web/mobile automation (stdio + remote HTTP)",
   "private": false,
   "type": "commonjs",