proagents 1.6.7 → 1.6.8

package/lib/commands/init.js

@@ -595,6 +595,77 @@ function detectProjectType(targetDir) {
   return detectedTypes;
 }
 
+/**
+ * Check if setup was interrupted (incomplete)
+ * Returns true if .proagents exists but setup wasn't completed
+ */
+function checkIncompleteSetup(targetDir) {
+  const configPath = join(targetDir, 'proagents.config.yaml');
+  const readmePath = join(targetDir, 'README.md');
+  const gitignorePath = join(targetDir, '.gitignore');
+
+  // Check 1: No config file in root = incomplete
+  if (!existsSync(configPath)) {
+    return true;
+  }
+
+  // Check 2: No AI instruction files at all = incomplete
+  const aiFiles = ['CLAUDE.md', '.cursorrules', '.windsurfrules', 'CHATGPT.md', 'GEMINI.md'];
+  const hasAnyAiFile = aiFiles.some(f => existsSync(join(targetDir, f)));
+  if (!hasAnyAiFile) {
+    return true;
+  }
+
+  // Check 3: README exists but no ProAgents section = incomplete
+  if (existsSync(readmePath)) {
+    const readmeContent = readFileSync(readmePath, 'utf-8');
+    if (!readmeContent.includes('PROAGENTS:START')) {
+      return true;
+    }
+  }
+
+  // Check 4: .gitignore exists but no proagents entry = incomplete
+  if (existsSync(gitignorePath)) {
+    const gitignoreContent = readFileSync(gitignorePath, 'utf-8');
+    if (!gitignoreContent.includes('.proagents')) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Prompt user for what to do with incomplete setup
+ */
+async function promptIncompleteSetupChoice() {
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  const question = (prompt) => new Promise(resolve => rl.question(prompt, resolve));
+
+  console.log(chalk.cyan('What would you like to do?'));
+  console.log(chalk.white('  1. Continue setup') + chalk.green(' (recommended)'));
+  console.log(chalk.gray('     Complete the remaining setup steps'));
+  console.log('');
+  console.log(chalk.white('  2. Restart fresh'));
+  console.log(chalk.gray('     Remove everything and start over'));
+  console.log('');
+  console.log(chalk.white('  3. Update only'));
+  console.log(chalk.gray('     Just update framework files, skip setup'));
+  console.log('');
+
+  const choice = await question(chalk.yellow('  Choose (1, 2, or 3, default=1): '));
+  rl.close();
+
+  const trimmed = choice.trim();
+  if (trimmed === '2') return 'restart';
+  if (trimmed === '3') return 'update';
+  return 'continue';
+}
+
 /**
  * Prompt user for .gitignore preference
  */
@@ -836,24 +907,56 @@ export async function initCommand(options = {}) {
   // Check if already initialized
   const alreadyInitialized = existsSync(proagentsDir);
 
+  // Check for incomplete setup (user killed terminal mid-setup)
+  const isIncompleteSetup = alreadyInitialized && checkIncompleteSetup(targetDir);
+
   if (alreadyInitialized && !options.force) {
-    // Smart update mode - preserve user files, update framework
-    console.log(chalk.cyan('ℹ️  ProAgents detected. Running smart update...'));
-    console.log(chalk.gray('   (Preserving your customizations)\n'));
+    if (isIncompleteSetup) {
+      // Incomplete setup detected - ask user what to do
+      console.log(chalk.yellow('⚠️  Incomplete setup detected!'));
+      console.log(chalk.gray('   Previous setup was interrupted before completion.\n'));
+
+      const choice = await promptIncompleteSetupChoice();
+
+      if (choice === 'continue') {
+        console.log(chalk.cyan('\nContinuing setup...\n'));
+        // Fall through to fresh install (but keep .proagents folder)
+      } else if (choice === 'restart') {
+        console.log(chalk.cyan('\nRestarting fresh setup...\n'));
+        rmSync(proagentsDir, { recursive: true, force: true });
+        // Fall through to fresh install
+      } else {
+        // Update only
+        console.log(chalk.cyan('\nRunning smart update...\n'));
+        try {
+          await smartUpdate(sourceDir, proagentsDir);
+          console.log(chalk.green('\n✓ ProAgents updated successfully!\n'));
+          return;
+        } catch (error) {
+          console.error(chalk.red('\n✗ Error updating ProAgents:'));
+          console.error(chalk.red(error.message));
+          process.exit(1);
+        }
+      }
+    } else {
+      // Complete setup exists - run smart update
+      console.log(chalk.cyan('ℹ️  ProAgents detected. Running smart update...'));
+      console.log(chalk.gray('   (Preserving your customizations)\n'));
 
-    try {
-      await smartUpdate(sourceDir, proagentsDir);
-      console.log(chalk.green('\n✓ ProAgents updated successfully!\n'));
-      console.log(chalk.gray('Preserved:'));
-      console.log(chalk.gray('  • active-features/ (your work in progress)'));
-      console.log(chalk.gray('  • proagents.config.yaml (your values + new options merged)'));
-      console.log(chalk.gray('  • .learning/ (learned patterns)'));
-      console.log(chalk.gray('  • cache/ (analysis cache)\n'));
-      return;
-    } catch (error) {
-      console.error(chalk.red('\n✗ Error updating ProAgents:'));
-      console.error(chalk.red(error.message));
-      process.exit(1);
+      try {
+        await smartUpdate(sourceDir, proagentsDir);
+        console.log(chalk.green('\n✓ ProAgents updated successfully!\n'));
+        console.log(chalk.gray('Preserved:'));
+        console.log(chalk.gray('  • active-features/ (your work in progress)'));
+        console.log(chalk.gray('  • proagents.config.yaml (your values + new options merged)'));
+        console.log(chalk.gray('  • .learning/ (learned patterns)'));
+        console.log(chalk.gray('  • cache/ (analysis cache)\n'));
+        return;
+      } catch (error) {
+        console.error(chalk.red('\n✗ Error updating ProAgents:'));
+        console.error(chalk.red(error.message));
+        process.exit(1);
+      }
     }
   }
 

package/lib/commands/uninstall.js

@@ -19,6 +19,50 @@ const AI_FILES = [
   'AI_INSTRUCTIONS.md',
 ];
 
+// ProAgents markers used in merged files
+const PROAGENTS_START = '<!-- PROAGENTS:START -->';
+const PROAGENTS_END = '<!-- PROAGENTS:END -->';
+
+/**
+ * Remove only ProAgents section from a file, keep user's original content
+ * Returns: 'deleted' (file removed), 'cleaned' (section removed), 'skipped' (no ProAgents section)
+ */
+function removeProagentsSectionFromFile(filePath) {
+  try {
+    const content = readFileSync(filePath, 'utf-8');
+
+    const startIndex = content.indexOf(PROAGENTS_START);
+    const endIndex = content.indexOf(PROAGENTS_END);
+
+    if (startIndex !== -1 && endIndex !== -1) {
+      // Has ProAgents section - remove it, keep the rest
+      const before = content.substring(0, startIndex).trim();
+      const after = content.substring(endIndex + PROAGENTS_END.length).trim();
+      const remaining = (before + '\n\n' + after).trim();
+
+      if (remaining.length === 0) {
+        // File only had ProAgents content - delete it
+        rmSync(filePath, { force: true });
+        return 'deleted';
+      } else {
+        // File has other content - keep it, remove only ProAgents section
+        writeFileSync(filePath, remaining + '\n');
+        return 'cleaned';
+      }
+    } else {
+      // No ProAgents markers - file was created by ProAgents (not merged)
+      // Check if it's a ProAgents-generated file by looking for ProAgents reference
+      if (content.includes('proagents') || content.includes('ProAgents') || content.includes('.proagents/')) {
+        rmSync(filePath, { force: true });
+        return 'deleted';
+      }
+      return 'skipped';
+    }
+  } catch (error) {
+    return 'skipped';
+  }
+}
+
 /**
  * Command: proagents uninstall
  */
@@ -46,7 +90,7 @@ export async function uninstallCommand(options = {}) {
 
     console.log(chalk.yellow('This will remove:'));
     console.log(chalk.gray('  • ./.proagents/ folder'));
-    console.log(chalk.gray('  • AI instruction files (CLAUDE.md, .cursorrules, etc.)'));
+    console.log(chalk.gray('  • ProAgents sections from AI files (keeps your original config)'));
     console.log(chalk.gray('  • ProAgents section from README.md\n'));
 
     const answer = await question(chalk.yellow('Are you sure? (yes/no): '));
@@ -66,26 +110,39 @@ export async function uninstallCommand(options = {}) {
     console.log(chalk.green('✓ Removed ./.proagents/ folder'));
   }
 
-  // 2. Remove AI instruction files from project root
+  // 2. Remove AI instruction files from project root (smart removal)
   let aiFilesRemoved = 0;
+  let aiFilesCleaned = 0;
+
   for (const file of AI_FILES) {
     const filePath = join(targetDir, file);
     if (existsSync(filePath)) {
-      rmSync(filePath, { force: true });
-      aiFilesRemoved++;
+      const result = removeProagentsSectionFromFile(filePath);
+      if (result === 'deleted') {
+        aiFilesRemoved++;
+      } else if (result === 'cleaned') {
+        aiFilesCleaned++;
+      }
     }
   }
 
   // Remove .github/copilot-instructions.md
   const copilotPath = join(targetDir, '.github', 'copilot-instructions.md');
   if (existsSync(copilotPath)) {
-    rmSync(copilotPath, { force: true });
-    aiFilesRemoved++;
+    const result = removeProagentsSectionFromFile(copilotPath);
+    if (result === 'deleted') {
+      aiFilesRemoved++;
+    } else if (result === 'cleaned') {
+      aiFilesCleaned++;
+    }
   }
 
   if (aiFilesRemoved > 0) {
     console.log(chalk.green(`✓ Removed ${aiFilesRemoved} AI instruction file(s)`));
   }
+  if (aiFilesCleaned > 0) {
+    console.log(chalk.green(`✓ Cleaned ProAgents section from ${aiFilesCleaned} AI file(s) (kept original config)`));
+  }
 
   // 3. Remove ProAgents section from README.md
   const readmePath = join(targetDir, 'README.md');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proagents",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "AI-agnostic development workflow framework that automates the full software development lifecycle",
   "type": "module",
   "main": "lib/index.js",