granttap-mcp 0.8.63 → 0.8.64

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.63
+npm install -g granttap-mcp@0.8.64
 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.63\";\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.64\";\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.63";
+const PACKAGE = "granttap-mcp@0.8.64";
 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.63",
+  "version": "0.8.64",
   "description": "Personal live control center runtime for local coding agents on iPhone and Apple Watch.",
   "type": "module",
   "bin": {

package/packages/core/ciphertext-recipient/README.md

@@ -0,0 +1,9 @@
+# Ciphertext recipient routing
+
+`publicKeyIdentifier` identifies the recipient of one encrypted envelope without
+exposing content or private keys. RelayClient negotiates this optional routing
+with the relay; unsupported older/self-hosted relays retain the original wire.
+A controller advertises its own key digest during the authenticated upgrade.
+The relay filters live and retained ciphertext for that recipient; each client
+still authenticates the complete encrypted payload independently. Test coverage
+lives in `tests/`. This module uses the repository Apache License 2.0.

package/packages/core/ciphertext-recipient/index.ts

@@ -0,0 +1,6 @@
+import { createHash } from 'node:crypto';
+
+/** Only a routing hint. Ciphertext authentication remains the authorization boundary. */
+export function publicKeyIdentifier(publicKey: string): string {
+  return createHash('sha256').update(Buffer.from(publicKey, 'base64')).digest('hex');
+}

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

@@ -43,6 +43,8 @@ export type RelayClientOptions = {
 };
 
 export type SendOptions = {
+  /** Set by negotiated RelayClient transport; absent for older relays. */
+  recipientRouting?: boolean;
   /** Reply only to the authenticated requester; absent means all authorized peers. */
   peerPublicKey?: string;
   /** Delivery lifetime for relay hold queues. Omit only for non-expiring hello packets. */

package/packages/core/relay-client.ts

@@ -10,6 +10,7 @@
  * the Cloudflare Durable Object deployment.
  */
 import WebSocket from "ws";
+import { publicKeyIdentifier } from "./ciphertext-recipient";
 import { ManagedRelayLease, RelaySocketHealth } from "./socket-lifecycle";
 import { OutboundFrameQueue, sendEncryptedPayload } from "./outbound-scheduler";
 import { createHash } from "node:crypto";
@@ -26,6 +27,7 @@ type Listener = (p: Payload, peerPublicKey: string) => boolean | void | Promise<
 
 export class RelayClient {
   private ws?: WebSocket;
+  private recipientRouting = false;
   private frames?: OutboundFrameQueue;
   private listeners = new Set<Listener>();
   private intentionalClose = false;
@@ -74,6 +76,7 @@ export class RelayClient {
     if (this.connectPromise) return this.connectPromise;
 
     this.intentionalClose = false;
+    this.recipientRouting = false;
     const pending = Promise.resolve().then(() => this.opts.upgradeHeaders?.() ?? {})
       .then(headers => new Promise<void>((resolve, reject) => {
       // The room rides in the URL: the Cloudflare relay must pick a Durable
@@ -82,7 +85,8 @@ export class RelayClient {
       url.searchParams.set("room", this.cfg.room);
       const ws = new WebSocket(
         url.toString(),
-        { headers: { ...headers,
+        { headers: { ...headers, "X-GrantTap-Recipient-Routing": "1",
+          ...(this.cfg.role === "phone" ? { "X-GrantTap-Recipient-Key-Id": publicKeyIdentifier(this.cfg.myPublicKey) } : {}),
           ...(this.cfg.pushAuth ? { Authorization: `Bearer ${this.cfg.pushAuth}` } : {}) } },
       );
       this.ws = ws;
@@ -135,10 +139,16 @@ export class RelayClient {
   }
 
   private async onRaw(raw: string): Promise<void> {
-    const parsed = Envelope.safeParse(safeJson(raw));
+    const control = safeJson(raw) as { type?: string; recipientRouting?: boolean } | null;
+    if (control?.type === "relay.capabilities" && control.recipientRouting === true) {
+      this.recipientRouting = true;
+      return;
+    }
+    const parsed = Envelope.safeParse(control);
     if (!parsed.success) return;
     const env = parsed.data;
     if (env.room !== this.cfg.room) return;
+    if (env.recipientKeyId && env.recipientKeyId !== publicKeyIdentifier(this.cfg.myPublicKey)) return;
     if (env.from !== this.otherRole()) return;
     if (env.to !== this.cfg.role && env.to !== "all") return;
     if (env.expiresAt != null && env.expiresAt <= Date.now()) return;
@@ -239,7 +249,7 @@ export class RelayClient {
       return;
     }
     await sendEncryptedPayload(this.frames, this.cfg, key => this.peerIsAllowed(key),
-      { payload, to, options });
+      { payload, to, options: { ...options, recipientRouting: this.recipientRouting } });
   }
 
   /** Add a newly issued controller without waiting for the monitor to restart. */
@@ -261,7 +271,7 @@ export class RelayClient {
     if (!peerPublicKeys(this.cfg.peerPublicKey, this.cfg.extraPeerPublicKeys).includes(peerPublicKey)
       || !this.peerIsAllowed(peerPublicKey)) throw new Error("controller peer is not authorized");
     if (!this.frames) throw new Error("relay not connected");
-    await this.frames.send(sealEnvelope({ ...this.cfg, peerPublicKey }, payload, this.otherRole(), options), true);
+    await this.frames.send(sealEnvelope({ ...this.cfg, peerPublicKey }, payload, this.otherRole(), { ...options, recipientRouting: this.recipientRouting }), true);
   }
 
   setSessionKey(sessionId: string, key: string): void {

package/packages/core/relay-envelope.ts

@@ -1,5 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { Envelope, PROTOCOL_VERSION, type Payload, type Role } from "../protocol/schema";
+import { publicKeyIdentifier } from "./ciphertext-recipient";
 import { seal } from "./crypto";
 import type { PeerConfig, SendOptions } from "./relay-client-types";
 
@@ -25,6 +26,7 @@ export function sealEnvelope(
     from: cfg.role,
     to,
     senderId: cfg.senderId,
+    recipientKeyId: options.recipientRouting ? publicKeyIdentifier(cfg.peerPublicKey) : undefined,
     deliveryId: options.reliable === false
       ? undefined
       : options.deliveryId ?? randomUUID(),

package/packages/protocol/schema.ts

@@ -190,6 +190,7 @@ export type Payload = z.infer<typeof Payload>;
 
 /** The routed unit. `nonce`+`box` are the sealed Payload; relay cannot open it. */
 export const Envelope = z.object({
+  recipientKeyId: z.string().regex(/^[a-f0-9]{64}$/).optional(),
   v: z.literal(PROTOCOL_VERSION),
   room: z.string(),
   from: Role,