refactor(mobile): reuse repository aggregation

Generated-By: PostHog Code
Task-Id: c1bbe3cf-742b-4b24-bf96-d11a18b4cf22

Author: richardsolomou

apps/mobile/src/app/task/index.tsx

@@ -1,10 +1,4 @@
 import { Text } from "@components/text";
-import {
-  findRepositoryOption,
-  isRepositorySelectionComplete,
-  type RepositorySelection,
-  toRepositorySelection,
-} from "@posthog/core/integrations/repositories";
 import {
   DEFAULT_CLAUDE_EXECUTION_MODE,
   getAvailableModes,
@@ -79,7 +73,15 @@ import {
   pendingTaskPromptStoreApi,
 } from "@/features/tasks/stores/pendingTaskPromptStore";
 import { useTaskStore } from "@/features/tasks/stores/taskStore";
-import type { CreateTaskOptions } from "@/features/tasks/types";
+import type {
+  CreateTaskOptions,
+  RepositorySelection,
+} from "@/features/tasks/types";
+import {
+  findRepositoryOption,
+  isRepositorySelectionComplete,
+  toRepositorySelection,
+} from "@/features/tasks/utils/repositorySelection";
 import { useScreenInsets } from "@/hooks/useScreenInsets";
 import { logger } from "@/lib/logger";
 import { getPostHogApiClient } from "@/lib/posthogApiClient";

apps/mobile/src/features/inbox/components/TinderView.tsx

@@ -3,7 +3,6 @@ import {
   formatSignalReportSummaryMarkdown,
   inboxStatusLabel,
 } from "@posthog/core/inbox/reportPresentation";
-import type { RepositoryOption } from "@posthog/core/integrations/repositories";
 import type {
   SignalReport,
   SignalReportPriority,
@@ -29,7 +28,10 @@ import { MarkdownText } from "@/features/chat/components/MarkdownText";
 import { usePreferencesStore } from "@/features/preferences/stores/preferencesStore";
 import { getModelConfigOption } from "@/features/tasks/composer/options";
 import { useCloudTaskConfigOptions } from "@/features/tasks/hooks/useCloudTaskConfigOptions";
-import type { CreateTaskOptions } from "@/features/tasks/types";
+import type {
+  CreateTaskOptions,
+  RepositoryOption,
+} from "@/features/tasks/types";
 import {
   ANALYTICS_EVENTS,
   computeReportAgeHours,

apps/mobile/src/features/tasks/components/AutomationForm.tsx

@@ -7,12 +7,6 @@ import {
   deriveAutomationName,
   parseCronExpression,
 } from "@posthog/core/automations/automationSchedule";
-import {
-  findRepositoryOption,
-  isRepositorySelectionComplete,
-  type RepositorySelection,
-  toRepositorySelection,
-} from "@posthog/core/integrations/repositories";
 import { CaretDown, GithubLogo } from "phosphor-react-native";
 import { type MutableRefObject, useEffect, useMemo, useState } from "react";
 import {
@@ -26,6 +20,12 @@ import { MarkdownText } from "@/features/chat/components/MarkdownText";
 import { useThemeColors } from "@/lib/theme";
 import { RepositoryPickerInline } from "../composer/RepositoryPickerInline";
 import { useIntegrations } from "../hooks/useIntegrations";
+import type { RepositorySelection } from "../types";
+import {
+  findRepositoryOption,
+  isRepositorySelectionComplete,
+  toRepositorySelection,
+} from "../utils/repositorySelection";
 import { GitHubConnectionPrompt } from "./GitHubConnectionPrompt";
 import { GitHubLoadNotice } from "./GitHubLoadNotice";
 import { ScheduleEditor } from "./ScheduleEditor";

apps/mobile/src/features/tasks/composer/RepositoryPickerInline.tsx

@@ -1,5 +1,4 @@
 import { Text } from "@components/text";
-import type { RepositoryOption } from "@posthog/core/integrations/repositories";
 import { ArrowsClockwise, Check, MagnifyingGlass } from "phosphor-react-native";
 import { useEffect, useMemo, useRef, useState } from "react";
 import {
@@ -17,6 +16,7 @@ import Animated, {
   withTiming,
 } from "react-native-reanimated";
 import { useThemeColors } from "@/lib/theme";
+import type { RepositoryOption } from "../types";
 
 // Tuning for the nested (ScrollView) path's progressive mount. The first
 // chunk needs to cover the rows the user can actually see (~5 with the

apps/mobile/src/features/tasks/hooks/useIntegrations.ts

@@ -1,14 +1,14 @@
-import {
-  buildTeamRepositoryOptions,
-  normalizeRepositoryNames,
-  repositoryLoadWarning,
-  repositoryOptionsEqual,
-} from "@posthog/core/integrations/repositories";
+import { combineGithubRepositories } from "@posthog/core/integrations/repositories";
 import { useQuery } from "@tanstack/react-query";
 import { useEffect, useMemo } from "react";
 import { useAuthStore } from "@/features/auth";
 import { getPostHogApiClient } from "@/lib/posthogApiClient";
 import { useRepositoryCacheStore } from "../stores/repositoryCacheStore";
+import {
+  buildRepositoryOptions,
+  repositoryLoadWarning,
+  repositoryOptionsEqual,
+} from "../utils/repositorySelection";
 
 export const integrationKeys = {
   all: ["integrations"] as const,
@@ -58,9 +58,11 @@ export function useIntegrations(options: UseIntegrationsOptions = {}) {
       const results = await Promise.allSettled(
         githubIntegrations.map(async (integration) => ({
           integrationId: integration.id,
-          repositories: normalizeRepositoryNames(
-            await getPostHogApiClient().getGithubRepositories(integration.id),
-          ),
+          repositories: (
+            await getPostHogApiClient().getGithubRepositories(integration.id)
+          )
+            .map((repository) => repository.toLowerCase())
+            .filter(Boolean),
         })),
       );
 
@@ -89,16 +91,27 @@ export function useIntegrations(options: UseIntegrationsOptions = {}) {
 
   const repositoriesByIntegration =
     repositoriesQuery.data?.repositoriesByIntegration ?? {};
-  const repositories = Object.values(repositoriesByIntegration).flat().sort();
+  const repositories = Object.keys(
+    combineGithubRepositories(
+      githubIntegrations.map((integration) => ({
+        data: {
+          integrationId: integration.id,
+          repos: repositoriesByIntegration[integration.id] ?? [],
+        },
+        isPending: repositoriesQuery.isPending,
+        isError: false,
+        isRefetching: repositoriesQuery.isRefetching,
+      })),
+    ).repositoryMap,
+  ).sort();
 
   // Memoize the derived options list keyed on the underlying query data so
   // its reference is stable across renders when the data hasn't actually
   // changed. Without this, every render produces a fresh array — which both
   // churns the cache-write effect below AND defeats downstream React.memo /
   // useMemo callers that depend on `repositoryOptions`.
   const liveRepositoryOptions = useMemo(
-    () =>
-      buildTeamRepositoryOptions(githubIntegrations, repositoriesByIntegration),
+    () => buildRepositoryOptions(githubIntegrations, repositoriesByIntegration),
     [githubIntegrations, repositoriesByIntegration],
   );
 

apps/mobile/src/features/tasks/hooks/useUserIntegrations.ts

@@ -1,13 +1,13 @@
-import {
-  buildUserRepositoryOptions,
-  normalizeRepositoryNames,
-  type RepositoryOption,
-  repositoryLoadWarning,
-} from "@posthog/core/integrations/repositories";
+import { combineUserGithubRepositories } from "@posthog/core/integrations/repositories";
 import { useQuery } from "@tanstack/react-query";
 import { useCallback, useMemo } from "react";
 import { useAuthStore } from "@/features/auth";
 import { getPostHogApiClient } from "@/lib/posthogApiClient";
+import type { RepositoryOption } from "../types";
+import {
+  buildUserRepositoryOptions,
+  repositoryLoadWarning,
+} from "../utils/repositorySelection";
 
 /**
  * User-scoped sibling of {@link useIntegrations}. Reads the authenticated
@@ -63,31 +63,47 @@ export function useUserIntegrations(options: UseUserIntegrationsOptions = {}) {
       integrations.map((i) => i.installation_id),
     ),
     queryFn: async () => {
-      const byInstallation: Record<string, string[]> = {};
       const results = await Promise.allSettled(
         integrations.map(async (integration) => ({
           installationId: integration.installation_id,
-          repositories: normalizeRepositoryNames(
+          repositories: (
             await getPostHogApiClient().getGithubUserRepositories(
               integration.installation_id,
-            ),
-          ),
+            )
+          )
+            .map((repository) => repository.toLowerCase())
+            .filter(Boolean),
         })),
       );
 
-      let failedCount = 0;
-      for (const result of results) {
-        if (result.status === "fulfilled") {
-          byInstallation[result.value.installationId] =
-            result.value.repositories;
-        } else {
-          failedCount += 1;
-        }
-      }
+      const combined = combineUserGithubRepositories(
+        results.map((result) => ({
+          data:
+            result.status === "fulfilled"
+              ? {
+                  userIntegrationId:
+                    integrations.find(
+                      (integration) =>
+                        integration.installation_id ===
+                        result.value.installationId,
+                    )?.id ?? "",
+                  installationId: result.value.installationId,
+                  repos: result.value.repositories,
+                }
+              : undefined,
+          isPending: false,
+          isError: result.status === "rejected",
+          isRefetching: false,
+        })),
+        integrations.map((integration) => integration.installation_id),
+      );
 
       return {
-        byInstallation,
-        partialError: repositoryLoadWarning(failedCount, integrations.length),
+        byInstallation: combined.reposByInstallationId,
+        partialError: repositoryLoadWarning(
+          combined.failedInstallationIds.length,
+          integrations.length,
+        ),
       };
     },
     enabled: enabled && integrations.length > 0,

apps/mobile/src/features/tasks/stores/repositoryCacheStore.ts

@@ -1,7 +1,7 @@
-import type { RepositoryOption } from "@posthog/core/integrations/repositories";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { create } from "zustand";
 import { createJSONStorage, persist } from "zustand/middleware";
+import type { RepositoryOption } from "../types";
 
 interface RepositoryCacheState {
   /** Last successfully fetched, sorted list of repository options across all

apps/mobile/src/features/tasks/stores/taskStore.ts

@@ -1,9 +1,9 @@
-import type { RepositorySelection } from "@posthog/core/integrations/repositories";
 import type { TaskActivitySortMode } from "@posthog/core/tasks/taskActivity";
 import type { ExecutionMode, SupportedReasoningEffort } from "@posthog/shared";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { create } from "zustand";
 import { createJSONStorage, persist } from "zustand/middleware";
+import type { RepositorySelection } from "../types";
 
 export type OrganizeMode = "by-project" | "chronological";
 export type SortMode = TaskActivitySortMode;

apps/mobile/src/features/tasks/types.ts

@@ -57,6 +57,17 @@ export interface UserGithubIntegration {
   };
 }
 
+export interface RepositoryOption {
+  integrationId: number;
+  integrationLabel: string;
+  repository: string;
+}
+
+export interface RepositorySelection {
+  integrationId: number | null;
+  repository: string | null;
+}
+
 export interface CreateTaskOptions {
   description: string;
   title?: string;

apps/mobile/src/features/tasks/utils/repositorySelection.test.ts

@@ -0,0 +1,75 @@
+import { describe, expect, it } from "vitest";
+import {
+  buildRepositoryOptions,
+  findRepositoryOption,
+  isRepositorySelectionComplete,
+  toRepositorySelection,
+} from "./repositorySelection";
+
+describe("repositorySelection", () => {
+  const integrations = [
+    { id: 7, kind: "github", display_name: "Personal GitHub" },
+    {
+      id: 11,
+      kind: "github",
+      config: { account: { login: "posthog" } },
+    },
+  ];
+
+  it("preserves integration identity for each repository option", () => {
+    expect(
+      buildRepositoryOptions(integrations, {
+        7: ["annika/mobile-app"],
+        11: ["posthog/posthog", "posthog/code"],
+      }),
+    ).toEqual([
+      {
+        integrationId: 7,
+        integrationLabel: "Personal GitHub",
+        repository: "annika/mobile-app",
+      },
+      {
+        integrationId: 11,
+        integrationLabel: "posthog",
+        repository: "posthog/code",
+      },
+      {
+        integrationId: 11,
+        integrationLabel: "posthog",
+        repository: "posthog/posthog",
+      },
+    ]);
+  });
+
+  it("finds an exact repository option", () => {
+    const options = buildRepositoryOptions(integrations, {
+      7: ["posthog/posthog"],
+      11: ["posthog/posthog"],
+    });
+
+    expect(
+      findRepositoryOption(options, {
+        integrationId: 11,
+        repository: "posthog/posthog",
+      }),
+    ).toEqual({
+      integrationId: 11,
+      integrationLabel: "posthog",
+      repository: "posthog/posthog",
+    });
+  });
+
+  it("converts an option into a repository selection", () => {
+    const selection = toRepositorySelection({
+      integrationId: 11,
+      integrationLabel: "posthog",
+      repository: "posthog/code",
+    });
+
+    expect(selection).toEqual({
+      integrationId: 11,
+      repository: "posthog/code",
+    });
+    expect(isRepositorySelectionComplete(selection)).toBe(true);
+  });
+});