@atbash/atbash-mcp 0.0.6 → 0.0.7

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { loadAgent, setupTelemetry, shutdownTelemetry } from "@atbash/sdk";
+import { Atbash, setupTelemetry, shutdownTelemetry } from "@atbash/sdk";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
@@ -41,28 +41,15 @@ function registerSafetyPrompt(server2) {
 }
 
 // src/resources/policy.ts
-function registerPolicyResource(server2, agent2, endpoint2) {
+function registerPolicyResource(server2, client2) {
   void server2;
-  void agent2;
-  void endpoint2;
-  return;
+  void client2;
 }
 
 // src/tools/judge.ts
-import {
-  checkAgentExists,
-  createAtbashClient
-} from "@atbash/sdk";
 import { z as z2 } from "zod";
 
 // src/utils.ts
-function createClientOpts(agent2, endpoint2, orgName2) {
-  const opts = {};
-  if (endpoint2) opts.endpoint = endpoint2;
-  if (agent2) opts.auth = agent2;
-  if (orgName2) opts.orgName = orgName2;
-  return Object.keys(opts).length > 0 ? opts : void 0;
-}
 function safeErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -79,13 +66,7 @@ function toErrorContent(error) {
 }
 
 // src/tools/judge.ts
-function registerJudgeTools(server2, agent2, endpoint2, orgName2) {
-  const opts = createClientOpts(agent2, endpoint2, orgName2);
-  const client = createAtbashClient({
-    keyPair: { privKey: agent2.privkey, pubKey: agent2.pubkey },
-    judge: endpoint2 ? { endpoint: endpoint2 } : void 0,
-    orgName: orgName2
-  });
+function registerJudgeTools(server2, client2) {
   server2.registerTool(
     "atbash_judge",
     {
@@ -107,18 +88,18 @@ function registerJudgeTools(server2, agent2, endpoint2, orgName2) {
             parsedArgs = tool_args_json;
           }
         }
-        const decision = await client.auditToolCall({
+        const decision = await client2.auditToolCall({
           toolName: tool_name ?? "mcp_judge",
           args: parsedArgs ?? { action },
           context: `${action} \u2014 ${context}`
         });
         if (decision.verdict === "HOLD") {
-          return toJsonContent({
-            ...decision,
-            allow: false,
-            reason: `Action held for operator review. The agent will not be jailed \u2014 please approve or reject this request from the Atbash dashboard, then ask the agent to try again.
-Reason: ${decision.reason ?? ""}`
-          });
+          const holdParts = [
+            "Action held for operator review. The agent will not be jailed \u2014 please approve or reject this request from the Atbash dashboard, then ask the agent to try again.",
+            `Reason: ${decision.reason ?? ""}`
+          ];
+          if (decision.toolCallId) holdParts.push(`Tool Call ID: ${decision.toolCallId}`);
+          return toJsonContent({ ...decision, allow: false, reason: holdParts.join("\n") });
         }
         return toJsonContent(decision);
       } catch (error) {
@@ -147,18 +128,18 @@ Reason: ${decision.reason ?? ""}`
             parsedArgs = tool_args_json;
           }
         }
-        const result = await client.auditToolCall({
+        const result = await client2.auditToolCall({
           toolName: tool_name ?? "mcp_log",
           args: parsedArgs ?? { action },
           context: `${action} \u2014 ${context}`
         });
         if (result.verdict === "HOLD") {
-          return toJsonContent({
-            ...result,
-            allow: false,
-            reason: `Action held for operator review. The agent will not be jailed \u2014 please approve or reject this request from the Atbash dashboard, then ask the agent to try again.
-Reason: ${result.reason ?? ""}`
-          });
+          const holdParts = [
+            "Action held for operator review. The agent will not be jailed \u2014 please approve or reject this request from the Atbash dashboard, then ask the agent to try again.",
+            `Reason: ${result.reason ?? ""}`
+          ];
+          if (result.toolCallId) holdParts.push(`Tool Call ID: ${result.toolCallId}`);
+          return toJsonContent({ ...result, allow: false, reason: holdParts.join("\n") });
         }
         return toJsonContent(result);
       } catch (error) {
@@ -176,8 +157,8 @@ Reason: ${result.reason ?? ""}`
     },
     async ({ pubkey }) => {
       try {
-        const selectedPubkey = pubkey ?? agent2.pubkey;
-        const registered = await checkAgentExists(selectedPubkey, opts);
+        const selectedPubkey = pubkey ?? client2.pubkey;
+        const registered = await client2.checkAgentExists(selectedPubkey);
         return toJsonContent({ registered, pubkey: selectedPubkey });
       } catch (error) {
         return toErrorContent(error);
@@ -187,25 +168,11 @@ Reason: ${result.reason ?? ""}`
 }
 
 // src/tools/queries.ts
-import {
-  getAgentDetail,
-  getAgentPolicy,
-  getAgentToolCalls,
-  getHeldActionReviews,
-  getOrgSubscription,
-  getOrgToolCalls,
-  getPendingHeldActions,
-  getSafetyStats,
-  getToolCallCount,
-  getToolCallFull,
-  getToolCalls
-} from "@atbash/sdk";
 import { z as z3 } from "zod";
 function defaultMaxCount(value) {
   return value ?? 20;
 }
-function registerQueryTools(server2, agent2, endpoint2, orgName2) {
-  const opts = createClientOpts(agent2, endpoint2, orgName2);
+function registerQueryTools(server2, client2) {
   server2.registerTool(
     "atbash_get_policy",
     {
@@ -216,7 +183,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ pubkey }) => {
       try {
-        return toJsonContent(await getAgentPolicy(pubkey ?? agent2.pubkey, opts));
+        return toJsonContent(await client2.getAgentPolicy(pubkey ?? client2.pubkey));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -232,7 +199,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ pubkey }) => {
       try {
-        return toJsonContent(await getAgentDetail(pubkey ?? agent2.pubkey, opts));
+        return toJsonContent(await client2.getAgentDetail(pubkey ?? client2.pubkey));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -248,7 +215,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ max_count }) => {
       try {
-        return toJsonContent(await getToolCalls(defaultMaxCount(max_count), opts));
+        return toJsonContent(await client2.getToolCalls(defaultMaxCount(max_count)));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -266,7 +233,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     async ({ pubkey, max_count }) => {
       try {
         return toJsonContent(
-          await getAgentToolCalls(pubkey ?? agent2.pubkey, defaultMaxCount(max_count), opts)
+          await client2.getAgentToolCalls(pubkey ?? client2.pubkey, defaultMaxCount(max_count))
         );
       } catch (error) {
         return toErrorContent(error);
@@ -284,7 +251,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ org_name, max_count }) => {
       try {
-        return toJsonContent(await getOrgToolCalls(org_name, defaultMaxCount(max_count), opts));
+        return toJsonContent(await client2.getOrgToolCalls(org_name, defaultMaxCount(max_count)));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -300,7 +267,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ tool_call_id }) => {
       try {
-        return toJsonContent(await getToolCallFull(tool_call_id, opts));
+        return toJsonContent(await client2.getToolCallFull(tool_call_id));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -314,7 +281,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async () => {
       try {
-        return toJsonContent({ count: await getToolCallCount(opts) });
+        return toJsonContent({ count: await client2.getToolCallCount() });
       } catch (error) {
         return toErrorContent(error);
       }
@@ -323,14 +290,14 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
   server2.registerTool(
     "atbash_get_tier_info",
     {
-      description: "Get an organization's tier information.",
+      description: "Get an organization's tier and enforcement information.",
       inputSchema: z3.object({
         org_name: z3.string().describe("Organization name")
       })
     },
     async ({ org_name }) => {
       try {
-        return toJsonContent(await getOrgSubscription(org_name, opts));
+        return toJsonContent(await client2.getOrgTierInfo(org_name));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -348,7 +315,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     async ({ org_name, max_count }) => {
       try {
         return toJsonContent(
-          await getPendingHeldActions(org_name, defaultMaxCount(max_count), opts)
+          await client2.getPendingHeldActions(org_name, defaultMaxCount(max_count))
         );
       } catch (error) {
         return toErrorContent(error);
@@ -366,7 +333,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ org_name, max_count }) => {
       try {
-        return toJsonContent(await getHeldActionReviews(org_name, defaultMaxCount(max_count), opts));
+        return toJsonContent(await client2.getHeldActionReviews(org_name, defaultMaxCount(max_count)));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -380,7 +347,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async () => {
       try {
-        return toJsonContent(await getSafetyStats(opts));
+        return toJsonContent(await client2.getSafetyStats());
       } catch (error) {
         return toErrorContent(error);
       }
@@ -390,23 +357,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
 
 // src/tools/status.ts
 import { z as z4 } from "zod";
-function normalizeVerdict(raw) {
-  if (raw == null) return "No verdict";
-  const value = String(raw).toUpperCase();
-  if (value === "ALLOW" || value === "GREEN") return "ALLOW";
-  if (value === "HOLD" || value === "YELLOW") return "HOLD";
-  if (value === "BLOCK" || value === "RED") return "BLOCK";
-  return value;
-}
-function normalizeStatus(raw) {
-  const value = String(raw ?? "").toLowerCase();
-  if (value === "pending" || value === "answered" || value === "error") {
-    return value;
-  }
-  return "error";
-}
-function registerStatusTools(server2, defaultPubkey, endpoint2) {
-  const baseUrl = (endpoint2 ?? "https://atbash.ai").replace(/\/$/, "");
+function registerStatusTools(server2, client2) {
   server2.registerTool(
     "atbash_judgment_status",
     {
@@ -418,30 +369,8 @@ function registerStatusTools(server2, defaultPubkey, endpoint2) {
     },
     async ({ tool_call_id, agent_pubkey }) => {
       try {
-        const pubkey = agent_pubkey ?? defaultPubkey;
-        const url = new URL(`${baseUrl}/api/v1/judge`);
-        url.searchParams.set("tool_call_id", tool_call_id);
-        url.searchParams.set("agent_pubkey", pubkey);
-        const response = await fetch(url, {
-          method: "GET",
-          headers: { Accept: "application/json" }
-        });
-        if (!response.ok) {
-          const body = await response.text().catch(() => "");
-          throw new Error(`API error ${response.status}: ${body || response.statusText}`);
-        }
-        const data = await response.json();
-        return toJsonContent({
-          status: normalizeStatus(data.status),
-          verdict: normalizeVerdict(data.verdict),
-          reason: String(data.reason ?? ""),
-          judgmentId: String(data.judgmentId ?? tool_call_id),
-          onChain: Boolean(data.onChain),
-          cached: Boolean(data.cached),
-          responseTimeMs: Number(data.responseTimeMs ?? 0),
-          tool_call_id,
-          agent_pubkey: pubkey
-        });
+        const status = await client2.getJudgmentStatus(tool_call_id, agent_pubkey);
+        return toJsonContent(status);
       } catch (error) {
         return toErrorContent(error);
       }
@@ -455,21 +384,24 @@ if (!privkey) {
   console.error("ATBASH_AGENT_PRIVKEY env var is required");
   process.exit(1);
 }
-var agent = loadAgent(privkey);
 var endpoint = process.env.ATBASH_ENDPOINT;
 var orgName = process.env.ATBASH_ORG_NAME;
 setupTelemetry({ enabled: true, source: "plugin:mcp" });
 process.once("beforeExit", () => shutdownTelemetry());
 process.once("SIGINT", () => shutdownTelemetry().finally(() => process.exit(0)));
 process.once("SIGTERM", () => shutdownTelemetry().finally(() => process.exit(0)));
+var clientOpts = {};
+if (endpoint) clientOpts.endpoint = endpoint;
+if (orgName) clientOpts.orgName = orgName;
+var client = new Atbash(privkey, clientOpts);
 var server = new McpServer({
   name: "atbash-safety",
   version: "1.0.0"
 });
-registerJudgeTools(server, agent, endpoint, orgName);
-registerStatusTools(server, agent.pubkey, endpoint);
-registerQueryTools(server, agent, endpoint, orgName);
-registerPolicyResource(server, agent, endpoint);
+registerJudgeTools(server, client);
+registerStatusTools(server, client);
+registerQueryTools(server, client);
+registerPolicyResource(server, client);
 registerSafetyPrompt(server);
 var transport = new StdioServerTransport();
 await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atbash/atbash-mcp",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Atbash safety judge exposed as a standalone MCP server",
   "type": "module",
   "main": "dist/index.js",
@@ -41,7 +41,7 @@
     "publish:dev": "node scripts/publish-dev.mjs"
   },
   "dependencies": {
-    "@atbash/sdk": "^0.3.25",
+    "@atbash/sdk": "0.5.4",
     "@modelcontextprotocol/sdk": "^1.12.3",
     "zod": "^3.25.76"
   },