memoir-cli 3.0.0 → 3.0.3

package/bin/memoir.js

@@ -239,9 +239,8 @@ program
       console.log('\n' + chalk.cyan(`Updating memoir ${VERSION} → ${chalk.green.bold(latest)}...`) + '\n');
 
       const { execSync } = await import('child_process');
-      const execPath = process.argv[1] || '';
-      const useBun = execPath.includes('.bun') || process.env.BUN_INSTALL;
-      const cmd = useBun ? 'bun install -g memoir-cli' : 'npm install -g memoir-cli';
+      // Always use npm — bun installs to a different location and can cause PATH conflicts
+      const cmd = 'npm install -g memoir-cli';
 
       execSync(cmd, { stdio: 'inherit' });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memoir-cli",
-  "version": "3.0.0",
+  "version": "3.0.3",
   "description": "Sync AI memory across devices. Back up and restore Claude, Gemini, Codex, Cursor, Copilot, Windsurf configs. Snapshot coding sessions and resume on another machine. Migrate instructions between AI assistants.",
   "main": "src/index.js",
   "type": "module",

package/src/adapters/restore.js

@@ -9,7 +9,7 @@ import { adapters } from '../adapters/index.js';
 // on this machine, rather than trying to compute the encoding ourselves.
 // Claude's path encoding varies across platforms and versions, so detection
 // is the only reliable approach.
-function detectLocalHomeKey(adapterSource) {
+export function detectLocalHomeKey(adapterSource) {
   const localProjectsDir = path.join(adapterSource, 'projects');
   if (!fs.existsSync(localProjectsDir)) return null;
 
@@ -65,7 +65,14 @@ function remapProjectPaths(backupDir, adapterSource) {
   if (!localHomeKey) {
     const home = os.homedir();
     // Use the same encoding Claude uses: path with separators → dashes
-    localHomeKey = '-' + home.replace(/^\//, '').replace(/\\/g, '-').replace(/\//g, '-').replace(/:/g, '');
+    // Claude encodes paths: each separator (/ \ :) → dash
+    // macOS /Users/cam → -Users-cam (leading / stripped, prefixed with -)
+    // Windows C:\Users\X → C--Users-X (C + dash for colon + dash for backslash)
+    if (process.platform === 'win32') {
+      localHomeKey = home.replace(/\\/g, '-').replace(/:/g, '-');
+    } else {
+      localHomeKey = '-' + home.replace(/^\//, '').replace(/\//g, '-');
+    }
   }
 
   // Step 3: Identify foreign home keys in the backup
@@ -163,6 +170,60 @@ async function mergeMemoryDirs(src, dest) {
   }
 }
 
+// After restore, ensure every memory .md file is referenced in its MEMORY.md index.
+// Without this, files synced from another machine exist but Claude won't know about them.
+async function reconcileMemoryIndexes(claudeSource) {
+  const projectsDir = path.join(claudeSource, 'projects');
+  if (!fs.existsSync(projectsDir)) return;
+
+  const entries = fs.readdirSync(projectsDir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const memDir = path.join(projectsDir, entry.name, 'memory');
+    if (!fs.existsSync(memDir)) continue;
+
+    const memoryMdPath = path.join(memDir, 'MEMORY.md');
+    let memoryMd = '';
+    if (fs.existsSync(memoryMdPath)) {
+      memoryMd = fs.readFileSync(memoryMdPath, 'utf8');
+    }
+
+    // Find all .md files in this memory dir
+    const mdFiles = fs.readdirSync(memDir)
+      .filter(f => f.endsWith('.md') && f !== 'MEMORY.md');
+
+    // Check which ones are NOT referenced in MEMORY.md
+    const unreferenced = mdFiles.filter(f => {
+      const name = f.replace('.md', '');
+      // Check for markdown link [text](file.md) or plain filename mention
+      return !memoryMd.includes(f) && !memoryMd.includes(`(${f})`);
+    });
+
+    if (unreferenced.length === 0) continue;
+
+    // Read each unreferenced file to get its name/description from frontmatter
+    let additions = '\n\n## Synced from another machine\n';
+    for (const file of unreferenced) {
+      const content = fs.readFileSync(path.join(memDir, file), 'utf8');
+      // Try to extract name from frontmatter
+      const nameMatch = content.match(/^name:\s*(.+)/m);
+      const descMatch = content.match(/^description:\s*(.+)/m);
+      const name = nameMatch ? nameMatch[1].trim() : file.replace('.md', '').replace(/-/g, ' ');
+      const desc = descMatch ? descMatch[1].trim() : '';
+      additions += `- [${name}](${file})${desc ? ' — ' + desc : ''}\n`;
+    }
+
+    // Append to MEMORY.md
+    if (!memoryMd) {
+      memoryMd = '# Project Memory\n';
+    }
+    // Remove old "Synced from another machine" section if it exists, then re-add
+    memoryMd = memoryMd.replace(/\n\n## Synced from another machine\n[\s\S]*$/, '');
+    memoryMd = memoryMd.trimEnd() + additions;
+    fs.writeFileSync(memoryMdPath, memoryMd);
+  }
+}
+
 async function syncFiles(src, dest, changes) {
   const entries = await fs.readdir(src, { withFileTypes: true });
   for (const entry of entries) {
@@ -277,6 +338,13 @@ export async function restoreMemories(sourceDir, spinner, onlyFilter = null, aut
           await syncFiles(backupDir, adapter.source, changes);
         }
 
+        // After syncing, reconcile MEMORY.md files
+        // MEMORY.md is an INDEX — it must reference all memory files from both machines
+        // This MUST run after syncFiles so newly copied files are included
+        if (adapter.name === 'Claude CLI') {
+          await reconcileMemoryIndexes(adapter.source);
+        }
+
         // Show summary of changes
         spinner.stop();
         const totalChanged = changes.added.length + changes.updated.length;

package/src/commands/push.js

@@ -32,6 +32,8 @@ export async function pushCommand(options = {}) {
   const stagingDir = path.join(os.tmpdir(), `memoir-staging-${Date.now()}`);
   await fs.ensureDir(stagingDir);
 
+  let encryptedDir = null;
+
   try {
     // Profile-level tool filter (config.only) merged with CLI --only flag
     const onlyRaw = options.only || (config.only ? config.only.join(',') : null);
@@ -160,7 +162,7 @@ export async function pushCommand(options = {}) {
       }]);
       spinner.start(chalk.gray('Encrypting...'));
 
-      const encryptedDir = path.join(os.tmpdir(), `memoir-encrypted-${Date.now()}`);
+      encryptedDir = path.join(os.tmpdir(), `memoir-encrypted-${Date.now()}`);
       await fs.ensureDir(encryptedDir);
       await encryptDirectory(stagingDir, encryptedDir, passphrase);
 
@@ -232,13 +234,8 @@ export async function pushCommand(options = {}) {
   } finally {
     await fs.remove(stagingDir);
     // Clean up encrypted dir if it was created
-    if (true) {
-      const encDirs = await fs.readdir(os.tmpdir());
-      for (const d of encDirs) {
-        if (d.startsWith('memoir-encrypted-')) {
-          await fs.remove(path.join(os.tmpdir(), d)).catch(() => {});
-        }
-      }
+    if (encryptedDir) {
+      await fs.remove(encryptedDir).catch(() => {});
     }
   }
 }

package/src/commands/restore.js

@@ -9,6 +9,7 @@ import inquirer from 'inquirer';
 import { getConfig } from '../config.js';
 import { fetchFromLocal, fetchFromGit } from '../providers/restore.js';
 import { decryptDirectory, verifyPassphrase } from '../security/encryption.js';
+import { detectLocalHomeKey } from '../adapters/restore.js';
 
 const home = os.homedir();
 
@@ -135,9 +136,19 @@ export async function restoreCommand(options = {}) {
           await fs.writeFile(path.join(localHandoffDir, 'latest.md'), handoffContent);
 
           // Inject into Claude's home-level memory so it's always loaded
-          const cwdKey = '-' + home.replace(/^\//, '').replace(/\\/g, '-').replace(/\//g, '-').replace(/:/g, '');
-          const claudeMemDir = path.join(home, '.claude', 'projects', cwdKey, 'memory');
-          if (await fs.pathExists(path.join(home, '.claude'))) {
+          // Use detection (reads what Claude actually created) with corrected fallback
+          const claudeDir = path.join(home, '.claude');
+          if (await fs.pathExists(claudeDir)) {
+            let homeKey = detectLocalHomeKey(claudeDir);
+            if (!homeKey) {
+              // Fallback: compute key matching Claude's actual encoding
+              if (process.platform === 'win32') {
+                homeKey = home.replace(/\\/g, '-').replace(/:/g, '-');
+              } else {
+                homeKey = '-' + home.replace(/^\//, '').replace(/\//g, '-');
+              }
+            }
+            const claudeMemDir = path.join(claudeDir, 'projects', homeKey, 'memory');
             await fs.ensureDir(claudeMemDir);
             await fs.writeFile(path.join(claudeMemDir, 'handoff.md'), handoffContent);
             handoffInjected = true;

package/src/commands/resume.js

@@ -51,7 +51,13 @@ async function injectHandoff(content, tool) {
     claude: () => {
       // Write to Claude's project memory dir so it's auto-loaded
       const cwd = process.cwd();
-      const cwdKey = '-' + cwd.replace(/^\//, '').replace(/\\/g, '-').replace(/\//g, '-').replace(/:/g, '');
+      // Match Claude's actual path encoding: each separator → dash
+      let cwdKey;
+      if (process.platform === 'win32') {
+        cwdKey = cwd.replace(/\\/g, '-').replace(/:/g, '-');
+      } else {
+        cwdKey = '-' + cwd.replace(/^\//, '').replace(/\//g, '-');
+      }
       const memDir = path.join(home, '.claude', 'projects', cwdKey, 'memory');
       return path.join(memDir, 'handoff.md');
     },