@nimbus-dev/connectors 0.2.1 → 0.2.3

package/connectors/canva/src/server.ts

@@ -1,77 +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 { filterCanvaDesigns } from "./search-filter.ts";
-
-const BASE = "https://api.canva.com";
-
-function apiToken(): string {
-  const t = process.env["CANVA_TOKEN"]?.trim();
-  if (t === undefined || t === "") {
-    throw new Error("CANVA_TOKEN is not set");
-  }
-  return t;
-}
-
-function authHeader(): Record<string, string> {
-  return { Authorization: `Bearer ${apiToken()}`, Accept: "application/json" };
-}
-
-async function canvaGet(path: string): Promise<unknown> {
-  const res = await fetch(`${BASE}${path}`, { headers: authHeader() });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`Canva ${String(res.status)}: ${text.slice(0, 400)}`);
-  }
-  return JSON.parse(text) as unknown;
-}
-
-function designsFrom(root: unknown): unknown[] {
-  const items = (root as { items?: unknown } | null)?.items;
-  return Array.isArray(items) ? items : [];
-}
+import { registerCanvaTools } from "./tools.ts";
 
 await runReadOnlyMcpConnector("nimbus-canva", (reg) => {
-  reg(
-    "canva_list",
-    "List the authenticated user's Canva designs (GET /rest/v1/designs?continuation=<token>). Returns the { items: [...], continuation? } envelope — `items` holds the design objects, each shaped { id, title, created_at, updated_at, urls: { edit_url, view_url }, thumbnail: { url, width, height }, ... }; `continuation` (when present) is the opaque token for the next page.",
-    z.object({
-      continuation: z.string().optional(),
-    }),
-    async (p) => {
-      const params = new URLSearchParams();
-      if (p.continuation !== undefined && p.continuation !== "") {
-        params.set("continuation", p.continuation);
-      }
-      const qs = params.toString();
-      const query = qs === "" ? "" : `?${qs}`;
-      return jsonResult(await canvaGet(`/rest/v1/designs${query}`));
-    },
-  );
-
-  reg(
-    "canva_get",
-    "Fetch one Canva design by its id (GET /rest/v1/designs/{designId}). Returns the { design: { id, title, created_at, updated_at, urls, thumbnail, ... } } envelope. Throws when no design with that id exists.",
-    z.object({
-      id: z.string().min(1),
-    }),
-    async (p) => {
-      return jsonResult(await canvaGet(`/rest/v1/designs/${encodeURIComponent(p.id)}`));
-    },
-  );
-
-  reg(
-    "canva_search",
-    "**Substring search over the FIRST PAGE only** of the authenticated user's Canva designs. This tool fetches GET /rest/v1/designs once and matches the query locally (case-insensitive) against the design title. **Designs beyond the first page are not searchable here — query the local Nimbus index instead for full coverage.** Returns a { matches: [...] } envelope.",
-    searchToolInputSchema(100),
-    async (p) => {
-      const root = await canvaGet("/rest/v1/designs");
-      const matches = filterCanvaDesigns(designsFrom(root), {
-        query: p.query,
-        limit: p.limit,
-      });
-      return jsonResult({ matches });
-    },
-  );
+  registerCanvaTools(reg);
 });

package/connectors/canva/src/tools.ts

@@ -0,0 +1,66 @@
+import { z } from "zod";
+import { createJsonGetter, envAuthHeaders } 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 { filterCanvaDesigns } from "./search-filter.ts";
+
+const BASE = "https://api.canva.com";
+
+const canvaGet = createJsonGetter({
+  base: BASE,
+  label: "Canva",
+  headers: envAuthHeaders({ env: "CANVA_TOKEN" }),
+});
+
+function designsFrom(root: unknown): unknown[] {
+  const items = (root as { items?: unknown } | null)?.items;
+  return Array.isArray(items) ? items : [];
+}
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const CANVA_TOOL_NAMES = ["canva_get", "canva_list", "canva_search"] as const;
+
+export function registerCanvaTools(reg: ZodToolRegistrar): void {
+  reg(
+    "canva_list",
+    "List the authenticated user's Canva designs (GET /rest/v1/designs?continuation=<token>). Returns the { items: [...], continuation? } envelope — `items` holds the design objects, each shaped { id, title, created_at, updated_at, urls: { edit_url, view_url }, thumbnail: { url, width, height }, ... }; `continuation` (when present) is the opaque token for the next page.",
+    z.object({
+      continuation: z.string().optional(),
+    }),
+    async (p) => {
+      const params = new URLSearchParams();
+      if (p.continuation !== undefined && p.continuation !== "") {
+        params.set("continuation", p.continuation);
+      }
+      const qs = params.toString();
+      const query = qs === "" ? "" : `?${qs}`;
+      return jsonResult(await canvaGet(`/rest/v1/designs${query}`));
+    },
+  );
+
+  reg(
+    "canva_get",
+    "Fetch one Canva design by its id (GET /rest/v1/designs/{designId}). Returns the { design: { id, title, created_at, updated_at, urls, thumbnail, ... } } envelope. Throws when no design with that id exists.",
+    z.object({
+      id: z.string().min(1),
+    }),
+    async (p) => {
+      return jsonResult(await canvaGet(`/rest/v1/designs/${encodeURIComponent(p.id)}`));
+    },
+  );
+
+  reg(
+    "canva_search",
+    "**Substring search over the FIRST PAGE only** of the authenticated user's Canva designs. This tool fetches GET /rest/v1/designs once and matches the query locally (case-insensitive) against the design title. **Designs beyond the first page are not searchable here — query the local Nimbus index instead for full coverage.** Returns a { matches: [...] } envelope.",
+    searchToolInputSchema(100),
+    async (p) => {
+      const root = await canvaGet("/rest/v1/designs");
+      const matches = filterCanvaDesigns(designsFrom(root), {
+        query: p.query,
+        limit: p.limit,
+      });
+      return jsonResult({ matches });
+    },
+  );
+}

package/connectors/circleci/src/server.ts

@@ -1,184 +1,10 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { z } from "zod";
-import { createWriteToolRegistrar } from "../../../shared/consent-kit.ts";
-import {
-  createRegisterSimpleTool,
-  createZodToolRegistrar,
-  mcpJsonResult as jsonResult,
-  requireProcessEnv,
-} from "../../../shared/mcp-tool-kit.ts";
-import { makeRestToolRegistrar } from "../../../shared/rest-tool-kit.ts";
-
-const CCI_API = "https://circleci.com/api/v2";
-
-function projectPathSegments(projectSlug: string): string {
-  return projectSlug
-    .split("/")
-    .map((s) => s.trim())
-    .filter((s) => s.length > 0)
-    .map((s) => encodeURIComponent(s))
-    .join("/");
-}
-
-async function circleciFetch(
-  token: string,
-  path: string,
-  init?: RequestInit,
-): Promise<{ ok: boolean; status: number; json: unknown; text: string }> {
-  const url = path.startsWith("http") ? path : `${CCI_API}${path}`;
-  const res = await fetch(url, {
-    ...init,
-    headers: {
-      Accept: "application/json",
-      "Circle-Token": token,
-      ...(init?.headers as Record<string, string> | undefined),
-    },
-  });
-  const text = await res.text();
-  let json: unknown;
-  try {
-    json = JSON.parse(text) as unknown;
-  } catch {
-    json = null;
-  }
-  return { ok: res.ok, status: res.status, json, text };
-}
+import { registerCircleciTools } from "./tools.ts";
 
 const mcp = new McpServer({ name: "nimbus-circleci", version: "0.1.0" });
-const reg = createZodToolRegistrar(createRegisterSimpleTool(mcp));
-
-/**
- * Every MUTATING circleci tool goes through here. Outside the gateway this adds the
- * consent gate, the write-scope allow-list, the mutation budget and the audit record; inside
- * the gateway it is a pass-through, because executor.ts (I2) is the gate there.
- */
-const registerWriteTool = createWriteToolRegistrar(mcp, {
-  connector: "circleci",
-  scopeEnv: "NIMBUS_MCP_CIRCLECI_WRITE_SCOPE",
-  scopeKinds: ["project"],
-});
-
-/** Standard CircleCI read tool: token → circleciFetch(buildPath) → mcpJsonResultIfOk("CircleCI"). */
-const registerCciTool = makeRestToolRegistrar({
-  registrar: reg,
-  tokenEnv: "CIRCLECI_API_TOKEN",
-  serviceLabel: "CircleCI",
-  fetch: circleciFetch,
-});
-
-const projectSlugSchema = z.object({
-  projectSlug: z
-    .string()
-    .min(3)
-    .describe("CircleCI project slug, e.g. gh/org/repo or bb/workspace/repo"),
-});
-
-registerCciTool(
-  "circleci_pipeline_list",
-  "List pipelines for a CircleCI project.",
-  projectSlugSchema.extend({
-    pageToken: z.string().min(1).optional(),
-  }),
-  (parsed) => {
-    const base = `/project/${projectPathSegments(parsed.projectSlug)}/pipeline`;
-    const u = new URL(`${CCI_API}${base}`);
-    if (parsed.pageToken !== undefined) {
-      u.searchParams.set("page-token", parsed.pageToken);
-    }
-    return `${u.pathname}${u.search}`;
-  },
-);
-
-registerCciTool(
-  "circleci_pipeline_get",
-  "Get a pipeline by UUID.",
-  z.object({ pipelineId: z.uuid() }),
-  (parsed) => `/pipeline/${encodeURIComponent(parsed.pipelineId)}`,
-);
-
-registerCciTool(
-  "circleci_workflow_list",
-  "List workflows for a pipeline.",
-  z.object({ pipelineId: z.uuid() }),
-  (parsed) => `/pipeline/${encodeURIComponent(parsed.pipelineId)}/workflow`,
-);
-
-registerCciTool(
-  "circleci_job_list",
-  "List jobs for a workflow.",
-  z.object({ workflowId: z.uuid() }),
-  (parsed) => `/workflow/${encodeURIComponent(parsed.workflowId)}/job`,
-);
-
-registerCciTool(
-  "circleci_job_artifacts",
-  "List artifact metadata for a job number under a project.",
-  projectSlugSchema.extend({
-    jobNumber: z.number().int().min(1),
-  }),
-  (parsed) =>
-    `/project/${projectPathSegments(parsed.projectSlug)}/job/${String(parsed.jobNumber)}/artifacts`,
-);
-
-registerWriteTool(
-  "circleci_pipeline_trigger",
-  {
-    mutates: "circleci.pipeline.trigger",
-    recoverable: true,
-    scopeTargetOf: (p) => ({ kind: "project", value: p.projectSlug }),
-  },
-  "Trigger a new pipeline on a branch (or tag).",
-  projectSlugSchema.extend({
-    branch: z.string().min(1).optional(),
-    tag: z.string().min(1).optional(),
-    parameters: z.record(z.string(), z.string()).optional(),
-  }),
-  async (parsed) => {
-    const token = requireProcessEnv("CIRCLECI_API_TOKEN");
-    const path = `/project/${projectPathSegments(parsed.projectSlug)}/pipeline`;
-    const body: Record<string, unknown> = {};
-    if (parsed.tag !== undefined && parsed.tag !== "") {
-      body["tag"] = parsed.tag;
-    } else {
-      body["branch"] = parsed.branch ?? "main";
-    }
-    if (parsed.parameters !== undefined && Object.keys(parsed.parameters).length > 0) {
-      body["parameters"] = parsed.parameters;
-    }
-    const res = await circleciFetch(token, path, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body),
-    });
-    if (!res.ok) {
-      throw new Error(`CircleCI trigger ${String(res.status)}: ${res.text.slice(0, 400)}`);
-    }
-    return jsonResult(res.json ?? { ok: true, raw: res.text });
-  },
-);
 
-registerWriteTool(
-  "circleci_job_cancel",
-  {
-    mutates: "circleci.job.cancel",
-    recoverable: true,
-    scopeTargetOf: (p) => ({ kind: "project", value: p.projectSlug }),
-  },
-  "Cancel a running job by project slug and job number.",
-  projectSlugSchema.extend({
-    jobNumber: z.number().int().min(1),
-  }),
-  async (parsed) => {
-    const token = requireProcessEnv("CIRCLECI_API_TOKEN");
-    const path = `/project/${projectPathSegments(parsed.projectSlug)}/job/${String(parsed.jobNumber)}/cancel`;
-    const res = await circleciFetch(token, path, { method: "POST" });
-    if (!res.ok) {
-      throw new Error(`CircleCI job cancel ${String(res.status)}: ${res.text.slice(0, 400)}`);
-    }
-    return jsonResult(res.json ?? { ok: true });
-  },
-);
+registerCircleciTools(mcp);
 
 const transport = new StdioServerTransport();
 await mcp.connect(transport);

package/connectors/circleci/src/tools.ts

@@ -0,0 +1,193 @@
+import { z } from "zod";
+import type { ConsentServer } from "../../../shared/consent-kit.ts";
+import { createWriteToolRegistrar } from "../../../shared/consent-kit.ts";
+import {
+  createRegisterSimpleTool,
+  createZodToolRegistrar,
+  mcpJsonResult as jsonResult,
+  requireProcessEnv,
+} from "../../../shared/mcp-tool-kit.ts";
+import {
+  makeRestToolRegistrar,
+  type RestFetchResult,
+  toRestFetchResult,
+} from "../../../shared/rest-tool-kit.ts";
+
+const CCI_API = "https://circleci.com/api/v2";
+
+function projectPathSegments(projectSlug: string): string {
+  return projectSlug
+    .split("/")
+    .map((s) => s.trim())
+    .filter((s) => s.length > 0)
+    .map((s) => encodeURIComponent(s))
+    .join("/");
+}
+
+async function circleciFetch(
+  token: string,
+  path: string,
+  init?: RequestInit,
+): Promise<RestFetchResult> {
+  const url = path.startsWith("http") ? path : `${CCI_API}${path}`;
+  const res = await fetch(url, {
+    ...init,
+    headers: {
+      Accept: "application/json",
+      "Circle-Token": token,
+      ...(init?.headers as Record<string, string> | undefined),
+    },
+  });
+  return toRestFetchResult(res);
+}
+
+/** Tool names exposed by this connector — for contract/introspection tests. */
+export const CIRCLECI_TOOL_NAMES = [
+  "circleci_pipeline_list",
+  "circleci_pipeline_get",
+  "circleci_workflow_list",
+  "circleci_job_list",
+  "circleci_job_artifacts",
+  "circleci_pipeline_trigger",
+  "circleci_job_cancel",
+] as const;
+
+export function registerCircleciTools(
+  server: ConsentServer & { tool: (...args: never) => unknown },
+): void {
+  const reg = createZodToolRegistrar(createRegisterSimpleTool(server));
+
+  /**
+   * Every MUTATING circleci tool goes through here. Outside the gateway this adds the
+   * consent gate, the write-scope allow-list, the mutation budget and the audit record; inside
+   * the gateway it is a pass-through, because executor.ts (I2) is the gate there.
+   */
+  const registerWriteTool = createWriteToolRegistrar(server, {
+    connector: "circleci",
+    scopeEnv: "NIMBUS_MCP_CIRCLECI_WRITE_SCOPE",
+    scopeKinds: ["project"],
+  });
+
+  /** Standard CircleCI read tool: token → circleciFetch(buildPath) → mcpJsonResultIfOk("CircleCI"). */
+  const registerCciTool = makeRestToolRegistrar({
+    registrar: reg,
+    tokenEnv: "CIRCLECI_API_TOKEN",
+    serviceLabel: "CircleCI",
+    fetch: circleciFetch,
+  });
+
+  const projectSlugSchema = z.object({
+    projectSlug: z
+      .string()
+      .min(3)
+      .describe("CircleCI project slug, e.g. gh/org/repo or bb/workspace/repo"),
+  });
+
+  registerCciTool(
+    "circleci_pipeline_list",
+    "List pipelines for a CircleCI project.",
+    projectSlugSchema.extend({
+      pageToken: z.string().min(1).optional(),
+    }),
+    (parsed) => {
+      const base = `/project/${projectPathSegments(parsed.projectSlug)}/pipeline`;
+      const u = new URL(`${CCI_API}${base}`);
+      if (parsed.pageToken !== undefined) {
+        u.searchParams.set("page-token", parsed.pageToken);
+      }
+      // Relative to CCI_API, like every other tool here: the fetcher prefixes the base, which
+      // already ends in /api/v2, so returning `u.pathname` requested /api/v2/api/v2/….
+      return `${base}${u.search}`;
+    },
+  );
+
+  registerCciTool(
+    "circleci_pipeline_get",
+    "Get a pipeline by UUID.",
+    z.object({ pipelineId: z.uuid() }),
+    (parsed) => `/pipeline/${encodeURIComponent(parsed.pipelineId)}`,
+  );
+
+  registerCciTool(
+    "circleci_workflow_list",
+    "List workflows for a pipeline.",
+    z.object({ pipelineId: z.uuid() }),
+    (parsed) => `/pipeline/${encodeURIComponent(parsed.pipelineId)}/workflow`,
+  );
+
+  registerCciTool(
+    "circleci_job_list",
+    "List jobs for a workflow.",
+    z.object({ workflowId: z.uuid() }),
+    (parsed) => `/workflow/${encodeURIComponent(parsed.workflowId)}/job`,
+  );
+
+  registerCciTool(
+    "circleci_job_artifacts",
+    "List artifact metadata for a job number under a project.",
+    projectSlugSchema.extend({
+      jobNumber: z.number().int().min(1),
+    }),
+    (parsed) =>
+      `/project/${projectPathSegments(parsed.projectSlug)}/job/${String(parsed.jobNumber)}/artifacts`,
+  );
+
+  registerWriteTool(
+    "circleci_pipeline_trigger",
+    {
+      mutates: "circleci.pipeline.trigger",
+      recoverable: true,
+      scopeTargetOf: (p) => ({ kind: "project", value: p.projectSlug }),
+    },
+    "Trigger a new pipeline on a branch (or tag).",
+    projectSlugSchema.extend({
+      branch: z.string().min(1).optional(),
+      tag: z.string().min(1).optional(),
+      parameters: z.record(z.string(), z.string()).optional(),
+    }),
+    async (parsed) => {
+      const token = requireProcessEnv("CIRCLECI_API_TOKEN");
+      const path = `/project/${projectPathSegments(parsed.projectSlug)}/pipeline`;
+      const body: Record<string, unknown> = {};
+      if (parsed.tag !== undefined && parsed.tag !== "") {
+        body["tag"] = parsed.tag;
+      } else {
+        body["branch"] = parsed.branch ?? "main";
+      }
+      if (parsed.parameters !== undefined && Object.keys(parsed.parameters).length > 0) {
+        body["parameters"] = parsed.parameters;
+      }
+      const res = await circleciFetch(token, path, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body),
+      });
+      if (!res.ok) {
+        throw new Error(`CircleCI trigger ${String(res.status)}: ${res.text.slice(0, 400)}`);
+      }
+      return jsonResult(res.json ?? { ok: true, raw: res.text });
+    },
+  );
+
+  registerWriteTool(
+    "circleci_job_cancel",
+    {
+      mutates: "circleci.job.cancel",
+      recoverable: true,
+      scopeTargetOf: (p) => ({ kind: "project", value: p.projectSlug }),
+    },
+    "Cancel a running job by project slug and job number.",
+    projectSlugSchema.extend({
+      jobNumber: z.number().int().min(1),
+    }),
+    async (parsed) => {
+      const token = requireProcessEnv("CIRCLECI_API_TOKEN");
+      const path = `/project/${projectPathSegments(parsed.projectSlug)}/job/${String(parsed.jobNumber)}/cancel`;
+      const res = await circleciFetch(token, path, { method: "POST" });
+      if (!res.ok) {
+        throw new Error(`CircleCI job cancel ${String(res.status)}: ${res.text.slice(0, 400)}`);
+      }
+      return jsonResult(res.json ?? { ok: true });
+    },
+  );
+}

package/connectors/cloud-logging/src/tools.ts

@@ -1,8 +1,14 @@
 import { z } from "zod";
+import {
+  cliArg,
+  createCliJsonRunner,
+  gcloudProjectArgs,
+  isRecord,
+  strField,
+} from "../../../shared/cli-json-kit.ts";
 import { mcpJsonResult as jsonResult } from "../../../shared/mcp-tool-kit.ts";
 import { nimbusSpawn } from "../../../shared/nimbus-spawn.ts";
 import type { ZodToolRegistrar } from "../../../shared/run-read-only-mcp-connector.ts";
-import { assertSafeCliArg } from "../../../shared/safe-cli-arg.ts";
 
 /**
  * GCP Cloud Logging (Tier-3, no-row-data) MCP tool surface. ALL tools index log
@@ -20,42 +26,23 @@ export const CLOUD_LOGGING_TOOL_NAMES = [
   "cloud_logging_search",
 ] as const;
 
-function isRecord(v: unknown): v is Record<string, unknown> {
-  return v !== null && typeof v === "object" && !Array.isArray(v);
-}
-
-function strField(r: Record<string, unknown>, key: string): string {
-  const v = r[key];
-  return typeof v === "string" ? v : "";
-}
-
 function asArray(parsed: unknown): unknown[] {
   return Array.isArray(parsed) ? parsed : [];
 }
 
-/** The configured GCP project id, if `GOOGLE_CLOUD_PROJECT` is set at spawn. */
-function projectArgs(): string[] {
-  const project = process.env["GOOGLE_CLOUD_PROJECT"]?.trim();
-  return project !== undefined && project !== "" ? ["--project", project] : [];
-}
-
 /**
  * Run `gcloud logging <args> --format json` and parse stdout. gcloud reads
  * Application Default Credentials from `GOOGLE_APPLICATION_CREDENTIALS`
  * natively from the process env injected at spawn time. Throws on non-zero exit.
  */
-async function gcloudLogging(args: string[]): Promise<unknown> {
-  const { code, stdout, stderr } = await nimbusSpawn(
-    ["gcloud", "logging", ...args, ...projectArgs(), "--format", "json"],
-    {},
-  );
-  const out = stdout.trim();
-  const err = stderr.trim();
-  if (code !== 0) {
-    throw new Error(`gcloud logging ${args[0] ?? ""} failed: ${err.slice(0, 400)}`);
-  }
-  return out === "" ? [] : (JSON.parse(out) as unknown);
-}
+const gcloudLogging = createCliJsonRunner(
+  {
+    argv: (args) => ["gcloud", "logging", ...args, ...gcloudProjectArgs(), "--format", "json"],
+    label: "gcloud logging",
+    emptyResult: [],
+  },
+  nimbusSpawn,
+);
 
 function sinkMatches(entry: unknown, q: string): boolean {
   if (!isRecord(entry)) {
@@ -88,15 +75,12 @@ export function registerCloudLoggingTools(reg: ZodToolRegistrar): void {
     "cloud_logging_get",
     "Fetch one Cloud Logging routing sink's configuration METADATA (`gcloud logging sinks describe <sink>`). Returns the sink's `name`, `destination`, `filter`, `description`, `disabled` flag, and create/update timestamps. No log-entry contents are returned — metadata only.",
     z.object({
-      sinkName: z.string().min(1),
+      // A bare positional to `gcloud logging sinks describe`, so it is refused here, at the
+      // schema, if gcloud would misread it: a value starting with "-" would be parsed as a flag.
+      sinkName: cliArg,
     }),
     async (p) => {
-      // `sinkName` is a bare positional to `gcloud logging sinks describe`; guard
-      // against argv flag smuggling (a value beginning with "-" would be parsed as
-      // a gcloud flag).
-      return jsonResult(
-        await gcloudLogging(["sinks", "describe", assertSafeCliArg(p.sinkName, "sinkName")]),
-      );
+      return jsonResult(await gcloudLogging(["sinks", "describe", p.sinkName]));
     },
   );