diff --git a/resources/js/locales/en.ts b/resources/js/locales/en.ts
index f2a434b..c67fd77 100644
--- a/resources/js/locales/en.ts
+++ b/resources/js/locales/en.ts
@@ -722,6 +722,8 @@ export const en = {
     'profile.delete.confirmAction': 'Permanently delete account',
     'common.cancel': 'Cancel',
     'common.close': 'Close',
+    'common.edit': 'Edit',
+    'common.remove': 'Remove',
     'common.retry': 'Try again',
     'feedback.empty': 'Nothing here yet',
     'feedback.saved': 'Changes saved',
@@ -1013,6 +1015,81 @@ export const en = {
     'inheritance.area.ticketLinkTypes': 'Ticket link types',
     'inheritance.area.repositoryConnections': 'Repository connections',
     'inheritance.area.notificationActions': 'Notification actions',
+    'repositorySettings.pageTitle': '{project} repository settings',
+    'repositorySettings.title': 'Project repositories',
+    'repositorySettings.description':
+        'Choose the repositories this project uses for ticket branches and pull requests.',
+    'repositorySettings.projectScope':
+        'Repository links belong to the project. Every team member keeps using the same linked repositories, while access is granted through their own personal Git connections.',
+    'repositorySettings.linkedRepositories': 'Linked repositories',
+    'repositorySettings.linkAction': 'Link repository',
+    'repositorySettings.empty': 'No project repositories yet',
+    'repositorySettings.emptyDescription':
+        'Link a repository from one of your personal Git connections to make it available to project tickets.',
+    'repositorySettings.personalAccessReady': 'Personal access ready',
+    'repositorySettings.personalAccessMissing': 'Personal access needed',
+    'repositorySettings.ticketUsage':
+        'Tickets use this project link to discover matching branches and pull requests.',
+    'repositorySettings.openRepository':
+        'Open {repository} in the Git provider (opens in a new tab)',
+    'repositorySettings.open': 'Open repository',
+    'repositorySettings.connectAccess': 'Connect Git access',
+    'repositorySettings.editRepository':
+        'Change project repository {repository}',
+    'repositorySettings.removeRepository':
+        'Remove project repository {repository}',
+    'repositorySettings.personalSources': 'Personal Git access',
+    'repositorySettings.personalSourcesDescription':
+        'These account connections are private to you and are only used to discover repositories you can link to this project.',
+    'repositorySettings.manageConnections': 'Manage Git connections',
+    'repositorySettings.refresh': 'Refresh repositories',
+    'repositorySettings.refreshing': 'Loading repositories…',
+    'repositorySettings.refreshingDescription':
+        'The latest repositories are being requested from your Git providers.',
+    'repositorySettings.noConnections': 'No personal Git connection',
+    'repositorySettings.noConnectionsDescription':
+        'Add a personal Git connection before linking or changing a project repository.',
+    'repositorySettings.detectedSources': 'Detected personal sources',
+    'repositorySettings.unavailable': 'Provider unavailable',
+    'repositorySettings.repositoryCount': '{count} repositories',
+    'repositorySettings.linkTitle': 'Link a project repository',
+    'repositorySettings.linkDescription':
+        'Choose a personal connection, find a repository, and add it to this project.',
+    'repositorySettings.editTitle': 'Change project repository',
+    'repositorySettings.editDescription':
+        'Replace this project link with another repository. Tickets will use the updated link after saving.',
+    'repositorySettings.removeTitle': 'Remove repository',
+    'repositorySettings.removeDescription':
+        'Remove this repository from the project? Tickets will no longer discover its branches or pull requests.',
+    'repositorySettings.linked': 'Repository linked to the project.',
+    'repositorySettings.updated': 'Project repository updated.',
+    'repositorySettings.removed': 'Repository removed from the project.',
+    'repositorySettings.matchingConnectionMissing':
+        'Matching personal access is missing',
+    'repositorySettings.matchingConnectionMissingDescription':
+        'The project link remains available to the team, but this account cannot query it until you add a matching provider connection. You can still choose a different accessible repository below.',
+    'repositorySettings.personalConnection': 'Personal Git connection',
+    'repositorySettings.personalConnectionHelp':
+        'Used for discovery only; it is not shared with the project.',
+    'repositorySettings.providerError':
+        'Repositories could not be loaded from this provider',
+    'repositorySettings.searchLabel': 'Find a repository',
+    'repositorySettings.searchPlaceholder':
+        'Search by repository, owner, or namespace',
+    'repositorySettings.noRepositories': 'No repositories available',
+    'repositorySettings.noRepositoriesDescription':
+        'This connection is working, but the provider returned no repositories you can access.',
+    'repositorySettings.noSearchResults': 'No matching repositories',
+    'repositorySettings.noSearchResultsDescription':
+        'No repository matches “{search}”. Try a different name or clear the search.',
+    'repositorySettings.repositoryLabel': 'Available repositories',
+    'repositorySettings.forbidden': 'Project access denied',
+    'repositorySettings.forbiddenDescription':
+        'You no longer have permission to manage repositories for this project. Close this dialog and refresh the page.',
+    'repositorySettings.linking': 'Linking repository…',
+    'repositorySettings.saving': 'Saving repository…',
+    'repositorySettings.save': 'Save repository',
+    'repositorySettings.removing': 'Removing repository…',
     'gitConnections.description':
         'Connect your personal Git account to browse repositories, branches, and pull requests you can access.',
     'gitConnections.privacy':
diff --git a/resources/js/pages/projects/settings/Repositories.vue b/resources/js/pages/projects/settings/Repositories.vue
index 3c2687e..aa758bd 100644
--- a/resources/js/pages/projects/settings/Repositories.vue
+++ b/resources/js/pages/projects/settings/Repositories.vue
@@ -1,282 +1,336 @@
 <script setup lang="ts">
-import { Form, Head, Link, useForm, usePage } from '@inertiajs/vue3';
-import { computed, watch } from 'vue';
-import ProjectRepositorySettingsController from '@/actions/App/Http/Controllers/ProjectRepositorySettingsController';
-import Heading from '@/components/Heading.vue';
+import { Head, Link, router, useForm } from '@inertiajs/vue3';
+import {
+    ExternalLink,
+    GitBranch,
+    Link2,
+    Pencil,
+    Plus,
+    RefreshCw,
+    Search,
+    Server,
+    Trash2,
+} from 'lucide-vue-next';
+import { computed, ref, watch } from 'vue';
+import {
+    destroy,
+    store,
+    update,
+} from '@/actions/App/Http/Controllers/ProjectRepositorySettingsController';
+import FeedbackState from '@/components/FeedbackState.vue';
+import FormFeedback from '@/components/FormFeedback.vue';
 import InputError from '@/components/InputError.vue';
 import TemplateInheritancePanel from '@/components/projects/TemplateInheritancePanel.vue';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
+import { Card, CardContent, CardHeader } from '@/components/ui/card';
 import {
-    Card,
-    CardContent,
-    CardDescription,
-    CardHeader,
-    CardTitle,
-} from '@/components/ui/card';
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog';
+import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { Skeleton } from '@/components/ui/skeleton';
+import { useFormProtection } from '@/composables/useFormProtection';
+import { useLocalization } from '@/composables/useLocalization';
 import AppLayout from '@/layouts/AppLayout.vue';
+import SettingsLayout from '@/layouts/projects/SettingsLayout.vue';
 import { edit as editGitConnections } from '@/routes/git-connections/index';
 import { index, show } from '@/routes/projects/index';
-import {
-    board as boardSettings,
-    general as generalSettings,
-    metadata as metadataSettings,
-    notifications as notificationSettings,
-    repositories as repositorySettings,
-} from '@/routes/projects/settings';
-import type { AvailableGitRepositorySourceModel } from '@/types/models/available-git-repository-source-model';
-import type { RepositoryConnectionModel } from '@/types/models/repository-connection-model';
+import { repositories } from '@/routes/projects/settings';
 import type {
     BreadcrumbItem,
     ProjectRepositorySettingsPageProps,
 } from '@/types';
+import type { AvailableGitRepositorySourceModel } from '@/types/models/available-git-repository-source-model';
+import type { RepositoryConnectionModel } from '@/types/models/repository-connection-model';
+
+type DialogMode = 'link' | 'edit' | 'remove';
 
 const props = defineProps<ProjectRepositorySettingsPageProps>();
-const page = usePage();
-const appName = String(page.props.name);
-
-const breadcrumbs: BreadcrumbItem[] = [
+const { t } = useLocalization();
+const breadcrumbs = computed<BreadcrumbItem[]>(() => [
+    { title: t('navigation.projects'), href: index() },
+    { title: props.project.name, href: show(props.project.id) },
     {
-        title: 'Projects',
-        href: index(),
+        title: t('navigation.repositories'),
+        href: repositories(props.project.id),
     },
-    {
-        title: props.project.name,
-        href: show(props.project.id),
-    },
-    {
-        title: 'Repository settings',
-        href: repositorySettings(props.project.id),
-    },
-];
-
-const selectableRepositorySources = computed(() =>
-    props.availableRepositorySources.filter(
-        (source) => source.repositories.length > 0,
+]);
+const dialogOpen = ref(false);
+const dialogMode = ref<DialogMode>('link');
+const selectedConnection = ref<RepositoryConnectionModel | null>(null);
+const repositorySearch = ref('');
+const refreshingSources = ref(false);
+const repositoryForm = useForm<{
+    provider_repository_id: string;
+    user_git_connection_id: string;
+}>({
+    provider_repository_id: '',
+    user_git_connection_id: '',
+});
+const removalForm = useForm({});
+const repositoryProtection = useFormProtection(repositoryForm);
+const removalProtection = useFormProtection(removalForm);
+const processing = computed(
+    () => repositoryForm.processing || removalForm.processing,
+);
+const successfulSourceCount = computed(
+    () =>
+        props.availableRepositorySources.filter((source) => !source.error)
+            .length,
+);
+const selectedSource = computed(() =>
+    props.availableRepositorySources.find(
+        (source) =>
+            source.user_git_connection_id ===
+            Number(repositoryForm.user_git_connection_id),
     ),
 );
+const filteredRepositories = computed(() => {
+    const search = repositorySearch.value.trim().toLocaleLowerCase();
+    const sourceRepositories = selectedSource.value?.repositories ?? [];
 
-const repositoryConnectionById = computed(
+    if (search === '') {
+        return sourceRepositories;
+    }
+
+    return sourceRepositories.filter((repository) =>
+        [
+            repository.full_name,
+            repository.owner_name,
+            repository.repository_name,
+        ]
+            .join(' ')
+            .toLocaleLowerCase()
+            .includes(search),
+    );
+});
+const canSaveRepository = computed(
     () =>
-        new Map(
-            props.repositoryConnections.map((repositoryConnection) => [
-                repositoryConnection.id,
-                repositoryConnection,
-            ]),
+        selectedSource.value !== undefined &&
+        selectedSource.value.error === null &&
+        selectedSource.value.repositories.some(
+            (repository) =>
+                repository.provider_repository_id ===
+                repositoryForm.provider_repository_id,
         ),
 );
-
-const repositoriesForSource = (
-    userGitConnectionId: number | string,
-): AvailableGitRepositorySourceModel['repositories'] => {
-    const normalizedUserGitConnectionId = Number(userGitConnectionId);
-
-    if (Number.isNaN(normalizedUserGitConnectionId)) {
-        return [];
-    }
-
-    return (
-        selectableRepositorySources.value.find(
+const matchingPersonalSourceMissing = computed(
+    () =>
+        dialogMode.value === 'edit' &&
+        selectedConnection.value !== null &&
+        !props.availableRepositorySources.some(
             (source) =>
-                source.user_git_connection_id === normalizedUserGitConnectionId,
-        )?.repositories ?? []
-    );
-};
-
-const matchingSourceIdForRepositoryConnection = (
-    repositoryConnection: RepositoryConnectionModel | undefined,
-): string => {
-    if (repositoryConnection === undefined) {
-        return String(
-            selectableRepositorySources.value[0]?.user_git_connection_id ?? '',
-        );
+                source.provider === selectedConnection.value?.provider &&
+                source.base_url === selectedConnection.value?.base_url,
+        ),
+);
+const dialogTitle = computed(() =>
+    t(
+        dialogMode.value === 'link'
+            ? 'repositorySettings.linkTitle'
+            : dialogMode.value === 'edit'
+              ? 'repositorySettings.editTitle'
+              : 'repositorySettings.removeTitle',
+    ),
+);
+const successTitle = computed(() => {
+    if (props.status?.endsWith('connection was updated.')) {
+        return t('repositorySettings.updated');
     }
 
-    return String(
-        selectableRepositorySources.value.find(
+    if (props.status?.endsWith('was removed from the project.')) {
+        return t('repositorySettings.removed');
+    }
+
+    return t('repositorySettings.linked');
+});
+
+function sourceForConnection(
+    repositoryConnection: RepositoryConnectionModel | null,
+): AvailableGitRepositorySourceModel | undefined {
+    if (repositoryConnection) {
+        const matchingSource = props.availableRepositorySources.find(
             (source) =>
                 source.provider === repositoryConnection.provider &&
                 source.base_url === repositoryConnection.base_url,
-        )?.user_git_connection_id ??
-            selectableRepositorySources.value[0]?.user_git_connection_id ??
-            '',
+        );
+
+        if (matchingSource) {
+            return matchingSource;
+        }
+    }
+
+    return (
+        props.availableRepositorySources.find(
+            (source) => source.error === null && source.repositories.length > 0,
+        ) ??
+        props.availableRepositorySources.find(
+            (source) => source.error === null,
+        ) ??
+        props.availableRepositorySources[0]
     );
-};
+}
 
-const createForm = useForm<{
-    provider_repository_id: string;
-    user_git_connection_id: string;
-}>({
-    provider_repository_id: '',
-    user_git_connection_id: String(
-        selectableRepositorySources.value[0]?.user_git_connection_id ?? '',
-    ),
-});
+function resetForms(): void {
+    repositoryForm.defaults({
+        provider_repository_id: '',
+        user_git_connection_id: '',
+    });
+    repositoryForm.resetAndClearErrors();
+    repositoryProtection.clearFeedback();
+    removalForm.resetAndClearErrors();
+    removalProtection.clearFeedback();
+    repositorySearch.value = '';
+}
 
-const updateForm = useForm<{
-    provider_repository_id: string;
-    repository_connection_id: string;
-    user_git_connection_id: string;
-}>({
-    provider_repository_id: '',
-    repository_connection_id: String(props.repositoryConnections[0]?.id ?? ''),
-    user_git_connection_id: String(
-        selectableRepositorySources.value[0]?.user_git_connection_id ?? '',
-    ),
-});
+function openDialog(
+    mode: DialogMode,
+    repositoryConnection: RepositoryConnectionModel | null = null,
+): void {
+    resetForms();
+    dialogMode.value = mode;
+    selectedConnection.value = repositoryConnection;
 
-const createRepositories = computed(() =>
-    repositoriesForSource(createForm.user_git_connection_id),
-);
+    if (mode !== 'remove') {
+        const source = sourceForConnection(repositoryConnection);
+        const currentRepositoryId =
+            repositoryConnection?.provider_repository_id;
+        const providerRepositoryId = source?.repositories.some(
+            (repository) =>
+                repository.provider_repository_id === currentRepositoryId,
+        )
+            ? (currentRepositoryId ?? '')
+            : '';
 
-const updateRepositories = computed(() =>
-    repositoriesForSource(updateForm.user_git_connection_id),
-);
+        repositoryForm.defaults({
+            provider_repository_id: providerRepositoryId,
+            user_git_connection_id: String(
+                source?.user_git_connection_id ?? '',
+            ),
+        });
+        repositoryForm.reset();
+    }
+
+    dialogOpen.value = true;
+}
+
+function closeDialog(open: boolean): void {
+    if (
+        open ||
+        processing.value ||
+        !repositoryProtection.confirmLeave() ||
+        !removalProtection.confirmLeave()
+    ) {
+        return;
+    }
+
+    dialogOpen.value = false;
+    resetForms();
+}
+
+function finishMutation(): void {
+    dialogOpen.value = false;
+    selectedConnection.value = null;
+    resetForms();
+}
+
+function selectSource(source: AvailableGitRepositorySourceModel): void {
+    repositoryForm.user_git_connection_id = String(
+        source.user_git_connection_id,
+    );
+}
+
+function selectRepository(providerRepositoryId: string): void {
+    repositoryForm.provider_repository_id = providerRepositoryId;
+    repositoryForm.clearErrors('provider_repository_id');
+}
+
+function saveRepository(): void {
+    if (!canSaveRepository.value || processing.value) {
+        return;
+    }
+
+    const target =
+        dialogMode.value === 'edit' && selectedConnection.value
+            ? update([props.project.id, selectedConnection.value.id])
+            : store(props.project.id);
+
+    repositoryProtection.submit(target, {
+        preserveScroll: true,
+        onSuccess: finishMutation,
+    });
+}
+
+function removeRepository(): void {
+    if (!selectedConnection.value || processing.value) {
+        return;
+    }
+
+    removalProtection.submit(
+        destroy([props.project.id, selectedConnection.value.id]),
+        {
+            preserveScroll: true,
+            onSuccess: finishMutation,
+        },
+    );
+}
+
+function refreshSources(): void {
+    if (refreshingSources.value || processing.value) {
+        return;
+    }
+
+    router.reload({
+        only: ['availableRepositorySources'],
+        onStart: () => {
+            refreshingSources.value = true;
+        },
+        onFinish: () => {
+            refreshingSources.value = false;
+        },
+    });
+}
 
 watch(
-    () => createForm.user_git_connection_id,
+    () => repositoryForm.user_git_connection_id,
     () => {
-        const repositories = createRepositories.value;
+        repositorySearch.value = '';
 
         if (
-            repositories.some(
+            selectedSource.value?.repositories.some(
                 (repository) =>
                     repository.provider_repository_id ===
-                    createForm.provider_repository_id,
+                    repositoryForm.provider_repository_id,
             )
         ) {
             return;
         }
 
-        createForm.provider_repository_id =
-            repositories[0]?.provider_repository_id ?? '';
+        repositoryForm.provider_repository_id = '';
+        repositoryForm.clearErrors('provider_repository_id');
     },
-    { immediate: true },
 );
-
-watch(
-    () => updateForm.repository_connection_id,
-    (repositoryConnectionId) => {
-        const repositoryConnection = repositoryConnectionById.value.get(
-            Number(repositoryConnectionId),
-        );
-
-        updateForm.user_git_connection_id =
-            matchingSourceIdForRepositoryConnection(repositoryConnection);
-    },
-    { immediate: true },
-);
-
-watch(
-    [
-        () => updateForm.user_git_connection_id,
-        () => updateForm.repository_connection_id,
-    ],
-    () => {
-        const repositories = updateRepositories.value;
-        const repositoryConnection = repositoryConnectionById.value.get(
-            Number(updateForm.repository_connection_id),
-        );
-        const matchingRepository = repositories.find(
-            (repository) =>
-                repository.provider_repository_id ===
-                repositoryConnection?.provider_repository_id,
-        );
-
-        updateForm.provider_repository_id =
-            matchingRepository?.provider_repository_id ??
-            repositories[0]?.provider_repository_id ??
-            '';
-    },
-    { immediate: true },
-);
-
-const submitCreate = (): void => {
-    createForm.submit(
-        ProjectRepositorySettingsController.store(props.project.id),
-        {
-            preserveScroll: true,
-        },
-    );
-};
-
-const submitUpdate = (): void => {
-    if (updateForm.repository_connection_id === '') {
-        return;
-    }
-
-    updateForm.submit(
-        ProjectRepositorySettingsController.update([
-            props.project.id,
-            Number(updateForm.repository_connection_id),
-        ]),
-        {
-            preserveScroll: true,
-        },
-    );
-};
 </script>
 
 <template>
     <AppLayout :breadcrumbs="breadcrumbs">
-        <Head :title="`${project.name} repository settings`" />
-
-        <div class="flex flex-1 flex-col gap-6 p-4">
-            <div
-                class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between"
-            >
-                <div class="space-y-3">
-                    <Badge variant="outline" class="px-3 py-1">
-                        {{ project.key }}
-                    </Badge>
-                    <Heading
-                        :title="`${project.name} repository settings`"
-                        description="Link project repositories through your personal Git connections so tickets can later discover matching branches and pull requests."
-                    />
-                </div>
-
-                <div class="flex flex-wrap gap-3">
-                    <Button
-                        v-if="$page.props.auth.permissions.globalAdmin"
-                        as-child
-                        variant="outline"
-                    >
-                        <Link :href="generalSettings(project.id)">
-                            General settings
-                        </Link>
-                    </Button>
-
-                    <Button as-child variant="outline">
-                        <Link :href="boardSettings(project.id)">
-                            Board settings
-                        </Link>
-                    </Button>
-
-                    <Button as-child variant="outline">
-                        <Link :href="metadataSettings(project.id)">
-                            Ticket settings
-                        </Link>
-                    </Button>
-
-                    <Button as-child variant="outline">
-                        <Link :href="notificationSettings(project.id)">
-                            Notification settings
-                        </Link>
-                    </Button>
-
-                    <Button as-child variant="outline">
-                        <Link :href="show(project.id)">Back to project</Link>
-                    </Button>
-                </div>
-            </div>
-
-            <div
+        <Head
+            :title="
+                t('repositorySettings.pageTitle', { project: project.name })
+            "
+        />
+        <SettingsLayout :project-name="project.name" :project-key="project.key">
+            <FeedbackState
                 v-if="status"
-                class="rounded-xl border border-emerald-200 bg-emerald-50 px-4 py-3 text-sm text-emerald-900 dark:border-emerald-900/70 dark:bg-emerald-950/40 dark:text-emerald-100"
-            >
-                {{ status }}
-            </div>
+                state="success"
+                :title="successTitle"
+            />
 
             <TemplateInheritancePanel
                 :areas="['repository_connections']"
@@ -284,428 +338,815 @@ const submitUpdate = (): void => {
                 :template-state="templateState"
             />
 
-            <Card>
-                <CardHeader>
-                    <CardTitle>Personal Git access</CardTitle>
-                    <CardDescription>
-                        Project repository links are shared across the project,
-                        but every user needs their own Git connection to open or
-                        sync private repository data.
-                    </CardDescription>
-                </CardHeader>
-
-                <CardContent class="flex flex-wrap items-center gap-3">
-                    <Button as-child variant="outline">
-                        <Link :href="editGitConnections()">
-                            Open Git connections
-                        </Link>
-                    </Button>
-                    <p class="text-muted-foreground text-sm">
-                        Without a matching personal connection,
-                        {{ appName }} only shows the repository name and links
-                        you to your user settings.
-                    </p>
-                </CardContent>
-            </Card>
-
-            <div class="grid gap-6 xl:grid-cols-[24rem_minmax(0,1fr)]">
-                <div class="space-y-6">
-                    <Card>
-                        <CardHeader>
-                            <CardTitle>Link repository</CardTitle>
-                            <CardDescription>
-                                Choose one of your personal Git connections and
-                                link a visible repository to this project.
-                            </CardDescription>
-                        </CardHeader>
-
-                        <CardContent>
-                            <div
-                                v-if="selectableRepositorySources.length === 0"
-                                class="border-border text-muted-foreground rounded-xl border border-dashed px-4 py-6 text-sm"
-                            >
-                                Add a personal Git connection first, or fix an
-                                existing connection that currently cannot load
-                                repositories.
-                            </div>
-
-                            <form
-                                v-else
-                                class="space-y-4"
-                                @submit.prevent="submitCreate"
-                            >
-                                <div class="grid gap-2">
-                                    <Label for="create-user-git-connection">
-                                        Personal Git connection
-                                    </Label>
-                                    <select
-                                        id="create-user-git-connection"
-                                        v-model="
-                                            createForm.user_git_connection_id
-                                        "
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
-                                    >
-                                        <option
-                                            v-for="source in selectableRepositorySources"
-                                            :key="source.user_git_connection_id"
-                                            :value="
-                                                source.user_git_connection_id
-                                            "
-                                        >
-                                            {{
-                                                `${source.provider_label} · ${source.account_login} @ ${source.base_url}`
-                                            }}
-                                        </option>
-                                    </select>
-                                    <InputError
-                                        :message="
-                                            createForm.errors
-                                                .user_git_connection_id
-                                        "
-                                    />
-                                </div>
-
-                                <div class="grid gap-2">
-                                    <Label for="create-provider-repository-id">
-                                        Repository
-                                    </Label>
-                                    <select
-                                        id="create-provider-repository-id"
-                                        v-model="
-                                            createForm.provider_repository_id
-                                        "
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
-                                    >
-                                        <option
-                                            v-for="repository in createRepositories"
-                                            :key="
-                                                repository.provider_repository_id
-                                            "
-                                            :value="
-                                                repository.provider_repository_id
-                                            "
-                                        >
-                                            {{
-                                                `${repository.full_name} (${repository.visibility_label})`
-                                            }}
-                                        </option>
-                                    </select>
-                                    <InputError
-                                        :message="
-                                            createForm.errors
-                                                .provider_repository_id
-                                        "
-                                    />
-                                </div>
-
-                                <Button
-                                    type="submit"
-                                    :disabled="createForm.processing"
-                                >
-                                    Link repository
-                                </Button>
-                            </form>
-                        </CardContent>
-                    </Card>
-
-                    <Card
-                        v-if="
-                            repositoryConnections.length > 0 &&
-                            selectableRepositorySources.length > 0
-                        "
+            <Card
+                class="min-w-0 gap-0 overflow-hidden rounded-xl py-0 shadow-none"
+            >
+                <CardHeader
+                    class="gap-column min-w-0 grid-cols-1 border-b p-5 sm:p-6"
+                >
+                    <div
+                        class="flex min-w-0 flex-col gap-4 sm:flex-row sm:items-start sm:justify-between"
                     >
-                        <CardHeader>
-                            <CardTitle>Relink repository</CardTitle>
-                            <CardDescription>
-                                Update an existing project repository connection
-                                by choosing a different repository from one of
-                                your personal Git connections.
-                            </CardDescription>
-                        </CardHeader>
+                        <div class="gap-stack grid min-w-0">
+                            <h2 class="text-title">
+                                {{ t('repositorySettings.title') }}
+                            </h2>
+                            <p class="text-muted-foreground">
+                                {{ t('repositorySettings.description') }}
+                            </p>
+                        </div>
+                        <Button
+                            type="button"
+                            class="shrink-0 self-start"
+                            @click="openDialog('link')"
+                        >
+                            <Plus aria-hidden="true" />
+                            {{ t('repositorySettings.linkAction') }}
+                        </Button>
+                    </div>
+                    <div
+                        class="bg-muted/45 text-caption text-muted-foreground flex items-start gap-2 rounded-lg border p-3"
+                    >
+                        <Link2
+                            class="text-primary mt-0.5 size-4 shrink-0"
+                            aria-hidden="true"
+                        />
+                        <p>
+                            {{ t('repositorySettings.projectScope') }}
+                        </p>
+                    </div>
+                </CardHeader>
+                <CardContent class="gap-column grid min-w-0 p-5 sm:p-6">
+                    <div class="flex flex-wrap items-center gap-2">
+                        <h3 class="font-semibold">
+                            {{ t('repositorySettings.linkedRepositories') }}
+                        </h3>
+                        <Badge variant="secondary">
+                            {{ repositoryConnections.length }}
+                        </Badge>
+                    </div>
 
-                        <CardContent>
-                            <form
-                                class="space-y-4"
-                                @submit.prevent="submitUpdate"
-                            >
-                                <div class="grid gap-2">
-                                    <Label for="update-repository-connection">
-                                        Linked repository
-                                    </Label>
-                                    <select
-                                        id="update-repository-connection"
-                                        v-model="
-                                            updateForm.repository_connection_id
-                                        "
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
+                    <FeedbackState
+                        v-if="repositoryConnections.length === 0"
+                        state="empty"
+                        :title="t('repositorySettings.empty')"
+                        :description="t('repositorySettings.emptyDescription')"
+                    >
+                        <Button type="button" @click="openDialog('link')">
+                            <Plus aria-hidden="true" />
+                            {{ t('repositorySettings.linkAction') }}
+                        </Button>
+                    </FeedbackState>
+
+                    <ul
+                        v-else
+                        class="gap-column grid min-w-0"
+                        :aria-label="t('repositorySettings.linkedRepositories')"
+                    >
+                        <li
+                            v-for="repositoryConnection in repositoryConnections"
+                            :key="repositoryConnection.id"
+                            class="gap-column grid min-w-0 rounded-lg border p-4"
+                        >
+                            <div class="flex min-w-0 items-start gap-3">
+                                <div
+                                    class="bg-accent text-primary flex size-10 shrink-0 items-center justify-center rounded-lg"
+                                >
+                                    <GitBranch
+                                        class="size-5"
+                                        aria-hidden="true"
+                                    />
+                                </div>
+                                <div class="gap-stack grid min-w-0 flex-1">
+                                    <div
+                                        class="flex min-w-0 flex-wrap items-center gap-2"
                                     >
-                                        <option
-                                            v-for="repositoryConnection in repositoryConnections"
-                                            :key="repositoryConnection.id"
-                                            :value="repositoryConnection.id"
+                                        <h4
+                                            class="min-w-0 break-all font-semibold"
                                         >
                                             {{
                                                 repositoryConnection.repository_full_name
                                             }}
-                                        </option>
-                                    </select>
-                                </div>
-
-                                <div class="grid gap-2">
-                                    <Label for="update-user-git-connection">
-                                        Personal Git connection
-                                    </Label>
-                                    <select
-                                        id="update-user-git-connection"
-                                        v-model="
-                                            updateForm.user_git_connection_id
-                                        "
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
-                                    >
-                                        <option
-                                            v-for="source in selectableRepositorySources"
-                                            :key="source.user_git_connection_id"
-                                            :value="
-                                                source.user_git_connection_id
+                                        </h4>
+                                        <Badge variant="secondary">
+                                            {{
+                                                repositoryConnection.provider_label
+                                            }}
+                                        </Badge>
+                                        <Badge
+                                            :variant="
+                                                repositoryConnection.has_personal_access
+                                                    ? 'success'
+                                                    : 'warning'
                                             "
                                         >
                                             {{
-                                                `${source.provider_label} · ${source.account_login} @ ${source.base_url}`
+                                                t(
+                                                    repositoryConnection.has_personal_access
+                                                        ? 'repositorySettings.personalAccessReady'
+                                                        : 'repositorySettings.personalAccessMissing',
+                                                )
                                             }}
-                                        </option>
-                                    </select>
-                                    <InputError
-                                        :message="
-                                            updateForm.errors
-                                                .user_git_connection_id
+                                        </Badge>
+                                    </div>
+                                    <div
+                                        class="text-caption text-muted-foreground flex min-w-0 items-start gap-2"
+                                    >
+                                        <Server
+                                            class="mt-0.5 size-4 shrink-0"
+                                            aria-hidden="true"
+                                        />
+                                        <span class="min-w-0 break-all">
+                                            {{ repositoryConnection.base_url }}
+                                        </span>
+                                    </div>
+                                    <p
+                                        class="text-caption text-muted-foreground"
+                                    >
+                                        {{
+                                            t('repositorySettings.ticketUsage')
+                                        }}
+                                    </p>
+                                </div>
+                            </div>
+
+                            <div
+                                class="flex flex-wrap gap-2 border-t pt-3 sm:justify-end"
+                            >
+                                <Button
+                                    v-if="
+                                        repositoryConnection.has_personal_access
+                                    "
+                                    as-child
+                                    variant="outline"
+                                >
+                                    <a
+                                        :href="
+                                            repositoryConnection.repository_url
                                         "
-                                    />
+                                        target="_blank"
+                                        rel="noreferrer"
+                                        :aria-label="
+                                            t(
+                                                'repositorySettings.openRepository',
+                                                {
+                                                    repository:
+                                                        repositoryConnection.repository_full_name,
+                                                },
+                                            )
+                                        "
+                                    >
+                                        <ExternalLink aria-hidden="true" />
+                                        {{ t('repositorySettings.open') }}
+                                    </a>
+                                </Button>
+                                <Button v-else as-child variant="outline">
+                                    <Link :href="editGitConnections()">
+                                        <Link2 aria-hidden="true" />
+                                        {{
+                                            t(
+                                                'repositorySettings.connectAccess',
+                                            )
+                                        }}
+                                    </Link>
+                                </Button>
+                                <Button
+                                    type="button"
+                                    variant="outline"
+                                    :aria-label="
+                                        t('repositorySettings.editRepository', {
+                                            repository:
+                                                repositoryConnection.repository_full_name,
+                                        })
+                                    "
+                                    @click="
+                                        openDialog('edit', repositoryConnection)
+                                    "
+                                >
+                                    <Pencil aria-hidden="true" />
+                                    {{ t('common.edit') }}
+                                </Button>
+                                <Button
+                                    type="button"
+                                    variant="ghost"
+                                    :aria-label="
+                                        t(
+                                            'repositorySettings.removeRepository',
+                                            {
+                                                repository:
+                                                    repositoryConnection.repository_full_name,
+                                            },
+                                        )
+                                    "
+                                    @click="
+                                        openDialog(
+                                            'remove',
+                                            repositoryConnection,
+                                        )
+                                    "
+                                >
+                                    <Trash2 aria-hidden="true" />
+                                    {{ t('common.remove') }}
+                                </Button>
+                            </div>
+                        </li>
+                    </ul>
+                </CardContent>
+            </Card>
+
+            <Card
+                class="min-w-0 gap-0 overflow-hidden rounded-xl py-0 shadow-none"
+            >
+                <CardHeader
+                    class="gap-column min-w-0 grid-cols-1 border-b p-5 sm:p-6"
+                >
+                    <div
+                        class="flex min-w-0 flex-col gap-4 sm:flex-row sm:items-start sm:justify-between"
+                    >
+                        <div class="gap-stack grid min-w-0">
+                            <h2 class="text-title">
+                                {{ t('repositorySettings.personalSources') }}
+                            </h2>
+                            <p class="text-muted-foreground">
+                                {{
+                                    t(
+                                        'repositorySettings.personalSourcesDescription',
+                                    )
+                                }}
+                            </p>
+                        </div>
+                        <div class="flex flex-wrap gap-2">
+                            <Button as-child variant="outline">
+                                <Link :href="editGitConnections()">
+                                    {{
+                                        t(
+                                            'repositorySettings.manageConnections',
+                                        )
+                                    }}
+                                </Link>
+                            </Button>
+                            <Button
+                                type="button"
+                                variant="outline"
+                                :loading="refreshingSources"
+                                :loading-label="
+                                    t('repositorySettings.refreshing')
+                                "
+                                @click="refreshSources"
+                            >
+                                <RefreshCw aria-hidden="true" />
+                                {{ t('repositorySettings.refresh') }}
+                            </Button>
+                        </div>
+                    </div>
+                </CardHeader>
+                <CardContent class="gap-column grid min-w-0 p-5 sm:p-6">
+                    <FeedbackState
+                        v-if="refreshingSources"
+                        state="loading"
+                        :title="t('repositorySettings.refreshing')"
+                        :description="
+                            t('repositorySettings.refreshingDescription')
+                        "
+                    />
+                    <FeedbackState
+                        v-else-if="availableRepositorySources.length === 0"
+                        state="empty"
+                        :title="t('repositorySettings.noConnections')"
+                        :description="
+                            t('repositorySettings.noConnectionsDescription')
+                        "
+                    >
+                        <Button as-child variant="outline">
+                            <Link :href="editGitConnections()">
+                                {{ t('repositorySettings.manageConnections') }}
+                            </Link>
+                        </Button>
+                    </FeedbackState>
+                    <template v-else>
+                        <div class="flex flex-wrap items-center gap-2">
+                            <h3 class="font-semibold">
+                                {{ t('repositorySettings.detectedSources') }}
+                            </h3>
+                            <Badge variant="secondary">
+                                {{ successfulSourceCount }} /
+                                {{ availableRepositorySources.length }}
+                            </Badge>
+                        </div>
+                        <ul class="gap-column grid min-w-0">
+                            <li
+                                v-for="source in availableRepositorySources"
+                                :key="source.user_git_connection_id"
+                                class="gap-card grid min-w-0 rounded-lg border p-4 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-start"
+                            >
+                                <div class="flex min-w-0 items-start gap-3">
+                                    <div
+                                        class="bg-muted text-muted-foreground flex size-9 shrink-0 items-center justify-center rounded-md"
+                                    >
+                                        <Server
+                                            class="size-4"
+                                            aria-hidden="true"
+                                        />
+                                    </div>
+                                    <div class="gap-stack grid min-w-0">
+                                        <div
+                                            class="flex min-w-0 flex-wrap items-center gap-2"
+                                        >
+                                            <span
+                                                class="min-w-0 break-all font-semibold"
+                                            >
+                                                {{ source.account_login }}
+                                            </span>
+                                            <Badge variant="secondary">
+                                                {{ source.provider_label }}
+                                            </Badge>
+                                        </div>
+                                        <span
+                                            class="text-caption text-muted-foreground break-all"
+                                        >
+                                            {{ source.base_url }}
+                                        </span>
+                                        <p
+                                            v-if="source.error"
+                                            class="text-caption text-destructive break-words"
+                                        >
+                                            {{ source.error }}
+                                        </p>
+                                    </div>
+                                </div>
+                                <Badge
+                                    :variant="
+                                        source.error ? 'warning' : 'outline'
+                                    "
+                                    class="justify-self-start"
+                                >
+                                    {{
+                                        source.error
+                                            ? t(
+                                                  'repositorySettings.unavailable',
+                                              )
+                                            : t(
+                                                  'repositorySettings.repositoryCount',
+                                                  {
+                                                      count: source.repositories
+                                                          .length,
+                                                  },
+                                              )
+                                    }}
+                                </Badge>
+                            </li>
+                        </ul>
+                    </template>
+                </CardContent>
+            </Card>
+
+            <Dialog :open="dialogOpen" @update:open="closeDialog">
+                <DialogContent
+                    class="sm:max-w-2xl"
+                    :show-close-button="!processing"
+                    @escape-key-down="processing && $event.preventDefault()"
+                    @interact-outside="processing && $event.preventDefault()"
+                >
+                    <DialogHeader>
+                        <DialogTitle>{{ dialogTitle }}</DialogTitle>
+                        <DialogDescription>
+                            {{
+                                t(
+                                    dialogMode === 'link'
+                                        ? 'repositorySettings.linkDescription'
+                                        : dialogMode === 'edit'
+                                          ? 'repositorySettings.editDescription'
+                                          : 'repositorySettings.removeDescription',
+                                )
+                            }}
+                        </DialogDescription>
+                    </DialogHeader>
+
+                    <form
+                        v-if="dialogMode !== 'remove'"
+                        class="gap-column grid min-w-0"
+                        :aria-busy="repositoryForm.processing"
+                        @submit.prevent="saveRepository"
+                    >
+                        <FormFeedback
+                            :state="repositoryProtection.state.value"
+                            :title="
+                                repositoryProtection.responseStatus.value ===
+                                403
+                                    ? t('repositorySettings.forbidden')
+                                    : repositoryForm.processing
+                                      ? t(
+                                            dialogMode === 'edit'
+                                                ? 'repositorySettings.saving'
+                                                : 'repositorySettings.linking',
+                                        )
+                                      : undefined
+                            "
+                            :description="
+                                repositoryProtection.responseStatus.value ===
+                                403
+                                    ? t(
+                                          'repositorySettings.forbiddenDescription',
+                                      )
+                                    : undefined
+                            "
+                            :retryable="
+                                repositoryProtection.responseStatus.value !==
+                                403
+                            "
+                            @retry="saveRepository"
+                        />
+
+                        <FeedbackState
+                            v-if="matchingPersonalSourceMissing"
+                            state="empty"
+                            :title="
+                                t(
+                                    'repositorySettings.matchingConnectionMissing',
+                                )
+                            "
+                            :description="
+                                t(
+                                    'repositorySettings.matchingConnectionMissingDescription',
+                                )
+                            "
+                        >
+                            <Button as-child variant="outline">
+                                <Link :href="editGitConnections()">
+                                    {{
+                                        t(
+                                            'repositorySettings.manageConnections',
+                                        )
+                                    }}
+                                </Link>
+                            </Button>
+                        </FeedbackState>
+
+                        <fieldset
+                            class="gap-column grid min-w-0"
+                            :disabled="repositoryForm.processing"
+                        >
+                            <legend class="sr-only">{{ dialogTitle }}</legend>
+
+                            <div class="gap-stack grid min-w-0">
+                                <div
+                                    class="flex flex-wrap items-baseline justify-between gap-2"
+                                >
+                                    <Label>
+                                        {{
+                                            t(
+                                                'repositorySettings.personalConnection',
+                                            )
+                                        }}
+                                    </Label>
+                                    <span
+                                        class="text-caption text-muted-foreground"
+                                    >
+                                        {{
+                                            t(
+                                                'repositorySettings.personalConnectionHelp',
+                                            )
+                                        }}
+                                    </span>
                                 </div>
 
-                                <div class="grid gap-2">
-                                    <Label for="update-provider-repository-id">
-                                        Repository
-                                    </Label>
-                                    <select
-                                        id="update-provider-repository-id"
-                                        v-model="
-                                            updateForm.provider_repository_id
+                                <FeedbackState
+                                    v-if="
+                                        availableRepositorySources.length === 0
+                                    "
+                                    state="empty"
+                                    :title="
+                                        t('repositorySettings.noConnections')
+                                    "
+                                    :description="
+                                        t(
+                                            'repositorySettings.noConnectionsDescription',
+                                        )
+                                    "
+                                >
+                                    <Button as-child variant="outline">
+                                        <Link :href="editGitConnections()">
+                                            {{
+                                                t(
+                                                    'repositorySettings.manageConnections',
+                                                )
+                                            }}
+                                        </Link>
+                                    </Button>
+                                </FeedbackState>
+
+                                <div
+                                    v-else
+                                    class="grid min-w-0 gap-2 sm:grid-cols-2"
+                                >
+                                    <button
+                                        v-for="source in availableRepositorySources"
+                                        :key="source.user_git_connection_id"
+                                        type="button"
+                                        :aria-pressed="
+                                            repositoryForm.user_git_connection_id ===
+                                            String(
+                                                source.user_git_connection_id,
+                                            )
                                         "
-                                        class="border-input bg-background shadow-xs focus-visible:border-ring focus-visible:ring-ring/50 rounded-md border px-3 py-2 text-sm outline-none transition-[color,box-shadow] focus-visible:ring-[3px]"
+                                        :class="[
+                                            'focus-visible:ring-ring/35 gap-stack grid min-w-0 rounded-lg border p-3 text-left outline-none transition-colors focus-visible:ring-2',
+                                            repositoryForm.user_git_connection_id ===
+                                            String(
+                                                source.user_git_connection_id,
+                                            )
+                                                ? 'border-primary/50 bg-accent'
+                                                : 'hover:bg-muted/50',
+                                        ]"
+                                        @click="selectSource(source)"
                                     >
-                                        <option
-                                            v-for="repository in updateRepositories"
+                                        <span
+                                            class="flex min-w-0 flex-wrap items-center gap-2"
+                                        >
+                                            <span
+                                                class="min-w-0 break-all font-semibold"
+                                            >
+                                                {{ source.account_login }}
+                                            </span>
+                                            <Badge variant="secondary">
+                                                {{ source.provider_label }}
+                                            </Badge>
+                                        </span>
+                                        <span
+                                            class="text-caption text-muted-foreground break-all"
+                                        >
+                                            {{ source.base_url }}
+                                        </span>
+                                        <span
+                                            v-if="source.error"
+                                            class="text-caption text-destructive"
+                                        >
+                                            {{
+                                                t(
+                                                    'repositorySettings.unavailable',
+                                                )
+                                            }}
+                                        </span>
+                                    </button>
+                                </div>
+                                <InputError
+                                    :message="
+                                        repositoryForm.errors
+                                            .user_git_connection_id
+                                    "
+                                />
+                            </div>
+
+                            <div v-if="selectedSource" class="gap-column grid">
+                                <FeedbackState
+                                    v-if="selectedSource.error"
+                                    state="error"
+                                    :title="
+                                        t('repositorySettings.providerError')
+                                    "
+                                    :description="selectedSource.error"
+                                    retryable
+                                    @retry="refreshSources"
+                                />
+
+                                <template v-else>
+                                    <div class="grid gap-2">
+                                        <Label for="repository-search">
+                                            {{
+                                                t(
+                                                    'repositorySettings.searchLabel',
+                                                )
+                                            }}
+                                        </Label>
+                                        <div class="relative min-w-0">
+                                            <Search
+                                                class="text-muted-foreground pointer-events-none absolute left-3 top-1/2 size-4 -translate-y-1/2"
+                                                aria-hidden="true"
+                                            />
+                                            <Input
+                                                id="repository-search"
+                                                v-model="repositorySearch"
+                                                type="search"
+                                                class="pl-9"
+                                                :placeholder="
+                                                    t(
+                                                        'repositorySettings.searchPlaceholder',
+                                                    )
+                                                "
+                                            />
+                                        </div>
+                                    </div>
+
+                                    <div
+                                        v-if="refreshingSources"
+                                        class="gap-stack grid"
+                                        role="status"
+                                        :aria-label="
+                                            t('repositorySettings.refreshing')
+                                        "
+                                    >
+                                        <Skeleton class="h-16 w-full" />
+                                        <Skeleton class="h-16 w-full" />
+                                        <Skeleton class="h-16 w-full" />
+                                    </div>
+
+                                    <FeedbackState
+                                        v-else-if="
+                                            selectedSource.repositories
+                                                .length === 0
+                                        "
+                                        state="empty"
+                                        :title="
+                                            t(
+                                                'repositorySettings.noRepositories',
+                                            )
+                                        "
+                                        :description="
+                                            t(
+                                                'repositorySettings.noRepositoriesDescription',
+                                            )
+                                        "
+                                    />
+
+                                    <FeedbackState
+                                        v-else-if="
+                                            filteredRepositories.length === 0
+                                        "
+                                        state="empty"
+                                        :title="
+                                            t(
+                                                'repositorySettings.noSearchResults',
+                                            )
+                                        "
+                                        :description="
+                                            t(
+                                                'repositorySettings.noSearchResultsDescription',
+                                                { search: repositorySearch },
+                                            )
+                                        "
+                                    />
+
+                                    <div
+                                        v-else
+                                        class="max-h-72 space-y-2 overflow-y-auto pr-1"
+                                        role="radiogroup"
+                                        :aria-label="
+                                            t(
+                                                'repositorySettings.repositoryLabel',
+                                            )
+                                        "
+                                    >
+                                        <button
+                                            v-for="repository in filteredRepositories"
                                             :key="
                                                 repository.provider_repository_id
                                             "
-                                            :value="
+                                            type="button"
+                                            role="radio"
+                                            :aria-checked="
+                                                repositoryForm.provider_repository_id ===
                                                 repository.provider_repository_id
                                             "
+                                            :class="[
+                                                'focus-visible:ring-ring/35 flex w-full min-w-0 items-start justify-between gap-3 rounded-lg border p-3 text-left outline-none transition-colors focus-visible:ring-2',
+                                                repositoryForm.provider_repository_id ===
+                                                repository.provider_repository_id
+                                                    ? 'border-primary/50 bg-accent'
+                                                    : 'hover:bg-muted/50',
+                                            ]"
+                                            @click="
+                                                selectRepository(
+                                                    repository.provider_repository_id,
+                                                )
+                                            "
                                         >
-                                            {{
-                                                `${repository.full_name} (${repository.visibility_label})`
-                                            }}
-                                        </option>
-                                    </select>
-                                    <InputError
-                                        :message="
-                                            updateForm.errors
-                                                .provider_repository_id
-                                        "
-                                    />
-                                </div>
+                                            <span
+                                                class="gap-stack grid min-w-0"
+                                            >
+                                                <span
+                                                    class="min-w-0 break-all font-semibold"
+                                                >
+                                                    {{ repository.full_name }}
+                                                </span>
+                                                <span
+                                                    class="text-caption text-muted-foreground break-all"
+                                                >
+                                                    {{
+                                                        repository.repository_url
+                                                    }}
+                                                </span>
+                                            </span>
+                                            <Badge
+                                                variant="outline"
+                                                class="shrink-0"
+                                            >
+                                                {{
+                                                    repository.visibility_label
+                                                }}
+                                            </Badge>
+                                        </button>
+                                    </div>
+                                </template>
+                                <InputError
+                                    :message="
+                                        repositoryForm.errors
+                                            .provider_repository_id
+                                    "
+                                />
+                            </div>
 
+                            <DialogFooter>
+                                <Button
+                                    type="button"
+                                    variant="secondary"
+                                    @click="closeDialog(false)"
+                                >
+                                    {{ t('common.cancel') }}
+                                </Button>
                                 <Button
                                     type="submit"
-                                    variant="outline"
-                                    :disabled="updateForm.processing"
-                                >
-                                    Save repository change
-                                </Button>
-                            </form>
-                        </CardContent>
-                    </Card>
-                </div>
-
-                <div class="space-y-6">
-                    <Card class="gap-0 overflow-hidden">
-                        <CardHeader class="border-b">
-                            <CardTitle>Linked repositories</CardTitle>
-                            <CardDescription>
-                                Project repositories are shared, but access to
-                                private data depends on each viewer's personal
-                                Git connection.
-                            </CardDescription>
-                        </CardHeader>
-
-                        <CardContent class="space-y-4 p-6">
-                            <div
-                                v-if="repositoryConnections.length === 0"
-                                class="border-border text-muted-foreground rounded-xl border border-dashed px-4 py-6 text-sm"
-                            >
-                                No repositories are linked to this project yet.
-                            </div>
-
-                            <div
-                                v-for="repositoryConnection in repositoryConnections"
-                                :key="repositoryConnection.id"
-                                class="border-border rounded-xl border p-4"
-                            >
-                                <div
-                                    class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between"
-                                >
-                                    <div class="space-y-2">
-                                        <div
-                                            class="flex flex-wrap items-center gap-2"
-                                        >
-                                            <Badge>
-                                                {{
-                                                    repositoryConnection.provider_label
-                                                }}
-                                            </Badge>
-                                            <Badge variant="secondary">
-                                                {{
-                                                    repositoryConnection.base_url
-                                                }}
-                                            </Badge>
-                                        </div>
-                                        <div>
-                                            <p class="font-medium">
-                                                {{
-                                                    repositoryConnection.repository_full_name
-                                                }}
-                                            </p>
-                                            <p
-                                                class="text-muted-foreground text-sm"
-                                            >
-                                                {{
-                                                    repositoryConnection.repository_name
-                                                }}
-                                                by
-                                                {{
-                                                    repositoryConnection.owner_name
-                                                }}
-                                            </p>
-                                        </div>
-                                    </div>
-
-                                    <div class="flex flex-wrap gap-3">
-                                        <Button
-                                            v-if="
-                                                repositoryConnection.has_personal_access
-                                            "
-                                            as-child
-                                            variant="outline"
-                                        >
-                                            <a
-                                                :href="
-                                                    repositoryConnection.repository_url
-                                                "
-                                                target="_blank"
-                                                rel="noreferrer"
-                                            >
-                                                Open repository
-                                            </a>
-                                        </Button>
-
-                                        <Button
-                                            v-else
-                                            as-child
-                                            variant="outline"
-                                        >
-                                            <Link :href="editGitConnections()">
-                                                Connect Git access
-                                            </Link>
-                                        </Button>
-                                    </div>
-                                </div>
-
-                                <p
-                                    v-if="
-                                        !repositoryConnection.has_personal_access
+                                    :disabled="!canSaveRepository"
+                                    :loading="repositoryForm.processing"
+                                    :loading-label="
+                                        t(
+                                            dialogMode === 'edit'
+                                                ? 'repositorySettings.saving'
+                                                : 'repositorySettings.linking',
+                                        )
                                     "
-                                    class="text-muted-foreground mt-3 text-sm"
                                 >
-                                    This project link is visible, but you need a
-                                    matching Git connection in your user
-                                    settings before {{ appName }} can open or
-                                    query this repository for you.
-                                </p>
+                                    {{
+                                        t(
+                                            dialogMode === 'edit'
+                                                ? 'repositorySettings.save'
+                                                : 'repositorySettings.linkAction',
+                                        )
+                                    }}
+                                </Button>
+                            </DialogFooter>
+                        </fieldset>
+                    </form>
 
-                                <div class="mt-4 flex justify-end">
-                                    <Form
-                                        v-bind="
-                                            ProjectRepositorySettingsController.destroy.form(
-                                                [
-                                                    project.id,
-                                                    repositoryConnection.id,
-                                                ],
-                                            )
-                                        "
-                                        v-slot="{ processing }"
-                                    >
-                                        <Button
-                                            type="submit"
-                                            variant="destructive"
-                                            :disabled="processing"
-                                        >
-                                            Remove
-                                        </Button>
-                                    </Form>
-                                </div>
-                            </div>
-                        </CardContent>
-                    </Card>
-
-                    <Card
-                        v-if="availableRepositorySources.length > 0"
-                        class="gap-0 overflow-hidden"
+                    <form
+                        v-else
+                        class="gap-column grid min-w-0"
+                        :aria-busy="removalForm.processing"
+                        @submit.prevent="removeRepository"
                     >
-                        <CardHeader class="border-b">
-                            <CardTitle>Detected personal sources</CardTitle>
-                            <CardDescription>
-                                {{ appName }} loads repositories from your
-                                personal Git connections and offers them for
-                                project linking.
-                            </CardDescription>
-                        </CardHeader>
-
-                        <CardContent class="space-y-4 p-6">
-                            <div
-                                v-for="source in availableRepositorySources"
-                                :key="source.user_git_connection_id"
-                                class="border-border rounded-xl border p-4"
+                        <div
+                            class="bg-destructive/8 border-destructive/25 text-body grid min-w-0 gap-2 rounded-lg border p-4"
+                        >
+                            <p class="break-all font-semibold">
+                                {{ selectedConnection?.repository_full_name }}
+                            </p>
+                            <p class="text-muted-foreground break-all">
+                                {{ selectedConnection?.base_url }}
+                            </p>
+                        </div>
+                        <FormFeedback
+                            :state="removalProtection.state.value"
+                            :title="
+                                removalProtection.responseStatus.value === 403
+                                    ? t('repositorySettings.forbidden')
+                                    : removalForm.processing
+                                      ? t('repositorySettings.removing')
+                                      : undefined
+                            "
+                            :description="
+                                removalProtection.responseStatus.value === 403
+                                    ? t(
+                                          'repositorySettings.forbiddenDescription',
+                                      )
+                                    : undefined
+                            "
+                            :retryable="
+                                removalProtection.responseStatus.value !== 403
+                            "
+                            @retry="removeRepository"
+                        />
+                        <DialogFooter>
+                            <Button
+                                type="button"
+                                variant="secondary"
+                                :disabled="removalForm.processing"
+                                @click="closeDialog(false)"
                             >
-                                <div class="flex flex-wrap items-center gap-2">
-                                    <Badge>{{ source.provider_label }}</Badge>
-                                    <span class="text-sm font-medium">
-                                        {{ source.account_login }}
-                                    </span>
-                                    <span class="text-muted-foreground text-xs">
-                                        {{ source.base_url }}
-                                    </span>
-                                </div>
-
-                                <p
-                                    v-if="source.error"
-                                    class="mt-3 text-sm text-amber-700 dark:text-amber-300"
-                                >
-                                    {{ source.error }}
-                                </p>
-
-                                <p
-                                    v-else
-                                    class="text-muted-foreground mt-3 text-sm"
-                                >
-                                    {{ source.repositories.length }}
-                                    repositories available through this
-                                    connection.
-                                </p>
-                            </div>
-                        </CardContent>
-                    </Card>
-                </div>
-            </div>
-        </div>
+                                {{ t('common.cancel') }}
+                            </Button>
+                            <Button
+                                type="submit"
+                                variant="destructive"
+                                :loading="removalForm.processing"
+                                :loading-label="
+                                    t('repositorySettings.removing')
+                                "
+                            >
+                                {{ t('repositorySettings.removeTitle') }}
+                            </Button>
+                        </DialogFooter>
+                    </form>
+                </DialogContent>
+            </Dialog>
+        </SettingsLayout>
     </AppLayout>
 </template>
diff --git a/tests/Feature/Projects/ProjectRepositorySettingsControllerTest.php b/tests/Feature/Projects/ProjectRepositorySettingsControllerTest.php
index 2da038c..4a4a7b0 100644
--- a/tests/Feature/Projects/ProjectRepositorySettingsControllerTest.php
+++ b/tests/Feature/Projects/ProjectRepositorySettingsControllerTest.php
@@ -63,6 +63,58 @@ class ProjectRepositorySettingsControllerTest extends TestCase
             );
     }
 
+    /**
+     * Ensure repository discovery distinguishes empty provider results from provider failures.
+     */
+    public function test_repository_settings_expose_personal_access_and_provider_states(): void
+    {
+        $user = User::factory()->create();
+        $project = Project::factory()->create();
+        $emptyGitConnection = UserGitConnection::factory()->for($user)->create([
+            'account_login' => 'empty-account',
+            'base_url' => 'https://empty.git.test',
+            'provider' => GitProviderKey::Gitea,
+        ]);
+        UserGitConnection::factory()->for($user)->create([
+            'account_login' => 'broken-account',
+            'base_url' => 'https://broken.git.test',
+            'provider' => GitProviderKey::Gitea,
+        ]);
+        RepositoryConnection::factory()->for($project)->create([
+            'base_url' => $emptyGitConnection->base_url,
+            'provider' => GitProviderKey::Gitea,
+        ]);
+
+        $this->syncProjectPermissions($project, $user, ['edit']);
+
+        Http::preventStrayRequests();
+        Http::fake([
+            'https://empty.git.test/api/v1/user/repos*' => Http::response([]),
+            'https://broken.git.test/api/v1/user/repos*' => Http::response([], 502),
+        ]);
+
+        $this->actingAs($user)
+            ->get(route('projects.settings.repositories', $project))
+            ->assertOk()
+            ->assertInertia(fn (Assert $page) => $page
+                ->component('projects/settings/Repositories')
+                ->has('availableRepositorySources', 2)
+                ->where('availableRepositorySources', function ($sources): bool {
+                    $sourcesByAccount = collect($sources)->keyBy('account_login');
+                    $emptySource = $sourcesByAccount->get('empty-account');
+                    $brokenSource = $sourcesByAccount->get('broken-account');
+
+                    return data_get($emptySource, 'provider') === GitProviderKey::Gitea->value
+                        && data_get($emptySource, 'provider_label') === GitProviderKey::Gitea->label()
+                        && data_get($emptySource, 'repositories') === []
+                        && data_get($emptySource, 'error') === null
+                        && data_get($brokenSource, 'repositories') === []
+                        && data_get($brokenSource, 'error') === config('app.name').' could not load repositories from this Git connection right now.';
+                })
+                ->where('repositoryConnections.0.has_personal_access', true),
+            );
+    }
+
     /**
      * Ensure users without edit permission cannot manage repository settings.
      */