@keywaysh/cli 0.1.6 → 0.1.8

package/dist/cli.js

@@ -101,7 +101,7 @@ var INTERNAL_POSTHOG_HOST = "https://eu.i.posthog.com";
 // package.json
 var package_default = {
   name: "@keywaysh/cli",
-  version: "0.1.6",
+  version: "0.1.8",
   description: "One link to all your secrets",
   type: "module",
   bin: {
@@ -444,6 +444,29 @@ async function getSyncStatus(accessToken, repoFullName, connectionId, projectId,
   const wrapped = await handleResponse(response);
   return wrapped.data;
 }
+async function getSyncDiff(accessToken, repoFullName, options) {
+  const [owner, repo] = repoFullName.split("/");
+  const params = new URLSearchParams({
+    connectionId: options.connectionId,
+    projectId: options.projectId,
+    keywayEnvironment: options.keywayEnvironment || "production",
+    providerEnvironment: options.providerEnvironment || "production"
+  });
+  const response = await fetchWithTimeout(
+    `${API_BASE_URL}/v1/integrations/vaults/${owner}/${repo}/sync/diff?${params}`,
+    {
+      method: "GET",
+      headers: {
+        "User-Agent": USER_AGENT,
+        Authorization: `Bearer ${accessToken}`
+      }
+    },
+    6e4
+    // 60 seconds
+  );
+  const wrapped = await handleResponse(response);
+  return wrapped.data;
+}
 async function getSyncPreview(accessToken, repoFullName, options) {
   const [owner, repo] = repoFullName.split("/");
   const params = new URLSearchParams({
@@ -1087,6 +1110,9 @@ async function pushCommand(options) {
     let environment = options.env;
     let envFile = options.file;
     const candidates = discoverEnvCandidates(process.cwd());
+    if (candidates.length === 0 && !envFile) {
+      throw new Error("No .env file found. Create a .env file first, or use --file <path> to specify one.");
+    }
     if (environment && !envFile) {
       const match = candidates.find((c) => c.env === environment);
       if (match) {
@@ -1145,34 +1171,9 @@ async function pushCommand(options) {
     if (!envFile) {
       envFile = ".env";
     }
-    let envFilePath = path4.resolve(process.cwd(), envFile);
+    const envFilePath = path4.resolve(process.cwd(), envFile);
     if (!fs4.existsSync(envFilePath)) {
-      if (!isInteractive2) {
-        throw new Error(`File not found: ${envFile}. Provide --file <path> or run interactively to choose a file.`);
-      }
-      const { newPath } = await prompts3(
-        {
-          type: "text",
-          name: "newPath",
-          message: `File not found: ${envFile}. Enter an env file path to use:`,
-          validate: (value) => {
-            if (!value || typeof value !== "string") return "Path is required";
-            const resolved = path4.resolve(process.cwd(), value);
-            if (!fs4.existsSync(resolved)) return `File not found: ${value}`;
-            return true;
-          }
-        },
-        {
-          onCancel: () => {
-            throw new Error("Push cancelled (no env file provided).");
-          }
-        }
-      );
-      if (!newPath || typeof newPath !== "string") {
-        throw new Error("Push cancelled (no env file provided).");
-      }
-      envFile = newPath.trim();
-      envFilePath = path4.resolve(process.cwd(), envFile);
+      throw new Error(`File not found: ${envFile}`);
     }
     const content = fs4.readFileSync(envFilePath, "utf-8");
     if (content.trim().length === 0) {
@@ -1231,7 +1232,9 @@ async function pushCommand(options) {
     }
     console.log(`
 Your secrets are now encrypted and stored securely.`);
-    console.log(`To retrieve them, run: ${pc5.cyan(`keyway pull --env ${environment}`)}`);
+    const dashboardLink = `https://www.keyway.sh/dashboard/vaults/${repoFullName}`;
+    console.log(`
+${pc5.blue("\u2394")} Dashboard: ${pc5.underline(dashboardLink)}`);
     await shutdownAnalytics();
   } catch (error) {
     let message;
@@ -2136,6 +2139,45 @@ function mapToProviderEnvironment(provider, keywayEnv) {
       return keywayEnv;
   }
 }
+function displayDiffSummary(diff, providerName) {
+  const totalDiff = diff.onlyInKeyway.length + diff.onlyInProvider.length + diff.different.length;
+  if (totalDiff === 0 && diff.same.length > 0) {
+    console.log(pc10.green(`
+\u2713 Already in sync (${diff.same.length} secrets)`));
+    return;
+  }
+  console.log(pc10.blue("\n\u{1F4CA} Comparison Summary\n"));
+  console.log(pc10.gray(`   Keyway: ${diff.keywayCount} secrets | ${providerName}: ${diff.providerCount} secrets
+`));
+  if (diff.onlyInKeyway.length > 0) {
+    console.log(pc10.cyan(`   \u2192 ${diff.onlyInKeyway.length} only in Keyway`));
+    diff.onlyInKeyway.slice(0, 3).forEach((key) => console.log(pc10.gray(`      ${key}`)));
+    if (diff.onlyInKeyway.length > 3) {
+      console.log(pc10.gray(`      ... and ${diff.onlyInKeyway.length - 3} more`));
+    }
+  }
+  if (diff.onlyInProvider.length > 0) {
+    console.log(pc10.magenta(`   \u2190 ${diff.onlyInProvider.length} only in ${providerName}`));
+    diff.onlyInProvider.slice(0, 3).forEach((key) => console.log(pc10.gray(`      ${key}`)));
+    if (diff.onlyInProvider.length > 3) {
+      console.log(pc10.gray(`      ... and ${diff.onlyInProvider.length - 3} more`));
+    }
+  }
+  if (diff.different.length > 0) {
+    console.log(pc10.yellow(`   \u2260 ${diff.different.length} with different values`));
+    diff.different.slice(0, 3).forEach((key) => console.log(pc10.gray(`      ${key}`)));
+    if (diff.different.length > 3) {
+      console.log(pc10.gray(`      ... and ${diff.different.length - 3} more`));
+    }
+  }
+  if (diff.same.length > 0) {
+    console.log(pc10.gray(`   = ${diff.same.length} identical`));
+  }
+  console.log("");
+}
+function getProjectDisplayName(project) {
+  return project.serviceName || project.name;
+}
 function findMatchingProject(projects, repoFullName) {
   const repoFullNameLower = repoFullName.toLowerCase();
   const repoName = repoFullName.split("/")[1]?.toLowerCase();
@@ -2172,17 +2214,18 @@ function projectMatchesRepo(project, repoFullName) {
 async function promptProjectSelection(projects, repoFullName) {
   const repoName = repoFullName.split("/")[1]?.toLowerCase() || "";
   const choices = projects.map((p) => {
-    let title = p.name;
+    const displayName = getProjectDisplayName(p);
+    let title = displayName;
     const badges = [];
     if (p.linkedRepo?.toLowerCase() === repoFullName.toLowerCase()) {
       badges.push(pc10.green("\u2190 linked"));
-    } else if (p.name.toLowerCase() === repoName) {
+    } else if (p.name.toLowerCase() === repoName || p.serviceName?.toLowerCase() === repoName) {
       badges.push(pc10.green("\u2190 same name"));
     } else if (p.linkedRepo) {
       badges.push(pc10.gray(`\u2192 ${p.linkedRepo}`));
     }
     if (badges.length > 0) {
-      title = `${p.name} ${badges.join(" ")}`;
+      title = `${displayName} ${badges.join(" ")}`;
     }
     return { title, value: p.id };
   });
@@ -2248,12 +2291,12 @@ Connection to ${providerDisplayName} failed.`));
     let selectedProject;
     if (options.project) {
       const found = projects.find(
-        (p) => p.id === options.project || p.name.toLowerCase() === options.project?.toLowerCase()
+        (p) => p.id === options.project || p.name.toLowerCase() === options.project?.toLowerCase() || p.serviceName?.toLowerCase() === options.project?.toLowerCase()
       );
       if (!found) {
         console.error(pc10.red(`Project not found: ${options.project}`));
         console.log(pc10.gray("Available projects:"));
-        projects.forEach((p) => console.log(pc10.gray(`  - ${p.name}`)));
+        projects.forEach((p) => console.log(pc10.gray(`  - ${getProjectDisplayName(p)}`)));
         process.exit(1);
       }
       selectedProject = found;
@@ -2263,7 +2306,7 @@ Connection to ${providerDisplayName} failed.`));
         console.log(pc10.yellow("\u2502  \u26A0\uFE0F  WARNING: Project does not match current repository     \u2502"));
         console.log(pc10.yellow("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518"));
         console.log(pc10.yellow(`  Current repo:      ${repoFullName}`));
-        console.log(pc10.yellow(`  Selected project:  ${selectedProject.name}`));
+        console.log(pc10.yellow(`  Selected project:  ${getProjectDisplayName(selectedProject)}`));
         if (selectedProject.linkedRepo) {
           console.log(pc10.yellow(`  Project linked to: ${selectedProject.linkedRepo}`));
         }
@@ -2274,13 +2317,14 @@ Connection to ${providerDisplayName} failed.`));
       if (autoMatch && (autoMatch.matchType === "linked_repo" || autoMatch.matchType === "exact_name")) {
         selectedProject = autoMatch.project;
         const matchReason = autoMatch.matchType === "linked_repo" ? `linked to ${repoFullName}` : "exact name match";
-        console.log(pc10.green(`\u2713 Auto-selected project: ${selectedProject.name} (${matchReason})`));
+        console.log(pc10.green(`\u2713 Auto-selected project: ${getProjectDisplayName(selectedProject)} (${matchReason})`));
       } else if (autoMatch && autoMatch.matchType === "partial_name") {
-        console.log(pc10.yellow(`Detected project: ${autoMatch.project.name} (partial match)`));
+        const partialDisplayName = getProjectDisplayName(autoMatch.project);
+        console.log(pc10.yellow(`Detected project: ${partialDisplayName} (partial match)`));
         const { useDetected } = await prompts7({
           type: "confirm",
           name: "useDetected",
-          message: `Use ${autoMatch.project.name}?`,
+          message: `Use ${partialDisplayName}?`,
           initial: true
         });
         if (useDetected) {
@@ -2296,7 +2340,7 @@ Connection to ${providerDisplayName} failed.`));
           console.log(pc10.yellow("\u2502  \u26A0\uFE0F  WARNING: Project does not match current repository     \u2502"));
           console.log(pc10.yellow("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518"));
           console.log(pc10.yellow(`  Current repo:      ${repoFullName}`));
-          console.log(pc10.yellow(`  Only project:      ${selectedProject.name}`));
+          console.log(pc10.yellow(`  Only project:      ${getProjectDisplayName(selectedProject)}`));
           if (selectedProject.linkedRepo) {
             console.log(pc10.yellow(`  Project linked to: ${selectedProject.linkedRepo}`));
           }
@@ -2327,7 +2371,7 @@ Connection to ${providerDisplayName} failed.`));
         console.log(pc10.yellow("\u2502  \u26A0\uFE0F  WARNING: You selected a different project              \u2502"));
         console.log(pc10.yellow("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518"));
         console.log(pc10.yellow(`  Current repo:      ${repoFullName}`));
-        console.log(pc10.yellow(`  Selected project:  ${selectedProject.name}`));
+        console.log(pc10.yellow(`  Selected project:  ${getProjectDisplayName(selectedProject)}`));
         if (selectedProject.linkedRepo) {
           console.log(pc10.yellow(`  Project linked to: ${selectedProject.linkedRepo}`));
         }
@@ -2366,7 +2410,51 @@ Connection to ${providerDisplayName} failed.`));
         }
         keywayEnv = selectedEnv;
         if (!options.providerEnv) {
-          providerEnv = mapToProviderEnvironment(provider, keywayEnv);
+          if (selectedProject.environments && selectedProject.environments.length > 0) {
+            const mappedEnv = mapToProviderEnvironment(provider, keywayEnv);
+            const envExists = selectedProject.environments.some(
+              (e) => e.toLowerCase() === mappedEnv.toLowerCase()
+            );
+            if (envExists) {
+              providerEnv = mappedEnv;
+            } else if (selectedProject.environments.length === 1) {
+              providerEnv = selectedProject.environments[0];
+              console.log(pc10.gray(`Using ${providerName} environment: ${providerEnv}`));
+            } else {
+              const { selectedProviderEnv } = await prompts7({
+                type: "select",
+                name: "selectedProviderEnv",
+                message: `${providerName} environment:`,
+                choices: selectedProject.environments.map((e) => ({ title: e, value: e })),
+                initial: Math.max(0, selectedProject.environments.findIndex(
+                  (e) => e.toLowerCase() === "production"
+                ))
+              });
+              if (!selectedProviderEnv) {
+                console.log(pc10.gray("Cancelled."));
+                process.exit(0);
+              }
+              providerEnv = selectedProviderEnv;
+            }
+          } else {
+            providerEnv = mapToProviderEnvironment(provider, keywayEnv);
+          }
+        }
+      }
+      if (needsDirectionPrompt) {
+        const effectiveKeywayEnv = keywayEnv || "production";
+        const effectiveProviderEnv = providerEnv || mapToProviderEnvironment(provider, effectiveKeywayEnv);
+        console.log(pc10.gray("\nComparing secrets..."));
+        const diff = await getSyncDiff(accessToken, repoFullName, {
+          connectionId: connection.id,
+          projectId: selectedProject.id,
+          keywayEnvironment: effectiveKeywayEnv,
+          providerEnvironment: effectiveProviderEnv
+        });
+        displayDiffSummary(diff, providerName);
+        const totalDiff = diff.onlyInKeyway.length + diff.onlyInProvider.length + diff.different.length;
+        if (totalDiff === 0) {
+          return;
         }
       }
       if (needsDirectionPrompt) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keywaysh/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "One link to all your secrets",
   "type": "module",
   "bin": {