@unifiedmemory/cli 1.0.1 → 1.2.0

package/commands/org.js

@@ -1,8 +1,8 @@
-import inquirer from 'inquirer';
 import chalk from 'chalk';
 import { updateSelectedOrg, getSelectedOrg } from '../lib/token-storage.js';
 import { loadAndRefreshToken } from '../lib/token-validation.js';
-import { getUserOrganizations, getOrganizationsFromToken, formatOrganization } from '../lib/clerk-api.js';
+import { getUserOrganizations, getOrganizationsFromToken } from '../lib/clerk-api.js';
+import { promptOrganizationSelection, displayOrganizationSelection } from '../lib/org-selection-ui.js';
 
 /**
  * Switch organization context
@@ -40,49 +40,20 @@ export async function switchOrg() {
     process.exit(0);
   }
 
-  console.log(chalk.green(`\nFound ${memberships.length} organization(s)!`));
-
-  // Format organizations for display
-  const formattedOrgs = memberships.map(formatOrganization);
-
   // Get current selection
   const currentOrg = getSelectedOrg();
-  const currentOrgId = currentOrg?.id;
-
-  // Build choices for inquirer
-  const choices = [
-    {
-      name: chalk.cyan('Personal Account') + chalk.gray(' (no organization)') + (currentOrgId ? '' : chalk.green(' ← current')),
-      value: null,
-      short: 'Personal Account',
-    },
-    new inquirer.Separator(chalk.gray('--- Organizations ---')),
-    ...formattedOrgs.map(org => ({
-      name: `${chalk.green(org.name)} ${chalk.gray(`(${org.slug})`)} ${chalk.yellow(`[${org.role}]`)}${org.id === currentOrgId ? chalk.green(' ← current') : ''}`,
-      value: org,
-      short: org.name,
-    })),
-  ];
 
   // Prompt user to select
-  const answer = await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'organization',
-      message: 'Select account context:',
-      choices: choices,
-      pageSize: 15,
-      default: currentOrgId ? formattedOrgs.findIndex(org => org.id === currentOrgId) + 2 : 0, // +2 for personal + separator
-    },
-  ]);
+  const selectedOrg = await promptOrganizationSelection(memberships, currentOrg);
 
   // Update selected organization
-  updateSelectedOrg(answer.organization);
+  updateSelectedOrg(selectedOrg);
 
-  if (answer.organization) {
-    console.log(chalk.green(`\n✅ Switched to organization: ${chalk.bold(answer.organization.name)}`));
-    console.log(chalk.gray(`   Organization ID: ${answer.organization.id}`));
-    console.log(chalk.gray(`   Your role: ${answer.organization.role}`));
+  // Display result (with "Switched to" instead of "Selected")
+  if (selectedOrg) {
+    console.log(chalk.green(`\n✅ Switched to organization: ${chalk.bold(selectedOrg.name)}`));
+    console.log(chalk.gray(`   Organization ID: ${selectedOrg.id}`));
+    console.log(chalk.gray(`   Your role: ${selectedOrg.role}`));
   } else {
     console.log(chalk.green('\n✅ Switched to personal account context'));
   }

package/index.js

@@ -11,13 +11,14 @@ import { record } from './commands/record.js';
 import { config } from './lib/config.js';
 import { getSelectedOrg } from './lib/token-storage.js';
 import { loadAndRefreshToken } from './lib/token-validation.js';
+import { showWelcome } from './lib/welcome.js';
 
 const program = new Command();
 
 program
   .name('um')
   .description('UnifiedMemory CLI - AI code assistant integration')
-  .version('1.0.0');
+  .version('1.1.0');
 
 // Unified command (primary)
 program
@@ -36,11 +37,19 @@ program
     }
   });
 
+// Welcome command
+program
+  .command('welcome')
+  .description('Show welcome message')
+  .action(() => {
+    showWelcome();
+    process.exit(0);
+  });
+
 // Individual commands (power users)
 program
   .command('login')
   .description('Login to UnifiedMemory')
-  .option('--device', 'Use device flow for headless environments')
   .action(async (options) => {
     try {
       await login();
@@ -113,30 +122,6 @@ program
     }
   });
 
-// Project management command
-program
-  .command('project')
-  .description('Manage project configuration')
-  .option('--create', 'Create new project')
-  .option('--link <id>', 'Link existing project')
-  .action(async (options) => {
-    console.log(chalk.yellow('Project management not yet implemented'));
-    console.log(chalk.gray('Use `um init` to configure a project'));
-    process.exit(0);
-  });
-
-// Configure command
-program
-  .command('configure')
-  .description('Configure AI code assistants')
-  .option('--all', 'Configure all detected assistants')
-  .option('--provider <name>', 'Configure specific provider')
-  .action(async (options) => {
-    console.log(chalk.yellow('Provider configuration not yet implemented'));
-    console.log(chalk.gray('Use `um init` to auto-configure all providers'));
-    process.exit(0);
-  });
-
 // Organization management
 const orgCommand = program
   .command('org')
@@ -212,4 +197,10 @@ noteCommand
     }
   });
 
+// Show welcome splash if no command provided
+if (process.argv.length === 2) {
+  showWelcome();
+  program.help();
+}
+
 program.parse();

package/lib/config.js

@@ -1,39 +1,57 @@
-import fs from 'fs';
-import path from 'path';
 import { fileURLToPath } from 'url';
-import { dirname } from 'path';
+import { dirname, join } from 'path';
+import { config as dotenvConfig } from 'dotenv';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Load environment variables from .env file if it exists
-const envPath = path.join(__dirname, '..', '.env');
-if (fs.existsSync(envPath)) {
-  const envContent = fs.readFileSync(envPath, 'utf8');
-  envContent.split('\n').forEach(line => {
-    const [key, ...valueParts] = line.split('=');
-    if (key && valueParts.length > 0) {
-      const value = valueParts.join('=').trim();
-      if (!process.env[key]) {
-        process.env[key] = value;
-      }
-    }
-  });
-}
+// Load environment variables from .env file using dotenv
+dotenvConfig({ path: join(__dirname, '..', '.env') });
 
 export const config = {
-  // Production Clerk OAuth client (safe to embed - public key only)
-  clerkClientId: process.env.CLERK_CLIENT_ID || 'nULlnomaKB9rRGP2',
+  // Required: Clerk OAuth configuration
+  clerkClientId: process.env.CLERK_CLIENT_ID,
   clerkClientSecret: process.env.CLERK_CLIENT_SECRET, // Optional for PKCE flow
-  clerkDomain: process.env.CLERK_DOMAIN || 'clear-caiman-45.clerk.accounts.dev',
-  apiEndpoint: process.env.API_ENDPOINT || 'https://rose-asp-main-1c0b114.d2.zuplo.dev',
+  clerkDomain: process.env.CLERK_DOMAIN,
+
+  // Required: API configuration
+  apiEndpoint: process.env.API_ENDPOINT,
+
+  // Optional: OAuth flow configuration (non-sensitive defaults OK)
   redirectUri: process.env.REDIRECT_URI || 'http://localhost:3333/callback',
   port: parseInt(process.env.PORT || '3333', 10)
 };
 
-// Validation function (no longer throws - hardcoded defaults are valid)
+// Validation function - ensures required configuration is present
 export function validateConfig() {
-  // All required values now have defaults - validation always passes
-  // Keep function for backward compatibility with existing code
+  const missing = [];
+
+  if (!config.clerkClientId) {
+    missing.push('CLERK_CLIENT_ID');
+  }
+
+  if (!config.clerkDomain) {
+    missing.push('CLERK_DOMAIN');
+  }
+
+  if (!config.apiEndpoint) {
+    missing.push('API_ENDPOINT');
+  }
+
+  if (missing.length > 0) {
+    throw new Error(
+      `Missing required environment variables: ${missing.join(', ')}\n\n` +
+      `Please create a .env file in the project root with these values.\n` +
+      `See .env.example for a template.`
+    );
+  }
+
+  // Validate URL format for apiEndpoint
+  try {
+    new URL(config.apiEndpoint);
+  } catch (e) {
+    throw new Error(`API_ENDPOINT must be a valid URL (got: ${config.apiEndpoint})`);
+  }
+
   return true;
 }

package/lib/jwt-utils.js

@@ -0,0 +1,63 @@
+/**
+ * JWT Utility Functions
+ *
+ * Centralized JWT parsing, validation, and expiration checking.
+ * Extracted from duplicate implementations in login.js and token-refresh.js.
+ */
+
+/**
+ * Parse a JWT token and return its payload
+ * @param {string} token - The JWT token to parse
+ * @returns {Object|null} Decoded JWT payload or null if invalid
+ */
+export function parseJWT(token) {
+  try {
+    const parts = token.split('.');
+    if (parts.length !== 3) {
+      return null;
+    }
+    const payload = Buffer.from(parts[1], 'base64').toString('utf8');
+    return JSON.parse(payload);
+  } catch (error) {
+    return null;
+  }
+}
+
+/**
+ * Check if a JWT token is expired
+ * @param {Object} decoded - Decoded JWT payload with exp claim
+ * @param {number} bufferMs - Optional expiration buffer in milliseconds (default: 0)
+ * @returns {boolean} True if token is expired (including buffer)
+ */
+export function isJWTExpired(decoded, bufferMs = 0) {
+  if (!decoded?.exp) {
+    return true;
+  }
+  const expirationTime = decoded.exp * 1000;
+  return Date.now() >= (expirationTime - bufferMs);
+}
+
+/**
+ * Validate JWT structure has required fields
+ * @param {Object} decoded - Decoded JWT payload
+ * @returns {boolean} True if JWT has valid structure (sub and exp claims)
+ */
+export function validateJWTStructure(decoded) {
+  return decoded &&
+         typeof decoded === 'object' &&
+         decoded.sub &&
+         decoded.exp;
+}
+
+/**
+ * Get time until JWT expiration
+ * @param {Object} decoded - Decoded JWT payload with exp claim
+ * @returns {number} Milliseconds until expiration (negative if already expired)
+ */
+export function getTimeUntilExpiration(decoded) {
+  if (!decoded?.exp) {
+    return -1;
+  }
+  const expirationTime = decoded.exp * 1000;
+  return expirationTime - Date.now();
+}

package/lib/mcp-server.js

@@ -35,7 +35,7 @@ export async function startMCPServer() {
     // 5. Create MCP server
     const server = new Server(
       {
-        name: "unifiedmemory-vault",
+        name: "unifiedmemory",
         version: "1.0.0",
       },
       {

package/lib/memory-instructions.js

@@ -0,0 +1,72 @@
+// Unique marker to detect if instructions already present
+export const MEMORY_INSTRUCTIONS_MARKER = '<!-- UNIFIEDMEMORY_INSTRUCTIONS_V1 -->';
+
+export function getMemoryInstructions() {
+  return `${MEMORY_INSTRUCTIONS_MARKER}
+
+# UnifiedMemory Automatic Integration
+
+When working in this project, automatically integrate with UnifiedMemory to maintain project knowledge:
+
+## 1. Search Before Responding
+
+**When**: User submits any query or request
+**Action**: Use the \`unifiedmemory\` MCP tool to search for relevant context
+**Usage**:
+- Send the user's query to the search tool
+- Review the search results for relevant prior work, decisions, or context
+- Incorporate findings into your response
+
+Example:
+\`\`\`
+User: "Add dark mode to the dashboard"
+→ Search: unifiedmemory search --query "dark mode dashboard styling"
+→ Review results for existing patterns or decisions
+→ Respond with context-aware answer
+\`\`\`
+
+## 2. Record Plans
+
+**When**: Creating an implementation plan or design approach
+**Action**: Record the plan as a note using the \`unifiedmemory\` tool
+**Format**:
+- Include: objective, approach, key steps, important decisions
+- Keep concise but informative
+- Limit to under 1000 characters for optimal indexing
+
+Example:
+\`\`\`
+Plan created for dark mode feature
+→ unifiedmemory create_note --content "Plan: Dark mode implementation. Approach: CSS variables + localStorage persistence. Steps: 1) Define color tokens, 2) Add toggle component, 3) Persist preference. Decision: Use system preference as default."
+\`\`\`
+
+## 3. Record Task Completions
+
+**When**: After completing any task, feature, or significant milestone
+**Action**: Create a summary note using the \`unifiedmemory\` tool
+**Format**:
+- Summarize what was accomplished and why
+- Include key technical decisions or gotchas
+- **IMPORTANT**: Limit to under 1000 characters
+- Focus on outcomes, not detailed code
+
+Example:
+\`\`\`
+Completed dark mode feature
+→ unifiedmemory create_note --content "Completed: Dark mode toggle in dashboard. Implemented CSS custom properties with theme switcher component. User preference stored in localStorage. Respects system prefers-color-scheme by default. All components updated to use theme tokens."
+\`\`\`
+
+## Summary Guidelines
+
+- ✅ **DO**: Search context before responding
+- ✅ **DO**: Record plans and completions automatically
+- ✅ **DO**: Keep notes under 1000 characters
+- ✅ **DO**: Focus on decisions, outcomes, and context
+- ❌ **DON'T**: Record trivial tasks (typo fixes, minor edits)
+- ❌ **DON'T**: Include full code in notes
+- ❌ **DON'T**: Duplicate information already in git commits
+
+---
+*Auto-generated by UnifiedMemory CLI v1.0*
+`;
+}

package/lib/org-selection-ui.js

@@ -0,0 +1,104 @@
+/**
+ * Organization Selection UI
+ *
+ * Shared UI for prompting users to select an organization context.
+ * Extracted from duplicate implementations in login.js and org.js.
+ */
+
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+import { formatOrganization } from './clerk-api.js';
+
+/**
+ * Prompt user to select an organization context
+ * @param {Array} memberships - Array of organization memberships from Clerk
+ * @param {Object|null} currentOrg - Currently selected organization (optional)
+ * @param {Object} options - Display options
+ * @param {boolean} options.allowPersonal - Whether to show "Personal Account" option (default: true)
+ * @param {string} options.message - Custom prompt message (default: "Select account context:")
+ * @returns {Promise<Object|null>} Selected organization data or null for personal context
+ */
+export async function promptOrganizationSelection(memberships, currentOrg = null, options = {}) {
+  const {
+    allowPersonal = true,
+    message = 'Select account context (use arrow keys):',
+  } = options;
+
+  if (memberships.length === 0) {
+    if (!allowPersonal) {
+      throw new Error('No organizations available');
+    }
+    console.log(chalk.gray('No organizations found. Using personal account context.'));
+    return null;
+  }
+
+  console.log(chalk.green(`\nFound ${memberships.length} organization(s)!`));
+  console.log(chalk.cyan('💡 Use ↑/↓ arrow keys to navigate, Enter to select'));
+
+  // Format organizations for display
+  const formattedOrgs = memberships.map(formatOrganization);
+
+  const currentOrgId = currentOrg?.id;
+
+  // Build choices for inquirer
+  const choices = [];
+
+  if (allowPersonal) {
+    choices.push({
+      name: chalk.cyan('Personal Account') +
+            chalk.gray(' (no organization)') +
+            (currentOrgId ? '' : chalk.green(' ← current')),
+      value: null,
+      short: 'Personal Account',
+    });
+    choices.push(new inquirer.Separator(chalk.gray('--- Organizations ---')));
+  }
+
+  choices.push(...formattedOrgs.map(org => ({
+    name: `${chalk.green(org.name)} ${chalk.gray(`(${org.slug})`)} ${chalk.yellow(`[${org.role}]`)}${org.id === currentOrgId ? chalk.green(' ← current') : ''}`,
+    value: org,
+    short: org.name,
+  })));
+
+  // Calculate default selection
+  let defaultIndex = 0;
+  if (currentOrgId && allowPersonal) {
+    const orgIndex = formattedOrgs.findIndex(org => org.id === currentOrgId);
+    if (orgIndex >= 0) {
+      defaultIndex = orgIndex + 2; // +2 for personal + separator
+    }
+  } else if (currentOrgId && !allowPersonal) {
+    const orgIndex = formattedOrgs.findIndex(org => org.id === currentOrgId);
+    if (orgIndex >= 0) {
+      defaultIndex = orgIndex;
+    }
+  }
+
+  // Prompt user to select
+  const answer = await inquirer.prompt([
+    {
+      type: 'select',
+      name: 'organization',
+      message: message,
+      choices: choices,
+      pageSize: 15,
+      default: defaultIndex,
+    },
+  ]);
+
+  return answer.organization;
+}
+
+/**
+ * Display organization selection result
+ * @param {Object|null} selectedOrg - Selected organization or null for personal account
+ */
+export function displayOrganizationSelection(selectedOrg) {
+  if (selectedOrg) {
+    console.log(chalk.green(`\n✅ Selected organization: ${chalk.bold(selectedOrg.name)}`));
+    console.log(chalk.gray(`   Organization ID: ${selectedOrg.id}`));
+    console.log(chalk.gray(`   Your role: ${selectedOrg.role}`));
+  } else {
+    console.log(chalk.green('\n✅ Using personal account context'));
+  }
+}