Merge pull request AndyMik90#24 from mojaray2k/fix/github-org-repo-support

Fix GitHub organization repository support

Author: AndyMik90

auto-claude-ui/src/main/ipc-handlers/github/issue-handlers.ts

@@ -6,7 +6,7 @@ import { ipcMain } from 'electron';
 import { IPC_CHANNELS } from '../../../shared/constants';
 import type { IPCResult, GitHubIssue } from '../../../shared/types';
 import { projectStore } from '../../project-store';
-import { getGitHubConfig, githubFetch } from './utils';
+import { getGitHubConfig, githubFetch, normalizeRepoReference } from './utils';
 import type { GitHubAPIIssue, GitHubAPIComment } from './types';
 
 /**
@@ -57,16 +57,32 @@ export function registerGetIssues(): void {
       }
 
       try {
+        const normalizedRepo = normalizeRepoReference(config.repo);
+        if (!normalizedRepo) {
+          return {
+            success: false,
+            error: 'Invalid repository format. Use owner/repo or GitHub URL.'
+          };
+        }
+
         const issues = await githubFetch(
           config.token,
-          `/repos/${config.repo}/issues?state=${state}&per_page=100&sort=updated`
-        ) as GitHubAPIIssue[];
+          `/repos/${normalizedRepo}/issues?state=${state}&per_page=100&sort=updated`
+        );
+
+        // Ensure issues is an array
+        if (!Array.isArray(issues)) {
+          return {
+            success: false,
+            error: 'Unexpected response format from GitHub API'
+          };
+        }
 
         // Filter out pull requests
-        const issuesOnly = issues.filter(issue => !issue.pull_request);
+        const issuesOnly = issues.filter((issue: GitHubAPIIssue) => !issue.pull_request);
 
-        const result: GitHubIssue[] = issuesOnly.map(issue =>
-          transformIssue(issue, config.repo)
+        const result: GitHubIssue[] = issuesOnly.map((issue: GitHubAPIIssue) =>
+          transformIssue(issue, normalizedRepo)
         );
 
         return { success: true, data: result };
@@ -98,12 +114,20 @@ export function registerGetIssue(): void {
       }
 
       try {
+        const normalizedRepo = normalizeRepoReference(config.repo);
+        if (!normalizedRepo) {
+          return {
+            success: false,
+            error: 'Invalid repository format. Use owner/repo or GitHub URL.'
+          };
+        }
+
         const issue = await githubFetch(
           config.token,
-          `/repos/${config.repo}/issues/${issueNumber}`
+          `/repos/${normalizedRepo}/issues/${issueNumber}`
         ) as GitHubAPIIssue;
 
-        const result = transformIssue(issue, config.repo);
+        const result = transformIssue(issue, normalizedRepo);
 
         return { success: true, data: result };
       } catch (error) {
@@ -134,9 +158,17 @@ export function registerGetIssueComments(): void {
       }
 
       try {
+        const normalizedRepo = normalizeRepoReference(config.repo);
+        if (!normalizedRepo) {
+          return {
+            success: false,
+            error: 'Invalid repository format. Use owner/repo or GitHub URL.'
+          };
+        }
+
         const comments = await githubFetch(
           config.token,
-          `/repos/${config.repo}/issues/${issueNumber}/comments`
+          `/repos/${normalizedRepo}/issues/${issueNumber}/comments`
         ) as GitHubAPIComment[];
 
         return { success: true, data: comments };

auto-claude-ui/src/main/ipc-handlers/github/repository-handlers.ts

@@ -6,7 +6,7 @@ import { ipcMain } from 'electron';
 import { IPC_CHANNELS } from '../../../shared/constants';
 import type { IPCResult, GitHubRepository, GitHubSyncStatus } from '../../../shared/types';
 import { projectStore } from '../../project-store';
-import { getGitHubConfig, githubFetch } from './utils';
+import { getGitHubConfig, githubFetch, normalizeRepoReference } from './utils';
 import type { GitHubAPIRepository } from './types';
 
 /**
@@ -33,16 +33,28 @@ export function registerCheckConnection(): void {
       }
 
       try {
+        // Normalize repo reference (handles full URLs, git URLs, etc.)
+        const normalizedRepo = normalizeRepoReference(config.repo);
+        if (!normalizedRepo) {
+          return {
+            success: true,
+            data: {
+              connected: false,
+              error: 'Invalid repository format. Use owner/repo or GitHub URL.'
+            }
+          };
+        }
+
         // Fetch repo info
         const repoData = await githubFetch(
           config.token,
-          `/repos/${config.repo}`
+          `/repos/${normalizedRepo}`
         ) as { full_name: string; description?: string };
 
         // Count open issues
         const issuesData = await githubFetch(
           config.token,
-          `/repos/${config.repo}/issues?state=open&per_page=1`
+          `/repos/${normalizedRepo}/issues?state=open&per_page=1`
         ) as unknown[];
 
         const openCount = Array.isArray(issuesData) ? issuesData.length : 0;
@@ -71,7 +83,7 @@ export function registerCheckConnection(): void {
 }
 
 /**
- * Get list of GitHub repositories
+ * Get list of GitHub repositories (personal + organization)
  */
 export function registerGetRepositories(): void {
   ipcMain.handle(
@@ -88,9 +100,11 @@ export function registerGetRepositories(): void {
       }
 
       try {
+        // Fetch user's personal + organization repos
+        // affiliation parameter includes: owner, collaborator, organization_member
         const repos = await githubFetch(
           config.token,
-          '/user/repos?per_page=100&sort=updated'
+          '/user/repos?per_page=100&sort=updated&affiliation=owner,collaborator,organization_member'
         ) as GitHubAPIRepository[];
 
         const result: GitHubRepository[] = repos.map(repo => ({

auto-claude-ui/src/main/ipc-handlers/github/utils.ts

@@ -54,6 +54,32 @@ export function getGitHubConfig(project: Project): GitHubConfig | null {
   }
 }
 
+/**
+ * Normalize a GitHub repository reference to owner/repo format
+ * Handles:
+ * - owner/repo (already normalized)
+ * - https://github.com/owner/repo
+ * - https://github.com/owner/repo.git
+ * - git@github.com:owner/repo.git
+ */
+export function normalizeRepoReference(repo: string): string {
+  if (!repo) return '';
+
+  // Remove trailing .git if present
+  let normalized = repo.replace(/\.git$/, '');
+
+  // Handle full GitHub URLs
+  if (normalized.startsWith('https://github.com/')) {
+    normalized = normalized.replace('https://github.com/', '');
+  } else if (normalized.startsWith('http://github.com/')) {
+    normalized = normalized.replace('http://github.com/', '');
+  } else if (normalized.startsWith('git@github.com:')) {
+    normalized = normalized.replace('git@github.com:', '');
+  }
+
+  return normalized.trim();
+}
+
 /**
  * Make a request to the GitHub API
  */

auto-claude-ui/src/renderer/components/ProjectSettings.tsx

@@ -238,6 +238,7 @@ export function ProjectSettings({ project, open, onOpenChange }: ProjectSettings
                   onUpdateConfig={updateEnvConfig}
                   gitHubConnectionStatus={gitHubConnectionStatus}
                   isCheckingGitHub={isCheckingGitHub}
+                  projectName={project.name}
                 />
 
                 <Separator />

auto-claude-ui/src/renderer/components/project-settings/GitHubIntegrationSection.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Github, RefreshCw, KeyRound } from 'lucide-react';
+import { Github, RefreshCw, KeyRound, Info } from 'lucide-react';
 import { CollapsibleSection } from './CollapsibleSection';
 import { StatusBadge } from './StatusBadge';
 import { PasswordInput } from './PasswordInput';
@@ -19,6 +19,7 @@ interface GitHubIntegrationSectionProps {
   onUpdateConfig: (updates: Partial<ProjectEnvConfig>) => void;
   gitHubConnectionStatus: GitHubSyncStatus | null;
   isCheckingGitHub: boolean;
+  projectName?: string;
 }
 
 export function GitHubIntegrationSection({
@@ -28,6 +29,7 @@ export function GitHubIntegrationSection({
   onUpdateConfig,
   gitHubConnectionStatus,
   isCheckingGitHub,
+  projectName,
 }: GitHubIntegrationSectionProps) {
   const [showOAuthFlow, setShowOAuthFlow] = useState(false);
 
@@ -48,6 +50,22 @@ export function GitHubIntegrationSection({
       onToggle={onToggle}
       badge={badge}
     >
+      {/* Project-Specific Configuration Notice */}
+      {projectName && (
+        <div className="rounded-lg border border-info/30 bg-info/5 p-3 mb-4">
+          <div className="flex items-start gap-2">
+            <Info className="h-4 w-4 text-info mt-0.5 shrink-0" />
+            <div className="flex-1">
+              <p className="text-sm font-medium text-foreground">Project-Specific Configuration</p>
+              <p className="text-xs text-muted-foreground mt-1">
+                This GitHub repository is configured only for <span className="font-semibold text-foreground">{projectName}</span>.
+                Each project can have its own GitHub repository.
+              </p>
+            </div>
+          </div>
+        </div>
+      )}
+
       <div className="flex items-center justify-between">
         <div className="space-y-0.5">
           <Label className="font-normal text-foreground">Enable GitHub Issues</Label>