@nimbus-dev/connectors 0.2.1 → 0.2.2

package/connectors/looker/src/server.ts

@@ -1,44 +1,25 @@
 import { z } from "zod";
 import { type ConsentServer, createWriteToolRegistrar } from "../../../shared/consent-kit.ts";
+import { cursorListInputSchema } from "../../../shared/cursor-list-tool.ts";
+import { requiredBaseUrl, requiredEnv } from "../../../shared/env-json-api.ts";
 import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
 import { fetchWithTimeout, mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import {
   runReadOnlyMcpConnector,
   type ZodToolRegistrar,
 } from "../../../shared/run-read-only-mcp-connector.ts";
+import { asRecord } from "../../../shared/search-filter.ts";
 import { filterLookerDashboards } from "./search-filter.ts";
 
-function trimTrailingSlash(s: string): string {
-  return s.endsWith("/") ? s.slice(0, -1) : s;
-}
-
 function apiBase(): string {
-  const v = process.env["LOOKER_BASE_URL"]?.trim();
-  if (v === undefined || v === "") {
-    throw new Error("LOOKER_BASE_URL is not set");
-  }
-  return trimTrailingSlash(v);
-}
-
-function clientId(): string {
-  const v = process.env["LOOKER_CLIENT_ID"]?.trim();
-  if (v === undefined || v === "") {
-    throw new Error("LOOKER_CLIENT_ID is not set");
-  }
-  return v;
-}
-
-function clientSecret(): string {
-  const v = process.env["LOOKER_CLIENT_SECRET"]?.trim();
-  if (v === undefined || v === "") {
-    throw new Error("LOOKER_CLIENT_SECRET is not set");
-  }
-  return v;
+  return requiredBaseUrl("LOOKER_BASE_URL");
 }
 
 async function lookerLogin(): Promise<string> {
   const base = apiBase();
-  const body = `client_id=${encodeURIComponent(clientId())}&client_secret=${encodeURIComponent(clientSecret())}`;
+  const clientId = encodeURIComponent(requiredEnv("LOOKER_CLIENT_ID"));
+  const clientSecret = encodeURIComponent(requiredEnv("LOOKER_CLIENT_SECRET"));
+  const body = `client_id=${clientId}&client_secret=${clientSecret}`;
   const res = await fetchWithTimeout(`${base}/api/4.0/login`, {
     method: "POST",
     headers: {
@@ -51,11 +32,7 @@ async function lookerLogin(): Promise<string> {
   if (!res.ok) {
     throw new Error(`Looker login ${String(res.status)}: ${text.slice(0, 400)}`);
   }
-  const parsed = JSON.parse(text) as unknown;
-  const root =
-    parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)
-      ? (parsed as Record<string, unknown>)
-      : null;
+  const root = asRecord(JSON.parse(text) as unknown);
   const token = typeof root?.["access_token"] === "string" ? root["access_token"] : null;
   if (token === null || token === "") {
     throw new Error("Looker login response missing access_token");
@@ -93,6 +70,25 @@ function offsetCursor(cursor: string | null | undefined): number {
     : Math.max(0, Number.parseInt(cursor, 10) || 0);
 }
 
+const PAGE_LIMIT_DEFAULT = 200;
+const PAGE_LIMIT_MAX = 500;
+
+/** The collections exposed as an offset-cursor listing. */
+const PAGINATED_LISTS = [
+  {
+    tool: "looker_list",
+    path: "/api/4.0/dashboards",
+    description:
+      "List Looker dashboards (`GET /api/4.0/dashboards`). Requires a client-credentials login first. Paginated: `cursor` (opaque offset) + `limit` (default 200, max 500) → `{ items, nextCursor }`.",
+  },
+  {
+    tool: "looker_models_list",
+    path: "/api/4.0/lookml_models",
+    description:
+      "List LookML models (`GET /api/4.0/lookml_models`) for dashboard→table lineage. Paginated: `cursor` (opaque offset) + `limit` (default 200, max 500) → `{ items, nextCursor }`. Returns raw models (explores/views nested); the gateway flattens them.",
+  },
+] as const;
+
 export function registerLookerTools(reg: ZodToolRegistrar, server: unknown): void {
   // Despite the read-only helper's name, this connector exposes write tools. The consent
   // kit needs the real server, which the helper now passes through as its second argument.
@@ -102,43 +98,18 @@ export function registerLookerTools(reg: ZodToolRegistrar, server: unknown): voi
     scopeKinds: ["resource"],
   });
 
-  reg(
-    "looker_list",
-    "List Looker dashboards (`GET /api/4.0/dashboards`). Requires a client-credentials login first. Paginated: `cursor` (opaque offset) + `limit` (default 200, max 500) → `{ items, nextCursor }`.",
-    z.object({
-      cursor: z.string().nullable().optional(),
-      limit: z.number().int().min(1).max(500).optional(),
-    }),
-    async (p) => {
-      const limit = p.limit ?? 200;
+  // Both listings are the same offset-cursor page over a different collection.
+  for (const { tool, path, description } of PAGINATED_LISTS) {
+    reg(tool, description, cursorListInputSchema(PAGE_LIMIT_MAX), async (p) => {
+      const limit = p.limit ?? PAGE_LIMIT_DEFAULT;
       const offset = offsetCursor(p.cursor);
-      const token = await lookerLogin();
-      const items = await getArray(token, "/api/4.0/dashboards", { limit, offset });
+      const items = await getArray(await lookerLogin(), path, { limit, offset });
       return jsonResult({
         items,
         nextCursor: items.length === limit ? String(offset + limit) : null,
       });
-    },
-  );
-
-  reg(
-    "looker_models_list",
-    "List LookML models (`GET /api/4.0/lookml_models`) for dashboard→table lineage. Paginated: `cursor` (opaque offset) + `limit` (default 200, max 500) → `{ items, nextCursor }`. Returns raw models (explores/views nested); the gateway flattens them.",
-    z.object({
-      cursor: z.string().nullable().optional(),
-      limit: z.number().int().min(1).max(500).optional(),
-    }),
-    async (p) => {
-      const limit = p.limit ?? 200;
-      const offset = offsetCursor(p.cursor);
-      const token = await lookerLogin();
-      const items = await getArray(token, "/api/4.0/lookml_models", { limit, offset });
-      return jsonResult({
-        items,
-        nextCursor: items.length === limit ? String(offset + limit) : null,
-      });
-    },
-  );
+    });
+  }
 
   reg(
     "looker_get",
@@ -149,13 +120,7 @@ export function registerLookerTools(reg: ZodToolRegistrar, server: unknown): voi
     async (p) => {
       const token = await lookerLogin();
       const dashboards = await listDashboards(token);
-      const found = dashboards.find((d) => {
-        const obj =
-          d !== null && typeof d === "object" && !Array.isArray(d)
-            ? (d as Record<string, unknown>)
-            : null;
-        return obj?.["id"] === p.id;
-      });
+      const found = dashboards.find((d) => asRecord(d)?.["id"] === p.id);
       if (found === undefined) {
         throw new Error(`Looker dashboard not found: ${p.id}`);
       }

package/connectors/mendeley/src/server.ts

@@ -1,59 +1,6 @@
-import { z } from "zod";
-import { matchesResult } from "../../../shared/mcp-search-tool.ts";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterMendeleyDocuments } from "./search-filter.ts";
-
-const BASE = "https://api.mendeley.com";
-const DOC_ACCEPT = "application/vnd.mendeley-document.1+json";
-
-function accessToken(): string {
-  const t = process.env["MENDELEY_ACCESS_TOKEN"]?.trim();
-  if (t === undefined || t === "") {
-    throw new Error("MENDELEY_ACCESS_TOKEN is not set");
-  }
-  return t;
-}
-
-async function mendeleyGet(path: string): Promise<unknown> {
-  const res = await fetch(`${BASE}${path}`, {
-    headers: { Authorization: `Bearer ${accessToken()}`, Accept: DOC_ACCEPT },
-  });
-  const text = await res.text();
-  if (!res.ok) {
-    // Include the HTTP status so an expired token (401) surfaces explicitly to the
-    // gateway client; matches the zotero server's error shape.
-    throw new Error(`Mendeley ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
+import { registerMendeleyTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-mendeley", (reg) => {
-  reg(
-    "mendeley_list",
-    "List the user's Mendeley library documents (`GET /documents?view=all&limit=100`). Returns the raw JSON array of document objects — each is `{ id, title, type, authors, year, source, identifiers: { doi, ... }, keywords, abstract, last_modified, websites, ... }`.",
-    z.object({}),
-    async () => {
-      return jsonResult(await mendeleyGet(`/documents?view=all&limit=100`));
-    },
-  );
-
-  reg(
-    "mendeley_get",
-    "Fetch one Mendeley document by its id (`GET /documents/{id}?view=all`). Returns the document object directly (NOT wrapped in an array). Throws when no match is found.",
-    z.object({ id: z.string().min(1) }),
-    async (p) => {
-      return jsonResult(await mendeleyGet(`/documents/${encodeURIComponent(p.id)}?view=all`));
-    },
-  );
-
-  reg(
-    "mendeley_search",
-    "Substring search across the first page of the user's library documents. Matches the query against the title, document type, abstract, source, DOI, formatted author names, and keywords (case-insensitive). Returns a `{ matches: [...] }` envelope.",
-    z.object({ query: z.string().min(1), limit: z.number().int().min(1).max(100).optional() }),
-    async (p) => {
-      const root = await mendeleyGet(`/documents?view=all&limit=100`);
-      return matchesResult(root, filterMendeleyDocuments, p);
-    },
-  );
+  registerMendeleyTools(reg);
 });

package/connectors/mendeley/src/tools.ts

@@ -0,0 +1,54 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders } from "../../../shared/env-json-api.ts";
+import { matchesResult } from "../../../shared/mcp-search-tool.ts";
+import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
+import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
+import { filterMendeleyDocuments } from "./search-filter.ts";
+
+const BASE = "https://api.mendeley.com";
+const DOC_ACCEPT = "application/vnd.mendeley-document.1+json";
+
+/**
+ * Failures carry the HTTP status (`Mendeley <status>: …`) so an expired token (401) surfaces
+ * explicitly to the gateway client; the same error shape as the zotero connector's.
+ */
+const mendeleyGet = createJsonGetter({
+  base: BASE,
+  label: "Mendeley",
+  // `extra` replaces the default `Accept` in place: Mendeley serves documents under its own
+  // vendor media type.
+  headers: envAuthHeaders({ env: "MENDELEY_ACCESS_TOKEN", extra: { Accept: DOC_ACCEPT } }),
+});
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const MENDELEY_TOOL_NAMES = ["mendeley_get", "mendeley_list", "mendeley_search"] as const;
+
+export function registerMendeleyTools(reg: ZodToolRegistrar): void {
+  reg(
+    "mendeley_list",
+    "List the user's Mendeley library documents (`GET /documents?view=all&limit=100`). Returns the raw JSON array of document objects — each is `{ id, title, type, authors, year, source, identifiers: { doi, ... }, keywords, abstract, last_modified, websites, ... }`.",
+    z.object({}),
+    async () => {
+      return jsonResult(await mendeleyGet(`/documents?view=all&limit=100`));
+    },
+  );
+
+  reg(
+    "mendeley_get",
+    "Fetch one Mendeley document by its id (`GET /documents/{id}?view=all`). Returns the document object directly (NOT wrapped in an array). Throws when no match is found.",
+    z.object({ id: z.string().min(1) }),
+    async (p) => {
+      return jsonResult(await mendeleyGet(`/documents/${encodeURIComponent(p.id)}?view=all`));
+    },
+  );
+
+  reg(
+    "mendeley_search",
+    "Substring search across the first page of the user's library documents. Matches the query against the title, document type, abstract, source, DOI, formatted author names, and keywords (case-insensitive). Returns a `{ matches: [...] }` envelope.",
+    z.object({ query: z.string().min(1), limit: z.number().int().min(1).max(100).optional() }),
+    async (p) => {
+      const root = await mendeleyGet(`/documents?view=all&limit=100`);
+      return matchesResult(root, filterMendeleyDocuments, p);
+    },
+  );
+}

package/connectors/mercury/src/server.ts

@@ -1,61 +1,6 @@
-import { z } from "zod";
-import { matchesResult, searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterMercuryAccounts } from "./search-filter.ts";
-
-const BASE = "https://api.mercury.com";
-
-function apiToken(): string {
-  const t = process.env["MERCURY_TOKEN"]?.trim();
-  if (t === undefined || t === "") {
-    throw new Error("MERCURY_TOKEN is not set");
-  }
-  return t;
-}
-
-function authHeader(): Record<string, string> {
-  return { Authorization: `Bearer ${apiToken()}`, Accept: "application/json" };
-}
-
-async function mercuryGet(path: string): Promise<unknown> {
-  const res = await fetch(`${BASE}${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Mercury ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
+import { registerMercuryTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-mercury", (reg) => {
-  reg(
-    "mercury_list",
-    "List the user's Mercury bank accounts (`GET /api/v1/accounts`). Returns the `{ accounts: [...] }` envelope. There is no pagination — Mercury returns the full account list in one call.",
-    z.object({}),
-    async () => {
-      return jsonResult(await mercuryGet(`/api/v1/accounts`));
-    },
-  );
-
-  reg(
-    "mercury_get",
-    "Fetch one Mercury account by its id (`GET /api/v1/account/{id}`, note the singular `account` in the path). Returns the account object directly. Throws when no match is found.",
-    z.object({
-      id: z.string().min(1),
-    }),
-    async (p) => {
-      return jsonResult(await mercuryGet(`/api/v1/account/${encodeURIComponent(p.id)}`));
-    },
-  );
-
-  reg(
-    "mercury_search",
-    "Substring search across the user's Mercury accounts. Matches the query against id, name, status, type, kind, and the legal business name (case-insensitive). Returns a `{ matches: [...] }` envelope.",
-    searchToolInputSchema(100),
-    async (p) => {
-      const root = await mercuryGet(`/api/v1/accounts`);
-      const accounts = (root as { accounts?: unknown[] } | null)?.accounts;
-      return matchesResult(accounts, filterMercuryAccounts, p);
-    },
-  );
+  registerMercuryTools(reg);
 });

package/connectors/mercury/src/tools.ts

@@ -0,0 +1,50 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders } from "../../../shared/env-json-api.ts";
+import { matchesResult, searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
+import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
+import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
+import { filterMercuryAccounts } from "./search-filter.ts";
+
+const BASE = "https://api.mercury.com";
+
+const mercuryGet = createJsonGetter({
+  base: BASE,
+  label: "Mercury",
+  headers: envAuthHeaders({ env: "MERCURY_TOKEN" }),
+});
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const MERCURY_TOOL_NAMES = ["mercury_get", "mercury_list", "mercury_search"] as const;
+
+export function registerMercuryTools(reg: ZodToolRegistrar): void {
+  reg(
+    "mercury_list",
+    "List the user's Mercury bank accounts (`GET /api/v1/accounts`). Returns the `{ accounts: [...] }` envelope. There is no pagination — Mercury returns the full account list in one call.",
+    z.object({}),
+    async () => {
+      return jsonResult(await mercuryGet(`/api/v1/accounts`));
+    },
+  );
+
+  reg(
+    "mercury_get",
+    "Fetch one Mercury account by its id (`GET /api/v1/account/{id}`, note the singular `account` in the path). Returns the account object directly. Throws when no match is found.",
+    z.object({
+      id: z.string().min(1),
+    }),
+    async (p) => {
+      return jsonResult(await mercuryGet(`/api/v1/account/${encodeURIComponent(p.id)}`));
+    },
+  );
+
+  reg(
+    "mercury_search",
+    "Substring search across the user's Mercury accounts. Matches the query against id, name, status, type, kind, and the legal business name (case-insensitive). Returns a `{ matches: [...] }` envelope.",
+    searchToolInputSchema(100),
+    async (p) => {
+      const root = await mercuryGet(`/api/v1/accounts`);
+      const accounts = (root as { accounts?: unknown[] } | null)?.accounts;
+      return matchesResult(accounts, filterMercuryAccounts, p);
+    },
+  );
+}

package/connectors/metabase/src/search-filter.ts

@@ -1,22 +1,11 @@
 import {
-  asRecord,
   makeQueryFilter,
+  recordFieldsFromKeys,
   type SearchMatchOptions,
 } from "../../../shared/search-filter.ts";
 
 export type MetabaseSearchMatchOptions = SearchMatchOptions;
 
-function stringAt(row: Record<string, unknown>, key: string): string {
-  const v = row[key];
-  return typeof v === "string" ? v : "";
-}
-
-function fieldsOf(item: unknown): readonly string[] | null {
-  const row = asRecord(item);
-  if (row === undefined) {
-    return null;
-  }
-  return [stringAt(row, "name"), stringAt(row, "description")];
-}
-
-export const filterMetabaseDashboards = makeQueryFilter(fieldsOf);
+export const filterMetabaseDashboards = makeQueryFilter(
+  recordFieldsFromKeys(["name", "description"]),
+);

package/connectors/metabase/src/server.ts

@@ -1,83 +1,6 @@
-import { z } from "zod";
-import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterMetabaseDashboards } from "./search-filter.ts";
-
-function trimTrailingSlash(s: string): string {
-  return s.endsWith("/") ? s.slice(0, -1) : s;
-}
-
-function apiBase(): string {
-  const v = process.env["METABASE_URL"]?.trim();
-  if (v === undefined || v === "") {
-    throw new Error("METABASE_URL is not set");
-  }
-  return trimTrailingSlash(v);
-}
-
-function authHeader(): Record<string, string> {
-  const k = process.env["METABASE_API_KEY"]?.trim();
-  if (k === undefined || k === "") {
-    throw new Error("METABASE_API_KEY is not set");
-  }
-  return { "x-api-key": k, Accept: "application/json" };
-}
-
-async function mbGet(path: string): Promise<unknown> {
-  const res = await fetch(`${apiBase()}${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Metabase ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
-
-function dashboardsFrom(root: unknown): unknown[] {
-  if (Array.isArray(root)) {
-    return root;
-  }
-  const data = (root as { data?: unknown } | null)?.data;
-  return Array.isArray(data) ? data : [];
-}
+import { registerMetabaseTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-metabase", (reg) => {
-  reg(
-    "metabase_list",
-    "List Metabase dashboards (`GET /api/dashboard`). Metabase returns the full list in one response; `limit` (default 200) caps the returned list client-side.",
-    z.object({
-      limit: z.number().int().min(1).max(500).optional(),
-    }),
-    async (p) => {
-      const root = await mbGet("/api/dashboard");
-      const dashboards = dashboardsFrom(root);
-      const cap = p.limit ?? 200;
-      return jsonResult({ items: dashboards.slice(0, cap) });
-    },
-  );
-
-  reg(
-    "metabase_get",
-    "Fetch one Metabase dashboard by numeric id (`/api/dashboard/{id}`). Throws when no dashboard with that id exists.",
-    z.object({
-      id: z.number().int(),
-    }),
-    async (p) => {
-      return jsonResult(await mbGet(`/api/dashboard/${encodeURIComponent(String(p.id))}`));
-    },
-  );
-
-  reg(
-    "metabase_search",
-    "Substring search across Metabase dashboards. Matches the query (case-insensitive) against dashboard name and description. Returns a `{ matches: [...] }` envelope.",
-    searchToolInputSchema(200),
-    async (p) => {
-      const root = await mbGet("/api/dashboard");
-      const matches = filterMetabaseDashboards(dashboardsFrom(root), {
-        query: p.query,
-        limit: p.limit,
-      });
-      return jsonResult({ matches });
-    },
-  );
+  registerMetabaseTools(reg);
 });

package/connectors/metabase/src/tools.ts

@@ -0,0 +1,64 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders, requiredBaseUrl } from "../../../shared/env-json-api.ts";
+import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
+import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
+import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
+import { filterMetabaseDashboards } from "./search-filter.ts";
+
+const mbGet = createJsonGetter({
+  base: () => requiredBaseUrl("METABASE_URL"),
+  label: "Metabase",
+  headers: envAuthHeaders({ env: "METABASE_API_KEY", scheme: "", header: "x-api-key" }),
+});
+
+function dashboardsFrom(root: unknown): unknown[] {
+  if (Array.isArray(root)) {
+    return root;
+  }
+  const data = (root as { data?: unknown } | null)?.data;
+  return Array.isArray(data) ? data : [];
+}
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const METABASE_TOOL_NAMES = ["metabase_get", "metabase_list", "metabase_search"] as const;
+
+export function registerMetabaseTools(reg: ZodToolRegistrar): void {
+  reg(
+    "metabase_list",
+    "List Metabase dashboards (`GET /api/dashboard`). Metabase returns the full list in one response; `limit` (default 200) caps the returned list client-side.",
+    z.object({
+      limit: z.number().int().min(1).max(500).optional(),
+    }),
+    async (p) => {
+      const root = await mbGet("/api/dashboard");
+      const dashboards = dashboardsFrom(root);
+      const cap = p.limit ?? 200;
+      return jsonResult({ items: dashboards.slice(0, cap) });
+    },
+  );
+
+  reg(
+    "metabase_get",
+    "Fetch one Metabase dashboard by numeric id (`/api/dashboard/{id}`). Throws when no dashboard with that id exists.",
+    z.object({
+      id: z.number().int(),
+    }),
+    async (p) => {
+      return jsonResult(await mbGet(`/api/dashboard/${encodeURIComponent(String(p.id))}`));
+    },
+  );
+
+  reg(
+    "metabase_search",
+    "Substring search across Metabase dashboards. Matches the query (case-insensitive) against dashboard name and description. Returns a `{ matches: [...] }` envelope.",
+    searchToolInputSchema(200),
+    async (p) => {
+      const root = await mbGet("/api/dashboard");
+      const matches = filterMetabaseDashboards(dashboardsFrom(root), {
+        query: p.query,
+        limit: p.limit,
+      });
+      return jsonResult({ matches });
+    },
+  );
+}

package/connectors/miro/src/server.ts

@@ -1,76 +1,6 @@
-import { z } from "zod";
-import { searchToolInputSchema } from "../../../shared/mcp-search-tool.ts";
-import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { runReadOnlyMcpConnector } from "../../../shared/run-read-only-mcp-connector.ts";
-import { filterMiroBoards } from "./search-filter.ts";
-
-const BASE = "https://api.miro.com";
-
-function apiToken(): string {
-  const t = process.env["MIRO_TOKEN"]?.trim();
-  if (t === undefined || t === "") {
-    throw new Error("MIRO_TOKEN is not set");
-  }
-  return t;
-}
-
-function authHeader(): Record<string, string> {
-  return { Authorization: `Bearer ${apiToken()}`, Accept: "application/json" };
-}
-
-async function miroGet(path: string): Promise<unknown> {
-  const res = await fetch(`${BASE}${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Miro ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
-
-function boardsFrom(root: unknown): unknown[] {
-  const data = (root as { data?: unknown } | null)?.data;
-  return Array.isArray(data) ? data : [];
-}
+import { registerMiroTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-miro", (reg) => {
-  reg(
-    "miro_list",
-    "List the authenticated user's Miro boards (GET /v2/boards?limit=N&cursor=<cursor>). Returns the { data: [...], cursor?, total, size } envelope — `data` holds the board objects, each shaped { id, name, description, createdAt, modifiedAt, owner: { name }, viewLink, ... }; `cursor` (when present) is the opaque token for the next page. `limit` (default 50, max 50) caps the page_size of the single first-page request.",
-    z.object({
-      limit: z.number().int().min(1).max(50).optional(),
-      cursor: z.string().optional(),
-    }),
-    async (p) => {
-      const params = new URLSearchParams({ limit: String(p.limit ?? 50) });
-      if (p.cursor !== undefined && p.cursor !== "") {
-        params.set("cursor", p.cursor);
-      }
-      return jsonResult(await miroGet(`/v2/boards?${params.toString()}`));
-    },
-  );
-
-  reg(
-    "miro_get",
-    "Fetch one Miro board by its id (GET /v2/boards/{boardId}). Returns the board object directly (NOT wrapped in `data`). Throws when no board with that id exists.",
-    z.object({
-      id: z.string().min(1),
-    }),
-    async (p) => {
-      return jsonResult(await miroGet(`/v2/boards/${encodeURIComponent(p.id)}`));
-    },
-  );
-
-  reg(
-    "miro_search",
-    "**Substring search over the FIRST PAGE only** (up to 50 most-recently-listed boards) of the authenticated user's Miro boards. This tool fetches GET /v2/boards?limit=50 once and matches the query locally (case-insensitive) against the board name, description, and owner name. **Boards beyond the first page are not searchable here — query the local Nimbus index instead for full coverage.** Returns a { matches: [...] } envelope.",
-    searchToolInputSchema(50),
-    async (p) => {
-      const root = await miroGet("/v2/boards?limit=50");
-      const matches = filterMiroBoards(boardsFrom(root), {
-        query: p.query,
-        limit: p.limit,
-      });
-      return jsonResult({ matches });
-    },
-  );
+  registerMiroTools(reg);
 });