@keywaysh/cli 0.1.7 → 0.1.9

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.7",
+  version: "0.1.9",
   description: "One link to all your secrets",
   type: "module",
   bin: {
@@ -452,6 +452,9 @@ async function getSyncDiff(accessToken, repoFullName, options) {
     keywayEnvironment: options.keywayEnvironment || "production",
     providerEnvironment: options.providerEnvironment || "production"
   });
+  if (options.serviceId) {
+    params.set("serviceId", options.serviceId);
+  }
   const response = await fetchWithTimeout(
     `${API_BASE_URL}/v1/integrations/vaults/${owner}/${repo}/sync/diff?${params}`,
     {
@@ -477,6 +480,9 @@ async function getSyncPreview(accessToken, repoFullName, options) {
     direction: options.direction || "push",
     allowDelete: String(options.allowDelete || false)
   });
+  if (options.serviceId) {
+    params.set("serviceId", options.serviceId);
+  }
   const response = await fetchWithTimeout(
     `${API_BASE_URL}/v1/integrations/vaults/${owner}/${repo}/sync/preview?${params}`,
     {
@@ -506,6 +512,7 @@ async function executeSync(accessToken, repoFullName, options) {
       body: JSON.stringify({
         connectionId: options.connectionId,
         projectId: options.projectId,
+        serviceId: options.serviceId,
         keywayEnvironment: options.keywayEnvironment || "production",
         providerEnvironment: options.providerEnvironment || "production",
         direction: options.direction || "push",
@@ -2175,6 +2182,9 @@ function displayDiffSummary(diff, providerName) {
   }
   console.log("");
 }
+function getProjectDisplayName(project) {
+  return project.serviceName || project.name;
+}
 function findMatchingProject(projects, repoFullName) {
   const repoFullNameLower = repoFullName.toLowerCase();
   const repoName = repoFullName.split("/")[1]?.toLowerCase();
@@ -2211,17 +2221,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 };
   });
@@ -2287,12 +2298,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;
@@ -2302,7 +2313,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}`));
         }
@@ -2313,13 +2324,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) {
@@ -2335,7 +2347,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}`));
           }
@@ -2366,7 +2378,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}`));
         }
@@ -2405,7 +2417,35 @@ 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) {
@@ -2415,6 +2455,8 @@ Connection to ${providerDisplayName} failed.`));
         const diff = await getSyncDiff(accessToken, repoFullName, {
           connectionId: connection.id,
           projectId: selectedProject.id,
+          serviceId: selectedProject.serviceId,
+          // Railway: service ID for service-specific variables
           keywayEnvironment: effectiveKeywayEnv,
           providerEnvironment: effectiveProviderEnv
         });
@@ -2559,6 +2601,8 @@ async function executeSyncOperation(accessToken, repoFullName, connectionId, pro
   const result = await executeSync(accessToken, repoFullName, {
     connectionId,
     projectId: project.id,
+    serviceId: project.serviceId,
+    // Railway: service ID for service-specific variables
     keywayEnvironment: keywayEnv,
     providerEnvironment: providerEnv,
     direction,

package/package.json

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