@mndrk/agx 2.4.9 → 2.4.11

package/cloud-runtime/standalone/apps/local/app/api/projects/payload.ts

@@ -1,5 +1,12 @@
 import type { ProjectInput, ProjectRepoInput, ProjectUpdatePayload } from "@/lib/db-adapter.interface";
 
+export class InvalidProjectPayloadError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "InvalidProjectPayloadError";
+  }
+}
+
 function toOptionalString(value: unknown): string | undefined {
   if (typeof value !== "string") return undefined;
   const trimmed = value.trim();
@@ -23,16 +30,28 @@ function parseProjectRepos(value: unknown): ProjectRepoInput[] | undefined {
   if (!Array.isArray(value)) return undefined;
 
   const repos: ProjectRepoInput[] = [];
-  value.forEach((item) => {
+  value.forEach((item, index) => {
     if (!item || typeof item !== "object") return;
 
     const rawName = (item as Record<string, unknown>).name;
+    const rawPath = (item as Record<string, unknown>).path;
     const name = typeof rawName === "string" ? rawName.trim() : "";
-    if (!name) return;
+    const path = typeof rawPath === "string" ? rawPath.trim() : "";
+
+    if (!name && !path) return;
+    if (!name) {
+      throw new InvalidProjectPayloadError(
+        `Folder name is required for repos[${index}] when a local path is provided`
+      );
+    }
+    if (!path) {
+      throw new InvalidProjectPayloadError(
+        `Local path is required for repos[${index}] when a folder name is provided`
+      );
+    }
 
     const repo: Partial<ProjectRepoInput> = { name };
     const rawId = (item as Record<string, unknown>).id;
-    const rawPath = (item as Record<string, unknown>).path;
     const rawGitUrl = (item as Record<string, unknown>).git_url;
     const rawNotes = (item as Record<string, unknown>).notes;
 
@@ -40,12 +59,7 @@ function parseProjectRepos(value: unknown): ProjectRepoInput[] | undefined {
       repo.id = rawId.trim();
     }
 
-    if (typeof rawPath === "string" && rawPath.trim()) {
-      repo.path = rawPath.trim();
-    } else {
-      // Path is mandatory
-      return;
-    }
+    repo.path = path;
 
     if (typeof rawGitUrl === "string" && rawGitUrl.trim()) {
       repo.git_url = rawGitUrl.trim();

package/cloud-runtime/standalone/apps/local/app/api/projects/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { db } from "@/lib/db-instance";
-import { buildProjectInput } from "./payload";
+import { buildProjectInput, InvalidProjectPayloadError } from "./payload";
 import { LOCAL_USER } from "@/lib/auth-mode";
 import { hydrateProjectsObjectiveMetadata } from "./objective-metadata";
 import { logger } from "@/lib/logger";
@@ -57,6 +57,9 @@ export async function POST(request: NextRequest) {
     const project = await db.createProject(userId, projectInput);
     return NextResponse.json({ project }, { status: 201 });
   } catch (error) {
+    if (error instanceof InvalidProjectPayloadError) {
+      return NextResponse.json({ error: error.message }, { status: 400 });
+    }
     logger.error("Error creating project", logger.formatError(error));
     if (isMissingProjectsSchemaError(error)) {
       return NextResponse.json(

package/cloud-runtime/standalone/apps/local/app/layout.tsx

@@ -1,5 +1,5 @@
 import type { Metadata } from "next";
-import { Geist, Geist_Mono } from "next/font/google";
+import { Geist, Geist_Mono, Inter_Tight, JetBrains_Mono } from "next/font/google";
 import { GoogleAnalytics } from "@/components/GoogleAnalytics";
 import { PostHogAnalytics } from "@/components/PostHogAnalytics";
 import StartupGuard from "@/components/errors/StartupGuard";
@@ -16,6 +16,18 @@ const geistMono = Geist_Mono({
   subsets: ["latin"],
 });
 
+const interTight = Inter_Tight({
+  variable: "--font-inter-tight",
+  subsets: ["latin"],
+  weight: ["400", "500", "600", "700", "800", "900"],
+});
+
+const jetbrainsMono = JetBrains_Mono({
+  variable: "--font-jetbrains-mono",
+  subsets: ["latin"],
+  weight: ["400", "500", "600", "700"],
+});
+
 export const metadata: Metadata = {
   title: "AGX",
   description: "Workflow surface for AI-assisted dev work — tickets, repos, PRs, and agents in one window.",
@@ -45,7 +57,7 @@ export default function RootLayout({
       <head>
         <script dangerouslySetInnerHTML={{ __html: themeBootstrapScript }} />
       </head>
-      <body className={`${geistSans.variable} ${geistMono.variable} antialiased min-h-screen overflow-x-hidden overflow-y-auto bg-[var(--background)] text-[var(--foreground)] selection:bg-[var(--primary)] selection:text-[var(--primary-foreground)]`}>
+      <body className={`${geistSans.variable} ${geistMono.variable} ${interTight.variable} ${jetbrainsMono.variable} antialiased min-h-screen overflow-x-hidden overflow-y-auto bg-[var(--background)] text-[var(--foreground)] selection:bg-[var(--primary)] selection:text-[var(--primary-foreground)]`}>
         <StartupGuard>{children}</StartupGuard>
         <VersionBadge />
         <GoogleAnalytics />

package/cloud-runtime/standalone/apps/local/app/page.tsx

@@ -79,7 +79,7 @@ export default function Home() {
         <EmptyStateCard
           icon={<FolderPlus className="w-6 h-6 text-[var(--foreground)]" />}
           title="Create your first project"
-          description="A project groups your repos, teams, and automations. Create one to start working with agents."
+          description="A project groups your tickets, repos, and PRs — plus the agent teams that work them. Create one to get started."
           ctaLabel="Create a project"
           ctaHref="/projects?new=1"
         />
@@ -92,7 +92,7 @@ export default function Home() {
       <EmptyStateCard
         icon={<Users className="w-6 h-6 text-[var(--foreground)]" />}
         title={`Add a team to ${state.projectName}`}
-        description="Teams give your project the agents that will actually do the work. Add one to get started."
+        description="Teams are the agents that work through your tickets and PRs. Add one to start shipping."
         ctaLabel="Add a team"
         ctaHref={`/projects/${state.projectSlug}/teams/new`}
       />

package/cloud-runtime/standalone/apps/local/app/projects/[slug]/page.tsx

@@ -47,7 +47,7 @@ export default function ProjectPage({
       <EmptyStateCard
         icon={<Users className="w-6 h-6 text-[var(--foreground)]" />}
         title={`Add a team to ${project.name}`}
-        description="Teams give your project the agents that will actually do the work. Add one to get started."
+        description="Teams are the agents that work through your tickets and PRs. Add one to start shipping."
         ctaLabel="Add a team"
         ctaHref={`/projects/${project.slug}/teams/new`}
       />

package/cloud-runtime/standalone/apps/local/app/projects/[slug]/prs/[prId]/page.tsx

@@ -0,0 +1,13 @@
+"use client";
+
+import { use } from "react";
+import { PrReviewView } from "@/components/prs/review/PrReviewView";
+
+interface PageProps {
+  params: Promise<{ slug: string; prId: string }>;
+}
+
+export default function PrReviewPage({ params }: PageProps) {
+  const { prId } = use(params);
+  return <PrReviewView prId={prId} />;
+}

package/cloud-runtime/standalone/apps/local/app/projects/[slug]/prs/page.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { use, useCallback, useEffect, useMemo, useState } from "react";
+import Link from "next/link";
 import type { GithubPr, GithubRepo } from "@/lib/github-types";
 import { useProjectsWithAgents } from "@/hooks/useProjects";
 import { PrComposerPanel } from "@/components/prs/PrComposerPanel";
@@ -192,10 +193,10 @@ export default function ProjectPrsPage({
             const ci = ciIcon(pr.ciStatus);
             const isSelected = pr.id === selectedId;
             return (
-              <button
-                type="button"
+              <Link
                 key={pr.id}
-                onClick={() => setSelectedId(pr.id)}
+                href={`/projects/${slug}/prs/${encodeURIComponent(pr.id)}`}
+                onMouseEnter={() => setSelectedId(pr.id)}
                 className={`flex flex-col gap-0.5 border-b border-neutral-800/60 px-4 py-2 text-left text-sm hover:bg-neutral-800/50 ${
                   isSelected ? "bg-neutral-800/70" : ""
                 }`}
@@ -219,7 +220,7 @@ export default function ProjectPrsPage({
                   <span>·</span>
                   <span>{formatRelative(pr.updatedAt)}</span>
                 </div>
-              </button>
+              </Link>
             );
           })}
         </div>

package/cloud-runtime/standalone/apps/local/app/projects/page.tsx

@@ -5,6 +5,10 @@ import { useRouter, useSearchParams } from "next/navigation";
 import Layout from "@/components/Layout";
 import ProjectCard from "@/components/ProjectCard";
 import ProjectModal, { useProjectFormState, createProjectPayload } from "@/components/ProjectModal";
+import {
+  findInvalidProjectRepoDraft,
+  formatInvalidProjectRepoDraftMessage,
+} from "@/components/project-repo-validation";
 import TaskList from "@/components/TaskList";
 import { Task } from "@/components/TaskCard";
 import { useTasks } from "@/hooks/useTasks";
@@ -91,9 +95,9 @@ export default function ProjectsPage() {
       return;
     }
 
-    const invalidRepo = modalRepos.find(r => r.name.trim() && !r.path.trim());
+    const invalidRepo = findInvalidProjectRepoDraft(modalRepos);
     if (invalidRepo) {
-      setModalFormError(`Local path is required for folder "${invalidRepo.name}"`);
+      setModalFormError(formatInvalidProjectRepoDraftMessage(invalidRepo));
       return;
     }
 
@@ -169,7 +173,7 @@ export default function ProjectsPage() {
             </div>
             <h2 className="text-2xl font-bold mb-2">You have no projects</h2>
             <p className="text-[var(--muted-foreground)] text-center max-w-sm mb-8 leading-relaxed">
-              Create your first project to start organizing your tasks and connecting your folders.
+              Create your first project to connect your tickets, repos, and agent teams — and start shipping PRs.
             </p>
             <button
               onClick={openNewProjectModal}

package/cloud-runtime/standalone/apps/local/components/ProjectModal.tsx

@@ -3,6 +3,12 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { ProjectWithRepos } from "@/hooks/useProjects";
 import DirectoryBrowser from "@/components/DirectoryBrowser";
+import {
+  findInvalidProjectRepoDraft,
+  formatInvalidProjectRepoDraftMessage,
+  getProjectRepoValidationIssue,
+  isCompleteProjectRepoDraft,
+} from "@/components/project-repo-validation";
 
 export interface ProjectFormState {
   name: string;
@@ -99,8 +105,13 @@ export function createProjectPayload(
   form: ProjectFormState,
   repos: RepoDraft[]
 ) {
+  const invalidRepo = findInvalidProjectRepoDraft(repos);
+  if (invalidRepo) {
+    throw new Error(formatInvalidProjectRepoDraftMessage(invalidRepo));
+  }
+
   const repoPayload = repos
-    .filter((repo) => repo.name.trim() && repo.path.trim())
+    .filter((repo) => isCompleteProjectRepoDraft(repo))
     .map((repo) => ({
       ...(repo.id ? { id: repo.id } : {}),
       name: repo.name.trim(),
@@ -229,107 +240,116 @@ function ProjectFormFields({
           </button>
         </div>
         <div className="space-y-4">
-          {repos.map((repo, index) => (
-            <div key={index} className="p-4 rounded-2xl border border-[var(--card-border)] bg-[var(--muted)]/20 space-y-3 relative group">
-              <div className="flex items-center justify-between">
-                <div>
-                  <div className="text-xs font-bold text-[var(--foreground)] uppercase">Folder #{index + 1}</div>
-                  {isEditingProject && !isRepoExpanded(index) ? (
-                    <div className="mt-1 text-sm text-[var(--muted-foreground)]">
-                      <div>{repo.name || "Unnamed folder"}</div>
-                      <div className="truncate">{repo.path || "No local path set"}</div>
-                    </div>
-                  ) : null}
-                </div>
-                <div className="flex items-center gap-3">
-                  {isEditingProject && (
-                    <button
-                      type="button"
-                      onClick={() => toggleRepoExpanded(index)}
-                      className="text-xs font-semibold text-[var(--primary)] hover:underline"
-                      disabled={isSubmitting}
-                    >
-                      {isRepoExpanded(index) ? "Done" : "Edit"}
-                    </button>
-                  )}
-                  {repos.length > 1 && (
-                    <button
-                      type="button"
-                      onClick={() => onRemoveRepo(index)}
-                      className="text-xs font-semibold text-[var(--destructive)] hover:underline"
-                      disabled={isSubmitting}
-                    >
-                      Remove
-                    </button>
-                  )}
-                </div>
-              </div>
-              {isRepoExpanded(index) ? (
-                <div className="grid gap-3 md:grid-cols-2">
-                  <input
-                    value={repo.name}
-                    onChange={(e) => onRepoChange(index, "name", e.target.value)}
-                    placeholder="Name (e.g. Frontend, API Docs, Design System)"
-                    className="input text-sm"
-                    disabled={isSubmitting}
-                  />
-                  <div className="space-y-1">
-                    <div className="flex items-center gap-2">
-                      <input
-                        value={repo.path}
-                        onChange={(e) => onRepoChange(index, "path", e.target.value)}
-                        placeholder="Local path to folder"
-                        className={`input text-sm flex-1${repo.name.trim() && !repo.path.trim() ? " border-[var(--destructive)]/50 ring-1 ring-[var(--destructive)]/20" : ""}`}
+          {repos.map((repo, index) => {
+            const validationIssue = getProjectRepoValidationIssue(repo);
+
+            return (
+              <div key={index} className="p-4 rounded-2xl border border-[var(--card-border)] bg-[var(--muted)]/20 space-y-3 relative group">
+                <div className="flex items-center justify-between">
+                  <div>
+                    <div className="text-xs font-bold text-[var(--foreground)] uppercase">Folder #{index + 1}</div>
+                    {isEditingProject && !isRepoExpanded(index) ? (
+                      <div className="mt-1 text-sm text-[var(--muted-foreground)]">
+                        <div>{repo.name || "Unnamed folder"}</div>
+                        <div className="truncate">{repo.path || "No local path set"}</div>
+                      </div>
+                    ) : null}
+                  </div>
+                  <div className="flex items-center gap-3">
+                    {isEditingProject && (
+                      <button
+                        type="button"
+                        onClick={() => toggleRepoExpanded(index)}
+                        className="text-xs font-semibold text-[var(--primary)] hover:underline"
                         disabled={isSubmitting}
-                      />
+                      >
+                        {isRepoExpanded(index) ? "Done" : "Edit"}
+                      </button>
+                    )}
+                    {repos.length > 1 && (
                       <button
                         type="button"
-                        onClick={async () => {
-                          try {
-                            const res = await fetch("/api/filesystem/pick-folder", { method: "POST" });
-                            const data = await res.json();
-                            if (data.path) {
-                              onRepoChange(index, "path", data.path);
-                            }
-                          } catch {
-                            setBrowsingRepoIndex(browsingRepoIndex === index ? null : index);
-                          }
-                        }}
-                        className="px-3 py-2 rounded-xl border border-[var(--card-border)] bg-[var(--muted)]/30 hover:bg-[var(--muted)]/60 transition-colors text-xs font-semibold text-[var(--muted-foreground)] whitespace-nowrap"
+                        onClick={() => onRemoveRepo(index)}
+                        className="text-xs font-semibold text-[var(--destructive)] hover:underline"
                         disabled={isSubmitting}
                       >
-                        Browse
+                        Remove
                       </button>
-                    </div>
-                    {repo.name.trim() && !repo.path.trim() && (
-                      <p className="text-[11px] text-[var(--destructive)]">Local path is required</p>
                     )}
                   </div>
-                  {browsingRepoIndex === index && (
+                </div>
+                {isRepoExpanded(index) ? (
+                  <div className="grid gap-3 md:grid-cols-2">
+                    <div className="space-y-1">
+                      <input
+                        value={repo.name}
+                        onChange={(e) => onRepoChange(index, "name", e.target.value)}
+                        placeholder="Name (e.g. Frontend, API Docs, Design System)"
+                        className={`input text-sm w-full${validationIssue === "missing_name" ? " border-[var(--destructive)]/50 ring-1 ring-[var(--destructive)]/20" : ""}`}
+                        disabled={isSubmitting}
+                      />
+                      {validationIssue === "missing_name" && (
+                        <p className="text-[11px] text-[var(--destructive)]">Folder name is required</p>
+                      )}
+                    </div>
+                    <div className="space-y-1">
+                      <div className="flex items-center gap-2">
+                        <input
+                          value={repo.path}
+                          onChange={(e) => onRepoChange(index, "path", e.target.value)}
+                          placeholder="Local path to folder"
+                          className={`input text-sm flex-1${validationIssue === "missing_path" ? " border-[var(--destructive)]/50 ring-1 ring-[var(--destructive)]/20" : ""}`}
+                          disabled={isSubmitting}
+                        />
+                        <button
+                          type="button"
+                          onClick={async () => {
+                            try {
+                              const res = await fetch("/api/filesystem/pick-folder", { method: "POST" });
+                              const data = await res.json();
+                              if (data.path) {
+                                onRepoChange(index, "path", data.path);
+                              }
+                            } catch {
+                              setBrowsingRepoIndex(browsingRepoIndex === index ? null : index);
+                            }
+                          }}
+                          className="px-3 py-2 rounded-xl border border-[var(--card-border)] bg-[var(--muted)]/30 hover:bg-[var(--muted)]/60 transition-colors text-xs font-semibold text-[var(--muted-foreground)] whitespace-nowrap"
+                          disabled={isSubmitting}
+                        >
+                          Browse
+                        </button>
+                      </div>
+                      {validationIssue === "missing_path" && (
+                        <p className="text-[11px] text-[var(--destructive)]">Local path is required</p>
+                      )}
+                    </div>
+                    {browsingRepoIndex === index && (
+                      <div className="md:col-span-2">
+                        <DirectoryBrowser
+                          initialPath={repo.path || ""}
+                          onSelect={(selectedPath) => {
+                            onRepoChange(index, "path", selectedPath);
+                            setBrowsingRepoIndex(null);
+                          }}
+                          onCancel={() => setBrowsingRepoIndex(null)}
+                        />
+                      </div>
+                    )}
                     <div className="md:col-span-2">
-                      <DirectoryBrowser
-                        initialPath={repo.path || ""}
-                        onSelect={(selectedPath) => {
-                          onRepoChange(index, "path", selectedPath);
-                          setBrowsingRepoIndex(null);
-                        }}
-                        onCancel={() => setBrowsingRepoIndex(null)}
+                      <textarea
+                        value={repo.notes}
+                        onChange={(e) => onRepoChange(index, "notes", e.target.value)}
+                        placeholder="Notes for this folder — e.g. coding conventions, deploy steps, ownership, doc standards..."
+                        className="input text-sm w-full min-h-24 resize-y"
+                        disabled={isSubmitting}
                       />
                     </div>
-                  )}
-                  <div className="md:col-span-2">
-                    <textarea
-                      value={repo.notes}
-                      onChange={(e) => onRepoChange(index, "notes", e.target.value)}
-                      placeholder="Notes for this folder — e.g. coding conventions, deploy steps, ownership, doc standards..."
-                      className="input text-sm w-full min-h-24 resize-y"
-                      disabled={isSubmitting}
-                    />
                   </div>
-                </div>
-              ) : null}
-            </div>
-          ))}
+                ) : null}
+              </div>
+            );
+          })}
         </div>
       </div>
     </div>
@@ -408,7 +428,7 @@ export default function ProjectModal({
     };
   }, [editingProject]);
 
-  const hasIncompleteRepo = repos.some(r => r.name.trim() && !r.path.trim());
+  const hasIncompleteRepo = Boolean(findInvalidProjectRepoDraft(repos));
   const isFormInvalid = !form.name.trim() || hasIncompleteRepo;
 
   if (!isOpen) return null;

package/cloud-runtime/standalone/apps/local/components/TrackerBoard.tsx

@@ -1904,7 +1904,7 @@ export default function TrackerBoard({ trackerType, projectId, projectSlug, init
                   />
                 ) : isAwaitingRestore ? null : participants.length === 0 ? (
                   <div className="flex h-full items-center justify-center text-xs text-[var(--muted-foreground)]">
-                    Add at least one agent to this project to start a session.
+                    Add an agent team so you can pick a ticket and start shipping.
                   </div>
                 ) : (
                   <TicketPanel
@@ -2518,7 +2518,7 @@ export default function TrackerBoard({ trackerType, projectId, projectSlug, init
           </div>
         ) : isAwaitingRestore ? null : participants.length === 0 ? (
           <div className="flex h-full items-center justify-center text-xs text-[var(--muted-foreground)]">
-            Add at least one agent to this project to start a session.
+            Add an agent team so you can pick a ticket and start shipping.
           </div>
         ) : (
           <TicketPanel

package/cloud-runtime/standalone/apps/local/components/project-repo-validation.ts

@@ -0,0 +1,65 @@
+"use client";
+
+export interface ProjectRepoDraftLike {
+  name: string;
+  path: string;
+}
+
+export type ProjectRepoValidationIssue = "missing_name" | "missing_path";
+
+export interface InvalidProjectRepoDraft<T extends ProjectRepoDraftLike = ProjectRepoDraftLike> {
+  index: number;
+  issue: ProjectRepoValidationIssue;
+  repo: T;
+}
+
+function trimRepoFields(repo: ProjectRepoDraftLike) {
+  return {
+    name: repo.name.trim(),
+    path: repo.path.trim(),
+  };
+}
+
+export function getProjectRepoValidationIssue(
+  repo: ProjectRepoDraftLike
+): ProjectRepoValidationIssue | null {
+  const { name, path } = trimRepoFields(repo);
+
+  if (!name && !path) {
+    return null;
+  }
+  if (!name) {
+    return "missing_name";
+  }
+  if (!path) {
+    return "missing_path";
+  }
+  return null;
+}
+
+export function findInvalidProjectRepoDraft<T extends ProjectRepoDraftLike>(
+  repos: T[]
+): InvalidProjectRepoDraft<T> | null {
+  for (const [index, repo] of repos.entries()) {
+    const issue = getProjectRepoValidationIssue(repo);
+    if (issue) {
+      return { index, issue, repo };
+    }
+  }
+  return null;
+}
+
+export function isCompleteProjectRepoDraft(repo: ProjectRepoDraftLike): boolean {
+  const { name, path } = trimRepoFields(repo);
+  return Boolean(name && path);
+}
+
+export function formatInvalidProjectRepoDraftMessage(
+  invalidRepo: InvalidProjectRepoDraft
+): string {
+  const { issue, repo } = invalidRepo;
+  if (issue === "missing_name") {
+    return `Folder name is required for local path "${repo.path.trim()}"`;
+  }
+  return `Local path is required for folder "${repo.name.trim()}"`;
+}

package/cloud-runtime/standalone/apps/local/components/projects/FoldersView.tsx

@@ -5,7 +5,6 @@ import { useCallback, useRef, useState } from "react";
 import {
   Download,
   FileText,
-  Folder,
   FolderGit2,
   FolderPlus,
   Loader2,
@@ -17,11 +16,13 @@ import {
   Trash2,
   Upload,
   X,
+  Folder,
 } from "lucide-react";
 import type { WorkspaceEntry } from "@/lib/db/types";
 import { useProjectWorkspace } from "@/hooks/useProjectWorkspace";
 import { buildWorkspaceCategoryGroups } from "@/lib/project-workspace";
 import { DEFAULT_WORKSPACE_CATEGORIES } from "@/lib/workspace-categories";
+import { RepoPathCombobox } from "@/components/projects/RepoPathCombobox";
 
 interface FoldersViewProps {
   projectId: string;
@@ -579,15 +580,24 @@ export function FoldersView({ projectId }: FoldersViewProps) {
                                     Path
                                   </span>
                                   <div className="flex items-center gap-2">
-                                    <input
+                                    <RepoPathCombobox
+                                      category={editDraft.category}
                                       value={editDraft.path}
-                                      onChange={(event) =>
+                                      onChange={(next) =>
                                         setEditDraft((current) =>
-                                          current ? { ...current, path: event.target.value, error: null } : current,
+                                          current ? { ...current, path: next, error: null } : current,
                                         )
                                       }
-                                      className="w-full rounded-xl border border-[var(--border)] bg-[var(--background)] px-3 py-2 text-sm text-[var(--foreground)]"
+                                      onSelectMatch={(repo) =>
+                                        setEditDraft((current) => {
+                                          if (!current) return current;
+                                          const nextName =
+                                            current.name.trim().length === 0 ? repo.basename : current.name;
+                                          return { ...current, name: nextName, path: repo.path, error: null };
+                                        })
+                                      }
                                       placeholder="/Users/you/Projects/repo"
+                                      className="w-full rounded-xl border border-[var(--border)] bg-[var(--background)] px-3 py-2 text-sm text-[var(--foreground)]"
                                     />
                                     <button
                                       type="button"
@@ -667,13 +677,21 @@ export function FoldersView({ projectId }: FoldersViewProps) {
                               Path
                             </span>
                             <div className="flex items-center gap-2">
-                              <input
+                              <RepoPathCombobox
+                                category={addDraft.category}
                                 value={addDraft.path}
-                                onChange={(event) =>
-                                  setAddDraft((current) => ({ ...current, path: event.target.value, error: null }))
+                                onChange={(next) =>
+                                  setAddDraft((current) => ({ ...current, path: next, error: null }))
+                                }
+                                onSelectMatch={(repo) =>
+                                  setAddDraft((current) => {
+                                    const nextName =
+                                      current.name.trim().length === 0 ? repo.basename : current.name;
+                                    return { ...current, name: nextName, path: repo.path, error: null };
+                                  })
                                 }
-                                className="w-full rounded-xl border border-[var(--border)] bg-[var(--card-bg)] px-3 py-2 text-sm text-[var(--foreground)]"
                                 placeholder="/Users/you/Projects/repo"
+                                className="w-full rounded-xl border border-[var(--border)] bg-[var(--card-bg)] px-3 py-2 text-sm text-[var(--foreground)]"
                               />
                               <button
                                 type="button"