fix(cli): address github connection review feedback

AmanVarshney01 · AmanVarshney01 · commit 3efe52cf8d48 · 2026-05-20T18:15:00.000+05:30
diff --git a/docs/product/command-spec.md b/docs/product/command-spec.md
@@ -251,7 +251,7 @@ Behavior:
 - stores the repository connection server-side through the Management API
 - does not write repository data to `prisma.config.ts`
 - does not create branches synchronously
-- enables platform webhook automation to map GitHub branch activity to Prisma Branch state
+- when the connection is active, enables platform webhook automation to map GitHub branch activity to Prisma Branch state
 
 Current backend contract:
 
diff --git a/packages/cli/src/controllers/project.ts b/packages/cli/src/controllers/project.ts
@@ -653,6 +653,7 @@ async function listScmInstallations(
 ): Promise<ScmInstallationResponse[]> {
   const installations: ScmInstallationResponse[] = [];
   let cursor: string | undefined;
+  const seenCursors = new Set<string>();
 
   do {
     const { data, error, response } = await api.GET("/v1/scm-installations", {
@@ -670,7 +671,12 @@ async function listScmInstallations(
     }
 
     installations.push(...data.data);
-    cursor = data.pagination.hasMore && data.pagination.nextCursor ? data.pagination.nextCursor : undefined;
+    cursor = readNextPaginationCursor(
+      data.pagination,
+      seenCursors,
+      "Failed to inspect GitHub App installations",
+      response,
+    );
   } while (cursor);
 
   return installations;
@@ -683,6 +689,7 @@ async function findRepositoryInInstallation(
 ): Promise<ScmRepositoryResponse | null> {
   const expectedFullName = repository.fullName.toLowerCase();
   let cursor: string | undefined;
+  const seenCursors = new Set<string>();
 
   do {
     const { data, error, response } = await api.GET("/v1/scm-installations/{installationId}/repositories", {
@@ -706,12 +713,40 @@ async function findRepositoryInInstallation(
       return matchedRepository;
     }
 
-    cursor = data.pagination.hasMore && data.pagination.nextCursor ? data.pagination.nextCursor : undefined;
+    cursor = readNextPaginationCursor(
+      data.pagination,
+      seenCursors,
+      "Failed to inspect GitHub repositories",
+      response,
+    );
   } while (cursor);
 
   return null;
 }
 
+function readNextPaginationCursor(
+  pagination: { hasMore: boolean; nextCursor: string | null },
+  seenCursors: Set<string>,
+  summary: string,
+  response: Response | undefined,
+): string | undefined {
+  const nextCursor = pagination.hasMore && pagination.nextCursor ? pagination.nextCursor : undefined;
+  if (!nextCursor) {
+    return undefined;
+  }
+
+  if (seenCursors.has(nextCursor)) {
+    throw repoConnectionApiError(summary, response, {
+      error: {
+        message: "Pagination cursor did not advance.",
+      },
+    });
+  }
+
+  seenCursors.add(nextCursor);
+  return nextCursor;
+}
+
 async function findRepositoryInInstallationIfAvailable(
   api: SourceRepositoryApiClient,
   installationId: string,
diff --git a/packages/cli/src/presenters/project.ts b/packages/cli/src/presenters/project.ts
@@ -1,6 +1,7 @@
 import type { CommandDescriptor } from "../shell/command-meta";
 import type { CommandContext } from "../shell/runtime";
 import type {
+  GitRepositoryConnection,
   ProjectListResult,
   ProjectRepositoryConnectionResult,
   ProjectShowResult,
@@ -87,11 +88,7 @@ export function renderGitConnect(
       ],
       operationDescription: "Applying repository connection",
       operationCount: 1,
-      details: [
-        connection.status === "active"
-          ? "GitHub branch automation is active for this project."
-          : "GitHub branch automation is pending GitHub App installation.",
-      ],
+      details: [formatGitConnectionDetail(connection.status)],
     },
     context.ui,
   );
@@ -135,3 +132,16 @@ function formatProjectSource(source: ProjectShowResult["resolution"]["projectSou
       return "prompt";
   }
 }
+
+function formatGitConnectionDetail(status: GitRepositoryConnection["status"]): string {
+  switch (status) {
+    case "active":
+      return "GitHub branch automation is active for this project.";
+    case "pending":
+      return "GitHub branch automation is pending GitHub App installation.";
+    case "archived":
+      return "GitHub branch automation has been archived for this project.";
+    default:
+      return "GitHub repository is connected, but branch automation is not active.";
+  }
+}
diff --git a/packages/cli/tests/project-real-mode.test.ts b/packages/cli/tests/project-real-mode.test.ts
@@ -79,6 +79,34 @@ function sourceRepositoryList(records: unknown[] = []) {
   };
 }
 
+function scmInstallationRecord(overrides: Record<string, unknown> = {}) {
+  return {
+    id: "scminstall_123",
+    type: "scm-installation",
+    url: "https://api.prisma.test/v1/scm-installations/scminstall_123",
+    provider: "github",
+    installationId: 98765,
+    accountId: 111,
+    accountLogin: "prisma",
+    accountType: "organization",
+    suspended: false,
+    createdAt: "2026-05-18T00:00:00.000Z",
+    updatedAt: "2026-05-18T00:00:00.000Z",
+    ...overrides,
+  };
+}
+
+function scmRepositoryRecord(overrides: Record<string, unknown> = {}) {
+  return {
+    id: 999,
+    type: "scm-repository",
+    fullName: "prisma/other",
+    defaultBranch: "main",
+    isPrivate: false,
+    ...overrides,
+  };
+}
+
 describe("real project mode", () => {
   it("uses the real API path for project list and sorts by name then id", async () => {
     const readAuthState = mockAuthState();
@@ -811,6 +839,132 @@ describe("real project mode", () => {
     expect(post).not.toHaveBeenCalled();
   });
 
+  it("guards repeated GitHub App installation pagination cursors", async () => {
+    const get = vi.fn().mockImplementation((pathName: string) => {
+      if (pathName === "/v1/projects") {
+        return mockClient().GET(pathName);
+      }
+
+      if (pathName === "/v1/source-repositories") {
+        return sourceRepositoryList();
+      }
+
+      if (pathName === "/v1/scm-installations") {
+        return {
+          data: {
+            data: [],
+            pagination: {
+              nextCursor: "repeat",
+              hasMore: true,
+            },
+          },
+        };
+      }
+
+      throw new Error(`Unexpected path ${pathName}`);
+    });
+    const post = vi.fn();
+
+    vi.doMock("../src/lib/auth/auth-ops", () => ({
+      readAuthState: mockAuthState(),
+      performLogin: vi.fn(),
+      performLogout: vi.fn(),
+    }));
+    vi.doMock("../src/lib/auth/guard", () => ({
+      requireComputeAuth: vi.fn().mockResolvedValue(mockClient({ GET: get, POST: post })),
+    }));
+
+    const { createTempCwd, createTestCommandContext } = await import("./helpers");
+    const { runGitConnect } = await import("../src/controllers/project");
+    const cwd = await createTempCwd();
+    const stateDir = path.join(cwd, ".state");
+    const { context } = await createTestCommandContext({
+      cwd,
+      stateDir,
+      env: {
+        ...process.env,
+        PRISMA_CLI_MOCK_FIXTURE_PATH: undefined,
+      },
+    });
+
+    await expect(runGitConnect(context, "https://github.com/prisma/prisma-cli", { project: "proj_123" }))
+      .rejects
+      .toMatchObject({
+        code: "REPO_CONNECTION_FAILED",
+        why: "Pagination cursor did not advance.",
+      });
+    expect(post).not.toHaveBeenCalled();
+  });
+
+  it("guards repeated GitHub repository pagination cursors", async () => {
+    const get = vi.fn().mockImplementation((pathName: string) => {
+      if (pathName === "/v1/projects") {
+        return mockClient().GET(pathName);
+      }
+
+      if (pathName === "/v1/source-repositories") {
+        return sourceRepositoryList();
+      }
+
+      if (pathName === "/v1/scm-installations") {
+        return {
+          data: {
+            data: [scmInstallationRecord()],
+            pagination: {
+              nextCursor: null,
+              hasMore: false,
+            },
+          },
+        };
+      }
+
+      if (pathName === "/v1/scm-installations/{installationId}/repositories") {
+        return {
+          data: {
+            data: [scmRepositoryRecord()],
+            pagination: {
+              nextCursor: "repeat",
+              hasMore: true,
+            },
+          },
+        };
+      }
+
+      throw new Error(`Unexpected path ${pathName}`);
+    });
+    const post = vi.fn();
+
+    vi.doMock("../src/lib/auth/auth-ops", () => ({
+      readAuthState: mockAuthState(),
+      performLogin: vi.fn(),
+      performLogout: vi.fn(),
+    }));
+    vi.doMock("../src/lib/auth/guard", () => ({
+      requireComputeAuth: vi.fn().mockResolvedValue(mockClient({ GET: get, POST: post })),
+    }));
+
+    const { createTempCwd, createTestCommandContext } = await import("./helpers");
+    const { runGitConnect } = await import("../src/controllers/project");
+    const cwd = await createTempCwd();
+    const stateDir = path.join(cwd, ".state");
+    const { context } = await createTestCommandContext({
+      cwd,
+      stateDir,
+      env: {
+        ...process.env,
+        PRISMA_CLI_MOCK_FIXTURE_PATH: undefined,
+      },
+    });
+
+    await expect(runGitConnect(context, "https://github.com/prisma/prisma-cli", { project: "proj_123" }))
+      .rejects
+      .toMatchObject({
+        code: "REPO_CONNECTION_FAILED",
+        why: "Pagination cursor did not advance.",
+      });
+    expect(post).not.toHaveBeenCalled();
+  });
+
   it("disconnects a GitHub repository through the source repositories API", async () => {
     const del = vi.fn().mockResolvedValue({});
     const get = vi.fn().mockImplementation((pathName: string) => {
