@neiracore/mcp-server 1.0.3 → 1.2.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { McpServer, ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { ACSPClient, randomNonceHex, ACSPError } from '@neiracore/acsp';
+import { ACSPClient, ACSPError } from '@neiracore/acsp';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
@@ -88,12 +88,6 @@ var ServerContext = class {
   getAid() {
     return this.credentials?.aid ?? null;
   }
-  /**
-   * Get the current login key (nk_...) or null.
-   */
-  getLoginKey() {
-    return this.credentials?.login_key ?? null;
-  }
   /**
    * Hot-reload credentials after registration (no server restart needed).
    */
@@ -335,38 +329,11 @@ function registerSearchTool(server, ctx) {
     InputSchema2,
     async (args) => {
       try {
-        ctx.requireAuth();
+        const client = ctx.requireAuth();
         const aid = ctx.getAid();
-        const loginKey = ctx.getLoginKey();
         ctx.log("debug", `Searching: "${truncate(args.query, 50)}" limit=${args.limit}`);
-        const body = {
-          aid,
-          looking_for: args.query
-        };
-        if (args.limit !== void 0) body.limit = args.limit;
-        const headers = {
-          "Content-Type": "application/json"
-        };
-        if (loginKey) {
-          headers["Authorization"] = `Bearer ${loginKey}`;
-        }
-        const res = await fetch(`${ctx.getBaseUrl()}/api/acsp/search`, {
-          method: "POST",
-          headers,
-          body: JSON.stringify(body)
-        });
-        if (!res.ok) {
-          const text = await res.text();
-          let msg = `Search failed (HTTP ${res.status})`;
-          try {
-            const err = JSON.parse(text);
-            if (err.message) msg = err.message;
-          } catch {
-          }
-          return textResult(`\u274C ${msg}`);
-        }
-        const result = await res.json();
-        if (!result.matches || result.matches.length === 0) {
+        const result = await client.search(args.query, args.limit, aid);
+        if (result.matches.length === 0) {
           return textResult(
             `\u{1F50D} No agents found matching "${args.query}".
 
@@ -413,24 +380,11 @@ function registerStatusTool(server, ctx) {
     InputSchema3,
     async (args) => {
       try {
-        ctx.requireAuth();
+        const client = ctx.requireAuth();
         const targetAid = args.aid ?? ctx.getAid();
         const isSelf = !args.aid || args.aid === ctx.getAid();
         ctx.log("debug", `Status check for: ${targetAid.slice(0, 8)}...`);
-        const res = await fetch(
-          `${ctx.getBaseUrl()}/api/acsp/status?aid=${targetAid}`
-        );
-        if (!res.ok) {
-          const text = await res.text();
-          let msg = `Status check failed (HTTP ${res.status})`;
-          try {
-            const err = JSON.parse(text);
-            if (err.message) msg = err.message;
-          } catch {
-          }
-          return textResult(`\u274C ${msg}`);
-        }
-        const result = await res.json();
+        const result = await client.status(targetAid);
         const lines = [
           isSelf ? "\u{1F4CA} Your Agent Status\n" : `\u{1F4CA} Agent Status: ${targetAid.slice(0, 8)}...
 `,
@@ -470,9 +424,8 @@ function registerConnectTool(server, ctx) {
     InputSchema4,
     async (args) => {
       try {
-        ctx.requireAuth();
+        const client = ctx.requireAuth();
         const creds = ctx.credentials;
-        const loginKey = ctx.getLoginKey();
         ctx.log("info", `Connecting to: ${args.target_aid.slice(0, 8)}...`);
         const enrichedMessage = [
           `[Connection Request from ${creds.agent_name}]`,
@@ -480,41 +433,17 @@ function registerConnectTool(server, ctx) {
           "",
           args.message
         ].join("\n");
-        const headers = {
-          "Content-Type": "application/json"
-        };
-        if (loginKey) {
-          headers["Authorization"] = `Bearer ${loginKey}`;
-        }
-        const res = await fetch(`${ctx.getBaseUrl()}/api/acsp/message/send`, {
-          method: "POST",
-          headers,
-          body: JSON.stringify({
-            sender_aid: creds.aid,
-            recipient_aid: args.target_aid,
-            content: enrichedMessage
-          })
+        const result = await client.message.send({
+          to: args.target_aid,
+          content: enrichedMessage
         });
-        if (!res.ok) {
-          const text = await res.text();
-          let msg = `Connect failed (HTTP ${res.status})`;
-          try {
-            const err = JSON.parse(text);
-            if (err.message) msg = err.message;
-          } catch {
-          }
-          return textResult(`\u274C ${msg}`);
-        }
-        const result = await res.json();
-        const msgId = result.message_id ?? result.id ?? "sent";
-        const ts = result.created_at ?? result.timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
-        ctx.log("info", `Connection sent: ${msgId}`);
+        ctx.log("info", `Connection sent: ${result.message_id}`);
         return textResult(
           `\u{1F91D} Connection request sent!
 
   To:        ${args.target_aid.slice(0, 8)}...
   Message:   ${truncate(args.message, 80)}
-  Sent at:   ${ts}
+  ID:        ${result.message_id}
 
 The target agent will see your name, capabilities, and message.`
         );
@@ -537,40 +466,15 @@ function registerSendMessageTool(server, ctx) {
     InputSchema5,
     async (args) => {
       try {
-        ctx.requireAuth();
+        const client = ctx.requireAuth();
         const creds = ctx.credentials;
-        const loginKey = ctx.getLoginKey();
         ctx.log("info", `Sending ${args.message_type} to: ${args.to.slice(0, 8)}...`);
         const content = args.message_type === "text" ? args.content : `[${args.message_type.toUpperCase()}] ${args.content}`;
-        const headers = {
-          "Content-Type": "application/json"
-        };
-        if (loginKey) {
-          headers["Authorization"] = `Bearer ${loginKey}`;
-        }
-        const res = await fetch(`${ctx.getBaseUrl()}/api/acsp/message/send`, {
-          method: "POST",
-          headers,
-          body: JSON.stringify({
-            sender_aid: creds.aid,
-            recipient_aid: args.to,
-            content
-          })
+        const result = await client.message.send({
+          to: args.to,
+          content
         });
-        if (!res.ok) {
-          const text = await res.text();
-          let msg = `Send failed (HTTP ${res.status})`;
-          try {
-            const err = JSON.parse(text);
-            if (err.message) msg = err.message;
-          } catch {
-          }
-          return textResult(`\u274C ${msg}`);
-        }
-        const result = await res.json();
-        const msgId = result.message_id ?? result.id ?? "sent";
-        const ts = result.created_at ?? result.timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
-        ctx.log("info", `Message sent: ${msgId}`);
+        ctx.log("info", `Message sent: ${result.message_id}`);
         return textResult(
           `\u2709\uFE0F Message sent!
 
@@ -578,8 +482,7 @@ function registerSendMessageTool(server, ctx) {
   To:        ${args.to.slice(0, 8)}...
   Type:      ${args.message_type}
   Preview:   ${truncate(args.content, 80)}
-  Sent at:   ${ts}
-  ID:        ${msgId}`
+  ID:        ${result.message_id}`
         );
       } catch (err) {
         ctx.log("error", `Send message failed: ${String(err)}`);
@@ -589,34 +492,49 @@ function registerSendMessageTool(server, ctx) {
   );
 }
 var InputSchema6 = {
-  name: z.string().min(1, "Group name is required").max(128, "Group name must be 128 characters or less"),
+  name: z.string().min(1, "Group name is required").max(64, "Group name must be 64 characters or less"),
   description: z.string().max(1024, "Description must be 1024 characters or less").optional()
 };
 function registerCreateGroupTool(server, ctx) {
   server.tool(
     "neiracore_create_group",
-    "Create a new privacy group on the Neiracore network. You become the first member automatically. Other agents can join via group ID.",
+    "Create a new group on the Neiracore network. You become the first member automatically. Other agents can join via the invite code.",
     InputSchema6,
     async (args) => {
       try {
-        const client = ctx.requireAuth();
+        ctx.requireAuth();
+        const creds = ctx.credentials;
         ctx.log("info", `Creating group: ${args.name}`);
-        const result = await client.group.create({
-          name: args.name,
-          description: args.description
+        const res = await fetch(`${ctx.getBaseUrl()}/api/acsp/groups`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${creds.login_key}`
+          },
+          body: JSON.stringify({
+            aid: creds.aid,
+            name: args.name,
+            description: args.description ?? void 0
+          })
         });
-        ctx.log("info", `Group created: ${result.group_id}`);
+        if (!res.ok) {
+          const errBody = await res.json().catch(() => ({ error: `HTTP ${res.status}` }));
+          throw new Error(errBody.message ?? errBody.error ?? `HTTP ${res.status}`);
+        }
+        const result = await res.json();
+        const group = result.group ?? result;
+        ctx.log("info", `Group created: ${String(group.id ?? "unknown")}`);
         const output = [
           "\u{1F3D8}\uFE0F Group created!\n",
           formatSection("", [
-            ["Group ID", result.group_id],
-            ["Name", result.name],
-            ["Description", result.description ?? "(none)"],
-            ["Created by", result.created_by.slice(0, 8) + "..."],
-            ["Created at", result.created_at]
+            ["Group ID", String(group.id ?? "(unknown)")],
+            ["Name", String(group.name ?? args.name)],
+            ["Description", String(group.description ?? args.description ?? "(none)")],
+            ["Invite Code", String(group.invite_code ?? result.invite_code ?? "(none)")],
+            ["Members", String(group.member_count ?? 1)]
           ]),
           "",
-          `Share the Group ID with other agents so they can use neiracore_join_group.`
+          `Share the invite code with other agents so they can join.`
         ].join("\n");
         return textResult(output);
       } catch (err) {
@@ -627,33 +545,54 @@ function registerCreateGroupTool(server, ctx) {
   );
 }
 var InputSchema7 = {
-  group_id: z.string().regex(/^grp_[A-Za-z0-9_-]{21}$/, "Group ID must match format grp_XXXXXXXXXXXXXXXXXXXXX")
+  group_id: z.string().optional().describe("UUID of the group/channel to join"),
+  group_name: z.string().optional().describe("Name of the group/channel to join (alternative to group_id)")
 };
 function registerJoinGroupTool(server, ctx) {
   server.tool(
     "neiracore_join_group",
-    "Join an existing privacy group on the Neiracore network. Provide the group ID shared by another agent.",
+    "Join a public group or channel on the Neiracore network. Provide either a group_id or group_name.",
     InputSchema7,
     async (args) => {
       try {
-        const client = ctx.requireAuth();
+        ctx.requireAuth();
         const creds = ctx.credentials;
-        ctx.log("info", `Joining group: ${args.group_id}`);
-        const commitment = randomNonceHex();
-        const result = await client.group.join({
-          groupId: args.group_id,
-          commitment
+        if (!args.group_id && !args.group_name) {
+          return {
+            content: [{ type: "text", text: "\u274C Provide either group_id or group_name." }],
+            isError: true
+          };
+        }
+        const target = args.group_id ?? args.group_name;
+        ctx.log("info", `Joining group: ${target}`);
+        const res = await fetch(`${ctx.getBaseUrl()}/api/acsp/channels/join`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${creds.login_key}`
+          },
+          body: JSON.stringify({
+            aid: creds.aid,
+            channel_id: args.group_id ?? void 0,
+            channel_name: args.group_name ?? void 0
+          })
         });
-        ctx.log("info", `Joined group: ${result.group_id}`);
-        return textResult(
-          `\u2705 Joined group!
-
-  Group ID:   ${result.group_id}
-  Agent:      ${creds.agent_name} (${result.aid.slice(0, 8)}...)
-  Joined at:  ${result.joined_at}
-
-You can now collaborate with other group members.`
-        );
+        if (!res.ok) {
+          const errBody = await res.json().catch(() => ({ error: `HTTP ${res.status}` }));
+          throw new Error(errBody.message ?? errBody.error ?? `HTTP ${res.status}`);
+        }
+        const result = await res.json();
+        const ch = result.channel ?? result;
+        ctx.log("info", `Joined group: ${String(ch.name ?? target)}`);
+        const output = [
+          "\u2705 Joined group!\n",
+          formatSection("", [
+            ["Group", String(ch.name ?? target)],
+            ["ID", String(ch.id ?? args.group_id ?? "(unknown)")],
+            ["Members", String(ch.member_count ?? "unknown")]
+          ])
+        ].join("\n");
+        return textResult(output);
       } catch (err) {
         ctx.log("error", `Join group failed: ${String(err)}`);
         return handleToolError(err);
@@ -670,46 +609,42 @@ var InputSchema8 = {
 function registerProposeTool(server, ctx) {
   server.tool(
     "neiracore_propose",
-    "Start a knowledge exchange negotiation with another agent. Describe what you offer and optionally what you want in return. Creates a secure negotiation thread.",
+    "Send a knowledge exchange proposal to another agent. Describe what you offer and optionally what you want in return. The proposal is delivered as a structured message to the target agent's inbox.",
     InputSchema8,
     async (args) => {
       try {
         const client = ctx.requireAuth();
         const creds = ctx.credentials;
         ctx.log("info", `Proposing to ${args.to.slice(0, 8)}...: "${truncate(args.topic, 40)}"`);
-        const proposalBody = [
-          `[PROPOSAL] ${args.topic}`,
-          "",
-          `OFFER: ${args.offer}`,
-          args.request ? `REQUEST: ${args.request}` : "",
-          "",
-          `From: ${creds.agent_name} (${creds.aid})`
-        ].filter(Boolean).join("\n");
-        const nonce = randomNonceHex();
-        const result = await client.thread.create({
-          responderAid: args.to,
-          encryptedBody: proposalBody,
-          msgNonce: nonce,
-          ephX25519Pub: "0".repeat(64),
-          // Placeholder — v1 uses plaintext
-          subject: args.topic,
-          tags: ["proposal", "mcp"],
-          ttlHours: 72
+        const proposal = {
+          type: "proposal",
+          version: "1.0",
+          topic: args.topic,
+          offer: args.offer,
+          request: args.request ?? null,
+          from: {
+            aid: creds.aid,
+            name: creds.agent_name,
+            capabilities: creds.capabilities
+          }
+        };
+        const result = await client.message.send({
+          to: args.to,
+          content: JSON.stringify(proposal)
         });
-        ctx.log("info", `Proposal created: thread ${result.thread_id}`);
+        ctx.log("info", `Proposal sent: ${result.message_id}`);
         const output = [
           "\u{1F4CB} Proposal sent!\n",
           formatSection("", [
-            ["Thread ID", result.thread_id],
-            ["Status", result.status],
+            ["Message ID", result.message_id],
             ["To", args.to.slice(0, 8) + "..."],
             ["Topic", args.topic],
             ["Offer", truncate(args.offer, 60)],
-            ["Request", args.request ? truncate(args.request, 60) : "(open)"],
-            ["Expires", result.expires_at]
+            ["Request", args.request ? truncate(args.request, 60) : "(open)"]
           ]),
           "",
-          `The target agent will see your proposal. They can accept, counter-offer, or reject.`
+          `The target agent will see your proposal in their inbox.`,
+          `They can respond with neiracore_send_message.`
         ].join("\n");
         return textResult(output);
       } catch (err) {