From 0590257277cba022ae7dcfc32678b6f189159ab2 Mon Sep 17 00:00:00 2001 From: Chris Scott <99081550+chriswritescode-dev@users.noreply.github.com> Date: Sat, 30 May 2026 15:34:19 +0000 Subject: [PATCH 1/3] fix: repo directory name collisions and custom directory support Allow users to specify a custom directory name when adding a remote repo, preventing collisions when cloning a fork of an already-cloned repo. - Add shared validation and normalization utilities (shared/src/utils/repo.ts) for directory name sanitization, URL normalization, and path safety - Replace duplicated sanitizeWorkspaceAliasSegment with shared helper - Backend validates directoryName before use as filesystem path - Frontend detects directory collisions with normalized URL comparison - Move SSH credential setup after DB record creation --- backend/src/routes/repos.ts | 4 +- backend/src/services/repo.ts | 32 +++---- frontend/src/api/repos.ts | 1 + .../src/components/repo/AddRepoDialog.tsx | 88 ++++++++++++++++-- shared/src/schemas/repo.ts | 1 + shared/src/utils/index.ts | 1 + shared/src/utils/repo.ts | 89 +++++++++++++++++++ 7 files changed, 187 insertions(+), 29 deletions(-) create mode 100644 shared/src/utils/repo.ts diff --git a/backend/src/routes/repos.ts b/backend/src/routes/repos.ts index 43ea8278..30c29b0e 100644 --- a/backend/src/routes/repos.ts +++ b/backend/src/routes/repos.ts @@ -46,7 +46,7 @@ export function createRepoRoutes( app.post('/', async (c) => { try { const body = await c.req.json() - const { repoUrl, localPath, branch, openCodeConfigName, useWorktree, skipSSHVerification, provider, baseBranch } = body + const { repoUrl, localPath, branch, directoryName, openCodeConfigName, useWorktree, skipSSHVerification, provider, baseBranch } = body if (!repoUrl && !localPath) { return c.json({ error: 'Either repoUrl or localPath is required' }, 400) @@ -67,7 +67,7 @@ export function createRepoRoutes( database, gitAuthService, repoUrl!, - { branch, useWorktree, skipSSHVerification, baseBranch } + { branch, directoryName, useWorktree, skipSSHVerification, baseBranch } ) } diff --git a/backend/src/services/repo.ts b/backend/src/services/repo.ts index cdf1221c..10ca0fc8 100644 --- a/backend/src/services/repo.ts +++ b/backend/src/services/repo.ts @@ -7,6 +7,7 @@ import type { Database } from 'bun:sqlite' import type { Repo, CreateRepoInput } from '../types/repo' import { logger } from '../utils/logger' import { getReposPath } from '@opencode-manager/shared/config/env' +import { normalizeRepoDirectoryName, sanitizeRepoDirectoryName } from '@opencode-manager/shared/utils' import type { GitAuthService } from './git-auth' import { isGitHubHttpsUrl, isSSHUrl, normalizeSSHUrl } from '../utils/git-auth' import path from 'path' @@ -103,19 +104,9 @@ async function isGitWorktreeRepo(targetPath: string): Promise { } } -function sanitizeWorkspaceAliasSegment(segment: string): string { - const sanitized = segment - .trim() - .replace(/[^a-zA-Z0-9._-]+/g, '-') - .replace(/^-+/, '') - .replace(/-+$/, '') - - return sanitized || 'repo' -} - function buildWorkspaceAliasCandidates(sourcePath: string, rootPath?: string): string[] { const candidates: string[] = [] - const baseName = sanitizeWorkspaceAliasSegment(path.basename(sourcePath)) + const baseName = sanitizeRepoDirectoryName(path.basename(sourcePath)) candidates.push(baseName) if (rootPath) { @@ -123,7 +114,7 @@ function buildWorkspaceAliasCandidates(sourcePath: string, rootPath?: string): s if (relativePath && !relativePath.startsWith('..')) { const relativeAlias = relativePath .split(path.sep) - .map(sanitizeWorkspaceAliasSegment) + .map(sanitizeRepoDirectoryName) .filter(Boolean) .join('--') @@ -579,6 +570,7 @@ export async function initLocalRepo( export interface CloneRepoOptions { branch?: string + directoryName?: string useWorktree?: boolean skipSSHVerification?: boolean baseBranch?: string @@ -590,24 +582,22 @@ export async function cloneRepo( repoUrl: string, options: CloneRepoOptions = {} ): Promise { - const { branch, useWorktree = false, skipSSHVerification = false, baseBranch } = options + const { branch, directoryName, useWorktree = false, skipSSHVerification = false, baseBranch } = options const effectiveUrl = normalizeSSHUrl(repoUrl) const isSSH = isSSHUrl(effectiveUrl) const preserveSSH = isSSH - const hasSSHCredential = await gitAuthService.setupSSHForRepoUrl(effectiveUrl, database, skipSSHVerification) - const { url: normalizedRepoUrl, name: repoName } = normalizeRepoUrl(effectiveUrl, preserveSSH) - const baseRepoDirName = repoName - const worktreeDirName = branch && useWorktree ? `${repoName}-${branch.replace(/[\\/]/g, '-')}` : repoName + const dirName = directoryName === undefined + ? sanitizeRepoDirectoryName(repoName) + : normalizeRepoDirectoryName(directoryName) + const baseRepoDirName = dirName + const worktreeDirName = branch && useWorktree ? `${dirName}-${branch.replace(/[\\/]/g, '-')}` : dirName const localPath = worktreeDirName const existing = getRepoByUrlAndBranch(database, normalizedRepoUrl, branch) if (existing) { logger.info(`Repo branch already exists: ${normalizedRepoUrl}${branch ? `#${branch}` : ''}`) - if (hasSSHCredential) { - await gitAuthService.cleanupSSHKey() - } return existing } @@ -632,6 +622,8 @@ export async function cloneRepo( const repo = createRepo(database, createRepoInput) try { + await gitAuthService.setupSSHForRepoUrl(effectiveUrl, database, skipSSHVerification) + const env = { ...gitAuthService.getGitEnvironment(), ...(isSSH ? gitAuthService.getSSHEnvironment() : {}) diff --git a/frontend/src/api/repos.ts b/frontend/src/api/repos.ts index 11017f9c..e76cd1f5 100644 --- a/frontend/src/api/repos.ts +++ b/frontend/src/api/repos.ts @@ -7,6 +7,7 @@ export interface CreateRepoOptions { repoUrl?: string localPath?: string branch?: string + directoryName?: string openCodeConfigName?: string useWorktree?: boolean skipSSHVerification?: boolean diff --git a/frontend/src/components/repo/AddRepoDialog.tsx b/frontend/src/components/repo/AddRepoDialog.tsx index 4e77b29e..2b1d699d 100644 --- a/frontend/src/components/repo/AddRepoDialog.tsx +++ b/frontend/src/components/repo/AddRepoDialog.tsx @@ -1,12 +1,13 @@ -import { useState } from 'react' -import { useMutation, useQueryClient } from '@tanstack/react-query' -import { createRepo, discoverRepos } from '@/api/repos' +import { useState, useRef, useCallback, useMemo } from 'react' +import { useMutation, useQueryClient, useQuery } from '@tanstack/react-query' +import { listRepos, createRepo, discoverRepos } from '@/api/repos' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog' import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs' import { Loader2 } from 'lucide-react' import { showToast } from '@/lib/toast' +import { getRepoDirectoryNameError, getRepoNameFromUrl, normalizeRepoUrlForCompare, sanitizeRepoDirectoryName } from '@opencode-manager/shared/utils' import type { DiscoverReposResponse } from '@opencode-manager/shared/types' import type { Repo } from '@/api/types' @@ -20,8 +21,10 @@ export function AddRepoDialog({ open, onOpenChange }: AddRepoDialogProps) { const [repoUrl, setRepoUrl] = useState('') const [localPath, setLocalPath] = useState('') const [folderPath, setFolderPath] = useState('') + const [directoryName, setDirectoryName] = useState('') const [branch, setBranch] = useState('') const [skipSSHVerification, setSkipSSHVerification] = useState(false) + const directoryTouched = useRef(false) const queryClient = useQueryClient() const isSSHUrl = (url: string): boolean => { @@ -29,6 +32,29 @@ export function AddRepoDialog({ open, onOpenChange }: AddRepoDialogProps) { } const showSkipSSHCheckbox = repoType === 'remote' && isSSHUrl(repoUrl) + const showDirectoryName = repoType === 'remote' + + const { data: existingRepos } = useQuery({ + queryKey: ['repos'], + queryFn: listRepos, + staleTime: 30_000, + }) + + const directoryNameError = useMemo(() => { + if (!showDirectoryName || !directoryName) return null + return getRepoDirectoryNameError(directoryName) + }, [showDirectoryName, directoryName]) + + const directoryCollision = useMemo(() => { + if (!showDirectoryName || !directoryName || directoryNameError || !existingRepos) return null + const normalizedNewUrl = normalizeRepoUrlForCompare(repoUrl) + const colliding = existingRepos.find((r) => { + if (r.localPath !== directoryName) return false + if (r.repoUrl && normalizeRepoUrlForCompare(r.repoUrl) === normalizedNewUrl) return false + return true + }) + return colliding ?? null + }, [showDirectoryName, directoryName, directoryNameError, existingRepos, repoUrl]) type AddRepoResult = | { mode: 'single'; repo: Repo } @@ -46,7 +72,13 @@ export function AddRepoDialog({ open, onOpenChange }: AddRepoDialogProps) { return { mode: 'discover', ...result } } - const repo = await createRepo({ repoUrl, branch: branch || undefined, useWorktree: false, skipSSHVerification }) + const repo = await createRepo({ + repoUrl, + directoryName: directoryName || undefined, + branch: branch || undefined, + useWorktree: false, + skipSSHVerification, + }) return { mode: 'single', repo } }, onSuccess: (result) => { @@ -55,9 +87,11 @@ export function AddRepoDialog({ open, onOpenChange }: AddRepoDialogProps) { setRepoUrl('') setLocalPath('') setFolderPath('') + setDirectoryName('') setBranch('') setRepoType('remote') setSkipSSHVerification(false) + directoryTouched.current = false if (result.mode === 'discover') { const summary = [ @@ -91,12 +125,21 @@ export function AddRepoDialog({ open, onOpenChange }: AddRepoDialogProps) { } } - const handleRepoUrlChange = (value: string) => { + const handleRepoUrlChange = useCallback((value: string) => { setRepoUrl(value) if (!isSSHUrl(value)) { setSkipSSHVerification(false) } - } + if (!directoryTouched.current) { + const extracted = sanitizeRepoDirectoryName(getRepoNameFromUrl(value)) + setDirectoryName(extracted) + } + }, []) + + const handleDirectoryNameChange = useCallback((value: string) => { + directoryTouched.current = true + setDirectoryName(value) + }, []) return ( @@ -161,6 +204,37 @@ export function AddRepoDialog({ open, onOpenChange }: AddRepoDialogProps) {

)} + + {showDirectoryName && ( +
+ + handleDirectoryNameChange(e.target.value)} + disabled={mutation.isPending} + className="bg-[#1a1a1a] border-[#2a2a2a] text-white placeholder:text-zinc-500 min-h-[44px] text-base" + /> + {directoryNameError ? ( +

+ {directoryNameError}. +

+ ) : directoryCollision ? ( +

+ A repository named '{directoryName}' already exists. + {directoryCollision.repoUrl && directoryCollision.repoUrl !== repoUrl + ? ` (${directoryCollision.repoUrl})` + : '' + } + {' '}Choose a different directory name to clone this fork. +

+ ) : ( +

+ Custom directory name for the cloned repository +

+ )} +
+ )}
@@ -204,7 +278,7 @@ export function AddRepoDialog({ open, onOpenChange }: AddRepoDialogProps) {