@jinn-network/client 0.1.7-canary.d4e4e183 → 0.1.7-canary.eb5ac0de
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.
- package/README.md +67 -1
- package/dist/adapters/mech/adapter.js +27 -3
- package/dist/adapters/mech/adapter.js.map +1 -1
- package/dist/adapters/mech/safe.d.ts +1 -1
- package/dist/adapters/mech/safe.js +5 -3
- package/dist/adapters/mech/safe.js.map +1 -1
- package/dist/adapters/mech/types.d.ts +6 -1
- package/dist/adapters/mech/types.js.map +1 -1
- package/dist/api/activity-events-endpoint.d.ts +14 -0
- package/dist/api/activity-events-endpoint.js +59 -0
- package/dist/api/activity-events-endpoint.js.map +1 -0
- package/dist/api/bootstrap-endpoint.d.ts +1 -2
- package/dist/api/bootstrap-endpoint.js +0 -1
- package/dist/api/bootstrap-endpoint.js.map +1 -1
- package/dist/api/gather-status.d.ts +3 -0
- package/dist/api/gather-status.js +105 -26
- package/dist/api/gather-status.js.map +1 -1
- package/dist/api/launcher-status.d.ts +1 -1
- package/dist/api/launcher-status.js +11 -10
- package/dist/api/launcher-status.js.map +1 -1
- package/dist/api/launcher-tasks.d.ts +1 -1
- package/dist/api/launcher-tasks.js +12 -8
- package/dist/api/launcher-tasks.js.map +1 -1
- package/dist/api/server.js +4 -0
- package/dist/api/server.js.map +1 -1
- package/dist/api/setup-endpoints.js +11 -131
- package/dist/api/setup-endpoints.js.map +1 -1
- package/dist/api/status-build.d.ts +40 -0
- package/dist/api/status-build.js +25 -0
- package/dist/api/status-build.js.map +1 -1
- package/dist/build-info.json +4 -4
- package/dist/build-meta.json +1 -1
- package/dist/cli/commands/solver-nets.js +92 -21
- package/dist/cli/commands/solver-nets.js.map +1 -1
- package/dist/cli/commands/solver-plugins-block.d.ts +33 -0
- package/dist/cli/commands/solver-plugins-block.js +118 -0
- package/dist/cli/commands/solver-plugins-block.js.map +1 -0
- package/dist/cli/commands/solver-plugins-feedback.d.ts +72 -0
- package/dist/cli/commands/solver-plugins-feedback.js +262 -0
- package/dist/cli/commands/solver-plugins-feedback.js.map +1 -0
- package/dist/cli/commands/solver-plugins-read.d.ts +54 -0
- package/dist/cli/commands/solver-plugins-read.js +259 -0
- package/dist/cli/commands/solver-plugins-read.js.map +1 -0
- package/dist/cli/commands/solver-plugins.d.ts +35 -0
- package/dist/cli/commands/solver-plugins.js +399 -2
- package/dist/cli/commands/solver-plugins.js.map +1 -1
- package/dist/cli/commands/tasks.js +15 -2
- package/dist/cli/commands/tasks.js.map +1 -1
- package/dist/cli/task-native-readiness.d.ts +7 -0
- package/dist/cli/task-native-readiness.js +7 -5
- package/dist/cli/task-native-readiness.js.map +1 -1
- package/dist/config.d.ts +169 -232
- package/dist/config.js +219 -107
- package/dist/config.js.map +1 -1
- package/dist/daemon/daemon.d.ts +3 -0
- package/dist/daemon/daemon.js +88 -22
- package/dist/daemon/daemon.js.map +1 -1
- package/dist/daemon/gate-logger.d.ts +9 -0
- package/dist/daemon/gate-logger.js +2 -0
- package/dist/daemon/gate-logger.js.map +1 -0
- package/dist/daemon/readiness-gate.d.ts +1 -4
- package/dist/daemon/readiness-gate.js.map +1 -1
- package/dist/daemon/spend-cap-gate.d.ts +40 -0
- package/dist/daemon/spend-cap-gate.js +46 -0
- package/dist/daemon/spend-cap-gate.js.map +1 -0
- package/dist/dashboard/assets/index-CKTc0D37.css +32 -0
- package/dist/dashboard/assets/index-h2ATCtSA.js +345 -0
- package/dist/dashboard/index.html +2 -2
- package/dist/earning/safe-adapter.js +23 -11
- package/dist/earning/safe-adapter.js.map +1 -1
- package/dist/earning/types.d.ts +6 -6
- package/dist/earning/viem-clients.d.ts +11 -4
- package/dist/earning/viem-clients.js +14 -5
- package/dist/earning/viem-clients.js.map +1 -1
- package/dist/events/types.d.ts +2 -2
- package/dist/harnesses/engine/engine.js +13 -0
- package/dist/harnesses/engine/engine.js.map +1 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.d.ts +74 -5
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js +103 -32
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js.map +1 -1
- package/dist/main.js +44 -31
- package/dist/main.js.map +1 -1
- package/dist/observability/emit-event.d.ts +3 -2
- package/dist/observability/emit-event.js +22 -1
- package/dist/observability/emit-event.js.map +1 -1
- package/dist/preflight/rpc-network.d.ts +40 -0
- package/dist/preflight/rpc-network.js +67 -1
- package/dist/preflight/rpc-network.js.map +1 -1
- package/dist/rpc/transport.d.ts +109 -0
- package/dist/rpc/transport.js +220 -0
- package/dist/rpc/transport.js.map +1 -0
- package/dist/scripts/donation-consumption-acceptance.js +7 -28
- package/dist/scripts/donation-consumption-acceptance.js.map +1 -1
- package/dist/solver-nets/prediction-operator-ux.d.ts +1 -2
- package/dist/solver-nets/prediction-operator-ux.js +56 -53
- package/dist/solver-nets/prediction-operator-ux.js.map +1 -1
- package/dist/solver-nets/registry.d.ts +19 -1
- package/dist/solver-nets/registry.js +37 -24
- package/dist/solver-nets/registry.js.map +1 -1
- package/dist/solver-types/_swe-rebench-v2-pool.d.ts +9 -2
- package/dist/solver-types/_swe-rebench-v2-pool.js +15 -20
- package/dist/solver-types/_swe-rebench-v2-pool.js.map +1 -1
- package/dist/solver-types/_swe-rebench-v2-validated-pool.d.ts +29 -1
- package/dist/solver-types/_swe-rebench-v2-validated-pool.js +62 -13
- package/dist/solver-types/_swe-rebench-v2-validated-pool.js.map +1 -1
- package/dist/solver-types/swe-rebench-v2.js +4 -1
- package/dist/solver-types/swe-rebench-v2.js.map +1 -1
- package/dist/spend/credential.d.ts +8 -0
- package/dist/spend/credential.js +30 -0
- package/dist/spend/credential.js.map +1 -0
- package/dist/spend/daemon-config.d.ts +13 -0
- package/dist/spend/daemon-config.js +24 -0
- package/dist/spend/daemon-config.js.map +1 -0
- package/dist/spend/pricing.d.ts +16 -0
- package/dist/spend/pricing.js +26 -0
- package/dist/spend/pricing.js.map +1 -0
- package/dist/spend/record.d.ts +13 -0
- package/dist/spend/record.js +30 -0
- package/dist/spend/record.js.map +1 -0
- package/dist/spend/usage.d.ts +27 -0
- package/dist/spend/usage.js +113 -0
- package/dist/spend/usage.js.map +1 -0
- package/dist/store/store.d.ts +28 -0
- package/dist/store/store.js +118 -4
- package/dist/store/store.js.map +1 -1
- package/dist/trajectory/transcript-parsers/types.d.ts +8 -8
- package/dist/tx-retry.d.ts +15 -0
- package/dist/tx-retry.js +30 -6
- package/dist/tx-retry.js.map +1 -1
- package/package.json +2 -1
- package/dist/dashboard/assets/index-BUlE8F3Y.js +0 -330
- package/dist/dashboard/assets/index-blqc7eqq.css +0 -32
|
@@ -88,7 +88,6 @@ type LoadSolverNets = typeof defaultLoadSolverNets;
|
|
|
88
88
|
export interface BuildPredictionOperatorStatusOptions {
|
|
89
89
|
config: JinnConfig;
|
|
90
90
|
configPath: string;
|
|
91
|
-
name?: string;
|
|
92
91
|
buildHarnesses?: BuildHarnesses;
|
|
93
92
|
loadExternalImpl?: LoadExternalImpl;
|
|
94
93
|
loadSolverNets?: LoadSolverNets;
|
|
@@ -103,7 +102,7 @@ export interface RunPredictionSampleOptions {
|
|
|
103
102
|
workingRoot?: string;
|
|
104
103
|
harness?: PredictionV1BaselineImpl;
|
|
105
104
|
}
|
|
106
|
-
export declare function buildPredictionOperatorStatus({ config, configPath,
|
|
105
|
+
export declare function buildPredictionOperatorStatus({ config, configPath, buildHarnesses, loadExternalImpl, loadSolverNets, daemonRunning, }: BuildPredictionOperatorStatusOptions): Promise<PredictionOperatorStatus>;
|
|
107
106
|
export declare function buildSamplePredictionV1Task(options?: {
|
|
108
107
|
now?: number;
|
|
109
108
|
closedWindow?: boolean;
|
|
@@ -52,13 +52,13 @@ function diagnosticNextAction(diagnostics, daemonRunning = false) {
|
|
|
52
52
|
cli: 'jinn run',
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
|
-
function missingSolverNetStatus(configPath,
|
|
55
|
+
function missingSolverNetStatus(configPath, daemonRunning = false) {
|
|
56
56
|
const diagnostics = [
|
|
57
57
|
{
|
|
58
58
|
code: 'prediction_solvernet_missing',
|
|
59
59
|
severity: 'error',
|
|
60
60
|
message: 'No active SolverNet configured.',
|
|
61
|
-
configField: '
|
|
61
|
+
configField: 'joinedSolverNets',
|
|
62
62
|
nextAction: {
|
|
63
63
|
description: 'Open Operator > SolverNets to join or configure a SolverNet.',
|
|
64
64
|
url: '/operator#solvernets',
|
|
@@ -70,7 +70,7 @@ function missingSolverNetStatus(configPath, name, daemonRunning = false) {
|
|
|
70
70
|
ok: false,
|
|
71
71
|
configPath,
|
|
72
72
|
solverNet: {
|
|
73
|
-
name,
|
|
73
|
+
name: 'prediction',
|
|
74
74
|
enabled: false,
|
|
75
75
|
solverType: 'prediction.v1',
|
|
76
76
|
roles: [],
|
|
@@ -98,8 +98,16 @@ function findPredictionJoined(joinedSolverNets) {
|
|
|
98
98
|
* the Prediction SolverNet via the manifest-keyed flow but has no legacy
|
|
99
99
|
* solverNets[name] entry.
|
|
100
100
|
*/
|
|
101
|
-
function synthesizeFromJoined(joined,
|
|
101
|
+
function synthesizeFromJoined(joined, defaultSolverType = 'prediction.v1') {
|
|
102
102
|
const roles = rolesFromJoinedConfig(joined);
|
|
103
|
+
// Derive solverType from the joined contract when available so the
|
|
104
|
+
// operator-status diagnostic can surface contract-version mismatches
|
|
105
|
+
// (e.g. legacy `solverType: 'prediction.v2'` migrated into a joined
|
|
106
|
+
// entry — the synthesized net's solverType is then 'prediction.v2',
|
|
107
|
+
// which the prediction.v1 mismatch check catches downstream).
|
|
108
|
+
const solverType = joined.contract
|
|
109
|
+
? `${joined.contract.id}.${joined.contract.version}`
|
|
110
|
+
: defaultSolverType;
|
|
103
111
|
return {
|
|
104
112
|
enabled: true,
|
|
105
113
|
solverType,
|
|
@@ -110,21 +118,22 @@ function synthesizeFromJoined(joined, solverType = 'prediction.v1') {
|
|
|
110
118
|
taskGenerator: { enabled: false },
|
|
111
119
|
};
|
|
112
120
|
}
|
|
113
|
-
export async function buildPredictionOperatorStatus({ config, configPath,
|
|
114
|
-
const legacy = config.solverNets[name];
|
|
121
|
+
export async function buildPredictionOperatorStatus({ config, configPath, buildHarnesses = defaultBuildHarnesses, loadExternalImpl = defaultLoadExternalImpl, loadSolverNets = defaultLoadSolverNets, daemonRunning = false, }) {
|
|
115
122
|
// Prediction is a deprecated SolverNet. Only emit prediction-operator
|
|
116
|
-
// diagnostics when the operator has a *genuine* prediction config: a
|
|
117
|
-
// `
|
|
118
|
-
//
|
|
119
|
-
//
|
|
120
|
-
//
|
|
123
|
+
// diagnostics when the operator has a *genuine* prediction config: a
|
|
124
|
+
// `joinedSolverNets` entry whose contract is the prediction SolverNet
|
|
125
|
+
// (`contract.id === 'prediction'`). An operator who joined only
|
|
126
|
+
// non-prediction SolverNets (the normal case) must get no prediction
|
|
127
|
+
// diagnostics — synthesizing a prediction net from a non-prediction
|
|
121
128
|
// joined entry would mislabel its harness and raise a spurious ATTENTION
|
|
122
129
|
// (dogfood finding #9, issue #328).
|
|
123
130
|
const predictionJoined = findPredictionJoined(config.joinedSolverNets);
|
|
124
|
-
if (!
|
|
125
|
-
return missingSolverNetStatus(configPath,
|
|
131
|
+
if (!predictionJoined) {
|
|
132
|
+
return missingSolverNetStatus(configPath, daemonRunning);
|
|
126
133
|
}
|
|
127
|
-
const net =
|
|
134
|
+
const net = synthesizeFromJoined(predictionJoined, 'prediction.v1');
|
|
135
|
+
const manifestCid = predictionJoined.manifestCid;
|
|
136
|
+
const displayName = predictionJoined.name ?? manifestCid;
|
|
128
137
|
const diagnostics = [];
|
|
129
138
|
let loadedNet;
|
|
130
139
|
let pluginLoadError = null;
|
|
@@ -133,10 +142,10 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
133
142
|
code: 'prediction_solvernet_disabled',
|
|
134
143
|
severity: 'error',
|
|
135
144
|
message: 'Prediction SolverNet is disabled.',
|
|
136
|
-
configField: `
|
|
145
|
+
configField: `joinedSolverNets.${manifestCid}.roles`,
|
|
137
146
|
nextAction: {
|
|
138
|
-
description: '
|
|
139
|
-
|
|
147
|
+
description: 'Re-join the Prediction SolverNet to enable participation.',
|
|
148
|
+
url: '/operator#solvernets',
|
|
140
149
|
},
|
|
141
150
|
});
|
|
142
151
|
}
|
|
@@ -144,21 +153,21 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
144
153
|
diagnostics.push({
|
|
145
154
|
code: 'prediction_solver_type_mismatch',
|
|
146
155
|
severity: 'error',
|
|
147
|
-
message: `SolverNet '${
|
|
148
|
-
configField: `
|
|
156
|
+
message: `SolverNet '${displayName}' is configured for ${net.solverType}, not prediction.v1.`,
|
|
157
|
+
configField: `joinedSolverNets.${manifestCid}.contract`,
|
|
149
158
|
nextAction: {
|
|
150
|
-
description: 'Set the SolverNet
|
|
159
|
+
description: 'Set the SolverNet contract to prediction.v1.',
|
|
151
160
|
},
|
|
152
161
|
});
|
|
153
162
|
}
|
|
154
163
|
if (net.enabled) {
|
|
155
164
|
try {
|
|
156
165
|
const registry = await loadSolverNets({
|
|
157
|
-
|
|
158
|
-
[
|
|
166
|
+
joinedSolverNets: {
|
|
167
|
+
[manifestCid]: predictionJoined,
|
|
159
168
|
},
|
|
160
169
|
});
|
|
161
|
-
loadedNet = registry.get(
|
|
170
|
+
loadedNet = registry.get(displayName);
|
|
162
171
|
}
|
|
163
172
|
catch (error) {
|
|
164
173
|
pluginLoadError = errorMessage(error);
|
|
@@ -166,10 +175,10 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
166
175
|
code: 'prediction_plugin_unavailable',
|
|
167
176
|
severity: 'error',
|
|
168
177
|
message: pluginLoadError,
|
|
169
|
-
configField: `
|
|
178
|
+
configField: `joinedSolverNets.${manifestCid}.plugins`,
|
|
170
179
|
nextAction: {
|
|
171
180
|
description: 'Fix the Prediction runtime plugin source or restore the bundled plugin.',
|
|
172
|
-
|
|
181
|
+
url: '/operator#solvernets',
|
|
173
182
|
},
|
|
174
183
|
});
|
|
175
184
|
}
|
|
@@ -236,10 +245,10 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
236
245
|
code: 'prediction_harness_missing',
|
|
237
246
|
severity: 'error',
|
|
238
247
|
message: 'No Harness is selected for the Prediction SolverNet.',
|
|
239
|
-
configField: `
|
|
248
|
+
configField: `joinedSolverNets.${manifestCid}.harness`,
|
|
240
249
|
nextAction: {
|
|
241
|
-
description: 'Select a Harness for prediction.v1 Tasks.',
|
|
242
|
-
|
|
250
|
+
description: 'Select a Harness for prediction.v1 Tasks via Operator > SolverNets.',
|
|
251
|
+
url: '/operator#solvernets',
|
|
243
252
|
},
|
|
244
253
|
});
|
|
245
254
|
}
|
|
@@ -262,7 +271,7 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
262
271
|
message: selectedExternalEntry
|
|
263
272
|
? `Selected external Harness '${net.harness}' is configured but not available.`
|
|
264
273
|
: `Selected Harness '${net.harness}' is not installed.`,
|
|
265
|
-
configField: `
|
|
274
|
+
configField: `joinedSolverNets.${manifestCid}.harness`,
|
|
266
275
|
nextAction: {
|
|
267
276
|
description: 'Select an installed Harness.',
|
|
268
277
|
cli: `jinn harnesses list`,
|
|
@@ -274,10 +283,10 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
274
283
|
code: 'prediction_harness_unsupported',
|
|
275
284
|
severity: 'error',
|
|
276
285
|
message: `Selected Harness '${selectedHarness.name}' does not support prediction.v1 restoration Tasks.`,
|
|
277
|
-
configField: `
|
|
286
|
+
configField: `joinedSolverNets.${manifestCid}.harness`,
|
|
278
287
|
nextAction: {
|
|
279
|
-
description: 'Select a Harness that supports prediction.v1.',
|
|
280
|
-
|
|
288
|
+
description: 'Select a Harness that supports prediction.v1 via Operator > SolverNets.',
|
|
289
|
+
url: '/operator#solvernets',
|
|
281
290
|
},
|
|
282
291
|
});
|
|
283
292
|
}
|
|
@@ -286,7 +295,7 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
286
295
|
code: 'prediction_harness_not_ready',
|
|
287
296
|
severity: 'warning',
|
|
288
297
|
message: harnessStatus.readiness.reason ?? `Selected Harness '${selectedHarness.name}' is not ready.`,
|
|
289
|
-
configField: `
|
|
298
|
+
configField: `joinedSolverNets.${manifestCid}.harness`,
|
|
290
299
|
nextAction: harnessStatus.readiness.nextStep ?? {
|
|
291
300
|
description: 'Start the daemon with a configured operator fleet.',
|
|
292
301
|
cli: 'jinn run',
|
|
@@ -295,37 +304,31 @@ export async function buildPredictionOperatorStatus({ config, configPath, name =
|
|
|
295
304
|
}
|
|
296
305
|
}
|
|
297
306
|
if (net.enabled && !net.taskGenerator.enabled) {
|
|
307
|
+
// Joined SolverNets do not carry the operator-side task-generator flag —
|
|
308
|
+
// generator ownership is launched-record-driven (spec §11). Synthesised
|
|
309
|
+
// entries set `taskGenerator.enabled: false`; the diagnostic is now an
|
|
310
|
+
// informational note rather than a warning so the dashboard does not
|
|
311
|
+
// raise ATTENTION on every operator who joins via the registry.
|
|
298
312
|
diagnostics.push({
|
|
299
313
|
code: 'prediction_task_generator_disabled',
|
|
300
|
-
severity: '
|
|
301
|
-
message: 'Prediction Task generator
|
|
302
|
-
configField: `
|
|
314
|
+
severity: 'info',
|
|
315
|
+
message: 'Prediction Task generator runs on the launcher, not on this operator. This node will solve shared Tasks; the launcher posts new rounds.',
|
|
316
|
+
configField: `joinedSolverNets.${manifestCid}`,
|
|
303
317
|
nextAction: {
|
|
304
|
-
description: '
|
|
318
|
+
description: 'Operator config no longer carries the task-generator flag; nothing to change.',
|
|
305
319
|
},
|
|
306
320
|
});
|
|
307
321
|
}
|
|
308
|
-
//
|
|
309
|
-
//
|
|
310
|
-
//
|
|
311
|
-
|
|
312
|
-
// explicitly on the operator-status payload).
|
|
313
|
-
const resolvedRoles = (() => {
|
|
314
|
-
const candidate = net.roles;
|
|
315
|
-
if (Array.isArray(candidate) && candidate.length > 0) {
|
|
316
|
-
return Array.from(new Set(candidate.filter((r) => r === 'solving' || r === 'evaluating')));
|
|
317
|
-
}
|
|
318
|
-
const legacy = net.role;
|
|
319
|
-
if (legacy === 'solving' || legacy === 'evaluating')
|
|
320
|
-
return [legacy];
|
|
321
|
-
return ['solving'];
|
|
322
|
-
})();
|
|
322
|
+
// `synthesizeFromJoined` already guarantees a non-empty
|
|
323
|
+
// `SolverNetOperatorRole[]` (it routes through `rolesFromJoinedConfig`
|
|
324
|
+
// and falls back to `['solving']`), so the net's roles are canonical.
|
|
325
|
+
const resolvedRoles = net.roles ?? ['solving'];
|
|
323
326
|
const status = {
|
|
324
327
|
kind: 'prediction.v1.operatorStatus',
|
|
325
328
|
ok: diagnostics.every((diagnostic) => diagnostic.severity !== 'error'),
|
|
326
329
|
configPath,
|
|
327
330
|
solverNet: {
|
|
328
|
-
name,
|
|
331
|
+
name: displayName,
|
|
329
332
|
enabled: net.enabled,
|
|
330
333
|
solverType: net.solverType,
|
|
331
334
|
roles: resolvedRoles,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prediction-operator-ux.js","sourceRoot":"","sources":["../../src/solver-nets/prediction-operator-ux.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prediction-operator-ux.js","sourceRoot":"","sources":["../../src/solver-nets/prediction-operator-ux.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,25 @@ export interface LoadedSolverNet {
|
|
|
50
50
|
}
|
|
51
51
|
export declare function taskRoleForOperatorRole(role: SolverNetOperatorRole): SolverNetTaskRole | undefined;
|
|
52
52
|
export declare function rolesFromJoinedConfig(net: JoinedSolverNetConfig): SolverNetOperatorRole[];
|
|
53
|
+
/**
|
|
54
|
+
* Format a joined-entry contract back into the `<id>.<version>` solverType
|
|
55
|
+
* string the runtime uses for dispatch. Returns `undefined` when the joined
|
|
56
|
+
* entry has no contract (mid-migration synthesized entries can land here).
|
|
57
|
+
*/
|
|
58
|
+
export declare function solverTypeFromJoinedContract(net: Pick<JoinedSolverNetConfig, 'contract'>): string | undefined;
|
|
59
|
+
/**
|
|
60
|
+
* Operator-facing display name for a joined SolverNet — the registry
|
|
61
|
+
* `name` field if present, otherwise the manifest CID. Mirrors the same
|
|
62
|
+
* resolution the registry uses when registering entries.
|
|
63
|
+
*/
|
|
64
|
+
export declare function joinedDisplayName(cid: string, net: Pick<JoinedSolverNetConfig, 'name'>): string;
|
|
65
|
+
/**
|
|
66
|
+
* Find a joined SolverNet entry by its operator-facing display name. The
|
|
67
|
+
* lookup also matches against the manifest CID so callers that resolve a
|
|
68
|
+
* net by either identifier (legacy short-name or post-join CID) keep
|
|
69
|
+
* working. Returns the matched entry, or `undefined` if no match.
|
|
70
|
+
*/
|
|
71
|
+
export declare function findJoinedByName(joinedSolverNets: Record<string, JoinedSolverNetConfig> | undefined, needle: string): JoinedSolverNetConfig | undefined;
|
|
53
72
|
export declare class SolverNetRegistry {
|
|
54
73
|
private readonly nets;
|
|
55
74
|
register(net: LoadedSolverNet): void;
|
|
@@ -60,6 +79,5 @@ export declare class SolverNetRegistry {
|
|
|
60
79
|
claudeModelSelections(): Record<string, string>;
|
|
61
80
|
}
|
|
62
81
|
export declare function loadSolverNets(config: {
|
|
63
|
-
solverNets: Record<string, SolverNetConfig>;
|
|
64
82
|
joinedSolverNets?: Record<string, JoinedSolverNetConfig>;
|
|
65
83
|
}): Promise<SolverNetRegistry>;
|
|
@@ -30,6 +30,41 @@ export function rolesFromJoinedConfig(net) {
|
|
|
30
30
|
}
|
|
31
31
|
return Array.from(new Set(roles));
|
|
32
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Format a joined-entry contract back into the `<id>.<version>` solverType
|
|
35
|
+
* string the runtime uses for dispatch. Returns `undefined` when the joined
|
|
36
|
+
* entry has no contract (mid-migration synthesized entries can land here).
|
|
37
|
+
*/
|
|
38
|
+
export function solverTypeFromJoinedContract(net) {
|
|
39
|
+
if (!net.contract)
|
|
40
|
+
return undefined;
|
|
41
|
+
return `${net.contract.id}.${net.contract.version}`;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Operator-facing display name for a joined SolverNet — the registry
|
|
45
|
+
* `name` field if present, otherwise the manifest CID. Mirrors the same
|
|
46
|
+
* resolution the registry uses when registering entries.
|
|
47
|
+
*/
|
|
48
|
+
export function joinedDisplayName(cid, net) {
|
|
49
|
+
return net.name ?? cid;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Find a joined SolverNet entry by its operator-facing display name. The
|
|
53
|
+
* lookup also matches against the manifest CID so callers that resolve a
|
|
54
|
+
* net by either identifier (legacy short-name or post-join CID) keep
|
|
55
|
+
* working. Returns the matched entry, or `undefined` if no match.
|
|
56
|
+
*/
|
|
57
|
+
export function findJoinedByName(joinedSolverNets, needle) {
|
|
58
|
+
if (!joinedSolverNets)
|
|
59
|
+
return undefined;
|
|
60
|
+
for (const [cid, entry] of Object.entries(joinedSolverNets)) {
|
|
61
|
+
if (joinedDisplayName(cid, entry) === needle)
|
|
62
|
+
return entry;
|
|
63
|
+
if (entry.manifestCid === needle)
|
|
64
|
+
return entry;
|
|
65
|
+
}
|
|
66
|
+
return undefined;
|
|
67
|
+
}
|
|
33
68
|
function defaultRuntimePluginsForSolverType(solverType) {
|
|
34
69
|
if (solverType === 'swe-rebench-v2.v1') {
|
|
35
70
|
return ['bundled:swe-rebench-v2-runtime'];
|
|
@@ -120,30 +155,11 @@ export class SolverNetRegistry {
|
|
|
120
155
|
return out;
|
|
121
156
|
}
|
|
122
157
|
}
|
|
123
|
-
/**
|
|
124
|
-
* Parse the legacy operator-config `solverType` string (`'<id>.<version>'`)
|
|
125
|
-
* into a `{ id, version }` ref so we can call the contract registry's
|
|
126
|
-
* non-deprecated lookup signature. The operator config field itself is
|
|
127
|
-
* carried forward for now (Task 8 of
|
|
128
|
-
* `spec/2026-05-05-solvernet-creation-and-launch.md` — internal dispatch
|
|
129
|
-
* keeps `solverType` as a routing alias; Task 30 removes it).
|
|
130
|
-
*/
|
|
131
|
-
function parseSolverTypeRef(solverType) {
|
|
132
|
-
const dot = solverType.lastIndexOf('.');
|
|
133
|
-
if (dot <= 0 || dot === solverType.length - 1)
|
|
134
|
-
return undefined;
|
|
135
|
-
return { id: solverType.slice(0, dot), version: solverType.slice(dot + 1) };
|
|
136
|
-
}
|
|
137
158
|
export async function loadSolverNets(config) {
|
|
138
159
|
const registry = new SolverNetRegistry();
|
|
139
|
-
async function registerFromConfig(name, net) {
|
|
160
|
+
async function registerFromConfig(name, net, contract) {
|
|
140
161
|
if (!net.enabled)
|
|
141
162
|
return;
|
|
142
|
-
const ref = parseSolverTypeRef(net.solverType);
|
|
143
|
-
const contract = ref ? getSolverNetContract(ref) : undefined;
|
|
144
|
-
if (!contract) {
|
|
145
|
-
throw new Error(`SolverNet ${name} has no registered SolverNetContract for ${net.solverType}`);
|
|
146
|
-
}
|
|
147
163
|
const runtimePlugins = [];
|
|
148
164
|
const seenSources = new Set();
|
|
149
165
|
const seenNames = new Set();
|
|
@@ -208,10 +224,7 @@ export async function loadSolverNets(config) {
|
|
|
208
224
|
...(joined.model ? { model: joined.model } : {}),
|
|
209
225
|
plugins: [...defaultPlugins, ...(joined.plugins ?? [])],
|
|
210
226
|
taskGenerator: { enabled: false },
|
|
211
|
-
});
|
|
212
|
-
}
|
|
213
|
-
for (const [name, net] of Object.entries(config.solverNets)) {
|
|
214
|
-
await registerFromConfig(name, net);
|
|
227
|
+
}, contract);
|
|
215
228
|
}
|
|
216
229
|
return registry;
|
|
217
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/solver-nets/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAA0B,MAAM,gBAAgB,CAAC;AAE9E,MAAM,CAAC,MAAM,yBAAyB,GAAG,uBAAgC,CAAC;AA6C1E,MAAM,UAAU,uBAAuB,CAAC,IAA2B;IACjE,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,aAAa,CAAC;IAC7C,IAAI,IAAI,KAAK,YAAY;QAAE,OAAO,YAAY,CAAC;IAC/C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CAAC,GAAoB;IAC3C,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7E,OAAO,CAAC,SAAS,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAA0B;IAC9D,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,IAAI,KAAK,QAAQ;YAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,IAAI,KAAK,WAAW;YAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,kCAAkC,CAAC,UAAkB;IAC5D,IAAI,UAAU,KAAK,mBAAmB,EAAE,CAAC;QACvC,OAAO,CAAC,gCAAgC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAyB,EAAE,QAAkB;IAC1E,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC;QAC1C,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACtF,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,+BAA+B,CAAC,QAA2B;IAClE,MAAM,cAAc,GAAG,QAAQ,CAAC,kBAAkB,CAAC,cAAc,CAAC;IAClE,IAAI,cAAc,CAAC,QAAQ,CAAC,0BAA0B,CAAC;QAAE,OAAO,0BAA0B,CAAC;IAC3F,IAAI,cAAc,CAAC,QAAQ,CAAC,yBAAyB,CAAC;QAAE,OAAO,yBAAyB,CAAC;IACzF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,iBAAiB,CACxB,MAAuD,EACvD,UAAuC;IAEvC,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,UAAU;KACX,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,MAAuD;IAC9E,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,OAAO,iBAAiB;IACX,IAAI,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE3D,QAAQ,CAAC,GAAoB;QAC3B,IAAI,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC;QACnB,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,GAAG,GAAG,GAAG,GAAG,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,aAAa,CAAC,UAAkB,EAAE,QAA4B;QAC5D,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG,CAAC,OAAO;YACX,GAAG,CAAC,UAAU,KAAK,UAAU;YAC7B,CAAC,QAAQ,KAAK,SAAS;gBACrB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;oBACnB,MAAM,EAAE,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;oBACtC,OAAO,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,QAAQ,CAAC;gBAC7C,CAAC,CAAC,CAAC,CACN,CAAC;IACJ,CAAC;IAED,IAAI;QACF,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,iBAAiB;QACf,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,SAAS;gBAAE,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;QAC1F,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,qBAAqB;QACnB,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACrC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,SAAS;gBAAE,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC;QACrG,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/solver-nets/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* Spec: docs/superpowers/specs/2026-05-06-agent-harness-solvernet-design.md §3.6
|
|
7
7
|
* DR: log/decisions/2026-05-06-task-generator-success-cap.md
|
|
8
8
|
*/
|
|
9
|
+
import { type FetchHfWithRetryOptions } from '../harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js';
|
|
9
10
|
export interface PoolTask {
|
|
10
11
|
instance_id: string;
|
|
11
12
|
hf_dataset: string;
|
|
@@ -43,9 +44,15 @@ export interface BuildPoolArgs {
|
|
|
43
44
|
* partitions are kept only from the earliest partition (first-seen wins).
|
|
44
45
|
*/
|
|
45
46
|
export declare function buildHistoricalPool(args: BuildPoolArgs): Promise<PoolTask[]>;
|
|
46
|
-
/**
|
|
47
|
+
/**
|
|
48
|
+
* HTTP fetcher for HF datasets-server rows API. Use as `fetchSplit` in
|
|
49
|
+
* production. Routes through {@link fetchHfWithRetry} so 408/429/5xx are
|
|
50
|
+
* retried with jittered backoff and the process-wide HF min-interval is
|
|
51
|
+
* honoured (issue #578). Throws on non-2xx after retry exhaustion —
|
|
52
|
+
* previously returned `[]` silently, which is what hid the 290 lost tasks.
|
|
53
|
+
*/
|
|
47
54
|
export declare function fetchHfSplit(args: {
|
|
48
55
|
dataset: string;
|
|
49
56
|
split: string;
|
|
50
57
|
limit?: number;
|
|
51
|
-
}): Promise<any[]>;
|
|
58
|
+
}, opts?: FetchHfWithRetryOptions): Promise<any[]>;
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* Spec: docs/superpowers/specs/2026-05-06-agent-harness-solvernet-design.md §3.6
|
|
7
7
|
* DR: log/decisions/2026-05-06-task-generator-success-cap.md
|
|
8
8
|
*/
|
|
9
|
-
import {
|
|
9
|
+
import { fetchHfWithRetry, } from '../harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js';
|
|
10
10
|
/** Filter dataset split names to only the YYYY_MM monthly partitions. */
|
|
11
11
|
export function listMonthlyPartitions(splits) {
|
|
12
12
|
return splits
|
|
@@ -43,30 +43,25 @@ export async function buildHistoricalPool(args) {
|
|
|
43
43
|
}
|
|
44
44
|
return pool;
|
|
45
45
|
}
|
|
46
|
-
/**
|
|
47
|
-
|
|
46
|
+
/**
|
|
47
|
+
* HTTP fetcher for HF datasets-server rows API. Use as `fetchSplit` in
|
|
48
|
+
* production. Routes through {@link fetchHfWithRetry} so 408/429/5xx are
|
|
49
|
+
* retried with jittered backoff and the process-wide HF min-interval is
|
|
50
|
+
* honoured (issue #578). Throws on non-2xx after retry exhaustion —
|
|
51
|
+
* previously returned `[]` silently, which is what hid the 290 lost tasks.
|
|
52
|
+
*/
|
|
53
|
+
export async function fetchHfSplit(args, opts = {}) {
|
|
48
54
|
const url = new URL('https://datasets-server.huggingface.co/rows');
|
|
49
55
|
url.searchParams.set('dataset', args.dataset);
|
|
50
56
|
url.searchParams.set('config', 'default');
|
|
51
57
|
url.searchParams.set('split', args.split);
|
|
52
58
|
url.searchParams.set('offset', '0');
|
|
53
59
|
url.searchParams.set('length', String(args.limit ?? 100));
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
const parsed = JSON.parse(body);
|
|
61
|
-
resolve((parsed.rows ?? []).map((r) => r.row));
|
|
62
|
-
}
|
|
63
|
-
catch (e) {
|
|
64
|
-
reject(e);
|
|
65
|
-
}
|
|
66
|
-
});
|
|
67
|
-
});
|
|
68
|
-
req.on('error', reject);
|
|
69
|
-
req.end();
|
|
70
|
-
});
|
|
60
|
+
const res = await fetchHfWithRetry(url.toString(), opts);
|
|
61
|
+
if (!res.ok) {
|
|
62
|
+
throw Object.assign(new Error(`HF datasets-server returned ${res.status} for ${args.dataset}/${args.split}`), { httpStatus: res.status });
|
|
63
|
+
}
|
|
64
|
+
const json = (await res.json());
|
|
65
|
+
return (json.rows ?? []).map((r) => r.row);
|
|
71
66
|
}
|
|
72
67
|
//# sourceMappingURL=_swe-rebench-v2-pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_swe-rebench-v2-pool.js","sourceRoot":"","sources":["../../src/solver-types/_swe-rebench-v2-pool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"_swe-rebench-v2-pool.js","sourceRoot":"","sources":["../../src/solver-types/_swe-rebench-v2-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,16 @@ export declare const VETTED_POOL_REF_ELIGIBILITY_KEY: "vettedPoolRef";
|
|
|
42
42
|
declare const PUBLICATION_SCHEMA_VERSION: "swe-rebench-v2-vetted-pool-publication.v1";
|
|
43
43
|
export interface ValidatedPoolEntry {
|
|
44
44
|
scorable: boolean;
|
|
45
|
-
/**
|
|
45
|
+
/**
|
|
46
|
+
* Why scorable/unscorable — `'gold-patch-resolves'`, `'ungradeable:<reason>'`,
|
|
47
|
+
* `'transient:HF-429:<msg>'`, `'error:HF-429-permanent-after-5-passes'`, etc.
|
|
48
|
+
*
|
|
49
|
+
* Reason prefixes:
|
|
50
|
+
* - `transient:` — non-terminal; the next `validatePoolInstances` pass
|
|
51
|
+
* re-processes the entry until `transientRetryCount` hits {@link MAX_TRANSIENT_PASSES}.
|
|
52
|
+
* - everything else (including `error:`, `ungradeable:`, etc.) — terminal
|
|
53
|
+
* under the skip-check; only re-processed when `opts.force` is set.
|
|
54
|
+
*/
|
|
46
55
|
reason: string;
|
|
47
56
|
checkedAt: string;
|
|
48
57
|
/** Canonical-JSON SHA-256 over the HF row fields used for grading. v3+. */
|
|
@@ -53,7 +62,26 @@ export interface ValidatedPoolEntry {
|
|
|
53
62
|
imageDigest?: string;
|
|
54
63
|
/** `git rev-parse HEAD` of the enabled upstream SWE-rebench repo at validation time. v3+. */
|
|
55
64
|
upstreamEvalCommit?: string;
|
|
65
|
+
/**
|
|
66
|
+
* Number of consecutive `validatePoolInstances` passes that have recorded a
|
|
67
|
+
* `transient:` reason for this instance under this `evalSemanticsVersion`.
|
|
68
|
+
* Bumped on each pass; flips the reason to `error:HF-429-permanent-after-5-passes`
|
|
69
|
+
* once it hits {@link MAX_TRANSIENT_PASSES} (issue #578). Undefined for
|
|
70
|
+
* non-transient entries (treated as `0` on read).
|
|
71
|
+
*/
|
|
72
|
+
transientRetryCount?: number;
|
|
73
|
+
/** ISO timestamp of the most recent transient pass. Undefined for non-transient entries. */
|
|
74
|
+
lastTransientAt?: string;
|
|
56
75
|
}
|
|
76
|
+
/**
|
|
77
|
+
* Cap on consecutive transient passes before an instance flips to the
|
|
78
|
+
* terminal `error:HF-429-permanent-after-5-passes` reason. Issue #578: the
|
|
79
|
+
* AC says "the failure is still recorded for visibility, but the validation
|
|
80
|
+
* pipeline distinguishes transient from permanent so the next run reprocesses
|
|
81
|
+
* these instances"; this is the convergence boundary that keeps a
|
|
82
|
+
* permanently-broken split from churning forever.
|
|
83
|
+
*/
|
|
84
|
+
export declare const MAX_TRANSIENT_PASSES = 5;
|
|
57
85
|
export interface SweRebenchV2VettedPoolArtifactEntry extends ValidatedPoolEntry {
|
|
58
86
|
instance_id: string;
|
|
59
87
|
scorable: true;
|