Skip to content

Commit 4310e58

Browse files
refactor(server): PR provider maps credential errors by tag
Also points main's PR watch fingerprint resolver at the GitHubApi pinned credential. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent c97580c commit 4310e58

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎apps/server/src/pullRequest/GitHubPullRequestCli.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,8 @@ layer("GitHubPullRequestCli.layer", (it) => {
809809
// GitHub had no answer for #8, so its watch reads it in full.
810810
expect(eight).toBeNull();
811811
expect(mockedExecute).toHaveBeenCalledOnce();
812-
expect(callAt(0).args.at(-1) ?? "").toContain(
812+
const call = callAt(0);
813+
expect(call.kind === "graphql" ? call.query : "").toContain(
813814
'w1: repository(owner: "acme", name: "web") { pullRequest(number: 8)',
814815
);
815816
}),

‎apps/server/src/pullRequest/GitHubPullRequestCli.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1902,7 +1902,7 @@ export const make = Effect.gen(function* () {
19021902
key: ({ request, context }) =>
19031903
JSON.stringify([
19041904
request.host.toLowerCase(),
1905-
Context.getOrElse(context, GitHubCli.PinnedGitHubCredential, () => null)
1905+
Context.getOrElse(context, GitHubApi.PinnedGitHubCredential, () => null)
19061906
?.credentialFingerprint ?? null,
19071907
Context.getOrElse(context, SourceControlRateLimit.CredentialScope, () => ""),
19081908
]),

‎apps/server/src/pullRequest/GitHubPullRequestProvider.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ export function gitHubProviderFailure(
106106
error: GitHubPullRequestCli.GitHubPullRequestCliError,
107107
): PullRequestProviderFailure {
108108
switch (error._tag) {
109-
case "GitHubCredentialUnavailableError":
110-
return { reason: error.reason === "cli-missing" ? "missing-tool" : "unauthenticated" };
109+
case "GitHubCliMissingError":
110+
return { reason: "missing-tool" };
111+
case "GitHubNotSignedInError":
111112
case "GitHubApiAuthenticationError":
112113
return { reason: "unauthenticated" };
113114
case "GitHubApiRateLimitError":

0 commit comments

Comments
 (0)