granttap-mcp 0.8.30 → 0.8.32

package/apps/bridge/src/account-recovery/README.md

@@ -0,0 +1,15 @@
+# Account recovery
+
+`link.ts` persists the local Mac's opt-in account machine credential in its
+private GrantTap config directory. The Mac app can enroll through its existing
+authorized loopback connection, or the provider MCP consent flow can enroll
+after a verified passkey assertion. The credential lets `poller.ts` answer
+short-lived, account-authorized phone requests. `offer.ts` creates a new phone
+controller key in the current room and seals its pairing half to the phone's
+ephemeral public key. The website stores only the machine token hash and sealed
+offer; it never receives a pairing key in plaintext.
+
+The normal QR pairing path remains independent. A passkey authenticates the
+account; an ephemeral phone public key encrypts the pairing offer end to end.
+
+This runtime module is covered by the repository MIT License.

package/apps/bridge/src/account-recovery/enroll.ts

@@ -0,0 +1,48 @@
+import { hostname } from "node:os";
+import { loadAccountLink, saveAccountLink } from "./link";
+
+const TOKEN = /^[A-Za-z0-9_-]{43}$/;
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+
+/** Native Mac app authorizes this MCP with its account session over protected loopback. */
+export async function enrollMacAccount(accountToken: string, origin: string,
+  request: typeof fetch = fetch): Promise<{ accountId: string; machineId: string }> {
+  if (!TOKEN.test(accountToken) || new URL(origin).protocol !== "https:") {
+    throw new Error("Invalid account authorization.");
+  }
+  const headers = { authorization: `Bearer ${accountToken}`, accept: "application/json" };
+  const response = await request(`${origin}/api/account/me`, {
+    headers, signal: AbortSignal.timeout(8_000), redirect: "error",
+  });
+  if (!response.ok) throw new Error("Account passkey session was not accepted.");
+  const me = await response.json() as { accountId?: string };
+  if (!me.accountId || !UUID.test(me.accountId)) throw new Error("Invalid account identity.");
+  const existing = loadAccountLink();
+  if (existing) {
+    if (existing.accountId !== me.accountId) {
+      throw new Error("This Mac is linked to a different account. Revoke it first.");
+    }
+    const linked = await request(`${origin}/api/account/machines`, {
+      headers, signal: AbortSignal.timeout(8_000), redirect: "error",
+    });
+    if (!linked.ok) throw new Error("Account computer list is unavailable.");
+    const list = await linked.json() as { machines?: Array<{ id?: string }> };
+    if (!Array.isArray(list.machines)) throw new Error("Invalid account computer list.");
+    if (list.machines.some(machine => machine.id === existing.machineId)) {
+      return { accountId: existing.accountId, machineId: existing.machineId };
+    }
+  }
+  const registration = await request(`${origin}/api/account/machines`, {
+    method: "POST", headers: { ...headers, "content-type": "application/json" },
+    body: JSON.stringify({ name: hostname().slice(0, 80) }),
+    signal: AbortSignal.timeout(8_000), redirect: "error",
+  });
+  if (registration.status !== 201 && registration.status !== 200) {
+    throw new Error(`Account machine registration failed (${registration.status}).`);
+  }
+  const row = await registration.json() as { id?: string; machineToken?: string };
+  if (!row.id || !row.machineToken || !saveAccountLink({
+    accountId: me.accountId, machineId: row.id, machineToken: row.machineToken,
+  })) throw new Error("Account machine authorization could not be saved.");
+  return { accountId: me.accountId, machineId: row.id };
+}

package/apps/bridge/src/account-recovery/link.ts

@@ -0,0 +1,32 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { configDir } from "../config/runtime/paths";
+import { writePrivateFile } from "../config/access/write-private";
+
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const TOKEN = /^[A-Za-z0-9_-]{43}$/;
+
+export type AccountLink = { accountId: string; machineId: string; machineToken: string };
+
+function valid(value: unknown): value is AccountLink {
+  if (!value || typeof value !== "object") return false;
+  const row = value as Partial<AccountLink>;
+  return typeof row.accountId === "string" && UUID.test(row.accountId)
+    && typeof row.machineId === "string" && UUID.test(row.machineId)
+    && typeof row.machineToken === "string" && TOKEN.test(row.machineToken);
+}
+
+function path(): string { return join(configDir(), "account-link.json"); }
+
+export function loadAccountLink(): AccountLink | null {
+  try {
+    const row = JSON.parse(readFileSync(path(), "utf8")) as unknown;
+    return valid(row) ? row : null;
+  } catch { return null; }
+}
+
+export function saveAccountLink(value: AccountLink): boolean {
+  if (!valid(value)) return false;
+  writePrivateFile(path(), `${JSON.stringify(value)}\n`);
+  return true;
+}

package/apps/bridge/src/account-recovery/offer.ts

@@ -0,0 +1,52 @@
+import { existsSync } from "node:fs";
+import { generateKeyPair, randomId, seal } from "../../../../packages/core/crypto";
+import { createPairing, DEFAULT_RELAY_URL, machineConfigPath, phonePairingPath,
+  saveConfig } from "../config";
+import { applyNetworkRoute } from "../device-network/settings";
+import { readNetworkSettings } from "../device-network/settings";
+import { parkedPairingHalves } from "../pairing";
+import { prunePendingControllers, rememberPendingController } from "../pairing/controllers";
+
+export type RecoveryRequest = { id: string; phonePublicKey: string; expiresAt: number };
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const KEY = /^[A-Za-z0-9_-]{43}$/;
+
+/** The account server sees this envelope but has no key that can open it. */
+export function createRecoveryOffer(request: RecoveryRequest, machineId: string): string {
+  if (!UUID.test(request.id) || !UUID.test(machineId) || !KEY.test(request.phonePublicKey)
+    || Buffer.from(request.phonePublicKey, "base64url").length !== 32
+    || request.expiresAt <= Date.now() || request.expiresAt > Date.now() + 5 * 60_000) {
+    throw new Error("Invalid or expired account recovery request.");
+  }
+  const existing = parkedPairingHalves();
+  if (!existing && (existsSync(machineConfigPath()) || existsSync(phonePairingPath()))) {
+    throw new Error("Existing pairing is incomplete; repair it before account recovery.");
+  }
+  const network = readNetworkSettings();
+  const relayUrl = network.mode === "managed" ? DEFAULT_RELAY_URL : network.endpoint;
+  let { machineCfg, phoneCfg } = existing ?? createPairing(relayUrl);
+  if (existing) {
+    machineCfg = prunePendingControllers(machineCfg);
+    const extra = machineCfg.extraPeerPublicKeys ?? [];
+    if (extra.length >= 16) throw new Error("This computer has reached its controller device limit.");
+    const keys = generateKeyPair();
+    phoneCfg = { ...phoneCfg, senderId: randomId(8), myPublicKey: keys.publicKey,
+      mySecretKey: keys.secretKey };
+    machineCfg = { ...machineCfg, extraPeerPublicKeys: [...extra, keys.publicKey] };
+  }
+  const routedPhone = applyNetworkRoute(phoneCfg);
+  const ephemeral = generateKeyPair();
+  const payload = { schema: "granttap.account-offer.v1", requestId: request.id,
+    machineId, pairing: routedPhone };
+  const recipient = Buffer.from(request.phonePublicKey, "base64url").toString("base64");
+  const box = seal(payload, recipient, ephemeral.secretKey);
+  // Persist authorization before the server can deliver the phone half.
+  if (!existing) {
+    saveConfig(machineConfigPath(), machineCfg);
+    saveConfig(phonePairingPath(), phoneCfg);
+  } else {
+    rememberPendingController(machineCfg.room, phoneCfg.myPublicKey, request.expiresAt);
+    saveConfig(machineConfigPath(), machineCfg);
+  }
+  return JSON.stringify({ senderPublicKey: ephemeral.publicKey, ...box });
+}

package/apps/bridge/src/account-recovery/poller.ts

@@ -0,0 +1,54 @@
+import { loadAccountLink } from "./link";
+import { createRecoveryOffer, type RecoveryRequest } from "./offer";
+
+type PendingResponse = { requests?: RecoveryRequest[] };
+const offers = new Map<string, string>();
+
+/** Poll the account bridge; the server receives only an encrypted phone half. */
+export async function pollAccountRecoveryOnce(origin: string, request: typeof fetch = fetch,
+  pairingChanged: () => void = () => {}): Promise<void> {
+  const link = loadAccountLink();
+  if (!link) return;
+  if (new URL(origin).protocol !== "https:") throw new Error("Account recovery requires HTTPS.");
+  const headers = { authorization: `Bearer ${link.machineToken}`, accept: "application/json" };
+  const response = await request(`${origin}/api/account/machine/requests`, {
+    headers, signal: AbortSignal.timeout(8_000), redirect: "error",
+  });
+  if (!response.ok) throw new Error(`Account recovery poll failed (${response.status}).`);
+  const body = await response.json() as PendingResponse;
+  if (!Array.isArray(body.requests)) throw new Error("Invalid account recovery response.");
+  const live = new Set(body.requests.map(item => item.id));
+  for (const id of offers.keys()) if (!live.has(id)) offers.delete(id);
+  for (const item of body.requests) {
+    try {
+      let offer = offers.get(item.id);
+      if (!offer) {
+        offer = createRecoveryOffer(item, link.machineId);
+        pairingChanged();
+      }
+      offers.set(item.id, offer);
+      const sent = await request(`${origin}/api/account/machine/requests/${item.id}/offer`, {
+        method: "POST", headers: { ...headers, "content-type": "application/json" },
+        body: JSON.stringify({ encryptedOffer: offer }),
+        signal: AbortSignal.timeout(8_000), redirect: "error",
+      });
+      if (sent.ok || sent.status === 404) offers.delete(item.id);
+    } catch {
+      // A transient failure retains its sealed offer for a later attempt.
+    }
+  }
+}
+
+export function startAccountRecoveryPoller(origin: string, pairingChanged: () => void): () => void {
+  let busy = false;
+  const tick = async () => {
+    if (busy) return;
+    busy = true;
+    try { await pollAccountRecoveryOnce(origin, fetch, pairingChanged); } catch { /* retry on next tick */ }
+    finally { busy = false; }
+  };
+  void tick();
+  const timer = setInterval(() => { void tick(); }, 10_000);
+  timer.unref();
+  return () => { clearInterval(timer); offers.clear(); };
+}

package/apps/mcp/src/desktop/engine-bridge.ts

@@ -1,4 +1,5 @@
 import { chmod, mkdtemp, rm } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { createServer, type Socket } from "node:net";
@@ -30,6 +31,10 @@ export const DESKTOP_OPERATIONS = new Set([
   "desktop.network_status", "desktop.network_configure", "desktop.own_relay",
 ]);
 
+export function windowsDesktopPipePath(id: string): string {
+  return String.raw`\\.\pipe\granttap-desktop-${id}`;
+}
+
 export function desktopOperationTimeout(operation: unknown, input: unknown): number {
   if (operation === "desktop.mesh_snapshot"
     && (input as { refresh_graph?: unknown } | undefined)?.refresh_graph === "true") return 120_000;
@@ -57,8 +62,10 @@ export async function startDesktopEngineBridge(options: {
   client?: Pick<EngineClient, "request" | "close">;
   onPairingChanged?: () => void;
 } = {}): Promise<{ socketPath: string; close: () => Promise<void> }> {
-  const directory = await mkdtemp(join(tmpdir(), "granttap-desktop-"));
-  const socketPath = join(directory, "engine.sock");
+  const directory = process.platform === "win32" ? null
+    : await mkdtemp(join(tmpdir(), "granttap-desktop-"));
+  const socketPath = directory ? join(directory, "engine.sock")
+    : windowsDesktopPipePath(randomUUID());
   const engine = options.client ?? new EngineClient({
     socketPath: options.engineSocketPath ?? join(configDir(), "engine.sock"),
   });
@@ -121,14 +128,15 @@ export async function startDesktopEngineBridge(options: {
   try {
     await new Promise<void>((resolve, reject) => {
       server.once("error", reject);
-      server.listen(socketPath, () => { server.removeListener("error", reject); resolve(); });
+      server.listen({ path: socketPath, readableAll: false, writableAll: false },
+        () => { server.removeListener("error", reject); resolve(); });
     });
-    await chmod(socketPath, 0o600);
+    if (directory) await chmod(socketPath, 0o600);
   } catch (error) {
     activity.close();
     enrichment.close();
     engine.close();
-    await rm(directory, { recursive: true, force: true });
+    if (directory) await rm(directory, { recursive: true, force: true });
     throw error;
   }
   return {
@@ -140,7 +148,7 @@ export async function startDesktopEngineBridge(options: {
       controllerEnrollment.close();
       await new Promise<void>((resolve) => server.close(() => resolve()));
       engine.close();
-      await rm(directory, { recursive: true, force: true });
+      if (directory) await rm(directory, { recursive: true, force: true });
     },
   };
 }

package/apps/mcp/src/desktop/native-access/README.md

@@ -13,6 +13,9 @@ its device-only Keychain and never shares it with a provider.
 invoke only the existing allowlisted desktop operations; inputs are still
 validated by the private bridge and task/policy layers. It never grants a
 provider broader MCP scope. The installer/runtime remains outside the sandbox.
+`/desktop/account/link` uses the same native grant, verifies the app's fresh
+passkey account session with granttap.com, and stores a revocable machine
+credential locally. It returns only the account and machine identifiers.
 Tests exercise real HTTP and Unix sockets, consent forgery rejection, PKCE,
 one-use codes, expiration, restart and authenticated forwarding.
 

package/apps/mcp/src/desktop/native-access/routes.ts

@@ -3,6 +3,8 @@ import type { Express } from 'express';
 import { DesktopNativeAccess } from './access';
 import { invokeDesktop } from './invoke';
 import { DESKTOP_OPERATIONS, desktopOperationTimeout } from '../engine-bridge';
+import { enrollMacAccount } from '../../../../bridge/src/account-recovery/enroll';
+import { websiteOrigin } from '../../oauth/consent/website-session';
 
 export function installDesktopNativeRoutes(app: Express, socketPath: string, origin: string,
   access = new DesktopNativeAccess()): void {
@@ -39,6 +41,18 @@ export function installDesktopNativeRoutes(app: Express, socketPath: string, ori
     try { res.json({ access_token: access.exchange(String(req.body?.code ?? ''), String(req.body?.verifier ?? '')) }); }
     catch { res.status(401).json({ error: 'Native code could not be verified' }); }
   });
+  app.post('/desktop/account/link', express.json({ limit: '2kb' }), async (req, res) => {
+    const nativeToken = String(req.headers.authorization ?? '').replace(/^Bearer /, '');
+    if (!access.verify(nativeToken)) {
+      res.status(401).json({ error: 'Authorize GrantTap for Mac first' }); return;
+    }
+    try {
+      res.json(await enrollMacAccount(String(req.body?.accountToken ?? ''),
+        websiteOrigin() ?? 'https://granttap.com'));
+    } catch {
+      res.status(403).json({ error: 'Account link could not be verified' });
+    }
+  });
   app.post('/desktop/invoke', (req, res, next) => {
     const auth = String(req.headers.authorization ?? '');
     if (!auth.startsWith('Bearer ') || !access.verify(auth.slice(7))) {

package/apps/mcp/src/http/http-server.ts

@@ -15,7 +15,7 @@ import express from "express";
 import { relay, resetRelay } from "./create-server";
 import { resetPairingWatches } from "../oauth/consent/pairing-view";
 import { GrantTapOAuthProvider } from "../oauth-provider";
-import { resetConnectWatchers } from "../oauth/consent/website-session";
+import { resetConnectWatchers, websiteOrigin } from "../oauth/consent/website-session";
 import { isMachineConfigured, phoneReachability } from "../status/pairing-status";
 import { packageVersion } from "../status/package-version";
 import { desktopStatusSnapshot } from "../status/desktop-status";
@@ -24,6 +24,7 @@ import { createMcpSessionHandler } from "./mcp-handler";
 import { startDesktopEngineBridgeProcess } from "../desktop/process/bridge-process";
 
 import { installDesktopNativeRoutes } from "../desktop/native-access/routes";
+import { startAccountRecoveryPoller } from "../../../bridge/src/account-recovery/poller";
 
 export const DEFAULT_HTTP_HOST = "127.0.0.1";
 export const DEFAULT_HTTP_PORT = 17342;
@@ -110,12 +111,16 @@ export async function startHttpMcpServer(options: ServeOptions = {}): Promise<{
 
   provider.resumeConnectWatches();
   void relay();
+  const accountOrigin = websiteOrigin();
+  const stopAccountRecovery = accountOrigin
+    ? startAccountRecoveryPoller(accountOrigin, () => { resetRelay(); void relay(); }) : () => {};
 
   return {
     host,
     port,
     mcpUrl: mcpUrl.href,
     close: async () => {
+      stopAccountRecovery();
       await sessions.close();
       resetConnectWatchers();
       resetPairingWatches();

package/apps/mcp/src/oauth/consent/pending.ts

@@ -11,12 +11,14 @@ export type PendingAuth = {
   client: OAuthClientInformationFull;
   params: AuthorizationParams;
   createdAt: number;
+  requestSecret?: string;
 };
 
 type StoredPending = {
   client: OAuthClientInformationFull;
   createdAt: number;
   params: Omit<AuthorizationParams, "resource"> & { resource?: string };
+  requestSecret?: string;
 };
 
 function pendingPath(): string {
@@ -34,6 +36,7 @@ export function loadPending(): Map<string, PendingAuth> {
       pending.set(id, {
         client: entry.client,
         createdAt: entry.createdAt,
+        requestSecret: entry.requestSecret,
         params: {
           ...entry.params,
           resource: entry.params.resource ? new URL(entry.params.resource) : undefined,
@@ -54,6 +57,7 @@ export function savePending(pending: Map<string, PendingAuth>): void {
     raw[id] = {
       client: entry.client,
       createdAt: entry.createdAt,
+      requestSecret: entry.requestSecret,
       params: {
         ...entry.params,
         resource: entry.params.resource?.href,

package/apps/mcp/src/oauth/consent/website-session.ts

@@ -2,10 +2,12 @@
  * The coding-app browser talks only to granttap.com.
  * This helper publishes the public consent snapshot there. A QR scan — a
  * phone marked seen — is the Approve. Deny stays a website action.
- * Pairing keys never leave the computer.
+ * Consent snapshots contain no pairing keys; account recovery sends only a
+ * sealed phone half through a separate short-lived mailbox.
  */
 import { PENDING_TTL_MS } from "./pending";
 import type { ConnectSnapshot } from "../session/connect-snapshot";
+import { loadAccountLink, saveAccountLink } from "../../../../bridge/src/account-recovery/link";
 
 export type ConnectDecision = "approve" | "deny" | "passkey";
 export type ConsentMethod = "phone" | "passkey";
@@ -14,8 +16,30 @@ type ConnectRow = ConnectSnapshot & {
   decision?: ConnectDecision;
   redirectUrl?: string;
   error?: string;
+  accountId?: string;
+  machineId?: string;
+  machineToken?: string;
 };
 
+function headers(secret?: string, json = false): Record<string, string> {
+  return { accept: "application/json", ...(json ? { "content-type": "application/json" } : {}),
+    ...(secret ? { authorization: `Bearer ${secret}` } : {}) };
+}
+
+function acceptAccountLink(row: ConnectRow): void {
+  if (row.decision !== "passkey" || !row.accountId || !row.machineId) {
+    throw new Error("Passkey did not link this Mac to an account.");
+  }
+  const existing = loadAccountLink();
+  if (row.machineToken) {
+    if (!saveAccountLink({ accountId: row.accountId, machineId: row.machineId,
+      machineToken: row.machineToken })) throw new Error("Account link could not be saved.");
+  } else if (!existing || existing.accountId !== row.accountId
+      || existing.machineId !== row.machineId) {
+    throw new Error("This account is not linked to this Mac.");
+  }
+}
+
 const watchers = new Map<string, AbortController>();
 
 export function websiteOrigin(): string | undefined {
@@ -32,10 +56,11 @@ export async function publishConnectRequest(
   origin: string,
   requestId: string,
   snapshot: ConnectSnapshot,
+  requestSecret?: string,
 ): Promise<void> {
   const response = await fetch(`${origin}/api/connect/requests/${requestId}`, {
     method: "PUT",
-    headers: { "content-type": "application/json", accept: "application/json" },
+    headers: headers(requestSecret, true),
     body: JSON.stringify(snapshot),
     signal: AbortSignal.timeout(4_000),
   });
@@ -50,10 +75,11 @@ export async function publishConnectRequestRetry(
   requestId: string,
   snapshot: ConnectSnapshot,
   attempts = 3,
+  requestSecret?: string,
 ): Promise<boolean> {
   for (let attempt = 0; attempt < attempts; attempt++) {
     try {
-      await publishConnectRequest(origin, requestId, snapshot);
+      await publishConnectRequest(origin, requestId, snapshot, requestSecret);
       return true;
     } catch {
       if (attempt + 1 < attempts) {
@@ -67,9 +93,10 @@ export async function publishConnectRequestRetry(
 export async function readConnectRequest(
   origin: string,
   requestId: string,
+  requestSecret?: string,
 ): Promise<ConnectRow | undefined> {
   const response = await fetch(`${origin}/api/connect/requests/${requestId}`, {
-    headers: { accept: "application/json" },
+    headers: headers(requestSecret),
     signal: AbortSignal.timeout(4_000),
   });
   if (response.status === 404) return undefined;
@@ -99,10 +126,11 @@ export async function publishConnectError(
   origin: string,
   requestId: string,
   error: string,
+  requestSecret?: string,
 ): Promise<void> {
   await fetch(`${origin}/api/connect/requests/${requestId}`, {
     method: "PUT",
-    headers: { "content-type": "application/json", accept: "application/json" },
+    headers: headers(requestSecret, true),
     body: JSON.stringify({ error: error.slice(0, 300) }),
     signal: AbortSignal.timeout(4_000),
   }).catch(() => {});
@@ -113,7 +141,7 @@ export function watchConnectDecision(
   requestId: string,
   snapshot: ConnectSnapshot | (() => ConnectSnapshot),
   complete: (approve: boolean, method: ConsentMethod) => { redirectUrl: string },
-  options: { pollMs?: number } = {},
+  options: { pollMs?: number; requestSecret?: string } = {},
 ): void {
   const current = (): ConnectSnapshot => (typeof snapshot === "function" ? snapshot() : snapshot);
   const pollMs = options.pollMs ?? 3_000;
@@ -126,9 +154,10 @@ export function watchConnectDecision(
     while (!ac.signal.aborted && Date.now() < deadline) {
       try {
         const live = current();
-        const row = await readConnectRequest(origin, requestId);
+        const row = await readConnectRequest(origin, requestId, options.requestSecret);
         if (row?.decision === "approve" || row?.decision === "deny" || row?.decision === "passkey") {
           try {
+            if (row.decision === "passkey") acceptAccountLink(row);
             const { redirectUrl } = complete(row.decision !== "deny",
               row.decision === "passkey" ? "passkey" : "phone");
             await publishConnectRedirect(origin, requestId, redirectUrl);
@@ -138,6 +167,7 @@ export function watchConnectDecision(
               origin,
               requestId,
               error instanceof Error ? error.message : String(error),
+              options.requestSecret,
             );
             // A failed publish used to stop the watcher after deleting the
             // pending id. Approve then sat on "Waiting for this computer".
@@ -145,7 +175,7 @@ export function watchConnectDecision(
         }
         const body = JSON.stringify(live);
         if (!row || body !== lastBody) {
-          await publishConnectRequest(origin, requestId, live);
+          await publishConnectRequest(origin, requestId, live, options.requestSecret);
           lastBody = body;
         }
       } catch {

package/apps/mcp/src/oauth/session/connect-snapshot.ts

@@ -10,6 +10,7 @@ import { isTerminalTaskState } from "../../../../bridge/src/mesh/admin/convergen
 import { localMeshStore } from "../../../../bridge/src/mesh/local-remote/local";
 import { connectionRuntimeStatus } from "../../mcp-tools/connect/relay";
 import { isMachineConfigured, listPairedPhones, readOnlyMachineConfigPath } from "../../status/pairing-status";
+import { loadAccountLink } from "../../../../bridge/src/account-recovery/link";
 
 export type ConnectProvider = {
   id: "codex" | "claude" | "cursor";
@@ -29,6 +30,7 @@ export type ConnectSnapshot = {
   computerName: string;
   paired: boolean;
   passkeyCapable?: boolean;
+  machineId?: string;
   /** First 8 hex chars of the pairing room. Never the full id. */
   roomPrefix: string;
   phones: ReturnType<typeof listPairedPhones>;
@@ -50,6 +52,7 @@ export function buildConnectSnapshot(clientName?: string): ConnectSnapshot {
     computerName: hostname(),
     paired,
     passkeyCapable: true,
+    machineId: loadAccountLink()?.machineId,
     roomPrefix: room ? room.slice(0, 8) : "",
     phones: listPairedPhones(runtime.phoneLastSeenAt),
     providers: inspectAgentIntegrations()

package/apps/mcp/src/oauth-provider.ts

@@ -4,7 +4,7 @@
  * Authorize means: confirm this Mac's GrantTap pairing for a client (issue a
  * bearer token). E2EE keys stay in ~/.granttap — OAuth does not replace pair.
  */
-import { randomUUID } from "node:crypto";
+import { randomBytes, randomUUID } from "node:crypto";
 import type { Response } from "express";
 import {
   InvalidGrantError,
@@ -60,7 +60,8 @@ export class GrantTapOAuthProvider implements OAuthServerProvider {
   createPending(client: OAuthClientInformationFull, params: AuthorizationParams): string {
     this.gcPending();
     const id = randomUUID();
-    this.pending.set(id, { client, params, createdAt: Date.now() });
+    this.pending.set(id, { client, params, createdAt: Date.now(),
+      requestSecret: randomBytes(32).toString("base64url") });
     savePending(this.pending);
     return id;
   }
@@ -114,8 +115,10 @@ export class GrantTapOAuthProvider implements OAuthServerProvider {
     if (origin) {
       const snapshot = () => buildConnectSnapshot(client.client_name);
       watchConnectDecision(origin, pendingId, snapshot, (approve, method) =>
-        this.completeConsent(pendingId, approve, method));
-      void publishConnectRequestRetry(origin, pendingId, snapshot());
+        this.completeConsent(pendingId, approve, method),
+        { requestSecret: this.getPending(pendingId)?.requestSecret });
+      void publishConnectRequestRetry(origin, pendingId, snapshot(), 3,
+        this.getPending(pendingId)?.requestSecret);
     }
   }
 
@@ -127,8 +130,10 @@ export class GrantTapOAuthProvider implements OAuthServerProvider {
       const snapshot = () =>
         buildConnectSnapshot(this.getPending(pendingId)?.client.client_name);
       watchConnectDecision(origin, pendingId, snapshot, (approve, method) =>
-        this.completeConsent(pendingId, approve, method));
-      void publishConnectRequestRetry(origin, pendingId, snapshot());
+        this.completeConsent(pendingId, approve, method),
+        { requestSecret: this.getPending(pendingId)?.requestSecret });
+      void publishConnectRequestRetry(origin, pendingId, snapshot(), 3,
+        this.getPending(pendingId)?.requestSecret);
     }
   }
 

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