@mexty/cli 1.5.0 → 1.7.0

package/src/commands/update-git-url.ts

@@ -0,0 +1,170 @@
+import chalk from "chalk";
+import { apiClient } from "../utils/api";
+import { requireAuthentication, getAuthenticatedUser } from "../utils/auth";
+import { createInterface } from "readline";
+
+// Simple prompt function
+async function prompt(
+  question: string,
+  defaultValue?: string
+): Promise<string> {
+  return new Promise((resolve) => {
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
+
+    const promptText = defaultValue
+      ? `${question} (${defaultValue}): `
+      : `${question}: `;
+
+    rl.question(promptText, (answer) => {
+      rl.close();
+      resolve(answer.trim() || defaultValue || "");
+    });
+  });
+}
+
+// Simple yes/no prompt function
+async function promptYesNo(question: string): Promise<boolean> {
+  return new Promise((resolve) => {
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
+
+    rl.question(`${question} (y/n): `, (answer) => {
+      rl.close();
+      resolve(answer.toLowerCase().startsWith("y"));
+    });
+  });
+}
+
+export async function updateGitUrlCommand(blockId?: string, gitUrl?: string, reset?: boolean) {
+  try {
+    // Require authentication
+    await requireAuthentication();
+    const user = getAuthenticatedUser();
+    
+    console.log(chalk.blue("🔗 Update Block Git URL"));
+    console.log(chalk.gray("Update the Git repository URL for a block\n"));
+
+    // Get block ID if not provided
+    if (!blockId) {
+      blockId = await prompt("Enter block ID");
+      if (!blockId) {
+        console.error(chalk.red("❌ Block ID is required"));
+        process.exit(1);
+      }
+    }
+
+    // Validate block ID format
+    if (!/^[a-f0-9]{24}$/.test(blockId)) {
+      console.error(chalk.red("❌ Invalid block ID format"));
+      process.exit(1);
+    }
+
+    console.log(chalk.blue(`📦 Block ID: ${blockId}`));
+
+    // Get current block information
+    try {
+      const block = await apiClient.getBlock(blockId);
+      console.log(chalk.green(`✅ Found block: ${block.title}`));
+      console.log(chalk.gray(`Current Git URL: ${block.gitUrl || "Not set"}`));
+      
+      // Check if current URL is default
+      const isDefaultUrl = block.gitUrl?.startsWith("https://github.com/mext-ai/block-");
+      if (isDefaultUrl) {
+        console.log(chalk.yellow("ℹ️  Current URL is the default Mext URL"));
+      }
+    } catch (error: any) {
+      console.error(chalk.red(`❌ Failed to fetch block: ${error.message}`));
+      process.exit(1);
+    }
+
+    let newGitUrl: string | undefined;
+    let resetToDefault = false;
+
+    // Handle reset option
+    if (reset) {
+      resetToDefault = true;
+      newGitUrl = `https://github.com/mext-ai/block-${blockId}`;
+      console.log(chalk.blue(`🔄 Resetting to default URL: ${newGitUrl}`));
+    } else if (gitUrl) {
+      // Validate provided URL
+      const isValidUrl = /^https:\/\/github\.com\/[\w\-\.]+\/[\w\-\.]+(?:\.git)?$/.test(gitUrl);
+      if (!isValidUrl) {
+        console.error(chalk.red("❌ Invalid Git URL format. Please provide a valid GitHub URL."));
+        process.exit(1);
+      }
+      newGitUrl = gitUrl;
+      console.log(chalk.blue(`🔗 New Git URL: ${newGitUrl}`));
+    } else {
+      // Interactive mode
+      const currentBlock = await apiClient.getBlock(blockId);
+      const currentUrl = currentBlock.gitUrl || "";
+      
+      // Ask for new URL
+      newGitUrl = await prompt("Enter new Git URL", currentUrl);
+      
+      if (!newGitUrl) {
+        console.error(chalk.red("❌ Git URL is required"));
+        process.exit(1);
+      }
+
+      // Validate URL format
+      const isValidUrl = /^https:\/\/github\.com\/[\w\-\.]+\/[\w\-\.]+(?:\.git)?$/.test(newGitUrl);
+      if (!isValidUrl) {
+        console.error(chalk.red("❌ Invalid Git URL format. Please provide a valid GitHub URL."));
+        process.exit(1);
+      }
+
+      // Check if user wants to reset to default
+      if (!newGitUrl.startsWith("https://github.com/mext-ai/block-")) {
+        const shouldReset = await promptYesNo("This is not the default Mext URL. Do you want to reset to default instead?");
+        if (shouldReset) {
+          resetToDefault = true;
+          newGitUrl = `https://github.com/mext-ai/block-${blockId}`;
+          console.log(chalk.blue(`🔄 Resetting to default URL: ${newGitUrl}`));
+        }
+      }
+    }
+
+    // Confirm the update
+    console.log(chalk.yellow(`\n⚠️  About to update Git URL to: ${newGitUrl}`));
+    const confirmed = await promptYesNo("Do you want to proceed?");
+    
+    if (!confirmed) {
+      console.log(chalk.gray("❌ Update cancelled"));
+      process.exit(0);
+    }
+
+    // Update the Git URL
+    console.log(chalk.blue("🔄 Updating Git URL..."));
+    
+    try {
+      const result = await apiClient.updateBlockGitUrl(blockId, newGitUrl, resetToDefault);
+      
+      console.log(chalk.green("✅ Git URL updated successfully!"));
+      console.log(chalk.gray(`New URL: ${result.gitUrl}`));
+      
+      if (result.resetToDefault) {
+        console.log(chalk.yellow("🔄 URL was reset to default"));
+      }
+    } catch (error: any) {
+      console.error(chalk.red(`❌ Failed to update Git URL: ${error.message}`));
+      
+      if (error.response?.status === 403) {
+        console.error(chalk.red("Access denied. You can only update blocks you own."));
+      } else if (error.response?.status === 404) {
+        console.error(chalk.red("Block not found."));
+      }
+      
+      process.exit(1);
+    }
+
+  } catch (error: any) {
+    console.error(chalk.red(`❌ Error: ${error.message}`));
+    process.exit(1);
+  }
+}

package/src/index.ts

@@ -7,6 +7,9 @@ import { createCommand } from "./commands/create";
 import { deleteCommand } from "./commands/delete";
 import { publishCommand } from "./commands/publish";
 import { saveCommand } from "./commands/save";
+import { updateGitUrlCommand } from "./commands/update-git-url";
+import { githubLoginCommand } from "./commands/github-login";
+import { githubDisconnectCommand } from "./commands/github-disconnect";
 import { apiClient } from "./utils/api";
 
 const program = new Command();
@@ -71,6 +74,50 @@ program
   .description("Save current block (git add, commit, push, and trigger build)")
   .action(saveCommand);
 
+program
+  .command("update-git-url [blockId]")
+  .description("Update the Git repository URL for a block")
+  .option("-u, --url <url>", "New Git URL")
+  .option("-r, --reset", "Reset to default Mext URL")
+  .action((blockId, options) => {
+    updateGitUrlCommand(blockId, options.url, options.reset);
+  });
+
+program
+  .command("github-login")
+  .description("Connect your GitHub account for private repository access")
+  .action(githubLoginCommand);
+
+program
+  .command("github-disconnect")
+  .description("Disconnect your GitHub account")
+  .action(githubDisconnectCommand);
+
+program
+  .command("github-status")
+  .description("Check GitHub connection status")
+  .action(async () => {
+    try {
+      if (!apiClient.isAuthenticated()) {
+        console.log(chalk.yellow("⚠️  Please login first: mexty login"));
+        return;
+      }
+
+      const status = await apiClient.getGitHubStatus();
+      
+      if (status.connected) {
+        console.log(chalk.green("✅ GitHub connected"));
+        console.log(chalk.gray(`   Username: ${status.githubUsername}`));
+        console.log(chalk.gray(`   Status: ${status.message}`));
+      } else {
+        console.log(chalk.yellow("❌ GitHub not connected"));
+        console.log(chalk.blue("   Connect with: mexty github-login"));
+      }
+    } catch (error: any) {
+      console.error(chalk.red(`❌ Failed to check status: ${error.message}`));
+    }
+  });
+
 // Error handling
 program.on("command:*", () => {
   console.error(chalk.red(`Invalid command: ${program.args.join(" ")}`));

package/src/utils/api.ts

@@ -304,6 +304,35 @@ class ApiClient {
     }
   }
 
+  async updateBlockGitUrl(blockId: string, gitUrl?: string, resetToDefault?: boolean): Promise<any> {
+    const response = await this.client.patch(`/api/blocks/${blockId}/git-url`, {
+      gitUrl,
+      resetToDefault,
+    });
+    return response.data;
+  }
+
+  // GitHub OAuth methods
+  async getGitHubAuthUrl(): Promise<{ success: boolean; url?: string; message: string }> {
+    const response = await this.client.get("/api/auth/github/url");
+    return response.data;
+  }
+
+  async getGitHubStatus(): Promise<{ success: boolean; connected: boolean; githubUsername?: string; message: string }> {
+    const response = await this.client.get("/api/auth/github/status");
+    return response.data;
+  }
+
+  async getGitHubToken(): Promise<{ success: boolean; token?: string; username?: string; expiresAt?: Date; message?: string; expired?: boolean }> {
+    const response = await this.client.get("/api/auth/github/token");
+    return response.data;
+  }
+
+  async disconnectGitHub(): Promise<{ success: boolean; message: string }> {
+    const response = await this.client.post("/api/auth/github/disconnect");
+    return response.data;
+  }
+
   setBaseUrl(url: string): void {
     this.baseUrl = url;
     this.client.defaults.baseURL = url;

package/src/utils/git.ts

@@ -2,6 +2,7 @@ import simpleGit, { SimpleGit } from "simple-git";
 import path from "path";
 import fs from "fs";
 import chalk from "chalk";
+import { apiClient } from "./api";
 
 // Simple spinner implementation since ora v5 has import issues
 class SimpleSpinner {
@@ -14,6 +15,11 @@ class SimpleSpinner {
     this.message = message;
   }
 
+  // Add setter for message text
+  set text(newMessage: string) {
+    this.message = newMessage;
+  }
+
   start(): this {
     process.stdout.write(this.message);
     this.interval = setInterval(() => {
@@ -57,6 +63,7 @@ export class GitManager {
 
   /**
    * Clone a repository to a local directory
+   * Supports private repositories if GitHub is connected
    */
   async cloneRepository(repoUrl: string, targetDir: string): Promise<void> {
     const spinner = ora(`Cloning repository from ${repoUrl}...`).start();
@@ -68,16 +75,67 @@ export class GitManager {
         throw new Error(`Directory ${targetDir} already exists`);
       }
 
+      // Check if this is a GitHub URL that might need authentication
+      const isGitHub = repoUrl.includes('github.com');
+      let authenticatedUrl = repoUrl;
+
+      if (isGitHub) {
+        try {
+          // Try to get GitHub token for private repo access
+          const tokenData = await apiClient.getGitHubToken();
+          
+          if (tokenData.success && tokenData.token) {
+            // Inject token into URL for authenticated cloning
+            authenticatedUrl = this.injectTokenIntoUrl(repoUrl, tokenData.token);
+            spinner.text = `Cloning repository (authenticated)...`;
+          }
+        } catch (error: any) {
+          // If token retrieval fails (e.g., not connected), try without auth
+          // This is fine for public repositories
+          if (error.response?.status === 404) {
+            spinner.text = `Cloning repository (public)...`;
+          }
+        }
+      }
+
       // Clone the repository
-      await this.git.clone(repoUrl, targetDir);
+      await this.git.clone(authenticatedUrl, targetDir);
 
       spinner.succeed(chalk.green(`Repository cloned to ${targetDir}`));
     } catch (error: any) {
-      spinner.fail(chalk.red(`Failed to clone repository: ${error.message}`));
+      // Check if error is due to authentication
+      if (error.message.includes('Authentication failed') || 
+          error.message.includes('could not read Username') ||
+          error.message.includes('Repository not found')) {
+        spinner.fail(chalk.red(`Failed to clone repository: Authentication required`));
+        console.log(chalk.yellow('\n💡 This might be a private repository.'));
+        console.log(chalk.blue('   Connect your GitHub account: mexty github-login\n'));
+      } else {
+        spinner.fail(chalk.red(`Failed to clone repository: ${error.message}`));
+      }
       throw error;
     }
   }
 
+  /**
+   * Inject GitHub token into repository URL for authenticated access
+   */
+  private injectTokenIntoUrl(repoUrl: string, token: string): string {
+    // Handle HTTPS URLs
+    if (repoUrl.startsWith('https://github.com/')) {
+      return repoUrl.replace('https://github.com/', `https://${token}@github.com/`);
+    }
+    
+    // Handle SSH URLs (convert to HTTPS with token)
+    if (repoUrl.startsWith('git@github.com:')) {
+      const path = repoUrl.replace('git@github.com:', '');
+      return `https://${token}@github.com/${path}`;
+    }
+
+    // Return original URL if format not recognized
+    return repoUrl;
+  }
+
   /**
    * Check if current directory is a Git repository
    */

package/dist/commands/fork.d.ts

@@ -1,2 +0,0 @@
-export declare function forkCommand(blockId: string): Promise<void>;
-//# sourceMappingURL=fork.d.ts.map

package/dist/commands/fork.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fork.d.ts","sourceRoot":"","sources":["../../src/commands/fork.ts"],"names":[],"mappings":"AAMA,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDhE"}

package/dist/commands/fork.js

@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.forkCommand = forkCommand;
-const chalk_1 = __importDefault(require("chalk"));
-const path_1 = __importDefault(require("path"));
-const api_1 = require("../utils/api");
-const git_1 = require("../utils/git");
-const auth_1 = require("../utils/auth");
-async function forkCommand(blockId) {
-    try {
-        // Check authentication first
-        (0, auth_1.requireAuthentication)();
-        const user = (0, auth_1.getAuthenticatedUser)();
-        console.log(chalk_1.default.blue(`🍴 Forking block: ${blockId}`));
-        console.log(chalk_1.default.gray(`   User: ${user?.fullName || user?.email || 'Unknown'}`));
-        // Fork the block
-        console.log(chalk_1.default.yellow('📡 Forking block on server...'));
-        const forkedBlock = await api_1.apiClient.forkBlock({ blockId });
-        console.log(chalk_1.default.green(`✅ Block forked successfully!`));
-        console.log(chalk_1.default.gray(`   New Block ID: ${forkedBlock._id}`));
-        console.log(chalk_1.default.gray(`   Title: ${forkedBlock.title}`));
-        console.log(chalk_1.default.gray(`   Description: ${forkedBlock.description}`));
-        if (forkedBlock.gitUrl) {
-            console.log(chalk_1.default.gray(`   GitHub URL: ${forkedBlock.gitUrl}`));
-            // Clone the forked repository
-            const repoName = git_1.GitManager.extractRepoName(forkedBlock.gitUrl);
-            const targetDir = path_1.default.join(process.cwd(), repoName);
-            console.log(chalk_1.default.yellow(`📦 Cloning forked repository to ./${repoName}...`));
-            try {
-                const gitManager = new git_1.GitManager();
-                await gitManager.cloneRepository(forkedBlock.gitUrl, targetDir);
-                console.log(chalk_1.default.green(`🎉 Block forked and repository cloned successfully!`));
-                console.log(chalk_1.default.blue(`\nNext steps:`));
-                console.log(chalk_1.default.gray(`  1. cd ${repoName}`));
-                console.log(chalk_1.default.gray(`  2. Make your changes`));
-                console.log(chalk_1.default.gray(`  3. git add . && git commit -m "Your changes"`));
-                console.log(chalk_1.default.gray(`  4. mexty publish`));
-            }
-            catch (cloneError) {
-                console.error(chalk_1.default.red(`❌ Failed to clone repository: ${cloneError.message}`));
-                console.log(chalk_1.default.yellow(`You can manually clone it later:`));
-                console.log(chalk_1.default.gray(`  git clone ${forkedBlock.gitUrl}`));
-            }
-        }
-        else {
-            console.log(chalk_1.default.yellow('⚠️  No GitHub repository available for this block'));
-        }
-    }
-    catch (error) {
-        console.error(chalk_1.default.red(`❌ Failed to fork block: ${error.message}`));
-        process.exit(1);
-    }
-}
-//# sourceMappingURL=fork.js.map

package/dist/commands/fork.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fork.js","sourceRoot":"","sources":["../../src/commands/fork.ts"],"names":[],"mappings":";;;;;AAMA,kCAmDC;AAzDD,kDAA0B;AAC1B,gDAAwB;AACxB,sCAAyC;AACzC,sCAA0C;AAC1C,wCAA4E;AAErE,KAAK,UAAU,WAAW,CAAC,OAAe;IAC/C,IAAI,CAAC;QACH,6BAA6B;QAC7B,IAAA,4BAAqB,GAAE,CAAC;QAExB,MAAM,IAAI,GAAG,IAAA,2BAAoB,GAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,QAAQ,IAAI,IAAI,EAAE,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC;QAElF,iBAAiB;QACjB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,eAAS,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAE3D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,oBAAoB,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,aAAa,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,mBAAmB,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAEtE,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,kBAAkB,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAEhE,8BAA8B;YAC9B,MAAM,QAAQ,GAAG,gBAAU,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAChE,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;YAErD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,qCAAqC,QAAQ,KAAK,CAAC,CAAC,CAAC;YAE9E,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAI,gBAAU,EAAE,CAAC;gBACpC,MAAM,UAAU,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBAEhE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC,CAAC;gBAChF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAC/C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;gBAClD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC,CAAC;gBAC1E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAEhD,CAAC;YAAC,OAAO,UAAe,EAAE,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,iCAAiC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAChF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC,CAAC;gBAC9D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,eAAe,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,mDAAmD,CAAC,CAAC,CAAC;QACjF,CAAC;IAEH,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,2BAA2B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}

package/dist/commands/sync.d.ts

@@ -1,2 +0,0 @@
-export declare function syncCommand(): Promise<void>;
-//# sourceMappingURL=sync.d.ts.map

package/dist/commands/sync.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AA0BA,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAkGjD"}