pairai 0.2.0 → 0.2.2

package/bin.js

@@ -9,7 +9,7 @@ const require = createRequire(import.meta.url);
 
 // Resolve tsx from this package's node_modules as a file:// URL
 const tsxPath = pathToFileURL(require.resolve("tsx")).href;
-const script = join(__dirname, "pairai-channel.ts");
+const script = join(__dirname, "pairai.ts");
 
 const result = spawnSync(process.execPath, ["--import", tsxPath, script, ...process.argv.slice(2)], {
   stdio: "inherit",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pairai",
-  "version": "0.2.0",
-  "description": "Connect AI agents to collaborate via the pairai hub — channel server for Claude Code",
+  "version": "0.2.2",
+  "description": "pairai CLI — connect AI agents to collaborate via the pairai hub",
   "type": "module",
   "license": "MIT",
   "homepage": "https://pairai.pro",
@@ -23,7 +23,7 @@
   },
   "files": [
     "bin.js",
-    "pairai-channel.ts",
+    "pairai.ts",
     "README.md"
   ],
   "dependencies": {

package/{pairai-channel.ts → pairai.ts}

@@ -1,14 +1,15 @@
 #!/usr/bin/env npx tsx
 /**
- * pairai — connect AI agents via the pairai hub
+ * pairai CLI — connect AI agents via the pairai hub
  *
- * Setup:
- *   npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global]
- *
- * Runtime (spawned by Claude Code / Gemini CLI, not called manually):
+ * Commands:
+ *   npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global] [--force]
  *   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
+ *   npx pairai upgrade     — update to latest version (preserves keys and config)
+ *   npx pairai version     — show current version
+ *
+ * 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 {
@@ -18,11 +19,67 @@ import {
 } from "node:crypto";
 import { writeFileSync, mkdirSync, readFileSync, statSync, existsSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const PKG = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf-8"));
+const VERSION: string = PKG.version;
 
 const args = process.argv.slice(2);
 const command = args[0];
 
+// ── Version ─────────────────────────────────────────────────────────────────
+
+if (command === "version" || args.includes("--version") || args.includes("-v")) {
+  console.log(`pairai v${VERSION}`);
+  process.exit(0);
+}
+
+// ── Upgrade ─────────────────────────────────────────────────────────────────
+
+if (command === "upgrade") {
+  console.log(`\n  Current version: v${VERSION}`);
+  console.log(`  Checking for updates...\n`);
+  try {
+    const latest = execSync("npm view pairai version", { encoding: "utf-8" }).trim();
+    if (latest === VERSION) {
+      console.log(`  Already on latest version (v${VERSION}).\n`);
+    } else {
+      console.log(`  New version available: v${latest}`);
+      console.log(`  Upgrading...\n`);
+      execSync("npm install -g pairai@latest", { stdio: "inherit" });
+      console.log(`\n  Upgraded to v${latest}.`);
+      console.log(`  Keys and config are unchanged.\n`);
+
+      // Update pinned version in config files
+      const configPaths = [
+        join(process.cwd(), ".mcp.json"),
+        join(process.cwd(), ".gemini", "settings.json"),
+        join(homedir(), ".gemini", "settings.json"),
+      ];
+      for (const p of configPaths) {
+        try {
+          if (!existsSync(p)) continue;
+          const content = readFileSync(p, "utf-8");
+          const updated = content.replace(
+            new RegExp(`pairai@${VERSION.replace(/\./g, "\\.")}`, "g"),
+            `pairai@${latest}`,
+          );
+          if (updated !== content) {
+            writeFileSync(p, updated);
+            console.log(`  Updated version in ${p}`);
+          }
+        } catch {}
+      }
+    }
+  } catch (err) {
+    console.error(`  Upgrade failed: ${(err as Error).message}`);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
 function detectProvider(): "claude" | "gemini" {
   if (process.env.GEMINI_CLI) return "gemini";
   try { if (statSync(".gemini").isDirectory()) return "gemini"; } catch {}
@@ -36,16 +93,41 @@ if (command === "setup") {
   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 providerArg = providerIdx !== -1 ? rest.splice(providerIdx, 2)[1] : undefined;
+  if (providerArg && providerArg !== "claude" && providerArg !== "gemini") {
+    console.error(`  Unknown provider "${providerArg}". Must be "claude" or "gemini".`);
+    process.exit(1);
+  }
+  const provider = providerArg ?? detectProvider();
   const globalIdx = rest.indexOf("--global");
   const useGlobal = globalIdx !== -1 ? (rest.splice(globalIdx, 1), true) : false;
   const agentName = rest.find((a) => !a.startsWith("--"));
 
+  const forceIdx = rest.indexOf("--force");
+  const useForce = forceIdx !== -1 ? (rest.splice(forceIdx, 1), true) : false;
   if (!agentName) {
-    console.error('Usage: npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global]');
+    console.error('Usage: npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global] [--force]');
     process.exit(1);
   }
 
+  // Check for existing config to avoid accidental overwrites
+  const existingConfigPath = provider === "gemini"
+    ? join(useGlobal ? join(homedir(), ".gemini") : join(process.cwd(), ".gemini"), "settings.json")
+    : join(process.cwd(), ".mcp.json");
+  const mcpKey = provider === "gemini" ? "pairai" : "pairai-channel";
+  if (!useForce && existsSync(existingConfigPath)) {
+    try {
+      const existing = JSON.parse(readFileSync(existingConfigPath, "utf-8"));
+      const servers = existing.mcpServers ?? {};
+      if (servers[mcpKey]) {
+        console.error(`\n  pairai is already configured in ${existingConfigPath}`);
+        console.error(`  Running setup again would overwrite the existing API key and config.`);
+        console.error(`\n  To force a fresh setup, run: npx pairai setup "${agentName}" --force\n`);
+        process.exit(1);
+      }
+    } catch {}
+  }
+
   console.log(`\n  Registering "${agentName}" on ${hubUrl}...\n`);
 
   console.log("  Generating RSA-4096 keypair...");
@@ -75,7 +157,24 @@ if (command === "setup") {
   mkdirSync(keyDir, { recursive: true });
   const keyPath = join(keyDir, `${id}.pem`);
   writeFileSync(keyPath, privateKey, { mode: 0o600 });
-  console.log(`  Private key: ${keyPath}\n`);
+  console.log(`  Private key: ${keyPath}`);
+  const lines = [
+    "BACK UP YOUR PRIVATE KEY",
+    "",
+    keyPath,
+    "",
+    "This key is stored only on your machine.",
+    "The hub never sees it. If lost, you must re-register",
+    "and re-pair — all encrypted history becomes unreadable.",
+    "",
+    "Copy it to a password manager or secure backup now.",
+  ];
+  const w = Math.max(...lines.map((l) => l.length)) + 2;
+  console.log();
+  console.log(`  ┌${"─".repeat(w + 2)}┐`);
+  for (const l of lines) console.log(`  │  ${l.padEnd(w)}│`);
+  console.log(`  └${"─".repeat(w + 2)}┘`);
+  console.log();
 
   if (provider === "gemini") {
     // Write .gemini/settings.json (project or global)
@@ -96,7 +195,7 @@ if (command === "setup") {
     if (!existing.mcpServers) existing.mcpServers = {};
     existing.mcpServers.pairai = {
       command: "npx",
-      args: ["pairai", "serve"],
+      args: [`pairai@${VERSION}`, "serve"],
       env: {
         PAIRAI_HUB_URL: hubUrl,
         PAIRAI_AGENT_CRED: apiKey,
@@ -105,19 +204,19 @@ if (command === "setup") {
     };
 
     writeFileSync(settingsPath, JSON.stringify(existing, null, 2) + "\n");
-    console.log(`  Config written to ${settingsPath}\n`);
-    console.log(`  Done! Next steps:`);
+    console.log(`  Config: ${settingsPath}`);
+    console.log();
+    console.log(`  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`);
+    console.log(`    3. Share the code with another agent to connect`);
   } else {
     // Write .mcp.json for Claude Code
     const mcpConfig = {
       mcpServers: {
         "pairai-channel": {
           command: "npx",
-          args: ["pairai", "serve"],
+          args: [`pairai@${VERSION}`, "serve"],
           env: { PAIRAI_AGENT_CRED: apiKey, PAIRAI_HUB_URL: hubUrl, PAIRAI_KEY_FILE: keyPath },
         },
       },
@@ -126,20 +225,27 @@ if (command === "setup") {
     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`);
+    console.log(`  Config: ${mcpJsonPath}`);
+    console.log();
+    console.log(`  Next steps:`);
+    console.log(`    1. Start Claude Code in this directory`);
+    console.log(`    2. Ask Claude: "Generate a pairing code"`);
+    console.log(`    3. Share the code with another agent to connect`);
   }
 
+  console.log();
   process.exit(0);
 }
 
 // ── Serve: stdio MCP channel server ──────────────────────────────────────────
 
 if (command !== "serve") {
+  console.error(`pairai v${VERSION}\n`);
   console.error("Usage:");
-  console.error('  npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global]');
+  console.error('  npx pairai setup "Agent Name" [--hub URL] [--provider claude|gemini] [--global] [--force]');
   console.error("  npx pairai serve [--provider claude|gemini]");
+  console.error("  npx pairai upgrade        — update to latest version");
+  console.error("  npx pairai version        — show current version");
   process.exit(1);
 }
 
@@ -149,7 +255,12 @@ const { ListToolsRequestSchema, CallToolRequestSchema } = await import("@modelco
 
 const serveArgs = args.slice(1);
 const serveProviderIdx = serveArgs.indexOf("--provider");
-const serveProvider = serveProviderIdx !== -1 ? serveArgs[serveProviderIdx + 1] : "claude";
+const serveProviderArg = serveProviderIdx !== -1 ? serveArgs[serveProviderIdx + 1] : undefined;
+if (serveProviderArg && serveProviderArg !== "claude" && serveProviderArg !== "gemini") {
+  console.error(`  Unknown provider "${serveProviderArg}". Must be "claude" or "gemini".`);
+  process.exit(1);
+}
+const serveProvider = serveProviderArg ?? "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;
@@ -271,7 +382,8 @@ function localDecrypt(
 // ── MCP Server ───────────────────────────────────────────────────────────────
 
 const instructions = [
-  'You are connected to the pairai agent hub. Messages from other AI agents arrive as notifications.',
+  "You are connected to the pairai agent hub. Messages from other AI agents arrive as notifications.",
+  "The channel server polls for updates automatically — you don't need to poll manually.",
   "",
   "Notification attributes:",
   "  task_id     — the task this message belongs to",
@@ -279,10 +391,11 @@ const instructions = [
   "  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.",
+  "When you receive a notification:",
+  "  - 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 update_status with 'input-required' and send a message.",
 ].join("\n");
 
 const capabilities = serveProvider === "claude"
@@ -423,10 +536,38 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
   }
 
   if (name === "pairai_create_task") {
+    const { target_agent_id, title, description } = args as {
+      target_agent_id: string; title: string; description?: string;
+    };
+
+    // Auto-encrypt when both agents have keys and we have a private key
+    await loadPublicKeys();
+    const otherPub = pubKeyCache.get(target_agent_id);
+    if (PRIVATE_KEY && otherPub && myPublicKey) {
+      const { nanoid } = await import("nanoid");
+      const taskId = nanoid();
+      const payload = JSON.stringify({ title, description: description ?? "" });
+      const { ciphertext, signature, encryptedKeys } = localEncrypt(payload, taskId, {
+        [myAgentId]: myPublicKey,
+        [target_agent_id]: otherPub,
+      });
+      await hubPost("/tasks", {
+        id: taskId,
+        targetAgentId: target_agent_id,
+        title: "Encrypted Task",
+        description: ciphertext,
+        encrypted: true,
+        descriptionKeys: encryptedKeys,
+        senderSignature: signature,
+      });
+      return { content: [{ type: "text" as const, text: `Task created (encrypted). ID: ${taskId}` }] };
+    }
+
+    // Fallback: plaintext (no keys available)
     const data = await hubPost("/tasks", {
-      targetAgentId: args.target_agent_id,
-      title: args.title,
-      description: args.description,
+      targetAgentId: target_agent_id,
+      title,
+      description,
     });
     return { content: [{ type: "text" as const, text: JSON.stringify(data, null, 2) }] };
   }