granttap-mcp 0.8.19 → 0.8.20

package/apps/bridge/src/approvals/index.ts

@@ -19,6 +19,7 @@ import {
   type ApprovalRegistrationHandle,
 } from "./state";
 import { primeSessionKeys, sendSessionPayload } from "../host/session-keys";
+import { controllerPeerGate } from "../pairing/controllers";
 
 /**
  * Nobody answered — relay unreachable, or the phone never responded before the
@@ -44,7 +45,7 @@ export async function requestApproval(
   opts: RequestApprovalOpts = {},
 ): Promise<ApprovalDecision> {
   const timeoutMs = opts.timeoutMs ?? 60_000;
-  const client = opts.client ?? new RelayClient(cfg);
+  const client = opts.client ?? new RelayClient(cfg, { peerAllowed: controllerPeerGate(cfg) });
   const ownsClient = !opts.client;
   let cancelDecisionWait = () => {};
   const registration = registerPendingApproval(req);

package/apps/bridge/src/bin/hooks/cursor-after-shell.ts

@@ -9,6 +9,7 @@ import {
 } from "../../approvals/state";
 import { isProviderEnabled, loadConfig, machineConfigPath } from "../../config";
 import { cursorRootSessionId } from "../../sessions/cursor";
+import { controllerPeerGate } from "../../pairing/controllers";
 
 const SHELL_TOOLS = new Set([
   "bash",
@@ -75,7 +76,8 @@ async function main(): Promise<void> {
 
   if (cancelled.length > 0) {
     try {
-      const client = new RelayClient(loadConfig(machineConfigPath()));
+      const config = loadConfig(machineConfigPath());
+      const client = new RelayClient(config, { peerAllowed: controllerPeerGate(config) });
       await client.connect();
       try {
         for (const { request, accepted } of cancelled) {

package/apps/bridge/src/bin/runtime/monitor.ts

@@ -4,6 +4,7 @@ import { RelayClient } from "../../../../../packages/core/relay-client";
 import { configDir, loadConfig, machineConfigPath } from "../../config";
 import { EngineSupervisor } from "../../engine/runtime/engine-supervisor";
 import { startSessionMonitor } from "../../monitor";
+import { controllerPeerGate } from "../../pairing/controllers";
 
 let client: RelayClient;
 let monitor: ReturnType<typeof startSessionMonitor>;
@@ -15,6 +16,7 @@ try {
   client = new RelayClient(cfg, {
     autoReconnect: true,
     replayPath: join(configDir(), `replay-${cfg.room}.json`),
+    peerAllowed: controllerPeerGate(cfg),
   });
   monitor = startSessionMonitor(client);
 } catch (error) {

package/apps/bridge/src/pairing/controllers.ts

@@ -1,5 +1,5 @@
 /** A QR may authorize a new phone key only for its one-time enrollment window. */
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import type { PeerConfig } from "../../../../packages/core/relay-client";
 import { saveConfig } from "../config/access/pairing";
@@ -12,19 +12,20 @@ function path(): string {
   return join(configDir(), "pending-controllers.json");
 }
 
-function load(): PendingController[] {
+function loadStrict(): PendingController[] | null {
   try {
     const value = JSON.parse(readFileSync(path(), "utf8")) as unknown;
-    if (!Array.isArray(value)) return [];
-    return value.slice(0, 16).filter((item): item is PendingController => {
+    if (!Array.isArray(value) || value.length > 16) return null;
+    const valid = (item: unknown): item is PendingController => {
       if (!item || typeof item !== "object") return false;
       const record = item as Partial<PendingController>;
       return typeof record.room === "string" && record.room.length > 0
         && typeof record.peerPublicKey === "string" && record.peerPublicKey.length > 0
         && typeof record.expiresAt === "number" && Number.isFinite(record.expiresAt);
-    });
+    };
+    return value.every(valid) ? value as PendingController[] : null;
   } catch {
-    return [];
+    return null;
   }
 }
 
@@ -33,22 +34,50 @@ function save(pending: PendingController[]): void {
 }
 
 export function rememberPendingController(room: string, peerPublicKey: string, expiresAt: number): void {
-  const pending = load().filter((item) => item.room !== room || item.peerPublicKey !== peerPublicKey);
+  const loaded = loadStrict();
+  if (loaded === null && existsSync(path())) throw new Error("controller enrollment journal is invalid");
+  const pending = (loaded ?? []).filter((item) => item.room !== room || item.peerPublicKey !== peerPublicKey);
   save([...pending, { room, peerPublicKey, expiresAt }].slice(-16));
 }
 
 /** Authenticated activity from this exact key makes its grant durable. */
-export function confirmPendingController(room: string, peerPublicKey: string): boolean {
-  const pending = load();
+export function confirmPendingController(room: string, peerPublicKey: string, now = Date.now()): boolean {
+  const pending = loadStrict();
+  if (pending === null) return false;
+  if (pending.some((item) => item.room === room && item.peerPublicKey === peerPublicKey
+    && item.expiresAt <= now)) return false;
   const remaining = pending.filter((item) => item.room !== room || item.peerPublicKey !== peerPublicKey);
   if (remaining.length === pending.length) return false;
   save(remaining);
   return true;
 }
 
+/** Every machine-side RelayClient uses this before parsing or sending a payload. */
+export function controllerPeerGate(config: PeerConfig, now = Date.now): (peerPublicKey: string) => boolean {
+  return (peerPublicKey) => {
+    if (config.role !== "machine" || peerPublicKey === config.peerPublicKey) return true;
+    try {
+      const live = JSON.parse(readFileSync(machineConfigPath(), "utf8")) as PeerConfig;
+      if (live.room !== config.room || live.myPublicKey !== config.myPublicKey
+        || !live.extraPeerPublicKeys?.includes(peerPublicKey)) return false;
+    } catch { return false; }
+    const pending = loadStrict();
+    if (pending === null) return false;
+    const record = pending.find((item) => item.room === config.room && item.peerPublicKey === peerPublicKey);
+    return record === undefined || record.expiresAt > now();
+  };
+}
+
 /** Expired, unclaimed QR keys cannot consume every controller slot forever. */
 export function prunePendingControllers(config: PeerConfig, now = Date.now()): PeerConfig {
-  const pending = load();
+  const pending = loadStrict();
+  if (pending === null) {
+    if ((config.extraPeerPublicKeys?.length ?? 0) === 0) return config;
+    const next = { ...config, extraPeerPublicKeys: [] };
+    saveConfig(machineConfigPath(), next);
+    save([]);
+    return next;
+  }
   const expired = new Set(pending.filter((item) =>
     item.room === config.room && item.expiresAt <= now).map((item) => item.peerPublicKey));
   if (expired.size === 0) return config;

package/apps/mcp/src/connection-center/widget.html

@@ -38,7 +38,7 @@ details{border-top:1px solid #8884;padding-top:14px}summary{cursor:pointer;font-
     <h3>Provider readiness</h3><ul id="providers"></ul>
     <p>No GrantTap account or password is required. Pair using GrantTap on iPhone → Settings → Connections.
     Provider sign-in is separate.</p>
-    <p>Missing hooks or background sync? Run <code>npm install -g granttap-mcp@0.8.18</code> and <code>granttap setup</code> locally.
+    <p>Missing hooks or background sync? Run <code>npm install -g granttap-mcp@0.8.19</code> and <code>granttap setup</code> locally.
     A saved pairing alone does not prove your phone or the background helper is online.</p>
     <p><a href="https://granttap.com" target="_blank" rel="noopener noreferrer">Website</a> ·
     <a href="https://granttap.com/privacy" target="_blank" rel="noopener noreferrer">Privacy</a> ·

package/apps/mcp/src/mcp-tools/connect/relay.ts

@@ -11,7 +11,7 @@ import { applyPairingJoin } from "../../../../bridge/src/pairing";
 import { installMonitorHelper, reloadMonitorHelper } from "../../../../bridge/src/install";
 import { recordPhoneSeen } from "../../../../bridge/src/pairing/presence";
 import { completeEnrollment } from "../../connection-center/enrollment";
-import { confirmPendingController } from "../../../../bridge/src/pairing/controllers";
+import { confirmPendingController, controllerPeerGate } from "../../../../bridge/src/pairing/controllers";
 
 const ASK_TIMEOUT_MS = Number(
   process.env.GRANTTAP_ASK_TIMEOUT_MS ?? process.env.NODVOX_ASK_TIMEOUT_MS ?? 180_000,
@@ -31,7 +31,8 @@ export type TaskInteractionScope = {
 export async function relay(): Promise<RelayClient | null> {
   try {
     if (!client) {
-      client = new RelayClient(loadConfig(machineConfigPath()), { autoReconnect: true });
+      const config = loadConfig(machineConfigPath());
+      client = new RelayClient(config, { autoReconnect: true, peerAllowed: controllerPeerGate(config) });
       client.onMessage((payload, peerPublicKey) => {
         if (payload.type === "pairing.join") {
           const result = applyPairingJoin(payload);

package/apps/mcp/src/status/pairing-status.ts

@@ -4,6 +4,7 @@ import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { loadConfig } from "../../../bridge/src/config";
 import { hasControllerPresence, readControllerLastSeenAt, readPhoneLastSeenAt } from "../../../bridge/src/pairing/presence";
+import { controllerPeerGate } from "../../../bridge/src/pairing/controllers";
 
 export type PairedPhone = {
   name: string;
@@ -59,8 +60,9 @@ export function listPairedPhones(phoneLastSeenAt: number | null = null, now = Da
   ), null);
   const seen = lastSeenAt != null && now - lastSeenAt < 60_000;
   const primary: PairedPhone = { name, status: seen ? "seen" : "paired", lastSeenAt };
+  const allowed = controllerPeerGate(machine);
   const additional = (machine.extraPeerPublicKeys ?? [])
-    .filter((key) => key && key !== machine.peerPublicKey)
+    .filter((key) => key && key !== machine.peerPublicKey && allowed(key))
     .map((key, index): PairedPhone => {
       const at = readControllerLastSeenAt(key);
       const suffix = createHash("sha256").update(key).digest("hex").slice(0, 6);

package/cursor-plugin/.cursor-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "granttap",
   "displayName": "GrantTap",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "The agent connects this computer in chat. Authorize in plugin settings opens the device window. Scan the QR in GrantTap — that scan authorizes. Device list and Add another stay there and in the GrantTap app.",
   "author": {
     "name": "GrantTap",

package/cursor-plugin/README.md

@@ -10,7 +10,7 @@ keeps each phone response tied to the exact originating chat and prompt.
 Install the supported CLI on this computer, then run:
 
 ```bash
-npm install -g granttap-mcp@0.8.18
+npm install -g granttap-mcp@0.8.19
 granttap setup
 granttap status
 ```

package/cursor-plugin/mcp.json

@@ -4,7 +4,7 @@
       "command": "node",
       "args": [
         "-e",
-        "\"use strict\";\n\n// Cursor may start this MCP from any cwd. Execute JavaScript entry points with\n// Node itself: Windows batch shims require shell quoting that differs by host.\nconst { spawn } = require(\"node:child_process\");\nconst { existsSync } = require(\"node:fs\");\nconst { delimiter, dirname, join } = require(\"node:path\");\n\nconst PACKAGE = \"granttap-mcp@0.8.18\";\nconst dryRun = process.env.GRANTTAP_BOOTSTRAP_DRY_RUN === \"1\";\nconst platform = dryRun && process.env.GRANTTAP_BOOTSTRAP_PLATFORM\n  ? process.env.GRANTTAP_BOOTSTRAP_PLATFORM : process.platform;\nconst nodeRoot = dryRun && process.env.GRANTTAP_BOOTSTRAP_NODE_ROOT\n  ? process.env.GRANTTAP_BOOTSTRAP_NODE_ROOT : dirname(process.execPath);\nconst pathRoots = (process.env.PATH || \"\").split(delimiter).filter(Boolean);\nconst appData = process.env.APPDATA;\nconst roots = [nodeRoot, ...pathRoots, ...(appData ? [join(appData, \"npm\")] : [])];\nconst first = (paths) => paths.find((path) => existsSync(path));\n\nfunction launch() {\n  if (platform !== \"win32\") {\n    const installed = first(roots.map((root) => join(root, \"granttap-mcp\")));\n    if (installed) return { command: installed, args: [] };\n    const npx = first(roots.map((root) => join(root, \"npx\"))) || \"npx\";\n    return { command: npx, args: [\"-y\", PACKAGE] };\n  }\n  const installed = first(roots.map((root) =>\n    join(root, \"node_modules\", \"granttap-mcp\", \"bin\", \"granttap-mcp.mjs\")));\n  if (installed) return { command: process.execPath, args: [installed] };\n  const npx = first(roots.map((root) =>\n    join(root, \"node_modules\", \"npm\", \"bin\", \"npx-cli.js\")));\n  if (npx) return { command: process.execPath, args: [npx, \"-y\", PACKAGE] };\n  throw new Error(\"Node.js/npm 20+ is required on this Windows device. Install npm and retry GrantTap.\");\n}\n\nlet target;\ntry { target = launch(); }\ncatch (error) {\n  process.stderr.write(`[granttap] ${error.message}\\n`);\n  process.exit(1);\n}\n\nif (dryRun) {\n  process.stdout.write(JSON.stringify(target));\n  process.exit(0);\n}\n\nconst child = spawn(target.command, target.args, { stdio: \"inherit\", windowsHide: true });\nchild.on(\"error\", (error) => {\n  process.stderr.write(`[granttap] ${error.message}\\n`);\n  process.exit(1);\n});\nchild.on(\"exit\", (code, signal) => {\n  if (signal && platform !== \"win32\") {\n    try { process.kill(process.pid, signal); } catch { process.exit(code ?? 1); }\n    return;\n  }\n  process.exit(code ?? 1);\n});\n"
+        "\"use strict\";\n\n// Cursor may start this MCP from any cwd. Execute JavaScript entry points with\n// Node itself: Windows batch shims require shell quoting that differs by host.\nconst { spawn } = require(\"node:child_process\");\nconst { existsSync } = require(\"node:fs\");\nconst { delimiter, dirname, join } = require(\"node:path\");\n\nconst PACKAGE = \"granttap-mcp@0.8.19\";\nconst dryRun = process.env.GRANTTAP_BOOTSTRAP_DRY_RUN === \"1\";\nconst platform = dryRun && process.env.GRANTTAP_BOOTSTRAP_PLATFORM\n  ? process.env.GRANTTAP_BOOTSTRAP_PLATFORM : process.platform;\nconst nodeRoot = dryRun && process.env.GRANTTAP_BOOTSTRAP_NODE_ROOT\n  ? process.env.GRANTTAP_BOOTSTRAP_NODE_ROOT : dirname(process.execPath);\nconst pathRoots = (process.env.PATH || \"\").split(delimiter).filter(Boolean);\nconst appData = process.env.APPDATA;\nconst roots = [nodeRoot, ...pathRoots, ...(appData ? [join(appData, \"npm\")] : [])];\nconst first = (paths) => paths.find((path) => existsSync(path));\n\nfunction launch() {\n  if (platform !== \"win32\") {\n    const installed = first(roots.map((root) => join(root, \"granttap-mcp\")));\n    if (installed) return { command: installed, args: [] };\n    const npx = first(roots.map((root) => join(root, \"npx\"))) || \"npx\";\n    return { command: npx, args: [\"-y\", PACKAGE] };\n  }\n  const installed = first(roots.map((root) =>\n    join(root, \"node_modules\", \"granttap-mcp\", \"bin\", \"granttap-mcp.mjs\")));\n  if (installed) return { command: process.execPath, args: [installed] };\n  const npx = first(roots.map((root) =>\n    join(root, \"node_modules\", \"npm\", \"bin\", \"npx-cli.js\")));\n  if (npx) return { command: process.execPath, args: [npx, \"-y\", PACKAGE] };\n  throw new Error(\"Node.js/npm 20+ is required on this Windows device. Install npm and retry GrantTap.\");\n}\n\nlet target;\ntry { target = launch(); }\ncatch (error) {\n  process.stderr.write(`[granttap] ${error.message}\\n`);\n  process.exit(1);\n}\n\nif (dryRun) {\n  process.stdout.write(JSON.stringify(target));\n  process.exit(0);\n}\n\nconst child = spawn(target.command, target.args, { stdio: \"inherit\", windowsHide: true });\nchild.on(\"error\", (error) => {\n  process.stderr.write(`[granttap] ${error.message}\\n`);\n  process.exit(1);\n});\nchild.on(\"exit\", (code, signal) => {\n  if (signal && platform !== \"win32\") {\n    try { process.kill(process.pid, signal); } catch { process.exit(code ?? 1); }\n    return;\n  }\n  process.exit(code ?? 1);\n});\n"
       ]
     }
   }

package/cursor-plugin/stdio-bootstrap.cjs

@@ -7,7 +7,7 @@ const { spawn } = require("node:child_process");
 const { existsSync } = require("node:fs");
 const { delimiter, dirname, join } = require("node:path");
 
-const PACKAGE = "granttap-mcp@0.8.18";
+const PACKAGE = "granttap-mcp@0.8.19";
 const dryRun = process.env.GRANTTAP_BOOTSTRAP_DRY_RUN === "1";
 const platform = dryRun && process.env.GRANTTAP_BOOTSTRAP_PLATFORM
   ? process.env.GRANTTAP_BOOTSTRAP_PLATFORM : process.platform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "granttap-mcp",
-  "version": "0.8.19",
+  "version": "0.8.20",
   "description": "Personal live control center runtime for local coding agents on iPhone and Apple Watch.",
   "type": "module",
   "bin": {

package/packages/core/relay-client-types.ts

@@ -32,6 +32,8 @@ export type RelayClientOptions = {
   pongTimeoutMs?: number;
   /** Durable ciphertext fingerprints so a restart cannot replay a consumed box. */
   replayPath?: string;
+  /** Refuse a revoked or expired controller before handling or sending payloads. */
+  peerAllowed?: (peerPublicKey: string) => boolean;
 };
 
 export type SendOptions = {

package/packages/core/relay-client.ts

@@ -61,6 +61,11 @@ export class RelayClient {
     return this.cfg.role === "machine" ? "phone" : "machine";
   }
 
+  private peerIsAllowed(peerPublicKey: string): boolean {
+    try { return this.opts.peerAllowed?.(peerPublicKey) ?? true; }
+    catch { return false; }
+  }
+
   connect(timeoutMs = 10_000): Promise<void> {
     if (this.isConnected) return Promise.resolve();
     if (this.connectPromise) return this.connectPromise;
@@ -138,6 +143,7 @@ export class RelayClient {
     );
     if (opened === null) return; // not for us, or tampered
     const { body, peerPublicKey } = opened;
+    if (!this.peerIsAllowed(peerPublicKey)) return;
     const parsedPayload = Payload.safeParse(body);
     if (!parsedPayload.success) {
       const type = body && typeof body === "object" && "type" in body ? String((body as { type?: unknown }).type) : "";
@@ -219,7 +225,9 @@ export class RelayClient {
   ): Promise<void> {
     const ws = this.ws;
     if (!ws || ws.readyState !== WebSocket.OPEN) throw new Error("relay not connected");
-    const peers = peerPublicKeys(this.cfg.peerPublicKey, this.cfg.extraPeerPublicKeys);
+    const peers = peerPublicKeys(this.cfg.peerPublicKey, this.cfg.extraPeerPublicKeys)
+      .filter((peerPublicKey) => this.peerIsAllowed(peerPublicKey));
+    if (peers.length === 0) throw new Error("no authorized pairing peers");
     for (const peerPublicKey of peers) {
       ws.send(sealEnvelope(
         { ...this.cfg, peerPublicKey },