Merge pull request #2525 from generalaction/feat-migrate-git-stack

feat: migrate git stack

Author: jschwxrz

apps/emdash-desktop/src/main/core/forgejo/forgejo-connection-service.ts

@@ -1,7 +1,7 @@
 import { userGetCurrent } from '@llamaduck/forgejo-ts';
 import { createClient, type Client } from '@llamaduck/forgejo-ts/client';
 import { AxiosError } from 'axios';
-import { resolvePreferredRemote } from '@main/core/issues/git-remote-resolver';
+import { resolveRepositoryRemote } from '@main/core/issues/git-remote-resolver';
 import {
   assertRemoteHostMatchesInstance,
   hasKnownNetworkErrorCode,
@@ -177,11 +177,10 @@ export class ForgejoConnectionService {
   }
 
   async resolveRepo(
-    projectPath: string,
-    remoteName?: string
+    repositoryUrl: string | undefined
   ): Promise<{ client: Client; owner: string; repo: string; repoName: string }> {
     const { instanceUrl, client } = await this.requireAuth();
-    const remote = await resolvePreferredRemote(projectPath, remoteName);
+    const remote = resolveRepositoryRemote(repositoryUrl);
 
     assertRemoteHostMatchesInstance(remote.host, instanceUrl, 'Forgejo');
 

apps/emdash-desktop/src/main/core/forgejo/forgejo-issue-provider.ts

@@ -2,7 +2,7 @@ import { issueListIssues, type Issue as ForgejoIssue } from '@llamaduck/forgejo-
 import {
   clampIssueLimit,
   normalizeSearchTerm,
-  requireProjectPath,
+  requireRepositoryUrl,
 } from '@main/core/issues/helpers/provider-inputs';
 import type { IssueProvider } from '@main/core/issues/issue-provider';
 import type { LinkedIssue } from '@shared/core/linked-issue';
@@ -28,18 +28,12 @@ function toIssue(issue: ForgejoIssue, repoName: string): LinkedIssue {
   };
 }
 
-async function listIssues(
-  projectPath: string,
-  remoteName: string | undefined,
-  limit: number
-): Promise<IssueListResult> {
+async function listIssues(repositoryUrl: string, limit: number): Promise<IssueListResult> {
   const perPage = clampIssueLimit(limit, 50, 100);
 
   try {
-    const { client, owner, repo, repoName } = await forgejoConnectionService.resolveRepo(
-      projectPath,
-      remoteName
-    );
+    const { client, owner, repo, repoName } =
+      await forgejoConnectionService.resolveRepo(repositoryUrl);
 
     const { data: issues } = await issueListIssues({
       client,
@@ -61,8 +55,7 @@ async function listIssues(
 }
 
 async function searchIssues(
-  projectPath: string,
-  remoteName: string | undefined,
+  repositoryUrl: string,
   searchTerm: string,
   limit: number
 ): Promise<IssueListResult> {
@@ -74,10 +67,8 @@ async function searchIssues(
   const perPage = clampIssueLimit(limit, 20, 100);
 
   try {
-    const { client, owner, repo, repoName } = await forgejoConnectionService.resolveRepo(
-      projectPath,
-      remoteName
-    );
+    const { client, owner, repo, repoName } =
+      await forgejoConnectionService.resolveRepo(repositoryUrl);
 
     const { data: issues } = await issueListIssues({
       client,
@@ -113,20 +104,20 @@ export const forgejoIssueProvider: IssueProvider = {
   checkConnection: () => forgejoConnectionService.checkConnection(),
 
   listIssues: async (opts) => {
-    const projectPath = requireProjectPath(opts.projectPath);
-    if (!projectPath) {
-      return { success: false, error: 'Project path is required.' };
+    const repositoryUrl = requireRepositoryUrl(opts.repositoryUrl);
+    if (!repositoryUrl) {
+      return { success: false, error: 'Repository URL is required.' };
     }
 
-    return listIssues(projectPath, opts.remote, opts.limit ?? 50);
+    return listIssues(repositoryUrl, opts.limit ?? 50);
   },
 
   searchIssues: async (opts) => {
-    const projectPath = requireProjectPath(opts.projectPath);
-    if (!projectPath) {
-      return { success: false, error: 'Project path is required.' };
+    const repositoryUrl = requireRepositoryUrl(opts.repositoryUrl);
+    if (!repositoryUrl) {
+      return { success: false, error: 'Repository URL is required.' };
     }
 
-    return searchIssues(projectPath, opts.remote, opts.searchTerm, opts.limit ?? 20);
+    return searchIssues(repositoryUrl, opts.searchTerm, opts.limit ?? 20);
   },
 };