@vm0/cli 9.222.2 → 9.222.3

package/{chunk-UX5MX23W.js → chunk-V2NS7MND.js}

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   loadFirewallPermissionMetadata,
   resolveFirewallMetadataPolicies
-} from "./chunk-KA6H24H6.js";
+} from "./chunk-K7F6VF2Z.js";
 import {
   source_default
 } from "./chunk-JUTUEPIR.js";
@@ -87,4 +87,4 @@ export {
   policyIcon,
   loadConnectorPermissionInfos
 };
-//# sourceMappingURL=chunk-UX5MX23W.js.map
+//# sourceMappingURL=chunk-V2NS7MND.js.map

package/{chunk-X6DLTGXJ.js → chunk-XX44OKQX.js}

@@ -3,7 +3,7 @@ import { createRequire as __createRequire } from "node:module";
 const require = __createRequire(import.meta.url);
 import {
   MODEL_PROVIDER_TYPES
-} from "./chunk-E2O7MDL7.js";
+} from "./chunk-3QZMZ46V.js";
 import {
   init_esm_shims
 } from "./chunk-DIRAZ3YX.js";
@@ -40,4 +40,4 @@ export {
   formatModelProviderRoute,
   formatModelPolicyStatus
 };
-//# sourceMappingURL=chunk-X6DLTGXJ.js.map
+//# sourceMappingURL=chunk-XX44OKQX.js.map

package/{computer-use-UUJJLFRO.js → computer-use-V7RXYM5A.js}

@@ -9,7 +9,7 @@ import {
   fetchComputerUsePluginContent,
   fetchComputerUseScreenshot,
   getComputerUseCommand
-} from "./chunk-E2O7MDL7.js";
+} from "./chunk-3QZMZ46V.js";
 import {
   ApiRequestError,
   withErrorHandler
@@ -881,4 +881,4 @@ export {
   formatComputerUseResultForConsole,
   zeroComputerUseCommand
 };
-//# sourceMappingURL=computer-use-UUJJLFRO.js.map
+//# sourceMappingURL=computer-use-V7RXYM5A.js.map

package/{connector-IT2BLPVI.js → connector-ZFFOQO63.js}

@@ -16,7 +16,7 @@ import {
   getZeroCustomConnector,
   listZeroConnectorCatalogStatus,
   listZeroCustomConnectors
-} from "./chunk-E2O7MDL7.js";
+} from "./chunk-3QZMZ46V.js";
 import {
   withErrorHandler
 } from "./chunk-3F4RFLPX.js";
@@ -832,4 +832,4 @@ var zeroConnectorCommand = new Command().name("connector").description("Check th
 export {
   zeroConnectorCommand
 };
-//# sourceMappingURL=connector-IT2BLPVI.js.map
+//# sourceMappingURL=connector-ZFFOQO63.js.map

package/{credit-ZT4YJEEV.js → credit-O3ELRY7X.js}

@@ -8,7 +8,7 @@ import "./chunk-LTDQISD7.js";
 import {
   createZeroCreditCheckout,
   getZeroOrgMembers
-} from "./chunk-E2O7MDL7.js";
+} from "./chunk-3QZMZ46V.js";
 import {
   withErrorHandler
 } from "./chunk-3F4RFLPX.js";
@@ -87,4 +87,4 @@ var zeroCreditCommand = new Command().name("credit").description("Create a Strip
 export {
   zeroCreditCommand
 };
-//# sourceMappingURL=credit-ZT4YJEEV.js.map
+//# sourceMappingURL=credit-O3ELRY7X.js.map

package/{developer-support-GUZAND2T.js → developer-support-2VYEJ4UE.js}

@@ -5,7 +5,7 @@ import "./chunk-LTDQISD7.js";
 import {
   requestDeveloperSupportConsent,
   submitDeveloperSupport
-} from "./chunk-E2O7MDL7.js";
+} from "./chunk-3QZMZ46V.js";
 import {
   withErrorHandler
 } from "./chunk-3F4RFLPX.js";
@@ -61,4 +61,4 @@ Notes:
 export {
   zeroDeveloperSupportCommand
 };
-//# sourceMappingURL=developer-support-GUZAND2T.js.map
+//# sourceMappingURL=developer-support-2VYEJ4UE.js.map

package/{doctor-GRCIJPEA.js → doctor-F5ETPBLW.js}

@@ -5,19 +5,19 @@ import {
   findFirewallMetadataPermission,
   getFirewallPermissionSummary,
   loadFirewallPermissionMetadata
-} from "./chunk-KA6H24H6.js";
+} from "./chunk-K7F6VF2Z.js";
 import {
   getPlatformOrigin,
   toPlatformUrl
 } from "./chunk-ZFETZTKV.js";
 import {
-  findMatchingRoutingPermissions,
-  matchFirewallBaseUrl
-} from "./chunk-ODQBZESC.js";
+  matchFirewallBaseUrl,
+  matchFirewallRequestDecision
+} from "./chunk-72DXWQL4.js";
 import {
   getConnectorEnvBindingEntries,
   getDiagnosticConnectorTypeForRuntimeEnvName
-} from "./chunk-IH5XFOOD.js";
+} from "./chunk-A5RF3VZM.js";
 import "./chunk-LTDQISD7.js";
 import {
   CONNECTOR_TYPES,
@@ -32,7 +32,7 @@ import {
   hasUnsafeFirewallPath,
   resolveFirewallBaseUrlTemplate,
   searchZeroConnectors
-} from "./chunk-E2O7MDL7.js";
+} from "./chunk-3QZMZ46V.js";
 import {
   ApiRequestError,
   getApiUrl,
@@ -7235,11 +7235,45 @@ async function connectorTypeIsAvailable(type) {
 function connectorEnvName(type) {
   return getConnectorEnvBindingEntries(type)[0]?.envName ?? null;
 }
-function hasRoutingPermissionRules(config) {
-  return config.apis.some((api) => {
-    return api.routes.length > 0;
+function stripUrlQueryAndFragment(url) {
+  const queryIndex = url.indexOf("?");
+  const fragmentIndex = url.indexOf("#");
+  let end = url.length;
+  if (queryIndex !== -1) end = Math.min(end, queryIndex);
+  if (fragmentIndex !== -1) end = Math.min(end, fragmentIndex);
+  return url.slice(0, end);
+}
+function shellQuoteArg(value) {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
+function routesToDecisionPermissions(routes) {
+  const rulesByPermission = /* @__PURE__ */ new Map();
+  for (const route of routes) {
+    const rules = rulesByPermission.get(route.permissionName);
+    if (rules) {
+      rules.push(route.rule);
+    } else {
+      rulesByPermission.set(route.permissionName, [route.rule]);
+    }
+  }
+  return [...rulesByPermission.entries()].map(([name, rules]) => {
+    return { name, rules };
   });
 }
+function routingConfigToDecisionFirewalls(config) {
+  return [
+    {
+      name: config.type,
+      apis: config.apis.map((api) => {
+        return {
+          base: api.base,
+          auth: {},
+          permissions: routesToDecisionPermissions(api.routes)
+        };
+      })
+    }
+  ];
+}
 function routingBaseExecutionTemplate(type, base) {
   const executionMetadata = getFirewallExecutionMetadata(type);
   const template = executionMetadata?.baseUrlTemplates.find((entry) => {
@@ -7358,7 +7392,7 @@ async function resolveConnectorFromRunContext(url, runContext) {
     envName,
     matchedBase: bestMatch.match.displayBase,
     relativePath: bestMatch.match.relativePath,
-    ...hasRoutingPermissionRules(bestMatch.routingConfig) ? { routingConfig: bestMatch.routingConfig } : {}
+    routingConfig: bestMatch.routingConfig
   };
 }
 async function getCurrentRunContext() {
@@ -7566,21 +7600,27 @@ function checkPermissionPolicy(connectorType, label, permissionName, networkPoli
   console.log(`Permission policies for the ${label} connector:`);
   console.log(`  allow list: [${connectorPolicies.allow.join(", ")}]`);
   console.log(`  deny list:  [${connectorPolicies.deny.join(", ")}]`);
+  console.log(`  ask list:   [${connectorPolicies.ask.join(", ")}]`);
   console.log(`  unknown endpoint policy: ${connectorPolicies.unknownPolicy}`);
   console.log("");
   const isInAllow = connectorPolicies.allow.includes(permissionName);
   const isInDeny = connectorPolicies.deny.includes(permissionName);
-  if (isInAllow) {
+  const isInAsk = connectorPolicies.ask.includes(permissionName);
+  if (isInDeny) {
     console.log(
-      `Result: "${permissionName}" is in the allow list. Requests matching this permission are allowed.`
+      `Result: "${permissionName}" is in the deny list. Requests matching this permission are denied.`
     );
-  } else if (isInDeny) {
+  } else if (isInAsk) {
     console.log(
-      `Result: "${permissionName}" is in the deny list. Requests matching this permission are denied.`
+      `Result: "${permissionName}" is in the ask list. Requests matching this permission are blocked until approval.`
+    );
+  } else if (isInAllow) {
+    console.log(
+      `Result: "${permissionName}" is in the allow list. Requests matching this permission are allowed.`
     );
   } else {
     console.log(
-      `Result: "${permissionName}" is not in any permission list. It will be handled by the unknown endpoint policy: ${connectorPolicies.unknownPolicy}.`
+      `Result: "${permissionName}" is not in the deny or ask list. Requests matching this permission are allowed; the unknown endpoint policy only applies when no named permission matches a request.`
     );
   }
   console.log("");
@@ -7588,7 +7628,116 @@ function checkPermissionPolicy(connectorType, label, permissionName, networkPoli
 function unknownPermissionChangeCommand(connectorRef) {
   return `zero doctor permission-change ${connectorRef} --permission ${UNKNOWN_PERMISSION_GRANT} --enable --duration 1h`;
 }
-async function resolvePermissionFromUrl(connectorType, label, method, relativePath, matchedBase, routingConfig, networkPolicies, configuredForRun) {
+function matchedPermissionsFromDecision(decision) {
+  if (decision.kind === "allow") {
+    return decision.permission === void 0 ? [] : [decision.permission];
+  }
+  if (decision.kind === "block" && decision.reason === "permission_denied") {
+    return [...decision.permissions];
+  }
+  return [];
+}
+function printMatchedPermissionsSummary(method, relativePath, decision) {
+  const matchedPermissions = matchedPermissionsFromDecision(decision);
+  if (matchedPermissions.length > 0) {
+    console.log(`Matched permissions: [${matchedPermissions.join(", ")}]`);
+    return;
+  }
+  if (decision.kind === "allow" || decision.kind === "block" && decision.reason === "unknown_endpoint") {
+    console.log(
+      `No named permission matches ${method} ${relativePath}. This request falls through to the unknown-endpoint policy.`
+    );
+    return;
+  }
+  if (decision.kind === "no_match") {
+    console.log(
+      "No connector firewall base matched this request during final permission evaluation."
+    );
+    return;
+  }
+  if (decision.reason === "malformed_firewall_config") {
+    console.log(
+      "Permission matching could not complete because the matched firewall config is malformed."
+    );
+    return;
+  }
+  if (decision.reason === "malformed_network_policy") {
+    console.log(
+      "Permission matching could not complete because the matched network policy is malformed."
+    );
+    return;
+  }
+  console.log(
+    "Permission matching could not complete because the request path contains unsafe path syntax."
+  );
+}
+function printAllowedPermissionResult(permission, connectorPolicies) {
+  if (connectorPolicies.allow.includes(permission)) {
+    console.log(`Result: "${permission}" is in the allow list \u2014 allowed.`);
+    return;
+  }
+  console.log(
+    `Result: "${permission}" is not blocked by the deny or ask list \u2014 allowed.`
+  );
+}
+function printDeniedPermissionResult(permission, connectorPolicies) {
+  if (connectorPolicies.deny.includes(permission)) {
+    console.log(`Result: "${permission}" is in the deny list \u2014 denied.`);
+    return;
+  }
+  if (connectorPolicies.ask.includes(permission)) {
+    console.log(`Result: "${permission}" is in the ask list \u2014 blocked.`);
+    return;
+  }
+  console.log(`Result: "${permission}" is blocked by permission policy.`);
+}
+function printFirewallDecisionResult(connectorType, decision, connectorPolicies) {
+  if (decision.kind === "allow") {
+    if (decision.permission === void 0) {
+      console.log(
+        "Result: No permission matched. The unknown endpoint policy applies: allow."
+      );
+      return;
+    }
+    printAllowedPermissionResult(decision.permission, connectorPolicies);
+    return;
+  }
+  if (decision.kind === "no_match") {
+    console.log("Result: No connector firewall base matched this request.");
+    return;
+  }
+  switch (decision.reason) {
+    case "permission_denied":
+      for (const permission of decision.permissions) {
+        printDeniedPermissionResult(permission, connectorPolicies);
+      }
+      return;
+    case "unknown_endpoint":
+      console.log(
+        `Result: No permission matched. The unknown endpoint policy applies: ${connectorPolicies.unknownPolicy}.`
+      );
+      console.log(
+        `To allow unknown endpoints, run: ${unknownPermissionChangeCommand(connectorType)}`
+      );
+      return;
+    case "malformed_firewall_config":
+      console.log(
+        "Result: The matched firewall config is malformed, so the request is blocked."
+      );
+      return;
+    case "malformed_network_policy":
+      console.log(
+        "Result: The matched network policy is malformed, so the request is blocked."
+      );
+      return;
+    case "unsafe_path":
+      console.log(
+        "Result: The request path contains unsafe path syntax, so the request is blocked."
+      );
+      return;
+  }
+}
+async function resolvePermissionFromUrl(connectorType, label, method, url, relativePath, matchedBase, routingConfig, networkPolicies, configuredForRun) {
   console.log("## Step 3: Permission policy check (auto-detected from URL)");
   console.log("");
   console.log(
@@ -7607,19 +7756,13 @@ async function resolvePermissionFromUrl(connectorType, label, method, relativePa
     console.log("");
     return;
   }
-  const matchedPermissions = findMatchingRoutingPermissions(
+  const decision = matchFirewallRequestDecision(
+    routingConfigToDecisionFirewalls(config),
     method,
-    relativePath,
-    config.apis,
-    { apiBase: matchedBase }
+    url,
+    networkPolicies
   );
-  if (matchedPermissions.length === 0) {
-    console.log(
-      `No named permission matches ${method} ${relativePath}. This request falls through to the unknown-endpoint policy.`
-    );
-  } else {
-    console.log(`Matched permissions: [${matchedPermissions.join(", ")}]`);
-  }
+  printMatchedPermissionsSummary(method, relativePath, decision);
   console.log("");
   if (!networkPolicies) {
     console.log(
@@ -7649,32 +7792,10 @@ async function resolvePermissionFromUrl(connectorType, label, method, relativePa
   console.log(`Permission policies for the ${label} connector:`);
   console.log(`  allow list: [${connectorPolicies.allow.join(", ")}]`);
   console.log(`  deny list:  [${connectorPolicies.deny.join(", ")}]`);
+  console.log(`  ask list:   [${connectorPolicies.ask.join(", ")}]`);
   console.log(`  unknown endpoint policy: ${connectorPolicies.unknownPolicy}`);
   console.log("");
-  if (matchedPermissions.length === 0) {
-    console.log(
-      `Result: No permission matched. The unknown endpoint policy applies: ${connectorPolicies.unknownPolicy}.`
-    );
-    if (connectorPolicies.unknownPolicy !== "allow") {
-      console.log(
-        `To allow unknown endpoints, run: ${unknownPermissionChangeCommand(connectorType)}`
-      );
-    }
-  } else {
-    for (const perm of matchedPermissions) {
-      const isInAllow = connectorPolicies.allow.includes(perm);
-      const isInDeny = connectorPolicies.deny.includes(perm);
-      if (isInAllow) {
-        console.log(`Result: "${perm}" is in the allow list \u2014 allowed.`);
-      } else if (isInDeny) {
-        console.log(`Result: "${perm}" is in the deny list \u2014 denied.`);
-      } else {
-        console.log(
-          `Result: "${perm}" is not in any list \u2014 falls through to unknown endpoint policy: ${connectorPolicies.unknownPolicy}.`
-        );
-      }
-    }
-  }
+  printFirewallDecisionResult(connectorType, decision, connectorPolicies);
   console.log("");
 }
 var checkConnectorCommand = new Command().name("check-connector").description(
@@ -7739,13 +7860,14 @@ How connectors work:
       }
       if (!urlLookup) {
         throw new Error(
-          `No connector found for URL: ${opts.url} \u2014 no registered base URL matches this URL`
+          "No connector found for provided URL \u2014 no registered base URL matches this URL"
         );
       }
+      const displayUrl = stripUrlQueryAndFragment(opts.url);
       connectorType = urlLookup.connectorType;
       envName = opts.envName ?? urlLookup.envName;
       console.log(
-        `URL ${opts.url} matches the ${CONNECTOR_TYPES[connectorType].label} connector (type: ${connectorType}).`
+        `URL ${displayUrl} matches the ${CONNECTOR_TYPES[connectorType].label} connector (type: ${connectorType}).`
       );
       console.log(`  Matched base URL: ${urlLookup.matchedBase}`);
       console.log(`  Relative path:    ${urlLookup.relativePath}`);
@@ -7794,11 +7916,13 @@ How connectors work:
       );
     }
     console.log("");
-    if (urlLookup) {
+    const diagnosedUrl = opts.url;
+    if (urlLookup && diagnosedUrl) {
       await resolvePermissionFromUrl(
         connectorType,
         label,
         opts.method,
+        diagnosedUrl,
         urlLookup.relativePath,
         urlLookup.matchedBase,
         urlLookup.routingConfig,
@@ -7816,15 +7940,15 @@ How connectors work:
     }
     const args = [];
     if (opts.url) {
-      args.push(`--url ${opts.url}`);
+      args.push(`--url ${shellQuoteArg(stripUrlQueryAndFragment(opts.url))}`);
       if (opts.method !== "GET") {
-        args.push(`--method ${opts.method}`);
+        args.push(`--method ${shellQuoteArg(opts.method)}`);
       }
     } else {
-      args.push(`--env-name ${envName}`);
+      args.push(`--env-name ${shellQuoteArg(envName)}`);
     }
     if (opts.checkPermission) {
-      args.push(`--check-permission ${opts.checkPermission}`);
+      args.push(`--check-permission ${shellQuoteArg(opts.checkPermission)}`);
     }
     console.log(
       `To re-diagnose after changes, run: zero doctor check-connector ${args.join(" ")}`
@@ -7990,7 +8114,7 @@ function hostnameMatchesConnectorRef(url, connectorRef) {
   if (labels.length < 2) return false;
   return hostLabelMatchesConnectorRef(labels[labels.length - 2], connectorRef);
 }
-function stripUrlQueryAndFragment(url) {
+function stripUrlQueryAndFragment2(url) {
   const queryIndex = url.indexOf("?");
   const fragmentIndex = url.indexOf("#");
   let end = url.length;
@@ -7998,8 +8122,11 @@ function stripUrlQueryAndFragment(url) {
   if (fragmentIndex !== -1) end = Math.min(end, fragmentIndex);
   return url.slice(0, end);
 }
+function stripTrailingSlash(value) {
+  return value.endsWith("/") ? value.slice(0, -1) : value;
+}
 function rawPathFromDeniedUrl(url) {
-  const urlWithoutQuery = stripUrlQueryAndFragment(url);
+  const urlWithoutQuery = stripUrlQueryAndFragment2(url);
   const schemeEnd = urlWithoutQuery.indexOf("://");
   const authorityStart = schemeEnd === -1 ? 0 : schemeEnd + 3;
   const pathStart = urlWithoutQuery.indexOf("/", authorityStart);
@@ -8010,6 +8137,7 @@ function matchApiBaseUrl(url, apiBase) {
   if (directMatch) {
     return {
       apiBase,
+      decisionBase: apiBase,
       displayBase: directMatch.displayBase,
       relativePath: directMatch.relativePath,
       score: directMatch.score
@@ -8021,6 +8149,7 @@ function matchApiBaseUrl(url, apiBase) {
     if (resolvedMatch) {
       return {
         apiBase,
+        decisionBase: resolvedBase,
         displayBase: resolvedMatch.displayBase,
         relativePath: resolvedMatch.relativePath,
         score: resolvedMatch.score
@@ -8034,6 +8163,7 @@ function matchApiBaseUrl(url, apiBase) {
   if (!patternMatch) return null;
   return {
     apiBase,
+    decisionBase: patternBase,
     displayBase: apiBase,
     relativePath: patternMatch.relativePath,
     score: patternMatch.score
@@ -8057,11 +8187,76 @@ function findBestBaseMatch(url, deniedUrl, connectorRef, apis) {
   const api = unresolvedWholeBaseApis[0];
   return {
     apiBase: api.base,
+    decisionBase: deniedUrl.origin,
     displayBase: api.base,
     relativePath: rawPathFromDeniedUrl(url),
     score: 0
   };
 }
+function routesForMatchedBase(apis, apiBase) {
+  const normalizedApiBase = stripTrailingSlash(apiBase);
+  const routes = [];
+  for (const api of apis) {
+    if (stripTrailingSlash(api.base) === normalizedApiBase) {
+      routes.push(...api.routes);
+    }
+  }
+  return routes;
+}
+function routesToDecisionPermissions2(routes) {
+  const rulesByPermission = /* @__PURE__ */ new Map();
+  for (const route of routes) {
+    const rules = rulesByPermission.get(route.permissionName);
+    if (rules) {
+      rules.push(route.rule);
+    } else {
+      rulesByPermission.set(route.permissionName, [route.rule]);
+    }
+  }
+  return [...rulesByPermission.entries()].map(([name, rules]) => {
+    return { name, rules };
+  });
+}
+function buildDecisionFirewall(connectorRef, base, permissions) {
+  return [
+    {
+      name: connectorRef,
+      apis: [
+        {
+          base,
+          auth: {},
+          permissions
+        }
+      ]
+    }
+  ];
+}
+function buildAllDeniedNetworkPolicies(connectorRef, permissions) {
+  return {
+    [connectorRef]: {
+      allow: [],
+      deny: permissions.map((permission) => {
+        return permission.name;
+      }),
+      ask: [],
+      unknownPolicy: "deny"
+    }
+  };
+}
+function findDeniedDecisionPermissions(connectorRef, method, url, match, apis) {
+  const routes = routesForMatchedBase(apis, match.apiBase);
+  const permissions = routesToDecisionPermissions2(routes);
+  const decision = matchFirewallRequestDecision(
+    buildDecisionFirewall(connectorRef, match.decisionBase, permissions),
+    method,
+    url,
+    buildAllDeniedNetworkPolicies(connectorRef, permissions)
+  );
+  if (decision.kind !== "block" || decision.reason !== "permission_denied") {
+    return [];
+  }
+  return [...decision.permissions];
+}
 function printPermissionChangeGuidance(connectorRef, permissions) {
   const sortedPermissions = [...permissions].sort();
   if (sortedPermissions.length === 1) {
@@ -8146,11 +8341,12 @@ Notes:
           `No registered ${label} base URL matches the provided URL.`
         );
       }
-      const permissions = findMatchingRoutingPermissions(
+      const permissions = findDeniedDecisionPermissions(
+        connectorRef,
         method,
-        match.relativePath,
-        metadata.apis,
-        { apiBase: match.apiBase, serviceName: connectorRef }
+        opts.url,
+        match,
+        metadata.apis
       );
       console.log(
         `The ${label} permission filtered ${method} ${match.relativePath} relative to base URL ${match.displayBase}.`
@@ -8449,4 +8645,4 @@ Notes:
 export {
   zeroDoctorCommand
 };
-//# sourceMappingURL=doctor-GRCIJPEA.js.map
+//# sourceMappingURL=doctor-F5ETPBLW.js.map