@smoothbricks/nx-plugin 0.7.18 → 0.7.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (143) hide show
  1. package/README.md +160 -99
  2. package/dist/.build-inputs.json +35 -29
  3. package/dist/built-output-packages.js +1 -1
  4. package/dist/cargo-closure-input.js +1 -1
  5. package/dist/cargo-source-hash.d.ts +3 -21
  6. package/dist/cargo-source-hash.d.ts.map +1 -1
  7. package/dist/cargo-source-hash.js +4 -91
  8. package/dist/cargo-toolchain-paths.d.ts +2 -2
  9. package/dist/cargo-toolchain-paths.js +2 -2
  10. package/dist/cargo-workspace.d.ts.map +1 -1
  11. package/dist/cargo-workspace.js +2 -1
  12. package/dist/executors/bounded-exec/admission-queue.d.ts +3 -1
  13. package/dist/executors/bounded-exec/admission-queue.d.ts.map +1 -1
  14. package/dist/executors/bounded-exec/admission-queue.js +9 -10
  15. package/dist/executors/bounded-exec/awake-clock.d.ts +5 -0
  16. package/dist/executors/bounded-exec/awake-clock.d.ts.map +1 -0
  17. package/dist/executors/bounded-exec/awake-clock.js +22 -0
  18. package/dist/executors/bounded-exec/bounds.d.ts +7 -5
  19. package/dist/executors/bounded-exec/bounds.d.ts.map +1 -1
  20. package/dist/executors/bounded-exec/bounds.js +14 -11
  21. package/dist/executors/bounded-exec/case-gate.d.ts +114 -0
  22. package/dist/executors/bounded-exec/case-gate.d.ts.map +1 -0
  23. package/dist/executors/bounded-exec/case-gate.js +342 -0
  24. package/dist/executors/bounded-exec/cpu-pool-thread.d.ts +1 -0
  25. package/dist/executors/bounded-exec/cpu-pool-thread.d.ts.map +1 -1
  26. package/dist/executors/bounded-exec/cpu-pool-thread.js +2 -2
  27. package/dist/executors/bounded-exec/cpu-pool.d.ts +28 -1
  28. package/dist/executors/bounded-exec/cpu-pool.d.ts.map +1 -1
  29. package/dist/executors/bounded-exec/cpu-pool.js +102 -16
  30. package/dist/executors/bounded-exec/endpoint-life.d.ts +146 -0
  31. package/dist/executors/bounded-exec/endpoint-life.d.ts.map +1 -0
  32. package/dist/executors/bounded-exec/endpoint-life.js +228 -0
  33. package/dist/executors/bounded-exec/executor.d.ts.map +1 -1
  34. package/dist/executors/bounded-exec/executor.js +207 -69
  35. package/dist/executors/bounded-exec/gateway-lease.d.ts +1 -1
  36. package/dist/executors/bounded-exec/gateway-lease.d.ts.map +1 -1
  37. package/dist/executors/bounded-exec/gateway-lease.js +8 -1
  38. package/dist/executors/bounded-exec/go-run-summary.d.ts +51 -0
  39. package/dist/executors/bounded-exec/go-run-summary.d.ts.map +1 -0
  40. package/dist/executors/bounded-exec/go-run-summary.js +98 -0
  41. package/dist/executors/bounded-exec/hang-diagnostics.d.ts +3 -3
  42. package/dist/executors/bounded-exec/hang-diagnostics.d.ts.map +1 -1
  43. package/dist/executors/bounded-exec/hang-diagnostics.js +66 -48
  44. package/dist/executors/bounded-exec/lease-wait.d.ts +1 -0
  45. package/dist/executors/bounded-exec/lease-wait.d.ts.map +1 -1
  46. package/dist/executors/bounded-exec/lease-wait.js +1 -0
  47. package/dist/executors/bounded-exec/mbx-pool.d.ts +28 -7
  48. package/dist/executors/bounded-exec/mbx-pool.d.ts.map +1 -1
  49. package/dist/executors/bounded-exec/mbx-pool.js +30 -9
  50. package/dist/executors/bounded-exec/mbx-reservations.d.ts +8 -5
  51. package/dist/executors/bounded-exec/mbx-reservations.d.ts.map +1 -1
  52. package/dist/executors/bounded-exec/mbx-reservations.js +187 -283
  53. package/dist/executors/bounded-exec/parent-grant.d.ts +2 -0
  54. package/dist/executors/bounded-exec/parent-grant.d.ts.map +1 -1
  55. package/dist/executors/bounded-exec/parent-grant.js +1 -0
  56. package/dist/executors/bounded-exec/pool-admission.d.ts +29 -3
  57. package/dist/executors/bounded-exec/pool-admission.d.ts.map +1 -1
  58. package/dist/executors/bounded-exec/pool-admission.js +47 -1
  59. package/dist/executors/bounded-exec/progress.d.ts +3 -0
  60. package/dist/executors/bounded-exec/progress.d.ts.map +1 -1
  61. package/dist/executors/bounded-exec/progress.js +31 -1
  62. package/dist/executors/bounded-exec/reservation-connection.d.ts +90 -0
  63. package/dist/executors/bounded-exec/reservation-connection.d.ts.map +1 -0
  64. package/dist/executors/bounded-exec/reservation-connection.js +248 -0
  65. package/dist/executors/bounded-exec/run-cpu-pool.d.ts.map +1 -1
  66. package/dist/executors/bounded-exec/run-cpu-pool.js +3 -0
  67. package/dist/executors/bounded-exec/runner-sizing.d.ts +9 -5
  68. package/dist/executors/bounded-exec/runner-sizing.d.ts.map +1 -1
  69. package/dist/executors/bounded-exec/runner-sizing.js +13 -9
  70. package/dist/executors/bounded-exec/schema.d.ts +2 -2
  71. package/dist/executors/bounded-exec/suite-minimum.d.ts +21 -0
  72. package/dist/executors/bounded-exec/suite-minimum.d.ts.map +1 -0
  73. package/dist/executors/bounded-exec/suite-minimum.js +85 -0
  74. package/dist/executors/bounded-exec/test-result-writer.d.ts +2 -0
  75. package/dist/executors/bounded-exec/test-result-writer.d.ts.map +1 -1
  76. package/dist/executors/bounded-exec/test-result-writer.js +1 -0
  77. package/dist/executors/bounded-exec/test-results.d.ts +5 -0
  78. package/dist/executors/bounded-exec/test-results.d.ts.map +1 -1
  79. package/dist/executors/bounded-exec/test-results.js +2 -2
  80. package/dist/executors/bounded-exec/verdict.d.ts +26 -4
  81. package/dist/executors/bounded-exec/verdict.d.ts.map +1 -1
  82. package/dist/executors/bounded-exec/verdict.js +26 -5
  83. package/dist/executors/cargo-zigbuild/executor.d.ts +10 -8
  84. package/dist/executors/cargo-zigbuild/executor.d.ts.map +1 -1
  85. package/dist/executors/cargo-zigbuild/executor.js +32 -19
  86. package/dist/index.d.ts.map +1 -1
  87. package/dist/index.js +105 -73
  88. package/dist/managed-files/ci-workflow.d.ts +4 -1
  89. package/dist/managed-files/ci-workflow.d.ts.map +1 -1
  90. package/dist/managed-files/ci-workflow.js +9 -14
  91. package/dist/managed-files/files.d.ts +3 -3
  92. package/dist/managed-files/files.js +3 -3
  93. package/dist/task-results.js +2 -1
  94. package/dist/workspace-config-policy.d.ts.map +1 -1
  95. package/dist/workspace-config-policy.js +135 -42
  96. package/executors.json +2 -0
  97. package/managed/raw/envrc +24 -0
  98. package/managed/raw/patches/nx@24.0.3.patch +1179 -133
  99. package/managed/raw/patches/ttsc@0.37.1.patch +1055 -0
  100. package/managed/raw/tooling/direnv/developer-links.ts +105 -11
  101. package/managed/raw/tooling/direnv/devenv.smoo.nix +20 -19
  102. package/package.json +67 -11
  103. package/runtime/nx-publish/.build-inputs.json +2 -2
  104. package/runtime/nx-publish/cache_adapter.js +293 -3
  105. package/runtime/nx-publish/nx_publish.js +36 -14
  106. package/src/built-output-packages.ts +1 -1
  107. package/src/cargo-closure-input.ts +1 -1
  108. package/src/cargo-source-hash.ts +16 -132
  109. package/src/cargo-toolchain-paths.ts +2 -2
  110. package/src/cargo-workspace.ts +1 -2
  111. package/src/executors/bounded-exec/admission-queue.ts +11 -10
  112. package/src/executors/bounded-exec/awake-clock.ts +20 -0
  113. package/src/executors/bounded-exec/bounds.ts +28 -15
  114. package/src/executors/bounded-exec/case-gate.ts +365 -0
  115. package/src/executors/bounded-exec/cpu-pool-thread.ts +3 -3
  116. package/src/executors/bounded-exec/cpu-pool.ts +139 -12
  117. package/src/executors/bounded-exec/endpoint-life.ts +279 -0
  118. package/src/executors/bounded-exec/executor.ts +280 -106
  119. package/src/executors/bounded-exec/gateway-lease.ts +6 -0
  120. package/src/executors/bounded-exec/go-run-summary.ts +137 -0
  121. package/src/executors/bounded-exec/hang-diagnostics.ts +70 -52
  122. package/src/executors/bounded-exec/lease-wait.ts +1 -0
  123. package/src/executors/bounded-exec/mbx-pool.ts +36 -9
  124. package/src/executors/bounded-exec/mbx-reservations.ts +213 -182
  125. package/src/executors/bounded-exec/parent-grant.ts +3 -0
  126. package/src/executors/bounded-exec/pool-admission.ts +59 -2
  127. package/src/executors/bounded-exec/progress.ts +37 -2
  128. package/src/executors/bounded-exec/reservation-connection.ts +221 -0
  129. package/src/executors/bounded-exec/run-cpu-pool.ts +2 -0
  130. package/src/executors/bounded-exec/runner-sizing.ts +13 -8
  131. package/src/executors/bounded-exec/schema.json +1 -1
  132. package/src/executors/bounded-exec/schema.ts +2 -2
  133. package/src/executors/bounded-exec/suite-minimum.ts +81 -0
  134. package/src/executors/bounded-exec/test-result-writer.ts +3 -0
  135. package/src/executors/bounded-exec/test-results.ts +5 -0
  136. package/src/executors/bounded-exec/verdict.ts +39 -6
  137. package/src/executors/cargo-zigbuild/executor.ts +30 -19
  138. package/src/index.ts +112 -78
  139. package/src/managed-files/ci-workflow.ts +13 -17
  140. package/src/managed-files/files.ts +3 -3
  141. package/src/workspace-config-policy.ts +161 -43
  142. package/test-timings.json +157 -147
  143. package/managed/raw/patches/ttsc@0.36.3.patch +0 -1660
@@ -0,0 +1,21 @@
1
+ /**
2
+ * The minimum a whole-suite test leaf names on its reservation (specs/cowshed/05_gateway.md, "A minimum for a whole
3
+ * suite"): "the fewest threads at which its last recorded test walls, longest first, never leave 180 s without a test
4
+ * finishing". The 180 s there is the leaf's own no-progress bound, `idleMs`.
5
+ *
6
+ * A grant never grows, so a suite that starts on one core runs every test in turn for its whole life: a suite of
7
+ * minutes-long cases granted one core beside seventeen short leaves ran 21 minutes where its longest case is 8.5.
8
+ */
9
+ /**
10
+ * Each test's wall as the task's last run closed it, by the test's id, from its results in `directory`; none for a
11
+ * task that has not run, whose results are gone or cannot be read. They size a request and order a leaf's cases at its
12
+ * gate (case-gate.ts), never a charge: a leaf with none names no minimum and starts as it did before it had any.
13
+ */
14
+ export declare function readLastWalls(directory: string): Promise<Map<string, number>>;
15
+ /**
16
+ * The fewest threads, from one to `want`, at which the recorded walls keep a test finishing within every `idleMs`;
17
+ * `want` when none does (a single test longer than the bound finishes within it on no count). One, which is no
18
+ * minimum, for a leaf with no recorded wall.
19
+ */
20
+ export declare function suiteMinimum(recordedWallsMs: readonly number[], want: number, idleMs: number): number;
21
+ //# sourceMappingURL=suite-minimum.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"suite-minimum.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/suite-minimum.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAqBnF;AA4BD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAQrG"}
@@ -0,0 +1,85 @@
1
+ /**
2
+ * The minimum a whole-suite test leaf names on its reservation (specs/cowshed/05_gateway.md, "A minimum for a whole
3
+ * suite"): "the fewest threads at which its last recorded test walls, longest first, never leave 180 s without a test
4
+ * finishing". The 180 s there is the leaf's own no-progress bound, `idleMs`.
5
+ *
6
+ * A grant never grows, so a suite that starts on one core runs every test in turn for its whole life: a suite of
7
+ * minutes-long cases granted one core beside seventeen short leaves ran 21 minutes where its longest case is 8.5.
8
+ */
9
+ import { readFile } from 'node:fs/promises';
10
+ import { join } from 'node:path';
11
+ import { TEST_RESULTS_FILE } from './test-results.js';
12
+ /**
13
+ * Each test's wall as the task's last run closed it, by the test's id, from its results in `directory`; none for a
14
+ * task that has not run, whose results are gone or cannot be read. They size a request and order a leaf's cases at its
15
+ * gate (case-gate.ts), never a charge: a leaf with none names no minimum and starts as it did before it had any.
16
+ */
17
+ export async function readLastWalls(directory) {
18
+ let text;
19
+ try {
20
+ text = await readFile(join(directory, TEST_RESULTS_FILE), 'utf8');
21
+ }
22
+ catch {
23
+ return new Map();
24
+ }
25
+ const walls = new Map();
26
+ for (const line of text.split('\n')) {
27
+ if (line === '')
28
+ continue;
29
+ let row;
30
+ try {
31
+ row = JSON.parse(line);
32
+ }
33
+ catch {
34
+ return new Map();
35
+ }
36
+ if (typeof row !== 'object' || row === null || !('durationMs' in row) || !('id' in row))
37
+ continue;
38
+ const { id, durationMs: wall } = row;
39
+ if (typeof id === 'string' && typeof wall === 'number' && Number.isFinite(wall) && wall >= 0)
40
+ walls.set(id, wall);
41
+ }
42
+ return walls;
43
+ }
44
+ /** When each test finishes on `threads` threads: longest first, each on the thread that frees first. */
45
+ function finishTimes(wallsLongestFirst, threads) {
46
+ const free = new Array(threads).fill(0);
47
+ const finished = [];
48
+ for (const wall of wallsLongestFirst) {
49
+ let soonest = 0;
50
+ for (let thread = 1; thread < threads; thread++) {
51
+ if ((free[thread] ?? 0) < (free[soonest] ?? 0))
52
+ soonest = thread;
53
+ }
54
+ const end = (free[soonest] ?? 0) + wall;
55
+ free[soonest] = end;
56
+ finished.push(end);
57
+ }
58
+ return finished.sort((a, b) => a - b);
59
+ }
60
+ /** Whether no span longer than `idleMs` passes without a test finishing, from the start to the last finish. */
61
+ function keepsFinishing(finished, idleMs) {
62
+ let last = 0;
63
+ for (const end of finished) {
64
+ if (end - last > idleMs)
65
+ return false;
66
+ last = end;
67
+ }
68
+ return true;
69
+ }
70
+ /**
71
+ * The fewest threads, from one to `want`, at which the recorded walls keep a test finishing within every `idleMs`;
72
+ * `want` when none does (a single test longer than the bound finishes within it on no count). One, which is no
73
+ * minimum, for a leaf with no recorded wall.
74
+ */
75
+ export function suiteMinimum(recordedWallsMs, want, idleMs) {
76
+ if (recordedWallsMs.length === 0)
77
+ return 1;
78
+ const longestFirst = [...recordedWallsMs].sort((a, b) => b - a);
79
+ const most = Math.min(want, longestFirst.length);
80
+ for (let threads = 1; threads <= most; threads++) {
81
+ if (keepsFinishing(finishTimes(longestFirst, threads), idleMs))
82
+ return threads;
83
+ }
84
+ return most;
85
+ }
@@ -7,6 +7,8 @@ export interface NativeTestResult {
7
7
  readonly source: ClosedTestResult['source'];
8
8
  readonly contradictsCursor?: number;
9
9
  readonly durationMs: number | null;
10
+ /** How long the case waited at its leaf's gate before it ran, which `durationMs` leaves out; absent for none. */
11
+ readonly waitMs?: number;
10
12
  readonly sourceRef: string | null;
11
13
  readonly failureOutput: string | null;
12
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"test-result-writer.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/test-result-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA6D,MAAM,mBAAmB,CAAC;AAErH,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAM7C,wFAAwF;AACxF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC/B,iFAAiF;IACjF,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAAC;IAChD,SAAS,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC;IAC/D,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjC;AA6BD,8FAA8F;AAC9F,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC1D,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA8FpH"}
1
+ {"version":3,"file":"test-result-writer.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/test-result-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA6D,MAAM,mBAAmB,CAAC;AAErH,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAM7C,wFAAwF;AACxF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,iHAAiH;IACjH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC/B,iFAAiF;IACjF,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAAC;IAChD,SAAS,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC;IAC/D,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjC;AA6BD,8FAA8F;AAC9F,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC1D,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA+FpH"}
@@ -87,6 +87,7 @@ export async function createTestResultWriter(directory, sourceRoot) {
87
87
  source: result.source,
88
88
  ...(result.contradictsCursor === undefined ? {} : { contradictsCursor: result.contradictsCursor }),
89
89
  durationMs: result.durationMs,
90
+ ...(result.waitMs === undefined ? {} : { waitMs: result.waitMs }),
90
91
  sourceRef: normalizeSourceRef(result.sourceRef, sourceRoot),
91
92
  causeRef,
92
93
  }, offset);
@@ -12,6 +12,11 @@ export interface ClosedTestResult {
12
12
  readonly contradictsCursor?: ByteOffset;
13
13
  /** Null when the native runner reports no duration (for example a skipped test). */
14
14
  readonly durationMs: (number & tags.Minimum<0>) | null;
15
+ /**
16
+ * How long the case waited for a core at its leaf's gate before it ran (specs/cowshed/05_gateway.md, "A case starts
17
+ * on a core"), which `durationMs` leaves out; absent for a case that did not wait.
18
+ */
19
+ readonly waitMs?: number & tags.Minimum<0>;
15
20
  /** Native file:line, never a location inferred from human output. */
16
21
  readonly sourceRef: string | null;
17
22
  /** UTF-8 byte range [startByte, endByte), relative to the task artifact directory. */
@@ -1 +1 @@
1
- {"version":3,"file":"test-results.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/test-results.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,IAAI,EAAE,MAAM,OAAO,CAAC;AAEzC,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AACtD,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AAEtD,KAAK,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEhF,8FAA8F;AAC9F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IACjD,qFAAqF;IACrF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC;IACxC,oFAAoF;IACpF,QAAQ,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACvD,qEAAqE;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,sFAAsF;IACtF,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,IAAI,EAAE,OAAO,kBAAkB,CAAC;QACzC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;QAC/B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;KAC9B,GAAG,IAAI,CAAC;IACT,gFAAgF;IAChF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC7B;AAED,eAAO,MAAM,kBAAkB,+CAAyC,CAAC;AAEzE,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAMlG"}
1
+ {"version":3,"file":"test-results.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/test-results.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,IAAI,EAAE,MAAM,OAAO,CAAC;AAEzC,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AACtD,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AAEtD,KAAK,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEhF,8FAA8F;AAC9F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IACjD,qFAAqF;IACrF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC;IACxC,oFAAoF;IACpF,QAAQ,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACvD;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3C,qEAAqE;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,sFAAsF;IACtF,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,IAAI,EAAE,OAAO,kBAAkB,CAAC;QACzC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;QAC/B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;KAC9B,GAAG,IAAI,CAAC;IACT,gFAAgF;IAChF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC7B;AAED,eAAO,MAAM,kBAAkB,+CAAyC,CAAC;AAEzE,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAMlG"}
@@ -4,8 +4,8 @@ import typia from 'typia';
4
4
  export const TEST_RESULTS_FILE = 'test-results.jsonl';
5
5
  export const TEST_FAILURES_FILE = 'test-failures.log';
6
6
  export const isClosedTestResult = (() => {
7
- const _io0 = (input, _exceptionable = true) => "string" === typeof input.runId && _isFormatUuid_1._isFormatUuid(input.runId) && "string" === typeof input.id && ("fail" === input.status || "pass" === input.status || "skip" === input.status) && ("junit" === input.source || "native" === input.source || "progress" === input.source) && (undefined === input.contradictsCursor || "number" === typeof input.contradictsCursor && (_isTypeUint64_1._isTypeUint64(input.contradictsCursor) && input.contradictsCursor <= 9007199254740991)) && (null === input.durationMs || "number" === typeof input.durationMs && 0 <= input.durationMs) && (null === input.sourceRef || "string" === typeof input.sourceRef) && (null === input.causeRef || "object" === typeof input.causeRef && null !== input.causeRef && _io1(input.causeRef, true && _exceptionable)) && ("number" === typeof input.cursor && (_isTypeUint64_1._isTypeUint64(input.cursor) && input.cursor <= 9007199254740991)) && (8 === Object.keys(input).length || Object.keys(input).every(key => {
8
- if (["runId", "id", "status", "source", "contradictsCursor", "durationMs", "sourceRef", "causeRef", "cursor"].some(prop => key === prop))
7
+ const _io0 = (input, _exceptionable = true) => "string" === typeof input.runId && _isFormatUuid_1._isFormatUuid(input.runId) && "string" === typeof input.id && ("fail" === input.status || "pass" === input.status || "skip" === input.status) && ("junit" === input.source || "native" === input.source || "progress" === input.source) && (undefined === input.contradictsCursor || "number" === typeof input.contradictsCursor && (_isTypeUint64_1._isTypeUint64(input.contradictsCursor) && input.contradictsCursor <= 9007199254740991)) && (null === input.durationMs || "number" === typeof input.durationMs && 0 <= input.durationMs) && (undefined === input.waitMs || "number" === typeof input.waitMs && 0 <= input.waitMs) && (null === input.sourceRef || "string" === typeof input.sourceRef) && (null === input.causeRef || "object" === typeof input.causeRef && null !== input.causeRef && _io1(input.causeRef, true && _exceptionable)) && ("number" === typeof input.cursor && (_isTypeUint64_1._isTypeUint64(input.cursor) && input.cursor <= 9007199254740991)) && (8 === Object.keys(input).length || Object.keys(input).every(key => {
8
+ if (["runId", "id", "status", "source", "contradictsCursor", "durationMs", "waitMs", "sourceRef", "causeRef", "cursor"].some(prop => key === prop))
9
9
  return true;
10
10
  const value = input[key];
11
11
  if (undefined === value)
@@ -27,6 +27,11 @@ import type { NativeTestResult } from './test-result-writer.js';
27
27
  * - `queued`: the command failed before any admission after a live task PID was explicitly seen waiting in mbx, or
28
28
  * while its reserved leaf's request waited on its run's mbx reservation endpoint. Its observed wait, and any public
29
29
  * queue positions, describe admission pressure, never a wedged test.
30
+ * - `operational`: bounded-exec itself ended or refused the run for a cause its command did not make, and `cause` says
31
+ * which: its leaf's mbx reservation was refused (`reservation-refused`, naming the endpoint asked and the connect
32
+ * error's code, `ENOENT` when the endpoint's socket is gone), or the executor's own machinery failed (`executor`: a
33
+ * lost CPU grant or pool, a broken progress channel or runner lifecycle, leftovers it could not retire). The tests the
34
+ * report named are failures, never bounds, and the run never records exit 0.
30
35
  * - `failed`: anything else that did not pass. That includes an assertion named in the report,
31
36
  * or a non-zero exit with no report to say why.
32
37
  */
@@ -61,6 +66,23 @@ export type BoundedExecVerdict = {
61
66
  readonly outcome: 'failed';
62
67
  readonly exitCode: number;
63
68
  readonly tests: readonly string[];
69
+ } | {
70
+ readonly outcome: 'operational';
71
+ readonly exitCode: number;
72
+ readonly tests: readonly string[];
73
+ readonly cause: OperationalCause;
74
+ };
75
+ /** Why bounded-exec ended or refused a run whatever its command did (`operational`). */
76
+ export type OperationalCause = {
77
+ readonly kind: 'reservation-refused';
78
+ /** The run's mbx reservation endpoint the leaf asked. */
79
+ readonly endpoint: string;
80
+ /** The code of the error that ended the connection (`ENOENT`: the endpoint's socket is gone), else null. */
81
+ readonly errno: string | null;
82
+ readonly message: string;
83
+ } | {
84
+ readonly kind: 'executor';
85
+ readonly message: string;
64
86
  };
65
87
  /** Observed admission wait, supplied only while the command has never received a grant. */
66
88
  export interface AdmissionQueueWait {
@@ -192,11 +214,11 @@ export interface RunEnd {
192
214
  */
193
215
  export declare function judgeRun(run: RunEnd): BoundedExecVerdict;
194
216
  /**
195
- * A run that failed for a reason its command did not cause: its CPU grant was lost, or its sub-pool did not close
196
- * cleanly. It is an ordinary failure whatever the command exited with and whatever bound also fired, and the tests it
197
- * reports are failures, never bounds. A failed run never records exit 0.
217
+ * A run that failed for a reason its command did not cause (`OperationalCause`): its reservation was refused, its CPU
218
+ * grant was lost, or its sub-pool did not close cleanly. It is operational whatever the command exited with and
219
+ * whatever bound also fired, and the tests it reports are failures, never bounds. It never records exit 0.
198
220
  */
199
- export declare function judgeOperationalFailure(exitCode: number, report: JunitFailures | null): BoundedExecVerdict;
221
+ export declare function judgeOperationalFailure(exitCode: number, report: JunitFailures | null, cause: OperationalCause): BoundedExecVerdict;
200
222
  /** Where `task`'s verdict and report live: this checkout's own Nx workspace-data directory. */
201
223
  export declare function taskDirectory(workspaceData: string, taskId: string): string;
202
224
  export declare const VERDICT_FILE = "verdict.json";
@@ -1 +1 @@
1
- {"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/verdict.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"verdict.d.ts","sourceRoot":"","sources":["../../../src/executors/bounded-exec/verdict.ts"],"names":[],"mappings":"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"}
@@ -12,6 +12,21 @@ const isQueuedVerdict = (() => {
12
12
  const _io2 = input => "number" === typeof input.pid && "number" === typeof input.ticket && "number" === typeof input.queuePosition;
13
13
  return input => "object" === typeof input && null !== input && _io0(input);
14
14
  })();
15
+ const isOperationalVerdict = (() => {
16
+ const _ip0 = input => "string" === typeof input["message"];
17
+ const _io0 = input => "operational" === input.outcome && "number" === typeof input.exitCode && (Array.isArray(input.tests) && input.tests.every(elem => "string" === typeof elem)) && ("object" === typeof input.cause && null !== input.cause && _iu0(input.cause));
18
+ const _io1 = input => "reservation-refused" === input.kind && "string" === typeof input.endpoint && (null === input.errno || "string" === typeof input.errno) && _ip0(input);
19
+ const _io2 = input => "executor" === input.kind && _ip0(input);
20
+ const _iu0 = input => (() => {
21
+ if ("reservation-refused" === input.kind)
22
+ return _io1(input);
23
+ else if ("executor" === input.kind)
24
+ return _io2(input);
25
+ else
26
+ return false;
27
+ })();
28
+ return input => "object" === typeof input && null !== input && _io0(input);
29
+ })();
15
30
  const isCpuRising = (() => {
16
31
  const _io0 = input => "number" === typeof input.pid && (_isTypeUint32_1._isTypeUint32(input.pid) && 1 <= input.pid) && "string" === typeof input.command && ("number" === typeof input.gainedMs && 0 <= input.gainedMs);
17
32
  return input => Array.isArray(input) && input.every(elem => "object" === typeof elem && null !== elem && _io0(elem));
@@ -244,13 +259,13 @@ export function judgeRun(run) {
244
259
  return { outcome: 'failed', exitCode: run.exitCode, tests: [] };
245
260
  }
246
261
  /**
247
- * A run that failed for a reason its command did not cause: its CPU grant was lost, or its sub-pool did not close
248
- * cleanly. It is an ordinary failure whatever the command exited with and whatever bound also fired, and the tests it
249
- * reports are failures, never bounds. A failed run never records exit 0.
262
+ * A run that failed for a reason its command did not cause (`OperationalCause`): its reservation was refused, its CPU
263
+ * grant was lost, or its sub-pool did not close cleanly. It is operational whatever the command exited with and
264
+ * whatever bound also fired, and the tests it reports are failures, never bounds. It never records exit 0.
250
265
  */
251
- export function judgeOperationalFailure(exitCode, report) {
266
+ export function judgeOperationalFailure(exitCode, report, cause) {
252
267
  const tests = report === null ? [] : [...report.failed, ...report.timedOut, ...report.cancelled];
253
- return { outcome: 'failed', exitCode: exitCode === 0 ? 1 : exitCode, tests };
268
+ return { outcome: 'operational', exitCode: exitCode === 0 ? 1 : exitCode, tests, cause };
254
269
  }
255
270
  /** Where `task`'s verdict and report live: this checkout's own Nx workspace-data directory. */
256
271
  export function taskDirectory(workspaceData, taskId) {
@@ -425,6 +440,10 @@ function parseVerdict(value) {
425
440
  }
426
441
  break;
427
442
  }
443
+ case 'operational':
444
+ if (isOperationalVerdict(value))
445
+ return value;
446
+ break;
428
447
  case 'failed':
429
448
  if (typeof value.exitCode === 'number' && isStrings(value.tests)) {
430
449
  return { outcome: 'failed', exitCode: value.exitCode, tests: value.tests };
@@ -561,6 +580,8 @@ export function describeVerdict(verdict) {
561
580
  return verdict.tests.length > 0
562
581
  ? `failed: ${verdict.tests.join(', ')}`
563
582
  : `exited ${verdict.exitCode} with no report naming a timeout`;
583
+ case 'operational':
584
+ return `${verdict.cause.message}${verdict.tests.length > 0 ? `; the tests that failed: ${verdict.tests.join(', ')}` : ''}`;
564
585
  }
565
586
  }
566
587
  /**
@@ -1,5 +1,6 @@
1
1
  import { type BuildInputProducer, type BuildInputRecord } from '@smoothbricks/build-inputs';
2
- import { type Result } from '@smoothbricks/cargo-retain';
2
+ import type { CargoLockResolve } from '@smoothbricks/build-inputs/cargo-closure';
3
+ import type { Result } from '@smoothbricks/cargo-retain';
3
4
  import type { CargoZigbuildOptions } from './schema.js';
4
5
  interface CargoZigbuildContext {
5
6
  root: string;
@@ -39,12 +40,12 @@ export declare function zigbuildArgs(options: CargoZigbuildOptions, manifestPath
39
40
  /** `x86_64-unknown-linux-gnu.2.17` → `x86_64-unknown-linux-gnu`. */
40
41
  export declare function cargoTriple(target: string): string;
41
42
  /**
42
- * The remedy for a failed build of `target` on this host, when rustc has no standard library for its triple: every
43
- * managed shell carries `x86_64-unknown-linux-gnu`'s, and on macOS the rest of the Linux set is the `linux-cross`
44
- * profile's. A build outside it fails in rustc, which names the missing target but not the profile. `libdir` is what
43
+ * The remedy for a failed build of `target`, when rustc has no standard library for its triple: every managed shell
44
+ * carries the whole Linux rust-std set, so that rustc is not the one the checkout's shell provides. A build outside it
45
+ * fails in rustc, which names the missing target but not the shell. `libdir` is what
45
46
  * `rustc --print target-libdir --target <triple>` printed, or null when rustc could not answer.
46
47
  */
47
- export declare function missingRustStdRemedy(command: string, target: string, platform: NodeJS.Platform, libdir: {
48
+ export declare function missingRustStdRemedy(command: string, target: string, libdir: {
48
49
  readonly path: string;
49
50
  readonly exists: boolean;
50
51
  } | null): string | null;
@@ -74,10 +75,11 @@ export declare function depInfoPath(built: string): string;
74
75
  /**
75
76
  * The input record (build-inputs.ts) of the build that wrote `built`, or why none can be made: the record
76
77
  * `smoo-nx-build-inputs` writes after a macOS build, from the dep-info beside the artifact, so one link check judges
77
- * both. `cargoRoot` is the Cargo workspace root, whose manifest and lock the record names as well. `producer` is the
78
- * Nx task running the build, which the executor reads from its environment.
78
+ * both. `cargo` is the resolve Cargo reports for the build's manifest, which names the workspace manifest and the
79
+ * lockfile closure the record states. `producer` is the Nx task running the build, which the executor reads from its
80
+ * environment.
79
81
  */
80
- export declare function buildInputsOf(built: string, manifestPath: string, cargoRoot: string, producer?: BuildInputProducer): Result<BuildInputRecord, string>;
82
+ export declare function buildInputsOf(built: string, manifestPath: string, cargo: CargoLockResolve, producer?: BuildInputProducer): Result<BuildInputRecord, string>;
81
83
  /**
82
84
  * Writes the artifact and its input record into the directory `output` is in, which the target declares as its Nx
83
85
  * output (`{options.output}/../`), so a cache hit restores both. The artifact is copied then renamed, so the output
@@ -1 +1 @@
1
- {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/executors/cargo-zigbuild/executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAKtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAA0C,KAAK,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGjG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAKD,wEAAwE;AACxE,MAAM,MAAM,gBAAgB,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAElF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,GAAG,gBAAgB,CAE7F;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAe1F;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGlD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,MAAM,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GACjE,MAAM,GAAG,IAAI,CAOf;AAoBD;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAQrF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAqB1G;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGjD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAalC;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAA8B,qBAAqB,CACjD,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAkE/B"}
1
+ {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/executors/cargo-zigbuild/executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAKtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAIzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,UAAU,oBAAoB;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAKD,wEAAwE;AACxE,MAAM,MAAM,gBAAgB,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAElF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,GAAG,gBAAgB,CAE7F;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAe1F;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGlD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GACjE,MAAM,GAAG,IAAI,CAOf;AAoBD;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAQrF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAqB1G;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGjD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,gBAAgB,EACvB,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAkBlC;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAA8B,qBAAqB,CACjD,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAsE/B"}
@@ -6,8 +6,8 @@ import { chmod, copyFile, mkdir, rename } from 'node:fs/promises';
6
6
  import path from 'node:path';
7
7
  import { createInterface } from 'node:readline';
8
8
  import { buildInputProducer, cargoBuildInputs, gitWorkspaceRoot, writeBuildInputs, } from '@smoothbricks/build-inputs';
9
- import { cargoWorkspace, describeRetentionError } from '@smoothbricks/cargo-retain';
10
9
  import typia from 'typia';
10
+ import { CargoMetadataError, readCargoResolve } from '../../cargo-source-hash.js';
11
11
  const validateReason = (() => {
12
12
  let errors;
13
13
  let _report;
@@ -166,17 +166,17 @@ export function cargoTriple(target) {
166
166
  return glibcSuffix === null ? target : target.slice(0, glibcSuffix.index);
167
167
  }
168
168
  /**
169
- * The remedy for a failed build of `target` on this host, when rustc has no standard library for its triple: every
170
- * managed shell carries `x86_64-unknown-linux-gnu`'s, and on macOS the rest of the Linux set is the `linux-cross`
171
- * profile's. A build outside it fails in rustc, which names the missing target but not the profile. `libdir` is what
169
+ * The remedy for a failed build of `target`, when rustc has no standard library for its triple: every managed shell
170
+ * carries the whole Linux rust-std set, so that rustc is not the one the checkout's shell provides. A build outside it
171
+ * fails in rustc, which names the missing target but not the shell. `libdir` is what
172
172
  * `rustc --print target-libdir --target <triple>` printed, or null when rustc could not answer.
173
173
  */
174
- export function missingRustStdRemedy(command, target, platform, libdir) {
175
- if (platform !== 'darwin' || libdir === null || libdir.exists)
174
+ export function missingRustStdRemedy(command, target, libdir) {
175
+ if (libdir === null || libdir.exists)
176
176
  return null;
177
- return (`${command}: rustc has no standard library for ${cargoTriple(target)} (${libdir.path} is absent). On macOS the ` +
178
- "Linux rust-std set beyond x86_64-unknown-linux-gnu is the linux-cross profile's: tooling/devenv -P linux-cross " +
179
- 'shell -- nx run <project>:<target>');
177
+ return (`${command}: rustc has no standard library for ${cargoTriple(target)} (${libdir.path} is absent). Every managed ` +
178
+ "shell carries the Linux rust-std set, so this rustc is not the checkout's shell's: enter it (direnv reload) and " +
179
+ 'run nx run <project>:<target> again');
180
180
  }
181
181
  /** What `rustc --print target-libdir` names for the triple of `target`, and whether it exists; null if rustc failed. */
182
182
  async function rustLibdir(target) {
@@ -256,10 +256,11 @@ export function depInfoPath(built) {
256
256
  /**
257
257
  * The input record (build-inputs.ts) of the build that wrote `built`, or why none can be made: the record
258
258
  * `smoo-nx-build-inputs` writes after a macOS build, from the dep-info beside the artifact, so one link check judges
259
- * both. `cargoRoot` is the Cargo workspace root, whose manifest and lock the record names as well. `producer` is the
260
- * Nx task running the build, which the executor reads from its environment.
259
+ * both. `cargo` is the resolve Cargo reports for the build's manifest, which names the workspace manifest and the
260
+ * lockfile closure the record states. `producer` is the Nx task running the build, which the executor reads from its
261
+ * environment.
261
262
  */
262
- export function buildInputsOf(built, manifestPath, cargoRoot, producer) {
263
+ export function buildInputsOf(built, manifestPath, cargo, producer) {
263
264
  const directory = path.dirname(manifestPath);
264
265
  const workspaceRoot = gitWorkspaceRoot(directory);
265
266
  if (workspaceRoot === null) {
@@ -269,7 +270,13 @@ export function buildInputsOf(built, manifestPath, cargoRoot, producer) {
269
270
  if (!existsSync(depInfo)) {
270
271
  return { ok: false, error: `${depInfo} does not exist: cargo wrote no dep-info beside ${built}` };
271
272
  }
272
- const record = cargoBuildInputs(workspaceRoot, readFileSync(depInfo, 'utf8'), cargoRoot, producer);
273
+ let record;
274
+ try {
275
+ record = cargoBuildInputs(workspaceRoot, readFileSync(depInfo, 'utf8'), cargo, producer);
276
+ }
277
+ catch (error) {
278
+ return { ok: false, error: `${depInfo}: ${error instanceof Error ? error.message : String(error)}` };
279
+ }
273
280
  if (record === null)
274
281
  return { ok: false, error: `${depInfo} names no file of ${workspaceRoot}` };
275
282
  return { ok: true, value: record };
@@ -327,7 +334,7 @@ export default async function cargoZigbuildExecutor(options, context) {
327
334
  }
328
335
  if (status.code !== 0) {
329
336
  console.error(`${command}: exited with ${status.signal ?? `status ${status.code}`}`);
330
- const remedy = missingRustStdRemedy(command, options.target, process.platform, await rustLibdir(options.target));
337
+ const remedy = missingRustStdRemedy(command, options.target, await rustLibdir(options.target));
331
338
  if (remedy !== null)
332
339
  console.error(remedy);
333
340
  return { success: false };
@@ -338,13 +345,19 @@ export default async function cargoZigbuildExecutor(options, context) {
338
345
  return { success: false };
339
346
  }
340
347
  // From the dep-info cargo just wrote, before the artifact is copied: a build whose inputs cannot be named leaves the
341
- // output as it was, and a source edited while the artifact is copied is not recorded with its new bytes.
342
- const cargo = await cargoWorkspace(path.dirname(manifestPath));
343
- if (!cargo.ok) {
344
- console.error(`${command}: ${describeRetentionError(cargo.error)}`);
348
+ // output as it was, and a source edited while the artifact is copied is not recorded with its new bytes. The resolve
349
+ // is the one the task's key was computed from (readCargoResolve), so the record states the key's lockfile closure.
350
+ let cargo;
351
+ try {
352
+ cargo = await readCargoResolve(manifestPath, context.root);
353
+ }
354
+ catch (error) {
355
+ if (!(error instanceof CargoMetadataError))
356
+ throw error;
357
+ console.error(`${command}: ${error.message}`);
345
358
  return { success: false };
346
359
  }
347
- const inputs = buildInputsOf(built, manifestPath, cargo.value.workspaceRoot, producer);
360
+ const inputs = buildInputsOf(built, manifestPath, cargo, producer);
348
361
  if (!inputs.ok) {
349
362
  console.error(`${command}: ${inputs.error}`);
350
363
  return { success: false };
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAGnB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAGtB,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAyFlC,OAAO,EACL,KAAK,uBAAuB,EAG7B,MAAM,wBAAwB,CAAC;AA2BhC,gEAAgE;AAChE,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,uEAAuE;AACvE,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAqhBlD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAMtE;AA8bD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,MAAM,EACrB,qBAAqB,UAAkC,GACtD,OAAO,CAoBT;AACD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,OAAO,GACjB,MAAM,EAAE,CAKV;AA6JD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAG,aAAa,CAEvG;AAED,eAAO,MAAM,aAAa,EAAE,aAG3B,CAAC;AAeF;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,EAAE,iBAAiB,CAAC,uBAAuB,CAQxE,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,kBAAkB,CAAC,uBAAuB,CAM1E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAIhC,CAAC;AAEF,+GAA+G;AAC/G,eAAO,MAAM,cAAc,EAAE,cAK5B,CAAC;;;;;;;;;AAiDF,+GAA+G;AAC/G,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmCxB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAGnB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAGtB,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAyFlC,OAAO,EACL,KAAK,uBAAuB,EAG7B,MAAM,wBAAwB,CAAC;AA2BhC,gEAAgE;AAChE,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,uEAAuE;AACvE,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AA4hBlD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAMtE;AA0cD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,MAAM,EACrB,qBAAqB,UAAkC,GACtD,OAAO,CAoBT;AACD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,OAAO,GACjB,MAAM,EAAE,CAKV;AA6JD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAG,aAAa,CAEvG;AAED,eAAO,MAAM,aAAa,EAAE,aAG3B,CAAC;AAeF;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,EAAE,iBAAiB,CAAC,uBAAuB,CAQxE,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,kBAAkB,CAAC,uBAAuB,CAM1E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAIhC,CAAC;AAEF,+GAA+G;AAC/G,eAAO,MAAM,cAAc,EAAE,cAK5B,CAAC;;;;;;;;;AAiDF,+GAA+G;AAC/G,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmCxB"}