feat: enhance Git project folder handling and improve test descriptions

Author: gatzjames

packages/insomnia-smoke-test/playwright/pages/project/index.ts

@@ -164,6 +164,8 @@ export class ProjectPage extends BasePage {
     await this.page.getByRole('button', { name: 'Open existing folder' }).click();
     await this.page.getByRole('button', { name: 'Choose folder' }).click();
     await this.page.getByRole('button', { name: 'Open', exact: true }).click();
+    // Confirm the "Do you trust this folder?" dialog before the folder is opened/initialized.
+    await this.page.getByRole('button', { name: 'Open folder' }).click();
   }
 
   /**
@@ -178,10 +180,12 @@ export class ProjectPage extends BasePage {
     await this.page.getByRole('textbox', { name: 'Project name' }).press('ControlOrMeta+a');
     await this.page.getByRole('textbox', { name: 'Project name' }).fill(name);
     await this.page.getByText('Git Sync').click();
-    await this.page.getByRole('button', { name: 'Access Token author Git' }).click();
+    await this.page.getByRole('button', { name: 'Git Credentials Authorized as' }).click();
     await this.page.getByRole('option', { name: 'Custom Git Credential' }).click();
     await this.page.getByRole('textbox', { name: 'Repository URL' }).click();
-    await this.page.getByRole('textbox', { name: 'Repository URL' }).fill('git-server.git');
+    // Use the reachable git test server URL so remote branches can be listed.
+    // deriveRepoName() still yields "git-server" from this URL.
+    await this.page.getByRole('textbox', { name: 'Repository URL' }).fill('http://localhost:4010/git/git-server.git');
     await this.page.getByRole('button', { name: 'Show suggestions Branch' }).click();
     await this.page.getByRole('option', { name: 'master' }).click();
     // Pick the custom clone destination before scanning.

packages/insomnia-smoke-test/tests/smoke/git-local-repos.test.ts

@@ -24,7 +24,7 @@ test.describe('Git repositories in user-chosen folders', () => {
 
       await insomnia.projectPage.openGitProjectFromFolder('Opened Folder Project', folder);
 
-      // `git init` must have run inside the chosen folder (decision OQ2).
+      // `git init` must have run inside the chosen folder.
       await expect.poll(() => fs.existsSync(path.join(folder, '.git')), { timeout: 30_000 }).toBe(true);
 
       // The project landed — no error banner.
@@ -43,7 +43,7 @@ test.describe('Git repositories in user-chosen folders', () => {
       // Back to the project dashboard, then try to adopt the same folder again.
       await insomnia.projectPage.openGitProjectFromFolder('Second Adoption', folder);
 
-      // The hard-block surfaces an error mentioning the already-connected folder (OQ5).
+      // The hard-block surfaces an error mentioning the already-connected folder.
       await expect.soft(page.getByText(/already connected to this folder/i)).toBeVisible();
     } finally {
       fs.rmSync(folder, { recursive: true, force: true });

packages/insomnia/src/main/git-service.ts

@@ -577,7 +577,7 @@ export async function loadGitRepository({ projectId, workspaceId }: { projectId:
     // its drive unmounted) BEFORE creating the FS client — `fsClient` auto-creates
     // its base dir, which would silently resurrect a deleted folder as empty and
     // let the watcher wipe the database. We surface an "unavailable" state and let
-    // the user re-locate or remove the project; we never auto-remove it (OQ6/D4).
+    // the user re-locate or remove the project; we never auto-remove it.
     if (gitRepository.directory) {
       let isAvailable = false;
       try {
@@ -1195,7 +1195,7 @@ export const cloneGitRepoAction = async ({
     }
 
     // When a user-chosen clone location is provided, validate it and guard
-    // against two projects targeting the same folder (decision OQ5 — hard block).
+    // against two projects targeting the same folder.
     if (directory) {
       if (!path.isAbsolute(directory)) {
         return { errors: ['Clone location must be an absolute path.'] };
@@ -1592,10 +1592,10 @@ export const cloneGitRepoAction = async ({
  *
  * Unlike {@link cloneGitRepoAction} this performs no network clone — it points
  * Insomnia at a folder already on disk:
- *   - If the folder is not yet a git repo, `GitVCS.init` runs `git init` (OQ2).
+ *   - If the folder is not yet a git repo, `GitVCS.init` runs `git init`.
  *   - Existing Insomnia YAML is imported by the watcher; a repo with no Insomnia
- *     data simply yields an empty project ready to populate (OQ1).
- *   - Two projects may not target the same folder (OQ5 — hard block).
+ *     data simply yields an empty project ready to populate.
+ *   - Two projects may not target the same folder.
  */
 export const openGitRepoAction = async ({
   organizationId,
@@ -1632,7 +1632,7 @@ export const openGitRepoAction = async ({
       };
     }
 
-    // Hard-block if another project already owns this folder (OQ5).
+    // Hard-block if another project already owns this folder.
     const existing = await services.gitRepository.getByDirectory(resolvedDirectory);
     if (existing) {
       return { errors: [`A project is already connected to this folder: ${resolvedDirectory}`] };
@@ -1770,7 +1770,7 @@ export const relocateGitRepoAction = async ({
     return { errors: ['The repository is already in that folder.'] };
   }
 
-  // Hard-block if another project already owns the target (OQ5).
+  // Hard-block if another project already owns the target.
   const existing = await services.gitRepository.getByDirectory(targetDir);
   if (existing && existing._id !== repo._id) {
     return { errors: [`A project is already connected to this folder: ${targetDir}`] };