memoir-cli 1.2.1 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memoir-cli",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Your AI remembers everything. Sync it everywhere.",
   "main": "src/index.js",
   "type": "module",

package/src/adapters/restore.js

@@ -5,6 +5,25 @@ import os from 'os';
 import inquirer from 'inquirer';
 import { adapters } from '../adapters/index.js';
 
+async function copyMissing(src, dest, spinner) {
+  const entries = await fs.readdir(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    if (entry.isDirectory()) {
+      await fs.ensureDir(destPath);
+      await copyMissing(srcPath, destPath, spinner);
+    } else {
+      if (await fs.pathExists(destPath)) {
+        // skip existing files
+      } else {
+        await fs.copy(srcPath, destPath);
+      }
+    }
+  }
+}
+
 export async function restoreMemories(sourceDir, spinner) {
   let restoredAny = false;
 
@@ -19,7 +38,7 @@ export async function restoreMemories(sourceDir, spinner) {
         {
           type: 'confirm',
           name: 'confirm',
-          message: `Restore ${adapter.name} memory? This will overwrite existing configuration files!`,
+          message: `Restore ${adapter.name} memory? (only adds missing files, won't overwrite)`,
           default: false
         }
       ]);
@@ -28,16 +47,22 @@ export async function restoreMemories(sourceDir, spinner) {
 
       if (confirm) {
         if (adapter.customExtract) {
-          // Restore individual files back to their original locations
+          // Restore individual files — only add missing ones
           const files = await fs.readdir(backupDir);
           for (const file of files) {
             const dest = path.join(adapter.source, file);
-            await fs.copy(path.join(backupDir, file), dest, { overwrite: true });
+            if (await fs.pathExists(dest)) {
+              spinner.info(chalk.gray(`  Skipped ${file} (already exists)`));
+              spinner.start();
+            } else {
+              await fs.copy(path.join(backupDir, file), dest);
+            }
           }
         } else {
           spinner.text = `Restoring ${chalk.cyan(adapter.name)} memory to ${adapter.source}...`;
           await fs.ensureDir(adapter.source);
-          await fs.copy(backupDir, adapter.source, { overwrite: true });
+          // Merge — only copy files that don't already exist
+          await copyMissing(backupDir, adapter.source, spinner);
         }
         restoredAny = true;
       } else {

package/src/commands/init.js

@@ -4,78 +4,88 @@ import open from 'open';
 import boxen from 'boxen';
 import gradient from 'gradient-string';
 import { saveConfig } from '../config.js';
+import { pushCommand } from './push.js';
+import { restoreCommand } from './restore.js';
 
 export async function initCommand() {
   const title = gradient.pastel.multiline('memoir \\nYour AI Remembers Everything');
-  console.log('\\n' + boxen(title, { 
-    padding: 1, 
-    margin: 1, 
-    borderStyle: 'round', 
+  console.log('\\n' + boxen(title, {
+    padding: 1,
+    margin: 1,
+    borderStyle: 'round',
     borderColor: 'cyan',
     align: 'center'
   }));
 
-  console.log(chalk.gray("Let's configure where your AI knowledge will be safely stored.\\n"));
+  console.log(chalk.gray("Let's get your AI memory set up.\\n"));
 
-  const answers = await inquirer.prompt([
+  const { direction } = await inquirer.prompt([
     {
       type: 'list',
-      name: 'provider',
-      message: 'Choose your storage provider:',
+      name: 'direction',
+      message: 'What do you want to do?',
       choices: [
-        { name: '☁️  Git Repository ' + chalk.gray('(GitHub, GitLab - Best for syncing across computers)'), value: 'git' },
-        { name: '📂 Local Directory ' + chalk.gray('(Dropbox, iCloud - Best for local backups)'), value: 'local' }
+        { name: '⬆️  Upload ' + chalk.gray('(backup this machine\'s AI memory)'), value: 'upload' },
+        { name: '⬇️  Download ' + chalk.gray('(restore AI memory to this machine)'), value: 'download' }
       ]
-    },
-    {
-      type: 'input',
-      name: 'localPath',
-      message: 'Enter the full path to your sync directory ' + chalk.gray('(e.g., ~/Dropbox/memoir):'),
-      when: (answers) => answers.provider === 'local',
-      validate: (input) => input.trim() !== '' ? true : chalk.red('✖ Path is required')
-    },
+    }
+  ]);
+
+  const { provider } = await inquirer.prompt([
     {
-      type: 'confirm',
-      name: 'openBrowser',
-      message: 'Need to create an empty GitHub repository right now?',
-      when: (answers) => answers.provider === 'git',
-      default: false
+      type: 'list',
+      name: 'provider',
+      message: 'Where do you want to store it?',
+      choices: [
+        { name: '☁️  GitHub ' + chalk.gray('(sync across computers)'), value: 'git' },
+        { name: '📂 Local Directory ' + chalk.gray('(Dropbox, iCloud, etc.)'), value: 'local' }
+      ]
     }
   ]);
 
-  if (answers.openBrowser) {
-    console.log(chalk.cyan('\\n↗ Opening GitHub... Create an empty private repository, then return here.\\n'));
-    await open('https://github.com/new');
-  }
+  let config = { provider };
 
-  const finalAnswers = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'gitRepo',
-      message: 'Repository URL ' + chalk.gray('(e.g., git@github.com:username/ai-memory.git):'),
-      when: () => answers.provider === 'git',
-      validate: (input) => {
-        if (input.trim() === '') return chalk.red('✖ Repo URL is required');
-        if (!input.includes('github.com') && !input.includes('gitlab.com')) {
-          return chalk.yellow('⚠ Warning: This does not look like a standard GitHub/GitLab URL. Please verify.');
+  if (provider === 'local') {
+    const { localPath } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'localPath',
+        message: 'Path to sync directory ' + chalk.gray('(e.g., ~/Dropbox/memoir):'),
+        validate: (input) => input.trim() !== '' ? true : chalk.red('✖ Path is required')
+      }
+    ]);
+    config.localPath = localPath;
+  } else {
+    const { repoInput } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'repoInput',
+        message: 'GitHub repo ' + chalk.gray('(e.g., camgitt/brain):'),
+        validate: (input) => {
+          if (input.trim() === '') return chalk.red('✖ Repo is required');
+          return true;
         }
-        return true;
       }
-    }
-  ]);
+    ]);
 
-  const config = {
-    provider: answers.provider,
-    localPath: answers.localPath,
-    gitRepo: finalAnswers.gitRepo
-  };
+    // Accept shorthand like "camgitt/brain" or full URLs
+    let gitRepo = repoInput.trim();
+    if (!gitRepo.includes('github.com') && !gitRepo.includes('gitlab.com')) {
+      gitRepo = `https://github.com/${gitRepo}.git`;
+    }
+    config.gitRepo = gitRepo;
+  }
 
   await saveConfig(config);
 
-  console.log('\\n' + boxen(
-    chalk.green('✔ Configuration saved successfully!') + '\\n\\n' +
-    chalk.white('To backup your memory, run:') + '\\n' +
-    chalk.cyan.bold('memoir push'),
-    { padding: 1, borderStyle: 'single', borderColor: 'green' }
-  ) + '\\n');
+  console.log('\\n' + chalk.green('✔ Configuration saved!'));
+
+  // Immediately run the chosen action
+  if (direction === 'upload') {
+    console.log(chalk.cyan('\\n↗ Uploading your AI memory...\\n'));
+    await pushCommand();
+  } else {
+    console.log(chalk.cyan('\\n↙ Downloading your AI memory...\\n'));
+    await restoreCommand();
+  }
 }