@envmanager-cli/cli 0.1.5 → 0.1.7

package/README.md

@@ -44,6 +44,7 @@ envmanager diff
 | `template` | Manage .env templates |
 | `validate` | Validate against schema |
 | `completion` | Generate shell completion script |
+| `debug` | Collect diagnostic info for troubleshooting |
 
 ## Shell Completion
 
@@ -91,9 +92,19 @@ envmanager pull --project 1 --environment development
 envmanager pull --project my-api --environment production
 ```
 
+### Default Environment
+
+When `-e` / `--environment` is omitted, it defaults to `development`. You can override the default in `envmanager.json`:
+
+```json
+{
+  "environment": "staging"
+}
+```
+
 ### Multiple Organizations
 
-If you belong to multiple organizations, use `--org` to specify which one:
+If you belong to multiple organizations, the CLI auto-detects the organization from your project when possible. Use `--org` to specify explicitly if needed:
 
 ```bash
 envmanager pull --org "My Company" --project 1 --environment staging

package/dist/bin/envmanager.js

@@ -1287,7 +1287,7 @@ var diffCommand = new Command6("diff").description("Show differences between loc
 import { Command as Command7 } from "commander";
 import chalk8 from "chalk";
 import ora6 from "ora";
-var listCommand = new Command7("list").description("List projects, environments, or variables").argument("[resource]", "Resource to list: projects, environments, variables", "projects").option("--org <name>", "Organization name (required if you belong to multiple)").option("-p, --project <name-or-id>", "Project name or ID (for environments/variables)").option("-e, --environment <name>", "Environment name (for variables)").option("-v, --verbose", "Show IDs").action(async (resource, options) => {
+var listCommand = new Command7("list").description("List projects, environments, or variables").argument("[resource]", "Resource to list: projects, environments, variables", "projects").option("--org <name>", "Organization name (required if you belong to multiple)").option("-p, --project <name-or-id>", "Project name or ID (for environments/variables)").option("-e, --environment <name>", 'Environment name (default: "development")').option("-v, --verbose", "Show IDs").action(async (resource, options) => {
   const spinner = ora6("Connecting...").start();
   try {
     const config = loadConfig();
@@ -1479,7 +1479,9 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
       table: "variables"
     },
     (payload) => {
-      const record = payload.new || payload.old;
+      const newRecord = payload.new;
+      const oldRecord = payload.old;
+      const record = newRecord && Object.keys(newRecord).length > 0 ? newRecord : oldRecord;
       if (!record) return;
       const recordEnvId = record.environment_id;
       if (recordEnvId !== environmentId) {
@@ -1493,8 +1495,7 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
         is_secret: record.is_secret,
         timestamp: Date.now() / 1e3
       };
-      if (payload.eventType === "UPDATE" && payload.old) {
-        const oldRecord = payload.old;
+      if (payload.eventType === "UPDATE" && oldRecord) {
         if (oldRecord.key !== record.key) {
           event.old_key = oldRecord.key;
         }
@@ -1664,9 +1665,12 @@ function mergeWithRemote(local, remoteVariables, strategy) {
         result.set(key, value);
       }
       break;
-    case "remote_wins":
+    case "remote_wins": {
+      const remoteKeys = new Set(remoteVariables.map((v) => v.key));
       for (const [key, value] of local) {
-        result.set(key, value);
+        if (remoteKeys.has(key)) {
+          result.set(key, value);
+        }
       }
       for (const v of remoteVariables) {
         if (v.value !== null) {
@@ -1674,6 +1678,7 @@ function mergeWithRemote(local, remoteVariables, strategy) {
         }
       }
       break;
+    }
     case "merge_new":
       for (const [key, value] of local) {
         result.set(key, value);
@@ -2234,7 +2239,7 @@ import { readFileSync as readFileSync7, writeFileSync as writeFileSync5, existsS
 import { resolve as resolve6 } from "path";
 import { parse as parseDotenv4 } from "dotenv";
 var templateCommand = new Command11("template").description("Manage environment templates");
-templateCommand.command("generate").description("Generate .env file from template and EnvManager values").option("-t, --template <file>", "Template file (default: .env.template or .env.template.yaml)").option("-o, --output <file>", "Output file (default: .env)").option("-e, --environment <name>", "Environment name (default: from config)").option("-p, --project <id>", "Project ID (default: from config)").option("-f, --force", "Overwrite existing output file").action(async (options) => {
+templateCommand.command("generate").description("Generate .env file from template and EnvManager values").option("-t, --template <file>", "Template file (default: .env.template or .env.template.yaml)").option("-o, --output <file>", "Output file (default: .env)").option("-e, --environment <name>", 'Environment name (default: "development")').option("-p, --project <id>", "Project ID (default: from config)").option("-f, --force", "Overwrite existing output file").action(async (options) => {
   const spinner = ora9("Generating .env from template...").start();
   try {
     const config = loadConfig();
@@ -2336,7 +2341,7 @@ File ${outputPath} already exists. Use --force to overwrite.`));
     process.exit(1);
   }
 });
-templateCommand.command("sync").description("Compare template with EnvManager and report differences").option("-t, --template <file>", "Template file (default: .env.template or .env.template.yaml)").option("-e, --environment <name>", "Environment name (default: from config)").option("-p, --project <id>", "Project ID (default: from config)").action(async (options) => {
+templateCommand.command("sync").description("Compare template with EnvManager and report differences").option("-t, --template <file>", "Template file (default: .env.template or .env.template.yaml)").option("-e, --environment <name>", 'Environment name (default: "development")').option("-p, --project <id>", "Project ID (default: from config)").action(async (options) => {
   const spinner = ora9("Comparing template with EnvManager...").start();
   try {
     const config = loadConfig();
@@ -2652,7 +2657,7 @@ function jsonToSchema(json) {
 }
 
 // src/commands/validate.ts
-var validateCommand = new Command12("validate").description("Validate local .env file against schema from EnvManager or local file").option("-e, --environment <name>", "Environment name (default: from config)").option("-p, --project <id>", "Project ID (default: from config)").option("--org <name>", "Organization name (required if you belong to multiple)").option("-i, --input <file>", "Input .env file (default: .env)").option("-s, --schema <file>", "Local schema JSON file (skip fetching from EnvManager)").option("--strict", "Fail on warnings (extra variables not in schema)").action(async (options) => {
+var validateCommand = new Command12("validate").description("Validate local .env file against schema from EnvManager or local file").option("-e, --environment <name>", 'Environment name (default: "development")').option("-p, --project <id>", "Project ID (default: from config)").option("--org <name>", "Organization name (required if you belong to multiple)").option("-i, --input <file>", "Input .env file (default: .env)").option("-s, --schema <file>", "Local schema JSON file (skip fetching from EnvManager)").option("--strict", "Fail on warnings (extra variables not in schema)").action(async (options) => {
   const spinner = ora10("Validating environment...").start();
   try {
     const config = loadConfig();