@topolo/mcp 0.11.10 → 0.11.12

package/dist/index.js

@@ -80,6 +80,7 @@ var ERROR_CODE_PATTERN = /^[a-z][a-z0-9_]{0,63}$/;
 var TOPOLO_REQUEST_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var CLOUDFLARE_RAY_ID_PATTERN = /^[0-9a-f]{16}-[A-Z]{3}$/;
 var PERMISSION_PATTERN = /^[a-z][a-z0-9_-]{0,63}(?:\.[a-z][a-z0-9_-]{0,63})*:(?:[a-z][a-z0-9_-]{0,63}|\*)$/;
+var PUBLIC_FIELD_PATH_PATTERN = /^[$.a-z0-9_[\]-]{1,160}$/i;
 var RETRY_AFTER_DATE_PATTERN = /^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun), \d{2} (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{4} \d{2}:\d{2}:\d{2} GMT$/;
 var PUBLIC_DETAIL_SOURCES = /* @__PURE__ */ new Set([
   "api_key_introspection",
@@ -192,7 +193,11 @@ function extractTopoloServiceErrorDetails(body) {
     if (candidate === void 0) candidate = nestedRecord.details ?? nestedRecord;
   }
   if (candidate === void 0) candidate = record;
-  if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) return void 0;
+  if (Array.isArray(candidate)) {
+    const paths = canonicalTopoloValidationPaths(candidate);
+    return paths.length ? { paths } : void 0;
+  }
+  if (!candidate || typeof candidate !== "object") return void 0;
   const source = candidate;
   const safe = {};
   for (const [key, value] of Object.entries(source)) {
@@ -229,12 +234,42 @@ function extractTopoloServiceErrorDetails(body) {
       continue;
     }
     if (["missingFields", "fields", "paths"].includes(key) && Array.isArray(value)) {
-      const paths = value.filter((item) => typeof item === "string" && /^[$.a-z0-9_[\]-]{1,160}$/i.test(item));
+      const paths = value.filter((item) => typeof item === "string" && PUBLIC_FIELD_PATH_PATTERN.test(item));
       if (paths.length) safe[key] = paths;
     }
   }
   return Object.keys(safe).length ? safe : void 0;
 }
+function canonicalTopoloValidationPaths(issues) {
+  const paths = [];
+  for (const issue of issues) {
+    if (!issue || typeof issue !== "object" || Array.isArray(issue)) continue;
+    const record = issue;
+    const path = canonicalTopoloValidationPath(record.field) ?? canonicalTopoloValidationPath(record.path);
+    if (path && !paths.includes(path)) paths.push(path);
+    if (paths.length === 32) break;
+  }
+  return paths;
+}
+function canonicalTopoloValidationPath(value) {
+  if (typeof value === "string") {
+    const path2 = value.trim();
+    return PUBLIC_FIELD_PATH_PATTERN.test(path2) ? path2 : void 0;
+  }
+  if (!Array.isArray(value) || value.length === 0 || value.length > 32) return void 0;
+  const segments = value.map((segment) => {
+    if (typeof segment === "number" && Number.isSafeInteger(segment) && segment >= 0) {
+      return String(segment);
+    }
+    if (typeof segment === "string" && /^[a-z0-9_$-]{1,80}$/i.test(segment)) {
+      return segment;
+    }
+    return null;
+  });
+  if (segments.includes(null)) return void 0;
+  const path = segments.join(".");
+  return PUBLIC_FIELD_PATH_PATTERN.test(path) ? path : void 0;
+}
 function publicTopoloErrorMessage(error) {
   const code = canonicalTopoloErrorCode(
     typeof error === "string" ? error : error.code ?? extractTopoloServiceErrorCode(error.body)
@@ -1011,16 +1046,29 @@ var TopoloClient = class _TopoloClient {
         clearTimeout(timeoutId);
       }
     };
+    const fetchWithReadRetry = async () => {
+      const maxAttempts = method === "GET" ? 2 : 1;
+      for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        try {
+          return await fetchOnce();
+        } catch (error) {
+          const transportFailure = !(error instanceof TopoloSdkError) && !opts.signal?.aborted;
+          if (!transportFailure || attempt === maxAttempts) throw error;
+          await new Promise((resolve2) => setTimeout(resolve2, 250));
+        }
+      }
+      throw new TopoloSdkError("network_error", "Topolo read retry loop exhausted.");
+    };
     let res;
     try {
       const attemptedCredential = this.credential;
-      res = await fetchOnce();
+      res = await fetchWithReadRetry();
       if (res.status === 401 && attemptedCredential.kind === "access_token" && this.refreshCredential) {
         await res.body?.cancel().catch(() => void 0);
         const refreshed = await this.refreshRejectedAccessToken(attemptedCredential.accessToken);
         if (refreshed) {
           applyAuthHeaders(headers, refreshed);
-          res = await fetchOnce();
+          res = await fetchWithReadRetry();
         }
       }
     } catch (err) {
@@ -1540,7 +1588,9 @@ var TopoloClient = class _TopoloClient {
     };
   }
   planResolvedAction(entry, input, options) {
-    const validation = validateTopoloActionInput(entry.inputSchema, input);
+    const inputValidation = validateTopoloActionInput(entry.inputSchema, input);
+    const resourceIssue = validateActionResource(entry, options.resource);
+    const validation = resourceIssue ? { valid: false, errors: [...inputValidation.errors, resourceIssue] } : inputValidation;
     const agentAccess = entry.agentAccess ?? (entry.destructive ? "off" : entry.readOnly && !entry.requiresConfirmation ? "auto" : "confirm");
     const confirmationRequired = agentAccess === "confirm" || entry.requiresConfirmation || entry.destructive;
     let request = null;
@@ -1599,6 +1649,13 @@ var TopoloClient = class _TopoloClient {
         `Topolo action "${entry.actionId}" input is invalid: ${validation.errors.map((issue) => `${issue.path} ${issue.message}`).join("; ")}`
       );
     }
+    const resourceIssue = validateActionResource(entry, options.resource);
+    if (resourceIssue) {
+      throw new TopoloSdkError(
+        "invalid_action_resource",
+        `Topolo action "${entry.actionId}" resource context is invalid: ${resourceIssue.message}`
+      );
+    }
     const mapped = mapActionInput(entry, input);
     const service = entry.appSlug || entry.appId;
     const result = await this.request({
@@ -1661,6 +1718,35 @@ var TopoloClient = class _TopoloClient {
     };
   }
 };
+function validateActionResource(entry, resource) {
+  const permissionName = entry.permissionName || entry.requiredPermission.split(".").at(-1) || "";
+  const declaredContext = entry.agentContract?.resourceContext;
+  const declaredKind = typeof declaredContext?.kind === "string" ? declaredContext.kind.trim() : "";
+  const expectedType = declaredKind || (permissionName.startsWith("workspace:") ? "workspace" : "");
+  if (!expectedType || declaredContext?.required === false && !permissionName.startsWith("workspace:")) return null;
+  if (!resource) {
+    return {
+      path: "$.resource",
+      code: "required",
+      message: `Select resourceType "${expectedType}" with the application resource catalog before planning or calling this action.`
+    };
+  }
+  if (resource.resourceType !== expectedType) {
+    return {
+      path: "$.resource.resourceType",
+      code: "const",
+      message: `This action requires resourceType "${expectedType}".`
+    };
+  }
+  if (!resource.resourceId.trim()) {
+    return {
+      path: "$.resource.resourceId",
+      code: "required",
+      message: `This action requires a ${expectedType} resourceId.`
+    };
+  }
+  return null;
+}
 function resolveConfiguredAppId(slug, appIds) {
   for (const serviceKey of serviceKeyCandidates2(slug)) {
     const configured = appIds?.[serviceKey];
@@ -2028,7 +2114,8 @@ function compactActionCatalogEntry(action) {
     agentAccess: action.agentAccess ?? (action.requiresConfirmation ? "confirm" : action.readOnly ? "auto" : "confirm"),
     requiredPermission: action.requiredPermission,
     requiredInput: required,
-    resourceType: action.agentContract?.resource?.kind ?? null,
+    resourceType: action.agentContract?.resourceContext?.kind ?? (action.permissionName.startsWith("workspace:") ? "workspace" : null),
+    resultResourceType: action.agentContract?.resource?.kind ?? null,
     exampleInput: example.value,
     exampleInputAvailable: example.available,
     docsUrl: action.agentContract?.docsUrl ?? null
@@ -2376,6 +2463,7 @@ var ERROR_CODE_PATTERN2 = /^[a-z][a-z0-9_]{0,63}$/;
 var TOPOLO_REQUEST_ID_PATTERN2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var CLOUDFLARE_RAY_ID_PATTERN2 = /^[0-9a-f]{16}-[A-Z]{3}$/;
 var PERMISSION_PATTERN2 = /^[a-z][a-z0-9_-]{0,63}(?:\.[a-z][a-z0-9_-]{0,63})*:(?:[a-z][a-z0-9_-]{0,63}|\*)$/;
+var PUBLIC_FIELD_PATH_PATTERN2 = /^[$.a-z0-9_[\]-]{1,160}$/i;
 var RETRY_AFTER_DATE_PATTERN2 = /^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun), \d{2} (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{4} \d{2}:\d{2}:\d{2} GMT$/;
 var PUBLIC_DETAIL_SOURCES2 = /* @__PURE__ */ new Set([
   "api_key_introspection",
@@ -2461,7 +2549,11 @@ function extractTopoloServiceErrorDetails2(body) {
     if (candidate === void 0) candidate = nestedRecord.details ?? nestedRecord;
   }
   if (candidate === void 0) candidate = record;
-  if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) return void 0;
+  if (Array.isArray(candidate)) {
+    const paths = canonicalTopoloValidationPaths2(candidate);
+    return paths.length ? { paths } : void 0;
+  }
+  if (!candidate || typeof candidate !== "object") return void 0;
   const source = candidate;
   const safe = {};
   for (const [key, value] of Object.entries(source)) {
@@ -2498,12 +2590,42 @@ function extractTopoloServiceErrorDetails2(body) {
       continue;
     }
     if (["missingFields", "fields", "paths"].includes(key) && Array.isArray(value)) {
-      const paths = value.filter((item) => typeof item === "string" && /^[$.a-z0-9_[\]-]{1,160}$/i.test(item));
+      const paths = value.filter((item) => typeof item === "string" && PUBLIC_FIELD_PATH_PATTERN2.test(item));
       if (paths.length) safe[key] = paths;
     }
   }
   return Object.keys(safe).length ? safe : void 0;
 }
+function canonicalTopoloValidationPaths2(issues) {
+  const paths = [];
+  for (const issue of issues) {
+    if (!issue || typeof issue !== "object" || Array.isArray(issue)) continue;
+    const record = issue;
+    const path = canonicalTopoloValidationPath2(record.field) ?? canonicalTopoloValidationPath2(record.path);
+    if (path && !paths.includes(path)) paths.push(path);
+    if (paths.length === 32) break;
+  }
+  return paths;
+}
+function canonicalTopoloValidationPath2(value) {
+  if (typeof value === "string") {
+    const path2 = value.trim();
+    return PUBLIC_FIELD_PATH_PATTERN2.test(path2) ? path2 : void 0;
+  }
+  if (!Array.isArray(value) || value.length === 0 || value.length > 32) return void 0;
+  const segments = value.map((segment) => {
+    if (typeof segment === "number" && Number.isSafeInteger(segment) && segment >= 0) {
+      return String(segment);
+    }
+    if (typeof segment === "string" && /^[a-z0-9_$-]{1,80}$/i.test(segment)) {
+      return segment;
+    }
+    return null;
+  });
+  if (segments.includes(null)) return void 0;
+  const path = segments.join(".");
+  return PUBLIC_FIELD_PATH_PATTERN2.test(path) ? path : void 0;
+}
 var TopoloHttpError2 = class extends TopoloSdkError2 {
   status;
   body;
@@ -3012,7 +3134,7 @@ function summarizeActionCapabilities(service, actions) {
     mutating: actions.filter((action) => !action.readOnly).length,
     destructive: actions.filter((action) => action.destructive).length,
     confirmationRequired: actions.filter((action) => action.requiresConfirmation).length,
-    resourceTypes: [...new Set(actions.map((action) => action.agentContract?.resource?.kind).filter(Boolean))].sort()
+    resourceTypes: [...new Set(actions.map((action) => action.agentContract?.resourceContext?.kind ?? (action.permissionName.startsWith("workspace:") ? "workspace" : null)).filter(Boolean))].sort()
   };
 }
 function coerceObjectParam(value, name) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@topolo/mcp",
-  "version": "0.11.10",
-  "topoloPublishedVersion": "0.11.10",
+  "version": "0.11.12",
+  "topoloPublishedVersion": "0.11.12",
   "description": "Model Context Protocol server for the Topolo platform. Exposes scope-gated tools that third-party agents (Claude, Codex, etc.) can call natively.",
   "license": "UNLICENSED",
   "author": "Topolo",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "@topolo/sdk": "0.11.10"
+    "@topolo/sdk": "0.14.2"
   },
   "devDependencies": {
     "@types/node": "^20.12.0",