lsh-framework 0.8.2 → 0.8.3

package/dist/lib/secrets-manager.js

@@ -6,7 +6,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as crypto from 'crypto';
 import DatabasePersistence from './database-persistence.js';
-import { createLogger } from './logger.js';
+import { createLogger, LogLevel } from './logger.js';
 import { getGitRepoInfo, hasEnvExample, ensureEnvInGitignore } from './git-utils.js';
 const logger = createLogger('SecretsManager');
 export class SecretsManager {
@@ -476,117 +476,161 @@ LSH_SECRETS_KEY=${this.encryptionKey}
      * This is the new enhanced sync that does everything automatically
      */
     async smartSync(envFilePath = '.env', environment = 'dev', autoExecute = true, loadMode = false) {
-        // Use repo-aware environment if in git repo
-        const effectiveEnv = this.getRepoAwareEnvironment(environment);
-        const displayEnv = this.gitInfo?.repoName ? `${this.gitInfo.repoName}/${environment}` : environment;
-        // In load mode, redirect output to stderr so stdout only has export commands
-        const out = loadMode ? console.error : console.log;
-        out(`\n🔍 Smart sync for: ${displayEnv}\n`);
-        // Show git repo context if detected
-        if (this.gitInfo?.isGitRepo) {
-            out('📁 Git Repository:');
-            out(`   Repo: ${this.gitInfo.repoName || 'unknown'}`);
-            if (this.gitInfo.currentBranch) {
-                out(`   Branch: ${this.gitInfo.currentBranch}`);
-            }
-            out();
-        }
-        // Step 1: Ensure encryption key exists
-        if (!process.env.LSH_SECRETS_KEY) {
-            logger.info('🔑 No encryption key found...');
-            await this.ensureEncryptionKey();
-            out();
-        }
-        // Step 2: Ensure .gitignore includes .env
-        if (this.gitInfo?.isGitRepo) {
-            ensureEnvInGitignore(process.cwd());
-        }
-        // Step 3: Check current status
-        const status = await this.status(envFilePath, effectiveEnv);
-        out('📊 Current Status:');
-        out(`   Encryption key: ${status.keySet ? '✅' : '❌'}`);
-        out(`   Local ${envFilePath}: ${status.localExists ? `✅ (${status.localKeys} keys)` : '❌'}`);
-        out(`   Cloud storage: ${status.cloudExists ? `✅ (${status.cloudKeys} keys)` : '❌'}`);
-        if (status.cloudExists && status.keyMatches !== undefined) {
-            out(`   Key matches: ${status.keyMatches ? '✅' : '❌'}`);
-        }
-        out();
-        // Step 4: Determine action and execute if auto mode
-        let action = 'in-sync';
-        if (status.cloudExists && status.keyMatches === false) {
-            action = 'key-mismatch';
-            out('⚠️  Encryption key mismatch!');
-            out('   The local key does not match the cloud storage.');
-            out('   Please use the original key or push new secrets with:');
-            out(`   lsh lib secrets push -f ${envFilePath} -e ${environment}`);
-            out();
-            return;
+        // In load mode, suppress all logger output to prevent zsh glob interpretation
+        // Save original level and restore at the end
+        const originalLogLevel = loadMode ? logger['config'].level : undefined;
+        if (loadMode) {
+            logger.setLevel(LogLevel.NONE);
         }
-        if (!status.localExists && !status.cloudExists) {
-            action = 'create-and-push';
-            out('🆕 No secrets found locally or in cloud');
-            out('   Creating new .env file...');
-            if (autoExecute) {
-                await this.createEnvFromExample(envFilePath);
-                out('   Pushing to cloud...');
-                await this.push(envFilePath, effectiveEnv);
+        try {
+            // Use repo-aware environment if in git repo
+            const effectiveEnv = this.getRepoAwareEnvironment(environment);
+            const displayEnv = this.gitInfo?.repoName ? `${this.gitInfo.repoName}/${environment}` : environment;
+            // In load mode, suppress all output except the final export commands
+            const out = loadMode ? () => { } : console.log;
+            out(`\n🔍 Smart sync for: ${displayEnv}\n`);
+            // Show git repo context if detected
+            if (this.gitInfo?.isGitRepo) {
+                out('📁 Git Repository:');
+                out(`   Repo: ${this.gitInfo.repoName || 'unknown'}`);
+                if (this.gitInfo.currentBranch) {
+                    out(`   Branch: ${this.gitInfo.currentBranch}`);
+                }
                 out();
-                out('✅ Setup complete! Edit your .env and run sync again to update.');
-            }
-            else {
-                out('💡 Run: lsh lib secrets create && lsh lib secrets push');
             }
-            out();
-            // Output export commands in load mode
-            if (loadMode && fs.existsSync(envFilePath)) {
-                console.log(this.generateExportCommands(envFilePath));
+            // Step 1: Ensure encryption key exists
+            if (!process.env.LSH_SECRETS_KEY) {
+                logger.info('🔑 No encryption key found...');
+                await this.ensureEncryptionKey();
+                out();
             }
-            return;
-        }
-        if (status.localExists && !status.cloudExists) {
-            action = 'push';
-            out('⬆️  Local .env exists but not in cloud');
-            if (autoExecute) {
-                out('   Pushing to cloud...');
-                await this.push(envFilePath, effectiveEnv);
-                out('✅ Secrets pushed to cloud!');
+            // Step 2: Ensure .gitignore includes .env
+            if (this.gitInfo?.isGitRepo) {
+                ensureEnvInGitignore(process.cwd());
             }
-            else {
-                out(`💡 Run: lsh lib secrets push -f ${envFilePath} -e ${environment}`);
+            // Step 3: Check current status
+            const status = await this.status(envFilePath, effectiveEnv);
+            out('📊 Current Status:');
+            out(`   Encryption key: ${status.keySet ? '✅' : '❌'}`);
+            out(`   Local ${envFilePath}: ${status.localExists ? `✅ (${status.localKeys} keys)` : '❌'}`);
+            out(`   Cloud storage: ${status.cloudExists ? `✅ (${status.cloudKeys} keys)` : '❌'}`);
+            if (status.cloudExists && status.keyMatches !== undefined) {
+                out(`   Key matches: ${status.keyMatches ? '✅' : '❌'}`);
             }
             out();
-            // Output export commands in load mode
-            if (loadMode && fs.existsSync(envFilePath)) {
-                console.log(this.generateExportCommands(envFilePath));
+            // Step 4: Determine action and execute if auto mode
+            let action = 'in-sync';
+            if (status.cloudExists && status.keyMatches === false) {
+                action = 'key-mismatch';
+                out('⚠️  Encryption key mismatch!');
+                out('   The local key does not match the cloud storage.');
+                out('   Please use the original key or push new secrets with:');
+                out(`   lsh lib secrets push -f ${envFilePath} -e ${environment}`);
+                out();
+                return;
             }
-            return;
-        }
-        if (!status.localExists && status.cloudExists && status.keyMatches) {
-            action = 'pull';
-            out('⬇️  Cloud secrets available but no local file');
-            if (autoExecute) {
-                out('   Pulling from cloud...');
-                await this.pull(envFilePath, effectiveEnv, false);
-                out('✅ Secrets pulled from cloud!');
+            if (!status.localExists && !status.cloudExists) {
+                action = 'create-and-push';
+                out('🆕 No secrets found locally or in cloud');
+                out('   Creating new .env file...');
+                if (autoExecute) {
+                    await this.createEnvFromExample(envFilePath);
+                    out('   Pushing to cloud...');
+                    await this.push(envFilePath, effectiveEnv);
+                    out();
+                    out('✅ Setup complete! Edit your .env and run sync again to update.');
+                }
+                else {
+                    out('💡 Run: lsh lib secrets create && lsh lib secrets push');
+                }
+                out();
+                // Output export commands in load mode
+                if (loadMode && fs.existsSync(envFilePath)) {
+                    console.log(this.generateExportCommands(envFilePath));
+                }
+                return;
             }
-            else {
-                out(`💡 Run: lsh lib secrets pull -f ${envFilePath} -e ${environment}`);
+            if (status.localExists && !status.cloudExists) {
+                action = 'push';
+                out('⬆️  Local .env exists but not in cloud');
+                if (autoExecute) {
+                    out('   Pushing to cloud...');
+                    await this.push(envFilePath, effectiveEnv);
+                    out('✅ Secrets pushed to cloud!');
+                }
+                else {
+                    out(`💡 Run: lsh lib secrets push -f ${envFilePath} -e ${environment}`);
+                }
+                out();
+                // Output export commands in load mode
+                if (loadMode && fs.existsSync(envFilePath)) {
+                    console.log(this.generateExportCommands(envFilePath));
+                }
+                return;
             }
-            out();
-            // Output export commands in load mode
-            if (loadMode && fs.existsSync(envFilePath)) {
-                console.log(this.generateExportCommands(envFilePath));
+            if (!status.localExists && status.cloudExists && status.keyMatches) {
+                action = 'pull';
+                out('⬇️  Cloud secrets available but no local file');
+                if (autoExecute) {
+                    out('   Pulling from cloud...');
+                    await this.pull(envFilePath, effectiveEnv, false);
+                    out('✅ Secrets pulled from cloud!');
+                }
+                else {
+                    out(`💡 Run: lsh lib secrets pull -f ${envFilePath} -e ${environment}`);
+                }
+                out();
+                // Output export commands in load mode
+                if (loadMode && fs.existsSync(envFilePath)) {
+                    console.log(this.generateExportCommands(envFilePath));
+                }
+                return;
             }
-            return;
-        }
-        if (status.localExists && status.cloudExists && status.keyMatches) {
-            if (status.localModified && status.cloudModified) {
-                const localNewer = status.localModified > status.cloudModified;
-                const timeDiff = Math.abs(status.localModified.getTime() - status.cloudModified.getTime());
-                const minutesDiff = Math.floor(timeDiff / (1000 * 60));
-                // If difference is less than 1 minute, consider in sync
-                if (minutesDiff < 1) {
-                    out('✅ Local and cloud are in sync!');
+            if (status.localExists && status.cloudExists && status.keyMatches) {
+                if (status.localModified && status.cloudModified) {
+                    const localNewer = status.localModified > status.cloudModified;
+                    const timeDiff = Math.abs(status.localModified.getTime() - status.cloudModified.getTime());
+                    const minutesDiff = Math.floor(timeDiff / (1000 * 60));
+                    // If difference is less than 1 minute, consider in sync
+                    if (minutesDiff < 1) {
+                        out('✅ Local and cloud are in sync!');
+                        out();
+                        if (!loadMode) {
+                            this.showLoadInstructions(envFilePath);
+                        }
+                        else if (fs.existsSync(envFilePath)) {
+                            console.log(this.generateExportCommands(envFilePath));
+                        }
+                        return;
+                    }
+                    if (localNewer) {
+                        action = 'push';
+                        out('⬆️  Local file is newer than cloud');
+                        out(`   Local: ${status.localModified.toLocaleString()}`);
+                        out(`   Cloud: ${status.cloudModified.toLocaleString()}`);
+                        if (autoExecute) {
+                            out('   Pushing to cloud...');
+                            await this.push(envFilePath, effectiveEnv);
+                            out('✅ Secrets synced to cloud!');
+                        }
+                        else {
+                            out(`💡 Run: lsh lib secrets push -f ${envFilePath} -e ${environment}`);
+                        }
+                    }
+                    else {
+                        action = 'pull';
+                        out('⬇️  Cloud is newer than local file');
+                        out(`   Local: ${status.localModified.toLocaleString()}`);
+                        out(`   Cloud: ${status.cloudModified.toLocaleString()}`);
+                        if (autoExecute) {
+                            out('   Pulling from cloud (backup created)...');
+                            await this.pull(envFilePath, effectiveEnv, false);
+                            out('✅ Secrets synced from cloud!');
+                        }
+                        else {
+                            out(`💡 Run: lsh lib secrets pull -f ${envFilePath} -e ${environment}`);
+                        }
+                    }
                     out();
                     if (!loadMode) {
                         this.showLoadInstructions(envFilePath);
@@ -596,52 +640,22 @@ LSH_SECRETS_KEY=${this.encryptionKey}
                     }
                     return;
                 }
-                if (localNewer) {
-                    action = 'push';
-                    out('⬆️  Local file is newer than cloud');
-                    out(`   Local: ${status.localModified.toLocaleString()}`);
-                    out(`   Cloud: ${status.cloudModified.toLocaleString()}`);
-                    if (autoExecute) {
-                        out('   Pushing to cloud...');
-                        await this.push(envFilePath, effectiveEnv);
-                        out('✅ Secrets synced to cloud!');
-                    }
-                    else {
-                        out(`💡 Run: lsh lib secrets push -f ${envFilePath} -e ${environment}`);
-                    }
-                }
-                else {
-                    action = 'pull';
-                    out('⬇️  Cloud is newer than local file');
-                    out(`   Local: ${status.localModified.toLocaleString()}`);
-                    out(`   Cloud: ${status.cloudModified.toLocaleString()}`);
-                    if (autoExecute) {
-                        out('   Pulling from cloud (backup created)...');
-                        await this.pull(envFilePath, effectiveEnv, false);
-                        out('✅ Secrets synced from cloud!');
-                    }
-                    else {
-                        out(`💡 Run: lsh lib secrets pull -f ${envFilePath} -e ${environment}`);
-                    }
-                }
-                out();
-                if (!loadMode) {
-                    this.showLoadInstructions(envFilePath);
-                }
-                else if (fs.existsSync(envFilePath)) {
-                    console.log(this.generateExportCommands(envFilePath));
-                }
-                return;
+            }
+            // Default: everything is in sync
+            out('✅ Secrets are synchronized!');
+            out();
+            if (!loadMode) {
+                this.showLoadInstructions(envFilePath);
+            }
+            else if (fs.existsSync(envFilePath)) {
+                console.log(this.generateExportCommands(envFilePath));
             }
         }
-        // Default: everything is in sync
-        out('✅ Secrets are synchronized!');
-        out();
-        if (!loadMode) {
-            this.showLoadInstructions(envFilePath);
-        }
-        else if (fs.existsSync(envFilePath)) {
-            console.log(this.generateExportCommands(envFilePath));
+        finally {
+            // Restore original logger level if it was changed
+            if (loadMode && originalLogLevel !== undefined) {
+                logger.setLevel(originalLogLevel);
+            }
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lsh-framework",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "Encrypted secrets manager with automatic rotation, team sync, and multi-environment support. Built on a powerful shell with daemon scheduling and CI/CD integration.",
   "main": "dist/app.js",
   "bin": {
@@ -106,6 +106,7 @@
     "ioredis": "^5.8.0",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
+    "lsh-framework": "^0.8.2",
     "node-cron": "^3.0.3",
     "node-fetch": "^3.3.2",
     "ora": "^8.0.1",