@uagents/syncenv-cli 0.1.1

package/README.md

@@ -0,0 +1,204 @@
+# SyncEnv CLI
+
+CLI for SyncEnv - Secure environment variable synchronization.
+
+## Installation
+
+### Via npm (Recommended)
+
+```bash
+npm install -g @uagents/syncenv-cli
+```
+
+### Via pnpm
+
+```bash
+pnpm add -g @uagents/syncenv-cli
+```
+
+### Via curl (Standalone Binary)
+
+```bash
+curl -sL https://syncenv-files.uagents.app/cli/install.sh | bash
+```
+
+With custom install directory:
+
+```bash
+curl -sL https://syncenv-files.uagents.app/cli/install.sh | INSTALL_DIR=~/.local/bin bash
+```
+
+## Quick Start
+
+1. **Initialize a project:**
+
+   ```bash
+   syncenv init
+   ```
+
+2. **Create an account or login:**
+
+   ```bash
+   syncenv auth signup
+   # or
+   syncenv auth login
+   ```
+
+3. **Create a project on the server:**
+
+   ```bash
+   syncenv project create
+   ```
+
+4. **Push your .env file:**
+
+   ```bash
+   syncenv env push
+   ```
+
+5. **Pull environment variables:**
+   ```bash
+   syncenv env pull
+   ```
+
+## Commands
+
+### Authentication
+
+- `syncenv auth signup` - Create a new account
+- `syncenv auth login` - Login to your account
+- `syncenv auth logout` - Logout and clear session
+- `syncenv auth status` - Check authentication status
+
+### Project Management
+
+- `syncenv init` - Initialize project configuration
+- `syncenv project list` - List all projects
+- `syncenv project create [name]` - Create a new project
+- `syncenv project get <id>` - Get project details
+- `syncenv project delete <id>` - Delete a project
+- `syncenv project use <id>` - Set default project
+
+### Environment Variables
+
+- `syncenv env push` - Push .env file to server
+  - `-p, --project <id>` - Project ID
+  - `-e, --env <name>` - Environment name
+  - `-f, --file <path>` - File path
+  - `-m, --message <message>` - Change description
+
+- `syncenv env pull` - Pull .env file from server
+  - `-p, --project <id>` - Project ID
+  - `-e, --env <name>` - Environment name
+  - `-f, --file <path>` - Output file path
+  - `-v, --version <number>` - Specific version to pull
+  - `-m, --merge` - Merge with existing file
+
+- `syncenv env history` - Show version history
+  - `-l, --limit <number>` - Number of versions to show
+
+- `syncenv env diff <v1> <v2>` - Compare two versions
+
+- `syncenv env rollback <version>` - Rollback to a specific version
+
+- `syncenv env sync` - Smart sync (pull + merge + push)
+  - `--dry-run` - Preview changes without applying
+  - `--strategy <strategy>` - Conflict resolution: `local-wins`, `remote-wins`, `interactive`
+  - `-y, --yes` - Skip confirmation prompts
+
+### Device Management
+
+- `syncenv device list` - List all devices
+- `syncenv device authorize <id>` - Authorize a pending device
+- `syncenv device revoke <id>` - Revoke a device
+- `syncenv device remove <id>` - Remove a device
+- `syncenv device current` - Show current device info
+
+### Diagnostics
+
+- `syncenv doctor` - Diagnose configuration and connectivity issues
+
+## Smart Merge
+
+When pushing or syncing, if remote has been modified since your last pull, the CLI automatically performs a **three-way merge**:
+
+1. **Detect conflicts** - Compare your local changes with remote changes
+2. **Auto-merge** - Non-conflicting changes are merged automatically
+3. **Interactive resolution** - Conflicts are presented with options:
+   - `[l]` Use local value
+   - `[r]` Use remote value
+   - `[b]` Keep both values
+   - `[e]` Edit custom value
+   - `[s]` Skip and keep conflict markers
+
+### Merge Strategies
+
+```bash
+# Interactive (default) - prompt for each conflict
+syncenv env sync
+
+# Local wins - always use your changes
+syncenv env sync --strategy=local-wins
+
+# Remote wins - always use remote changes
+syncenv env sync --strategy=remote-wins
+
+# Fail on conflict - exit if conflicts exist
+syncenv env push --strategy=fail-on-conflict
+```
+
+## Configuration
+
+### CLI Config
+
+Stored in OS-specific config directory (e.g., `~/.config/syncenv/` on Linux).
+
+- `apiUrl` - API base URL
+- `authToken` - Authentication token
+- `userId` - User ID
+- `deviceId` - Device ID
+
+### Project Config (`.envsyncrc`)
+
+Example:
+
+```yaml
+project:
+  name: myapp
+  id: proj_xxx
+
+defaults:
+  environment: dev
+  pushOnChange: false
+  confirmOverwrite: true
+
+encryption:
+  algorithm: AES-256-GCM
+  keyDerivation: Argon2id
+
+environments:
+  dev:
+    file: .env
+  staging:
+    file: .env.staging
+  production:
+    file: .env.production
+    requireConfirmation: true
+```
+
+## Environment Variables
+
+- `SYNCENV_API_URL` - API base URL (default: http://localhost:8787)
+- `SYNCENV_VERBOSE` - Enable verbose logging
+
+## Security
+
+- All encryption/decryption happens locally on your device
+- Master password never leaves your device
+- Data Encryption Keys (DEK) are encrypted with your Key Encryption Key (KEK)
+- KEK is derived from your master password using Argon2id
+- Server only stores encrypted data and cannot decrypt your environment variables
+
+## License
+
+MIT

package/dist/chunk-F7ZZUTRW.js

@@ -0,0 +1,403 @@
+// src/merge/interactive.ts
+import * as readline from "readline";
+
+// src/merge/three-way.ts
+function threeWayMerge(input) {
+  const { base, local, remote } = input;
+  const allKeys = /* @__PURE__ */ new Set([...Object.keys(base), ...Object.keys(local), ...Object.keys(remote)]);
+  const result = {};
+  const conflicts = [];
+  let added = 0;
+  let modified = 0;
+  let deleted = 0;
+  let unchanged = 0;
+  for (const key of allKeys) {
+    const baseVal = base[key] ?? null;
+    const localVal = local[key] ?? null;
+    const remoteVal = remote[key] ?? null;
+    if (localVal === remoteVal) {
+      if (localVal !== null) {
+        result[key] = localVal;
+        if (baseVal === null) {
+          added++;
+        } else if (baseVal !== localVal) {
+          modified++;
+        } else {
+          unchanged++;
+        }
+      } else if (baseVal !== null) {
+        deleted++;
+      }
+      continue;
+    }
+    if (localVal === baseVal) {
+      if (remoteVal !== null) {
+        result[key] = remoteVal;
+        if (baseVal === null) {
+          added++;
+        } else {
+          modified++;
+        }
+      } else {
+        deleted++;
+      }
+      continue;
+    }
+    if (remoteVal === baseVal) {
+      if (localVal !== null) {
+        result[key] = localVal;
+        if (baseVal === null) {
+          added++;
+        } else {
+          modified++;
+        }
+      } else {
+        deleted++;
+      }
+      continue;
+    }
+    conflicts.push({
+      key,
+      baseValue: baseVal,
+      localValue: localVal,
+      remoteValue: remoteVal
+    });
+  }
+  return {
+    autoMerged: conflicts.length === 0,
+    mergedContent: formatEnvFile(result),
+    conflicts,
+    statistics: {
+      added,
+      modified,
+      deleted,
+      conflicts: conflicts.length,
+      unchanged
+    }
+  };
+}
+function resolveConflicts(base, local, remote, conflicts) {
+  const result = {};
+  const allKeys = /* @__PURE__ */ new Set([...Object.keys(base), ...Object.keys(local), ...Object.keys(remote)]);
+  for (const key of allKeys) {
+    const baseVal = base[key] ?? null;
+    const localVal = local[key] ?? null;
+    const remoteVal = remote[key] ?? null;
+    const conflict = conflicts.find((c) => c.key === key);
+    if (conflict) {
+      switch (conflict.resolution) {
+        case "local":
+          if (localVal !== null) result[key] = localVal;
+          break;
+        case "remote":
+          if (remoteVal !== null) result[key] = remoteVal;
+          break;
+        case "custom":
+          if (conflict.customValue !== void 0 && conflict.customValue !== null) {
+            result[key] = conflict.customValue;
+          }
+          break;
+        default:
+          break;
+      }
+      continue;
+    }
+    if (localVal === remoteVal) {
+      if (localVal !== null) result[key] = localVal;
+    } else if (localVal === baseVal) {
+      if (remoteVal !== null) result[key] = remoteVal;
+    } else {
+      if (localVal !== null) result[key] = localVal;
+    }
+  }
+  const unresolvedConflicts = conflicts.filter((c) => !c.resolution);
+  if (unresolvedConflicts.length > 0) {
+    return formatEnvFileWithConflicts(result, unresolvedConflicts);
+  }
+  return formatEnvFile(result);
+}
+function formatEnvFile(vars) {
+  const lines = [];
+  for (const [key, value] of Object.entries(vars)) {
+    if (value.includes("\n") || value.includes('"')) {
+      if (!value.includes("'")) {
+        lines.push(`${key}='${value}'`);
+      } else {
+        lines.push(`${key}="${value.replace(/"/g, '\\"')}"`);
+      }
+    } else if (value.includes(" ") || value.includes("#")) {
+      lines.push(`${key}="${value}"`);
+    } else {
+      lines.push(`${key}=${value}`);
+    }
+  }
+  return lines.join("\n") + (lines.length > 0 ? "\n" : "");
+}
+function formatEnvFileWithConflicts(vars, conflicts) {
+  const lines = ["# WARNING: This file contains unresolved merge conflicts", ""];
+  for (const [key, value] of Object.entries(vars)) {
+    const conflict = conflicts.find((c) => c.key === key);
+    if (conflict) {
+      lines.push(`# CONFLICT: ${key}`);
+      lines.push(`# BASE: ${conflict.baseValue ?? "(deleted)"}`);
+      lines.push(`${key}=<<<<<<< LOCAL`);
+      lines.push(conflict.localValue ?? "");
+      lines.push("=======");
+      lines.push(conflict.remoteValue ?? "");
+      lines.push(">>>>>>> REMOTE");
+      lines.push("");
+    } else {
+      lines.push(`${key}=${value}`);
+    }
+  }
+  return lines.join("\n") + "\n";
+}
+function applyMergeStrategy(input, strategy) {
+  const result = threeWayMerge(input);
+  if (result.autoMerged) {
+    return result;
+  }
+  if (strategy === "fail-on-conflict") {
+    throw new Error(
+      `Merge failed: ${result.conflicts.length} conflict(s) found. Keys: ${result.conflicts.map((c) => c.key).join(", ")}`
+    );
+  }
+  const resolvedConflicts = result.conflicts.map((c) => ({
+    ...c,
+    resolution: strategy === "local-wins" ? "local" : "remote"
+  }));
+  const resolvedContent = resolveConflicts(
+    input.base,
+    input.local,
+    input.remote,
+    resolvedConflicts
+  );
+  return {
+    autoMerged: true,
+    mergedContent: resolvedContent,
+    conflicts: resolvedConflicts,
+    statistics: {
+      ...result.statistics,
+      conflicts: 0
+    }
+  };
+}
+
+// src/merge/interactive.ts
+var COLORS = {
+  reset: "\x1B[0m",
+  red: "\x1B[31m",
+  green: "\x1B[32m",
+  yellow: "\x1B[33m",
+  blue: "\x1B[34m",
+  magenta: "\x1B[35m",
+  cyan: "\x1B[36m",
+  gray: "\x1B[90m"
+};
+async function interactiveMerge(input, mergeResult, options = {}) {
+  const { base, local, remote } = input;
+  const { conflicts, statistics } = mergeResult;
+  printMergeSummary(statistics);
+  const resolvedConflicts = [];
+  for (const conflict of conflicts) {
+    printConflictDetails(conflict);
+    const choice = await promptForResolution(conflict, options);
+    if (choice.type === "cancel") {
+      return { success: false, content: "", resolvedConflicts, cancelled: true };
+    }
+    if (choice.type === "save-draft") {
+      resolvedConflicts.push(
+        ...conflicts.slice(resolvedConflicts.length).map((c) => ({
+          ...c,
+          resolution: void 0
+        }))
+      );
+      const content2 = resolveConflicts(base, local, remote, resolvedConflicts);
+      return { success: true, content: content2, resolvedConflicts, cancelled: false };
+    }
+    resolvedConflicts.push({
+      ...conflict,
+      resolution: choice.resolution,
+      customValue: choice.customValue
+    });
+  }
+  const content = resolveConflicts(base, local, remote, resolvedConflicts);
+  const confirmed = await confirmFinalMerge(mergeResult.statistics);
+  if (!confirmed) {
+    return { success: false, content: "", resolvedConflicts, cancelled: true };
+  }
+  return { success: true, content, resolvedConflicts, cancelled: false };
+}
+function printMergeSummary(stats) {
+  console.log("");
+  console.log(
+    `${COLORS.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\u2510${COLORS.reset}`
+  );
+  console.log(
+    `${COLORS.yellow}\u2502${COLORS.reset} ${COLORS.yellow}\u26A0\uFE0F  Conflicts detected, manual resolution required${COLORS.reset}        ${COLORS.yellow}\u2502${COLORS.reset}`
+  );
+  console.log(
+    `${COLORS.yellow}\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524${COLORS.reset}`
+  );
+  if (stats.added > 0) {
+    console.log(
+      `${COLORS.yellow}\u2502${COLORS.reset}  ${COLORS.green}Added:${COLORS.reset} ${stats.added.toString().padStart(3)}${" ".repeat(42)}${COLORS.yellow}\u2502${COLORS.reset}`
+    );
+  }
+  if (stats.modified > 0) {
+    console.log(
+      `${COLORS.yellow}\u2502${COLORS.reset}  ${COLORS.cyan}Modified:${COLORS.reset} ${stats.modified.toString().padStart(3)}${" ".repeat(39)}${COLORS.yellow}\u2502${COLORS.reset}`
+    );
+  }
+  if (stats.deleted > 0) {
+    console.log(
+      `${COLORS.yellow}\u2502${COLORS.reset}  ${COLORS.red}Deleted:${COLORS.reset} ${stats.deleted.toString().padStart(3)}${" ".repeat(40)}${COLORS.yellow}\u2502${COLORS.reset}`
+    );
+  }
+  console.log(
+    `${COLORS.yellow}\u2502${COLORS.reset}  ${COLORS.red}\u2715 Conflicts: ${stats.conflicts}${" ".repeat(35)}${COLORS.yellow}\u2502${COLORS.reset}`
+  );
+  console.log(
+    `${COLORS.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\u2518${COLORS.reset}`
+  );
+  console.log("");
+}
+function printConflictDetails(conflict) {
+  const { key, baseValue, localValue, remoteValue } = conflict;
+  console.log(`${COLORS.magenta}Conflict: ${key}${COLORS.reset}`);
+  console.log(
+    `${COLORS.gray}\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500${COLORS.reset}`
+  );
+  if (baseValue !== null) {
+    console.log(`${COLORS.gray}Base value:${COLORS.reset}`);
+    console.log(`  ${truncate(baseValue, 60)}`);
+  } else {
+    console.log(`${COLORS.gray}Base: (new variable)${COLORS.reset}`);
+  }
+  console.log("");
+  if (localValue !== null) {
+    console.log(`${COLORS.green}[L] Local:${COLORS.reset}`);
+    console.log(`  ${truncate(localValue, 60)}`);
+  } else {
+    console.log(`${COLORS.green}[L] Local: (deleted)${COLORS.reset}`);
+  }
+  console.log("");
+  if (remoteValue !== null) {
+    console.log(`${COLORS.blue}[R] Remote:${COLORS.reset}`);
+    console.log(`  ${truncate(remoteValue, 60)}`);
+  } else {
+    console.log(`${COLORS.blue}[R] Remote: (deleted)${COLORS.reset}`);
+  }
+  console.log("");
+}
+async function promptForResolution(conflict, options) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const ask = (prompt) => {
+    return new Promise((resolve) => {
+      rl.question(prompt, resolve);
+    });
+  };
+  try {
+    while (true) {
+      const choices = [];
+      if (conflict.localValue !== null) {
+        choices.push("[l] Use local value (Local)");
+      }
+      if (conflict.remoteValue !== null) {
+        choices.push("[r] Use remote value (Remote)");
+      }
+      if (options.allowBoth && conflict.localValue !== null && conflict.remoteValue !== null) {
+        choices.push("[b] Keep both (Both)");
+      }
+      if (options.allowEdit) {
+        choices.push("[e] Edit custom value (Edit)");
+      }
+      choices.push("[s] Skip, keep conflict markers (Skip)");
+      choices.push("[d] Save draft, continue later (Draft)");
+      choices.push("[q] Cancel merge (Cancel)");
+      console.log("How would you like to resolve this conflict?");
+      choices.forEach((c) => console.log(`  ${c}`));
+      console.log("");
+      const answer = await ask("Choice: ");
+      const choice = answer.trim().toLowerCase();
+      switch (choice) {
+        case "l":
+        case "local":
+          if (conflict.localValue !== null) {
+            return { type: "resolve", resolution: "local" };
+          }
+          console.log(`${COLORS.red}Local value does not exist, cannot select${COLORS.reset}`);
+          break;
+        case "r":
+        case "remote":
+          if (conflict.remoteValue !== null) {
+            return { type: "resolve", resolution: "remote" };
+          }
+          console.log(`${COLORS.red}Remote value does not exist, cannot select${COLORS.reset}`);
+          break;
+        case "b":
+        case "both":
+          if (conflict.localValue !== null && conflict.remoteValue !== null) {
+            const customValue = `${conflict.localValue}
+# MERGED_FROM_REMOTE: ${conflict.remoteValue}`;
+            return { type: "resolve", resolution: "custom", customValue };
+          }
+          console.log(`${COLORS.red}Both values must exist to select this option${COLORS.reset}`);
+          break;
+        case "e":
+        case "edit":
+          if (options.allowEdit) {
+            const customValue = await ask("Enter custom value: ");
+            return { type: "resolve", resolution: "local", customValue };
+          }
+          break;
+        case "s":
+        case "skip":
+          return { type: "resolve", resolution: "local" };
+        case "d":
+        case "draft":
+          return { type: "save-draft" };
+        case "q":
+        case "quit":
+        case "cancel":
+          return { type: "cancel" };
+        default:
+          console.log(`${COLORS.red}Invalid option, please select again${COLORS.reset}`);
+      }
+    }
+  } finally {
+    rl.close();
+  }
+}
+async function confirmFinalMerge(stats) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    console.log("");
+    console.log(`${COLORS.cyan}Merge Summary:${COLORS.reset}`);
+    console.log(`  Added: ${stats.added}`);
+    console.log(`  Modified: ${stats.modified}`);
+    console.log(`  Deleted: ${stats.deleted}`);
+    console.log(`  Conflicts resolved: ${stats.conflicts}`);
+    console.log("");
+    rl.question("Apply this merge? [y/N]: ", (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase() === "y");
+    });
+  });
+}
+function truncate(str, maxLength) {
+  if (str.length <= maxLength) return str;
+  return str.substring(0, maxLength - 3) + "...";
+}
+
+export {
+  threeWayMerge,
+  applyMergeStrategy,
+  interactiveMerge
+};