@mexty/cli 1.8.2 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mexty/cli",
-  "version": "1.8.2",
+  "version": "1.9.1",
   "description": "MEXT CLI for managing blocks and repositories",
   "main": "dist/index.js",
   "bin": {

package/src/commands/create.ts

@@ -132,6 +132,72 @@ export async function createCommand(
     if (gitUrl) {
       console.log(chalk.gray(`   GitHub URL: ${gitUrl}`));
 
+      const blockId = block.id || block._id;
+      
+      // Check if user has GitHub connected and needs to accept invitation
+      try {
+        const githubStatus = await apiClient.getGitHubStatus();
+        
+        if (githubStatus.connected) {
+          // User has GitHub connected, check if they need to accept invitation
+          const invitationStatus = await apiClient.checkGitHubInvitationStatus(blockId);
+          
+          if (!invitationStatus.accepted) {
+            // User needs to accept invitation
+            console.log(chalk.blue(`\n🔐 GitHub Repository Access Required`));
+            console.log(chalk.gray(`   You've been invited as a collaborator to this private repository.`));
+            console.log(chalk.gray(`   You must accept the invitation before cloning.\n`));
+            
+            console.log(chalk.yellow(`📧 Accept your invitation:`));
+            console.log(chalk.cyan(`   ${invitationStatus.invitationUrl}\n`));
+            
+            console.log(chalk.gray(`⏳ Waiting for you to accept the invitation...`));
+            console.log(chalk.gray(`   You have 10 minutes. Checking every 5 seconds.\n`));
+            
+            // Poll for acceptance (10 minutes = 120 attempts at 5 second intervals)
+            const maxAttempts = 120;
+            const pollInterval = 5000; // 5 seconds
+            let attempts = 0;
+            let accepted = false;
+            
+            while (attempts < maxAttempts && !accepted) {
+              await new Promise(resolve => setTimeout(resolve, pollInterval));
+              attempts++;
+              
+              try {
+                const status = await apiClient.checkGitHubInvitationStatus(blockId);
+                if (status.accepted) {
+                  accepted = true;
+                  console.log(chalk.green(`\n✅ Invitation accepted! Proceeding with clone...\n`));
+                  break;
+                }
+                
+                // Show progress every 30 seconds
+                if (attempts % 6 === 0) {
+                  const elapsed = Math.floor((attempts * pollInterval) / 1000);
+                  const remaining = Math.floor(((maxAttempts - attempts) * pollInterval) / 1000);
+                  console.log(chalk.gray(`   Still waiting... (${elapsed}s elapsed, ${remaining}s remaining)`));
+                }
+              } catch (pollError) {
+                // Continue polling even if there's an error
+              }
+            }
+            
+            if (!accepted) {
+              console.error(chalk.red(`\n❌ Timeout: Invitation not accepted within 10 minutes`));
+              console.log(chalk.yellow(`\n💡 You can still accept the invitation later and clone manually:`));
+              console.log(chalk.gray(`   1. Accept invitation: ${invitationStatus.invitationUrl}`));
+              console.log(chalk.gray(`   2. Clone repository: git clone ${gitUrl}`));
+              return;
+            }
+          } else {
+            console.log(chalk.green(`✅ GitHub access confirmed`));
+          }
+        }
+      } catch (githubError: any) {
+        // Silently skip GitHub invitation check if not connected
+      }
+
       // Clone the repository
       const repoName = GitManager.extractRepoName(gitUrl);
       const targetDir = path.join(process.cwd(), repoName);
@@ -166,7 +232,9 @@ export async function createCommand(
         console.error(
           chalk.red(`❌ Failed to clone repository: ${cloneError.message}`)
         );
-        console.log(chalk.yellow(`You can manually clone it later:`));
+        console.log(chalk.yellow(`\n💡 This might be a private repository.`));
+        console.log(chalk.gray(`   Connect your GitHub account: mexty github-login`));
+        console.log(chalk.yellow(`\nYou can manually clone it later:`));
         console.log(chalk.gray(`  git clone ${gitUrl}`));
       }
     } else {

package/src/commands/github-login.ts

@@ -1,107 +1,107 @@
-import chalk from 'chalk';
-import open from 'open';
-import { apiClient } from '../utils/api';
-import { requireAuthentication } from '../utils/auth';
-
-async function wait(seconds: number): Promise<void> {
-  return new Promise(resolve => setTimeout(resolve, seconds * 1000));
-}
-
-export async function githubLoginCommand(): Promise<void> {
-  try {
-    // Check authentication first
-    requireAuthentication();
-
-    console.log(chalk.blue('🔐 GitHub Authentication'));
-    console.log(chalk.gray('   Connecting your GitHub account for private repository access\n'));
-
-    // Check if already connected
-    try {
-      const status = await apiClient.getGitHubStatus();
-      if (status.connected) {
-        console.log(chalk.green('✅ GitHub already connected!'));
-        console.log(chalk.gray(`   Username: ${status.githubUsername}`));
-        console.log(chalk.gray(`   Status: ${status.message}\n`));
-        
-        console.log(chalk.yellow('To disconnect and reconnect, run: mexty github-disconnect'));
-        return;
-      }
-    } catch (error: any) {
-      // If status check fails, continue with login
-      console.log(chalk.yellow('⚠️  Could not check GitHub status, proceeding with login...'));
-    }
-
-    // Get GitHub OAuth URL
-    console.log(chalk.yellow('📡 Requesting GitHub OAuth URL...'));
-    const authData = await apiClient.getGitHubAuthUrl();
-
-    if (!authData.success || !authData.url) {
-      console.error(chalk.red(`❌ ${authData.message}`));
-      process.exit(1);
-    }
-
-    console.log(chalk.green('✅ OAuth URL generated'));
-    console.log(chalk.blue('\n🌐 Opening browser for GitHub authentication...'));
-    console.log(chalk.gray(`   URL: ${authData.url}\n`));
-
-    // Open browser
-    try {
-      await open(authData.url);
-      console.log(chalk.yellow('👆 Please authorize MEXTY in your browser'));
-    } catch (error) {
-      console.warn(chalk.yellow('⚠️  Could not open browser automatically'));
-      console.log(chalk.blue('\nPlease open this URL in your browser:'));
-      console.log(chalk.cyan(authData.url));
-    }
-
-    console.log(chalk.gray('\n⏳ Waiting for you to authorize...'));
-    console.log(chalk.gray('   This may take a moment\n'));
-
-    // Poll for connection status
-    let connected = false;
-    let attempts = 0;
-    const maxAttempts = 60; // 2 minutes (2 second intervals)
-
-    while (!connected && attempts < maxAttempts) {
-      await wait(2);
-      attempts++;
-
-      try {
-        const status = await apiClient.getGitHubStatus();
-        if (status.connected) {
-          connected = true;
-          console.log(chalk.green('\n🎉 GitHub connected successfully!'));
-          console.log(chalk.gray(`   Username: ${status.githubUsername}`));
-          console.log(chalk.gray(`   Status: ${status.message}\n`));
-          console.log(chalk.blue('You can now clone private block repositories!'));
-          break;
-        }
-      } catch (error) {
-        // Continue polling
-      }
-
-      // Show progress indicator every 10 attempts
-      if (attempts % 10 === 0) {
-        console.log(chalk.gray(`   Still waiting... (${attempts * 2}s)`));
-      }
-    }
-
-    if (!connected) {
-      console.error(chalk.red('\n❌ Authentication timeout'));
-      console.log(chalk.yellow('   Please try again: mexty github-login'));
-      process.exit(1);
-    }
-
-  } catch (error: any) {
-    console.error(chalk.red(`❌ GitHub login failed: ${error.message}`));
-    
-    if (error.response?.status === 401) {
-      console.log(chalk.yellow('   Please login first: mexty login'));
-    } else if (error.response?.status === 500) {
-      console.log(chalk.yellow('   GitHub OAuth may not be configured on the server'));
-    }
-    
-    process.exit(1);
-  }
-}
-
+import chalk from 'chalk';
+import open from 'open';
+import { apiClient } from '../utils/api';
+import { requireAuthentication } from '../utils/auth';
+
+async function wait(seconds: number): Promise<void> {
+  return new Promise(resolve => setTimeout(resolve, seconds * 1000));
+}
+
+export async function githubLoginCommand(): Promise<void> {
+  try {
+    // Check authentication first
+    requireAuthentication();
+
+    console.log(chalk.blue('🔐 GitHub Authentication'));
+    console.log(chalk.gray('   Connecting your GitHub account for private repository access\n'));
+
+    // Check if already connected
+    try {
+      const status = await apiClient.getGitHubStatus();
+      if (status.connected) {
+        console.log(chalk.green('✅ GitHub already connected!'));
+        console.log(chalk.gray(`   Username: ${status.githubUsername}`));
+        console.log(chalk.gray(`   Status: ${status.message}\n`));
+        
+        console.log(chalk.yellow('To disconnect and reconnect, run: mexty github-disconnect'));
+        return;
+      }
+    } catch (error: any) {
+      // If status check fails, continue with login
+      console.log(chalk.yellow('⚠️  Could not check GitHub status, proceeding with login...'));
+    }
+
+    // Get GitHub OAuth URL
+    console.log(chalk.yellow('📡 Requesting GitHub OAuth URL...'));
+    const authData = await apiClient.getGitHubAuthUrl();
+
+    if (!authData.success || !authData.url) {
+      console.error(chalk.red(`❌ ${authData.message}`));
+      process.exit(1);
+    }
+
+    console.log(chalk.green('✅ OAuth URL generated'));
+    console.log(chalk.blue('\n🌐 Opening browser for GitHub authentication...'));
+    console.log(chalk.gray(`   URL: ${authData.url}\n`));
+
+    // Open browser
+    try {
+      await open(authData.url);
+      console.log(chalk.yellow('👆 Please authorize MEXTY in your browser'));
+    } catch (error) {
+      console.warn(chalk.yellow('⚠️  Could not open browser automatically'));
+      console.log(chalk.blue('\nPlease open this URL in your browser:'));
+      console.log(chalk.cyan(authData.url));
+    }
+
+    console.log(chalk.gray('\n⏳ Waiting for you to authorize...'));
+    console.log(chalk.gray('   This may take a moment\n'));
+
+    // Poll for connection status
+    let connected = false;
+    let attempts = 0;
+    const maxAttempts = 60; // 2 minutes (2 second intervals)
+
+    while (!connected && attempts < maxAttempts) {
+      await wait(2);
+      attempts++;
+
+      try {
+        const status = await apiClient.getGitHubStatus();
+        if (status.connected) {
+          connected = true;
+          console.log(chalk.green('\n🎉 GitHub connected successfully!'));
+          console.log(chalk.gray(`   Username: ${status.githubUsername}`));
+          console.log(chalk.gray(`   Status: ${status.message}\n`));
+          console.log(chalk.blue('You can now clone private block repositories!'));
+          break;
+        }
+      } catch (error) {
+        // Continue polling
+      }
+
+      // Show progress indicator every 10 attempts
+      if (attempts % 10 === 0) {
+        console.log(chalk.gray(`   Still waiting... (${attempts * 2}s)`));
+      }
+    }
+
+    if (!connected) {
+      console.error(chalk.red('\n❌ Authentication timeout'));
+      console.log(chalk.yellow('   Please try again: mexty github-login'));
+      process.exit(1);
+    }
+
+  } catch (error: any) {
+    console.error(chalk.red(`❌ GitHub login failed: ${error.message}`));
+    
+    if (error.response?.status === 401) {
+      console.log(chalk.yellow('   Please login first: mexty login'));
+    } else if (error.response?.status === 500) {
+      console.log(chalk.yellow('   GitHub OAuth may not be configured on the server'));
+    }
+    
+    process.exit(1);
+  }
+}
+

package/src/utils/api.ts

@@ -333,6 +333,11 @@ class ApiClient {
     return response.data;
   }
 
+  async checkGitHubInvitationStatus(blockId: string): Promise<{ success: boolean; accepted: boolean; invitationUrl?: string; githubUsername?: string; message?: string }> {
+    const response = await this.client.get(`/api/auth/github/invitation-status/${blockId}`);
+    return response.data;
+  }
+
   setBaseUrl(url: string): void {
     this.baseUrl = url;
     this.client.defaults.baseURL = url;