memoir-cli 3.2.2 → 3.3.1

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Something isn't working
+title: ''
+labels: bug
+assignees: ''
+---
+
+**What happened?**
+A clear description of the bug.
+
+**Steps to reproduce**
+1. Run `memoir ...`
+2. See error
+
+**Expected behavior**
+What you expected to happen.
+
+**Environment**
+- OS: [e.g. macOS 15, Windows 11, Ubuntu 24]
+- Node: [e.g. 20.11.0]
+- memoir version: [e.g. 3.2.2]
+- AI tools: [e.g. Claude Code, Cursor]
+
+**Logs / screenshots**
+Paste any error output here.

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest an idea for memoir
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+**What would you like?**
+A clear description of the feature.
+
+**Why?**
+What problem does this solve for you?
+
+**Alternatives considered**
+Any workarounds you've tried.

package/CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# Contributing to memoir
+
+Thanks for your interest in contributing! memoir is open source and welcomes contributions.
+
+## Quick start
+
+```bash
+git clone https://github.com/camgitt/memoir.git
+cd memoir
+npm install
+node bin/memoir.js status
+```
+
+## What to work on
+
+- **New tool adapters** — add support for more AI tools in `src/tools/`
+- **MCP improvements** — enhance the MCP server in `src/mcp.js`
+- **Bug fixes** — check [open issues](https://github.com/camgitt/memoir/issues)
+- **Documentation** — improve README, add examples
+
+## Submitting changes
+
+1. Fork the repo
+2. Create a branch (`git checkout -b feature/my-feature`)
+3. Make your changes
+4. Test locally: `npm test`
+5. Commit and push
+6. Open a PR with a clear description
+
+## Code style
+
+- ES modules (`import`/`export`)
+- No TypeScript (plain JS)
+- Keep dependencies minimal
+
+## Adding a tool adapter
+
+See `src/tools/claude.js` for an example. Each adapter exports:
+- `name` — display name
+- `icon` — emoji
+- `source` — path to the tool's config directory
+- `files` — specific files to sync (if `customExtract` is true)
+- `filter` — function to include/exclude files
+
+## Questions?
+
+Open an issue or start a discussion.

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 camgitt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -6,14 +6,17 @@
 
 [![npm version](https://img.shields.io/npm/v/memoir-cli.svg?style=flat-square&color=7c6ef0)](https://npmjs.org/package/memoir-cli)
 [![npm downloads](https://img.shields.io/npm/dm/memoir-cli.svg?style=flat-square&color=7c6ef0)](https://npmjs.org/package/memoir-cli)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](https://opensource.org/licenses/MIT)
+[![GitHub stars](https://img.shields.io/github/stars/camgitt/memoir?style=flat-square&color=7c6ef0)](https://github.com/camgitt/memoir/stargazers)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](LICENSE)
 [![Node.js](https://img.shields.io/badge/node-%3E%3D18-brightgreen?style=flat-square)](https://nodejs.org)
 
 Your AI forgets everything between sessions. memoir gives it long-term memory via MCP.
 
-Works with Claude Code, Cursor, Windsurf, Gemini, and 7 more tools.
+**11 tools supported** • **E2E encrypted** • **Cross-platform** • **Open source**
 
-[Website](https://memoir.sh) • [npm](https://npmjs.org/package/memoir-cli) • [Blog](https://memoir.sh/blog)
+Works with Claude Code, Cursor, Windsurf, Gemini, Copilot, Codex, ChatGPT, Aider, Zed, Cline, and Continue.dev.
+
+[Website](https://memoir.sh) • [npm](https://npmjs.org/package/memoir-cli) • [Blog](https://memoir.sh/blog) • [Contributing](CONTRIBUTING.md)
 
 <br />
 
@@ -44,6 +47,27 @@ claude: Based on your previous sessions: this project uses JWT auth
 
 No re-explaining. memoir remembered.
 
+## Architecture
+
+```mermaid
+graph LR
+    A[Claude Code] --> M[memoir MCP]
+    B[Cursor] --> M
+    C[Gemini CLI] --> M
+    D[Windsurf] --> M
+    E[+ 7 more] --> M
+
+    M --> R[recall / remember / list / read]
+    R --> S[(Local Memory Store)]
+
+    S --> P[memoir push]
+    P --> G[GitHub / Cloud]
+    G --> Q[memoir restore]
+    Q --> S2[(New Machine)]
+```
+
+memoir runs as a local MCP server inside your AI tools. Your AI can search, save, and recall memories automatically. Push to sync across machines.
+
 ## Quick Start
 
 ```bash

package/bin/memoir.js

@@ -14,7 +14,7 @@ import { migrateCommand } from '../src/commands/migrate.js';
 import { snapshotCommand } from '../src/commands/snapshot.js';
 import { resumeCommand } from '../src/commands/resume.js';
 import { profileListCommand, profileCreateCommand, profileSwitchCommand, profileDeleteCommand } from '../src/commands/profile.js';
-import { loginCommand, logoutCommand } from '../src/commands/login.js';
+import { loginCommand, logoutCommand, forgotPasswordCommand, deleteAccountCommand } from '../src/commands/login.js';
 import { cloudPushCommand, cloudRestoreCommand } from '../src/commands/cloud.js';
 import { shareCommand } from '../src/commands/share.js';
 import { historyCommand } from '../src/commands/history.js';
@@ -97,9 +97,16 @@ program
 program
   .command('init')
   .description('Set up memoir with your storage provider')
-  .action(async () => {
+  .option('--direction <direction>', 'Upload or download (upload, download)')
+  .option('--provider <provider>', 'Storage provider (git, local)')
+  .option('--local-path <path>', 'Local folder path (for local provider)')
+  .option('--username <name>', 'GitHub username (for git provider)')
+  .option('--repo <name>', 'GitHub repo name (for git provider)')
+  .option('--encrypt', 'Enable E2E encryption')
+  .option('--no-encrypt', 'Disable E2E encryption')
+  .action(async (options) => {
     try {
-      await initCommand();
+      await initCommand(options);
     } catch (err) {
       console.error(chalk.red('\n✖ Error during initialization:'), err.message);
       process.exit(1);
@@ -294,7 +301,9 @@ program
 program
   .command('encrypt')
   .description('Toggle E2E encryption for your backups')
-  .action(async () => {
+  .option('--on', 'Enable encryption without prompting')
+  .option('--off', 'Disable encryption without prompting')
+  .action(async (options) => {
     try {
       const { getConfig, getRawConfig, saveConfig, migrateConfigToV2 } = await import('../src/config.js');
       const config = await getConfig();
@@ -304,24 +313,34 @@ program
       }
       const current = config.encrypt || false;
       console.log(chalk.white(`\n  Encryption is currently: ${current ? chalk.green('ON') : chalk.red('OFF')}`));
-      const inquirer = (await import('inquirer')).default;
-      const { toggle } = await inquirer.prompt([{
-        type: 'confirm',
-        name: 'toggle',
-        message: current ? 'Disable encryption?' : 'Enable encryption?',
-        default: !current
-      }]);
-      if (toggle !== current) {
+
+      let newValue;
+      if (options.on) {
+        newValue = true;
+      } else if (options.off) {
+        newValue = false;
+      } else {
+        const inquirer = (await import('inquirer')).default;
+        const { toggle } = await inquirer.prompt([{
+          type: 'confirm',
+          name: 'toggle',
+          message: current ? 'Disable encryption?' : 'Enable encryption?',
+          default: !current
+        }]);
+        newValue = toggle ? !current : current;
+      }
+
+      if (newValue !== current) {
         let raw = await getRawConfig();
         if (!raw.version || raw.version < 2) raw = migrateConfigToV2(raw);
         const profileName = raw.activeProfile || 'default';
         if (raw.profiles?.[profileName]) {
-          raw.profiles[profileName].encrypt = !current;
+          raw.profiles[profileName].encrypt = newValue;
         } else {
-          raw.encrypt = !current;
+          raw.encrypt = newValue;
         }
         await saveConfig(raw);
-        console.log(chalk.green(`\n  ✔ Encryption ${!current ? 'enabled' : 'disabled'}. Next push will ${!current ? 'encrypt' : 'skip encryption'}.\n`));
+        console.log(chalk.green(`\n  ✔ Encryption ${newValue ? 'enabled' : 'disabled'}. Next push will ${newValue ? 'encrypt' : 'skip encryption'}.\n`));
       }
     } catch (err) {
       console.error(chalk.red('\n✖ Error:'), err.message);
@@ -348,9 +367,12 @@ program
 program
   .command('login')
   .description('Sign in to memoir cloud')
-  .action(async () => {
+  .option('--email <email>', 'Email address (skip interactive prompt)')
+  .option('--password <password>', 'Password (skip interactive prompt)')
+  .option('--signup', 'Create a new account instead of signing in')
+  .action(async (options) => {
     try {
-      await loginCommand();
+      await loginCommand(options);
     } catch (err) {
       console.error(chalk.red('\n✖ Error:'), err.message);
       process.exit(1);
@@ -369,6 +391,36 @@ program
     }
   });
 
+program
+  .command('forgot-password')
+  .alias('reset-password')
+  .description('Send a password reset email')
+  .option('--email <email>', 'Email address (skip interactive prompt)')
+  .action(async (options) => {
+    try {
+      await forgotPasswordCommand(options);
+    } catch (err) {
+      console.error(chalk.red('\n✖ Error:'), err.message);
+      process.exit(1);
+    }
+  });
+
+// Account management
+const account = program.command('account').description('Manage your memoir account');
+
+account
+  .command('delete')
+  .description('Permanently delete your account and all cloud data')
+  .option('--confirm', 'Skip interactive prompt (Node 25 workaround)')
+  .action(async (options) => {
+    try {
+      await deleteAccountCommand(options);
+    } catch (err) {
+      console.error(chalk.red('\n✖ Error:'), err.message);
+      process.exit(1);
+    }
+  });
+
 // Cloud sync
 const cloud = program.command('cloud').description('Cloud backup and restore (Pro)');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memoir-cli",
-  "version": "3.2.2",
+  "version": "3.3.1",
   "mcpName": "io.github.camgitt/memoir",
   "description": "Persistent memory for AI coding tools via MCP. Your AI remembers across sessions, tools, and machines. Works with Claude, Cursor, Gemini, Windsurf, and 7 more tools.",
   "main": "src/index.js",

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/camgitt/memoir",
     "source": "github"
   },
-  "version": "3.2.0",
+  "version": "3.2.2",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "memoir-cli",
-      "version": "3.2.0",
+      "version": "3.2.2",
       "transport": {
         "type": "stdio"
       }

package/src/cloud/auth.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import os from 'os';
-import { SUPABASE_URL, SUPABASE_ANON_KEY } from './constants.js';
+import { SUPABASE_URL, SUPABASE_ANON_KEY, STORAGE_BUCKET } from './constants.js';
 
 const isWin = process.platform === 'win32';
 const configDir = isWin
@@ -25,7 +25,13 @@ async function supaFetch(endpoint, options = {}) {
 export async function signUp(email, password) {
   const res = await supaFetch('/auth/v1/signup', {
     method: 'POST',
-    body: JSON.stringify({ email, password }),
+    body: JSON.stringify({
+      email,
+      password,
+      options: {
+        emailRedirectTo: 'https://memoir.sh/confirmed',
+      },
+    }),
   });
   const data = await res.json();
   if (!res.ok) throw new Error(data.error_description || data.msg || 'Sign up failed');
@@ -109,4 +115,77 @@ export async function getSubscription(session) {
   return data[0];
 }
 
+export async function resetPassword(email) {
+  const res = await supaFetch('/auth/v1/recover', {
+    method: 'POST',
+    body: JSON.stringify({
+      email,
+      options: {
+        redirectTo: 'https://memoir.sh/reset-password',
+      },
+    }),
+  });
+  if (!res.ok) {
+    const data = await res.json();
+    throw new Error(data.error_description || data.msg || 'Password reset failed');
+  }
+}
+
+export async function deleteAccount(session) {
+  // 1. Delete all backups (storage files + metadata rows)
+  const backupsRes = await fetch(
+    `${SUPABASE_URL}/rest/v1/backups?select=*&user_id=eq.${session.user.id}`,
+    {
+      headers: {
+        'Authorization': `Bearer ${session.access_token}`,
+        'apikey': SUPABASE_ANON_KEY,
+      },
+    }
+  );
+
+  if (backupsRes.ok) {
+    const backups = await backupsRes.json();
+    for (const backup of backups) {
+      // Delete storage object
+      await fetch(`${SUPABASE_URL}/storage/v1/object/${STORAGE_BUCKET}/${backup.storage_path}`, {
+        method: 'DELETE',
+        headers: {
+          'Authorization': `Bearer ${session.access_token}`,
+          'apikey': SUPABASE_ANON_KEY,
+        },
+      });
+
+      // Delete metadata row
+      await fetch(`${SUPABASE_URL}/rest/v1/backups?id=eq.${backup.id}`, {
+        method: 'DELETE',
+        headers: {
+          'Authorization': `Bearer ${session.access_token}`,
+          'apikey': SUPABASE_ANON_KEY,
+        },
+      });
+    }
+  }
+
+  // 2. Delete shared links
+  await fetch(`${SUPABASE_URL}/rest/v1/shared_links?user_id=eq.${session.user.id}`, {
+    method: 'DELETE',
+    headers: {
+      'Authorization': `Bearer ${session.access_token}`,
+      'apikey': SUPABASE_ANON_KEY,
+    },
+  });
+
+  // 3. Delete subscription
+  await fetch(`${SUPABASE_URL}/rest/v1/subscriptions?user_id=eq.${session.user.id}`, {
+    method: 'DELETE',
+    headers: {
+      'Authorization': `Bearer ${session.access_token}`,
+      'apikey': SUPABASE_ANON_KEY,
+    },
+  });
+
+  // 4. Sign out locally
+  await logout();
+}
+
 export { AUTH_FILE, supaFetch };

package/src/cloud/constants.js

@@ -1,5 +1,5 @@
-export const SUPABASE_URL = 'https://oqrkxytbahfwjhcbyzrx.supabase.co';
-export const SUPABASE_ANON_KEY = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Im9xcmt4eXRiYWhmd2poY2J5enJ4Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzMyMTQ4MzMsImV4cCI6MjA4ODc5MDgzM30.jOKOi73OJgIgi1zj0VOIQkGp0xqS3ee4gfCjpdqCnvM';
+export const SUPABASE_URL = process.env.MEMOIR_SUPABASE_URL || 'https://oqrkxytbahfwjhcbyzrx.supabase.co';
+export const SUPABASE_ANON_KEY = process.env.MEMOIR_SUPABASE_ANON_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Im9xcmt4eXRiYWhmd2poY2J5enJ4Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzMyMTQ4MzMsImV4cCI6MjA4ODc5MDgzM30.jOKOi73OJgIgi1zj0VOIQkGp0xqS3ee4gfCjpdqCnvM';
 export const STORAGE_BUCKET = 'memoir-backups';
 export const MAX_BACKUPS_FREE = 3;
 export const MAX_BACKUPS_PRO = 50;

package/src/cloud/storage.js

@@ -5,6 +5,7 @@ import { createGzip, createGunzip } from 'zlib';
 import { pipeline } from 'stream/promises';
 import { Readable, Writable } from 'stream';
 import { SUPABASE_URL, SUPABASE_ANON_KEY, STORAGE_BUCKET, MAX_BACKUPS_FREE, MAX_BACKUPS_PRO } from './constants.js';
+import { encryptBuffer, decryptBuffer } from '../security/encryption.js';
 
 // Bundle a directory into a JSON manifest + gzip
 async function bundleDir(dir) {
@@ -64,10 +65,19 @@ async function unbundleToDir(gzipped, destDir) {
   return files.length;
 }
 
+// Derive a stable encryption passphrase from the user's identity
+// Uses only user_id (immutable) — NOT email, which can change
+function cloudPassphrase(session) {
+  return `memoir-cloud:${session.user.id}`;
+}
+
 // Upload backup to Supabase Storage + insert metadata
 export async function uploadBackup(stagingDir, session, toolResults) {
   const gzipped = await bundleDir(stagingDir);
 
+  // Encrypt before upload (AES-256-GCM, keyed to user identity)
+  const encrypted = await encryptBuffer(gzipped, cloudPassphrase(session));
+
   const backupId = crypto.randomUUID();
   const storagePath = `${session.user.id}/${backupId}.gz`;
 
@@ -79,7 +89,7 @@ export async function uploadBackup(stagingDir, session, toolResults) {
       'apikey': SUPABASE_ANON_KEY,
       'Content-Type': 'application/octet-stream',
     },
-    body: gzipped,
+    body: encrypted,
   });
 
   if (!uploadRes.ok) {
@@ -125,7 +135,7 @@ export async function uploadBackup(stagingDir, session, toolResults) {
       user_id: session.user.id,
       tool_count: tools.length,
       file_count: fileCount,
-      size_bytes: gzipped.length,
+      size_bytes: encrypted.length,
       tools,
       storage_path: storagePath,
       machine_name: os.hostname(),
@@ -139,7 +149,7 @@ export async function uploadBackup(stagingDir, session, toolResults) {
   }
 
   const backup = (await metaRes.json())[0];
-  return { ...backup, sizeBytes: gzipped.length };
+  return { ...backup, sizeBytes: encrypted.length };
 }
 
 // Download a specific backup
@@ -153,7 +163,17 @@ export async function downloadBackup(backup, destDir, session) {
 
   if (!res.ok) throw new Error(`Download failed: ${await res.text()}`);
 
-  const gzipped = Buffer.from(await res.arrayBuffer());
+  const raw = Buffer.from(await res.arrayBuffer());
+
+  // Decrypt if encrypted (check for MEMOIR01 magic header)
+  let gzipped;
+  if (raw.length >= 8 && raw.subarray(0, 8).toString() === 'MEMOIR01') {
+    gzipped = await decryptBuffer(raw, cloudPassphrase(session));
+  } else {
+    // Legacy unencrypted backup
+    gzipped = raw;
+  }
+
   const fileCount = await unbundleToDir(gzipped, destDir);
   return fileCount;
 }

package/src/commands/init.js

@@ -23,7 +23,7 @@ function getGitHubUsername() {
   }
 }
 
-export async function initCommand() {
+export async function initCommand(options = {}) {
   console.log('');
   console.log(boxen(
     gradient.pastel('memoir') + '\n' +
@@ -34,57 +34,80 @@ export async function initCommand() {
 
   const detectedUser = getGitHubUsername();
 
-  const { direction, provider } = await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'direction',
-      message: 'Upload or download?',
-      choices: [
-        { name: 'Upload — back up this machine', value: 'upload' },
-        { name: 'Download — restore from backup', value: 'download' }
-      ]
-    },
-    {
-      type: 'list',
-      name: 'provider',
-      message: (answers) => answers.direction === 'upload' ? 'Back up to?' : 'Restore from?',
-      choices: [
-        { name: 'GitHub', value: 'git' },
-        { name: 'Local folder', value: 'local' }
-      ]
-    }
-  ]);
-
-  let config = { provider };
+  let direction, provider;
 
-  if (provider === 'local') {
-    const msg = direction === 'upload' ? 'Save to:' : 'Backup folder:';
-    const { localPath } = await inquirer.prompt([{
-      type: 'input',
-      name: 'localPath',
-      message: msg,
-      validate: (input) => input.trim() ? true : 'Required'
-    }]);
-    config.localPath = localPath;
+  if (options.provider) {
+    // Non-interactive: use flags directly
+    provider = options.provider;
+    direction = options.direction || 'upload';
   } else {
+    // Interactive: prompt the user
     const answers = await inquirer.prompt([
       {
-        type: 'input',
-        name: 'username',
-        message: 'GitHub username:',
-        default: detectedUser || undefined,
-        validate: (input) => input.trim() ? true : 'Required'
+        type: 'list',
+        name: 'direction',
+        message: 'Upload or download?',
+        choices: [
+          { name: 'Upload — back up this machine', value: 'upload' },
+          { name: 'Download — restore from backup', value: 'download' }
+        ]
       },
       {
-        type: 'input',
-        name: 'repo',
-        message: 'Repo name:',
-        default: 'ai-memory',
-        validate: (input) => input.trim() ? true : 'Required'
+        type: 'list',
+        name: 'provider',
+        message: (a) => a.direction === 'upload' ? 'Back up to?' : 'Restore from?',
+        choices: [
+          { name: 'GitHub', value: 'git' },
+          { name: 'Local folder', value: 'local' }
+        ]
       }
     ]);
-    const username = answers.username.trim();
-    const repo = answers.repo.trim();
+    direction = answers.direction;
+    provider = answers.provider;
+  }
+
+  let config = { provider };
+
+  if (provider === 'local') {
+    let localPath;
+    if (options.localPath) {
+      localPath = options.localPath;
+    } else {
+      const msg = direction === 'upload' ? 'Save to:' : 'Backup folder:';
+      const answers = await inquirer.prompt([{
+        type: 'input',
+        name: 'localPath',
+        message: msg,
+        validate: (input) => input.trim() ? true : 'Required'
+      }]);
+      localPath = answers.localPath;
+    }
+    config.localPath = localPath;
+  } else {
+    let username, repo;
+    if (options.username) {
+      username = options.username.trim();
+      repo = (options.repo || 'ai-memory').trim();
+    } else {
+      const answers = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'username',
+          message: 'GitHub username:',
+          default: detectedUser || undefined,
+          validate: (input) => input.trim() ? true : 'Required'
+        },
+        {
+          type: 'input',
+          name: 'repo',
+          message: 'Repo name:',
+          default: 'ai-memory',
+          validate: (input) => input.trim() ? true : 'Required'
+        }
+      ]);
+      username = answers.username.trim();
+      repo = answers.repo.trim();
+    }
 
     config.gitRepo = `https://github.com/${username}/${repo}.git`;
     console.log(chalk.gray(`  → ${config.gitRepo}`));
@@ -109,12 +132,18 @@ export async function initCommand() {
   }
 
   // Ask about encryption
-  const { encrypt } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'encrypt',
-    message: 'Enable E2E encryption? (protects your data even if backup is compromised)',
-    default: true
-  }]);
+  let encrypt;
+  if (options.encrypt !== undefined) {
+    encrypt = options.encrypt;
+  } else {
+    const answers = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'encrypt',
+      message: 'Enable E2E encryption? (protects your data even if backup is compromised)',
+      default: true
+    }]);
+    encrypt = answers.encrypt;
+  }
   config.encrypt = encrypt;
 
   if (encrypt) {