@ada-mcp/mcp-server 0.1.24 → 0.1.26

package/dist/cli.cjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+if (!process.env.ADA_MCP_SERVER_ENTRY) process.env.ADA_MCP_SERVER_ENTRY = __filename;
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -5555,6 +5556,66 @@ var init_src3 = __esm({
   }
 });
 
+// ../../packages/plugin-host/src/resolve-plugin-dir.ts
+function resolvePackagePluginDir() {
+  const candidates = [];
+  const push = (dir) => {
+    const trimmed = dir?.trim();
+    if (!trimmed) {
+      return;
+    }
+    candidates.push(import_node_path6.default.resolve(trimmed));
+  };
+  push(process.env.ADA_PLUGIN_DIR);
+  const entryFromEnv = process.env.ADA_MCP_SERVER_ENTRY?.trim();
+  if (entryFromEnv) {
+    const entryDir = import_node_path6.default.dirname(import_node_path6.default.resolve(entryFromEnv));
+    push(import_node_path6.default.join(entryDir, "plugins"));
+    push(import_node_path6.default.join(entryDir, "..", "plugins"));
+  }
+  const argv1 = process.argv[1]?.trim();
+  if (argv1) {
+    const entryDir = import_node_path6.default.dirname(import_node_path6.default.resolve(argv1));
+    push(import_node_path6.default.join(entryDir, "plugins"));
+    push(import_node_path6.default.join(entryDir, "..", "plugins"));
+  }
+  if (typeof __filename === "string") {
+    const fromFile = import_node_path6.default.dirname(__filename);
+    push(import_node_path6.default.join(fromFile, "plugins"));
+    push(import_node_path6.default.join(fromFile, "..", "plugins"));
+  }
+  try {
+    const req = (0, import_node_module2.createRequire)(typeof __filename === "string" ? __filename : process.cwd());
+    for (const specifier of ["@ada-mcp/mcp-server/package.json", "@ada-mcp/mcp-server"]) {
+      try {
+        const resolved = req.resolve(specifier);
+        const root = specifier.endsWith("package.json") ? import_node_path6.default.dirname(resolved) : import_node_path6.default.join(import_node_path6.default.dirname(resolved), "..");
+        push(import_node_path6.default.join(root, "plugins"));
+      } catch {
+      }
+    }
+  } catch {
+  }
+  const seen = /* @__PURE__ */ new Set();
+  for (const dir of candidates) {
+    if (seen.has(dir) || !(0, import_node_fs2.existsSync)(dir)) {
+      continue;
+    }
+    seen.add(dir);
+    return dir;
+  }
+  return void 0;
+}
+var import_node_fs2, import_node_path6, import_node_module2;
+var init_resolve_plugin_dir = __esm({
+  "../../packages/plugin-host/src/resolve-plugin-dir.ts"() {
+    "use strict";
+    import_node_fs2 = require("node:fs");
+    import_node_path6 = __toESM(require("node:path"), 1);
+    import_node_module2 = require("node:module");
+  }
+});
+
 // ../../packages/plugin-host/src/index.ts
 function assertManifest(plugin) {
   const m = plugin.manifest;
@@ -5578,15 +5639,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_path7.default.dirname(import_node_path7.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_path7.default.resolve(trimmed));
+  };
+  push(explicitPluginDir);
+  push(process.env.ADA_PLUGIN_DIR);
+  const entryDir = entryScriptDir();
+  if (entryDir) {
+    push(import_node_path7.default.join(entryDir, "plugins"));
+    push(import_node_path7.default.join(entryDir, "..", "plugins"));
+  }
+  if (typeof __filename === "string") {
+    const fromModule = import_node_path7.default.dirname(__filename);
+    push(import_node_path7.default.join(fromModule, "plugins"));
+    push(import_node_path7.default.join(fromModule, "..", "plugins"));
+  }
+  const initCwd = process.env.INIT_CWD?.trim();
+  if (initCwd) {
+    push(import_node_path7.default.join(initCwd, "plugins"));
+    push(import_node_path7.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_path7.default.join(cwd, "plugins"));
+  push(import_node_path7.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_fs3.default.existsSync(pluginDir)) {
+    return false;
+  }
+  return import_node_fs3.default.readdirSync(pluginDir, { withFileTypes: true }).some((ent) => ent.isFile() && (ent.name.endsWith(".cjs") || ent.name.endsWith(".js")));
 }
 function loadPluginFromModule(requireFn, moduleId) {
   try {
@@ -5598,27 +5704,30 @@ function loadPluginFromModule(requireFn, moduleId) {
   }
 }
 function registerPluginsFromDirectory(host, pluginDir) {
-  if (!import_node_fs2.default.existsSync(pluginDir)) {
+  if (!import_node_fs3.default.existsSync(pluginDir)) {
     return [];
   }
-  const entries = import_node_fs2.default.readdirSync(pluginDir, { withFileTypes: true }).filter((ent) => ent.isFile() && (ent.name.endsWith(".cjs") || ent.name.endsWith(".js"))).map((ent) => import_node_path6.default.join(pluginDir, ent.name)).sort((a, b) => a.localeCompare(b));
+  const entries = import_node_fs3.default.readdirSync(pluginDir, { withFileTypes: true }).filter((ent) => ent.isFile() && (ent.name.endsWith(".cjs") || ent.name.endsWith(".js"))).map((ent) => import_node_path7.default.join(pluginDir, ent.name)).sort((a, b) => a.localeCompare(b));
   if (entries.length === 0) {
     return [];
   }
   const loaded = [];
   for (const file2 of entries) {
-    const requireFn = (0, import_node_module2.createRequire)(file2);
+    const requireFn = (0, import_node_module3.createRequire)(file2);
     const plugin = loadPluginFromModule(requireFn, file2);
     if (!plugin) {
       continue;
     }
+    if (host.listManifests().some((m) => m.id === plugin.manifest.id)) {
+      continue;
+    }
     host.register(plugin);
     loaded.push(plugin.manifest);
   }
   return loaded;
 }
 function registerPluginsFromModuleIds(host, moduleIds) {
-  const req = (0, import_node_module2.createRequire)(typeof __filename === "string" ? __filename : process.cwd());
+  const req = (0, import_node_module3.createRequire)(typeof __filename === "string" ? __filename : process.cwd());
   const loaded = [];
   for (const moduleId of moduleIds) {
     const plugin = loadPluginFromModule(req, moduleId);
@@ -5631,24 +5740,27 @@ 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);
 }
-var import_node_fs2, import_node_path6, import_node_module2, PluginHost, DEFAULT_PLUGIN_MODULE_IDS;
+var import_node_fs3, import_node_path7, import_node_module3, PluginHost, DEFAULT_PLUGIN_MODULE_IDS;
 var init_src4 = __esm({
   "../../packages/plugin-host/src/index.ts"() {
     "use strict";
     init_src3();
-    import_node_fs2 = __toESM(require("node:fs"), 1);
-    import_node_path6 = __toESM(require("node:path"), 1);
-    import_node_module2 = require("node:module");
+    import_node_fs3 = __toESM(require("node:fs"), 1);
+    import_node_path7 = __toESM(require("node:path"), 1);
+    import_node_module3 = require("node:module");
+    init_resolve_plugin_dir();
     PluginHost = class {
       plugins = /* @__PURE__ */ new Map();
       webEngines = /* @__PURE__ */ new Map();
@@ -5762,12 +5874,12 @@ var init_src4 = __esm({
 // ../ada-agent/src/plugin-registry.ts
 function buildPluginHost() {
   const host = new PluginHost();
-  registerRuntimePlugins(host);
+  const pluginDir = resolvePackagePluginDir();
+  registerRuntimePlugins(host, pluginDir ? { pluginDir } : void 0);
   return host;
 }
 function listBuiltInPluginManifests() {
-  const host = new PluginHost();
-  return registerRuntimePlugins(host);
+  return buildPluginHost().listManifests();
 }
 var init_plugin_registry = __esm({
   "../ada-agent/src/plugin-registry.ts"() {
@@ -5797,9 +5909,9 @@ async function isPortAvailable(host, port) {
 async function runDoctor(config2) {
   const root = await resolveWorkspaceRoot2(process.cwd());
   const queue = {
-    inboxDir: import_node_path7.default.resolve(root, config2.queue.inboxDir),
-    processedDir: import_node_path7.default.resolve(root, config2.queue.processedDir),
-    failedDir: import_node_path7.default.resolve(root, config2.queue.failedDir)
+    inboxDir: import_node_path8.default.resolve(root, config2.queue.inboxDir),
+    processedDir: import_node_path8.default.resolve(root, config2.queue.processedDir),
+    failedDir: import_node_path8.default.resolve(root, config2.queue.failedDir)
   };
   const deps = await getDependencyHealth(config2);
   const portFree = await isPortAvailable(config2.bootstrapUI.host, config2.bootstrapUI.port);
@@ -5910,7 +6022,7 @@ async function checkNativeBootstrap(config2, root) {
   const hasPathHint = native.command.includes("/") || native.command.includes("\\") || native.command.startsWith(".");
   let reachable = false;
   if (hasPathHint) {
-    const resolved = import_node_path7.default.resolve(root, native.command);
+    const resolved = import_node_path8.default.resolve(root, native.command);
     reachable = await fileExists2(resolved);
   } else {
     reachable = await commandExists(native.command);
@@ -5950,12 +6062,12 @@ async function checkAppiumServer(serverUrl) {
     };
   }
 }
-var import_promises6, import_node_net, import_node_path7, import_node_url, import_node_child_process3;
+var import_promises6, import_node_net, import_node_path8, import_node_url, import_node_child_process3;
 var init_doctor = __esm({
   "../ada-agent/src/doctor.ts"() {
     import_promises6 = __toESM(require("node:fs/promises"));
     import_node_net = __toESM(require("node:net"));
-    import_node_path7 = __toESM(require("node:path"));
+    import_node_path8 = __toESM(require("node:path"));
     import_node_url = require("node:url");
     import_node_child_process3 = require("node:child_process");
     init_dependency_installer();
@@ -7362,11 +7474,11 @@ function getScreenshotPath(result) {
   return typeof pathValue === "string" ? pathValue : null;
 }
 function buildMonitorOutputPath(config2, sourcePath, requestId, sessionId) {
-  const ext = import_node_path8.default.extname(sourcePath) || ".png";
+  const ext = import_node_path9.default.extname(sourcePath) || ".png";
   if (config2.monitoring.groupBySession) {
-    return import_node_path8.default.join(config2.monitoring.outputDir, sessionId, `${requestId}${ext}`);
+    return import_node_path9.default.join(config2.monitoring.outputDir, sessionId, `${requestId}${ext}`);
   }
-  return import_node_path8.default.join(config2.monitoring.outputDir, `${requestId}${ext}`);
+  return import_node_path9.default.join(config2.monitoring.outputDir, `${requestId}${ext}`);
 }
 async function captureOperationMonitor(command, result, index, context) {
   if (!shouldMonitorCommand(command, context.config, index)) {
@@ -7388,7 +7500,7 @@ async function captureOperationMonitor(command, result, index, context) {
     return;
   }
   const targetPath = buildMonitorOutputPath(context.config, sourcePath, command.requestId, command.sessionId);
-  await import_promises9.default.mkdir(import_node_path8.default.dirname(targetPath), { recursive: true });
+  await import_promises9.default.mkdir(import_node_path9.default.dirname(targetPath), { recursive: true });
   const { maxWidth, maxHeight, keepAspectRatio } = context.config.monitoring.resolution;
   const mw = Math.max(1, maxWidth);
   const mh = Math.max(1, maxHeight);
@@ -7412,12 +7524,12 @@ async function captureOperationMonitor(command, result, index, context) {
     }
   });
 }
-var import_promises9, import_node_path8, import_jimp;
+var import_promises9, import_node_path9, import_jimp;
 var init_monitoring = __esm({
   "../ada-agent/src/monitoring.ts"() {
     "use strict";
     import_promises9 = __toESM(require("node:fs/promises"), 1);
-    import_node_path8 = __toESM(require("node:path"), 1);
+    import_node_path9 = __toESM(require("node:path"), 1);
     import_jimp = require("jimp");
     init_logger();
   }
@@ -7503,16 +7615,16 @@ async function ensureDirs(config2) {
 }
 async function listTaskFiles(inboxDir) {
   const entries = await import_promises10.default.readdir(inboxDir, { withFileTypes: true });
-  return entries.filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => import_node_path9.default.join(inboxDir, entry.name)).sort((a, b) => a.localeCompare(b));
+  return entries.filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => import_node_path10.default.join(inboxDir, entry.name)).sort((a, b) => a.localeCompare(b));
 }
 async function moveTo(targetDir, sourcePath) {
-  const fileName = import_node_path9.default.basename(sourcePath);
-  const destination = import_node_path9.default.join(targetDir, fileName);
+  const fileName = import_node_path10.default.basename(sourcePath);
+  const destination = import_node_path10.default.join(targetDir, fileName);
   await import_promises10.default.rename(sourcePath, destination);
 }
 async function writeFailedMeta(targetDir, sourcePath, meta3) {
-  const fileName = `${import_node_path9.default.basename(sourcePath)}.error.json`;
-  const destination = import_node_path9.default.join(targetDir, fileName);
+  const fileName = `${import_node_path10.default.basename(sourcePath)}.error.json`;
+  const destination = import_node_path10.default.join(targetDir, fileName);
   await import_promises10.default.writeFile(destination, JSON.stringify(meta3, null, 2), "utf8");
 }
 async function processQueueOnce(config2, options = {}) {
@@ -7588,11 +7700,11 @@ async function watchQueue(config2, shouldStop, options = {}) {
   }
   log("info", { event: "queue.watch.stopped" });
 }
-var import_promises10, import_node_path9;
+var import_promises10, import_node_path10;
 var init_queue_runner = __esm({
   "../ada-agent/src/queue-runner.ts"() {
     import_promises10 = __toESM(require("node:fs/promises"));
-    import_node_path9 = __toESM(require("node:path"));
+    import_node_path10 = __toESM(require("node:path"));
     init_task_loader();
     init_runtime();
     init_logger();
@@ -18136,64 +18248,49 @@ var init_streamableHttp = __esm({
 });
 
 // src/executor.ts
-function ensureBundledPluginDir() {
-  if (process.env.ADA_PLUGIN_DIR?.trim()) {
-    return;
+function getPluginHost() {
+  if (sharedHost) {
+    return sharedHost;
   }
-  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 dirname = globalThis.__dirname;
-  if (typeof dirname === "string") {
-    candidates.push(import_node_path11.default.join(dirname, "..", "plugins"));
-  }
-  for (const dir of candidates) {
-    if ((0, import_node_fs4.existsSync)(dir)) {
-      process.env.ADA_PLUGIN_DIR = dir;
-      return;
-    }
-  }
-}
-function buildPluginHost2() {
-  ensureBundledPluginDir();
+  const bundledDir = resolvePackagePluginDir();
   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 sharedHost, sharedExecutor;
 var init_executor = __esm({
   "src/executor.ts"() {
     "use strict";
-    import_node_fs4 = require("node:fs");
-    import_node_path11 = __toESM(require("node:path"));
-    import_node_url3 = require("node:url");
     init_src7();
     init_src4();
-    import_meta = {};
-    manifests = registerRuntimePlugins(new PluginHost());
-    sharedExecutor = new TaskExecutor(buildPluginHost2());
+    sharedHost = null;
+    sharedExecutor = null;
   }
 });
 
@@ -31355,7 +31452,7 @@ async function isPortOpen(host, port) {
   });
 }
 function parseServerEndpoint(serverUrl) {
-  const parsed = new import_node_url4.URL(serverUrl);
+  const parsed = new import_node_url3.URL(serverUrl);
   const host = parsed.hostname;
   const port = Number(parsed.port || (parsed.protocol === "https:" ? 443 : 80));
   return { host, port };
@@ -33011,7 +33108,7 @@ async function startMcpServer() {
   await server.connect(transport);
   console.error("[ADA-MCP] server connected");
 }
-var import_promises13, import_node_fs5, import_node_net2, import_node_path14, import_node_child_process5, import_node_url4, appiumEnsureJob, persistedHomesCache, appiumReadyCache, APPIUM_READY_CACHE_TTL_MS, supportedCommands, riskyCommandDefaults, riskyCommandAllowlist, perfStats, PERF_MAX_SAMPLES_PER_LABEL, shuttingDown, server;
+var import_promises13, import_node_fs5, import_node_net2, import_node_path14, import_node_child_process5, import_node_url3, appiumEnsureJob, persistedHomesCache, appiumReadyCache, APPIUM_READY_CACHE_TTL_MS, supportedCommands, riskyCommandDefaults, riskyCommandAllowlist, perfStats, PERF_MAX_SAMPLES_PER_LABEL, shuttingDown, server;
 var init_main = __esm({
   "src/main.ts"() {
     "use strict";
@@ -33020,7 +33117,7 @@ var init_main = __esm({
     import_node_net2 = __toESM(require("node:net"));
     import_node_path14 = __toESM(require("node:path"));
     import_node_child_process5 = require("node:child_process");
-    import_node_url4 = require("node:url");
+    import_node_url3 = require("node:url");
     init_server2();
     init_stdio2();
     init_types();
@@ -33345,9 +33442,12 @@ var init_remote_server = __esm({
   }
 });
 
+// src/cli.ts
+var import_node_url4 = require("node:url");
+
 // src/bootstrap-deps.ts
-var import_node_fs3 = __toESM(require("node:fs"));
-var import_node_path10 = __toESM(require("node:path"));
+var import_node_fs4 = __toESM(require("node:fs"));
+var import_node_path11 = __toESM(require("node:path"));
 init_src8();
 var INSTALL_SCOPE_TOKENS = /* @__PURE__ */ new Set([
   "playwright",
@@ -33430,9 +33530,9 @@ function applyPreinstallPlaywrightHostFile() {
     (x) => typeof x === "string" && x.trim().length > 0
   );
   for (const root of roots) {
-    const file2 = import_node_path10.default.join(root, ".ada-mcp-playwright-host");
+    const file2 = import_node_path11.default.join(root, ".ada-mcp-playwright-host");
     try {
-      const host = normalizePlaywrightHost(import_node_fs3.default.readFileSync(file2, "utf8").trim());
+      const host = normalizePlaywrightHost(import_node_fs4.default.readFileSync(file2, "utf8").trim());
       if (host.length > 0 && PREINSTALL_PLAYWRIGHT_HOST_ALLOW.has(host)) {
         process.env.PLAYWRIGHT_DOWNLOAD_HOST = host;
         process.env.ADA_PLAYWRIGHT_HOST_FROM_PREINSTALL = "1";
@@ -33483,6 +33583,13 @@ async function runBootstrapInstallDeps(argv2) {
 }
 
 // src/cli.ts
+var import_meta = {};
+if (!process.env.ADA_MCP_SERVER_ENTRY?.trim()) {
+  try {
+    process.env.ADA_MCP_SERVER_ENTRY = (0, import_node_url4.fileURLToPath)(import_meta.url);
+  } catch {
+  }
+}
 function argValue(name, fallback = "") {
   const argv2 = process.argv.slice(2);
   const hit = argv2.find((x) => x.startsWith(`${name}=`));

package/package.json

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