@unifiedmemory/cli 1.3.16 → 1.3.17

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/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.16",
+  "version": "1.3.17",
   "description": "UnifiedMemory CLI - AI code assistant integration",
   "main": "index.js",
   "type": "module",