@compilr-dev/cli 0.5.0 → 0.5.1

package/dist/ui/overlay/impl/new-overlay-v2.js

@@ -12,14 +12,21 @@
  *   4. Tech stack
  *   5. Coding standards
  *   6. Initialize git?
- *   7. Track with project database?
- *   8. Workflow mode (if tracking enabled)
- *   9. Confirmation
+ *   7. Workflow mode
+ *   8. Confirmation
+ *
+ * Note: All projects are tracked in the database. File-based backlog was deprecated.
  */
 import chalk from 'chalk';
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
 import { BaseOverlayV2, renderBorder } from '../../base/index.js';
-import { TECH_STACK_LABELS, CODING_STANDARDS_LABELS, REPO_PATTERN_LABELS, generateProject, isValidProjectName, projectExists, } from '../../../templates/index.js';
+import { checkGitConfig } from '../../../utils/git-config.js';
+import { TECH_STACK_LABELS, CODING_STANDARDS_LABELS, REPO_PATTERN_LABELS, generateProject, isValidProjectName, projectExists, generateCompilrMdForImport, } from '../../../templates/index.js';
 import { getProjectsPath, ensureProjectsDirectory } from '../../../settings/paths.js';
+import { detectProjectInfo, validateImportPath, getLanguageLabel, getFrameworkLabel, } from '../../../utils/project-detection.js';
+import { projectRepository } from '../../../db/repositories/index.js';
 // =============================================================================
 // Constants
 // =============================================================================
@@ -47,17 +54,15 @@ function getMaxOptionsForStep(step) {
         case 6:
             return 2;
         case 7:
-            return 2;
-        case 8:
             return WORKFLOW_MODE_OPTIONS.length;
-        case 9:
+        case 8:
             return 2;
         default:
             return 0;
     }
 }
 function isSelectionStep(step) {
-    return [0, 3, 4, 5, 6, 7, 8, 9].includes(step);
+    return [0, 3, 4, 5, 6, 7, 8].includes(step);
 }
 function isInputStep(step) {
     return [1, 2].includes(step);
@@ -78,8 +83,19 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
             techStack: null,
             codingStandards: null,
             initGit: true,
-            trackInDatabase: true,
+            gitRemote: '',
             workflowMode: 'flexible',
+            gitConfigChecked: false,
+            gitConfigValid: false,
+            gitUserName: null,
+            gitUserEmail: null,
+            gitRemoteInputMode: false,
+            // Import project state
+            importPath: '',
+            detectedProject: null,
+            importGitChoice: null,
+            importStep: 0,
+            // UI state
             selectedIndex: 0,
             inputBuffer: '',
             error: null,
@@ -98,9 +114,37 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         }
         const lines = [];
         const border = renderBorder(context.width, s);
-        // Header
+        // Check if we're in import flow (projectType === 'existing')
+        if (this.state.projectType === 'existing') {
+            // Import flow header
+            lines.push(border);
+            lines.push(' ' + s.primaryBold('Import Existing Project') + s.muted(` [${String(this.state.importStep + 1)}/5]`));
+            lines.push('');
+            // Import step content
+            switch (this.state.importStep) {
+                case 0:
+                    lines.push(...this.renderImportStep1(s));
+                    break;
+                case 1:
+                    lines.push(...this.renderImportStep2(s));
+                    break;
+                case 2:
+                    lines.push(...this.renderImportStep3(s));
+                    break;
+                case 3:
+                    lines.push(...this.renderImportStep4(s));
+                    break;
+                case 4:
+                    lines.push(...this.renderImportStep5(s));
+                    break;
+            }
+            // Footer for import flow
+            lines.push(...this.renderImportStepFooter(s));
+            return lines;
+        }
+        // Header for new project flow
         lines.push(border);
-        lines.push(' ' + s.primaryBold('Initialize New Project') + s.muted(` [${String(this.state.step)}/9]`));
+        lines.push(' ' + s.primaryBold('Initialize New Project') + s.muted(` [${String(this.state.step)}/8]`));
         lines.push('');
         // Step content
         switch (this.state.step) {
@@ -131,9 +175,6 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
             case 8:
                 lines.push(...this.renderStep8(s));
                 break;
-            case 9:
-                lines.push(...this.renderStep9(s));
-                break;
         }
         // Footer
         lines.push(...this.renderStepFooter(s));
@@ -152,7 +193,7 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         if (this.state.step === 0) {
             lines.push(s.muted(' Up/Down Navigate | Enter Select | q/Esc Cancel'));
         }
-        else if (this.state.step === 9) {
+        else if (this.state.step === 8) {
             lines.push(s.muted(' Up/Down Navigate | Enter Confirm | Esc Back'));
         }
         else if (isSelectionStep(this.state.step)) {
@@ -179,10 +220,16 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         lines.push(chalk.bold(' What would you like to do?'));
         lines.push('');
         lines.push(this.renderSelectionOption(s, 0, '1. Start a new project'));
-        lines.push(this.renderSelectionOption(s, 1, '2. Add workflow to existing project', true));
+        lines.push(this.renderSelectionOption(s, 1, '2. Add workflow to existing project'));
         lines.push('');
-        lines.push(s.muted(' Start fresh with a structured project layout'));
-        lines.push(s.muted(' optimized for AI-assisted development.'));
+        if (this.state.selectedIndex === 0) {
+            lines.push(s.muted(' Start fresh with a structured project layout'));
+            lines.push(s.muted(' optimized for AI-assisted development.'));
+        }
+        else {
+            lines.push(s.muted(' Import an existing codebase and add'));
+            lines.push(s.muted(' compilr workflow tracking.'));
+        }
         return lines;
     }
     renderStep1(s) {
@@ -256,26 +303,50 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
     }
     renderStep6(s) {
         const lines = [];
+        // Check git config on first render of this step
+        if (!this.state.gitConfigChecked) {
+            const config = checkGitConfig();
+            this.state.gitConfigChecked = true;
+            this.state.gitConfigValid = config.hasName && config.hasEmail;
+            this.state.gitUserName = config.userName;
+            this.state.gitUserEmail = config.userEmail;
+        }
+        // Git remote URL input mode
+        if (this.state.gitRemoteInputMode) {
+            lines.push(chalk.bold(' Git remote URL (optional)'));
+            lines.push('');
+            lines.push(' Enter the URL of your git remote repository.');
+            lines.push(' Useful for tracking even if the repo already exists.');
+            lines.push(' You can skip this and set it later via /projects (e key).');
+            lines.push('');
+            lines.push(` > ${this.state.inputBuffer}█`);
+            lines.push('');
+            lines.push(s.muted(' Enter Continue · Esc Skip'));
+            return lines;
+        }
+        // Main selection
         lines.push(chalk.bold(' Initialize git repository?'));
         lines.push('');
         lines.push(this.renderSelectionOption(s, 0, 'Yes'));
         lines.push(this.renderSelectionOption(s, 1, 'No'));
         lines.push('');
-        lines.push(s.muted(' Creates git repo with initial commit'));
+        if (this.state.gitConfigValid) {
+            lines.push(s.muted(' Creates git repo with initial commit'));
+            lines.push(s.muted(` Git user: ${this.state.gitUserName ?? ''} <${this.state.gitUserEmail ?? ''}>`));
+        }
+        else {
+            lines.push(s.warning(' ⚠ Git config not set - initial commit will be skipped'));
+            if (!this.state.gitUserName) {
+                lines.push(s.muted('   Missing: git config --global user.name'));
+            }
+            if (!this.state.gitUserEmail) {
+                lines.push(s.muted('   Missing: git config --global user.email'));
+            }
+            lines.push(s.muted('   Configure via /config or run git config commands'));
+        }
         return lines;
     }
     renderStep7(s) {
-        const lines = [];
-        lines.push(chalk.bold(' Track with project database?'));
-        lines.push('');
-        lines.push(this.renderSelectionOption(s, 0, 'Yes (recommended)'));
-        lines.push(this.renderSelectionOption(s, 1, 'No'));
-        lines.push('');
-        lines.push(s.muted(' Enables persistent project tracking, backlog management,'));
-        lines.push(s.muted(' and workflow features across sessions.'));
-        return lines;
-    }
-    renderStep8(s) {
         const lines = [];
         lines.push(chalk.bold(' Workflow mode'));
         lines.push('');
@@ -289,7 +360,7 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         lines.push(s.muted(' Guided: Agent suggests next steps, tracks work item progress'));
         return lines;
     }
-    renderStep9(s) {
+    renderStep8(s) {
         const lines = [];
         lines.push(chalk.bold(' Ready to create project?'));
         lines.push('');
@@ -299,10 +370,10 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         lines.push(` Tech:        ${s.primary(this.state.techStack ? TECH_STACK_LABELS[this.state.techStack] : 'Not set')}`);
         lines.push(` Standards:   ${s.primary(this.state.codingStandards ? CODING_STANDARDS_LABELS[this.state.codingStandards] : 'Not set')}`);
         lines.push(` Git:         ${s.primary(this.state.initGit ? 'Yes' : 'No')}`);
-        lines.push(` DB Tracking: ${s.primary(this.state.trackInDatabase ? 'Yes' : 'No')}`);
-        if (this.state.trackInDatabase) {
-            lines.push(` Workflow:    ${s.primary(WORKFLOW_MODE_LABELS[this.state.workflowMode])}`);
+        if (this.state.gitRemote) {
+            lines.push(` Remote:      ${s.primary(this.state.gitRemote)}`);
         }
+        lines.push(` Workflow:    ${s.primary(WORKFLOW_MODE_LABELS[this.state.workflowMode])}`);
         if (this.state.repoPattern === 'two-repo') {
             lines.push('');
             lines.push(s.muted(` Docs repo:   ./${this.state.projectName}-docs/`));
@@ -317,6 +388,178 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         return lines;
     }
     // ===========================================================================
+    // Import Step Renderers
+    // ===========================================================================
+    renderImportStep1(s) {
+        const lines = [];
+        lines.push(chalk.bold(' Enter path to existing project'));
+        lines.push('');
+        lines.push(` > ${this.state.inputBuffer}|`);
+        lines.push('');
+        if (this.state.error) {
+            lines.push(s.error(` ${this.state.error}`));
+        }
+        else {
+            lines.push(s.muted(' Enter absolute or relative path to project directory'));
+            lines.push(s.muted(' Tab for autocomplete'));
+        }
+        return lines;
+    }
+    renderImportStep2(s) {
+        const lines = [];
+        const detected = this.state.detectedProject;
+        if (!detected) {
+            lines.push(s.error(' No project detected'));
+            return lines;
+        }
+        lines.push(chalk.bold(' Project Detection Results'));
+        lines.push('');
+        // Name
+        const nameIcon = detected.nameSource !== 'folder' ? s.success('✓') : s.warning('⚠');
+        const nameNote = detected.nameSource !== 'folder' ? `(from ${detected.nameSource})` : '(from folder name)';
+        lines.push(` ${nameIcon} Name: ${s.primary(detected.displayName)} ${s.muted(nameNote)}`);
+        // Language
+        const langIcon = detected.language ? s.success('✓') : s.warning('⚠');
+        const langLabel = getLanguageLabel(detected.language);
+        lines.push(` ${langIcon} Language: ${s.primary(langLabel)}`);
+        // Framework
+        if (detected.framework) {
+            lines.push(` ${s.success('✓')} Framework: ${s.primary(getFrameworkLabel(detected.framework))}`);
+        }
+        else if (detected.language) {
+            lines.push(` ${s.muted('-')} Framework: ${s.muted('Not detected')}`);
+        }
+        // Git
+        if (detected.hasGit && detected.gitRemote) {
+            lines.push(` ${s.success('✓')} Git: ${s.primary(detected.gitRemote)}`);
+        }
+        else if (detected.hasGit) {
+            lines.push(` ${s.warning('⚠')} Git: ${s.muted('No remote configured')}`);
+        }
+        else {
+            lines.push(` ${s.warning('⚠')} Git: ${s.muted('Not initialized')}`);
+        }
+        // COMPILR.md
+        if (detected.hasCompilrMd) {
+            lines.push(` ${s.success('✓')} COMPILR.md: ${s.primary('Found')}`);
+        }
+        else if (detected.hasClaudeMd) {
+            lines.push(` ${s.success('✓')} CLAUDE.md: ${s.primary('Found (will use as COMPILR.md)')}`);
+        }
+        else {
+            lines.push(` ${s.muted('○')} COMPILR.md: ${s.muted('Will be created')}`);
+        }
+        lines.push('');
+        lines.push(s.muted(' Press Enter to continue, or Esc to go back'));
+        return lines;
+    }
+    renderImportStep3(s) {
+        const lines = [];
+        const detected = this.state.detectedProject;
+        lines.push(chalk.bold(' Git Repository Setup'));
+        lines.push('');
+        // Custom input mode for remote URL
+        if (this.state.importGitChoice === 'custom' || this.state.importGitChoice === 'init') {
+            lines.push(' Enter git remote URL:');
+            lines.push('');
+            lines.push(` > ${this.state.inputBuffer}|`);
+            lines.push('');
+            lines.push(s.muted(' Enter to confirm, Esc to cancel'));
+            return lines;
+        }
+        if (detected?.hasGit && detected.gitRemote) {
+            // Has git with remote
+            lines.push(` Detected remote: ${s.primary(detected.gitRemote)}`);
+            lines.push('');
+            lines.push(this.renderSelectionOption(s, 0, 'Use detected remote'));
+            lines.push(this.renderSelectionOption(s, 1, 'Enter different remote URL'));
+            lines.push(this.renderSelectionOption(s, 2, 'Skip git remote (local only)'));
+        }
+        else if (detected?.hasGit) {
+            // Has git but no remote
+            lines.push(' Git repository found but no remote configured.');
+            lines.push('');
+            lines.push(this.renderSelectionOption(s, 0, 'Enter remote URL'));
+            lines.push(this.renderSelectionOption(s, 1, 'Skip git remote (local only)'));
+        }
+        else {
+            // No git
+            lines.push(' No git repository found.');
+            lines.push('');
+            lines.push(this.renderSelectionOption(s, 0, 'Initialize git and enter remote URL'));
+            lines.push(this.renderSelectionOption(s, 1, 'Initialize git (local only)'));
+            lines.push(this.renderSelectionOption(s, 2, 'Skip git initialization'));
+        }
+        return lines;
+    }
+    renderImportStep4(s) {
+        const lines = [];
+        lines.push(chalk.bold(' Workflow mode'));
+        lines.push('');
+        for (let i = 0; i < WORKFLOW_MODE_OPTIONS.length; i++) {
+            const mode = WORKFLOW_MODE_OPTIONS[i];
+            const suffix = i === 0 ? ' (recommended)' : '';
+            lines.push(this.renderSelectionOption(s, i, `${String(i + 1)}. ${WORKFLOW_MODE_LABELS[mode]}${suffix}`));
+        }
+        lines.push('');
+        lines.push(s.muted(' Flexible: Work at your own pace, agent responds to requests'));
+        lines.push(s.muted(' Guided: Agent suggests next steps, tracks work item progress'));
+        return lines;
+    }
+    renderImportStep5(s) {
+        const lines = [];
+        const detected = this.state.detectedProject;
+        lines.push(chalk.bold(' Ready to import project?'));
+        lines.push('');
+        lines.push(` Path:        ${s.primary(this.state.importPath)}`);
+        lines.push(` Name:        ${s.primary(detected?.displayName ?? 'Unknown')}`);
+        lines.push(` Language:    ${s.primary(getLanguageLabel(detected?.language ?? null))}`);
+        if (detected?.framework) {
+            lines.push(` Framework:   ${s.primary(getFrameworkLabel(detected.framework))}`);
+        }
+        lines.push(` Git Remote:  ${s.primary(this.state.gitRemote || 'None')}`);
+        lines.push(` Workflow:    ${s.primary(WORKFLOW_MODE_LABELS[this.state.workflowMode])}`);
+        lines.push('');
+        lines.push(chalk.bold(' Will create:'));
+        if (!detected?.hasCompilrMd && !detected?.hasClaudeMd) {
+            lines.push(` ${s.success('✓')} COMPILR.md (project context file)`);
+        }
+        lines.push(` ${s.success('✓')} .compilr/config.json (local config)`);
+        lines.push(` ${s.success('✓')} Database entry (project tracking)`);
+        // Note if project is outside the standard projects folder
+        const projectsFolder = getProjectsPath();
+        if (!this.state.importPath.startsWith(projectsFolder)) {
+            lines.push('');
+            lines.push(s.muted(' Note: This project is outside your projects folder.'));
+            lines.push(s.muted(`       It will be tracked at its current location.`));
+        }
+        lines.push('');
+        if (this.state.error) {
+            lines.push(s.error(` ${this.state.error}`));
+            lines.push('');
+        }
+        lines.push(this.renderSelectionOption(s, 0, 'Import'));
+        lines.push(this.renderSelectionOption(s, 1, 'Cancel'));
+        return lines;
+    }
+    renderImportStepFooter(s) {
+        const lines = [];
+        lines.push('');
+        if (this.state.importStep === 0) {
+            lines.push(s.muted(' Enter Confirm | Tab Autocomplete | Esc Cancel'));
+        }
+        else if (this.state.importStep === 4) {
+            lines.push(s.muted(' Up/Down Navigate | Enter Confirm | Esc Back'));
+        }
+        else if (this.state.importStep === 1) {
+            lines.push(s.muted(' Enter Continue | Esc Back'));
+        }
+        else {
+            lines.push(s.muted(' Up/Down Navigate | Enter Select | Esc Back'));
+        }
+        return lines;
+    }
+    // ===========================================================================
     // Key Handling
     // ===========================================================================
     handleKey(key) {
@@ -324,18 +567,35 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         if (this.isInterruptKey(key)) {
             return this.close({ created: false });
         }
+        // Import flow handling
+        if (this.state.projectType === 'existing') {
+            return this.handleImportKey(key);
+        }
         // 'q' key on step 0 cancels
         if (this.state.step === 0 && key.name === 'q') {
             return this.close({ created: false });
         }
         // Escape on step 0 cancels, otherwise goes back
         if (key.name === 'escape') {
+            // In git remote input mode, Esc skips to next step
+            if (this.state.gitRemoteInputMode) {
+                this.state.gitRemoteInputMode = false;
+                this.state.gitRemote = '';
+                this.state.inputBuffer = '';
+                this.state.step = 7;
+                this.state.selectedIndex = 0;
+                return this.rerender();
+            }
             if (this.state.step === 0) {
                 return this.close({ created: false });
             }
             this.prevStep();
             return this.rerender();
         }
+        // Handle git remote URL input mode (sub-step of step 6)
+        if (this.state.gitRemoteInputMode) {
+            return this.handleGitRemoteInput(key);
+        }
         // Handle selection steps
         if (isSelectionStep(this.state.step)) {
             return this.handleSelectionKey(key);
@@ -371,13 +631,28 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         return this.noAction();
     }
     async handleSelectionEnter() {
-        // Step 0 - only allow "new" option
-        if (this.state.step === 0 && this.state.selectedIndex === 1) {
-            this.state.error = 'This option is coming soon';
+        // Step 0 - choose between new and existing project
+        if (this.state.step === 0) {
+            if (this.state.selectedIndex === 0) {
+                // New project
+                this.state.projectType = 'new';
+                this.state.step = 1;
+                this.state.inputBuffer = '';
+                this.state.selectedIndex = 0;
+                this.state.error = null;
+            }
+            else {
+                // Import existing project
+                this.state.projectType = 'existing';
+                this.state.importStep = 0;
+                this.state.inputBuffer = '';
+                this.state.selectedIndex = 0;
+                this.state.error = null;
+            }
             return this.rerender();
         }
-        // Step 9 - confirmation
-        if (this.state.step === 9) {
+        // Step 8 - confirmation
+        if (this.state.step === 8) {
             if (this.state.selectedIndex === 1) {
                 // Cancel
                 return this.close({ created: false });
@@ -409,10 +684,11 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                         projectPath: result.projectPath,
                         docsPath: result.docsPath,
                         filesCreated: result.filesCreated,
-                        trackInDatabase: this.state.trackInDatabase,
+                        trackInDatabase: true, // Always track in database
                         workflowMode: this.state.workflowMode,
                         projectName: this.state.projectName,
                         description: this.state.description,
+                        gitRemote: this.state.gitRemote || undefined,
                     });
                 }
                 else {
@@ -450,19 +726,404 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         }
         return this.noAction();
     }
+    handleGitRemoteInput(key) {
+        // Enter - confirm and move to next step
+        if (this.isEnterKey(key)) {
+            this.state.gitRemote = this.state.inputBuffer.trim();
+            this.state.gitRemoteInputMode = false;
+            this.state.inputBuffer = '';
+            this.state.step = 7;
+            this.state.selectedIndex = 0;
+            return this.rerender();
+        }
+        // Backspace - delete last character
+        if (key.name === 'backspace') {
+            this.state.inputBuffer = this.state.inputBuffer.slice(0, -1);
+            return this.rerender();
+        }
+        // Regular character input
+        if (key.char && key.char.length === 1 && key.char >= ' ' && key.char <= '~') {
+            this.state.inputBuffer += key.char;
+            return this.rerender();
+        }
+        return this.noAction();
+    }
+    // ===========================================================================
+    // Import Flow Key Handling
+    // ===========================================================================
+    handleImportKey(key) {
+        // Escape handling for import flow
+        if (key.name === 'escape') {
+            // In git remote custom input mode, cancel and go back to selection
+            if (this.state.importGitChoice === 'custom' || this.state.importGitChoice === 'init') {
+                this.state.importGitChoice = null;
+                this.state.inputBuffer = '';
+                return this.rerender();
+            }
+            // Step 0: go back to project type selection
+            if (this.state.importStep === 0) {
+                this.state.projectType = null;
+                this.state.step = 0;
+                this.state.selectedIndex = 1; // Keep "existing" selected
+                this.state.error = null;
+                return this.rerender();
+            }
+            // Other steps: go back
+            this.prevImportStep();
+            return this.rerender();
+        }
+        // Handle based on current step
+        switch (this.state.importStep) {
+            case 0: // Path input
+                return this.handleImportPathInput(key);
+            case 1: // Detection results (just Enter to continue)
+                if (this.isEnterKey(key)) {
+                    this.nextImportStep();
+                    return this.rerender();
+                }
+                return this.noAction();
+            case 2: // Git configuration
+                return this.handleImportGitStep(key);
+            case 3: // Workflow mode
+                return this.handleImportWorkflowStep(key);
+            case 4: // Confirmation
+                return this.handleImportConfirmation(key);
+            default:
+                return this.noAction();
+        }
+    }
+    handleImportPathInput(key) {
+        // Enter - validate and continue
+        if (this.isEnterKey(key)) {
+            const inputPath = this.state.inputBuffer.trim();
+            if (!inputPath) {
+                this.state.error = 'Path is required';
+                return this.rerender();
+            }
+            // Resolve to absolute path
+            const absolutePath = path.isAbsolute(inputPath)
+                ? inputPath
+                : path.resolve(process.cwd(), inputPath);
+            // Validate path
+            const validation = validateImportPath(absolutePath);
+            if (!validation.valid) {
+                this.state.error = validation.error ?? 'Invalid path';
+                return this.rerender();
+            }
+            // Check if already tracked in database
+            const existingProject = projectRepository.getByPath(absolutePath);
+            if (existingProject) {
+                this.state.error = `Already tracked as "${existingProject.displayName}"`;
+                return this.rerender();
+            }
+            // Detect project info
+            this.state.importPath = absolutePath;
+            this.state.detectedProject = detectProjectInfo(absolutePath);
+            this.state.error = null;
+            this.nextImportStep();
+            return this.rerender();
+        }
+        // Tab - autocomplete
+        if (key.name === 'tab') {
+            const completedPath = this.autocompleteImportPath(this.state.inputBuffer);
+            if (completedPath) {
+                this.state.inputBuffer = completedPath;
+                this.state.error = null;
+            }
+            return this.rerender();
+        }
+        // Backspace
+        if (key.name === 'backspace') {
+            this.state.inputBuffer = this.state.inputBuffer.slice(0, -1);
+            this.state.error = null;
+            return this.rerender();
+        }
+        // Regular character input
+        if (key.char && key.char.length === 1 && key.char >= ' ' && key.char <= '~') {
+            this.state.inputBuffer += key.char;
+            this.state.error = null;
+            return this.rerender();
+        }
+        return this.noAction();
+    }
+    handleImportGitStep(key) {
+        const detected = this.state.detectedProject;
+        // In custom URL input mode
+        if (this.state.importGitChoice === 'custom' || this.state.importGitChoice === 'init') {
+            if (this.isEnterKey(key)) {
+                this.state.gitRemote = this.state.inputBuffer.trim();
+                this.state.inputBuffer = '';
+                this.state.importGitChoice = null;
+                this.nextImportStep();
+                return this.rerender();
+            }
+            if (key.name === 'backspace') {
+                this.state.inputBuffer = this.state.inputBuffer.slice(0, -1);
+                return this.rerender();
+            }
+            if (key.char && key.char.length === 1 && key.char >= ' ' && key.char <= '~') {
+                this.state.inputBuffer += key.char;
+                return this.rerender();
+            }
+            return this.noAction();
+        }
+        // Navigation
+        const maxOptions = this.getImportGitMaxOptions();
+        if ((key.name === 'j' || this.isDownKey(key)) && this.state.selectedIndex < maxOptions - 1) {
+            this.state.selectedIndex++;
+            return this.rerender();
+        }
+        if ((key.name === 'k' || this.isUpKey(key)) && this.state.selectedIndex > 0) {
+            this.state.selectedIndex--;
+            return this.rerender();
+        }
+        // Enter to select
+        if (this.isEnterKey(key)) {
+            if (detected?.hasGit && detected.gitRemote) {
+                // Has git with remote
+                switch (this.state.selectedIndex) {
+                    case 0: // Use detected
+                        this.state.gitRemote = detected.gitRemote;
+                        this.nextImportStep();
+                        break;
+                    case 1: // Custom
+                        this.state.importGitChoice = 'custom';
+                        this.state.inputBuffer = '';
+                        break;
+                    case 2: // Skip
+                        this.state.gitRemote = '';
+                        this.nextImportStep();
+                        break;
+                }
+            }
+            else if (detected?.hasGit) {
+                // Has git but no remote
+                switch (this.state.selectedIndex) {
+                    case 0: // Enter URL
+                        this.state.importGitChoice = 'custom';
+                        this.state.inputBuffer = '';
+                        break;
+                    case 1: // Skip
+                        this.state.gitRemote = '';
+                        this.nextImportStep();
+                        break;
+                }
+            }
+            else {
+                // No git
+                switch (this.state.selectedIndex) {
+                    case 0: // Init + URL
+                        this.state.importGitChoice = 'init';
+                        this.state.inputBuffer = '';
+                        this.state.initGit = true;
+                        break;
+                    case 1: // Init only
+                        this.state.initGit = true;
+                        this.state.gitRemote = '';
+                        this.nextImportStep();
+                        break;
+                    case 2: // Skip
+                        this.state.initGit = false;
+                        this.state.gitRemote = '';
+                        this.nextImportStep();
+                        break;
+                }
+            }
+            return this.rerender();
+        }
+        return this.noAction();
+    }
+    handleImportWorkflowStep(key) {
+        const maxOptions = WORKFLOW_MODE_OPTIONS.length;
+        // Navigation
+        if ((key.name === 'j' || this.isDownKey(key)) && this.state.selectedIndex < maxOptions - 1) {
+            this.state.selectedIndex++;
+            return this.rerender();
+        }
+        if ((key.name === 'k' || this.isUpKey(key)) && this.state.selectedIndex > 0) {
+            this.state.selectedIndex--;
+            return this.rerender();
+        }
+        // Enter to select
+        if (this.isEnterKey(key)) {
+            this.state.workflowMode = WORKFLOW_MODE_OPTIONS[this.state.selectedIndex];
+            this.nextImportStep();
+            return this.rerender();
+        }
+        return this.noAction();
+    }
+    handleImportConfirmation(key) {
+        // Navigation
+        if ((key.name === 'j' || this.isDownKey(key)) && this.state.selectedIndex < 1) {
+            this.state.selectedIndex++;
+            return this.rerender();
+        }
+        if ((key.name === 'k' || this.isUpKey(key)) && this.state.selectedIndex > 0) {
+            this.state.selectedIndex--;
+            return this.rerender();
+        }
+        // Enter to confirm
+        if (this.isEnterKey(key)) {
+            if (this.state.selectedIndex === 1) {
+                // Cancel
+                return this.close({ created: false });
+            }
+            // Import project
+            return this.executeImport();
+        }
+        return this.noAction();
+    }
+    executeImport() {
+        const detected = this.state.detectedProject;
+        if (!detected) {
+            this.state.error = 'No project detected';
+            return this.rerender();
+        }
+        this.state.isGenerating = true;
+        try {
+            // Create .compilr directory
+            const compilrDir = path.join(this.state.importPath, '.compilr');
+            if (!fs.existsSync(compilrDir)) {
+                fs.mkdirSync(compilrDir, { recursive: true });
+            }
+            // Create .compilr/config.json
+            const configContent = JSON.stringify({
+                version: 1,
+                projectPath: this.state.importPath,
+                workflow_mode: this.state.workflowMode,
+                created_at: new Date().toISOString(),
+            }, null, 2);
+            fs.writeFileSync(path.join(compilrDir, 'config.json'), configContent, 'utf-8');
+            // Create COMPILR.md if it doesn't exist
+            if (!detected.hasCompilrMd && !detected.hasClaudeMd) {
+                const compilrMdContent = generateCompilrMdForImport({
+                    name: detected.name,
+                    displayName: detected.displayName,
+                    path: this.state.importPath,
+                    detected,
+                    workflowMode: this.state.workflowMode,
+                });
+                fs.writeFileSync(path.join(this.state.importPath, 'COMPILR.md'), compilrMdContent, 'utf-8');
+            }
+            // Initialize git if requested and not already initialized
+            if (this.state.initGit && !detected.hasGit) {
+                try {
+                    execSync('git init', { cwd: this.state.importPath, stdio: 'ignore' });
+                }
+                catch {
+                    // Git init failed - not critical
+                }
+            }
+            // Return success - database registration is handled by the command handler
+            return this.close({
+                created: true,
+                imported: true,
+                projectPath: this.state.importPath,
+                trackInDatabase: true,
+                workflowMode: this.state.workflowMode,
+                projectName: detected.name,
+                description: undefined, // No description for imports
+                gitRemote: this.state.gitRemote || undefined,
+                detectedProject: detected,
+            });
+        }
+        catch (error) {
+            this.state.isGenerating = false;
+            this.state.error = error.message;
+            return this.rerender();
+        }
+    }
+    getImportGitMaxOptions() {
+        const detected = this.state.detectedProject;
+        if (detected?.hasGit && detected.gitRemote)
+            return 3;
+        if (detected?.hasGit)
+            return 2;
+        return 3;
+    }
+    nextImportStep() {
+        this.state.importStep = Math.min(4, this.state.importStep + 1);
+        this.state.selectedIndex = 0;
+        this.state.error = null;
+    }
+    prevImportStep() {
+        this.state.importStep = Math.max(0, this.state.importStep - 1);
+        this.state.selectedIndex = 0;
+        this.state.error = null;
+    }
+    autocompleteImportPath(input) {
+        if (!input)
+            return null;
+        try {
+            // Resolve the input to determine directory and prefix
+            const resolvedInput = input.startsWith('/')
+                ? input
+                : path.resolve(process.cwd(), input);
+            let dir;
+            let prefix;
+            if (fs.existsSync(resolvedInput) && fs.statSync(resolvedInput).isDirectory()) {
+                // Input is a complete directory, list its contents
+                dir = resolvedInput;
+                prefix = '';
+            }
+            else {
+                // Input is partial, get parent directory and prefix
+                dir = path.dirname(resolvedInput);
+                prefix = path.basename(resolvedInput).toLowerCase();
+            }
+            if (!fs.existsSync(dir))
+                return null;
+            // Get directory contents
+            const entries = fs.readdirSync(dir, { withFileTypes: true })
+                .filter((e) => e.isDirectory())
+                .filter((e) => !e.name.startsWith('.')) // Hide hidden directories
+                .map((e) => e.name);
+            // Find matches
+            const matches = entries.filter((name) => name.toLowerCase().startsWith(prefix));
+            if (matches.length === 0)
+                return null;
+            if (matches.length === 1) {
+                // Single match - complete it with trailing slash
+                const completed = path.join(dir, matches[0]);
+                // Keep relative if input was relative
+                if (!input.startsWith('/')) {
+                    const relative = path.relative(process.cwd(), completed);
+                    return relative + '/';
+                }
+                return completed + '/';
+            }
+            // Multiple matches - find common prefix
+            const sortedMatches = matches.sort();
+            const first = sortedMatches[0];
+            const last = sortedMatches[sortedMatches.length - 1];
+            let common = '';
+            for (let i = 0; i < first.length; i++) {
+                if (first[i] === last[i]) {
+                    common += first[i];
+                }
+                else {
+                    break;
+                }
+            }
+            if (common.length > prefix.length) {
+                const completed = path.join(dir, common);
+                if (!input.startsWith('/')) {
+                    return path.relative(process.cwd(), completed);
+                }
+                return completed;
+            }
+            return null;
+        }
+        catch {
+            return null;
+        }
+    }
     // ===========================================================================
     // Step Navigation
     // ===========================================================================
     nextStep() {
         switch (this.state.step) {
-            case 0:
-                if (this.state.selectedIndex === 0) {
-                    this.state.projectType = 'new';
-                    this.state.step = 1;
-                    this.state.inputBuffer = '';
-                    this.state.selectedIndex = 0;
-                }
-                break;
+            // Note: step 0 is handled in handleSelectionEnter() since it branches to import flow
             case 1:
                 this.state.projectName = this.state.inputBuffer.trim();
                 this.state.step = 2;
@@ -490,18 +1151,14 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                 break;
             case 6:
                 this.state.initGit = this.state.selectedIndex === 0;
-                this.state.step = 7;
-                this.state.selectedIndex = 0;
+                // Always prompt for git remote URL (useful even if not initializing git)
+                // User might have an existing repo on GitHub they want to associate
+                this.state.gitRemoteInputMode = true;
+                this.state.inputBuffer = '';
                 break;
             case 7:
-                this.state.trackInDatabase = this.state.selectedIndex === 0;
-                // If tracking in DB, ask for workflow mode; otherwise skip to confirmation
-                this.state.step = this.state.trackInDatabase ? 8 : 9;
-                this.state.selectedIndex = 0;
-                break;
-            case 8:
                 this.state.workflowMode = WORKFLOW_MODE_OPTIONS[this.state.selectedIndex];
-                this.state.step = 9;
+                this.state.step = 8;
                 this.state.selectedIndex = 0;
                 break;
         }
@@ -539,14 +1196,7 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                 break;
             case 8:
                 this.state.step = 7;
-                this.state.selectedIndex = this.state.trackInDatabase ? 0 : 1;
-                break;
-            case 9:
-                // Go back to workflow mode if DB tracking is on, otherwise go to DB tracking step
-                this.state.step = this.state.trackInDatabase ? 8 : 7;
-                this.state.selectedIndex = this.state.trackInDatabase
-                    ? WORKFLOW_MODE_OPTIONS.indexOf(this.state.workflowMode)
-                    : 1;
+                this.state.selectedIndex = WORKFLOW_MODE_OPTIONS.indexOf(this.state.workflowMode);
                 break;
         }
         this.state.error = null;