@@ -554,7 +554,8 @@ export const make = Effect.gen(function* () {
554554 if ( filter . projectId !== undefined && project . id !== filter . projectId ) continue ;
555555 const identity = project . repositoryIdentity ;
556556 if (
557- identity ?. provider !== "unknown" ||
557+ ( identity ?. provider !== "unknown" &&
558+ ! ( identity ?. provider === "forgejo" && isSshRemoteUrl ( identity . locator . remoteUrl ) ) ) ||
558559 sourceControlRepositorySelector ( project . repositoryIdentity ) === null
559560 )
560561 continue ;
@@ -566,10 +567,7 @@ export const make = Effect.gen(function* () {
566567 host !== "unknown" &&
567568 host !== filter . host . toLowerCase ( ) &&
568569 pullRequestHostOf ( identity , "forgejo" ) !== filter . host . toLowerCase ( ) &&
569- ! (
570- isSshRemoteUrl ( identity . locator . remoteUrl ) &&
571- host === filter . host . toLowerCase ( ) . replace ( / : \d + $ / u, "" )
572- )
570+ ! isSshRemoteUrl ( identity . locator . remoteUrl )
573571 ) {
574572 continue ;
575573 }
@@ -591,20 +589,28 @@ export const make = Effect.gen(function* () {
591589 Effect . suspend ( ( ) =>
592590 sourceControlProviders . resolveHandle ( {
593591 cwd : project . workspaceRoot ,
594- context : { provider, remoteName, remoteUrl } ,
592+ context : {
593+ provider :
594+ provider . kind === "forgejo" ? { ...provider , kind : "unknown" } : provider ,
595+ remoteName,
596+ remoteUrl,
597+ ...( filter . host !== undefined && isSshRemoteUrl ( remoteUrl )
598+ ? { requestedHost : filter . host }
599+ : { } ) ,
600+ } ,
595601 } ) ,
596602 ) . pipe (
597603 Effect . flatMap ( ( handle ) => {
598- const kind = handle . context ?. provider . kind ;
599- return kind === undefined || kind === "unknown"
604+ const refined = handle . context ?. provider ;
605+ return refined === undefined || refined . kind === "unknown"
600606 ? Effect . fail ( undefined )
601- : Effect . succeed ( kind ) ;
607+ : Effect . succeed ( refined ) ;
602608 } ) ,
603609 ) ,
604610 ) ,
605611 ) . pipe (
606- Effect . map ( ( kind ) => [ baseUrl , kind ] as const ) ,
607- Effect . orElseSucceed ( ( ) => [ baseUrl , "unknown" ] as const ) ,
612+ Effect . map ( ( provider ) => [ baseUrl , provider ] as const ) ,
613+ Effect . orElseSucceed ( ( ) => [ baseUrl , null ] as const ) ,
608614 ) ,
609615 { concurrency : REPOSITORY_CONCURRENCY } ,
610616 ) . pipe ( Effect . map ( ( resolved ) => new Map ( resolved ) ) ) ;
@@ -624,10 +630,10 @@ export const make = Effect.gen(function* () {
624630 ) ,
625631 Effect . flatMap ( ( snapshot ) =>
626632 refineUnknownProjectKinds ( snapshot . projects , filter ) . pipe (
627- Effect . map ( ( refinedKinds ) => ( { refinedKinds , snapshot } ) ) ,
633+ Effect . map ( ( refinedProviders ) => ( { refinedProviders , snapshot } ) ) ,
628634 ) ,
629635 ) ,
630- Effect . map ( ( { refinedKinds , snapshot } ) => {
636+ Effect . map ( ( { refinedProviders , snapshot } ) => {
631637 const supported : SupportedProject [ ] = [ ] ;
632638 const unimplemented = new Map <
633639 string ,
@@ -645,21 +651,21 @@ export const make = Effect.gen(function* () {
645651 // Worktrees of one repository are separate projects; reading the remote once keeps
646652 // the page from repeating every change request per local checkout. The host is part
647653 // of the key, so the same `owner/repo` on two hosts stays two repositories.
648- if ( kind === "unknown" ) {
654+ let refinedProvider : SourceControlProviderInfo | null | undefined ;
655+ if (
656+ kind === "unknown" ||
657+ ( kind === "forgejo" && isSshRemoteUrl ( identity . locator . remoteUrl ) )
658+ ) {
649659 const provider = detectSourceControlProviderFromRemoteUrl ( identity . locator . remoteUrl ) ;
650- kind = provider === null ? kind : ( refinedKinds . get ( provider . baseUrl ) ?? kind ) ;
660+ refinedProvider = provider === null ? null : refinedProviders . get ( provider . baseUrl ) ;
661+ kind = refinedProvider ?. kind ?? kind ;
651662 }
652- let host = pullRequestHostOf ( identity , kind ) ;
663+ const host =
664+ refinedProvider ?. kind === "forgejo"
665+ ? new URL ( refinedProvider . baseUrl ) . host . toLowerCase ( )
666+ : pullRequestHostOf ( identity , kind ) ;
653667 if ( filter . host !== undefined && host !== filter . host . toLowerCase ( ) ) {
654- if (
655- kind !== "forgejo" ||
656- ! isSshRemoteUrl ( identity . locator . remoteUrl ) ||
657- host !== filter . host . toLowerCase ( ) . replace ( / : \d + $ / u, "" )
658- ) {
659- continue ;
660- }
661- // SSH clone ports do not identify the web server; tea validates this HTTP authority.
662- host = filter . host . toLowerCase ( ) ;
668+ continue ;
663669 }
664670 const api = registry . get ( kind ) ;
665671 // Recorded before the de-duplication below, so the viewer lookup keeps the alternates
0 commit comments