@atbash/atbash-mcp 0.0.6-dev.0 → 0.0.6-dev.1

package/dist/index.js

@@ -49,17 +49,14 @@ function registerPolicyResource(server2, agent2, endpoint2) {
 }
 
 // src/tools/judge.ts
-import {
-  checkAgentExists,
-  createAtbashClient
-} from "@atbash/sdk";
+import { Atbash } from "@atbash/sdk";
 import { z as z2 } from "zod";
 
 // src/utils.ts
 function createClientOpts(agent2, endpoint2, orgName2) {
+  void agent2;
   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;
 }
@@ -81,11 +78,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
-  });
+  const client = new Atbash(agent2.privkey, opts);
   server2.registerTool(
     "atbash_judge",
     {
@@ -113,12 +106,12 @@ function registerJudgeTools(server2, agent2, endpoint2, orgName2) {
           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) {
@@ -153,12 +146,12 @@ Reason: ${decision.reason ?? ""}`
           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) {
@@ -177,7 +170,7 @@ Reason: ${result.reason ?? ""}`
     async ({ pubkey }) => {
       try {
         const selectedPubkey = pubkey ?? agent2.pubkey;
-        const registered = await checkAgentExists(selectedPubkey, opts);
+        const registered = await client.checkAgentExists(selectedPubkey);
         return toJsonContent({ registered, pubkey: selectedPubkey });
       } catch (error) {
         return toErrorContent(error);
@@ -187,25 +180,14 @@ Reason: ${result.reason ?? ""}`
 }
 
 // src/tools/queries.ts
-import {
-  getAgentDetail,
-  getAgentPolicy,
-  getAgentToolCalls,
-  getHeldActionReviews,
-  getOrgSubscription,
-  getOrgToolCalls,
-  getPendingHeldActions,
-  getSafetyStats,
-  getToolCallCount,
-  getToolCallFull,
-  getToolCalls
-} from "@atbash/sdk";
+import { Atbash as Atbash2 } 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);
+  const client = new Atbash2(agent2.privkey, opts);
   server2.registerTool(
     "atbash_get_policy",
     {
@@ -216,7 +198,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ pubkey }) => {
       try {
-        return toJsonContent(await getAgentPolicy(pubkey ?? agent2.pubkey, opts));
+        return toJsonContent(await client.getAgentPolicy(pubkey ?? agent2.pubkey));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -232,7 +214,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ pubkey }) => {
       try {
-        return toJsonContent(await getAgentDetail(pubkey ?? agent2.pubkey, opts));
+        return toJsonContent(await client.getAgentDetail(pubkey ?? agent2.pubkey));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -248,7 +230,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ max_count }) => {
       try {
-        return toJsonContent(await getToolCalls(defaultMaxCount(max_count), opts));
+        return toJsonContent(await client.getToolCalls(defaultMaxCount(max_count)));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -266,7 +248,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     async ({ pubkey, max_count }) => {
       try {
         return toJsonContent(
-          await getAgentToolCalls(pubkey ?? agent2.pubkey, defaultMaxCount(max_count), opts)
+          await client.getAgentToolCalls(pubkey ?? agent2.pubkey, defaultMaxCount(max_count))
         );
       } catch (error) {
         return toErrorContent(error);
@@ -284,7 +266,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 client.getOrgToolCalls(org_name, defaultMaxCount(max_count)));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -300,7 +282,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ tool_call_id }) => {
       try {
-        return toJsonContent(await getToolCallFull(tool_call_id, opts));
+        return toJsonContent(await client.getToolCallFull(tool_call_id));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -314,7 +296,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async () => {
       try {
-        return toJsonContent({ count: await getToolCallCount(opts) });
+        return toJsonContent({ count: await client.getToolCallCount() });
       } catch (error) {
         return toErrorContent(error);
       }
@@ -330,7 +312,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async ({ org_name }) => {
       try {
-        return toJsonContent(await getOrgSubscription(org_name, opts));
+        return toJsonContent(await client.getOrgSubscription(org_name));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -348,7 +330,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     async ({ org_name, max_count }) => {
       try {
         return toJsonContent(
-          await getPendingHeldActions(org_name, defaultMaxCount(max_count), opts)
+          await client.getPendingHeldActions(org_name, defaultMaxCount(max_count))
         );
       } catch (error) {
         return toErrorContent(error);
@@ -366,7 +348,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 client.getHeldActionReviews(org_name, defaultMaxCount(max_count)));
       } catch (error) {
         return toErrorContent(error);
       }
@@ -380,7 +362,7 @@ function registerQueryTools(server2, agent2, endpoint2, orgName2) {
     },
     async () => {
       try {
-        return toJsonContent(await getSafetyStats(opts));
+        return toJsonContent(await client.getSafetyStats());
       } catch (error) {
         return toErrorContent(error);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atbash/atbash-mcp",
-  "version": "0.0.6-dev.0",
+  "version": "0.0.6-dev.1",
   "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": "*",
+    "@atbash/sdk": "0.5.3-dev.0",
     "@modelcontextprotocol/sdk": "^1.12.3",
     "zod": "^3.25.76"
   },