memoir-cli 3.17.1 → 3.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memoir-cli",
-  "version": "3.17.1",
+  "version": "3.17.3",
   "mcpName": "io.github.camgitt/memoir",
   "description": "Portable, project-scoped memory and session handoffs for coding agents. Readable files, MCP recall, and optional user-passphrase encrypted backups.",
   "main": "src/index.js",

package/src/cloud/auth.js

@@ -11,7 +11,7 @@ const AUTH_FILE = path.join(configDir, 'auth.json');
 
 async function supaFetch(endpoint, options = {}) {
   const url = `${SUPABASE_URL}${endpoint}`;
-  const res = await fetch(url, {
+  return fetch(url, {
     ...options,
     headers: {
       'apikey': SUPABASE_ANON_KEY,
@@ -19,42 +19,27 @@ async function supaFetch(endpoint, options = {}) {
       ...options.headers,
     },
   });
-  return res;
 }
 
-// GoTrue's REST API takes the post-email landing URL as a `redirect_to`
-// QUERY PARAM. `options.emailRedirectTo` / `options.redirectTo` in the JSON
-// body is supabase-js's client shape — sent raw it is silently ignored and
-// the email links fall back to the project's Site URL. Both URLs below must
-// also be on the Auth → URL Configuration → Redirect URLs allow-list.
 const CONFIRMED_URL = 'https://memoir.sh/confirmed';
 const RESET_URL = 'https://memoir.sh/reset-password';
 
 export async function signUp(email, password) {
-  const res = await supaFetch(`/auth/v1/signup?redirect_to=${encodeURIComponent(CONFIRMED_URL)}`, {
-    method: 'POST',
-    body: JSON.stringify({ email, password }),
-  });
+  const res = await supaFetch(`/auth/v1/signup?redirect_to=${encodeURIComponent(CONFIRMED_URL)}`, { method: 'POST', body: JSON.stringify({ email, password }) });
   const data = await res.json();
   if (!res.ok) throw new Error(data.error_description || data.msg || 'Sign up failed');
   return data;
 }
 
 export async function signIn(email, password) {
-  const res = await supaFetch('/auth/v1/token?grant_type=password', {
-    method: 'POST',
-    body: JSON.stringify({ email, password }),
-  });
+  const res = await supaFetch('/auth/v1/token?grant_type=password', { method: 'POST', body: JSON.stringify({ email, password }) });
   const data = await res.json();
   if (!res.ok) throw new Error(data.error_description || data.msg || 'Sign in failed');
   return data;
 }
 
 export async function refreshSession(refreshToken) {
-  const res = await supaFetch('/auth/v1/token?grant_type=refresh_token', {
-    method: 'POST',
-    body: JSON.stringify({ refresh_token: refreshToken }),
-  });
+  const res = await supaFetch('/auth/v1/token?grant_type=refresh_token', { method: 'POST', body: JSON.stringify({ refresh_token: refreshToken }) });
   const data = await res.json();
   if (!res.ok) throw new Error(data.error_description || data.msg || 'Token refresh failed');
   return data;
@@ -62,127 +47,73 @@ export async function refreshSession(refreshToken) {
 
 export async function saveSession(session) {
   await fs.ensureDir(configDir);
-  const payload = {
-    access_token: session.access_token,
-    refresh_token: session.refresh_token,
-    expires_at: Date.now() + (session.expires_in * 1000),
-    user: {
-      id: session.user.id,
-      email: session.user.email,
-    },
-  };
+  const payload = { access_token: session.access_token, refresh_token: session.refresh_token, expires_at: Date.now() + (session.expires_in * 1000), user: { id: session.user.id, email: session.user.email } };
   await fs.writeFile(AUTH_FILE, JSON.stringify(payload, null, 2), { mode: 0o600 });
   return payload;
 }
 
 export async function getSession() {
   if (!await fs.pathExists(AUTH_FILE)) return null;
-
   const stored = await fs.readJson(AUTH_FILE);
-
-  // If token expires within 60 seconds, refresh
   if (stored.expires_at < Date.now() + 60000) {
-    try {
-      const refreshed = await refreshSession(stored.refresh_token);
-      return await saveSession(refreshed);
-    } catch {
-      // Refresh failed — session is dead
-      await fs.remove(AUTH_FILE);
-      return null;
-    }
+    try { return await saveSession(await refreshSession(stored.refresh_token)); }
+    catch { await fs.remove(AUTH_FILE); return null; }
   }
-
   return stored;
 }
 
-export async function logout() {
-  if (await fs.pathExists(AUTH_FILE)) {
-    await fs.remove(AUTH_FILE);
-  }
-}
-
-export async function isLoggedIn() {
-  const session = await getSession();
-  return !!session;
-}
+export async function logout() { if (await fs.pathExists(AUTH_FILE)) await fs.remove(AUTH_FILE); }
+export async function isLoggedIn() { return !!(await getSession()); }
 
+// A failed plan lookup is not evidence that a user is on Free. Callers use
+// this value to choose destructive retention limits, so fail closed instead of
+// silently downgrading a Pro account and pruning its history.
 export async function getSubscription(session) {
-  const res = await supaFetch('/rest/v1/subscriptions?select=*&user_id=eq.' + session.user.id, {
-    headers: {
-      'Authorization': `Bearer ${session.access_token}`,
-    },
+  const res = await supaFetch('/rest/v1/subscriptions?select=*&user_id=eq.' + encodeURIComponent(session.user.id), {
+    headers: { 'Authorization': `Bearer ${session.access_token}` },
   });
+  if (!res.ok) throw new Error(`Could not verify subscription (${res.status}). Existing backups were not pruned.`);
   const data = await res.json();
-  if (!res.ok || !data.length) return { status: 'free' };
+  if (!Array.isArray(data)) throw new Error('Could not verify subscription. Existing backups were not pruned.');
+  if (!data.length) return { status: 'free' };
   return data[0];
 }
 
 export async function resetPassword(email) {
-  const res = await supaFetch(`/auth/v1/recover?redirect_to=${encodeURIComponent(RESET_URL)}`, {
-    method: 'POST',
-    body: JSON.stringify({ email }),
-  });
-  if (!res.ok) {
-    const data = await res.json();
-    throw new Error(data.error_description || data.msg || 'Password reset failed');
-  }
+  const res = await supaFetch(`/auth/v1/recover?redirect_to=${encodeURIComponent(RESET_URL)}`, { method: 'POST', body: JSON.stringify({ email }) });
+  if (!res.ok) { const data = await res.json(); throw new Error(data.error_description || data.msg || 'Password reset failed'); }
+}
+
+async function requireDelete(res, label) {
+  if (res.ok || res.status === 404) return;
+  let detail = '';
+  try { detail = (await res.text()).trim(); } catch {}
+  throw new Error(`${label} failed (${res.status})${detail ? ': ' + detail : ''}. Nothing else was reported as deleted; retry account deletion.`);
 }
 
+// Deletes the data the current user is authorized to delete. Auth-user removal
+// itself requires a privileged server-side endpoint and must never be attempted
+// with a service-role key from this CLI.
 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,
-        },
-      });
-    }
+  const headers = { 'Authorization': `Bearer ${session.access_token}`, 'apikey': SUPABASE_ANON_KEY };
+  const backupsRes = await fetch(`${SUPABASE_URL}/rest/v1/backups?select=*&user_id=eq.${encodeURIComponent(session.user.id)}`, { headers });
+  if (!backupsRes.ok) throw new Error(`Could not enumerate backups (${backupsRes.status}); account deletion stopped safely.`);
+  const backups = await backupsRes.json();
+
+  for (const backup of backups) {
+    if (typeof backup.storage_path !== 'string' || !backup.storage_path.startsWith(session.user.id + '/')) throw new Error('Unsafe backup path; account deletion stopped.');
+    const object = await fetch(`${SUPABASE_URL}/storage/v1/object/${STORAGE_BUCKET}`, {
+      method: 'DELETE', headers: { ...headers, 'Content-Type': 'application/json' }, body: JSON.stringify({ prefixes: [backup.storage_path] }),
+    });
+    await requireDelete(object, 'Backup object deletion');
+    const row = await fetch(`${SUPABASE_URL}/rest/v1/backups?id=eq.${encodeURIComponent(backup.id)}`, { method: 'DELETE', headers });
+    await requireDelete(row, 'Backup metadata deletion');
   }
 
-  // 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 requireDelete(await fetch(`${SUPABASE_URL}/rest/v1/shared_links?user_id=eq.${encodeURIComponent(session.user.id)}`, { method: 'DELETE', headers }), 'Shared-link deletion');
+  await requireDelete(await fetch(`${SUPABASE_URL}/rest/v1/subscriptions?user_id=eq.${encodeURIComponent(session.user.id)}`, { method: 'DELETE', headers }), 'Subscription deletion');
   await logout();
+  return { localDataDeleted: true, authUserDeleted: false };
 }
 
 export { AUTH_FILE, supaFetch };

package/src/commands/login.js

@@ -5,169 +5,58 @@ import inquirer from 'inquirer';
 import { signIn, signUp, saveSession, getSession, logout, getSubscription, resetPassword, deleteAccount } from '../cloud/auth.js';
 
 export async function loginCommand(options = {}) {
-  // Check if already logged in
   const existing = await getSession();
   if (existing) {
-    const sub = await getSubscription(existing);
-    console.log('\n' + boxen(
-      gradient.pastel('  memoir cloud  ') + '\n\n' +
-      chalk.green('✔ Already logged in as ') + chalk.cyan(existing.user.email) + '\n' +
-      chalk.gray('Plan: ') + (sub.status === 'pro' ? chalk.green('Pro') : chalk.yellow('Free')),
-      { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }
-    ) + '\n');
+    try {
+      const sub = await getSubscription(existing);
+      console.log('\n' + boxen(gradient.pastel('  memoir cloud  ') + '\n\n' + chalk.green('✔ Already logged in as ') + chalk.cyan(existing.user.email) + '\n' + chalk.gray('Plan: ') + (sub.status === 'pro' ? chalk.green('Pro') : chalk.yellow('Free')), { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }) + '\n');
+    } catch (error) {
+      console.log('\n' + boxen(chalk.green('✔ Logged in as ') + chalk.cyan(existing.user.email) + '\n' + chalk.yellow('Plan could not be verified right now. No backup history will be pruned until it can be verified.') + '\n' + chalk.gray(error.message), { padding: 1, borderStyle: 'round', borderColor: 'yellow' }) + '\n');
+    }
     return;
   }
 
   let action, email, password;
-
-  // Support non-interactive login via flags
-  if (options.email && options.password) {
-    action = options.signup ? 'signup' : 'signin';
-    email = options.email;
-    password = options.password;
-  } else {
+  if (options.email && options.password) { action = options.signup ? 'signup' : 'signin'; email = options.email; password = options.password; }
+  else {
     console.log();
-
-    const actionAnswer = await inquirer.prompt([{
-      type: 'list',
-      name: 'action',
-      message: 'Sign in or create account?',
-      choices: [
-        { name: 'Sign in (existing account)', value: 'signin' },
-        { name: 'Create account', value: 'signup' },
-      ],
-    }]);
-    action = actionAnswer.action;
-
-    const emailAnswer = await inquirer.prompt([{
-      type: 'input',
-      name: 'email',
-      message: 'Email:',
-      validate: v => v.includes('@') ? true : 'Enter a valid email',
-    }]);
-    email = emailAnswer.email;
-
-    const passwordAnswer = await inquirer.prompt([{
-      type: 'password',
-      name: 'password',
-      message: 'Password:',
-      mask: '*',
-      validate: v => v.length >= 6 ? true : 'Password must be at least 6 characters',
-    }]);
-    password = passwordAnswer.password;
+    action = (await inquirer.prompt([{ type: 'list', name: 'action', message: 'Sign in or create account?', choices: [{ name: 'Sign in (existing account)', value: 'signin' }, { name: 'Create account', value: 'signup' }] }])).action;
+    email = (await inquirer.prompt([{ type: 'input', name: 'email', message: 'Email:', validate: v => v.includes('@') ? true : 'Enter a valid email' }])).email;
+    password = (await inquirer.prompt([{ type: 'password', name: 'password', message: 'Password:', mask: '*', validate: v => v.length >= 6 ? true : 'Password must be at least 6 characters' }])).password;
   }
 
   try {
     let session;
-
     if (action === 'signup') {
       const result = await signUp(email, password);
-      if (result.access_token) {
-        session = await saveSession(result);
-      } else {
-        // Email confirmation required
-        console.log('\n' + boxen(
-          chalk.green('✔ Account created!') + '\n\n' +
-          chalk.white('Check your email to confirm, then run ') + chalk.cyan('memoir login') + chalk.white(' again.'),
-          { padding: 1, borderStyle: 'round', borderColor: 'green' }
-        ) + '\n');
-        return;
-      }
-    } else {
-      const result = await signIn(email, password);
-      session = await saveSession(result);
-    }
-
-    const sub = await getSubscription(session);
-
-    console.log('\n' + boxen(
-      gradient.pastel('  memoir cloud  ') + '\n\n' +
-      chalk.green('✔ Logged in as ') + chalk.cyan(session.user.email) + '\n' +
-      chalk.gray('Plan: ') + (sub.status === 'pro' ? chalk.green('Pro') : chalk.yellow('Free')) + '\n\n' +
-      chalk.gray('Try: ') + chalk.cyan('memoir cloud push') + chalk.gray(' to back up to the cloud'),
-      { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }
-    ) + '\n');
-
-  } catch (error) {
-    console.log('\n' + boxen(
-      chalk.red('✖ ' + error.message),
-      { padding: 1, borderStyle: 'round', borderColor: 'red' }
-    ) + '\n');
-  }
+      if (result.access_token) session = await saveSession(result);
+      else { console.log('\n' + boxen(chalk.green('✔ Account created!') + '\n\n' + chalk.white('Check your email to confirm, then run ') + chalk.cyan('memoir login') + chalk.white(' again.'), { padding: 1, borderStyle: 'round', borderColor: 'green' }) + '\n'); return; }
+    } else session = await saveSession(await signIn(email, password));
+
+    let plan = 'Unknown';
+    try { const sub = await getSubscription(session); plan = sub.status === 'pro' ? 'Pro' : 'Free'; } catch {}
+    console.log('\n' + boxen(gradient.pastel('  memoir cloud  ') + '\n\n' + chalk.green('✔ Logged in as ') + chalk.cyan(session.user.email) + '\n' + chalk.gray('Plan: ') + (plan === 'Pro' ? chalk.green(plan) : plan === 'Free' ? chalk.yellow(plan) : chalk.yellow(plan + ' — will retry before retention cleanup')) + '\n\n' + chalk.gray('Try: ') + chalk.cyan('memoir cloud push') + chalk.gray(' to back up to the cloud'), { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }) + '\n');
+  } catch (error) { console.log('\n' + boxen(chalk.red('✖ ' + error.message), { padding: 1, borderStyle: 'round', borderColor: 'red' }) + '\n'); }
 }
 
 export async function forgotPasswordCommand(options = {}) {
   let email = options.email;
-
-  if (!email) {
-    const emailAnswer = await inquirer.prompt([{
-      type: 'input',
-      name: 'email',
-      message: 'Email:',
-      validate: v => v.includes('@') ? true : 'Enter a valid email',
-    }]);
-    email = emailAnswer.email;
-  }
-
-  try {
-    await resetPassword(email);
-    console.log('\n' + boxen(
-      chalk.green('✔ Password reset email sent!') + '\n\n' +
-      chalk.white('Check ') + chalk.cyan(email) + chalk.white(' for a reset link.'),
-      { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }
-    ) + '\n');
-  } catch (error) {
-    console.log('\n' + boxen(
-      chalk.red('✖ ' + error.message),
-      { padding: 1, borderStyle: 'round', borderColor: 'red' }
-    ) + '\n');
-  }
+  if (!email) email = (await inquirer.prompt([{ type: 'input', name: 'email', message: 'Email:', validate: v => v.includes('@') ? true : 'Enter a valid email' }])).email;
+  try { await resetPassword(email); console.log('\n' + boxen(chalk.green('✔ Password reset email sent!') + '\n\n' + chalk.white('Check ') + chalk.cyan(email) + chalk.white(' for a reset link.'), { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }) + '\n'); }
+  catch (error) { console.log('\n' + boxen(chalk.red('✖ ' + error.message), { padding: 1, borderStyle: 'round', borderColor: 'red' }) + '\n'); }
 }
 
-export async function logoutCommand() {
-  await logout();
-  console.log('\n' + boxen(
-    chalk.green('✔ Logged out'),
-    { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }
-  ) + '\n');
-}
+export async function logoutCommand() { await logout(); console.log('\n' + boxen(chalk.green('✔ Logged out'), { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }) + '\n'); }
 
 export async function deleteAccountCommand(options = {}) {
   const session = await getSession();
-  if (!session) {
-    console.log('\n' + boxen(
-      chalk.red('✖ Not logged in. Run ') + chalk.cyan('memoir login') + chalk.red(' first.'),
-      { padding: 1, borderStyle: 'round', borderColor: 'red' }
-    ) + '\n');
-    return;
-  }
-
+  if (!session) { console.log('\n' + boxen(chalk.red('✖ Not logged in. Run ') + chalk.cyan('memoir login') + chalk.red(' first.'), { padding: 1, borderStyle: 'round', borderColor: 'red' }) + '\n'); return; }
   if (!options.confirm) {
-    const answer = await inquirer.prompt([{
-      type: 'input',
-      name: 'confirmation',
-      message: 'Type DELETE to confirm account deletion:',
-    }]);
-
-    if (answer.confirmation !== 'DELETE') {
-      console.log('\n' + chalk.gray('  Account deletion cancelled.') + '\n');
-      return;
-    }
+    const answer = await inquirer.prompt([{ type: 'input', name: 'confirmation', message: 'Type DELETE to remove your Memoir cloud data and sign out:' }]);
+    if (answer.confirmation !== 'DELETE') { console.log('\n' + chalk.gray('  Account-data deletion cancelled.') + '\n'); return; }
   }
-
   try {
     await deleteAccount(session);
-
-    console.log('\n' + boxen(
-      gradient.pastel('  memoir cloud  ') + '\n\n' +
-      chalk.green('✔ Account deleted.') + '\n' +
-      chalk.gray('All backups, shared links, and data have been removed.'),
-      { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }
-    ) + '\n');
-  } catch (error) {
-    console.log('\n' + boxen(
-      chalk.red('✖ ' + error.message),
-      { padding: 1, borderStyle: 'round', borderColor: 'red' }
-    ) + '\n');
-  }
+    console.log('\n' + boxen(gradient.pastel('  memoir cloud  ') + '\n\n' + chalk.green('✔ Memoir cloud data deleted and this device signed out.') + '\n' + chalk.gray('Backups, shared links, and subscription data accessible to this account were removed.') + '\n\n' + chalk.yellow('Your authentication identity may still exist. Full auth-account removal requires the hosted account-deletion service.'), { padding: 1, borderStyle: 'round', borderColor: 'green', dimBorder: true }) + '\n');
+  } catch (error) { console.log('\n' + boxen(chalk.red('✖ Deletion incomplete: ' + error.message) + '\n' + chalk.gray('Retry the command. Memoir will not report success for an incomplete deletion.'), { padding: 1, borderStyle: 'round', borderColor: 'red' }) + '\n'); }
 }

package/src/commands/upgrade.js

@@ -1,3 +1,4 @@
+import { execFile } from 'child_process';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import gradient from 'gradient-string';
@@ -18,13 +19,10 @@ async function createCheckoutSession(session) {
   return data.url;
 }
 
-// No shell. The URL comes from our own API, but `exec(\`open "${url}"\`)`
-// is still a shell string built from data — flagged (correctly) by the
-// agentscores.xyz scan as command injection, and one bad quote away from
-// being one. execFile passes the URL as a single argument; on Windows
-// rundll32's URL handler avoids cmd.exe parsing `&` inside the query string.
+// No shell interpolation: execFile passes the URL as a discrete argument
+// array; on Windows rundll32's URL handler avoids cmd.exe parsing `&` inside
+// the query string.
 function openUrl(url) {
-  const { execFile } = require('child_process');
   const platform = process.platform;
   const [cmd, args] = platform === 'darwin' ? ['open', [url]]
     : platform === 'win32' ? ['rundll32', ['url.dll,FileProtocolHandler', url]]