incremnt 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incremnt",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Command-line tool for querying your incremnt strength training data",
   "license": "MIT",
   "type": "module",

package/src/contract.js

@@ -8,16 +8,85 @@ export const capabilities = {
   remoteBootstrap: true
 };
 
+// Single source of truth for all read commands.
+// Drives: officialCommands, readCommands, help text, and the contract JSON schema.
+// When adding a command: add one entry here — everything else updates automatically.
+export const commandSchema = [
+  {
+    command: 'sessions list',
+    id: 'session-insights',
+    description: 'List recent sessions',
+    options: [
+      { name: 'limit', type: 'number', required: false, description: 'Max sessions to return (default: 10)' }
+    ]
+  },
+  {
+    command: 'sessions show',
+    id: 'session-show',
+    description: 'Show session details',
+    usage: 'sessions show --id <session-id>',
+    options: [
+      { name: 'id', type: 'string', required: true, description: 'Session ID' }
+    ]
+  },
+  {
+    command: 'sessions compare',
+    id: 'planned-vs-actual',
+    description: 'Compare planned vs actual',
+    usage: 'sessions compare --session-id <session-id>',
+    options: [
+      { name: 'session-id', type: 'string', required: true, description: 'Session ID' }
+    ]
+  },
+  {
+    command: 'sessions explain',
+    id: 'why-did-this-change',
+    description: 'Explain session context',
+    usage: 'sessions explain --session-id <session-id>',
+    options: [
+      { name: 'session-id', type: 'string', required: true, description: 'Session ID' }
+    ]
+  },
+  {
+    command: 'programs list',
+    id: 'program-list',
+    description: 'List all programs',
+    options: []
+  },
+  {
+    command: 'programs current',
+    id: 'program-summary',
+    description: 'Show active program',
+    options: []
+  },
+  {
+    command: 'programs show',
+    id: 'program-detail',
+    description: 'Show program with all exercises',
+    usage: 'programs show --id <program-id>',
+    options: [
+      { name: 'id', type: 'string', required: false, description: 'Program ID (defaults to active program)' }
+    ]
+  },
+  {
+    command: 'exercises history',
+    id: 'exercise-history',
+    description: 'Exercise history',
+    usage: 'exercises history --name <exercise-name>',
+    options: [
+      { name: 'name', type: 'string', required: true, description: 'Exercise name' }
+    ]
+  },
+  {
+    command: 'records',
+    id: 'records',
+    description: 'Personal records',
+    options: []
+  }
+];
+
 export const officialCommands = [
-  'sessions list',
-  'sessions show --id <session-id>',
-  'sessions compare --session-id <session-id>',
-  'sessions explain --session-id <session-id>',
-  'programs list',
-  'programs current',
-  'programs show --id <program-id>',
-  'exercises history --name <exercise-name>',
-  'records',
+  ...commandSchema.map((c) => c.usage ?? c.command),
   'status',
   'contract',
   'login',
@@ -29,14 +98,4 @@ export const officialCommands = [
   'logout'
 ];
 
-export const readCommands = new Set([
-  'session-insights',
-  'session-show',
-  'exercise-history',
-  'records',
-  'program-list',
-  'program-summary',
-  'program-detail',
-  'planned-vs-actual',
-  'why-did-this-change'
-]);
+export const readCommands = new Set(commandSchema.map((c) => c.id));

package/src/format.js

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { commandSchema } from './contract.js';
 
 const shortMonths = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 const shortDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
@@ -377,18 +378,11 @@ export function formatHelp() {
     `   incremnt <command> [options]`,
     '',
     header('COMMANDS'),
-    cmd('sessions list', 'List recent sessions'),
-    cmd('sessions show --id <id>', 'Show session details'),
-    cmd('sessions compare --id <id>', 'Compare planned vs actual'),
-    cmd('sessions explain --id <id>', 'Explain session context'),
-    cmd('programs list', 'List all programs'),
-    cmd('programs current', 'Show active program'),
-    cmd('programs show --id <id>', 'Show program with all exercises'),
-    cmd('exercises history --name <name>', 'Exercise history'),
-    cmd('records', 'Personal records'),
+    ...commandSchema.map((c) => cmd(c.usage ?? c.command, c.description)),
     '',
     header('AUTH'),
-    cmd('login --base-url <url>', 'Sign in (device flow)'),
+    cmd('login', 'Sign in (opens browser)'),
+    cmd('login --base-url <url>', 'Sign in to a specific server'),
     cmd('login --base-url <url> --token <t>', 'Sign in with token'),
     cmd('login --snapshot <file>', 'Use local snapshot'),
     cmd('login --session-file <file>', 'Import session file'),

package/src/lib.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
-import { capabilities, contractVersion, officialCommands, readCommands } from './contract.js';
+import { capabilities, commandSchema, contractVersion, officialCommands, readCommands } from './contract.js';
 import {
   bootstrapSessionFromRemoteBaseUrl,
   bootstrapSessionFromRemoteBaseUrlWithDeviceFlow,
@@ -53,14 +53,7 @@ function parseArgs(argv) {
 export async function runCli(argv, stdout, stderr) {
   const { command, options } = parseArgs(argv);
   const normalizedCommand = ({
-    'sessions list': 'session-insights',
-    'sessions show': 'session-show',
-    'programs list': 'program-list',
-    'programs current': 'program-summary',
-    'programs show': 'program-detail',
-    'exercises history': 'exercise-history',
-    'sessions compare': 'planned-vs-actual',
-    'sessions explain': 'why-did-this-change',
+    ...Object.fromEntries(commandSchema.map((c) => [c.command, c.id])),
     insights: 'session-insights',
     history: 'exercise-history',
     prs: 'records',
@@ -115,7 +108,8 @@ export async function runCli(argv, stdout, stderr) {
       contractVersion,
       binary: 'incremnt',
       capabilities,
-      officialCommands
+      officialCommands,
+      schema: commandSchema
     }, null, 2)}\n`);
     return 0;
   }
@@ -136,6 +130,37 @@ export async function runCli(argv, stdout, stderr) {
   }
 
   if (normalizedCommand === 'login') {
+    if (options.snapshot) {
+      try {
+        const result = await bootstrapSessionFromSnapshot(options.snapshot);
+        stdout.write(`${JSON.stringify({
+          ok: true,
+          sessionPath: result.path,
+          account: result.session.account,
+          transport: result.session.transport
+        }, null, 2)}\n`);
+        return 0;
+      } catch (error) {
+        stderr.write(`${error.message}\n`);
+        return 1;
+      }
+    }
+
+    if (options['session-file']) {
+      try {
+        const result = await importSessionFile(options['session-file']);
+        stdout.write(`${JSON.stringify({
+          ok: true,
+          sessionPath: result.path,
+          account: result.session.account
+        }, null, 2)}\n`);
+        return 0;
+      } catch (error) {
+        stderr.write(`${error.message}\n`);
+        return 1;
+      }
+    }
+
     const loginBaseUrl = resolveLoginBaseUrl(options, sessionState);
 
     if (loginBaseUrl) {
@@ -229,49 +254,28 @@ export async function runCli(argv, stdout, stderr) {
       }
     }
 
-    if (options.snapshot) {
-      try {
-        const result = await bootstrapSessionFromSnapshot(options.snapshot);
-        stdout.write(`${JSON.stringify({
-          ok: true,
-          sessionPath: result.path,
-          account: result.session.account,
-          transport: result.session.transport
-        }, null, 2)}\n`);
-        return 0;
-      } catch (error) {
-        stderr.write(`${error.message}\n`);
-        return 1;
-      }
-    }
-
-    if (options['session-file']) {
-      try {
-        const result = await importSessionFile(options['session-file']);
-        stdout.write(`${JSON.stringify({
-          ok: true,
-          sessionPath: result.path,
-          account: result.session.account
-        }, null, 2)}\n`);
-        return 0;
-      } catch (error) {
-        stderr.write(`${error.message}\n`);
-        return 1;
-      }
-    }
-
-    stderr.write('Pass --base-url, --snapshot, or --session-file to login, or set INCREMNT_BASE_URL.\n');
+    // loginBaseUrl always resolves (falls back to DEFAULT_BASE_URL) so this is unreachable
+    // unless INCREMNT_BASE_URL is explicitly set to empty string to disable the default
+    stderr.write('Pass --snapshot or --session-file, or run incremnt login to sign in.\n');
     return 1;
   }
 
+  const wantJson = options.json || !(stdout.isTTY ?? false);
+  const explicitJson = Boolean(options.json);
+
   if (!readCommands.has(normalizedCommand)) {
-    stderr.write(`Unknown command: ${command}\n`);
+    const message = `Unknown command: ${command}`;
+    if (explicitJson) {
+      stdout.write(`${JSON.stringify({ error: message, code: 'UNKNOWN_COMMAND' }, null, 2)}\n`);
+    } else {
+      stderr.write(`${message}\n`);
+    }
+
     return 1;
   }
 
   try {
     const payload = await transport.executeReadCommand(normalizedCommand, options);
-    const wantJson = options.json || !(stdout.isTTY ?? false);
     if (wantJson) {
       stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
     } else {
@@ -281,16 +285,24 @@ export async function runCli(argv, stdout, stderr) {
 
     return 0;
   } catch (error) {
-    stderr.write(`${error.message}\n`);
+    if (explicitJson) {
+      stdout.write(`${JSON.stringify({ error: error.message, code: error.code ?? null }, null, 2)}\n`);
+    } else {
+      stderr.write(`${error.message}\n`);
+    }
+
     return 1;
   }
 }
 
+const DEFAULT_BASE_URL = 'https://incremnt-sync.onrender.com';
+
 function resolveLoginBaseUrl(options, sessionState) {
-  return options['base-url']
-    ?? process.env.INCREMNT_BASE_URL
-    ?? sessionState.session?.transport?.baseUrl
-    ?? null;
+  if (options['base-url']) return options['base-url'];
+  // If INCREMNT_BASE_URL is explicitly set (even to empty string), respect it — empty = no URL
+  if ('INCREMNT_BASE_URL' in process.env) return process.env.INCREMNT_BASE_URL || null;
+  if (sessionState.session?.transport?.baseUrl) return sessionState.session.transport.baseUrl;
+  return DEFAULT_BASE_URL;
 }
 
 async function maybeOpenBrowser(url) {