hale-commenting-system 2.0.4 → 2.1.1

package/README.md

@@ -20,7 +20,7 @@ After installation, the onboarding flow will automatically start to help you con
 
 ## Requirements
 
-- PatternFly Seed project
+- PatternFly Seed project with PatternFly v6+ (`@patternfly/react-core` ^6.0.0)
 - GitHub account with OAuth app
 - Jira access (Red Hat Jira: issues.redhat.com)
 

package/bin/detect.d.ts

@@ -1 +1,10 @@
 export declare function detectPatternFlySeed(): boolean;
+export interface GitRemoteInfo {
+    owner?: string;
+    repo?: string;
+    url?: string;
+    isFork?: boolean;
+}
+export declare function detectGitRemote(): GitRemoteInfo | null;
+export type ProjectSetupType = 'forked' | 'cloned' | 'unknown' | 'none';
+export declare function detectProjectSetup(): ProjectSetupType;

package/bin/detect.js

@@ -34,8 +34,11 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectPatternFlySeed = detectPatternFlySeed;
+exports.detectGitRemote = detectGitRemote;
+exports.detectProjectSetup = detectProjectSetup;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
 function detectPatternFlySeed() {
     const cwd = process.cwd();
     // Check for webpack config files
@@ -60,3 +63,72 @@ function detectPatternFlySeed() {
     }
     return hasWebpack && hasAppDir && hasPatternFly;
 }
+function detectGitRemote() {
+    const cwd = process.cwd();
+    // Check if .git exists
+    if (!fs.existsSync(path.join(cwd, '.git'))) {
+        return null;
+    }
+    try {
+        // Get remote URL
+        const remoteUrl = (0, child_process_1.execSync)('git remote get-url origin', {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['ignore', 'pipe', 'ignore']
+        }).trim();
+        if (!remoteUrl) {
+            return null;
+        }
+        // Parse GitHub URL (supports https://, git@, and ssh formats)
+        // https://github.com/owner/repo.git
+        // git@github.com:owner/repo.git
+        // ssh://git@github.com/owner/repo.git
+        const githubMatch = remoteUrl.match(/github\.com[/:]([^/]+)\/([^/]+?)(?:\.git)?$/);
+        if (githubMatch) {
+            const owner = githubMatch[1];
+            const repo = githubMatch[2].replace(/\.git$/, '');
+            // Try to detect if it's a fork by checking if upstream exists
+            let isFork = false;
+            try {
+                (0, child_process_1.execSync)('git remote get-url upstream', {
+                    cwd,
+                    encoding: 'utf-8',
+                    stdio: ['ignore', 'pipe', 'ignore']
+                });
+                isFork = true;
+            }
+            catch {
+                // No upstream remote, might still be a fork but we can't tell
+                // Check if repo name matches patternfly-react-seed (likely a fork)
+                isFork = repo.includes('patternfly-react-seed') || repo.includes('pfseed');
+            }
+            return {
+                owner,
+                repo,
+                url: remoteUrl,
+                isFork
+            };
+        }
+    }
+    catch (error) {
+        // Git command failed or not a git repo
+        return null;
+    }
+    return null;
+}
+function detectProjectSetup() {
+    const gitInfo = detectGitRemote();
+    if (!gitInfo) {
+        return 'none';
+    }
+    // Check if it looks like a fork (has patternfly-react-seed in name or has upstream)
+    if (gitInfo.isFork || gitInfo.repo?.includes('patternfly-react-seed')) {
+        return 'forked';
+    }
+    // Check if it's a clone of the original
+    if (gitInfo.owner === 'patternfly' && gitInfo.repo === 'patternfly-react-seed') {
+        return 'cloned';
+    }
+    // Has git remote but unclear
+    return 'unknown';
+}

package/bin/generators.js

@@ -121,8 +121,8 @@ async function integrateIntoProject() {
         return;
     }
     // Read the template
-    // In compiled output, templates will be in the package root
-    const packageRoot = path.resolve(__dirname, '../../..');
+    // In compiled output, templates are in the package root (same level as bin/)
+    const packageRoot = path.resolve(__dirname, '..');
     const templatePath = path.join(packageRoot, 'templates', 'webpack-middleware.js');
     if (!fs.existsSync(templatePath)) {
         console.log('   ⚠️  Template file not found. Manual integration required.');

package/bin/onboarding.js

@@ -40,13 +40,207 @@ exports.runOnboarding = runOnboarding;
 const inquirer_1 = __importDefault(require("inquirer"));
 const validators = __importStar(require("./validators"));
 const generators = __importStar(require("./generators"));
+const detect_1 = require("./detect");
 async function runOnboarding() {
-    console.log('Welcome to Hale Commenting System!');
-    console.log('This setup will guide you through connecting GitHub and Jira.\n');
-    // Step 1: GitHub OAuth Setup
-    console.log('📦 Step 1: GitHub OAuth Setup\n');
-    console.log('You\'ll need to create a GitHub OAuth App if you haven\'t already.');
-    console.log('Visit: https://github.com/settings/developers\n');
+    // Welcome & Explanation
+    console.log('🚀 Welcome to Hale Commenting System!\n');
+    console.log('This commenting system allows you to:');
+    console.log('  • Add comments directly on your design pages');
+    console.log('  • Sync comments with GitHub Issues');
+    console.log('  • Link Jira tickets to pages');
+    console.log('  • Store design goals and context\n');
+    console.log('Why GitHub?');
+    console.log('  We use GitHub Issues to store and sync all comments. When you add a comment');
+    console.log('  on a page, it creates a GitHub Issue. This allows comments to persist, sync');
+    console.log('  across devices, and be managed like any other GitHub Issue.\n');
+    console.log('Why Jira?');
+    console.log('  You can link Jira tickets to specific pages or sections. This helps connect');
+    console.log('  design work to development tracking and provides context for reviewers.\n');
+    // Step 1: Project Status Check
+    console.log('📋 Step 1: Project Setup Check\n');
+    const hasProject = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'hasProject',
+            message: 'Do you have a PatternFly Seed project set up locally?',
+            choices: [
+                { name: 'Yes, I have it set up', value: 'yes' },
+                { name: 'No, I need help setting it up', value: 'no' }
+            ]
+        }
+    ]);
+    if (hasProject.hasProject === 'no') {
+        console.log('\n📚 Setting up PatternFly Seed:\n');
+        console.log('1. Fork the PatternFly Seed repository:');
+        console.log('   Visit: https://github.com/patternfly/patternfly-react-seed');
+        console.log('   Click "Fork" in the top right\n');
+        console.log('2. Clone your fork locally:');
+        console.log('   git clone https://github.com/YOUR_USERNAME/patternfly-react-seed.git');
+        console.log('   cd patternfly-react-seed\n');
+        console.log('3. Install dependencies:');
+        console.log('   npm install\n');
+        console.log('4. Run this setup again:');
+        console.log('   npx hale-commenting-system init\n');
+        process.exit(0);
+    }
+    // Check if it's actually a PF Seed project
+    if (!(0, detect_1.detectPatternFlySeed)()) {
+        console.error('❌ Error: This doesn\'t appear to be a PatternFly Seed project.');
+        console.error('Please run this command from a PatternFly Seed project directory.');
+        process.exit(1);
+    }
+    // Detect project setup type
+    const gitInfo = (0, detect_1.detectGitRemote)();
+    const setupType = (0, detect_1.detectProjectSetup)();
+    let projectSetup = 'unknown';
+    let owner = gitInfo?.owner;
+    let repo = gitInfo?.repo;
+    if (setupType === 'none' || !gitInfo) {
+        // No git remote - need to set up
+        const setupAnswer = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'setupType',
+                message: 'How did you set up your PatternFly Seed project?',
+                choices: [
+                    { name: 'I forked the PatternFly Seed repo on GitHub', value: 'forked' },
+                    { name: 'I cloned the PatternFly Seed repo locally', value: 'cloned' },
+                    { name: 'I\'m not sure', value: 'unknown' }
+                ]
+            }
+        ]);
+        projectSetup = setupAnswer.setupType;
+    }
+    else {
+        projectSetup = setupType;
+    }
+    // Handle different setup types
+    if (projectSetup === 'forked') {
+        // Ask for owner/repo if not detected
+        if (!owner || !repo) {
+            const forkAnswers = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'owner',
+                    message: 'What is your GitHub username or organization name?',
+                    default: owner,
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Owner is required';
+                        return true;
+                    }
+                },
+                {
+                    type: 'input',
+                    name: 'repo',
+                    message: 'What is the name of your forked repository?',
+                    default: repo,
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Repository name is required';
+                        return true;
+                    }
+                }
+            ]);
+            owner = forkAnswers.owner;
+            repo = forkAnswers.repo;
+        }
+        else {
+            console.log(`\n✅ Detected repository: ${owner}/${repo}\n`);
+        }
+    }
+    else if (projectSetup === 'cloned') {
+        console.log('\n📝 Since you cloned the repo, you\'ll need to create your own GitHub repository.\n');
+        console.log('Steps:');
+        console.log('1. Create a new repository on GitHub');
+        console.log('2. Add it as a remote: git remote add origin <your-repo-url>');
+        console.log('3. Push your code: git push -u origin main\n');
+        const hasCreated = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'created',
+                message: 'Have you created and pushed to your GitHub repository?',
+                default: false
+            }
+        ]);
+        if (!hasCreated.created) {
+            console.log('\nPlease complete the steps above and run this setup again.');
+            process.exit(0);
+        }
+        // Ask for owner/repo
+        const repoAnswers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'owner',
+                message: 'What is your GitHub username or organization name?',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Owner is required';
+                    return true;
+                }
+            },
+            {
+                type: 'input',
+                name: 'repo',
+                message: 'What is the name of your GitHub repository?',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Repository name is required';
+                    return true;
+                }
+            }
+        ]);
+        owner = repoAnswers.owner;
+        repo = repoAnswers.repo;
+    }
+    else if (projectSetup === 'unknown') {
+        // Try to detect from git
+        if (gitInfo && gitInfo.owner && gitInfo.repo) {
+            console.log(`\n✅ Detected repository: ${gitInfo.owner}/${gitInfo.repo}\n`);
+            owner = gitInfo.owner;
+            repo = gitInfo.repo;
+        }
+        else {
+            // Ask for owner/repo
+            const repoAnswers = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'owner',
+                    message: 'What is your GitHub username or organization name?',
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Owner is required';
+                        return true;
+                    }
+                },
+                {
+                    type: 'input',
+                    name: 'repo',
+                    message: 'What is the name of your GitHub repository?',
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Repository name is required';
+                        return true;
+                    }
+                }
+            ]);
+            owner = repoAnswers.owner;
+            repo = repoAnswers.repo;
+        }
+    }
+    // Step 2: GitHub OAuth Setup
+    console.log('\n📦 Step 2: GitHub OAuth Setup\n');
+    console.log('To sync comments with GitHub Issues, we need to authenticate with GitHub.');
+    console.log('This requires creating a GitHub OAuth App.\n');
+    console.log('Instructions:');
+    console.log('1. Visit: https://github.com/settings/developers');
+    console.log('2. Click "New OAuth App"');
+    console.log('3. Fill in the form:');
+    console.log('   - Application name: Your app name (e.g., "My Design Comments")');
+    console.log('   - Homepage URL: http://localhost:9000 (or your dev server URL)');
+    console.log('   - Authorization callback URL: http://localhost:9000/api/github-oauth-callback');
+    console.log('4. Click "Register application"');
+    console.log('5. Copy the Client ID and generate a Client Secret\n');
     const githubAnswers = await inquirer_1.default.prompt([
         {
             type: 'input',
@@ -62,50 +256,39 @@ async function runOnboarding() {
             type: 'password',
             name: 'clientSecret',
             message: 'GitHub OAuth Client Secret:',
+            mask: '*',
             validate: (input) => {
                 if (!input.trim())
                     return 'Client Secret is required';
                 return true;
             }
-        },
-        {
-            type: 'input',
-            name: 'owner',
-            message: 'GitHub Owner (username or org):',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Owner is required';
-                return true;
-            }
-        },
-        {
-            type: 'input',
-            name: 'repo',
-            message: 'GitHub Repository name:',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Repository name is required';
-                return true;
-            }
         }
     ]);
     // Validate GitHub credentials
     console.log('\n🔍 Validating GitHub credentials...');
-    const githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, githubAnswers.owner, githubAnswers.repo);
+    const githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, owner, repo);
     if (!githubValid) {
         console.error('❌ GitHub validation failed. Please check your credentials and try again.');
         process.exit(1);
     }
     console.log('✅ GitHub credentials validated!\n');
-    // Step 2: Jira Setup
-    console.log('🎫 Step 2: Jira Setup\n');
-    console.log('For Red Hat Jira, generate a Personal Access Token from:');
-    console.log('https://issues.redhat.com/secure/ViewProfile.jspa\n');
+    // Step 3: Jira Setup
+    console.log('🎫 Step 3: Jira Setup\n');
+    console.log('You can link Jira tickets to pages in your design. This helps connect');
+    console.log('design work to development tracking.\n');
+    console.log('For Red Hat Jira, generate a Personal Access Token:');
+    console.log('1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa');
+    console.log('2. Click "Personal Access Tokens" in the left sidebar');
+    console.log('3. Click "Create token"');
+    console.log('4. Give it a name (e.g., "Hale Commenting System")');
+    console.log('5. Remove expiration (or set a long expiration)');
+    console.log('6. Click "Create" and copy the token\n');
+    console.log('Note: We use Bearer token authentication (no email required for Red Hat Jira).\n');
     const jiraAnswers = await inquirer_1.default.prompt([
         {
             type: 'input',
             name: 'baseUrl',
-            message: 'Jira Base URL:',
+            message: 'Jira Base URL (press Enter for Red Hat Jira):',
             default: 'https://issues.redhat.com',
             validate: (input) => {
                 if (!input.trim())
@@ -119,16 +302,11 @@ async function runOnboarding() {
                 }
             }
         },
-        {
-            type: 'input',
-            name: 'email',
-            message: 'Jira Email (optional, leave blank if using Bearer token):',
-            default: ''
-        },
         {
             type: 'password',
             name: 'apiToken',
             message: 'Jira API Token:',
+            mask: '*',
             validate: (input) => {
                 if (!input.trim())
                     return 'API Token is required';
@@ -138,33 +316,34 @@ async function runOnboarding() {
     ]);
     // Validate Jira credentials
     console.log('\n🔍 Validating Jira credentials...');
-    const jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, jiraAnswers.email || undefined);
+    const jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, undefined // No email for Bearer token
+    );
     if (!jiraValid) {
         console.error('❌ Jira validation failed. Please check your credentials and try again.');
         process.exit(1);
     }
     console.log('✅ Jira credentials validated!\n');
-    // Step 3: Generate files
-    console.log('📝 Step 3: Generating configuration files...\n');
+    // Step 4: Generate files
+    console.log('📝 Step 4: Generating configuration files...\n');
     await generators.generateFiles({
         github: {
             clientId: githubAnswers.clientId,
             clientSecret: githubAnswers.clientSecret,
-            owner: githubAnswers.owner,
-            repo: githubAnswers.repo
+            owner: owner,
+            repo: repo
         },
         jira: {
             baseUrl: jiraAnswers.baseUrl,
             apiToken: jiraAnswers.apiToken,
-            email: jiraAnswers.email || undefined
+            email: undefined // Not used for Bearer token
         }
     });
-    // Step 4: Integrate into project
-    console.log('🔧 Step 4: Integrating into PatternFly Seed project...\n');
+    // Step 5: Integrate into project
+    console.log('🔧 Step 5: Integrating into PatternFly Seed project...\n');
     await generators.integrateIntoProject();
     console.log('\n✅ Setup complete!');
     console.log('\nNext steps:');
-    console.log('1. Review the generated .env and .env.server files');
-    console.log('2. Restart your dev server: npm run start:dev');
-    console.log('3. The commenting system will be available in your app!\n');
+    console.log('1. Start your dev server: npm run start:dev');
+    console.log('   (If it\'s already running, restart it to load the new configuration)');
+    console.log('2. The commenting system will be available in your app!\n');
 }

package/dist/cli/detect.d.ts

@@ -1 +1,10 @@
 export declare function detectPatternFlySeed(): boolean;
+export interface GitRemoteInfo {
+    owner?: string;
+    repo?: string;
+    url?: string;
+    isFork?: boolean;
+}
+export declare function detectGitRemote(): GitRemoteInfo | null;
+export type ProjectSetupType = 'forked' | 'cloned' | 'unknown' | 'none';
+export declare function detectProjectSetup(): ProjectSetupType;

package/dist/cli/detect.js

@@ -34,8 +34,11 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectPatternFlySeed = detectPatternFlySeed;
+exports.detectGitRemote = detectGitRemote;
+exports.detectProjectSetup = detectProjectSetup;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
 function detectPatternFlySeed() {
     const cwd = process.cwd();
     // Check for webpack config files
@@ -60,3 +63,72 @@ function detectPatternFlySeed() {
     }
     return hasWebpack && hasAppDir && hasPatternFly;
 }
+function detectGitRemote() {
+    const cwd = process.cwd();
+    // Check if .git exists
+    if (!fs.existsSync(path.join(cwd, '.git'))) {
+        return null;
+    }
+    try {
+        // Get remote URL
+        const remoteUrl = (0, child_process_1.execSync)('git remote get-url origin', {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['ignore', 'pipe', 'ignore']
+        }).trim();
+        if (!remoteUrl) {
+            return null;
+        }
+        // Parse GitHub URL (supports https://, git@, and ssh formats)
+        // https://github.com/owner/repo.git
+        // git@github.com:owner/repo.git
+        // ssh://git@github.com/owner/repo.git
+        const githubMatch = remoteUrl.match(/github\.com[/:]([^/]+)\/([^/]+?)(?:\.git)?$/);
+        if (githubMatch) {
+            const owner = githubMatch[1];
+            const repo = githubMatch[2].replace(/\.git$/, '');
+            // Try to detect if it's a fork by checking if upstream exists
+            let isFork = false;
+            try {
+                (0, child_process_1.execSync)('git remote get-url upstream', {
+                    cwd,
+                    encoding: 'utf-8',
+                    stdio: ['ignore', 'pipe', 'ignore']
+                });
+                isFork = true;
+            }
+            catch {
+                // No upstream remote, might still be a fork but we can't tell
+                // Check if repo name matches patternfly-react-seed (likely a fork)
+                isFork = repo.includes('patternfly-react-seed') || repo.includes('pfseed');
+            }
+            return {
+                owner,
+                repo,
+                url: remoteUrl,
+                isFork
+            };
+        }
+    }
+    catch (error) {
+        // Git command failed or not a git repo
+        return null;
+    }
+    return null;
+}
+function detectProjectSetup() {
+    const gitInfo = detectGitRemote();
+    if (!gitInfo) {
+        return 'none';
+    }
+    // Check if it looks like a fork (has patternfly-react-seed in name or has upstream)
+    if (gitInfo.isFork || gitInfo.repo?.includes('patternfly-react-seed')) {
+        return 'forked';
+    }
+    // Check if it's a clone of the original
+    if (gitInfo.owner === 'patternfly' && gitInfo.repo === 'patternfly-react-seed') {
+        return 'cloned';
+    }
+    // Has git remote but unclear
+    return 'unknown';
+}

package/dist/cli/generators.js

@@ -121,8 +121,8 @@ async function integrateIntoProject() {
         return;
     }
     // Read the template
-    // In compiled output, templates will be in the package root
-    const packageRoot = path.resolve(__dirname, '../../..');
+    // In compiled output, templates are in the package root (same level as bin/)
+    const packageRoot = path.resolve(__dirname, '..');
     const templatePath = path.join(packageRoot, 'templates', 'webpack-middleware.js');
     if (!fs.existsSync(templatePath)) {
         console.log('   ⚠️  Template file not found. Manual integration required.');

package/dist/cli/onboarding.js

@@ -40,13 +40,207 @@ exports.runOnboarding = runOnboarding;
 const inquirer_1 = __importDefault(require("inquirer"));
 const validators = __importStar(require("./validators"));
 const generators = __importStar(require("./generators"));
+const detect_1 = require("./detect");
 async function runOnboarding() {
-    console.log('Welcome to Hale Commenting System!');
-    console.log('This setup will guide you through connecting GitHub and Jira.\n');
-    // Step 1: GitHub OAuth Setup
-    console.log('📦 Step 1: GitHub OAuth Setup\n');
-    console.log('You\'ll need to create a GitHub OAuth App if you haven\'t already.');
-    console.log('Visit: https://github.com/settings/developers\n');
+    // Welcome & Explanation
+    console.log('🚀 Welcome to Hale Commenting System!\n');
+    console.log('This commenting system allows you to:');
+    console.log('  • Add comments directly on your design pages');
+    console.log('  • Sync comments with GitHub Issues');
+    console.log('  • Link Jira tickets to pages');
+    console.log('  • Store design goals and context\n');
+    console.log('Why GitHub?');
+    console.log('  We use GitHub Issues to store and sync all comments. When you add a comment');
+    console.log('  on a page, it creates a GitHub Issue. This allows comments to persist, sync');
+    console.log('  across devices, and be managed like any other GitHub Issue.\n');
+    console.log('Why Jira?');
+    console.log('  You can link Jira tickets to specific pages or sections. This helps connect');
+    console.log('  design work to development tracking and provides context for reviewers.\n');
+    // Step 1: Project Status Check
+    console.log('📋 Step 1: Project Setup Check\n');
+    const hasProject = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'hasProject',
+            message: 'Do you have a PatternFly Seed project set up locally?',
+            choices: [
+                { name: 'Yes, I have it set up', value: 'yes' },
+                { name: 'No, I need help setting it up', value: 'no' }
+            ]
+        }
+    ]);
+    if (hasProject.hasProject === 'no') {
+        console.log('\n📚 Setting up PatternFly Seed:\n');
+        console.log('1. Fork the PatternFly Seed repository:');
+        console.log('   Visit: https://github.com/patternfly/patternfly-react-seed');
+        console.log('   Click "Fork" in the top right\n');
+        console.log('2. Clone your fork locally:');
+        console.log('   git clone https://github.com/YOUR_USERNAME/patternfly-react-seed.git');
+        console.log('   cd patternfly-react-seed\n');
+        console.log('3. Install dependencies:');
+        console.log('   npm install\n');
+        console.log('4. Run this setup again:');
+        console.log('   npx hale-commenting-system init\n');
+        process.exit(0);
+    }
+    // Check if it's actually a PF Seed project
+    if (!(0, detect_1.detectPatternFlySeed)()) {
+        console.error('❌ Error: This doesn\'t appear to be a PatternFly Seed project.');
+        console.error('Please run this command from a PatternFly Seed project directory.');
+        process.exit(1);
+    }
+    // Detect project setup type
+    const gitInfo = (0, detect_1.detectGitRemote)();
+    const setupType = (0, detect_1.detectProjectSetup)();
+    let projectSetup = 'unknown';
+    let owner = gitInfo?.owner;
+    let repo = gitInfo?.repo;
+    if (setupType === 'none' || !gitInfo) {
+        // No git remote - need to set up
+        const setupAnswer = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'setupType',
+                message: 'How did you set up your PatternFly Seed project?',
+                choices: [
+                    { name: 'I forked the PatternFly Seed repo on GitHub', value: 'forked' },
+                    { name: 'I cloned the PatternFly Seed repo locally', value: 'cloned' },
+                    { name: 'I\'m not sure', value: 'unknown' }
+                ]
+            }
+        ]);
+        projectSetup = setupAnswer.setupType;
+    }
+    else {
+        projectSetup = setupType;
+    }
+    // Handle different setup types
+    if (projectSetup === 'forked') {
+        // Ask for owner/repo if not detected
+        if (!owner || !repo) {
+            const forkAnswers = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'owner',
+                    message: 'What is your GitHub username or organization name?',
+                    default: owner,
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Owner is required';
+                        return true;
+                    }
+                },
+                {
+                    type: 'input',
+                    name: 'repo',
+                    message: 'What is the name of your forked repository?',
+                    default: repo,
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Repository name is required';
+                        return true;
+                    }
+                }
+            ]);
+            owner = forkAnswers.owner;
+            repo = forkAnswers.repo;
+        }
+        else {
+            console.log(`\n✅ Detected repository: ${owner}/${repo}\n`);
+        }
+    }
+    else if (projectSetup === 'cloned') {
+        console.log('\n📝 Since you cloned the repo, you\'ll need to create your own GitHub repository.\n');
+        console.log('Steps:');
+        console.log('1. Create a new repository on GitHub');
+        console.log('2. Add it as a remote: git remote add origin <your-repo-url>');
+        console.log('3. Push your code: git push -u origin main\n');
+        const hasCreated = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'created',
+                message: 'Have you created and pushed to your GitHub repository?',
+                default: false
+            }
+        ]);
+        if (!hasCreated.created) {
+            console.log('\nPlease complete the steps above and run this setup again.');
+            process.exit(0);
+        }
+        // Ask for owner/repo
+        const repoAnswers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'owner',
+                message: 'What is your GitHub username or organization name?',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Owner is required';
+                    return true;
+                }
+            },
+            {
+                type: 'input',
+                name: 'repo',
+                message: 'What is the name of your GitHub repository?',
+                validate: (input) => {
+                    if (!input.trim())
+                        return 'Repository name is required';
+                    return true;
+                }
+            }
+        ]);
+        owner = repoAnswers.owner;
+        repo = repoAnswers.repo;
+    }
+    else if (projectSetup === 'unknown') {
+        // Try to detect from git
+        if (gitInfo && gitInfo.owner && gitInfo.repo) {
+            console.log(`\n✅ Detected repository: ${gitInfo.owner}/${gitInfo.repo}\n`);
+            owner = gitInfo.owner;
+            repo = gitInfo.repo;
+        }
+        else {
+            // Ask for owner/repo
+            const repoAnswers = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'owner',
+                    message: 'What is your GitHub username or organization name?',
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Owner is required';
+                        return true;
+                    }
+                },
+                {
+                    type: 'input',
+                    name: 'repo',
+                    message: 'What is the name of your GitHub repository?',
+                    validate: (input) => {
+                        if (!input.trim())
+                            return 'Repository name is required';
+                        return true;
+                    }
+                }
+            ]);
+            owner = repoAnswers.owner;
+            repo = repoAnswers.repo;
+        }
+    }
+    // Step 2: GitHub OAuth Setup
+    console.log('\n📦 Step 2: GitHub OAuth Setup\n');
+    console.log('To sync comments with GitHub Issues, we need to authenticate with GitHub.');
+    console.log('This requires creating a GitHub OAuth App.\n');
+    console.log('Instructions:');
+    console.log('1. Visit: https://github.com/settings/developers');
+    console.log('2. Click "New OAuth App"');
+    console.log('3. Fill in the form:');
+    console.log('   - Application name: Your app name (e.g., "My Design Comments")');
+    console.log('   - Homepage URL: http://localhost:9000 (or your dev server URL)');
+    console.log('   - Authorization callback URL: http://localhost:9000/api/github-oauth-callback');
+    console.log('4. Click "Register application"');
+    console.log('5. Copy the Client ID and generate a Client Secret\n');
     const githubAnswers = await inquirer_1.default.prompt([
         {
             type: 'input',
@@ -62,50 +256,39 @@ async function runOnboarding() {
             type: 'password',
             name: 'clientSecret',
             message: 'GitHub OAuth Client Secret:',
+            mask: '*',
             validate: (input) => {
                 if (!input.trim())
                     return 'Client Secret is required';
                 return true;
             }
-        },
-        {
-            type: 'input',
-            name: 'owner',
-            message: 'GitHub Owner (username or org):',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Owner is required';
-                return true;
-            }
-        },
-        {
-            type: 'input',
-            name: 'repo',
-            message: 'GitHub Repository name:',
-            validate: (input) => {
-                if (!input.trim())
-                    return 'Repository name is required';
-                return true;
-            }
         }
     ]);
     // Validate GitHub credentials
     console.log('\n🔍 Validating GitHub credentials...');
-    const githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, githubAnswers.owner, githubAnswers.repo);
+    const githubValid = await validators.validateGitHubCredentials(githubAnswers.clientId, githubAnswers.clientSecret, owner, repo);
     if (!githubValid) {
         console.error('❌ GitHub validation failed. Please check your credentials and try again.');
         process.exit(1);
     }
     console.log('✅ GitHub credentials validated!\n');
-    // Step 2: Jira Setup
-    console.log('🎫 Step 2: Jira Setup\n');
-    console.log('For Red Hat Jira, generate a Personal Access Token from:');
-    console.log('https://issues.redhat.com/secure/ViewProfile.jspa\n');
+    // Step 3: Jira Setup
+    console.log('🎫 Step 3: Jira Setup\n');
+    console.log('You can link Jira tickets to pages in your design. This helps connect');
+    console.log('design work to development tracking.\n');
+    console.log('For Red Hat Jira, generate a Personal Access Token:');
+    console.log('1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa');
+    console.log('2. Click "Personal Access Tokens" in the left sidebar');
+    console.log('3. Click "Create token"');
+    console.log('4. Give it a name (e.g., "Hale Commenting System")');
+    console.log('5. Remove expiration (or set a long expiration)');
+    console.log('6. Click "Create" and copy the token\n');
+    console.log('Note: We use Bearer token authentication (no email required for Red Hat Jira).\n');
     const jiraAnswers = await inquirer_1.default.prompt([
         {
             type: 'input',
             name: 'baseUrl',
-            message: 'Jira Base URL:',
+            message: 'Jira Base URL (press Enter for Red Hat Jira):',
             default: 'https://issues.redhat.com',
             validate: (input) => {
                 if (!input.trim())
@@ -119,16 +302,11 @@ async function runOnboarding() {
                 }
             }
         },
-        {
-            type: 'input',
-            name: 'email',
-            message: 'Jira Email (optional, leave blank if using Bearer token):',
-            default: ''
-        },
         {
             type: 'password',
             name: 'apiToken',
             message: 'Jira API Token:',
+            mask: '*',
             validate: (input) => {
                 if (!input.trim())
                     return 'API Token is required';
@@ -138,33 +316,34 @@ async function runOnboarding() {
     ]);
     // Validate Jira credentials
     console.log('\n🔍 Validating Jira credentials...');
-    const jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, jiraAnswers.email || undefined);
+    const jiraValid = await validators.validateJiraCredentials(jiraAnswers.baseUrl, jiraAnswers.apiToken, undefined // No email for Bearer token
+    );
     if (!jiraValid) {
         console.error('❌ Jira validation failed. Please check your credentials and try again.');
         process.exit(1);
     }
     console.log('✅ Jira credentials validated!\n');
-    // Step 3: Generate files
-    console.log('📝 Step 3: Generating configuration files...\n');
+    // Step 4: Generate files
+    console.log('📝 Step 4: Generating configuration files...\n');
     await generators.generateFiles({
         github: {
             clientId: githubAnswers.clientId,
             clientSecret: githubAnswers.clientSecret,
-            owner: githubAnswers.owner,
-            repo: githubAnswers.repo
+            owner: owner,
+            repo: repo
         },
         jira: {
             baseUrl: jiraAnswers.baseUrl,
             apiToken: jiraAnswers.apiToken,
-            email: jiraAnswers.email || undefined
+            email: undefined // Not used for Bearer token
         }
     });
-    // Step 4: Integrate into project
-    console.log('🔧 Step 4: Integrating into PatternFly Seed project...\n');
+    // Step 5: Integrate into project
+    console.log('🔧 Step 5: Integrating into PatternFly Seed project...\n');
     await generators.integrateIntoProject();
     console.log('\n✅ Setup complete!');
     console.log('\nNext steps:');
-    console.log('1. Review the generated .env and .env.server files');
-    console.log('2. Restart your dev server: npm run start:dev');
-    console.log('3. The commenting system will be available in your app!\n');
+    console.log('1. Start your dev server: npm run start:dev');
+    console.log('   (If it\'s already running, restart it to load the new configuration)');
+    console.log('2. The commenting system will be available in your app!\n');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hale-commenting-system",
-  "version": "2.0.4",
+  "version": "2.1.1",
   "description": "Commenting system for PatternFly Seed projects with GitHub and Jira integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",