@topolo/cli 0.9.5 → 0.9.7

package/dist/index.js

@@ -9,7 +9,7 @@ import { platform as platform2 } from "os";
 import { createInterface } from "readline/promises";
 import { stdin as input } from "process";
 
-// ../../node_modules/.pnpm/@topolo+sdk@0.11.11/node_modules/@topolo/sdk/dist/index.js
+// node_modules/@topolo/sdk/dist/index.js
 function applyAuthHeaders(headers, credential) {
   if (credential.kind === "api_key") {
     headers.set("X-Api-Key", credential.apiKey);
@@ -86,6 +86,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",
@@ -198,7 +199,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)) {
@@ -235,12 +240,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)
@@ -1017,16 +1052,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((resolve3) => setTimeout(resolve3, 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) {
@@ -1678,26 +1726,29 @@ var TopoloClient = class _TopoloClient {
 };
 function validateActionResource(entry, resource) {
   const permissionName = entry.permissionName || entry.requiredPermission.split(".").at(-1) || "";
-  if (!permissionName.startsWith("workspace:")) return null;
+  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 a workspace with the application resource catalog before planning or calling this action."
+      message: `Select resourceType "${expectedType}" with the application resource catalog before planning or calling this action.`
     };
   }
-  if (resource.resourceType !== "workspace") {
+  if (resource.resourceType !== expectedType) {
     return {
       path: "$.resource.resourceType",
       code: "const",
-      message: 'This action requires resourceType "workspace".'
+      message: `This action requires resourceType "${expectedType}".`
     };
   }
   if (!resource.resourceId.trim()) {
     return {
       path: "$.resource.resourceId",
       code: "required",
-      message: "This action requires a workspace resourceId."
+      message: `This action requires a ${expectedType} resourceId.`
     };
   }
   return null;
@@ -2069,7 +2120,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
@@ -2432,7 +2484,7 @@ function createTopolo(options) {
   };
 }
 
-// ../../node_modules/.pnpm/@topolo+sdk@0.11.11/node_modules/@topolo/sdk/dist/node/credential-store.js
+// node_modules/@topolo/sdk/dist/node/credential-store.js
 import { mkdir, readFile, writeFile, chmod, rm, stat } from "fs/promises";
 import { existsSync } from "fs";
 import { homedir, platform } from "os";
@@ -2495,6 +2547,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",
@@ -2580,7 +2633,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)) {
@@ -2617,12 +2674,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;
@@ -3372,6 +3459,11 @@ async function runDeviceFlow(options) {
 
   Waiting for approval (expires in ${expiresMin} min)`
     );
+  } else {
+    process.stderr.write(
+      `Open ${verifyUrl} and confirm code ${start.user_code} to sign in (expires in ${expiresMin} min).
+`
+    );
   }
   const spinner = options.mode === "pretty" ? startSpinner() : null;
   let token;
@@ -5202,9 +5294,9 @@ function registerContextCommand(program2) {
       const wantPersonal = /^(personal|me)$/i.test(target.trim());
       let resolved;
       const needle = target.trim().toLowerCase();
-      const storedEntry = Object.entries(profile.contexts ?? {}).find(([, candidate]) => {
+      const storedEntry = Object.entries(profile.contexts ?? {}).find(([key2, candidate]) => {
         if (wantPersonal) return candidate.contextType === "personal";
-        return candidate.contextType === "organization" && (candidate.organizationId === target || candidate.organizationSlug?.toLowerCase() === needle || candidate.organizationName?.toLowerCase() === needle);
+        return key2.toLowerCase() === needle || candidate.contextType === "organization" && (candidate.organizationId === target || candidate.organizationSlug?.toLowerCase() === needle || candidate.organizationName?.toLowerCase() === needle);
       });
       const storedContext = storedEntry?.[1];
       if (storedEntry && storedContext?.credential) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@topolo/cli",
-  "version": "0.9.5",
-  "topoloPublishedVersion": "0.9.5",
+  "version": "0.9.7",
+  "topoloPublishedVersion": "0.9.7",
   "description": "Public command-line interface for Topolo customer organizations, developers, and agents.",
   "license": "UNLICENSED",
   "author": "Topolo",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "@topolo/mcp": "0.11.11",
-    "@topolo/sdk": "0.11.11",
+    "@topolo/mcp": "0.11.12",
+    "@topolo/sdk": "0.14.2",
     "commander": "^12.1.0"
   },
   "devDependencies": {