@hasna/connectors 1.3.30 → 1.3.32

package/bin/index.js

@@ -1909,7 +1909,7 @@ 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: {
@@ -1997,7 +1997,7 @@ var init_package = __esm(() => {
 });
 
 // src/core/errors.ts
-var ConnectorDefinitionError, ConnectorOperationNotFoundError;
+var ConnectorDefinitionError;
 var init_errors = __esm(() => {
   ConnectorDefinitionError = class ConnectorDefinitionError extends Error {
     code;
@@ -2007,16 +2007,6 @@ var init_errors = __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
@@ -2058,34 +2048,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_errors();
   CONNECTOR_NAME_RE = /^[a-z0-9-]+$/;
-  OPERATION_NAME_RE = /^[A-Za-z0-9:._-]+$/;
+  OPERATION_NAME_RE = /^[a-z0-9:_-]+$/;
 });
 
 // src/core/registry.ts
@@ -6087,10 +6054,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)) {
@@ -6946,806 +6913,6 @@ 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 (error2) {
-      lastError = error2 instanceof Error ? error2.message : String(error2);
-      if (attempt >= MAX_GMAIL_RETRIES)
-        throw error2;
-      await sleep(gmailBackoffDelayMs(attempt));
-      continue;
-    }
-    const text = await response.text();
-    const data = text ? JSON.parse(text) : {};
-    if (response.ok)
-      return data;
-    const error = data;
-    lastError = error.error?.message ?? response.statusText;
-    if (!isRetryableGmailResponse(response.status, error) || 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, error) {
-  if ([429, 500, 502, 503, 504].includes(status))
-    return true;
-  const reasons = error.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
-        })
-      }
-    }
-  });
-});
-
 // node_modules/@hasna/cloud/dist/index.js
 var exports_dist = {};
 __export(exports_dist, {
@@ -7819,27 +6986,27 @@ __export(exports_dist, {
 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 } from "os";
-import { existsSync as existsSync42, readFileSync as readFileSync22 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join42 } from "path";
-import { existsSync as existsSync5, readdirSync as readdirSync32 } from "fs";
+import { join as join4 } from "path";
+import { existsSync as existsSync5, readdirSync as readdirSync3 } from "fs";
 import { join as join5 } from "path";
 import { join as join6, dirname as dirname2 } from "path";
-import { existsSync as existsSync6, writeFileSync as writeFileSync22, unlinkSync, mkdirSync as mkdirSync32 } from "fs";
+import { existsSync as existsSync6, writeFileSync as writeFileSync2, unlinkSync, mkdirSync as mkdirSync3 } from "fs";
 import { homedir as homedir5, platform } from "os";
 function __accessProp2(key) {
   return this[key];
@@ -8722,33 +7889,33 @@ function custom2(check, _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 migrateDotfile(serviceName) {
-  const legacyDir = join4(homedir3(), `.${serviceName}`);
-  const newDir = join4(HASNA_DIR, serviceName);
-  if (!existsSync4(legacyDir))
+  const legacyDir = join2(homedir(), `.${serviceName}`);
+  const newDir = join2(HASNA_DIR, serviceName);
+  if (!existsSync2(legacyDir))
     return [];
-  if (existsSync4(newDir))
+  if (existsSync2(newDir))
     return [];
-  mkdirSync3(newDir, { recursive: true });
+  mkdirSync(newDir, { recursive: true });
   const migrated = [];
   copyDirRecursive(legacyDir, newDir, legacyDir, migrated);
   return migrated;
 }
 function copyDirRecursive(src, dest, root, migrated) {
-  const entries = readdirSync3(src, { withFileTypes: true });
+  const entries = readdirSync(src, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = join4(src, entry.name);
-    const destPath = join4(dest, entry.name);
+    const srcPath = join2(src, entry.name);
+    const destPath = join2(dest, entry.name);
     if (entry.isDirectory()) {
-      mkdirSync3(destPath, { recursive: true });
+      mkdirSync(destPath, { recursive: true });
       copyDirRecursive(srcPath, destPath, root, migrated);
     } else {
       copyFileSync(srcPath, destPath);
@@ -8757,10 +7924,10 @@ function copyDirRecursive(src, dest, root, migrated) {
   }
 }
 function hasLegacyDotfile(serviceName) {
-  return existsSync4(join4(homedir3(), `.${serviceName}`));
+  return existsSync2(join2(homedir(), `.${serviceName}`));
 }
 function getHasnaDir() {
-  mkdirSync3(HASNA_DIR, { recursive: true });
+  mkdirSync(HASNA_DIR, { recursive: true });
   return HASNA_DIR;
 }
 function getConfigDir() {
@@ -8774,15 +7941,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(config) {
-  mkdirSync22(CONFIG_DIR, { recursive: true });
-  writeFileSync3(CONFIG_PATH, JSON.stringify(config, null, 2) + `
+  mkdirSync2(CONFIG_DIR, { recursive: true });
+  writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + `
 `, "utf-8");
 }
 function getConnectionString(dbName) {
@@ -8812,11 +7979,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;
@@ -8834,24 +8001,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;
@@ -9158,9 +8325,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) {
@@ -9207,7 +8374,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(", ");
@@ -9217,20 +8384,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);
 }
@@ -9770,10 +8939,10 @@ function resetAllSyncMeta(db) {
 }
 function getAutoSyncConfig() {
   try {
-    if (!existsSync42(AUTO_SYNC_CONFIG_PATH)) {
+    if (!existsSync4(AUTO_SYNC_CONFIG_PATH)) {
       return { ...DEFAULT_AUTO_SYNC_CONFIG };
     }
-    const raw = JSON.parse(readFileSync22(AUTO_SYNC_CONFIG_PATH, "utf-8"));
+    const raw = JSON.parse(readFileSync2(AUTO_SYNC_CONFIG_PATH, "utf-8"));
     return {
       auto_sync_on_start: typeof raw.auto_sync_on_start === "boolean" ? raw.auto_sync_on_start : DEFAULT_AUTO_SYNC_CONFIG.auto_sync_on_start,
       auto_sync_on_stop: typeof raw.auto_sync_on_stop === "boolean" ? raw.auto_sync_on_stop : DEFAULT_AUTO_SYNC_CONFIG.auto_sync_on_stop
@@ -9888,7 +9057,7 @@ function discoverSyncableServices2() {
   const hasnaDir = getHasnaDir();
   const services = [];
   try {
-    const entries = readdirSync32(hasnaDir, { withFileTypes: true });
+    const entries = readdirSync3(hasnaDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
@@ -10058,11 +9227,11 @@ function createLaunchdPlist(intervalMinutes) {
 async function registerLaunchd(intervalMinutes) {
   const plistPath = getLaunchdPlistPath();
   const plistDir = dirname2(plistPath);
-  mkdirSync32(plistDir, { recursive: true });
+  mkdirSync3(plistDir, { recursive: true });
   try {
     await Bun.spawn(["launchctl", "unload", plistPath]).exited;
   } catch {}
-  writeFileSync22(plistPath, createLaunchdPlist(intervalMinutes));
+  writeFileSync2(plistPath, createLaunchdPlist(intervalMinutes));
   await Bun.spawn(["launchctl", "load", plistPath]).exited;
 }
 async function removeLaunchd() {
@@ -10109,9 +9278,9 @@ WantedBy=timers.target
 }
 async function registerSystemd(intervalMinutes) {
   const dir = getSystemdDir();
-  mkdirSync32(dir, { recursive: true });
-  writeFileSync22(join6(dir, `${SERVICE_NAME}.service`), createSystemdService());
-  writeFileSync22(join6(dir, `${SERVICE_NAME}.timer`), createSystemdTimer(intervalMinutes));
+  mkdirSync3(dir, { recursive: true });
+  writeFileSync2(join6(dir, `${SERVICE_NAME}.service`), createSystemdService());
+  writeFileSync2(join6(dir, `${SERVICE_NAME}.timer`), createSystemdTimer(intervalMinutes));
   await Bun.spawn(["systemctl", "--user", "daemon-reload"]).exited;
   await Bun.spawn(["systemctl", "--user", "enable", "--now", `${SERVICE_NAME}.timer`]).exited;
 }
@@ -10134,7 +9303,7 @@ async function registerSyncSchedule(intervalMinutes) {
   if (intervalMinutes <= 0) {
     throw new Error("Interval must be a positive number of minutes.");
   }
-  mkdirSync32(CONFIG_DIR2, { recursive: true });
+  mkdirSync3(CONFIG_DIR2, { recursive: true });
   if (platform() === "darwin") {
     await registerLaunchd(intervalMinutes);
   } else {
@@ -10300,7 +9469,7 @@ async function ensureAllPgDatabases() {
   }
   return results;
 }
-function registerCloudTools(server, serviceName) {
+function registerCloudTools(server, serviceName, opts = {}) {
   server.tool(`${serviceName}_cloud_status`, "Show cloud configuration and connection health", {}, async () => {
     const config = getCloudConfig();
     const lines = [
@@ -10333,8 +9502,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();
@@ -10356,7 +9530,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) {
@@ -18708,7 +17882,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, {
@@ -18739,7 +17913,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 = {};
@@ -18804,7 +17978,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");
   DEFAULT_AUTO_SYNC_CONFIG = {
     auto_sync_on_start: true,
     auto_sync_on_stop: true
@@ -19013,115 +18187,17 @@ var init_database = __esm(() => {
   DB_PATH = join7(DB_DIR, "connectors.db");
 });
 
-// src/lib/connector-resolver.ts
-import { existsSync as existsSync9, readdirSync as readdirSync5, statSync as statSync2 } from "fs";
-import { join as join9 } 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) => join9(connectorsDir, dirName));
-  const existingPath = checkedPaths.find((path) => existsSync9(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 = join9(connectorsHome, preferredDirName);
-  const legacyPath = join9(connectorsHome, resolution.legacyName);
-  const paths = preferredPath === legacyPath ? [preferredPath] : [preferredPath, legacyPath];
-  const existingPaths = paths.filter((path) => existsSync9(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;
-}
-function listConfiguredConnectorNames(connectorsHome = getConnectorsHome()) {
-  if (!existsSync9(connectorsHome))
-    return [];
-  const names = new Set;
-  for (const entry of readdirSync5(connectorsHome)) {
-    const fullPath = join9(connectorsHome, entry);
-    try {
-      if (!statSync2(fullPath).isDirectory())
-        continue;
-      if (!isValidConnectorName(entry))
-        continue;
-      names.add(normalizeConnectorName(entry));
-    } catch {}
-  }
-  return [...names].sort();
-}
-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 existsSync10,
-  mkdirSync as mkdirSync5,
-  readFileSync as readFileSync4,
+  existsSync as existsSync9,
+  mkdirSync as mkdirSync6,
+  readFileSync as readFileSync3,
   readdirSync as readdirSync6,
   rmSync,
-  statSync as statSync3,
-  writeFileSync as writeFileSync4
+  statSync as statSync2,
+  writeFileSync as writeFileSync3
 } from "fs";
-import { join as join10 } from "path";
+import { join as join9 } from "path";
 function buildRootHelp(specs) {
   const lines = [
     "Usage: connect-imessage [options] [command]",
@@ -19166,44 +18242,36 @@ function buildCommandHelp(spec) {
 `);
 }
 function getConfigDir2() {
-  return getConnectorConfigDir(CONNECTOR_NAME);
-}
-function getConfigReadDirs() {
-  return getConnectorConfigReadDirs(CONNECTOR_NAME);
+  return join9(getConnectorsHome(), CONNECTOR_DIRNAME);
 }
 function getProfilesDir() {
-  return join10(getConfigDir2(), "profiles");
+  return join9(getConfigDir2(), "profiles");
 }
 function getCurrentProfile() {
-  for (const configDir of getConfigReadDirs()) {
-    const currentProfileFile = join10(configDir, "current_profile");
-    if (!existsSync10(currentProfileFile))
-      continue;
-    try {
-      return readFileSync4(currentProfileFile, "utf-8").trim() || "default";
-    } catch {
-      return "default";
-    }
+  const currentProfileFile = join9(getConfigDir2(), "current_profile");
+  if (!existsSync9(currentProfileFile)) {
+    return "default";
+  }
+  try {
+    return readFileSync3(currentProfileFile, "utf-8").trim() || "default";
+  } catch {
+    return "default";
   }
-  return "default";
 }
 function setCurrentProfile(profile) {
   const configDir = getConfigDir2();
-  mkdirSync5(configDir, { recursive: true });
-  writeFileSync4(join10(configDir, "current_profile"), profile);
+  mkdirSync6(configDir, { recursive: true });
+  writeFileSync3(join9(configDir, "current_profile"), profile);
 }
 function getFlatProfilePath(profile) {
-  return join10(getProfilesDir(), `${profile}.json`);
+  return join9(getProfilesDir(), `${profile}.json`);
 }
-function getFlatProfileReadPaths(profile) {
-  return getConfigReadDirs().map((dir) => join10(dir, "profiles", `${profile}.json`));
-}
-function getDirectoryProfileReadPaths(profile) {
-  return getConfigReadDirs().map((dir) => join10(dir, "profiles", profile, "config.json"));
+function getDirectoryProfilePath(profile) {
+  return join9(getProfilesDir(), profile, "config.json");
 }
 function loadJsonFile(path) {
   try {
-    return JSON.parse(readFileSync4(path, "utf-8"));
+    return JSON.parse(readFileSync3(path, "utf-8"));
   } catch {
     return {};
   }
@@ -19219,8 +18287,8 @@ function sanitizeProfileConfig(config) {
   };
 }
 function loadProfile(profile = getCurrentProfile()) {
-  const flatConfig = getFlatProfileReadPaths(profile).reverse().reduce((config, path) => ({ ...config, ...existsSync10(path) ? loadJsonFile(path) : {} }), {});
-  const directoryConfig = getDirectoryProfileReadPaths(profile).reverse().reduce((config, path) => ({ ...config, ...existsSync10(path) ? loadJsonFile(path) : {} }), {});
+  const flatConfig = existsSync9(getFlatProfilePath(profile)) ? loadJsonFile(getFlatProfilePath(profile)) : {};
+  const directoryConfig = existsSync9(getDirectoryProfilePath(profile)) ? loadJsonFile(getDirectoryProfilePath(profile)) : {};
   return sanitizeProfileConfig({
     ...flatConfig,
     ...directoryConfig
@@ -19228,34 +18296,33 @@ function loadProfile(profile = getCurrentProfile()) {
 }
 function writeProfile(profile, config) {
   const profilesDir = getProfilesDir();
-  mkdirSync5(profilesDir, { recursive: true });
-  writeFileSync4(getFlatProfilePath(profile), JSON.stringify(config, null, 2) + `
+  mkdirSync6(profilesDir, { recursive: true });
+  writeFileSync3(getFlatProfilePath(profile), JSON.stringify(config, null, 2) + `
 `);
 }
 function profileExists(profile) {
   if (profile === "default") {
     return true;
   }
-  return getFlatProfileReadPaths(profile).some((path) => existsSync10(path)) || getConfigReadDirs().some((dir) => existsSync10(join10(dir, "profiles", profile)));
+  return existsSync9(getFlatProfilePath(profile)) || existsSync9(join9(getProfilesDir(), profile));
 }
-function listProfiles3() {
+function listProfiles() {
+  const profilesDir = getProfilesDir();
   const seen = new Set(["default"]);
-  for (const configDir of getConfigReadDirs()) {
-    const profilesDir = join10(configDir, "profiles");
-    if (!existsSync10(profilesDir))
-      continue;
-    try {
-      for (const entry of readdirSync6(profilesDir)) {
-        const fullPath = join10(profilesDir, entry);
-        const stat = statSync3(fullPath);
-        if (stat.isDirectory()) {
-          seen.add(entry);
-        } else if (entry.endsWith(".json")) {
-          seen.add(entry.replace(/\.json$/, ""));
-        }
-      }
-    } catch {}
+  if (!existsSync9(profilesDir)) {
+    return [...seen];
   }
+  try {
+    for (const entry of readdirSync6(profilesDir)) {
+      const fullPath = join9(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, config = {}) {
@@ -19268,11 +18335,11 @@ function createProfile(profile, config = {}) {
 }
 function clearProfile(profile = getCurrentProfile()) {
   const flatPath = getFlatProfilePath(profile);
-  const directoryPath = join10(getProfilesDir(), profile);
-  if (existsSync10(flatPath)) {
+  const directoryPath = join9(getProfilesDir(), profile);
+  if (existsSync9(flatPath)) {
     rmSync(flatPath);
   }
-  if (existsSync10(directoryPath)) {
+  if (existsSync9(directoryPath)) {
     rmSync(directoryPath, { recursive: true, force: true });
   }
 }
@@ -19568,7 +18635,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: {
@@ -19682,7 +18749,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(`
 `));
     }
@@ -19856,7 +18923,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),
@@ -19875,7 +18942,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
 
@@ -19905,12 +18972,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 = [
     {
@@ -20134,7 +19201,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);
         }
       }
     },
@@ -20198,18 +19265,18 @@ var init_imessage = __esm(() => {
 });
 
 // src/core/connectors/stripe.ts
-import { existsSync as existsSync11 } from "fs";
-import { dirname as dirname4, join as join11 } from "path";
+import { existsSync as existsSync10 } from "fs";
+import { dirname as dirname4, join as join10 } from "path";
 import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL2 } from "url";
 function resolveStripeConnectorDir() {
   const candidates = [
-    join11(__dirname3, "..", "..", "..", "connectors", "stripe"),
-    join11(__dirname3, "..", "..", "connectors", "stripe"),
-    join11(__dirname3, "..", "connectors", "stripe"),
-    join11(process.cwd(), "connectors", "stripe")
+    join10(__dirname3, "..", "..", "..", "connectors", "connect-stripe"),
+    join10(__dirname3, "..", "..", "connectors", "connect-stripe"),
+    join10(__dirname3, "..", "connectors", "connect-stripe"),
+    join10(process.cwd(), "connectors", "connect-stripe")
   ];
   for (const candidate of candidates) {
-    if (existsSync11(candidate)) {
+    if (existsSync10(candidate)) {
       return candidate;
     }
   }
@@ -20257,10 +19324,10 @@ function buildCommandHelp2(spec) {
 `);
 }
 async function loadStripeApiModule() {
-  return await import(pathToFileURL2(join11(CONNECTOR_DIR2, "src", "api", "index.ts")).href);
+  return await import(pathToFileURL2(join10(CONNECTOR_DIR2, "src", "api", "index.ts")).href);
 }
 async function loadStripeConfigModule() {
-  return await import(pathToFileURL2(join11(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
+  return await import(pathToFileURL2(join10(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
 }
 function extractGlobalArgs3(args) {
   const remaining = [];
@@ -21078,14 +20145,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
   ];
@@ -27225,8 +26288,8 @@ __export(exports_registry, {
   CONNECTORS: () => CONNECTORS,
   CATEGORIES: () => CATEGORIES
 });
-import { existsSync as existsSync12, readFileSync as readFileSync5 } from "fs";
-import { join as join12, dirname as dirname5 } from "path";
+import { existsSync as existsSync11, readFileSync as readFileSync5 } from "fs";
+import { join as join11, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function getConnectorsByCategory(category) {
   return CONNECTORS.filter((c) => c.category === category);
@@ -27379,10 +26442,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);
 }
 function loadConnectorVersions() {
   if (versionsLoaded)
@@ -27390,16 +26450,16 @@ function loadConnectorVersions() {
   versionsLoaded = true;
   const thisDir = dirname5(fileURLToPath3(import.meta.url));
   const candidates = [
-    join12(thisDir, "..", "connectors"),
-    join12(thisDir, "..", "..", "connectors")
+    join11(thisDir, "..", "connectors"),
+    join11(thisDir, "..", "..", "connectors")
   ];
-  const connectorsDir = candidates.find((d) => existsSync12(d));
+  const connectorsDir = candidates.find((d) => existsSync11(d));
   if (!connectorsDir)
     return;
   for (const connector of CONNECTORS) {
     try {
-      const pkgPath = join12(getConnectorPackagePath(connectorsDir, connector.name), "package.json");
-      if (existsSync12(pkgPath)) {
+      const pkgPath = join11(connectorsDir, `connect-${connector.name}`, "package.json");
+      if (existsSync11(pkgPath)) {
         const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
         connector.version = pkg.version || "0.0.0";
         continue;
@@ -27415,7 +26475,6 @@ var CATEGORIES, CONNECTORS, versionsLoaded = false;
 var init_registry2 = __esm(() => {
   init_builtins();
   init_synonyms();
-  init_connector_resolver();
   init_ai_ml();
   init_advertising();
   init_business_tools();
@@ -29124,30 +28183,33 @@ __export(exports_installer, {
   getConnectorDocs: () => getConnectorDocs,
   connectorExists: () => connectorExists
 });
-import { existsSync as existsSync13, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync5, readdirSync as readdirSync7, statSync as statSync4, rmSync as rmSync2 } from "fs";
-import { join as join13, dirname as dirname6 } from "path";
+import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync5, readdirSync as readdirSync7, statSync as statSync3, rmSync as rmSync2 } from "fs";
+import { join as join12, dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function resolveConnectorsDir() {
-  const fromBin = join13(__dirname4, "..", "connectors");
-  if (existsSync13(fromBin))
+  const fromBin = join12(__dirname4, "..", "connectors");
+  if (existsSync12(fromBin))
     return fromBin;
-  const fromSrc = join13(__dirname4, "..", "..", "connectors");
-  if (existsSync13(fromSrc))
+  const fromSrc = join12(__dirname4, "..", "..", "connectors");
+  if (existsSync12(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 join12(targetDir, PROJECT_CONNECTORS_DIRNAME);
 }
 function getEnablementManifestPath(targetDir) {
-  return join13(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
+  return join12(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
 }
 function getLegacyInstallPath(targetDir, name) {
-  return join13(getProjectConnectorsDir(targetDir), legacyConnectorName(name));
+  return join12(getProjectConnectorsDir(targetDir), `connect-${normalizeConnectorName(name)}`);
 }
 function loadEnablementManifest(targetDir) {
   const manifestPath = getEnablementManifestPath(targetDir);
-  if (!existsSync13(manifestPath)) {
+  if (!existsSync12(manifestPath)) {
     return null;
   }
   try {
@@ -29167,12 +28229,12 @@ function loadEnablementManifest(targetDir) {
 }
 function getLegacyInstalledConnectors(targetDir) {
   const connectorsDir = getProjectConnectorsDir(targetDir);
-  if (!existsSync13(connectorsDir)) {
+  if (!existsSync12(connectorsDir)) {
     return [];
   }
   return readdirSync7(connectorsDir).filter((entry) => {
-    const fullPath = join13(connectorsDir, entry);
-    return entry.startsWith("connect-") && statSync4(fullPath).isDirectory();
+    const fullPath = join12(connectorsDir, entry);
+    return entry.startsWith("connect-") && statSync3(fullPath).isDirectory();
   }).map((entry) => entry.replace("connect-", "")).sort();
 }
 function getEnabledConnectors(targetDir) {
@@ -29180,7 +28242,7 @@ function getEnabledConnectors(targetDir) {
   return [...new Set([...manifestConnectors, ...getLegacyInstalledConnectors(targetDir)])].sort();
 }
 function updateConnectorsIndex(connectorsDir, connectors18) {
-  const indexPath = join13(connectorsDir, ENABLEMENT_INDEX_FILENAME);
+  const indexPath = join12(connectorsDir, ENABLEMENT_INDEX_FILENAME);
   const connectorList = connectors18.map((connector) => `  "${connector}",`).join(`
 `);
   const content = `/**
@@ -29200,7 +28262,7 @@ export type EnabledConnectorName = typeof enabledConnectors[number];
 }
 function writeEnablementManifest(targetDir, connectors18) {
   const connectorsDir = getProjectConnectorsDir(targetDir);
-  mkdirSync6(connectorsDir, { recursive: true });
+  mkdirSync7(connectorsDir, { recursive: true });
   const manifest = {
     version: 1,
     mode: "internal",
@@ -29212,11 +28274,12 @@ function writeEnablementManifest(targetDir, connectors18) {
   updateConnectorsIndex(connectorsDir, manifest.connectors);
 }
 function getConnectorPath(name) {
-  return getConnectorPackagePath(CONNECTORS_DIR, name);
+  const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
+  return join12(CONNECTORS_DIR, connectorName);
 }
 function connectorExists(name) {
   const normalizedName = normalizeConnectorName(name);
-  return hasInternalConnectorDefinition(normalizedName) || existsSync13(getConnectorPath(normalizedName));
+  return hasInternalConnectorDefinition(normalizedName) || existsSync12(getConnectorPath(normalizedName));
 }
 function installConnector(name, options = {}) {
   const { targetDir = process.cwd(), overwrite = false } = options;
@@ -29249,7 +28312,7 @@ function installConnector(name, options = {}) {
   try {
     const nextEnabled = [...new Set([...installed, normalizedName])].sort();
     writeEnablementManifest(targetDir, nextEnabled);
-    if (overwrite && existsSync13(legacyInstallPath)) {
+    if (overwrite && existsSync12(legacyInstallPath)) {
       rmSync2(legacyInstallPath, { recursive: true });
     }
     return {
@@ -29284,8 +28347,8 @@ function parseConnectorDocs(raw) {
 function getConnectorDocs(name) {
   const normalizedName = normalizeConnectorName(name);
   const connectorPath = getConnectorPath(normalizedName);
-  const claudeMdPath = join13(connectorPath, "CLAUDE.md");
-  if (existsSync13(claudeMdPath)) {
+  const claudeMdPath = join12(connectorPath, "CLAUDE.md");
+  if (existsSync12(claudeMdPath)) {
     return parseConnectorDocs(readFileSync6(claudeMdPath, "utf-8"));
   }
   const internalDocs = getInternalConnectorDefinition(normalizedName)?.docsMarkdown;
@@ -29330,7 +28393,7 @@ function removeConnector(name, targetDir = process.cwd()) {
   const nextEnabled = installed.filter((connector) => connector !== normalizedName);
   writeEnablementManifest(targetDir, nextEnabled);
   const legacyInstallPath = getLegacyInstallPath(targetDir, normalizedName);
-  if (existsSync13(legacyInstallPath)) {
+  if (existsSync12(legacyInstallPath)) {
     rmSync2(legacyInstallPath, { recursive: true });
   }
   return true;
@@ -29338,29 +28401,29 @@ 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();
 });
 
 // src/lib/lock.ts
-import { openSync, closeSync, unlinkSync as unlinkSync2, existsSync as existsSync14, statSync as statSync6 } from "fs";
-import { mkdirSync as mkdirSync7 } from "fs";
+import { openSync, closeSync, unlinkSync as unlinkSync2, existsSync as existsSync13, statSync as statSync5 } from "fs";
+import { join as join14 } from "path";
+import { mkdirSync as mkdirSync8 } from "fs";
 function lockPath(connector) {
-  const dir = getConnectorConfigDir(connector);
-  mkdirSync7(dir, { recursive: true });
-  return `${dir}/.write.lock`;
+  const dir = join14(getConnectorsHome(), `connect-${connector}`);
+  mkdirSync8(dir, { recursive: true });
+  return join14(dir, ".write.lock");
 }
 function isStale(path) {
   try {
-    const stat = statSync6(path);
+    const stat = statSync5(path);
     return Date.now() - stat.mtimeMs > STALE_LOCK_MS;
   } catch {
     return false;
   }
 }
 function tryAcquire(path) {
-  if (existsSync14(path) && isStale(path)) {
+  if (existsSync13(path) && isStale(path)) {
     try {
       unlinkSync2(path);
     } catch {}
@@ -29381,7 +28444,6 @@ function release(path) {
   } catch {}
 }
 async function withWriteLock(connector, fn) {
-  connector = normalizeConnectorName(connector);
   const path = lockPath(connector);
   const deadline = Date.now() + LOCK_TIMEOUT_MS;
   while (Date.now() < deadline) {
@@ -29398,7 +28460,7 @@ async function withWriteLock(connector, fn) {
 }
 var LOCK_TIMEOUT_MS = 5000, LOCK_RETRY_MS = 100, STALE_LOCK_MS = 30000, LockTimeoutError;
 var init_lock = __esm(() => {
-  init_connector_resolver();
+  init_database();
   LockTimeoutError = class LockTimeoutError extends Error {
     connector;
     constructor(connector) {
@@ -29410,11 +28472,10 @@ var init_lock = __esm(() => {
 });
 
 // src/server/auth.ts
-import { existsSync as existsSync15, readFileSync as readFileSync7, writeFileSync as writeFileSync6, mkdirSync as mkdirSync8, readdirSync as readdirSync9, rmSync as rmSync3, statSync as statSync7 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync7, writeFileSync as writeFileSync6, mkdirSync as mkdirSync9, readdirSync as readdirSync9, rmSync as rmSync3, statSync as statSync6 } from "fs";
 import { randomBytes } from "crypto";
 import { join as join15 } from "path";
 function getAuthType(name) {
-  name = normalizeConnectorName(name);
   const docs = getConnectorDocs(name);
   if (!docs?.auth)
     return "apikey";
@@ -29425,65 +28486,53 @@ function getAuthType(name) {
     return "bearer";
   return "apikey";
 }
-function getConnectorConfigDir2(name) {
-  name = normalizeConnectorName(name);
-  return getConnectorConfigDir(name);
-}
-function getConnectorConfigReadDirs2(name) {
-  name = normalizeConnectorName(name);
-  return getConnectorConfigReadDirs(name);
+function getConnectorConfigDir(name) {
+  const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
+  return join15(getConnectorsHome(), connectorName);
 }
 function getCurrentProfile2(name) {
-  name = normalizeConnectorName(name);
-  for (const configDir of getConnectorConfigReadDirs2(name)) {
-    const currentProfileFile = join15(configDir, "current_profile");
-    if (existsSync15(currentProfileFile)) {
-      try {
-        return readFileSync7(currentProfileFile, "utf-8").trim() || "default";
-      } catch {
-        return "default";
-      }
+  const configDir = getConnectorConfigDir(name);
+  const currentProfileFile = join15(configDir, "current_profile");
+  if (existsSync14(currentProfileFile)) {
+    try {
+      return readFileSync7(currentProfileFile, "utf-8").trim() || "default";
+    } catch {
+      return "default";
     }
   }
   return "default";
 }
-function loadProfileConfigFromDir(configDir, profile) {
+function loadProfileConfig(name) {
+  const configDir = getConnectorConfigDir(name);
+  const profile = getCurrentProfile2(name);
   let flatConfig = {};
   let dirConfig = {};
   const profileFile = join15(configDir, "profiles", `${profile}.json`);
-  if (existsSync15(profileFile)) {
+  if (existsSync14(profileFile)) {
     try {
       flatConfig = JSON.parse(readFileSync7(profileFile, "utf-8"));
     } catch {}
   }
   const profileDirConfig = join15(configDir, "profiles", profile, "config.json");
-  if (existsSync15(profileDirConfig)) {
+  if (existsSync14(profileDirConfig)) {
     try {
       dirConfig = JSON.parse(readFileSync7(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));
+  if (Object.keys(flatConfig).length === 0 && Object.keys(dirConfig).length === 0) {
+    return {};
   }
-  return merged;
+  return { ...flatConfig, ...dirConfig };
 }
-function loadTokens3(name) {
-  name = normalizeConnectorName(name);
+function loadTokens(name) {
+  const configDir = getConnectorConfigDir(name);
   const profile = getCurrentProfile2(name);
-  for (const configDir of getConnectorConfigReadDirs2(name)) {
-    const tokensFile = join15(configDir, "profiles", profile, "tokens.json");
-    if (existsSync15(tokensFile)) {
-      try {
-        return JSON.parse(readFileSync7(tokensFile, "utf-8"));
-      } catch {
-        return null;
-      }
+  const tokensFile = join15(configDir, "profiles", profile, "tokens.json");
+  if (existsSync14(tokensFile)) {
+    try {
+      return JSON.parse(readFileSync7(tokensFile, "utf-8"));
+    } catch {
+      return null;
     }
   }
   const profileConfig = loadProfileConfig(name);
@@ -29498,50 +28547,28 @@ function loadTokens3(name) {
   }
   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)
+    set: !!process.env[v.variable]
   }));
   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 tokens = loadTokens(name);
+    const config2 = loadProfileConfig(name);
+    const hasTokens = !!tokens?.accessToken || !!config2.accessToken;
+    const hasRefreshToken = !!tokens?.refreshToken || !!config2.refreshToken;
+    const tokenExpiry = tokens?.expiresAt || config2.expiresAt;
     const hasEnvVar2 = envVars.some((v) => v.set);
     return {
       type: "oauth",
-      configured: hasTokens || hasRefreshToken || hasOAuthCredentials || hasEnvVar2,
+      configured: hasTokens || hasRefreshToken || hasEnvVar2,
       tokenExpiry,
       hasRefreshToken,
-      hasOAuthCredentials,
       envVars,
       envVarSetCount,
       envVarTotalCount
@@ -29559,24 +28586,21 @@ function getAuthStatus(name) {
   };
 }
 function getEnvVars(name) {
-  name = normalizeConnectorName(name);
   const docs = getConnectorDocs(name);
   return docs?.envVars || [];
 }
 async function saveApiKey(name, key, field) {
-  name = normalizeConnectorName(name);
   return withWriteLock(name, () => _saveApiKey(name, key, field));
 }
 function _saveApiKey(name, key, field) {
-  name = normalizeConnectorName(name);
-  const configDir = getConnectorConfigDir2(name);
+  const configDir = getConnectorConfigDir(name);
   const profile = getCurrentProfile2(name);
   const keyField = field || guessKeyField(name);
   if (keyField === "clientId" || keyField === "clientSecret") {
     const credentialsFile = join15(configDir, "credentials.json");
-    mkdirSync8(configDir, { recursive: true });
+    mkdirSync9(configDir, { recursive: true });
     let creds = {};
-    if (existsSync15(credentialsFile)) {
+    if (existsSync14(credentialsFile)) {
       try {
         creds = JSON.parse(readFileSync7(credentialsFile, "utf-8"));
       } catch {}
@@ -29587,7 +28611,7 @@ function _saveApiKey(name, key, field) {
   }
   const profileFile = join15(configDir, "profiles", `${profile}.json`);
   const profileDir = join15(configDir, "profiles", profile);
-  if (existsSync15(profileFile)) {
+  if (existsSync14(profileFile)) {
     let config = {};
     try {
       config = JSON.parse(readFileSync7(profileFile, "utf-8"));
@@ -29596,10 +28620,10 @@ function _saveApiKey(name, key, field) {
     writeFileSync6(profileFile, JSON.stringify(config, null, 2));
     return;
   }
-  if (existsSync15(profileDir)) {
+  if (existsSync14(profileDir)) {
     const configFile = join15(profileDir, "config.json");
     let config = {};
-    if (existsSync15(configFile)) {
+    if (existsSync14(configFile)) {
       try {
         config = JSON.parse(readFileSync7(configFile, "utf-8"));
       } catch {}
@@ -29608,11 +28632,10 @@ function _saveApiKey(name, key, field) {
     writeFileSync6(configFile, JSON.stringify(config, null, 2));
     return;
   }
-  mkdirSync8(profileDir, { recursive: true });
+  mkdirSync9(profileDir, { recursive: true });
   writeFileSync6(join15(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";
@@ -29627,15 +28650,13 @@ function guessKeyField(name) {
   return "apiKey";
 }
 function getOAuthConfig(name) {
-  name = normalizeConnectorName(name);
-  for (const configDir of getConnectorConfigReadDirs2(name)) {
-    const credentialsFile = join15(configDir, "credentials.json");
-    if (existsSync15(credentialsFile)) {
-      try {
-        const creds = JSON.parse(readFileSync7(credentialsFile, "utf-8"));
-        return { clientId: creds.clientId, clientSecret: creds.clientSecret };
-      } catch {}
-    }
+  const configDir = getConnectorConfigDir(name);
+  const credentialsFile = join15(configDir, "credentials.json");
+  if (existsSync14(credentialsFile)) {
+    try {
+      const creds = JSON.parse(readFileSync7(credentialsFile, "utf-8"));
+      return { clientId: creds.clientId, clientSecret: creds.clientSecret };
+    } catch {}
   }
   const config = loadProfileConfig(name);
   return {
@@ -29644,7 +28665,6 @@ function getOAuthConfig(name) {
   };
 }
 function getOAuthStartUrl(name, redirectUri) {
-  name = normalizeConnectorName(name);
   const oauthConfig = getOAuthConfig(name);
   if (!oauthConfig.clientId)
     return null;
@@ -29670,7 +28690,6 @@ function getOAuthStartUrl(name, redirectUri) {
   return `${GOOGLE_AUTH_URL}?${params.toString()}`;
 }
 function validateOAuthState(state, expectedConnector) {
-  expectedConnector = normalizeConnectorName(expectedConnector);
   if (!state)
     return false;
   const entry = oauthStateStore.get(state);
@@ -29680,7 +28699,6 @@ function validateOAuthState(state, expectedConnector) {
   return Date.now() - entry.createdAt < 10 * 60 * 1000;
 }
 async function exchangeOAuthCode(name, code, redirectUri) {
-  name = normalizeConnectorName(name);
   const oauthConfig = getOAuthConfig(name);
   if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
     throw new Error("OAuth credentials not configured for " + name);
@@ -29713,22 +28731,19 @@ async function exchangeOAuthCode(name, code, redirectUri) {
   return tokens;
 }
 function saveOAuthTokens(name, tokens) {
-  name = normalizeConnectorName(name);
-  const configDir = getConnectorConfigDir2(name);
+  const configDir = getConnectorConfigDir(name);
   const profile = getCurrentProfile2(name);
   const profileDir = join15(configDir, "profiles", profile);
-  mkdirSync8(profileDir, { recursive: true });
+  mkdirSync9(profileDir, { recursive: true });
   const tokensFile = join15(profileDir, "tokens.json");
   writeFileSync6(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);
+  const currentTokens = loadTokens(name);
   if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
     throw new Error("OAuth credentials not configured for " + name);
   }
@@ -29761,43 +28776,39 @@ async function _refreshOAuthToken(name) {
   saveOAuthTokens(name, tokens);
   return tokens;
 }
-function listProfiles4(name) {
-  name = normalizeConnectorName(name);
+function listProfiles2(name) {
+  const configDir = getConnectorConfigDir(name);
+  const profilesDir = join15(configDir, "profiles");
+  if (!existsSync14(profilesDir))
+    return ["default"];
   const seen = new Set;
-  for (const configDir of getConnectorConfigReadDirs2(name)) {
-    const profilesDir = join15(configDir, "profiles");
-    if (!existsSync15(profilesDir))
-      continue;
-    try {
-      const entries = readdirSync9(profilesDir);
-      for (const entry of entries) {
-        const fullPath = join15(profilesDir, entry);
-        const stat = statSync7(fullPath);
-        if (stat.isDirectory()) {
-          seen.add(entry);
-        } else if (entry.endsWith(".json")) {
-          seen.add(entry.replace(/\.json$/, ""));
-        }
+  try {
+    const entries = readdirSync9(profilesDir);
+    for (const entry of entries) {
+      const fullPath = join15(profilesDir, entry);
+      const stat = statSync6(fullPath);
+      if (stat.isDirectory()) {
+        seen.add(entry);
+      } else if (entry.endsWith(".json")) {
+        seen.add(entry.replace(/\.json$/, ""));
       }
-    } catch {}
-  }
+    }
+  } catch {}
   seen.add("default");
   return Array.from(seen).sort();
 }
 function switchProfile(name, profile) {
-  name = normalizeConnectorName(name);
-  const configDir = getConnectorConfigDir2(name);
-  mkdirSync8(configDir, { recursive: true });
+  const configDir = getConnectorConfigDir(name);
+  mkdirSync9(configDir, { recursive: true });
   writeFileSync6(join15(configDir, "current_profile"), profile);
 }
 function deleteProfile2(name, profile) {
-  name = normalizeConnectorName(name);
   if (profile === "default")
     return false;
-  const configDir = getConnectorConfigDir2(name);
+  const configDir = getConnectorConfigDir(name);
   const profilesDir = join15(configDir, "profiles");
   const profileFile = join15(profilesDir, `${profile}.json`);
-  if (existsSync15(profileFile)) {
+  if (existsSync14(profileFile)) {
     rmSync3(profileFile);
     if (getCurrentProfile2(name) === profile) {
       switchProfile(name, "default");
@@ -29805,7 +28816,7 @@ function deleteProfile2(name, profile) {
     return true;
   }
   const profileDir = join15(profilesDir, profile);
-  if (existsSync15(profileDir)) {
+  if (existsSync14(profileDir)) {
     rmSync3(profileDir, { recursive: true });
     if (getCurrentProfile2(name) === profile) {
       switchProfile(name, "default");
@@ -29818,7 +28829,7 @@ var FETCH_TIMEOUT = 1e4, oauthStateStore, GOOGLE_AUTH_URL = "https://accounts.go
 var init_auth = __esm(() => {
   init_installer();
   init_lock();
-  init_connector_resolver();
+  init_database();
   oauthStateStore = new Map;
   GOOGLE_SCOPES = {
     gmail: [
@@ -30068,14 +29079,14 @@ var init_rate = __esm(() => {
 });
 
 // src/lib/llm.ts
-import { existsSync as existsSync16, readFileSync as readFileSync8, writeFileSync as writeFileSync7, mkdirSync as mkdirSync9 } from "fs";
+import { existsSync as existsSync15, readFileSync as readFileSync8, writeFileSync as writeFileSync7, mkdirSync as mkdirSync10 } from "fs";
 import { join as join16 } from "path";
 function getLlmConfigPath() {
   return join16(getConnectorsHome(), "llm.json");
 }
 function getLlmConfig() {
   const path = getLlmConfigPath();
-  if (!existsSync16(path))
+  if (!existsSync15(path))
     return null;
   try {
     return JSON.parse(readFileSync8(path, "utf-8"));
@@ -30085,7 +29096,7 @@ function getLlmConfig() {
 }
 function saveLlmConfig(config) {
   const dir = getConnectorsHome();
-  mkdirSync9(dir, { recursive: true });
+  mkdirSync10(dir, { recursive: true });
   writeFileSync7(getLlmConfigPath(), JSON.stringify(config, null, 2));
 }
 function setLlmStrip(enabled) {
@@ -30469,7 +29480,7 @@ var init_scheduler = __esm(() => {
 });
 
 // src/lib/workflow-runner.ts
-import { spawn as nodeSpawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 async function runStep(step, previousOutput) {
   return new Promise((resolve) => {
     const args = [...step.args ?? []];
@@ -30477,7 +29488,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 = spawn2("connectors", cmdArgs, { shell: false });
     let output = "";
     proc.stdout.on("data", (d) => {
       output += d.toString();
@@ -30517,23 +29528,21 @@ async function runWorkflow(workflow) {
     final_output: results[results.length - 1]?.output ?? ""
   };
 }
-var spawnImpl;
 var init_workflow_runner = __esm(() => {
   init_strip();
-  spawnImpl = nodeSpawn;
 });
 
 // src/lib/runner.ts
-import { existsSync as existsSync17, readdirSync as readdirSync10 } from "fs";
+import { existsSync as existsSync16, readdirSync as readdirSync10 } from "fs";
 import { join as join17, dirname as dirname7 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 function resolveConnectorsDir2() {
   const fromBin = join17(__dirname5, "..", "connectors");
-  if (existsSync17(fromBin))
+  if (existsSync16(fromBin))
     return fromBin;
   const fromSrc = join17(__dirname5, "..", "..", "connectors");
-  if (existsSync17(fromSrc))
+  if (existsSync16(fromSrc))
     return fromSrc;
   return fromBin;
 }
@@ -30554,9 +29563,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`;
@@ -30577,32 +29585,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 safeName = name.replace(/[^a-z0-9-]/g, "");
+  const connectorDir = join17(CONNECTORS_DIR2, `connect-${safeName}`);
   const cliPath = join17(connectorDir, "src", "cli", "index.ts");
-  if (existsSync17(cliPath))
+  if (existsSync16(cliPath))
     return cliPath;
   return null;
 }
@@ -30640,7 +29629,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();
@@ -30657,9 +29646,8 @@ function parseCommanderHelpOperations(helpText) {
   return operations;
 }
 function runConnectorCommand2(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) {
@@ -30673,133 +29661,25 @@ function runConnectorCommand2(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 (error) {
-      return {
-        connector: connectorName,
-        operation: args.operation,
-        profile: args.profile,
-        stdout: "",
-        stderr: error.message,
-        exitCode: 1,
-        success: false
-      };
-    }
-  }
-  const commandArgs = buildConnectorOperationArgs(args);
-  const result = await runConnectorCommand2(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
     });
   }
   return new Promise((resolve) => {
-    const proc = spawn2("bun", ["run", cliPath, ...args], {
+    const proc = spawn3("bun", ["run", cliPath, ...args], {
       timeout: timeoutMs,
-      env: buildEnvWithCredentials(connectorName, process.env),
+      env: buildEnvWithCredentials(name, process.env),
       stdio: ["pipe", "pipe", "pipe"]
     });
     let stdout = "";
@@ -30829,8 +29709,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,
@@ -30842,15 +29721,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 runConnectorCommand2(connectorName, ["--help"]);
+  const result = await runConnectorCommand2(name, ["--help"]);
   const helpText = result.stdout || result.stderr;
   const operations = parseCommanderHelpOperations(helpText);
   return {
@@ -30861,8 +29740,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) {
@@ -30873,16 +29751,13 @@ async function getConnectorCommandHelp(name, command) {
   if (runtimeCommand?.helpText) {
     return runtimeCommand.helpText;
   }
-  const result = await runConnectorCommand2(connectorName, [command, "--help"]);
+  const result = await runConnectorCommand2(name, [command, "--help"]);
   return result.stdout || result.stderr;
 }
 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 = {
@@ -30894,88 +29769,13 @@ var init_runner = __esm(() => {
   };
 });
 
-// src/lib/manifest.ts
-function buildAliases(name) {
-  const canonicalName = normalizeConnectorName(name);
-  const legacyName = legacyConnectorName(canonicalName);
-  return canonicalName === legacyName ? [canonicalName] : [canonicalName, legacyName];
-}
-async function loadOperations(name, includeOperations) {
-  if (!includeOperations || !hasConnectorCommandSurface(name))
-    return;
-  return (await getConnectorOperations(name)).operations;
-}
-async function getConnectorCapability(name, options = {}) {
-  const connectorName = normalizeConnectorName(name);
-  const meta = getConnector(connectorName);
-  if (!meta)
-    return null;
-  const docs = getConnectorDocs(connectorName);
-  const configPaths = resolveConnectorConfigPaths(connectorName);
-  const operations = await loadOperations(connectorName, options.includeOperations);
-  return {
-    ...meta,
-    id: connectorName,
-    aliases: buildAliases(connectorName),
-    runtime: {
-      packageName: "@hasna/connectors",
-      connectorId: connectorName,
-      legacyConnectorId: legacyConnectorName(connectorName),
-      packagePath: getConnectorPath(connectorName),
-      configDirName: configPaths.preferredDirName,
-      legacyConfigDirName: configPaths.legacyName,
-      internal: Boolean(getInternalConnectorDefinition(connectorName)),
-      packageDirectory: connectorExists(connectorName),
-      commandSurface: hasConnectorCommandSurface(connectorName)
-    },
-    auth: {
-      type: getAuthType(connectorName),
-      summary: docs?.auth ?? null,
-      envVars: docs?.envVars ?? []
-    },
-    docs: {
-      overview: docs?.overview ?? "",
-      cliCommands: docs?.cliCommands ?? "",
-      dataStorage: docs?.dataStorage ?? null
-    },
-    ...operations ? { operations } : {}
-  };
-}
-async function getConnectorCapabilityManifest(options = {}) {
-  const names = options.connectorNames ? [...new Set(options.connectorNames.map((name) => normalizeConnectorName(name)))].sort() : CONNECTORS.map((connector) => connector.name);
-  const connectors18 = [];
-  for (const name of names) {
-    const capability = await getConnectorCapability(name, options);
-    if (capability)
-      connectors18.push(capability);
-  }
-  return {
-    version: 1,
-    packageName: "@hasna/connectors",
-    packageVersion: package_default.version,
-    generatedAt: new Date().toISOString(),
-    categories: CATEGORIES,
-    connectorCount: connectors18.length,
-    connectors: connectors18
-  };
-}
-var init_manifest = __esm(() => {
-  init_package();
-  init_registry2();
-  init_installer();
-  init_runner();
-  init_auth();
-  init_connector_resolver();
-  init_builtins();
-});
-
 // src/server/serve.ts
 var exports_serve = {};
 __export(exports_serve, {
   startServer: () => startServer
 });
-import { existsSync as existsSync18, readdirSync as readdirSync11, readFileSync as readFileSync9, writeFileSync as writeFileSync8, mkdirSync as mkdirSync10 } from "fs";
-import { join as join18, dirname as dirname8, extname, basename as basename3 } from "path";
+import { existsSync as existsSync17, readdirSync as readdirSync11, readFileSync as readFileSync9, writeFileSync as writeFileSync8, mkdirSync as mkdirSync11 } from "fs";
+import { join as join18, dirname as dirname8, extname, basename } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 function logActivity(action, connector, detail) {
   activityLog.unshift({ action, connector, timestamp: Date.now(), detail });
@@ -30997,7 +29797,7 @@ function resolveDashboardDir() {
   }
   candidates.push(join18(process.cwd(), "dashboard", "dist"));
   for (const candidate of candidates) {
-    if (existsSync18(candidate))
+    if (existsSync17(candidate))
       return candidate;
   }
   return join18(process.cwd(), "dashboard", "dist");
@@ -31030,6 +29830,9 @@ function htmlResponse(content, status = 200) {
     headers: { "Content-Type": "text/html; charset=utf-8", ...SECURITY_HEADERS }
   });
 }
+function isValidConnectorName(name) {
+  return /^[a-z0-9-]+$/.test(name);
+}
 function getAllConnectorsWithAuth() {
   const installed = new Set(getInstalledConnectors());
   return CONNECTORS.map((meta) => {
@@ -31082,7 +29885,7 @@ function oauthPage(type, title, message, hint, extra) {
   </body></html>`;
 }
 function serveStaticFile(filePath) {
-  if (!existsSync18(filePath))
+  if (!existsSync17(filePath))
     return null;
   const ext = extname(filePath);
   const contentType = MIME_TYPES[ext] || "application/octet-stream";
@@ -31119,7 +29922,7 @@ async function startServer(requestedPort, options) {
   const strict = options?.strict ?? false;
   loadConnectorVersions();
   const dashboardDir = resolveDashboardDir();
-  const dashboardExists = existsSync18(dashboardDir);
+  const dashboardExists = existsSync17(dashboardDir);
   if (!dashboardExists) {
     console.error(`
 Dashboard not found at: ${dashboardDir}`);
@@ -31162,15 +29965,6 @@ Dashboard not found at: ${dashboardDir}`);
         }
         return jsonStripped(data, 200, port);
       }
-      if (path === "/api/connectors/manifest" && method === "GET") {
-        const connectorNames = url2.searchParams.get("connectors")?.split(",").map((name) => name.trim()).filter(Boolean);
-        const includeOperations = url2.searchParams.get("includeOperations") === "true";
-        const manifest = await getConnectorCapabilityManifest({
-          includeOperations,
-          ...connectorNames ? { connectorNames } : {}
-        });
-        return json(manifest, 200, port);
-      }
       const singleMatch = path.match(/^\/api\/connectors\/([^/]+)$/);
       if (singleMatch && method === "GET") {
         const name = singleMatch[1];
@@ -31244,20 +30038,6 @@ Dashboard not found at: ${dashboardDir}`);
             return json({ error: "Request body too large" }, 413, port);
           }
           const body = await req.json();
-          if (typeof body.operation === "string" && body.operation.trim()) {
-            const result2 = await runConnectorOperation({
-              connector: name,
-              operation: body.operation,
-              input: body.input,
-              profile: body.profile,
-              timeoutMs: body.timeout ?? 30000,
-              parseJson: body.parseJson
-            });
-            if (!result2.success) {
-              return json({ displayName: meta.displayName, ...result2 }, 400, port);
-            }
-            return json({ displayName: meta.displayName, ...result2 }, 200, port);
-          }
           const args = Array.isArray(body.args) ? body.args.filter((value) => typeof value === "string") : [];
           if (args.length === 0) {
             return json({ error: "Missing connector command arguments" }, 400, port);
@@ -31544,16 +30324,14 @@ ${result.stderr}`;
         if (!isValidConnectorName(name))
           return json({ error: "Invalid connector name" }, 400, port);
         try {
-          const profiles = listProfiles4(name);
+          const profiles = listProfiles2(name);
+          const configDir = join18(getConnectorsHome(), name.startsWith("connect-") ? name : `connect-${name}`);
+          const currentProfileFile = join18(configDir, "current_profile");
           let current = "default";
-          for (const configDir of getConnectorConfigReadDirs(name)) {
-            const currentProfileFile = join18(configDir, "current_profile");
-            if (existsSync18(currentProfileFile)) {
-              try {
-                current = readFileSync9(currentProfileFile, "utf-8").trim() || "default";
-              } catch {}
-              break;
-            }
+          if (existsSync17(currentProfileFile)) {
+            try {
+              current = readFileSync9(currentProfileFile, "utf-8").trim() || "default";
+            } catch {}
           }
           return json({ current, profiles }, 200, port);
         } catch (e) {
@@ -31601,31 +30379,33 @@ ${result.stderr}`;
         try {
           const connectDir = getConnectorsHome();
           const result = {};
-          if (existsSync18(connectDir)) {
-            for (const connectorName of listConfiguredConnectorNames(connectDir)) {
+          if (existsSync17(connectDir)) {
+            const entries = readdirSync11(connectDir, { withFileTypes: true });
+            for (const entry of entries) {
+              if (!entry.isDirectory() || !entry.name.startsWith("connect-"))
+                continue;
+              const connectorName = entry.name.replace(/^connect-/, "");
+              const profilesDir = join18(connectDir, entry.name, "profiles");
+              if (!existsSync17(profilesDir))
+                continue;
               const profiles = {};
-              for (const configDir of [...getConnectorConfigReadDirs(connectorName, connectDir)].reverse()) {
-                const profilesDir = join18(configDir, "profiles");
-                if (!existsSync18(profilesDir))
-                  continue;
-                const profileEntries = readdirSync11(profilesDir, { withFileTypes: true });
-                for (const pEntry of profileEntries) {
-                  if (pEntry.isFile() && pEntry.name.endsWith(".json")) {
-                    const profileName = basename3(pEntry.name, ".json");
+              const profileEntries = readdirSync11(profilesDir, { withFileTypes: true });
+              for (const pEntry of profileEntries) {
+                if (pEntry.isFile() && pEntry.name.endsWith(".json")) {
+                  const profileName = basename(pEntry.name, ".json");
+                  try {
+                    const config = JSON.parse(readFileSync9(join18(profilesDir, pEntry.name), "utf-8"));
+                    profiles[profileName] = config;
+                  } catch {}
+                }
+                if (pEntry.isDirectory()) {
+                  const configPath = join18(profilesDir, pEntry.name, "config.json");
+                  if (existsSync17(configPath)) {
                     try {
-                      const config = JSON.parse(readFileSync9(join18(profilesDir, pEntry.name), "utf-8"));
-                      profiles[profileName] = config;
+                      const config = JSON.parse(readFileSync9(configPath, "utf-8"));
+                      profiles[pEntry.name] = config;
                     } catch {}
                   }
-                  if (pEntry.isDirectory()) {
-                    const configPath = join18(profilesDir, pEntry.name, "config.json");
-                    if (existsSync18(configPath)) {
-                      try {
-                        const config = JSON.parse(readFileSync9(configPath, "utf-8"));
-                        profiles[pEntry.name] = config;
-                      } catch {}
-                    }
-                  }
                 }
               }
               if (Object.keys(profiles).length > 0) {
@@ -31663,12 +30443,12 @@ ${result.stderr}`;
               continue;
             if (!data.profiles || typeof data.profiles !== "object")
               continue;
-            const connectorDir = getConnectorConfigDir(connectorName, connectDir);
+            const connectorDir = join18(connectDir, `connect-${connectorName}`);
             const profilesDir = join18(connectorDir, "profiles");
             for (const [profileName, config] of Object.entries(data.profiles)) {
               if (!config || typeof config !== "object")
                 continue;
-              mkdirSync10(profilesDir, { recursive: true });
+              mkdirSync11(profilesDir, { recursive: true });
               const profileFile = join18(profilesDir, `${profileName}.json`);
               writeFileSync8(profileFile, JSON.stringify(config, null, 2));
               imported++;
@@ -31686,7 +30466,7 @@ ${result.stderr}`;
         const redirectUri = `http://localhost:${port}/oauth/${name}/callback`;
         const authUrl = getOAuthStartUrl(name, redirectUri);
         if (!authUrl) {
-          return htmlResponse(oauthPage("warning", "OAuth Not Available", `No OAuth client credentials found for <span class="connector">${name}</span>.`, `Run <code>connectors auth ${name}</code> or add credentials at <code>~/.hasna/connectors/${name}/credentials.json</code>`));
+          return htmlResponse(oauthPage("warning", "OAuth Not Available", `No OAuth client credentials found for <span class="connector">${name}</span>.`, `Run <code>connectors auth ${name}</code> or add credentials at <code>~/.hasna/connectors/connect-${name}/credentials.json</code>`));
         }
         return Response.redirect(authUrl, 302);
       }
@@ -31770,9 +30550,7 @@ var init_serve = __esm(() => {
   init_database();
   init_registry2();
   init_installer();
-  init_connector_resolver();
   init_runner();
-  init_manifest();
   init_auth();
   activityLog = [];
   MIME_TYPES = {
@@ -33292,8 +32070,8 @@ init_registry2();
 init_installer();
 import { render } from "ink";
 import chalk2 from "chalk";
-import { readdirSync as readdirSync8, statSync as statSync5 } from "fs";
-import { join as join14, relative as relative2 } from "path";
+import { readdirSync as readdirSync8, statSync as statSync4 } from "fs";
+import { join as join13, relative as relative2 } from "path";
 import { createInterface } from "readline";
 import { jsxDEV as jsxDEV7 } from "react/jsx-dev-runtime";
 var isTTY = process.stdout.isTTY ?? false;
@@ -33308,8 +32086,8 @@ var PRESETS = {
 function listFilesRecursive(dir, base = dir) {
   const files = [];
   for (const entry of readdirSync8(dir)) {
-    const fullPath = join14(dir, entry);
-    if (statSync5(fullPath).isDirectory()) {
+    const fullPath = join13(dir, entry);
+    if (statSync4(fullPath).isDirectory()) {
       files.push(...listFilesRecursive(fullPath, base));
     } else {
       files.push(relative2(base, fullPath));
@@ -33358,9 +32136,9 @@ function registerCommands(program2) {
     }
     if (options.dryRun) {
       const installed = getInstalledConnectors();
-      const connectorsDir = join14(process.cwd(), ".connectors");
-      const manifestPath = join14(connectorsDir, "manifest.json");
-      const indexPath = join14(connectorsDir, "index.ts");
+      const connectorsDir = join13(process.cwd(), ".connectors");
+      const manifestPath = join13(connectorsDir, "manifest.json");
+      const indexPath = join13(connectorsDir, "index.ts");
       const actions = [];
       for (const name of connectors18) {
         if (!/^[a-z0-9-]+$/.test(name)) {
@@ -33376,6 +32154,7 @@ function registerCommands(program2) {
           actions.push({ connector: name, action: "error", reason: `Connector '${name}' source files not found` });
           continue;
         }
+        const connectorDirName = name.startsWith("connect-") ? name : `connect-${name}`;
         const sourcePath = getConnectorPath(name);
         const alreadyInstalled = installed.includes(name);
         const files = listFilesRecursive(sourcePath);
@@ -33977,9 +32756,8 @@ init_registry2();
 init_installer();
 init_auth();
 init_database();
-init_connector_resolver();
 import chalk4 from "chalk";
-import { existsSync as existsSync19, readFileSync as readFileSync10 } from "fs";
+import { existsSync as existsSync18, readdirSync as readdirSync12, statSync as statSync7, readFileSync as readFileSync10 } from "fs";
 import { join as join19 } from "path";
 function registerCommands3(program2) {
   program2.command("status").option("--json", "Output as JSON", false).description("Show auth status of all configured connectors (project + global)").action((options) => {
@@ -33989,15 +32767,13 @@ function registerCommands3(program2) {
     const allStatuses = [];
     function buildStatusEntry(name, source) {
       const auth = getAuthStatus(name);
+      const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
+      const currentProfileFile = join19(configDir, connectorName, "current_profile");
       let profile = "default";
-      for (const connectorConfigDir of getConnectorConfigReadDirs(name, configDir)) {
-        const currentProfileFile = join19(connectorConfigDir, "current_profile");
-        if (existsSync19(currentProfileFile)) {
-          try {
-            profile = readFileSync10(currentProfileFile, "utf-8").trim() || "default";
-          } catch {}
-          break;
-        }
+      if (existsSync18(currentProfileFile)) {
+        try {
+          profile = readFileSync10(currentProfileFile, "utf-8").trim() || "default";
+        } catch {}
       }
       let expiryLabel = null;
       let expired = false;
@@ -34032,11 +32808,21 @@ function registerCommands3(program2) {
       seen.add(name);
       allStatuses.push(buildStatusEntry(name, "project"));
     }
-    if (existsSync19(configDir)) {
+    if (existsSync18(configDir)) {
       try {
-        for (const name of listConfiguredConnectorNames(configDir)) {
-          if (name.startsWith("zzztest"))
-            continue;
+        const globalDirs = readdirSync12(configDir).filter((f) => {
+          if (!f.startsWith("connect-"))
+            return false;
+          if (f.startsWith("connect-zzztest"))
+            return false;
+          try {
+            return statSync7(join19(configDir, f)).isDirectory();
+          } catch {
+            return false;
+          }
+        });
+        for (const dir of globalDirs) {
+          const name = dir.replace("connect-", "");
           if (seen.has(name))
             continue;
           seen.add(name);
@@ -34243,11 +33029,10 @@ init_registry2();
 init_auth();
 init_database();
 import chalk5 from "chalk";
-import { existsSync as existsSync20, readdirSync as readdirSync12, statSync as statSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync9, mkdirSync as mkdirSync11 } from "fs";
+import { existsSync as existsSync19, readdirSync as readdirSync13, statSync as statSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync9, mkdirSync as mkdirSync12 } from "fs";
 import { join as join20 } from "path";
 import { homedir as homedir8 } from "os";
 import { createInterface as createInterface2 } from "readline";
-init_connector_resolver();
 var SENSITIVE_FIELDS = new Set([
   "clientsecret",
   "client_secret",
@@ -34298,7 +33083,7 @@ function redactSecrets(obj) {
   return obj;
 }
 function getOAuthTokenState(name) {
-  const tokens = loadTokens3(name);
+  const tokens = loadTokens(name);
   if (!tokens?.accessToken && !tokens?.refreshToken) {
     return { hasTokens: false, expired: false };
   }
@@ -34318,27 +33103,6 @@ function getOAuthTokenState(name) {
   })();
   return { hasTokens: true, expired: isExpired, expiresIn };
 }
-function getCurrentOAuthProfile(name, connectorsHome = getConnectorsHome()) {
-  for (const dir of getConnectorConfigReadDirs(name, connectorsHome)) {
-    const currentProfilePath = join20(dir, "current_profile");
-    if (!existsSync20(currentProfilePath))
-      continue;
-    const profile = readFileSync11(currentProfilePath, "utf8").trim();
-    if (profile)
-      return profile;
-  }
-  return "default";
-}
-function getOAuthTokenPathsForProfile(name, connectorsHome = getConnectorsHome(), profile = getCurrentOAuthProfile(name, connectorsHome)) {
-  return getConnectorConfigReadDirs(name, connectorsHome).map((dir) => join20(dir, "profiles", profile, "tokens.json"));
-}
-function hasOAuthTokenFileUpdatedSince(tokenPaths, sinceMs) {
-  return tokenPaths.some((tokensPath) => {
-    if (!existsSync20(tokensPath))
-      return false;
-    return statSync8(tokensPath).mtimeMs >= sinceMs;
-  });
-}
 function registerCommands4(program2) {
   program2.command("auth").argument("<connector>", "Connector name to configure auth for").option("-k, --key <value>", "API key or bearer token value (non-interactive)").option("-f, --field <field>", "Which field to set (for multi-field connectors)").option("--json", "Output as JSON", false).option("--no-browser", "Print OAuth URL without opening a browser (agent-friendly)", false).option("--refresh", "Refresh expired OAuth tokens", false).option("--port <port>", "OAuth server port (default: 9876)", "9876").description("Configure authentication for a connector").action(async (connector, options) => {
     const meta = getConnector(connector);
@@ -34462,13 +33226,12 @@ ${meta.displayName} \u2014 Auth Configuration
       try {
         if (!options.browser) {
           console.log(chalk5.dim(`Starting OAuth server on port ${port}...`));
-          const { spawn: spawn3 } = await import("child_process");
+          const { spawn: spawn4 } = await import("child_process");
           const scriptPath = process.argv[1];
-          const serverProc = spawn3(process.execPath, [scriptPath, "serve", "--port", String(port)], {
+          const serverProc = spawn4("node", [scriptPath, "serve", "--port", String(port)], {
             detached: true,
             stdio: "ignore"
           });
-          const startedAt = Date.now();
           serverProc.unref();
           await new Promise((resolve) => setTimeout(resolve, 2000));
           try {
@@ -34485,13 +33248,13 @@ ${meta.displayName} \u2014 Auth Configuration
 `);
           console.log(chalk5.dim("Waiting for authentication to complete..."));
           const connectorsHome = getConnectorsHome();
-          const activeProfile = getCurrentOAuthProfile(connector, connectorsHome);
-          const tokenPaths = getOAuthTokenPathsForProfile(connector, connectorsHome, activeProfile);
+          const connectorDirName = connector.startsWith("connect-") ? connector : `connect-${connector}`;
+          const tokensPath = join20(connectorsHome, connectorDirName, "profiles", "default", "tokens.json");
           let attempts = 0;
           const maxAttempts = 360;
           while (attempts < maxAttempts) {
             await new Promise((resolve) => setTimeout(resolve, 500));
-            if (hasOAuthTokenFileUpdatedSince(tokenPaths, startedAt)) {
+            if (existsSync19(tokensPath)) {
               break;
             }
             attempts++;
@@ -34505,7 +33268,7 @@ ${meta.displayName} \u2014 Auth Configuration
           if (attempts >= maxAttempts) {
             console.log();
             console.log(chalk5.yellow("Timed out waiting for OAuth callback. The auth may still be in progress."));
-            console.log(chalk5.dim(`Check ${tokenPaths[0]} for tokens.`));
+            console.log(chalk5.dim(`Check ${tokensPath} for tokens.`));
             console.log(chalk5.dim("You can stop the server manually: lsof -ti :${port} | xargs kill"));
             process.exit(1);
             return;
@@ -34638,12 +33401,13 @@ Open this URL to authenticate:
     let configuredCount = 0;
     const configuredNames = [];
     try {
-      if (existsSync20(connectorsHome)) {
-        for (const name of listConfiguredConnectorNames(connectorsHome)) {
-          const hasProfiles = getConnectorConfigReadDirs(name, connectorsHome).some((dir) => existsSync20(join20(dir, "profiles")));
-          if (hasProfiles) {
+      if (existsSync19(connectorsHome)) {
+        const entries = readdirSync13(connectorsHome).filter((e) => e.startsWith("connect-") && statSync8(join20(connectorsHome, e)).isDirectory());
+        for (const entry of entries) {
+          const profilesDir = join20(connectorsHome, entry, "profiles");
+          if (existsSync19(profilesDir)) {
             configuredCount++;
-            configuredNames.push(name);
+            configuredNames.push(entry.replace(/^connect-/, ""));
           }
         }
       }
@@ -34692,45 +33456,46 @@ Open this URL to authenticate:
   program2.command("export").option("-o, --output <file>", "Write to file instead of stdout").option("--include-secrets", "Include secrets in plaintext (dangerous \u2014 use only for backup/restore)").description("Export all connector credentials as JSON backup").action((options) => {
     const connectDir = getConnectorsHome();
     const result = {};
-    if (existsSync20(connectDir)) {
-      for (const connectorName of listConfiguredConnectorNames(connectDir)) {
-        const connectorDirs = [...getConnectorConfigReadDirs(connectorName, connectDir)].reverse();
+    if (existsSync19(connectDir)) {
+      for (const entry of readdirSync13(connectDir)) {
+        const entryPath = join20(connectDir, entry);
+        if (!statSync8(entryPath).isDirectory() || !entry.startsWith("connect-"))
+          continue;
+        const connectorName = entry.replace(/^connect-/, "");
         let credentials = undefined;
-        for (const connectorDir of connectorDirs) {
-          const credentialsPath = join20(connectorDir, "credentials.json");
-          if (existsSync20(credentialsPath)) {
-            try {
-              credentials = JSON.parse(readFileSync11(credentialsPath, "utf-8"));
-            } catch {}
-          }
+        const credentialsPath = join20(entryPath, "credentials.json");
+        if (existsSync19(credentialsPath)) {
+          try {
+            credentials = JSON.parse(readFileSync11(credentialsPath, "utf-8"));
+          } catch {}
         }
+        const profilesDir = join20(entryPath, "profiles");
+        if (!existsSync19(profilesDir) && !credentials)
+          continue;
         const profiles = {};
-        for (const connectorDir of connectorDirs) {
-          const profilesDir = join20(connectorDir, "profiles");
-          if (existsSync20(profilesDir)) {
-            for (const pEntry of readdirSync12(profilesDir)) {
-              const pPath = join20(profilesDir, pEntry);
-              if (statSync8(pPath).isFile() && pEntry.endsWith(".json")) {
+        if (existsSync19(profilesDir)) {
+          for (const pEntry of readdirSync13(profilesDir)) {
+            const pPath = join20(profilesDir, pEntry);
+            if (statSync8(pPath).isFile() && pEntry.endsWith(".json")) {
+              try {
+                profiles[pEntry.replace(/\.json$/, "")] = JSON.parse(readFileSync11(pPath, "utf-8"));
+              } catch {}
+            } else if (statSync8(pPath).isDirectory()) {
+              const configPath = join20(pPath, "config.json");
+              const tokensPath = join20(pPath, "tokens.json");
+              let merged = {};
+              if (existsSync19(configPath)) {
                 try {
-                  profiles[pEntry.replace(/\.json$/, "")] = JSON.parse(readFileSync11(pPath, "utf-8"));
+                  merged = { ...merged, ...JSON.parse(readFileSync11(configPath, "utf-8")) };
                 } catch {}
-              } else if (statSync8(pPath).isDirectory()) {
-                const configPath = join20(pPath, "config.json");
-                const tokensPath = join20(pPath, "tokens.json");
-                let merged = {};
-                if (existsSync20(configPath)) {
-                  try {
-                    merged = { ...merged, ...JSON.parse(readFileSync11(configPath, "utf-8")) };
-                  } catch {}
-                }
-                if (existsSync20(tokensPath)) {
-                  try {
-                    merged = { ...merged, ...JSON.parse(readFileSync11(tokensPath, "utf-8")) };
-                  } catch {}
-                }
-                if (Object.keys(merged).length > 0)
-                  profiles[pEntry] = merged;
               }
+              if (existsSync19(tokensPath)) {
+                try {
+                  merged = { ...merged, ...JSON.parse(readFileSync11(tokensPath, "utf-8")) };
+                } catch {}
+              }
+              if (Object.keys(merged).length > 0)
+                profiles[pEntry] = merged;
             }
           }
         }
@@ -34761,7 +33526,7 @@ Open this URL to authenticate:
         chunks.push(chunk.toString());
       raw = chunks.join("");
     } else {
-      if (!existsSync20(file)) {
+      if (!existsSync19(file)) {
         if (options.json) {
           console.log(JSON.stringify({ error: `File not found: ${file}` }));
         } else {
@@ -34798,9 +33563,9 @@ Open this URL to authenticate:
     for (const [connectorName, connData] of Object.entries(data.connectors)) {
       if (!/^[a-z0-9-]+$/.test(connectorName))
         continue;
-      const connectorDir = getConnectorConfigDir(connectorName, connectDir);
+      const connectorDir = join20(connectDir, `connect-${connectorName}`);
       if (connData.credentials && typeof connData.credentials === "object") {
-        mkdirSync11(connectorDir, { recursive: true });
+        mkdirSync12(connectorDir, { recursive: true });
         writeFileSync9(join20(connectorDir, "credentials.json"), JSON.stringify(connData.credentials, null, 2));
         imported++;
       }
@@ -34810,7 +33575,7 @@ Open this URL to authenticate:
       for (const [profileName, config] of Object.entries(connData.profiles)) {
         if (!config || typeof config !== "object")
           continue;
-        mkdirSync11(profilesDir, { recursive: true });
+        mkdirSync12(profilesDir, { recursive: true });
         writeFileSync9(join20(profilesDir, `${profileName}.json`), JSON.stringify(config, null, 2));
         imported++;
       }
@@ -34824,7 +33589,7 @@ Open this URL to authenticate:
   program2.command("auth-import").option("--json", "Output as JSON", false).option("-d, --dry-run", "Preview what would be imported without copying", false).option("--force", "Overwrite existing files in ~/.hasna/connectors/", false).description("Migrate auth tokens from ~/.connect/ to ~/.hasna/connectors/").action((options) => {
     const oldBase = join20(homedir8(), ".connect");
     const newBase = getConnectorsHome();
-    if (!existsSync20(oldBase)) {
+    if (!existsSync19(oldBase)) {
       if (options.json) {
         console.log(JSON.stringify({ imported: [], skipped: [], error: null, message: "No ~/.connect/ directory found" }));
       } else {
@@ -34832,7 +33597,7 @@ Open this URL to authenticate:
       }
       return;
     }
-    const entries = readdirSync12(oldBase).filter((name) => {
+    const entries = readdirSync13(oldBase).filter((name) => {
       if (!name.startsWith("connect-"))
         return false;
       try {
@@ -34853,8 +33618,8 @@ Open this URL to authenticate:
     const skipped = [];
     for (const dirName of entries) {
       const oldDir = join20(oldBase, dirName);
+      const newDir = join20(newBase, dirName);
       const connectorName = dirName.replace(/^connect-/, "");
-      const newDir = getConnectorConfigDir(connectorName, newBase);
       const allFiles = listFilesRecursive(oldDir);
       const authFiles = allFiles.filter((f) => {
         return f === "credentials.json" || f === "config.json" || f === "tokens.json" || f === "current_profile" || f.startsWith("profiles/") || f.startsWith("profiles\\");
@@ -34866,13 +33631,13 @@ Open this URL to authenticate:
       for (const relFile of authFiles) {
         const srcPath = join20(oldDir, relFile);
         const destPath = join20(newDir, relFile);
-        if (existsSync20(destPath) && !options.force) {
+        if (existsSync19(destPath) && !options.force) {
           skippedFiles.push(relFile);
           continue;
         }
         if (!options.dryRun) {
           const parentDir = join20(destPath, "..");
-          mkdirSync11(parentDir, { recursive: true });
+          mkdirSync12(parentDir, { recursive: true });
           const content = readFileSync11(srcPath);
           writeFileSync9(destPath, content);
         }
@@ -34940,7 +33705,7 @@ init_installer();
 init_auth();
 init_database();
 import chalk6 from "chalk";
-import { existsSync as existsSync21, readFileSync as readFileSync12, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync20, readdirSync as readdirSync14, statSync as statSync9, readFileSync as readFileSync12, writeFileSync as writeFileSync10 } from "fs";
 import { join as join21 } from "path";
 
 // src/lib/test-endpoints.ts
@@ -35140,7 +33905,6 @@ var TEST_ENDPOINTS = {
 
 // src/cli/commands/misc.ts
 init_auth();
-init_connector_resolver();
 function registerCommands5(program2) {
   program2.command("upgrade").alias("self-update").option("--check", "Only check for updates, don't install", false).option("--json", "Output as JSON", false).description("Check for updates and upgrade to the latest version").action(async (options) => {
     const currentVersion = program2.version();
@@ -35371,21 +34135,29 @@ Available presets:
         configured++;
       else
         unconfigured++;
+      const connectorConfigDir = join21(configDir, name.startsWith("connect-") ? name : `connect-${name}`);
+      const currentProfileFile = join21(connectorConfigDir, "current_profile");
       let profile = "default";
-      for (const connectorConfigDir of getConnectorConfigReadDirs(name, configDir)) {
-        const currentProfileFile = join21(connectorConfigDir, "current_profile");
-        if (existsSync21(currentProfileFile)) {
-          try {
-            profile = readFileSync12(currentProfileFile, "utf-8").trim() || "default";
-          } catch {}
-          break;
-        }
+      if (existsSync20(currentProfileFile)) {
+        try {
+          profile = readFileSync12(currentProfileFile, "utf-8").trim() || "default";
+        } catch {}
       }
       connectorDetails.push({ name, configured: auth.configured, authType: auth.type, profile, source: "project" });
     }
-    if (existsSync21(configDir)) {
+    if (existsSync20(configDir)) {
       try {
-        for (const name of listConfiguredConnectorNames(configDir)) {
+        const globalDirs = readdirSync14(configDir).filter((f) => {
+          if (!f.startsWith("connect-"))
+            return false;
+          try {
+            return statSync9(join21(configDir, f)).isDirectory();
+          } catch {
+            return false;
+          }
+        });
+        for (const dir of globalDirs) {
+          const name = dir.replace("connect-", "");
           if (seen.has(name))
             continue;
           const auth = getAuthStatus(name);
@@ -35393,15 +34165,12 @@ Available presets:
             continue;
           seen.add(name);
           configured++;
+          const currentProfileFile = join21(configDir, dir, "current_profile");
           let profile = "default";
-          for (const connectorConfigDir of getConnectorConfigReadDirs(name, configDir)) {
-            const currentProfileFile = join21(connectorConfigDir, "current_profile");
-            if (existsSync21(currentProfileFile)) {
-              try {
-                profile = readFileSync12(currentProfileFile, "utf-8").trim() || "default";
-              } catch {}
-              break;
-            }
+          if (existsSync20(currentProfileFile)) {
+            try {
+              profile = readFileSync12(currentProfileFile, "utf-8").trim() || "default";
+            } catch {}
           }
           connectorDetails.push({ name, configured: true, authType: auth.type, profile, source: "global" });
         }
@@ -35411,7 +34180,7 @@ Available presets:
       console.log(JSON.stringify({
         version,
         configDir,
-        configDirExists: existsSync21(configDir),
+        configDirExists: existsSync20(configDir),
         installed: installed.length,
         configured,
         unconfigured,
@@ -35423,7 +34192,7 @@ Available presets:
 Connectors Setup
 `));
     console.log(`  Version:      ${chalk6.cyan(version)}`);
-    console.log(`  Config:       ${configDir}${existsSync21(configDir) ? "" : chalk6.dim(" (not created yet)")}`);
+    console.log(`  Config:       ${configDir}${existsSync20(configDir) ? "" : chalk6.dim(" (not created yet)")}`);
     console.log(`  Installed:    ${installed.length} connector${installed.length !== 1 ? "s" : ""}`);
     console.log(`  Configured:   ${chalk6.green(String(configured))} ready, ${unconfigured > 0 ? chalk6.red(String(unconfigured)) : chalk6.dim("0")} need auth`);
     const projectConnectors = connectorDetails.filter((c) => c.source === "project");
@@ -35514,19 +34283,16 @@ Testing connector credentials...
         }
       }
       if (!apiKey) {
-        const connectorConfigDirs = getConnectorConfigReadDirs(name);
+        const connectorConfigDir = join21(getConnectorsHome(), name.startsWith("connect-") ? name : `connect-${name}`);
         let currentProfile = "default";
-        for (const connectorConfigDir of connectorConfigDirs) {
-          const currentProfileFile = join21(connectorConfigDir, "current_profile");
-          if (existsSync21(currentProfileFile)) {
-            try {
-              currentProfile = readFileSync12(currentProfileFile, "utf-8").trim() || "default";
-            } catch {}
-            break;
-          }
+        const currentProfileFile = join21(connectorConfigDir, "current_profile");
+        if (existsSync20(currentProfileFile)) {
+          try {
+            currentProfile = readFileSync12(currentProfileFile, "utf-8").trim() || "default";
+          } catch {}
         }
-        const tokensFile = connectorConfigDirs.map((dir) => join21(dir, "profiles", currentProfile, "tokens.json")).find((path) => existsSync21(path));
-        if (tokensFile) {
+        const tokensFile = join21(connectorConfigDir, "profiles", currentProfile, "tokens.json");
+        if (existsSync20(tokensFile)) {
           try {
             const tokens = JSON.parse(readFileSync12(tokensFile, "utf-8"));
             const isExpired = tokens.expiresAt && Date.now() >= tokens.expiresAt - 60000;
@@ -35546,29 +34312,21 @@ Testing connector credentials...
           } catch {}
         }
         if (!apiKey) {
-          for (const connectorConfigDir of connectorConfigDirs) {
-            const profileFile = join21(connectorConfigDir, "profiles", `${currentProfile}.json`);
-            if (existsSync21(profileFile)) {
-              try {
-                const config = JSON.parse(readFileSync12(profileFile, "utf-8"));
-                apiKey = Object.values(config).find((v) => typeof v === "string" && v.length > 0);
-              } catch {}
-              if (apiKey)
-                break;
-            }
+          const profileFile = join21(connectorConfigDir, "profiles", `${currentProfile}.json`);
+          if (existsSync20(profileFile)) {
+            try {
+              const config = JSON.parse(readFileSync12(profileFile, "utf-8"));
+              apiKey = Object.values(config).find((v) => typeof v === "string" && v.length > 0);
+            } catch {}
           }
         }
         if (!apiKey) {
-          for (const connectorConfigDir of connectorConfigDirs) {
-            const profileDirConfig = join21(connectorConfigDir, "profiles", currentProfile, "config.json");
-            if (existsSync21(profileDirConfig)) {
-              try {
-                const config = JSON.parse(readFileSync12(profileDirConfig, "utf-8"));
-                apiKey = Object.values(config).find((v) => typeof v === "string" && v.length > 0);
-              } catch {}
-              if (apiKey)
-                break;
-            }
+          const profileDirConfig = join21(connectorConfigDir, "profiles", currentProfile, "config.json");
+          if (existsSync20(profileDirConfig)) {
+            try {
+              const config = JSON.parse(readFileSync12(profileDirConfig, "utf-8"));
+              apiKey = Object.values(config).find((v) => typeof v === "string" && v.length > 0);
+            } catch {}
           }
         }
       }
@@ -35806,14 +34564,15 @@ Setting up ${meta.displayName}...
   ${chalk7.bold("Open this URL to authenticate:")}`);
             console.log(`  ${chalk7.cyan(oauthUrl)}
 `);
-            const { spawn: spawn3 } = await import("child_process");
+            const { spawn: spawn4 } = await import("child_process");
             const { getConnectorsHome: getConnectorsHome2 } = await Promise.resolve().then(() => (init_database(), exports_database));
+            const { existsSync: existsSync8 } = await import("fs");
+            const { join: join8 } = await import("path");
             const scriptPath = process.argv[1];
-            const serverProc = spawn3(process.execPath, [scriptPath, "serve", "--port", String(port)], {
+            const serverProc = spawn4("node", [scriptPath, "serve", "--port", String(port)], {
               detached: true,
               stdio: "ignore"
             });
-            const startedAt = Date.now();
             serverProc.unref();
             await new Promise((resolve) => setTimeout(resolve, 2000));
             try {
@@ -35825,13 +34584,13 @@ Setting up ${meta.displayName}...
             }
             console.log(chalk7.dim("  Waiting for authentication to complete..."));
             const connectorsHome = getConnectorsHome2();
-            const activeProfile = getCurrentOAuthProfile(name, connectorsHome);
-            const tokenPaths = getOAuthTokenPathsForProfile(name, connectorsHome, activeProfile);
+            const connectorDirName = name.startsWith("connect-") ? name : `connect-${name}`;
+            const tokensPath = join8(connectorsHome, connectorDirName, "profiles", "default", "tokens.json");
             let attempts = 0;
             const maxAttempts = 360;
             while (attempts < maxAttempts) {
               await new Promise((resolve) => setTimeout(resolve, 500));
-              if (hasOAuthTokenFileUpdatedSince(tokenPaths, startedAt))
+              if (existsSync8(tokensPath))
                 break;
               attempts++;
               if (attempts % 6 === 0)