@unifiedmemory/cli 1.3.15 → 1.3.17

package/.env.example

@@ -17,17 +17,17 @@
 # ============================================
 # Clerk OAuth Configuration
 # ============================================
-# Production defaults are included in the CLI
-# Only override these if using a custom Clerk instance
-# CLERK_CLIENT_ID=custom_clerk_client_id
-# CLERK_DOMAIN=custom-app.clerk.accounts.dev
+# Production defaults are included in the CLI.
+# For local development, uncomment and use dev Clerk values:
+# CLERK_CLIENT_ID=nULlnomaKB9rRGP2
+# CLERK_DOMAIN=clear-caiman-45.clerk.accounts.dev
 
 # ============================================
 # API Configuration
 # ============================================
-# Production default is included in the CLI
-# Only override this for local testing or custom deployments
-# API_ENDPOINT=https://custom-api-gateway.zuplo.dev
+# Production default is included in the CLI.
+# For local development, uncomment and use dev gateway:
+# API_ENDPOINT=https://rose-asp-main-1c0b114.d2.zuplo.dev
 
 # ============================================
 # OAuth Flow Configuration

package/commands/init.js

@@ -141,24 +141,6 @@ export async function init(options = {}) {
   console.log('  3. Run `um status` to verify configuration\n');
 }
 
-/**
- * Validate that we have a real organization context (not fallback to user_id)
- * @param {Object} authData - Auth data with user_id and org_id
- * @returns {Object} { isValid, isPersonalContext, message }
- */
-function validateOrganizationContext(authData) {
-  const isPersonalContext = authData.org_id === authData.user_id;
-
-  if (isPersonalContext) {
-    return {
-      isValid: false,
-      isPersonalContext: true,
-      message: 'You are in personal account context. Organization-scoped operations require an organization.',
-    };
-  }
-
-  return { isValid: true, isPersonalContext: false, message: null };
-}
 
 async function ensureAuthenticated(options) {
   // Try to load and refresh token if expired
@@ -213,19 +195,6 @@ async function ensureAuthenticated(options) {
 async function selectOrCreateProject(authData, options) {
   const apiUrl = authData.api_url || 'https://rose-asp-main-1c0b114.d2.zuplo.dev';
 
-  // Validate organization context BEFORE making API calls
-  const contextValidation = validateOrganizationContext(authData);
-
-  if (!contextValidation.isValid && contextValidation.isPersonalContext) {
-    console.log(chalk.yellow('\n⚠️  ' + contextValidation.message));
-    console.log(chalk.gray('\nOrganization-scoped projects require an organization context.'));
-    console.log(chalk.cyan('\nRecommended actions:'));
-    console.log(chalk.cyan('  1. Switch to an organization: um org switch'));
-    console.log(chalk.cyan('  2. Create an organization at: https://unifiedmemory.ai'));
-    console.log(chalk.cyan('  3. Re-run: um init'));
-    return null;
-  }
-
   // Fetch existing projects with enhanced error handling
   console.log(chalk.gray('Fetching projects...'));
   const result = await fetchProjects(authData, apiUrl);

package/lib/config.js

@@ -10,12 +10,14 @@ dotenvConfig({ path: join(__dirname, '..', '.env') });
 
 export const config = {
   // Clerk OAuth configuration (production defaults, can be overridden via env vars)
-  clerkClientId: process.env.CLERK_CLIENT_ID || 'nULlnomaKB9rRGP2',
+  // TODO: Replace clerkClientId with production Clerk OAuth client ID once created
+  clerkClientId: process.env.CLERK_CLIENT_ID || 'bNpTWw0hP3V7ueqN',
   clerkClientSecret: process.env.CLERK_CLIENT_SECRET, // Optional for PKCE flow
-  clerkDomain: process.env.CLERK_DOMAIN || 'clear-caiman-45.clerk.accounts.dev',
+  clerkDomain: process.env.CLERK_DOMAIN || 'clerk.unifiedmemory.ai',
 
   // API configuration (production default, can be overridden via env var)
-  apiEndpoint: process.env.API_ENDPOINT || 'https://rose-asp-main-1c0b114.d2.zuplo.dev',
+  // TODO: Replace with production Zuplo gateway URL once deployed
+  apiEndpoint: process.env.API_ENDPOINT || 'https://api.unifiedmemory.ai',
 
   // OAuth flow configuration (localhost defaults for callback server)
   redirectUri: process.env.REDIRECT_URI || 'http://localhost:3333/callback',

package/lib/mcp-proxy.js

@@ -2,7 +2,9 @@
  * MCP Proxy Client - Forwards MCP requests to the gateway HTTP endpoint
  */
 
-const GATEWAY_MCP_URL = 'https://rose-asp-main-1c0b114.d2.zuplo.dev/mcp';
+import { config } from './config.js';
+
+const GATEWAY_MCP_URL = `${config.apiEndpoint}/mcp`;
 
 /**
  * Transform tool schema to hide context parameters (org, proj, user)

package/lib/mcp-server.js

@@ -218,15 +218,14 @@ function buildAuthHeaders(authData, projectContext) {
     headers['X-User-Id'] = authData.decoded.sub;
   }
 
-  // Add X-Org-Id - check JWT claims first, fall back to selectedOrgId
-  const orgId = authData.decoded?.o?.o_id || authData.selectedOrgId;
+  // Add X-Org-Id - check JWT claims first, fall back to selectedOrgId, then userId (personal account)
+  const orgId = authData.decoded?.o?.o_id || authData.selectedOrgId || authData.decoded?.sub;
   const orgName = authData.decoded?.o?.o_name || authData.selectedOrgName;
 
   if (orgId) {
     headers['X-Org-Id'] = orgId;
-    console.error(`✓ Organization: ${orgName || orgId}`);
-  } else {
-    console.error(`✓ Using personal account context`);
+    const isPersonal = orgId === authData.decoded?.sub;
+    console.error(`✓ ${isPersonal ? 'Personal account' : 'Organization'}: ${orgName || orgId}`);
   }
 
   // Add project context if available
@@ -249,9 +248,9 @@ async function loadFreshAuth(projectContext) {
   const authData = await loadAndRefreshToken();
   const authHeaders = buildAuthHeaders(authData, projectContext);
 
-  // Build auth context - check JWT claims first, fall back to selectedOrgId
+  // Build auth context - check JWT claims first, fall back to selectedOrgId, then userId (personal account)
   const jwtOrgId = authData.decoded?.o?.o_id;
-  const orgId = jwtOrgId || authData.selectedOrgId;
+  const orgId = jwtOrgId || authData.selectedOrgId || authData.decoded?.sub;
   const orgName = authData.decoded?.o?.o_name || authData.selectedOrgName;
   const orgRole = authData.decoded?.o?.o_role;
 
@@ -259,7 +258,7 @@ async function loadFreshAuth(projectContext) {
     decoded: authData.decoded,
     orgContext: orgId ? {
       id: orgId,
-      name: orgName,
+      name: orgName || 'Personal',
       role: orgRole,
     } : null
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifiedmemory/cli",
-  "version": "1.3.15",
+  "version": "1.3.17",
   "description": "UnifiedMemory CLI - AI code assistant integration",
   "main": "index.js",
   "type": "module",

package/tests/unit/config.test.js

@@ -8,6 +8,11 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
+// Mock dotenv so the local .env file doesn't interfere with unit tests
+vi.mock('dotenv', () => ({
+  config: vi.fn()
+}));
+
 describe('config', () => {
   // Store original env vars
   const originalEnv = { ...process.env };
@@ -35,9 +40,9 @@ describe('config', () => {
       // Fresh import to get defaults
       const { config } = await import('../../lib/config.js');
 
-      expect(config.clerkClientId).toBe('nULlnomaKB9rRGP2');
-      expect(config.clerkDomain).toBe('clear-caiman-45.clerk.accounts.dev');
-      expect(config.apiEndpoint).toBe('https://rose-asp-main-1c0b114.d2.zuplo.dev');
+      expect(config.clerkClientId).toBe('bNpTWw0hP3V7ueqN');
+      expect(config.clerkDomain).toBe('clerk.unifiedmemory.ai');
+      expect(config.apiEndpoint).toBe('https://api.unifiedmemory.ai');
       expect(config.redirectUri).toBe('http://localhost:3333/callback');
       expect(config.port).toBe(3333);
     });
@@ -123,7 +128,7 @@ describe('config', () => {
       const { config, validateConfig } = await import('../../lib/config.js');
 
       // Empty string is falsy, so it falls back to default
-      expect(config.clerkDomain).toBe('clear-caiman-45.clerk.accounts.dev');
+      expect(config.clerkDomain).toBe('clerk.unifiedmemory.ai');
       expect(validateConfig()).toBe(true);
     });
 
@@ -142,7 +147,7 @@ describe('config', () => {
       const { config, validateConfig } = await import('../../lib/config.js');
 
       // Empty string is falsy, so it falls back to default
-      expect(config.clerkClientId).toBe('nULlnomaKB9rRGP2');
+      expect(config.clerkClientId).toBe('bNpTWw0hP3V7ueqN');
       expect(validateConfig()).toBe(true);
     });
 

package/tests/unit/mcp-proxy.test.js

@@ -8,11 +8,17 @@
  * are tested indirectly through the exported functions.
  */
 
-import { describe, it, expect, vi, beforeAll, afterAll, afterEach } from 'vitest';
+import { describe, it, expect, vi, beforeAll, beforeEach, afterAll, afterEach } from 'vitest';
 import { setupServer } from 'msw/node';
 import { http, HttpResponse } from 'msw';
 
-const GATEWAY_MCP_URL = 'https://rose-asp-main-1c0b114.d2.zuplo.dev/mcp';
+// Mock dotenv so the local .env file doesn't interfere with unit tests
+vi.mock('dotenv', () => ({
+  config: vi.fn()
+}));
+
+// Must match the fallback default in lib/config.js (used when no .env is present, e.g. CI)
+const GATEWAY_MCP_URL = 'https://api.unifiedmemory.ai/mcp';
 
 // Sample tool with pathParams and headers that should be transformed
 const sampleToolWithContext = {
@@ -59,6 +65,11 @@ const sampleToolNoContext = {
 const server = setupServer();
 
 beforeAll(() => server.listen({ onUnhandledRequest: 'bypass' }));
+beforeEach(() => {
+  vi.resetModules();
+  // Clear API_ENDPOINT so config.js uses the hardcoded default matching GATEWAY_MCP_URL above
+  delete process.env.API_ENDPOINT;
+});
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());