@hasna/connectors 1.3.26 → 1.3.28

package/bin/mcp.js

@@ -10612,10 +10612,10 @@ import { dirname, join } from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 function resolveGithubConnectorDir() {
   const candidates = [
-    join(__dirname2, "..", "..", "..", "connectors", "connect-github"),
-    join(__dirname2, "..", "..", "connectors", "connect-github"),
-    join(__dirname2, "..", "connectors", "connect-github"),
-    join(process.cwd(), "connectors", "connect-github")
+    join(__dirname2, "..", "..", "..", "connectors", "github"),
+    join(__dirname2, "..", "..", "connectors", "github"),
+    join(__dirname2, "..", "connectors", "github"),
+    join(process.cwd(), "connectors", "github")
   ];
   for (const candidate of candidates) {
     if (existsSync(candidate)) {
@@ -11653,7 +11653,7 @@ function configDirs() {
   if (explicit)
     return [explicit];
   const baseDir = process.env.HASNA_CONNECTORS_DIR ?? join2(homedir(), ".hasna", "connectors");
-  return [join2(baseDir, "connect-gmail"), join2(baseDir, "gmail")];
+  return [join2(baseDir, "gmail"), join2(baseDir, "connect-gmail")];
 }
 function readJson(path) {
   if (!existsSync2(path))
@@ -11988,6 +11988,35 @@ function listProfiles2() {
   }
   return Array.from(profiles).sort((a, b) => a.localeCompare(b));
 }
+function listProfileStatuses(profile) {
+  const profiles = profile ? [profile] : listProfiles2();
+  const uniqueProfiles = profiles.length ? profiles : ["default"];
+  const now = Date.now();
+  return uniqueProfiles.map((name) => {
+    const tokens = loadTokens2(name);
+    const credentials = loadCredentials2(name);
+    const hasAccessToken = Boolean(tokens?.accessToken || process.env.GOOGLE_ACCESS_TOKEN);
+    const hasRefreshToken = Boolean(tokens?.refreshToken);
+    const hasOAuthCredentials = Boolean(credentials.clientId && credentials.clientSecret);
+    const expiresAt = tokens?.expiresAt ?? null;
+    const expired = Boolean(expiresAt && now >= expiresAt - REFRESH_BUFFER_MS2);
+    const authenticated = Boolean(process.env.GOOGLE_ACCESS_TOKEN || hasRefreshToken || hasAccessToken && !expired);
+    const configured = authenticated || hasOAuthCredentials;
+    const authRequired = !authenticated || expired && !hasRefreshToken;
+    return {
+      profile: name,
+      configured,
+      authenticated,
+      expired,
+      expiresAt,
+      hasAccessToken,
+      hasRefreshToken,
+      hasOAuthCredentials,
+      authRequired,
+      message: authRequired ? `Google Drive profile "${name}" needs authentication. Run: connectors auth googledrive` : expired ? `Google Drive profile "${name}" access token is expired but can refresh.` : `Google Drive profile "${name}" is authenticated.`
+    };
+  });
+}
 function loadCredentials2(profile) {
   const envClientId = process.env.GOOGLE_CLIENT_ID;
   const envClientSecret = process.env.GOOGLE_CLIENT_SECRET;
@@ -12025,7 +12054,7 @@ function configDirs2() {
   if (explicit)
     return [explicit];
   const baseDir = process.env.HASNA_CONNECTORS_DIR ?? join3(homedir2(), ".hasna", "connectors");
-  return [join3(baseDir, "connect-googledrive"), join3(baseDir, "googledrive")];
+  return [join3(baseDir, "googledrive"), join3(baseDir, "connect-googledrive")];
 }
 function readJson2(path) {
   if (!existsSync3(path))
@@ -12060,7 +12089,7 @@ function extractGoogleError(body) {
     return body;
   }
 }
-var DRIVE_API_BASE = "https://www.googleapis.com/drive/v3", TOKEN_URL2 = "https://oauth2.googleapis.com/token", REFRESH_BUFFER_MS2, DEFAULT_FILE_FIELDS, DEFAULT_EXPORT_FORMATS, EXPORT_EXTENSIONS, listFilesSchema, listDrivesSchema, fileIdSchema, downloadSchema, googleDriveConnector;
+var DRIVE_API_BASE = "https://www.googleapis.com/drive/v3", TOKEN_URL2 = "https://oauth2.googleapis.com/token", REFRESH_BUFFER_MS2, DEFAULT_FILE_FIELDS, DEFAULT_EXPORT_FORMATS, EXPORT_EXTENSIONS, listFilesSchema, listDrivesSchema, fileIdSchema, downloadSchema, profilesStatusSchema, googleDriveConnector;
 var init_googledrive = __esm(() => {
   init_zod();
   init_connector();
@@ -12125,6 +12154,9 @@ var init_googledrive = __esm(() => {
     }).optional(),
     exportMimeType: exports_external.string().optional()
   });
+  profilesStatusSchema = exports_external.object({
+    profile: exports_external.string().optional()
+  });
   googleDriveConnector = defineConnector({
     meta: {
       name: "googledrive",
@@ -12147,6 +12179,11 @@ var init_googledrive = __esm(() => {
         summary: "List configured Google Drive profiles.",
         execute: () => ({ profiles: listProfiles2() })
       },
+      "profiles.status": {
+        summary: "List Google Drive profile authentication status.",
+        inputSchema: profilesStatusSchema,
+        execute: (_ctx, input) => ({ profiles: listProfileStatuses(input.profile) })
+      },
       "files.list": {
         summary: "List Google Drive files.",
         inputSchema: listFilesSchema,
@@ -12203,7 +12240,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/connectors",
-    version: "1.3.26",
+    version: "1.3.28",
     description: "Open source connector library - Install API connectors with a single command",
     type: "module",
     bin: {
@@ -22505,17 +22542,99 @@ var init_database = __esm(() => {
   DB_PATH = join5(DB_DIR, "connectors.db");
 });
 
+// src/lib/connector-resolver.ts
+import { existsSync as existsSync6, readdirSync as readdirSync5, statSync as statSync2 } from "fs";
+import { join as join7 } from "path";
+function normalizeConnectorName(name) {
+  const trimmed = name.trim().toLowerCase();
+  return trimmed.startsWith(LEGACY_CONNECTOR_PREFIX) ? trimmed.slice(LEGACY_CONNECTOR_PREFIX.length) : trimmed;
+}
+function legacyConnectorName(name) {
+  return `${LEGACY_CONNECTOR_PREFIX}${normalizeConnectorName(name)}`;
+}
+function resolveConnectorName(name) {
+  const canonicalName = normalizeConnectorName(name);
+  const legacyName = legacyConnectorName(canonicalName);
+  return {
+    input: name,
+    canonicalName,
+    legacyName,
+    aliases: canonicalName === legacyName ? [canonicalName] : [canonicalName, legacyName],
+    isLegacyInput: name.trim().toLowerCase().startsWith(LEGACY_CONNECTOR_PREFIX)
+  };
+}
+function isValidConnectorName(name) {
+  const trimmed = name.trim();
+  if (trimmed !== trimmed.toLowerCase())
+    return false;
+  return CONNECTOR_NAME_RE2.test(normalizeConnectorName(trimmed));
+}
+function connectorPackageDirNames(name) {
+  const { canonicalName, legacyName } = resolveConnectorName(name);
+  if (!canonicalName)
+    return [legacyName];
+  return canonicalName === legacyName ? [canonicalName] : [canonicalName, legacyName];
+}
+function resolveConnectorPackagePath(connectorsDir, name) {
+  const resolution = resolveConnectorName(name);
+  const dirNames = connectorPackageDirNames(name);
+  const checkedPaths = dirNames.map((dirName) => join7(connectorsDir, dirName));
+  const existingPath = checkedPaths.find((path) => existsSync6(path)) ?? null;
+  const existingDirName = existingPath ? dirNames[checkedPaths.indexOf(existingPath)] : null;
+  return {
+    ...resolution,
+    connectorsDir,
+    preferredDirName: dirNames[0],
+    preferredPath: checkedPaths[0],
+    existingPath,
+    existingDirName,
+    checkedPaths
+  };
+}
+function getConnectorPackagePath(connectorsDir, name) {
+  const resolved = resolveConnectorPackagePath(connectorsDir, name);
+  return resolved.existingPath ?? resolved.preferredPath;
+}
+function resolveConnectorConfigPaths(name, connectorsHome = getConnectorsHome()) {
+  const resolution = resolveConnectorName(name);
+  const preferredDirName = resolution.canonicalName || resolution.legacyName;
+  const preferredPath = join7(connectorsHome, preferredDirName);
+  const legacyPath = join7(connectorsHome, resolution.legacyName);
+  const paths = preferredPath === legacyPath ? [preferredPath] : [preferredPath, legacyPath];
+  const existingPaths = paths.filter((path) => existsSync6(path));
+  return {
+    ...resolution,
+    connectorsHome,
+    preferredDirName,
+    preferredPath,
+    legacyPath,
+    existingPaths,
+    readPaths: paths
+  };
+}
+function getConnectorConfigDir(name, connectorsHome = getConnectorsHome()) {
+  return resolveConnectorConfigPaths(name, connectorsHome).preferredPath;
+}
+function getConnectorConfigReadDirs(name, connectorsHome = getConnectorsHome()) {
+  return resolveConnectorConfigPaths(name, connectorsHome).readPaths;
+}
+var LEGACY_CONNECTOR_PREFIX = "connect-", CONNECTOR_NAME_RE2;
+var init_connector_resolver = __esm(() => {
+  init_database();
+  CONNECTOR_NAME_RE2 = /^[a-z0-9-]+$/;
+});
+
 // src/core/connectors/imessage.ts
 import {
-  existsSync as existsSync6,
+  existsSync as existsSync7,
   mkdirSync as mkdirSync5,
   readFileSync as readFileSync4,
-  readdirSync as readdirSync5,
+  readdirSync as readdirSync6,
   rmSync,
-  statSync as statSync2,
+  statSync as statSync3,
   writeFileSync as writeFileSync4
 } from "fs";
-import { join as join7 } from "path";
+import { join as join9 } from "path";
 function buildRootHelp(specs) {
   const lines = [
     "Usage: connect-imessage [options] [command]",
@@ -22560,32 +22679,40 @@ function buildCommandHelp(spec) {
 `);
 }
 function getConfigDir2() {
-  return join7(getConnectorsHome(), CONNECTOR_DIRNAME);
+  return getConnectorConfigDir(CONNECTOR_NAME);
+}
+function getConfigReadDirs() {
+  return getConnectorConfigReadDirs(CONNECTOR_NAME);
 }
 function getProfilesDir() {
-  return join7(getConfigDir2(), "profiles");
+  return join9(getConfigDir2(), "profiles");
 }
 function getCurrentProfile() {
-  const currentProfileFile = join7(getConfigDir2(), "current_profile");
-  if (!existsSync6(currentProfileFile)) {
-    return "default";
-  }
-  try {
-    return readFileSync4(currentProfileFile, "utf-8").trim() || "default";
-  } catch {
-    return "default";
+  for (const configDir of getConfigReadDirs()) {
+    const currentProfileFile = join9(configDir, "current_profile");
+    if (!existsSync7(currentProfileFile))
+      continue;
+    try {
+      return readFileSync4(currentProfileFile, "utf-8").trim() || "default";
+    } catch {
+      return "default";
+    }
   }
+  return "default";
 }
 function setCurrentProfile(profile) {
   const configDir = getConfigDir2();
   mkdirSync5(configDir, { recursive: true });
-  writeFileSync4(join7(configDir, "current_profile"), profile);
+  writeFileSync4(join9(configDir, "current_profile"), profile);
 }
 function getFlatProfilePath(profile) {
-  return join7(getProfilesDir(), `${profile}.json`);
+  return join9(getProfilesDir(), `${profile}.json`);
 }
-function getDirectoryProfilePath(profile) {
-  return join7(getProfilesDir(), profile, "config.json");
+function getFlatProfileReadPaths(profile) {
+  return getConfigReadDirs().map((dir) => join9(dir, "profiles", `${profile}.json`));
+}
+function getDirectoryProfileReadPaths(profile) {
+  return getConfigReadDirs().map((dir) => join9(dir, "profiles", profile, "config.json"));
 }
 function loadJsonFile(path) {
   try {
@@ -22605,8 +22732,8 @@ function sanitizeProfileConfig(config2) {
   };
 }
 function loadProfile(profile = getCurrentProfile()) {
-  const flatConfig = existsSync6(getFlatProfilePath(profile)) ? loadJsonFile(getFlatProfilePath(profile)) : {};
-  const directoryConfig = existsSync6(getDirectoryProfilePath(profile)) ? loadJsonFile(getDirectoryProfilePath(profile)) : {};
+  const flatConfig = getFlatProfileReadPaths(profile).reverse().reduce((config2, path) => ({ ...config2, ...existsSync7(path) ? loadJsonFile(path) : {} }), {});
+  const directoryConfig = getDirectoryProfileReadPaths(profile).reverse().reduce((config2, path) => ({ ...config2, ...existsSync7(path) ? loadJsonFile(path) : {} }), {});
   return sanitizeProfileConfig({
     ...flatConfig,
     ...directoryConfig
@@ -22622,25 +22749,26 @@ function profileExists(profile) {
   if (profile === "default") {
     return true;
   }
-  return existsSync6(getFlatProfilePath(profile)) || existsSync6(join7(getProfilesDir(), profile));
+  return getFlatProfileReadPaths(profile).some((path) => existsSync7(path)) || getConfigReadDirs().some((dir) => existsSync7(join9(dir, "profiles", profile)));
 }
 function listProfiles3() {
-  const profilesDir = getProfilesDir();
   const seen = new Set(["default"]);
-  if (!existsSync6(profilesDir)) {
-    return [...seen];
-  }
-  try {
-    for (const entry of readdirSync5(profilesDir)) {
-      const fullPath = join7(profilesDir, entry);
-      const stat = statSync2(fullPath);
-      if (stat.isDirectory()) {
-        seen.add(entry);
-      } else if (entry.endsWith(".json")) {
-        seen.add(entry.replace(/\.json$/, ""));
+  for (const configDir of getConfigReadDirs()) {
+    const profilesDir = join9(configDir, "profiles");
+    if (!existsSync7(profilesDir))
+      continue;
+    try {
+      for (const entry of readdirSync6(profilesDir)) {
+        const fullPath = join9(profilesDir, entry);
+        const stat = statSync3(fullPath);
+        if (stat.isDirectory()) {
+          seen.add(entry);
+        } else if (entry.endsWith(".json")) {
+          seen.add(entry.replace(/\.json$/, ""));
+        }
       }
-    }
-  } catch {}
+    } catch {}
+  }
   return [...seen].sort();
 }
 function createProfile(profile, config2 = {}) {
@@ -22653,11 +22781,11 @@ function createProfile(profile, config2 = {}) {
 }
 function clearProfile(profile = getCurrentProfile()) {
   const flatPath = getFlatProfilePath(profile);
-  const directoryPath = join7(getProfilesDir(), profile);
-  if (existsSync6(flatPath)) {
+  const directoryPath = join9(getProfilesDir(), profile);
+  if (existsSync7(flatPath)) {
     rmSync(flatPath);
   }
-  if (existsSync6(directoryPath)) {
+  if (existsSync7(directoryPath)) {
     rmSync(directoryPath, { recursive: true, force: true });
   }
 }
@@ -23260,7 +23388,7 @@ function createOperationContext(args) {
     deviceId: extractCredentialString(args.credentials, "deviceId")
   });
 }
-var CONNECTOR_DIRNAME = "connect-imessage", COMMAND_SPECS, ROOT_HELP2, COMMAND_HELP2, COMMAND_DESCRIPTORS, IMESSAGE_DOCS = `# CLAUDE.md
+var CONNECTOR_NAME = "imessage", COMMAND_SPECS, ROOT_HELP2, COMMAND_HELP2, COMMAND_DESCRIPTORS, IMESSAGE_DOCS = `# CLAUDE.md
 
 ## Project Overview
 
@@ -23290,12 +23418,12 @@ API Key authentication is optional and depends on the bridge deployment. A bridg
 
 ## Data Storage
 
-Connector state is stored under \`~/.hasna/connectors/connect-imessage/\`. Profiles are read from both \`profiles/<name>.json\` and \`profiles/<name>/config.json\` so the connector stays compatible with the shared dashboard auth helpers while remaining fully internal to the one-product repo.
+Connector state is stored under \`~/.hasna/connectors/imessage/\`. Profiles are read from both \`profiles/<name>.json\` and \`profiles/<name>/config.json\` so the connector stays compatible with the shared dashboard auth helpers while remaining fully internal to the one-product repo.
 `, commandInputSchema, conversationListInputSchema, conversationGetInputSchema, messageListInputSchema, messageSendInputSchema, messageReplyInputSchema, imessageConnector;
 var init_imessage = __esm(() => {
   init_package();
   init_zod();
-  init_database();
+  init_connector_resolver();
   init_connector();
   COMMAND_SPECS = [
     {
@@ -23583,18 +23711,18 @@ var init_imessage = __esm(() => {
 });
 
 // src/core/connectors/stripe.ts
-import { existsSync as existsSync7 } from "fs";
-import { dirname as dirname4, join as join9 } from "path";
+import { existsSync as existsSync8 } from "fs";
+import { dirname as dirname4, join as join10 } from "path";
 import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL2 } from "url";
 function resolveStripeConnectorDir() {
   const candidates = [
-    join9(__dirname3, "..", "..", "..", "connectors", "connect-stripe"),
-    join9(__dirname3, "..", "..", "connectors", "connect-stripe"),
-    join9(__dirname3, "..", "connectors", "connect-stripe"),
-    join9(process.cwd(), "connectors", "connect-stripe")
+    join10(__dirname3, "..", "..", "..", "connectors", "stripe"),
+    join10(__dirname3, "..", "..", "connectors", "stripe"),
+    join10(__dirname3, "..", "connectors", "stripe"),
+    join10(process.cwd(), "connectors", "stripe")
   ];
   for (const candidate of candidates) {
-    if (existsSync7(candidate)) {
+    if (existsSync8(candidate)) {
       return candidate;
     }
   }
@@ -23642,10 +23770,10 @@ function buildCommandHelp2(spec) {
 `);
 }
 async function loadStripeApiModule() {
-  return await import(pathToFileURL2(join9(CONNECTOR_DIR2, "src", "api", "index.ts")).href);
+  return await import(pathToFileURL2(join10(CONNECTOR_DIR2, "src", "api", "index.ts")).href);
 }
 async function loadStripeConfigModule() {
-  return await import(pathToFileURL2(join9(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
+  return await import(pathToFileURL2(join10(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
 }
 function extractGlobalArgs3(args) {
   const remaining = [];
@@ -24491,14 +24619,14 @@ __export(exports_llm, {
   PROVIDER_DEFAULTS: () => PROVIDER_DEFAULTS,
   LLMClient: () => LLMClient
 });
-import { existsSync as existsSync9, readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6 } from "fs";
-import { join as join11 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6 } from "fs";
+import { join as join12 } from "path";
 function getLlmConfigPath() {
-  return join11(getConnectorsHome(), "llm.json");
+  return join12(getConnectorsHome(), "llm.json");
 }
 function getLlmConfig() {
   const path = getLlmConfigPath();
-  if (!existsSync9(path))
+  if (!existsSync10(path))
     return null;
   try {
     return JSON.parse(readFileSync6(path, "utf-8"));
@@ -24628,33 +24756,30 @@ __export(exports_installer, {
   getConnectorDocs: () => getConnectorDocs,
   connectorExists: () => connectorExists
 });
-import { existsSync as existsSync10, mkdirSync as mkdirSync7, readFileSync as readFileSync7, writeFileSync as writeFileSync6, readdirSync as readdirSync6, statSync as statSync3, rmSync as rmSync2 } from "fs";
-import { join as join12, dirname as dirname6 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync7, writeFileSync as writeFileSync6, readdirSync as readdirSync7, statSync as statSync4, rmSync as rmSync2 } from "fs";
+import { join as join13, dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function resolveConnectorsDir() {
-  const fromBin = join12(__dirname4, "..", "connectors");
-  if (existsSync10(fromBin))
+  const fromBin = join13(__dirname4, "..", "connectors");
+  if (existsSync11(fromBin))
     return fromBin;
-  const fromSrc = join12(__dirname4, "..", "..", "connectors");
-  if (existsSync10(fromSrc))
+  const fromSrc = join13(__dirname4, "..", "..", "connectors");
+  if (existsSync11(fromSrc))
     return fromSrc;
   return fromBin;
 }
-function normalizeConnectorName(name) {
-  return name.startsWith("connect-") ? name.slice("connect-".length) : name;
-}
 function getProjectConnectorsDir(targetDir) {
-  return join12(targetDir, PROJECT_CONNECTORS_DIRNAME);
+  return join13(targetDir, PROJECT_CONNECTORS_DIRNAME);
 }
 function getEnablementManifestPath(targetDir) {
-  return join12(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
+  return join13(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
 }
 function getLegacyInstallPath(targetDir, name) {
-  return join12(getProjectConnectorsDir(targetDir), `connect-${normalizeConnectorName(name)}`);
+  return join13(getProjectConnectorsDir(targetDir), legacyConnectorName(name));
 }
 function loadEnablementManifest(targetDir) {
   const manifestPath = getEnablementManifestPath(targetDir);
-  if (!existsSync10(manifestPath)) {
+  if (!existsSync11(manifestPath)) {
     return null;
   }
   try {
@@ -24674,12 +24799,12 @@ function loadEnablementManifest(targetDir) {
 }
 function getLegacyInstalledConnectors(targetDir) {
   const connectorsDir = getProjectConnectorsDir(targetDir);
-  if (!existsSync10(connectorsDir)) {
+  if (!existsSync11(connectorsDir)) {
     return [];
   }
-  return readdirSync6(connectorsDir).filter((entry) => {
-    const fullPath = join12(connectorsDir, entry);
-    return entry.startsWith("connect-") && statSync3(fullPath).isDirectory();
+  return readdirSync7(connectorsDir).filter((entry) => {
+    const fullPath = join13(connectorsDir, entry);
+    return entry.startsWith("connect-") && statSync4(fullPath).isDirectory();
   }).map((entry) => entry.replace("connect-", "")).sort();
 }
 function getEnabledConnectors(targetDir) {
@@ -24687,7 +24812,7 @@ function getEnabledConnectors(targetDir) {
   return [...new Set([...manifestConnectors, ...getLegacyInstalledConnectors(targetDir)])].sort();
 }
 function updateConnectorsIndex(connectorsDir, connectors18) {
-  const indexPath = join12(connectorsDir, ENABLEMENT_INDEX_FILENAME);
+  const indexPath = join13(connectorsDir, ENABLEMENT_INDEX_FILENAME);
   const connectorList = connectors18.map((connector) => `  "${connector}",`).join(`
 `);
   const content = `/**
@@ -24719,12 +24844,11 @@ function writeEnablementManifest(targetDir, connectors18) {
   updateConnectorsIndex(connectorsDir, manifest.connectors);
 }
 function getConnectorPath(name) {
-  const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
-  return join12(CONNECTORS_DIR, connectorName);
+  return getConnectorPackagePath(CONNECTORS_DIR, name);
 }
 function connectorExists(name) {
   const normalizedName = normalizeConnectorName(name);
-  return hasInternalConnectorDefinition(normalizedName) || existsSync10(getConnectorPath(normalizedName));
+  return hasInternalConnectorDefinition(normalizedName) || existsSync11(getConnectorPath(normalizedName));
 }
 function installConnector(name, options = {}) {
   const { targetDir = process.cwd(), overwrite = false } = options;
@@ -24757,7 +24881,7 @@ function installConnector(name, options = {}) {
   try {
     const nextEnabled = [...new Set([...installed, normalizedName])].sort();
     writeEnablementManifest(targetDir, nextEnabled);
-    if (overwrite && existsSync10(legacyInstallPath)) {
+    if (overwrite && existsSync11(legacyInstallPath)) {
       rmSync2(legacyInstallPath, { recursive: true });
     }
     return {
@@ -24792,8 +24916,8 @@ function parseConnectorDocs(raw) {
 function getConnectorDocs(name) {
   const normalizedName = normalizeConnectorName(name);
   const connectorPath = getConnectorPath(normalizedName);
-  const claudeMdPath = join12(connectorPath, "CLAUDE.md");
-  if (existsSync10(claudeMdPath)) {
+  const claudeMdPath = join13(connectorPath, "CLAUDE.md");
+  if (existsSync11(claudeMdPath)) {
     return parseConnectorDocs(readFileSync7(claudeMdPath, "utf-8"));
   }
   const internalDocs = getInternalConnectorDefinition(normalizedName)?.docsMarkdown;
@@ -24838,7 +24962,7 @@ function removeConnector(name, targetDir = process.cwd()) {
   const nextEnabled = installed.filter((connector) => connector !== normalizedName);
   writeEnablementManifest(targetDir, nextEnabled);
   const legacyInstallPath = getLegacyInstallPath(targetDir, normalizedName);
-  if (existsSync10(legacyInstallPath)) {
+  if (existsSync11(legacyInstallPath)) {
     rmSync2(legacyInstallPath, { recursive: true });
   }
   return true;
@@ -24846,6 +24970,7 @@ function removeConnector(name, targetDir = process.cwd()) {
 var __dirname4, CONNECTORS_DIR, PROJECT_CONNECTORS_DIRNAME = ".connectors", ENABLEMENT_MANIFEST_FILENAME = "manifest.json", ENABLEMENT_INDEX_FILENAME = "index.ts";
 var init_installer = __esm(() => {
   init_builtins();
+  init_connector_resolver();
   __dirname4 = dirname6(fileURLToPath4(import.meta.url));
   CONNECTORS_DIR = resolveConnectorsDir();
 });
@@ -24920,24 +25045,23 @@ var init_usage = __esm(() => {
 });
 
 // src/lib/lock.ts
-import { openSync, closeSync, unlinkSync, existsSync as existsSync11, statSync as statSync4 } from "fs";
-import { join as join13 } from "path";
+import { openSync, closeSync, unlinkSync, existsSync as existsSync12, statSync as statSync5 } from "fs";
 import { mkdirSync as mkdirSync8 } from "fs";
 function lockPath(connector) {
-  const dir = join13(getConnectorsHome(), `connect-${connector}`);
+  const dir = getConnectorConfigDir(connector);
   mkdirSync8(dir, { recursive: true });
-  return join13(dir, ".write.lock");
+  return `${dir}/.write.lock`;
 }
 function isStale(path) {
   try {
-    const stat = statSync4(path);
+    const stat = statSync5(path);
     return Date.now() - stat.mtimeMs > STALE_LOCK_MS;
   } catch {
     return false;
   }
 }
 function tryAcquire(path) {
-  if (existsSync11(path) && isStale(path)) {
+  if (existsSync12(path) && isStale(path)) {
     try {
       unlinkSync(path);
     } catch {}
@@ -24958,6 +25082,7 @@ function release(path) {
   } catch {}
 }
 async function withWriteLock(connector, fn) {
+  connector = normalizeConnectorName(connector);
   const path = lockPath(connector);
   const deadline = Date.now() + LOCK_TIMEOUT_MS;
   while (Date.now() < deadline) {
@@ -24974,7 +25099,7 @@ async function withWriteLock(connector, fn) {
 }
 var LOCK_TIMEOUT_MS = 5000, LOCK_RETRY_MS = 100, STALE_LOCK_MS = 30000, LockTimeoutError;
 var init_lock = __esm(() => {
-  init_database();
+  init_connector_resolver();
   LockTimeoutError = class LockTimeoutError extends Error {
     connector;
     constructor(connector) {
@@ -24986,9 +25111,10 @@ var init_lock = __esm(() => {
 });
 
 // src/server/auth.ts
-import { existsSync as existsSync12, readFileSync as readFileSync8, writeFileSync as writeFileSync7, mkdirSync as mkdirSync9, readdirSync as readdirSync7, rmSync as rmSync3, statSync as statSync5 } from "fs";
+import { existsSync as existsSync13, readFileSync as readFileSync8, writeFileSync as writeFileSync7, mkdirSync as mkdirSync9, readdirSync as readdirSync8, rmSync as rmSync3, statSync as statSync6 } from "fs";
 import { join as join14 } from "path";
 function getAuthType(name) {
+  name = normalizeConnectorName(name);
   const docs = getConnectorDocs(name);
   if (!docs?.auth)
     return "apikey";
@@ -24999,53 +25125,65 @@ function getAuthType(name) {
     return "bearer";
   return "apikey";
 }
-function getConnectorConfigDir(name) {
-  const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
-  return join14(getConnectorsHome(), connectorName);
+function getConnectorConfigDir2(name) {
+  name = normalizeConnectorName(name);
+  return getConnectorConfigDir(name);
+}
+function getConnectorConfigReadDirs2(name) {
+  name = normalizeConnectorName(name);
+  return getConnectorConfigReadDirs(name);
 }
 function getCurrentProfile2(name) {
-  const configDir = getConnectorConfigDir(name);
-  const currentProfileFile = join14(configDir, "current_profile");
-  if (existsSync12(currentProfileFile)) {
-    try {
-      return readFileSync8(currentProfileFile, "utf-8").trim() || "default";
-    } catch {
-      return "default";
+  name = normalizeConnectorName(name);
+  for (const configDir of getConnectorConfigReadDirs2(name)) {
+    const currentProfileFile = join14(configDir, "current_profile");
+    if (existsSync13(currentProfileFile)) {
+      try {
+        return readFileSync8(currentProfileFile, "utf-8").trim() || "default";
+      } catch {
+        return "default";
+      }
     }
   }
   return "default";
 }
-function loadProfileConfig(name) {
-  const configDir = getConnectorConfigDir(name);
-  const profile = getCurrentProfile2(name);
+function loadProfileConfigFromDir(configDir, profile) {
   let flatConfig = {};
   let dirConfig = {};
   const profileFile = join14(configDir, "profiles", `${profile}.json`);
-  if (existsSync12(profileFile)) {
+  if (existsSync13(profileFile)) {
     try {
       flatConfig = JSON.parse(readFileSync8(profileFile, "utf-8"));
     } catch {}
   }
   const profileDirConfig = join14(configDir, "profiles", profile, "config.json");
-  if (existsSync12(profileDirConfig)) {
+  if (existsSync13(profileDirConfig)) {
     try {
       dirConfig = JSON.parse(readFileSync8(profileDirConfig, "utf-8"));
     } catch {}
   }
-  if (Object.keys(flatConfig).length === 0 && Object.keys(dirConfig).length === 0) {
-    return {};
-  }
   return { ...flatConfig, ...dirConfig };
 }
+function loadProfileConfig(name) {
+  name = normalizeConnectorName(name);
+  const profile = getCurrentProfile2(name);
+  const merged = {};
+  for (const configDir of [...getConnectorConfigReadDirs2(name)].reverse()) {
+    Object.assign(merged, loadProfileConfigFromDir(configDir, profile));
+  }
+  return merged;
+}
 function loadTokens3(name) {
-  const configDir = getConnectorConfigDir(name);
+  name = normalizeConnectorName(name);
   const profile = getCurrentProfile2(name);
-  const tokensFile = join14(configDir, "profiles", profile, "tokens.json");
-  if (existsSync12(tokensFile)) {
-    try {
-      return JSON.parse(readFileSync8(tokensFile, "utf-8"));
-    } catch {
-      return null;
+  for (const configDir of getConnectorConfigReadDirs2(name)) {
+    const tokensFile = join14(configDir, "profiles", profile, "tokens.json");
+    if (existsSync13(tokensFile)) {
+      try {
+        return JSON.parse(readFileSync8(tokensFile, "utf-8"));
+      } catch {
+        return null;
+      }
     }
   }
   const profileConfig = loadProfileConfig(name);
@@ -25079,6 +25217,7 @@ function isStoredOAuthEnvVarSet(variable, oauthConfig, tokens, profileConfig) {
   return false;
 }
 function getAuthStatus(name) {
+  name = normalizeConnectorName(name);
   const authType = getAuthType(name);
   const docs = getConnectorDocs(name);
   const oauthConfig = authType === "oauth" ? getOAuthConfig(name) : {};
@@ -25120,21 +25259,24 @@ function getAuthStatus(name) {
   };
 }
 function getEnvVars(name) {
+  name = normalizeConnectorName(name);
   const docs = getConnectorDocs(name);
   return docs?.envVars || [];
 }
 async function saveApiKey(name, key, field) {
+  name = normalizeConnectorName(name);
   return withWriteLock(name, () => _saveApiKey(name, key, field));
 }
 function _saveApiKey(name, key, field) {
-  const configDir = getConnectorConfigDir(name);
+  name = normalizeConnectorName(name);
+  const configDir = getConnectorConfigDir2(name);
   const profile = getCurrentProfile2(name);
   const keyField = field || guessKeyField(name);
   if (keyField === "clientId" || keyField === "clientSecret") {
     const credentialsFile = join14(configDir, "credentials.json");
     mkdirSync9(configDir, { recursive: true });
     let creds = {};
-    if (existsSync12(credentialsFile)) {
+    if (existsSync13(credentialsFile)) {
       try {
         creds = JSON.parse(readFileSync8(credentialsFile, "utf-8"));
       } catch {}
@@ -25145,7 +25287,7 @@ function _saveApiKey(name, key, field) {
   }
   const profileFile = join14(configDir, "profiles", `${profile}.json`);
   const profileDir = join14(configDir, "profiles", profile);
-  if (existsSync12(profileFile)) {
+  if (existsSync13(profileFile)) {
     let config2 = {};
     try {
       config2 = JSON.parse(readFileSync8(profileFile, "utf-8"));
@@ -25154,10 +25296,10 @@ function _saveApiKey(name, key, field) {
     writeFileSync7(profileFile, JSON.stringify(config2, null, 2));
     return;
   }
-  if (existsSync12(profileDir)) {
+  if (existsSync13(profileDir)) {
     const configFile = join14(profileDir, "config.json");
     let config2 = {};
-    if (existsSync12(configFile)) {
+    if (existsSync13(configFile)) {
       try {
         config2 = JSON.parse(readFileSync8(configFile, "utf-8"));
       } catch {}
@@ -25170,6 +25312,7 @@ function _saveApiKey(name, key, field) {
   writeFileSync7(join14(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
 }
 function guessKeyField(name) {
+  name = normalizeConnectorName(name);
   const docs = getConnectorDocs(name);
   if (!docs?.envVars.length)
     return "apiKey";
@@ -25184,13 +25327,15 @@ function guessKeyField(name) {
   return "apiKey";
 }
 function getOAuthConfig(name) {
-  const configDir = getConnectorConfigDir(name);
-  const credentialsFile = join14(configDir, "credentials.json");
-  if (existsSync12(credentialsFile)) {
-    try {
-      const creds = JSON.parse(readFileSync8(credentialsFile, "utf-8"));
-      return { clientId: creds.clientId, clientSecret: creds.clientSecret };
-    } catch {}
+  name = normalizeConnectorName(name);
+  for (const configDir of getConnectorConfigReadDirs2(name)) {
+    const credentialsFile = join14(configDir, "credentials.json");
+    if (existsSync13(credentialsFile)) {
+      try {
+        const creds = JSON.parse(readFileSync8(credentialsFile, "utf-8"));
+        return { clientId: creds.clientId, clientSecret: creds.clientSecret };
+      } catch {}
+    }
   }
   const config2 = loadProfileConfig(name);
   return {
@@ -25199,7 +25344,8 @@ function getOAuthConfig(name) {
   };
 }
 function saveOAuthTokens(name, tokens) {
-  const configDir = getConnectorConfigDir(name);
+  name = normalizeConnectorName(name);
+  const configDir = getConnectorConfigDir2(name);
   const profile = getCurrentProfile2(name);
   const profileDir = join14(configDir, "profiles", profile);
   mkdirSync9(profileDir, { recursive: true });
@@ -25207,9 +25353,11 @@ function saveOAuthTokens(name, tokens) {
   writeFileSync7(tokensFile, JSON.stringify(tokens, null, 2), { mode: 384 });
 }
 async function refreshOAuthToken(name) {
+  name = normalizeConnectorName(name);
   return withWriteLock(name, () => _refreshOAuthToken(name));
 }
 async function _refreshOAuthToken(name) {
+  name = normalizeConnectorName(name);
   const oauthConfig = getOAuthConfig(name);
   const currentTokens = loadTokens3(name);
   if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
@@ -25248,7 +25396,7 @@ var FETCH_TIMEOUT = 1e4, oauthStateStore, GOOGLE_TOKEN_URL = "https://oauth2.goo
 var init_auth = __esm(() => {
   init_installer();
   init_lock();
-  init_database();
+  init_connector_resolver();
   oauthStateStore = new Map;
   GOOGLE_SCOPES = {
     gmail: [
@@ -25304,16 +25452,16 @@ __export(exports_runner, {
   buildEnvWithCredentials: () => buildEnvWithCredentials,
   buildConnectorOperationArgs: () => buildConnectorOperationArgs
 });
-import { existsSync as existsSync14, readdirSync as readdirSync8 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync9 } from "fs";
 import { join as join16, dirname as dirname7 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { spawn as spawn2 } from "child_process";
 function resolveConnectorsDir2() {
   const fromBin = join16(__dirname5, "..", "connectors");
-  if (existsSync14(fromBin))
+  if (existsSync15(fromBin))
     return fromBin;
   const fromSrc = join16(__dirname5, "..", "..", "connectors");
-  if (existsSync14(fromSrc))
+  if (existsSync15(fromSrc))
     return fromSrc;
   return fromBin;
 }
@@ -25334,8 +25482,9 @@ function getInternalCommandRuntime(name) {
 }
 function buildEnvWithCredentials(connectorName, baseEnv) {
   const env = { ...baseEnv };
-  const prefixes = ENV_VAR_NAME_OVERRIDES[connectorName] || [
-    connectorName.toUpperCase().replace(/-/g, "_")
+  const normalizedConnectorName = normalizeConnectorName(connectorName);
+  const prefixes = ENV_VAR_NAME_OVERRIDES[normalizedConnectorName] || [
+    normalizedConnectorName.toUpperCase().replace(/-/g, "_")
   ];
   for (const prefix of prefixes) {
     const canonicalKey = `${prefix}_API_KEY`;
@@ -25356,10 +25505,10 @@ function buildEnvWithCredentials(connectorName, baseEnv) {
       }
     }
   }
-  if (getAuthType(connectorName) === "oauth") {
-    const oauthConfig = getOAuthConfig(connectorName);
-    const tokens = loadTokens3(connectorName);
-    for (const { variable } of getEnvVars(connectorName)) {
+  if (getAuthType(normalizedConnectorName) === "oauth") {
+    const oauthConfig = getOAuthConfig(normalizedConnectorName);
+    const tokens = loadTokens3(normalizedConnectorName);
+    for (const { variable } of getEnvVars(normalizedConnectorName)) {
       if (env[variable])
         continue;
       if (variable.endsWith("_CLIENT_ID") && oauthConfig.clientId) {
@@ -25378,10 +25527,10 @@ function buildEnvWithCredentials(connectorName, baseEnv) {
   return env;
 }
 function getConnectorCliPath(name) {
-  const safeName = name.replace(/[^a-z0-9-]/g, "");
-  const connectorDir = join16(CONNECTORS_DIR2, `connect-${safeName}`);
+  const safeName = normalizeConnectorName(name).replace(/[^a-z0-9-]/g, "");
+  const connectorDir = getConnectorPackagePath(CONNECTORS_DIR2, safeName);
   const cliPath = join16(connectorDir, "src", "cli", "index.ts");
-  if (existsSync14(cliPath))
+  if (existsSync15(cliPath))
     return cliPath;
   return null;
 }
@@ -25436,8 +25585,9 @@ function parseCommanderHelpOperations(helpText) {
   return operations;
 }
 function runConnectorCommand(name, args, timeoutMs = 30000) {
+  const connectorName = normalizeConnectorName(name);
   getConnectorsHome();
-  const internalRuntime = getInternalCommandRuntime(name);
+  const internalRuntime = getInternalCommandRuntime(connectorName);
   if (internalRuntime?.run) {
     return Promise.resolve(internalRuntime.run(args)).then((result) => {
       if (result) {
@@ -25451,13 +25601,14 @@ function runConnectorCommand(name, args, timeoutMs = 30000) {
           success: result.success ?? exitCode === 0
         };
       }
-      return runLegacyConnectorCommand(name, args, timeoutMs);
+      return runLegacyConnectorCommand(connectorName, args, timeoutMs);
     });
   }
-  return runLegacyConnectorCommand(name, args, timeoutMs);
+  return runLegacyConnectorCommand(connectorName, args, timeoutMs);
 }
 async function runConnectorOperation(args) {
-  const internal = getInternalConnectorDefinition(args.connector);
+  const connectorName = normalizeConnectorName(args.connector);
+  const internal = getInternalConnectorDefinition(connectorName);
   if (internal?.operations[args.operation]) {
     try {
       const operationData = await executeConnectorOperation(internal, {
@@ -25467,14 +25618,14 @@ async function runConnectorOperation(args) {
       });
       const commandResult = normalizeOperationReturn(operationData);
       return {
-        connector: args.connector,
+        connector: connectorName,
         operation: args.operation,
         profile: args.profile,
         ...commandResult
       };
     } catch (error2) {
       return {
-        connector: args.connector,
+        connector: connectorName,
         operation: args.operation,
         profile: args.profile,
         stdout: "",
@@ -25485,10 +25636,10 @@ async function runConnectorOperation(args) {
     }
   }
   const commandArgs = buildConnectorOperationArgs(args);
-  const result = await runConnectorCommand(args.connector, commandArgs, args.timeoutMs ?? 30000);
+  const result = await runConnectorCommand(connectorName, commandArgs, args.timeoutMs ?? 30000);
   const response = {
     ...result,
-    connector: args.connector,
+    connector: connectorName,
     operation: args.operation,
     profile: args.profile
   };
@@ -25563,11 +25714,12 @@ function buildConnectorOperationArgs(args) {
   return commandArgs;
 }
 function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
-  const cliPath = getConnectorCliPath(name);
+  const connectorName = normalizeConnectorName(name);
+  const cliPath = getConnectorCliPath(connectorName);
   if (!cliPath) {
     return Promise.resolve({
       stdout: "",
-      stderr: `Connector '${name}' not found or has no CLI.`,
+      stderr: `Connector '${connectorName}' not found or has no CLI.`,
       exitCode: 1,
       success: false
     });
@@ -25575,7 +25727,7 @@ function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
   return new Promise((resolve) => {
     const proc = spawn2("bun", ["run", cliPath, ...args], {
       timeout: timeoutMs,
-      env: buildEnvWithCredentials(name, process.env),
+      env: buildEnvWithCredentials(connectorName, process.env),
       stdio: ["pipe", "pipe", "pipe"]
     });
     let stdout = "";
@@ -25605,7 +25757,8 @@ function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
   });
 }
 async function getConnectorOperations(name) {
-  const internalRuntime = getInternalCommandRuntime(name);
+  const connectorName = normalizeConnectorName(name);
+  const internalRuntime = getInternalCommandRuntime(connectorName);
   if (internalRuntime?.commands.length) {
     const operations2 = internalRuntime.commands.map((command) => ({
       name: command.name,
@@ -25617,15 +25770,15 @@ async function getConnectorOperations(name) {
     return {
       commands: operations2.map((operation) => operation.name),
       operations: operations2,
-      helpText: internalRuntime.helpText ?? buildInternalHelpText(name, internalRuntime.commands),
+      helpText: internalRuntime.helpText ?? buildInternalHelpText(connectorName, internalRuntime.commands),
       hasCli: true
     };
   }
-  const cliPath = getConnectorCliPath(name);
+  const cliPath = getConnectorCliPath(connectorName);
   if (!cliPath) {
     return { commands: [], operations: [], helpText: "", hasCli: false };
   }
-  const result = await runConnectorCommand(name, ["--help"]);
+  const result = await runConnectorCommand(connectorName, ["--help"]);
   const helpText = result.stdout || result.stderr;
   const operations = parseCommanderHelpOperations(helpText);
   return {
@@ -25636,7 +25789,8 @@ async function getConnectorOperations(name) {
   };
 }
 async function getConnectorCommandHelp(name, command) {
-  const internalRuntime = getInternalCommandRuntime(name);
+  const connectorName = normalizeConnectorName(name);
+  const internalRuntime = getInternalCommandRuntime(connectorName);
   if (internalRuntime?.getHelp) {
     const help = await internalRuntime.getHelp(command);
     if (help) {
@@ -25647,17 +25801,15 @@ async function getConnectorCommandHelp(name, command) {
   if (runtimeCommand?.helpText) {
     return runtimeCommand.helpText;
   }
-  const result = await runConnectorCommand(name, [command, "--help"]);
+  const result = await runConnectorCommand(connectorName, [command, "--help"]);
   return result.stdout || result.stderr;
 }
 function getConnectorsWithCli() {
   const connectors18 = new Set;
   try {
-    const dirs = readdirSync8(CONNECTORS_DIR2);
+    const dirs = readdirSync9(CONNECTORS_DIR2);
     for (const dir of dirs) {
-      if (!dir.startsWith("connect-"))
-        continue;
-      const name = dir.replace("connect-", "");
+      const name = normalizeConnectorName(dir);
       if (getConnectorCliPath(name)) {
         connectors18.add(name);
       }
@@ -25676,6 +25828,7 @@ var init_runner = __esm(() => {
   init_connector();
   init_database();
   init_auth();
+  init_connector_resolver();
   __dirname5 = dirname7(fileURLToPath5(import.meta.url));
   CONNECTORS_DIR2 = resolveConnectorsDir2();
   ENV_VAR_NAME_OVERRIDES = {
@@ -34687,8 +34840,8 @@ class StdioServerTransport {
 
 // src/lib/registry.ts
 init_builtins();
-import { existsSync as existsSync8, readFileSync as readFileSync5 } from "fs";
-import { join as join10, dirname as dirname5 } from "path";
+import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
+import { join as join11, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/lib/fuzzy.ts
@@ -34777,6 +34930,9 @@ function expandQuery(tokens) {
   return { original: tokens, expanded: [...synonyms] };
 }
 
+// src/lib/registry.ts
+init_connector_resolver();
+
 // src/lib/connectors/ai-ml.ts
 var connectors = [
   {
@@ -40950,7 +41106,10 @@ function searchConnectors(query, context) {
   return results.slice(0, limit);
 }
 function getConnector(name) {
-  return CONNECTORS.find((c) => c.name === name);
+  if (!isValidConnectorName(name))
+    return;
+  const normalizedName = normalizeConnectorName(name);
+  return CONNECTORS.find((c) => c.name === normalizedName);
 }
 var versionsLoaded = false;
 function loadConnectorVersions() {
@@ -40959,16 +41118,16 @@ function loadConnectorVersions() {
   versionsLoaded = true;
   const thisDir = dirname5(fileURLToPath3(import.meta.url));
   const candidates = [
-    join10(thisDir, "..", "connectors"),
-    join10(thisDir, "..", "..", "connectors")
+    join11(thisDir, "..", "connectors"),
+    join11(thisDir, "..", "..", "connectors")
   ];
-  const connectorsDir = candidates.find((d) => existsSync8(d));
+  const connectorsDir = candidates.find((d) => existsSync9(d));
   if (!connectorsDir)
     return;
   for (const connector of CONNECTORS) {
     try {
-      const pkgPath = join10(connectorsDir, `connect-${connector.name}`, "package.json");
-      if (existsSync8(pkgPath)) {
+      const pkgPath = join11(getConnectorPackagePath(connectorsDir, connector.name), "package.json");
+      if (existsSync9(pkgPath)) {
         const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
         connector.version = pkg.version || "0.0.0";
         continue;
@@ -41293,7 +41452,8 @@ function registerManagementTools(server, stripped) {
 init_zod();
 init_auth();
 init_database();
-import { existsSync as existsSync13, readFileSync as readFileSync9 } from "fs";
+init_connector_resolver();
+import { existsSync as existsSync14, readFileSync as readFileSync9 } from "fs";
 import { join as join15 } from "path";
 import { spawn } from "child_process";
 function registerAuthTools(server, stripped) {
@@ -41430,8 +41590,7 @@ function registerAuthTools(server, stripped) {
     const oauthUrl = `http://localhost:${serverPort}/oauth/${name}/start`;
     if (noBrowser) {
       const connectorsHome = getConnectorsHome();
-      const connectorDirName = name.startsWith("connect-") ? name : `connect-${name}`;
-      const tokensPath = join15(connectorsHome, connectorDirName, "profiles", "default", "tokens.json");
+      const tokenPaths = getConnectorConfigReadDirs(name, connectorsHome).map((dir) => join15(dir, "profiles", "default", "tokens.json"));
       let serverRunning = false;
       try {
         await fetch(`http://localhost:${serverPort}/api/connectors`);
@@ -41450,7 +41609,7 @@ function registerAuthTools(server, stripped) {
       const maxAttempts = 120;
       while (attempts < maxAttempts) {
         await new Promise((resolve) => setTimeout(resolve, 500));
-        if (existsSync13(tokensPath)) {
+        if (tokenPaths.some((tokensPath) => existsSync14(tokensPath))) {
           break;
         }
         attempts++;
@@ -41463,12 +41622,13 @@ function registerAuthTools(server, stripped) {
               connector: name,
               status: "waiting",
               oauthUrl,
-              message: `OAuth server is running on port ${serverPort}. Open the URL to authenticate. Tokens will be saved to ${tokensPath}.`
+              message: `OAuth server is running on port ${serverPort}. Open the URL to authenticate. Tokens will be saved to ${tokenPaths[0]}.`
             }, null, 2)
           }]
         };
       }
       try {
+        const tokensPath = tokenPaths.find((path) => existsSync14(path)) ?? tokenPaths[0];
         const tokenData = JSON.parse(readFileSync9(tokensPath, "utf-8"));
         return {
           content: [{