Skip to content

Commit d5e4f51

Browse files
committed
fix(server): simplify incompatible CLI discovery hints
1 parent 7789142 commit d5e4f51

3 files changed

Lines changed: 34 additions & 37 deletions

File tree

‎apps/server/src/sourceControl/SourceControlDiscovery.test.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ it.effect("reports every hosting integration in registry order with its sign-in"
133133
}).pipe(Effect.provide(SourceControlDiscovery.layer.pipe(Layer.provide(layerDiscovery())))),
134134
);
135135

136-
for (const platform of ["darwin", "linux"] as const) {
137-
it.effect(`names incompatible executables only on macOS (${platform})`, () => {
136+
it.effect.each(["darwin", "linux"] as const)(
137+
"names incompatible executables only on macOS (%s)",
138+
(platform) => {
138139
const runProcess: typeof run = (input) =>
139140
Effect.fail(
140141
new VcsProcessSpawnError({
@@ -168,5 +169,5 @@ for (const platform of ["darwin", "linux"] as const) {
168169
Effect.provideService(HostProcess.Platform, platform),
169170
Effect.provideService(HostProcess.Architecture, "arm64"),
170171
);
171-
});
172-
}
172+
},
173+
);

‎apps/server/src/sourceControl/SourceControlDiscovery.ts‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,19 @@ export const make = Effect.gen(function* () {
119119
}) satisfies DiscoveryProbeResult<Kind>,
120120
),
121121
Effect.catch((cause) =>
122-
unavailableInstallHint(executable, input.installHint, cause).pipe(
123-
Effect.map(
124-
(installHint) =>
125-
({
126-
kind: input.kind,
127-
label: input.label,
128-
executable,
129-
implemented: input.implemented,
130-
status: "missing" as const,
131-
version: Option.none<string>(),
132-
installHint,
133-
detail: detailFromCause(cause),
134-
}) satisfies DiscoveryProbeResult<Kind>,
135-
),
136-
),
122+
Effect.gen(function* () {
123+
const installHint = yield* unavailableInstallHint(executable, input.installHint, cause);
124+
return {
125+
kind: input.kind,
126+
label: input.label,
127+
executable,
128+
implemented: input.implemented,
129+
status: "missing" as const,
130+
version: Option.none<string>(),
131+
installHint,
132+
detail: detailFromCause(cause),
133+
} satisfies DiscoveryProbeResult<Kind>;
134+
}),
137135
),
138136
);
139137
};

‎packages/source-control-core/src/server/discovery.ts‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -217,20 +217,22 @@ function probeCli(input: {
217217
}) satisfies DiscoveryProbeResult,
218218
),
219219
Effect.catch((cause) =>
220-
unavailableInstallHint(input.spec.executable, input.spec.installHint, cause).pipe(
221-
Effect.map(
222-
(installHint) =>
223-
({
224-
kind: input.spec.kind,
225-
label: input.spec.label,
226-
executable: input.spec.executable,
227-
status: "missing" as const,
228-
version: Option.none<string>(),
229-
installHint,
230-
detail: detailFromCause(cause),
231-
}) satisfies DiscoveryProbeResult,
232-
),
233-
),
220+
Effect.gen(function* () {
221+
const installHint = yield* unavailableInstallHint(
222+
input.spec.executable,
223+
input.spec.installHint,
224+
cause,
225+
);
226+
return {
227+
kind: input.spec.kind,
228+
label: input.spec.label,
229+
executable: input.spec.executable,
230+
status: "missing" as const,
231+
version: Option.none<string>(),
232+
installHint,
233+
detail: detailFromCause(cause),
234+
} satisfies DiscoveryProbeResult;
235+
}),
234236
),
235237
);
236238
}
@@ -319,10 +321,6 @@ export function isMissingExecutable(error: unknown): boolean {
319321
// Intel-only `gh` on Apple Silicon without Rosetta.
320322
const BAD_CPU_TYPE_ERRNO = -86;
321323

322-
/**
323-
* The hint for a CLI that failed to start. One built for another CPU looks installed to the user,
324-
* so the hint names the file the server tried to run.
325-
*/
326324
export const unavailableInstallHint = Effect.fn("discovery.unavailableInstallHint")(function* (
327325
executable: string,
328326
installHint: string,

0 commit comments

Comments
 (0)