pairai 0.1.2 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pairai",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Connect AI agents to collaborate via the pairai hub — channel server for Claude Code",
   "type": "module",
   "license": "MIT",

package/pairai-channel.ts

@@ -3,12 +3,12 @@
  * pairai — connect AI agents via the pairai hub
  *
  * Setup:
- *   npx pairai setup "My Agent Name"
- *   npx pairai setup "My Agent Name" --hub https://myhub.example.com
+ *   npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global]
  *
- * Runtime (spawned by Claude Code, not called manually):
- *   npx pairai serve
- *   Env: PAIRAI_URL, PAIRAI_API_KEY, PAIRAI_POLL_MS, PAIRAI_PRIVATE_KEY_PATH
+ * Runtime (spawned by Claude Code / Gemini CLI, not called manually):
+ *   npx pairai serve [--provider claude|gemini]
+ *   Env: PAIRAI_HUB_URL, PAIRAI_AGENT_CRED, PAIRAI_KEY_FILE, PAIRAI_POLL_MS
+ *   Legacy: PAIRAI_URL, PAIRAI_API_KEY, PAIRAI_PRIVATE_KEY_PATH
  */
 import { execSync } from "node:child_process";
 import {
@@ -16,23 +16,33 @@ import {
   publicEncrypt, privateDecrypt, sign, verify,
   randomBytes, createCipheriv, createDecipheriv, constants,
 } from "node:crypto";
-import { writeFileSync, mkdirSync, readFileSync } from "node:fs";
+import { writeFileSync, mkdirSync, readFileSync, statSync, existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
 const args = process.argv.slice(2);
 const command = args[0];
 
-// ── Setup: register + configure Claude Code ──────────────────────────────────
+function detectProvider(): "claude" | "gemini" {
+  if (process.env.GEMINI_CLI) return "gemini";
+  try { if (statSync(".gemini").isDirectory()) return "gemini"; } catch {}
+  return "claude";
+}
+
+// ── Setup: register + configure ──────────────────────────────────────────────
 
 if (command === "setup") {
   const rest = args.slice(1);
   const hubIdx = rest.indexOf("--hub");
   const hubUrl = hubIdx !== -1 ? rest.splice(hubIdx, 2)[1] : "https://pairai.pro";
+  const providerIdx = rest.indexOf("--provider");
+  const provider = providerIdx !== -1 ? rest.splice(providerIdx, 2)[1] as "claude" | "gemini" : detectProvider();
+  const globalIdx = rest.indexOf("--global");
+  const useGlobal = globalIdx !== -1 ? (rest.splice(globalIdx, 1), true) : false;
   const agentName = rest.find((a) => !a.startsWith("--"));
 
   if (!agentName) {
-    console.error('Usage: npx pairai setup "Agent Name" [--hub URL]');
+    console.error('Usage: npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global]');
     process.exit(1);
   }
 
@@ -67,23 +77,59 @@ if (command === "setup") {
   writeFileSync(keyPath, privateKey, { mode: 0o600 });
   console.log(`  Private key: ${keyPath}\n`);
 
-  // Write .mcp.json directly (claude mcp add --env puts env vars in args, which breaks)
-  const mcpConfig = {
-    mcpServers: {
-      "pairai-channel": {
-        command: "npx",
-        args: ["pairai", "serve"],
-        env: { PAIRAI_API_KEY: apiKey, PAIRAI_URL: hubUrl, PAIRAI_PRIVATE_KEY_PATH: keyPath },
+  if (provider === "gemini") {
+    // Write .gemini/settings.json (project or global)
+    const geminiDir = useGlobal
+      ? join(homedir(), ".gemini")
+      : join(process.cwd(), ".gemini");
+    mkdirSync(geminiDir, { recursive: true });
+    const settingsPath = join(geminiDir, "settings.json");
+
+    // Merge with existing settings
+    let existing: any = {};
+    try {
+      if (existsSync(settingsPath)) {
+        existing = JSON.parse(readFileSync(settingsPath, "utf-8"));
+      }
+    } catch {}
+
+    if (!existing.mcpServers) existing.mcpServers = {};
+    existing.mcpServers.pairai = {
+      command: "npx",
+      args: ["pairai", "serve"],
+      env: {
+        PAIRAI_HUB_URL: hubUrl,
+        PAIRAI_AGENT_CRED: apiKey,
+        PAIRAI_KEY_FILE: keyPath,
       },
-    },
-  };
+    };
 
-  const cwd = process.cwd();
-  const mcpJsonPath = join(cwd, ".mcp.json");
-  writeFileSync(mcpJsonPath, JSON.stringify(mcpConfig, null, 2) + "\n");
-  console.log(`  MCP config: ${mcpJsonPath}\n`);
-  console.log(`  Done! Start Claude Code with:\n`);
-  console.log(`    claude --dangerously-load-development-channels server:pairai-channel\n`);
+    writeFileSync(settingsPath, JSON.stringify(existing, null, 2) + "\n");
+    console.log(`  Config written to ${settingsPath}\n`);
+    console.log(`  Done! Next steps:`);
+    console.log(`    1. Restart Gemini CLI to activate the pairai MCP server`);
+    console.log(`    2. Ask Gemini: "Generate a pairing code"`);
+    console.log(`    3. Share the code with another agent to connect\n`);
+    console.log(`  E2E encryption is enabled. Back up ${keyPath} — it cannot be recovered.\n`);
+  } else {
+    // Write .mcp.json for Claude Code
+    const mcpConfig = {
+      mcpServers: {
+        "pairai-channel": {
+          command: "npx",
+          args: ["pairai", "serve"],
+          env: { PAIRAI_AGENT_CRED: apiKey, PAIRAI_HUB_URL: hubUrl, PAIRAI_KEY_FILE: keyPath },
+        },
+      },
+    };
+
+    const cwd = process.cwd();
+    const mcpJsonPath = join(cwd, ".mcp.json");
+    writeFileSync(mcpJsonPath, JSON.stringify(mcpConfig, null, 2) + "\n");
+    console.log(`  MCP config: ${mcpJsonPath}\n`);
+    console.log(`  Done! Start Claude Code with:\n`);
+    console.log(`    claude --dangerously-load-development-channels server:pairai-channel\n`);
+  }
 
   process.exit(0);
 }
@@ -92,8 +138,8 @@ if (command === "setup") {
 
 if (command !== "serve") {
   console.error("Usage:");
-  console.error('  npx pairai setup "Agent Name"   — register and configure');
-  console.error("  npx pairai serve                — run channel server (used by Claude Code)");
+  console.error('  npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global]');
+  console.error("  npx pairai serve [--provider claude|gemini]");
   process.exit(1);
 }
 
@@ -101,14 +147,18 @@ const { Server } = await import("@modelcontextprotocol/sdk/server/index.js");
 const { StdioServerTransport } = await import("@modelcontextprotocol/sdk/server/stdio.js");
 const { ListToolsRequestSchema, CallToolRequestSchema } = await import("@modelcontextprotocol/sdk/types.js");
 
-const HUB_URL = process.env.PAIRAI_URL ?? "https://pairai.pro";
-const API_KEY = process.env.PAIRAI_API_KEY;
+const serveArgs = args.slice(1);
+const serveProviderIdx = serveArgs.indexOf("--provider");
+const serveProvider = serveProviderIdx !== -1 ? serveArgs[serveProviderIdx + 1] : "claude";
+
+const HUB_URL = process.env.PAIRAI_HUB_URL ?? process.env.PAIRAI_URL ?? "https://pairai.pro";
+const API_KEY = process.env.PAIRAI_AGENT_CRED ?? process.env.PAIRAI_API_KEY;
 const POLL_MS = Number(process.env.PAIRAI_POLL_MS ?? "5000");
-const PRIVATE_KEY_PATH = process.env.PAIRAI_PRIVATE_KEY_PATH;
+const PRIVATE_KEY_PATH = process.env.PAIRAI_KEY_FILE ?? process.env.PAIRAI_PRIVATE_KEY_PATH;
 const PRIVATE_KEY = PRIVATE_KEY_PATH ? readFileSync(PRIVATE_KEY_PATH, "utf-8") : null;
 
 if (!API_KEY) {
-  console.error('PAIRAI_API_KEY not set. Run "npx pairai setup" first.');
+  console.error('PAIRAI_AGENT_CRED not set. Run "npx pairai setup" first.');
   process.exit(1);
 }
 
@@ -220,28 +270,28 @@ function localDecrypt(
 
 // ── MCP Server ───────────────────────────────────────────────────────────────
 
+const instructions = [
+  'You are connected to the pairai agent hub. Messages from other AI agents arrive as notifications.',
+  "",
+  "Notification attributes:",
+  "  task_id     — the task this message belongs to",
+  "  task_title  — short description of the task",
+  "  from_agent  — name of the agent who sent it",
+  "  event_type  — 'new_task' or 'new_message'",
+  "",
+  "To respond, use the reply tool with the task_id and your message.",
+  "To accept a task, use the update_status tool with status 'working'.",
+  "To finish a task, use the update_status tool with status 'completed'.",
+  "To ask for more info, use the update_status tool with 'input-required' and send a message.",
+].join("\n");
+
+const capabilities = serveProvider === "claude"
+  ? { experimental: { "claude/channel": {} }, tools: {} }
+  : { tools: {} };
+
 const mcp = new Server(
   { name: "pairai", version: "1.0.0" },
-  {
-    capabilities: {
-      experimental: { "claude/channel": {} },
-      tools: {},
-    },
-    instructions: [
-      'You are connected to the pairai agent hub. Messages from other AI agents arrive as <channel source="pairai" ...> notifications.',
-      "",
-      "Notification attributes:",
-      "  task_id     — the task this message belongs to",
-      "  task_title  — short description of the task",
-      "  from_agent  — name of the agent who sent it",
-      "  event_type  — 'new_task' or 'new_message'",
-      "",
-      "To respond, use the pairai_reply tool with the task_id and your message.",
-      "To accept a task, use pairai_update_status with status 'working'.",
-      "To finish a task, use pairai_update_status with status 'completed'.",
-      "To ask for more info, use pairai_update_status with 'input-required' and send a message.",
-    ].join("\n"),
-  }
+  { capabilities, instructions }
 );
 
 // ── Tools ────────────────────────────────────────────────────────────────────
@@ -334,6 +384,7 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
     const taskData = (await hubGet(`/tasks/${task_id}`)) as any;
     if (taskData.encrypted) {
       // STRICT: never fall back to plaintext for encrypted tasks
+      await loadPublicKeys(); // refresh in case keys were added since last poll
       const otherId =
         taskData.initiatorAgentId === myAgentId ? taskData.targetAgentId : taskData.initiatorAgentId;
       const otherPub = pubKeyCache.get(otherId);
@@ -400,6 +451,8 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
       title: string;
       description?: string;
     };
+    // Refresh keys in case a new connection was established
+    await loadPublicKeys();
     const otherPub = pubKeyCache.get(target_agent_id);
     if (!otherPub || !myPublicKey)
       return {