@hasna/connectors 1.3.30 → 1.3.32

package/bin/mcp.js

@@ -8548,7 +8548,6 @@ var require_limitLength = __commonJS((exports) => {
 var require_pattern = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   var code_1 = require_code2();
-  var util_1 = require_util();
   var codegen_1 = require_codegen();
   var error2 = {
     message: ({ schemaCode }) => (0, codegen_1.str)`must match pattern "${schemaCode}"`,
@@ -8561,18 +8560,10 @@ var require_pattern = __commonJS((exports) => {
     $data: true,
     error: error2,
     code(cxt) {
-      const { gen, data, $data, schema, schemaCode, it } = cxt;
+      const { data, $data, schema, schemaCode, it } = cxt;
       const u = it.opts.unicodeRegExp ? "u" : "";
-      if ($data) {
-        const { regExp } = it.opts.code;
-        const regExpCode = regExp.code === "new RegExp" ? (0, codegen_1._)`new RegExp` : (0, util_1.useFunc)(gen, regExp);
-        const valid = gen.let("valid");
-        gen.try(() => gen.assign(valid, (0, codegen_1._)`${regExpCode}(${schemaCode}, ${u}).test(${data})`), () => gen.assign(valid, false));
-        cxt.fail$data((0, codegen_1._)`!${valid}`);
-      } else {
-        const regExp = (0, code_1.usePattern)(cxt, schema);
-        cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
-      }
+      const regExp = $data ? (0, codegen_1._)`(new RegExp(${schemaCode}, ${u}))` : (0, code_1.usePattern)(cxt, schema);
+      cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
     }
   };
   exports.default = def;
@@ -10485,7 +10476,7 @@ var init_zod = __esm(() => {
 });
 
 // src/core/errors.ts
-var ConnectorDefinitionError, ConnectorOperationNotFoundError;
+var ConnectorDefinitionError;
 var init_errors2 = __esm(() => {
   ConnectorDefinitionError = class ConnectorDefinitionError extends Error {
     code;
@@ -10495,16 +10486,6 @@ var init_errors2 = __esm(() => {
       this.code = code;
     }
   };
-  ConnectorOperationNotFoundError = class ConnectorOperationNotFoundError extends Error {
-    connectorName;
-    operationName;
-    constructor(connectorName, operationName) {
-      super(`Operation '${operationName}' not found on connector '${connectorName}'`);
-      this.name = "ConnectorOperationNotFoundError";
-      this.connectorName = connectorName;
-      this.operationName = operationName;
-    }
-  };
 });
 
 // src/core/connector.ts
@@ -10546,34 +10527,11 @@ function defineConnector(definition) {
     operations: normalizedOperations
   };
 }
-function listConnectorOperations(connector) {
-  return Object.values(connector.operations).sort((a, b) => a.name.localeCompare(b.name));
-}
-function getConnectorOperation(connector, name) {
-  return listConnectorOperations(connector).find((operation) => operation.name === name);
-}
-async function executeConnectorOperation(connector, args) {
-  const operation = getConnectorOperation(connector, args.operation);
-  if (!operation) {
-    throw new ConnectorOperationNotFoundError(connector.meta.name, args.operation);
-  }
-  const context = connector.createContext ? await connector.createContext({
-    credentials: args.credentials,
-    profile: args.profile
-  }) : undefined;
-  const parsedInput = operation.inputSchema ? operation.inputSchema.parse(args.input ?? {}) : args.input ?? {};
-  return operation.execute({
-    connector,
-    context,
-    profile: args.profile,
-    credentials: args.credentials
-  }, parsedInput);
-}
 var CONNECTOR_NAME_RE, OPERATION_NAME_RE;
 var init_connector = __esm(() => {
   init_errors2();
   CONNECTOR_NAME_RE = /^[a-z0-9-]+$/;
-  OPERATION_NAME_RE = /^[A-Za-z0-9:._-]+$/;
+  OPERATION_NAME_RE = /^[a-z0-9:_-]+$/;
 });
 
 // src/core/registry.ts
@@ -10612,10 +10570,10 @@ import { dirname, join } from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 function resolveGithubConnectorDir() {
   const candidates = [
-    join(__dirname2, "..", "..", "..", "connectors", "github"),
-    join(__dirname2, "..", "..", "connectors", "github"),
-    join(__dirname2, "..", "connectors", "github"),
-    join(process.cwd(), "connectors", "github")
+    join(__dirname2, "..", "..", "..", "connectors", "connect-github"),
+    join(__dirname2, "..", "..", "connectors", "connect-github"),
+    join(__dirname2, "..", "connectors", "connect-github"),
+    join(process.cwd(), "connectors", "connect-github")
   ];
   for (const candidate of candidates) {
     if (existsSync(candidate)) {
@@ -11471,812 +11429,12 @@ Commands:
   });
 });
 
-// src/core/connectors/gmail.ts
-import { existsSync as existsSync2, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs";
-import { homedir } from "os";
-import { basename, join as join2 } from "path";
-async function modifyMessage(profile, messageId, addLabelIds, removeLabelIds) {
-  return requestJson(profile, `/users/me/messages/${encodeURIComponent(messageId)}/modify`, {}, {
-    method: "POST",
-    body: {
-      addLabelIds: addLabelIds ?? [],
-      removeLabelIds: removeLabelIds ?? []
-    }
-  });
-}
-async function replyToMessage(profile, messageId, input) {
-  const original = await requestJson(profile, `/users/me/messages/${encodeURIComponent(messageId)}`, { format: "full" });
-  const headers = headersToObject(original.payload?.headers ?? []);
-  const subject = normalizeReplySubject(headers.Subject ?? headers.subject ?? "");
-  const to = headers.From ?? headers.from ?? "";
-  const messageIdHeader = headers["Message-ID"] ?? headers["Message-Id"] ?? headers["message-id"] ?? "";
-  const references = [headers.References ?? headers.references, messageIdHeader].filter(Boolean).join(" ");
-  const raw = buildRawEmail({
-    to,
-    cc: normalizeStringArray(input.cc),
-    bcc: normalizeStringArray(input.bcc),
-    subject,
-    body: input.body,
-    isHtml: Boolean(input.html ?? input.isHtml),
-    inReplyTo: messageIdHeader,
-    references
-  });
-  return requestJson(profile, "/users/me/messages/send", {}, {
-    method: "POST",
-    body: {
-      raw: Buffer.from(raw).toString("base64url"),
-      threadId: original.threadId
-    }
-  });
-}
-async function downloadAttachments(profile, input) {
-  const messageId = getMessageId(input);
-  const outputDir = input.dir ?? input.outputDir ?? join2(configDirs()[0], "attachments", messageId);
-  mkdirSync(outputDir, { recursive: true });
-  const attachments = input.attachmentId && input.filename ? [{
-    attachmentId: input.attachmentId,
-    filename: input.filename,
-    mimeType: input.mimeType ?? "application/octet-stream",
-    size: 0
-  }] : collectAttachments((await requestJson(profile, `/users/me/messages/${encodeURIComponent(messageId)}`, { format: "full" })).payload);
-  const downloaded = [];
-  for (const attachment of attachments) {
-    const data = await requestJson(profile, `/users/me/messages/${encodeURIComponent(messageId)}/attachments/${encodeURIComponent(attachment.attachmentId)}`, {});
-    const filename = safeFilename(attachment.filename);
-    const path = join2(outputDir, filename);
-    const buffer = Buffer.from(data.data, "base64url");
-    writeFileSync(path, buffer);
-    downloaded.push({
-      filename,
-      path,
-      size: buffer.length,
-      mimeType: attachment.mimeType
-    });
-  }
-  return downloaded;
-}
-async function requestJson(profile, path, params, options = {}) {
-  const token = await getValidAccessToken(profile);
-  const url = new URL(`${GMAIL_API_BASE}${path}`);
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== undefined && value !== null && value !== "")
-      url.searchParams.append(key, String(value));
-  }
-  let lastError;
-  for (let attempt = 0;attempt <= MAX_GMAIL_RETRIES; attempt++) {
-    let response;
-    try {
-      response = await fetch(url, {
-        method: options.method ?? "GET",
-        headers: {
-          Authorization: `Bearer ${token}`,
-          Accept: "application/json",
-          ...options.body ? { "Content-Type": "application/json" } : {}
-        },
-        body: options.body ? JSON.stringify(options.body) : undefined
-      });
-    } catch (error3) {
-      lastError = error3 instanceof Error ? error3.message : String(error3);
-      if (attempt >= MAX_GMAIL_RETRIES)
-        throw error3;
-      await sleep(gmailBackoffDelayMs(attempt));
-      continue;
-    }
-    const text = await response.text();
-    const data = text ? JSON.parse(text) : {};
-    if (response.ok)
-      return data;
-    const error2 = data;
-    lastError = error2.error?.message ?? response.statusText;
-    if (!isRetryableGmailResponse(response.status, error2) || attempt >= MAX_GMAIL_RETRIES) {
-      throw new Error(`Gmail request failed (${response.status}): ${lastError}`);
-    }
-    await sleep(gmailBackoffDelayMs(attempt, response.headers.get("retry-after")));
-  }
-  throw new Error(`Gmail request failed: ${lastError ?? "unknown error"}`);
-}
-function isRetryableGmailResponse(status, error2) {
-  if ([429, 500, 502, 503, 504].includes(status))
-    return true;
-  const reasons = error2.error?.errors?.map((entry) => entry.reason) ?? [];
-  return reasons.some((reason) => reason === "rateLimitExceeded" || reason === "userRateLimitExceeded");
-}
-function gmailBackoffDelayMs(attempt, retryAfter = null) {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (Number.isFinite(seconds) && seconds >= 0)
-      return seconds * 1000;
-  }
-  const base = Number(process.env.CONNECTORS_GMAIL_RETRY_BASE_MS ?? "1000");
-  const baseMs = Number.isFinite(base) && base >= 0 ? base : 1000;
-  const jitterMs = Math.floor(Math.random() * 1000);
-  return Math.min(2 ** attempt * baseMs + jitterMs, 64000);
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-async function getValidAccessToken(profile) {
-  if (process.env.GMAIL_ACCESS_TOKEN)
-    return process.env.GMAIL_ACCESS_TOKEN;
-  const tokens = loadTokens(profile);
-  if (!tokens?.accessToken && !tokens?.refreshToken) {
-    throw new Error(`Gmail profile "${profile}" is not authenticated. Run: connectors auth gmail`);
-  }
-  if (tokens.accessToken && (!tokens.expiresAt || Date.now() < tokens.expiresAt - REFRESH_BUFFER_MS))
-    return tokens.accessToken;
-  if (!tokens.refreshToken)
-    return tokens.accessToken ?? "";
-  return (await refreshAccessToken(profile, tokens)).accessToken ?? "";
-}
-async function refreshAccessToken(profile, currentTokens) {
-  const credentials = loadCredentials(profile);
-  if (!credentials.clientId || !credentials.clientSecret)
-    throw new Error("Gmail OAuth credentials are not configured. Run: connectors auth gmail");
-  if (!currentTokens.refreshToken)
-    throw new Error(`Gmail profile "${profile}" has no refresh token. Run: connectors auth gmail`);
-  const response = await fetch(TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      client_id: credentials.clientId,
-      client_secret: credentials.clientSecret,
-      refresh_token: currentTokens.refreshToken,
-      grant_type: "refresh_token"
-    })
-  });
-  const data = await response.json().catch(() => ({}));
-  if (!response.ok || !data.access_token)
-    throw new Error(`Gmail token refresh failed: ${data.error_description || data.error || response.statusText}`);
-  const tokens = {
-    accessToken: data.access_token,
-    refreshToken: currentTokens.refreshToken,
-    expiresAt: Date.now() + (data.expires_in ?? 3600) * 1000,
-    tokenType: data.token_type ?? currentTokens.tokenType,
-    scope: data.scope ?? currentTokens.scope
-  };
-  saveTokens(profile, tokens);
-  return tokens;
-}
-function listProfiles() {
-  const profiles = new Set;
-  for (const baseDir of configDirs()) {
-    const profilesDir = join2(baseDir, "profiles");
-    if (!existsSync2(profilesDir))
-      continue;
-    for (const entry of readdirSync(profilesDir, { withFileTypes: true })) {
-      if (entry.isDirectory())
-        profiles.add(entry.name);
-      if (entry.isFile() && entry.name.endsWith(".json"))
-        profiles.add(basename(entry.name, ".json"));
-    }
-  }
-  return Array.from(profiles).sort((a, b) => a.localeCompare(b));
-}
-function loadCredentials(profile) {
-  const envClientId = process.env.GMAIL_CLIENT_ID ?? process.env.GOOGLE_CLIENT_ID;
-  const envClientSecret = process.env.GMAIL_CLIENT_SECRET ?? process.env.GOOGLE_CLIENT_SECRET;
-  if (envClientId && envClientSecret)
-    return { clientId: envClientId, clientSecret: envClientSecret };
-  for (const baseDir of configDirs()) {
-    const credentials = {
-      ...readJson(join2(baseDir, "credentials.json")),
-      ...readJson(join2(baseDir, "profiles", profile, "config.json"))
-    };
-    if (credentials.clientId || credentials.clientSecret)
-      return credentials;
-  }
-  return {};
-}
-function loadTokens(profile) {
-  for (const baseDir of configDirs()) {
-    const fromProfile = readJson(join2(baseDir, "profiles", profile, "tokens.json"));
-    if (fromProfile)
-      return fromProfile;
-    const flat = readJson(join2(baseDir, "profiles", `${profile}.json`));
-    if (flat)
-      return flat.tokens ?? (flat.accessToken || flat.refreshToken ? flat : null);
-  }
-  return null;
-}
-function saveTokens(profile, tokens) {
-  const baseDir = configDirs().find((dir) => existsSync2(dir)) ?? configDirs()[0];
-  const profileDir = join2(baseDir, "profiles", profile);
-  mkdirSync(profileDir, { recursive: true });
-  writeFileSync(join2(profileDir, "tokens.json"), JSON.stringify(tokens, null, 2), { mode: 384 });
-}
-function configDirs() {
-  const explicit = process.env.HASNA_GMAIL_CONNECTOR_DIR ?? process.env.GMAIL_CONNECTOR_DIR;
-  if (explicit)
-    return [explicit];
-  const baseDir = process.env.HASNA_CONNECTORS_DIR ?? join2(homedir(), ".hasna", "connectors");
-  return [join2(baseDir, "gmail"), join2(baseDir, "connect-gmail")];
-}
-function readJson(path) {
-  if (!existsSync2(path))
-    return null;
-  try {
-    return JSON.parse(readFileSync(path, "utf8"));
-  } catch {
-    return null;
-  }
-}
-function getMessageId(input) {
-  const id = input.messageId ?? (input.args?.[0] != null ? String(input.args[0]) : undefined);
-  if (!id)
-    throw new Error("Gmail messageId is required");
-  return id;
-}
-function headersToObject(headers) {
-  const out = {};
-  for (const header of headers)
-    out[header.name] = header.value;
-  return out;
-}
-function extractBody(message, preferHtml = false) {
-  if (!message.payload)
-    return "";
-  const targetType = preferHtml ? "text/html" : "text/plain";
-  const parts = [];
-  collectTextParts(message.payload, parts);
-  return parts.find((part) => part.mimeType === targetType)?.data ?? parts.find((part) => part.mimeType.startsWith("text/"))?.data ?? "";
-}
-function collectTextParts(part, results) {
-  const mimeType = (part.mimeType ?? "").split(";")[0].trim().toLowerCase();
-  if (part.body?.data && mimeType.startsWith("text/")) {
-    results.push({ mimeType, data: Buffer.from(part.body.data, "base64url").toString("utf8") });
-  }
-  for (const child of part.parts ?? [])
-    collectTextParts(child, results);
-}
-function collectAttachments(part, attachments = []) {
-  if (!part)
-    return attachments;
-  if (part.body?.attachmentId && part.filename) {
-    attachments.push({
-      attachmentId: part.body.attachmentId,
-      filename: part.filename,
-      mimeType: part.mimeType ?? "application/octet-stream",
-      size: part.body.size ?? 0,
-      partId: part.partId
-    });
-  }
-  for (const child of part.parts ?? [])
-    collectAttachments(child, attachments);
-  return attachments;
-}
-function normalizeStringArray(value) {
-  if (!value)
-    return [];
-  return Array.isArray(value) ? value : value.split(",").map((item) => item.trim()).filter(Boolean);
-}
-function normalizeReplySubject(subject) {
-  return subject.toLowerCase().startsWith("re:") ? subject : `Re: ${subject}`;
-}
-function buildRawEmail(input) {
-  const headers = [
-    `To: ${input.to}`,
-    input.cc.length ? `Cc: ${input.cc.join(", ")}` : "",
-    input.bcc.length ? `Bcc: ${input.bcc.join(", ")}` : "",
-    `Subject: ${input.subject}`,
-    input.inReplyTo ? `In-Reply-To: ${input.inReplyTo}` : "",
-    input.references ? `References: ${input.references}` : "",
-    "MIME-Version: 1.0",
-    `Content-Type: ${input.isHtml ? "text/html" : "text/plain"}; charset=UTF-8`
-  ].filter(Boolean);
-  return `${headers.join(`\r
-`)}\r
-\r
-${input.body}`;
-}
-function safeFilename(filename) {
-  return basename(filename.replace(/[\u00A0\u2000-\u200B\u202F\u205F\u3000]/g, " ")).replace(/[\/\\]/g, "_");
-}
-var GMAIL_API_BASE = "https://gmail.googleapis.com/gmail/v1", TOKEN_URL = "https://oauth2.googleapis.com/token", REFRESH_BUFFER_MS, MAX_GMAIL_RETRIES = 5, listMessagesSchema, messageIdSchema, readMessageSchema, attachmentListSchema, attachmentDownloadSchema, historyListSchema, replySchema, gmailConnector;
-var init_gmail = __esm(() => {
-  init_zod();
-  init_connector();
-  REFRESH_BUFFER_MS = 5 * 60 * 1000;
-  listMessagesSchema = exports_external.object({
-    max: exports_external.coerce.number().int().positive().max(500).optional(),
-    maxResults: exports_external.coerce.number().int().positive().max(500).optional(),
-    pageToken: exports_external.string().optional(),
-    query: exports_external.string().optional(),
-    q: exports_external.string().optional(),
-    label: exports_external.string().optional(),
-    labelIds: exports_external.union([exports_external.string(), exports_external.array(exports_external.string())]).optional(),
-    includeSpamTrash: exports_external.boolean().optional()
-  });
-  messageIdSchema = exports_external.object({
-    args: exports_external.array(exports_external.union([exports_external.string(), exports_external.number(), exports_external.boolean()])).optional(),
-    messageId: exports_external.string().optional()
-  });
-  readMessageSchema = messageIdSchema.extend({
-    body: exports_external.boolean().optional(),
-    html: exports_external.boolean().optional(),
-    format: exports_external.enum(["full", "metadata", "minimal", "raw"]).optional()
-  });
-  attachmentListSchema = messageIdSchema;
-  attachmentDownloadSchema = messageIdSchema.extend({
-    attachmentId: exports_external.string().optional(),
-    filename: exports_external.string().optional(),
-    mimeType: exports_external.string().optional(),
-    dir: exports_external.string().optional(),
-    outputDir: exports_external.string().optional()
-  });
-  historyListSchema = exports_external.object({
-    startHistoryId: exports_external.string(),
-    historyTypes: exports_external.union([exports_external.string(), exports_external.array(exports_external.string())]).optional(),
-    labelId: exports_external.string().optional(),
-    maxResults: exports_external.coerce.number().int().positive().max(500).optional(),
-    pageToken: exports_external.string().optional()
-  });
-  replySchema = messageIdSchema.extend({
-    body: exports_external.string(),
-    html: exports_external.boolean().optional(),
-    isHtml: exports_external.boolean().optional(),
-    cc: exports_external.union([exports_external.string(), exports_external.array(exports_external.string())]).optional(),
-    bcc: exports_external.union([exports_external.string(), exports_external.array(exports_external.string())]).optional()
-  });
-  gmailConnector = defineConnector({
-    meta: {
-      name: "gmail",
-      displayName: "Gmail",
-      description: "Profile-aware Gmail mailbox operations for sync, labels, attachments, history, and replies.",
-      category: "communication",
-      tags: ["google", "gmail", "email", "mailbox"]
-    },
-    auth: {
-      type: "oauth2",
-      supportsProfiles: true,
-      fields: [
-        { key: "clientId", env: "GMAIL_CLIENT_ID", label: "OAuth client ID" },
-        { key: "clientSecret", env: "GMAIL_CLIENT_SECRET", label: "OAuth client secret", secret: true }
-      ]
-    },
-    createContext: ({ profile }) => ({ profile: profile || "default" }),
-    operations: {
-      "profiles.list": {
-        summary: "List configured Gmail profiles.",
-        execute: () => ({ profiles: listProfiles() })
-      },
-      "profile.get": {
-        summary: "Get the authenticated Gmail profile.",
-        execute: async ({ context }) => requestJson(context.profile, "/users/me/profile", {})
-      },
-      "messages.list": {
-        summary: "List Gmail messages.",
-        inputSchema: listMessagesSchema,
-        execute: async ({ context }, input) => {
-          const labelIds = normalizeStringArray(input.labelIds ?? input.label);
-          return requestJson(context.profile, "/users/me/messages", {
-            maxResults: input.maxResults ?? input.max ?? 50,
-            pageToken: input.pageToken,
-            q: input.q ?? input.query,
-            labelIds: labelIds.length > 0 ? labelIds.join(",") : undefined,
-            includeSpamTrash: input.includeSpamTrash
-          });
-        }
-      },
-      "messages.read": {
-        summary: "Read a Gmail message with optional extracted body.",
-        inputSchema: readMessageSchema,
-        execute: async ({ context }, input) => {
-          const messageId = getMessageId(input);
-          const message = await requestJson(context.profile, `/users/me/messages/${encodeURIComponent(messageId)}`, { format: input.format ?? "full" });
-          const headers = headersToObject(message.payload?.headers ?? []);
-          return {
-            ...message,
-            from: headers.From ?? headers.from ?? "",
-            to: headers.To ?? headers.to ?? "",
-            cc: headers.Cc ?? headers.cc ?? "",
-            subject: headers.Subject ?? headers.subject ?? "",
-            date: headers.Date ?? headers.date ?? "",
-            body: input.body ? extractBody(message, Boolean(input.html)) : undefined,
-            size: message.sizeEstimate
-          };
-        }
-      },
-      "messages.getRaw": {
-        summary: "Read raw base64url Gmail message content.",
-        inputSchema: messageIdSchema,
-        execute: async ({ context }, input) => {
-          const messageId = getMessageId(input);
-          return requestJson(context.profile, `/users/me/messages/${encodeURIComponent(messageId)}`, { format: "raw" });
-        }
-      },
-      "messages.mark-read": {
-        summary: "Mark a message as read.",
-        inputSchema: messageIdSchema,
-        execute: async ({ context }, input) => modifyMessage(context.profile, getMessageId(input), undefined, ["UNREAD"])
-      },
-      "messages.mark-unread": {
-        summary: "Mark a message as unread.",
-        inputSchema: messageIdSchema,
-        execute: async ({ context }, input) => modifyMessage(context.profile, getMessageId(input), ["UNREAD"], undefined)
-      },
-      "messages.archive": {
-        summary: "Archive a message by removing the INBOX label.",
-        inputSchema: messageIdSchema,
-        execute: async ({ context }, input) => modifyMessage(context.profile, getMessageId(input), undefined, ["INBOX"])
-      },
-      "messages.star": {
-        summary: "Star a message.",
-        inputSchema: messageIdSchema,
-        execute: async ({ context }, input) => modifyMessage(context.profile, getMessageId(input), ["STARRED"], undefined)
-      },
-      "messages.reply": {
-        summary: "Reply to a Gmail message in the same thread.",
-        inputSchema: replySchema,
-        execute: async ({ context }, input) => replyToMessage(context.profile, getMessageId(input), input)
-      },
-      "attachments.list": {
-        summary: "List Gmail message attachments.",
-        inputSchema: attachmentListSchema,
-        execute: async ({ context }, input) => {
-          const message = await requestJson(context.profile, `/users/me/messages/${encodeURIComponent(getMessageId(input))}`, { format: "full" });
-          return collectAttachments(message.payload);
-        }
-      },
-      "attachments.download": {
-        summary: "Download one or all Gmail message attachments to disk.",
-        inputSchema: attachmentDownloadSchema,
-        execute: async ({ context }, input) => downloadAttachments(context.profile, input)
-      },
-      "labels.list": {
-        summary: "List Gmail labels.",
-        execute: async ({ context }) => requestJson(context.profile, "/users/me/labels", {})
-      },
-      "history.list": {
-        summary: "List Gmail mailbox history from a history id.",
-        inputSchema: historyListSchema,
-        execute: async ({ context }, input) => requestJson(context.profile, "/users/me/history", {
-          startHistoryId: input.startHistoryId,
-          historyTypes: normalizeStringArray(input.historyTypes).join(",") || undefined,
-          labelId: input.labelId,
-          maxResults: input.maxResults,
-          pageToken: input.pageToken
-        })
-      }
-    }
-  });
-});
-
-// src/core/connectors/googledrive.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, readdirSync as readdirSync2, writeFileSync as writeFileSync2 } from "fs";
-import { homedir as homedir2 } from "os";
-import { basename as basename2, join as join3 } from "path";
-async function requestJson2(profile, path, params) {
-  const response = await request(profile, path, params);
-  const text = await response.text();
-  return text ? JSON.parse(text) : {};
-}
-async function requestBinary(profile, path, params) {
-  return (await request(profile, path, params)).arrayBuffer();
-}
-async function request(profile, path, params) {
-  const token = await getValidAccessToken2(profile);
-  const url = new URL(`${DRIVE_API_BASE}${path}`);
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== undefined && value !== null && value !== "")
-      url.searchParams.set(key, String(value));
-  }
-  const response = await fetch(url, { headers: { Authorization: `Bearer ${token}`, Accept: "application/json" } });
-  if (!response.ok) {
-    const body = await response.text().catch(() => "");
-    throw new Error(`Google Drive request failed (${response.status}): ${extractGoogleError(body) || response.statusText}`);
-  }
-  return response;
-}
-async function getValidAccessToken2(profile) {
-  if (process.env.GOOGLE_ACCESS_TOKEN)
-    return process.env.GOOGLE_ACCESS_TOKEN;
-  const tokens = loadTokens2(profile);
-  if (!tokens?.accessToken && !tokens?.refreshToken) {
-    throw new Error(`Google Drive profile "${profile}" is not authenticated. Run: connectors auth googledrive`);
-  }
-  if (tokens.accessToken && (!tokens.expiresAt || Date.now() < tokens.expiresAt - REFRESH_BUFFER_MS2))
-    return tokens.accessToken;
-  if (!tokens.refreshToken)
-    return tokens.accessToken ?? "";
-  return (await refreshAccessToken2(profile, tokens)).accessToken ?? "";
-}
-async function refreshAccessToken2(profile, currentTokens) {
-  const credentials = loadCredentials2(profile);
-  if (!credentials.clientId || !credentials.clientSecret)
-    throw new Error("Google Drive OAuth credentials are not configured. Run: connectors auth googledrive");
-  if (!currentTokens.refreshToken)
-    throw new Error(`Google Drive profile "${profile}" has no refresh token. Run: connectors auth googledrive`);
-  const response = await fetch(TOKEN_URL2, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      client_id: credentials.clientId,
-      client_secret: credentials.clientSecret,
-      refresh_token: currentTokens.refreshToken,
-      grant_type: "refresh_token"
-    })
-  });
-  const data = await response.json().catch(() => ({}));
-  if (!response.ok || !data.access_token)
-    throw new Error(`Google Drive token refresh failed: ${data.error_description || data.error || response.statusText}`);
-  const tokens = {
-    accessToken: data.access_token,
-    refreshToken: currentTokens.refreshToken,
-    expiresAt: Date.now() + (data.expires_in ?? 3600) * 1000,
-    tokenType: data.token_type ?? currentTokens.tokenType,
-    scope: data.scope ?? currentTokens.scope
-  };
-  saveTokens2(profile, tokens);
-  return tokens;
-}
-function listProfiles2() {
-  const profiles = new Set;
-  for (const baseDir of configDirs2()) {
-    const profilesDir = join3(baseDir, "profiles");
-    if (!existsSync3(profilesDir))
-      continue;
-    for (const entry of readdirSync2(profilesDir, { withFileTypes: true })) {
-      if (entry.isDirectory())
-        profiles.add(entry.name);
-      if (entry.isFile() && entry.name.endsWith(".json"))
-        profiles.add(basename2(entry.name, ".json"));
-    }
-  }
-  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;
-  if (envClientId && envClientSecret)
-    return { clientId: envClientId, clientSecret: envClientSecret };
-  for (const baseDir of configDirs2()) {
-    const credentials = {
-      ...readJson2(join3(baseDir, "credentials.json")),
-      ...readJson2(join3(baseDir, "profiles", profile, "config.json"))
-    };
-    if (credentials.clientId || credentials.clientSecret)
-      return credentials;
-  }
-  return {};
-}
-function loadTokens2(profile) {
-  for (const baseDir of configDirs2()) {
-    const fromProfile = readJson2(join3(baseDir, "profiles", profile, "tokens.json"));
-    if (fromProfile)
-      return fromProfile;
-    const flat = readJson2(join3(baseDir, "profiles", `${profile}.json`));
-    if (flat)
-      return flat.tokens ?? (flat.accessToken || flat.refreshToken ? flat : null);
-  }
-  return null;
-}
-function saveTokens2(profile, tokens) {
-  const baseDir = configDirs2().find((dir) => existsSync3(dir)) ?? configDirs2()[0];
-  const profileDir = join3(baseDir, "profiles", profile);
-  mkdirSync2(profileDir, { recursive: true });
-  writeFileSync2(join3(profileDir, "tokens.json"), JSON.stringify(tokens, null, 2), { mode: 384 });
-}
-function configDirs2() {
-  const explicit = process.env.HASNA_GOOGLE_DRIVE_CONNECTOR_DIR ?? process.env.GOOGLE_DRIVE_CONNECTOR_DIR;
-  if (explicit)
-    return [explicit];
-  const baseDir = process.env.HASNA_CONNECTORS_DIR ?? join3(homedir2(), ".hasna", "connectors");
-  return [join3(baseDir, "googledrive"), join3(baseDir, "connect-googledrive")];
-}
-function readJson2(path) {
-  if (!existsSync3(path))
-    return null;
-  try {
-    return JSON.parse(readFileSync2(path, "utf8"));
-  } catch {
-    return null;
-  }
-}
-function defaultExportMimeType(googleMimeType) {
-  if (googleMimeType.endsWith(".document"))
-    return DEFAULT_EXPORT_FORMATS.document;
-  if (googleMimeType.endsWith(".spreadsheet"))
-    return DEFAULT_EXPORT_FORMATS.spreadsheet;
-  if (googleMimeType.endsWith(".presentation"))
-    return DEFAULT_EXPORT_FORMATS.presentation;
-  if (googleMimeType.endsWith(".drawing"))
-    return DEFAULT_EXPORT_FORMATS.drawing;
-  throw new Error(`Cannot export Google Workspace file type: ${googleMimeType}`);
-}
-function extensionForMimeType(mimeType) {
-  return EXPORT_EXTENSIONS[mimeType] ?? "";
-}
-function extractGoogleError(body) {
-  if (!body)
-    return "";
-  try {
-    const parsed = JSON.parse(body);
-    return parsed.error?.message ?? body;
-  } catch {
-    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, profilesStatusSchema, googleDriveConnector;
-var init_googledrive = __esm(() => {
-  init_zod();
-  init_connector();
-  REFRESH_BUFFER_MS2 = 5 * 60 * 1000;
-  DEFAULT_FILE_FIELDS = [
-    "id",
-    "name",
-    "mimeType",
-    "parents",
-    "version",
-    "md5Checksum",
-    "size",
-    "modifiedTime",
-    "createdTime",
-    "trashed",
-    "webViewLink",
-    "webContentLink"
-  ].join(",");
-  DEFAULT_EXPORT_FORMATS = {
-    document: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-    spreadsheet: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-    presentation: "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-    drawing: "image/png"
-  };
-  EXPORT_EXTENSIONS = {
-    "application/vnd.openxmlformats-officedocument.wordprocessingml.document": ".docx",
-    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx",
-    "application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx",
-    "application/pdf": ".pdf",
-    "text/plain": ".txt",
-    "text/csv": ".csv",
-    "image/png": ".png",
-    "image/jpeg": ".jpg",
-    "image/svg+xml": ".svg"
-  };
-  listFilesSchema = exports_external.object({
-    pageSize: exports_external.coerce.number().int().positive().max(1000).optional(),
-    pageToken: exports_external.string().optional(),
-    q: exports_external.string().optional(),
-    fields: exports_external.string().optional(),
-    orderBy: exports_external.string().optional(),
-    corpora: exports_external.enum(["user", "drive", "allDrives"]).optional(),
-    driveId: exports_external.string().optional(),
-    supportsAllDrives: exports_external.boolean().optional(),
-    includeItemsFromAllDrives: exports_external.boolean().optional()
-  });
-  listDrivesSchema = exports_external.object({
-    pageSize: exports_external.coerce.number().int().positive().max(100).optional(),
-    pageToken: exports_external.string().optional(),
-    q: exports_external.string().optional()
-  });
-  fileIdSchema = exports_external.object({
-    fileId: exports_external.string(),
-    fields: exports_external.string().optional()
-  });
-  downloadSchema = exports_external.object({
-    fileId: exports_external.string(),
-    file: exports_external.object({
-      id: exports_external.string(),
-      name: exports_external.string(),
-      mimeType: exports_external.string()
-    }).optional(),
-    exportMimeType: exports_external.string().optional()
-  });
-  profilesStatusSchema = exports_external.object({
-    profile: exports_external.string().optional()
-  });
-  googleDriveConnector = defineConnector({
-    meta: {
-      name: "googledrive",
-      displayName: "Google Drive",
-      description: "Profile-aware Google Drive discovery and file download operations.",
-      category: "storage",
-      tags: ["google", "drive", "files", "storage"]
-    },
-    auth: {
-      type: "oauth2",
-      supportsProfiles: true,
-      fields: [
-        { key: "clientId", env: "GOOGLE_CLIENT_ID", label: "OAuth client ID" },
-        { key: "clientSecret", env: "GOOGLE_CLIENT_SECRET", label: "OAuth client secret", secret: true }
-      ]
-    },
-    createContext: ({ profile }) => ({ profile: profile || "default" }),
-    operations: {
-      "profiles.list": {
-        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,
-        execute: async ({ context }, input) => requestJson2(context.profile, "/files", {
-          pageSize: input.pageSize ?? 1000,
-          pageToken: input.pageToken,
-          q: input.q,
-          fields: input.fields ?? `nextPageToken,files(${DEFAULT_FILE_FIELDS})`,
-          orderBy: input.orderBy ?? "modifiedTime desc",
-          corpora: input.corpora,
-          driveId: input.driveId,
-          supportsAllDrives: input.supportsAllDrives ?? true,
-          includeItemsFromAllDrives: input.includeItemsFromAllDrives ?? false
-        })
-      },
-      "files.get": {
-        summary: "Get Google Drive file metadata.",
-        inputSchema: fileIdSchema,
-        execute: async ({ context }, input) => requestJson2(context.profile, `/files/${encodeURIComponent(input.fileId)}`, {
-          fields: input.fields ?? DEFAULT_FILE_FIELDS,
-          supportsAllDrives: true
-        })
-      },
-      "files.download": {
-        summary: "Download or export a Google Drive file as base64 content.",
-        inputSchema: downloadSchema,
-        execute: async ({ context }, input) => {
-          const file = input.file ?? await requestJson2(context.profile, `/files/${encodeURIComponent(input.fileId)}`, { fields: DEFAULT_FILE_FIELDS, supportsAllDrives: true });
-          const exportMimeType = file.mimeType.startsWith("application/vnd.google-apps.") ? input.exportMimeType ?? defaultExportMimeType(file.mimeType) : undefined;
-          const data = await requestBinary(context.profile, exportMimeType ? `/files/${encodeURIComponent(file.id)}/export` : `/files/${encodeURIComponent(file.id)}`, exportMimeType ? { mimeType: exportMimeType, supportsAllDrives: true } : { alt: "media", supportsAllDrives: true });
-          const mimeType = exportMimeType ?? file.mimeType ?? "application/octet-stream";
-          return {
-            dataBase64: Buffer.from(data).toString("base64"),
-            filename: exportMimeType ? `${file.name}${extensionForMimeType(exportMimeType)}` : file.name,
-            mimeType
-          };
-        }
-      },
-      "drives.list": {
-        summary: "List Google shared drives.",
-        inputSchema: listDrivesSchema,
-        execute: async ({ context }, input) => requestJson2(context.profile, "/drives", {
-          pageSize: input.pageSize ?? 100,
-          pageToken: input.pageToken,
-          q: input.q
-        })
-      }
-    }
-  });
-});
-
 // package.json
 var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/connectors",
-    version: "1.3.30",
+    version: "1.3.24",
     description: "Open source connector library - Install API connectors with a single command",
     type: "module",
     bin: {
@@ -12367,22 +11525,22 @@ var init_package = __esm(() => {
 import { createRequire } from "module";
 import { Database } from "bun:sqlite";
 import {
-  existsSync as existsSync4,
-  mkdirSync as mkdirSync3,
-  readdirSync as readdirSync3,
+  existsSync as existsSync2,
+  mkdirSync,
+  readdirSync,
   copyFileSync
 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join4, relative } from "path";
-import { existsSync as existsSync22, mkdirSync as mkdirSync22, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir22 } from "os";
+import { homedir } from "os";
+import { join as join2, relative } from "path";
+import { existsSync as existsSync22, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "fs";
+import { homedir as homedir2 } from "os";
 import { join as join22 } from "path";
-import { readdirSync as readdirSync22, existsSync as existsSync32 } from "fs";
-import { join as join32 } from "path";
-import { homedir as homedir32 } from "os";
+import { readdirSync as readdirSync2, existsSync as existsSync3 } from "fs";
+import { join as join3 } from "path";
+import { homedir as homedir3 } from "os";
 import { hostname as hostname2 } from "os";
 import { homedir as homedir4 } from "os";
-import { join as join42 } from "path";
+import { join as join4 } from "path";
 import { join as join6, dirname as dirname2 } from "path";
 import { homedir as homedir5, platform } from "os";
 function __accessProp2(key) {
@@ -13255,13 +12413,13 @@ function custom3(check2, _params = {}, fatal) {
   return ZodAny2.create();
 }
 function getDataDir(serviceName) {
-  const dir = join4(HASNA_DIR, serviceName);
-  mkdirSync3(dir, { recursive: true });
+  const dir = join2(HASNA_DIR, serviceName);
+  mkdirSync(dir, { recursive: true });
   return dir;
 }
 function getDbPath(serviceName) {
   const dir = getDataDir(serviceName);
-  return join4(dir, `${serviceName}.db`);
+  return join2(dir, `${serviceName}.db`);
 }
 function getConfigDir() {
   return CONFIG_DIR;
@@ -13274,15 +12432,15 @@ function getCloudConfig() {
     return CloudConfigSchema.parse({});
   }
   try {
-    const raw = readFileSync3(CONFIG_PATH, "utf-8");
+    const raw = readFileSync(CONFIG_PATH, "utf-8");
     return CloudConfigSchema.parse(JSON.parse(raw));
   } catch {
     return CloudConfigSchema.parse({});
   }
 }
 function saveCloudConfig(config2) {
-  mkdirSync22(CONFIG_DIR, { recursive: true });
-  writeFileSync3(CONFIG_PATH, JSON.stringify(config2, null, 2) + `
+  mkdirSync2(CONFIG_DIR, { recursive: true });
+  writeFileSync(CONFIG_PATH, JSON.stringify(config2, null, 2) + `
 `, "utf-8");
 }
 function getConnectionString(dbName) {
@@ -13312,11 +12470,11 @@ function isSyncExcludedTable(table) {
   return SYNC_EXCLUDED_TABLE_PATTERNS.some((p) => p.test(table));
 }
 function discoverServices() {
-  const dataDir = join32(homedir32(), ".hasna");
-  if (!existsSync32(dataDir))
+  const dataDir = join3(homedir3(), ".hasna");
+  if (!existsSync3(dataDir))
     return [];
   try {
-    const entries = readdirSync22(dataDir, { withFileTypes: true });
+    const entries = readdirSync2(dataDir, { withFileTypes: true });
     return entries.filter((e) => {
       if (!e.isDirectory())
         return false;
@@ -13334,24 +12492,24 @@ function discoverSyncableServices() {
   return local.filter((s) => pgSet.has(s));
 }
 function getServiceDbPath(service) {
-  const dataDir = join32(homedir32(), ".hasna", service);
-  if (!existsSync32(dataDir))
+  const dataDir = join3(homedir3(), ".hasna", service);
+  if (!existsSync3(dataDir))
     return null;
   const candidates = [
-    join32(dataDir, `${service}.db`),
-    join32(dataDir, "data.db"),
-    join32(dataDir, "database.db")
+    join3(dataDir, `${service}.db`),
+    join3(dataDir, "data.db"),
+    join3(dataDir, "database.db")
   ];
   try {
-    const files = readdirSync22(dataDir);
+    const files = readdirSync2(dataDir);
     for (const f of files) {
       if (f.endsWith(".db") && !f.endsWith("-wal") && !f.endsWith("-shm")) {
-        candidates.push(join32(dataDir, f));
+        candidates.push(join3(dataDir, f));
       }
     }
   } catch {}
   for (const p of candidates) {
-    if (existsSync32(p))
+    if (existsSync3(p))
       return p;
   }
   return null;
@@ -13658,9 +12816,9 @@ async function syncTransfer(source, target, options, _direction) {
           const batch = rows.slice(offset, offset + batchSize);
           try {
             if (isAsyncAdapter(target)) {
-              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch);
+              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             } else {
-              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch);
+              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             }
             result.rowsWritten += batch.length;
           } catch (err) {
@@ -13707,7 +12865,7 @@ async function syncTransfer(source, target, options, _direction) {
   }
   return results;
 }
-async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch) {
+async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
@@ -13717,20 +12875,22 @@ async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, ba
   }).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => row[c] ?? null));
   await target.run(sql, ...params);
 }
-function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch) {
+function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
   const valuePlaceholders = batch.map(() => `(${columns.map(() => "?").join(", ")})`).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => coerceForSqlite(row[c])));
   target.run(sql, ...params);
 }
@@ -13955,7 +13115,7 @@ class SyncProgressTracker {
     }
   }
 }
-function registerCloudTools(server, serviceName) {
+function registerCloudTools(server, serviceName, opts = {}) {
   server.tool(`${serviceName}_cloud_status`, "Show cloud configuration and connection health", {}, async () => {
     const config2 = getCloudConfig();
     const lines = [
@@ -13988,8 +13148,13 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
+    if (opts.migrations?.length) {
+      for (const sql of opts.migrations) {
+        await cloud.run(sql);
+      }
+    }
     const tableList = tablesStr ? tablesStr.split(",").map((t) => t.trim()) : listSqliteTables(local);
     const results = await syncPush(local, cloud, { tables: tableList });
     local.close();
@@ -14011,7 +13176,7 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
     let tableList;
     if (tablesStr) {
@@ -22278,7 +21443,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
     init_external2();
   });
   init_dotfile = __esm2(() => {
-    HASNA_DIR = join4(homedir3(), ".hasna");
+    HASNA_DIR = join2(homedir(), ".hasna");
   });
   exports_config = {};
   __export2(exports_config, {
@@ -22309,7 +21474,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
         schedule_minutes: exports_external2.number().default(0)
       }).default({})
     });
-    CONFIG_DIR = join22(homedir22(), ".hasna", "cloud");
+    CONFIG_DIR = join22(homedir2(), ".hasna", "cloud");
     CONFIG_PATH = join22(CONFIG_DIR, "config.json");
   });
   exports_discover = {};
@@ -22374,7 +21539,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
   init_adapter();
   init_config();
   init_discover();
-  AUTO_SYNC_CONFIG_PATH = join42(homedir4(), ".hasna", "cloud", "config.json");
+  AUTO_SYNC_CONFIG_PATH = join4(homedir4(), ".hasna", "cloud", "config.json");
   init_config();
   init_adapter();
   init_dotfile();
@@ -22403,13 +21568,13 @@ __export(exports_database, {
 });
 import { dirname as dirname3, join as join5 } from "path";
 import { homedir as homedir6 } from "os";
-import { mkdirSync as mkdirSync4, existsSync as existsSync5, readdirSync as readdirSync4, copyFileSync as copyFileSync2, statSync } from "fs";
+import { mkdirSync as mkdirSync3, existsSync as existsSync4, readdirSync as readdirSync3, copyFileSync as copyFileSync2, statSync } from "fs";
 function mergeDirectoryContents(sourceDir, targetDir) {
-  if (!existsSync5(sourceDir)) {
+  if (!existsSync4(sourceDir)) {
     return;
   }
-  mkdirSync4(targetDir, { recursive: true });
-  for (const entry of readdirSync4(sourceDir)) {
+  mkdirSync3(targetDir, { recursive: true });
+  for (const entry of readdirSync3(sourceDir)) {
     const sourcePath = join5(sourceDir, entry);
     const targetPath = join5(targetDir, entry);
     try {
@@ -22418,7 +21583,7 @@ function mergeDirectoryContents(sourceDir, targetDir) {
         mergeDirectoryContents(sourcePath, targetPath);
         continue;
       }
-      if (!existsSync5(targetPath)) {
+      if (!existsSync4(targetPath)) {
         copyFileSync2(sourcePath, targetPath);
       }
     } catch {}
@@ -22428,7 +21593,7 @@ function getConnectorsHome() {
   const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir6();
   const newDir = join5(home, ".hasna", "connectors");
   const legacyDirs = [join5(home, ".connectors"), join5(home, ".connect")];
-  mkdirSync4(newDir, { recursive: true });
+  mkdirSync3(newDir, { recursive: true });
   for (const legacyDir of legacyDirs) {
     try {
       mergeDirectoryContents(legacyDir, newDir);
@@ -22446,7 +21611,7 @@ function getDatabase(path) {
     _dbPath = null;
   }
   if (dbPath !== ":memory:") {
-    mkdirSync4(dirname3(dbPath), { recursive: true });
+    mkdirSync3(dirname3(dbPath), { recursive: true });
   }
   _db = new SqliteAdapter(dbPath);
   _dbPath = dbPath;
@@ -22578,99 +21743,17 @@ 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 existsSync7,
+  existsSync as existsSync6,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync4,
-  readdirSync as readdirSync6,
+  readFileSync as readFileSync2,
+  readdirSync as readdirSync5,
   rmSync,
-  statSync as statSync3,
-  writeFileSync as writeFileSync4
+  statSync as statSync2,
+  writeFileSync as writeFileSync2
 } from "fs";
-import { join as join9 } from "path";
+import { join as join7 } from "path";
 function buildRootHelp(specs) {
   const lines = [
     "Usage: connect-imessage [options] [command]",
@@ -22715,44 +21798,36 @@ function buildCommandHelp(spec) {
 `);
 }
 function getConfigDir2() {
-  return getConnectorConfigDir(CONNECTOR_NAME);
-}
-function getConfigReadDirs() {
-  return getConnectorConfigReadDirs(CONNECTOR_NAME);
+  return join7(getConnectorsHome(), CONNECTOR_DIRNAME);
 }
 function getProfilesDir() {
-  return join9(getConfigDir2(), "profiles");
+  return join7(getConfigDir2(), "profiles");
 }
 function getCurrentProfile() {
-  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";
-    }
+  const currentProfileFile = join7(getConfigDir2(), "current_profile");
+  if (!existsSync6(currentProfileFile)) {
+    return "default";
+  }
+  try {
+    return readFileSync2(currentProfileFile, "utf-8").trim() || "default";
+  } catch {
+    return "default";
   }
-  return "default";
 }
 function setCurrentProfile(profile) {
   const configDir = getConfigDir2();
   mkdirSync5(configDir, { recursive: true });
-  writeFileSync4(join9(configDir, "current_profile"), profile);
+  writeFileSync2(join7(configDir, "current_profile"), profile);
 }
 function getFlatProfilePath(profile) {
-  return join9(getProfilesDir(), `${profile}.json`);
+  return join7(getProfilesDir(), `${profile}.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 getDirectoryProfilePath(profile) {
+  return join7(getProfilesDir(), profile, "config.json");
 }
 function loadJsonFile(path) {
   try {
-    return JSON.parse(readFileSync4(path, "utf-8"));
+    return JSON.parse(readFileSync2(path, "utf-8"));
   } catch {
     return {};
   }
@@ -22768,8 +21843,8 @@ function sanitizeProfileConfig(config2) {
   };
 }
 function loadProfile(profile = getCurrentProfile()) {
-  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) : {} }), {});
+  const flatConfig = existsSync6(getFlatProfilePath(profile)) ? loadJsonFile(getFlatProfilePath(profile)) : {};
+  const directoryConfig = existsSync6(getDirectoryProfilePath(profile)) ? loadJsonFile(getDirectoryProfilePath(profile)) : {};
   return sanitizeProfileConfig({
     ...flatConfig,
     ...directoryConfig
@@ -22778,33 +21853,32 @@ function loadProfile(profile = getCurrentProfile()) {
 function writeProfile(profile, config2) {
   const profilesDir = getProfilesDir();
   mkdirSync5(profilesDir, { recursive: true });
-  writeFileSync4(getFlatProfilePath(profile), JSON.stringify(config2, null, 2) + `
+  writeFileSync2(getFlatProfilePath(profile), JSON.stringify(config2, null, 2) + `
 `);
 }
 function profileExists(profile) {
   if (profile === "default") {
     return true;
   }
-  return getFlatProfileReadPaths(profile).some((path) => existsSync7(path)) || getConfigReadDirs().some((dir) => existsSync7(join9(dir, "profiles", profile)));
+  return existsSync6(getFlatProfilePath(profile)) || existsSync6(join7(getProfilesDir(), profile));
 }
-function listProfiles3() {
+function listProfiles() {
+  const profilesDir = getProfilesDir();
   const seen = new Set(["default"]);
-  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 {}
+  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$/, ""));
+      }
+    }
+  } catch {}
   return [...seen].sort();
 }
 function createProfile(profile, config2 = {}) {
@@ -22817,11 +21891,11 @@ function createProfile(profile, config2 = {}) {
 }
 function clearProfile(profile = getCurrentProfile()) {
   const flatPath = getFlatProfilePath(profile);
-  const directoryPath = join9(getProfilesDir(), profile);
-  if (existsSync7(flatPath)) {
+  const directoryPath = join7(getProfilesDir(), profile);
+  if (existsSync6(flatPath)) {
     rmSync(flatPath);
   }
-  if (existsSync7(directoryPath)) {
+  if (existsSync6(directoryPath)) {
     rmSync(directoryPath, { recursive: true, force: true });
   }
 }
@@ -23117,7 +22191,7 @@ async function sendMessage(context, input) {
     direction: "outbound"
   });
 }
-async function replyToMessage2(context, input) {
+async function replyToMessage(context, input) {
   const payload = await bridgeRequest(context, "/messages/reply", {
     method: "POST",
     body: {
@@ -23231,7 +22305,7 @@ async function runProfileCommand2(args, context) {
   switch (subcommand) {
     case "list": {
       const current = getCurrentProfile();
-      const profiles = listProfiles3();
+      const profiles = listProfiles();
       return successOutput({ current, profiles }, context.format, () => profiles.map((profile) => `${profile}${profile === current ? " (active)" : ""}`).join(`
 `));
     }
@@ -23405,7 +22479,7 @@ async function runMessageCommand(args, context) {
       if (!conversationId || !text) {
         return failure2("Usage: connect-imessage message reply --conversation <id> --text <text>");
       }
-      return successOutput(await replyToMessage2(resolved, {
+      return successOutput(await replyToMessage(resolved, {
         conversationId,
         text,
         replyToMessageId: asString2(options.replyTo),
@@ -23424,7 +22498,7 @@ function createOperationContext(args) {
     deviceId: extractCredentialString(args.credentials, "deviceId")
   });
 }
-var CONNECTOR_NAME = "imessage", COMMAND_SPECS, ROOT_HELP2, COMMAND_HELP2, COMMAND_DESCRIPTORS, IMESSAGE_DOCS = `# CLAUDE.md
+var CONNECTOR_DIRNAME = "connect-imessage", COMMAND_SPECS, ROOT_HELP2, COMMAND_HELP2, COMMAND_DESCRIPTORS, IMESSAGE_DOCS = `# CLAUDE.md
 
 ## Project Overview
 
@@ -23454,12 +22528,12 @@ API Key authentication is optional and depends on the bridge deployment. A bridg
 
 ## Data Storage
 
-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.
+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.
 `, commandInputSchema, conversationListInputSchema, conversationGetInputSchema, messageListInputSchema, messageSendInputSchema, messageReplyInputSchema, imessageConnector;
 var init_imessage = __esm(() => {
   init_package();
   init_zod();
-  init_connector_resolver();
+  init_database();
   init_connector();
   COMMAND_SPECS = [
     {
@@ -23683,7 +22757,7 @@ var init_imessage = __esm(() => {
         summary: "Reply to an existing conversation through the bridge",
         inputSchema: messageReplyInputSchema,
         async execute({ context }, input) {
-          return replyToMessage2(context, input);
+          return replyToMessage(context, input);
         }
       }
     },
@@ -23747,18 +22821,18 @@ var init_imessage = __esm(() => {
 });
 
 // src/core/connectors/stripe.ts
-import { existsSync as existsSync8 } from "fs";
-import { dirname as dirname4, join as join10 } from "path";
+import { existsSync as existsSync7 } from "fs";
+import { dirname as dirname4, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL2 } from "url";
 function resolveStripeConnectorDir() {
   const candidates = [
-    join10(__dirname3, "..", "..", "..", "connectors", "stripe"),
-    join10(__dirname3, "..", "..", "connectors", "stripe"),
-    join10(__dirname3, "..", "connectors", "stripe"),
-    join10(process.cwd(), "connectors", "stripe")
+    join8(__dirname3, "..", "..", "..", "connectors", "connect-stripe"),
+    join8(__dirname3, "..", "..", "connectors", "connect-stripe"),
+    join8(__dirname3, "..", "connectors", "connect-stripe"),
+    join8(process.cwd(), "connectors", "connect-stripe")
   ];
   for (const candidate of candidates) {
-    if (existsSync8(candidate)) {
+    if (existsSync7(candidate)) {
       return candidate;
     }
   }
@@ -23806,10 +22880,10 @@ function buildCommandHelp2(spec) {
 `);
 }
 async function loadStripeApiModule() {
-  return await import(pathToFileURL2(join10(CONNECTOR_DIR2, "src", "api", "index.ts")).href);
+  return await import(pathToFileURL2(join8(CONNECTOR_DIR2, "src", "api", "index.ts")).href);
 }
 async function loadStripeConfigModule() {
-  return await import(pathToFileURL2(join10(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
+  return await import(pathToFileURL2(join8(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
 }
 function extractGlobalArgs3(args) {
   const remaining = [];
@@ -24630,14 +23704,10 @@ var INTERNAL_CONNECTOR_DEFINITIONS, INTERNAL_CONNECTOR_REGISTRY;
 var init_builtins = __esm(() => {
   init_registry();
   init_github();
-  init_gmail();
-  init_googledrive();
   init_imessage();
   init_stripe();
   INTERNAL_CONNECTOR_DEFINITIONS = [
-    gmailConnector,
     githubConnector,
-    googleDriveConnector,
     imessageConnector,
     stripeConnector
   ];
@@ -24655,17 +23725,17 @@ __export(exports_llm, {
   PROVIDER_DEFAULTS: () => PROVIDER_DEFAULTS,
   LLMClient: () => LLMClient
 });
-import { existsSync as existsSync10, readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6 } from "fs";
-import { join as join12 } from "path";
+import { existsSync as existsSync9, readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync6 } from "fs";
+import { join as join10 } from "path";
 function getLlmConfigPath() {
-  return join12(getConnectorsHome(), "llm.json");
+  return join10(getConnectorsHome(), "llm.json");
 }
 function getLlmConfig() {
   const path = getLlmConfigPath();
-  if (!existsSync10(path))
+  if (!existsSync9(path))
     return null;
   try {
-    return JSON.parse(readFileSync6(path, "utf-8"));
+    return JSON.parse(readFileSync4(path, "utf-8"));
   } catch {
     return null;
   }
@@ -24673,7 +23743,7 @@ function getLlmConfig() {
 function saveLlmConfig(config2) {
   const dir = getConnectorsHome();
   mkdirSync6(dir, { recursive: true });
-  writeFileSync5(getLlmConfigPath(), JSON.stringify(config2, null, 2));
+  writeFileSync3(getLlmConfigPath(), JSON.stringify(config2, null, 2));
 }
 function setLlmStrip(enabled) {
   const config2 = getLlmConfig();
@@ -24792,34 +23862,37 @@ __export(exports_installer, {
   getConnectorDocs: () => getConnectorDocs,
   connectorExists: () => connectorExists
 });
-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 { existsSync as existsSync10, mkdirSync as mkdirSync7, readFileSync as readFileSync5, writeFileSync as writeFileSync4, readdirSync as readdirSync6, statSync as statSync3, rmSync as rmSync2 } from "fs";
+import { join as join11, dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function resolveConnectorsDir() {
-  const fromBin = join13(__dirname4, "..", "connectors");
-  if (existsSync11(fromBin))
+  const fromBin = join11(__dirname4, "..", "connectors");
+  if (existsSync10(fromBin))
     return fromBin;
-  const fromSrc = join13(__dirname4, "..", "..", "connectors");
-  if (existsSync11(fromSrc))
+  const fromSrc = join11(__dirname4, "..", "..", "connectors");
+  if (existsSync10(fromSrc))
     return fromSrc;
   return fromBin;
 }
+function normalizeConnectorName(name) {
+  return name.startsWith("connect-") ? name.slice("connect-".length) : name;
+}
 function getProjectConnectorsDir(targetDir) {
-  return join13(targetDir, PROJECT_CONNECTORS_DIRNAME);
+  return join11(targetDir, PROJECT_CONNECTORS_DIRNAME);
 }
 function getEnablementManifestPath(targetDir) {
-  return join13(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
+  return join11(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
 }
 function getLegacyInstallPath(targetDir, name) {
-  return join13(getProjectConnectorsDir(targetDir), legacyConnectorName(name));
+  return join11(getProjectConnectorsDir(targetDir), `connect-${normalizeConnectorName(name)}`);
 }
 function loadEnablementManifest(targetDir) {
   const manifestPath = getEnablementManifestPath(targetDir);
-  if (!existsSync11(manifestPath)) {
+  if (!existsSync10(manifestPath)) {
     return null;
   }
   try {
-    const raw = JSON.parse(readFileSync7(manifestPath, "utf-8"));
+    const raw = JSON.parse(readFileSync5(manifestPath, "utf-8"));
     if (!Array.isArray(raw.connectors)) {
       return null;
     }
@@ -24835,12 +23908,12 @@ function loadEnablementManifest(targetDir) {
 }
 function getLegacyInstalledConnectors(targetDir) {
   const connectorsDir = getProjectConnectorsDir(targetDir);
-  if (!existsSync11(connectorsDir)) {
+  if (!existsSync10(connectorsDir)) {
     return [];
   }
-  return readdirSync7(connectorsDir).filter((entry) => {
-    const fullPath = join13(connectorsDir, entry);
-    return entry.startsWith("connect-") && statSync4(fullPath).isDirectory();
+  return readdirSync6(connectorsDir).filter((entry) => {
+    const fullPath = join11(connectorsDir, entry);
+    return entry.startsWith("connect-") && statSync3(fullPath).isDirectory();
   }).map((entry) => entry.replace("connect-", "")).sort();
 }
 function getEnabledConnectors(targetDir) {
@@ -24848,7 +23921,7 @@ function getEnabledConnectors(targetDir) {
   return [...new Set([...manifestConnectors, ...getLegacyInstalledConnectors(targetDir)])].sort();
 }
 function updateConnectorsIndex(connectorsDir, connectors18) {
-  const indexPath = join13(connectorsDir, ENABLEMENT_INDEX_FILENAME);
+  const indexPath = join11(connectorsDir, ENABLEMENT_INDEX_FILENAME);
   const connectorList = connectors18.map((connector) => `  "${connector}",`).join(`
 `);
   const content = `/**
@@ -24864,7 +23937,7 @@ ${connectorList}
 
 export type EnabledConnectorName = typeof enabledConnectors[number];
 `;
-  writeFileSync6(indexPath, content);
+  writeFileSync4(indexPath, content);
 }
 function writeEnablementManifest(targetDir, connectors18) {
   const connectorsDir = getProjectConnectorsDir(targetDir);
@@ -24875,16 +23948,17 @@ function writeEnablementManifest(targetDir, connectors18) {
     updatedAt: new Date().toISOString(),
     connectors: [...new Set(connectors18.map((value) => normalizeConnectorName(value)))].sort()
   };
-  writeFileSync6(getEnablementManifestPath(targetDir), JSON.stringify(manifest, null, 2) + `
+  writeFileSync4(getEnablementManifestPath(targetDir), JSON.stringify(manifest, null, 2) + `
 `);
   updateConnectorsIndex(connectorsDir, manifest.connectors);
 }
 function getConnectorPath(name) {
-  return getConnectorPackagePath(CONNECTORS_DIR, name);
+  const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
+  return join11(CONNECTORS_DIR, connectorName);
 }
 function connectorExists(name) {
   const normalizedName = normalizeConnectorName(name);
-  return hasInternalConnectorDefinition(normalizedName) || existsSync11(getConnectorPath(normalizedName));
+  return hasInternalConnectorDefinition(normalizedName) || existsSync10(getConnectorPath(normalizedName));
 }
 function installConnector(name, options = {}) {
   const { targetDir = process.cwd(), overwrite = false } = options;
@@ -24917,7 +23991,7 @@ function installConnector(name, options = {}) {
   try {
     const nextEnabled = [...new Set([...installed, normalizedName])].sort();
     writeEnablementManifest(targetDir, nextEnabled);
-    if (overwrite && existsSync11(legacyInstallPath)) {
+    if (overwrite && existsSync10(legacyInstallPath)) {
       rmSync2(legacyInstallPath, { recursive: true });
     }
     return {
@@ -24952,9 +24026,9 @@ function parseConnectorDocs(raw) {
 function getConnectorDocs(name) {
   const normalizedName = normalizeConnectorName(name);
   const connectorPath = getConnectorPath(normalizedName);
-  const claudeMdPath = join13(connectorPath, "CLAUDE.md");
-  if (existsSync11(claudeMdPath)) {
-    return parseConnectorDocs(readFileSync7(claudeMdPath, "utf-8"));
+  const claudeMdPath = join11(connectorPath, "CLAUDE.md");
+  if (existsSync10(claudeMdPath)) {
+    return parseConnectorDocs(readFileSync5(claudeMdPath, "utf-8"));
   }
   const internalDocs = getInternalConnectorDefinition(normalizedName)?.docsMarkdown;
   if (internalDocs) {
@@ -24998,7 +24072,7 @@ function removeConnector(name, targetDir = process.cwd()) {
   const nextEnabled = installed.filter((connector) => connector !== normalizedName);
   writeEnablementManifest(targetDir, nextEnabled);
   const legacyInstallPath = getLegacyInstallPath(targetDir, normalizedName);
-  if (existsSync11(legacyInstallPath)) {
+  if (existsSync10(legacyInstallPath)) {
     rmSync2(legacyInstallPath, { recursive: true });
   }
   return true;
@@ -25006,7 +24080,6 @@ 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();
 });
@@ -25080,426 +24153,30 @@ var init_usage = __esm(() => {
   init_database();
 });
 
-// src/lib/lock.ts
-import { openSync, closeSync, unlinkSync, existsSync as existsSync12, statSync as statSync5 } from "fs";
-import { mkdirSync as mkdirSync8 } from "fs";
-function lockPath(connector) {
-  const dir = getConnectorConfigDir(connector);
-  mkdirSync8(dir, { recursive: true });
-  return `${dir}/.write.lock`;
-}
-function isStale(path) {
-  try {
-    const stat = statSync5(path);
-    return Date.now() - stat.mtimeMs > STALE_LOCK_MS;
-  } catch {
-    return false;
-  }
-}
-function tryAcquire(path) {
-  if (existsSync12(path) && isStale(path)) {
-    try {
-      unlinkSync(path);
-    } catch {}
-  }
-  try {
-    const fd = openSync(path, "wx");
-    closeSync(fd);
-    return true;
-  } catch (e) {
-    if (e.code === "EEXIST")
-      return false;
-    throw e;
-  }
-}
-function release(path) {
-  try {
-    unlinkSync(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) {
-    if (tryAcquire(path)) {
-      try {
-        return await fn();
-      } finally {
-        release(path);
-      }
-    }
-    await new Promise((resolve) => setTimeout(resolve, LOCK_RETRY_MS));
-  }
-  throw new LockTimeoutError(connector);
-}
-var LOCK_TIMEOUT_MS = 5000, LOCK_RETRY_MS = 100, STALE_LOCK_MS = 30000, LockTimeoutError;
-var init_lock = __esm(() => {
-  init_connector_resolver();
-  LockTimeoutError = class LockTimeoutError extends Error {
-    connector;
-    constructor(connector) {
-      super(`Could not acquire write lock for connector "${connector}" within ${LOCK_TIMEOUT_MS}ms. Another agent may be writing. Try again shortly.`);
-      this.connector = connector;
-      this.name = "LockTimeoutError";
-    }
-  };
-});
-
-// src/server/auth.ts
-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";
-  const authLower = docs.auth.toLowerCase();
-  if (authLower.includes("oauth"))
-    return "oauth";
-  if (authLower.includes("bearer token"))
-    return "bearer";
-  return "apikey";
-}
-function getConnectorConfigDir2(name) {
-  name = normalizeConnectorName(name);
-  return getConnectorConfigDir(name);
-}
-function getConnectorConfigReadDirs2(name) {
-  name = normalizeConnectorName(name);
-  return getConnectorConfigReadDirs(name);
-}
-function getCurrentProfile2(name) {
-  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 loadProfileConfigFromDir(configDir, profile) {
-  let flatConfig = {};
-  let dirConfig = {};
-  const profileFile = join14(configDir, "profiles", `${profile}.json`);
-  if (existsSync13(profileFile)) {
-    try {
-      flatConfig = JSON.parse(readFileSync8(profileFile, "utf-8"));
-    } catch {}
-  }
-  const profileDirConfig = join14(configDir, "profiles", profile, "config.json");
-  if (existsSync13(profileDirConfig)) {
-    try {
-      dirConfig = JSON.parse(readFileSync8(profileDirConfig, "utf-8"));
-    } catch {}
-  }
-  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) {
-  name = normalizeConnectorName(name);
-  const profile = getCurrentProfile2(name);
-  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);
-  if (profileConfig.refreshToken || profileConfig.accessToken) {
-    return {
-      accessToken: profileConfig.accessToken ?? "",
-      refreshToken: profileConfig.refreshToken,
-      expiresAt: profileConfig.expiresAt ?? 0,
-      tokenType: profileConfig.tokenType,
-      scope: profileConfig.scope
-    };
-  }
-  return null;
-}
-function isStoredOAuthEnvVarSet(variable, oauthConfig, tokens, profileConfig) {
-  if (variable.endsWith("_CLIENT_ID")) {
-    return Boolean(oauthConfig.clientId || profileConfig.clientId);
-  }
-  if (variable.endsWith("_CLIENT_SECRET")) {
-    return Boolean(oauthConfig.clientSecret || profileConfig.clientSecret);
-  }
-  if (variable.endsWith("_ACCESS_TOKEN")) {
-    return Boolean(tokens?.accessToken || profileConfig.accessToken);
-  }
-  if (variable.endsWith("_REFRESH_TOKEN")) {
-    return Boolean(tokens?.refreshToken || profileConfig.refreshToken);
-  }
-  if (variable.endsWith("_TOKEN_EXPIRES_AT")) {
-    return Boolean(tokens?.expiresAt || profileConfig.expiresAt);
-  }
-  return false;
-}
-function getAuthStatus(name) {
-  name = normalizeConnectorName(name);
-  const authType = getAuthType(name);
-  const docs = getConnectorDocs(name);
-  const oauthConfig = authType === "oauth" ? getOAuthConfig(name) : {};
-  const tokens = authType === "oauth" ? loadTokens3(name) : null;
-  const profileConfig = authType === "oauth" ? loadProfileConfig(name) : {};
-  const envVars = (docs?.envVars || []).map((v) => ({
-    variable: v.variable,
-    description: v.description,
-    set: !!process.env[v.variable] || authType === "oauth" && isStoredOAuthEnvVarSet(v.variable, oauthConfig, tokens, profileConfig)
-  }));
-  const envVarTotalCount = envVars.length;
-  const envVarSetCount = envVars.filter((v) => v.set).length;
-  if (authType === "oauth") {
-    const hasTokens = !!tokens?.accessToken || !!profileConfig.accessToken;
-    const hasRefreshToken = !!tokens?.refreshToken || !!profileConfig.refreshToken;
-    const tokenExpiry = tokens?.expiresAt || profileConfig.expiresAt;
-    const hasOAuthCredentials = Boolean(oauthConfig.clientId && oauthConfig.clientSecret);
-    const hasEnvVar2 = envVars.some((v) => v.set);
-    return {
-      type: "oauth",
-      configured: hasTokens || hasRefreshToken || hasOAuthCredentials || hasEnvVar2,
-      tokenExpiry,
-      hasRefreshToken,
-      hasOAuthCredentials,
-      envVars,
-      envVarSetCount,
-      envVarTotalCount
-    };
-  }
-  const config2 = loadProfileConfig(name);
-  const hasKey = Object.values(config2).some((v) => typeof v === "string" && v.length > 0);
-  const hasEnvVar = envVars.some((v) => v.set);
-  return {
-    type: authType,
-    configured: hasKey || hasEnvVar,
-    envVars,
-    envVarSetCount,
-    envVarTotalCount
-  };
-}
-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) {
-  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 (existsSync13(credentialsFile)) {
-      try {
-        creds = JSON.parse(readFileSync8(credentialsFile, "utf-8"));
-      } catch {}
-    }
-    creds[keyField] = key;
-    writeFileSync7(credentialsFile, JSON.stringify(creds, null, 2));
-    return;
-  }
-  const profileFile = join14(configDir, "profiles", `${profile}.json`);
-  const profileDir = join14(configDir, "profiles", profile);
-  if (existsSync13(profileFile)) {
-    let config2 = {};
-    try {
-      config2 = JSON.parse(readFileSync8(profileFile, "utf-8"));
-    } catch {}
-    config2[keyField] = key;
-    writeFileSync7(profileFile, JSON.stringify(config2, null, 2));
-    return;
-  }
-  if (existsSync13(profileDir)) {
-    const configFile = join14(profileDir, "config.json");
-    let config2 = {};
-    if (existsSync13(configFile)) {
-      try {
-        config2 = JSON.parse(readFileSync8(configFile, "utf-8"));
-      } catch {}
-    }
-    config2[keyField] = key;
-    writeFileSync7(configFile, JSON.stringify(config2, null, 2));
-    return;
-  }
-  mkdirSync9(profileDir, { recursive: true });
-  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";
-  const keyVar = docs.envVars.find((v) => v.variable.includes("API_KEY") || v.variable.includes("API_SECRET") || v.variable.includes("TOKEN") || v.variable.includes("SECRET"));
-  if (keyVar) {
-    const parts = keyVar.variable.toLowerCase().split("_");
-    const withoutPrefix = parts.slice(1);
-    if (withoutPrefix.length > 0) {
-      return withoutPrefix.map((p, i) => i === 0 ? p : p.charAt(0).toUpperCase() + p.slice(1)).join("");
-    }
-  }
-  return "apiKey";
-}
-function getOAuthConfig(name) {
-  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 {
-    clientId: config2.clientId,
-    clientSecret: config2.clientSecret
-  };
-}
-function saveOAuthTokens(name, tokens) {
-  name = normalizeConnectorName(name);
-  const configDir = getConnectorConfigDir2(name);
-  const profile = getCurrentProfile2(name);
-  const profileDir = join14(configDir, "profiles", profile);
-  mkdirSync9(profileDir, { recursive: true });
-  const tokensFile = join14(profileDir, "tokens.json");
-  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) {
-    throw new Error("OAuth credentials not configured for " + name);
-  }
-  if (!currentTokens?.refreshToken) {
-    throw new Error("No refresh token available. Please re-authenticate.");
-  }
-  const response = await fetch(GOOGLE_TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      client_id: oauthConfig.clientId,
-      client_secret: oauthConfig.clientSecret,
-      refresh_token: currentTokens.refreshToken,
-      grant_type: "refresh_token"
-    }),
-    signal: AbortSignal.timeout(FETCH_TIMEOUT)
-  });
-  if (!response.ok) {
-    const error2 = await response.json().catch(() => ({ error: response.statusText }));
-    throw new Error(`Token refresh failed: ${error2.error_description || error2.error}`);
-  }
-  const data = await response.json();
-  const tokens = {
-    accessToken: data.access_token,
-    refreshToken: currentTokens.refreshToken,
-    expiresAt: Date.now() + data.expires_in * 1000,
-    tokenType: data.token_type,
-    scope: data.scope || currentTokens.scope
-  };
-  saveOAuthTokens(name, tokens);
-  return tokens;
-}
-var FETCH_TIMEOUT = 1e4, oauthStateStore, GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token", GOOGLE_SCOPES;
-var init_auth = __esm(() => {
-  init_installer();
-  init_lock();
-  init_connector_resolver();
-  oauthStateStore = new Map;
-  GOOGLE_SCOPES = {
-    gmail: [
-      "https://www.googleapis.com/auth/gmail.readonly",
-      "https://www.googleapis.com/auth/gmail.send",
-      "https://www.googleapis.com/auth/gmail.compose",
-      "https://www.googleapis.com/auth/gmail.modify",
-      "https://www.googleapis.com/auth/gmail.labels",
-      "https://mail.google.com/"
-    ].join(" "),
-    googlecalendar: [
-      "https://www.googleapis.com/auth/calendar",
-      "https://www.googleapis.com/auth/calendar.events"
-    ].join(" "),
-    googledrive: [
-      "https://www.googleapis.com/auth/drive",
-      "https://www.googleapis.com/auth/drive.file"
-    ].join(" "),
-    googledocs: [
-      "https://www.googleapis.com/auth/documents",
-      "https://www.googleapis.com/auth/drive.file"
-    ].join(" "),
-    googlesheets: [
-      "https://www.googleapis.com/auth/spreadsheets",
-      "https://www.googleapis.com/auth/drive.file"
-    ].join(" "),
-    googletasks: [
-      "https://www.googleapis.com/auth/tasks"
-    ].join(" "),
-    googlecontacts: [
-      "https://www.googleapis.com/auth/contacts",
-      "https://www.googleapis.com/auth/contacts.readonly"
-    ].join(" "),
-    google: [
-      "openid",
-      "https://www.googleapis.com/auth/userinfo.email",
-      "https://www.googleapis.com/auth/userinfo.profile"
-    ].join(" ")
-  };
-});
-
-// src/lib/runner.ts
-var exports_runner = {};
-__export(exports_runner, {
-  runConnectorOperation: () => runConnectorOperation,
-  runConnectorCommand: () => runConnectorCommand,
-  parseCommanderHelpOperations: () => parseCommanderHelpOperations,
-  hasConnectorCommandSurface: () => hasConnectorCommandSurface,
-  getConnectorsWithCli: () => getConnectorsWithCli,
-  getConnectorOperations: () => getConnectorOperations,
-  getConnectorCommandHelp: () => getConnectorCommandHelp,
-  getConnectorCliPath: () => getConnectorCliPath,
-  buildEnvWithCredentials: () => buildEnvWithCredentials,
-  buildConnectorOperationArgs: () => buildConnectorOperationArgs
-});
-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 (existsSync15(fromBin))
-    return fromBin;
-  const fromSrc = join16(__dirname5, "..", "..", "connectors");
-  if (existsSync15(fromSrc))
-    return fromSrc;
-  return fromBin;
+// src/lib/runner.ts
+var exports_runner = {};
+__export(exports_runner, {
+  runConnectorCommand: () => runConnectorCommand,
+  parseCommanderHelpOperations: () => parseCommanderHelpOperations,
+  hasConnectorCommandSurface: () => hasConnectorCommandSurface,
+  getConnectorsWithCli: () => getConnectorsWithCli,
+  getConnectorOperations: () => getConnectorOperations,
+  getConnectorCommandHelp: () => getConnectorCommandHelp,
+  getConnectorCliPath: () => getConnectorCliPath,
+  buildEnvWithCredentials: () => buildEnvWithCredentials
+});
+import { existsSync as existsSync14, readdirSync as readdirSync8 } from "fs";
+import { join as join15, dirname as dirname7 } from "path";
+import { fileURLToPath as fileURLToPath5 } from "url";
+import { spawn as spawn2 } from "child_process";
+function resolveConnectorsDir2() {
+  const fromBin = join15(__dirname5, "..", "connectors");
+  if (existsSync14(fromBin))
+    return fromBin;
+  const fromSrc = join15(__dirname5, "..", "..", "connectors");
+  if (existsSync14(fromSrc))
+    return fromSrc;
+  return fromBin;
 }
 function buildInternalHelpText(name, commands) {
   const lines = [
@@ -25518,9 +24195,8 @@ function getInternalCommandRuntime(name) {
 }
 function buildEnvWithCredentials(connectorName, baseEnv) {
   const env = { ...baseEnv };
-  const normalizedConnectorName = normalizeConnectorName(connectorName);
-  const prefixes = ENV_VAR_NAME_OVERRIDES[normalizedConnectorName] || [
-    normalizedConnectorName.toUpperCase().replace(/-/g, "_")
+  const prefixes = ENV_VAR_NAME_OVERRIDES[connectorName] || [
+    connectorName.toUpperCase().replace(/-/g, "_")
   ];
   for (const prefix of prefixes) {
     const canonicalKey = `${prefix}_API_KEY`;
@@ -25541,32 +24217,13 @@ function buildEnvWithCredentials(connectorName, baseEnv) {
       }
     }
   }
-  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) {
-        env[variable] = oauthConfig.clientId;
-      } else if (variable.endsWith("_CLIENT_SECRET") && oauthConfig.clientSecret) {
-        env[variable] = oauthConfig.clientSecret;
-      } else if (variable.endsWith("_ACCESS_TOKEN") && tokens?.accessToken) {
-        env[variable] = tokens.accessToken;
-      } else if (variable.endsWith("_REFRESH_TOKEN") && tokens?.refreshToken) {
-        env[variable] = tokens.refreshToken;
-      } else if (variable.endsWith("_TOKEN_EXPIRES_AT") && tokens?.expiresAt) {
-        env[variable] = String(tokens.expiresAt);
-      }
-    }
-  }
   return env;
 }
 function getConnectorCliPath(name) {
-  const safeName = normalizeConnectorName(name).replace(/[^a-z0-9-]/g, "");
-  const connectorDir = getConnectorPackagePath(CONNECTORS_DIR2, safeName);
-  const cliPath = join16(connectorDir, "src", "cli", "index.ts");
-  if (existsSync15(cliPath))
+  const safeName = name.replace(/[^a-z0-9-]/g, "");
+  const connectorDir = join15(CONNECTORS_DIR2, `connect-${safeName}`);
+  const cliPath = join15(connectorDir, "src", "cli", "index.ts");
+  if (existsSync14(cliPath))
     return cliPath;
   return null;
 }
@@ -25604,7 +24261,7 @@ function parseCommanderHelpOperations(helpText) {
         inCommands = false;
       continue;
     }
-    const row = line.match(/^ {2}(?! )(\S.*?)(?: {2,}(.+))?$/);
+    const row = line.match(/^ {2}(\S.*?)(?: {2,}(.+))?$/);
     if (!row)
       continue;
     const usage = row[1].trim();
@@ -25621,9 +24278,8 @@ function parseCommanderHelpOperations(helpText) {
   return operations;
 }
 function runConnectorCommand(name, args, timeoutMs = 30000) {
-  const connectorName = normalizeConnectorName(name);
   getConnectorsHome();
-  const internalRuntime = getInternalCommandRuntime(connectorName);
+  const internalRuntime = getInternalCommandRuntime(name);
   if (internalRuntime?.run) {
     return Promise.resolve(internalRuntime.run(args)).then((result) => {
       if (result) {
@@ -25637,125 +24293,17 @@ function runConnectorCommand(name, args, timeoutMs = 30000) {
           success: result.success ?? exitCode === 0
         };
       }
-      return runLegacyConnectorCommand(connectorName, args, timeoutMs);
+      return runLegacyConnectorCommand(name, args, timeoutMs);
     });
   }
-  return runLegacyConnectorCommand(connectorName, args, timeoutMs);
-}
-async function runConnectorOperation(args) {
-  const connectorName = normalizeConnectorName(args.connector);
-  const internal = getInternalConnectorDefinition(connectorName);
-  if (internal?.operations[args.operation]) {
-    try {
-      const operationData = await executeConnectorOperation(internal, {
-        operation: args.operation,
-        input: args.input,
-        profile: args.profile
-      });
-      const commandResult = normalizeOperationReturn(operationData);
-      return {
-        connector: connectorName,
-        operation: args.operation,
-        profile: args.profile,
-        ...commandResult
-      };
-    } catch (error2) {
-      return {
-        connector: connectorName,
-        operation: args.operation,
-        profile: args.profile,
-        stdout: "",
-        stderr: error2.message,
-        exitCode: 1,
-        success: false
-      };
-    }
-  }
-  const commandArgs = buildConnectorOperationArgs(args);
-  const result = await runConnectorCommand(connectorName, commandArgs, args.timeoutMs ?? 30000);
-  const response = {
-    ...result,
-    connector: connectorName,
-    operation: args.operation,
-    profile: args.profile
-  };
-  if (args.parseJson !== false && result.stdout) {
-    try {
-      response.data = JSON.parse(result.stdout);
-    } catch {}
-  }
-  return response;
-}
-function normalizeOperationReturn(value) {
-  if (isRunResult(value)) {
-    const result = value;
-    const response = {
-      ...result
-    };
-    if (result.stdout) {
-      try {
-        response.data = JSON.parse(result.stdout);
-      } catch {}
-    }
-    return response;
-  }
-  return {
-    data: value,
-    stdout: JSON.stringify(value),
-    stderr: "",
-    exitCode: 0,
-    success: true
-  };
-}
-function isRunResult(value) {
-  if (!value || typeof value !== "object")
-    return false;
-  const candidate = value;
-  return typeof candidate.stdout === "string" && typeof candidate.stderr === "string" && typeof candidate.exitCode === "number" && typeof candidate.success === "boolean";
-}
-function buildConnectorOperationArgs(args) {
-  const commandArgs = [];
-  if (args.profile) {
-    commandArgs.push("--profile", args.profile);
-  }
-  commandArgs.push(...args.operation.split(".").filter(Boolean));
-  for (const positional of args.input?.args ?? []) {
-    commandArgs.push(String(positional));
-  }
-  let hasFormat = false;
-  for (const [key, value] of Object.entries(args.input ?? {})) {
-    if (key === "args")
-      continue;
-    if (value === undefined || value === null)
-      continue;
-    const flag = `--${key.replace(/_/g, "-").replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`)}`;
-    if (flag === "--format" || flag === "--json")
-      hasFormat = true;
-    if (typeof value === "boolean") {
-      if (value)
-        commandArgs.push(flag);
-      continue;
-    }
-    if (Array.isArray(value)) {
-      for (const item of value) {
-        commandArgs.push(flag, String(item));
-      }
-      continue;
-    }
-    commandArgs.push(flag, String(value));
-  }
-  if (args.parseJson !== false && !hasFormat) {
-    commandArgs.push("--format", "json");
-  }
-  return commandArgs;
+  return runLegacyConnectorCommand(name, args, timeoutMs);
 }
 function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
-  const connectorName = normalizeConnectorName(name);
-  const cliPath = getConnectorCliPath(connectorName);
+  const cliPath = getConnectorCliPath(name);
   if (!cliPath) {
     return Promise.resolve({
       stdout: "",
-      stderr: `Connector '${connectorName}' not found or has no CLI.`,
+      stderr: `Connector '${name}' not found or has no CLI.`,
       exitCode: 1,
       success: false
     });
@@ -25763,7 +24311,7 @@ function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
   return new Promise((resolve) => {
     const proc = spawn2("bun", ["run", cliPath, ...args], {
       timeout: timeoutMs,
-      env: buildEnvWithCredentials(connectorName, process.env),
+      env: buildEnvWithCredentials(name, process.env),
       stdio: ["pipe", "pipe", "pipe"]
     });
     let stdout = "";
@@ -25793,8 +24341,7 @@ function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
   });
 }
 async function getConnectorOperations(name) {
-  const connectorName = normalizeConnectorName(name);
-  const internalRuntime = getInternalCommandRuntime(connectorName);
+  const internalRuntime = getInternalCommandRuntime(name);
   if (internalRuntime?.commands.length) {
     const operations2 = internalRuntime.commands.map((command) => ({
       name: command.name,
@@ -25806,15 +24353,15 @@ async function getConnectorOperations(name) {
     return {
       commands: operations2.map((operation) => operation.name),
       operations: operations2,
-      helpText: internalRuntime.helpText ?? buildInternalHelpText(connectorName, internalRuntime.commands),
+      helpText: internalRuntime.helpText ?? buildInternalHelpText(name, internalRuntime.commands),
       hasCli: true
     };
   }
-  const cliPath = getConnectorCliPath(connectorName);
+  const cliPath = getConnectorCliPath(name);
   if (!cliPath) {
     return { commands: [], operations: [], helpText: "", hasCli: false };
   }
-  const result = await runConnectorCommand(connectorName, ["--help"]);
+  const result = await runConnectorCommand(name, ["--help"]);
   const helpText = result.stdout || result.stderr;
   const operations = parseCommanderHelpOperations(helpText);
   return {
@@ -25825,8 +24372,7 @@ async function getConnectorOperations(name) {
   };
 }
 async function getConnectorCommandHelp(name, command) {
-  const connectorName = normalizeConnectorName(name);
-  const internalRuntime = getInternalCommandRuntime(connectorName);
+  const internalRuntime = getInternalCommandRuntime(name);
   if (internalRuntime?.getHelp) {
     const help = await internalRuntime.getHelp(command);
     if (help) {
@@ -25837,15 +24383,17 @@ async function getConnectorCommandHelp(name, command) {
   if (runtimeCommand?.helpText) {
     return runtimeCommand.helpText;
   }
-  const result = await runConnectorCommand(connectorName, [command, "--help"]);
+  const result = await runConnectorCommand(name, [command, "--help"]);
   return result.stdout || result.stderr;
 }
 function getConnectorsWithCli() {
   const connectors18 = new Set;
   try {
-    const dirs = readdirSync9(CONNECTORS_DIR2);
+    const dirs = readdirSync8(CONNECTORS_DIR2);
     for (const dir of dirs) {
-      const name = normalizeConnectorName(dir);
+      if (!dir.startsWith("connect-"))
+        continue;
+      const name = dir.replace("connect-", "");
       if (getConnectorCliPath(name)) {
         connectors18.add(name);
       }
@@ -25861,10 +24409,7 @@ function getConnectorsWithCli() {
 var __dirname5, CONNECTORS_DIR2, ENV_VAR_NAME_OVERRIDES;
 var init_runner = __esm(() => {
   init_builtins();
-  init_connector();
   init_database();
-  init_auth();
-  init_connector_resolver();
   __dirname5 = dirname7(fileURLToPath5(import.meta.url));
   CONNECTORS_DIR2 = resolveConnectorsDir2();
   ENV_VAR_NAME_OVERRIDES = {
@@ -32845,10 +31390,6 @@ class Protocol {
     this._progressHandlers.clear();
     this._taskProgressTokens.clear();
     this._pendingDebouncedNotifications.clear();
-    for (const info of this._timeoutInfo.values()) {
-      clearTimeout(info.timeoutId);
-    }
-    this._timeoutInfo.clear();
     for (const controller of this._requestHandlerAbortControllers.values()) {
       controller.abort();
     }
@@ -32979,9 +31520,7 @@ class Protocol {
         await capturedTransport?.send(errorResponse);
       }
     }).catch((error2) => this._onerror(new Error(`Failed to send response: ${error2}`))).finally(() => {
-      if (this._requestHandlerAbortControllers.get(request.id) === abortController) {
-        this._requestHandlerAbortControllers.delete(request.id);
-      }
+      this._requestHandlerAbortControllers.delete(request.id);
     });
   }
   _onprogress(notification) {
@@ -33522,69 +32061,13 @@ class AjvJsonSchemaValidator {
   }
 }
 
-// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
-class ExperimentalServerTasks {
-  constructor(_server) {
-    this._server = _server;
-  }
-  requestStream(request, resultSchema, options) {
-    return this._server.requestStream(request, resultSchema, options);
-  }
-  createMessageStream(params, options) {
-    const clientCapabilities = this._server.getClientCapabilities();
-    if ((params.tools || params.toolChoice) && !clientCapabilities?.sampling?.tools) {
-      throw new Error("Client does not support sampling tools capability.");
-    }
-    if (params.messages.length > 0) {
-      const lastMessage = params.messages[params.messages.length - 1];
-      const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [lastMessage.content];
-      const hasToolResults = lastContent.some((c) => c.type === "tool_result");
-      const previousMessage = params.messages.length > 1 ? params.messages[params.messages.length - 2] : undefined;
-      const previousContent = previousMessage ? Array.isArray(previousMessage.content) ? previousMessage.content : [previousMessage.content] : [];
-      const hasPreviousToolUse = previousContent.some((c) => c.type === "tool_use");
-      if (hasToolResults) {
-        if (lastContent.some((c) => c.type !== "tool_result")) {
-          throw new Error("The last message must contain only tool_result content if any is present");
-        }
-        if (!hasPreviousToolUse) {
-          throw new Error("tool_result blocks are not matching any tool_use from the previous message");
-        }
-      }
-      if (hasPreviousToolUse) {
-        const toolUseIds = new Set(previousContent.filter((c) => c.type === "tool_use").map((c) => c.id));
-        const toolResultIds = new Set(lastContent.filter((c) => c.type === "tool_result").map((c) => c.toolUseId));
-        if (toolUseIds.size !== toolResultIds.size || ![...toolUseIds].every((id) => toolResultIds.has(id))) {
-          throw new Error("ids of tool_result blocks and tool_use blocks from previous message do not match");
-        }
-      }
-    }
-    return this.requestStream({
-      method: "sampling/createMessage",
-      params
-    }, CreateMessageResultSchema, options);
-  }
-  elicitInputStream(params, options) {
-    const clientCapabilities = this._server.getClientCapabilities();
-    const mode = params.mode ?? "form";
-    switch (mode) {
-      case "url": {
-        if (!clientCapabilities?.elicitation?.url) {
-          throw new Error("Client does not support url elicitation.");
-        }
-        break;
-      }
-      case "form": {
-        if (!clientCapabilities?.elicitation?.form) {
-          throw new Error("Client does not support form elicitation.");
-        }
-        break;
-      }
-    }
-    const normalizedParams = mode === "form" && params.mode === undefined ? { ...params, mode: "form" } : params;
-    return this.requestStream({
-      method: "elicitation/create",
-      params: normalizedParams
-    }, ElicitResultSchema, options);
+// node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
+class ExperimentalServerTasks {
+  constructor(_server) {
+    this._server = _server;
+  }
+  requestStream(request, resultSchema, options) {
+    return this._server.requestStream(request, resultSchema, options);
   }
   async getTask(taskId, options) {
     return this._server.getTask({ taskId }, options);
@@ -34641,9 +33124,6 @@ class McpServer {
           annotations = rest.shift();
         }
       } else if (typeof firstArg === "object" && firstArg !== null) {
-        if (Object.values(firstArg).some((v) => typeof v === "object" && v !== null)) {
-          throw new Error(`Tool ${name} expected a Zod schema or ToolAnnotations, but received an unrecognized object`);
-        }
         annotations = rest.shift();
       }
     }
@@ -34736,9 +33216,6 @@ function getZodSchemaObject(schema) {
   if (isZodRawShapeCompat(schema)) {
     return objectFromShape(schema);
   }
-  if (!isZodSchemaInstance(schema)) {
-    throw new Error("inputSchema must be a Zod schema or raw shape, received an unrecognized object");
-  }
   return schema;
 }
 function promptArgumentsFromSchema(schema) {
@@ -34876,8 +33353,8 @@ class StdioServerTransport {
 
 // src/lib/registry.ts
 init_builtins();
-import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
-import { join as join11, dirname as dirname5 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync3 } from "fs";
+import { join as join9, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/lib/fuzzy.ts
@@ -34966,9 +33443,6 @@ function expandQuery(tokens) {
   return { original: tokens, expanded: [...synonyms] };
 }
 
-// src/lib/registry.ts
-init_connector_resolver();
-
 // src/lib/connectors/ai-ml.ts
 var connectors = [
   {
@@ -41142,10 +39616,7 @@ function searchConnectors(query, context) {
   return results.slice(0, limit);
 }
 function getConnector(name) {
-  if (!isValidConnectorName(name))
-    return;
-  const normalizedName = normalizeConnectorName(name);
-  return CONNECTORS.find((c) => c.name === normalizedName);
+  return CONNECTORS.find((c) => c.name === name);
 }
 var versionsLoaded = false;
 function loadConnectorVersions() {
@@ -41154,17 +39625,17 @@ function loadConnectorVersions() {
   versionsLoaded = true;
   const thisDir = dirname5(fileURLToPath3(import.meta.url));
   const candidates = [
-    join11(thisDir, "..", "connectors"),
-    join11(thisDir, "..", "..", "connectors")
+    join9(thisDir, "..", "connectors"),
+    join9(thisDir, "..", "..", "connectors")
   ];
-  const connectorsDir = candidates.find((d) => existsSync9(d));
+  const connectorsDir = candidates.find((d) => existsSync8(d));
   if (!connectorsDir)
     return;
   for (const connector of CONNECTORS) {
     try {
-      const pkgPath = join11(getConnectorPackagePath(connectorsDir, connector.name), "package.json");
-      if (existsSync9(pkgPath)) {
-        const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
+      const pkgPath = join9(connectorsDir, `connect-${connector.name}`, "package.json");
+      if (existsSync8(pkgPath)) {
+        const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
         connector.version = pkg.version || "0.0.0";
         continue;
       }
@@ -41343,7 +39814,355 @@ function registerDiscoveryTools(server, stripped) {
 // src/mcp/tools/management.ts
 init_zod();
 init_installer();
-init_auth();
+
+// src/server/auth.ts
+import { existsSync as existsSync12, readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync9, readdirSync as readdirSync7, rmSync as rmSync3, statSync as statSync5 } from "fs";
+init_installer();
+import { join as join13 } from "path";
+
+// src/lib/lock.ts
+init_database();
+import { openSync, closeSync, unlinkSync, existsSync as existsSync11, statSync as statSync4 } from "fs";
+import { join as join12 } from "path";
+import { mkdirSync as mkdirSync8 } from "fs";
+var LOCK_TIMEOUT_MS = 5000;
+var LOCK_RETRY_MS = 100;
+var STALE_LOCK_MS = 30000;
+
+class LockTimeoutError extends Error {
+  connector;
+  constructor(connector) {
+    super(`Could not acquire write lock for connector "${connector}" within ${LOCK_TIMEOUT_MS}ms. Another agent may be writing. Try again shortly.`);
+    this.connector = connector;
+    this.name = "LockTimeoutError";
+  }
+}
+function lockPath(connector) {
+  const dir = join12(getConnectorsHome(), `connect-${connector}`);
+  mkdirSync8(dir, { recursive: true });
+  return join12(dir, ".write.lock");
+}
+function isStale(path) {
+  try {
+    const stat = statSync4(path);
+    return Date.now() - stat.mtimeMs > STALE_LOCK_MS;
+  } catch {
+    return false;
+  }
+}
+function tryAcquire(path) {
+  if (existsSync11(path) && isStale(path)) {
+    try {
+      unlinkSync(path);
+    } catch {}
+  }
+  try {
+    const fd = openSync(path, "wx");
+    closeSync(fd);
+    return true;
+  } catch (e) {
+    if (e.code === "EEXIST")
+      return false;
+    throw e;
+  }
+}
+function release(path) {
+  try {
+    unlinkSync(path);
+  } catch {}
+}
+async function withWriteLock(connector, fn) {
+  const path = lockPath(connector);
+  const deadline = Date.now() + LOCK_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    if (tryAcquire(path)) {
+      try {
+        return await fn();
+      } finally {
+        release(path);
+      }
+    }
+    await new Promise((resolve) => setTimeout(resolve, LOCK_RETRY_MS));
+  }
+  throw new LockTimeoutError(connector);
+}
+
+// src/server/auth.ts
+init_database();
+var FETCH_TIMEOUT = 1e4;
+var oauthStateStore = new Map;
+var GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token";
+var GOOGLE_SCOPES = {
+  gmail: [
+    "https://www.googleapis.com/auth/gmail.readonly",
+    "https://www.googleapis.com/auth/gmail.send",
+    "https://www.googleapis.com/auth/gmail.compose",
+    "https://www.googleapis.com/auth/gmail.modify",
+    "https://www.googleapis.com/auth/gmail.labels",
+    "https://mail.google.com/"
+  ].join(" "),
+  googlecalendar: [
+    "https://www.googleapis.com/auth/calendar",
+    "https://www.googleapis.com/auth/calendar.events"
+  ].join(" "),
+  googledrive: [
+    "https://www.googleapis.com/auth/drive",
+    "https://www.googleapis.com/auth/drive.file"
+  ].join(" "),
+  googledocs: [
+    "https://www.googleapis.com/auth/documents",
+    "https://www.googleapis.com/auth/drive.file"
+  ].join(" "),
+  googlesheets: [
+    "https://www.googleapis.com/auth/spreadsheets",
+    "https://www.googleapis.com/auth/drive.file"
+  ].join(" "),
+  googletasks: [
+    "https://www.googleapis.com/auth/tasks"
+  ].join(" "),
+  googlecontacts: [
+    "https://www.googleapis.com/auth/contacts",
+    "https://www.googleapis.com/auth/contacts.readonly"
+  ].join(" "),
+  google: [
+    "openid",
+    "https://www.googleapis.com/auth/userinfo.email",
+    "https://www.googleapis.com/auth/userinfo.profile"
+  ].join(" ")
+};
+function getAuthType(name) {
+  const docs = getConnectorDocs(name);
+  if (!docs?.auth)
+    return "apikey";
+  const authLower = docs.auth.toLowerCase();
+  if (authLower.includes("oauth"))
+    return "oauth";
+  if (authLower.includes("bearer token"))
+    return "bearer";
+  return "apikey";
+}
+function getConnectorConfigDir(name) {
+  const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
+  return join13(getConnectorsHome(), connectorName);
+}
+function getCurrentProfile2(name) {
+  const configDir = getConnectorConfigDir(name);
+  const currentProfileFile = join13(configDir, "current_profile");
+  if (existsSync12(currentProfileFile)) {
+    try {
+      return readFileSync6(currentProfileFile, "utf-8").trim() || "default";
+    } catch {
+      return "default";
+    }
+  }
+  return "default";
+}
+function loadProfileConfig(name) {
+  const configDir = getConnectorConfigDir(name);
+  const profile = getCurrentProfile2(name);
+  let flatConfig = {};
+  let dirConfig = {};
+  const profileFile = join13(configDir, "profiles", `${profile}.json`);
+  if (existsSync12(profileFile)) {
+    try {
+      flatConfig = JSON.parse(readFileSync6(profileFile, "utf-8"));
+    } catch {}
+  }
+  const profileDirConfig = join13(configDir, "profiles", profile, "config.json");
+  if (existsSync12(profileDirConfig)) {
+    try {
+      dirConfig = JSON.parse(readFileSync6(profileDirConfig, "utf-8"));
+    } catch {}
+  }
+  if (Object.keys(flatConfig).length === 0 && Object.keys(dirConfig).length === 0) {
+    return {};
+  }
+  return { ...flatConfig, ...dirConfig };
+}
+function loadTokens(name) {
+  const configDir = getConnectorConfigDir(name);
+  const profile = getCurrentProfile2(name);
+  const tokensFile = join13(configDir, "profiles", profile, "tokens.json");
+  if (existsSync12(tokensFile)) {
+    try {
+      return JSON.parse(readFileSync6(tokensFile, "utf-8"));
+    } catch {
+      return null;
+    }
+  }
+  const profileConfig = loadProfileConfig(name);
+  if (profileConfig.refreshToken || profileConfig.accessToken) {
+    return {
+      accessToken: profileConfig.accessToken ?? "",
+      refreshToken: profileConfig.refreshToken,
+      expiresAt: profileConfig.expiresAt ?? 0,
+      tokenType: profileConfig.tokenType,
+      scope: profileConfig.scope
+    };
+  }
+  return null;
+}
+function getAuthStatus(name) {
+  const authType = getAuthType(name);
+  const docs = getConnectorDocs(name);
+  const envVars = (docs?.envVars || []).map((v) => ({
+    variable: v.variable,
+    description: v.description,
+    set: !!process.env[v.variable]
+  }));
+  const envVarTotalCount = envVars.length;
+  const envVarSetCount = envVars.filter((v) => v.set).length;
+  if (authType === "oauth") {
+    const tokens = loadTokens(name);
+    const config3 = loadProfileConfig(name);
+    const hasTokens = !!tokens?.accessToken || !!config3.accessToken;
+    const hasRefreshToken = !!tokens?.refreshToken || !!config3.refreshToken;
+    const tokenExpiry = tokens?.expiresAt || config3.expiresAt;
+    const hasEnvVar2 = envVars.some((v) => v.set);
+    return {
+      type: "oauth",
+      configured: hasTokens || hasRefreshToken || hasEnvVar2,
+      tokenExpiry,
+      hasRefreshToken,
+      envVars,
+      envVarSetCount,
+      envVarTotalCount
+    };
+  }
+  const config2 = loadProfileConfig(name);
+  const hasKey = Object.values(config2).some((v) => typeof v === "string" && v.length > 0);
+  const hasEnvVar = envVars.some((v) => v.set);
+  return {
+    type: authType,
+    configured: hasKey || hasEnvVar,
+    envVars,
+    envVarSetCount,
+    envVarTotalCount
+  };
+}
+async function saveApiKey(name, key, field) {
+  return withWriteLock(name, () => _saveApiKey(name, key, field));
+}
+function _saveApiKey(name, key, field) {
+  const configDir = getConnectorConfigDir(name);
+  const profile = getCurrentProfile2(name);
+  const keyField = field || guessKeyField(name);
+  if (keyField === "clientId" || keyField === "clientSecret") {
+    const credentialsFile = join13(configDir, "credentials.json");
+    mkdirSync9(configDir, { recursive: true });
+    let creds = {};
+    if (existsSync12(credentialsFile)) {
+      try {
+        creds = JSON.parse(readFileSync6(credentialsFile, "utf-8"));
+      } catch {}
+    }
+    creds[keyField] = key;
+    writeFileSync5(credentialsFile, JSON.stringify(creds, null, 2));
+    return;
+  }
+  const profileFile = join13(configDir, "profiles", `${profile}.json`);
+  const profileDir = join13(configDir, "profiles", profile);
+  if (existsSync12(profileFile)) {
+    let config2 = {};
+    try {
+      config2 = JSON.parse(readFileSync6(profileFile, "utf-8"));
+    } catch {}
+    config2[keyField] = key;
+    writeFileSync5(profileFile, JSON.stringify(config2, null, 2));
+    return;
+  }
+  if (existsSync12(profileDir)) {
+    const configFile = join13(profileDir, "config.json");
+    let config2 = {};
+    if (existsSync12(configFile)) {
+      try {
+        config2 = JSON.parse(readFileSync6(configFile, "utf-8"));
+      } catch {}
+    }
+    config2[keyField] = key;
+    writeFileSync5(configFile, JSON.stringify(config2, null, 2));
+    return;
+  }
+  mkdirSync9(profileDir, { recursive: true });
+  writeFileSync5(join13(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
+}
+function guessKeyField(name) {
+  const docs = getConnectorDocs(name);
+  if (!docs?.envVars.length)
+    return "apiKey";
+  const keyVar = docs.envVars.find((v) => v.variable.includes("API_KEY") || v.variable.includes("API_SECRET") || v.variable.includes("TOKEN") || v.variable.includes("SECRET"));
+  if (keyVar) {
+    const parts = keyVar.variable.toLowerCase().split("_");
+    const withoutPrefix = parts.slice(1);
+    if (withoutPrefix.length > 0) {
+      return withoutPrefix.map((p, i) => i === 0 ? p : p.charAt(0).toUpperCase() + p.slice(1)).join("");
+    }
+  }
+  return "apiKey";
+}
+function getOAuthConfig(name) {
+  const configDir = getConnectorConfigDir(name);
+  const credentialsFile = join13(configDir, "credentials.json");
+  if (existsSync12(credentialsFile)) {
+    try {
+      const creds = JSON.parse(readFileSync6(credentialsFile, "utf-8"));
+      return { clientId: creds.clientId, clientSecret: creds.clientSecret };
+    } catch {}
+  }
+  const config2 = loadProfileConfig(name);
+  return {
+    clientId: config2.clientId,
+    clientSecret: config2.clientSecret
+  };
+}
+function saveOAuthTokens(name, tokens) {
+  const configDir = getConnectorConfigDir(name);
+  const profile = getCurrentProfile2(name);
+  const profileDir = join13(configDir, "profiles", profile);
+  mkdirSync9(profileDir, { recursive: true });
+  const tokensFile = join13(profileDir, "tokens.json");
+  writeFileSync5(tokensFile, JSON.stringify(tokens, null, 2), { mode: 384 });
+}
+async function refreshOAuthToken(name) {
+  return withWriteLock(name, () => _refreshOAuthToken(name));
+}
+async function _refreshOAuthToken(name) {
+  const oauthConfig = getOAuthConfig(name);
+  const currentTokens = loadTokens(name);
+  if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
+    throw new Error("OAuth credentials not configured for " + name);
+  }
+  if (!currentTokens?.refreshToken) {
+    throw new Error("No refresh token available. Please re-authenticate.");
+  }
+  const response = await fetch(GOOGLE_TOKEN_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      client_id: oauthConfig.clientId,
+      client_secret: oauthConfig.clientSecret,
+      refresh_token: currentTokens.refreshToken,
+      grant_type: "refresh_token"
+    }),
+    signal: AbortSignal.timeout(FETCH_TIMEOUT)
+  });
+  if (!response.ok) {
+    const error2 = await response.json().catch(() => ({ error: response.statusText }));
+    throw new Error(`Token refresh failed: ${error2.error_description || error2.error}`);
+  }
+  const data = await response.json();
+  const tokens = {
+    accessToken: data.access_token,
+    refreshToken: currentTokens.refreshToken,
+    expiresAt: Date.now() + data.expires_in * 1000,
+    tokenType: data.token_type,
+    scope: data.scope || currentTokens.scope
+  };
+  saveOAuthTokens(name, tokens);
+  return tokens;
+}
+
+// src/mcp/tools/management.ts
 function registerManagementTools(server, stripped) {
   server.registerTool("install_connector", {
     title: "Install Connector",
@@ -41486,11 +40305,9 @@ function registerManagementTools(server, stripped) {
 }
 // src/mcp/tools/auth.ts
 init_zod();
-init_auth();
 init_database();
-init_connector_resolver();
-import { existsSync as existsSync14, readFileSync as readFileSync9 } from "fs";
-import { join as join15 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync7 } from "fs";
+import { join as join14 } from "path";
 import { spawn } from "child_process";
 function registerAuthTools(server, stripped) {
   server.registerTool("connector_auth_status", {
@@ -41609,7 +40426,7 @@ function registerAuthTools(server, stripped) {
         };
       }
     }
-    const tokens = loadTokens3(name);
+    const tokens = loadTokens(name);
     if (tokens?.accessToken && tokens?.refreshToken) {
       if (tokens.expiresAt && Date.now() < tokens.expiresAt - 60000) {
         const mins = Math.floor((tokens.expiresAt - Date.now()) / 60000);
@@ -41626,7 +40443,8 @@ function registerAuthTools(server, stripped) {
     const oauthUrl = `http://localhost:${serverPort}/oauth/${name}/start`;
     if (noBrowser) {
       const connectorsHome = getConnectorsHome();
-      const tokenPaths = getConnectorConfigReadDirs(name, connectorsHome).map((dir) => join15(dir, "profiles", "default", "tokens.json"));
+      const connectorDirName = name.startsWith("connect-") ? name : `connect-${name}`;
+      const tokensPath = join14(connectorsHome, connectorDirName, "profiles", "default", "tokens.json");
       let serverRunning = false;
       try {
         await fetch(`http://localhost:${serverPort}/api/connectors`);
@@ -41645,7 +40463,7 @@ function registerAuthTools(server, stripped) {
       const maxAttempts = 120;
       while (attempts < maxAttempts) {
         await new Promise((resolve) => setTimeout(resolve, 500));
-        if (tokenPaths.some((tokensPath) => existsSync14(tokensPath))) {
+        if (existsSync13(tokensPath)) {
           break;
         }
         attempts++;
@@ -41658,14 +40476,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 ${tokenPaths[0]}.`
+              message: `OAuth server is running on port ${serverPort}. Open the URL to authenticate. Tokens will be saved to ${tokensPath}.`
             }, null, 2)
           }]
         };
       }
       try {
-        const tokensPath = tokenPaths.find((path) => existsSync14(path)) ?? tokenPaths[0];
-        const tokenData = JSON.parse(readFileSync9(tokensPath, "utf-8"));
+        const tokenData = JSON.parse(readFileSync7(tokensPath, "utf-8"));
         return {
           content: [{
             type: "text",
@@ -41709,7 +40526,6 @@ function registerAuthTools(server, stripped) {
 }
 // src/mcp/tools/operations.ts
 init_zod();
-init_auth();
 init_runner();
 function registerOperationsTools(server, stripped) {
   server.registerTool("list_connector_operations", {
@@ -41996,8 +40812,7 @@ function listWorkflows(db) {
 }
 
 // src/lib/workflow-runner.ts
-import { spawn as nodeSpawn } from "child_process";
-var spawnImpl = nodeSpawn;
+import { spawn as spawn3 } from "child_process";
 async function runStep(step, previousOutput) {
   return new Promise((resolve) => {
     const args = [...step.args ?? []];
@@ -42005,7 +40820,7 @@ async function runStep(step, previousOutput) {
       args.push("--input", previousOutput.trim().slice(0, 4096));
     }
     const cmdArgs = ["run", step.connector, step.command, ...args, "--format", "json"];
-    const proc = spawnImpl("connectors", cmdArgs, { shell: false });
+    const proc = spawn3("connectors", cmdArgs, { shell: false });
     let output = "";
     proc.stdout.on("data", (d) => {
       output += d.toString();
@@ -42047,11 +40862,11 @@ async function runWorkflow(workflow) {
 }
 
 // src/lib/scheduler.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 async function runConnectorCommand2(connector, command, args) {
   return new Promise((resolve) => {
     const cmdArgs = [connector, command, ...args, "--format", "json"];
-    const proc = spawn3("connectors", ["run", ...cmdArgs], { shell: false });
+    const proc = spawn4("connectors", ["run", ...cmdArgs], { shell: false });
     let output = "";
     proc.stdout.on("data", (d) => {
       output += d.toString();