@hasna/connectors 1.3.30 → 1.3.32

package/bin/serve.js

@@ -10009,7 +10009,7 @@ var init_promotions = __esm(() => {
 });
 
 // src/server/serve.ts
-import { existsSync as existsSync18, readdirSync as readdirSync12, readFileSync as readFileSync9, writeFileSync as writeFileSync8, mkdirSync as mkdirSync12 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync9, readFileSync as readFileSync7, writeFileSync as writeFileSync6, mkdirSync as mkdirSync10 } from "fs";
 
 // src/db/agents.ts
 init_database();
@@ -10188,8 +10188,7 @@ init_scheduler();
 
 // src/lib/workflow-runner.ts
 init_strip();
-import { spawn as nodeSpawn } from "child_process";
-var spawnImpl = nodeSpawn;
+import { spawn as spawn2 } from "child_process";
 async function runStep(step, previousOutput) {
   return new Promise((resolve) => {
     const args = [...step.args ?? []];
@@ -10197,7 +10196,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();
@@ -10240,12 +10239,12 @@ async function runWorkflow(workflow) {
 
 // src/server/serve.ts
 init_database();
-import { join as join18, dirname as dirname8, extname, basename as basename3 } from "path";
+import { join as join16, dirname as dirname8, extname, basename } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 
 // src/lib/registry.ts
-import { existsSync as existsSync13, readFileSync as readFileSync6 } from "fs";
-import { join as join14, dirname as dirname5 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync4 } from "fs";
+import { join as join11, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/core/errors.ts
@@ -10258,20 +10257,9 @@ class ConnectorDefinitionError extends Error {
   }
 }
 
-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
 var CONNECTOR_NAME_RE = /^[a-z0-9-]+$/;
-var OPERATION_NAME_RE = /^[A-Za-z0-9:._-]+$/;
+var OPERATION_NAME_RE = /^[a-z0-9:_-]+$/;
 function defineConnector(definition) {
   const { meta, auth, operations } = definition;
   if (!CONNECTOR_NAME_RE.test(meta.name)) {
@@ -10310,29 +10298,6 @@ 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);
-}
 
 // src/core/registry.ts
 function createConnectorDefinitionRegistry(definitions) {
@@ -14339,10 +14304,10 @@ var NEVER2 = INVALID2;
 var __dirname2 = dirname3(fileURLToPath(import.meta.url));
 function resolveGithubConnectorDir() {
   const candidates = [
-    join8(__dirname2, "..", "..", "..", "connectors", "github"),
-    join8(__dirname2, "..", "..", "connectors", "github"),
-    join8(__dirname2, "..", "connectors", "github"),
-    join8(process.cwd(), "connectors", "github")
+    join8(__dirname2, "..", "..", "..", "connectors", "connect-github"),
+    join8(__dirname2, "..", "..", "connectors", "connect-github"),
+    join8(__dirname2, "..", "connectors", "connect-github"),
+    join8(process.cwd(), "connectors", "connect-github")
   ];
   for (const candidate of candidates) {
     if (existsSync7(candidate)) {
@@ -15192,805 +15157,10 @@ var githubConnector = defineConnector({
     }
   }
 });
-
-// src/core/connectors/gmail.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync3, readdirSync as readdirSync5, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir8 } from "os";
-import { basename, join as join9 } from "path";
-var GMAIL_API_BASE = "https://gmail.googleapis.com/gmail/v1";
-var TOKEN_URL = "https://oauth2.googleapis.com/token";
-var REFRESH_BUFFER_MS = 5 * 60 * 1000;
-var MAX_GMAIL_RETRIES = 5;
-var listMessagesSchema = exports_external2.object({
-  max: exports_external2.coerce.number().int().positive().max(500).optional(),
-  maxResults: exports_external2.coerce.number().int().positive().max(500).optional(),
-  pageToken: exports_external2.string().optional(),
-  query: exports_external2.string().optional(),
-  q: exports_external2.string().optional(),
-  label: exports_external2.string().optional(),
-  labelIds: exports_external2.union([exports_external2.string(), exports_external2.array(exports_external2.string())]).optional(),
-  includeSpamTrash: exports_external2.boolean().optional()
-});
-var messageIdSchema = exports_external2.object({
-  args: exports_external2.array(exports_external2.union([exports_external2.string(), exports_external2.number(), exports_external2.boolean()])).optional(),
-  messageId: exports_external2.string().optional()
-});
-var readMessageSchema = messageIdSchema.extend({
-  body: exports_external2.boolean().optional(),
-  html: exports_external2.boolean().optional(),
-  format: exports_external2.enum(["full", "metadata", "minimal", "raw"]).optional()
-});
-var attachmentListSchema = messageIdSchema;
-var attachmentDownloadSchema = messageIdSchema.extend({
-  attachmentId: exports_external2.string().optional(),
-  filename: exports_external2.string().optional(),
-  mimeType: exports_external2.string().optional(),
-  dir: exports_external2.string().optional(),
-  outputDir: exports_external2.string().optional()
-});
-var historyListSchema = exports_external2.object({
-  startHistoryId: exports_external2.string(),
-  historyTypes: exports_external2.union([exports_external2.string(), exports_external2.array(exports_external2.string())]).optional(),
-  labelId: exports_external2.string().optional(),
-  maxResults: exports_external2.coerce.number().int().positive().max(500).optional(),
-  pageToken: exports_external2.string().optional()
-});
-var replySchema = messageIdSchema.extend({
-  body: exports_external2.string(),
-  html: exports_external2.boolean().optional(),
-  isHtml: exports_external2.boolean().optional(),
-  cc: exports_external2.union([exports_external2.string(), exports_external2.array(exports_external2.string())]).optional(),
-  bcc: exports_external2.union([exports_external2.string(), exports_external2.array(exports_external2.string())]).optional()
-});
-var 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
-      })
-    }
-  }
-});
-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 ?? join9(configDirs()[0], "attachments", messageId);
-  mkdirSync6(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 = join9(outputDir, filename);
-    const buffer = Buffer.from(data.data, "base64url");
-    writeFileSync3(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 = join9(baseDir, "profiles");
-    if (!existsSync8(profilesDir))
-      continue;
-    for (const entry of readdirSync5(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(join9(baseDir, "credentials.json")),
-      ...readJson(join9(baseDir, "profiles", profile, "config.json"))
-    };
-    if (credentials.clientId || credentials.clientSecret)
-      return credentials;
-  }
-  return {};
-}
-function loadTokens(profile) {
-  for (const baseDir of configDirs()) {
-    const fromProfile = readJson(join9(baseDir, "profiles", profile, "tokens.json"));
-    if (fromProfile)
-      return fromProfile;
-    const flat = readJson(join9(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) => existsSync8(dir)) ?? configDirs()[0];
-  const profileDir = join9(baseDir, "profiles", profile);
-  mkdirSync6(profileDir, { recursive: true });
-  writeFileSync3(join9(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 ?? join9(homedir8(), ".hasna", "connectors");
-  return [join9(baseDir, "gmail"), join9(baseDir, "connect-gmail")];
-}
-function readJson(path) {
-  if (!existsSync8(path))
-    return null;
-  try {
-    return JSON.parse(readFileSync3(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, "_");
-}
-
-// src/core/connectors/googledrive.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync7, readFileSync as readFileSync4, readdirSync as readdirSync6, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir9 } from "os";
-import { basename as basename2, join as join10 } from "path";
-var DRIVE_API_BASE = "https://www.googleapis.com/drive/v3";
-var TOKEN_URL2 = "https://oauth2.googleapis.com/token";
-var REFRESH_BUFFER_MS2 = 5 * 60 * 1000;
-var DEFAULT_FILE_FIELDS = [
-  "id",
-  "name",
-  "mimeType",
-  "parents",
-  "version",
-  "md5Checksum",
-  "size",
-  "modifiedTime",
-  "createdTime",
-  "trashed",
-  "webViewLink",
-  "webContentLink"
-].join(",");
-var 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"
-};
-var 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"
-};
-var listFilesSchema = exports_external2.object({
-  pageSize: exports_external2.coerce.number().int().positive().max(1000).optional(),
-  pageToken: exports_external2.string().optional(),
-  q: exports_external2.string().optional(),
-  fields: exports_external2.string().optional(),
-  orderBy: exports_external2.string().optional(),
-  corpora: exports_external2.enum(["user", "drive", "allDrives"]).optional(),
-  driveId: exports_external2.string().optional(),
-  supportsAllDrives: exports_external2.boolean().optional(),
-  includeItemsFromAllDrives: exports_external2.boolean().optional()
-});
-var listDrivesSchema = exports_external2.object({
-  pageSize: exports_external2.coerce.number().int().positive().max(100).optional(),
-  pageToken: exports_external2.string().optional(),
-  q: exports_external2.string().optional()
-});
-var fileIdSchema = exports_external2.object({
-  fileId: exports_external2.string(),
-  fields: exports_external2.string().optional()
-});
-var downloadSchema = exports_external2.object({
-  fileId: exports_external2.string(),
-  file: exports_external2.object({
-    id: exports_external2.string(),
-    name: exports_external2.string(),
-    mimeType: exports_external2.string()
-  }).optional(),
-  exportMimeType: exports_external2.string().optional()
-});
-var profilesStatusSchema = exports_external2.object({
-  profile: exports_external2.string().optional()
-});
-var 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
-      })
-    }
-  }
-});
-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 = join10(baseDir, "profiles");
-    if (!existsSync9(profilesDir))
-      continue;
-    for (const entry of readdirSync6(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 now3 = 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 && now3 >= 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(join10(baseDir, "credentials.json")),
-      ...readJson2(join10(baseDir, "profiles", profile, "config.json"))
-    };
-    if (credentials.clientId || credentials.clientSecret)
-      return credentials;
-  }
-  return {};
-}
-function loadTokens2(profile) {
-  for (const baseDir of configDirs2()) {
-    const fromProfile = readJson2(join10(baseDir, "profiles", profile, "tokens.json"));
-    if (fromProfile)
-      return fromProfile;
-    const flat = readJson2(join10(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) => existsSync9(dir)) ?? configDirs2()[0];
-  const profileDir = join10(baseDir, "profiles", profile);
-  mkdirSync7(profileDir, { recursive: true });
-  writeFileSync4(join10(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 ?? join10(homedir9(), ".hasna", "connectors");
-  return [join10(baseDir, "googledrive"), join10(baseDir, "connect-googledrive")];
-}
-function readJson2(path) {
-  if (!existsSync9(path))
-    return null;
-  try {
-    return JSON.parse(readFileSync4(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;
-  }
-}
 // package.json
 var 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: {
@@ -16078,114 +15248,17 @@ var package_default = {
 
 // src/core/connectors/imessage.ts
 import {
-  existsSync as existsSync11,
-  mkdirSync as mkdirSync8,
-  readFileSync as readFileSync5,
-  readdirSync as readdirSync8,
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync6,
+  readFileSync as readFileSync3,
+  readdirSync as readdirSync5,
   rmSync,
-  statSync as statSync3,
-  writeFileSync as writeFileSync5
+  statSync as statSync2,
+  writeFileSync as writeFileSync3
 } from "fs";
-import { join as join12 } from "path";
-
-// src/lib/connector-resolver.ts
+import { join as join9 } from "path";
 init_database();
-import { existsSync as existsSync10, readdirSync as readdirSync7, statSync as statSync2 } from "fs";
-import { join as join11 } from "path";
-var LEGACY_CONNECTOR_PREFIX = "connect-";
-var CONNECTOR_NAME_RE2 = /^[a-z0-9-]+$/;
-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) => join11(connectorsDir, dirName));
-  const existingPath = checkedPaths.find((path) => existsSync10(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 = join11(connectorsHome, preferredDirName);
-  const legacyPath = join11(connectorsHome, resolution.legacyName);
-  const paths = preferredPath === legacyPath ? [preferredPath] : [preferredPath, legacyPath];
-  const existingPaths = paths.filter((path) => existsSync10(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 (!existsSync10(connectorsHome))
-    return [];
-  const names = new Set;
-  for (const entry of readdirSync7(connectorsHome)) {
-    const fullPath = join11(connectorsHome, entry);
-    try {
-      if (!statSync2(fullPath).isDirectory())
-        continue;
-      if (!isValidConnectorName(entry))
-        continue;
-      names.add(normalizeConnectorName(entry));
-    } catch {}
-  }
-  return [...names].sort();
-}
-
-// src/core/connectors/imessage.ts
-var CONNECTOR_NAME = "imessage";
+var CONNECTOR_DIRNAME = "connect-imessage";
 var COMMAND_SPECS = [
   {
     name: "profile",
@@ -16309,7 +15382,7 @@ 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.
 `;
 var commandInputSchema = exports_external2.object({
   args: exports_external2.array(exports_external2.string()).default([]),
@@ -16345,44 +15418,36 @@ var messageReplyInputSchema = exports_external2.object({
   deviceId: exports_external2.string().optional()
 });
 function getConfigDir2() {
-  return getConnectorConfigDir(CONNECTOR_NAME);
-}
-function getConfigReadDirs() {
-  return getConnectorConfigReadDirs(CONNECTOR_NAME);
+  return join9(getConnectorsHome(), CONNECTOR_DIRNAME);
 }
 function getProfilesDir() {
-  return join12(getConfigDir2(), "profiles");
+  return join9(getConfigDir2(), "profiles");
 }
 function getCurrentProfile() {
-  for (const configDir of getConfigReadDirs()) {
-    const currentProfileFile = join12(configDir, "current_profile");
-    if (!existsSync11(currentProfileFile))
-      continue;
-    try {
-      return readFileSync5(currentProfileFile, "utf-8").trim() || "default";
-    } catch {
-      return "default";
-    }
+  const currentProfileFile = join9(getConfigDir2(), "current_profile");
+  if (!existsSync8(currentProfileFile)) {
+    return "default";
+  }
+  try {
+    return readFileSync3(currentProfileFile, "utf-8").trim() || "default";
+  } catch {
+    return "default";
   }
-  return "default";
 }
 function setCurrentProfile(profile) {
   const configDir = getConfigDir2();
-  mkdirSync8(configDir, { recursive: true });
-  writeFileSync5(join12(configDir, "current_profile"), profile);
+  mkdirSync6(configDir, { recursive: true });
+  writeFileSync3(join9(configDir, "current_profile"), profile);
 }
 function getFlatProfilePath(profile) {
-  return join12(getProfilesDir(), `${profile}.json`);
+  return join9(getProfilesDir(), `${profile}.json`);
 }
-function getFlatProfileReadPaths(profile) {
-  return getConfigReadDirs().map((dir) => join12(dir, "profiles", `${profile}.json`));
-}
-function getDirectoryProfileReadPaths(profile) {
-  return getConfigReadDirs().map((dir) => join12(dir, "profiles", profile, "config.json"));
+function getDirectoryProfilePath(profile) {
+  return join9(getProfilesDir(), profile, "config.json");
 }
 function loadJsonFile(path) {
   try {
-    return JSON.parse(readFileSync5(path, "utf-8"));
+    return JSON.parse(readFileSync3(path, "utf-8"));
   } catch {
     return {};
   }
@@ -16398,8 +15463,8 @@ function sanitizeProfileConfig(config) {
   };
 }
 function loadProfile(profile = getCurrentProfile()) {
-  const flatConfig = getFlatProfileReadPaths(profile).reverse().reduce((config, path) => ({ ...config, ...existsSync11(path) ? loadJsonFile(path) : {} }), {});
-  const directoryConfig = getDirectoryProfileReadPaths(profile).reverse().reduce((config, path) => ({ ...config, ...existsSync11(path) ? loadJsonFile(path) : {} }), {});
+  const flatConfig = existsSync8(getFlatProfilePath(profile)) ? loadJsonFile(getFlatProfilePath(profile)) : {};
+  const directoryConfig = existsSync8(getDirectoryProfilePath(profile)) ? loadJsonFile(getDirectoryProfilePath(profile)) : {};
   return sanitizeProfileConfig({
     ...flatConfig,
     ...directoryConfig
@@ -16407,34 +15472,33 @@ function loadProfile(profile = getCurrentProfile()) {
 }
 function writeProfile(profile, config) {
   const profilesDir = getProfilesDir();
-  mkdirSync8(profilesDir, { recursive: true });
-  writeFileSync5(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) => existsSync11(path)) || getConfigReadDirs().some((dir) => existsSync11(join12(dir, "profiles", profile)));
+  return existsSync8(getFlatProfilePath(profile)) || existsSync8(join9(getProfilesDir(), profile));
 }
-function listProfiles3() {
+function listProfiles() {
+  const profilesDir = getProfilesDir();
   const seen = new Set(["default"]);
-  for (const configDir of getConfigReadDirs()) {
-    const profilesDir = join12(configDir, "profiles");
-    if (!existsSync11(profilesDir))
-      continue;
-    try {
-      for (const entry of readdirSync8(profilesDir)) {
-        const fullPath = join12(profilesDir, entry);
-        const stat = statSync3(fullPath);
-        if (stat.isDirectory()) {
-          seen.add(entry);
-        } else if (entry.endsWith(".json")) {
-          seen.add(entry.replace(/\.json$/, ""));
-        }
-      }
-    } catch {}
+  if (!existsSync8(profilesDir)) {
+    return [...seen];
   }
+  try {
+    for (const entry of readdirSync5(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 = {}) {
@@ -16447,11 +15511,11 @@ function createProfile(profile, config = {}) {
 }
 function clearProfile(profile = getCurrentProfile()) {
   const flatPath = getFlatProfilePath(profile);
-  const directoryPath = join12(getProfilesDir(), profile);
-  if (existsSync11(flatPath)) {
+  const directoryPath = join9(getProfilesDir(), profile);
+  if (existsSync8(flatPath)) {
     rmSync(flatPath);
   }
-  if (existsSync11(directoryPath)) {
+  if (existsSync8(directoryPath)) {
     rmSync(directoryPath, { recursive: true, force: true });
   }
 }
@@ -16747,7 +15811,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: {
@@ -16861,7 +15925,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(`
 `));
     }
@@ -17035,7 +16099,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),
@@ -17193,7 +16257,7 @@ var imessageConnector = defineConnector({
       summary: "Reply to an existing conversation through the bridge",
       inputSchema: messageReplyInputSchema,
       async execute({ context }, input) {
-        return replyToMessage2(context, input);
+        return replyToMessage(context, input);
       }
     }
   },
@@ -17256,19 +16320,19 @@ var imessageConnector = defineConnector({
 });
 
 // src/core/connectors/stripe.ts
-import { existsSync as existsSync12 } from "fs";
-import { dirname as dirname4, join as join13 } from "path";
+import { existsSync as existsSync9 } from "fs";
+import { dirname as dirname4, join as join10 } from "path";
 import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL2 } from "url";
 var __dirname3 = dirname4(fileURLToPath2(import.meta.url));
 function resolveStripeConnectorDir() {
   const candidates = [
-    join13(__dirname3, "..", "..", "..", "connectors", "stripe"),
-    join13(__dirname3, "..", "..", "connectors", "stripe"),
-    join13(__dirname3, "..", "connectors", "stripe"),
-    join13(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 (existsSync12(candidate)) {
+    if (existsSync9(candidate)) {
       return candidate;
     }
   }
@@ -17507,10 +16571,10 @@ function buildCommandHelp2(spec) {
 var ROOT_HELP3 = buildRootHelp2(COMMAND_SPECS2);
 var COMMAND_HELP3 = Object.fromEntries(COMMAND_SPECS2.map((spec) => [spec.name, buildCommandHelp2(spec)]));
 async function loadStripeApiModule() {
-  return await import(pathToFileURL2(join13(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(join13(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
+  return await import(pathToFileURL2(join10(CONNECTOR_DIR2, "src", "utils", "config.ts")).href);
 }
 function extractGlobalArgs3(args) {
   const remaining = [];
@@ -18122,9 +17186,7 @@ var stripeConnector = defineConnector({
 
 // src/core/builtins.ts
 var INTERNAL_CONNECTOR_DEFINITIONS = [
-  gmailConnector,
   githubConnector,
-  googleDriveConnector,
   imessageConnector,
   stripeConnector
 ];
@@ -24120,25 +23182,6 @@ var connectors17 = [
 ];
 
 // src/lib/registry.ts
-var CATEGORIES = [
-  "AI & ML",
-  "Developer Tools",
-  "Design & Content",
-  "Communication",
-  "Social Media",
-  "Commerce & Finance",
-  "Google Workspace",
-  "Data & Analytics",
-  "Business Tools",
-  "Patents & IP",
-  "Advertising",
-  "Security & Compliance",
-  "Marketing & Sales",
-  "Infrastructure",
-  "Healthcare & Hospitality",
-  "IoT & Messaging",
-  "Database"
-];
 var CONNECTORS = [
   ...connectors,
   ...connectors2,
@@ -24159,10 +23202,7 @@ var CONNECTORS = [
   ...connectors17
 ];
 function getConnector(name) {
-  if (!isValidConnectorName(name))
-    return;
-  const normalizedName = normalizeConnectorName(name);
-  return CONNECTORS.find((c) => c.name === normalizedName);
+  return CONNECTORS.find((c) => c.name === name);
 }
 var versionsLoaded = false;
 function loadConnectorVersions() {
@@ -24171,17 +23211,17 @@ function loadConnectorVersions() {
   versionsLoaded = true;
   const thisDir = dirname5(fileURLToPath3(import.meta.url));
   const candidates = [
-    join14(thisDir, "..", "connectors"),
-    join14(thisDir, "..", "..", "connectors")
+    join11(thisDir, "..", "connectors"),
+    join11(thisDir, "..", "..", "connectors")
   ];
-  const connectorsDir = candidates.find((d) => existsSync13(d));
+  const connectorsDir = candidates.find((d) => existsSync10(d));
   if (!connectorsDir)
     return;
   for (const connector of CONNECTORS) {
     try {
-      const pkgPath = join14(getConnectorPackagePath(connectorsDir, connector.name), "package.json");
-      if (existsSync13(pkgPath)) {
-        const pkg = JSON.parse(readFileSync6(pkgPath, "utf-8"));
+      const pkgPath = join11(connectorsDir, `connect-${connector.name}`, "package.json");
+      if (existsSync10(pkgPath)) {
+        const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
         connector.version = pkg.version || "0.0.0";
         continue;
       }
@@ -24194,16 +23234,16 @@ function loadConnectorVersions() {
 }
 
 // src/lib/installer.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync9, readFileSync as readFileSync7, writeFileSync as writeFileSync6, readdirSync as readdirSync9, statSync as statSync4, rmSync as rmSync2 } from "fs";
-import { join as join15, dirname as dirname6 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync5, writeFileSync as writeFileSync4, readdirSync as readdirSync6, statSync as statSync3, rmSync as rmSync2 } from "fs";
+import { join as join12, dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var __dirname4 = dirname6(fileURLToPath4(import.meta.url));
 function resolveConnectorsDir() {
-  const fromBin = join15(__dirname4, "..", "connectors");
-  if (existsSync14(fromBin))
+  const fromBin = join12(__dirname4, "..", "connectors");
+  if (existsSync11(fromBin))
     return fromBin;
-  const fromSrc = join15(__dirname4, "..", "..", "connectors");
-  if (existsSync14(fromSrc))
+  const fromSrc = join12(__dirname4, "..", "..", "connectors");
+  if (existsSync11(fromSrc))
     return fromSrc;
   return fromBin;
 }
@@ -24211,22 +23251,25 @@ var CONNECTORS_DIR = resolveConnectorsDir();
 var PROJECT_CONNECTORS_DIRNAME = ".connectors";
 var ENABLEMENT_MANIFEST_FILENAME = "manifest.json";
 var ENABLEMENT_INDEX_FILENAME = "index.ts";
+function normalizeConnectorName(name) {
+  return name.startsWith("connect-") ? name.slice("connect-".length) : name;
+}
 function getProjectConnectorsDir(targetDir) {
-  return join15(targetDir, PROJECT_CONNECTORS_DIRNAME);
+  return join12(targetDir, PROJECT_CONNECTORS_DIRNAME);
 }
 function getEnablementManifestPath(targetDir) {
-  return join15(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
+  return join12(getProjectConnectorsDir(targetDir), ENABLEMENT_MANIFEST_FILENAME);
 }
 function getLegacyInstallPath(targetDir, name) {
-  return join15(getProjectConnectorsDir(targetDir), legacyConnectorName(name));
+  return join12(getProjectConnectorsDir(targetDir), `connect-${normalizeConnectorName(name)}`);
 }
 function loadEnablementManifest(targetDir) {
   const manifestPath = getEnablementManifestPath(targetDir);
-  if (!existsSync14(manifestPath)) {
+  if (!existsSync11(manifestPath)) {
     return null;
   }
   try {
-    const raw = JSON.parse(readFileSync7(manifestPath, "utf-8"));
+    const raw = JSON.parse(readFileSync5(manifestPath, "utf-8"));
     if (!Array.isArray(raw.connectors)) {
       return null;
     }
@@ -24242,12 +23285,12 @@ function loadEnablementManifest(targetDir) {
 }
 function getLegacyInstalledConnectors(targetDir) {
   const connectorsDir = getProjectConnectorsDir(targetDir);
-  if (!existsSync14(connectorsDir)) {
+  if (!existsSync11(connectorsDir)) {
     return [];
   }
-  return readdirSync9(connectorsDir).filter((entry) => {
-    const fullPath = join15(connectorsDir, entry);
-    return entry.startsWith("connect-") && statSync4(fullPath).isDirectory();
+  return readdirSync6(connectorsDir).filter((entry) => {
+    const fullPath = join12(connectorsDir, entry);
+    return entry.startsWith("connect-") && statSync3(fullPath).isDirectory();
   }).map((entry) => entry.replace("connect-", "")).sort();
 }
 function getEnabledConnectors(targetDir) {
@@ -24255,7 +23298,7 @@ function getEnabledConnectors(targetDir) {
   return [...new Set([...manifestConnectors, ...getLegacyInstalledConnectors(targetDir)])].sort();
 }
 function updateConnectorsIndex(connectorsDir, connectors18) {
-  const indexPath = join15(connectorsDir, ENABLEMENT_INDEX_FILENAME);
+  const indexPath = join12(connectorsDir, ENABLEMENT_INDEX_FILENAME);
   const connectorList = connectors18.map((connector) => `  "${connector}",`).join(`
 `);
   const content = `/**
@@ -24271,27 +23314,28 @@ ${connectorList}
 
 export type EnabledConnectorName = typeof enabledConnectors[number];
 `;
-  writeFileSync6(indexPath, content);
+  writeFileSync4(indexPath, content);
 }
 function writeEnablementManifest(targetDir, connectors18) {
   const connectorsDir = getProjectConnectorsDir(targetDir);
-  mkdirSync9(connectorsDir, { recursive: true });
+  mkdirSync7(connectorsDir, { recursive: true });
   const manifest = {
     version: 1,
     mode: "internal",
     updatedAt: new Date().toISOString(),
     connectors: [...new Set(connectors18.map((value) => normalizeConnectorName(value)))].sort()
   };
-  writeFileSync6(getEnablementManifestPath(targetDir), JSON.stringify(manifest, null, 2) + `
+  writeFileSync4(getEnablementManifestPath(targetDir), JSON.stringify(manifest, null, 2) + `
 `);
   updateConnectorsIndex(connectorsDir, manifest.connectors);
 }
 function getConnectorPath(name) {
-  return getConnectorPackagePath(CONNECTORS_DIR, name);
+  const connectorName = name.startsWith("connect-") ? name : `connect-${name}`;
+  return join12(CONNECTORS_DIR, connectorName);
 }
 function connectorExists(name) {
   const normalizedName = normalizeConnectorName(name);
-  return hasInternalConnectorDefinition(normalizedName) || existsSync14(getConnectorPath(normalizedName));
+  return hasInternalConnectorDefinition(normalizedName) || existsSync11(getConnectorPath(normalizedName));
 }
 function installConnector(name, options = {}) {
   const { targetDir = process.cwd(), overwrite = false } = options;
@@ -24324,7 +23368,7 @@ function installConnector(name, options = {}) {
   try {
     const nextEnabled = [...new Set([...installed, normalizedName])].sort();
     writeEnablementManifest(targetDir, nextEnabled);
-    if (overwrite && existsSync14(legacyInstallPath)) {
+    if (overwrite && existsSync11(legacyInstallPath)) {
       rmSync2(legacyInstallPath, { recursive: true });
     }
     return {
@@ -24356,9 +23400,9 @@ function parseConnectorDocs(raw) {
 function getConnectorDocs(name) {
   const normalizedName = normalizeConnectorName(name);
   const connectorPath = getConnectorPath(normalizedName);
-  const claudeMdPath = join15(connectorPath, "CLAUDE.md");
-  if (existsSync14(claudeMdPath)) {
-    return parseConnectorDocs(readFileSync7(claudeMdPath, "utf-8"));
+  const claudeMdPath = join12(connectorPath, "CLAUDE.md");
+  if (existsSync11(claudeMdPath)) {
+    return parseConnectorDocs(readFileSync5(claudeMdPath, "utf-8"));
   }
   const internalDocs = getInternalConnectorDefinition(normalizedName)?.docsMarkdown;
   if (internalDocs) {
@@ -24402,54 +23446,282 @@ function removeConnector(name, targetDir = process.cwd()) {
   const nextEnabled = installed.filter((connector) => connector !== normalizedName);
   writeEnablementManifest(targetDir, nextEnabled);
   const legacyInstallPath = getLegacyInstallPath(targetDir, normalizedName);
-  if (existsSync14(legacyInstallPath)) {
+  if (existsSync11(legacyInstallPath)) {
     rmSync2(legacyInstallPath, { recursive: true });
   }
   return true;
 }
 
 // src/lib/runner.ts
-import { existsSync as existsSync17, readdirSync as readdirSync11 } from "fs";
-import { join as join17, dirname as dirname7 } from "path";
+import { existsSync as existsSync12, readdirSync as readdirSync7 } from "fs";
+import { join as join13, 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";
 init_database();
-
-// src/server/auth.ts
-import { existsSync as existsSync16, readFileSync as readFileSync8, writeFileSync as writeFileSync7, mkdirSync as mkdirSync11, readdirSync as readdirSync10, rmSync as rmSync3, statSync as statSync6 } from "fs";
-import { randomBytes } from "crypto";
-import { join as join16 } from "path";
-
-// src/lib/lock.ts
-import { openSync, closeSync, unlinkSync, existsSync as existsSync15, statSync as statSync5 } from "fs";
-import { mkdirSync as mkdirSync10 } from "fs";
-var LOCK_TIMEOUT_MS = 5000;
-var LOCK_RETRY_MS = 100;
-var STALE_LOCK_MS = 30000;
-
-class LockTimeoutError extends Error {
-  connector;
-  constructor(connector) {
+var __dirname5 = dirname7(fileURLToPath5(import.meta.url));
+function resolveConnectorsDir2() {
+  const fromBin = join13(__dirname5, "..", "connectors");
+  if (existsSync12(fromBin))
+    return fromBin;
+  const fromSrc = join13(__dirname5, "..", "..", "connectors");
+  if (existsSync12(fromSrc))
+    return fromSrc;
+  return fromBin;
+}
+var CONNECTORS_DIR2 = resolveConnectorsDir2();
+function buildInternalHelpText(name, commands) {
+  const lines = [
+    `Usage: connect-${name} [options] [command]`,
+    "",
+    "Commands:"
+  ];
+  for (const command of commands) {
+    lines.push(`  ${command.name.padEnd(24)} ${command.summary}`);
+  }
+  return lines.join(`
+`);
+}
+function getInternalCommandRuntime(name) {
+  return getInternalConnectorDefinition(name)?.commandRuntime;
+}
+var ENV_VAR_NAME_OVERRIDES = {
+  googlemaps: ["GOOGLE_MAPS"],
+  googletasks: ["GOOGLE_TASKS", "GOOGLE"],
+  google: ["GOOGLE"],
+  stabilityai: ["STABILITY"],
+  openweathermap: ["OPENWEATHERMAP", "OPENWEATHER"]
+};
+function buildEnvWithCredentials(connectorName, baseEnv) {
+  const env = { ...baseEnv };
+  const prefixes = ENV_VAR_NAME_OVERRIDES[connectorName] || [
+    connectorName.toUpperCase().replace(/-/g, "_")
+  ];
+  for (const prefix of prefixes) {
+    const canonicalKey = `${prefix}_API_KEY`;
+    if (env[canonicalKey])
+      continue;
+    const alternatives = [
+      `HASNAXYZ_${prefix}_LIVE_API_KEY`,
+      `HASNA_${prefix}_LIVE_API_KEY`,
+      `${prefix}_LIVE_API_KEY`,
+      `${prefix}_KEY`,
+      `${prefix}_TOKEN`
+    ];
+    for (const alt of alternatives) {
+      const value = env[alt];
+      if (value) {
+        env[canonicalKey] = value;
+        break;
+      }
+    }
+  }
+  return env;
+}
+function getConnectorCliPath(name) {
+  const safeName = name.replace(/[^a-z0-9-]/g, "");
+  const connectorDir = join13(CONNECTORS_DIR2, `connect-${safeName}`);
+  const cliPath = join13(connectorDir, "src", "cli", "index.ts");
+  if (existsSync12(cliPath))
+    return cliPath;
+  return null;
+}
+function hasConnectorCommandSurface(name) {
+  return Boolean(getInternalCommandRuntime(name)?.commands.length || getConnectorCliPath(name));
+}
+function normalizeCommanderUsage(usage) {
+  const commandToken = usage.trim().split(/\s+/)[0];
+  if (!commandToken || commandToken === "help")
+    return null;
+  const aliases = commandToken.split("|").filter(Boolean);
+  const [name, ...rest] = aliases;
+  if (!name)
+    return null;
+  return {
+    name,
+    aliases: rest,
+    usage: usage.trim()
+  };
+}
+function parseCommanderHelpOperations(helpText) {
+  const operations = [];
+  const lines = helpText.split(`
+`);
+  let inCommands = false;
+  for (const line of lines) {
+    if (line.trim().startsWith("Commands:")) {
+      inCommands = true;
+      continue;
+    }
+    if (!inCommands)
+      continue;
+    if (line.trim() === "") {
+      if (operations.length > 0)
+        inCommands = false;
+      continue;
+    }
+    const row = line.match(/^ {2}(\S.*?)(?: {2,}(.+))?$/);
+    if (!row)
+      continue;
+    const usage = row[1].trim();
+    const summary = (row[2] ?? "").trim();
+    const normalized = normalizeCommanderUsage(usage);
+    if (!normalized)
+      continue;
+    operations.push({
+      ...normalized,
+      summary,
+      source: "cli"
+    });
+  }
+  return operations;
+}
+function runConnectorCommand2(name, args, timeoutMs = 30000) {
+  getConnectorsHome();
+  const internalRuntime = getInternalCommandRuntime(name);
+  if (internalRuntime?.run) {
+    return Promise.resolve(internalRuntime.run(args)).then((result) => {
+      if (result) {
+        const stdout = result.stdout.trim();
+        const stderr = (result.stderr ?? "").trim();
+        const exitCode = result.exitCode ?? (result.success === false ? 1 : 0);
+        return {
+          stdout,
+          stderr,
+          exitCode,
+          success: result.success ?? exitCode === 0
+        };
+      }
+      return runLegacyConnectorCommand(name, args, timeoutMs);
+    });
+  }
+  return runLegacyConnectorCommand(name, args, timeoutMs);
+}
+function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
+  const cliPath = getConnectorCliPath(name);
+  if (!cliPath) {
+    return Promise.resolve({
+      stdout: "",
+      stderr: `Connector '${name}' not found or has no CLI.`,
+      exitCode: 1,
+      success: false
+    });
+  }
+  return new Promise((resolve) => {
+    const proc = spawn3("bun", ["run", cliPath, ...args], {
+      timeout: timeoutMs,
+      env: buildEnvWithCredentials(name, process.env),
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (data) => {
+      stdout += data.toString();
+    });
+    proc.stderr.on("data", (data) => {
+      stderr += data.toString();
+    });
+    proc.on("close", (code) => {
+      resolve({
+        stdout: stdout.trim(),
+        stderr: stderr.trim(),
+        exitCode: code ?? 1,
+        success: code === 0
+      });
+    });
+    proc.on("error", (err) => {
+      resolve({
+        stdout: "",
+        stderr: err.message,
+        exitCode: 1,
+        success: false
+      });
+    });
+  });
+}
+async function getConnectorOperations(name) {
+  const internalRuntime = getInternalCommandRuntime(name);
+  if (internalRuntime?.commands.length) {
+    const operations2 = internalRuntime.commands.map((command) => ({
+      name: command.name,
+      aliases: [],
+      usage: command.name,
+      summary: command.summary,
+      source: "internal"
+    }));
+    return {
+      commands: operations2.map((operation) => operation.name),
+      operations: operations2,
+      helpText: internalRuntime.helpText ?? buildInternalHelpText(name, internalRuntime.commands),
+      hasCli: true
+    };
+  }
+  const cliPath = getConnectorCliPath(name);
+  if (!cliPath) {
+    return { commands: [], operations: [], helpText: "", hasCli: false };
+  }
+  const result = await runConnectorCommand2(name, ["--help"]);
+  const helpText = result.stdout || result.stderr;
+  const operations = parseCommanderHelpOperations(helpText);
+  return {
+    commands: operations.map((operation) => operation.name),
+    operations,
+    helpText,
+    hasCli: true
+  };
+}
+async function getConnectorCommandHelp(name, command) {
+  const internalRuntime = getInternalCommandRuntime(name);
+  if (internalRuntime?.getHelp) {
+    const help = await internalRuntime.getHelp(command);
+    if (help) {
+      return help;
+    }
+  }
+  const runtimeCommand = internalRuntime?.commands.find((runtimeEntry) => runtimeEntry.name === command);
+  if (runtimeCommand?.helpText) {
+    return runtimeCommand.helpText;
+  }
+  const result = await runConnectorCommand2(name, [command, "--help"]);
+  return result.stdout || result.stderr;
+}
+
+// src/server/auth.ts
+import { existsSync as existsSync14, readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync9, readdirSync as readdirSync8, rmSync as rmSync3, statSync as statSync5 } from "fs";
+import { randomBytes } from "crypto";
+import { join as join15 } from "path";
+
+// src/lib/lock.ts
+init_database();
+import { openSync, closeSync, unlinkSync, existsSync as existsSync13, statSync as statSync4 } from "fs";
+import { join as join14 } from "path";
+import { mkdirSync as mkdirSync8 } from "fs";
+var LOCK_TIMEOUT_MS = 5000;
+var LOCK_RETRY_MS = 100;
+var STALE_LOCK_MS = 30000;
+
+class LockTimeoutError extends Error {
+  connector;
+  constructor(connector) {
     super(`Could not acquire write lock for connector "${connector}" within ${LOCK_TIMEOUT_MS}ms. Another agent may be writing. Try again shortly.`);
     this.connector = connector;
     this.name = "LockTimeoutError";
   }
 }
 function lockPath(connector) {
-  const dir = getConnectorConfigDir(connector);
-  mkdirSync10(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 = statSync5(path);
+    const stat = statSync4(path);
     return Date.now() - stat.mtimeMs > STALE_LOCK_MS;
   } catch {
     return false;
   }
 }
 function tryAcquire(path) {
-  if (existsSync15(path) && isStale(path)) {
+  if (existsSync13(path) && isStale(path)) {
     try {
       unlinkSync(path);
     } catch {}
@@ -24470,7 +23742,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) {
@@ -24487,6 +23758,7 @@ async function withWriteLock(connector, fn) {
 }
 
 // src/server/auth.ts
+init_database();
 var FETCH_TIMEOUT = 1e4;
 var oauthStateStore = new Map;
 var GOOGLE_AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
@@ -24530,7 +23802,6 @@ var GOOGLE_SCOPES = {
   ].join(" ")
 };
 function getAuthType(name) {
-  name = normalizeConnectorName(name);
   const docs = getConnectorDocs(name);
   if (!docs?.auth)
     return "apikey";
@@ -24541,65 +23812,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 = join16(configDir, "current_profile");
-    if (existsSync16(currentProfileFile)) {
-      try {
-        return readFileSync8(currentProfileFile, "utf-8").trim() || "default";
-      } catch {
-        return "default";
-      }
+  const configDir = getConnectorConfigDir(name);
+  const currentProfileFile = join15(configDir, "current_profile");
+  if (existsSync14(currentProfileFile)) {
+    try {
+      return readFileSync6(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 = join16(configDir, "profiles", `${profile}.json`);
-  if (existsSync16(profileFile)) {
+  const profileFile = join15(configDir, "profiles", `${profile}.json`);
+  if (existsSync14(profileFile)) {
     try {
-      flatConfig = JSON.parse(readFileSync8(profileFile, "utf-8"));
+      flatConfig = JSON.parse(readFileSync6(profileFile, "utf-8"));
     } catch {}
   }
-  const profileDirConfig = join16(configDir, "profiles", profile, "config.json");
-  if (existsSync16(profileDirConfig)) {
+  const profileDirConfig = join15(configDir, "profiles", profile, "config.json");
+  if (existsSync14(profileDirConfig)) {
     try {
-      dirConfig = JSON.parse(readFileSync8(profileDirConfig, "utf-8"));
+      dirConfig = JSON.parse(readFileSync6(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 = join16(configDir, "profiles", profile, "tokens.json");
-    if (existsSync16(tokensFile)) {
-      try {
-        return JSON.parse(readFileSync8(tokensFile, "utf-8"));
-      } catch {
-        return null;
-      }
+  const tokensFile = join15(configDir, "profiles", profile, "tokens.json");
+  if (existsSync14(tokensFile)) {
+    try {
+      return JSON.parse(readFileSync6(tokensFile, "utf-8"));
+    } catch {
+      return null;
     }
   }
   const profileConfig = loadProfileConfig(name);
@@ -24614,50 +23873,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
@@ -24674,686 +23911,241 @@ function getAuthStatus(name) {
     envVarTotalCount
   };
 }
-function getEnvVars(name) {
-  name = normalizeConnectorName(name);
-  const docs = getConnectorDocs(name);
-  return docs?.envVars || [];
-}
 async function saveApiKey(name, key, field) {
-  name = normalizeConnectorName(name);
   return withWriteLock(name, () => _saveApiKey(name, key, field));
 }
 function _saveApiKey(name, key, field) {
-  name = normalizeConnectorName(name);
-  const configDir = getConnectorConfigDir2(name);
+  const configDir = getConnectorConfigDir(name);
   const profile = getCurrentProfile2(name);
   const keyField = field || guessKeyField(name);
   if (keyField === "clientId" || keyField === "clientSecret") {
-    const credentialsFile = join16(configDir, "credentials.json");
-    mkdirSync11(configDir, { recursive: true });
+    const credentialsFile = join15(configDir, "credentials.json");
+    mkdirSync9(configDir, { recursive: true });
     let creds = {};
-    if (existsSync16(credentialsFile)) {
+    if (existsSync14(credentialsFile)) {
       try {
-        creds = JSON.parse(readFileSync8(credentialsFile, "utf-8"));
+        creds = JSON.parse(readFileSync6(credentialsFile, "utf-8"));
       } catch {}
     }
     creds[keyField] = key;
-    writeFileSync7(credentialsFile, JSON.stringify(creds, null, 2));
-    return;
-  }
-  const profileFile = join16(configDir, "profiles", `${profile}.json`);
-  const profileDir = join16(configDir, "profiles", profile);
-  if (existsSync16(profileFile)) {
-    let config = {};
-    try {
-      config = JSON.parse(readFileSync8(profileFile, "utf-8"));
-    } catch {}
-    config[keyField] = key;
-    writeFileSync7(profileFile, JSON.stringify(config, null, 2));
-    return;
-  }
-  if (existsSync16(profileDir)) {
-    const configFile = join16(profileDir, "config.json");
-    let config = {};
-    if (existsSync16(configFile)) {
-      try {
-        config = JSON.parse(readFileSync8(configFile, "utf-8"));
-      } catch {}
-    }
-    config[keyField] = key;
-    writeFileSync7(configFile, JSON.stringify(config, null, 2));
-    return;
-  }
-  mkdirSync11(profileDir, { recursive: true });
-  writeFileSync7(join16(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
-}
-function guessKeyField(name) {
-  name = normalizeConnectorName(name);
-  const docs = getConnectorDocs(name);
-  if (!docs?.envVars.length)
-    return "apiKey";
-  const keyVar = docs.envVars.find((v) => v.variable.includes("API_KEY") || v.variable.includes("API_SECRET") || v.variable.includes("TOKEN") || v.variable.includes("SECRET"));
-  if (keyVar) {
-    const parts = keyVar.variable.toLowerCase().split("_");
-    const withoutPrefix = parts.slice(1);
-    if (withoutPrefix.length > 0) {
-      return withoutPrefix.map((p, i) => i === 0 ? p : p.charAt(0).toUpperCase() + p.slice(1)).join("");
-    }
-  }
-  return "apiKey";
-}
-function getOAuthConfig(name) {
-  name = normalizeConnectorName(name);
-  for (const configDir of getConnectorConfigReadDirs2(name)) {
-    const credentialsFile = join16(configDir, "credentials.json");
-    if (existsSync16(credentialsFile)) {
-      try {
-        const creds = JSON.parse(readFileSync8(credentialsFile, "utf-8"));
-        return { clientId: creds.clientId, clientSecret: creds.clientSecret };
-      } catch {}
-    }
-  }
-  const config = loadProfileConfig(name);
-  return {
-    clientId: config.clientId,
-    clientSecret: config.clientSecret
-  };
-}
-function getOAuthStartUrl(name, redirectUri) {
-  name = normalizeConnectorName(name);
-  const oauthConfig = getOAuthConfig(name);
-  if (!oauthConfig.clientId)
-    return null;
-  const scopes = GOOGLE_SCOPES[name];
-  if (!scopes)
-    return null;
-  const state = randomBytes(32).toString("hex");
-  oauthStateStore.set(state, { connector: name, createdAt: Date.now() });
-  const tenMinutesAgo = Date.now() - 10 * 60 * 1000;
-  for (const [key, val] of oauthStateStore) {
-    if (val.createdAt < tenMinutesAgo)
-      oauthStateStore.delete(key);
-  }
-  const params = new URLSearchParams({
-    client_id: oauthConfig.clientId,
-    redirect_uri: redirectUri,
-    response_type: "code",
-    scope: scopes,
-    access_type: "offline",
-    prompt: "consent",
-    state
-  });
-  return `${GOOGLE_AUTH_URL}?${params.toString()}`;
-}
-function validateOAuthState(state, expectedConnector) {
-  expectedConnector = normalizeConnectorName(expectedConnector);
-  if (!state)
-    return false;
-  const entry = oauthStateStore.get(state);
-  if (!entry || entry.connector !== expectedConnector)
-    return false;
-  oauthStateStore.delete(state);
-  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);
-  }
-  const response = await fetch(GOOGLE_TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      code,
-      client_id: oauthConfig.clientId,
-      client_secret: oauthConfig.clientSecret,
-      redirect_uri: redirectUri,
-      grant_type: "authorization_code"
-    }),
-    signal: AbortSignal.timeout(FETCH_TIMEOUT)
-  });
-  if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: response.statusText }));
-    throw new Error(`Token exchange failed: ${error.error_description || error.error || response.statusText}`);
-  }
-  const data = await response.json();
-  const tokens = {
-    accessToken: data.access_token,
-    refreshToken: data.refresh_token,
-    expiresAt: Date.now() + data.expires_in * 1000,
-    tokenType: data.token_type,
-    scope: data.scope
-  };
-  saveOAuthTokens(name, tokens);
-  return tokens;
-}
-function saveOAuthTokens(name, tokens) {
-  name = normalizeConnectorName(name);
-  const configDir = getConnectorConfigDir2(name);
-  const profile = getCurrentProfile2(name);
-  const profileDir = join16(configDir, "profiles", profile);
-  mkdirSync11(profileDir, { recursive: true });
-  const tokensFile = join16(profileDir, "tokens.json");
-  writeFileSync7(tokensFile, JSON.stringify(tokens, null, 2), { mode: 384 });
-}
-async function refreshOAuthToken(name) {
-  name = normalizeConnectorName(name);
-  return withWriteLock(name, () => _refreshOAuthToken(name));
-}
-async function _refreshOAuthToken(name) {
-  name = normalizeConnectorName(name);
-  const oauthConfig = getOAuthConfig(name);
-  const currentTokens = loadTokens3(name);
-  if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
-    throw new Error("OAuth credentials not configured for " + name);
-  }
-  if (!currentTokens?.refreshToken) {
-    throw new Error("No refresh token available. Please re-authenticate.");
-  }
-  const response = await fetch(GOOGLE_TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      client_id: oauthConfig.clientId,
-      client_secret: oauthConfig.clientSecret,
-      refresh_token: currentTokens.refreshToken,
-      grant_type: "refresh_token"
-    }),
-    signal: AbortSignal.timeout(FETCH_TIMEOUT)
-  });
-  if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: response.statusText }));
-    throw new Error(`Token refresh failed: ${error.error_description || error.error}`);
-  }
-  const data = await response.json();
-  const tokens = {
-    accessToken: data.access_token,
-    refreshToken: currentTokens.refreshToken,
-    expiresAt: Date.now() + data.expires_in * 1000,
-    tokenType: data.token_type,
-    scope: data.scope || currentTokens.scope
-  };
-  saveOAuthTokens(name, tokens);
-  return tokens;
-}
-function listProfiles4(name) {
-  name = normalizeConnectorName(name);
-  const seen = new Set;
-  for (const configDir of getConnectorConfigReadDirs2(name)) {
-    const profilesDir = join16(configDir, "profiles");
-    if (!existsSync16(profilesDir))
-      continue;
-    try {
-      const entries = readdirSync10(profilesDir);
-      for (const entry of entries) {
-        const fullPath = join16(profilesDir, entry);
-        const stat = statSync6(fullPath);
-        if (stat.isDirectory()) {
-          seen.add(entry);
-        } else if (entry.endsWith(".json")) {
-          seen.add(entry.replace(/\.json$/, ""));
-        }
-      }
-    } catch {}
-  }
-  seen.add("default");
-  return Array.from(seen).sort();
-}
-function switchProfile(name, profile) {
-  name = normalizeConnectorName(name);
-  const configDir = getConnectorConfigDir2(name);
-  mkdirSync11(configDir, { recursive: true });
-  writeFileSync7(join16(configDir, "current_profile"), profile);
-}
-function deleteProfile2(name, profile) {
-  name = normalizeConnectorName(name);
-  if (profile === "default")
-    return false;
-  const configDir = getConnectorConfigDir2(name);
-  const profilesDir = join16(configDir, "profiles");
-  const profileFile = join16(profilesDir, `${profile}.json`);
-  if (existsSync16(profileFile)) {
-    rmSync3(profileFile);
-    if (getCurrentProfile2(name) === profile) {
-      switchProfile(name, "default");
-    }
-    return true;
-  }
-  const profileDir = join16(profilesDir, profile);
-  if (existsSync16(profileDir)) {
-    rmSync3(profileDir, { recursive: true });
-    if (getCurrentProfile2(name) === profile) {
-      switchProfile(name, "default");
-    }
-    return true;
-  }
-  return false;
-}
-
-// src/lib/runner.ts
-var __dirname5 = dirname7(fileURLToPath5(import.meta.url));
-function resolveConnectorsDir2() {
-  const fromBin = join17(__dirname5, "..", "connectors");
-  if (existsSync17(fromBin))
-    return fromBin;
-  const fromSrc = join17(__dirname5, "..", "..", "connectors");
-  if (existsSync17(fromSrc))
-    return fromSrc;
-  return fromBin;
-}
-var CONNECTORS_DIR2 = resolveConnectorsDir2();
-function buildInternalHelpText(name, commands) {
-  const lines = [
-    `Usage: connect-${name} [options] [command]`,
-    "",
-    "Commands:"
-  ];
-  for (const command of commands) {
-    lines.push(`  ${command.name.padEnd(24)} ${command.summary}`);
-  }
-  return lines.join(`
-`);
-}
-function getInternalCommandRuntime(name) {
-  return getInternalConnectorDefinition(name)?.commandRuntime;
-}
-var ENV_VAR_NAME_OVERRIDES = {
-  googlemaps: ["GOOGLE_MAPS"],
-  googletasks: ["GOOGLE_TASKS", "GOOGLE"],
-  google: ["GOOGLE"],
-  stabilityai: ["STABILITY"],
-  openweathermap: ["OPENWEATHERMAP", "OPENWEATHER"]
-};
-function buildEnvWithCredentials(connectorName, baseEnv) {
-  const env = { ...baseEnv };
-  const normalizedConnectorName = normalizeConnectorName(connectorName);
-  const prefixes = ENV_VAR_NAME_OVERRIDES[normalizedConnectorName] || [
-    normalizedConnectorName.toUpperCase().replace(/-/g, "_")
-  ];
-  for (const prefix of prefixes) {
-    const canonicalKey = `${prefix}_API_KEY`;
-    if (env[canonicalKey])
-      continue;
-    const alternatives = [
-      `HASNAXYZ_${prefix}_LIVE_API_KEY`,
-      `HASNA_${prefix}_LIVE_API_KEY`,
-      `${prefix}_LIVE_API_KEY`,
-      `${prefix}_KEY`,
-      `${prefix}_TOKEN`
-    ];
-    for (const alt of alternatives) {
-      const value = env[alt];
-      if (value) {
-        env[canonicalKey] = value;
-        break;
-      }
-    }
-  }
-  if (getAuthType(normalizedConnectorName) === "oauth") {
-    const oauthConfig = getOAuthConfig(normalizedConnectorName);
-    const tokens = loadTokens3(normalizedConnectorName);
-    for (const { variable } of getEnvVars(normalizedConnectorName)) {
-      if (env[variable])
-        continue;
-      if (variable.endsWith("_CLIENT_ID") && oauthConfig.clientId) {
-        env[variable] = oauthConfig.clientId;
-      } else if (variable.endsWith("_CLIENT_SECRET") && oauthConfig.clientSecret) {
-        env[variable] = oauthConfig.clientSecret;
-      } else if (variable.endsWith("_ACCESS_TOKEN") && tokens?.accessToken) {
-        env[variable] = tokens.accessToken;
-      } else if (variable.endsWith("_REFRESH_TOKEN") && tokens?.refreshToken) {
-        env[variable] = tokens.refreshToken;
-      } else if (variable.endsWith("_TOKEN_EXPIRES_AT") && tokens?.expiresAt) {
-        env[variable] = String(tokens.expiresAt);
-      }
-    }
-  }
-  return env;
-}
-function getConnectorCliPath(name) {
-  const safeName = normalizeConnectorName(name).replace(/[^a-z0-9-]/g, "");
-  const connectorDir = getConnectorPackagePath(CONNECTORS_DIR2, safeName);
-  const cliPath = join17(connectorDir, "src", "cli", "index.ts");
-  if (existsSync17(cliPath))
-    return cliPath;
-  return null;
-}
-function hasConnectorCommandSurface(name) {
-  return Boolean(getInternalCommandRuntime(name)?.commands.length || getConnectorCliPath(name));
-}
-function normalizeCommanderUsage(usage) {
-  const commandToken = usage.trim().split(/\s+/)[0];
-  if (!commandToken || commandToken === "help")
-    return null;
-  const aliases = commandToken.split("|").filter(Boolean);
-  const [name, ...rest] = aliases;
-  if (!name)
-    return null;
-  return {
-    name,
-    aliases: rest,
-    usage: usage.trim()
-  };
-}
-function parseCommanderHelpOperations(helpText) {
-  const operations = [];
-  const lines = helpText.split(`
-`);
-  let inCommands = false;
-  for (const line of lines) {
-    if (line.trim().startsWith("Commands:")) {
-      inCommands = true;
-      continue;
-    }
-    if (!inCommands)
-      continue;
-    if (line.trim() === "") {
-      if (operations.length > 0)
-        inCommands = false;
-      continue;
-    }
-    const row = line.match(/^ {2}(?! )(\S.*?)(?: {2,}(.+))?$/);
-    if (!row)
-      continue;
-    const usage = row[1].trim();
-    const summary = (row[2] ?? "").trim();
-    const normalized = normalizeCommanderUsage(usage);
-    if (!normalized)
-      continue;
-    operations.push({
-      ...normalized,
-      summary,
-      source: "cli"
-    });
-  }
-  return operations;
-}
-function runConnectorCommand2(name, args, timeoutMs = 30000) {
-  const connectorName = normalizeConnectorName(name);
-  getConnectorsHome();
-  const internalRuntime = getInternalCommandRuntime(connectorName);
-  if (internalRuntime?.run) {
-    return Promise.resolve(internalRuntime.run(args)).then((result) => {
-      if (result) {
-        const stdout = result.stdout.trim();
-        const stderr = (result.stderr ?? "").trim();
-        const exitCode = result.exitCode ?? (result.success === false ? 1 : 0);
-        return {
-          stdout,
-          stderr,
-          exitCode,
-          success: result.success ?? exitCode === 0
-        };
-      }
-      return runLegacyConnectorCommand(connectorName, 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
-      };
-    }
+    writeFileSync5(credentialsFile, JSON.stringify(creds, null, 2));
+    return;
   }
-  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) {
+  const profileFile = join15(configDir, "profiles", `${profile}.json`);
+  const profileDir = join15(configDir, "profiles", profile);
+  if (existsSync14(profileFile)) {
+    let config = {};
     try {
-      response.data = JSON.parse(result.stdout);
+      config = JSON.parse(readFileSync6(profileFile, "utf-8"));
     } catch {}
+    config[keyField] = key;
+    writeFileSync5(profileFile, JSON.stringify(config, null, 2));
+    return;
   }
-  return response;
-}
-function normalizeOperationReturn(value) {
-  if (isRunResult(value)) {
-    const result = value;
-    const response = {
-      ...result
-    };
-    if (result.stdout) {
+  if (existsSync14(profileDir)) {
+    const configFile = join15(profileDir, "config.json");
+    let config = {};
+    if (existsSync14(configFile)) {
       try {
-        response.data = JSON.parse(result.stdout);
+        config = JSON.parse(readFileSync6(configFile, "utf-8"));
       } catch {}
     }
-    return response;
+    config[keyField] = key;
+    writeFileSync5(configFile, JSON.stringify(config, null, 2));
+    return;
   }
-  return {
-    data: value,
-    stdout: JSON.stringify(value),
-    stderr: "",
-    exitCode: 0,
-    success: true
-  };
+  mkdirSync9(profileDir, { recursive: true });
+  writeFileSync5(join15(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
 }
-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;
+function guessKeyField(name) {
+  const docs = getConnectorDocs(name);
+  if (!docs?.envVars.length)
+    return "apiKey";
+  const keyVar = docs.envVars.find((v) => v.variable.includes("API_KEY") || v.variable.includes("API_SECRET") || v.variable.includes("TOKEN") || v.variable.includes("SECRET"));
+  if (keyVar) {
+    const parts = keyVar.variable.toLowerCase().split("_");
+    const withoutPrefix = parts.slice(1);
+    if (withoutPrefix.length > 0) {
+      return withoutPrefix.map((p, i) => i === 0 ? p : p.charAt(0).toUpperCase() + p.slice(1)).join("");
     }
-    commandArgs.push(flag, String(value));
   }
-  if (args.parseJson !== false && !hasFormat) {
-    commandArgs.push("--format", "json");
+  return "apiKey";
+}
+function getOAuthConfig(name) {
+  const configDir = getConnectorConfigDir(name);
+  const credentialsFile = join15(configDir, "credentials.json");
+  if (existsSync14(credentialsFile)) {
+    try {
+      const creds = JSON.parse(readFileSync6(credentialsFile, "utf-8"));
+      return { clientId: creds.clientId, clientSecret: creds.clientSecret };
+    } catch {}
   }
-  return commandArgs;
+  const config = loadProfileConfig(name);
+  return {
+    clientId: config.clientId,
+    clientSecret: config.clientSecret
+  };
 }
-function runLegacyConnectorCommand(name, args, timeoutMs = 30000) {
-  const connectorName = normalizeConnectorName(name);
-  const cliPath = getConnectorCliPath(connectorName);
-  if (!cliPath) {
-    return Promise.resolve({
-      stdout: "",
-      stderr: `Connector '${connectorName}' not found or has no CLI.`,
-      exitCode: 1,
-      success: false
-    });
+function getOAuthStartUrl(name, redirectUri) {
+  const oauthConfig = getOAuthConfig(name);
+  if (!oauthConfig.clientId)
+    return null;
+  const scopes = GOOGLE_SCOPES[name];
+  if (!scopes)
+    return null;
+  const state = randomBytes(32).toString("hex");
+  oauthStateStore.set(state, { connector: name, createdAt: Date.now() });
+  const tenMinutesAgo = Date.now() - 10 * 60 * 1000;
+  for (const [key, val] of oauthStateStore) {
+    if (val.createdAt < tenMinutesAgo)
+      oauthStateStore.delete(key);
   }
-  return new Promise((resolve) => {
-    const proc = spawn2("bun", ["run", cliPath, ...args], {
-      timeout: timeoutMs,
-      env: buildEnvWithCredentials(connectorName, process.env),
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    let stdout = "";
-    let stderr = "";
-    proc.stdout.on("data", (data) => {
-      stdout += data.toString();
-    });
-    proc.stderr.on("data", (data) => {
-      stderr += data.toString();
-    });
-    proc.on("close", (code) => {
-      resolve({
-        stdout: stdout.trim(),
-        stderr: stderr.trim(),
-        exitCode: code ?? 1,
-        success: code === 0
-      });
-    });
-    proc.on("error", (err) => {
-      resolve({
-        stdout: "",
-        stderr: err.message,
-        exitCode: 1,
-        success: false
-      });
-    });
+  const params = new URLSearchParams({
+    client_id: oauthConfig.clientId,
+    redirect_uri: redirectUri,
+    response_type: "code",
+    scope: scopes,
+    access_type: "offline",
+    prompt: "consent",
+    state
   });
+  return `${GOOGLE_AUTH_URL}?${params.toString()}`;
 }
-async function getConnectorOperations(name) {
-  const connectorName = normalizeConnectorName(name);
-  const internalRuntime = getInternalCommandRuntime(connectorName);
-  if (internalRuntime?.commands.length) {
-    const operations2 = internalRuntime.commands.map((command) => ({
-      name: command.name,
-      aliases: [],
-      usage: command.name,
-      summary: command.summary,
-      source: "internal"
-    }));
-    return {
-      commands: operations2.map((operation) => operation.name),
-      operations: operations2,
-      helpText: internalRuntime.helpText ?? buildInternalHelpText(connectorName, internalRuntime.commands),
-      hasCli: true
-    };
+function validateOAuthState(state, expectedConnector) {
+  if (!state)
+    return false;
+  const entry = oauthStateStore.get(state);
+  if (!entry || entry.connector !== expectedConnector)
+    return false;
+  oauthStateStore.delete(state);
+  return Date.now() - entry.createdAt < 10 * 60 * 1000;
+}
+async function exchangeOAuthCode(name, code, redirectUri) {
+  const oauthConfig = getOAuthConfig(name);
+  if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
+    throw new Error("OAuth credentials not configured for " + name);
   }
-  const cliPath = getConnectorCliPath(connectorName);
-  if (!cliPath) {
-    return { commands: [], operations: [], helpText: "", hasCli: false };
+  const response = await fetch(GOOGLE_TOKEN_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      code,
+      client_id: oauthConfig.clientId,
+      client_secret: oauthConfig.clientSecret,
+      redirect_uri: redirectUri,
+      grant_type: "authorization_code"
+    }),
+    signal: AbortSignal.timeout(FETCH_TIMEOUT)
+  });
+  if (!response.ok) {
+    const error = await response.json().catch(() => ({ error: response.statusText }));
+    throw new Error(`Token exchange failed: ${error.error_description || error.error || response.statusText}`);
   }
-  const result = await runConnectorCommand2(connectorName, ["--help"]);
-  const helpText = result.stdout || result.stderr;
-  const operations = parseCommanderHelpOperations(helpText);
-  return {
-    commands: operations.map((operation) => operation.name),
-    operations,
-    helpText,
-    hasCli: true
+  const data = await response.json();
+  const tokens = {
+    accessToken: data.access_token,
+    refreshToken: data.refresh_token,
+    expiresAt: Date.now() + data.expires_in * 1000,
+    tokenType: data.token_type,
+    scope: data.scope
   };
+  saveOAuthTokens(name, tokens);
+  return tokens;
 }
-async function getConnectorCommandHelp(name, command) {
-  const connectorName = normalizeConnectorName(name);
-  const internalRuntime = getInternalCommandRuntime(connectorName);
-  if (internalRuntime?.getHelp) {
-    const help = await internalRuntime.getHelp(command);
-    if (help) {
-      return help;
-    }
+function saveOAuthTokens(name, tokens) {
+  const configDir = getConnectorConfigDir(name);
+  const profile = getCurrentProfile2(name);
+  const profileDir = join15(configDir, "profiles", profile);
+  mkdirSync9(profileDir, { recursive: true });
+  const tokensFile = join15(profileDir, "tokens.json");
+  writeFileSync5(tokensFile, JSON.stringify(tokens, null, 2), { mode: 384 });
+}
+async function refreshOAuthToken(name) {
+  return withWriteLock(name, () => _refreshOAuthToken(name));
+}
+async function _refreshOAuthToken(name) {
+  const oauthConfig = getOAuthConfig(name);
+  const currentTokens = loadTokens(name);
+  if (!oauthConfig.clientId || !oauthConfig.clientSecret) {
+    throw new Error("OAuth credentials not configured for " + name);
   }
-  const runtimeCommand = internalRuntime?.commands.find((runtimeEntry) => runtimeEntry.name === command);
-  if (runtimeCommand?.helpText) {
-    return runtimeCommand.helpText;
+  if (!currentTokens?.refreshToken) {
+    throw new Error("No refresh token available. Please re-authenticate.");
   }
-  const result = await runConnectorCommand2(connectorName, [command, "--help"]);
-  return result.stdout || result.stderr;
+  const response = await fetch(GOOGLE_TOKEN_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      client_id: oauthConfig.clientId,
+      client_secret: oauthConfig.clientSecret,
+      refresh_token: currentTokens.refreshToken,
+      grant_type: "refresh_token"
+    }),
+    signal: AbortSignal.timeout(FETCH_TIMEOUT)
+  });
+  if (!response.ok) {
+    const error = await response.json().catch(() => ({ error: response.statusText }));
+    throw new Error(`Token refresh failed: ${error.error_description || error.error}`);
+  }
+  const data = await response.json();
+  const tokens = {
+    accessToken: data.access_token,
+    refreshToken: currentTokens.refreshToken,
+    expiresAt: Date.now() + data.expires_in * 1000,
+    tokenType: data.token_type,
+    scope: data.scope || currentTokens.scope
+  };
+  saveOAuthTokens(name, tokens);
+  return tokens;
 }
-
-// src/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;
+function listProfiles2(name) {
+  const configDir = getConnectorConfigDir(name);
+  const profilesDir = join15(configDir, "profiles");
+  if (!existsSync14(profilesDir))
+    return ["default"];
+  const seen = new Set;
+  try {
+    const entries = readdirSync8(profilesDir);
+    for (const entry of entries) {
+      const fullPath = join15(profilesDir, entry);
+      const stat = statSync5(fullPath);
+      if (stat.isDirectory()) {
+        seen.add(entry);
+      } else if (entry.endsWith(".json")) {
+        seen.add(entry.replace(/\.json$/, ""));
+      }
+    }
+  } catch {}
+  seen.add("default");
+  return Array.from(seen).sort();
 }
-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 } : {}
-  };
+function switchProfile(name, profile) {
+  const configDir = getConnectorConfigDir(name);
+  mkdirSync9(configDir, { recursive: true });
+  writeFileSync5(join15(configDir, "current_profile"), profile);
 }
-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);
+function deleteProfile2(name, profile) {
+  if (profile === "default")
+    return false;
+  const configDir = getConnectorConfigDir(name);
+  const profilesDir = join15(configDir, "profiles");
+  const profileFile = join15(profilesDir, `${profile}.json`);
+  if (existsSync14(profileFile)) {
+    rmSync3(profileFile);
+    if (getCurrentProfile2(name) === profile) {
+      switchProfile(name, "default");
+    }
+    return true;
   }
-  return {
-    version: 1,
-    packageName: "@hasna/connectors",
-    packageVersion: package_default.version,
-    generatedAt: new Date().toISOString(),
-    categories: CATEGORIES,
-    connectorCount: connectors18.length,
-    connectors: connectors18
-  };
+  const profileDir = join15(profilesDir, profile);
+  if (existsSync14(profileDir)) {
+    rmSync3(profileDir, { recursive: true });
+    if (getCurrentProfile2(name) === profile) {
+      switchProfile(name, "default");
+    }
+    return true;
+  }
+  return false;
 }
 
 // src/server/serve.ts
@@ -25369,20 +24161,20 @@ function resolveDashboardDir() {
   const candidates = [];
   try {
     const scriptDir = dirname8(fileURLToPath6(import.meta.url));
-    candidates.push(join18(scriptDir, "..", "dashboard", "dist"));
-    candidates.push(join18(scriptDir, "..", "..", "dashboard", "dist"));
+    candidates.push(join16(scriptDir, "..", "dashboard", "dist"));
+    candidates.push(join16(scriptDir, "..", "..", "dashboard", "dist"));
   } catch {}
   if (process.argv[1]) {
     const mainDir = dirname8(process.argv[1]);
-    candidates.push(join18(mainDir, "..", "dashboard", "dist"));
-    candidates.push(join18(mainDir, "..", "..", "dashboard", "dist"));
+    candidates.push(join16(mainDir, "..", "dashboard", "dist"));
+    candidates.push(join16(mainDir, "..", "..", "dashboard", "dist"));
   }
-  candidates.push(join18(process.cwd(), "dashboard", "dist"));
+  candidates.push(join16(process.cwd(), "dashboard", "dist"));
   for (const candidate of candidates) {
-    if (existsSync18(candidate))
+    if (existsSync15(candidate))
       return candidate;
   }
-  return join18(process.cwd(), "dashboard", "dist");
+  return join16(process.cwd(), "dashboard", "dist");
 }
 var MIME_TYPES = {
   ".html": "text/html; charset=utf-8",
@@ -25428,6 +24220,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);
+}
 var MAX_BODY_SIZE = 1024 * 1024;
 function getAllConnectorsWithAuth() {
   const installed = new Set(getInstalledConnectors());
@@ -25481,7 +24276,7 @@ function oauthPage(type, title, message, hint, extra) {
   </body></html>`;
 }
 function serveStaticFile(filePath) {
-  if (!existsSync18(filePath))
+  if (!existsSync15(filePath))
     return null;
   const ext = extname(filePath);
   const contentType = MIME_TYPES[ext] || "application/octet-stream";
@@ -25518,7 +24313,7 @@ async function startServer(requestedPort, options) {
   const strict = options?.strict ?? false;
   loadConnectorVersions();
   const dashboardDir = resolveDashboardDir();
-  const dashboardExists = existsSync18(dashboardDir);
+  const dashboardExists = existsSync15(dashboardDir);
   if (!dashboardExists) {
     console.error(`
 Dashboard not found at: ${dashboardDir}`);
@@ -25561,15 +24356,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];
@@ -25643,20 +24429,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);
@@ -25943,16 +24715,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 = join16(getConnectorsHome(), name.startsWith("connect-") ? name : `connect-${name}`);
+          const currentProfileFile = join16(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 (existsSync15(currentProfileFile)) {
+            try {
+              current = readFileSync7(currentProfileFile, "utf-8").trim() || "default";
+            } catch {}
           }
           return json({ current, profiles }, 200, port);
         } catch (e) {
@@ -26000,31 +24770,33 @@ ${result.stderr}`;
         try {
           const connectDir = getConnectorsHome();
           const result = {};
-          if (existsSync18(connectDir)) {
-            for (const connectorName of listConfiguredConnectorNames(connectDir)) {
+          if (existsSync15(connectDir)) {
+            const entries = readdirSync9(connectDir, { withFileTypes: true });
+            for (const entry of entries) {
+              if (!entry.isDirectory() || !entry.name.startsWith("connect-"))
+                continue;
+              const connectorName = entry.name.replace(/^connect-/, "");
+              const profilesDir = join16(connectDir, entry.name, "profiles");
+              if (!existsSync15(profilesDir))
+                continue;
               const profiles = {};
-              for (const configDir of [...getConnectorConfigReadDirs(connectorName, connectDir)].reverse()) {
-                const profilesDir = join18(configDir, "profiles");
-                if (!existsSync18(profilesDir))
-                  continue;
-                const profileEntries = readdirSync12(profilesDir, { withFileTypes: true });
-                for (const pEntry of profileEntries) {
-                  if (pEntry.isFile() && pEntry.name.endsWith(".json")) {
-                    const profileName = basename3(pEntry.name, ".json");
+              const profileEntries = readdirSync9(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(readFileSync7(join16(profilesDir, pEntry.name), "utf-8"));
+                    profiles[profileName] = config;
+                  } catch {}
+                }
+                if (pEntry.isDirectory()) {
+                  const configPath = join16(profilesDir, pEntry.name, "config.json");
+                  if (existsSync15(configPath)) {
                     try {
-                      const config = JSON.parse(readFileSync9(join18(profilesDir, pEntry.name), "utf-8"));
-                      profiles[profileName] = config;
+                      const config = JSON.parse(readFileSync7(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) {
@@ -26062,14 +24834,14 @@ ${result.stderr}`;
               continue;
             if (!data.profiles || typeof data.profiles !== "object")
               continue;
-            const connectorDir = getConnectorConfigDir(connectorName, connectDir);
-            const profilesDir = join18(connectorDir, "profiles");
+            const connectorDir = join16(connectDir, `connect-${connectorName}`);
+            const profilesDir = join16(connectorDir, "profiles");
             for (const [profileName, config] of Object.entries(data.profiles)) {
               if (!config || typeof config !== "object")
                 continue;
-              mkdirSync12(profilesDir, { recursive: true });
-              const profileFile = join18(profilesDir, `${profileName}.json`);
-              writeFileSync8(profileFile, JSON.stringify(config, null, 2));
+              mkdirSync10(profilesDir, { recursive: true });
+              const profileFile = join16(profilesDir, `${profileName}.json`);
+              writeFileSync6(profileFile, JSON.stringify(config, null, 2));
               imported++;
             }
           }
@@ -26085,7 +24857,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);
       }
@@ -26124,12 +24896,12 @@ ${result.stderr}`;
       }
       if (dashboardExists && (method === "GET" || method === "HEAD")) {
         if (path !== "/") {
-          const filePath = join18(dashboardDir, path);
+          const filePath = join16(dashboardDir, path);
           const res2 = serveStaticFile(filePath);
           if (res2)
             return res2;
         }
-        const indexPath = join18(dashboardDir, "index.html");
+        const indexPath = join16(dashboardDir, "index.html");
         const res = serveStaticFile(indexPath);
         if (res)
           return res;