Raise the declared minimums in pubspec.yaml to what our deps already require: Flutter >=3.35.0 / Dart >=3.9.0 (was 3.19.0 / 3.5.0). alchemist 0.12 needs Flutter 3.32; Dart 3.9 first ships in Flutter 3.35, so 3.35 is the binding floor. Pin the exact build toolchain in .fvmrc (Flutter 3.44.1). Moving to the Dart 3.9 language level switches `dart format` to the new "tall" style and enables two new lints. This commit is the resulting mechanical churn, isolated from any behaviour change: - whole-tree `dart format` reformat (tall style) - `dart fix` for unnecessary_underscores + use_null_aware_elements No runtime behaviour change; `make test` green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
156 lines
5.7 KiB
Dart
156 lines
5.7 KiB
Dart
/// Flutter-free toolchain data + resolution.
|
|
///
|
|
/// Split out of `toolchain.dart` so that pure-Dart consumers (the IPC
|
|
/// subsystems exported through `package:clide/clide.dart`, e.g.
|
|
/// [GitClient] and [PqlClient]) don't transitively pull in
|
|
/// `package:flutter/foundation.dart`. The live, listenable `Toolchain`
|
|
/// stays in `toolchain.dart`; everything here is plain Dart and runs
|
|
/// fine under `dart test`.
|
|
library;
|
|
|
|
import 'dart:io';
|
|
|
|
/// Serializable result of tool resolution (crosses isolate boundary).
|
|
class ResolvedPaths {
|
|
const ResolvedPaths({this.git, this.pql, this.tmux, this.shell, this.gitEnv});
|
|
|
|
final String? git;
|
|
final String? pql;
|
|
final String? tmux;
|
|
final String? shell;
|
|
final Map<String, String>? gitEnv;
|
|
}
|
|
|
|
/// Read-only view of resolved tool paths. The concrete `Toolchain`
|
|
/// (in `toolchain.dart`) implements this on top of `ChangeNotifier`;
|
|
/// pure-Dart clients depend on the interface so they stay Flutter-free.
|
|
abstract class ToolchainView {
|
|
/// A fixed, already-resolved view over [paths]. Flutter-free — handy
|
|
/// for tests and isolate-side code that has a [ResolvedPaths] but no
|
|
/// need for the listenable `Toolchain`.
|
|
const factory ToolchainView.resolved(ResolvedPaths paths) = _StaticToolchain;
|
|
|
|
String get git;
|
|
String get pql;
|
|
String get tmux;
|
|
String get shell;
|
|
Map<String, String>? get gitEnv;
|
|
bool get resolved;
|
|
bool get allOk;
|
|
List<String> get missing;
|
|
}
|
|
|
|
class _StaticToolchain implements ToolchainView {
|
|
const _StaticToolchain(this._paths);
|
|
|
|
final ResolvedPaths _paths;
|
|
|
|
@override
|
|
String get git => _paths.git ?? 'git';
|
|
@override
|
|
String get pql => _paths.pql ?? 'pql';
|
|
@override
|
|
String get tmux => _paths.tmux ?? 'tmux';
|
|
@override
|
|
String get shell => _paths.shell ?? '/bin/bash';
|
|
@override
|
|
Map<String, String>? get gitEnv => _paths.gitEnv;
|
|
@override
|
|
bool get resolved => true;
|
|
@override
|
|
bool get allOk => missing.isEmpty;
|
|
@override
|
|
List<String> get missing => [if (_paths.git == null) 'git', if (_paths.pql == null) 'pql', if (_paths.tmux == null) 'tmux'];
|
|
}
|
|
|
|
/// Top-level function for compute/isolate use. Returns a plain-data
|
|
/// result with all tool paths resolved against trusted locations only.
|
|
///
|
|
/// Critically does NOT take a workspace path: per T-98, resolving the
|
|
/// dugite-bundled git against the open workspace was a code-execution
|
|
/// vector (a malicious repo could plant `native/dugite/bin/git`).
|
|
/// Dugite is resolved against the install directory + an explicit env
|
|
/// override; everything else comes from PATH.
|
|
ResolvedPaths resolveToolchainPaths() {
|
|
String? git;
|
|
Map<String, String>? gitEnv;
|
|
final dugiteGit = _resolveDugiteGit();
|
|
if (dugiteGit != null) {
|
|
git = dugiteGit;
|
|
final dugiteRoot = File(dugiteGit).parent.parent.path;
|
|
gitEnv = {'GIT_EXEC_PATH': '$dugiteRoot/libexec/git-core', 'GIT_TEMPLATE_DIR': '$dugiteRoot/share/git-core/templates'};
|
|
} else {
|
|
git = _findOnPath('git');
|
|
}
|
|
|
|
return ResolvedPaths(
|
|
git: git,
|
|
pql: _findOnPath('pql'),
|
|
tmux: _findOnPath('tmux'),
|
|
shell: _findOnPath(Platform.environment['SHELL']?.split('/').last ?? 'bash'),
|
|
gitEnv: gitEnv,
|
|
);
|
|
}
|
|
|
|
/// Locate the dugite-bundled git binary in trusted install locations
|
|
/// only. **Never inspects workspace-relative paths** — see T-98.
|
|
///
|
|
/// Search order:
|
|
/// 1. `CLIDE_DUGITE_DIR` env var (dev override; points at a dugite
|
|
/// root that contains `bin/git`).
|
|
/// 2. `<exe-parent>/dugite/bin/git` — production bundle layout.
|
|
/// 3. `<exe-parent>/lib/dugite/bin/git` — alternate bundle layout
|
|
/// (mirrors Linux's INSTALL_BUNDLE_LIB_DIR convention).
|
|
///
|
|
/// Returns null if no dugite is found; caller falls back to PATH git.
|
|
String? _resolveDugiteGit() {
|
|
final candidates = <String>[];
|
|
final envDir = Platform.environment['CLIDE_DUGITE_DIR'];
|
|
if (envDir != null && envDir.isNotEmpty) {
|
|
candidates.add('$envDir/bin/git');
|
|
}
|
|
final exeDir = File(Platform.resolvedExecutable).parent.path;
|
|
candidates.add('$exeDir/dugite/bin/git');
|
|
candidates.add('$exeDir/lib/dugite/bin/git');
|
|
return _firstExisting(candidates);
|
|
}
|
|
|
|
String? _findOnPath(String name) {
|
|
for (final dir in _expandedPath().split(':')) {
|
|
if (dir.isEmpty) continue;
|
|
final f = File('$dir/$name');
|
|
if (f.existsSync()) return f.path;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
String? _firstExisting(List<String> candidates) {
|
|
for (final c in candidates) {
|
|
if (File(c).existsSync()) return c;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/// Build expanded PATH inline — must be self-contained for isolate use.
|
|
String _expandedPath() =>
|
|
expandToolPath(Platform.environment['PATH'] ?? '', isMac: Platform.isMacOS, isLinux: Platform.isLinux, home: Platform.environment['HOME']);
|
|
|
|
/// Pure PATH-expansion logic, extracted so it's testable without touching the
|
|
/// process environment.
|
|
///
|
|
/// A desktop-launched app (macOS or Linux) inherits a minimal PATH that lacks
|
|
/// the user bin dirs where tools like `pql` install (`~/.local/bin`), so tool
|
|
/// resolution fails even though a terminal launch would find them. Re-add the
|
|
/// common user/local bin dirs — that any are missing means they're prepended,
|
|
/// so they take precedence over a stale system copy (T-347). Homebrew dirs are
|
|
/// macOS-only. On other platforms the base PATH passes through unchanged.
|
|
String expandToolPath(String base, {required bool isMac, required bool isLinux, String? home}) {
|
|
if (!isMac && !isLinux) return base;
|
|
final h = home ?? '';
|
|
final extras = <String>[if (h.isNotEmpty) '$h/.local/bin', if (isMac) '/opt/homebrew/bin', if (isMac) '/opt/homebrew/sbin', '/usr/local/bin'];
|
|
final existing = base.split(':').toSet();
|
|
final missing = extras.where((p) => !existing.contains(p));
|
|
if (missing.isEmpty) return base;
|
|
return [...missing, ...existing].join(':');
|
|
}
|