memoir-cli 3.10.1 → 3.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memoir-cli",
-  "version": "3.10.1",
+  "version": "3.10.2",
   "mcpName": "io.github.camgitt/memoir",
   "description": "Private, portable AI memory: synced across every coding tool and machine, end-to-end encrypted, free. One memory for Claude Code, Cursor, Copilot, Gemini + more — MCP-native, zero-knowledge, open source.",
   "main": "src/index.js",

package/src/adapters/index.js

@@ -4,12 +4,21 @@ import path from 'path';
 import os from 'os';
 import chalk from 'chalk';
 import { shouldIgnoreProject } from '../context/capture.js';
+import { vscodeUserDir, vscodeGlobalStorage, xdgConfigDir } from '../utils/platform.js';
 
 const home = os.homedir();
 
 const isWin = process.platform === 'win32';
 const appData = process.env.APPDATA || path.join(home, 'AppData', 'Roaming');
 
+// VS Code-family config dirs — resolved per-OS (incl. Linux) via platform.js.
+const cursorUserDir = vscodeUserDir('Cursor');
+const windsurfUserDir = vscodeUserDir('Windsurf');
+const clineStorageDir = vscodeGlobalStorage('saoudrizwan.claude-dev');
+// Non-VSCode tools that store under AppData on Windows and XDG config on POSIX.
+const copilotDir = isWin ? path.join(appData, 'GitHub Copilot') : path.join(xdgConfigDir(), 'github-copilot');
+const zedDir = isWin ? path.join(appData, 'Zed') : path.join(xdgConfigDir(), 'zed');
+
 export const adapters = [
   {
     name: 'Gemini CLI',
@@ -78,13 +87,9 @@ export const adapters = [
   {
     name: 'Cursor',
     icon: '⚡',
-    source: isWin
-      ? path.join(appData, 'Cursor', 'User')
-      : path.join(home, 'Library', 'Application Support', 'Cursor', 'User'),
+    source: cursorUserDir,
     filter: (src) => {
-      const cursorDir = isWin
-        ? path.join(appData, 'Cursor', 'User')
-        : path.join(home, 'Library', 'Application Support', 'Cursor', 'User');
+      const cursorDir = cursorUserDir;
       const rel = path.relative(cursorDir, src);
       if (src === cursorDir) return true;
       const basename = path.basename(src);
@@ -100,13 +105,8 @@ export const adapters = [
   {
     name: 'GitHub Copilot',
     icon: '🐙',
-    source: isWin
-      ? path.join(appData, 'GitHub Copilot')
-      : path.join(home, '.config', 'github-copilot'),
+    source: copilotDir,
     filter: (src) => {
-      const copilotDir = isWin
-        ? path.join(appData, 'GitHub Copilot')
-        : path.join(home, '.config', 'github-copilot');
       if (src === copilotDir) return true;
       const basename = path.basename(src);
       // Only sync config — skip auth tokens and version files
@@ -117,13 +117,9 @@ export const adapters = [
   {
     name: 'Windsurf',
     icon: '🏄',
-    source: isWin
-      ? path.join(appData, 'Windsurf', 'User')
-      : path.join(home, 'Library', 'Application Support', 'Windsurf', 'User'),
+    source: windsurfUserDir,
     filter: (src) => {
-      const windsurfDir = isWin
-        ? path.join(appData, 'Windsurf', 'User')
-        : path.join(home, 'Library', 'Application Support', 'Windsurf', 'User');
+      const windsurfDir = windsurfUserDir;
       const rel = path.relative(windsurfDir, src);
       if (src === windsurfDir) return true;
       const basename = path.basename(src);
@@ -138,13 +134,8 @@ export const adapters = [
   {
     name: 'Zed',
     icon: '🔶',
-    source: isWin
-      ? path.join(appData, 'Zed')
-      : path.join(home, '.config', 'zed'),
+    source: zedDir,
     filter: (src) => {
-      const zedDir = isWin
-        ? path.join(appData, 'Zed')
-        : path.join(home, '.config', 'zed');
       const rel = path.relative(zedDir, src);
       if (src === zedDir) return true;
       const basename = path.basename(src);
@@ -163,13 +154,9 @@ export const adapters = [
   {
     name: 'Cline',
     icon: '🤖',
-    source: isWin
-      ? path.join(appData, 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev')
-      : path.join(home, 'Library', 'Application Support', 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev'),
+    source: clineStorageDir,
     filter: (src) => {
-      const clineDir = isWin
-        ? path.join(appData, 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev')
-        : path.join(home, 'Library', 'Application Support', 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev');
+      const clineDir = clineStorageDir;
       const rel = path.relative(clineDir, src);
       if (src === clineDir) return true;
       const basename = path.basename(src);

package/src/session/state.js

@@ -33,6 +33,9 @@ export { SCHEMA_VERSION, emptySession };
 // Prevents unbounded growth of the live pinned block.
 const MAX_GOALS = 3;
 const MAX_NEXT = 8;
+// Completion tombstones kept so merges can't resurrect finished actions.
+// Must outlive every stale copy that might still carry the item.
+const MAX_COMPLETED_TOMBSTONES = 50;
 const MAX_QUESTIONS = 5;
 const MAX_DECISIONS_RECENT = 10;
 const MAX_HISTORY = 30;
@@ -225,7 +228,20 @@ export async function completeNext(textOrIndex) {
     }
     const completed = idx >= 0;
     if (completed) {
-      state.current.next_actions.splice(idx, 1);
+      // Removal alone is not enough: any merge with a copy that still holds
+      // this item (the push-side backup, another machine, a stale MCP-process
+      // write) re-unions it straight back — the "completed actions resurrect"
+      // bug. So completion also records a tombstone that merges consult.
+      // Temporal, not absolute like decisions' `hidden`: a re-add whose
+      // `added` postdates `done_at` is a deliberate revival and survives.
+      const [removed] = state.current.next_actions.splice(idx, 1);
+      const key = removed.text.trim().toLowerCase();
+      state.current.completed_actions = [
+        { text: removed.text, done_at: new Date().toISOString() },
+        ...(state.current.completed_actions || []).filter(
+          c => c && c.text && c.text.trim().toLowerCase() !== key
+        ),
+      ].slice(0, MAX_COMPLETED_TOMBSTONES);
     }
     await writeSession(state);
     // Only when something was actually completed — the event should mean
@@ -312,6 +328,25 @@ export function mergeSessions(local, remote) {
     history: mergeHistory(local.history, remote.history),
   };
 
+  // Completed-action tombstones beat the union above. unionByText can only
+  // union; it cannot represent "this used to exist and was finished," so a
+  // completed item surviving in ANY stale copy resurrected on every merge —
+  // the intermittent completeNext no-op observed in production (2026-08-03).
+  // Temporal on purpose: an item re-ADDED after its done_at is a deliberate
+  // revival and must survive, so tombstones only suppress copies whose
+  // `added` predates the completion.
+  const tombstones = unionTombstones(
+    local.current?.completed_actions,
+    remote.current?.completed_actions
+  );
+  merged.current.completed_actions = tombstones;
+  merged.current.next_actions = merged.current.next_actions.filter(a => {
+    const t = tombstones.find(
+      c => c.text.trim().toLowerCase() === a.text.trim().toLowerCase()
+    );
+    return !t || new Date(a.added || 0) > new Date(t.done_at);
+  });
+
   // machines: union last_seen per id (take the newer)
   for (const [id, entry] of Object.entries(remote.machines || {})) {
     const existing = merged.machines[id];
@@ -359,6 +394,21 @@ function unionByText(a = [], b = [], dateField, cap) {
     .slice(0, cap);
 }
 
+function unionTombstones(a = [], b = []) {
+  const byText = new Map();
+  for (const item of [...(a || []), ...(b || [])]) {
+    if (!item || !item.text || !item.done_at) continue;
+    const key = item.text.trim().toLowerCase();
+    const existing = byText.get(key);
+    if (!existing || new Date(item.done_at) > new Date(existing.done_at)) {
+      byText.set(key, item);
+    }
+  }
+  return Array.from(byText.values())
+    .sort((x, y) => new Date(y.done_at) - new Date(x.done_at))
+    .slice(0, MAX_COMPLETED_TOMBSTONES);
+}
+
 function mergeHistory(a = [], b = []) {
   const seen = new Set();
   const all = [...a, ...b].filter(h => h && h.date);

package/src/utils/platform.js

@@ -0,0 +1,47 @@
+// Single source of truth for OS-specific config locations.
+//
+// Why this exists: before this module, every adapter branched on a single
+// `isWin` flag — `isWin ? <windows> : <macOS>`. On Linux, `process.platform`
+// is `'linux'`, so those ternaries silently fell through to the *macOS* path
+// (`~/Library/Application Support/...`), which doesn't exist on Linux. memoir
+// would then detect zero tools, sync nothing, and the user would churn without
+// any error — the "silent-zero-memory activation cliff."
+//
+// Every function is parameterized by { platform, env, home } so the three OS
+// branches can be unit-tested from any machine, not just the target OS. Runtime
+// callers omit the options and get the live platform.
+
+import path from 'node:path';
+import os from 'node:os';
+
+const HOME = os.homedir();
+
+// VS Code-family per-user config base: <root>/<App>/User
+//   win32  : %APPDATA%/<App>/User
+//   darwin : ~/Library/Application Support/<App>/User
+//   linux  : $XDG_CONFIG_HOME (or ~/.config)/<App>/User
+export function vscodeUserDir(appName, { platform = process.platform, env = process.env, home = HOME } = {}) {
+  if (platform === 'win32') {
+    const appData = env.APPDATA || path.join(home, 'AppData', 'Roaming');
+    return path.join(appData, appName, 'User');
+  }
+  if (platform === 'darwin') {
+    return path.join(home, 'Library', 'Application Support', appName, 'User');
+  }
+  // linux + anything else POSIX-y
+  const xdg = env.XDG_CONFIG_HOME || path.join(home, '.config');
+  return path.join(xdg, appName, 'User');
+}
+
+// A VS Code extension's globalStorage dir (e.g. Cline lives under the base
+// "Code" install, not its own app dir).
+export function vscodeGlobalStorage(extId, opts = {}) {
+  return path.join(vscodeUserDir('Code', opts), 'globalStorage', extId);
+}
+
+// XDG-aware ~/.config base, for non-VSCode tools that already store there
+// (zed, github-copilot). Exposed so callers don't re-hardcode ~/.config and
+// drift from XDG_CONFIG_HOME.
+export function xdgConfigDir({ env = process.env, home = HOME } = {}) {
+  return env.XDG_CONFIG_HOME || path.join(home, '.config');
+}