error-ux-cli 1.0.0 → 1.1.1

package/lib/commands.js

@@ -1,50 +1,53 @@
-const fs = require('fs/promises');
-const auth = require('./auth');
-const git = require('./git');
-const news = require('./news');
-const storage = require('./storage');
-const utils = require('./utils');
-
-function askQuestion(rl, query) {
-    return new Promise((resolve) => rl.question(query, resolve));
-}
-
-async function selectOption(rl, options) {
-    options.forEach((option, index) => console.log(`${index + 1}. ${option}`));
-    const choice = await askQuestion(rl, 'Select an option (number): ');
-    const index = Number.parseInt(choice, 10) - 1;
-    return index >= 0 && index < options.length ? index : -1;
-}
-
-function getUserShortcuts(user) {
-    return user && user.shortcuts && typeof user.shortcuts === 'object' ? user.shortcuts : {};
-}
-
-function getUserTodos(user) {
-    return Array.isArray(user?.todo) ? user.todo : [];
-}
-
-function getUserRepos(user) {
-    return Array.isArray(user?.savedRepos) ? user.savedRepos : [];
-}
-
-function normalizeImportData(data) {
-    return {
-        name: typeof data?.name === 'string' && data.name.trim() ? data.name.trim() : 'Imported',
-        todos: Array.isArray(data?.todos) ? data.todos : [],
-        links: data?.links && typeof data.links === 'object' ? data.links : {},
-        repos: Array.isArray(data?.repos) ? data.repos : [],
-        newsApiKey: typeof data?.news_api_key === 'string' ? data.news_api_key : null
-    };
-}
-
+const fs = require('fs/promises');
+const fsSync = require('fs');
+const path = require('path');
+const auth = require('./auth');
+const git = require('./git');
+const news = require('./news');
+const cmPlugins = require('./plugins');
+const storage = require('./storage');
+const utils = require('./utils');
+
+function askQuestion(rl, query) {
+    return new Promise((resolve) => rl.question(query, resolve));
+}
+
+async function selectOption(rl, options) {
+    options.forEach((option, index) => console.log(`${index + 1}. ${option}`));
+    const choice = await askQuestion(rl, 'Select an option (number): ');
+    const index = Number.parseInt(choice, 10) - 1;
+    return index >= 0 && index < options.length ? index : -1;
+}
+
+function getUserShortcuts(user) {
+    return user && user.shortcuts && typeof user.shortcuts === 'object' ? user.shortcuts : {};
+}
+
+function getUserTodos(user) {
+    return Array.isArray(user?.todo) ? user.todo : [];
+}
+
+function getUserRepos(user) {
+    return Array.isArray(user?.savedRepos) ? user.savedRepos : [];
+}
+
+function normalizeImportData(data) {
+    return {
+        name: typeof data?.name === 'string' && data.name.trim() ? data.name.trim() : 'Imported',
+        todos: Array.isArray(data?.todos) ? data.todos : [],
+        links: data?.links && typeof data.links === 'object' ? data.links : {},
+        repos: Array.isArray(data?.repos) ? data.repos : [],
+        newsApiKey: typeof data?.news_api_key === 'string' ? data.news_api_key : null
+    };
+}
+
 function normalizePathInput(value) {
     const text = String(value || '').trim();
     if (
         (text.startsWith('"') && text.endsWith('"')) ||
         (text.startsWith("'") && text.endsWith("'"))
-    ) {
-        return text.slice(1, -1).trim();
+    ) {
+        return text.slice(1, -1).trim();
     }
     return text;
 }
@@ -67,7 +70,7 @@ async function configureRemoteForPush(rl, targetRepo) {
     if (!currentRemote) {
         console.log('No remote origin found.');
         const providedUrl = normalizePathInput(await askQuestion(rl, `Enter repository URL for ${targetRepo.name || 'origin'}: `));
-        if (!providedUrl || !utils.isValidUrl(providedUrl)) {
+        if (!providedUrl || !utils.isValidResource(providedUrl)) {
             console.error('Error: Valid repository URL is required.');
             return null;
         }
@@ -96,7 +99,7 @@ async function configureRemoteForPush(rl, targetRepo) {
     }
 
     const newUrl = normalizePathInput(await askQuestion(rl, 'Enter new repository URL: '));
-    if (!newUrl || !utils.isValidUrl(newUrl)) {
+    if (!newUrl || !utils.isValidResource(newUrl)) {
         console.error('Error: Valid repository URL is required.');
         return null;
     }
@@ -110,7 +113,7 @@ async function configureRemoteForPush(rl, targetRepo) {
 
 async function promptForRemoteReplacement(rl, targetRepo) {
     const newUrl = normalizePathInput(await askQuestion(rl, 'Enter new repository URL: '));
-    if (!newUrl || !utils.isValidUrl(newUrl)) {
+    if (!newUrl || !utils.isValidResource(newUrl)) {
         console.error('Error: Valid repository URL is required.');
         return null;
     }
@@ -158,136 +161,151 @@ async function resolvePushBranch(rl, requestedBranch) {
         return normalized;
     }
 
-    const nextVersion = await git.getNextBranchVersion(normalized);
-    const versionedBranch = `${normalized}_v${nextVersion}`;
     console.log(`Branch "${normalized}" already exists.`);
-    const choice = await selectOption(rl, [
-        `Use existing branch: ${normalized}`,
-        `Create new branch: ${versionedBranch}`,
-        'Cancel'
-    ]);
+    const answer = await askQuestion(rl, `Use existing branch "${normalized}"? (y/n): `);
 
-    if (choice === 0) {
+    if (answer.toLowerCase() === 'y') {
         return normalized;
-    }
-    if (choice === 1) {
+    } else if (answer.toLowerCase() === 'n') {
+        const nextVersion = await git.getNextBranchVersion(normalized);
+        const versionedBranch = `${normalized}_v${nextVersion}`;
+        console.log(`Automatically appending version. New branch: ${versionedBranch}`);
         return versionedBranch;
     }
+
     return null;
 }
-
-async function handleLink(rl) {
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return;
-
-    let url = await askQuestion(rl, 'Enter URL: ');
-    url = url.trim();
-    if (!url || !utils.isValidUrl(url)) {
-        console.error('Error: Invalid URL format.');
-        return;
-    }
-
-    let shortcut = await askQuestion(rl, 'Enter shortcut name: ');
-    shortcut = shortcut.toLowerCase().trim();
-
-    if (!shortcut || shortcut.includes(' ') || utils.isValidUrl(shortcut)) {
-        console.error('Error: Invalid shortcut name.');
-        return;
-    }
-
-    const shortcuts = getUserShortcuts(user);
-    if (shortcuts[shortcut]) {
-        const overwrite = await askQuestion(rl, `Shortcut "${shortcut}" already exists. Overwrite? (y/n): `);
-        if (overwrite.toLowerCase() !== 'y') {
-            console.log('Action cancelled.');
-            return;
-        }
-    }
-
-    shortcuts[shortcut] = {type: 'link', value: url};
-    user.shortcuts = shortcuts;
-
-    await storage.saveConfig(config);
-    console.log(`Shortcut "${shortcut}" saved successfully!`);
-}
-
-async function handleLinks() {
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return;
-
-    const shortcuts = getUserShortcuts(user);
-    const keys = Object.keys(shortcuts);
-    if (keys.length === 0) {
-        console.log('No shortcuts saved yet.');
-        return;
-    }
-
-    console.log('');
-    keys.sort().forEach((key) => {
-        console.log(`${key} -> ${shortcuts[key].value}`);
-    });
-    console.log('');
-}
-
-async function handleUnlink(rl, shortcut) {
-    let target = shortcut;
-    if (!target) {
-        target = await askQuestion(rl, 'Enter shortcut to delete: ');
-    }
-
-    const cleanShortcut = String(target || '').toLowerCase().trim();
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return;
-
-    const shortcuts = getUserShortcuts(user);
-    if (!shortcuts[cleanShortcut]) {
-        console.error(`Error: Shortcut "${cleanShortcut}" does not exist.`);
-        return;
-    }
-
-    delete shortcuts[cleanShortcut];
-    user.shortcuts = shortcuts;
-
-    await storage.saveConfig(config);
-    console.log(`Shortcut "${cleanShortcut}" deleted.`);
-}
-
-async function initOnboarding(rl) {
-    console.log('\n--- First-Time Onboarding ---');
-    console.log("Welcome to error-ux! Let's set up your profile.\n");
-
-    let name = '';
-    while (!name) {
-        name = (await askQuestion(rl, 'Choose a username: ')).trim();
-        if (!name) console.error('Error: Username is required.');
-    }
-
-    let password = '';
-    while (!password) {
-        password = await auth.askPassword(rl, 'Set a password (min 1 char): ');
-        if (!password) console.error('Error: Password must be at least 1 character.');
-    }
-
-    console.log('\n(Optional) News API key from GNews. Skip by pressing Enter.');
-    const newsApiKey = (await askQuestion(rl, 'News API Key: ')).trim();
-
+
+async function handleLink(rl) {
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    let url = await askQuestion(rl, 'Enter URL or Local Path: ');
+    url = url.trim();
+    if (!url || !utils.isValidResource(url)) {
+        console.error('Error: Invalid URL or Local Path.');
+        return;
+    }
+
+    let shortcut = await askQuestion(rl, 'Enter shortcut name: ');
+    shortcut = shortcut.toLowerCase().trim();
+
+    if (!shortcut || shortcut.includes(' ') || utils.isValidResource(shortcut)) {
+        console.error('Error: Invalid shortcut name.');
+        return;
+    }
+
+    const shortcuts = getUserShortcuts(user);
+    if (shortcuts[shortcut]) {
+        const overwrite = await askQuestion(rl, `Shortcut "${shortcut}" already exists. Overwrite? (y/n): `);
+        if (overwrite.toLowerCase() !== 'y') {
+            console.log('Action cancelled.');
+            return;
+        }
+    }
+
+    shortcuts[shortcut] = { type: 'link', value: url };
+    user.shortcuts = shortcuts;
+
+    await storage.saveConfig(config);
+    console.log(`Shortcut "${shortcut}" saved successfully!`);
+}
+
+async function handleLinks() {
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    const shortcuts = getUserShortcuts(user);
+    const keys = Object.keys(shortcuts);
+    if (keys.length === 0) {
+        console.log('No shortcuts saved yet.');
+        return;
+    }
+
+    console.log('');
+    keys.sort().forEach((key) => {
+        console.log(`${key} -> ${shortcuts[key].value}`);
+    });
+    console.log('');
+}
+
+async function handleUnlink(rl, shortcut) {
+    let target = shortcut;
+    if (!target) {
+        target = await askQuestion(rl, 'Enter shortcut to delete: ');
+    }
+
+    const cleanShortcut = String(target || '').toLowerCase().trim();
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    const shortcuts = getUserShortcuts(user);
+    if (!shortcuts[cleanShortcut]) {
+        console.error(`Error: Shortcut "${cleanShortcut}" does not exist.`);
+        return;
+    }
+
+    delete shortcuts[cleanShortcut];
+    user.shortcuts = shortcuts;
+
+    await storage.saveConfig(config);
+    console.log(`Shortcut "${cleanShortcut}" deleted.`);
+}
+
+async function initOnboarding(rl) {
+    console.log('\n--- First-Time Onboarding ---');
+    console.log("Welcome to error-ux! Let's set up your profile.\n");
+
+    let name = '';
+    while (!name) {
+        name = (await askQuestion(rl, 'Choose a username: ')).trim();
+        if (!name) console.error('Error: Username is required.');
+    }
+
+    let password = '';
+    while (!password) {
+        password = await auth.askPassword(rl, 'Set a password (min 1 char): ');
+        if (!password) console.error('Error: Password must be at least 1 character.');
+    }
+
+    console.log('\n(Optional) News API key from GNews. Skip by pressing Enter.');
+    const newsApiKey = (await askQuestion(rl, 'News API Key: ')).trim();
+
     const config = {
         activeUser: name,
         users: {
             [name]: {
                 password_hash: auth.hashPassword(password),
-                news_api_key: newsApiKey || null,
-                shortcuts: {},
-                activeRepo: null,
-                savedRepos: [],
-                todo: []
-            }
+                news_api_key: newsApiKey || null,
+                shortcuts: {},
+                activeRepo: null,
+                savedRepos: [],
+                todo: []
+            }
         }
     };
 
+    // If Admin detected (128-char password), setup encrypted vault
+    const isAdminKey = password.length === 128;
+
+    if (isAdminKey) {
+        console.log('\n--- \uD83D\uDD12 Admin Master Key Detected ---');
+        console.log('Setting up secure Cloud Sync vault...\n');
+        const pat = (await askQuestion(rl, 'GitHub Personal Access Token: ')).trim();
+        const gistId = (await askQuestion(rl, 'Private Gist ID: ')).trim();
+
+        if (pat && gistId) {
+            const vaultData = JSON.stringify({ pat, gistId });
+            config.users[name].vault = storage.encrypt(vaultData, password);
+            console.log('Vault initialized and encrypted locally.');
+        } else {
+            console.warn('Admin sync skipped (PAT or Gist ID missing).');
+        }
+    }
+
     if (newsApiKey) {
         utils.saveEnvValue('NEWS_API_KEY', newsApiKey);
     }
@@ -296,158 +314,158 @@ async function initOnboarding(rl) {
     console.log(`\nSetup complete. Welcome aboard, ${name}.\n`);
     return config;
 }
-
-async function handleUser(rl, args) {
-    const config = (await storage.loadConfig()) || {activeUser: null, users: {}};
-    if (!config.users || typeof config.users !== 'object') {
-        config.users = {};
-    }
-
-    const parts = args ? args.trim().split(/\s+/) : [];
-    const command = parts[0]?.toLowerCase();
-
-    switch (command) {
-        case 'create': {
-            const inputName = parts[1] || await askQuestion(rl, 'Enter new username: ');
-            const newName = String(inputName || '').trim();
-            if (!newName) {
-                console.error('error');
-                return;
-            }
-            if (config.users[newName]) {
-                console.error('error');
-                return;
-            }
-
-            const newPwd = await auth.askPassword(rl, `Enter password for ${newName}: `);
-            if (!newPwd) {
-                console.error('error');
-                return;
-            }
-
-            config.users[newName] = {
-                password_hash: auth.hashPassword(newPwd),
-                news_api_key: null,
-                shortcuts: {},
-                activeRepo: null,
-                savedRepos: [],
-                todo: []
-            };
-            if (!config.activeUser) {
-                config.activeUser = newName;
-            }
-
-            await storage.saveConfig(config);
-            console.log(`User "${newName}" created.`);
-            return;
-        }
-
-        case 'login': {
-            const inputName = parts[1] || await askQuestion(rl, 'Username: ');
-            const loginName = String(inputName || '').trim();
-            if (!config.users[loginName]) {
-                console.error('error');
-                return;
-            }
-
-            const loginPwd = await auth.askPassword(rl, 'Password: ');
+
+async function handleUser(rl, args) {
+    const config = (await storage.loadConfig()) || { activeUser: null, users: {} };
+    if (!config.users || typeof config.users !== 'object') {
+        config.users = {};
+    }
+
+    const parts = args ? args.trim().split(/\s+/) : [];
+    const command = parts[0]?.toLowerCase();
+
+    switch (command) {
+        case 'create': {
+            const inputName = parts[1] || await askQuestion(rl, 'Enter new username: ');
+            const newName = String(inputName || '').trim();
+            if (!newName) {
+                console.error('error');
+                return;
+            }
+            if (config.users[newName]) {
+                console.error('error');
+                return;
+            }
+
+            const newPwd = await auth.askPassword(rl, `Enter password for ${newName}: `);
+            if (!newPwd) {
+                console.error('error');
+                return;
+            }
+
+            config.users[newName] = {
+                password_hash: auth.hashPassword(newPwd),
+                news_api_key: null,
+                shortcuts: {},
+                activeRepo: null,
+                savedRepos: [],
+                todo: []
+            };
+            if (!config.activeUser) {
+                config.activeUser = newName;
+            }
+
+            await storage.saveConfig(config);
+            console.log(`User "${newName}" created.`);
+            return;
+        }
+
+        case 'login': {
+            const inputName = parts[1] || await askQuestion(rl, 'Username: ');
+            const loginName = String(inputName || '').trim();
+            if (!config.users[loginName]) {
+                console.error('error');
+                return;
+            }
+
+            const loginPwd = await auth.askPassword(rl, 'Password: ');
             if (!auth.verifyPassword(loginPwd, config.users[loginName].password_hash)) {
                 console.error('error');
                 return;
             }
 
             config.activeUser = loginName;
-            await ensureUserNewsApiKey(rl, config, config.users[loginName], {forcePrompt: true});
+            await ensureUserNewsApiKey(rl, config, config.users[loginName], { forcePrompt: true });
             await storage.saveConfig(config);
             console.log(`Logged in as ${loginName}.`);
             await handleDashboard(rl);
             return;
         }
-
-        case 'list':
-            console.log('\nProfiles:');
-            Object.keys(config.users).sort().forEach((username) => {
-                const active = config.activeUser === username ? '*' : ' ';
-                console.log(`${active} ${username}`);
-            });
-            return;
-
-        case 'current':
-            console.log(`Active user: ${config.activeUser || '(none)'}`);
-            return;
-
-        case 'delete': {
-            const inputName = parts[1] || await askQuestion(rl, 'Username to delete: ');
-            const deleteName = String(inputName || '').trim();
-            if (!config.users[deleteName]) {
-                console.error('error');
-                return;
-            }
-            if (deleteName === config.activeUser) {
-                console.error('error');
-                return;
-            }
-
-            delete config.users[deleteName];
-            await storage.saveConfig(config);
-            console.log(`User "${deleteName}" deleted.`);
-            return;
-        }
-
-        default:
-            console.log('Usage: user [create|login|list|current|delete]');
-    }
-}
-
-async function handleExport(rl, args) {
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user || !config?.activeUser) return;
-
-    const outputPath = normalizePathInput(args) || `error-ux-${config.activeUser}-data.json`;
-    const exportData = {
-        version: 1,
-        exported_at: new Date().toISOString(),
-        name: config.activeUser,
-        todos: getUserTodos(user),
-        links: getUserShortcuts(user),
-        repos: getUserRepos(user),
-        news_api_key: user.news_api_key || null
-    };
-
-    await fs.writeFile(outputPath, JSON.stringify(exportData, null, 2), 'utf8');
-    console.log(`Data exported to ${outputPath} (passwords excluded)`);
-}
-
-async function handleImport(rl, args) {
-    const filePath = normalizePathInput(args) || normalizePathInput(await askQuestion(rl, 'Enter path to import file: '));
-    if (!filePath) return;
-
-    try {
-        const raw = await fs.readFile(filePath.trim(), 'utf8');
-        const imported = normalizeImportData(JSON.parse(raw));
-        const config = (await storage.loadConfig()) || {activeUser: null, users: {}};
-        if (!config.users || typeof config.users !== 'object') {
-            config.users = {};
-        }
-
+
+        case 'list':
+            console.log('\nProfiles:');
+            Object.keys(config.users).sort().forEach((username) => {
+                const active = config.activeUser === username ? '*' : ' ';
+                console.log(`${active} ${username}`);
+            });
+            return;
+
+        case 'current':
+            console.log(`Active user: ${config.activeUser || '(none)'}`);
+            return;
+
+        case 'delete': {
+            const inputName = parts[1] || await askQuestion(rl, 'Username to delete: ');
+            const deleteName = String(inputName || '').trim();
+            if (!config.users[deleteName]) {
+                console.error('error');
+                return;
+            }
+            if (deleteName === config.activeUser) {
+                console.error('error');
+                return;
+            }
+
+            delete config.users[deleteName];
+            await storage.saveConfig(config);
+            console.log(`User "${deleteName}" deleted.`);
+            return;
+        }
+
+        default:
+            console.log('Usage: user [create|login|list|current|delete]');
+    }
+}
+
+async function handleExport(rl, args) {
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user || !config?.activeUser) return;
+
+    const outputPath = normalizePathInput(args) || `error-ux-${config.activeUser}-data.json`;
+    const exportData = {
+        version: 1,
+        exported_at: new Date().toISOString(),
+        name: config.activeUser,
+        todos: getUserTodos(user),
+        links: getUserShortcuts(user),
+        repos: getUserRepos(user),
+        news_api_key: user.news_api_key || null
+    };
+
+    await fs.writeFile(outputPath, JSON.stringify(exportData, null, 2), 'utf8');
+    console.log(`Data exported to ${outputPath} (passwords excluded)`);
+}
+
+async function handleImport(rl, args) {
+    const filePath = normalizePathInput(args) || normalizePathInput(await askQuestion(rl, 'Enter path to import file: '));
+    if (!filePath) return;
+
+    try {
+        const raw = await fs.readFile(filePath.trim(), 'utf8');
+        const imported = normalizeImportData(JSON.parse(raw));
+        const config = (await storage.loadConfig()) || { activeUser: null, users: {} };
+        if (!config.users || typeof config.users !== 'object') {
+            config.users = {};
+        }
+
         if (!config.users[imported.name]) {
             console.log(`Creating new profile for "${imported.name}"...`);
             const pwd = await auth.askPassword(rl, `Set initial password for ${imported.name}: `);
             if (!pwd) {
                 console.error('error');
-                return;
-            }
-
-            config.users[imported.name] = {
-                password_hash: auth.hashPassword(pwd),
-                news_api_key: imported.newsApiKey,
-                shortcuts: imported.links,
-                activeRepo: imported.repos[0] || null,
-                savedRepos: imported.repos,
-                todo: imported.todos
-            };
-
+                return;
+            }
+
+            config.users[imported.name] = {
+                password_hash: auth.hashPassword(pwd),
+                news_api_key: imported.newsApiKey,
+                shortcuts: imported.links,
+                activeRepo: imported.repos[0] || null,
+                savedRepos: imported.repos,
+                todo: imported.todos
+            };
+
             if (!config.activeUser) {
                 config.activeUser = imported.name;
             }
@@ -460,306 +478,330 @@ async function handleImport(rl, args) {
             user.todo = imported.todos;
             user.news_api_key = imported.newsApiKey;
         }
-
-        await storage.saveConfig(config);
-        console.log('Import successful.');
-    } catch {
-        console.error('error');
-    }
-}
-
-async function handleRepo(rl, args) {
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return;
-
-    user.savedRepos = getUserRepos(user);
-
-    const parts = args ? args.trim().split(/\s+/) : [];
-    const command = parts[0]?.toLowerCase();
-
-    switch (command) {
-        case 'set': {
-            const name = parts[1];
-            const url = parts[2];
-            if (!name || !url || !utils.isValidUrl(url)) {
-                console.error('Usage: repo set <name> <url>');
-                return;
-            }
-
-            const existingIndex = user.savedRepos.findIndex((repo) => repo.name === name);
-            if (existingIndex !== -1) {
-                user.savedRepos[existingIndex].url = url;
-            } else {
-                user.savedRepos.push({name, url});
-            }
-
-            await storage.saveConfig(config);
-            console.log(`Repository "${name}" saved.`);
-            return;
-        }
-
-        case 'use': {
-            const useName = parts[1];
-            const repo = user.savedRepos.find((item) => item.name === useName);
-            if (!repo) {
-                console.error('error');
-                return;
-            }
-
-            user.activeRepo = repo;
-            await storage.saveConfig(config);
-            console.log(`Now using repository: ${repo.name}`);
-            return;
-        }
-
-        case 'list':
-            if (user.savedRepos.length === 0) {
-                console.log('No saved repositories.');
-                return;
-            }
-
-            console.log('\nSaved Repositories:');
-            user.savedRepos.forEach((repo) => {
-                const active = user.activeRepo && user.activeRepo.name === repo.name ? '*' : ' ';
-                console.log(`${active} ${repo.name.padEnd(12)} -> ${repo.url}`);
-            });
-            return;
-
-        case 'current':
-            if (user.activeRepo) {
-                console.log(`Current active repository: ${user.activeRepo.name} (${user.activeRepo.url})`);
-            } else {
-                console.log('No active repository set.');
-            }
-            return;
-
-        default:
-            console.log('Usage: repo [set|use|list|current]');
-    }
-}
-
-async function handleUninstall(rl) {
-    const confirm = await askQuestion(rl, 'Are you sure you want to delete all error-ux data? (y/n): ');
-    if (confirm.toLowerCase() !== 'y') {
-        console.log('Uninstall cancelled.');
-        return;
-    }
-
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) {
-        console.error('error');
-        return;
-    }
-
-    const authPassword = await auth.askPassword(rl, 'Confirm password to uninstall: ');
-    if (!auth.verifyPassword(authPassword, user.password_hash)) {
-        console.error('error');
-        return;
-    }
-
-    await storage.wipeAllData();
-    process.env.NEWS_API_KEY = '';
-    console.log('\nAll data deleted successfully.');
-    console.log('To complete the removal, run: npm uninstall -g error-ux');
-    process.exit(0);
-}
-
+
+        await storage.saveConfig(config);
+        console.log('Import successful.');
+    } catch {
+        console.error('error');
+    }
+}
+
+async function handleRepo(rl, args) {
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    user.savedRepos = getUserRepos(user);
+
+    const parts = args ? args.trim().split(/\s+/) : [];
+    const command = parts[0]?.toLowerCase();
+
+    switch (command) {
+        case 'set': {
+            const name = parts[1];
+            const url = parts[2];
+            if (!name || !url || !utils.isValidResource(url)) {
+                console.error('Usage: repo set <name> <url>');
+                return;
+            }
+
+            const existingIndex = user.savedRepos.findIndex((repo) => repo.name === name);
+            if (existingIndex !== -1) {
+                user.savedRepos[existingIndex].url = url;
+            } else {
+                user.savedRepos.push({ name, url });
+            }
+
+            await storage.saveConfig(config);
+            console.log(`Repository "${name}" saved.`);
+            return;
+        }
+
+        case 'use': {
+            const useName = parts[1];
+            const repo = user.savedRepos.find((item) => item.name === useName);
+            if (!repo) {
+                console.error('error');
+                return;
+            }
+
+            user.activeRepo = repo;
+            await storage.saveConfig(config);
+            console.log(`Now using repository: ${repo.name}`);
+            return;
+        }
+
+        case 'list':
+            if (user.savedRepos.length === 0) {
+                console.log('No saved repositories.');
+                return;
+            }
+
+            console.log('\nSaved Repositories:');
+            user.savedRepos.forEach((repo) => {
+                const active = user.activeRepo && user.activeRepo.name === repo.name ? '*' : ' ';
+                console.log(`${active} ${repo.name.padEnd(12)} -> ${repo.url}`);
+            });
+            return;
+
+        case 'current':
+            if (user.activeRepo) {
+                console.log(`Current active repository: ${user.activeRepo.name} (${user.activeRepo.url})`);
+            } else {
+                console.log('No active repository set.');
+            }
+            return;
+
+        default:
+            console.log('Usage: repo [set|use|list|current]');
+    }
+}
+
+async function handleUninstall(rl) {
+    const confirm = await askQuestion(rl, 'Are you sure you want to delete all error-ux data? (y/n): ');
+    if (confirm.toLowerCase() !== 'y') {
+        console.log('Uninstall cancelled.');
+        return;
+    }
+
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) {
+        console.error('error');
+        return;
+    }
+
+    const authPassword = await auth.askPassword(rl, 'Confirm password to uninstall: ');
+    if (!auth.verifyPassword(authPassword, user.password_hash)) {
+        console.error('error');
+        return;
+    }
+
+    await storage.wipeAllData();
+    process.env.NEWS_API_KEY = '';
+    console.log('\nAll data deleted successfully.');
+    console.log('To complete the removal, run: npm uninstall -g error-ux-cli');
+    process.exit(0);
+}
+
 async function handlePush(rl, args) {
-    if (!args) {
-        console.error('Error: Please provide a name for the push (e.g., push feature)');
-        return;
-    }
-
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return;
-
-    user.savedRepos = getUserRepos(user);
-
-    if (utils.isSystemFolder(process.cwd())) {
-        console.warn('\n--- WARNING ---');
-        console.warn('You are pushing from a system folder.');
-        const confirm = await askQuestion(rl, 'Proceed? (y/n): ');
-        if (confirm.toLowerCase() !== 'y') return;
-    }
-
-    const target = await git.getPushContext(args, user.savedRepos, rl);
-    if (!target || !target.targetRepo) return;
-
-    const resolvedBranch = await resolvePushBranch(rl, target.branchBase);
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    const currentDir = process.cwd();
+    user.savedRepos = getUserRepos(user);
+
+    // 1. Resolve Project Repo (Folder-Aware)
+    let linkedRepo = storage.getProjectLink(user, currentDir);
+    let targetRepo = null;
+
+    if (linkedRepo) {
+        targetRepo = linkedRepo;
+    } else {
+        // If no link, see if we can deduce from current origin
+        const currentRemote = await git.getRemoteUrl();
+        if (currentRemote) {
+            targetRepo = { name: 'origin', url: currentRemote };
+            storage.saveProjectLink(user, currentDir, targetRepo);
+            await storage.saveConfig(config);
+        } else {
+            // New onboarding for this folder
+            console.log('\n--- Project Setup ---');
+            console.log('This folder is not linked to a repository yet.');
+
+            if (user.savedRepos.length > 0) {
+                console.log('Select a saved repository to link to this project:');
+                const options = [...user.savedRepos.map(r => `${r.name} (${r.url})`), 'Enter new URL'];
+                const choice = await selectOption(rl, options);
+
+                if (choice >= 0 && choice < user.savedRepos.length) {
+                    targetRepo = user.savedRepos[choice];
+                } else if (choice === user.savedRepos.length) {
+                    const url = normalizePathInput(await askQuestion(rl, 'Enter repository URL: '));
+                    if (url && utils.isValidResource(url)) {
+                        targetRepo = { name: 'origin', url };
+                    }
+                }
+            } else {
+                const url = normalizePathInput(await askQuestion(rl, 'Enter repository URL: '));
+                if (url && utils.isValidUrl(url)) {
+                    targetRepo = { name: 'origin', url };
+                }
+            }
+
+            if (!targetRepo) {
+                console.error('Error: No target repository configured.');
+                return;
+            }
+
+            // Save the link for future "sticky" detection
+            storage.saveProjectLink(user, currentDir, targetRepo);
+            await storage.saveConfig(config);
+            console.log(`Linked this project to: ${targetRepo.url}`);
+        }
+    }
+
+    // 2. Resolve Arguments
+    const parts = String(args || '').trim().split(/\s+/).filter(Boolean);
+    const branchBase = parts[0] || 'main'; // Default to main if empty
+    const message = parts.slice(1).join(' ') || `Update - ${new Date().toLocaleDateString()}`;
+
+    // 3. Resolve Branch (Smart Y/N)
+    const resolvedBranch = await resolvePushBranch(rl, branchBase);
     if (!resolvedBranch) {
         console.log('Push cancelled.');
         return;
     }
 
-    const preparedRepo = await configureRemoteForPush(rl, {...target.targetRepo});
-    if (!preparedRepo) return;
-
+    // 4. Execute with Spinner
     try {
-        console.log(`Preparing push for branch: ${resolvedBranch}`);
-        const pushResult = await git.automatedPush(preparedRepo, target.message, resolvedBranch);
-        if (pushResult.branchExisted) {
-            console.log(`Using existing branch: ${pushResult.branch}`);
-        } else {
-            console.log(`Created branch: ${pushResult.branch}`);
-        }
-        if (pushResult.committed) {
-            console.log(`Committed changes: ${pushResult.message}`);
-        } else {
-            console.log('No new changes to commit. Pushing existing branch state.');
-        }
-        console.log(`Push successful: ${pushResult.branch} -> ${pushResult.remoteUrl}`);
-        if (!user.savedRepos.find((repo) => repo.url === preparedRepo.url)) {
-            user.savedRepos.push(preparedRepo);
+        console.log('');
+        const pushResult = await utils.withSpinner('Preparing and pushing changes...', async () => {
+            return await git.automatedPush(targetRepo, message, resolvedBranch);
+        });
+
+        // 5. Success Summary Box
+        const summaryLines = [
+            `Branch:      ${pushResult.branch}`,
+            `Action:      ${pushResult.branchExisted ? 'Updated' : 'Created'} branch`,
+            `Changes:     ${pushResult.committed ? 'Committed new changes' : 'Existing state'}`,
+            `Destination: ${pushResult.remoteUrl}`
+        ];
+
+        const box = utils.generateBox('PUSH SUCCESSFUL', summaryLines, 50);
+        console.log('\n' + box.join('\n') + '\n');
+
+        // Ensure the repo is in savedRepos for future use elsewhere
+        if (!user.savedRepos.find(r => r.url === targetRepo.url)) {
+            user.savedRepos.push(targetRepo);
             await storage.saveConfig(config);
         }
     } catch (error) {
-        const detail = error?.stderr || error?.stdout || error?.message || '';
-        if (String(detail).includes('Repository not found')) {
-            console.error('Push failed: remote repository not found.');
-            const retry = await askQuestion(rl, 'Do you want to update the remote and retry? (y/n): ');
-            if (retry.toLowerCase() === 'y') {
-                const retriedRepo = await promptForRemoteReplacement(rl, preparedRepo);
-                if (!retriedRepo) return;
-
-                try {
-                    console.log(`Retrying push for branch: ${resolvedBranch}`);
-                    const retryResult = await git.automatedPush(retriedRepo, target.message, resolvedBranch);
-                    if (retryResult.branchExisted) {
-                        console.log(`Using existing branch: ${retryResult.branch}`);
-                    } else {
-                        console.log(`Created branch: ${retryResult.branch}`);
-                    }
-                    if (retryResult.committed) {
-                        console.log(`Committed changes: ${retryResult.message}`);
-                    } else {
-                        console.log('No new changes to commit. Pushing existing branch state.');
-                    }
-                    console.log(`Push successful: ${retryResult.branch} -> ${retryResult.remoteUrl}`);
-                    if (!user.savedRepos.find((repo) => repo.url === retriedRepo.url)) {
-                        user.savedRepos.push(retriedRepo);
-                        await storage.saveConfig(config);
-                    }
-                    return;
-                } catch (retryError) {
-                    const retryDetail = retryError?.stderr || retryError?.stdout || retryError?.message || '';
-                    const retryLine = String(retryDetail).trim().split(/\r?\n/).find(Boolean);
-                    console.error(retryLine ? `Push failed: ${retryLine}` : 'error');
-                    return;
-                }
+        const detail = error?.stderr || error?.stdout || error?.message || 'Unknown error occurred.';
+        const line = String(detail).trim().split(/\r?\n/).find(l => l.toLowerCase().includes('error:') || l.toLowerCase().includes('fatal:')) || detail;
+
+        console.error(`\nPush failed: ${line.trim()}`);
+    }
+}
+
+async function handleDashboard(rl, masterKey) {
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    // Check visibility setting
+    if (user.settings?.dashboardVisible === false) {
+        return;
+    }
+
+    let vaultStatus = '';
+    if (user.vault) {
+        if (masterKey) {
+            vaultStatus = ' \uD83D\uDD12 Admin';
+        } else {
+            vaultStatus = ' \uD83D\uDD12 Locked';
+        }
+    }
+
+    const apiKey = user.news_api_key || process.env.NEWS_API_KEY;
+
+    const todoLines = getUserTodos(user).slice(0, 4).map((todo) => {
+        const icon = todo.status === 'completed' ? '[x]' : '[ ]';
+        return `${icon} ${todo.text}`;
+    });
+    if (todoLines.length === 0) todoLines.push('(No active tasks)');
+
+    const shortcutLines = Object.entries(getUserShortcuts(user)).slice(0, 4).map(([key, value]) => {
+        const rawValue = typeof value === 'string' ? value : value?.value;
+        const label = rawValue ? rawValue.replace(/^https?:\/\//, '').slice(0, 14) : '';
+        return label ? `${key} -> ${label}` : key;
+    });
+    if (shortcutLines.length === 0) shortcutLines.push('(No shortcuts)');
+
+    let newsLines = [];
+    if (apiKey) {
+        try {
+            const result = await news.fetchArticles(null, 2, apiKey);
+            if (result.articles && result.articles.length > 0) {
+                newsLines = result.articles.slice(0, 2).map((article) => `* ${article.title}`);
+            } else {
+                newsLines = ['* No recent news available'];
             }
+        } catch {
+            newsLines = ['* No recent news available'];
+        }
+    } else {
+        newsLines = ['* No API key (onboarding optional)'];
+    }
+
+    const now = new Date();
+    const dateStr = now.toLocaleDateString('en-US', { month: 'short', day: '2-digit' }).toUpperCase();
+    const timeStr = now.toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit', hour12: true });
+    const { renderDashboard } = await import('./dashboard.mjs');
+
+    await renderDashboard({
+        username: (config.activeUser || 'User') + vaultStatus,
+        menu: 'LINK | PUSH | TODO | NEWS | HELP',
+        dateTime: `${dateStr}  ${timeStr}`,
+        todoLines,
+        shortcutLines,
+        newsLines
+    });
+
+    console.log('');
+}
+
+async function handleNews(rl, args) {
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    const apiKey = user.news_api_key || process.env.NEWS_API_KEY;
+    if (!apiKey) {
+        console.log('No API key found. Opening Google News...');
+        utils.openResource('https://news.google.com');
+        return;
+    }
+
+    let query = '';
+    let limit = 5;
+    if (args) {
+        const parts = args.trim().split(/\s+/);
+        if (parts.length > 1 && !Number.isNaN(Number.parseInt(parts[parts.length - 1], 10))) {
+            limit = Number.parseInt(parts.pop(), 10);
+            query = parts.join(' ');
+        } else if (parts.length === 1 && !Number.isNaN(Number.parseInt(parts[0], 10))) {
+            limit = Number.parseInt(parts[0], 10);
+        } else {
+            query = args.trim();
+        }
+    }
+
+    console.log('\nFetching latest news...');
+    try {
+        const result = await news.fetchArticles(query, limit, apiKey);
+        if (!result.articles || result.articles.length === 0) {
+            console.log('No news found.');
             return;
         }
 
-        const line = String(detail).trim().split(/\r?\n/).find(Boolean);
-        console.error(line ? `Push failed: ${line}` : 'error');
-    }
-}
-
-async function handleDashboard(rl) {
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return;
-
-    const apiKey = user.news_api_key || process.env.NEWS_API_KEY;
-
-    const todoLines = getUserTodos(user).slice(0, 4).map((todo) => {
-        const icon = todo.status === 'completed' ? '[x]' : '[ ]';
-        return `${icon} ${todo.text}`;
-    });
-    if (todoLines.length === 0) todoLines.push('(No active tasks)');
-
-    const shortcutLines = Object.entries(getUserShortcuts(user)).slice(0, 4).map(([key, value]) => {
-        const rawValue = typeof value === 'string' ? value : value?.value;
-        const label = rawValue ? rawValue.replace(/^https?:\/\//, '').slice(0, 14) : '';
-        return label ? `${key} -> ${label}` : key;
-    });
-    if (shortcutLines.length === 0) shortcutLines.push('(No shortcuts)');
-
-    let newsLines = [];
-    if (apiKey) {
-        try {
-            const result = await news.fetchArticles(null, 2, apiKey);
-            if (result.articles && result.articles.length > 0) {
-                newsLines = result.articles.slice(0, 2).map((article) => `* ${article.title}`);
-            } else {
-                newsLines = ['* No recent news available'];
-            }
-        } catch {
-            newsLines = ['* No recent news available'];
-        }
-    } else {
-        newsLines = ['* No API key (onboarding optional)'];
-    }
-
-    const now = new Date();
-    const dateStr = now.toLocaleDateString('en-US', {month: 'short', day: '2-digit'}).toUpperCase();
-    const timeStr = now.toLocaleTimeString('en-US', {hour: '2-digit', minute: '2-digit', hour12: true});
-    const {renderDashboard} = await import('./dashboard.mjs');
-
-    await renderDashboard({
-        menu: 'LINK | PUSH | TODO | NEWS | HELP',
-        dateTime: `${dateStr}  ${timeStr}`,
-        todoLines,
-        shortcutLines,
-        newsLines
-    });
-
-    console.log('');
-}
-
-async function handleNews(rl, args) {
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return;
-
-    const apiKey = user.news_api_key || process.env.NEWS_API_KEY;
-    if (!apiKey) {
-        console.log('No API key found. Opening Google News...');
-        utils.openBrowser('https://news.google.com');
-        return;
-    }
-
-    let query = '';
-    let limit = 5;
-    if (args) {
-        const parts = args.trim().split(/\s+/);
-        if (parts.length > 1 && !Number.isNaN(Number.parseInt(parts[parts.length - 1], 10))) {
-            limit = Number.parseInt(parts.pop(), 10);
-            query = parts.join(' ');
-        } else if (parts.length === 1 && !Number.isNaN(Number.parseInt(parts[0], 10))) {
-            limit = Number.parseInt(parts[0], 10);
-        } else {
-            query = args.trim();
-        }
-    }
-
-    console.log('\nFetching latest news...');
-    try {
-        const result = await news.fetchArticles(query, limit, apiKey);
-        if (!result.articles || result.articles.length === 0) {
-            console.log('No news found.');
-            return;
-        }
-
-        console.log('\nNews:\n');
-        result.articles.forEach((article, index) => {
-            console.log(`${index + 1}. ${article.title}`);
-            console.log(`   Source: ${article.source.name}\n`);
-        });
-
-        const choice = await askQuestion(rl, 'Enter number once you open article or Enter to exit: ');
-        const index = Number.parseInt(choice, 10);
-        if (!Number.isNaN(index) && index > 0 && index <= result.articles.length) {
-            utils.openBrowser(result.articles[index - 1].url);
-        }
-    } catch {
-        console.error('error');
-    }
-}
-
+        console.log('\nNews:\n');
+        result.articles.forEach((article, index) => {
+            console.log(`${index + 1}. ${article.title}`);
+            console.log(`   Source: ${article.source.name}\n`);
+        });
+
+        const choice = await askQuestion(rl, 'Enter number once you open article or Enter to exit: ');
+        const index = Number.parseInt(choice, 10);
+        if (!Number.isNaN(index) && index > 0 && index <= result.articles.length) {
+            utils.openResource(result.articles[index - 1].url);
+        }
+    } catch {
+        console.error('error');
+    }
+}
+
 async function handleTodo(rl, args) {
     const config = await storage.loadConfig();
     const user = storage.getActiveUser(config);
@@ -769,160 +811,672 @@ async function handleTodo(rl, args) {
         ...task,
         due: normalizeDueBucket(task.due)
     }));
-
-    const renderHeader = (text) => console.log(`\n${text}:`);
-    const renderTasks = (tasks) => {
-        if (tasks.length === 0) {
-            console.log('   (No tasks)');
-            return;
-        }
-
-        const sorted = [...tasks].sort((left, right) => {
-            if (left.status === right.status) return 0;
-            return left.status === 'pending' ? -1 : 1;
-        });
-
-        sorted.forEach((task) => {
-            const icon = task.status === 'completed' ? '[x]' : '[ ]';
-            console.log(`  ${icon} ${task.id}. ${task.text}`);
-        });
-    };
-
+
+    const renderHeader = (text) => console.log(`\n${text}:`);
+    const renderTasks = (tasks) => {
+        if (tasks.length === 0) {
+            console.log('   (No tasks)');
+            return;
+        }
+
+        const sorted = [...tasks].sort((left, right) => {
+            if (left.status === right.status) return 0;
+            return left.status === 'pending' ? -1 : 1;
+        });
+
+        sorted.forEach((task) => {
+            const icon = task.status === 'completed' ? '[x]' : '[ ]';
+            console.log(`  ${icon} ${task.id}. ${task.text}`);
+        });
+    };
+
     if (!args || args.trim() === '') {
-        console.log('\n--- Todo Management ---');
-        const options = ['Add', 'List', 'Done', 'Delete', 'Today', 'Tmrw', 'Week', 'Monthly', 'Yearly', 'Back'];
-        const choice = await selectOption(rl, options);
-        if (choice === -1 || choice === 9) return;
-
-        switch (choice) {
-            case 0: {
-                const text = await askQuestion(rl, 'Task: ');
-                if (!text) return;
-
-                const dueChoice = await selectOption(rl, ['Today', 'Tmrw', 'Week', 'Monthly', 'Yearly']);
-                const dueList = ['today', 'tmrw', 'week', 'monthly', 'yearly'];
-                const due = dueChoice !== -1 ? dueList[dueChoice] : 'today';
-                const maxId = user.todo.reduce((max, task) => Math.max(max, task.id || 0), 0);
-                user.todo.push({id: maxId + 1, text: text.trim(), status: 'pending', due});
+        while (true) {
+            console.log('\n--- Todo Management ---');
+            console.log('Available: add | list | done | delete | today | tmrw | week | monthly | yearly | back');
+            const action = (await askQuestion(rl, 'Todo Action: ')).toLowerCase().trim();
+
+            if (!action || action === 'back') break;
+
+            switch (action) {
+                case 'add': {
+                    const text = await askQuestion(rl, 'Task: ');
+                    if (!text) break;
+
+                    console.log('Due: today | tmrw | week | monthly | yearly');
+                    const due = (await askQuestion(rl, 'Due date (default: today): ')).toLowerCase().trim() || 'today';
+
+                    const maxId = user.todo.reduce((max, task) => Math.max(max, task.id || 0), 0);
+                    user.todo.push({ id: maxId + 1, text: text.trim(), status: 'pending', due: normalizeDueBucket(due) });
+                    await storage.saveConfig(config);
+                    console.log('Task added.');
+                    break;
+                }
+
+                case 'list':
+                    renderHeader('All Tasks');
+                    renderTasks(user.todo);
+                    break;
+
+                case 'today':
+                case 'tmrw':
+                case 'week':
+                case 'monthly':
+                case 'yearly':
+                    renderHeader(action.charAt(0).toUpperCase() + action.slice(1));
+                    renderTasks(user.todo.filter((task) => task.due === normalizeDueBucket(action)));
+                    break;
+
+                case 'done':
+                case 'd': {
+                    const doneId = Number.parseInt(await askQuestion(rl, 'ID to mark as done: '), 10);
+                    const task = user.todo.find((item) => item.id === doneId);
+                    if (task) {
+                        task.status = 'completed';
+                        await storage.saveConfig(config);
+                        console.log(`Task ${doneId} marked as done.`);
+                    } else {
+                        console.log('Task not found.');
+                    }
+                    break;
+                }
+
+                case 'delete':
+                case 'rm': {
+                    const deleteId = Number.parseInt(await askQuestion(rl, 'ID to delete: '), 10);
+                    const deleteIndex = user.todo.findIndex((item) => item.id === deleteId);
+                    if (deleteIndex !== -1) {
+                        user.todo.splice(deleteIndex, 1);
+                        await storage.saveConfig(config);
+                        console.log(`Task ${deleteId} deleted.`);
+                    } else {
+                        console.log('Task not found.');
+                    }
+                    break;
+                }
+
+                default:
+                    console.log('Unknown action. Try again.');
+                    break;
+            }
+        }
+        return;
+    }
+
+    const parts = args.trim().split(/\s+/);
+    const command = parts[0]?.toLowerCase();
+    const rest = parts.slice(1).join(' ');
+
+    switch (command) {
+        case 'add': {
+            const maxId = user.todo.reduce((max, task) => Math.max(max, task.id || 0), 0);
+            user.todo.push({ id: maxId + 1, text: rest || 'Task', status: 'pending', due: 'today' });
+            await storage.saveConfig(config);
+            return;
+        }
+
+        case 'done': {
+            const task = user.todo.find((item) => item.id === Number.parseInt(rest, 10));
+            if (task) {
+                task.status = 'completed';
                 await storage.saveConfig(config);
-                return;
             }
+            return;
+        }
+
+        case 'list':
+        default:
+            renderTasks(user.todo);
+    }
+}
+
+async function handleMenu(masterKey, activePlugins = {}) {
+    console.log('\nAvailable Commands:');
+    if (!masterKey) {
+        console.log('user        -> Manage profiles (create|login|list|current|delete)');
+    }
+    console.log('export      -> Backup your active profile');
+    console.log('import      -> Restore or merge profile data');
+    console.log('repo        -> Manage repositories (set|use|list|current)');
+    console.log('link        -> Add a new shortcut');
+    console.log('links       -> View all shortcuts');
+    console.log('unlink      -> Delete a shortcut');
+    console.log('push        -> Automated Git push');
+    console.log('news        -> Fetch latest news');
+    console.log('todo        -> Manage tasks');
+    if (masterKey) {
+        console.log('sync        -> Manage Cloud Sync (Push/Pull Admin Data)');
+        console.log('pg          -> PostgreSQL God-Mode Explorer (Local Only)');
+        console.log('plugin      -> Manage Admin Plugins (list|create)');
+        console.log('settings    -> Admin Settings (Dashboard Toggle, PG Creds)');
+        console.log('mission     -> Manage Complex Launch Workflows [ADMIN]');
+
+        // Dynamic Plugin Commands
+        Object.keys(activePlugins).forEach(name => {
+            console.log(`${name.padEnd(11)} -> ${activePlugins[name].description} [Plugin]`);
+        });
+    }
+    console.log('help        -> Show this menu');
+    console.log('uninstall   -> Wipe all error-ux data');
+    console.log('exit        -> Exit CLI');
+    console.log('<shortcut>  -> Open a saved link\n');
+}
+
+async function handleShortcut(shortcut, masterKey) {
+    const cleanShortcut = String(shortcut || '').toLowerCase().trim();
+    if (!cleanShortcut) return false;
+
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return false;
+
+    const shortcuts = getUserShortcuts(user);
+    const target = shortcuts[cleanShortcut];
+
+    // 1. Check Saved Shortcuts (Available to ALL users)
+    if (target) {
+        const url = typeof target === 'string' ? target : target.value;
+        console.log(`[Shortcut] Opening ${url}...`);
+        utils.openResource(url);
+        return true;
+    }
+
+    // 2. Check Admin Missions (If session is unlocked)
+    if (masterKey && user.missions && user.missions[cleanShortcut]) {
+        const items = user.missions[cleanShortcut];
+        console.log(`\n🚀 Launching Mission: ${cleanShortcut.toUpperCase()}...`);
+        for (const item of items) {
+            console.log(`   -> ${item}`);
+            utils.openResource(item);
+        }
+        return true;
+    }
+
+    // 3. Restricted System Discovery (Admin-Only Whitelist)
+    if (masterKey) {
+        const whitelist = {
+            'calc': 'calc',
+            'chrome': 'chrome',
+            'edge': 'microsoft-edge:',
+            'telegram': 'tg://',
+            'pdadmin': 'pgadmin4',
+            'pgadmin': 'pgadmin4'
+        };
+
+        if (whitelist[cleanShortcut]) {
+            const target = whitelist[cleanShortcut];
+            console.log(`\n[⚡ Admin Gateway] Launching system resource: "${target}"...`);
+            utils.openResource(target);
+            return true;
+        }
+    }
+
+    return false;
+}
 
-            case 1:
-                renderHeader('Today');
-                renderTasks(user.todo.filter((task) => task.due === 'today'));
-                renderHeader('Tmrw');
-                renderTasks(user.todo.filter((task) => task.due === 'tmrw'));
-                renderHeader('Week');
-                renderTasks(user.todo.filter((task) => task.due === 'week'));
-                renderHeader('Monthly');
-                renderTasks(user.todo.filter((task) => task.due === 'monthly'));
-                renderHeader('Yearly');
-                renderTasks(user.todo.filter((task) => task.due === 'yearly'));
+async function handleAdminSync(rl, masterKey) {
+    if (!masterKey) {
+        console.log('Error: This command is only available in Admin mode (Unlocked).');
+        return;
+    }
+
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user || !user.vault) return;
+
+    // Decrypt credentials
+    const decrypted = storage.decrypt(user.vault, masterKey);
+    if (!decrypted) {
+        console.error('Error: Failed to decrypt vault. Your Master Key might be incorrect for this vault.');
+        return;
+    }
+
+    const { pat, gistId } = JSON.parse(decrypted);
+
+    if (!pat || !gistId) {
+        console.error('\n❌ Error: Sync credentials not set. Please choose "Update Credentials" first.');
+        console.log('--- Cloud Sync Management ---');
+        const options = ['Update Credentials', 'Back'];
+        const choice = await selectOption(rl, options);
+        if (choice === 0) {
+            // Re-run with intent to update
+            return await handleAdminSync(rl, masterKey);
+        }
+        return;
+    }
+
+    console.log('\n--- Cloud Sync Management ---');
+    const options = ['Push (Upload to Cloud)', 'Pull (Download from Cloud)', 'Update Credentials', 'Back'];
+    const choice = await selectOption(rl, options);
+
+    try {
+        if (choice === 0) {
+            // Push
+            console.log('Preparing full cockpit data for upload...');
+            const syncData = JSON.stringify({
+                todo: user.todo,
+                shortcuts: user.shortcuts,
+                savedRepos: user.savedRepos,
+                news_api_key: user.news_api_key,
+                missions: user.missions,
+                localVault: user.localVault,
+                settings: user.settings,
+                plugins: cmPlugins.getAllPluginSource()
+            });
+            const encryptedSyncData = storage.encrypt(syncData, masterKey);
+            await utils.withSpinner('Uploading to GitHub...', async () => {
+                await git.gistSync(pat, gistId, encryptedSyncData, 'push');
+            });
+            console.log('\nSuccess! Entire cockpit state PUSHED to cloud.');
+        } else if (choice === 1) {
+            // Pull
+            console.log('Fetching remote cockpit data...');
+            const encryptedBody = await utils.withSpinner('Downloading from GitHub...', async () => {
+                return await git.gistSync(pat, gistId, null, 'pull');
+            });
+
+            if (!encryptedBody) {
+                console.log('No data found in Gist.');
                 return;
-
-            case 2: {
-                const doneId = Number.parseInt(await askQuestion(rl, 'ID: '), 10);
-                const task = user.todo.find((item) => item.id === doneId);
-                if (task) {
-                    task.status = 'completed';
-                    await storage.saveConfig(config);
-                }
-                return;
-            }
-
-            case 3: {
-                const deleteId = Number.parseInt(await askQuestion(rl, 'ID: '), 10);
-                const deleteIndex = user.todo.findIndex((item) => item.id === deleteId);
-                if (deleteIndex !== -1) {
-                    user.todo.splice(deleteIndex, 1);
-                    await storage.saveConfig(config);
-                }
-                return;
-            }
-
-            default:
-                return;
-        }
-    }
-
-    const parts = args.trim().split(/\s+/);
-    const command = parts[0]?.toLowerCase();
-    const rest = parts.slice(1).join(' ');
-
-    switch (command) {
-        case 'add': {
-            const maxId = user.todo.reduce((max, task) => Math.max(max, task.id || 0), 0);
-            user.todo.push({id: maxId + 1, text: rest || 'Task', status: 'pending', due: 'today'});
-            await storage.saveConfig(config);
-            return;
-        }
-
-        case 'done': {
-            const task = user.todo.find((item) => item.id === Number.parseInt(rest, 10));
-            if (task) {
-                task.status = 'completed';
-                await storage.saveConfig(config);
-            }
-            return;
-        }
-
-        case 'list':
-        default:
-            renderTasks(user.todo);
-    }
-}
-
-async function handleMenu() {
-    console.log('\nAvailable Commands:');
-    console.log('user        -> Manage profiles (create|login|list|current|delete)');
-    console.log('export      -> Backup your active profile');
-    console.log('import      -> Restore or merge profile data');
-    console.log('repo        -> Manage repositories (set|use|list|current)');
-    console.log('link        -> Add a new shortcut');
-    console.log('links       -> View all shortcuts');
-    console.log('unlink      -> Delete a shortcut');
-    console.log('push        -> Automated Git push');
-    console.log('news        -> Fetch latest news');
-    console.log('todo        -> Manage tasks');
-    console.log('help        -> Show this menu');
-    console.log('uninstall   -> Wipe all error-ux data');
-    console.log('exit        -> Exit CLI');
-    console.log('<shortcut>  -> Open a saved link\n');
-}
-
-async function handleShortcut(shortcut) {
-    const cleanShortcut = String(shortcut || '').toLowerCase().trim();
-    const config = await storage.loadConfig();
-    const user = storage.getActiveUser(config);
-    if (!user) return false;
-
-    const shortcuts = getUserShortcuts(user);
-    const target = shortcuts[cleanShortcut];
-    if (!target) return false;
-
-    const url = typeof target === 'string' ? target : target.value;
-    console.log(`Opening ${url}...`);
-    utils.openBrowser(url);
-    return true;
-}
-
+            }
+
+            const decryptedBody = storage.decrypt(encryptedBody, masterKey);
+            if (!decryptedBody) {
+                throw new Error('Remote data could not be decrypted with current Master Key.');
+            }
+
+            const remoteData = JSON.parse(decryptedBody);
+            
+            // Restore Data Fields
+            user.todo = remoteData.todo || user.todo;
+            user.shortcuts = remoteData.shortcuts || user.shortcuts;
+            user.savedRepos = remoteData.savedRepos || user.savedRepos;
+            user.news_api_key = remoteData.news_api_key || user.news_api_key;
+            user.missions = remoteData.missions || user.missions;
+            user.localVault = remoteData.localVault || user.localVault;
+            user.settings = remoteData.settings || user.settings;
+
+            // Restore Plugins (Filesystem)
+            if (remoteData.plugins) {
+                console.log('Synchronizing plugins to local directory...');
+                for (const filename in remoteData.plugins) {
+                    cmPlugins.savePlugin(filename, remoteData.plugins[filename]);
+                }
+            }
+
+            await storage.saveConfig(config);
+            console.log('\nSuccess! Cockpit state PULLED and updated. All systems ready.');
+        } else if (choice === 2) {
+            // Update
+            const newPat = (await askQuestion(rl, 'New GitHub PAT: ')).trim();
+            let newGistId = (await askQuestion(rl, 'New Gist ID (or URL): ')).trim();
+            
+            // Extract ID if URL is provided
+            if (newGistId.includes('gist.github.com/')) {
+                const parts = newGistId.split('/');
+                newGistId = parts[parts.length - 1];
+            }
+
+            if (newPat && newGistId) {
+                user.vault = storage.encrypt(JSON.stringify({ pat: newPat, gistId: newGistId }), masterKey);
+                await storage.saveConfig(config);
+                console.log('Credentials updated.');
+            }
+        }
+    } catch (e) {
+        console.error(`\nSync Failed: ${e.message}`);
+    }
+}
+
+async function setupDB(rl, masterKey, user, config) {
+    console.log('\n--- PostgreSQL Credential Setup ---');
+    const host = (await askQuestion(rl, 'Host (default: localhost): ')).trim() || 'localhost';
+    const userStr = (await askQuestion(rl, 'User: ')).trim();
+    const password = await auth.askPassword(rl, 'Password: ');
+    const port = Number.parseInt((await askQuestion(rl, 'Port (default: 5432): ')).trim(), 10) || 5432;
+
+    if (userStr && password) {
+        const dbCreds = { host, user: userStr, password, port };
+        user.localVault = storage.encrypt(JSON.stringify(dbCreds), masterKey);
+        await storage.saveConfig(config);
+        console.log('Credentials updated and saved locally.');
+        return true;
+    } else {
+        console.error('Invalid credentials. Update aborted.');
+        return false;
+    }
+}
+
+async function handleDB(rl, masterKey) {
+    if (!masterKey) {
+        console.log('Error: This command is only available in Admin mode.');
+        return;
+    }
+
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    let dbCreds = null;
+    if (user.localVault) {
+        const decrypted = storage.decrypt(user.localVault, masterKey);
+        if (decrypted) {
+            dbCreds = JSON.parse(decrypted);
+        }
+    }
+
+    if (!dbCreds) {
+        console.log('\n--- PostgreSQL Local Setup ---');
+        console.log('Enter your database connection details (saved locally only).');
+        const host = (await askQuestion(rl, 'Host (default: localhost): ')).trim() || 'localhost';
+        const userStr = (await askQuestion(rl, 'User: ')).trim();
+        const password = await auth.askPassword(rl, 'Password: ');
+        const port = Number.parseInt((await askQuestion(rl, 'Port (default: 5432): ')).trim(), 10) || 5432;
+
+        if (userStr && password) {
+            dbCreds = { host, user: userStr, password, port };
+            user.localVault = storage.encrypt(JSON.stringify(dbCreds), masterKey);
+            await storage.saveConfig(config);
+            console.log('Credentials saved locally.');
+        } else {
+            console.error('Invalid credentials. Setup cancelled.');
+            return;
+        }
+    }
+
+    console.log('\nLaunching Cyberpunk Explorer...');
+    const { renderExplorer } = await import('./dbExplorer.mjs');
+    await renderExplorer(dbCreds);
+}
+
+async function handleSettings(rl, masterKey) {
+    if (!masterKey) {
+        console.log('Error: Settings are only available in Admin mode.');
+        return masterKey;
+    }
+
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return masterKey;
+
+    console.log('\n--- Admin Settings Hub ---');
+    const dbVisible = user.settings?.dashboardVisible !== false;
+    
+    const choice = await selectOption(rl, [
+        `Toggle Dashboard Visibility (Currently: ${dbVisible ? 'ON' : 'OFF'})`,
+        'Update PostgreSQL Credentials',
+        'Change Admin Master Key',
+        'Back'
+    ]);
+
+    if (choice === 0) {
+        // Toggle dashboard
+        user.settings.dashboardVisible = !dbVisible;
+        await storage.saveConfig(config);
+        console.log(`\nSuccess: Dashboard is now ${!dbVisible ? 'VISIBLE' : 'HIDDEN'}.`);
+    } else if (choice === 1) {
+        // Update PG Credentials
+        try {
+            await setupDB(rl, masterKey, user, config);
+        } catch (err) {
+            console.error(`\nError: ${err.message}`);
+        }
+    } else if (choice === 2) {
+        // Change Master Key
+        console.log('\n--- MASTER KEY ROTATION ---');
+        console.log('Warning: This will re-encrypt your Database and Cloud Sync credentials.');
+        
+        const newKey1 = await auth.askPassword(rl, 'Enter NEW 128-char Master Key: ');
+        if (newKey1.length !== 128) {
+            console.error('Error: Master Key must be exactly 128 characters.');
+            return masterKey;
+        }
+
+        const newKey2 = await auth.askPassword(rl, 'Confirm NEW Master Key: ');
+        if (newKey1 !== newKey2) {
+            console.error('Error: Keys do not match. Rotation cancelled.');
+            return masterKey;
+        }
+
+        try {
+            // 1. Re-encrypt user.vault (Sync)
+            if (user.vault) {
+                const decryptedVault = storage.decrypt(user.vault, masterKey);
+                if (decryptedVault) {
+                    user.vault = storage.encrypt(decryptedVault, newKey1);
+                }
+            }
+
+            // 2. Re-encrypt user.localVault (Database)
+            if (user.localVault) {
+                const decryptedLocalVault = storage.decrypt(user.localVault, masterKey);
+                if (decryptedLocalVault) {
+                    user.localVault = storage.encrypt(decryptedLocalVault, newKey1);
+                }
+            }
+
+            await storage.saveConfig(config);
+            console.log('\nSuccess! Master Key rotated and all data re-encrypted.');
+            return newKey1; // Return the new key to update the session
+        } catch (err) {
+            console.error(`\nMigration Failed: ${err.message}`);
+        }
+    }
+
+    return masterKey;
+}
+
+async function handlePlugin(rl, masterKey) {
+    if (!masterKey) {
+        console.log('Error: This command is only available in Admin mode.');
+        return;
+    }
+
+    console.log('\n--- Admin Plugin Management ---');
+    const choice = await selectOption(rl, [
+        'List Installed Plugins',
+        'Create New Plugin Boilerplate',
+        'Delete Existing Plugin',
+        'Back'
+    ]);
+
+    if (choice === 0) {
+        const active = cmPlugins.loadPlugins();
+        const names = Object.keys(active);
+        if (names.length === 0) {
+            console.log('No plugins installed in ~/.error-ux/plugins/');
+        } else {
+            console.log('\nInstalled Plugins:');
+            names.forEach(name => {
+                console.log(`- ${name}: ${active[name].description}`);
+            });
+        }
+    } else if (choice === 1) {
+        const name = (await askQuestion(rl, 'Plugin Name (internal name): ')).trim().toLowerCase();
+        if (!name) return;
+
+        const fileName = `${name}.js`;
+        const targetPath = path.join(cmPlugins.getPluginDir(), fileName);
+
+        if (fsSync.existsSync(targetPath)) {
+            console.error(`Error: Plugin "${name}" already exists.`);
+            return;
+        }
+
+        const boilerplate = `/**
+ * Error-UX Plugin: ${name}
+ * To use: Restart the CLI as Admin, then type "${name}"
+ */
+
+module.exports = {
+    name: '${name}',
+    description: 'A custom plugin for error-ux.',
+    async run(rl, args, masterKey) {
+        console.log('Hello from my new plugin!');
+    }
+};
+`;
+        fsSync.writeFileSync(targetPath, boilerplate, 'utf8');
+        console.log(`\nSuccess! Plugin boilerplate created at: ${targetPath}`);
+        console.log('Please restart the CLI to load your new plugin.');
+    } else if (choice === 2) {
+        const active = cmPlugins.loadPlugins();
+        const names = Object.keys(active);
+        if (names.length === 0) {
+            console.log('No plugins found to delete.');
+            return;
+        }
+
+        console.log('\nSelect a plugin to DELETE:');
+        const pluginChoice = await selectOption(rl, [...names, 'Cancel']);
+        if (pluginChoice >= names.length) return;
+
+        const targetName = names[pluginChoice];
+        const confirm = (await askQuestion(rl, `Are you SURE you want to delete "${targetName}"? (y/N): `)).toLowerCase();
+        if (confirm === 'y') {
+            if (cmPlugins.deletePlugin(targetName)) {
+                console.log(`\nSuccess! Plugin "${targetName}" has been purged.`);
+            } else {
+                console.error(`Error: Could not delete "${targetName}".`);
+            }
+        }
+    }
+}
+
+async function handleMission(rl, args, masterKey) {
+    if (!masterKey) {
+        console.error('Error: Mission Workflows are restricted to "God-Mode" Admin sessions.');
+        return;
+    }
+
+    const config = await storage.loadConfig();
+    const user = storage.getActiveUser(config);
+    if (!user) return;
+
+    if (!user.missions) user.missions = {};
+
+    let subCommand = (args[0] || '').toLowerCase();
+    
+    // Interactive Wizard if no subcommand
+    if (!subCommand) {
+        console.log('\n--- 🚀 Mission Quick-Start ---');
+        console.log('1. [List]   View current missions');
+        console.log('2. [Create] Build a new mission workflow');
+        console.log('3. [Delete] Remove a mission');
+        
+        const ans = (await askQuestion(rl, '\nChoice (1-3) or mission name to run: ')).trim().toLowerCase();
+        
+        if (ans === '1' || ans === 'list') {
+            subCommand = 'list';
+        } else if (ans === '2' || ans === 'create' || ans === 'save') {
+            subCommand = 'save';
+        } else if (ans === '3' || ans === 'delete') {
+            subCommand = 'delete';
+        } else if (ans) {
+            // Treat as mission name to run
+            subCommand = ans; 
+        } else {
+            return;
+        }
+    }
+
+    if (subCommand === 'save' || subCommand === 'create') {
+        let name = (args[1] || '').toLowerCase().trim();
+        if (!name) {
+            name = (await askQuestion(rl, 'Name your new Mission: ')).trim().toLowerCase();
+        }
+        
+        if (!name) {
+            console.log('Cancelled.');
+            return;
+        }
+
+        console.log(`\n--- Defining Mission: ${name.toUpperCase()} ---`);
+        console.log('Add items one by one (URLs, Paths, or Apps). Press Enter on an empty line to finish.');
+        
+        const resources = [];
+        while (true) {
+            const res = (await askQuestion(rl, `[Item ${resources.length + 1}] > `)).trim();
+            if (!res) break;
+            resources.push(res);
+        }
+
+        if (resources.length > 0) {
+            user.missions[name] = resources;
+            await storage.saveConfig(config);
+            console.log(`\n✨ Mission "${name}" synchronized and ready.`);
+        } else {
+            console.log('No items added. Mission discarded.');
+        }
+
+    } else if (subCommand === 'list') {
+        const missions = Object.keys(user.missions);
+        if (missions.length === 0) {
+            console.log('\nNo missions found. Type "mission" to create one.');
+            return;
+        }
+
+        console.log('\n--- 📂 Admin Mission Hub ---');
+        missions.forEach(m => {
+            console.log(`\n[ ${m.toUpperCase()} ]`);
+            user.missions[m].forEach(item => console.log(`  -> ${item}`));
+        });
+
+    } else if (subCommand === 'delete') {
+        let name = (args[1] || '').toLowerCase().trim();
+        if (!name) {
+            name = (await askQuestion(rl, 'Name of mission to delete: ')).trim().toLowerCase();
+        }
+        
+        if (!user.missions[name]) {
+            console.error(`Error: Mission "${name}" not found.`);
+            return;
+        }
+
+        delete user.missions[name];
+        await storage.saveConfig(config);
+        console.log(`\nMission "${name}" purged.`);
+
+    } else {
+        // Direct run
+        let name = subCommand;
+        if (name === 'run') name = (args[1] || '').toLowerCase();
+
+        if (user.missions[name]) {
+            console.log(`\n🚀 Executing Mission: ${name.toUpperCase()}...`);
+            const items = user.missions[name];
+            for (const item of items) {
+                console.log(`   Launching: ${item}`);
+                utils.openResource(item);
+            }
+        } else {
+            console.error(`Error: Mission "${name}" not found.`);
+            console.log('Type "mission" for options.');
+        }
+    }
+}
+
 module.exports = {
     askQuestion,
     ensureUserNewsApiKey,
+    handleAdminSync,
+    handleDB,
     handleDashboard,
-    handleExport,
-    handleImport,
-    handleLink,
-    handleLinks,
-    handleMenu,
-    handleNews,
-    handlePush,
-    handleRepo,
-    handleShortcut,
-    handleTodo,
-    handleUninstall,
-    handleUnlink,
-    handleUser,
-    initOnboarding
-};
+    handleExport,
+    handleImport,
+    handleLink,
+    handleLinks,
+    handleMenu,
+    handleNews,
+    handlePlugin,
+    handlePush,
+    handleRepo,
+    handleSettings,
+    handleShortcut,
+    handleTodo,
+    handleUninstall,
+    handleUnlink,
+    handleUser,
+    handleMission,
+    initOnboarding
+};