pairai 0.2.3 → 0.2.5

package/lib.ts

@@ -0,0 +1,80 @@
+/**
+ * Pure/testable functions extracted from pairai CLI.
+ * Imported by both pairai.ts and unit tests.
+ */
+import { existsSync, readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+
+/**
+ * Validate the --provider flag value.
+ * Returns the validated provider or throws with a message.
+ */
+export function validateProvider(value: string): "claude" | "gemini" {
+  if (value !== "claude" && value !== "gemini") {
+    throw new Error(`Unknown provider "${value}". Must be "claude" or "gemini".`);
+  }
+  return value;
+}
+
+/**
+ * Auto-detect provider based on environment and filesystem.
+ */
+export function detectProvider(): "claude" | "gemini" {
+  if (process.env.GEMINI_CLI) return "gemini";
+  try { if (statSync(".gemini").isDirectory()) return "gemini"; } catch {}
+  return "claude";
+}
+
+/**
+ * Replace any `pairai@x.y.z` version pin in a config string with a new version.
+ */
+export function updateVersionInConfig(content: string, latest: string): string {
+  return content.replace(/pairai@\d+\.\d+\.\d+/g, `pairai@${latest}`);
+}
+
+/**
+ * Check if pairai is already configured in a config file.
+ * Returns the path if config exists with a pairai entry, null otherwise.
+ */
+export function checkExistingConfig(
+  provider: "claude" | "gemini",
+  cwd: string,
+  homeDir: string,
+  useGlobal: boolean,
+): string | null {
+  const configPath = provider === "gemini"
+    ? join(useGlobal ? join(homeDir, ".gemini") : join(cwd, ".gemini"), "settings.json")
+    : join(cwd, ".mcp.json");
+  const mcpKey = provider === "gemini" ? "pairai" : "pairai-channel";
+
+  if (!existsSync(configPath)) return null;
+  try {
+    const existing = JSON.parse(readFileSync(configPath, "utf-8"));
+    const servers = existing.mcpServers ?? {};
+    if (servers[mcpKey]) return configPath;
+  } catch {}
+  return null;
+}
+
+/**
+ * Build the dynamic-width box for the private key backup warning.
+ */
+export function formatKeyBackupBox(keyPath: string): string[] {
+  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 \u2014 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;
+  const out: string[] = [];
+  out.push(`  \u250C${"\u2500".repeat(w + 2)}\u2510`);
+  for (const l of lines) out.push(`  \u2502  ${l.padEnd(w)}\u2502`);
+  out.push(`  \u2514${"\u2500".repeat(w + 2)}\u2518`);
+  return out;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pairai",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "pairai CLI — connect AI agents to collaborate via the pairai hub",
   "type": "module",
   "license": "MIT",
@@ -24,6 +24,7 @@
   "files": [
     "bin.js",
     "pairai.ts",
+    "lib.ts",
     "README.md"
   ],
   "dependencies": {

package/pairai.ts

@@ -21,6 +21,7 @@ import { writeFileSync, mkdirSync, readFileSync, statSync, existsSync } from "no
 import { homedir } from "node:os";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
+import { validateProvider, detectProvider, updateVersionInConfig, checkExistingConfig, formatKeyBackupBox } from "./lib.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PKG = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf-8"));
@@ -62,10 +63,7 @@ if (command === "upgrade") {
         try {
           if (!existsSync(p)) continue;
           const content = readFileSync(p, "utf-8");
-          const updated = content.replace(
-            new RegExp(`pairai@${VERSION.replace(/\./g, "\\.")}`, "g"),
-            `pairai@${latest}`,
-          );
+          const updated = updateVersionInConfig(content, latest);
           if (updated !== content) {
             writeFileSync(p, updated);
             console.log(`  Updated version in ${p}`);
@@ -80,11 +78,8 @@ if (command === "upgrade") {
   process.exit(0);
 }
 
-function detectProvider(): "claude" | "gemini" {
-  if (process.env.GEMINI_CLI) return "gemini";
-  try { if (statSync(".gemini").isDirectory()) return "gemini"; } catch {}
-  return "claude";
-}
+// detectProvider, validateProvider, updateVersionInConfig, checkExistingConfig,
+// formatKeyBackupBox are imported from ./lib.js
 
 // ── Setup: register + configure ──────────────────────────────────────────────
 
@@ -94,11 +89,13 @@ if (command === "setup") {
   const hubUrl = hubIdx !== -1 ? rest.splice(hubIdx, 2)[1] : "https://pairai.pro";
   const providerIdx = rest.indexOf("--provider");
   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);
+  if (providerArg) {
+    try { validateProvider(providerArg); } catch (e) {
+      console.error(`  ${(e as Error).message}`);
+      process.exit(1);
+    }
   }
-  const provider = providerArg ?? detectProvider();
+  const provider = (providerArg 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("--"));
@@ -111,21 +108,14 @@ if (command === "setup") {
   }
 
   // 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 {}
+  if (!useForce) {
+    const existingConfigPath = checkExistingConfig(provider, process.cwd(), homedir(), useGlobal);
+    if (existingConfigPath) {
+      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);
+    }
   }
 
   console.log(`\n  Registering "${agentName}" on ${hubUrl}...\n`);
@@ -158,22 +148,8 @@ if (command === "setup") {
   const keyPath = join(keyDir, `${id}.pem`);
   writeFileSync(keyPath, privateKey, { mode: 0o600 });
   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)}┘`);
+  for (const line of formatKeyBackupBox(keyPath)) console.log(line);
   console.log();
 
   if (provider === "gemini") {
@@ -256,11 +232,13 @@ const { ListToolsRequestSchema, CallToolRequestSchema } = await import("@modelco
 const serveArgs = args.slice(1);
 const serveProviderIdx = serveArgs.indexOf("--provider");
 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);
+if (serveProviderArg) {
+  try { validateProvider(serveProviderArg); } catch (e) {
+    console.error(`  ${(e as Error).message}`);
+    process.exit(1);
+  }
 }
-const serveProvider = serveProviderArg ?? "claude";
+const serveProvider = (serveProviderArg as "claude" | "gemini") ?? "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;
@@ -671,14 +649,45 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
   }
 
   if (name === "pairai_list_tasks") {
-    const data = (await hubGet("/tasks")) as Array<{ status: string }>;
+    await loadPublicKeys();
+    const data = (await hubGet("/tasks")) as Array<{
+      id: string; status: string; title: string; encrypted?: boolean;
+      description?: string; descriptionKeys?: any; senderSignature?: string; initiatorAgentId?: string;
+    }>;
     const filtered = args.status ? data.filter((t) => t.status === args.status) : data;
-    return { content: [{ type: "text" as const, text: JSON.stringify(filtered, null, 2) }] };
+    const decrypted = filtered.map((t) => {
+      if (t.encrypted) {
+        const desc = decryptTaskDescription(t, t.id);
+        return { ...t, title: desc.split("\n")[0] || t.title, description: desc };
+      }
+      return t;
+    });
+    return { content: [{ type: "text" as const, text: JSON.stringify(decrypted, null, 2) }] };
   }
 
   if (name === "pairai_get_task") {
-    const data = await hubGet(`/tasks/${args.task_id}`);
-    return { content: [{ type: "text" as const, text: JSON.stringify(data, null, 2) }] };
+    await loadPublicKeys();
+    const data = (await hubGet(`/tasks/${args.task_id}`)) as {
+      id: string; encrypted?: boolean; description?: string; descriptionKeys?: any;
+      senderSignature?: string; initiatorAgentId?: string;
+      [key: string]: unknown;
+    };
+    const msgs = (await hubGet(`/tasks/${args.task_id}/messages`)) as Array<{
+      id: string; content: string; contentType: string; senderAgentId: string;
+      encryptedKeys?: any; senderSignature?: string;
+    }>;
+    if (data.encrypted) {
+      const desc = decryptTaskDescription(data, data.id);
+      data.description = desc;
+    }
+    const decryptedMsgs = msgs.map((m) => {
+      if (data.encrypted) {
+        const d = decryptMessage(m, data.id);
+        return { ...m, content: d.content, contentType: d.contentType };
+      }
+      return m;
+    });
+    return { content: [{ type: "text" as const, text: JSON.stringify({ ...data, messages: decryptedMsgs }, null, 2) }] };
   }
 
   if (name === "pairai_upload_file") {
@@ -743,7 +752,7 @@ function decryptMessage(
   }
   try {
     const keys = typeof msg.encryptedKeys === "string" ? JSON.parse(msg.encryptedKeys) : msg.encryptedKeys;
-    const senderPub = pubKeyCache.get(msg.senderAgentId);
+    const senderPub = msg.senderAgentId === myAgentId ? myPublicKey : pubKeyCache.get(msg.senderAgentId);
     const myKey = keys[myAgentId];
     if (senderPub && myKey) {
       const plain = localDecrypt(msg.content, msg.senderSignature, taskId, senderPub, myKey);
@@ -766,7 +775,7 @@ function decryptTaskDescription(
   }
   try {
     const keys = typeof full.descriptionKeys === "string" ? JSON.parse(full.descriptionKeys) : full.descriptionKeys;
-    const senderPub = full.initiatorAgentId ? pubKeyCache.get(full.initiatorAgentId) : undefined;
+    const senderPub = full.initiatorAgentId === myAgentId ? myPublicKey : (full.initiatorAgentId ? pubKeyCache.get(full.initiatorAgentId) : undefined);
     const myKey = keys[myAgentId];
     if (senderPub && myKey) {
       const plain = localDecrypt(full.description, full.senderSignature, taskId, senderPub, myKey);