@uniformdev/cli 20.31.1-alpha.0 → 20.31.1-alpha.1

package/dist/index.mjs

@@ -31,7 +31,7 @@ import yargs from "yargs";
 
 // src/commands/ai/commands/mcp/install.ts
 import { blue, green as green2, red as red3, yellow as yellow2 } from "colorette";
-import { existsSync as existsSync3, readFileSync, writeFileSync } from "fs";
+import { existsSync as existsSync2, readFileSync, writeFileSync } from "fs";
 import inquirer4 from "inquirer";
 import { join as join3 } from "path";
 
@@ -272,6 +272,28 @@ var createClient = (baseUrl, authToken) => {
   };
 };
 
+// src/fs.ts
+import { promises as fs } from "fs";
+async function readJSON(path6) {
+  const fileContents = await fs.readFile(path6, "utf-8");
+  return JSON.parse(fileContents);
+}
+async function tryReadJSON(path6, missingValue = null) {
+  try {
+    const stat = await fs.stat(path6);
+    return stat.isFile() ? await readJSON(path6) : missingValue;
+  } catch {
+    return missingValue;
+  }
+}
+async function ensureDirectoryExists(dirPath) {
+  try {
+    await fs.access(dirPath);
+  } catch {
+    await fs.mkdir(dirPath, { recursive: true });
+  }
+}
+
 // src/spinner.ts
 import ora from "ora";
 var makeSpinner = () => {
@@ -357,7 +379,7 @@ import { extname, join } from "path";
 // src/util.ts
 import { cosmiconfigSync } from "cosmiconfig";
 import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
-import fs from "fs";
+import fs2 from "fs";
 var omit = (object, keys) => {
   const result = keys.reduce((current, key) => {
     const { [key]: _, ...rest } = current;
@@ -379,7 +401,7 @@ var loadConfig = (configPath) => {
     });
     let loadedConfig;
     if (configPath) {
-      if (!fs.existsSync(configPath)) {
+      if (!fs2.existsSync(configPath)) {
         throw new Error(
           `Invalid --config file path: ${configPath}. File does not exist.
 
@@ -491,9 +513,9 @@ ${e?.message}`));
 }
 
 // src/sync/package.ts
-import fs2 from "fs";
+import fs3 from "fs";
 function readUniformPackage(filename, assertExists) {
-  if (!assertExists && !fs2.existsSync(filename)) {
+  if (!assertExists && !fs3.existsSync(filename)) {
     return {};
   }
   const packageContents = readFileToObject(filename);
@@ -1050,81 +1072,13 @@ var Telemetry = class {
 // src/commands/ai/lib/agentUtils.ts
 import inquirer3 from "inquirer";
 import * as path from "path";
-
-// src/commands/ai/lib/directoryUtils.ts
-import { promises as fs3 } from "fs";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
-async function directoryExists(dirPath) {
-  try {
-    const stats = await fs3.stat(dirPath);
-    return stats.isDirectory();
-  } catch (error) {
-    console.error(error);
-    return false;
-  }
-}
-async function ensureDirectoryExists(dirPath) {
-  try {
-    await fs3.access(dirPath);
-  } catch {
-    await fs3.mkdir(dirPath, { recursive: true });
-  }
-}
-function ensureDirectoryExistsSync(dirPath) {
-  if (!existsSync2(dirPath)) {
-    mkdirSync2(dirPath, { recursive: true });
-  }
-}
-
-// src/commands/ai/lib/agentUtils.ts
-function detectAgent() {
-  if (process.env.CURSOR || process.env.CURSOR_USER || process.argv[0]?.includes("cursor")) {
-    return {
-      type: "cursor",
-      confidence: "high",
-      detected: true
-    };
-  }
-  if (process.env.CLAUDE_DESKTOP || process.argv[0]?.includes("claude")) {
-    return {
-      type: "claude",
-      confidence: "high",
-      detected: true
-    };
-  }
-  return {
-    type: "unknown",
-    confidence: "low",
-    detected: false
-  };
-}
 async function detectOrSelectAgent(agentOption, options = {}) {
   const { allowInteractive = true } = options;
   if (agentOption && agentOption !== "auto") {
     return agentOption;
   }
-  const detectionResult = detectAgent();
-  if (allowInteractive && detectionResult.type === "unknown") {
-    const hasCursorDir = await directoryExists(".cursor");
-    if (hasCursorDir) {
-      const { useDetected } = await inquirer3.prompt([
-        {
-          type: "confirm",
-          name: "useDetected",
-          message: "Detected Cursor project. Install for Cursor?",
-          default: true
-        }
-      ]);
-      if (useDetected) {
-        return "cursor";
-      }
-    }
-  }
-  if (detectionResult.confidence === "high") {
-    return detectionResult.type;
-  }
   if (!allowInteractive) {
-    return detectionResult.type;
+    throw new Error("Agent type must be specified when running in non-interactive mode. Use --agent flag.");
   }
   const { agentType } = await inquirer3.prompt([
     {
@@ -1133,7 +1087,7 @@ async function detectOrSelectAgent(agentOption, options = {}) {
       message: "Which AI development assistant are you using?",
       choices: [
         { name: "Cursor", value: "cursor" },
-        { name: "Claude Code", value: "claude" },
+        { name: "Claude Desktop", value: "claude" },
         { name: "Other AI assistant", value: "other" }
       ]
     }
@@ -1158,7 +1112,6 @@ function getRulesDirectory(agentType, customDir) {
       };
     case "claude":
     case "other":
-    case "unknown":
     default:
       return {
         path: path.join(currentDir, "rules"),
@@ -1189,7 +1142,6 @@ function getMcpDirectory(agentType, customDir) {
         isCustom: false
       };
     case "other":
-    case "unknown":
     default:
       return {
         path: process.cwd(),
@@ -1215,7 +1167,7 @@ function createUniformMcpServer(apiKey, projectId, apiHost) {
   };
 }
 function readOrCreateMcpConfig(mcpConfigPath) {
-  if (existsSync3(mcpConfigPath)) {
+  if (existsSync2(mcpConfigPath)) {
     try {
       const existingConfig = readFileSync(mcpConfigPath, "utf8");
       return JSON.parse(existingConfig);
@@ -1273,14 +1225,13 @@ async function chooseProject(user, teamId, explicitProjectId) {
 }
 var InstallMcpCommand = {
   command: "install",
-  describe: "Install Uniform MCP server configuration",
+  describe: "Install Uniform MCP server configuration (use --team, --project, and --apiKey for non-interactive mode)",
   builder: (yargs38) => withConfiguration(
     yargs38.option("agent", {
       alias: "a",
-      describe: "Specify agent type (cursor, claude, auto)",
+      describe: "Specify agent type (cursor, claude, other)",
       type: "string",
-      default: "auto",
-      choices: ["cursor", "claude", "auto"]
+      choices: ["cursor", "claude", "other"]
     }).option("directory", {
       alias: "d",
       describe: "Custom installation directory for mcp.json",
@@ -1298,47 +1249,76 @@ var InstallMcpCommand = {
       default: apiHostDefault,
       demandOption: true,
       type: "string"
+    }).option("apiKey", {
+      describe: "Uniform API key with write access rights (skips API key generation)",
+      type: "string"
     })
   ),
   handler: async function(argv) {
-    const { agent, directory, project, team, apiHost } = argv;
+    const { agent, directory, project, team, apiHost, apiKey } = argv;
     const { stopAllSpinners, spin } = makeSpinner();
     const telemetry = new Telemetry("mcp");
     try {
       console.log(blue("\n\u{1F680} Welcome to Uniform MCP Server Installer\n"));
-      const auth = await getBearerToken(apiHost);
-      const { authToken } = auth;
-      const uniformClient = createClient(apiHost, authToken);
-      let done = await spin("Fetching user information...");
-      const user = await fetchUserAndEnsureFirstTeamExists({
-        auth,
-        baseUrl: apiHost,
-        spin,
-        telemetry
-      });
-      await done();
-      let teamId = team;
-      if (!teamId) {
-        const teamResult = await chooseTeam(
-          user,
-          `Hey ${user.name}! Choose a Uniform team for MCP integration`,
+      const isNonInteractive = team && project && apiKey;
+      let teamId;
+      let projectId;
+      let projectName;
+      let writeApiKey;
+      let user = null;
+      if (isNonInteractive) {
+        console.log(yellow2("Running in non-interactive mode"));
+        teamId = team;
+        projectId = project;
+        projectName = `Project ${projectId}`;
+        writeApiKey = apiKey;
+      } else {
+        console.log(yellow2("Running in interactive mode teamId and projectId are ignored"));
+        const auth = await getBearerToken(apiHost);
+        const { authToken } = auth;
+        const uniformClient = createClient(apiHost, authToken);
+        let done2 = await spin("Fetching user information...");
+        user = await fetchUserAndEnsureFirstTeamExists({
+          auth,
+          baseUrl: apiHost,
+          spin,
           telemetry
-        );
-        teamId = teamResult.teamId;
+        });
+        await done2();
+        teamId = team || "";
+        if (!teamId) {
+          const teamResult = await chooseTeam(
+            user,
+            `Hey ${user.name}! Choose a Uniform team for MCP integration`,
+            telemetry
+          );
+          teamId = teamResult.teamId;
+        }
+        const projectSelection = await chooseProject(user, teamId, project);
+        projectId = projectSelection.projectId;
+        projectName = projectSelection.projectName;
+        if (apiKey) {
+          writeApiKey = apiKey;
+          console.log(yellow2("Using provided API key"));
+        } else {
+          done2 = await spin("Generating API keys...");
+          const apiKeyResponse = await uniformClient.createApiKeys(teamId, projectId);
+          writeApiKey = apiKeyResponse.writeApiKey;
+          await done2();
+        }
       }
-      const { projectId, projectName } = await chooseProject(user, teamId, project);
-      done = await spin("Generating API keys...");
-      const { writeApiKey } = await uniformClient.createApiKeys(teamId, projectId);
-      await done();
-      const detectionResult = detectAgent();
-      const agentType = agent === "auto" || !agent ? detectionResult.type : agent;
+      const agentType = await detectOrSelectAgent(agent, {
+        allowInteractive: !isNonInteractive
+      });
       const directoryConfig = getMcpDirectory(agentType, directory);
       const mcpDirectory = directoryConfig.path;
       console.log(yellow2(`
-Detected agent: ${agentType}`));
+Selected agent: ${agentType}`));
       console.log(yellow2(`Installing MCP configuration to: ${mcpDirectory}
 `));
-      ensureDirectoryExistsSync(mcpDirectory);
+      let done = await spin("Creating directory if needed...");
+      await ensureDirectoryExists(mcpDirectory);
+      await done();
       const mcpConfigPath = join3(mcpDirectory, "mcp.json");
       done = await spin("Reading existing MCP configuration...");
       const existingConfig = readOrCreateMcpConfig(mcpConfigPath);
@@ -1359,7 +1339,11 @@ Detected agent: ${agentType}`));
         }
       }
       console.log(`\u{1F4C1} Configuration file: ${mcpConfigPath}`);
-      console.log(`\u{1F3E2} Team: ${user.teams.find((t) => t.team.id === teamId)?.team.name}`);
+      if (isNonInteractive) {
+        console.log(`\u{1F3E2} Team ID: ${teamId}`);
+      } else {
+        console.log(`\u{1F3E2} Team: ${user.teams.find((t) => t.team.id === teamId)?.team.name}`);
+      }
       console.log(`\u{1F4E6} Project: ${projectName} (${projectId})`);
       if (agentType === "cursor") {
         console.log(blue("\n\u{1F4CB} Next steps for Cursor:"));
@@ -1378,7 +1362,9 @@ Detected agent: ${agentType}`));
         agent: agentType,
         projectId,
         teamId,
-        customDirectory: directory ? "true" : "false"
+        customDirectory: directory ? "true" : "false",
+        customApiKey: apiKey ? "true" : "false",
+        nonInteractive: isNonInteractive ? "true" : "false"
       });
       stopAllSpinners();
       process.exit(0);
@@ -1717,7 +1703,7 @@ var InstallRulesCommand = {
       alias: "a",
       describe: "Specify agent type (cursor, claude, other)",
       type: "string",
-      default: "auto"
+      choices: ["cursor", "claude", "other"]
     }).option("directory", {
       alias: "d",
       describe: "Custom installation directory",
@@ -1730,7 +1716,7 @@ var InstallRulesCommand = {
       console.log(blue3("\n\u{1F680} Welcome to Uniform AI Rules Installer\n"));
       await installRules(
         {
-          agent: agent === "auto" ? void 0 : agent,
+          agent,
           directory
         },
         spin
@@ -9928,7 +9914,7 @@ Installing project dependencies...
 }
 
 // src/projects/getOrCreateProject.ts
-import fs6, { existsSync as existsSync4, mkdirSync as mkdirSync3 } from "fs";
+import fs6, { existsSync as existsSync3, mkdirSync as mkdirSync2 } from "fs";
 import inquirer6 from "inquirer";
 import path4 from "path";
 import slugify from "slugify";
@@ -10051,8 +10037,8 @@ function validateProjectName(projectName, checkTargetDir, explicitTargetDir) {
   }
   if (checkTargetDir) {
     let targetDir = explicitTargetDir ?? process.cwd();
-    if (!existsSync4(targetDir)) {
-      mkdirSync3(targetDir, { recursive: true });
+    if (!existsSync3(targetDir)) {
+      mkdirSync2(targetDir, { recursive: true });
     }
     if (fs6.readdirSync(targetDir).length > 0) {
       targetDir = path4.resolve(targetDir, projectNameSlug);
@@ -10223,7 +10209,7 @@ npm run dev
 }
 
 // src/commands/new/commands/new-mesh-integration.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readdirSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
 import inquirer8 from "inquirer";
 import path5 from "path";
 import slugify2 from "slugify";
@@ -10272,7 +10258,7 @@ async function newMeshIntegrationHandler({
   });
   let done = await spin("Registering integration to team...");
   const pathToManifest = path5.resolve(targetDir, "mesh-manifest.json");
-  if (!existsSync5(pathToManifest)) {
+  if (!existsSync4(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
   }
   const manifestContents = readFileSync3(pathToManifest, "utf-8");
@@ -10326,12 +10312,12 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
     throw new Error("Integration name cannot be shorter than 6 characters.");
   }
   let targetDir = explicitOutputPath ?? process.cwd();
-  if (!existsSync5(targetDir)) {
-    mkdirSync4(targetDir, { recursive: true });
+  if (!existsSync4(targetDir)) {
+    mkdirSync3(targetDir, { recursive: true });
   }
   if (readdirSync(targetDir).length > 0) {
     targetDir = path5.resolve(targetDir, typeSlug);
-    if (existsSync5(targetDir)) {
+    if (existsSync4(targetDir)) {
       throw new Error(`${targetDir} directory already exists, choose a different name.`);
     }
   }
@@ -11822,7 +11808,7 @@ var SyncCommand = {
 import { bold as bold3, gray as gray6, green as green7 } from "colorette";
 
 // src/updateCheck.ts
-import { existsSync as existsSync6, promises as fs7 } from "fs";
+import { existsSync as existsSync5, promises as fs7 } from "fs";
 import { get as getHttp } from "http";
 import { get as getHttps } from "https";
 import { tmpdir } from "os";
@@ -11834,7 +11820,7 @@ var encode = (value) => encodeURIComponent(value).replace(/^%40/, "@");
 var getFile = async (details, distTag) => {
   const rootDir = tmpdir();
   const subDir = join10(rootDir, "update-check");
-  if (!existsSync6(subDir)) {
+  if (!existsSync5(subDir)) {
     await fs7.mkdir(subDir);
   }
   let name = `${details.name}-${distTag}.json`;
@@ -11844,7 +11830,7 @@ var getFile = async (details, distTag) => {
   return join10(subDir, name);
 };
 var evaluateCache = async (file, time, interval) => {
-  if (existsSync6(file)) {
+  if (existsSync5(file)) {
     const content = await fs7.readFile(file, "utf8");
     const { lastUpdate, latest } = JSON.parse(content);
     const nextCheck = lastUpdate + interval;
@@ -11997,23 +11983,6 @@ var checkForUpdateMiddleware = async ({ verbose }) => {
 // src/middleware/checkLocalDepsVersionsMiddleware.ts
 import { magenta, red as red8 } from "colorette";
 import { join as join11 } from "path";
-
-// src/fs.ts
-import { promises as fs8 } from "fs";
-async function readJSON(path6) {
-  const fileContents = await fs8.readFile(path6, "utf-8");
-  return JSON.parse(fileContents);
-}
-async function tryReadJSON(path6, missingValue = null) {
-  try {
-    const stat = await fs8.stat(path6);
-    return stat.isFile() ? await readJSON(path6) : missingValue;
-  } catch {
-    return missingValue;
-  }
-}
-
-// src/middleware/checkLocalDepsVersionsMiddleware.ts
 var uniformStrictVersions = [
   "@uniformdev/canvas",
   "@uniformdev/canvas-next",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.31.1-alpha.0+7a19e04af6",
+  "version": "20.31.1-alpha.1+b3b021f551",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.31.1-alpha.0+7a19e04af6",
-    "@uniformdev/canvas": "20.31.1-alpha.0+7a19e04af6",
-    "@uniformdev/context": "20.31.1-alpha.0+7a19e04af6",
-    "@uniformdev/files": "20.31.1-alpha.0+7a19e04af6",
-    "@uniformdev/project-map": "20.31.1-alpha.0+7a19e04af6",
-    "@uniformdev/redirect": "20.31.1-alpha.0+7a19e04af6",
-    "@uniformdev/richtext": "20.31.1-alpha.0+7a19e04af6",
+    "@uniformdev/assets": "20.31.1-alpha.1+b3b021f551",
+    "@uniformdev/canvas": "20.31.1-alpha.1+b3b021f551",
+    "@uniformdev/context": "20.31.1-alpha.1+b3b021f551",
+    "@uniformdev/files": "20.31.1-alpha.1+b3b021f551",
+    "@uniformdev/project-map": "20.31.1-alpha.1+b3b021f551",
+    "@uniformdev/redirect": "20.31.1-alpha.1+b3b021f551",
+    "@uniformdev/richtext": "20.31.1-alpha.1+b3b021f551",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7a19e04af69e2c0699440eaa4e602cd171530f63"
+  "gitHead": "b3b021f551f35362f521966890475a86353ee1f3"
 }