granttap-mcp 0.8.49 → 0.8.51

package/apps/bridge/src/bin/runtime/monitor.ts

@@ -4,7 +4,7 @@ import { RelayClient } from "../../../../../packages/core/relay-client";
 import { configDir, loadConfig, machineConfigPath } from "../../config";
 import { EngineSupervisor } from "../../engine/runtime/engine-supervisor";
 import { meshSnapshotsAsync } from "../../mesh/runtime";
-import { publishedCatalog } from "../../session-catalog";
+import { publishedCatalog, recoverCatalogBindings } from "../../session-catalog";
 import { recoverLocalGraphBindings } from "../../mesh/runtime/graph/binding-sync";
 import { startSessionMonitor } from "../../monitor";
 import { controllerPeerGate } from "../../pairing/controllers";
@@ -47,31 +47,25 @@ const stop = (): void => {
 process.on("SIGINT", stop);
 process.on("SIGTERM", stop);
 
-void engine.ensureAvailable().then((health) => {
-  if (health.state === "healthy") {
-    // A new Engine binary starts with its own registry. Re-admit existing,
-    // locally verified Git bindings so linked repositories have a graph again.
+void recoverCatalogBindings({
+  engineAvailable: async () => {
+    const health = await engine.ensureAvailable();
+    if (health.state !== "disabled" && health.state !== "healthy") {
+      process.stderr.write(`[granttap-mcp] Project engine ${health.state}; legacy behavior remains active\n`);
+    }
+    return health.state === "healthy";
+  },
+  publishCatalog: async () => {
+    try { await client.connect(); await monitor.publish(); }
+    catch (error) {
+      // RelayClient retries connection independently; keep this helper alive.
+      process.stderr.write(`[granttap-mcp] initial catalog connection failed (${error instanceof Error ? error.name : "unknown"})\n`);
+      throw error;
+    }
+  },
+  snapshots: () => {
     const known = publishedCatalog(client);
-    void meshSnapshotsAsync(known ? [...known.sessions, ...(known.history ?? [])] : [])
-      .then(recoverLocalGraphBindings)
-      .then(() => monitor.publish())
-      .catch(() => undefined);
-  }
-  if (health.state !== "disabled" && health.state !== "healthy") {
-    const reason = health.reason ? `: ${health.reason}` : "";
-    process.stderr.write(
-      `[granttap-mcp] Project engine ${health.state}${reason}; legacy behavior remains active\n`,
-    );
-  }
-});
-
-void client
-  .connect()
-  .then(() => monitor.publish())
-  .catch((error: unknown) => {
-    // RelayClient keeps reconnecting in the background. Log the initial error
-    // for diagnostics without terminating the launchd-managed helper.
-    process.stderr.write(
-      `[granttap-mcp] initial relay connection failed: ${error instanceof Error ? error.message : String(error)}\n`,
-    );
-  });
+    return meshSnapshotsAsync(known ? [...known.sessions, ...(known.history ?? [])] : []);
+  },
+  recover: recoverLocalGraphBindings,
+}).then(() => monitor.publish()).catch(() => undefined);

package/apps/bridge/src/engine/runtime/engine-projects.ts

@@ -38,7 +38,10 @@ export async function syncProjectBinding(
 ): Promise<boolean> {
   const env = options.env ?? process.env;
   if (!engineFeatureEnabled(env)) return false;
-  const client = options.client ?? defaultClient();
+  // Repository admission is restore work; keep it off the policy connection.
+  const client = options.client ?? new EngineClient({
+    socketPath: join(configDir(), "engine.sock"), connectTimeoutMs: 10_000,
+  });
   try {
     const result = await client.request({
       operation: "project.upsert_binding",
@@ -63,10 +66,12 @@ export async function syncProjectBinding(
           last_seen_at: local.lastSeenAt,
         },
       },
-    }, { timeoutMs: 5_000 });
+    }, { timeoutMs: 30_000 });
     return result.operation === "project.binding_upserted";
   } catch {
     return false;
+  } finally {
+    if (!options.client) client.close?.();
   }
 }
 
@@ -203,7 +208,9 @@ async function analyzeRepositoryGraph(
 ): Promise<ProjectRepositoryGraph | undefined> {
   // The daemon serves a socket serially. Analysis must not occupy the channel
   // used for policy, bindings and Backbone reads while a repository is scanned.
-  const channel = client ?? new EngineClient({ socketPath: join(configDir(), "engine.sock") });
+  const channel = client ?? new EngineClient({
+    socketPath: join(configDir(), "engine.sock"), connectTimeoutMs: 10_000,
+  });
   try {
     const result = await channel.request({
       operation: "graph.analyze_repository", input: {

package/apps/bridge/src/mesh/runtime/graph/binding-sync.ts

@@ -29,17 +29,25 @@ export async function refreshLocalGraphBindings(
           nodes: [], relations: [], totalNodes: 0, totalRelations: 0, truncated: false });
         return;
       }
-      await dependencies.sync(snapshot.project, {
+      const admitted = await dependencies.sync(snapshot.project, {
         summary: binding,
         localRoot: facts.root,
         canonicalRemote: facts.baseRemote,
         lastSeenAt: Date.now(),
       });
-    } catch { /* A stale checkout cannot prevent other verified bindings from recovery. */ }
+      if (!admitted) failures.push(admissionFailure(snapshot, binding));
+    } catch { failures.push(admissionFailure(snapshot, binding)); }
   }));
   return failures;
 }
 
+function admissionFailure(snapshot: MeshSnapshot, binding: NonNullable<MeshSnapshot["bindings"]>[number]): ProjectRepositoryGraph {
+  return { projectId: snapshot.projectId, repositoryId: binding.repositoryId,
+    revision: "unverified", weavatrixVersion: "unknown", analysisStatus: "UNAVAILABLE",
+    analysisErrorCode: "ENGINE_ADMISSION_UNAVAILABLE", nodes: [], relations: [],
+    totalNodes: 0, totalRelations: 0, truncated: false };
+}
+
 /** Rehydrate previously admitted Git checkouts after Engine restart. */
 export async function recoverLocalGraphBindings(
   snapshots: MeshSnapshot[],

package/apps/bridge/src/session-catalog/README.md

@@ -15,3 +15,7 @@ separately from that first live publication. It does not republish an old catalo
 as fresh. The phone continues its durable historical backfill independently.
 
 Tests live in `tests/`. This runtime module uses the repository MIT License.
+
+Engine binding recovery waits for the first connected catalog publication before projecting repository graphs. A cold Engine cannot hold the initial relay handshake behind restored Mesh analysis.
+
+Codex discovery shares repeated checkout verification only within one synchronous scan. The next scan verifies repository identity again; no long-lived checkout cache can cross a repository change. This keeps startup catalog delivery ahead of repeated Git subprocesses.

package/apps/bridge/src/session-catalog/index.ts

@@ -5,6 +5,7 @@ import type { RelayClient } from "../../../../packages/core/relay-client";
 import { SessionsStatus, type SessionInfo } from "../../../../packages/protocol/schema";
 import { configDir, writePrivateFile } from "../config";
 import { nativeTranscriptRoots, nativeTranscriptSource, restoreNativeTranscriptSource } from "../sessions";
+export { recoverCatalogBindings } from "./startup-recovery";
 
 const catalogs = new WeakMap<RelayClient, SessionsStatus | undefined>();
 const cachePath = () => join(configDir(), "session-catalog-cache.json");

package/apps/bridge/src/session-catalog/startup-recovery.ts

@@ -0,0 +1,12 @@
+type StartupRecovery<T> = {
+  engineAvailable: () => Promise<boolean>;
+  publishCatalog: () => Promise<unknown>;
+  snapshots: () => Promise<T>;
+  recover: (snapshots: T) => Promise<unknown>;
+};
+
+/** Coordinate the initial catalog and restoration of verified Engine bindings. */
+export async function recoverCatalogBindings<T>(input: StartupRecovery<T>): Promise<void> {
+  const [available] = await Promise.all([input.engineAvailable(), input.publishCatalog()]);
+  if (available) await input.recover(await input.snapshots());
+}

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

@@ -8,8 +8,13 @@ import {
 import { parseCodexFile } from "./parse";
 import { assembleCodexScan } from "./assemble";
 import { recentLogs, codexSessionsRoot, MAX_FILES, type Scan } from "../../support/common";
+import { withCheckoutObservationCache } from "../../support/repository-checkout";
 
 export function scanCodex(maxFiles = MAX_FILES): Scan {
+  return withCheckoutObservationCache(() => scanCodexCatalog(maxFiles));
+}
+
+function scanCodexCatalog(maxFiles: number): Scan {
   const root = codexSessionsRoot();
   const listed = recentLogs(root, 5, maxFiles + 1);
   const files = listed.slice(0, maxFiles);

package/apps/bridge/src/sessions/support/repository-checkout/index.ts

@@ -2,11 +2,25 @@ import { execFileSync } from "node:child_process";
 import { realpathSync } from "node:fs";
 import { isAbsolute } from "node:path";
 
+let scanRoots: Map<string, string | undefined> | undefined;
+
+/** Share verified lookups only during this synchronous catalog pass. */
+export function withCheckoutObservationCache<T>(scan: () => T): T {
+  if (scanRoots) return scan();
+  scanRoots = new Map();
+  try { return scan(); }
+  finally { scanRoots = undefined; }
+}
+
 function gitRoot(path: string): string | undefined {
+  if (scanRoots?.has(path)) return scanRoots.get(path);
+  let root: string | undefined;
   try {
-    return execFileSync("git", ["--no-optional-locks", "-C", path, "rev-parse", "--show-toplevel"],
+    root = execFileSync("git", ["--no-optional-locks", "-C", path, "rev-parse", "--show-toplevel"],
       {encoding:"utf8", stdio:["ignore","pipe","ignore"], timeout:2_000}).trim() || undefined;
-  } catch { return undefined; }
+  } catch { root = undefined; }
+  scanRoots?.set(path, root);
+  return root;
 }
 
 /** Recognize only a literal initial shell directory change, without evaluating shell code. */

package/apps/mcp/src/desktop/task-activity-runner.ts

@@ -35,7 +35,7 @@ export class DesktopTaskActivityRunner {
       || typeof taskId !== "string" || !taskId || taskId.length > 128) {
       return Promise.resolve(undefined);
     }
-    return this.enqueue(query, storePath);
+    return this.enqueue({ ...query, operation: "desktop.task_activity" }, storePath);
   }
 
   usage(): Promise<unknown> {

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