granttap-mcp 0.8.58 → 0.8.59

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

@@ -5,11 +5,13 @@ import { configDir } from "../config";
 
 const LIMIT = 500;
 const MAX_AGE_MS = 7 * 24 * 60 * 60_000;
-const PROCESSING_LEASE_MS = 5 * 60_000;
+// Cover the ten-minute provider call and completion propagation before retry.
+const PROCESSING_LEASE_MS = 11 * 60_000;
 
 type DeliveryRecord = {
   state: "processing" | "completed";
   updatedAt: number;
+  processingAcknowledged?: boolean;
 };
 
 export type DeliveryStart = "started" | "processing" | "completed";
@@ -55,6 +57,19 @@ function save(records: Record<string, DeliveryRecord>, now: number): void {
   chmodSync(deliveryLedgerPath(), 0o600);
 }
 
+/** Only validated provider work may emit a non-terminal processing receipt. */
+export function acknowledgeProcessingDelivery(messageId: string, now = Date.now()): void {
+  const records = load();
+  if (records[messageId]?.state !== "processing") return;
+  records[messageId] = { state: "processing", updatedAt: now, processingAcknowledged: true };
+  save(records, now);
+}
+
+export function processingDeliveryAcknowledged(messageId: string): boolean {
+  const record = load()[messageId];
+  return record?.state === "processing" && record.processingAcknowledged === true;
+}
+
 /** Acquire a durable processing lease before invoking an agent. */
 export function beginDelivery(messageId: string, now = Date.now()): DeliveryStart {
   const records = load();

package/apps/bridge/src/monitor/README.md

@@ -11,3 +11,10 @@ Backbone requests responsive.
 
 Integration tests remain in `tests/monitor`; background publication tests live
 beside `mesh-publication`. This module uses the repository MIT License.
+
+`message-delivery/index.ts` reserves the durable delivery lease, then
+emits a non-terminal processing receipt only after workspace, attachment and
+provider validation. Duplicate validated requests replay that receipt without
+starting another provider run. The eleven-minute lease covers the ten-minute
+provider timeout. New-task startup events are status updates; the correlated
+result is terminal. Delivery integration tests live in `tests/delivery`.

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

@@ -32,7 +32,7 @@ import {
   handleSubscription,
 } from "./session-commands";
 import { handleTaskCreate } from "./task-create";
-import { handleUserMessage } from "./user-message";
+import { handleInboundUserMessage } from "../message-delivery";
 import { publishSessionEvents } from "./catalog";
 import { publishSessionImage } from '../../session-images';
 import { publishTaskWorkspace } from '../../task-files/relay';
@@ -201,42 +201,6 @@ function handleInboundPairingJoin(payload: Extract<Payload, { type: "pairing.joi
   return true;
 }
 
-async function handleInboundUserMessage(
-  client: RelayClient, payload: Extract<Payload, { type: "user.message" }>,
-  publish: (forceHistory?: boolean) => Promise<void>,
-): Promise<boolean> {
-  // Correlated replies belong to the MCP `ask` waiter in one process.
-  if (payload.requestId) return false;
-  let deliveryStarted = false;
-  if (payload.messageId) {
-    const state = beginDelivery(payload.messageId);
-    if (state === "completed") {
-      await sendDeliveryReceipt(client, payload.messageId, "accepted", undefined, payload.sessionId);
-      return true;
-    }
-    if (state === "processing") return false;
-    deliveryStarted = true;
-  }
-  try {
-    const outcome = await handleUserMessage(client, payload);
-    if (payload.messageId && deliveryStarted) {
-      if (outcome === "rejected") {
-        // The phone sends the message again with what was missing; the
-        // ledger must let that second copy through.
-        abandonDelivery(payload.messageId);
-      } else {
-        completeDelivery(payload.messageId);
-        await sendDeliveryReceipt(client, payload.messageId, "accepted", undefined, payload.sessionId);
-      }
-    }
-    void publish().catch(() => {});
-    return true;
-  } catch {
-    if (payload.messageId && deliveryStarted) abandonDelivery(payload.messageId);
-    return false;
-  }
-}
-
 async function handleInboundTaskCreate(
   client: RelayClient, payload: Extract<Payload, { type: "project.task.create" }>,
   publish: (forceHistory?: boolean) => Promise<void>,

package/apps/bridge/src/monitor/handlers/user-message.ts

@@ -22,7 +22,8 @@ import { DELIVERY_TIMEOUT_MS } from "./receipts";
 async function startNewAgentTask(input: {
   client: RelayClient;
   message: UserMessage;
-  say: (text: string, sessionId?: string, wake?: boolean) => Promise<unknown>;
+  say: (text: string, sessionId?: string, wake?: boolean, kind?: "status" | "response") => Promise<unknown>;
+  onProcessing?: () => Promise<void>;
 }): Promise<"rejected" | void> {
   const { client, message, say } = input;
   const agent = message.agent ?? "codex";
@@ -57,7 +58,8 @@ async function startNewAgentTask(input: {
     }
     return "rejected";
   }
-  await say(`Creating a new ${displayName} task…`);
+  await input.onProcessing?.();
+  await say(`Creating a new ${displayName} task…`, undefined, false, "status");
   const create = {
     claude: createClaudeSession,
     codex: createCodexSession,
@@ -77,16 +79,17 @@ async function startNewAgentTask(input: {
 export async function handleUserMessage(
   client: RelayClient,
   message: UserMessage,
+  onProcessing?: () => Promise<void>,
 ): Promise<"accepted" | "rejected" | void> {
-  const say = (text: string, sessionId?: string, wake = false) => {
-    const payload = agentEventForUserMessage(message, text, sessionId);
+  const say = (text: string, sessionId?: string, wake = false, kind: "status" | "response" = "response") => {
+    const payload = agentEventForUserMessage(message, text, sessionId, kind);
     const options = { ttlMs: 15 * 60_000, wake: wake || undefined };
     return (sessionId
       ? sendSessionPayload(client, payload, sessionId, "phone", options)
       : client.send(payload, "phone", options)).catch(() => {});
   };
   if (!message.sessionId) {
-    return startNewAgentTask({ client, message, say });
+    return startNewAgentTask({ client, message, say, onProcessing });
   }
   const resolved = resolveMessageAttachments(message, (attachmentId) => takeAttachment(attachmentId, client.room));
   if (!resolved.ok) {
@@ -135,6 +138,7 @@ export async function handleUserMessage(
 
   // No "sent, waiting" line from a middleman: the delivery receipt already
   // marks the person's bubble, and the next words in the chat are the answer.
+  await onProcessing?.();
   const startedAt = Date.now();
   const result = await deliverToSession(target, message.text, DELIVERY_TIMEOUT_MS, attachments, {
     preferredMcp: message.preferredMcp,

package/apps/bridge/src/monitor/message-delivery/README.md

@@ -0,0 +1,11 @@
+# Phone message delivery
+
+Public entry: `index.ts`. The handler owns the durable delivery lease and receipt
+sequence for non-correlated phone messages. Validation happens before the first
+processing receipt, and duplicate validated messages never start another run.
+Terminal responses remain correlated to the original message id.
+
+Integration tests: `tests/delivery/processing-receipt.test.ts`; attachment rejection
+coverage: `tests/attachment/attachment-uploads.test.ts`. See the monitor README.
+
+This module uses the repository MIT License.

package/apps/bridge/src/monitor/message-delivery/index.ts

@@ -0,0 +1,44 @@
+import type { Payload } from "../../../../../packages/protocol/schema";
+import type { RelayClient } from "../../../../../packages/core/relay-client";
+import { abandonDelivery, beginDelivery, completeDelivery,
+  acknowledgeProcessingDelivery, processingDeliveryAcknowledged } from "../../delivery";
+import { sendDeliveryReceipt } from "../handlers/receipts";
+import { handleUserMessage } from "../handlers/user-message";
+
+/** Receipts acknowledge durable receipt, while the correlated response is terminal. */
+export async function handleInboundUserMessage(
+  client: RelayClient, payload: Extract<Payload, { type: "user.message" }>,
+  publish: (forceHistory?: boolean) => Promise<void>,
+): Promise<boolean> {
+  if (payload.requestId) return false;
+  let deliveryStarted = false;
+  if (payload.messageId) {
+    const state = beginDelivery(payload.messageId);
+    if (state !== "started") {
+      if (state === "completed" || processingDeliveryAcknowledged(payload.messageId)) {
+        await sendDeliveryReceipt(client, payload.messageId, "accepted", undefined, payload.sessionId);
+      }
+      return true;
+    }
+    deliveryStarted = true;
+  }
+  try {
+    const outcome = await handleUserMessage(client, payload, async () => {
+      if (!payload.messageId) return;
+      acknowledgeProcessingDelivery(payload.messageId);
+      await sendDeliveryReceipt(client, payload.messageId, "accepted", undefined, payload.sessionId);
+    });
+    if (payload.messageId && deliveryStarted) {
+      if (outcome === "rejected") abandonDelivery(payload.messageId);
+      else {
+        completeDelivery(payload.messageId);
+        await sendDeliveryReceipt(client, payload.messageId, "accepted", undefined, payload.sessionId);
+      }
+    }
+    void publish().catch(() => {});
+    return true;
+  } catch {
+    if (payload.messageId && deliveryStarted) abandonDelivery(payload.messageId);
+    return false;
+  }
+}

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