@envmanager-cli/cli 0.1.2 → 0.1.3

package/dist/bin/envmanager.js

@@ -506,12 +506,16 @@ function getConfigPath() {
 
 // src/lib/resolve.ts
 var UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function cleanProjectInput(input) {
+  return input.startsWith("#") ? input.slice(1) : input;
+}
 async function resolveProjectId(input, client, organizationId) {
-  if (UUID_REGEX.test(input)) {
-    return input;
+  const cleaned = cleanProjectInput(input);
+  if (UUID_REGEX.test(cleaned)) {
+    return cleaned;
   }
-  if (/^\d+$/.test(input)) {
-    const friendlyId = parseInt(input, 10);
+  if (/^\d+$/.test(cleaned)) {
+    const friendlyId = parseInt(cleaned, 10);
     if (friendlyId < 1) {
       throw new Error("Project ID must be 1 or greater");
     }
@@ -521,13 +525,13 @@ async function resolveProjectId(input, client, organizationId) {
     }
     return data2.id;
   }
-  const { data, error } = await client.from("projects").select("id").eq("organization_id", organizationId).ilike("name", input).single();
+  const { data, error } = await client.from("projects").select("id").eq("organization_id", organizationId).ilike("name", cleaned).single();
   if (error || !data) {
     throw new Error(`Project "${input}" not found in this organization`);
   }
   return data.id;
 }
-async function resolveOrganizationId(input, client) {
+async function resolveOrganizationId(input, client, projectHint) {
   const { data: memberships, error: memberError } = await client.from("organization_members").select("organization_id, organizations(id, name)");
   if (memberError || !memberships || memberships.length === 0) {
     throw new Error("No organizations found. Create one at envmanager.dev");
@@ -535,21 +539,42 @@ async function resolveOrganizationId(input, client) {
   if (memberships.length === 1 && !input) {
     return memberships[0].organization_id;
   }
-  if (!input) {
-    const orgList = memberships.map((m) => {
+  if (input) {
+    const match = memberships.find((m) => {
       const org = m.organizations;
-      return org?.name || "Unknown";
-    }).join(", ");
-    throw new Error(`Multiple organizations found. Use --org to specify: ${orgList}`);
+      return org?.name?.toLowerCase() === input.toLowerCase();
+    });
+    if (!match) {
+      throw new Error(`Organization "${input}" not found or you don't have access`);
+    }
+    return match.organization_id;
   }
-  const match = memberships.find((m) => {
+  if (projectHint) {
+    const orgId = await detectOrgFromProject(projectHint, client, memberships);
+    if (orgId) return orgId;
+  }
+  const orgList = memberships.map((m) => {
     const org = m.organizations;
-    return org?.name?.toLowerCase() === input.toLowerCase();
-  });
-  if (!match) {
-    throw new Error(`Organization "${input}" not found or you don't have access`);
+    return org?.name || "Unknown";
+  }).join(", ");
+  throw new Error(`Multiple organizations found. Use --org to specify: ${orgList}`);
+}
+async function detectOrgFromProject(projectInput, client, memberships) {
+  const cleaned = cleanProjectInput(projectInput);
+  const orgIds = memberships.map((m) => m.organization_id);
+  if (UUID_REGEX.test(cleaned)) {
+    const { data: data2 } = await client.from("projects").select("organization_id").eq("id", cleaned).in("organization_id", orgIds).single();
+    return data2?.organization_id ?? null;
+  }
+  if (/^\d+$/.test(cleaned)) {
+    const friendlyId = parseInt(cleaned, 10);
+    const { data: data2 } = await client.from("projects").select("organization_id").in("organization_id", orgIds).eq("friendly_id", friendlyId);
+    if (data2 && data2.length === 1) return data2[0].organization_id;
+    return null;
   }
-  return match.organization_id;
+  const { data } = await client.from("projects").select("organization_id").in("organization_id", orgIds).ilike("name", cleaned);
+  if (data && data.length === 1) return data[0].organization_id;
+  return null;
 }
 
 // src/lib/variable-references.ts
@@ -731,7 +756,7 @@ var pullCommand = new Command4("pull").description("Pull environment variables f
     const client = await createClient();
     let organizationId;
     try {
-      organizationId = await resolveOrganizationId(options.org, client);
+      organizationId = await resolveOrganizationId(options.org, client, projectInput);
     } catch (error) {
       spinner.fail(error instanceof Error ? error.message : "Failed to resolve organization");
       process.exit(1);
@@ -1026,7 +1051,7 @@ var pushCommand = new Command5("push").description("Push local .env file to EnvM
     const client = await createClient();
     let organizationId;
     try {
-      organizationId = await resolveOrganizationId(options.org, client);
+      organizationId = await resolveOrganizationId(options.org, client, projectInput);
     } catch (error) {
       spinner.fail(error instanceof Error ? error.message : "Failed to resolve organization");
       process.exit(1);
@@ -1158,7 +1183,7 @@ var diffCommand = new Command6("diff").description("Show differences between loc
     const client = await createClient();
     let organizationId;
     try {
-      organizationId = await resolveOrganizationId(options.org, client);
+      organizationId = await resolveOrganizationId(options.org, client, projectInput);
     } catch (error) {
       spinner.fail(error instanceof Error ? error.message : "Failed to resolve organization");
       process.exit(1);
@@ -1310,7 +1335,7 @@ var listCommand = new Command7("list").description("List projects, environments,
         }
         let organizationId;
         try {
-          organizationId = await resolveOrganizationId(options.org, client);
+          organizationId = await resolveOrganizationId(options.org, client, projectInput);
         } catch (error) {
           spinner.fail(error instanceof Error ? error.message : "Failed to resolve organization");
           process.exit(1);
@@ -1354,7 +1379,7 @@ var listCommand = new Command7("list").description("List projects, environments,
         }
         let organizationId;
         try {
-          organizationId = await resolveOrganizationId(options.org, client);
+          organizationId = await resolveOrganizationId(options.org, client, projectInput);
         } catch (error) {
           spinner.fail(error instanceof Error ? error.message : "Failed to resolve organization");
           process.exit(1);
@@ -1678,7 +1703,7 @@ var devCommand = new Command9("dev").description("Start real-time sync daemon -
     const client = await createClient();
     let organizationId;
     try {
-      organizationId = await resolveOrganizationId(options.org, client);
+      organizationId = await resolveOrganizationId(options.org, client, projectInput);
     } catch (error) {
       spinner.fail(error instanceof Error ? error.message : "Failed to resolve organization");
       process.exit(1);
@@ -2657,7 +2682,7 @@ var validateCommand = new Command12("validate").description("Validate local .env
       const client = await createClient();
       let organizationId;
       try {
-        organizationId = await resolveOrganizationId(options.org, client);
+        organizationId = await resolveOrganizationId(options.org, client, projectInput);
       } catch (error) {
         spinner.fail(error instanceof Error ? error.message : "Failed to resolve organization");
         process.exit(1);