lsh-framework 1.8.2 → 2.0.1

package/dist/cli.js

@@ -11,6 +11,7 @@ import { registerCompletionCommands } from './commands/completion.js';
 import { registerConfigCommands } from './commands/config.js';
 import { registerSyncHistoryCommands } from './commands/sync-history.js';
 import { registerIPFSCommands } from './commands/ipfs.js';
+import { registerMigrateCommand } from './commands/migrate.js';
 import { init_daemon } from './services/daemon/daemon.js';
 import { init_supabase } from './services/supabase/supabase.js';
 import { init_cron } from './services/cron/cron.js';
@@ -146,6 +147,7 @@ function findSimilarCommands(input, validCommands) {
     registerConfigCommands(program);
     registerSyncHistoryCommands(program);
     registerIPFSCommands(program);
+    registerMigrateCommand(program);
     // Secrets management (primary feature)
     await init_secrets(program);
     // Supporting services

package/dist/commands/migrate.js

@@ -0,0 +1,105 @@
+/**
+ * Migration Command - Help users migrate from v1.x to v2.0
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+import { homedir } from 'os';
+import { getGitRepoInfo } from '../lib/git-utils.js';
+export function registerMigrateCommand(program) {
+    program
+        .command('migrate')
+        .description('Migrate from v1.x to v2.0 environment naming')
+        .option('--dry-run', 'Show what would be migrated without doing it')
+        .option('--v1-compat', 'Enable v1.x compatibility mode')
+        .action(async (options) => {
+        if (options.v1Compat) {
+            console.log('\n🔄 Enabling v1.x Compatibility Mode\n');
+            console.log('Add this to your shell profile (~/.bashrc or ~/.zshrc):');
+            console.log('');
+            console.log('  export LSH_V1_COMPAT=true');
+            console.log('');
+            console.log('This will keep v1.x behavior (repo_dev naming).');
+            console.log('');
+            return;
+        }
+        console.log('\n🔄 LSH v2.0 Migration Guide\n');
+        console.log('━'.repeat(60));
+        console.log('');
+        // Check if in git repo
+        const gitInfo = getGitRepoInfo(process.cwd());
+        if (!gitInfo?.isGitRepo) {
+            console.log('ℹ️  Not in a git repository');
+            console.log('');
+            console.log('v2.0 only affects git repositories.');
+            console.log('Outside git repos, behavior is unchanged (default: dev)');
+            console.log('');
+            return;
+        }
+        console.log('📁 Current Repository:', gitInfo.repoName);
+        console.log('🌿 Branch:', gitInfo.currentBranch);
+        console.log('');
+        console.log('📊 Environment Naming Changes:\n');
+        console.log('  v1.x Behavior:');
+        console.log(`    lsh push              → ${gitInfo.repoName}_dev`);
+        console.log(`    lsh push --env dev    → ${gitInfo.repoName}_dev`);
+        console.log(`    lsh push --env staging → ${gitInfo.repoName}_staging`);
+        console.log('');
+        console.log('  v2.0 Behavior:');
+        console.log(`    lsh push              → ${gitInfo.repoName} (simpler!)`);
+        console.log(`    lsh push --env dev    → ${gitInfo.repoName}_dev`);
+        console.log(`    lsh push --env staging → ${gitInfo.repoName}_staging`);
+        console.log('');
+        // Check for existing v1.x cache
+        const cacheDir = path.join(homedir(), '.lsh', 'secrets-cache');
+        const repoName = gitInfo.repoName || 'unknown';
+        const v1EnvName = `${repoName}_dev`;
+        const v2EnvName = repoName;
+        let hasV1Data = false;
+        let hasV2Data = false;
+        if (fs.existsSync(cacheDir)) {
+            const files = fs.readdirSync(cacheDir);
+            hasV1Data = files.some(f => f.includes(v1EnvName));
+            hasV2Data = files.some(f => f.includes(v2EnvName) && !f.includes(`${v2EnvName}_`));
+        }
+        console.log('💾 Your Current Data:\n');
+        if (hasV1Data) {
+            console.log(`  ✅ v1.x data found: ${v1EnvName}`);
+        }
+        if (hasV2Data) {
+            console.log(`  ✅ v2.0 data found: ${v2EnvName}`);
+        }
+        if (!hasV1Data && !hasV2Data) {
+            console.log('  ℹ️  No local cache found (fresh start)');
+        }
+        console.log('');
+        console.log('🔧 Migration Steps:\n');
+        if (hasV1Data && !hasV2Data) {
+            console.log('  You have v1.x data. To migrate:\n');
+            console.log('  1. Push with explicit environment name:');
+            console.log(`     lsh push --env dev     # Keeps v1.x format (${v1EnvName})`);
+            console.log('');
+            console.log('  2. Or start using v2.0 format:');
+            console.log(`     lsh push               # New v2.0 format (${v2EnvName})`);
+            console.log('');
+            console.log('  💡 Both formats can coexist. Use --env dev to access old data.');
+        }
+        else if (hasV2Data) {
+            console.log('  ✅ You\'re already using v2.0 format!');
+            console.log('');
+            console.log(`  Continue using: lsh push    # → ${v2EnvName}`);
+        }
+        else {
+            console.log('  ✅ Fresh start - you\'re ready for v2.0!');
+            console.log('');
+            console.log(`  Start using: lsh push    # → ${v2EnvName}`);
+        }
+        console.log('');
+        console.log('━'.repeat(60));
+        console.log('');
+        console.log('📚 For more information:');
+        console.log('   https://github.com/gwicho38/lsh/blob/main/docs/releases/2.0.0.md');
+        console.log('');
+        console.log('💡 Tip: Use --v1-compat flag to keep v1.x behavior');
+        console.log('');
+    });
+}

package/dist/lib/secrets-manager.js

@@ -175,6 +175,8 @@ export class SecretsManager {
         if (filename !== '.env' && !filename.startsWith('.env.')) {
             throw new Error(`Invalid filename: ${filename}. Must be '.env' or start with '.env.'`);
         }
+        // Get the effective environment name (repo-aware)
+        const effectiveEnv = this.getRepoAwareEnvironment(environment);
         // Warn if using default key
         if (!process.env.LSH_SECRETS_KEY) {
             logger.warn('⚠️  Warning: No LSH_SECRETS_KEY set. Using machine-specific key.');
@@ -182,15 +184,15 @@ export class SecretsManager {
             logger.warn('   Then add LSH_SECRETS_KEY=<key> to your .env on all machines');
             console.log();
         }
-        logger.info(`Pushing ${envFilePath} to IPFS (${this.getRepoAwareEnvironment(environment)})...`);
+        logger.info(`Pushing ${envFilePath} to IPFS (${effectiveEnv})...`);
         const content = fs.readFileSync(envFilePath, 'utf8');
         const env = this.parseEnvFile(content);
         // Check for destructive changes unless force is true
         if (!force) {
             try {
                 // Check if secrets already exist for this environment
-                if (this.storage.exists(environment, this.gitInfo?.repoName)) {
-                    const existingSecrets = await this.storage.pull(environment, this.encryptionKey, this.gitInfo?.repoName);
+                if (this.storage.exists(effectiveEnv, this.gitInfo?.repoName)) {
+                    const existingSecrets = await this.storage.pull(effectiveEnv, this.encryptionKey, this.gitInfo?.repoName);
                     const cloudEnv = {};
                     existingSecrets.forEach(s => {
                         cloudEnv[s.key] = s.value;
@@ -214,16 +216,16 @@ export class SecretsManager {
         const secrets = Object.entries(env).map(([key, value]) => ({
             key,
             value,
-            environment,
+            environment: effectiveEnv,
             createdAt: new Date(),
             updatedAt: new Date(),
         }));
         // Store on IPFS
-        const cid = await this.storage.push(secrets, environment, this.encryptionKey, this.gitInfo?.repoName, this.gitInfo?.currentBranch);
+        const cid = await this.storage.push(secrets, effectiveEnv, this.encryptionKey, this.gitInfo?.repoName, this.gitInfo?.currentBranch);
         logger.info(`✅ Pushed ${secrets.length} secrets from ${filename} to IPFS`);
         console.log(`📦 IPFS CID: ${cid}`);
         // Log to IPFS for immutable audit record
-        await this.logToIPFS('push', environment, secrets.length);
+        await this.logToIPFS('push', effectiveEnv, secrets.length);
     }
     /**
      * Pull .env from IPFS
@@ -363,15 +365,39 @@ export class SecretsManager {
         }
         return status;
     }
+    /**
+     * Get the default environment name based on context
+     * v2.0: In git repo, default is repo name; otherwise 'dev'
+     */
+    getDefaultEnvironment() {
+        // Check for v1 compatibility mode
+        if (process.env.LSH_V1_COMPAT === 'true') {
+            return 'dev'; // v1.x behavior
+        }
+        // v2.0 behavior: use repo name as default in git repos
+        if (this.gitInfo?.repoName) {
+            return ''; // Empty string signals "use repo name only"
+        }
+        return 'dev';
+    }
     /**
      * Get repo-aware environment namespace
-     * Returns environment name with repo context if in a git repo
+     * v2.0: Returns environment name with repo context if in a git repo
+     *
+     * Behavior:
+     * - Empty env in repo: returns just repo name (v2.0 default)
+     * - Named env in repo: returns repo_env (e.g., repo_staging)
+     * - Any env outside repo: returns env as-is
      */
     getRepoAwareEnvironment(environment) {
         if (this.gitInfo?.repoName) {
+            // v2.0: Empty environment means "use repo name only"
+            if (environment === '' || environment === 'default') {
+                return this.gitInfo.repoName;
+            }
             return `${this.gitInfo.repoName}_${environment}`;
         }
-        return environment;
+        return environment || 'dev'; // Default to 'dev' outside git repos
     }
     /**
      * Generate encryption key if not set

package/dist/services/secrets/secrets.js

@@ -18,7 +18,9 @@ export async function init_secrets(program) {
         .action(async (options) => {
         const manager = new SecretsManager();
         try {
-            await manager.push(options.file, options.env, options.force);
+            // v2.0: Use context-aware default environment
+            const env = options.env === 'dev' ? manager.getDefaultEnvironment() : options.env;
+            await manager.push(options.file, env, options.force);
         }
         catch (error) {
             const err = error;
@@ -40,7 +42,9 @@ export async function init_secrets(program) {
         .action(async (options) => {
         const manager = new SecretsManager();
         try {
-            await manager.pull(options.file, options.env, options.force);
+            // v2.0: Use context-aware default environment
+            const env = options.env === 'dev' ? manager.getDefaultEnvironment() : options.env;
+            await manager.pull(options.file, env, options.force);
         }
         catch (error) {
             const err = error;
@@ -273,13 +277,15 @@ API_KEY=
         .action(async (options) => {
         const manager = new SecretsManager();
         try {
+            // v2.0: Use context-aware default environment
+            const env = options.env === 'dev' ? manager.getDefaultEnvironment() : options.env;
             if (options.legacy) {
                 // Use legacy sync (suggestions only)
-                await manager.sync(options.file, options.env);
+                await manager.sync(options.file, env);
             }
             else {
                 // Use new smart sync (auto-execute)
-                await manager.smartSync(options.file, options.env, !options.dryRun, options.load, options.force, options.forceRekey);
+                await manager.smartSync(options.file, env, !options.dryRun, options.load, options.force, options.forceRekey);
             }
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lsh-framework",
-  "version": "1.8.2",
+  "version": "2.0.1",
   "description": "Simple, cross-platform encrypted secrets manager with automatic sync, IPFS audit logs, and multi-environment support. Just run lsh sync and start managing your secrets.",
   "main": "dist/app.js",
   "bin": {