@@ -246,10 +246,9 @@ import { listLinkedPullRequestThreads } from "./pullRequest/linkedThreads.ts";
246246import { pullRequestSyncKey } from "./pullRequest/pullRequestSyncKey.ts" ;
247247import * as SqlClient from "effect/sql/SqlClient" ;
248248import * as PullRequestSyncReactor from "./orchestration-v2/PullRequestSyncReactor.ts" ;
249- import { gitHubIssueRpcHandlersFork } from "./githubIssue/githubIssueWiring.fork.ts" ; // fork-hook: github-issues/ws-wiring-import
250249import * as GitHubIssueService from "./githubIssue/GitHubIssueService.ts" ; // fork-hook: github-issues/ws-service-import
250+ import { wsRpcHandlersLayerFork , wsRpcTagsFork } from "./wsRpcHandlers.fork.ts" ; // fork-hook: upstream-fixes/ws-rpc-handlers-import
251251import { sharedCheckoutWsLayerFork } from "./git/sharedCheckoutGuard.fork.ts" ; // fork-hook: zmux-estate/ws-shared-checkout-import
252- import * as CheckoutMoveFork from "./git/CheckoutMoveService.fork.ts" ; // fork-hook: zmux-estate/ws-checkout-move-import
253252import * as SourceControlDiscovery from "./sourceControl/SourceControlDiscovery.ts" ;
254253import * as OtlpEndpointCheck from "./observability/OtlpEndpointCheck.ts" ;
255254import * as SourceControlRepositoryService from "./sourceControl/SourceControlRepositoryService.ts" ;
@@ -1235,12 +1234,14 @@ export const subscribeOrchestrationV2Shell = Effect.fn("ws.orchestrationV2.subsc
12351234 } ,
12361235) ;
12371236
1237+ const ServerWsRpcHandlerGroupFork = ServerWsRpcGroup . omit ( ...wsRpcTagsFork ) ; // fork-hook: upstream-fixes/ws-rpc-handler-group-omit
12381238export const layerWsRpc = (
12391239 currentSession : EnvironmentAuth . AuthenticatedSession ,
12401240 clientOrigin : OrchestrationClientOrigin ,
12411241 clientAnalyticsProps : Readonly < Record < string , unknown > > ,
12421242 previewAutomationBroker : PreviewAutomationBroker . PreviewAutomationBroker [ "Service" ] ,
12431243 serverBrowser : ServerBrowser . ServerBrowser [ "Service" ] ,
1244+ ServerWsRpcGroup = ServerWsRpcHandlerGroupFork , // fork-hook: upstream-fixes/ws-rpc-handler-group
12441245) =>
12451246 Layer . effectContext (
12461247 Effect . gen ( function * ( ) {
@@ -1377,8 +1378,6 @@ export const layerWsRpc = (
13771378 const sourceControlRepositories =
13781379 yield * SourceControlRepositoryService . SourceControlRepositoryService ;
13791380 const withPullRequestViewer = pullRequests . withRoutingCredential ;
1380- const githubIssues = yield * GitHubIssueService . GitHubIssueService ; // fork-hook: github-issues/ws-service-yield
1381- const checkoutMoves = yield * CheckoutMoveFork . CheckoutMoveServiceFork ; // fork-hook: zmux-estate/ws-checkout-move-yield
13821381 const bootstrapCredentials = yield * PairingGrantStore . PairingGrantStore ;
13831382 const sessions = yield * SessionStore . SessionStore ;
13841383 const processDiagnostics = yield * ProcessDiagnostics . ProcessDiagnostics ;
@@ -2683,9 +2682,6 @@ export const layerWsRpc = (
26832682 ) ,
26842683 [ WS_METHODS . pullRequestsUpdate ] : ( input ) =>
26852684 withPullRequestViewer ( input , pullRequests . update ( input ) ) ,
2686- [ WS_METHODS . pullRequestsCreateAttachmentUploadUrl ] : ( input ) =>
2687- pullRequests . createAttachmentUploadUrl ( input ) ,
2688- [ WS_METHODS . pullRequestsUploadAttachment ] : ( input ) => pullRequests . uploadAttachment ( input ) ,
26892685 [ WS_METHODS . pullRequestsComment ] : ( input ) =>
26902686 withPullRequestViewer ( input , pullRequests . comment ( input ) ) ,
26912687 [ WS_METHODS . pullRequestsUpdateComment ] : ( input ) =>
@@ -2722,8 +2718,6 @@ export const layerWsRpc = (
27222718 withPullRequestViewer ( input , pullRequests . labelCandidates ( input ) ) ,
27232719 [ WS_METHODS . pullRequestsSetLabels ] : ( input ) =>
27242720 withPullRequestViewer ( input , pullRequests . setLabels ( input ) ) ,
2725- ...gitHubIssueRpcHandlersFork ( githubIssues , sql ) , // fork-hook: github-issues/ws-rpc-handlers
2726- ...CheckoutMoveFork . checkoutMoveRpcHandlersFork ( checkoutMoves ) , // fork-hook: zmux-estate/ws-checkout-move-handlers
27272721 [ WS_METHODS . sourceControlLookupRepository ] : ( input ) =>
27282722 sourceControlRepositories . lookupRepository ( input ) ,
27292723 [ WS_METHODS . sourceControlCloneRepository ] : ( input ) =>
@@ -3404,6 +3398,7 @@ export const layer = Layer.unwrap(
34043398 previewAutomationBroker ,
34053399 serverBrowser ,
34063400 ) . pipe (
3401+ Layer . merge ( wsRpcHandlersLayerFork ) , // fork-hook: upstream-fixes/ws-rpc-handlers-layer
34073402 Layer . provideMerge ( RpcSerialization . layerJson ) ,
34083403 // Handler-context reporters see only request defects, not server-wide defects.
34093404 Layer . provide ( DefectReporter . layer ) ,
0 commit comments