@envmanager-cli/cli 0.2.0 → 0.2.1

package/dist/bin/envmanager.js

@@ -616,7 +616,8 @@ var ConfigSchema = z.object({
   format: z.enum(EXPORT_FORMATS).optional(),
   k8s_namespace: z.string().optional(),
   k8s_name: z.string().optional(),
-  tags: z.array(z.string()).optional()
+  tags: z.array(z.string()).optional(),
+  service: z.string().optional()
 });
 var CONFIG_FILENAMES = ["envmanager.json", ".envmanagerrc"];
 function findConfigFile(startDir = process.cwd()) {
@@ -726,6 +727,15 @@ async function detectOrgFromProject(projectInput, client, memberships) {
   if (data && data.length === 1) return data[0].organization_id;
   return null;
 }
+async function resolveServiceId(serviceName, client, projectId) {
+  const { data, error } = await client.from("services").select("id").eq("project_id", projectId).ilike("name", serviceName).single();
+  if (error || !data) {
+    const { data: allServices } = await client.from("services").select("name").eq("project_id", projectId).order("sort_order");
+    const available = allServices?.map((s) => s.name).join(", ") || "none";
+    throw new Error(`Service "${serviceName}" not found in project. Available services: ${available}`);
+  }
+  return data.id;
+}
 
 // src/lib/variable-references.ts
 var REFERENCE_PATTERN = /\$\{([A-Z_][A-Z0-9_]*)\}/g;
@@ -886,7 +896,7 @@ function resolveAll(variables) {
 }
 
 // src/commands/pull.ts
-var pullCommand = new Command4("pull").description("Pull environment variables from EnvManager to local .env file").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: from config or "development")').option("-p, --project <id>", "Project ID (default: from config)").option("-o, --output <file>", "Output file path (default: .env)").option("--no-secrets", "Exclude secret values (will be empty)").option("-f, --force", "Overwrite existing file without prompting").option("-r, --resolve-references", "Resolve ${VAR} references to their values").option("-F, --include-fallbacks", "Include fallback values for empty variables").option("-s, --show-sources", "Show value source as inline comments").option("--format <type>", `Export format (${EXPORT_FORMATS.join(", ")})`).option("--k8s-namespace <ns>", 'Kubernetes namespace (default: "default")').option("--k8s-name <name>", "Kubernetes resource name").option("--tag <tags...>", "Filter by tags (untagged variables always included)").action(async (options) => {
+var pullCommand = new Command4("pull").description("Pull environment variables from EnvManager to local .env file").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: from config or "development")').option("-p, --project <id>", "Project ID (default: from config)").option("-o, --output <file>", "Output file path (default: .env)").option("--no-secrets", "Exclude secret values (will be empty)").option("-f, --force", "Overwrite existing file without prompting").option("-r, --resolve-references", "Resolve ${VAR} references to their values").option("-F, --include-fallbacks", "Include fallback values for empty variables").option("-s, --show-sources", "Show value source as inline comments").option("--format <type>", `Export format (${EXPORT_FORMATS.join(", ")})`).option("--k8s-namespace <ns>", 'Kubernetes namespace (default: "default")').option("--k8s-name <name>", "Kubernetes resource name").option("--tag <tags...>", "Filter by tags (untagged variables always included)").option("--service <name>", "Filter by service name").action(async (options) => {
   const spinner = ora3("Connecting to EnvManager...").start();
   try {
     const config = loadConfig();
@@ -924,6 +934,16 @@ var pullCommand = new Command4("pull").description("Pull environment variables f
       spinner.fail(error instanceof Error ? error.message : "Failed to resolve project");
       process.exit(1);
     }
+    const serviceName = options.service || config?.service;
+    let serviceId;
+    if (serviceName) {
+      try {
+        serviceId = await resolveServiceId(serviceName, client, projectId);
+      } catch (error) {
+        spinner.fail(error instanceof Error ? error.message : "Failed to resolve service");
+        process.exit(1);
+      }
+    }
     spinner.text = "Fetching environment...";
     const { data: environments, error: envError } = await client.from("environments").select("id, name").eq("project_id", projectId).ilike("name", envName).single();
     if (envError || !environments) {
@@ -939,7 +959,8 @@ var pullCommand = new Command4("pull").description("Pull environment variables f
       p_environment_id: environmentId,
       p_sync_secrets: includeSecrets,
       p_sync_variables: true,
-      p_include_fallbacks: shouldFallback || false
+      p_include_fallbacks: shouldFallback || false,
+      ...serviceId && { p_service_id: serviceId }
     };
     const { data: variables, error: varError } = await client.rpc("get_variables_for_sync", rpcParams);
     if (varError) {
@@ -1039,8 +1060,9 @@ File ${outputFile} already exists.`));
     writeFileSync2(outputFile, content + "\n");
     const secretCount = vars.filter((v) => v.is_secret).length;
     const plainCount = vars.length - secretCount;
+    const serviceInfo = serviceName ? ` (service: ${serviceName})` : "";
     const tagInfo = filterTags.length > 0 ? ` (tags: ${filterTags.join(", ")})` : "";
-    spinner.succeed(`Pulled ${vars.length} variables to ${outputFile} (${format})${tagInfo}`);
+    spinner.succeed(`Pulled ${vars.length} variables to ${outputFile} (${format})${serviceInfo}${tagInfo}`);
     console.log(chalk4.gray(`  ${plainCount} plain, ${secretCount} secrets`));
     client.rpc("log_variable_access", {
       p_environment_id: environmentId,
@@ -1197,7 +1219,7 @@ function validateVariableName(name, config) {
 }
 
 // src/commands/push.ts
-var pushCommand = new Command5("push").description("Push local .env file to EnvManager").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: from config or "development")').option("-p, --project <id>", "Project ID (default: from config)").option("-i, --input <file>", "Input file path (default: .env)").option("--secrets <keys>", "Comma-separated list of keys to mark as secrets").option("--all-secrets", "Mark all variables as secrets").option("--dry-run", "Show what would be pushed without making changes").action(async (options) => {
+var pushCommand = new Command5("push").description("Push local .env file to EnvManager").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: from config or "development")').option("-p, --project <id>", "Project ID (default: from config)").option("-i, --input <file>", "Input file path (default: .env)").option("--secrets <keys>", "Comma-separated list of keys to mark as secrets").option("--all-secrets", "Mark all variables as secrets").option("--service <name>", "Push to specific service").option("--dry-run", "Show what would be pushed without making changes").action(async (options) => {
   const spinner = ora4("Reading .env file...").start();
   try {
     const config = loadConfig();
@@ -1248,6 +1270,16 @@ var pushCommand = new Command5("push").description("Push local .env file to EnvM
       spinner.fail(error instanceof Error ? error.message : "Failed to resolve project");
       process.exit(1);
     }
+    const serviceName = options.service || config?.service;
+    let serviceId;
+    if (serviceName) {
+      try {
+        serviceId = await resolveServiceId(serviceName, client, projectId);
+      } catch (error) {
+        spinner.fail(error instanceof Error ? error.message : "Failed to resolve service");
+        process.exit(1);
+      }
+    }
     spinner.text = "Fetching environment...";
     const { data: environment, error: envError } = await client.from("environments").select("id, name, project_id").eq("project_id", projectId).ilike("name", envName).single();
     if (envError || !environment) {
@@ -1303,12 +1335,24 @@ var pushCommand = new Command5("push").description("Push local .env file to EnvM
       key: v.key,
       value: v.value
     }));
-    const { data: existingVars } = await client.from("variables").select("key").eq("environment_id", environment.id);
+    let existingQuery = client.from("variables").select("key").eq("environment_id", environment.id);
+    if (serviceId) {
+      existingQuery = existingQuery.eq("service_id", serviceId);
+    } else {
+      existingQuery = existingQuery.is("service_id", null);
+    }
+    const { data: existingVars } = await existingQuery;
     const existingKeys = new Set((existingVars || []).map((v) => v.key));
     const keysToUpdate = variablesData.filter((v) => existingKeys.has(v.key));
     const keysToInsert = variablesData.filter((v) => !existingKeys.has(v.key));
     if (keysToUpdate.length > 0) {
-      const { error: deleteError } = await client.from("variables").delete().eq("environment_id", environment.id).in("key", keysToUpdate.map((v) => v.key));
+      let deleteQuery = client.from("variables").delete().eq("environment_id", environment.id).in("key", keysToUpdate.map((v) => v.key));
+      if (serviceId) {
+        deleteQuery = deleteQuery.eq("service_id", serviceId);
+      } else {
+        deleteQuery = deleteQuery.is("service_id", null);
+      }
+      const { error: deleteError } = await deleteQuery;
       if (deleteError) {
         spinner.fail("Failed to update existing variables");
         console.error(chalk6.red(deleteError.message));
@@ -1319,14 +1363,16 @@ var pushCommand = new Command5("push").description("Push local .env file to EnvM
       variables_data: variablesData,
       environment_id_param: environment.id,
       organization_id_param: organizationId,
-      import_as_secrets: markAsSecrets
+      import_as_secrets: markAsSecrets,
+      ...serviceId && { service_id_param: serviceId }
     });
     if (pushError) {
       spinner.fail("Push failed");
       console.error(chalk6.red(pushError.message));
       process.exit(1);
     }
-    spinner.succeed(`Pushed ${vars.length} variables to ${envName}`);
+    const serviceInfo = serviceName ? ` (service: ${serviceName})` : "";
+    spinner.succeed(`Pushed ${vars.length} variables to ${envName}${serviceInfo}`);
     if (keysToUpdate.length > 0) {
       console.log(chalk6.gray(`  ${keysToInsert.length} inserted, ${keysToUpdate.length} updated`));
     }
@@ -1739,14 +1785,16 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
   });
   return subscription;
 }
-async function fetchAllVariables(environmentId, includeSecrets = true) {
+async function fetchAllVariables(environmentId, includeSecrets = true, serviceId) {
   const client = await createClient();
-  const { data: variables, error } = await client.rpc("get_variables_for_sync", {
+  const rpcParams = {
     p_environment_id: environmentId,
     p_sync_secrets: includeSecrets,
     p_sync_variables: true,
-    p_include_fallbacks: false
-  });
+    p_include_fallbacks: false,
+    ...serviceId && { p_service_id: serviceId }
+  };
+  const { data: variables, error } = await client.rpc("get_variables_for_sync", rpcParams);
   if (error) {
     throw new Error(`Failed to fetch variables: ${error.message}`);
   }
@@ -1888,7 +1936,7 @@ function mergeWithRemote(local, remoteVariables, strategy) {
 }
 
 // src/commands/dev.ts
-var devCommand = new Command9("dev").description("Start real-time sync daemon - watches for remote variable changes").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: from config or "development")').option("-p, --project <id>", "Project ID (default: from config)").option("--output <file>", "Output file path (default: .env)").option("--no-watch", "Disable local file watching").option("--strategy <type>", "Merge strategy: remote_wins, local_wins, merge_new (default: remote_wins)", "remote_wins").option("--tag <tags...>", "Filter by tags (untagged variables always included)").action(async (options) => {
+var devCommand = new Command9("dev").description("Start real-time sync daemon - watches for remote variable changes").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: from config or "development")').option("-p, --project <id>", "Project ID (default: from config)").option("--output <file>", "Output file path (default: .env)").option("--no-watch", "Disable local file watching").option("--strategy <type>", "Merge strategy: remote_wins, local_wins, merge_new (default: remote_wins)", "remote_wins").option("--tag <tags...>", "Filter by tags (untagged variables always included)").option("--service <name>", "Filter by service name").action(async (options) => {
   const spinner = ora7("Starting dev mode...").start();
   try {
     const config = loadConfig();
@@ -1918,6 +1966,16 @@ var devCommand = new Command9("dev").description("Start real-time sync daemon -
       spinner.fail(error instanceof Error ? error.message : "Failed to resolve project");
       process.exit(1);
     }
+    const serviceName = options.service || config?.service;
+    let serviceId;
+    if (serviceName) {
+      try {
+        serviceId = await resolveServiceId(serviceName, client, projectId);
+      } catch (error) {
+        spinner.fail(error instanceof Error ? error.message : "Failed to resolve service");
+        process.exit(1);
+      }
+    }
     spinner.text = "Fetching environment...";
     const { data: environment, error: envError } = await client.from("environments").select("id, name, project_id").eq("project_id", projectId).ilike("name", envName).single();
     if (envError || !environment) {
@@ -1934,7 +1992,7 @@ var devCommand = new Command9("dev").description("Start real-time sync daemon -
       });
     };
     spinner.text = "Performing initial sync...";
-    const remoteVariables = applyTagFilter(await fetchAllVariables(environmentId, true));
+    const remoteVariables = applyTagFilter(await fetchAllVariables(environmentId, true, serviceId));
     let localVariables = /* @__PURE__ */ new Map();
     if (existsSync7(outputFile)) {
       const content = readFileSync6(outputFile, "utf-8");
@@ -1951,7 +2009,7 @@ var devCommand = new Command9("dev").description("Start real-time sync daemon -
     let isPaused = false;
     let lastRemoteKeys = null;
     async function syncRemoteToLocal(silent = false) {
-      const updatedVariables = applyTagFilter(await fetchAllVariables(environmentId, true));
+      const updatedVariables = applyTagFilter(await fetchAllVariables(environmentId, true, serviceId));
       const currentLocal = /* @__PURE__ */ new Map();
       if (existsSync7(outputFile)) {
         const content = readFileSync6(outputFile, "utf-8");
@@ -2043,6 +2101,9 @@ Realtime error: ${message || ""}`));
     console.log("");
     console.log(chalk10.cyan("  Project:"), projectId);
     console.log(chalk10.cyan("  Environment:"), envName);
+    if (serviceName) {
+      console.log(chalk10.cyan("  Service:"), serviceName);
+    }
     console.log(chalk10.cyan("  Output:"), outputFile);
     console.log(chalk10.cyan("  Strategy:"), strategy);
     console.log(chalk10.cyan("  Watching:"), watchLocal ? "local + remote" : "remote only");
@@ -2347,7 +2408,7 @@ function generateYamlTemplate(variables, options = {}) {
 }
 
 // src/commands/init.ts
-var initCommand = new Command10("init").description("Initialize project configuration and generate .env.template from EnvManager").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: "development")').option("-p, --project <id>", "Project ID").option("--format <type>", "Template format: simple or yaml (default: simple)", "simple").option("-f, --force", "Overwrite existing files without prompting").action(async (options) => {
+var initCommand = new Command10("init").description("Initialize project configuration and generate .env.template from EnvManager").option("--org <name>", "Organization name (required if you belong to multiple)").option("-e, --environment <name>", 'Environment name (default: "development")').option("-p, --project <id>", "Project ID").option("--format <type>", "Template format: simple or yaml (default: simple)", "simple").option("-f, --force", "Overwrite existing files without prompting").option("--service <name>", "Service name to scope variables to").action(async (options) => {
   const spinner = ora8("Initializing project...").start();
   try {
     const configPath = resolve5("envmanager.json");
@@ -2408,13 +2469,39 @@ Environment "${envName}" not found. Available:`));
       }
       process.exit(1);
     }
+    let selectedServiceName;
+    let serviceIdForSync;
+    const { data: projectServices } = await client.from("services").select("id, name").eq("project_id", projectId).order("sort_order");
+    if (options.service) {
+      spinner.text = "Resolving service...";
+      try {
+        serviceIdForSync = await resolveServiceId(options.service, client, projectId);
+        selectedServiceName = options.service;
+      } catch (error) {
+        spinner.fail(error instanceof Error ? error.message : "Failed to resolve service");
+        process.exit(1);
+      }
+    } else if (projectServices && projectServices.length > 0) {
+      spinner.stop();
+      console.log("");
+      console.log(chalk11.cyan("Services available in this project:"));
+      projectServices.forEach((s) => {
+        console.log(chalk11.gray(`  - ${s.name}`));
+      });
+      console.log(chalk11.gray("\n  Use --service <name> to scope variables to a specific service."));
+      console.log(chalk11.gray("  Without --service, all variables will be synced."));
+      console.log("");
+      spinner.start("Fetching variables...");
+    }
     spinner.text = "Fetching variables...";
-    const { data: variables, error: varError } = await client.rpc("get_variables_for_sync", {
+    const rpcParams = {
       p_environment_id: environment.id,
       p_sync_secrets: false,
       p_sync_variables: true,
-      p_include_fallbacks: false
-    });
+      p_include_fallbacks: false,
+      ...serviceIdForSync && { p_service_id: serviceIdForSync }
+    };
+    const { data: variables, error: varError } = await client.rpc("get_variables_for_sync", rpcParams);
     if (varError) {
       spinner.fail("Failed to fetch variables");
       console.error(chalk11.red(varError.message));
@@ -2438,6 +2525,9 @@ File ${templatePath} already exists. Use --force to overwrite.`));
       project_id: projectId,
       environment: environment.name
     };
+    if (selectedServiceName) {
+      config.service = selectedServiceName;
+    }
     writeFileSync4(configPath, JSON.stringify(config, null, 2) + "\n");
     const templateVars = varsArray.map((v) => ({
       key: v.key,
@@ -2451,7 +2541,8 @@ File ${templatePath} already exists. Use --force to overwrite.`));
       const simpleContent = generateTemplate(templateVars, { includeDefaults: true });
       writeFileSync4(templatePath, simpleContent);
     }
-    spinner.succeed("Project initialized");
+    const serviceInfo = selectedServiceName ? ` (service: ${selectedServiceName})` : "";
+    spinner.succeed(`Project initialized${serviceInfo}`);
     console.log("");
     console.log(chalk11.green("Created:"));
     console.log(chalk11.gray(`  ${configPath}`));