diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts index 938cb67706..b4cb1ecf36 100644 --- a/packages/server/src/server/session.ts +++ b/packages/server/src/server/session.ts @@ -6188,10 +6188,17 @@ export class Session { private buildWorkspaceGitHubRuntimePayload( snapshot: WorkspaceGitRuntimeSnapshot, ): NonNullable { - const { commitOids: _commitOids, ...pullRequest } = snapshot.forge.pullRequest ?? {}; + if (!snapshot.forge.pullRequest) { + return { + featuresEnabled: snapshot.forge.featuresEnabled, + pullRequest: null, + error: snapshot.forge.error, + }; + } + const { commitOids: _commitOids, ...pullRequest } = snapshot.forge.pullRequest; return { featuresEnabled: snapshot.forge.featuresEnabled, - pullRequest: snapshot.forge.pullRequest ? pullRequest : null, + pullRequest, error: snapshot.forge.error, }; }