@keywaysh/cli 0.0.19 → 0.0.21

package/dist/cli.js

@@ -69,7 +69,7 @@ var INTERNAL_POSTHOG_HOST = "https://eu.i.posthog.com";
 // package.json
 var package_default = {
   name: "@keywaysh/cli",
-  version: "0.0.19",
+  version: "0.0.21",
   description: "One link to all your secrets",
   type: "module",
   bin: {
@@ -550,7 +550,8 @@ var AnalyticsEvents = {
   CLI_DOCTOR: "cli_doctor",
   CLI_CONNECT: "cli_connect",
   CLI_DISCONNECT: "cli_disconnect",
-  CLI_SYNC: "cli_sync"
+  CLI_SYNC: "cli_sync",
+  CLI_FEEDBACK: "cli_feedback"
 };
 
 // src/cmds/login.ts
@@ -1756,14 +1757,66 @@ async function disconnectCommand(provider, options = {}) {
 import pc8 from "picocolors";
 import prompts7 from "prompts";
 function findMatchingProject(projects, repoFullName) {
+  const repoFullNameLower = repoFullName.toLowerCase();
   const repoName = repoFullName.split("/")[1]?.toLowerCase();
   if (!repoName) return void 0;
-  const exact = projects.find((p) => p.name.toLowerCase() === repoName);
-  if (exact) return exact;
-  const partial = projects.filter(
+  const linkedMatch = projects.find(
+    (p) => p.linkedRepo?.toLowerCase() === repoFullNameLower
+  );
+  if (linkedMatch) {
+    return { project: linkedMatch, matchType: "linked_repo" };
+  }
+  const exactNameMatch = projects.find((p) => p.name.toLowerCase() === repoName);
+  if (exactNameMatch) {
+    return { project: exactNameMatch, matchType: "exact_name" };
+  }
+  const partialMatches = projects.filter(
     (p) => p.name.toLowerCase().includes(repoName) || repoName.includes(p.name.toLowerCase())
   );
-  return partial.length === 1 ? partial[0] : void 0;
+  if (partialMatches.length === 1) {
+    return { project: partialMatches[0], matchType: "partial_name" };
+  }
+  return void 0;
+}
+function projectMatchesRepo(project, repoFullName) {
+  const repoFullNameLower = repoFullName.toLowerCase();
+  const repoName = repoFullName.split("/")[1]?.toLowerCase();
+  if (project.linkedRepo?.toLowerCase() === repoFullNameLower) {
+    return true;
+  }
+  if (repoName && project.name.toLowerCase() === repoName) {
+    return true;
+  }
+  return false;
+}
+async function promptProjectSelection(projects, repoFullName) {
+  const repoName = repoFullName.split("/")[1]?.toLowerCase() || "";
+  const choices = projects.map((p) => {
+    let title = p.name;
+    const badges = [];
+    if (p.linkedRepo?.toLowerCase() === repoFullName.toLowerCase()) {
+      badges.push(pc8.green("\u2190 linked"));
+    } else if (p.name.toLowerCase() === repoName) {
+      badges.push(pc8.green("\u2190 same name"));
+    } else if (p.linkedRepo) {
+      badges.push(pc8.gray(`\u2192 ${p.linkedRepo}`));
+    }
+    if (badges.length > 0) {
+      title = `${p.name} ${badges.join(" ")}`;
+    }
+    return { title, value: p.id };
+  });
+  const { projectChoice } = await prompts7({
+    type: "select",
+    name: "projectChoice",
+    message: "Select a project:",
+    choices
+  });
+  if (!projectChoice) {
+    console.log(pc8.gray("Cancelled."));
+    process.exit(0);
+  }
+  return projects.find((p) => p.id === projectChoice);
 }
 async function syncCommand(provider, options = {}) {
   try {
@@ -1804,43 +1857,91 @@ async function syncCommand(provider, options = {}) {
         process.exit(1);
       }
       selectedProject = found;
+      if (!projectMatchesRepo(selectedProject, repoFullName)) {
+        console.log("");
+        console.log(pc8.yellow("\u250C\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\u2510"));
+        console.log(pc8.yellow("\u2502  \u26A0\uFE0F  WARNING: Project does not match current repository     \u2502"));
+        console.log(pc8.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(pc8.yellow(`  Current repo:      ${repoFullName}`));
+        console.log(pc8.yellow(`  Selected project:  ${selectedProject.name}`));
+        if (selectedProject.linkedRepo) {
+          console.log(pc8.yellow(`  Project linked to: ${selectedProject.linkedRepo}`));
+        }
+        console.log("");
+      }
     } else {
       const autoMatch = findMatchingProject(projects, repoFullName);
-      if (autoMatch && projects.length > 1) {
-        console.log(pc8.gray(`Detected project: ${autoMatch.name}`));
+      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(pc8.green(`\u2713 Auto-selected project: ${selectedProject.name} (${matchReason})`));
+      } else if (autoMatch && autoMatch.matchType === "partial_name") {
+        console.log(pc8.yellow(`Detected project: ${autoMatch.project.name} (partial match)`));
         const { useDetected } = await prompts7({
           type: "confirm",
           name: "useDetected",
-          message: `Use ${autoMatch.name}?`,
+          message: `Use ${autoMatch.project.name}?`,
           initial: true
         });
         if (useDetected) {
-          selectedProject = autoMatch;
+          selectedProject = autoMatch.project;
         } else {
-          const { projectChoice } = await prompts7({
-            type: "select",
-            name: "projectChoice",
-            message: "Select a project:",
-            choices: projects.map((p) => ({ title: p.name, value: p.id }))
-          });
-          selectedProject = projects.find((p) => p.id === projectChoice);
+          selectedProject = await promptProjectSelection(projects, repoFullName);
         }
-      } else if (autoMatch) {
-        selectedProject = autoMatch;
       } else if (projects.length === 1) {
         selectedProject = projects[0];
+        if (!projectMatchesRepo(selectedProject, repoFullName)) {
+          console.log("");
+          console.log(pc8.yellow("\u250C\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\u2510"));
+          console.log(pc8.yellow("\u2502  \u26A0\uFE0F  WARNING: Project does not match current repository     \u2502"));
+          console.log(pc8.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(pc8.yellow(`  Current repo:      ${repoFullName}`));
+          console.log(pc8.yellow(`  Only project:      ${selectedProject.name}`));
+          if (selectedProject.linkedRepo) {
+            console.log(pc8.yellow(`  Project linked to: ${selectedProject.linkedRepo}`));
+          }
+          console.log("");
+          const { continueAnyway } = await prompts7({
+            type: "confirm",
+            name: "continueAnyway",
+            message: "Continue anyway?",
+            initial: false
+          });
+          if (!continueAnyway) {
+            console.log(pc8.gray("Cancelled."));
+            process.exit(0);
+          }
+        }
       } else {
-        const { projectChoice } = await prompts7({
-          type: "select",
-          name: "projectChoice",
-          message: "Select a project:",
-          choices: projects.map((p) => ({ title: p.name, value: p.id }))
+        console.log(pc8.yellow(`
+\u26A0\uFE0F  No matching project found for ${repoFullName}`));
+        console.log(pc8.gray("Select a project manually:\n"));
+        selectedProject = await promptProjectSelection(projects, repoFullName);
+      }
+    }
+    if (!options.project && !projectMatchesRepo(selectedProject, repoFullName)) {
+      const autoMatch = findMatchingProject(projects, repoFullName);
+      if (autoMatch && autoMatch.project.id !== selectedProject.id) {
+        console.log("");
+        console.log(pc8.yellow("\u250C\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\u2510"));
+        console.log(pc8.yellow("\u2502  \u26A0\uFE0F  WARNING: You selected a different project              \u2502"));
+        console.log(pc8.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(pc8.yellow(`  Current repo:      ${repoFullName}`));
+        console.log(pc8.yellow(`  Selected project:  ${selectedProject.name}`));
+        if (selectedProject.linkedRepo) {
+          console.log(pc8.yellow(`  Project linked to: ${selectedProject.linkedRepo}`));
+        }
+        console.log("");
+        const { continueAnyway } = await prompts7({
+          type: "confirm",
+          name: "continueAnyway",
+          message: "Are you sure you want to sync with this project?",
+          initial: false
         });
-        if (!projectChoice) {
+        if (!continueAnyway) {
           console.log(pc8.gray("Cancelled."));
           process.exit(0);
         }
-        selectedProject = projects.find((p) => p.id === projectChoice);
       }
     }
     const keywayEnv = options.environment || "production";
@@ -1848,6 +1949,7 @@ async function syncCommand(provider, options = {}) {
     const direction = options.pull ? "pull" : "push";
     const providerName = provider.charAt(0).toUpperCase() + provider.slice(1);
     console.log(pc8.gray(`Project: ${selectedProject.name}`));
+    console.log(pc8.gray(`Environment: ${keywayEnv}${providerEnv !== keywayEnv ? ` \u2192 ${providerEnv}` : ""}`));
     console.log(pc8.gray(`Direction: ${direction === "push" ? "Keyway \u2192 " + providerName : providerName + " \u2192 Keyway"}`));
     const status = await getSyncStatus(
       accessToken,
@@ -1858,7 +1960,8 @@ async function syncCommand(provider, options = {}) {
     );
     if (status.isFirstSync && !options.pull && status.vaultIsEmpty && status.providerHasSecrets) {
       console.log(pc8.yellow(`
-\u26A0\uFE0F  Your Keyway vault is empty, but ${providerName} has ${status.providerSecretCount} secrets.`));
+\u26A0\uFE0F  Your Keyway vault is empty for "${keywayEnv}", but ${providerName} has ${status.providerSecretCount} secrets.`));
+      console.log(pc8.gray(`   (Use --environment to sync a different environment)`));
       const { importFirst } = await prompts7({
         type: "confirm",
         name: "importFirst",
@@ -2028,7 +2131,7 @@ program.command("connections").description("List your provider connections").opt
 program.command("disconnect <provider>").description("Disconnect from a provider").option("--no-login-prompt", "Fail instead of prompting to login if unauthenticated").action(async (provider, options) => {
   await disconnectCommand(provider, options);
 });
-program.command("sync <provider>").description("Sync secrets with a provider (e.g., vercel)").option("--pull", "Import secrets from provider to Keyway").option("-e, --environment <env>", "Keyway environment", "production").option("--provider-env <env>", "Provider environment", "production").option("--project <project>", "Provider project name or ID").option("--allow-delete", "Allow deleting secrets not in source").option("-y, --yes", "Skip confirmation prompt").option("--no-login-prompt", "Fail instead of prompting to login if unauthenticated").action(async (provider, options) => {
+program.command("sync <provider>").description("Sync secrets with a provider (e.g., vercel)").option("--pull", "Import secrets from provider to Keyway").option("-e, --environment <env>", "Keyway environment (default: production)").option("--provider-env <env>", "Provider environment (default: production)").option("--project <project>", "Provider project name or ID").option("--allow-delete", "Allow deleting secrets not in source").option("-y, --yes", "Skip confirmation prompt").option("--no-login-prompt", "Fail instead of prompting to login if unauthenticated").action(async (provider, options) => {
   await syncCommand(provider, options);
 });
 program.parseAsync().catch((error) => {

package/package.json

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