mika kuns
d743a9d0e9
Four IEnvironmentCheck implementations in src/ClaudeDo.Installer/Checks/: - ClaudeCliCheck (Error) — resolves ctx.ClaudeBin via ExecutableResolver, runs --version; failure message lists searched PATH entries + fallback dirs, flags shim resolution (.cmd/.ps1) in Detail. - ClaudeVersionCheck (Error) — tolerant version parsing (ignores surrounding text), numeric System.Version comparison against a named floor constant (2.1.220, see docs/explore-notes/installer-preflight.md §3). Unparseable or missing CLI -> Unknown, never Failed. - ClaudeAuthCheck (Error) — `claude auth status --json`, never sends a prompt. - PermissionModeAutoCheck (Warning) — per the note's §2 conclusion, real auto-mode eligibility (org/model/plan) has no cheap static signal, so this only confirms `claude --help` still lists "auto" as a --permission-mode choice. Kept as its own check rather than folded into ClaudeVersionCheck, since the note explicitly separates "flag recognized" from "mode eligible" and only the former is checkable at all. All four share a new ClaudeCliLookup that resolves the CLI and runs --version exactly once per install run (memoized, semaphore-guarded), so none of the three version-dependent checks repeats that call. Foundation prerequisites this task depends on (docs/explore-notes/ installer-preflight.md, ExecutableResolver, the IEnvironmentCheck/CheckResult/ EnvironmentCheckService abstraction, ProcessCommand, IProcessRunner) existed only on an unmerged sibling branch, not on main. Rather than merging that whole unreviewed branch, the specific prerequisite files were copied in as-is (git history shows their origin). GitCheck/GitIdentityCheck/PortCheck/ WriteAccessCheck from that branch were intentionally NOT brought in — out of scope for this task. Deviations/decisions worth flagging: - Added ExecutableResolver.FallbackDirectories() (public) so ClaudeCliCheck can name the checked fallback locations in its failure message; the prior branch kept that list private. - Paths.cs now qualifies System.Environment explicitly. Adding the ClaudeDo.Data.Environment namespace makes bare `Environment.X` inside any ClaudeDo.Data.* namespace resolve to the sibling namespace instead of System.Environment (C# prefers nested/enclosing namespace members over usings) — this broke the build until qualified. Not done (explicitly out of scope): no DI wiring into the wizard UI, no XAML — matches how the prerequisite Git/Port/WriteAccess checks were also left unwired.
72 lines
2.4 KiB
C#
72 lines
2.4 KiB
C#
using System.Text.RegularExpressions;
|
|
using ClaudeDo.Data.Environment;
|
|
using ClaudeDo.Installer.Core;
|
|
using ClaudeDo.Installer.Core.Interfaces;
|
|
|
|
namespace ClaudeDo.Installer.Checks;
|
|
|
|
public sealed record ClaudeCliLookupResult(
|
|
ResolvedExecutable? Resolved,
|
|
int ExitCode,
|
|
string Output,
|
|
Version? ParsedVersion);
|
|
|
|
/// <summary>
|
|
/// Resolves the claude CLI and runs `--version` at most once per install run, shared across
|
|
/// ClaudeCliCheck, ClaudeVersionCheck, ClaudeAuthCheck, and PermissionModeAutoCheck.
|
|
/// </summary>
|
|
public sealed class ClaudeCliLookup
|
|
{
|
|
private static readonly Regex VersionPattern = new(@"\d+(\.\d+){1,3}", RegexOptions.Compiled);
|
|
|
|
private readonly SemaphoreSlim _gate = new(1, 1);
|
|
private ClaudeCliLookupResult? _cached;
|
|
|
|
public ClaudeCliLookup(IProcessRunner processRunner, string? pathOverride = null, string? pathExtOverride = null)
|
|
{
|
|
ProcessRunner = processRunner;
|
|
PathOverride = pathOverride;
|
|
PathExtOverride = pathExtOverride;
|
|
}
|
|
|
|
public IProcessRunner ProcessRunner { get; }
|
|
public string? PathOverride { get; }
|
|
public string? PathExtOverride { get; }
|
|
|
|
public async Task<ClaudeCliLookupResult> ResolveAsync(InstallContext ctx, CancellationToken ct)
|
|
{
|
|
if (_cached is not null) return _cached;
|
|
|
|
await _gate.WaitAsync(ct);
|
|
try
|
|
{
|
|
_cached ??= await ResolveCoreAsync(ctx, ct);
|
|
return _cached;
|
|
}
|
|
finally
|
|
{
|
|
_gate.Release();
|
|
}
|
|
}
|
|
|
|
private async Task<ClaudeCliLookupResult> ResolveCoreAsync(InstallContext ctx, CancellationToken ct)
|
|
{
|
|
var resolved = ExecutableResolver.Resolve(ctx.ClaudeBin, PathOverride, PathExtOverride);
|
|
if (resolved is null)
|
|
{
|
|
return new ClaudeCliLookupResult(null, ExitCode: -1, Output: string.Empty, ParsedVersion: null);
|
|
}
|
|
|
|
var (fileName, arguments) = ProcessCommand.For(resolved, "--version");
|
|
var (exitCode, output) = await ProcessRunner.RunAsync(fileName, arguments, null, ct);
|
|
var parsedVersion = exitCode == 0 ? ParseVersion(output) : null;
|
|
|
|
return new ClaudeCliLookupResult(resolved, exitCode, output, parsedVersion);
|
|
}
|
|
|
|
private static Version? ParseVersion(string output) =>
|
|
VersionPattern.Match(output) is { Success: true } match && Version.TryParse(match.Value, out var version)
|
|
? version
|
|
: null;
|
|
}
|