gitpadi 2.0.5 → 2.0.6

package/dist/cli.js

@@ -12,7 +12,7 @@ import { execSync } from 'child_process';
 import boxen from 'boxen';
 import { createSpinner } from 'nanospinner';
 import { Octokit } from '@octokit/rest';
-import { initGitHub, setRepo, getOwner, getRepo, getOctokit, saveConfig, getToken } from './core/github.js';
+import { initGitHub, setRepo, getOwner, getRepo, getOctokit, saveConfig, getToken, getAuthenticatedUser } from './core/github.js';
 import * as issues from './commands/issues.js';
 import * as prs from './commands/prs.js';
 import * as repos from './commands/repos.js';
@@ -157,35 +157,63 @@ async function ensureAuthenticated() {
 /**
  * Ensures we have a target repository (Owner/Repo)
  */
-async function ensureTargetRepo() {
+async function ensureTargetRepo(force = false) {
     let owner = getOwner();
     let repo = getRepo();
-    if (owner && repo) {
+    if (!force && owner && repo) {
         return;
     }
     console.log(neon('\n  📦 Project Targeting — which repo are we working on?\n'));
-    const answers = await inquirer.prompt([
-        {
+    // 1. Get the Owner/Org
+    const { targetOwner } = await inquirer.prompt([{
             type: 'input',
-            name: 'owner',
+            name: 'targetOwner',
             message: cyan('👤 GitHub Owner/Org:'),
-            default: owner || '',
+            default: owner || await getAuthenticatedUser(),
             validate: (v) => v.length > 0 || 'Required',
-        },
-        {
-            type: 'input',
-            name: 'repo',
-            message: cyan('📦 Repository name:'),
-            default: repo || '',
-            validate: (v) => v.length > 0 || 'Required',
-        },
-    ]);
-    setRepo(answers.owner, answers.repo);
-    saveConfig({ token: getToken(), owner: answers.owner, repo: answers.repo });
-    const spinner = createSpinner(dim('Connecting...')).start();
-    await sleep(400);
-    spinner.success({ text: green(`Locked in → ${cyan(`${answers.owner}/${answers.repo}`)}`) });
-    console.log('');
+        }]);
+    // 2. Fetch Repos for that Owner
+    const spin = createSpinner(dim(`Fetching repositories for ${targetOwner}...`)).start();
+    const fetchedRepos = await repos.listRepos({ owner: targetOwner, silent: true });
+    if (fetchedRepos.length > 0) {
+        spin.success({ text: green(`Found ${fetchedRepos.length} repositories for ${targetOwner}`) });
+        const { selectedRepo } = await inquirer.prompt([{
+                type: 'list',
+                name: 'selectedRepo',
+                message: cyan('📦 Select Repository:'),
+                choices: [
+                    ...fetchedRepos.map((r) => ({ name: r.name, value: r.name })),
+                    new inquirer.Separator(),
+                    { name: '✍️  Enter manually...', value: '__manual__' }
+                ],
+                loop: false
+            }]);
+        if (selectedRepo !== '__manual__') {
+            repo = selectedRepo;
+        }
+        else {
+            const { manualRepo } = await inquirer.prompt([{
+                    type: 'input',
+                    name: 'manualRepo',
+                    message: cyan('📦 Repository name:'),
+                    validate: (v) => v.length > 0 || 'Required',
+                }]);
+            repo = manualRepo;
+        }
+    }
+    else {
+        spin.warn({ text: yellow(`No public repositories found for ${targetOwner}.`) });
+        const { manualRepo } = await inquirer.prompt([{
+                type: 'input',
+                name: 'manualRepo',
+                message: cyan('📦 Enter Repository name manually:'),
+                validate: (v) => v.length > 0 || 'Required',
+            }]);
+        repo = manualRepo;
+    }
+    setRepo(targetOwner, repo);
+    saveConfig({ token: getToken(), owner: targetOwner, repo: repo });
+    console.log(green(`\n  ✅ Locked in → ${cyan(`${targetOwner}/${repo}`)}\n`));
 }
 // ── Mode Selector ──────────────────────────────────────────────────────
 async function mainMenu() {
@@ -333,16 +361,7 @@ async function maintainerMenu() {
         if (category === 'back')
             break;
         if (category === 'switch') {
-            await safeMenu(async () => {
-                const a = await inquirer.prompt([
-                    { type: 'input', name: 'owner', message: cyan('👤 New Owner/Org:'), default: getOwner() },
-                    { type: 'input', name: 'repo', message: cyan('📦 New Repo:'), default: getRepo() },
-                ]);
-                setRepo(a.owner, a.repo);
-                const s = createSpinner(dim('Switching...')).start();
-                await sleep(400);
-                s.success({ text: green(`Now targeting ${cyan(`${a.owner}/${a.repo}`)}`) });
-            });
+            await ensureTargetRepo(true);
             continue;
         }
         if (category === 'issues')

package/dist/commands/repos.js

@@ -91,9 +91,23 @@ export async function listRepos(opts) {
     const spinner = !opts.silent ? ora('Fetching repos...').start() : null;
     const octokit = getOctokit();
     try {
-        let repos;
-        if (opts.org) {
-            ({ data: repos } = await octokit.repos.listForOrg({ org: opts.org, per_page: opts.limit || 100, sort: 'updated' }));
+        let repos = [];
+        const owner = opts.org || opts.owner;
+        if (owner) {
+            // Check if it's an org or user
+            try {
+                const { data: entity } = await octokit.users.getByUsername({ username: owner });
+                if (entity.type === 'Organization') {
+                    ({ data: repos } = await octokit.repos.listForOrg({ org: owner, per_page: opts.limit || 100, sort: 'updated' }));
+                }
+                else {
+                    ({ data: repos } = await octokit.repos.listForUser({ username: owner, per_page: opts.limit || 100, sort: 'updated' }));
+                }
+            }
+            catch {
+                // Fallback to org if lookup fails (might be a private org only visible to token)
+                ({ data: repos } = await octokit.repos.listForOrg({ org: owner, per_page: opts.limit || 100, sort: 'updated' }));
+            }
         }
         else {
             ({ data: repos } = await octokit.repos.listForAuthenticatedUser({ per_page: opts.limit || 100, sort: 'updated' }));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitpadi",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "description": "GitPadi — Your AI-powered GitHub management CLI. Create repos, manage issues & PRs, score contributors, and automate everything.",
     "type": "module",
     "bin": {

package/src/cli.ts

@@ -15,7 +15,7 @@ import { execSync } from 'child_process';
 import boxen from 'boxen';
 import { createSpinner } from 'nanospinner';
 import { Octokit } from '@octokit/rest';
-import { initGitHub, setRepo, getOwner, getRepo, getOctokit, loadConfig, saveConfig, getToken } from './core/github.js';
+import { initGitHub, setRepo, getOwner, getRepo, getOctokit, loadConfig, saveConfig, getToken, getAuthenticatedUser } from './core/github.js';
 
 import * as issues from './commands/issues.js';
 import * as prs from './commands/prs.js';
@@ -178,40 +178,70 @@ async function ensureAuthenticated() {
 /**
  * Ensures we have a target repository (Owner/Repo)
  */
-async function ensureTargetRepo() {
+async function ensureTargetRepo(force = false) {
     let owner = getOwner();
     let repo = getRepo();
 
-    if (owner && repo) {
+    if (!force && owner && repo) {
         return;
     }
 
     console.log(neon('\n  📦 Project Targeting — which repo are we working on?\n'));
 
-    const answers = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'owner',
-            message: cyan('👤 GitHub Owner/Org:'),
-            default: owner || '',
-            validate: (v: string) => v.length > 0 || 'Required',
-        },
-        {
+    // 1. Get the Owner/Org
+    const { targetOwner } = await inquirer.prompt([{
+        type: 'input',
+        name: 'targetOwner',
+        message: cyan('👤 GitHub Owner/Org:'),
+        default: owner || await getAuthenticatedUser(),
+        validate: (v: string) => v.length > 0 || 'Required',
+    }]);
+
+    // 2. Fetch Repos for that Owner
+    const spin = createSpinner(dim(`Fetching repositories for ${targetOwner}...`)).start();
+    const fetchedRepos = await repos.listRepos({ owner: targetOwner, silent: true });
+
+    if (fetchedRepos.length > 0) {
+        spin.success({ text: green(`Found ${fetchedRepos.length} repositories for ${targetOwner}`) });
+
+        const { selectedRepo } = await inquirer.prompt([{
+            type: 'list',
+            name: 'selectedRepo',
+            message: cyan('📦 Select Repository:'),
+            choices: [
+                ...fetchedRepos.map((r: any) => ({ name: r.name, value: r.name })),
+                new inquirer.Separator(),
+                { name: '✍️  Enter manually...', value: '__manual__' }
+            ],
+            loop: false
+        }]);
+
+        if (selectedRepo !== '__manual__') {
+            repo = selectedRepo;
+        } else {
+            const { manualRepo } = await inquirer.prompt([{
+                type: 'input',
+                name: 'manualRepo',
+                message: cyan('📦 Repository name:'),
+                validate: (v: string) => v.length > 0 || 'Required',
+            }]);
+            repo = manualRepo;
+        }
+    } else {
+        spin.warn({ text: yellow(`No public repositories found for ${targetOwner}.`) });
+        const { manualRepo } = await inquirer.prompt([{
             type: 'input',
-            name: 'repo',
-            message: cyan('📦 Repository name:'),
-            default: repo || '',
+            name: 'manualRepo',
+            message: cyan('📦 Enter Repository name manually:'),
             validate: (v: string) => v.length > 0 || 'Required',
-        },
-    ]);
+        }]);
+        repo = manualRepo;
+    }
 
-    setRepo(answers.owner, answers.repo);
-    saveConfig({ token: getToken(), owner: answers.owner, repo: answers.repo });
+    setRepo(targetOwner, repo as string);
+    saveConfig({ token: getToken(), owner: targetOwner, repo: repo as string });
 
-    const spinner = createSpinner(dim('Connecting...')).start();
-    await sleep(400);
-    spinner.success({ text: green(`Locked in → ${cyan(`${answers.owner}/${answers.repo}`)}`) });
-    console.log('');
+    console.log(green(`\n  ✅ Locked in → ${cyan(`${targetOwner}/${repo}`)}\n`));
 }
 
 // ── Mode Selector ──────────────────────────────────────────────────────
@@ -365,16 +395,7 @@ async function maintainerMenu() {
         if (category === 'back') break;
 
         if (category === 'switch') {
-            await safeMenu(async () => {
-                const a = await inquirer.prompt([
-                    { type: 'input', name: 'owner', message: cyan('👤 New Owner/Org:'), default: getOwner() },
-                    { type: 'input', name: 'repo', message: cyan('📦 New Repo:'), default: getRepo() },
-                ]);
-                setRepo(a.owner, a.repo);
-                const s = createSpinner(dim('Switching...')).start();
-                await sleep(400);
-                s.success({ text: green(`Now targeting ${cyan(`${a.owner}/${a.repo}`)}`) });
-            });
+            await ensureTargetRepo(true);
             continue;
         }
 

package/src/commands/repos.ts

@@ -101,14 +101,27 @@ export async function setTopics(name: string, topics: string[], opts: { org?: st
     } catch (e: any) { spinner.fail(e.message); }
 }
 
-export async function listRepos(opts: { org?: string; limit?: number; silent?: boolean }) {
+export async function listRepos(opts: { org?: string; owner?: string; limit?: number; silent?: boolean }) {
     const spinner = !opts.silent ? ora('Fetching repos...').start() : null;
     const octokit = getOctokit();
 
     try {
-        let repos: any[];
-        if (opts.org) {
-            ({ data: repos } = await octokit.repos.listForOrg({ org: opts.org, per_page: opts.limit || 100, sort: 'updated' }));
+        let repos: any[] = [];
+        const owner = opts.org || opts.owner;
+
+        if (owner) {
+            // Check if it's an org or user
+            try {
+                const { data: entity } = await octokit.users.getByUsername({ username: owner });
+                if (entity.type === 'Organization') {
+                    ({ data: repos } = await octokit.repos.listForOrg({ org: owner, per_page: opts.limit || 100, sort: 'updated' }));
+                } else {
+                    ({ data: repos } = await octokit.repos.listForUser({ username: owner, per_page: opts.limit || 100, sort: 'updated' }));
+                }
+            } catch {
+                // Fallback to org if lookup fails (might be a private org only visible to token)
+                ({ data: repos } = await octokit.repos.listForOrg({ org: owner, per_page: opts.limit || 100, sort: 'updated' }));
+            }
         } else {
             ({ data: repos } = await octokit.repos.listForAuthenticatedUser({ per_page: opts.limit || 100, sort: 'updated' }));
         }