devgrowth 1.0.1 → 1.1.0

package/src/commands/log.js

@@ -1,36 +1,40 @@
-import * as configManager from '../core/configManager.js';
-import * as schedule from '../core/schedule.js';
-import * as logger from '../core/logger.js';
-import * as stats from '../core/stats.js';
-import chalk from 'chalk';
-
-export async function logCommand(message, options = {}) {
-  if (!message || message.trim().length === 0) {
-    console.error(chalk.red('Error: Log message required.'));
-    console.log('Usage: devgrowth log "Today I learned ___. Tomorrow I will ___."');
-    process.exit(1);
-  }
-
-  if (message.length < 10) {
-    console.log(chalk.yellow('⚠️  Warning: Log message is very short, but saving anyway.'));
-  }
-
-  const config = await configManager.getConfig();
-  const today = schedule.getTodaySkill(config);
-  const now = schedule.getSessionDate(new Date());
-  const isLight = options.light || false;
-  const status = isLight ? 'Light' : 'Completed';
-  const duration = config.session?.durationMinutes || 20;
-
-  await logger.writeLogEntry(now, today.skill, today.resource, duration, status, message);
-  const updatedStats = await stats.recordSession(now, today.skill, duration, status);
-
-  const weekFile = schedule.getWeekFileName(now);
-  const weekStart = schedule.getWeekStart(now);
-  const logYear = weekStart.getFullYear();
-  const logMonth = String(weekStart.getMonth() + 1).padStart(2, '0');
-  console.log(chalk.green('✓ Log saved.'));
-  console.log(chalk.gray(`  File: ~/.devgrowth/logs/${logYear}/${logMonth}/${weekFile}`));
-  console.log(chalk.gray(`  Week progress: ${updatedStats.currentWeek.completed}/5 sessions`));
-  console.log(chalk.gray(`  Streak: ${updatedStats.currentStreakWeeks} weeks (longest: ${updatedStats.longestStreakWeeks})`));
-}
+import * as configManager from '../core/configManager.js';
+import * as schedule from '../core/schedule.js';
+import * as logger from '../core/logger.js';
+import * as stats from '../core/stats.js';
+import * as eventLog from '../core/eventLog.js';
+import * as sync from '../core/sync.js';
+import chalk from 'chalk';
+
+export async function logCommand(message, options = {}) {
+  if (!message || message.trim().length === 0) {
+    console.error(chalk.red('Error: Log message required.'));
+    console.log('Usage: devgrowth log "Today I learned ___. Tomorrow I will ___."');
+    process.exit(1);
+  }
+
+  if (message.length < 10) {
+    console.log(chalk.yellow('⚠️  Warning: Log message is very short, but saving anyway.'));
+  }
+
+  const config = await configManager.getConfig();
+  const today = schedule.getTodaySkill(config);
+  const now = schedule.getSessionDate(new Date());
+  const isLight = options.light || false;
+  const status = isLight ? 'Light' : 'Completed';
+  const duration = config.session?.durationMinutes || 20;
+
+  await logger.writeLogEntry(now, today.skill, today.resource, duration, status, message);
+  const updatedStats = await stats.recordSession(now, today.skill, duration, status);
+  await eventLog.recordSession(now, { skill: today.skill, resource: today.resource, duration, status, message });
+  await sync.trySync();
+
+  const weekFile = schedule.getWeekFileName(now);
+  const weekStart = schedule.getWeekStart(now);
+  const logYear = weekStart.getFullYear();
+  const logMonth = String(weekStart.getMonth() + 1).padStart(2, '0');
+  console.log(chalk.green('✓ Log saved.'));
+  console.log(chalk.gray(`  File: ~/.devgrowth/logs/${logYear}/${logMonth}/${weekFile}`));
+  console.log(chalk.gray(`  Week progress: ${updatedStats.currentWeek.completed}/5 sessions`));
+  console.log(chalk.gray(`  Streak: ${updatedStats.currentStreakWeeks} weeks (longest: ${updatedStats.longestStreakWeeks})`));
+}

package/src/commands/login.js

@@ -0,0 +1,127 @@
+import * as os from 'os';
+import * as path from 'path';
+import chalk from 'chalk';
+import * as coreEvents from 'devgrowth-core/events';
+import * as auth from '../core/auth.js';
+import * as apiClient from '../core/apiClient.js';
+import * as prompt from '../core/prompt.js';
+import * as eventLog from '../core/eventLog.js';
+import * as sync from '../core/sync.js';
+import * as stats from '../core/stats.js';
+import * as milestones from '../core/milestones.js';
+import * as configManager from '../core/configManager.js';
+import * as storage from '../core/storage.js';
+
+async function hasLocalHistory() {
+  const dir = storage.getDevGrowthDir();
+  if ((await eventLog.readAllEvents()).length > 0) return true;
+  if ((await storage.listDir(path.join(dir, 'logs'))).length > 0) return true;
+  return (await stats.getStats()).totalSessions > 0;
+}
+
+/** Copy ~/.devgrowth (minus older backups and the credential) to ~/.devgrowth/backups/<timestamp>. */
+async function backupLocalData() {
+  const dir = storage.getDevGrowthDir();
+  const dest = path.join(dir, 'backups', new Date().toISOString().replace(/[:.]/g, '-'));
+  for (const entry of await storage.listDir(dir)) {
+    if (entry === 'backups' || entry === 'auth.json') continue;
+    await storage.copyPath(path.join(dir, entry), path.join(dest, entry));
+  }
+  return dest;
+}
+
+/**
+ * First login on this device:
+ * - Empty account: this device's current stats, milestones and config become
+ *   the account's starting point (a `baseline` event), then everything syncs up.
+ * - Account already has data: this device adopts it. Local data is backed up,
+ *   then replaced by the account's history (stats, milestones, config and
+ *   Markdown logs are rebuilt from the synced events).
+ *
+ * All local preparation (the baseline event, or backup + reset) happens before
+ * the first network sync, so if that sync fails nothing is lost: the next
+ * command's trySync() pushes the queued baseline or pulls the history.
+ */
+async function connectDevice(me) {
+  if (me.schemaVersion > coreEvents.SCHEMA_VERSION) {
+    console.log(chalk.yellow('⚠️  The server has data from a newer devgrowth. Update with: npm install -g devgrowth'));
+  }
+
+  if (me.eventCount === 0) {
+    let config = null;
+    try { config = await configManager.getConfig(); } catch { /* not initialized: no config to share */ }
+    await eventLog.recordEvent('baseline', {
+      stats: await stats.getStats(),
+      milestones: await milestones.getMilestones(),
+      config
+    });
+    const result = await firstSync({});
+    if (result) {
+      console.log(chalk.green(`✓ Uploaded this device's history (${result.pushed} events). Other devices will pick it up when they log in.`));
+    }
+    return;
+  }
+
+  const dir = storage.getDevGrowthDir();
+  if (await hasLocalHistory()) {
+    const backup = await backupLocalData();
+    console.log(chalk.gray(`  Backed up this device's previous data to ${backup}`));
+  }
+  await eventLog.resetLocalLog();
+  for (const name of ['stats.json', 'milestones.json', 'logs']) {
+    await storage.removePath(path.join(dir, name));
+  }
+  // The local config.json is replaced by the account's, not pushed over it.
+  const result = await firstSync({ detectConfigDrift: false });
+  if (!(await storage.fileExists(path.join(dir, 'config.json')))) {
+    await configManager.createDefaultConfig();
+  }
+  if (result) console.log(chalk.green(`✓ Synced ${result.pulled} events from your account.`));
+}
+
+async function firstSync(options) {
+  try {
+    return await sync.sync(options);
+  } catch (err) {
+    console.log(chalk.yellow(`⚠️  Logged in, but the first sync failed (${err.message}). It will retry on your next command, or run \`devgrowth sync\`.`));
+    return null;
+  }
+}
+
+async function authenticate(kind, options) {
+  const existing = await auth.getAuth();
+  if (existing) {
+    throw new Error(`Already logged in as ${existing.email}. Run \`devgrowth logout\` first.`);
+  }
+  const apiUrl = await auth.resolveApiUrl(options.api);
+  const email = options.email || await prompt.ask('Email: ');
+  if (!email) throw new Error('Email is required.');
+  const password = await prompt.askHidden('Password: ');
+  if (!password) throw new Error('Password is required.');
+
+  const endpoint = kind === 'register' ? '/v1/auth/register' : '/v1/auth/login';
+  const body = await apiClient.request(apiUrl, 'POST', endpoint, {
+    body: { email, password, deviceName: os.hostname() || 'cli', kind: 'cli' }
+  });
+  // Ask whether the account is empty *before* saving the login: if this fails,
+  // we must not end up logged in without the first-login step (a device with
+  // no baseline would later rebuild its stats without its pre-sync history).
+  let me;
+  try {
+    me = await apiClient.request(apiUrl, 'GET', '/v1/me', { token: body.token });
+  } catch (err) {
+    await apiClient.request(apiUrl, 'POST', '/v1/auth/logout', { token: body.token, timeoutMs: 3000 }).catch(() => {});
+    throw err;
+  }
+  await auth.saveAuth({ apiUrl, token: body.token, userId: body.userId, deviceId: body.deviceId, email });
+  console.log(chalk.green(`✓ ${kind === 'register' ? 'Account created. ' : ''}Logged in as ${email} on ${apiUrl}`));
+  await connectDevice(me);
+}
+
+export async function loginCommand(options = {}) {
+  await authenticate('login', options);
+}
+
+export async function registerCommand(options = {}) {
+  await authenticate('register', options);
+}

package/src/commands/logout.js

@@ -0,0 +1,26 @@
+import chalk from 'chalk';
+import * as auth from '../core/auth.js';
+import * as apiClient from '../core/apiClient.js';
+import * as eventLog from '../core/eventLog.js';
+import * as sync from '../core/sync.js';
+
+export async function logoutCommand() {
+  const session = await auth.getAuth();
+  if (!session) {
+    console.log('Not logged in.');
+    return;
+  }
+  // Push anything pending first so it isn't stranded on this device.
+  await sync.trySync();
+  const { outbox } = await eventLog.getSyncState();
+  try {
+    await apiClient.request(session.apiUrl, 'POST', '/v1/auth/logout', { token: session.token, timeoutMs: 3000 });
+  } catch {
+    // Offline or already revoked: forgetting the token locally is what matters.
+  }
+  await auth.clearAuth();
+  console.log(chalk.green(`✓ Logged out of ${session.email}. Your local data stays on this device.`));
+  if (outbox.length > 0) {
+    console.log(chalk.yellow(`⚠️  ${outbox.length} change(s) could not be synced. Log in again while online to upload them.`));
+  }
+}

package/src/commands/milestone.js

@@ -1,51 +1,54 @@
-import * as milestones from '../core/milestones.js';
-import chalk from 'chalk';
-
-export async function milestoneCommand(subcommand, args = []) {
-  switch (subcommand) {
-    case 'list': {
-      const data = await milestones.getMilestones();
-      for (const [skill, config] of Object.entries(data)) {
-        console.log(chalk.bold(`\n${skill.toUpperCase()}`));
-        console.log(chalk.gray('\u2500'.repeat(40)));
-        for (const [monthKey, monthData] of Object.entries(config)) {
-          console.log(chalk.cyan(`  ${monthKey.toUpperCase()}: ${monthData.title}`));
-          for (const [itemKey, done] of Object.entries(monthData.items)) {
-            const emoji = done ? '\u2705' : '\u2B1C';
-            console.log(`    ${emoji} ${itemKey}`);
-          }
-        }
-      }
-      console.log();
-      break;
-    }
-    case 'check': {
-      const [skill, month, item] = args;
-      if (!skill || !month || !item) {
-        console.error(chalk.red('Usage: devgrowth milestone check <skill> <month> <item>'));
-        process.exit(1);
-      }
-      await milestones.checkMilestone(skill, month, item);
-      console.log(chalk.green(`\u2705 Milestone checked: ${skill} ${month} ${item}`));
-      break;
-    }
-    case 'progress': {
-      const [skill] = args;
-      if (!skill) {
-        console.error(chalk.red('Usage: devgrowth milestone progress <skill>'));
-        process.exit(1);
-      }
-      const progress = await milestones.getProgress(skill);
-      const barLength = 20;
-      const filled = Math.round((progress.completed / progress.total) * barLength);
-      const bar = '\u2588'.repeat(filled) + '\u2591'.repeat(barLength - filled);
-      console.log(`${chalk.bold(skill.toUpperCase())} ${bar} ${progress.percentage}% (${progress.completed}/${progress.total})`);
-      break;
-    }
-    default: {
-      console.error(chalk.red(`Unknown subcommand: ${subcommand}`));
-      console.log('Usage: devgrowth milestone <list|check|progress>');
-      process.exit(1);
-    }
-  }
-}
+import * as milestones from '../core/milestones.js';
+import * as sync from '../core/sync.js';
+import chalk from 'chalk';
+
+export async function milestoneCommand(subcommand, args = []) {
+  if (['list', 'check', 'progress'].includes(subcommand)) await sync.trySync();
+  switch (subcommand) {
+    case 'list': {
+      const data = await milestones.getMilestones();
+      for (const [skill, config] of Object.entries(data)) {
+        console.log(chalk.bold(`\n${skill.toUpperCase()}`));
+        console.log(chalk.gray('\u2500'.repeat(40)));
+        for (const [monthKey, monthData] of Object.entries(config)) {
+          console.log(chalk.cyan(`  ${monthKey.toUpperCase()}: ${monthData.title}`));
+          for (const [itemKey, done] of Object.entries(monthData.items)) {
+            const emoji = done ? '\u2705' : '\u2B1C';
+            console.log(`    ${emoji} ${itemKey}`);
+          }
+        }
+      }
+      console.log();
+      break;
+    }
+    case 'check': {
+      const [skill, month, item] = args;
+      if (!skill || !month || !item) {
+        console.error(chalk.red('Usage: devgrowth milestone check <skill> <month> <item>'));
+        process.exit(1);
+      }
+      await milestones.checkMilestone(skill, month, item);
+      await sync.trySync();
+      console.log(chalk.green(`\u2705 Milestone checked: ${skill} ${month} ${item}`));
+      break;
+    }
+    case 'progress': {
+      const [skill] = args;
+      if (!skill) {
+        console.error(chalk.red('Usage: devgrowth milestone progress <skill>'));
+        process.exit(1);
+      }
+      const progress = await milestones.getProgress(skill);
+      const barLength = 20;
+      const filled = Math.round((progress.completed / progress.total) * barLength);
+      const bar = '\u2588'.repeat(filled) + '\u2591'.repeat(barLength - filled);
+      console.log(`${chalk.bold(skill.toUpperCase())} ${bar} ${progress.percentage}% (${progress.completed}/${progress.total})`);
+      break;
+    }
+    default: {
+      console.error(chalk.red(`Unknown subcommand: ${subcommand}`));
+      console.log('Usage: devgrowth milestone <list|check|progress>');
+      process.exit(1);
+    }
+  }
+}

package/src/commands/review.js

@@ -1,57 +1,62 @@
-import * as logger from '../core/logger.js';
-import * as stats from '../core/stats.js';
-import * as storage from '../core/storage.js';
-import * as schedule from '../core/schedule.js';
-import * as path from 'path';
-import chalk from 'chalk';
-
-export async function reviewCommand() {
-  const now = new Date();
-  // Key the log file by this week's Monday so month/year boundaries don't split logs
-  const weekStart = schedule.getWeekStart(now);
-  const year = weekStart.getFullYear();
-  const month = String(weekStart.getMonth() + 1).padStart(2, '0');
-  const weekFile = schedule.getCurrentWeekFileName(now);
-
-  const logs = await logger.readWeekLogs(year, month, weekFile);
-
-  console.log(chalk.bold('\nWeekly Review'));
-  console.log(chalk.gray('\u2500'.repeat(50)));
-
-  const entries = logger.parseLogEntries(logs);
-  if (entries.length === 0) {
-    console.log(chalk.yellow('No logs found for this week.'));
-  } else {
-    for (const entry of entries) {
-      console.log(`${chalk.cyan(entry.date)} \u2014 ${entry.message}`);
-    }
-  }
-
-  console.log(chalk.gray('\u2500'.repeat(50)));
-  console.log(chalk.bold('Review Questions:'));
-  console.log('1. What was your biggest win this week?');
-  console.log('2. What blocked you?');
-  console.log('3. What will you focus on next week?');
-  console.log();
-
-  const result = await stats.finalizeWeek(now);
-  if (result.justFinalized) {
-    console.log(chalk.green(`Week finalized! Streak: ${result.currentStreakWeeks} weeks | Longest: ${result.longestStreakWeeks} weeks`));
-  } else {
-    console.log(chalk.yellow(`Week already finalized. Streak unchanged: ${result.currentStreakWeeks} weeks (longest: ${result.longestStreakWeeks})`));
-  }
-  console.log();
-
-  // Append review block to the week's markdown file (only on first finalize)
-  if (result.justFinalized) {
-    const filePath = path.join(storage.getDevGrowthDir(), 'logs', String(year), month, weekFile);
-    const exists = await storage.fileExists(filePath);
-    if (exists) {
-      let content = await storage.readFile(filePath);
-      const weekNum = schedule.getWeekNumber(now);
-      const reviewBlock = `## Week ${weekNum} Review\n- **Date:** ${schedule.formatDate(now)}\n- **Sessions:** ${result.currentWeek?.completed || entries.length}\n- **Streak:** ${result.currentStreakWeeks} weeks (longest: ${result.longestStreakWeeks})\n- **Biggest Win:** _\n- **Blocker:** _\n- **Next Week Focus:** _\n\n`;
-      content += reviewBlock;
-      await storage.writeFile(filePath, content);
-    }
-  }
-}
+import * as logger from '../core/logger.js';
+import * as stats from '../core/stats.js';
+import * as storage from '../core/storage.js';
+import * as schedule from '../core/schedule.js';
+import * as eventLog from '../core/eventLog.js';
+import * as sync from '../core/sync.js';
+import * as path from 'path';
+import chalk from 'chalk';
+
+export async function reviewCommand() {
+  await sync.trySync();
+  const now = new Date();
+  // Key the log file by this week's Monday so month/year boundaries don't split logs
+  const weekStart = schedule.getWeekStart(now);
+  const year = weekStart.getFullYear();
+  const month = String(weekStart.getMonth() + 1).padStart(2, '0');
+  const weekFile = schedule.getCurrentWeekFileName(now);
+
+  const logs = await logger.readWeekLogs(year, month, weekFile);
+
+  console.log(chalk.bold('\nWeekly Review'));
+  console.log(chalk.gray('\u2500'.repeat(50)));
+
+  const entries = logger.parseLogEntries(logs);
+  if (entries.length === 0) {
+    console.log(chalk.yellow('No logs found for this week.'));
+  } else {
+    for (const entry of entries) {
+      console.log(`${chalk.cyan(entry.date)} \u2014 ${entry.message}`);
+    }
+  }
+
+  console.log(chalk.gray('\u2500'.repeat(50)));
+  console.log(chalk.bold('Review Questions:'));
+  console.log('1. What was your biggest win this week?');
+  console.log('2. What blocked you?');
+  console.log('3. What will you focus on next week?');
+  console.log();
+
+  const result = await stats.finalizeWeek(now);
+  if (result.justFinalized) {
+    await eventLog.recordReview(now);
+    console.log(chalk.green(`Week finalized! Streak: ${result.currentStreakWeeks} weeks | Longest: ${result.longestStreakWeeks} weeks`));
+  } else {
+    console.log(chalk.yellow(`Week already finalized. Streak unchanged: ${result.currentStreakWeeks} weeks (longest: ${result.longestStreakWeeks})`));
+  }
+  console.log();
+
+  // Append review block to the week's markdown file (only on first finalize)
+  if (result.justFinalized) {
+    const filePath = path.join(storage.getDevGrowthDir(), 'logs', String(year), month, weekFile);
+    const exists = await storage.fileExists(filePath);
+    if (exists) {
+      let content = await storage.readFile(filePath);
+      const weekNum = schedule.getWeekNumber(now);
+      const reviewBlock = `## Week ${weekNum} Review\n- **Date:** ${schedule.formatDate(now)}\n- **Sessions:** ${result.currentWeek?.completed || entries.length}\n- **Streak:** ${result.currentStreakWeeks} weeks (longest: ${result.longestStreakWeeks})\n- **Biggest Win:** _\n- **Blocker:** _\n- **Next Week Focus:** _\n\n`;
+      content += reviewBlock;
+      await storage.writeFile(filePath, content);
+    }
+    await sync.trySync();
+  }
+}