granttap-mcp 0.8.32 → 0.8.34

package/README.md

@@ -381,19 +381,20 @@ trust.
 
 ## MCP contract
 
-`tools/list` returns exactly five public tools:
+`tools/list` returns exactly six public tools:
 
 | Tool | Contract |
 | --- | --- |
+| `connection_status` | Open the connection card and inspect saved pairing, QR expiry, relay observations, and provider readiness without changing pairing |
 | `connect` | Reuse the existing production pairing or return a one-time QR |
-| `reconnect` | Replace the pairing after explicit confirmation and return a fresh one-time QR |
+| `reconnect` | After explicit confirmation, show a one-time QR to reconnect or add an independent controller device while retaining the current room |
 | `notify` | Send a non-blocking status update of at most 2,000 characters |
 | `ask_yes_no` | Ask a yes/no question and wait for the explicit answer |
 | `ask` | Ask an open question and wait for typed or spoken text |
 
 MCP `connect` accepts no custom routing, replacement, or key-rotation input.
-`reconnect` is declared destructive and requires `confirmed: true`; relay
-acceptance happens before the working local pairing is replaced.
+`reconnect` is declared destructive and requires `confirmed: true`; the
+existing pairing remains usable during a new enrollment attempt.
 Setup is CLI-only because it changes provider configuration and must not be
 available to a model through prompt injection.
 
@@ -509,12 +510,14 @@ is left to a trusted terminal, with the command spelled out in the answer. The
 result — version before and after, the updater's own output — comes back as
 `tool.update.result`.
 
-Cost is reported as attributed rather than measured, because that is what it
-is. A call is read back from the transcript once it has finished, so it can
-never be measured directly: an MCP server outlives its calls and is sampled
-directly, while a built-in tool leaves nothing behind and is costed from the
-samples that fall inside its own start and end. A call with no sample near it
-reports nothing rather than a number borrowed from another moment.
+GrantTap derives usage from native provider transcripts and local OS samples;
+it does not ask an agent to write a resource report. An MCP server can be
+sampled directly while it runs. For a completed CLI call, a unique observed
+process tree yields measured CPU time and peak RSS. If only agent-wide samples
+cover a built-in tool call, GrantTap labels its divided share as attributed.
+Ambiguous, unsampled, and historical calls remain unknown rather than borrowing
+a number from another moment. Estimated context tokens are labeled separately
+from provider-reported model tokens.
 
 ## Local enforcement
 

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

@@ -2,8 +2,12 @@
 
 `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
+authorized loopback connection; the provider MCP consent flow can enroll after
+a verified passkey assertion. `phone-link.ts` lets a QR-paired phone grant a
+machine-scoped credential through the existing encrypted device room after
+passkey sign-in. The Mac verifies it against the account service before saving
+and never receives the phone's account session token. 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

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

@@ -0,0 +1,28 @@
+import type { AccountMachineLink } from "../../../../packages/protocol/schema";
+import { loadAccountLink, saveAccountLink } from "./link";
+
+/** A trusted QR room can grant only a machine credential, never an account session. */
+export async function acceptPhoneAccountLink(
+  link: AccountMachineLink, origin: string, request: typeof fetch = fetch,
+): Promise<boolean> {
+  if (new URL(origin).protocol !== "https:") return false;
+  const current = loadAccountLink();
+  if (current && current.accountId !== link.accountId) return false;
+  const response = await request(`${origin}/api/account/machine/identity`, {
+    headers: { authorization: `Bearer ${link.machineToken}`, accept: "application/json" },
+    signal: AbortSignal.timeout(8_000), redirect: "error",
+  });
+  if (!response.ok) return false;
+  const identity = await response.json() as { accountId?: string; machineId?: string };
+  if (identity.accountId !== link.accountId || identity.machineId !== link.machineId) return false;
+  if (current && current.machineId !== link.machineId) {
+    const revoked = await request(`${origin}/api/account/machine/self`, {
+      method: "DELETE",
+      headers: { authorization: `Bearer ${current.machineToken}`, accept: "application/json" },
+      signal: AbortSignal.timeout(8_000), redirect: "error",
+    });
+    if (!revoked.ok && revoked.status !== 401) return false;
+  }
+  return saveAccountLink({ accountId: link.accountId,
+    machineId: link.machineId, machineToken: link.machineToken });
+}

package/apps/bridge/src/monitor/handlers/inbound.ts

@@ -36,6 +36,7 @@ import { publishSessionEvents } from "./catalog";
 import { publishHistoryPage } from "../history/pages";
 import { requestProjectGraphRefresh } from "../graph-refresh";
 import { handleControllerPairRequest, handleInboundKnowledgeWrite } from "../controller-knowledge";
+import { acceptPhoneAccountLink } from "../../account-recovery/phone-link";
 
 export async function handleMonitorMessage(
   client: RelayClient,
@@ -55,8 +56,8 @@ export async function handleMonitorMessage(
     // Codex may start one MCP server per open task. Exactly one instance owns
     // phone routing, so a single phone message can never create duplicate tasks.
     if (!leadership.acquire()) return false;
-    if (payload.type === "controller.pair.request") {
-      return handleControllerPairRequest(client, payload, input.peerPublicKey);
+    if (payload.type === "controller.pair.request" || payload.type === "account.machine.link") {
+      return handleDeviceEnrollment(client, payload, input.peerPublicKey);
     }
     if (payload.type === "provider.hook.trust") {
       return handleHookTrust(client, payload, input.peerPublicKey, publish);
@@ -138,6 +139,19 @@ export async function handleMonitorMessage(
     return false;
 }
 
+function handleDeviceEnrollment(
+  client: RelayClient,
+  payload: Extract<Payload, { type: "account.machine.link" | "controller.pair.request" }>,
+  peerPublicKey?: string,
+): Promise<boolean> {
+  if (payload.type === "controller.pair.request") {
+    return handleControllerPairRequest(client, payload, peerPublicKey);
+  }
+  if (!peerPublicKey) return Promise.resolve(false);
+  const origin = process.env.GRANTTAP_WEBSITE_ORIGIN || "https://granttap.com";
+  return acceptPhoneAccountLink(payload, origin).catch(() => false);
+}
+
 async function handleInboundClaimRelease(
   client: RelayClient, payload: Extract<Payload, { type: "mesh.claim.release" }>,
   publish: (forceHistory?: boolean) => Promise<void>,

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

package/packages/protocol/messages/device/account-machine-link.ts

@@ -0,0 +1,11 @@
+import { z } from "zod";
+
+/** A QR-paired phone grants this computer a machine-scoped account credential. */
+export const AccountMachineLink = z.object({
+  type: z.literal("account.machine.link"),
+  accountId: z.string().uuid(),
+  machineId: z.string().uuid(),
+  machineToken: z.string().regex(/^[A-Za-z0-9_-]{43}$/),
+  createdAt: z.number().nonnegative(),
+}).strict();
+export type AccountMachineLink = z.infer<typeof AccountMachineLink>;

package/packages/protocol/schema.ts

@@ -33,6 +33,7 @@ import {
 import { MachineLoad } from "./messages/machine";
 import { PairingJoin } from "./messages/pairing-join";
 import { ControllerPairOffer, ControllerPairRequest } from "./messages/device/controller-pairing";
+import { AccountMachineLink } from "./messages/device/account-machine-link";
 import { KnowledgeWrite, KnowledgeWriteResult } from "./messages/mesh/knowledge/write";
 import { MeshInvocationPage, MeshInvocationQuery } from "./messages/mesh/invocations";
 import {
@@ -68,6 +69,7 @@ export * from "./messages/interaction";
 export * from "./messages/machine";
 export * from "./messages/pairing-join";
 export * from "./messages/device/controller-pairing";
+export * from "./messages/device/account-machine-link";
 export * from "./messages/mesh/knowledge/write";
 export * from "./messages/mesh";
 export * from "./messages/mesh/invocations";
@@ -157,6 +159,7 @@ export const Payload = z.union([
   PairingJoin,
   ControllerPairRequest,
   ControllerPairOffer,
+  AccountMachineLink,
   KnowledgeWrite,
   KnowledgeWriteResult,
 ]).superRefine((payload, ctx) => {