gogcli-mcp-contacts 2.18.4 → 2.19.1

package/dist/index.js

@@ -3644,7 +3644,12 @@ var require_fast_uri = __commonJS({
     }
     function resolve(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
-      const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
+      const { parsed: baseParsed, malformedAuthorityOrPort: baseMalformed } = parseWithStatus(baseURI, schemelessOptions);
+      const { parsed: relativeParsed, malformedAuthorityOrPort: relativeMalformed } = parseWithStatus(relativeURI, schemelessOptions);
+      if (baseMalformed || relativeMalformed) {
+        throw new Error(baseParsed.error || relativeParsed.error || "URI is malformed.");
+      }
+      const resolved = resolveComponent(baseParsed, relativeParsed, schemelessOptions, true);
       schemelessOptions.skipEscape = true;
       return serialize(resolved, schemelessOptions);
     }
@@ -3770,6 +3775,7 @@ var require_fast_uri = __commonJS({
     }
     var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
     var AUTHORITY_PREFIX = /^(?:[^#/:?]+:)?\/\/([^/?#]*)/;
+    var AUTHORITY_INTRODUCER_REGION = /^(?:[^#/:?]+:)?([/\\\t\n\r]*)/;
     function getParseError(parsed, matches) {
       if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
         return 'URI path must start with "/" when authority is present.';
@@ -3804,6 +3810,20 @@ var require_fast_uri = __commonJS({
         parsed.error = "URI authority must not contain a literal backslash.";
         malformedAuthorityOrPort = true;
       }
+      const introducerMatch = uri.match(AUTHORITY_INTRODUCER_REGION);
+      if (introducerMatch !== null) {
+        const region = introducerMatch[1];
+        const normalizedRegion = region.replace(/[\t\n\r]/g, "");
+        if (normalizedRegion.length >= 2) {
+          if (normalizedRegion.slice(0, 2) !== "//") {
+            parsed.error = parsed.error || "URI authority must not contain a literal backslash.";
+            malformedAuthorityOrPort = true;
+          } else if (region.length !== normalizedRegion.length) {
+            parsed.error = parsed.error || "URI authority introducer must not contain whitespace.";
+            malformedAuthorityOrPort = true;
+          }
+        }
+      }
       const matches = uri.match(URI_PARSE);
       if (matches) {
         parsed.scheme = matches[1];
@@ -31797,7 +31817,68 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "2.18.4" : "0.0.0";
+var VERSION = true ? "2.19.1" : "0.0.0";
+
+// ../gogcli-mcp/src/connector-runtime.ts
+var DEFAULT_TIMEOUT_MS = 3e4;
+var DEADLINE_GRACE_MS = 5e3;
+var RUNNER_GOG_FAILED = 422;
+var RUNNER_DRAINING = 503;
+function makeFlyExecutor(endpoint, key) {
+  return async (args, opts) => {
+    const deadlineMs = (opts?.timeout ?? DEFAULT_TIMEOUT_MS) + DEADLINE_GRACE_MS;
+    let res;
+    try {
+      res = await fetch(endpoint + "/run", {
+        method: "POST",
+        headers: {
+          Authorization: "Bearer " + key,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ args }),
+        signal: AbortSignal.timeout(deadlineMs)
+      });
+    } catch (err) {
+      const name = err instanceof Error ? err.name : "";
+      if (name === "TimeoutError" || name === "AbortError") {
+        throw new Error(
+          `gog-runner did not respond within ${deadlineMs}ms (${endpoint}) \u2014 the Fly backend may be cold or wedged`
+        );
+      }
+      throw err;
+    }
+    if (!res.ok) {
+      const body = await res.json().catch(() => null);
+      const detail = body && typeof body.error === "string" ? body.stderr && body.stderr.trim() && body.stderr.trim() !== body.error.trim() ? `${body.error}
+${body.stderr}` : body.error : "";
+      if (res.status === RUNNER_GOG_FAILED) {
+        throw new Error(detail || "gog failed on the runner (no detail supplied)");
+      }
+      if (res.status === RUNNER_DRAINING || body?.retryable === true) {
+        throw new Error(
+          `gog-runner is restarting; retry this call.${detail ? ` ${detail}` : ""}`
+        );
+      }
+      if (detail) {
+        throw new Error(detail);
+      }
+      throw new Error(
+        `gog-runner HTTP ${res.status}: the response did not come from the runner, so the request never reached gog. The backend Machine was most likely starting or shutting down \u2014 this is transient, retry the same call.`
+      );
+    }
+    const { stdout } = await res.json();
+    return stdout;
+  };
+}
+
+// ../gogcli-mcp/src/remote-runner.ts
+function useRemoteGogRunner(env = process.env) {
+  const endpoint = readEnvVar("GOG_RUNNER_URL", { env });
+  const key = readEnvVar("GOG_RUNNER_KEY", { env });
+  if (!endpoint || !key) return false;
+  runExecutor.enterWith({ executor: makeFlyExecutor(endpoint.replace(/\/+$/, ""), key) });
+  return true;
+}
 
 // src/tools/contacts-extra.ts
 function registerExtraContactsTools(server) {
@@ -31999,6 +32080,7 @@ function registerExtraContactsTools(server) {
 }
 
 // src/index.ts
+useRemoteGogRunner();
 await runMcp({
   name: "gogcli-contacts",
   version: VERSION,

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-contacts",
   "display_name": "gogcli (Contacts)",
-  "version": "2.18.4",
+  "version": "2.19.1",
   "description": "Extended Google Contacts for Claude via gogcli — auth + Contacts + Workspace directory (People API)",
   "author": {
     "name": "Chris Hall",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-contacts",
-  "version": "2.18.4",
+  "version": "2.19.1",
   "mcpName": "io.github.chrischall/gogcli-mcp-contacts",
   "description": "Extended Google Contacts + People MCP server via gogcli — auth + Contacts + Workspace directory (People API)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/src/index.ts

@@ -1,8 +1,12 @@
 #!/usr/bin/env node
 import { runMcp } from '@chrischall/mcp-utils';
-import { VERSION, authToolsFor, registerContactsTools } from '../../gogcli-mcp/src/lib.js';
+import { VERSION, authToolsFor, registerContactsTools, useRemoteGogRunner } from '../../gogcli-mcp/src/lib.js';
 import { registerExtraContactsTools } from './tools/contacts-extra.js';
 
+// Execute `gog` on the Fly backend when the host points us at one; without
+// it, nothing changes and we spawn the local binary as before.
+useRemoteGogRunner();
+
 await runMcp({
   name: 'gogcli-contacts',
   version: VERSION,