Fix repo name mismatch when GitHub repo name contains spaces (#2377)

e2e-tests/github.spec.ts

@@ -84,6 +84,40 @@ test("create and sync to new repo - custom branch", async ({ po }) => {
   });
 });
 
+test("create repo with spaces in name - should normalize to hyphens", async ({
+  po,
+}) => {
+  await po.setUp();
+  await po.sendPrompt("tc=basic");
+
+  await po.getTitleBarAppNameButton().click();
+  await po.githubConnector.connect();
+
+  // Enter a repo name with spaces - GitHub normalizes these to hyphens
+  await po.githubConnector.fillCreateRepoName("my new repo");
+
+  // Wait for availability check
+  await po.page.waitForSelector("text=Repository name is available!", {
+    timeout: 5000,
+  });
+
+  // Click create repo button
+  await po.githubConnector.clickCreateRepoButton();
+
+  // Verify the connected repo shows the normalized name (with hyphens, not spaces)
+  await expect(po.page.locator("text=testuser/my-new-repo")).toBeVisible();
+
+  // Sync to GitHub
+  await po.githubConnector.clickSyncToGithubButton();
+
+  // Verify the push was received with the normalized repo name
+  await po.githubConnector.verifyPushEvent({
+    repo: "my-new-repo",
+    branch: "main",
+    operation: "create",
+  });
+});
+
 test("disconnect from repo", async ({ po }) => {
   await po.setUp();
   await po.sendPrompt("tc=basic");

src/__tests__/github_utils.test.ts

+import { normalizeGitHubRepoName } from "@/ipc/handlers/github_handlers";
+import { describe, it, expect } from "vitest";
+
+describe("normalizeGitHubRepoName", () => {
+  it("should replace single space with hyphen", () => {
+    expect(normalizeGitHubRepoName("my app")).toBe("my-app");
+  });
+
+  it("should replace multiple spaces with hyphens", () => {
+    expect(normalizeGitHubRepoName("my cool app")).toBe("my-cool-app");
+  });
+
+  it("should replace consecutive spaces with a single hyphen", () => {
+    expect(normalizeGitHubRepoName("my  app")).toBe("my-app");
+  });
+
+  it("should not modify names without spaces", () => {
+    expect(normalizeGitHubRepoName("my-app")).toBe("my-app");
+  });
+
+  it("should handle empty string", () => {
+    expect(normalizeGitHubRepoName("")).toBe("");
+  });
+
+  it("should handle leading and trailing spaces", () => {
+    expect(normalizeGitHubRepoName(" my app ")).toBe("my-app");
+  });
+
+  it("should handle tabs as whitespace", () => {
+    expect(normalizeGitHubRepoName("my\tapp")).toBe("my-app");
+  });
+});

src/ipc/handlers/github_handlers.ts

@@ -41,6 +41,16 @@ import type { CloneRepoParams, CloneRepoResult } from "../types/github";
 
 const logger = log.scope("github_handlers");
 
+/**
+ * Normalizes a GitHub repository name to match GitHub's automatic normalization rules.
+ * GitHub converts spaces to hyphens when creating repositories.
+ * @param repoName - The original repository name
+ * @returns The normalized repository name with spaces replaced by hyphens
+ */
+export function normalizeGitHubRepoName(repoName: string): string {
+  return repoName.trim().replace(/\s+/g, "-");
+}
+
 // --- GitHub Device Flow Constants ---
 // TODO: Fetch this securely, e.g., from environment variables or a config file
 const GITHUB_CLIENT_ID = process.env.GITHUB_CLIENT_ID || "Ov23liWV2HdC0RBLecWx";
@@ -609,6 +619,9 @@ async function handleIsRepoAvailable(
   event: IpcMainInvokeEvent,
   { org, repo }: { org: string; repo: string },
 ): Promise<{ available: boolean; error?: string }> {
+  // Normalize the repo name to match GitHub's automatic normalization
+  const normalizedRepo = normalizeGitHubRepoName(repo);
+
   try {
     // Get access token from settings
     const settings = readSettings();
@@ -624,8 +637,8 @@ async function handleIsRepoAvailable(
       })
         .then((r) => r.json())
         .then((u) => u.login));
-    // Check if repo exists
-    const url = `${GITHUB_API_BASE}/repos/${owner}/${repo}`;
+    // Check if repo exists (using normalized name)
+    const url = `${GITHUB_API_BASE}/repos/${encodeURIComponent(owner)}/${encodeURIComponent(normalizedRepo)}`;
     const res = await fetch(url, {
       headers: { Authorization: `Bearer ${accessToken}` },
     });
@@ -652,6 +665,10 @@ async function handleCreateRepo(
     branch,
   }: { org: string; repo: string; appId: number; branch?: string },
 ): Promise<void> {
+  // Normalize the repo name to match GitHub's automatic normalization
+  // GitHub converts spaces to hyphens when creating repositories
+  const normalizedRepo = normalizeGitHubRepoName(repo);
+
   // Get access token from settings
   const settings = readSettings();
   const accessToken = settings.githubAccessToken?.value;
@@ -679,7 +696,7 @@ async function handleCreateRepo(
       Accept: "application/vnd.github+json",
     },
     body: JSON.stringify({
-      name: repo,
+      name: normalizedRepo,
       private: true,
     }),
   });
@@ -726,8 +743,8 @@ async function handleCreateRepo(
 
   // Set up remote URL before preparing branch
   const remoteUrl = IS_TEST_BUILD
-    ? `${GITHUB_GIT_BASE}/${owner}/${repo}.git`
-    : `https://${accessToken}:x-oauth-basic@github.com/${owner}/${repo}.git`;
+    ? `${GITHUB_GIT_BASE}/${owner}/${normalizedRepo}.git`
+    : `https://${accessToken}:x-oauth-basic@github.com/${owner}/${normalizedRepo}.git`;
 
   // Prepare local branch with remote URL set up
   await prepareLocalBranch({
@@ -737,8 +754,13 @@ async function handleCreateRepo(
     accessToken,
   });
 
-  // Store org, repo, and branch in the app's DB row (apps table)
-  await updateAppGithubRepo({ appId, org: owner, repo, branch });
+  // Store org, repo (normalized), and branch in the app's DB row (apps table)
+  await updateAppGithubRepo({
+    appId,
+    org: owner,
+    repo: normalizedRepo,
+    branch,
+  });
 }
 
 // --- GitHub Connect to Existing Repo Handler ---