@uniformdev/cli 20.42.1 → 20.42.2-alpha.6

package/dist/index.mjs

@@ -35,7 +35,7 @@ import { writeFileSync } from "fs";
 import { join as join3 } from "path";
 
 // src/auth/getBearerToken.ts
-import inquirer from "inquirer";
+import { confirm, password } from "@inquirer/prompts";
 import jwt from "jsonwebtoken";
 import open from "open";
 
@@ -44,24 +44,17 @@ var makeUrl = (baseUrl, path8) => [baseUrl.trim().replace(/\/+$/, ""), path8.tri
 
 // src/auth/getBearerToken.ts
 async function getBearerToken(baseUrl) {
-  const { canOpen } = await inquirer.prompt([
-    {
-      type: "confirm",
-      name: "canOpen",
-      message: "Can we open a browser window to get a Uniform auth token?"
-    }
-  ]);
+  const canOpen = await confirm({
+    message: "Can we open a browser window to get a Uniform auth token?"
+  });
   if (canOpen) {
-    open(makeUrl(baseUrl, "/cli-login"));
+    await open(makeUrl(baseUrl, "/cli-login"));
   }
-  const tokenAnswer = await inquirer.prompt([
-    {
-      type: "password",
-      name: "authToken",
-      message: "Paste your Uniform auth token"
-    }
-  ]);
-  const authToken = tokenAnswer.authToken.trim();
+  const tokenAnswer = await password({
+    message: "Paste your Uniform auth token",
+    mask: true
+  });
+  const authToken = tokenAnswer.trim();
   if (!authToken) {
     throw new Error("No auth token provided.");
   }
@@ -274,6 +267,55 @@ var createClient = (baseUrl, authToken) => {
   };
 };
 
+// src/environments.ts
+import { select } from "@inquirer/prompts";
+var ENVIRONMENT_HOSTS = {
+  usa: {
+    api: "https://uniform.app",
+    global: "https://uniform.global",
+    ai: "https://ai.uniform.global"
+  },
+  eu: {
+    api: "https://eu.uniform.app",
+    global: "https://eu.uniform.global",
+    ai: "https://ai.eu.uniform.global"
+  }
+};
+async function selectEnvironment(explicitParams) {
+  let needToPrompt = false;
+  if (!explicitParams.api && !explicitParams.global && !explicitParams.ai) {
+    needToPrompt = true;
+  }
+  let environment = "usa";
+  if (needToPrompt) {
+    environment = await select({
+      message: "Choose your data residency region",
+      choices: [
+        {
+          name: "USA (uniform.app)",
+          value: "usa"
+        },
+        {
+          name: "EU (eu.uniform.app)",
+          value: "eu"
+        }
+      ],
+      default: "usa"
+    });
+  }
+  const result = { ...ENVIRONMENT_HOSTS[environment] };
+  if (explicitParams.api !== void 0) {
+    result.api = explicitParams.api;
+  }
+  if (explicitParams.global !== void 0) {
+    result.global = explicitParams.global;
+  }
+  if (explicitParams.ai !== void 0) {
+    result.ai = explicitParams.ai;
+  }
+  return result;
+}
+
 // src/fs.ts
 import { promises as fs } from "fs";
 async function readJSON(path8) {
@@ -313,8 +355,8 @@ async function fileExists(filePath) {
 }
 
 // src/projects/getOrCreateProject.ts
+import { input, select as select2 } from "@inquirer/prompts";
 import fs2, { existsSync, mkdirSync } from "fs";
-import inquirer2 from "inquirer";
 import path from "path";
 import slugify from "slugify";
 var newProjectId = "$new";
@@ -372,22 +414,17 @@ async function getNewProjectName({
 }) {
   let projectName = explicitName;
   if (!projectName) {
-    const answer = await inquirer2.prompt([
-      {
-        type: "input",
-        name: "name",
-        message: "What's your project name?",
-        validate(input) {
-          try {
-            validateProjectName(input, checkTargetDir, explicitTargetDir);
-            return true;
-          } catch (e) {
-            return e.message;
-          }
+    projectName = await input({
+      message: "What's your project name?",
+      validate(value) {
+        try {
+          validateProjectName(value, checkTargetDir, explicitTargetDir);
+          return true;
+        } catch (e) {
+          return e.message;
         }
       }
-    ]);
-    projectName = answer.name;
+    });
   }
   projectName = projectName.trim();
   const targetDir = validateProjectName(projectName, checkTargetDir, explicitTargetDir);
@@ -415,17 +452,13 @@ async function chooseExistingProject({
     value: t.id
   }));
   const choices = createNew ? [{ name: "Create new project...", value: newProjectId }].concat(projects) : projects;
-  const result = await inquirer2.prompt([
-    {
-      type: "list",
-      name: "projectId",
-      message: "Choose a project",
-      choices
-    }
-  ]);
+  const projectId = await select2({
+    message: "Choose a project",
+    choices
+  });
   return {
-    projectId: result.projectId,
-    projectName: projects.find((p) => p.value === result.projectId)?.name
+    projectId,
+    projectName: projects.find((p) => p.value === projectId)?.name
   };
 }
 function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
@@ -995,21 +1028,17 @@ function createPublishStatusSyncEngineConsoleLogger(options) {
 }
 
 // src/teams/chooseTeam.ts
-import inquirer3 from "inquirer";
+import { select as select3 } from "@inquirer/prompts";
 async function chooseTeam(user, prompt, telemetry) {
-  const result = await inquirer3.prompt([
-    {
-      type: "list",
-      name: "teamId",
-      message: prompt,
-      choices: user.teams.map((team) => ({
-        name: team.team.name,
-        value: team.team.id
-      }))
-    }
-  ]);
-  telemetry.send("team picked", { teamId: result.teamId });
-  return result;
+  const teamId = await select3({
+    message: prompt,
+    choices: user.teams.map((team) => ({
+      name: team.team.name,
+      value: team.team.id
+    }))
+  });
+  telemetry.send("team picked", { teamId });
+  return { teamId };
 }
 
 // src/auth/user-info.ts
@@ -1142,13 +1171,13 @@ var package_default = {
     graphql: "16.9.0",
     "graphql-request": "6.1.0",
     "image-size": "^1.2.1",
-    inquirer: "12.9.4",
-    "isomorphic-git": "1.33.1",
+    "@inquirer/prompts": "^7.10.1",
+    "isomorphic-git": "1.35.0",
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.2",
     mitt: "^3.0.1",
     "normalize-newline": "^4.1.0",
-    open: "10.1.0",
+    open: "10.2.0",
     ora: "8.0.1",
     "p-queue": "7.3.4",
     "posthog-node": "4.11.3",
@@ -1162,7 +1191,6 @@ var package_default = {
   },
   devDependencies: {
     "@types/diff": "5.0.9",
-    "@types/inquirer": "9.0.7",
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/node": "24.3.1",
@@ -1227,7 +1255,7 @@ var Telemetry = class {
 };
 
 // src/commands/ai/lib/agentUtils.ts
-import inquirer4 from "inquirer";
+import { select as select4 } from "@inquirer/prompts";
 import * as path2 from "path";
 async function selectAgent(agentOption, options = {}) {
   const { allowInteractive = true } = options;
@@ -1237,19 +1265,15 @@ async function selectAgent(agentOption, options = {}) {
   if (!allowInteractive) {
     throw new Error("Agent type must be specified when running in non-interactive mode. Use --agent flag.");
   }
-  const { agentType } = await inquirer4.prompt([
-    {
-      type: "list",
-      name: "agentType",
-      message: "Which AI development assistant are you using?",
-      choices: [
-        { name: "Cursor", value: "cursor" },
-        { name: "Claude Desktop", value: "claude" },
-        { name: "GitHub Copilot (VS Code)", value: "copilot" },
-        { name: "Other AI assistant", value: "other" }
-      ]
-    }
-  ]);
+  const agentType = await select4({
+    message: "Which AI development assistant are you using?",
+    choices: [
+      { name: "Cursor", value: "cursor" },
+      { name: "Claude Desktop", value: "claude" },
+      { name: "GitHub Copilot (VS Code)", value: "copilot" },
+      { name: "Other AI assistant", value: "other" }
+    ]
+  });
   return agentType;
 }
 function getRulesDirectory(agentType, customDir) {
@@ -1380,9 +1404,6 @@ function getExistingServers(config2) {
 }
 
 // src/commands/ai/commands/mcp/install.ts
-var stableApiHost = "https://uniform.app";
-var apiHostDefault = process.env.UNIFORM_CLI_BASE_URL || stableApiHost;
-var aiApiHostDefault = process.env.UNIFORM_AI_API_HOST || "https://ai.uniform.global";
 var InstallMcpCommand = {
   command: "install",
   describe: "Install Uniform MCP server configuration (use --team, --project, and --apiKey for non-interactive mode)",
@@ -1405,16 +1426,13 @@ var InstallMcpCommand = {
       describe: "Team ID to use (skips team selection)",
       type: "string"
     }).option("apiHost", {
-      describe: `Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or ${stableApiHost}. Supports dotenv.`,
-      default: apiHostDefault,
-      demandOption: true,
+      describe: `Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or https://uniform.app. Supports dotenv.`,
       type: "string"
     }).option("apiKey", {
       describe: "Uniform API key with write access rights (skips API key generation)",
       type: "string"
     }).option("aiApiHost", {
       describe: "Uniform AI API host. Defaults to UNIFORM_AI_API_HOST env or https://ai.uniform.global",
-      default: aiApiHostDefault,
       type: "string"
     })
   ),
@@ -1425,6 +1443,13 @@ var InstallMcpCommand = {
     try {
       console.log(blue("\n\u{1F680} Welcome to Uniform MCP Server Installer\n"));
       const isNonInteractive = project && apiKey;
+      const apiHostWithEnv = apiHost || process.env.UNIFORM_CLI_BASE_URL;
+      const aiApiHostWithEnv = aiApiHost || process.env.UNIFORM_AI_API_HOST;
+      const resolvedApiHosts = await selectEnvironment({
+        api: apiHostWithEnv,
+        ai: aiApiHostWithEnv
+      });
+      telemetry.send("environment selected", { apiHost: resolvedApiHosts.api });
       let teamId;
       let projectId;
       let projectName;
@@ -1438,13 +1463,13 @@ var InstallMcpCommand = {
         writeApiKey = apiKey;
       } else {
         console.log(yellow3("Running in interactive mode team and project arguments are ignored"));
-        const auth = await getBearerToken(apiHost);
+        const auth = await getBearerToken(resolvedApiHosts.api);
         const { authToken } = auth;
-        const uniformClient = createClient(apiHost, authToken);
+        const uniformClient = createClient(resolvedApiHosts.api, authToken);
         let done2 = await spin("Fetching user information...");
         user = await fetchUserAndEnsureFirstTeamExists({
           auth,
-          baseUrl: apiHost,
+          baseUrl: resolvedApiHosts.api,
           spin,
           telemetry
         });
@@ -1509,7 +1534,12 @@ Selected agent: ${agentType}`));
       done = await spin("Reading existing MCP configuration...");
       const existingConfig = readOrCreateMcpConfig(mcpConfigPath, agentType);
       await done();
-      const uniformServer = createUniformMcpServerConfig(writeApiKey, projectId, aiApiHost, apiHost);
+      const uniformServer = createUniformMcpServerConfig(
+        writeApiKey,
+        projectId,
+        resolvedApiHosts.ai,
+        resolvedApiHosts.api
+      );
       const mergedConfig = mergeMcpConfig(existingConfig, uniformServer, agentType);
       done = await spin("Updating MCP configuration...");
       writeFileSync(mcpConfigPath, JSON.stringify(mergedConfig, null, 2));
@@ -1591,9 +1621,9 @@ import yargs2 from "yargs";
 import { blue as blue3, green as green4, red as red4 } from "colorette";
 
 // src/commands/ai/lib/rulesInstaller.ts
+import { checkbox, confirm as confirm2, select as select5, Separator } from "@inquirer/prompts";
 import { blue as blue2, bold, cyan, gray as gray2, green as green3, yellow as yellow4 } from "colorette";
 import { promises as fs6 } from "fs";
-import inquirer5 from "inquirer";
 import * as path4 from "path";
 
 // src/commands/ai/lib/frameworkDetection.ts
@@ -1825,25 +1855,20 @@ async function installRules(options = {}, spin) {
     const agentType = await selectAgent(options.agent);
     let installLocation;
     if (agentType === "copilot") {
-      const { location } = await inquirer5.prompt([
-        {
-          type: "list",
-          name: "location",
-          message: "Where would you like to install the instructions?",
-          choices: [
-            {
-              name: "Workspace (.github/instructions) - Available only in this workspace",
-              value: "workspace"
-            },
-            {
-              name: "User profile - Available across all workspaces (requires VS Code profile setup)",
-              value: "user"
-            }
-          ],
-          default: "workspace"
-        }
-      ]);
-      installLocation = location;
+      installLocation = await select5({
+        message: "Where would you like to install the instructions?",
+        choices: [
+          {
+            name: "Workspace (.github/instructions) - Available only in this workspace",
+            value: "workspace"
+          },
+          {
+            name: "User profile - Available across all workspaces (requires VS Code profile setup)",
+            value: "user"
+          }
+        ],
+        default: "workspace"
+      });
     }
     const selectedRules = await selectRules(availableRules, frameworkDetection);
     if (selectedRules.length === 0) {
@@ -1892,14 +1917,10 @@ async function selectRules(availableRules, frameworkDetection) {
     });
     console.log("");
   }
-  const { installEssential } = await inquirer5.prompt([
-    {
-      type: "confirm",
-      name: "installEssential",
-      message: "Install all essential rules? (Recommended)",
-      default: true
-    }
-  ]);
+  const installEssential = await confirm2({
+    message: "Install all essential rules? (Recommended)",
+    default: true
+  });
   const suggestedFrameworkRules = [];
   if (frameworkDetection?.suggestedRules && frameworkDetection.suggestedRules.length > 0) {
     console.log(cyan(`\u{1F527} Framework-Specific Rules for ${getFrameworkDescription(frameworkDetection)}:`));
@@ -1912,14 +1933,10 @@ async function selectRules(availableRules, frameworkDetection) {
     });
     if (suggestedFrameworkRules.length > 0) {
       console.log("");
-      const { installFramework } = await inquirer5.prompt([
-        {
-          type: "confirm",
-          name: "installFramework",
-          message: "Install recommended framework-specific rules? (Highly recommended)",
-          default: true
-        }
-      ]);
+      const installFramework = await confirm2({
+        message: "Install recommended framework-specific rules? (Highly recommended)",
+        default: true
+      });
       if (installFramework) {
         console.log(green3(`\u2705 Added ${suggestedFrameworkRules.length} framework-specific rule(s)
 `));
@@ -1940,29 +1957,25 @@ async function selectRules(availableRules, frameworkDetection) {
       (category) => groupedRules[category].filter((rule) => !alreadySelectedNames.includes(rule.name))
     );
     if (availableAdditionalRules.length > 0) {
-      const { additionalRules } = await inquirer5.prompt([
-        {
-          type: "checkbox",
-          name: "additionalRules",
-          message: "Select additional rules to install:",
-          choices: otherCategories.flatMap((category) => {
-            const categoryRules = groupedRules[category].filter(
-              (rule) => !alreadySelectedNames.includes(rule.name)
-            );
-            if (categoryRules.length === 0) {
-              return [];
-            }
-            return [
-              new inquirer5.Separator(cyan(`--- ${getCategoryDisplayName(category)} ---`)),
-              ...categoryRules.map((rule) => ({
-                name: `${rule.displayName} - ${gray2(rule.description)}`,
-                value: rule,
-                short: rule.displayName
-              }))
-            ];
-          })
-        }
-      ]);
+      const additionalRules = await checkbox({
+        message: "Select additional rules to install:",
+        choices: otherCategories.flatMap((category) => {
+          const categoryRules = groupedRules[category].filter(
+            (rule) => !alreadySelectedNames.includes(rule.name)
+          );
+          if (categoryRules.length === 0) {
+            return [];
+          }
+          return [
+            new Separator(cyan(`--- ${getCategoryDisplayName(category)} ---`)),
+            ...categoryRules.map((rule) => ({
+              name: `${rule.displayName} - ${gray2(rule.description)}`,
+              value: rule,
+              short: rule.displayName
+            }))
+          ];
+        })
+      });
       selectedRules.push(...additionalRules);
     }
   }
@@ -10436,7 +10449,7 @@ var IntegrationCommand = {
 };
 
 // src/commands/new/commands/new.ts
-import inquirer6 from "inquirer";
+import { select as select6 } from "@inquirer/prompts";
 
 // src/npm.ts
 import execa from "execa";
@@ -10516,12 +10529,10 @@ async function newHandler({
   spin,
   projectName,
   apiHost,
+  edgeApiHost,
   outputPath,
   telemetry
 }) {
-  console.info(
-    `Welcome to Uniform New! Let's create ${projectName ? `"${projectName}"` : "a new project"}... \u2764\uFE0F`
-  );
   const auth = await getBearerToken(apiHost);
   const { authToken } = auth;
   const uniformClient = createClient(apiHost, authToken);
@@ -10531,23 +10542,19 @@ async function newHandler({
     `Hey ${user.name}! Choose a Uniform team for your new project`,
     telemetry
   );
-  const { frontendFramework } = await inquirer6.prompt([
-    {
-      type: "list",
-      name: "frontendFramework",
-      message: "Choose your preferred framework",
-      choices: [
-        {
-          name: "Next.JS",
-          value: "next"
-        },
-        {
-          name: "Nuxt.JS",
-          value: "nuxt"
-        }
-      ]
-    }
-  ]);
+  const frontendFramework = await select6({
+    message: "Choose your preferred framework",
+    choices: [
+      {
+        name: "Next.JS",
+        value: "next"
+      },
+      {
+        name: "Nuxt.JS",
+        value: "nuxt"
+      }
+    ]
+  });
   telemetry.send("framework picked", { frontendFramework });
   const starters = {
     next: {
@@ -10583,16 +10590,11 @@ async function newHandler({
     }
   };
   let githubBranch = void 0;
-  const {
-    starter: { githubUri, serverUrl, previewPath, installEnv }
-  } = await inquirer6.prompt([
-    {
-      type: "list",
-      name: "starter",
-      message: `Choose one of the Uniform starters (for ${frontendFramework === "next" ? "Next.JS" : "Nuxt.JS"})`,
-      choices: Object.values(starters[frontendFramework])
-    }
-  ]);
+  const starter = await select6({
+    message: `Choose one of the Uniform starters (for ${frontendFramework === "next" ? "Next.JS" : "Nuxt.JS"})`,
+    choices: Object.values(starters[frontendFramework])
+  });
+  const { githubUri, serverUrl, previewPath, installEnv } = starter;
   if (process.env.UNIFORM_ALTERNATIVE_STARTER_BRANCH) {
     console.log(
       `Using alternative starter branch for repo ${githubUri}: "${process.env.UNIFORM_ALTERNATIVE_STARTER_BRANCH}"`
@@ -10622,10 +10624,12 @@ async function newHandler({
     ["UNIFORM_CLI_API_KEY", writeApiKey],
     ...installEnv
   ].concat(
-    apiHost !== "https://uniform.app" ? [
+    apiHost !== ENVIRONMENT_HOSTS.usa.api ? [
       ["UNIFORM_CLI_BASE_URL", apiHost],
       ["UNIFORM_API_HOST", apiHost]
     ] : []
+  ).concat(
+    edgeApiHost !== ENVIRONMENT_HOSTS.usa.global ? [["UNIFORM_CLI_BASE_EDGE_URL", edgeApiHost]] : []
   ).map(([name, value]) => `${name}='${value}'`).join("\n") + "\n";
   await done();
   const cloneStartTimestamp = Date.now();
@@ -10670,8 +10674,8 @@ npm run dev
 }
 
 // src/commands/new/commands/new-mesh-integration.ts
+import { input as input2 } from "@inquirer/prompts";
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
-import inquirer7 from "inquirer";
 import path7 from "path";
 import slugify2 from "slugify";
 async function newMeshIntegrationHandler({
@@ -10690,32 +10694,33 @@ async function newMeshIntegrationHandler({
     `Hey ${user.name}! Choose a Uniform team to register your integration`,
     telemetry
   );
-  const answer = await inquirer7.prompt([
-    {
-      type: "input",
-      name: "name",
-      message: "Please name your integration",
-      validate(input) {
-        try {
-          validateIntegrationName(input, outputPath);
-          return true;
-        } catch (e) {
-          return e.message;
-        }
+  const name = await input2({
+    message: "Please name your integration",
+    validate(value) {
+      try {
+        validateIntegrationName(value, outputPath);
+        return true;
+      } catch (e) {
+        return e.message;
       }
     }
-  ]);
-  const name = answer.name;
-  const { targetDir, typeSlug } = validateIntegrationName(answer.name, outputPath);
+  });
+  const { targetDir, typeSlug } = validateIntegrationName(name, outputPath);
   const githubBranch = process.env.UNIFORM_ALTERNATIVE_MESH_INTEGRATION_BRANCH;
   if (githubBranch) {
     console.log(`Using alternative mesh integration branch: "${githubBranch}"`);
   }
+  const envVars = [["UNIFORM_CLI_TEAM_ID", teamId]];
+  if (apiHost !== ENVIRONMENT_HOSTS.usa.api) {
+    envVars.push(["UNIFORM_CLI_BASE_URL", apiHost]);
+  }
+  const dotEnvFile = envVars.length > 0 ? envVars.map(([name2, value]) => `${name2}='${value}'`).join("\n") + "\n" : void 0;
   const { runNpmInstall } = await cloneStarter({
     githubPath: `uniformdev/examples/mesh/mesh-integration`,
     spin,
     targetDir,
-    githubBranch
+    githubBranch,
+    dotEnvFile
   });
   let done = await spin("Registering integration to team...");
   const pathToManifest = path7.resolve(targetDir, "mesh-manifest.json");
@@ -10786,8 +10791,6 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
 }
 
 // src/commands/new/index.ts
-var stableApiHost2 = "https://uniform.app";
-var apiHostDefault2 = process.env.UNIFORM_CLI_BASE_URL || stableApiHost2;
 var disableTelemetryDefault = !["", "0", "false", "no"].includes(
   process.env.UNIFORM_CLI_DISABLE_TELEMETRY || ""
 );
@@ -10798,9 +10801,10 @@ var NewCmd = {
       describe: "Name of a project",
       type: "string"
     }).option("apiHost", {
-      describe: `Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or ${stableApiHost2}. Supports dotenv.`,
-      default: apiHostDefault2,
-      demandOption: true,
+      describe: `Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or https://uniform.app. Supports dotenv.`,
+      type: "string"
+    }).option("edgeApiHost", {
+      describe: `Uniform edge API host. Defaults to UNIFORM_CLI_BASE_EDGE_URL env or https://uniform.global. Supports dotenv.`,
       type: "string"
     }).option("outputPath", {
       alias: "o",
@@ -10814,11 +10818,26 @@ var NewCmd = {
     })
   ),
   describe: "Start a new Uniform project",
-  handler: async function({ name, apiHost, outputPath, disableTelemetry }) {
+  handler: async function({ name, apiHost, edgeApiHost, outputPath, disableTelemetry }) {
     const { stopAllSpinners, spin } = makeSpinner();
-    const telemetry = new Telemetry("cli new", disableTelemetry || apiHost !== stableApiHost2);
+    const telemetry = new Telemetry("cli new", disableTelemetry);
     try {
-      await newHandler({ spin, projectName: name, apiHost, outputPath, telemetry });
+      const apiHostWithEnv = apiHost || process.env.UNIFORM_CLI_BASE_URL;
+      const edgeApiHostWithEnv = edgeApiHost || process.env.UNIFORM_CLI_BASE_EDGE_URL;
+      const resolvedApiHosts = await selectEnvironment({
+        api: apiHostWithEnv,
+        global: edgeApiHostWithEnv
+      });
+      telemetry.send("environment selected", { apiHost: resolvedApiHosts.api });
+      console.info(`Welcome to Uniform New! Let's create ${name ? `"${name}"` : "a new project"}... \u2764\uFE0F`);
+      await newHandler({
+        spin,
+        projectName: name,
+        apiHost: resolvedApiHosts.api,
+        edgeApiHost: resolvedApiHosts.global,
+        outputPath,
+        telemetry
+      });
       stopAllSpinners();
       process.exit(0);
     } catch (err) {
@@ -10835,9 +10854,7 @@ var NewMeshCmd = {
   command: "new-integration",
   builder: (y) => withConfiguration(
     y.option("apiHost", {
-      describe: `Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or ${stableApiHost2}. Supports dotenv.`,
-      default: apiHostDefault2,
-      demandOption: true,
+      describe: `Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or https://uniform.app. Supports dotenv.`,
       type: "string"
     }).option("outputPath", {
       alias: "o",
@@ -10853,9 +10870,14 @@ var NewMeshCmd = {
   describe: "Start a new Uniform project",
   handler: async function({ apiHost, outputPath, disableTelemetry }) {
     const { stopAllSpinners, spin } = makeSpinner();
-    const telemetry = new Telemetry("cli new mesh", disableTelemetry || apiHost !== stableApiHost2);
+    const telemetry = new Telemetry("cli new mesh", disableTelemetry);
     try {
-      await newMeshIntegrationHandler({ spin, apiHost, outputPath, telemetry });
+      const apiHostWithEnv = apiHost || process.env.UNIFORM_CLI_BASE_URL;
+      const resolvedApiHosts = await selectEnvironment({
+        api: apiHostWithEnv
+      });
+      telemetry.send("environment selected", { apiHost: resolvedApiHosts.api });
+      await newMeshIntegrationHandler({ spin, apiHost: resolvedApiHosts.api, outputPath, telemetry });
       stopAllSpinners();
       process.exit(0);
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.42.1",
+  "version": "20.42.2-alpha.6+f523a72c7e",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -26,14 +26,15 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
+    "@inquirer/prompts": "^7.10.1",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.42.1",
-    "@uniformdev/canvas": "20.42.1",
-    "@uniformdev/context": "20.42.1",
-    "@uniformdev/files": "20.42.1",
-    "@uniformdev/project-map": "20.42.1",
-    "@uniformdev/redirect": "20.42.1",
-    "@uniformdev/richtext": "20.42.1",
+    "@uniformdev/assets": "20.42.2-alpha.6+f523a72c7e",
+    "@uniformdev/canvas": "20.42.2-alpha.6+f523a72c7e",
+    "@uniformdev/context": "20.42.2-alpha.6+f523a72c7e",
+    "@uniformdev/files": "20.42.2-alpha.6+f523a72c7e",
+    "@uniformdev/project-map": "20.42.2-alpha.6+f523a72c7e",
+    "@uniformdev/redirect": "20.42.2-alpha.6+f523a72c7e",
+    "@uniformdev/richtext": "20.42.2-alpha.6+f523a72c7e",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -47,13 +48,12 @@
     "graphql": "16.9.0",
     "graphql-request": "6.1.0",
     "image-size": "^1.2.1",
-    "inquirer": "12.9.4",
-    "isomorphic-git": "1.33.1",
+    "isomorphic-git": "1.35.0",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "9.0.2",
     "mitt": "^3.0.1",
     "normalize-newline": "^4.1.0",
-    "open": "10.1.0",
+    "open": "10.2.0",
     "ora": "8.0.1",
     "p-queue": "7.3.4",
     "posthog-node": "4.11.3",
@@ -67,7 +67,6 @@
   },
   "devDependencies": {
     "@types/diff": "5.0.9",
-    "@types/inquirer": "9.0.7",
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
     "@types/node": "24.3.1",
@@ -82,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d471dc57b0fec6ddcc8377bb6aeca8afd7221dd4"
+  "gitHead": "f523a72c7e64beca747f2146e1dfe62573a2e1a5"
 }