fix(clients): default clone destination to folder plus repo name (#5989)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>

Author: 3 people

apps/mobile/src/features/projects/AddProjectDestinationRoute.tsx

@@ -6,6 +6,7 @@ type AddProjectDestinationRouteParams = {
   readonly source?: string | string[];
   readonly remoteUrl?: string | string[];
   readonly repositoryTitle?: string | string[];
+  readonly repositoryName?: string | string[];
 };
 
 export function AddProjectDestinationRoute({

apps/mobile/src/features/projects/AddProjectScreen.tsx

@@ -7,6 +7,9 @@ import {
   canCreateProjectInEnvironment,
   findExistingAddProject,
   getAddProjectInitialQuery,
+  getCloneDestinationBrowsePath,
+  getCloneDestinationPath,
+  getCloneDirectoryName,
   resolveAddProjectPath,
   sortAddProjectProviderSources,
   type AddProjectRemoteSource,
@@ -23,8 +26,8 @@ import {
 } from "@t3tools/client-runtime/state/filesystem";
 import {
   appendBrowsePathSegment,
-  ensureBrowseDirectoryPath,
   inferProjectTitleFromPath,
+  isWindowsPlatform,
 } from "@t3tools/client-runtime/state/projects";
 import { CommandId, type EnvironmentId, ProjectId } from "@t3tools/contracts";
 import { CommonActions, StackActions, useNavigation } from "@react-navigation/native";
@@ -236,11 +239,18 @@ function ProjectPathInput(props: {
   );
 }
 
-function useBrowsePathInput(environment: EnvironmentOption | null) {
+// `pinnedDirectoryName` is the repository folder the clone destination keeps
+// appended to whatever folder the user browses to. The plain add-project flow
+// passes nothing, so it keeps proposing the browsed folder itself.
+function useBrowsePathInput(environment: EnvironmentOption | null, pinnedDirectoryName = "") {
   const environmentId = environment?.environmentId ?? null;
   const environmentBaseDirectory = environment?.baseDirectory ?? null;
+  const clonePathCaseSensitive = !isWindowsPlatform(environment?.platform ?? "");
   const [pathInput, commitPathInput] = useState(() =>
-    getAddProjectInitialQuery(environmentBaseDirectory),
+    getCloneDestinationPath(
+      getAddProjectInitialQuery(environmentBaseDirectory),
+      pinnedDirectoryName,
+    ),
   );
   const previousEnvironmentIdRef = useRef(environmentId);
   const environmentRuntime = useRemoteEnvironmentRuntime(environmentId);
@@ -259,33 +269,60 @@ function useBrowsePathInput(environment: EnvironmentOption | null) {
     [browseNavigation],
   );
   const navigateToBrowsePath = useCallback(
-    async (path: string) => {
+    async (input: {
+      readonly browseDirectoryPath: string;
+      readonly selectedDirectoryName?: string;
+    }) => {
+      const selectedDirectoryPath = input.selectedDirectoryName
+        ? appendBrowsePathSegment(input.browseDirectoryPath, input.selectedDirectoryName)
+        : input.browseDirectoryPath;
+      const nextPathInput =
+        pinnedDirectoryName && input.selectedDirectoryName
+          ? getCloneDestinationBrowsePath({
+              browseDirectoryPath: input.browseDirectoryPath,
+              selectedDirectoryName: input.selectedDirectoryName,
+              cloneDirectoryName: pinnedDirectoryName,
+              caseSensitive: clonePathCaseSensitive,
+            })
+          : getCloneDestinationPath(selectedDirectoryPath, pinnedDirectoryName);
       setIsBrowseNavigating(true);
       const committed = await browseNavigation.run(
         async () => {
           if (environment && canPreloadBrowsePath(environmentRuntime?.connectionState)) {
             await loadBrowsePath({
               environmentId: environment.environmentId,
-              input: { partialPath: path },
+              input: { partialPath: selectedDirectoryPath },
             });
           }
         },
-        () => commitPathInput(path),
+        () => commitPathInput(nextPathInput),
       );
       if (committed) {
         setIsBrowseNavigating(false);
       }
       return committed;
     },
-    [browseNavigation, environment, environmentRuntime?.connectionState, loadBrowsePath],
+    [
+      browseNavigation,
+      clonePathCaseSensitive,
+      environment,
+      environmentRuntime?.connectionState,
+      loadBrowsePath,
+      pinnedDirectoryName,
+    ],
   );
 
   useEffect(() => {
     if (environmentId !== null && environmentId !== previousEnvironmentIdRef.current) {
       previousEnvironmentIdRef.current = environmentId;
-      setPathInput(getAddProjectInitialQuery(environmentBaseDirectory));
+      setPathInput(
+        getCloneDestinationPath(
+          getAddProjectInitialQuery(environmentBaseDirectory),
+          pinnedDirectoryName,
+        ),
+      );
     }
-  }, [environmentBaseDirectory, environmentId, setPathInput]);
+  }, [environmentBaseDirectory, environmentId, pinnedDirectoryName, setPathInput]);
 
   useEffect(
     () => () => {
@@ -632,6 +669,7 @@ export function AddProjectRepositoryScreen(props: {
           source,
           remoteUrl,
           repositoryTitle: remoteUrl,
+          repositoryName: getCloneDirectoryName(remoteUrl),
         }),
       );
       setIsSubmitting(false);
@@ -655,6 +693,7 @@ export function AddProjectRepositoryScreen(props: {
           source,
           remoteUrl: repository.sshUrl,
           repositoryTitle: repository.nameWithOwner,
+          repositoryName: getCloneDirectoryName(repository.nameWithOwner),
         }),
       );
     }
@@ -698,7 +737,11 @@ function FolderBrowser(props: {
   readonly environment: EnvironmentOption;
   readonly pathInput: string;
   readonly setPathInput: (path: string) => void;
-  readonly navigateToBrowsePath: (path: string) => Promise<boolean>;
+  readonly navigateToBrowsePath: (input: {
+    readonly browseDirectoryPath: string;
+    readonly selectedDirectoryName?: string;
+  }) => Promise<boolean>;
+  readonly pinnedDirectoryName?: string;
 }) {
   const accentColor = useThemeColor("--color-icon-muted");
   const browsePath = useMemo(
@@ -717,9 +760,16 @@ function FolderBrowser(props: {
           input: browseInput,
         }),
   );
+  // A pinned repository folder does not exist yet, so filtering the listing by
+  // it would empty the folder picker. Anything the user typed still filters.
+  const pinnedDirectoryName = props.pinnedDirectoryName ?? "";
+  const pinnedDirectoryMatches = isWindowsPlatform(props.environment.platform)
+    ? browsePath.filterQuery.toLowerCase() === pinnedDirectoryName.toLowerCase()
+    : browsePath.filterQuery === pinnedDirectoryName;
+  const browseFilterQuery = pinnedDirectoryMatches ? "" : browsePath.filterQuery;
   const { visibleEntries: visibleBrowseEntries } = useMemo(
-    () => filterFilesystemBrowseEntries(browseState.data?.entries ?? [], browsePath.filterQuery),
-    [browsePath.filterQuery, browseState.data?.entries],
+    () => filterFilesystemBrowseEntries(browseState.data?.entries ?? [], browseFilterQuery),
+    [browseFilterQuery, browseState.data?.entries],
   );
 
   return (
@@ -747,7 +797,9 @@ function FolderBrowser(props: {
             right={null}
             onPress={() => {
               if (browsePath.parentPath) {
-                void props.navigateToBrowsePath(browsePath.parentPath);
+                void props.navigateToBrowsePath({
+                  browseDirectoryPath: browsePath.parentPath,
+                });
               }
             }}
           />
@@ -760,11 +812,10 @@ function FolderBrowser(props: {
             isFirst={index === 0 && !browsePath.canBrowseUp}
             right={null}
             onPress={() => {
-              const nextPath =
-                browsePath.directoryPath.length > 0
-                  ? appendBrowsePathSegment(browsePath.directoryPath, entry.name)
-                  : ensureBrowseDirectoryPath(entry.fullPath);
-              void props.navigateToBrowsePath(nextPath);
+              void props.navigateToBrowsePath({
+                browseDirectoryPath: browsePath.directoryPath,
+                selectedDirectoryName: entry.name,
+              });
             }}
           />
         ))}
@@ -836,6 +887,7 @@ export function AddProjectDestinationScreen(props: {
   readonly environmentId?: string | string[];
   readonly remoteUrl?: string | string[];
   readonly repositoryTitle?: string | string[];
+  readonly repositoryName?: string | string[];
 }) {
   const cloneRepository = useAtomCommand(sourceControlEnvironment.cloneRepository, {
     reportFailure: false,
@@ -844,8 +896,15 @@ export function AddProjectDestinationScreen(props: {
   const createProject = useCreateProject(environment);
   const remoteUrl = stringParam(props.remoteUrl);
   const repositoryTitle = stringParam(props.repositoryTitle);
-  const { isBrowseNavigating, navigateToBrowsePath, pathInput, setPathInput } =
-    useBrowsePathInput(environment);
+  // A lookup derives this from "owner/repo", a pasted clone URL from its own
+  // last segment. Older links without the param keep the browsed folder.
+  // Trim once here: the path input and the folder-list filter must compare the
+  // same value, or a deep link with a padded param empties the folder picker.
+  const repositoryName = stringParam(props.repositoryName)?.trim() ?? "";
+  const { isBrowseNavigating, navigateToBrowsePath, pathInput, setPathInput } = useBrowsePathInput(
+    environment,
+    repositoryName,
+  );
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -918,6 +977,7 @@ export function AddProjectDestinationScreen(props: {
             navigateToBrowsePath={navigateToBrowsePath}
             pathInput={pathInput}
             setPathInput={setPathInput}
+            pinnedDirectoryName={repositoryName}
           />
         </>
       ) : (

apps/web/src/components/CommandPalette.logic.test.ts

@@ -6,6 +6,7 @@ import {
   buildBrowseGroups,
   buildThreadActionItems,
   enumerateCommandPaletteItems,
+  filterPinnedBrowseEntries,
   filterCommandPaletteGroups,
   reduceCommandPaletteUiState,
   type CommandPaletteGroup,
@@ -371,3 +372,39 @@ describe("buildBrowseGroups", () => {
     expect(actionSettled).toBe(true);
   });
 });
+
+describe("filterPinnedBrowseEntries", () => {
+  const entries = [
+    { name: "repo", fullPath: "/projects/repo" },
+    { name: "work", fullPath: "/projects/work" },
+  ];
+
+  it("shows sibling folders without losing an existing pinned destination", () => {
+    expect(
+      filterPinnedBrowseEntries({
+        browseEntries: entries,
+        filterQuery: "repo",
+        pinnedDirectoryName: "repo",
+        caseSensitive: true,
+      }),
+    ).toEqual({ visibleEntries: entries, exactEntry: entries[0] });
+  });
+
+  it("matches an existing pinned destination without Windows casing", () => {
+    const windowsEntries = [
+      { name: "Repo", fullPath: "C:\\projects\\Repo" },
+      { name: "work", fullPath: "C:\\projects\\work" },
+    ];
+    expect(
+      filterPinnedBrowseEntries({
+        browseEntries: windowsEntries,
+        filterQuery: "repo",
+        pinnedDirectoryName: "repo",
+        caseSensitive: false,
+      }),
+    ).toEqual({
+      visibleEntries: windowsEntries,
+      exactEntry: windowsEntries[0],
+    });
+  });
+});

apps/web/src/components/CommandPalette.logic.ts

@@ -3,6 +3,7 @@ import {
   type KeybindingCommand,
   THREAD_JUMP_KEYBINDING_COMMANDS,
 } from "@t3tools/contracts";
+import { filterFilesystemBrowseEntries } from "@t3tools/client-runtime/state/filesystem";
 import type { SidebarThreadSortOrder } from "@t3tools/contracts/settings";
 import * as Arr from "effect/Array";
 import * as Result from "effect/Result";
@@ -397,6 +398,25 @@ export function buildBrowseGroups(input: {
   return [{ value: "directories", label: "Directories", items }];
 }
 
+export function filterPinnedBrowseEntries(input: {
+  browseEntries: ReadonlyArray<FilesystemBrowseEntry>;
+  filterQuery: string;
+  pinnedDirectoryName: string;
+  caseSensitive: boolean;
+}): ReturnType<typeof filterFilesystemBrowseEntries> {
+  const namesMatch = (left: string, right: string) =>
+    input.caseSensitive ? left === right : left.toLowerCase() === right.toLowerCase();
+  const visibleFilterQuery = namesMatch(input.filterQuery, input.pinnedDirectoryName)
+    ? ""
+    : input.filterQuery;
+  const { visibleEntries } = filterFilesystemBrowseEntries(input.browseEntries, visibleFilterQuery);
+  const exactEntry =
+    input.filterQuery.length > 0
+      ? (input.browseEntries.find((entry) => namesMatch(entry.name, input.filterQuery)) ?? null)
+      : null;
+  return { visibleEntries, exactEntry };
+}
+
 export function getCommandPaletteMode(input: {
   currentView: CommandPaletteView | null;
   isBrowsing: boolean;