gent-cli 1.1.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "A Git-like version control CLI tool with cloud authentication",
   "main": "src/index.js",
   "bin": {

package/src/commands/init.js

@@ -22,12 +22,25 @@ async function init(options) {
     try {
         const cwd = process.cwd();
         const gentPath = path.join(cwd, GENT_DIR);
+        let isReinit = false;
 
         // Check if already initialized
         if (await pathExists(gentPath)) {
-            spinner.fail(chalk.red('Gent repository already exists!'));
-            console.log(chalk.yellow('\nℹ Use gent status to see the current state'));
-            return;
+            spinner.stop();
+            const { reinitialize } = await inquirer.prompt([
+                {
+                    type: 'confirm',
+                    name: 'reinitialize',
+                    message: 'Gent repository already exists. Re-initialize? (This preserves your history)',
+                    default: true
+                }
+            ]);
+
+            if (!reinitialize) {
+                console.log(chalk.yellow('\nℹ Use gent status to see the current state'));
+                return;
+            }
+            isReinit = true;
         }
 
         // Get user configuration if not using defaults
@@ -44,7 +57,7 @@ async function init(options) {
         };
 
         if (!options.yes) {
-            spinner.stop();
+            spinner.stop(); // Ensure spinner is stopped before prompt
 
             const answers = await inquirer.prompt([
                 {
@@ -82,7 +95,7 @@ async function init(options) {
             config.repository.name = answers.repoName;
             config.repository.description = answers.repoDescription;
 
-            spinner.start('Creating repository structure...');
+            spinner.start(isReinit ? 'Re-initializing repository...' : 'Creating repository structure...');
         }
 
         // Create directory structure
@@ -91,25 +104,44 @@ async function init(options) {
         await ensureDir(path.join(gentPath, 'refs', 'heads'));
         await ensureDir(path.join(gentPath, 'refs', 'tags'));
 
-        // Create initial files
+        // Create/Update configuration
         await writeJSON(path.join(gentPath, CONFIG_FILE), config);
-        await writeJSON(path.join(gentPath, STAGING_FILE), { files: [] });
-        await writeJSON(path.join(gentPath, COMMITS_FILE), { commits: [], branches: { main: null }, currentBranch: 'main' });
 
-        // Create HEAD file
-        await fs.writeFile(path.join(gentPath, 'HEAD'), 'ref: refs/heads/main\n');
+        // Create initial files only if they don't exist (preserve history on re-init)
+        const stagingPath = path.join(gentPath, STAGING_FILE);
+        if (!isReinit || !(await pathExists(stagingPath))) {
+            await writeJSON(stagingPath, { files: [] });
+        }
+
+        const commitsPath = path.join(gentPath, COMMITS_FILE);
+        if (!isReinit || !(await pathExists(commitsPath))) {
+            await writeJSON(commitsPath, { commits: [], branches: { main: null }, currentBranch: 'main' });
+        }
 
-        // Create .gentignore
-        const gentignore = `# Gent ignore patterns
+        // Create HEAD file only if it doesn't exist
+        const headPath = path.join(gentPath, 'HEAD');
+        if (!isReinit || !(await pathExists(headPath))) {
+            await fs.writeFile(headPath, 'ref: refs/heads/main\n');
+        }
+
+        // Create .gentignore only if it doesn't exist
+        const ignorePath = path.join(cwd, '.gentignore');
+        if (!isReinit || !(await pathExists(ignorePath))) {
+            const gentignore = `# Gent ignore patterns
 node_modules/
 .DS_Store
 *.log
 .env
 .gent/
 `;
-        await fs.writeFile(path.join(cwd, '.gentignore'), gentignore);
+            await fs.writeFile(ignorePath, gentignore);
+        }
 
-        spinner.succeed(chalk.green('✓ Gent repository initialized successfully!'));
+        if (isReinit) {
+            spinner.succeed(chalk.green('✓ Gent repository re-initialized successfully!'));
+        } else {
+            spinner.succeed(chalk.green('✓ Gent repository initialized successfully!'));
+        }
 
         // Display success message
         const message = chalk.white(`

package/src/utils/api-client.js

@@ -13,7 +13,7 @@ const apiClient = axios.create({
     headers: {
         'Content-Type': 'application/json'
     },
-    timeout: 30000 // 30 seconds
+    timeout: 60000 // 60 seconds
 });
 
 // Track if we're currently refreshing token to avoid multiple refresh requests