@daanrongen/grafana-mcp 1.0.4 → 1.2.0

package/dist/main.js

@@ -36769,7 +36769,7 @@ class AlertInstance extends exports_Schema.Class("AlertInstance")({
 class Folder extends exports_Schema.Class("Folder")({
   uid: exports_Schema.String,
   title: exports_Schema.String,
-  url: exports_Schema.String
+  url: exports_Schema.optional(exports_Schema.String)
 }) {
 }
 
@@ -36791,10 +36791,91 @@ class HealthStatus extends exports_Schema.Class("HealthStatus")({
 }
 
 // src/infra/GrafanaClientLive.ts
+var SearchItemSchema = exports_Schema.Struct({
+  uid: exports_Schema.String,
+  title: exports_Schema.String,
+  url: exports_Schema.String,
+  folderTitle: exports_Schema.optional(exports_Schema.String),
+  tags: exports_Schema.Array(exports_Schema.String)
+});
+var DashboardEnvelopeSchema = exports_Schema.Struct({
+  dashboard: exports_Schema.Record({ key: exports_Schema.String, value: exports_Schema.Unknown }),
+  meta: exports_Schema.Struct({
+    folderTitle: exports_Schema.optional(exports_Schema.String),
+    version: exports_Schema.optional(exports_Schema.Number)
+  })
+});
+var CreateDashboardResponseSchema = exports_Schema.Struct({
+  uid: exports_Schema.String,
+  version: exports_Schema.Number,
+  url: exports_Schema.String
+});
+var UpdateDashboardResponseSchema = exports_Schema.Struct({
+  uid: exports_Schema.String
+});
+var DatasourceSchema = exports_Schema.Struct({
+  id: exports_Schema.Number,
+  uid: exports_Schema.String,
+  name: exports_Schema.String,
+  type: exports_Schema.String,
+  url: exports_Schema.String,
+  isDefault: exports_Schema.Boolean
+});
+var CreateDatasourceResponseSchema = exports_Schema.Struct({
+  datasource: DatasourceSchema
+});
+var AlertRuleSchema = exports_Schema.Struct({
+  uid: exports_Schema.String,
+  title: exports_Schema.String,
+  condition: exports_Schema.String,
+  folderUID: exports_Schema.String,
+  ruleGroup: exports_Schema.String,
+  noDataState: exports_Schema.String,
+  execErrState: exports_Schema.String
+});
+var AlertInstanceSchema = exports_Schema.Struct({
+  labels: exports_Schema.Record({ key: exports_Schema.String, value: exports_Schema.String }),
+  status: exports_Schema.Struct({ state: exports_Schema.String }),
+  activeAt: exports_Schema.optional(exports_Schema.String)
+});
+var FolderSchema = exports_Schema.Struct({
+  uid: exports_Schema.String,
+  title: exports_Schema.String,
+  url: exports_Schema.optional(exports_Schema.String)
+});
+var AnnotationSchema = exports_Schema.Struct({
+  id: exports_Schema.Number,
+  dashboardUID: exports_Schema.optional(exports_Schema.String),
+  time: exports_Schema.Number,
+  timeEnd: exports_Schema.optional(exports_Schema.Number),
+  text: exports_Schema.String,
+  tags: exports_Schema.Array(exports_Schema.String)
+});
+var CreateAnnotationResponseSchema = exports_Schema.Struct({
+  id: exports_Schema.Number
+});
+var HealthStatusSchema = exports_Schema.Struct({
+  commit: exports_Schema.String,
+  database: exports_Schema.String,
+  version: exports_Schema.String
+});
+
+class HttpError extends Error {
+  status;
+  constructor(status, message) {
+    super(message);
+    this.status = status;
+    this.name = "HttpError";
+  }
+}
 var wrapFetch = (label, fn2) => exports_Effect.tryPromise({
   try: fn2,
-  catch: (e) => new GrafanaError({ message: `${label} failed`, cause: e })
+  catch: (e) => e instanceof HttpError ? new GrafanaError({ message: `${label} failed: HTTP ${e.status} ${e.message}`, cause: e }) : new GrafanaError({ message: `${label} failed`, cause: e })
 });
+var decode6 = (schema) => (raw) => exports_Schema.decodeUnknown(schema)(raw).pipe(exports_Effect.mapError((e) => new GrafanaError({
+  message: `Response validation failed: ${e.message}`,
+  cause: e
+})));
 var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(function* () {
   const { url: url3, apiKey } = yield* exports_Effect.orDie(GrafanaConfig);
   const baseUrl = url3.replace(/\/$/, "");
@@ -36805,12 +36886,9 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
   };
   const get13 = (path) => wrapFetch(`GET ${path}`, async () => {
     const res = await fetch(`${baseUrl}${path}`, { headers });
-    if (res.status === 404) {
-      throw new Error(`404 Not Found: ${path}`);
-    }
     if (!res.ok) {
       const text = await res.text();
-      throw new Error(`HTTP ${res.status}: ${text}`);
+      throw new HttpError(res.status, text);
     }
     return res.json();
   });
@@ -36828,69 +36906,59 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
   });
   const del = (path) => wrapFetch(`DELETE ${path}`, async () => {
     const res = await fetch(`${baseUrl}${path}`, { method: "DELETE", headers });
-    if (res.status === 404) {
-      throw new Error(`404 Not Found: ${path}`);
-    }
     if (!res.ok) {
       const text = await res.text();
-      throw new Error(`HTTP ${res.status}: ${text}`);
+      throw new HttpError(res.status, text);
     }
   });
   const mapNotFound = (resource, id, effect2) => exports_Effect.catchAll(effect2, (e) => {
-    if (e.message.includes("404")) {
+    if (e.cause instanceof HttpError && e.cause.status === 404) {
       return exports_Effect.fail(new NotFoundError({ resource, id }));
     }
     return exports_Effect.fail(e);
   });
+  const fetchDashboardDetail = (uid) => get13(`/api/dashboards/uid/${uid}`).pipe(exports_Effect.flatMap(decode6(DashboardEnvelopeSchema)), exports_Effect.map(({ dashboard, meta }) => new DashboardDetail({
+    uid: String(dashboard.uid ?? uid),
+    title: String(dashboard.title ?? ""),
+    json: JSON.stringify(dashboard),
+    version: meta.version ?? 0,
+    folderTitle: meta.folderTitle
+  })));
+  const fetchDashboardVersion = (uid) => get13(`/api/dashboards/uid/${uid}`).pipe(exports_Effect.flatMap(decode6(DashboardEnvelopeSchema)), exports_Effect.map(({ meta }) => meta.version ?? 0));
+  const listAndMap = (path, itemSchema, mapper) => get13(path).pipe(exports_Effect.flatMap(decode6(exports_Schema.Array(itemSchema))), exports_Effect.map((items) => items.map(mapper)));
   return {
-    listDashboards: (query, limit = 100) => get13(`/api/search?type=dash-db&limit=${limit}${query ? `&query=${encodeURIComponent(query)}` : ""}`).pipe(exports_Effect.map((items) => items.map((d) => new Dashboard({
+    listDashboards: (query, limit = 100) => listAndMap(`/api/search?type=dash-db&limit=${limit}${query ? `&query=${encodeURIComponent(query)}` : ""}`, SearchItemSchema, (d) => new Dashboard({
       uid: d.uid,
       title: d.title,
       url: d.url,
       folderTitle: d.folderTitle,
-      tags: d.tags ?? []
-    })))),
-    getDashboard: (uid) => mapNotFound("dashboard", uid, get13(`/api/dashboards/uid/${uid}`).pipe(exports_Effect.map(({ dashboard, meta }) => new DashboardDetail({
-      uid: String(dashboard.uid ?? uid),
-      title: String(dashboard.title ?? ""),
-      json: JSON.stringify(dashboard),
-      version: meta.version ?? 0,
-      folderTitle: meta.folderTitle
-    })))),
+      tags: [...d.tags ?? []]
+    })),
+    getDashboard: (uid) => mapNotFound("dashboard", uid, fetchDashboardDetail(uid)),
     createDashboard: (dashboardJson, folderUid, message) => post("/api/dashboards/db", {
       dashboard: JSON.parse(dashboardJson),
       folderUid,
       message,
       overwrite: false
-    }).pipe(exports_Effect.flatMap((res) => get13(`/api/dashboards/uid/${res.uid}`).pipe(exports_Effect.map(({ dashboard, meta }) => new DashboardDetail({
-      uid: res.uid,
-      title: String(dashboard.title ?? ""),
-      json: JSON.stringify(dashboard),
-      version: meta.version
-    }))))),
-    updateDashboard: (uid, dashboardJson, message) => mapNotFound("dashboard", uid, get13(`/api/dashboards/uid/${uid}`).pipe(exports_Effect.flatMap(({ dashboard: _dashboard, meta }) => {
-      const updated = { ...JSON.parse(dashboardJson), uid, version: meta.version };
+    }).pipe(exports_Effect.flatMap(decode6(CreateDashboardResponseSchema)), exports_Effect.flatMap((res) => fetchDashboardDetail(res.uid))),
+    updateDashboard: (uid, dashboardJson, message) => mapNotFound("dashboard", uid, fetchDashboardVersion(uid).pipe(exports_Effect.flatMap((version2) => {
+      const updated = { ...JSON.parse(dashboardJson), uid, version: version2 };
       return post("/api/dashboards/db", {
         dashboard: updated,
         message,
         overwrite: true
       });
-    }), exports_Effect.flatMap((res) => get13(`/api/dashboards/uid/${res.uid}`).pipe(exports_Effect.map(({ dashboard, meta }) => new DashboardDetail({
-      uid: res.uid,
-      title: String(dashboard.title ?? ""),
-      json: JSON.stringify(dashboard),
-      version: meta.version
-    })))))),
+    }), exports_Effect.flatMap(decode6(UpdateDashboardResponseSchema)), exports_Effect.flatMap((res) => fetchDashboardDetail(res.uid)))),
     deleteDashboard: (uid) => mapNotFound("dashboard", uid, del(`/api/dashboards/uid/${uid}`)),
-    listDatasources: () => get13("/api/datasources").pipe(exports_Effect.map((items) => items.map((d) => new Datasource({
+    listDatasources: () => listAndMap("/api/datasources", DatasourceSchema, (d) => new Datasource({
       id: d.id,
       uid: d.uid,
       name: d.name,
       type: d.type,
       url: d.url ?? "",
       isDefault: d.isDefault ?? false
-    })))),
-    getDatasource: (uid) => mapNotFound("datasource", uid, get13(`/api/datasources/uid/${uid}`).pipe(exports_Effect.map((d) => new Datasource({
+    })),
+    getDatasource: (uid) => mapNotFound("datasource", uid, get13(`/api/datasources/uid/${uid}`).pipe(exports_Effect.flatMap(decode6(DatasourceSchema)), exports_Effect.map((d) => new Datasource({
       id: d.id,
       uid: d.uid,
       name: d.name,
@@ -36898,7 +36966,7 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
       url: d.url ?? "",
       isDefault: d.isDefault ?? false
     })))),
-    createDatasource: (name, type, url4, isDefault = false) => post("/api/datasources", { name, type, url: url4, access: "proxy", isDefault }).pipe(exports_Effect.map(({ datasource: d }) => new Datasource({
+    createDatasource: (name, type, url4, isDefault = false) => post("/api/datasources", { name, type, url: url4, access: "proxy", isDefault }).pipe(exports_Effect.flatMap(decode6(CreateDatasourceResponseSchema)), exports_Effect.map(({ datasource: d }) => new Datasource({
       id: d.id,
       uid: d.uid,
       name: d.name,
@@ -36907,7 +36975,7 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
       isDefault: d.isDefault ?? false
     }))),
     deleteDatasource: (uid) => mapNotFound("datasource", uid, del(`/api/datasources/uid/${uid}`)),
-    listAlertRules: () => get13("/api/v1/provisioning/alert-rules").pipe(exports_Effect.map((items) => items.map((r) => new AlertRule({
+    listAlertRules: () => listAndMap("/api/v1/provisioning/alert-rules", AlertRuleSchema, (r) => new AlertRule({
       uid: r.uid,
       title: r.title,
       condition: r.condition,
@@ -36915,8 +36983,8 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
       ruleGroup: r.ruleGroup,
       noDataState: r.noDataState,
       execErrState: r.execErrState
-    })))),
-    getAlertRule: (uid) => mapNotFound("alert-rule", uid, get13(`/api/v1/provisioning/alert-rules/${uid}`).pipe(exports_Effect.map((r) => new AlertRule({
+    })),
+    getAlertRule: (uid) => mapNotFound("alert-rule", uid, get13(`/api/v1/provisioning/alert-rules/${uid}`).pipe(exports_Effect.flatMap(decode6(AlertRuleSchema)), exports_Effect.map((r) => new AlertRule({
       uid: r.uid,
       title: r.title,
       condition: r.condition,
@@ -36925,28 +36993,28 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
       noDataState: r.noDataState,
       execErrState: r.execErrState
     })))),
-    listAlertInstances: () => get13("/api/alertmanager/grafana/api/v2/alerts").pipe(exports_Effect.map((items) => items.map((a) => new AlertInstance({
+    listAlertInstances: () => get13("/api/alertmanager/grafana/api/v2/alerts").pipe(exports_Effect.flatMap(decode6(exports_Schema.Array(AlertInstanceSchema))), exports_Effect.map((items) => items.map((a) => new AlertInstance({
       labels: a.labels,
       state: a.status?.state ?? "unknown",
       activeAt: a.activeAt
     })))),
-    listFolders: () => get13("/api/folders").pipe(exports_Effect.map((items) => items.map((f) => new Folder({ uid: f.uid, title: f.title, url: f.url })))),
+    listFolders: () => listAndMap("/api/folders", FolderSchema, (f) => new Folder({ uid: f.uid, title: f.title, url: f.url })),
     createFolder: (title, uid) => post("/api/folders", {
       title,
       ...uid !== undefined ? { uid } : {}
-    }).pipe(exports_Effect.map((f) => new Folder({ uid: f.uid, title: f.title, url: f.url }))),
+    }).pipe(exports_Effect.flatMap(decode6(FolderSchema)), exports_Effect.map((f) => new Folder({ uid: f.uid, title: f.title, url: f.url }))),
     deleteFolder: (uid) => mapNotFound("folder", uid, del(`/api/folders/${uid}`)),
     listAnnotations: (dashboardUID, limit = 100) => {
       const params = new URLSearchParams({ limit: String(limit) });
       if (dashboardUID !== undefined)
         params.set("dashboardUID", dashboardUID);
-      return get13(`/api/annotations?${params.toString()}`).pipe(exports_Effect.map((items) => items.map((a) => new Annotation({
+      return get13(`/api/annotations?${params.toString()}`).pipe(exports_Effect.flatMap(decode6(exports_Schema.Array(AnnotationSchema))), exports_Effect.map((items) => items.map((a) => new Annotation({
         id: a.id,
         dashboardUID: a.dashboardUID,
         time: a.time,
         timeEnd: a.timeEnd,
         text: a.text,
-        tags: a.tags ?? []
+        tags: [...a.tags ?? []]
       }))));
     },
     createAnnotation: (text, tags, dashboardUID, time3, timeEnd) => post("/api/annotations", {
@@ -36955,7 +37023,7 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
       ...dashboardUID !== undefined ? { dashboardUID } : {},
       ...time3 !== undefined ? { time: time3 } : {},
       ...timeEnd !== undefined ? { timeEnd } : {}
-    }).pipe(exports_Effect.map(({ id }) => new Annotation({
+    }).pipe(exports_Effect.flatMap(decode6(CreateAnnotationResponseSchema)), exports_Effect.map(({ id }) => new Annotation({
       id,
       dashboardUID,
       time: time3 ?? Date.now(),
@@ -36963,7 +37031,7 @@ var GrafanaClientLive = exports_Layer.effect(GrafanaClient, exports_Effect.gen(f
       text,
       tags
     }))),
-    healthCheck: () => get13("/api/health").pipe(exports_Effect.map((h) => new HealthStatus({
+    healthCheck: () => get13("/api/health").pipe(exports_Effect.flatMap(decode6(HealthStatusSchema)), exports_Effect.map((h) => new HealthStatus({
       commit: h.commit,
       database: h.database,
       version: h.version
@@ -44570,38 +44638,47 @@ var formatError2 = (cause3) => ({
   ],
   isError: true
 });
+var runTool = async (runtime5, effect2) => {
+  const result = await runtime5.runPromiseExit(effect2);
+  if (result._tag === "Failure")
+    return formatError2(result.cause);
+  return formatSuccess(result.value);
+};
 
 // src/mcp/tools/alerts.ts
 var registerAlertTools = (server, runtime5) => {
-  server.tool("list_alert_rules", "List all Grafana alert rules. Returns uid, title, condition, folder, rule group, and state settings.", {}, { title: "List Alert Rules", readOnlyHint: true, openWorldHint: true }, async () => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.listAlertRules();
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  server.tool("list_alert_rules", "List all Grafana alert rules. Returns uid, title, condition, folder, rule group, and state settings.", {}, {
+    title: "List Alert Rules",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, () => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.listAlertRules();
+  })));
   server.tool("get_alert_rule", "Get a Grafana alert rule by UID.", {
     uid: exports_external.string().describe("Alert rule UID")
-  }, { title: "Get Alert Rule", readOnlyHint: true, openWorldHint: true }, async ({ uid }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.getAlertRule(uid);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
-  server.tool("list_alert_instances", "List currently firing Grafana alert instances from Alertmanager. Returns labels, state, and activeAt.", {}, { title: "List Alert Instances", readOnlyHint: true, openWorldHint: true }, async () => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.listAlertInstances();
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "Get Alert Rule",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ uid }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.getAlertRule(uid);
+  })));
+  server.tool("list_alert_instances", "List currently firing Grafana alert instances from Alertmanager. Returns labels, state, and activeAt.", {}, {
+    title: "List Alert Instances",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, () => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.listAlertInstances();
+  })));
 };
 
 // src/mcp/tools/annotations.ts
@@ -44609,15 +44686,16 @@ var registerAnnotationTools = (server, runtime5) => {
   server.tool("list_annotations", "List Grafana annotations, optionally filtered by dashboard UID.", {
     dashboardUid: exports_external.string().optional().describe("Filter annotations by dashboard UID"),
     limit: exports_external.number().optional().describe("Maximum number of results (default: 100)")
-  }, { title: "List Annotations", readOnlyHint: true, openWorldHint: true }, async ({ dashboardUid, limit }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.listAnnotations(dashboardUid, limit);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "List Annotations",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ dashboardUid, limit }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.listAnnotations(dashboardUid, limit);
+  })));
   server.tool("create_annotation", "Create a Grafana annotation, optionally pinned to a dashboard.", {
     text: exports_external.string().describe("Annotation text / description"),
     tags: exports_external.array(exports_external.string()).describe("Tags to attach to the annotation"),
@@ -44628,16 +44706,12 @@ var registerAnnotationTools = (server, runtime5) => {
     title: "Create Annotation",
     readOnlyHint: false,
     destructiveHint: false,
+    idempotentHint: false,
     openWorldHint: true
-  }, async ({ text, tags, dashboardUid, time: time3, timeEnd }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.createAnnotation(text, tags, dashboardUid, time3, timeEnd);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, ({ text, tags, dashboardUid, time: time3, timeEnd }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.createAnnotation(text, tags, dashboardUid, time3, timeEnd);
+  })));
 };
 
 // src/mcp/tools/dashboards.ts
@@ -44645,87 +44719,95 @@ var registerDashboardTools = (server, runtime5) => {
   server.tool("list_dashboards", "Search and list Grafana dashboards. Returns uid, title, url, folderTitle, and tags.", {
     query: exports_external.string().optional().describe("Search query to filter dashboards by title"),
     limit: exports_external.number().optional().describe("Maximum number of results (default: 100)")
-  }, { title: "List Dashboards", readOnlyHint: true, openWorldHint: true }, async ({ query, limit }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.listDashboards(query, limit);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "List Dashboards",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ query, limit }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.listDashboards(query, limit);
+  })));
   server.tool("get_dashboard", "Get a Grafana dashboard by UID. Returns full dashboard JSON, version, and folder.", {
     uid: exports_external.string().describe("Dashboard UID")
-  }, { title: "Get Dashboard", readOnlyHint: true, openWorldHint: true }, async ({ uid }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.getDashboard(uid);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "Get Dashboard",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ uid }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.getDashboard(uid);
+  })));
   server.tool("create_dashboard", "Create a new Grafana dashboard from a JSON definition string.", {
     dashboardJson: exports_external.string().describe("Dashboard JSON as a string (must include at minimum a 'title' field)"),
     folderUid: exports_external.string().optional().describe("UID of the folder to place the dashboard in"),
     message: exports_external.string().optional().describe("Commit message for the dashboard version")
-  }, { title: "Create Dashboard", readOnlyHint: false, destructiveHint: false, openWorldHint: true }, async ({ dashboardJson, folderUid, message }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.createDashboard(dashboardJson, folderUid, message);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "Create Dashboard",
+    readOnlyHint: false,
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: true
+  }, ({ dashboardJson, folderUid, message }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.createDashboard(dashboardJson, folderUid, message);
+  })));
   server.tool("update_dashboard", "Update an existing Grafana dashboard by UID with a new JSON definition.", {
     uid: exports_external.string().describe("Dashboard UID"),
     dashboardJson: exports_external.string().describe("Updated dashboard JSON as a string"),
     message: exports_external.string().optional().describe("Commit message for the new version")
-  }, { title: "Update Dashboard", readOnlyHint: false, destructiveHint: false, openWorldHint: true }, async ({ uid, dashboardJson, message }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.updateDashboard(uid, dashboardJson, message);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "Update Dashboard",
+    readOnlyHint: false,
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: true
+  }, ({ uid, dashboardJson, message }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.updateDashboard(uid, dashboardJson, message);
+  })));
   server.tool("delete_dashboard", "Delete a Grafana dashboard by UID.", {
     uid: exports_external.string().describe("Dashboard UID")
-  }, { title: "Delete Dashboard", readOnlyHint: false, destructiveHint: true, openWorldHint: true }, async ({ uid }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      yield* client.deleteDashboard(uid);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess({ ok: true });
-  });
+  }, {
+    title: "Delete Dashboard",
+    readOnlyHint: false,
+    destructiveHint: true,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ uid }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    yield* client.deleteDashboard(uid);
+    return { ok: true };
+  })));
 };
 
 // src/mcp/tools/datasources.ts
 var registerDatasourceTools = (server, runtime5) => {
-  server.tool("list_datasources", "List all configured Grafana datasources. Returns id, uid, name, type, url, and isDefault.", {}, { title: "List Datasources", readOnlyHint: true, openWorldHint: true }, async () => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.listDatasources();
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  server.tool("list_datasources", "List all configured Grafana datasources. Returns id, uid, name, type, url, and isDefault.", {}, {
+    title: "List Datasources",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, () => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.listDatasources();
+  })));
   server.tool("get_datasource", "Get a Grafana datasource by UID.", {
     uid: exports_external.string().describe("Datasource UID")
-  }, { title: "Get Datasource", readOnlyHint: true, openWorldHint: true }, async ({ uid }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.getDatasource(uid);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "Get Datasource",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ uid }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.getDatasource(uid);
+  })));
   server.tool("create_datasource", "Create a new Grafana datasource.", {
     name: exports_external.string().describe("Datasource name"),
     type: exports_external.string().describe("Datasource type (e.g. prometheus, loki, elasticsearch, postgres)"),
@@ -44735,76 +44817,79 @@ var registerDatasourceTools = (server, runtime5) => {
     title: "Create Datasource",
     readOnlyHint: false,
     destructiveHint: false,
+    idempotentHint: false,
     openWorldHint: true
-  }, async ({ name, type, url: url3, isDefault }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.createDatasource(name, type, url3, isDefault);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, ({ name, type, url: url3, isDefault }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.createDatasource(name, type, url3, isDefault);
+  })));
   server.tool("delete_datasource", "Delete a Grafana datasource by UID.", {
     uid: exports_external.string().describe("Datasource UID")
-  }, { title: "Delete Datasource", readOnlyHint: false, destructiveHint: true, openWorldHint: true }, async ({ uid }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      yield* client.deleteDatasource(uid);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess({ ok: true });
-  });
+  }, {
+    title: "Delete Datasource",
+    readOnlyHint: false,
+    destructiveHint: true,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ uid }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    yield* client.deleteDatasource(uid);
+    return { ok: true };
+  })));
 };
 
 // src/mcp/tools/folders.ts
 var registerFolderTools = (server, runtime5) => {
-  server.tool("list_folders", "List all Grafana folders. Returns uid, title, and url.", {}, { title: "List Folders", readOnlyHint: true, openWorldHint: true }, async () => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.listFolders();
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  server.tool("list_folders", "List all Grafana folders. Returns uid, title, and url.", {}, {
+    title: "List Folders",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, () => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.listFolders();
+  })));
   server.tool("create_folder", "Create a new Grafana folder for organising dashboards.", {
     title: exports_external.string().describe("Folder title"),
     uid: exports_external.string().optional().describe("Optional custom UID for the folder")
-  }, { title: "Create Folder", readOnlyHint: false, destructiveHint: false, openWorldHint: true }, async ({ title, uid }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.createFolder(title, uid);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  }, {
+    title: "Create Folder",
+    readOnlyHint: false,
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: true
+  }, ({ title, uid }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.createFolder(title, uid);
+  })));
   server.tool("delete_folder", "Delete a Grafana folder by UID. Deleting a folder also deletes all dashboards within it.", {
     uid: exports_external.string().describe("Folder UID")
-  }, { title: "Delete Folder", readOnlyHint: false, destructiveHint: true, openWorldHint: true }, async ({ uid }) => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      yield* client.deleteFolder(uid);
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess({ ok: true });
-  });
+  }, {
+    title: "Delete Folder",
+    readOnlyHint: false,
+    destructiveHint: true,
+    idempotentHint: true,
+    openWorldHint: true
+  }, ({ uid }) => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    yield* client.deleteFolder(uid);
+    return { ok: true };
+  })));
 };
 
 // src/mcp/tools/health.ts
 var registerHealthTools = (server, runtime5) => {
-  server.tool("health_check", "Check the health of the Grafana instance. Returns version, database status, and commit hash.", {}, { title: "Health Check", readOnlyHint: true, openWorldHint: true }, async () => {
-    const result = await runtime5.runPromiseExit(exports_Effect.gen(function* () {
-      const client = yield* GrafanaClient;
-      return yield* client.healthCheck();
-    }));
-    if (result._tag === "Failure")
-      return formatError2(result.cause);
-    return formatSuccess(result.value);
-  });
+  server.tool("health_check", "Check the health of the Grafana instance. Returns version, database status, and commit hash.", {}, {
+    title: "Health Check",
+    readOnlyHint: true,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: true
+  }, () => runTool(runtime5, exports_Effect.gen(function* () {
+    const client = yield* GrafanaClient;
+    return yield* client.healthCheck();
+  })));
 };
 
 // src/mcp/server.ts
@@ -44823,8 +44908,7 @@ var createMcpServer = (runtime5) => {
 };
 
 // src/main.ts
-var layer = exports_Layer.mergeAll(GrafanaClientLive);
-var runtime5 = exports_ManagedRuntime.make(layer);
+var runtime5 = exports_ManagedRuntime.make(GrafanaClientLive);
 var server = createMcpServer(runtime5);
 var transport = new StdioServerTransport;
 await server.connect(transport);

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@daanrongen/grafana-mcp",
-  "version": "1.0.4",
+  "version": "1.2.0",
   "description": "MCP server for Grafana — manage dashboards, datasources, alerts, folders, and annotations over stdio",
   "type": "module",
-  "bin": "./dist/main.js",
+  "bin": {
+    "grafana-mcp": "./dist/main.js"
+  },
   "main": "./dist/main.js",
   "files": [
     "dist"