@paigy/mcp 0.35.0 → 0.37.0

package/dist/listen.js

@@ -1,12 +1,18 @@
 #!/usr/bin/env node
+import {
+  answerText
+} from "./chunk-UG2FARVV.js";
 import {
   WAKE_EVENT,
   wakeChannel
-} from "./chunk-YOGAG4YY.js";
+} from "./chunk-242XN7FD.js";
 import {
-  checkReplies2,
-  registerDelivery
-} from "./chunk-U6SLIORK.js";
+  ackReply,
+  authToken,
+  decodeReply,
+  registerDelivery,
+  sweepLeased
+} from "./chunk-VXHTA4PB.js";
 
 // src/listen.ts
 import { createClient } from "@supabase/supabase-js";
@@ -113,30 +119,6 @@ function uninstallService() {
 
 // src/listen.ts
 var emit = (obj) => void process.stdout.write(JSON.stringify(obj) + "\n");
-function answerText(answer) {
-  switch (answer.kind) {
-    case "text":
-      return answer.text;
-    case "option":
-      return answer.label ?? answer.optionId;
-    case "multi":
-    case "ranked":
-      return (answer.labels ?? answer.optionIds).join(", ");
-    case "confirm":
-      return answer.approved ? "approved" : "declined";
-    case "clarify":
-      return answer.chunks.join(" ");
-    // A call log — PAIGY_TEXT is what the USER said, so the bot's prompts stay out
-    // (the full exchange is in PAIGY_WORK for a launcher that wants it).
-    case "turns":
-      return answer.turns.map((t) => t.reply).join(" ");
-    // An auto-answer derived from the user's past decisions — reads like a fast human.
-    case "precedent":
-      return answer.answer;
-    case "ignored":
-      return "";
-  }
-}
 function launchEnv(work, reason) {
   const env = { PAIGY_WORK: JSON.stringify(work), PAIGY_EVENT: reason };
   const put = (key, value) => {
@@ -168,15 +150,30 @@ function launchEnv(work, reason) {
   }
   return env;
 }
+var SWEEP_PASSES = 10;
 async function sweep(reason) {
   try {
-    const work = await checkReplies2();
-    emit({ type: "sweep", reason, ...work });
     const cmd = process.env.PAIGY_ON_WAKE;
-    const inbound = work.replies.length > 0 || work.requests.length > 0;
-    const reengage = work.owedCallbacks.length > 0 && (reason === "boot" || reason.includes("callback"));
-    if (cmd && (inbound || reengage)) {
-      spawn(cmd, { shell: true, stdio: "inherit", env: { ...process.env, ...launchEnv(work, reason) } });
+    const token = authToken() ?? "";
+    for (let pass = 0; pass < SWEEP_PASSES; pass += 1) {
+      const raw = await sweepLeased();
+      const leased = raw.replies;
+      const work = {
+        ...raw,
+        work: raw.work ?? [],
+        replies: leased.map((r) => {
+          const { type: _type, ...reply } = decodeReply({ ...r, type: "reply" });
+          return reply;
+        })
+      };
+      emit({ type: "sweep", reason, ...work });
+      const inbound = work.replies.length > 0 || work.requests.length > 0;
+      const reengage = work.owedCallbacks.length > 0 && (reason === "boot" || reason.includes("callback"));
+      if (cmd && (inbound || reengage)) {
+        spawn(cmd, { shell: true, stdio: "inherit", env: { ...process.env, ...launchEnv(work, reason) } });
+      }
+      if (cmd) for (const r of leased) await ackReply({ ...r, type: "reply" }, token);
+      if (leased.length === 0) return;
     }
   } catch (e) {
     emit({ type: "error", reason, message: e.message });

package/dist/onboard.js

@@ -1,29 +1,44 @@
 #!/usr/bin/env node
+import {
+  resolvePairing,
+  startPairing,
+  suggestedAgentName
+} from "./chunk-V66NUNSQ.js";
 import {
   autoConfigureClients,
   claudeInstallHint,
   openBrowser
-} from "./chunk-KNMI3CJ3.js";
+} from "./chunk-PN7FDW26.js";
+import "./chunk-242XN7FD.js";
 import {
   AGENT_NAME,
   TOKEN_PATH,
   hatch,
   listSlots,
-  overrideToken2,
-  pollToken,
+  overrideToken,
   readToken,
-  requestCode,
   saveToken,
   setIdentity,
-  sleep,
   whoAmI
-} from "./chunk-U6SLIORK.js";
+} from "./chunk-VXHTA4PB.js";
 
 // src/onboard.ts
+function reportRegistered() {
+  const registered = autoConfigureClients();
+  if (registered.length) {
+    console.log("Also registered the Paigy MCP server in:");
+    for (const r of registered) console.log(`  - ${r}`);
+    console.log("(Restart those tools to pick it up.)\n");
+  }
+  const hint = claudeInstallHint();
+  if (hint) console.log(`${hint}
+`);
+}
 async function main() {
   console.log(`
 Paigy MCP onboarding (agent: "${AGENT_NAME}")
 `);
+  const chosen = process.env.PAIGY_NAME ?? suggestedAgentName();
   if (readToken()) {
     let who = await whoAmI().catch(() => null);
     if (who) {
@@ -50,68 +65,70 @@ Paigy MCP onboarding (agent: "${AGENT_NAME}")
     console.log("The saved token is no longer valid \u2014 re-pairing.\n");
   }
   if (listSlots().includes("Desktop")) {
-    overrideToken2(readToken("Desktop"));
+    overrideToken(readToken("Desktop"));
     try {
-      const minted = await hatch(process.env.PAIGY_NAME ?? "Agent", null);
+      const minted = await hatch(chosen ?? "Agent", process.env.PAIGY_VOICE ?? null);
       saveToken({ ok: true, access_token: minted.token, name: minted.name, device: null });
-      console.log(`Hatched instantly under this machine's credential \u2014 no code needed.`);
+      console.log("Hatched instantly under this machine's credential \u2014 no code needed.");
       console.log(`  Name   : ${minted.name}
 `);
-      const auto = autoConfigureClients();
-      if (auto.length) {
-        console.log("Also registered the Paigy MCP server in:");
-        for (const r of auto) console.log(`  - ${r}`);
-        console.log("(Restart those tools to pick it up.)\n");
-      }
+      reportRegistered();
       return;
     } catch {
       console.log("(This machine's saved credential didn't work \u2014 falling back to a code.)\n");
     } finally {
-      overrideToken2(null);
+      overrideToken(null);
     }
   }
-  const code = await requestCode();
+  const start = await startPairing(chosen);
   console.log("Open this URL in your browser to approve the connection:\n");
-  console.log(`  ${code.verification_uri_complete}
+  console.log(`  ${start.verificationUri}
 `);
-  console.log(`  (User code: ${code.user_code})
+  console.log(`  (User code: ${start.userCode})
 `);
-  openBrowser(code.verification_uri_complete);
-  const intervalMs = (code.interval ?? 5) * 1e3;
-  const expiresAt = Date.now() + code.expires_in * 1e3;
+  openBrowser(start.verificationUri);
   process.stdout.write("Waiting for approval");
-  while (Date.now() < expiresAt) {
-    await sleep(intervalMs);
-    process.stdout.write(".");
-    try {
-      const token = await pollToken(code.device_code);
-      if (token !== null) {
-        saveToken(token);
+  const deadline = Date.now() + start.expiresIn * 1e3;
+  let shownSas = null;
+  while (Date.now() < deadline) {
+    const outcome = await resolvePairing(start.deviceCode, Math.max(1e3, deadline - Date.now()));
+    if (outcome.kind === "awaiting_confirm") {
+      if (shownSas !== outcome.sas) {
+        shownSas = outcome.sas;
         console.log(`
 
-Paired! Token saved to ${TOKEN_PATH} (mode 0600).`);
-        console.log("Treat this token like a password \u2014 it grants account access. Never log, echo, or commit it.");
-        console.log(`  Name   : ${token.name}`);
-        console.log(`  Device : ${token.device ?? "(none)"}
-`);
-        const registered = autoConfigureClients();
-        if (registered.length) {
-          console.log("Also registered the Paigy MCP server in:");
-          for (const r of registered) console.log(`  - ${r}`);
-          console.log("(Restart those tools to pick it up.)\n");
-        }
-        const hint = claudeInstallHint();
-        if (hint) console.log(`${hint}
+This pairing is end-to-end encrypted. Verify this code matches the one on the phone:
+
+  ${outcome.sas}
 `);
-        return;
+        process.stdout.write("Waiting for the phone to confirm");
       }
-    } catch (err) {
+      process.stdout.write(".");
+      continue;
+    }
+    if (outcome.kind === "pending") {
+      process.stdout.write(".");
+      continue;
+    }
+    if (outcome.kind === "error") {
       console.error(`
 
-${err.message}
+${outcome.message}
 `);
       process.exit(1);
     }
+    console.log(`
+
+Paired! Token saved to ${TOKEN_PATH} (mode 0600).`);
+    console.log("Treat this token like a password \u2014 it grants account access. Never log, echo, or commit it.");
+    console.log(`  Name   : ${outcome.token.name}`);
+    console.log(`  Device : ${outcome.token.device ?? "(none)"}`);
+    if (outcome.sas) {
+      console.log(`  E2EE   : ${outcome.e2ee ? "verified and pinned" : "offered, identity key not yet confirmed on the phone"} (code ${outcome.sas})`);
+    }
+    console.log();
+    reportRegistered();
+    return;
   }
   console.error("\n\nDevice code expired without approval. Please re-run onboarding.\n");
   process.exit(1);

package/dist/slot.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+import {
+  AGENT_NAME
+} from "./chunk-VXHTA4PB.js";
+
+// src/slot.ts
+process.stdout.write(AGENT_NAME);

package/dist/statusline.js

@@ -6,7 +6,7 @@ import {
   BACKEND_URL,
   reach,
   readToken
-} from "./chunk-U6SLIORK.js";
+} from "./chunk-VXHTA4PB.js";
 
 // src/statusline.ts
 import { mkdirSync, readFileSync, realpathSync, writeFileSync } from "fs";

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@paigy/mcp",
-  "version": "0.35.0",
+  "version": "0.37.0",
   "description": "Paigy MCP server — the AI agent harness that calls you. Lets an agent notify a user and await their reply.",
   "license": "MIT",
   "type": "module",
   "bin": {
-    "mcp": "./dist/index.js",
-    "paigy-mcp": "./dist/index.js",
-    "paigy-mcp-onboard": "./dist/onboard.js",
-    "paigy-listen": "./dist/listen.js",
-    "paigy-statusline": "./dist/statusline.js",
-    "paigy-enable-tools": "./dist/enable.js"
+    "mcp": "dist/index.js",
+    "paigy-mcp": "dist/index.js",
+    "paigy-mcp-onboard": "dist/onboard.js",
+    "paigy-listen": "dist/listen.js",
+    "paigy-statusline": "dist/statusline.js",
+    "paigy-enable-tools": "dist/enable.js",
+    "paigy-slot": "dist/slot.js"
   },
   "files": [
     "dist"
@@ -23,6 +24,13 @@
     "url": "git+https://github.com/mauurda/paigy.git",
     "directory": "apps/mcp"
   },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "prepublishOnly": "pnpm --filter @paigy/schema build && pnpm --filter @paigy/crypto build && pnpm --filter @paigy/sdk build && pnpm build"
+  },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.4",
     "@supabase/supabase-js": "^2.47.10",
@@ -32,19 +40,13 @@
     "zod-to-json-schema": "^3.24.1"
   },
   "devDependencies": {
+    "@paigy/crypto": "workspace:*",
+    "@paigy/schema": "workspace:*",
+    "@paigy/sdk": "workspace:*",
     "@types/node": "^22.0.0",
     "@types/qrcode-generator": "^1.0.6",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
-    "vitest": "^2.1.8",
-    "@paigy/crypto": "0.0.0",
-    "@paigy/schema": "0.0.0",
-    "@paigy/sdk": "0.2.0"
-  },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run"
+    "vitest": "^2.1.8"
   }
-}
+}

package/dist/chunk-KNMI3CJ3.js

@@ -1,177 +0,0 @@
-import {
-  AGENT_NAME
-} from "./chunk-U6SLIORK.js";
-
-// src/clients.ts
-import { execFile } from "child_process";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { homedir, platform } from "os";
-import { join, dirname } from "path";
-function openBrowser(url) {
-  const cmd = platform() === "darwin" ? "open" : platform() === "win32" ? "cmd" : "xdg-open";
-  const args = platform() === "win32" ? ["/c", "start", url] : [url];
-  execFile(cmd, args, () => {
-  });
-}
-function withPaigyMcpJson(existing, agent) {
-  let config = {};
-  if (existing) {
-    try {
-      config = JSON.parse(existing);
-    } catch {
-      return null;
-    }
-  }
-  config.mcpServers = {
-    ...config.mcpServers ?? {},
-    paigy: { command: "npx", args: ["-y", "@paigy/mcp@latest"], env: { PAIGY_AGENT: agent } }
-  };
-  return JSON.stringify(config, null, 2);
-}
-function withPaigyMcpToml(existing, agent) {
-  if (existing.includes("[mcp_servers.paigy]")) return null;
-  const entry = [
-    "",
-    "[mcp_servers.paigy]",
-    'command = "npx"',
-    'args = ["-y", "@paigy/mcp@latest"]',
-    `env = { PAIGY_AGENT = "${agent}" }`,
-    ""
-  ].join("\n");
-  return existing + entry;
-}
-function autoConfigureClients(skip = AGENT_NAME) {
-  const home = homedir();
-  const registered = [];
-  if (skip !== "antigravity") {
-    const antigravityConfigs = [
-      join(home, ".gemini", "config", "mcp_config.json"),
-      join(home, ".gemini", "antigravity-cli", "mcp_config.json")
-    ];
-    for (const path of antigravityConfigs) {
-      try {
-        if (!existsSync(dirname(path))) continue;
-        const existing = existsSync(path) ? readFileSync(path, "utf8") : null;
-        const updated = withPaigyMcpJson(existing, "antigravity");
-        if (updated === null) continue;
-        writeFileSync(path, updated);
-        registered.push(`Google Antigravity (${path})`);
-      } catch {
-      }
-    }
-  }
-  if (skip !== "codex") {
-    const codexConfig = join(home, ".codex", "config.toml");
-    try {
-      if (existsSync(dirname(codexConfig))) {
-        const existing = existsSync(codexConfig) ? readFileSync(codexConfig, "utf8") : "";
-        const updated = withPaigyMcpToml(existing, "codex");
-        if (updated !== null) {
-          writeFileSync(codexConfig, updated);
-          registered.push(`OpenAI Codex (${codexConfig})`);
-        }
-      }
-    } catch {
-    }
-  }
-  return registered;
-}
-function claudeInstallHint(skip = AGENT_NAME) {
-  if (skip.startsWith("claude")) return null;
-  const claudeDir = join(homedir(), ".claude");
-  if (!existsSync(claudeDir)) return null;
-  try {
-    const registry = join(claudeDir, "plugins", "installed_plugins.json");
-    if (existsSync(registry) && readFileSync(registry, "utf8").includes('"paigy@')) return null;
-  } catch {
-  }
-  return "Claude Code detected \u2014 to add Paigy there, run /plugin marketplace add paigy-ai/mcp then /plugin install paigy (pairing carries over; no need to pair again). Note: If you run this inside a live session, type /reload-plugins afterward so the agent connects to the new tools.";
-}
-var ENABLE_COMMAND = "npx -y -p @paigy/mcp@latest paigy-enable-tools";
-var PAIGY_TOOL_IDS = [
-  "mcp__paigy__contact",
-  "mcp__paigy__notify_user",
-  "mcp__paigy__notify",
-  "mcp__paigy__await_reply",
-  "mcp__paigy__check_replies",
-  "mcp__paigy__set_task_state",
-  "mcp__paigy__schedule_callback",
-  "mcp__paigy__get_thread"
-];
-function withPaigyAllowlist(existing, tools) {
-  let config = {};
-  if (existing) {
-    try {
-      config = JSON.parse(existing);
-    } catch {
-      return null;
-    }
-  }
-  const permissions = config.permissions && typeof config.permissions === "object" ? config.permissions : {};
-  const allow = Array.isArray(permissions.allow) ? [...permissions.allow] : [];
-  for (const t of tools) if (!allow.includes(t)) allow.push(t);
-  config.permissions = { ...permissions, allow };
-  return JSON.stringify(config, null, 2);
-}
-function settingsPathFor(scope, cwd) {
-  return scope === "project" ? join(cwd, ".claude", "settings.json") : join(homedir(), ".claude", "settings.json");
-}
-function paigyToolsAllowlisted(scope = "user", cwd = process.cwd()) {
-  try {
-    const path = settingsPathFor(scope, cwd);
-    if (!path || !existsSync(path)) return false;
-    const config = JSON.parse(readFileSync(path, "utf8"));
-    const allow = Array.isArray(config.permissions?.allow) ? config.permissions.allow : [];
-    return PAIGY_TOOL_IDS.every((t) => allow.includes(t));
-  } catch {
-    return false;
-  }
-}
-function enablePaigyTools(scope = "user", cwd = process.cwd()) {
-  if (scope === "user" && !existsSync(join(homedir(), ".claude"))) {
-    return {
-      ok: false,
-      reason: `No ~/.claude on this machine \u2014 the hosting tool uses its own permission allowlist. Add these ids there by hand: ${PAIGY_TOOL_IDS.join(", ")}.`
-    };
-  }
-  const path = settingsPathFor(scope, cwd);
-  let existing = null;
-  try {
-    existing = existsSync(path) ? readFileSync(path, "utf8") : null;
-  } catch {
-    existing = null;
-  }
-  let prevAllow = [];
-  if (existing) {
-    try {
-      const parsed = JSON.parse(existing);
-      if (Array.isArray(parsed.permissions?.allow)) prevAllow = parsed.permissions.allow;
-    } catch {
-      return { ok: false, reason: `${path} didn't parse as JSON \u2014 not overwriting it. Add the ids by hand.` };
-    }
-  }
-  const updated = withPaigyAllowlist(existing, PAIGY_TOOL_IDS);
-  if (updated === null) return { ok: false, reason: `${path} didn't parse as JSON \u2014 not overwriting it. Add the ids by hand.` };
-  try {
-    mkdirSync(dirname(path), { recursive: true });
-    writeFileSync(path, updated + "\n");
-  } catch (e) {
-    return { ok: false, reason: `Couldn't write ${path}: ${e.message}` };
-  }
-  return {
-    ok: true,
-    path,
-    added: PAIGY_TOOL_IDS.filter((t) => !prevAllow.includes(t)),
-    already: PAIGY_TOOL_IDS.filter((t) => prevAllow.includes(t))
-  };
-}
-
-export {
-  openBrowser,
-  autoConfigureClients,
-  claudeInstallHint,
-  ENABLE_COMMAND,
-  PAIGY_TOOL_IDS,
-  paigyToolsAllowlisted,
-  enablePaigyTools
-};