{{ message }}
-
Notifications
You must be signed in to change notification settings - Fork 13
Expand file tree
/
Copy pathconfig.cppm
More file actions
888 lines (793 loc) · 39.3 KB
/
Copy pathconfig.cppm
File metadata and controls
888 lines (793 loc) · 39.3 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
// mcpp.config — global config + paths + xlings binary acquisition.
//
// Layout (per docs/14-data-layout.md):
// $MCPP_HOME/ default ~/.mcpp/
// bin/mcpp mcpp binary (self-contained mode)
// registry/ XLINGS_HOME for mcpp's xlings
// bin/xlings vendored xlings binary (= <XLINGS_HOME>/bin/xlings)
// .xlings.json seeded with index_repos = [mcpplibs]
// build-cache/v1/ cross-project build cache (pkg/ + std/)
// bmi/ pre-v1 build cache; unused, `cache clean --legacy`
// cache/ metadata caches
// config.toml this module's input
//
// Initialization is silent and idempotent: every Config::load() ensures
// the directory tree exists and seeds .xlings.json if missing.
module;
#include <cstdlib>
#include <cstdio>
export module mcpp.config;
import std;
import mcpp.home;
import mcpp.libs.toml;
import mcpp.pm.index_spec;
import mcpp.xlings;
import mcpp.platform;
import mcpp.log;
import mcpp.fallback.xlings_binary;
import mcpp.fallback.config_migration;
import mcpp.fallback.install_integrity;
export namespace mcpp::config {
inline constexpr std::string_view kXlingsPinnedVersion = mcpp::xlings::pinned::kXlingsVersion;
struct IndexRepo {
std::string name;
std::string url;
std::string artifact; // optional artifact source base (xlings >= 0.4.68, #269)
std::string source; // optional "auto" | "artifact" | "git" ("" = xlings default auto)
};
// Canonical mcpplibs index coordinates. The index repository moved from the
// mcpp-community org to the mcpplibs org (#267) — the legacy URL only works
// through GitHub's repo redirect, which breaks silently if the old name is
// ever re-taken. The artifact base is the release mirror consumed by
// xlings >= 0.4.68 per-repo artifact sync (#269); older xlings ignores it.
inline constexpr std::string_view kMcpplibsIndexUrl =
"https://github.com/mcpplibs/mcpp-index.git";
inline constexpr std::string_view kMcpplibsIndexUrlLegacy =
"https://github.com/mcpp-community/mcpp-index.git";
inline constexpr std::string_view kMcpplibsIndexArtifact =
"https://github.com/xlings-res/mcpp-index";
struct GlobalConfig {
// Resolved paths
std::filesystem::path mcppHome; // ~/.mcpp/
std::filesystem::path binDir; // mcppHome/bin
std::filesystem::path xlingsBinary; // mcppHome/registry/bin/xlings
std::filesystem::path registryDir; // mcppHome/registry
std::filesystem::path bmiCacheDir; // mcppHome/build-cache/v1
std::filesystem::path metaCacheDir; // mcppHome/cache
std::filesystem::path logDir; // mcppHome/log
std::filesystem::path configFile; // mcppHome/config.toml
// From config.toml [xlings]
std::string xlingsBinaryMode; // "bundled" | "system" | absolute path
std::filesystem::path xlingsHomeOverride; // empty = use registryDir
// From config.toml [index]
std::string defaultIndex; // "mcpplibs"
std::vector<IndexRepo> indexRepos;
// From config.toml [indices] — custom index repositories (new schema).
// Merged: project mcpp.toml > global config.toml > built-in default.
std::map<std::string, mcpp::pm::IndexSpec> indices;
// From config.toml [cache]
// NOTE (#315): this is no longer a gate on the build path. It bounds
// `mcpp search` (which exists to ask upstream) and dates the status line.
// Whether a build refreshes is decided by mcpp.pm.index_refresh from local
// resolvability, not from a clock.
std::int64_t searchTtlSeconds = 3600;
// From config.toml [index] auto_refresh
// Machine-level opt-out from the automatic on-miss index refresh. Distinct
// from offline mode: this only silences the index axis, package downloads
// still happen. Policy lives in the global config, never in mcpp.toml — it
// describes the machine's network, and a project that carried it would stop
// being portable between a corporate LAN, a laptop and CI.
bool indexAutoRefresh = true;
// From config.toml [build]
std::int64_t defaultJobs = 0;
std::string defaultBackend = "ninja";
// From config.toml [toolchain] (M5.5)
// default = "<compiler>@<version>" e.g. "gcc@15.1.0"
// Empty means no global default; mcpp will hard-error unless the project
// mcpp.toml declares its own [toolchain].
std::string defaultToolchain;
// default_target = "<triple>" e.g. "x86_64-linux-musl"
// The target axis of the default pair (toolchain = family@version and
// target = triple are orthogonal axes). Empty means host.
std::string defaultTarget;
// Resolved xlings home (registryDir unless overridden)
std::filesystem::path xlingsHome() const {
return xlingsHomeOverride.empty() ? registryDir : xlingsHomeOverride;
}
};
// Create an xlings::Env from the resolved GlobalConfig.
mcpp::xlings::Env make_xlings_env(const GlobalConfig& cfg) {
#if defined(_WIN32)
// On Windows, the copied xlings binary in the sandbox may not function
// correctly for large package installs (missing runtime environment).
// When MCPP_VENDORED_XLINGS is set, use the original xlings binary
// directly — it has the full xlings runtime. The XLINGS_HOME env var
// ensures packages are installed into the mcpp sandbox.
if (auto* e = std::getenv("MCPP_VENDORED_XLINGS"); e && *e) {
std::filesystem::path vendored{e};
if (std::filesystem::exists(vendored))
return { vendored, cfg.xlingsHome() };
}
#endif
return { cfg.xlingsBinary, cfg.xlingsHome() };
}
// Create an xlings::Env that targets the project-level .mcpp/ directory.
// Used when custom (non-builtin) indices are configured in mcpp.toml.
mcpp::xlings::Env make_project_xlings_env(const GlobalConfig& cfg,
const std::filesystem::path& projectDir) {
return { cfg.xlingsBinary, cfg.xlingsHome(), projectDir / ".mcpp" };
}
std::vector<std::filesystem::path>
project_xlings_data_roots(const std::filesystem::path& projectDir)
{
auto dotMcpp = projectDir / ".mcpp";
return {
dotMcpp / "data",
dotMcpp / ".xlings" / "data",
};
}
std::filesystem::path
resolve_project_index_path(const std::filesystem::path& projectDir,
const mcpp::pm::IndexSpec& spec)
{
auto source = spec.path;
if (source.is_relative()) source = projectDir / source;
return source.lexically_normal();
}
bool project_index_data_initialized(const std::filesystem::path& projectDir)
{
std::error_code ec;
for (auto const& data : project_xlings_data_roots(projectDir)) {
auto reposDir = data / "xim-index-repos";
if (std::filesystem::exists(reposDir / "xim-indexrepos.json", ec)) {
return true;
}
if (std::filesystem::is_directory(reposDir, ec)) {
for (auto const& entry : std::filesystem::directory_iterator(reposDir, ec)) {
if (entry.is_directory(ec) && std::filesystem::exists(entry.path() / "pkgs", ec)) {
return true;
}
}
}
if (std::filesystem::is_directory(data, ec)) {
for (auto const& entry : std::filesystem::directory_iterator(data, ec)) {
if (entry.is_directory(ec) && std::filesystem::exists(entry.path() / "pkgs", ec)) {
return true;
}
}
}
}
return false;
}
// Check that the sandbox bootstrap completed successfully.
// Returns empty string if ok, or a description of what's missing.
std::string check_base_init(const GlobalConfig& cfg) {
auto xlEnv = make_xlings_env(cfg);
struct Check { std::string_view name; std::filesystem::path path; };
auto patchelfBin = mcpp::xlings::paths::xim_tool(xlEnv, "patchelf",
mcpp::xlings::pinned::kPatchelfVersion) / "bin" / "patchelf";
auto ninjaRoot = mcpp::xlings::paths::xim_tool_root(xlEnv, "ninja");
auto ninja_name = std::string("ninja") + std::string(mcpp::platform::exe_suffix);
// Check xlings binary
if (!std::filesystem::exists(cfg.xlingsBinary))
return std::format("xlings binary missing: {}", cfg.xlingsBinary.string());
// Check sandbox init marker
auto marker = xlEnv.home / "subos" / "default" / ".xlings.json";
if (!std::filesystem::exists(marker))
return "sandbox not initialized (missing subos/default/.xlings.json)";
// Check patchelf (Linux only)
#if !defined(__APPLE__) && !defined(_WIN32)
if (!std::filesystem::exists(patchelfBin))
return std::format("patchelf missing: {}", patchelfBin.string());
#endif
// Check ninja
bool ninjaOk = false;
if (std::filesystem::exists(ninjaRoot)) {
std::error_code ec;
for (auto& v : std::filesystem::directory_iterator(ninjaRoot, ec)) {
if (std::filesystem::exists(v.path() / ninja_name)) { ninjaOk = true; break; }
}
}
if (!ninjaOk)
return "ninja missing from sandbox";
return {}; // all ok
}
// Delete the registry directory (sandbox) for a clean re-init.
// Preserves: bin/mcpp (self-contained mode), config.toml, log/.
void reset_registry(const GlobalConfig& cfg) {
std::error_code ec;
auto registry = cfg.xlingsHome();
if (std::filesystem::exists(registry))
std::filesystem::remove_all(registry, ec);
// Also clear BMI and metadata caches (stale after registry reset).
if (std::filesystem::exists(cfg.bmiCacheDir))
std::filesystem::remove_all(cfg.bmiCacheDir, ec);
if (std::filesystem::exists(cfg.metaCacheDir))
std::filesystem::remove_all(cfg.metaCacheDir, ec);
}
// Ensure the project-level .mcpp/ directory exists and contains a
// .xlings.json seeded with custom non-builtin index entries
// entries. Returns true if a .mcpp/ directory was created/updated.
bool ensure_project_index_dir(
const GlobalConfig& cfg,
const std::filesystem::path& projectDir,
const std::map<std::string, mcpp::pm::IndexSpec>& indices,
const mcpp::xlings::ProjectEnv& penv = {});
struct ConfigError { std::string message; };
// Load (or create) the global config. Idempotent. Performs:
// 1. Resolve $MCPP_HOME (env or ~/.mcpp)
// 2. Create directory tree if missing
// 3. Seed config.toml if missing
// 4. Seed registry/.xlings.json if missing (so xlings won't auto-add awesome)
// 5. Acquire xlings binary if missing (system copy → release download → fail)
// Streaming download-progress info for the sandbox bootstrap step (patchelf,
// ninja). cli.cppm wraps a ui::ProgressBar around this so the user sees the
// same percent / MB / s display they get for `mcpp toolchain install`.
//
// We can't use mcpp.fetcher's EventHandler here because fetcher imports
// config — the dependency would be cyclic.
using BootstrapFile = mcpp::xlings::BootstrapFile;
using BootstrapProgress = mcpp::xlings::BootstrapProgress;
using BootstrapProgressCallback = mcpp::xlings::BootstrapProgressCallback;
// `initial_mirror`: when seeding a *fresh* .xlings.json (file did not
// already exist), use this as the mirror value instead of the default.
// Empty means "use the default". Used by `mcpp self config --mirror X`
// so that the very first network roundtrip (during the immediately-
// following xlings sandbox bootstrap) goes through the user's chosen
// mirror, not the historical CN default. No effect when .xlings.json
// already exists — that case is handled by xlings::config_set_mirror.
std::expected<GlobalConfig, ConfigError> load_or_init(
bool quiet = false,
BootstrapProgressCallback onBootstrapProgress = {},
std::string_view initial_mirror = {});
// Pretty-print resolved config for `mcpp env` command.
void print_env(const GlobalConfig& cfg);
// Normalize legacy index naming in a loaded config (exported for tests):
// org migration mcpp-community/mcpp-index -> mcpplibs/mcpp-index, index name
// mcpp-index -> mcpplibs, then name+url dedup. Order matters: URL first, so
// old-config name entries still match and legacy/default entries fold.
void canonicalize_legacy_index_names(GlobalConfig& cfg);
// M5.5: persist [toolchain].default to config.toml.
std::expected<void, ConfigError>
write_default_toolchain(const GlobalConfig& cfg, std::string_view spec);
// Persist [toolchain].default_target ("" = host / clear).
std::expected<void, ConfigError>
write_default_target(const GlobalConfig& cfg, std::string_view targetTriple);
} // namespace mcpp::config
namespace mcpp::config {
namespace t = mcpp::libs::toml;
namespace {
// Right-pad a verb to 12 columns, matching mcpp::ui::verb_padded so the
// bootstrap status lines line up under the cyan "Downloading …" lines
// produced via the BootstrapProgressCallback. We can't import mcpp.ui
// from here (cyclic dep), so this is a tiny duplicate of that helper —
// no color, no fanciness.
void print_status(std::string_view verb, std::string_view msg) {
constexpr std::size_t W = 12;
if (verb.size() >= W) {
std::println("{} {}", verb, msg);
} else {
std::println("{}{} {}", std::string(W - verb.size(), ' '), verb, msg);
}
}
std::expected<std::string, std::string> run_capture(const std::string& cmd) {
return mcpp::xlings::run_capture(cmd);
}
void write_file(const std::filesystem::path& p, std::string_view content) {
std::error_code ec;
std::filesystem::create_directories(p.parent_path(), ec);
std::ofstream os(p);
os << content;
}
bool write_default_config_toml(const std::filesystem::path& path) {
constexpr auto tmpl = R"(# mcpp global config — auto-generated; safe to edit.
[xlings]
# binary: "bundled" (use $MCPP_HOME/registry/bin/xlings) | "system" | absolute path
binary = "bundled"
# home: empty = use $MCPP_HOME/registry; can override
home = ""
[index]
default = "mcpplibs"
# auto_refresh: refresh the package index automatically when a dependency
# cannot be resolved from the local copy (never merely because time passed).
# Set false to require an explicit `mcpp index update`.
auto_refresh = true
[index.repos."mcpplibs"]
url = "https://github.com/mcpplibs/mcpp-index.git"
artifact = "https://github.com/xlings-res/mcpp-index"
# source = "auto" # default: artifact first, git fallback; set "git" to force git
# xlings auto-adds xim / awesome / scode / d2x as defaults.
[cache]
# Bounds `mcpp search` and the age shown by `mcpp index status`. It is NOT
# what decides whether a build refreshes the index — see [index] auto_refresh.
search_ttl_seconds = 3600
[build]
default_jobs = 0
default_backend = "ninja"
)";
write_file(path, tmpl);
return std::filesystem::exists(path);
}
bool write_default_xlings_json(const std::filesystem::path& path,
const std::vector<IndexRepo>& repos,
std::string_view mirror_override = {})
{
// Delegate to xlings module. Convert IndexRepo vec to SeedRepo span.
std::vector<mcpp::xlings::SeedRepo> pairs;
pairs.reserve(repos.size());
for (auto& r : repos)
pairs.push_back({ r.name, r.url, r.artifact, r.source });
// seed_xlings_json writes to env.home / ".xlings.json", so we
// construct a temporary Env with home = path.parent_path().
mcpp::xlings::Env env;
env.home = path.parent_path();
// No explicit --mirror: seed "auto" so xlings' own adaptive mirror module
// (latency-probed, with per-download failover) picks the best reachable
// host. The historic hardcoded "CN" FORCED the CN mirror and disabled that
// mechanism, stranding overseas users and GitHub-hosted CI on a
// slow/unreachable gitcode. An explicit --mirror always wins (else branch).
if (mirror_override.empty())
mcpp::xlings::seed_xlings_json(env, pairs); // default = "auto"
else
mcpp::xlings::seed_xlings_json(env, pairs, mirror_override);
return std::filesystem::exists(path);
}
// Migration helpers delegated to mcpp.fallback.config_migration.
// canonicalize_legacy_index_names is exported (declared above, defined after
// this helper namespace) so its ordering rules stay under unit test.
// Xlings binary acquisition delegated to mcpp.fallback.xlings_binary.
// Run `xlings self init` against the sandbox to create the standard
// directory layout (subos/default/{bin,lib,usr,generations}, data/, config/,
// shell profiles, and the empty workspace .xlings.json). Idempotent.
//
// TODO(xlings-upstream): Once xlings ships a `xlings sandbox bootstrap` /
// `xlings self init --copy-self-bin` API that does init + binary placement
// + patchelf in one shot, this function and ensure_sandbox_xlings_binary +
// ensure_sandbox_patchelf below can collapse into a single call.
void ensure_sandbox_init(const GlobalConfig& cfg, bool quiet) noexcept {
mcpp::xlings::ensure_init(make_xlings_env(cfg), quiet);
}
// With the 0.0.4 layout change (xlings binary at <MCPP_HOME>/registry/bin/
// = <XLINGS_HOME>/bin/), the bundled xlings IS already at the path xlings's
// shim-creation guard checks (`paths.homeDir / "bin" / "xlings"`).
// No mirroring / hardlinking needed — this function is now a no-op.
void ensure_sandbox_xlings_binary(const GlobalConfig& /*cfg*/, bool /*quiet*/) noexcept {
// Intentional no-op: xlingsBinary == xlingsHome()/bin/xlings.
}
// Bootstrap install: delegated to mcpp.xlings module.
void ensure_sandbox_ninja(const GlobalConfig& cfg, bool quiet,
const BootstrapProgressCallback& cb) noexcept
{
mcpp::xlings::ensure_ninja(make_xlings_env(cfg), quiet, cb);
}
void ensure_sandbox_patchelf(const GlobalConfig& cfg, bool quiet,
const BootstrapProgressCallback& cb) noexcept
{
mcpp::xlings::ensure_patchelf(make_xlings_env(cfg), quiet, cb);
}
} // namespace
void canonicalize_legacy_index_names(GlobalConfig& cfg) {
if (cfg.defaultIndex == "mcpp-index")
cfg.defaultIndex = "mcpplibs";
std::vector<IndexRepo> normalized;
for (auto r : cfg.indexRepos) {
// ① Org migration first — later steps (name match, dedup) key on the
// canonical URL, so legacy entries fold instead of surviving as dupes.
if (r.url == kMcpplibsIndexUrlLegacy)
r.url = std::string(kMcpplibsIndexUrl);
// ② Legacy index name. The URL condition keeps a user's unrelated
// repo that happens to be named "mcpp-index" untouched.
if (r.name == "mcpp-index" && r.url == kMcpplibsIndexUrl)
r.name = "mcpplibs";
// ③ In-memory artifact default for the official index (#269): heals
// configs written by pre-artifact templates on every load without
// text surgery on user-editable config.toml. `source = "git"` is the
// explicit opt-out; a user-set artifact base always wins.
if (r.url == kMcpplibsIndexUrl && r.artifact.empty() && r.source != "git")
r.artifact = std::string(kMcpplibsIndexArtifact);
bool duplicate = std::any_of(normalized.begin(), normalized.end(),
[&](const IndexRepo& existing) {
return existing.name == r.name && existing.url == r.url;
});
if (!duplicate) normalized.push_back(std::move(r));
}
cfg.indexRepos = std::move(normalized);
}
std::expected<GlobalConfig, ConfigError> load_or_init(
bool quiet,
BootstrapProgressCallback onBootstrapProgress,
std::string_view initial_mirror)
{
GlobalConfig cfg;
// 1. Resolve paths (mcpp.home is the single resolver — #311)
cfg.mcppHome = mcpp::home::root();
cfg.binDir = cfg.mcppHome / "bin";
cfg.registryDir = cfg.mcppHome / "registry";
// xlings lives under registry/, not bin/ — it's a registry tool,
// not a user-facing binary. This also places it exactly at
// <XLINGS_HOME>/bin/xlings, which satisfies xlings's own shim-
// creation guard (`if fs::exists(homeDir/"bin"/"xlings")`),
// making ensure_sandbox_xlings_binary() a no-op.
cfg.xlingsBinary = cfg.registryDir / "bin" /
(std::string("xlings") + std::string(mcpp::platform::exe_suffix));
cfg.bmiCacheDir = mcpp::home::cache_root();
cfg.metaCacheDir = cfg.mcppHome / "cache";
cfg.logDir = cfg.mcppHome / "log";
cfg.configFile = cfg.mcppHome / "config.toml";
// 2. Create directory tree
std::error_code ec;
for (auto& d : { cfg.binDir, cfg.registryDir, cfg.bmiCacheDir,
cfg.metaCacheDir, cfg.logDir }) {
std::filesystem::create_directories(d, ec);
if (ec) return std::unexpected(ConfigError{
std::format("cannot create '{}': {}", d.string(), ec.message())});
}
// 2b. Initialize logger (early init with defaults; re-init after config load)
{
mcpp::log::Config logCfg;
logCfg.logDir = cfg.logDir;
mcpp::log::init(logCfg);
}
// 3. Seed config.toml if missing
bool fresh_config = !std::filesystem::exists(cfg.configFile);
if (fresh_config) write_default_config_toml(cfg.configFile);
else mcpp::fallback::migrate_config_toml_index_names(cfg.configFile);
// 4. Load config.toml
auto doc = t::parse_file(cfg.configFile);
if (!doc) {
return std::unexpected(ConfigError{
std::format("invalid config.toml: {}", doc.error().message)});
}
cfg.xlingsBinaryMode = doc->get_string("xlings.binary").value_or("bundled");
if (auto h = doc->get_string("xlings.home"); h && !h->empty())
cfg.xlingsHomeOverride = *h;
cfg.defaultIndex = doc->get_string("index.default").value_or("mcpplibs");
cfg.indexAutoRefresh = doc->get_bool("index.auto_refresh").value_or(true);
cfg.searchTtlSeconds = doc->get_int("cache.search_ttl_seconds").value_or(3600);
cfg.defaultJobs = doc->get_int("build.default_jobs").value_or(0);
cfg.defaultBackend = doc->get_string("build.default_backend").value_or("ninja");
cfg.defaultToolchain = doc->get_string("toolchain.default").value_or("");
cfg.defaultTarget = doc->get_string("toolchain.default_target").value_or("");
// [log] section — re-initialize logger with config values
{
mcpp::log::Config logCfg;
logCfg.logDir = cfg.logDir;
auto levelStr = doc->get_string("log.level").value_or("off");
if (levelStr == "debug") logCfg.level = mcpp::log::Level::debug;
else if (levelStr == "info") logCfg.level = mcpp::log::Level::info;
else if (levelStr == "warn") logCfg.level = mcpp::log::Level::warn;
else if (levelStr == "error") logCfg.level = mcpp::log::Level::error;
logCfg.maxFileSize = static_cast<std::size_t>(
doc->get_int("log.max_file_size").value_or(10 * 1024 * 1024));
logCfg.maxFiles = static_cast<int>(
doc->get_int("log.max_files").value_or(3));
mcpp::log::init(logCfg);
}
// [index.repos.NAME] tables
if (auto* repos = doc->get_table("index.repos")) {
for (auto& [name, val] : *repos) {
if (!val.is_table()) continue;
auto& tt = val.as_table();
auto it = tt.find("url");
if (it == tt.end() || !it->second.is_string()) continue;
IndexRepo r{ name, it->second.as_string() };
if (auto a = tt.find("artifact"); a != tt.end() && a->second.is_string())
r.artifact = a->second.as_string();
if (auto s = tt.find("source"); s != tt.end() && s->second.is_string())
r.source = s->second.as_string();
cfg.indexRepos.push_back(std::move(r));
}
}
// [indices] — new-schema custom index repositories.
// Accepts the same short/long/path forms as mcpp.toml [indices].
if (auto* indices_t = doc->get_table("indices")) {
for (auto& [k, v] : *indices_t) {
mcpp::pm::IndexSpec spec;
spec.name = k;
if (v.is_string()) {
spec.url = v.as_string();
} else if (v.is_table()) {
auto& sub = v.as_table();
if (auto it = sub.find("url"); it != sub.end() && it->second.is_string()) spec.url = it->second.as_string();
if (auto it = sub.find("rev"); it != sub.end() && it->second.is_string()) spec.rev = it->second.as_string();
if (auto it = sub.find("tag"); it != sub.end() && it->second.is_string()) spec.tag = it->second.as_string();
if (auto it = sub.find("branch"); it != sub.end() && it->second.is_string()) spec.branch = it->second.as_string();
if (auto it = sub.find("path"); it != sub.end() && it->second.is_string()) spec.path = it->second.as_string();
if (auto it = sub.find("artifact"); it != sub.end() && it->second.is_string()) spec.artifact = it->second.as_string();
if (auto it = sub.find("source"); it != sub.end() && it->second.is_string()) spec.source = it->second.as_string();
}
if (!spec.url.empty() || !spec.path.empty())
cfg.indices[k] = std::move(spec);
}
}
// Defaults: only mcpplibs. xlings auto-adds its own standard
// defaults (xim / awesome / scode / d2x) because globalIndexRepos_
// is non-empty (per xlings/src/core/config.cppm). Explicitly listing
// them ourselves can cause cross-index name conflicts during
// dependency resolution (e.g. linux-headers existing in both
// scode and xim). See docs/21 §VII.
auto add_default = [&](std::string_view name, std::string_view url,
std::string_view artifact = {}) {
for (auto& r : cfg.indexRepos) if (r.name == name) return;
cfg.indexRepos.push_back({ std::string(name), std::string(url),
std::string(artifact), std::string() });
};
add_default("mcpplibs", kMcpplibsIndexUrl, kMcpplibsIndexArtifact);
canonicalize_legacy_index_names(cfg);
// 5. Seed registry/.xlings.json if missing; migrate legacy cached
// sandboxes in place so CI/user caches move from mcpp-index to mcpplibs
// without losing xlings' active subos or version bindings.
auto xjson = cfg.xlingsHome() / ".xlings.json";
if (!std::filesystem::exists(xjson)) {
write_default_xlings_json(xjson, cfg.indexRepos, initial_mirror);
} else {
mcpp::fallback::migrate_xlings_json_index_names(xjson);
}
// 6. Acquire xlings binary if needed
if (cfg.xlingsBinaryMode == "bundled") {
auto xbin = mcpp::fallback::acquire_xlings_binary(
cfg.xlingsBinary, quiet, kXlingsPinnedVersion);
if (!xbin) return std::unexpected(ConfigError{xbin.error()});
} else if (cfg.xlingsBinaryMode == "system") {
auto sysPath = mcpp::platform::fs::which(
std::string("xlings") + std::string(mcpp::platform::exe_suffix));
if (!sysPath)
return std::unexpected(ConfigError{"system xlings not found in PATH"});
cfg.xlingsBinary = *sysPath;
} else {
cfg.xlingsBinary = cfg.xlingsBinaryMode;
if (!std::filesystem::exists(cfg.xlingsBinary))
return std::unexpected(ConfigError{std::format(
"configured xlings binary not found: {}", cfg.xlingsBinary.string())});
}
// 7. Sandbox bootstrap (mcpp self-contained xlings environment).
// Order matters:
// a. Mirror xlings binary into sandbox so shim creation works.
// b. xlings self init: creates subos/default/{bin,lib,usr} skeleton.
// c. Install patchelf so xim install hooks can patch ELF binaries.
//
// TODO(xlings-upstream): collapse into a single
// `xlings sandbox bootstrap --home <X>` once that command exists
// upstream (see docs/short-term-vs-long-track plan).
//
// NOT UNDER --offline. Each of the three steps below reaches the
// network when the sandbox is fresh: `xlings self init` clones the
// package index, and patchelf and ninja arrive through `xlings
// install`. `--offline` promises never to touch the network, and an
// empty home is exactly where that promise was being broken --
// measured: `MCPP_OFFLINE=1 mcpp self doctor` in a fresh home fetched
// the index and 126 MB of tools before running its first check.
//
// A bootstrapped home loses nothing: every step is a no-op once its
// artefact exists, and the completion markers below are still written
// from what is on disk. A fresh home stays un-bootstrapped, and the
// commands that need the tools say so through check_base_init().
const bool bootstrapAllowed = !mcpp::platform::env::offline_mode();
ensure_sandbox_xlings_binary(cfg, quiet);
if (bootstrapAllowed) {
ensure_sandbox_init(cfg, quiet);
} else if (!quiet) {
// Once per process: the doctor loads the configuration more than once,
// and the same sentence twice reads as two events.
static bool announced = false;
auto marker = mcpp::xlings::paths::sandbox_init_marker(make_xlings_env(cfg));
if (!announced && !std::filesystem::exists(marker)) {
announced = true;
print_status("Skipping",
"sandbox bootstrap (offline mode; run without --offline to bootstrap)");
}
}
{
auto bsEnv = make_xlings_env(cfg);
#if !defined(__APPLE__) && !defined(_WIN32)
// patchelf is ELF-only; macOS uses Mach-O and Windows uses PE.
if (bootstrapAllowed)
ensure_sandbox_patchelf(cfg, quiet, onBootstrapProgress);
// Only mark complete if the actual binary exists (not just the dir).
{
auto pBin = mcpp::xlings::paths::xim_tool(bsEnv, "patchelf",
mcpp::xlings::pinned::kPatchelfVersion) / "bin" / "patchelf";
if (std::filesystem::exists(pBin))
mcpp::fallback::mark_install_complete(pBin.parent_path().parent_path());
}
#endif
if (bootstrapAllowed)
ensure_sandbox_ninja(cfg, quiet, onBootstrapProgress);
{
auto nRoot = mcpp::xlings::paths::xim_tool_root(bsEnv, "ninja");
auto ninja_name = std::string("ninja") + std::string(mcpp::platform::exe_suffix);
std::error_code ec;
if (std::filesystem::exists(nRoot)) {
for (auto& v : std::filesystem::directory_iterator(nRoot, ec)) {
if (std::filesystem::exists(v.path() / ninja_name))
mcpp::fallback::mark_install_complete(v.path());
}
}
}
}
// 8. Bootstrap check is NOT done here — it's deferred to commands that
// actually need bootstrap tools (build, run, toolchain install).
// Light commands (self env, toolchain list) should work even if
// bootstrap is incomplete. Commands call check_base_init() themselves.
return cfg;
}
void print_env(const GlobalConfig& cfg) {
std::println("MCPP_HOME = {}", cfg.mcppHome.string());
std::println("xlings binary = {}", cfg.xlingsBinary.string());
std::println("xlings pinned = {}", kXlingsPinnedVersion);
std::println("xlings home = {}", cfg.xlingsHome().string());
std::println("config = {}", cfg.configFile.string());
std::println("build cache = {}", cfg.bmiCacheDir.string());
std::println("meta cache = {}", cfg.metaCacheDir.string());
if (!cfg.defaultToolchain.empty())
std::println("default toolchain = {}", cfg.defaultToolchain);
else
std::println("default toolchain = (none — run `mcpp toolchain install gcc 16.1.0`)");
std::println("");
std::println("Index repos:");
for (auto& r : cfg.indexRepos) {
bool isDefault = (r.name == cfg.defaultIndex);
std::println(" {} {}{}{}",
r.name, r.url,
r.artifact.empty() ? "" : " [artifact]",
isDefault ? " (default)" : "");
}
}
bool ensure_project_index_dir(
const GlobalConfig& cfg,
const std::filesystem::path& projectDir,
const std::map<std::string, mcpp::pm::IndexSpec>& indices,
const mcpp::xlings::ProjectEnv& penv)
{
// Collect custom non-builtin indices that need xlings project-scope data.
// Local path indices are also seeded so xlings can create its own
// project-local repo link and install packages from that index.
std::vector<mcpp::xlings::SeedRepo> customRepos;
for (auto& [name, spec] : indices) {
if (spec.is_builtin()) continue;
if (spec.is_local()) {
auto source = resolve_project_index_path(projectDir, spec);
std::error_code ec;
std::filesystem::remove(source / ".xlings-index-cache.json", ec);
customRepos.push_back({ name, source.generic_string(), "", "" });
continue;
}
// #269: pass a declared artifact source through to xlings unless a
// rev/tag/branch pin forces git (the artifact channel only tracks
// the latest published pointer).
mcpp::xlings::SeedRepo repo{ name, spec.url, "", "" };
if (spec.artifact_applicable()) {
repo.artifact = spec.artifact;
repo.source = spec.source;
} else if (!spec.artifact.empty()) {
std::println("warning: [indices].{}: artifact source ignored "
"(rev/tag/branch/path pins force git)", name);
}
customRepos.push_back(std::move(repo));
}
// NOTE: the official global `xim` index is deliberately NOT injected into
// the project's customRepos here. `xim` (and its dynamically-discovered
// sub-indexes) are xlings GLOBAL-default indices — global IS the default
// scope, and a repo is only project-scoped when it lands in the project's
// index_repos. Injecting `xim` as a project repo made every `xim:*` tool
// (cmake/glibc/gcc/make/…) resolve project-scoped and install into the
// project store instead of the shared registry, which broke ELF loader
// resolution for build-dep tools (cmake interpreter dangling). `xim:*`
// resolves fine at global scope via xlings' global index_repos + the
// registry-local clone, and stays visible to the project via additive.
// See .agents/docs/2026-07-09-project-index-scope-global-infra-fix.md.
std::error_code ec;
if (customRepos.empty() && penv.empty()) return false; // nothing to do
auto dotMcpp = projectDir / ".mcpp";
std::filesystem::create_directories(dotMcpp, ec);
// Seed .xlings.json with the custom index entries.
mcpp::xlings::Env env;
env.home = dotMcpp;
mcpp::xlings::seed_xlings_json(env, customRepos, "auto", penv);
auto exposeLocalIndex = [&](const std::string& name,
const std::filesystem::path& source,
const std::filesystem::path& dataRoot)
{
std::error_code ec2;
auto target = dataRoot / name;
std::filesystem::create_directories(dataRoot, ec2);
if (std::filesystem::exists(target / "pkgs", ec2)) {
return;
}
ec2.clear();
if (std::filesystem::exists(target, ec2) || std::filesystem::is_symlink(target, ec2)) {
std::filesystem::remove_all(target, ec2);
}
ec2.clear();
std::filesystem::create_directory_symlink(source, target, ec2);
if (!ec2 && std::filesystem::exists(target / "pkgs", ec2)) {
return;
}
ec2.clear();
std::filesystem::copy(
source,
target,
std::filesystem::copy_options::recursive
| std::filesystem::copy_options::skip_existing,
ec2);
};
for (auto& [name, spec] : indices) {
if (spec.is_builtin() || !spec.is_local()) continue;
auto source = resolve_project_index_path(projectDir, spec);
if (!std::filesystem::exists(source / "pkgs", ec)) continue;
exposeLocalIndex(name, source, dotMcpp / ".xlings" / "data");
exposeLocalIndex(name, source, dotMcpp / "data");
}
// (removed) The official global `xim` index is no longer exposed/copied into
// the project data dir: it is not a project-scoped repo (see the note above),
// so `xim:*` resolves at GLOBAL scope via the registry-local xim clone, not
// from a project-local copy. Only genuinely user-declared local custom
// indices are exposed project-locally (the loop above).
return true;
}
// M5.5: persist [toolchain].default into config.toml without disturbing
// other fields. Naive: read text, replace/insert one line.
std::expected<void, ConfigError>
write_toolchain_key(const GlobalConfig& cfg, std::string_view key,
std::string_view value) {
std::ifstream is(cfg.configFile);
if (!is) return std::unexpected(ConfigError{
std::format("cannot open '{}'", cfg.configFile.string())});
std::stringstream ss; ss << is.rdbuf();
std::string text = ss.str();
std::string line = std::format("{} = \"{}\"\n", key, value);
auto sectionPos = text.find("[toolchain]");
if (sectionPos == std::string::npos) {
// Append a [toolchain] block at end.
if (!text.empty() && text.back() != '\n') text += '\n';
text += std::format("\n[toolchain]\n{}", line);
} else {
// Locate an existing `<key> = ...` line within [toolchain]. Match at
// line starts with a word boundary after the key, so `default` never
// matches the `default_target` line (and vice versa).
auto eol = text.find('\n', sectionPos);
if (eol == std::string::npos) eol = text.size();
auto bodyStart = (eol == text.size()) ? text.size() : eol + 1;
auto nextSec = text.find("\n[", bodyStart);
auto bodyEnd = (nextSec == std::string::npos) ? text.size() : nextSec;
auto body = std::string_view(text).substr(bodyStart, bodyEnd - bodyStart);
std::size_t kRel = std::string_view::npos;
for (std::size_t p = 0; p < body.size();) {
auto lineEnd = body.find('\n', p);
if (lineEnd == std::string_view::npos) lineEnd = body.size();
auto l = body.substr(p, lineEnd - p);
auto ws = l.find_first_not_of(" \t");
if (ws != std::string_view::npos && l.substr(ws).starts_with(key)) {
auto after = l.substr(ws + key.size());
if (after.empty() || after[0] == ' ' || after[0] == '\t'
|| after[0] == '=') {
kRel = p + ws;
break;
}
}
p = lineEnd + 1;
}
if (kRel != std::string_view::npos) {
auto kAbs = bodyStart + kRel;
auto lineEnd = text.find('\n', kAbs);
if (lineEnd == std::string::npos) lineEnd = text.size();
text.replace(kAbs, lineEnd - kAbs + 1, line);
} else {
text.insert(bodyStart, line);
}
}
std::ofstream os(cfg.configFile);
if (!os) return std::unexpected(ConfigError{
std::format("cannot write '{}'", cfg.configFile.string())});
os << text;
return {};
}
std::expected<void, ConfigError>
write_default_toolchain(const GlobalConfig& cfg, std::string_view spec) {
return write_toolchain_key(cfg, "default", spec);
}
std::expected<void, ConfigError>
write_default_target(const GlobalConfig& cfg, std::string_view targetTriple) {
return write_toolchain_key(cfg, "default_target", targetTriple);
}
} // namespace mcpp::config
You can’t perform that action at this time.