@popoverai/dotrequirements 0.12.1 → 0.14.0

package/dist/commands/init.js

@@ -6,52 +6,48 @@ import { generateRequirementsReadme } from '../templates/requirements-readme.js'
 import { generateExampleRequirements } from '../templates/example-requirements.js';
 import { promptChoice, promptConfirm } from '../utils/prompts.js';
 import { pullCommand } from './pull.js';
-import { LOCAL_PROJECT_CREDENTIALS } from '../utils/local-project.js';
-import { loadEnvFile } from '../utils/env.js';
-import { hasValidTokens, getTokens } from '../utils/token-storage.js';
 import { executeOAuthFlow } from '../utils/oauth-flow.js';
 import { ConvexHttpClient } from 'convex/browser';
 import { getConvexUrl } from '../config.js';
 import { api } from '../convex.js';
 import { brand } from '../utils/brand.js';
-import { selectTeam as selectTeamFromList, selectProject, getOrCreateProjectSecret } from '../utils/project-selector.js';
+import { selectProject, getOrCreateProjectSecret, promptExpiryDays } from '../utils/project-selector.js';
+import { writeProjectSettings, findProjectRoot } from '../utils/project-settings.js';
 export async function initCommand(options = {}) {
     try {
         console.log(`Initializing ${brand} project...\n`);
         const cwd = process.cwd();
-        const envPath = path.join(cwd, '.env.local');
-        // 1. Pre-flight check: already initialized?
-        if (fs.existsSync(envPath)) {
-            const content = fs.readFileSync(envPath, 'utf-8');
-            if (content.includes('DOTREQUIREMENTS_PROJECT_ID')) {
-                const shouldReinit = await promptConfirm('Project already initialized. Reinitialize?', false);
-                if (!shouldReinit) {
-                    console.log('Aborted.');
-                    return;
-                }
-            }
+        // INIT-2: Check if .requirements/ folder already exists
+        const existingProject = findProjectRoot(cwd);
+        if (existingProject === cwd) {
+            console.log('This project is already initialized.');
+            console.log('Use "dotrequirements link" to connect or reconnect to cloud.\n');
+            return;
         }
-        // 2. Ask user to choose between creating new or connecting to existing
-        const flow = await promptChoice('What would you like to do?', [
-            { title: 'Create a new project', value: 'create' },
-            { title: 'Connect to an existing project', value: 'connect' },
+        // INIT-1: Ask user whether to authenticate
+        const authChoice = await promptChoice('Do you want to authenticate before initializing a project? (Recommended)', [
+            { title: 'Yes', value: 'yes' },
+            { title: 'No', value: 'no' },
         ]);
-        if (!flow) {
-            console.log('Aborted.');
+        if (!authChoice) {
+            // INIT-1.3: User cancelled
+            console.log('Initialization cancelled.');
             return;
         }
-        // 3. Execute the appropriate flow
-        if (flow === 'create') {
-            await createNewProjectFlow(cwd, envPath, options);
+        if (authChoice === 'no') {
+            // INIT-3: Local-only workflow
+            await localOnlyFlow(cwd);
         }
         else {
-            await connectExistingProjectFlow(cwd, envPath);
+            // INIT-17+: Authenticated workflow
+            await authenticatedFlow(cwd, options);
         }
         console.log('\nDocumentation: https://docs.dotrequirements.io/getting-started');
         console.log('By using this service, you agree to our Terms: https://app.dotrequirements.io/terms');
     }
     catch (error) {
         console.error(`\n✗ Error: ${error instanceof Error ? error.message : String(error)}`);
+        // INIT-11: Network error guidance
         if (error instanceof Error && error.message.includes('fetch')) {
             console.error('\nCheck your internet connection and try again.');
             console.error('If the problem persists, visit https://status.convex.dev');
@@ -60,15 +56,86 @@ export async function initCommand(options = {}) {
     }
 }
 /**
- * INIT-13: Prompt user to select a team for the new project
+ * INIT-3: Local-only workflow - creates folder structure without credentials
+ */
+async function localOnlyFlow(cwd) {
+    console.log('\nInitializing local project...');
+    // INIT-3.0: Create .requirements/ directory
+    const requirementsDir = path.join(cwd, '.requirements');
+    if (!fs.existsSync(requirementsDir)) {
+        fs.mkdirSync(requirementsDir, { recursive: true });
+        console.log('✓ Created .requirements/ directory');
+    }
+    // Create README and example files
+    const readmePath = path.join(requirementsDir, 'README.md');
+    fs.writeFileSync(readmePath, generateRequirementsReadme());
+    console.log('✓ Created .requirements/README.md');
+    const examplePath = path.join(requirementsDir, 'example.requirements.md');
+    if (!fs.existsSync(examplePath)) {
+        fs.writeFileSync(examplePath, generateExampleRequirements('local'));
+        console.log('✓ Created .requirements/example.requirements.md');
+    }
+    // INIT-5.2: Update .gitignore
+    ensureGitignore(cwd);
+    console.log('✓ Updated .gitignore\n');
+    // INIT-3.1: No credentials written (local-only)
+    // INIT-3.2, INIT-3.3: Show guidance
+    console.log('Next steps:');
+    console.log('  1. Create requirements in .requirements/ directory');
+    console.log('  2. Add the test harness to your test setup (see README)');
+    console.log('  3. Run "dotrequirements link" to connect to cloud features');
+}
+/**
+ * INIT-17, INIT-18, INIT-7, INIT-4, INIT-6: Authenticated workflow
+ */
+async function authenticatedFlow(cwd, options) {
+    // INIT-17: Inline OAuth (no persistent tokens)
+    let oauthResult;
+    try {
+        console.log();
+        oauthResult = await executeOAuthFlow();
+        console.log();
+    }
+    catch (error) {
+        // INIT-17.3: OAuth failed
+        console.error('\nAuthentication failed:', error instanceof Error ? error.message : String(error));
+        console.log('Please try again later.\n');
+        return;
+    }
+    // Set up authenticated client using the session token
+    const client = new ConvexHttpClient(getConvexUrl());
+    client.setAuth(oauthResult.accessToken);
+    // INIT-18: Select team
+    const selectedTeam = await selectTeam(client);
+    if (selectedTeam === undefined) {
+        // User cancelled
+        console.log('Initialization cancelled.');
+        return;
+    }
+    // INIT-7: Choose between create and connect
+    const projectChoice = await chooseProjectAction(client, selectedTeam.teamId);
+    if (!projectChoice) {
+        console.log('Initialization cancelled.');
+        return;
+    }
+    if (projectChoice === 'create') {
+        await createNewProjectFlow(cwd, client, selectedTeam, options);
+    }
+    else {
+        await connectExistingProjectFlow(cwd, client, selectedTeam);
+    }
+}
+/**
+ * INIT-18: Prompt user to select a team after OAuth
  * Returns:
- * - teamId string if user selected a team
- * - null if no teams exist (auto-create flow)
+ * - { teamId, tier } if user selected a team
  * - undefined if user cancelled
  */
 async function selectTeam(client) {
     console.log('Fetching your teams...\n');
-    // INIT-13.0: Query all teams for the authenticated user
+    // INIT-18.0: Ensure user has a default team if they don't have any
+    await client.mutation(api.teams.mutations.ensureDefaultTeam, {});
+    // Query all teams for the authenticated user
     const teams = await client.query(api.teams.queries.listForUserWithUsage);
     if (teams.length === 0) {
         console.log('\nYou are not a member of any teams.');
@@ -76,20 +143,21 @@ async function selectTeam(client) {
         console.log('After creating your team, run "dotrequirements init" again.\n');
         process.exit(0);
     }
-    // INIT-13.1 & INIT-13.3: Build team selection options with usage display
+    // INIT-18.1, INIT-18.2, INIT-18.3: Build team selection options with usage display
     const teamChoices = teams.map((team) => {
         const limitDisplay = team.projectLimit === -1
             ? 'unlimited'
             : `${team.projectCount}/${team.projectLimit}`;
-        // INIT-13.2: Mark teams at capacity
+        // INIT-18.3: Mark teams at capacity
         const capacityMarker = team.isAtCapacity ? ' [at capacity]' : '';
         return {
             title: `${team.name} (${team.tierName} - ${limitDisplay} projects)${capacityMarker}`,
             value: team.teamId,
-            disabled: team.isAtCapacity, // Make at-capacity teams unselectable
+            disabled: team.isAtCapacity,
         };
     });
-    // INIT-13.3: Add "Create new team" option
+    // INIT-18.4: Add "Create new team" option if user can create one
+    // (Check if user is already admin of a free team - simplified to always show for now)
     teamChoices.push({
         title: 'Create new team',
         value: 'CREATE_NEW_TEAM',
@@ -97,14 +165,12 @@ async function selectTeam(client) {
     });
     const selectedTeamId = await promptChoice('Select a team for this project:', teamChoices);
     if (!selectedTeamId) {
-        // User cancelled
         return undefined;
     }
-    // INIT-14: Handle selection of at-capacity team (should not happen due to disabled flag, but defensive check)
+    // INIT-14: Handle selection of at-capacity team (defensive check)
     const selectedTeam = teams.find((t) => t.teamId === selectedTeamId);
     if (selectedTeam && selectedTeam.isAtCapacity) {
         console.error('\n✗ This team is at its project limit. Please select a different team or create a new one.\n');
-        // Retry selection
         return await selectTeam(client);
     }
     // INIT-15: Handle "Create new team" selection
@@ -113,122 +179,78 @@ async function selectTeam(client) {
         console.log('After creating your team, run "dotrequirements init" again.\n');
         process.exit(0);
     }
-    // INIT-13.4: Return selected team ID
-    return selectedTeamId;
+    return {
+        teamId: selectedTeamId,
+        tier: selectedTeam.tier,
+    };
 }
 /**
- * Create a new project flow (INIT-3, INIT-4, INIT-13)
+ * INIT-7: Choose between creating new project or connecting to existing
  */
-async function createNewProjectFlow(cwd, envPath, options) {
-    // 1. Detect/prompt for project name
+async function chooseProjectAction(client, teamId) {
+    // INIT-7.3: Check if team has existing projects the user can access
+    const projectsWithSecrets = await client.query(api.projectSecrets.queries.listOwnSecretsForTeam, { target: { type: 'team', id: teamId } });
+    if (projectsWithSecrets.length === 0) {
+        // No existing projects, only offer create
+        const confirmed = await promptConfirm('This team has no projects. Create a new one?', true);
+        return confirmed ? 'create' : undefined;
+    }
+    // INIT-7.0: Offer both options
+    return await promptChoice('What would you like to do?', [
+        { title: 'Create a new project', value: 'create' },
+        { title: 'Connect to an existing project', value: 'connect' },
+    ]);
+}
+/**
+ * INIT-4: Create a new project in DotRequirements Cloud
+ */
+async function createNewProjectFlow(cwd, client, team, options) {
+    // INIT-4.0: Detect/prompt for project name
     const projectName = await detectProjectName({ name: options.name });
     console.log(`Project name: ${projectName}\n`);
-    // 2. Check if user is authenticated
-    const isAuthenticated = await hasValidTokens();
-    let projectId; // Can be slug (new) or Convex ID (old/local)
-    let secret;
-    if (isAuthenticated) {
-        // INIT-4: Authenticated user - create cloud project
-        const tokens = await getTokens();
-        if (!tokens) {
-            throw new Error('Authentication tokens not found');
-        }
-        const client = new ConvexHttpClient(getConvexUrl());
-        client.setAuth(tokens.accessToken);
-        // INIT-13: Select team for the project (returns null if no teams exist, undefined if cancelled)
-        const selectedTeamId = await selectTeam(client);
-        if (selectedTeamId === undefined) {
-            // User cancelled (note: "Create new team" exits in selectTeam)
-            console.log('Aborted.');
-            return;
-        }
-        console.log('Creating cloud project...');
-        const result = await client.mutation(api.projects.mutations.create, {
-            name: projectName,
-            teamId: selectedTeamId ?? undefined, // null becomes undefined for auto-create
-        });
-        // Use slug as the user-facing project identifier
-        projectId = result.slug;
-        secret = result.secret;
-        console.log(`✓ Cloud project created: ${projectId}`);
-    }
-    else {
-        // INIT-3: Unauthenticated user - create local-only project with placeholder credentials
-        console.log('Initializing local project...');
-        projectId = LOCAL_PROJECT_CREDENTIALS.projectId;
-        secret = LOCAL_PROJECT_CREDENTIALS.secret;
-        console.log(`✓ Project initialized locally`);
-    }
-    // 3. Write .env.local
-    const shouldContinue = await writeEnvFile(envPath, projectId, secret);
-    if (!shouldContinue) {
-        // User declined to continue - abort init
-        return;
-    }
-    // Reload env file so newly written credentials are available to subsequent commands
-    // Use force=true to overwrite any previously cached values
-    loadEnvFile(cwd, true);
-    // 4. Create .requirements/ directory
+    console.log('Creating cloud project...');
+    // INIT-4.1: Create project in cloud (no longer auto-creates secret)
+    const result = await client.mutation(api.projects.mutations.create, {
+        name: projectName,
+        teamId: team.teamId,
+    });
+    const projectId = result.slug;
+    console.log(`✓ Cloud project created: ${projectId}`);
+    // AUTHZ-3: Prompt for secret expiry (paid tier only)
+    const expiryDays = await promptExpiryDays(team.tier);
+    // Get secret for the newly created project
+    console.log('Getting project credentials...');
+    const secretResult = await getOrCreateProjectSecret(client, result.projectId, expiryDays);
+    const secret = secretResult.secret;
+    console.log('✓ Created project secret');
+    // INIT-4.2: Write credentials to project-settings.json
+    writeProjectSettings(cwd, { projectId, projectSecret: secret });
+    console.log('✓ Wrote credentials to .requirements/project-settings.json');
+    // INIT-5.0, INIT-5.1: Create directory structure (if not already created by writeProjectSettings)
     await createRequirementsDirectory(cwd, projectId);
-    // 5. Update .gitignore
+    // INIT-5.2: Update .gitignore
     ensureGitignore(cwd);
     console.log('✓ Updated .gitignore\n');
-    // 6. Show next steps
+    // INIT-4.3: Show guidance
     console.log('Next steps:');
     console.log('  1. Create requirements in .requirements/ directory');
     console.log('  2. Add the test harness to your test setup (see README)');
-    if (!isAuthenticated) {
-        // INIT-3.1: Local-only guidance
-        console.log('  3. Run "dotrequirements login" for cloud features (push/pull, coverage, AI)');
-    }
 }
 /**
- * Connect to existing project flow
+ * INIT-6, INIT-16: Connect to an existing project
  */
-async function connectExistingProjectFlow(cwd, envPath) {
-    // INIT-6.0: Check if user is authenticated, prompt to log in if not
-    let isAuthenticated = await hasValidTokens();
-    if (!isAuthenticated) {
-        const shouldLogin = await promptConfirm('You need to authenticate to connect to an existing project. Log in now?', true);
-        if (!shouldLogin) {
-            console.log('Aborted.');
-            return;
-        }
-        // INIT-6.1: Initiate OAuth login flow inline
-        try {
-            console.log();
-            await executeOAuthFlow();
-            console.log();
-            isAuthenticated = true;
-        }
-        catch (error) {
-            console.error('\nAuthentication failed:', error instanceof Error ? error.message : String(error));
-            console.log('Please try running "dotrequirements login" separately.\n');
-            return;
-        }
-    }
-    // Set up authenticated client
-    const tokens = await getTokens();
-    if (!tokens) {
-        throw new Error('Authentication tokens not found');
-    }
-    const client = new ConvexHttpClient(getConvexUrl());
-    client.setAuth(tokens.accessToken);
-    // INIT-6.2: Select team
-    const selectedTeamId = await selectTeamFromList(client);
-    if (!selectedTeamId) {
-        console.log('Aborted.');
-        return;
-    }
-    // INIT-6.3: Select project
-    const selectedProject = await selectProject(client, selectedTeamId);
+async function connectExistingProjectFlow(cwd, client, team) {
+    // INIT-6.0, INIT-16.0: Select project from team
+    const selectedProject = await selectProject(client, team.teamId);
     if (!selectedProject) {
-        console.log('Aborted.');
+        console.log('Initialization cancelled.');
         return;
     }
-    // INIT-6.4: Get or create secret for this project
+    // AUTHZ-3: Prompt for secret expiry (paid tier only, if creating new secret)
+    const expiryDays = await promptExpiryDays(team.tier);
+    // INIT-16.1: Get or create secret for this project
     console.log('\nGetting project credentials...');
-    const secretResult = await getOrCreateProjectSecret(client, selectedProject.projectId);
+    const secretResult = await getOrCreateProjectSecret(client, selectedProject.projectId, expiryDays);
     const projectId = selectedProject.projectSlug || selectedProject.projectId;
     const secret = secretResult.secret;
     if (secretResult.created) {
@@ -237,118 +259,39 @@ async function connectExistingProjectFlow(cwd, envPath) {
     else {
         console.log('✓ Retrieved existing project secret');
     }
-    // Write .env.local
-    const shouldContinue = await writeEnvFile(envPath, projectId, secret);
-    if (!shouldContinue) {
-        // User declined to continue - abort init
-        return;
-    }
-    // Reload env file so newly written credentials are available to pullCommand
-    // Use force=true to overwrite any previously cached values
-    loadEnvFile(cwd, true);
-    // Create .requirements/ directory
+    // INIT-6.1: Write credentials to project-settings.json
+    writeProjectSettings(cwd, { projectId, projectSecret: secret });
+    console.log('✓ Wrote credentials to .requirements/project-settings.json');
+    // Create directory structure
     await createRequirementsDirectory(cwd, projectId);
     // Update .gitignore
     ensureGitignore(cwd);
     console.log('✓ Updated .gitignore\n');
-    // Pull existing requirements from cloud
+    // INIT-6.2: Pull existing requirements from cloud
     console.log('Pulling requirements from cloud...');
     await pullCommand({ project: projectId });
     console.log(`\n✓ Successfully connected to project: ${selectedProject.projectName}`);
     console.log(`  Project ID: ${projectId}`);
+    // INIT-6.3: Show guidance
     console.log('\nNext steps:');
     console.log('  1. Review the requirements in .requirements/');
     console.log('  2. Add the test harness to your test setup (see README)');
 }
 /**
- * Write .env.local file with confirmation if it already exists
- * Returns true if credentials were written or user chose to continue with existing
- * Returns false if user aborted
- */
-async function writeEnvFile(envPath, projectId, secret) {
-    const newEnvLines = [
-        '# dot•requirements configuration',
-        `DOTREQUIREMENTS_PROJECT_ID=${projectId}`,
-        `DOTREQUIREMENTS_PROJECT_SECRET=${secret}`,
-    ];
-    if (fs.existsSync(envPath)) {
-        // Read existing content
-        const existingContent = fs.readFileSync(envPath, 'utf-8');
-        // Check if dotrequirements variables already exist
-        const hasProjectId = existingContent.includes('DOTREQUIREMENTS_PROJECT_ID');
-        const hasProjectSecret = existingContent.includes('DOTREQUIREMENTS_PROJECT_SECRET');
-        if (hasProjectId || hasProjectSecret) {
-            // INIT-2.0: Ask if user wants to update existing values
-            const shouldUpdate = await promptConfirm(`.env.local already contains ${brand} configuration. Update it?`, false);
-            if (!shouldUpdate) {
-                // INIT-2.1: Ask if user wants to continue with existing credentials
-                const shouldContinue = await promptConfirm('Continue with existing credentials?', true);
-                if (!shouldContinue) {
-                    // INIT-2.3: User declined to continue - abort
-                    console.log('Aborted.');
-                    return false;
-                }
-                // INIT-2.2: User wants to continue with existing credentials
-                console.log('Continuing with existing credentials...');
-                return true;
-            }
-            // Remove old dotrequirements lines
-            const lines = existingContent.split('\n');
-            const filteredLines = lines.filter(line => !line.includes('DOTREQUIREMENTS_PROJECT_ID') &&
-                !line.includes('DOTREQUIREMENTS_PROJECT_SECRET') &&
-                !(line.trim() === '# dotrequirements configuration') &&
-                !(line.trim() === '# dot•requirements configuration'));
-            // Append new configuration
-            const updatedContent = filteredLines.join('\n').trimEnd() + '\n\n' + newEnvLines.join('\n') + '\n';
-            fs.writeFileSync(envPath, updatedContent);
-            console.log(`✓ Updated ${brand} configuration in .env.local`);
-            return true;
-        }
-        else {
-            // File exists but doesn't have dotrequirements config - just append
-            const shouldAppend = await promptConfirm(`.env.local already exists. Add ${brand} configuration to it?`, true);
-            if (!shouldAppend) {
-                console.log('\nSkipped writing to .env.local. Please add these values manually:');
-                console.log(`  DOTREQUIREMENTS_PROJECT_ID=${projectId}`);
-                console.log(`  DOTREQUIREMENTS_PROJECT_SECRET=${secret}\n`);
-                return true; // Continue with init even though we didn't write the file
-            }
-            // Append to existing file
-            const appendContent = '\n' + newEnvLines.join('\n') + '\n';
-            fs.appendFileSync(envPath, appendContent);
-            console.log(`✓ Added ${brand} configuration to .env.local`);
-            return true;
-        }
-    }
-    else {
-        // File doesn't exist - create it
-        const envContent = newEnvLines.join('\n') + '\n';
-        fs.writeFileSync(envPath, envContent);
-        console.log('✓ Wrote configuration to .env.local');
-        return true;
-    }
-}
-/**
- * Create .requirements/ directory with confirmation if it already exists
+ * INIT-5: Create .requirements/ directory with README and example
  */
 async function createRequirementsDirectory(cwd, projectId) {
     const requirementsDir = path.join(cwd, '.requirements');
-    if (fs.existsSync(requirementsDir)) {
-        const shouldOverwrite = await promptConfirm('.requirements/ directory already exists. Continue?', true);
-        if (!shouldOverwrite) {
-            console.log('Skipped creating .requirements/ directory');
-            return;
-        }
-    }
-    else {
+    // Directory may already exist from writeProjectSettings
+    if (!fs.existsSync(requirementsDir)) {
         fs.mkdirSync(requirementsDir, { recursive: true });
         console.log('✓ Created .requirements/ directory');
     }
-    // Always create/update README
+    // INIT-5.0: Always create/update README
     const readmePath = path.join(requirementsDir, 'README.md');
     fs.writeFileSync(readmePath, generateRequirementsReadme());
     console.log('✓ Created .requirements/README.md');
-    // Create example.requirements.md (INIT-5.1)
+    // INIT-5.1: Create example.requirements.md
     const examplePath = path.join(requirementsDir, 'example.requirements.md');
     if (!fs.existsSync(examplePath)) {
         fs.writeFileSync(examplePath, generateExampleRequirements(projectId));

package/dist/commands/link.d.ts

@@ -1,15 +1,14 @@
 /**
- * Link command - connect local environment to an existing project.
+ * Link command - connect or reconnect local project to cloud.
  *
- * Flow:
- * 1. Check authentication (prompt to login if not)
- * 2. Fetch user's teams with usage info
- * 3. Let user select a team
- * 4. Fetch projects for that team
- * 5. Let user select a project
- * 6. Get or create user's secret for that project
- * 7. Write credentials to .env.local
- * 8. Optionally pull requirements
+ * Requirements:
+ * - LINK-1: Requires existing .requirements/ folder
+ * - LINK-2: Offers refresh when credentials exist
+ * - LINK-3: Uses inline OAuth (no persistent tokens)
+ * - LINK-4, LINK-5: Team and project selection
+ * - LINK-6: Saves credentials to project-settings.json
+ * - LINK-7: Optionally pulls requirements
+ * - LINK-8: Handles network errors gracefully
  */
 export declare function linkCommand(): Promise<void>;
 //# sourceMappingURL=link.d.ts.map