@compilr-dev/cli 0.7.4 → 0.7.5

package/dist/ui/overlay/impl/new-overlay-v2.d.ts

@@ -26,6 +26,10 @@ type WorkflowMode = 'flexible' | 'guided';
 interface NewProjectState {
     step: WizardStep;
     projectType: 'new' | 'existing' | null;
+    /** SDK project type id picked at step 3 ('web', 'general', 'research', 'business-plan',
+     *  'content', 'tech-docs', 'course', 'book'). Drives whether steps 4+5 are shown and
+     *  populates the roster step. */
+    projectTypeId: string;
     projectName: string;
     description: string;
     repoPattern: RepoPattern | null;
@@ -39,6 +43,13 @@ interface NewProjectState {
     gitUserName: string | null;
     gitUserEmail: string | null;
     gitRemoteInputMode: boolean;
+    rosterMode: 'auto' | 'custom' | 'skip';
+    /** Per-role include flag, pre-filled from the picked type's suggestedAgents.
+     *  Only used when rosterMode === 'custom'. */
+    rosterToggles: Record<string, boolean>;
+    /** Sub-mode of step 7 — when true, render the toggle grid instead of the
+     *  three-option selector. Same pattern as gitRemoteInputMode on step 6. */
+    rosterCustomizeMode: boolean;
     importPath: string;
     detectedProject: DetectedProject | null;
     importGitChoice: 'detected' | 'custom' | 'skip' | 'init' | 'init-skip' | null;
@@ -59,6 +70,13 @@ export interface NewProjectResultV2 {
     projectName?: string;
     description?: string;
     gitRemote?: string;
+    /** SDK project type id chosen at step 3. Used by the close handler to register the
+     *  project with the correct `type` instead of the hardcoded 'general' fallback. */
+    projectTypeId?: string;
+    /** SDK-canonical short role keys to add to the team after generation. Resolved at
+     *  close based on rosterMode ('auto' → all suggestedAgents, 'custom' → toggled ones,
+     *  'skip' → empty). */
+    rosterRolesToAdd?: string[];
     imported?: boolean;
     detectedProject?: DetectedProject;
 }
@@ -78,7 +96,17 @@ export declare class NewProjectOverlayV2 extends BaseOverlayV2<NewProjectState,
     private renderStep5;
     private renderStep6;
     private renderStep7;
+    /** Step 7 sub-mode: toggle each suggested agent on/off via Space. */
+    private renderStep7Customize;
     private renderStep8;
+    /** After the git step ends, advance to step 7 (roster) — but auto-skip to
+     *  step 8 (final confirm) when the picked type has no suggested agents
+     *  (e.g. 'general'). Centralised so both Enter-confirm and Esc-skip on the
+     *  gitRemoteInputMode sub-mode take the same path. */
+    private advancePastGitStep;
+    /** Resolve the roles to add based on the chosen rosterMode + toggles. Used by
+     *  both the step 8 summary render and the result builder at close time. */
+    private resolveRosterRolesToAdd;
     private renderImportStep1;
     private renderImportStep2;
     private renderImportStep3;
@@ -87,6 +115,10 @@ export declare class NewProjectOverlayV2 extends BaseOverlayV2<NewProjectState,
     private renderImportStepFooter;
     handleKey(key: KeyEvent): OverlayAction<NewProjectResultV2> | Promise<OverlayAction<NewProjectResultV2>>;
     private handleSelectionKey;
+    /** Keys for the step 7 customize sub-mode: ↑/↓ moves between agents, Space
+     *  toggles the highlighted agent's include flag, Enter confirms the current
+     *  selection and advances to step 8 (or back to mode picker if nothing left). */
+    private handleRosterCustomizeKey;
     private handleSelectionEnter;
     private handleInputKey;
     private handleGitRemoteInput;

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

@@ -23,7 +23,8 @@ import * as path from 'path';
 import { execSync } from 'child_process';
 import { BaseOverlayV2, renderBorder } from '../../base/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 { TECH_STACK_LABELS, CODING_STANDARDS_LABELS, generateProject, isValidProjectName, projectExists, generateCompilrMdForImport, } from '../../../templates/index.js';
+import { PROJECT_TYPES, getProjectTypeConfig, ROLE_METADATA } from '@compilr-dev/sdk';
 import { getProjectsPath, ensureProjectsDirectory } from '../../../settings/paths.js';
 import { detectProjectInfo, validateImportPath, getLanguageLabel, getFrameworkLabel, } from '../../../utils/project-detection.js';
 import { projectRepository } from '../../../db/repositories/index.js';
@@ -32,7 +33,6 @@ import { projectRepository } from '../../../db/repositories/index.js';
 // =============================================================================
 const TECH_STACK_OPTIONS = ['react-node-pg', 'react-python-pg', 'vue-node-pg', 'custom'];
 const CODING_STANDARDS_OPTIONS = ['strict', 'relaxed', 'custom'];
-const REPO_PATTERN_OPTIONS = ['single', 'two-repo'];
 const WORKFLOW_MODE_OPTIONS = ['flexible', 'guided'];
 const WORKFLOW_MODE_LABELS = {
     flexible: 'Flexible (user-driven, exploratory)',
@@ -46,7 +46,7 @@ function getMaxOptionsForStep(step) {
         case 0:
             return 2;
         case 3:
-            return REPO_PATTERN_OPTIONS.length;
+            return PROJECT_TYPES.length; // Project type picker
         case 4:
             return TECH_STACK_OPTIONS.length;
         case 5:
@@ -54,7 +54,7 @@ function getMaxOptionsForStep(step) {
         case 6:
             return 2;
         case 7:
-            return WORKFLOW_MODE_OPTIONS.length;
+            return 3; // Roster mode: auto / customize / skip
         case 8:
             return 2;
         default:
@@ -77,6 +77,7 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         super({
             step: 0,
             projectType: null,
+            projectTypeId: 'web', // Default — Software Development, top of the SDK list
             projectName: '',
             description: '',
             repoPattern: 'single', // Default — two-repo option removed
@@ -90,6 +91,9 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
             gitUserName: null,
             gitUserEmail: null,
             gitRemoteInputMode: false,
+            rosterMode: 'auto',
+            rosterToggles: {},
+            rosterCustomizeMode: false,
             // Import project state
             importPath: '',
             detectedProject: null,
@@ -264,15 +268,28 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
     }
     renderStep3(s) {
         const lines = [];
-        lines.push(chalk.bold(' Documentation structure'));
+        lines.push(chalk.bold(' What kind of project are you starting?'));
         lines.push('');
-        for (let i = 0; i < REPO_PATTERN_OPTIONS.length; i++) {
-            const pattern = REPO_PATTERN_OPTIONS[i];
-            lines.push(this.renderSelectionOption(s, i, `${String(i + 1)}. ${REPO_PATTERN_LABELS[pattern]}`));
+        // List all SDK-registered project types with their canonical short labels +
+        // taglines. The picked type drives whether tech-stack/coding-standards steps
+        // appear and which suggestedAgents populate the roster step.
+        for (let i = 0; i < PROJECT_TYPES.length; i++) {
+            const cfg = PROJECT_TYPES[i];
+            const tagline = cfg.tagline ?? cfg.description;
+            // Truncate tagline to ~46 chars so the row fits the overlay width.
+            const trimmed = tagline.length > 46 ? tagline.slice(0, 43) + '…' : tagline;
+            lines.push(this.renderSelectionOption(s, i, `${cfg.label.padEnd(24)} ${s.muted(trimmed)}`));
         }
         lines.push('');
-        lines.push(s.muted(' Single repo: All files in one repository'));
-        lines.push(s.muted(' Two repos: Code and docs in separate repositories'));
+        // Show the picked type's full description + suggested-agent count beneath
+        // the list as live preview. Helps users see what the choice actually means
+        // without having to commit and back-arrow.
+        const picked = PROJECT_TYPES[this.state.selectedIndex];
+        lines.push(s.muted(' ' + picked.description));
+        if (picked.suggestedAgents.length > 0) {
+            const names = picked.suggestedAgents.map((a) => `$${a.role}`).join(', ');
+            lines.push(s.muted(` Comes with: ${names}`));
+        }
         return lines;
     }
     renderStep4(s) {
@@ -347,31 +364,84 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         return lines;
     }
     renderStep7(s) {
+        // Customize sub-mode — toggle individual agents on/off.
+        if (this.state.rosterCustomizeMode) {
+            return this.renderStep7Customize(s);
+        }
         const lines = [];
-        lines.push(chalk.bold(' Workflow mode'));
+        const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+        const suggested = typeConfig.suggestedAgents;
+        lines.push(chalk.bold(' Team roster'));
         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(s.muted(` ${typeConfig.label} suggests these specialists:`));
+        lines.push('');
+        // Show the suggested agents as a preview list with mascot + label + description.
+        for (const agent of suggested) {
+            const meta = ROLE_METADATA[agent.role];
+            const mascot = meta?.mascot ?? '[?]';
+            lines.push(s.muted(`   ${mascot} ${agent.label.padEnd(14)} ${agent.description}`));
         }
         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'));
+        lines.push(' How should we set up the team?');
+        lines.push('');
+        const recommended = ' ← recommended';
+        lines.push(this.renderSelectionOption(s, 0, `Add all suggested (${String(suggested.length)})${this.state.selectedIndex === 0 ? recommended : ''}`));
+        lines.push(this.renderSelectionOption(s, 1, 'Customize selection'));
+        lines.push(this.renderSelectionOption(s, 2, 'Skip — start with just $default'));
+        return lines;
+    }
+    /** Step 7 sub-mode: toggle each suggested agent on/off via Space. */
+    renderStep7Customize(s) {
+        const lines = [];
+        const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+        const suggested = typeConfig.suggestedAgents;
+        lines.push(chalk.bold(' Customize team roster'));
+        lines.push('');
+        lines.push(s.muted(' Toggle agents to include in the initial team:'));
+        lines.push('');
+        for (let i = 0; i < suggested.length; i++) {
+            const agent = suggested[i];
+            const meta = ROLE_METADATA[agent.role];
+            const mascot = meta?.mascot ?? '[?]';
+            const included = (this.state.rosterToggles[agent.role] ?? true);
+            const checkbox = included ? '[✓]' : '[ ]';
+            const isSelected = i === this.state.selectedIndex;
+            const prefix = isSelected ? ' > ' : '   ';
+            const line = `${prefix}${checkbox} ${mascot} ${agent.label.padEnd(14)} ${s.muted(agent.description)}`;
+            lines.push(isSelected ? s.primary(line) : line);
+        }
+        lines.push('');
+        const selectedCount = suggested.filter((a) => (this.state.rosterToggles[a.role] ?? true)).length;
+        lines.push(s.muted(` ${String(selectedCount)} agents selected. You can /team add other roles later.`));
         return lines;
     }
     renderStep8(s) {
         const lines = [];
+        const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+        const isSoftware = typeConfig.category === 'software';
         lines.push(chalk.bold(' Ready to create project?'));
         lines.push('');
         lines.push(` Project:     ${s.primary(this.state.projectName)}`);
+        lines.push(` Type:        ${s.primary(typeConfig.label)}`);
         lines.push(` Location:    ${s.primary('./' + this.state.projectName + '/')}`);
-        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')}`);
+        // Tech stack + coding standards only apply to software-category projects.
+        if (isSoftware) {
+            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')}`);
         if (this.state.gitRemote) {
             lines.push(` Remote:      ${s.primary(this.state.gitRemote)}`);
         }
+        // Roster summary — shows what will be batch-added after generation.
+        const rosterRoles = this.resolveRosterRolesToAdd();
+        if (rosterRoles.length > 0) {
+            const names = rosterRoles.map((r) => `$${r}`).join(', ');
+            lines.push(` Team:        ${s.primary(`${String(rosterRoles.length)} specialists`)} ${s.muted(`(${names})`)}`);
+        }
+        else if (this.state.rosterMode === 'skip' || typeConfig.suggestedAgents.length === 0) {
+            lines.push(` Team:        ${s.muted('$default only')}`);
+        }
         lines.push('');
         if (this.state.error) {
             lines.push(s.error(` ${this.state.error}`));
@@ -381,6 +451,34 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         lines.push(this.renderSelectionOption(s, 1, 'Cancel'));
         return lines;
     }
+    /** After the git step ends, advance to step 7 (roster) — but auto-skip to
+     *  step 8 (final confirm) when the picked type has no suggested agents
+     *  (e.g. 'general'). Centralised so both Enter-confirm and Esc-skip on the
+     *  gitRemoteInputMode sub-mode take the same path. */
+    advancePastGitStep() {
+        const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+        if (typeConfig.suggestedAgents.length === 0) {
+            // No roster question to ask — skip straight to confirm.
+            this.state.rosterMode = 'skip';
+            this.state.step = 8;
+        }
+        else {
+            this.state.step = 7;
+        }
+        this.state.selectedIndex = 0;
+    }
+    /** Resolve the roles to add based on the chosen rosterMode + toggles. Used by
+     *  both the step 8 summary render and the result builder at close time. */
+    resolveRosterRolesToAdd() {
+        const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+        const suggested = typeConfig.suggestedAgents.map((a) => a.role);
+        if (this.state.rosterMode === 'skip')
+            return [];
+        if (this.state.rosterMode === 'auto')
+            return suggested;
+        // custom: only the toggles where !== false (defaults to included).
+        return suggested.filter((role) => (this.state.rosterToggles[role] ?? true));
+    }
     // ===========================================================================
     // Import Step Renderers
     // ===========================================================================
@@ -575,8 +673,7 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                 this.state.gitRemoteInputMode = false;
                 this.state.gitRemote = '';
                 this.state.inputBuffer = '';
-                this.state.step = 8; // Skip step 7 (workflow mode removed — always flexible)
-                this.state.selectedIndex = 0;
+                this.advancePastGitStep();
                 return this.rerender();
             }
             if (this.state.step === 0) {
@@ -600,6 +697,12 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         return this.noAction();
     }
     handleSelectionKey(key) {
+        // The customize sub-mode on step 7 has a different option count (one per
+        // suggested agent) than the parent step's 3 mode options, and adds Space
+        // as a toggle. Handle it explicitly before the generic selection logic.
+        if (this.state.step === 7 && this.state.rosterCustomizeMode) {
+            return this.handleRosterCustomizeKey(key);
+        }
         const maxOptions = getMaxOptionsForStep(this.state.step);
         // j/k for vim-style navigation
         if (key.name === 'j' && this.state.selectedIndex < maxOptions - 1) {
@@ -623,6 +726,35 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
         }
         return this.noAction();
     }
+    /** Keys for the step 7 customize sub-mode: ↑/↓ moves between agents, Space
+     *  toggles the highlighted agent's include flag, Enter confirms the current
+     *  selection and advances to step 8 (or back to mode picker if nothing left). */
+    handleRosterCustomizeKey(key) {
+        const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+        const max = typeConfig.suggestedAgents.length;
+        if ((this.isUpKey(key) || key.name === 'k') && this.state.selectedIndex > 0) {
+            this.state.selectedIndex--;
+            return this.rerender();
+        }
+        if ((this.isDownKey(key) || key.name === 'j') && this.state.selectedIndex < max - 1) {
+            this.state.selectedIndex++;
+            return this.rerender();
+        }
+        // Space toggles the highlighted agent's include flag.
+        if (key.name === 'space') {
+            const role = typeConfig.suggestedAgents[this.state.selectedIndex].role;
+            const current = (this.state.rosterToggles[role] ?? true);
+            this.state.rosterToggles = { ...this.state.rosterToggles, [role]: !current };
+            return this.rerender();
+        }
+        if (this.isEnterKey(key)) {
+            this.state.rosterCustomizeMode = false;
+            this.state.step = 8;
+            this.state.selectedIndex = 0;
+            return this.rerender();
+        }
+        return this.noAction();
+    }
     async handleSelectionEnter() {
         // Step 0 - choose between new and existing project
         if (this.state.step === 0) {
@@ -650,45 +782,84 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                 // Cancel
                 return this.close({ created: false });
             }
-            // Verify all required fields are set
-            if (!this.state.repoPattern || !this.state.techStack || !this.state.codingStandards) {
+            const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+            const isSoftware = typeConfig.category === 'software';
+            // Software projects require tech stack + coding standards (the full
+            // scaffold needs them). Non-software projects don't go through the
+            // scaffolder — just need a directory + COMPILR.md.
+            if (isSoftware && (!this.state.repoPattern || !this.state.techStack || !this.state.codingStandards)) {
                 this.state.error = 'Missing configuration values';
                 return this.rerender();
             }
             // Show generating state
             this.state.isGenerating = true;
-            // Create project
-            const config = {
-                name: this.state.projectName,
-                description: this.state.description,
-                repoPattern: this.state.repoPattern,
-                techStack: this.state.techStack,
-                codingStandards: this.state.codingStandards,
-                initGit: this.state.initGit,
-            };
             try {
-                // Ensure projects directory exists and create project there
                 ensureProjectsDirectory();
                 const projectsPath = getProjectsPath();
-                const result = await generateProject(config, projectsPath);
-                if (result.success) {
-                    return this.close({
-                        created: true,
-                        projectPath: result.projectPath,
-                        docsPath: result.docsPath,
-                        filesCreated: result.filesCreated,
-                        trackInDatabase: true, // Always track in database
-                        workflowMode: this.state.workflowMode,
-                        projectName: this.state.projectName,
+                if (isSoftware) {
+                    // Software path — full scaffold via SDK generateProject. The earlier
+                    // validation guarantees these are set when isSoftware is true, but
+                    // we provide explicit fallbacks here so the types resolve without
+                    // non-null assertions.
+                    const config = {
+                        name: this.state.projectName,
                         description: this.state.description,
-                        gitRemote: this.state.gitRemote || undefined,
-                    });
-                }
-                else {
+                        repoPattern: this.state.repoPattern ?? 'single',
+                        techStack: this.state.techStack ?? 'react-node-pg',
+                        codingStandards: this.state.codingStandards ?? 'strict',
+                        initGit: this.state.initGit,
+                    };
+                    const result = await generateProject(config, projectsPath);
+                    if (result.success) {
+                        return this.close({
+                            created: true,
+                            projectPath: result.projectPath,
+                            docsPath: result.docsPath,
+                            filesCreated: result.filesCreated,
+                            trackInDatabase: true,
+                            workflowMode: this.state.workflowMode,
+                            projectName: this.state.projectName,
+                            description: this.state.description,
+                            gitRemote: this.state.gitRemote || undefined,
+                            projectTypeId: this.state.projectTypeId,
+                            rosterRolesToAdd: this.resolveRosterRolesToAdd(),
+                        });
+                    }
                     this.state.isGenerating = false;
                     this.state.error = result.error ?? 'Unknown error';
                     return this.rerender();
                 }
+                // Non-software path — lightweight directory + COMPILR.md (mirrors the
+                // desktop's ipc.ts:1239 branch). No tech-stack scaffold; the project
+                // type config drives downstream agent + skill availability.
+                const projectPath = path.join(projectsPath, this.state.projectName);
+                fs.mkdirSync(projectPath, { recursive: true });
+                fs.mkdirSync(path.join(projectPath, 'knowledge'), { recursive: true });
+                const displayName = this.state.projectName
+                    .replace(/-/g, ' ')
+                    .replace(/\b\w/g, (c) => c.toUpperCase());
+                const compilrMd = `# ${displayName}\n\n${this.state.description}\n\nProject type: ${this.state.projectTypeId}\n`;
+                fs.writeFileSync(path.join(projectPath, 'COMPILR.md'), compilrMd, 'utf-8');
+                if (this.state.initGit) {
+                    try {
+                        execSync('git init', { cwd: projectPath, stdio: 'ignore' });
+                    }
+                    catch {
+                        // Best-effort — git not available, ignore.
+                    }
+                }
+                return this.close({
+                    created: true,
+                    projectPath,
+                    filesCreated: ['COMPILR.md', 'knowledge/'],
+                    trackInDatabase: true,
+                    workflowMode: this.state.workflowMode,
+                    projectName: this.state.projectName,
+                    description: this.state.description,
+                    gitRemote: this.state.gitRemote || undefined,
+                    projectTypeId: this.state.projectTypeId,
+                    rosterRolesToAdd: this.resolveRosterRolesToAdd(),
+                });
             }
             catch (error) {
                 this.state.isGenerating = false;
@@ -725,8 +896,7 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
             this.state.gitRemote = this.state.inputBuffer.trim();
             this.state.gitRemoteInputMode = false;
             this.state.inputBuffer = '';
-            this.state.step = 8; // Skip step 7 (workflow mode removed)
-            this.state.selectedIndex = 0;
+            this.advancePastGitStep();
             return this.rerender();
         }
         // Backspace - delete last character
@@ -1124,14 +1294,23 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                 break;
             case 2:
                 this.state.description = this.state.inputBuffer.trim();
-                this.state.step = 4; // Skip step 3 (repo pattern removed)
-                this.state.selectedIndex = 0;
+                // Advance to step 3 — project type picker. Default highlight on the
+                // type that's currently stored (defaults to 'web' from the constructor).
+                this.state.step = 3;
+                this.state.selectedIndex = PROJECT_TYPES.findIndex((t) => t.id === this.state.projectTypeId);
+                if (this.state.selectedIndex < 0)
+                    this.state.selectedIndex = 0;
                 break;
-            case 3:
-                this.state.repoPattern = REPO_PATTERN_OPTIONS[this.state.selectedIndex];
-                this.state.step = 4;
+            case 3: {
+                // User picked a project type. Record it; skip tech-stack + coding-standards
+                // for non-software-category types (research, business, book, etc.).
+                const picked = PROJECT_TYPES[this.state.selectedIndex];
+                this.state.projectTypeId = picked.id;
+                const isSoftware = picked.category === 'software';
+                this.state.step = isSoftware ? 4 : 6;
                 this.state.selectedIndex = 0;
                 break;
+            }
             case 4:
                 this.state.techStack = TECH_STACK_OPTIONS[this.state.selectedIndex];
                 this.state.step = 5;
@@ -1149,15 +1328,45 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                 this.state.gitRemoteInputMode = true;
                 this.state.inputBuffer = '';
                 break;
-            case 7:
-                this.state.workflowMode = WORKFLOW_MODE_OPTIONS[this.state.selectedIndex];
-                this.state.step = 8;
-                this.state.selectedIndex = 0;
+            case 7: {
+                // Roster mode selection: 0=auto, 1=customize, 2=skip.
+                // Pre-fill toggles from suggestedAgents (all included by default).
+                const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+                const toggles = {};
+                for (const a of typeConfig.suggestedAgents)
+                    toggles[a.role] = true;
+                this.state.rosterToggles = toggles;
+                if (this.state.selectedIndex === 0) {
+                    this.state.rosterMode = 'auto';
+                    this.state.step = 8;
+                    this.state.selectedIndex = 0;
+                }
+                else if (this.state.selectedIndex === 1) {
+                    // Enter customize sub-mode on the same step.
+                    this.state.rosterMode = 'custom';
+                    this.state.rosterCustomizeMode = true;
+                    this.state.selectedIndex = 0;
+                }
+                else {
+                    this.state.rosterMode = 'skip';
+                    this.state.step = 8;
+                    this.state.selectedIndex = 0;
+                }
                 break;
+            }
         }
         this.state.error = null;
     }
     prevStep() {
+        // Customize sub-mode on step 7 — back-arrow returns to roster-mode selection
+        // on the same step, NOT to step 6. Mirrors how step 6's gitRemoteInputMode
+        // back-arrow exits the input field without leaving step 6.
+        if (this.state.step === 7 && this.state.rosterCustomizeMode) {
+            this.state.rosterCustomizeMode = false;
+            this.state.selectedIndex = 1; // "Customize selection" was option index 1
+            this.state.error = null;
+            return;
+        }
         switch (this.state.step) {
             case 1:
                 this.state.step = 0;
@@ -1168,29 +1377,59 @@ export class NewProjectOverlayV2 extends BaseOverlayV2 {
                 this.state.inputBuffer = this.state.projectName;
                 break;
             case 3:
+                // Back from project-type picker to description
                 this.state.step = 2;
                 this.state.inputBuffer = this.state.description;
                 break;
             case 4:
-                this.state.step = 2; // Back to description (step 3 repo pattern removed)
-                this.state.inputBuffer = this.state.description;
+                // Back from tech stack to project-type picker
+                this.state.step = 3;
+                this.state.selectedIndex = PROJECT_TYPES.findIndex((t) => t.id === this.state.projectTypeId);
+                if (this.state.selectedIndex < 0)
+                    this.state.selectedIndex = 0;
                 break;
             case 5:
                 this.state.step = 4;
                 this.state.selectedIndex = this.state.techStack ? TECH_STACK_OPTIONS.indexOf(this.state.techStack) : 0;
                 break;
-            case 6:
-                this.state.step = 5;
-                this.state.selectedIndex = this.state.codingStandards ? CODING_STANDARDS_OPTIONS.indexOf(this.state.codingStandards) : 0;
+            case 6: {
+                // Back from git step. Software types came via 5 (coding standards);
+                // non-software types skipped 4+5 and came directly from 3.
+                const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+                const isSoftware = typeConfig.category === 'software';
+                if (isSoftware) {
+                    this.state.step = 5;
+                    this.state.selectedIndex = this.state.codingStandards
+                        ? CODING_STANDARDS_OPTIONS.indexOf(this.state.codingStandards)
+                        : 0;
+                }
+                else {
+                    this.state.step = 3;
+                    this.state.selectedIndex = PROJECT_TYPES.findIndex((t) => t.id === this.state.projectTypeId);
+                    if (this.state.selectedIndex < 0)
+                        this.state.selectedIndex = 0;
+                }
                 break;
+            }
             case 7:
+                // Back from roster mode selection to git step
                 this.state.step = 6;
                 this.state.selectedIndex = this.state.initGit ? 0 : 1;
                 break;
-            case 8:
-                this.state.step = 6; // Back to git (step 7 workflow mode removed)
-                this.state.selectedIndex = this.state.initGit ? 0 : 1;
+            case 8: {
+                // Back from confirm. If the project type has suggested agents, return to
+                // step 7 (roster); otherwise step 7 was auto-skipped, return to step 6.
+                const typeConfig = getProjectTypeConfig(this.state.projectTypeId);
+                if (typeConfig.suggestedAgents.length > 0) {
+                    this.state.step = 7;
+                    this.state.selectedIndex = this.state.rosterMode === 'auto' ? 0 : this.state.rosterMode === 'custom' ? 1 : 2;
+                }
+                else {
+                    this.state.step = 6;
+                    this.state.selectedIndex = this.state.initGit ? 0 : 1;
+                }
                 break;
+            }
         }
         this.state.error = null;
     }

package/dist/ui/overlay/impl/propose-alternatives-overlay-v2.d.ts

@@ -0,0 +1,53 @@
+/**
+ * Propose Alternatives Overlay V2
+ *
+ * Modal overlay for picking one of 2-3 agent-proposed alternatives.
+ * One tab per alternative (vs ask_user's one tab per question) — tabs
+ * are for COMPARING different answers to the SAME single question, not
+ * for moving between distinct questions.
+ *
+ * Spec: project-docs/00-requirements/compilr-dev-cli/propose-alternatives-spec.md
+ */
+import { BaseOverlayV2 } from '../../base/index.js';
+import type { RenderContext, OverlayAction, KeyEvent } from '../types.js';
+import type { Alternative } from '../../../shared-handlers.js';
+interface ProposeAlternativesState {
+    /** Active tab — 0-based alternative index */
+    currentTab: number;
+    /** Whether the user has switched to the notes-input mode */
+    isAddingNotes: boolean;
+    /** Notes buffer (single-line; v1) */
+    notesBuffer: string;
+}
+export interface ProposeAlternativesOptionsV2 {
+    question: string;
+    context?: string;
+    alternatives: Alternative[];
+}
+export interface ProposeAlternativesResultV2 {
+    chosenIndex: number;
+    chosenTitle: string;
+    notes?: string;
+    rejected: boolean;
+}
+export declare class ProposeAlternativesOverlayV2 extends BaseOverlayV2<ProposeAlternativesState, ProposeAlternativesResultV2> {
+    readonly type: "inline";
+    readonly id = "propose-alternatives-overlay-v2";
+    private readonly question;
+    private readonly context?;
+    private readonly alternatives;
+    constructor(options: ProposeAlternativesOptionsV2);
+    protected renderContent(context: RenderContext): string[];
+    handleKey(key: KeyEvent): OverlayAction<ProposeAlternativesResultV2>;
+    getCloseSummary(result: ProposeAlternativesResultV2): string | null;
+    private handleNavigationKey;
+    private handleNotesKey;
+    private renderTabBar;
+    private renderActiveAlternative;
+    private renderContentBlock;
+    private renderNotesInput;
+    private renderInstructions;
+    private makePicked;
+    private makeRejected;
+}
+export {};