granttap-mcp 0.8.78 → 0.8.80

package/apps/bridge/src/sessions/scan/codex/README.md

@@ -12,5 +12,11 @@ as a person's message. A real request next to that context is retained. Ordinary
 JSON requests remain visible. Native rollouts are read without modifying the
 provider's conversation files.
 
+Forked child rollouts retain their first native identity. Copied parent metadata
+and entries older than the child's creation are excluded from the child's
+catalog, activity and usage; they must not replace the root Task or double count
+its history. `tests/forked-agents.test.ts` covers cached rescans and all three
+nested conversations through the public catalog and activity readers.
+
 Tests live in [`tests/`](tests/). The selected-Page regression covers the public
 catalog, cached rescans, live activity, and paginated transcript history.

package/apps/bridge/src/sessions/scan/codex/activity.ts

@@ -227,7 +227,7 @@ export function codexActivity(session: SessionInfo): ActivityEntry[] {
   const out: ActivityEntry[] = [];
   const seen = new Set<string>();
   for (const source of sources) {
-    const head = codexHeadRequest(source.path);
+    const head = source.child ? undefined : codexHeadRequest(source.path);
     if (head) {
       const createdAt = head.createdAt || session.startedAt;
       const childFields = source.child ? childEntryFields(source.child) : {};

package/apps/bridge/src/sessions/scan/codex/lineage/index.ts

@@ -0,0 +1,18 @@
+import { safeParse, ts } from '../../../support/common';
+
+/** Forked rollouts begin with their own metadata, then a copied parent log. */
+export function ownCodexLines(lines: string[]): string[] {
+  const first = lines.find(line => safeParse(line)?.type === 'session_meta');
+  if (!first) return lines;
+  const native = safeParse(first);
+  const meta = native?.payload;
+  if (!meta?.source?.subagent?.thread_spawn?.parent_thread_id) return lines;
+  const startedAt = ts(native.timestamp ?? meta.timestamp);
+  return lines.filter(line => {
+    const row = safeParse(line);
+    if (!row) return false;
+    if (row.type === 'session_meta') return row.payload?.id === meta.id;
+    const at = ts(row.timestamp);
+    return !startedAt || !at || at >= startedAt;
+  });
+}

package/apps/bridge/src/sessions/scan/codex/parse.ts

@@ -166,7 +166,10 @@ export function parseCodexFile(file: string): CodexCandidate | undefined {
     const d = safeParse(line);
     if (d) applyCodexLine(d, state);
   }
-  if (!state.title) adoptRequestTitle(state, codexHeadRequest(file, true)?.text);
+  if (!state.title && !state.child) adoptRequestTitle(state, codexHeadRequest(file, true)?.text);
+  if (!state.title && state.child?.agentPath) {
+    state.title = childTitle(state.child.agentPath.split('/').filter(Boolean).at(-1)?.replace(/_/g, ' '));
+  }
   state.title ??= state.provisionalTitle;
   state.lastActivityAt = Math.max(state.lastActivityAt, fileStat.mtimeMs);
   state.startedAt ||= fileStat.birthtimeMs || state.lastActivityAt;

package/apps/bridge/src/sessions/scan/codex/shared.ts

@@ -2,6 +2,7 @@ import { toolDescription } from "../../support/activity-helpers";
 import { diffPreviewFromInput, sensitivePath, statsFromInput } from "../../support/edit-stats";
 import { redactSecrets } from "../../telemetry/command-preview";
 import { recordObservedWrite, writtenPaths } from "../../../mesh/observed/writes";
+import { ownCodexLines } from './lineage';
 /**
  * Codex session logs:
  *   ~/.codex/sessions/YYYY/MM/DD/rollout-*.jsonl
@@ -135,7 +136,7 @@ export function readCodexLogWindow(
   tailBytes = CODEX_SUMMARY_TAIL_BYTES,
 ): string[] {
   const size = statSync(path).size;
-  if (size <= headBytes + tailBytes) return readFileSync(path, "utf8").split("\n");
+  if (size <= headBytes + tailBytes) return ownCodexLines(readFileSync(path, "utf8").split("\n"));
   const fd = openSync(path, "r");
   try {
     const head = Buffer.allocUnsafe(headBytes);
@@ -153,7 +154,7 @@ export function readCodexLogWindow(
       const tailBreak = tailText.indexOf("\n");
       tailText = tailBreak >= 0 ? tailText.slice(tailBreak + 1) : "";
     }
-    return `${headText}${tailText}`.split("\n");
+    return ownCodexLines(`${headText}${tailText}`.split("\n"));
   } finally {
     closeSync(fd);
   }

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

@@ -1,7 +1,7 @@
 {
   "name": "granttap",
   "displayName": "GrantTap",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "GrantTap pairs this computer with iPhone. The connection card shows a one-time QR when Cursor supports interactive MCP Apps; an interactive terminal command is available if it does not. The website approves the coding 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.78
+npm install -g granttap-mcp@0.8.80
 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.78\";\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.80\";\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.78";
+const PACKAGE = "granttap-mcp@0.8.80";
 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.78",
+  "version": "0.8.80",
   "description": "Commercial computer runtime connecting local coding agents to GrantTap on Mac, iPhone, iPad and Apple Watch.",
   "type": "module",
   "bin": {

package/packages/core/relay-client.ts

@@ -1,17 +1,16 @@
 /** Shared authenticated relay transport. See README.md for delivery and encryption boundaries. */
 import WebSocket from "ws";
-import { ManagedRelayLease, RelaySocketHealth, relayUpgradeHeaders } from "./socket-lifecycle";
+import { ManagedRelayLease, RelaySocketHealth, RelayReconnectBackoff, relayUpgradeHeaders } from "./socket-lifecycle";
 import { OutboundFrameQueue, sendEncryptedPayload } from "./outbound-scheduler";
 import { openRelayMessage } from "./relay-inbound";
 import { consumeTaskJobOffer, type TaskDispatchListener } from "./task-dispatch";
 import { Payload, type Role } from "../protocol/schema";
-import { peerPublicKeys, sealWithTransferKey } from "./crypto";
+import { peerPublicKeys } from "./crypto";
 import type { PeerConfig, RelayClientOptions, SendOptions } from "./relay-client-types";
 export type { PeerConfig, RelayClientOptions, SendOptions } from "./relay-client-types";
 import { RelayMessageAcceptance } from "./replay-store";
-import { sealEnvelope } from "./relay-envelope";
+import { sealEnvelope, sealSessionPayload } from "./relay-envelope";
 export { sealEnvelope } from "./relay-envelope";
-
 /** Return true only after this consumer has durably accepted the payload. */
 type Listener = (p: Payload, peerPublicKey: string) => boolean | void | Promise<boolean | void>;
 
@@ -25,7 +24,7 @@ export class RelayClient {
   private intentionalClose = false;
   private connectPromise?: Promise<void>;
   private reconnectTimer?: NodeJS.Timeout;
-  private reconnectDelay: number;
+  private readonly reconnect: RelayReconnectBackoff;
   private readonly socketHealth = new RelaySocketHealth();
   private readonly admissionLease = new ManagedRelayLease();
   private readonly sessionKeys = new Map<string, string>();
@@ -35,7 +34,7 @@ export class RelayClient {
     private readonly cfg: PeerConfig,
     private readonly opts: RelayClientOptions = {},
   ) {
-    this.reconnectDelay = opts.minReconnectMs ?? 1_000;
+    this.reconnect = new RelayReconnectBackoff(opts.minReconnectMs, opts.maxReconnectMs);
     if (opts.onTaskDispatch) this.taskDispatchListeners.add(opts.onTaskDispatch);
     this.replay = new RelayMessageAcceptance(opts.replayPath);
   }
@@ -57,6 +56,7 @@ export class RelayClient {
   connect(timeoutMs = 10_000): Promise<void> {
     if (this.isConnected) return Promise.resolve();
     if (this.connectPromise) return this.connectPromise;
+    if (this.reconnectTimer) return Promise.reject(new Error('Relay reconnect is waiting for its retry window.'));
 
     this.intentionalClose = false;
     this.recipientRouting = false;
@@ -76,7 +76,7 @@ export class RelayClient {
         ws.send(frame, error => error ? reject(error) : resolve());
       }));
       this.frames = frames;
-      let opened = false;
+      let opened = false, openedAt: number | undefined;
       const timer = setTimeout(() => {
         ws.terminate();
         reject(new Error(`relay connect timeout (${this.cfg.relayUrl})`));
@@ -85,7 +85,7 @@ export class RelayClient {
       ws.on("open", () => {
         opened = true;
         clearTimeout(timer);
-        this.reconnectDelay = this.opts.minReconnectMs ?? 1_000;
+        openedAt = Date.now();
         this.socketHealth.start(ws, this.opts.pingIntervalMs ?? 20_000);
         this.admissionLease.start(ws, this.opts);
         // Announce ourselves. The envelope's cleartext (room, from) is what the
@@ -99,16 +99,21 @@ export class RelayClient {
         resolve();
       });
       ws.on("message", (data: WebSocket.RawData) => void this.onRaw(data.toString()));
+      ws.on('unexpected-response', (_request, response) => {
+        this.reconnect.defer(response.headers['retry-after']);
+        response.resume(); ws.terminate();
+        clearTimeout(timer); reject(new Error('Relay upgrade was not accepted.'));
+      });
       ws.on("error", (err) => {
         clearTimeout(timer);
         if (!opened) reject(err);
       });
-      ws.on("close", () => {
+      ws.on("close", (code, reason) => {
         frames.cancel();
         clearTimeout(timer);
         this.socketHealth.stop(ws);
         this.admissionLease.stop(ws);
-        if (this.ws === ws) this.ws = undefined;
+        if (this.ws === ws) { this.reconnect.closed(openedAt, code, reason.toString()); this.ws = undefined; }
         if (!opened) reject(new Error(`relay connection closed (${this.cfg.relayUrl})`));
         this.scheduleReconnect();
       });
@@ -219,16 +224,7 @@ export class RelayClient {
     to: Role | "all" = this.otherRole(),
     options: SendOptions = {},
   ): Promise<void> {
-    const key = this.sessionKeys.get(sessionId);
-    if (!key) throw new Error(`no encryption key for task ${sessionId}`);
-    const sealed = sealWithTransferKey(payload, key);
-    await this.send({
-      type: "session.sealed",
-      sessionId,
-      nonce: sealed.nonce,
-      box: sealed.box,
-      createdAt: Date.now(),
-    }, to, options);
+    await this.send(sealSessionPayload(payload, sessionId, this.sessionKeys.get(sessionId)), to, options);
   }
 
   /** Register before connect so only durable receivers advertise task-job support. */
@@ -284,9 +280,7 @@ export class RelayClient {
 
   private scheduleReconnect(): void {
     if (!this.opts.autoReconnect || this.intentionalClose || this.reconnectTimer) return;
-    const delay = this.reconnectDelay;
-    const max = this.opts.maxReconnectMs ?? 15_000;
-    this.reconnectDelay = Math.min(max, delay * 2);
+    const delay = this.reconnect.delay();
     this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = undefined;
       void this.connect().catch(() => {

package/packages/core/relay-envelope.ts

@@ -1,7 +1,7 @@
 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 { seal, sealWithTransferKey } from "./crypto";
 import type { PeerConfig, SendOptions } from "./relay-client-types";
 
 /**
@@ -37,3 +37,10 @@ export function sealEnvelope(
   };
   return JSON.stringify(envelope);
 }
+
+/** Apply the independent task encryption layer before transport encryption. */
+export function sealSessionPayload(payload: Payload, sessionId: string, key: string | undefined): Payload {
+  if (!key) throw new Error(`no encryption key for task ${sessionId}`);
+  const { nonce, box } = sealWithTransferKey(payload, key);
+  return { type: 'session.sealed', sessionId, nonce, box, createdAt: Date.now() };
+}

package/packages/core/socket-lifecycle/README.md

@@ -6,6 +6,15 @@ socket and does not rotate task keys or reload transcript state. A failed lookup
 cannot extend the server's signed expiry. Closing or replacing a socket cancels
 only its own timers.
 
+Reconnect pacing resets only after a non-policy connection lived at least 30
+seconds. Short handshakes keep exponential backoff and jitter. WebSocket
+`retry-after` reasons and HTTP `Retry-After` are lower bounds even when they
+exceed the ordinary retry cap. Foreground polling cannot bypass a scheduled
+retry. None of these waits delay a submission already persisted on the relay.
+Every endpoint advertises its public-key digest before the upgrade, including
+transient machine hooks, so a server can refuse a cooled identity before it
+receives any ciphertext. This digest grants no permissions or decryption rights.
+
 The real WebSocket integration is in `tests/core/managed-relay-renewal.test.ts`.
 
 Licensed under the GrantTap Commercial Source License in the repository root.

package/packages/core/socket-lifecycle/index.ts

@@ -1,4 +1,5 @@
 export { ManagedRelayLease } from "./managed-relay-lease";
 export { RelaySocketHealth } from "./relay-socket-health";
+export { RelayReconnectBackoff } from "./reconnect-backoff";
 
 export { relayUpgradeHeaders } from "./upgrade-headers";

package/packages/core/socket-lifecycle/reconnect-backoff.ts

@@ -0,0 +1,29 @@
+/** Retry pacing survives refused handshakes and short-lived WebSockets. */
+export class RelayReconnectBackoff {
+  private next: number;
+  private notBefore = 0;
+
+  constructor(private readonly minimum = 1_000, private readonly maximum = 15_000,
+    private readonly now = Date.now, private readonly random = Math.random) {
+    this.next = minimum;
+  }
+
+  closed(openedAt: number | undefined, code: number, reason: string): void {
+    const policy = code === 1008 || code === 1009 || (code >= 4400 && code <= 4499);
+    if (!policy && openedAt !== undefined && this.now() - openedAt >= 30_000) this.next = this.minimum;
+    this.defer(/(?:^|;\s*)retry-after=(\d{1,5})(?:;|$)/.exec(reason)?.[1]);
+    if (policy) this.notBefore = Math.max(this.notBefore, this.now() + Math.min(60_000, this.maximum));
+  }
+
+  /** Server Retry-After is a floor, independent of the ordinary reconnect cap. */
+  defer(value: string | string[] | undefined): void {
+    if (typeof value !== 'string' || !/^\d{1,5}$/.test(value)) return;
+    this.notBefore = Math.max(this.notBefore, this.now() + Number(value) * 1_000);
+  }
+
+  delay(): number {
+    const jittered = Math.round(Math.max(this.minimum, Math.min(this.maximum, this.next * (0.8 + this.random() * 0.4))));
+    this.next = Math.min(this.maximum, this.next * 2);
+    return Math.max(jittered, this.notBefore - this.now());
+  }
+}

package/packages/core/socket-lifecycle/upgrade-headers.ts

@@ -4,8 +4,7 @@ import { publicKeyIdentifier } from '../ciphertext-recipient';
 /** Bind optional mailbox routing to this endpoint's real encryption identity. */
 export function relayUpgradeHeaders(cfg: PeerConfig, admission: Record<string, string>, durableReceiver: boolean) {
   return { ...admission, 'X-GrantTap-Recipient-Routing': '1',
-    ...((cfg.role === 'phone' || durableReceiver)
-      ? { 'X-GrantTap-Recipient-Key-Id': publicKeyIdentifier(cfg.myPublicKey) } : {}),
+    'X-GrantTap-Recipient-Key-Id': publicKeyIdentifier(cfg.myPublicKey),
     ...(durableReceiver ? { 'X-GrantTap-Task-Dispatch': '1' } : {}),
     ...(cfg.pushAuth ? { Authorization: `Bearer ${cfg.pushAuth}` } : {}) };
 }