@overkill-dev/run 0.0.93 → 0.0.95
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/baselines/calibration-reference.js +1 -1
- package/baselines/calibration-reference.js.map +1 -1
- package/baselines/performance-presentation.js +1 -1
- package/baselines/performance-presentation.js.map +1 -1
- package/baselines/performance-schema.js +1 -1
- package/baselines/performance-schema.js.map +1 -1
- package/bench/calibration-evidence.js +1 -1
- package/bench/calibration-evidence.js.map +1 -1
- package/config/config.d.ts.map +1 -1
- package/config/config.js +1 -0
- package/config/config.js.map +1 -1
- package/config/history-policy.d.ts +1 -0
- package/config/history-policy.d.ts.map +1 -1
- package/config/history-policy.js +2 -0
- package/config/history-policy.js.map +1 -1
- package/config/property-corpus.js +21 -0
- package/config/property-corpus.js.map +1 -0
- package/config/schema.d.ts +17 -0
- package/config/schema.d.ts.map +1 -1
- package/config/schema.js +2 -0
- package/config/schema.js.map +1 -1
- package/config/snapshot.js +1 -0
- package/config/snapshot.js.map +1 -1
- package/config/types.d.ts +9 -0
- package/config/types.d.ts.map +1 -1
- package/config/validation.js +1 -0
- package/config/validation.js.map +1 -1
- package/package.json +16 -4
- package/packages/run/command-line.entry-point.d.ts.map +1 -1
- package/packages/run/command-line.entry-point.js +4 -2
- package/packages/run/command-line.entry-point.js.map +1 -1
- package/packages/run/property-codec.entry-point.d.ts +3 -0
- package/packages/run/property-codec.entry-point.d.ts.map +1 -0
- package/packages/run/property-codec.entry-point.js +3 -0
- package/packages/run/property-codec.entry-point.js.map +1 -0
- package/packages/run/run.entry-point.d.ts +5 -1
- package/packages/run/run.entry-point.d.ts.map +1 -1
- package/packages/run/run.entry-point.js +3 -1
- package/packages/run/run.entry-point.js.map +1 -1
- package/property/property-codec.d.ts +22 -0
- package/property/property-codec.d.ts.map +1 -0
- package/property/property-codec.js +39 -0
- package/property/property-codec.js.map +1 -0
- package/property/property-graph-v1.js +303 -0
- package/property/property-graph-v1.js.map +1 -0
- package/property/property-graph.d.ts +10 -0
- package/property/property-graph.d.ts.map +1 -0
- package/property/property-graph.js +94 -0
- package/property/property-graph.js.map +1 -0
- package/readme.md +78 -3
- package/run/assertion-result-schema.js +1 -1
- package/run/assertion-result-schema.js.map +1 -1
- package/run/attachment-record.js +8 -11
- package/run/attachment-record.js.map +1 -1
- package/run/attachment-run.js +6 -2
- package/run/attachment-run.js.map +1 -1
- package/run/benchmark-result-schema.js +1 -1
- package/run/benchmark-result-schema.js.map +1 -1
- package/run/child-process.entry-point.js +4 -1
- package/run/child-process.entry-point.js.map +1 -1
- package/run/collected-run-invocation.js +1 -1
- package/run/collected-run-invocation.js.map +1 -1
- package/run/collected-run-plan-schema.js +1 -1
- package/run/collected-run-plan-schema.js.map +1 -1
- package/run/collected-run-plan.js +5 -0
- package/run/collected-run-plan.js.map +1 -1
- package/run/collected-run.js +3 -2
- package/run/collected-run.js.map +1 -1
- package/run/command-line-command-namespace.d.ts +9 -1
- package/run/command-line-command-namespace.d.ts.map +1 -1
- package/run/command-line-command-namespace.js +24 -0
- package/run/command-line-command-namespace.js.map +1 -1
- package/run/command-line-command.d.ts +1 -0
- package/run/command-line-command.d.ts.map +1 -1
- package/run/command-line-command.js.map +1 -1
- package/run/command-line-execution.js +10 -2
- package/run/command-line-execution.js.map +1 -1
- package/run/command-line-runner.d.ts +2 -1
- package/run/command-line-runner.d.ts.map +1 -1
- package/run/command-line-runner.js +2 -1
- package/run/command-line-runner.js.map +1 -1
- package/run/compact-history-schema.js +1 -1
- package/run/compact-history-schema.js.map +1 -1
- package/run/corpus-codec.entry-point.js +72 -0
- package/run/corpus-codec.entry-point.js.map +1 -0
- package/run/corpus-codec.js +56 -0
- package/run/corpus-codec.js.map +1 -0
- package/run/corpus-commands.d.ts +10 -0
- package/run/corpus-commands.d.ts.map +1 -0
- package/run/corpus-commands.js +63 -0
- package/run/corpus-commands.js.map +1 -0
- package/run/corpus-source.js +56 -0
- package/run/corpus-source.js.map +1 -0
- package/run/corpus-types.d.ts +54 -0
- package/run/corpus-types.d.ts.map +1 -0
- package/run/corpus-types.js +12 -0
- package/run/corpus-types.js.map +1 -0
- package/run/corpus.d.ts +5 -0
- package/run/corpus.d.ts.map +1 -0
- package/run/corpus.js +82 -0
- package/run/corpus.js.map +1 -0
- package/run/execution-session-collected.js +1 -1
- package/run/execution-session-collected.js.map +1 -1
- package/run/execution-session-schema.js +3 -0
- package/run/execution-session-schema.js.map +1 -1
- package/run/execution-session-supervised.js +1 -1
- package/run/execution-session-supervised.js.map +1 -1
- package/run/freeze-run-policy.js +9 -6
- package/run/freeze-run-policy.js.map +1 -1
- package/run/frozen-policy-validation.js +6 -3
- package/run/frozen-policy-validation.js.map +1 -1
- package/run/frozen-run-policy-schema.js +1 -0
- package/run/frozen-run-policy-schema.js.map +1 -1
- package/run/frozen-run-policy.d.ts.map +1 -1
- package/run/frozen-run-policy.js +3 -0
- package/run/frozen-run-policy.js.map +1 -1
- package/run/history-lock-acquisition.js +59 -0
- package/run/history-lock-acquisition.js.map +1 -0
- package/run/history-maintenance-budget.js +35 -0
- package/run/history-maintenance-budget.js.map +1 -0
- package/run/history-maintenance.js +21 -0
- package/run/history-maintenance.js.map +1 -0
- package/run/history-pruning.js +10 -3
- package/run/history-pruning.js.map +1 -1
- package/run/history-reader.js +21 -1
- package/run/history-reader.js.map +1 -1
- package/run/history-record.js +1 -1
- package/run/history-record.js.map +1 -1
- package/run/history-repair.js.map +1 -1
- package/run/history-retention-metadata.js +54 -0
- package/run/history-retention-metadata.js.map +1 -0
- package/run/history-retention-records.js +9 -54
- package/run/history-retention-records.js.map +1 -1
- package/run/history-state-access.js +22 -9
- package/run/history-state-access.js.map +1 -1
- package/run/history-storage-types.d.ts +2 -0
- package/run/history-storage-types.d.ts.map +1 -1
- package/run/history-types.d.ts +5 -1
- package/run/history-types.d.ts.map +1 -1
- package/run/history.d.ts.map +1 -1
- package/run/history.js +5 -12
- package/run/history.js.map +1 -1
- package/run/last-failed-selection.js +6 -0
- package/run/last-failed-selection.js.map +1 -0
- package/run/node-history-storage.js +16 -27
- package/run/node-history-storage.js.map +1 -1
- package/run/node-run-execution.js +4 -0
- package/run/node-run-execution.js.map +1 -1
- package/run/property-corpus-cache.js +89 -0
- package/run/property-corpus-cache.js.map +1 -0
- package/run/property-corpus-execution.js +69 -0
- package/run/property-corpus-execution.js.map +1 -0
- package/run/property-corpus-storage.js +86 -0
- package/run/property-corpus-storage.js.map +1 -0
- package/run/property-evidence-schema.js +3 -5
- package/run/property-evidence-schema.js.map +1 -1
- package/run/recorded-run.js +1 -1
- package/run/recorded-run.js.map +1 -1
- package/run/replay-command.js +5 -0
- package/run/replay-command.js.map +1 -0
- package/run/reporter-event-schema.js +1 -1
- package/run/reporter-event-schema.js.map +1 -1
- package/run/request-snapshot.js +1 -0
- package/run/request-snapshot.js.map +1 -1
- package/run/run-artifact-id-schema.js +1 -1
- package/run/run-artifact-id-schema.js.map +1 -1
- package/run/run-artifact-schema.js +1 -1
- package/run/run-artifact-schema.js.map +1 -1
- package/run/run-command-schema.js +8 -0
- package/run/run-command-schema.js.map +1 -1
- package/run/run-empty-shard.js +2 -2
- package/run/run-empty-shard.js.map +1 -1
- package/run/run-engine-primitives.d.ts.map +1 -1
- package/run/run-execution.js +10 -3
- package/run/run-execution.js.map +1 -1
- package/run/run-if-main.d.ts.map +1 -1
- package/run/run-if-main.js +4 -0
- package/run/run-if-main.js.map +1 -1
- package/run/run-in-process-execution.js.map +1 -1
- package/run/run-input-resolution.js +10 -1
- package/run/run-input-resolution.js.map +1 -1
- package/run/run-isolated-process.js +2 -2
- package/run/run-isolated-process.js.map +1 -1
- package/run/run-local-command.js +2 -1
- package/run/run-local-command.js.map +1 -1
- package/run/run-local-coverage.js +2 -1
- package/run/run-local-coverage.js.map +1 -1
- package/run/run-local-execution.js +3 -0
- package/run/run-local-execution.js.map +1 -1
- package/run/run-local-resolution.js +4 -0
- package/run/run-local-resolution.js.map +1 -1
- package/run/run-operations.d.ts.map +1 -1
- package/run/run-orchestrator-dependencies.d.ts +2 -1
- package/run/run-orchestrator-dependencies.d.ts.map +1 -1
- package/run/run-profile-facts.js +1 -0
- package/run/run-profile-facts.js.map +1 -1
- package/run/run-record-input.js +8 -0
- package/run/run-record-input.js.map +1 -1
- package/run/run-record.js +17 -8
- package/run/run-record.js.map +1 -1
- package/run/run-request-types.d.ts +6 -0
- package/run/run-request-types.d.ts.map +1 -1
- package/run/run-result-schema.d.ts +2 -0
- package/run/run-result-schema.d.ts.map +1 -1
- package/run/run-result-schema.js +9 -1
- package/run/run-result-schema.js.map +1 -1
- package/run/run-selection-filters.js +4 -4
- package/run/run-selection-filters.js.map +1 -1
- package/run/run-selection-schema.d.ts.map +1 -1
- package/run/run-selection-schema.js +2 -1
- package/run/run-selection-schema.js.map +1 -1
- package/run/run-selection.js +3 -2
- package/run/run-selection.js.map +1 -1
- package/run/run-state-finalization.js +22 -0
- package/run/run-state-finalization.js.map +1 -0
- package/run/run-supervised-finalization.js +1 -1
- package/run/run-supervised-finalization.js.map +1 -1
- package/run/run-supervised-process.js +1 -1
- package/run/run-supervised-process.js.map +1 -1
- package/run/run-support.js +1 -20
- package/run/run-support.js.map +1 -1
- package/run/run-types.d.ts +11 -8
- package/run/run-types.d.ts.map +1 -1
- package/run/run-types.js.map +1 -1
- package/run/run-validation.js +8 -2
- package/run/run-validation.js.map +1 -1
- package/run/runner-result.js +10 -0
- package/run/runner-result.js.map +1 -0
- package/run/simulation-witness.js +2 -0
- package/run/simulation-witness.js.map +1 -1
- package/run/supervised-child-transport.js +19 -0
- package/run/supervised-child-transport.js.map +1 -1
- package/run/supervised-child.js +6 -2
- package/run/supervised-child.js.map +1 -1
- package/run/supervised-protocol-schema.js +3 -2
- package/run/supervised-protocol-schema.js.map +1 -1
- package/run/supervised-protocol.js +3 -0
- package/run/supervised-protocol.js.map +1 -1
- package/run/supervised-run-runtime.js +12 -4
- package/run/supervised-run-runtime.js.map +1 -1
- package/run/supervised-run.js +3 -18
- package/run/supervised-run.js.map +1 -1
- package/run/worker-pool-host-protocol-schema.js +1 -1
- package/run/worker-pool-host-protocol-schema.js.map +1 -1
- package/run/worker-pool-task-schema.js +1 -1
- package/run/worker-pool-task-schema.js.map +1 -1
- package/software-bill-of-materials.cyclonedx.json +26 -9
- package/engine/identity-schema.js +0 -38
- package/engine/identity-schema.js.map +0 -1
- package/run/history-repair.d.ts +0 -7
- package/run/history-repair.d.ts.map +0 -1
|
@@ -1,60 +1,12 @@
|
|
|
1
1
|
import { lstat } from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import {
|
|
4
|
-
import { historyStateError } from "./history-state-error.js";
|
|
5
|
-
import { historyRecordSchema } from "./history-record.js";
|
|
6
|
-
import { historyRunStatus } from "./history-outcomes.js";
|
|
3
|
+
import { checkHistoryMaintenanceBudget } from "./history-maintenance-budget.js";
|
|
7
4
|
import { historyDirectoryNames, compareHistoryRuns, assertHistoryRunId } from "./history-state-access.js";
|
|
5
|
+
import { manifestSchema, recordMetadata, artifactMetadata } from "./history-retention-metadata.js";
|
|
8
6
|
const millisecondsPerDay = 86_400_000;
|
|
9
|
-
const manifestSchema = z.object({
|
|
10
|
-
version: z.literal(1),
|
|
11
|
-
id: z.string(),
|
|
12
|
-
startedAt: z.iso.datetime({ offset: true }),
|
|
13
|
-
status: z.enum(['passed', 'failed', 'runner-error', 'interrupted', 'inconclusive'])
|
|
14
|
-
});
|
|
15
|
-
async function artifactMetadata(store, target, fallback, name) {
|
|
16
|
-
const source = await store.read(path.join(target, 'retention.json'));
|
|
17
|
-
const value = source === null ? fallback : JSON.parse(source);
|
|
18
|
-
if (value === undefined) {
|
|
19
|
-
throw new Error(`Missing artifact retention metadata: ${target}`);
|
|
20
|
-
}
|
|
21
|
-
const parsed = manifestSchema.parse(value);
|
|
22
|
-
if (parsed.id !== name) {
|
|
23
|
-
throw new Error(`Artifact identity does not match path: ${target}`);
|
|
24
|
-
}
|
|
25
|
-
return parsed;
|
|
26
|
-
}
|
|
27
|
-
function assertRecordCommitted(record, input) {
|
|
28
|
-
if (record.status !== 'completed') {
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
const cutoff = Date.parse(input.now) - input.policy.staleIdentityRetentionDays * millisecondsPerDay;
|
|
32
|
-
if (Date.parse(record.startedAt) < cutoff) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
const receipt = input.index.receipts.find(function (value) {
|
|
36
|
-
return value.id === record.id;
|
|
37
|
-
});
|
|
38
|
-
if (receipt?.state !== 'completed') {
|
|
39
|
-
throw historyStateError(`Run ${record.id} has an incomplete history commit.`);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
async function recordMetadata(input, recordPath) {
|
|
43
|
-
const { store } = input;
|
|
44
|
-
const record = historyRecordSchema.parse(JSON.parse(await store.read(recordPath) ?? 'null'));
|
|
45
|
-
if (path.basename(recordPath) !== `${record.id}.json`) {
|
|
46
|
-
throw new Error(`Record identity does not match path: ${recordPath}`);
|
|
47
|
-
}
|
|
48
|
-
assertRecordCommitted(record, input);
|
|
49
|
-
return manifestSchema.parse({
|
|
50
|
-
version: 1,
|
|
51
|
-
id: record.id,
|
|
52
|
-
startedAt: record.startedAt,
|
|
53
|
-
status: historyRunStatus(record)
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
7
|
async function readRecords(input, records, retain) {
|
|
57
8
|
for (const recordPath of records) {
|
|
9
|
+
checkHistoryMaintenanceBudget();
|
|
58
10
|
const record = await recordMetadata(input, recordPath);
|
|
59
11
|
retain(record.id, record);
|
|
60
12
|
}
|
|
@@ -73,9 +25,11 @@ async function artifactDirectory(input, metadata, retain, name) {
|
|
|
73
25
|
}
|
|
74
26
|
async function readArtifacts(input, metadata, retain) {
|
|
75
27
|
const names = await historyDirectoryNames(input.runs);
|
|
76
|
-
const directories =
|
|
77
|
-
|
|
78
|
-
|
|
28
|
+
const directories = [];
|
|
29
|
+
for (const name of names) {
|
|
30
|
+
checkHistoryMaintenanceBudget();
|
|
31
|
+
directories.push(await artifactDirectory(input, metadata, retain, name));
|
|
32
|
+
}
|
|
79
33
|
return directories.filter(function existingDirectory(directory) {
|
|
80
34
|
return directory !== null;
|
|
81
35
|
});
|
|
@@ -94,6 +48,7 @@ export async function readRetentionCatalog(input) {
|
|
|
94
48
|
return { metadata, records, artifactDirectories };
|
|
95
49
|
}
|
|
96
50
|
export function selectHistoryRemovals(catalog, runs, policy, now) {
|
|
51
|
+
checkHistoryMaintenanceBudget();
|
|
97
52
|
const { metadata, records, artifactDirectories } = catalog;
|
|
98
53
|
const ordered = Array.from(metadata.values()).toSorted(compareHistoryRuns);
|
|
99
54
|
const retainedRecords = new Set(ordered
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-retention-records.js","sourceRoot":"","sources":["../../../../source/run/history-retention-records.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"history-retention-records.js","sourceRoot":"","sources":["../../../../source/run/history-retention-records.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ import path from 'node:path';
|
|
|
3
3
|
import { hostname } from 'node:os';
|
|
4
4
|
import lockfile from 'proper-lockfile';
|
|
5
5
|
import { z } from 'zod';
|
|
6
|
+
import { checkHistoryMaintenanceBudget, historyMaintenanceDiagnostics, historyMaintenanceDeadline, HistoryMaintenanceDeferredError } from "./history-maintenance-budget.js";
|
|
6
7
|
import { RunCollectionError } from "./run-errors.js";
|
|
7
|
-
import { createNodeHistoryStorage } from "./node-history-storage.js";
|
|
8
8
|
function ownerAlive(pid) {
|
|
9
9
|
try {
|
|
10
10
|
process.kill(pid, 0);
|
|
@@ -17,6 +17,12 @@ function ownerAlive(pid) {
|
|
|
17
17
|
throw error;
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
+
function rejectActiveOwner(message) {
|
|
21
|
+
if (Number.isFinite(historyMaintenanceDeadline())) {
|
|
22
|
+
throw new HistoryMaintenanceDeferredError();
|
|
23
|
+
}
|
|
24
|
+
throw new Error(message);
|
|
25
|
+
}
|
|
20
26
|
async function assertOwnerInactive(store, ownerPath, options) {
|
|
21
27
|
const owner = z
|
|
22
28
|
.object({ pid: z.number().int().positive(), host: z.string() })
|
|
@@ -27,15 +33,16 @@ async function assertOwnerInactive(store, ownerPath, options) {
|
|
|
27
33
|
stale: options.config.history.staleLockMilliseconds
|
|
28
34
|
});
|
|
29
35
|
if (live) {
|
|
30
|
-
|
|
36
|
+
rejectActiveOwner('History is owned by a run on another host.');
|
|
31
37
|
}
|
|
32
38
|
return;
|
|
33
39
|
}
|
|
34
40
|
if (ownerAlive(owner.pid)) {
|
|
35
|
-
|
|
41
|
+
rejectActiveOwner('Persisted runs are active. Finish them before history maintenance.');
|
|
36
42
|
}
|
|
37
43
|
}
|
|
38
44
|
async function existingStatus(target) {
|
|
45
|
+
checkHistoryMaintenanceBudget();
|
|
39
46
|
try {
|
|
40
47
|
return await lstat(target);
|
|
41
48
|
}
|
|
@@ -60,6 +67,7 @@ async function assertNotLinked(target) {
|
|
|
60
67
|
}
|
|
61
68
|
}
|
|
62
69
|
export async function historyDirectoryNames(directory) {
|
|
70
|
+
checkHistoryMaintenanceBudget();
|
|
63
71
|
try {
|
|
64
72
|
return await readdir(directory);
|
|
65
73
|
}
|
|
@@ -75,10 +83,10 @@ function containsProject(directory, projectRoot) {
|
|
|
75
83
|
return relative === '' ||
|
|
76
84
|
relative !== '..' && !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative);
|
|
77
85
|
}
|
|
78
|
-
export function createHistoryAccess(options) {
|
|
86
|
+
export function createHistoryAccess(options, createStorage) {
|
|
79
87
|
const directory = path.resolve(options.projectRoot, options.config.runtimeStateDir);
|
|
80
88
|
const policy = options.config.history;
|
|
81
|
-
const store =
|
|
89
|
+
const store = createStorage(directory, policy);
|
|
82
90
|
const runs = path.join(directory, 'runs');
|
|
83
91
|
const abandonedOwners = new Set();
|
|
84
92
|
async function guarded(operation) {
|
|
@@ -86,7 +94,7 @@ export function createHistoryAccess(options) {
|
|
|
86
94
|
return await store.withLock(operation);
|
|
87
95
|
}
|
|
88
96
|
catch (error) {
|
|
89
|
-
if (error instanceof RunCollectionError) {
|
|
97
|
+
if (error instanceof RunCollectionError || error instanceof HistoryMaintenanceDeferredError) {
|
|
90
98
|
throw error;
|
|
91
99
|
}
|
|
92
100
|
throw new RunCollectionError(`History operation failed: ${error instanceof Error ? error.message : String(error)}`, { cause: error }, 'runtime-state');
|
|
@@ -99,6 +107,7 @@ export function createHistoryAccess(options) {
|
|
|
99
107
|
return name.endsWith('.json');
|
|
100
108
|
});
|
|
101
109
|
for (const name of names) {
|
|
110
|
+
checkHistoryMaintenanceBudget();
|
|
102
111
|
await assertOwnerInactive(store, path.join(directory, 'active-runs', name), options);
|
|
103
112
|
abandonedOwners.add(name);
|
|
104
113
|
}
|
|
@@ -122,6 +131,7 @@ export function createHistoryAccess(options) {
|
|
|
122
131
|
assertIdle,
|
|
123
132
|
async removeAbandonedOwners() {
|
|
124
133
|
for (const name of abandonedOwners) {
|
|
134
|
+
checkHistoryMaintenanceBudget();
|
|
125
135
|
const ownerPath = path.join(directory, 'active-runs', name);
|
|
126
136
|
await rm(`${ownerPath}.lease`, { recursive: true, force: true });
|
|
127
137
|
await rm(ownerPath, { force: true });
|
|
@@ -129,9 +139,12 @@ export function createHistoryAccess(options) {
|
|
|
129
139
|
},
|
|
130
140
|
assertOwnedLocation,
|
|
131
141
|
diagnostics() {
|
|
132
|
-
return
|
|
133
|
-
|
|
134
|
-
|
|
142
|
+
return [
|
|
143
|
+
...historyMaintenanceDiagnostics(),
|
|
144
|
+
...Array.from(abandonedOwners, function (name) {
|
|
145
|
+
return `Abandoned run ownership: ${name}`;
|
|
146
|
+
})
|
|
147
|
+
];
|
|
135
148
|
}
|
|
136
149
|
};
|
|
137
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-state-access.js","sourceRoot":"","sources":["../../../../source/run/history-state-access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"history-state-access.js","sourceRoot":"","sources":["../../../../source/run/history-state-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { HistoryPolicy } from '../config/history-policy.ts';
|
|
2
|
+
import type { HistoryOptions } from './history-types.ts';
|
|
3
|
+
export type HistoryMaintenance = (options: HistoryOptions) => Promise<readonly string[]>;
|
|
2
4
|
export type HistoryStorage = {
|
|
3
5
|
readonly beginRun: (id: string) => Promise<() => Promise<void>>;
|
|
4
6
|
readonly list: (directory: string) => Promise<readonly string[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-storage-types.d.ts","sourceRoot":"","sources":["../../../../source/run/history-storage-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"history-storage-types.d.ts","sourceRoot":"","sources":["../../../../source/run/history-storage-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;AAEzF,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,QAAQ,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;IACjE,QAAQ,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5D,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;AACvE,MAAM,MAAM,qBAAqB,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,KAAK,cAAc,CAAC"}
|
package/run/history-types.d.ts
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import type { Except } from 'type-fest';
|
|
2
2
|
import type { NormalizedConfig } from '../config/types.ts';
|
|
3
|
-
import type { HistoryRepairResult } from './history-repair.ts';
|
|
4
3
|
import type { HistoryRunSummary as StoredSummary } from './compact-history-schema.ts';
|
|
5
4
|
export type HistoryOptions = {
|
|
6
5
|
readonly projectRoot: string;
|
|
7
6
|
readonly config: Pick<NormalizedConfig, 'history' | 'runtimeStateDir'>;
|
|
8
7
|
};
|
|
8
|
+
export type HistoryRepairResult = {
|
|
9
|
+
readonly rebuiltRunCount: number;
|
|
10
|
+
readonly diagnostics: readonly string[];
|
|
11
|
+
readonly dataLoss: boolean;
|
|
12
|
+
};
|
|
9
13
|
export type HistoryRunSummary = Except<StoredSummary, 'replayable'> & {
|
|
10
14
|
readonly replay: 'available' | 'available-interrupted' | 'pruned' | 'unavailable';
|
|
11
15
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-types.d.ts","sourceRoot":"","sources":["../../../../source/run/history-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"history-types.d.ts","sourceRoot":"","sources":["../../../../source/run/history-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,IAAI,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEtF,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,iBAAiB,CAAC,CAAC;CAC1E,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC9B,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG;IAClE,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,uBAAuB,GAAG,QAAQ,GAAG,aAAa,CAAC;CACrF,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACvC,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CAAE,CAAC;AACjH,MAAM,MAAM,mBAAmB,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAAE,CAAC;AAChE,MAAM,MAAM,mBAAmB,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;CAAE,CAAC;AAEhE,MAAM,MAAM,OAAO,GAAG;IAClB,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAAC;IAC3D,QAAQ,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9E,QAAQ,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACxD,CAAC"}
|
package/run/history.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../../source/run/history.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../../source/run/history.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACR,cAAc,EAOd,OAAO,EACV,MAAM,oBAAoB,CAAC;AAqB5B,wBAAgB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CA+E9D"}
|
package/run/history.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { rm } from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { z } from 'zod';
|
|
4
|
+
import { createNodeHistoryStorage } from "./node-history-storage.js";
|
|
4
5
|
import { createHistoryAccess, compareHistoryRuns, assertHistoryRunId, detailedRecordState } from "./history-state-access.js";
|
|
5
|
-
import {
|
|
6
|
-
import { historyStateError, historySchemaVersion } from "./history-state-error.js";
|
|
6
|
+
import { readRequiredCompactHistory } from "./history-reader.js";
|
|
7
7
|
import { repairHistory } from "./history-repair.js";
|
|
8
8
|
import { pruneHistory } from "./history-pruning.js";
|
|
9
9
|
function replayAvailability(availability, replayable, status) {
|
|
@@ -20,7 +20,7 @@ function currentTimestamp() {
|
|
|
20
20
|
return now.toISOString();
|
|
21
21
|
}
|
|
22
22
|
export function createHistory(options) {
|
|
23
|
-
const { directory, policy, store, runs, guarded, assertIdle, assertOwnedLocation, diagnostics, removeAbandonedOwners } = createHistoryAccess(options);
|
|
23
|
+
const { directory, policy, store, runs, guarded, assertIdle, assertOwnedLocation, diagnostics, removeAbandonedOwners } = createHistoryAccess(options, createNodeHistoryStorage);
|
|
24
24
|
async function repair(mode) {
|
|
25
25
|
const result = await repairHistory({
|
|
26
26
|
...store,
|
|
@@ -40,17 +40,10 @@ export function createHistory(options) {
|
|
|
40
40
|
}
|
|
41
41
|
return {
|
|
42
42
|
async list() {
|
|
43
|
-
const
|
|
44
|
-
return await
|
|
43
|
+
const index = await readRequiredCompactHistory(store, directory, async function repairAutomatically() {
|
|
44
|
+
return await repair('automatic');
|
|
45
45
|
});
|
|
46
|
-
if (source !== null && historySchemaVersion(source) === 0) {
|
|
47
|
-
await repair('automatic');
|
|
48
|
-
}
|
|
49
46
|
return await guarded(async function listHistory() {
|
|
50
|
-
const index = await readCompactHistory(store, directory);
|
|
51
|
-
if (index === null) {
|
|
52
|
-
throw historyStateError('Compact history is missing.');
|
|
53
|
-
}
|
|
54
47
|
return await Promise.all(index
|
|
55
48
|
.summaries
|
|
56
49
|
.toSorted(compareHistoryRuns)
|
package/run/history.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../source/run/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../source/run/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAYpD,SAAS,kBAAkB,CACvB,YAAiC,EACjC,UAAmB,EACnB,MAAmC;IAEnC,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,IAAI,YAAY,KAAK,aAAa,IAAI,CAAC,UAAU,EAAE,CAAC;QAChD,OAAO,aAAa,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,WAAW,CAAC;AAC5E,CAAC;AAED,SAAS,gBAAgB;IACrB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAuB;IACjD,MAAM,EACF,SAAS,EACT,MAAM,EACN,KAAK,EACL,IAAI,EACJ,OAAO,EACP,UAAU,EACV,mBAAmB,EACnB,WAAW,EACX,qBAAqB,EACxB,GAAG,mBAAmB,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;IAC3D,KAAK,UAAU,MAAM,CAAC,IAA8B;QAChD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;YAC/B,GAAG,KAAK;YACR,KAAK,CAAC,QAAQ,CAAC,SAAS;gBACpB,OAAO,MAAM,OAAO,CAAC,KAAK,UAAU,iBAAiB;oBACjD,MAAM,mBAAmB,EAAE,CAAC;oBAC5B,MAAM,UAAU,EAAE,CAAC;oBACnB,MAAM,eAAe,GAAG,MAAM,SAAS,EAAE,CAAC;oBAC1C,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;wBACtB,MAAM,qBAAqB,EAAE,CAAC;oBAClC,CAAC;oBACD,OAAO,eAAe,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACP,CAAC;SACJ,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,CAAE,GAAG,WAAW,EAAE,EAAE,GAAG,MAAM,CAAC,WAAW,CAAE,EAAE,CAAC;IACnF,CAAC;IACD,OAAO;QACH,KAAK,CAAC,IAAI;YACN,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,UAAU,mBAAmB;gBAC/F,OAAO,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,OAAO,CAAC,KAAK,UAAU,WAAW;gBAC3C,OAAO,MAAM,OAAO,CAAC,GAAG,CACpB,KAAK;qBACA,SAAS;qBACT,QAAQ,CAAC,kBAAkB,CAAC;qBAC5B,GAAG,CAAC,KAAK,UAAU,aAAa,CAAC,OAAO;oBACrC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;oBAC1C,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC/B,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;oBACtF,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;oBAC5E,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC;gBACjC,CAAC,CAAC,CACT,CAAC;YACN,CAAC,CAAC,CAAC;QACP,CAAC;QACD,KAAK,CAAC,OAAO;YACT,OAAO,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,OAA4B;YACpC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACzC,OAAO,MAAM,OAAO,CAAC,KAAK,UAAU,YAAY;gBAC5C,MAAM,mBAAmB,EAAE,CAAC;gBAC5B,MAAM,UAAU,EAAE,CAAC;gBACnB,MAAM,KAAK,GAAG,CAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,aAAa,CAAE;qBACjE,GAAG,CAAC,SAAS,SAAS,CAAC,IAAI;oBACxB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBACtC,CAAC,CAAC,CAAC;gBACP,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE,CAAC;oBACzB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvD,CAAC;gBACD,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,CAAC;YACjD,CAAC,CAAC,CAAC;QACP,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,OAA4B;YACpC,OAAO,MAAM,OAAO,CAAC,KAAK,UAAU,gBAAgB;gBAChD,MAAM,mBAAmB,EAAE,CAAC;gBAC5B,MAAM,UAAU,EAAE,CAAC;gBACnB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;gBACzE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;oBAClB,MAAM,qBAAqB,EAAE,CAAC;gBAClC,CAAC;gBACD,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,CAAC;YACrD,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"last-failed-selection.js","sourceRoot":"","sources":["../../../../source/run/last-failed-selection.ts"],"names":[],"mappings":"AAAA,OAAoC,2BAA2B,CAAC;AAChE,OAA8B,qBAAqB,CAAC;AACpD,OAAqC,sBAAsB,CAAC;AAC5D,OAA2C,qBAAqB,CAAC;AAIjE,OAA2C,oBAAoB,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { mkdir, readdir, rm } from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { hostname } from 'node:os';
|
|
4
|
-
import { setTimeout as delay } from 'node:timers/promises';
|
|
5
4
|
import lockfile from 'proper-lockfile';
|
|
6
5
|
import { createNodeFileStore } from "../file-store.js";
|
|
7
|
-
|
|
6
|
+
import { checkHistoryMaintenanceBudget } from "./history-maintenance-budget.js";
|
|
7
|
+
import { acquireHistoryLock } from "./history-lock-acquisition.js";
|
|
8
8
|
function createLockState() {
|
|
9
9
|
let error = null;
|
|
10
10
|
return {
|
|
@@ -37,27 +37,6 @@ async function historyFiles(directory) {
|
|
|
37
37
|
return path.join(directory, name);
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
-
async function acquireHistoryLock(directory, policy, state) {
|
|
41
|
-
const options = {
|
|
42
|
-
lockfilePath: path.join(directory, 'history.lock'),
|
|
43
|
-
stale: policy.staleLockMilliseconds,
|
|
44
|
-
onCompromised(error) {
|
|
45
|
-
state.record(error);
|
|
46
|
-
}
|
|
47
|
-
};
|
|
48
|
-
const deadline = performance.now() + policy.lockTimeoutMilliseconds;
|
|
49
|
-
for (;;) {
|
|
50
|
-
try {
|
|
51
|
-
return await lockfile.lock(directory, options);
|
|
52
|
-
}
|
|
53
|
-
catch (error) {
|
|
54
|
-
if (performance.now() >= deadline || !await lockfile.check(directory, options)) {
|
|
55
|
-
throw error;
|
|
56
|
-
}
|
|
57
|
-
await delay(Math.min(retryIntervalMilliseconds, Math.max(0, deadline - performance.now())));
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
40
|
async function guardedHistoryOperation(operation, state) {
|
|
62
41
|
const result = await operation();
|
|
63
42
|
const error = state.error();
|
|
@@ -98,13 +77,23 @@ export function createNodeHistoryStorage(directory, policy) {
|
|
|
98
77
|
}
|
|
99
78
|
};
|
|
100
79
|
},
|
|
101
|
-
read
|
|
102
|
-
|
|
103
|
-
|
|
80
|
+
async read(target) {
|
|
81
|
+
checkHistoryMaintenanceBudget();
|
|
82
|
+
return await store.read(target);
|
|
83
|
+
},
|
|
84
|
+
async write(target, content) {
|
|
85
|
+
checkHistoryMaintenanceBudget();
|
|
86
|
+
await store.write(target, content);
|
|
87
|
+
},
|
|
88
|
+
async list(target) {
|
|
89
|
+
checkHistoryMaintenanceBudget();
|
|
90
|
+
return await historyFiles(target);
|
|
91
|
+
},
|
|
104
92
|
async withLock(operation) {
|
|
93
|
+
checkHistoryMaintenanceBudget();
|
|
105
94
|
await mkdir(directory, { recursive: true });
|
|
106
95
|
const state = createLockState();
|
|
107
|
-
const release = await acquireHistoryLock(directory, policy, state);
|
|
96
|
+
const release = await acquireHistoryLock(directory, policy, state.record);
|
|
108
97
|
try {
|
|
109
98
|
return await guardedHistoryOperation(operation, state);
|
|
110
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-history-storage.js","sourceRoot":"","sources":["../../../../source/run/node-history-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,
|
|
1
|
+
{"version":3,"file":"node-history-storage.js","sourceRoot":"","sources":["../../../../source/run/node-history-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAInE,SAAS,eAAe;IACpB,IAAI,KAAK,GAAiB,IAAI,CAAC;IAC/B,OAAO;QACH,KAAK;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,CAAC,KAAK;YACR,KAAK,GAAG,KAAK,CAAC;QAClB,CAAC;KACJ,CAAC;AACN,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,SAAiB;IAC3C,IAAI,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,IAAI,KAAK,YAAY,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;YACpE,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,SAAiB;IACzC,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;IAC9C,OAAO,KAAK;SACP,MAAM,CAAC,SAAS,UAAU,CAAC,IAAI;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC,CAAC;SACD,GAAG,CAAC,SAAS,UAAU,CAAC,IAAI;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACX,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAI,SAA2B,EAAE,KAAgB;IACnF,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAC5B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjB,MAAM,KAAK,CAAC;IAChB,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,eAAe,CAC1B,SAAiB,EACjB,MAAqB,EACrB,KAAgB;IAEhB,IAAI,CAAC;QACD,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE;YAClC,YAAY,EAAE,GAAG,SAAS,QAAQ;YAClC,KAAK,EAAE,MAAM,CAAC,qBAAqB;YACnC,aAAa,EAAE,KAAK,CAAC,MAAM;SAC9B,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC;AACD,MAAM,UAAU,wBAAwB,CAAC,SAAiB,EAAE,MAAqB;IAC7E,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAmB;QAC5B,KAAK,CAAC,QAAQ,CAAC,EAAE;YACb,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YACpE,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,UAAU,aAAa;gBAC/D,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;gBACtF,OAAO,MAAM,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,UAAU,YAAY;gBAC9B,MAAM,OAAO,EAAE,CAAC;gBAChB,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;gBAC5B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACjB,MAAM,KAAK,CAAC;gBAChB,CAAC;YACL,CAAC,CAAC;QACN,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM;YACb,6BAA6B,EAAE,CAAC;YAChC,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;YACvB,6BAA6B,EAAE,CAAC;YAChC,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM;YACb,6BAA6B,EAAE,CAAC;YAChC,OAAO,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,CAAC,QAAQ,CAAC,SAAS;YACpB,6BAA6B,EAAE,CAAC;YAChC,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC1E,IAAI,CAAC;gBACD,OAAO,MAAM,uBAAuB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAC3D,CAAC;oBAAS,CAAC;gBACP,MAAM,OAAO,EAAE,CAAC;YACpB,CAAC;QACL,CAAC;KACJ,CAAC;IACF,OAAO,OAAO,CAAC;AACnB,CAAC"}
|
|
@@ -9,6 +9,10 @@ function readActiveResourceTypes() {
|
|
|
9
9
|
export function createNodeExecutionDependencies(input) {
|
|
10
10
|
return {
|
|
11
11
|
createHistoryStorage: createNodeHistoryStorage,
|
|
12
|
+
async maintainHistory(options) {
|
|
13
|
+
const { maintainHistory } = await import("./history-maintenance.js");
|
|
14
|
+
return await maintainHistory(options);
|
|
15
|
+
},
|
|
12
16
|
createProcessUsageTracker(options) {
|
|
13
17
|
return createNodeProcessUsageTracker(input.wallClock, options);
|
|
14
18
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-run-execution.js","sourceRoot":"","sources":["../../../../source/run/node-run-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0CAAwB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"node-run-execution.js","sourceRoot":"","sources":["../../../../source/run/node-run-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0CAAwB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAoBnE,SAAS,uBAAuB;IAC5B,OAAO,OAAO,CAAC,sBAAsB,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAAyB;IACrE,OAAO;QACH,oBAAoB,EAAE,wBAAwB;QAC9C,KAAK,CAAC,eAAe,CAAC,OAAO;YACzB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;YACrE,OAAO,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,yBAAyB,CAAC,OAAO;YAC7B,OAAO,6BAA6B,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC;QACD,gBAAgB,CAAC,OAAO;YACpB,OAAO,+BAA+B,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,EAAE,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACxG,CAAC;QACD,OAAO,EAAE,aAAa,CAAC;YACnB,oBAAoB,EAAE,IAAI;YAC1B,oBAAoB,EAAE,SAAS;YAC/B,uBAAuB;YACvB,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS;SAC7B,CAAC;QACF,iBAAiB,EAAE,mBAAmB,EAAE;KAC3C,CAAC;AACN,CAAC"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { z } from 'zod/v4';
|
|
3
|
+
import { propertyWitnessSchema } from "@overkill-dev/engine/engine/witness-file.js";
|
|
4
|
+
export const cachedEntrySchema = z.strictObject({
|
|
5
|
+
id: z.string().min(1),
|
|
6
|
+
savedAt: z.string(),
|
|
7
|
+
entry: propertyWitnessSchema
|
|
8
|
+
});
|
|
9
|
+
export const cacheSchema = z.strictObject({ version: z.literal(1), entries: z.array(z.unknown()) });
|
|
10
|
+
function validatedEntries(candidates, file) {
|
|
11
|
+
const entries = [];
|
|
12
|
+
const diagnostics = [];
|
|
13
|
+
for (const candidate of candidates) {
|
|
14
|
+
const parsed = cachedEntrySchema.safeParse(candidate);
|
|
15
|
+
if (parsed.success) {
|
|
16
|
+
entries.push(parsed.data);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
diagnostics.push({ path: file, reason: parsed.error.message });
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return { entries, diagnostics };
|
|
23
|
+
}
|
|
24
|
+
function decodedCache(content, file) {
|
|
25
|
+
return validatedEntries(cacheSchema.parse(JSON.parse(content)).entries, file);
|
|
26
|
+
}
|
|
27
|
+
export function parseCorpusCache(content, file) {
|
|
28
|
+
if (content === null) {
|
|
29
|
+
return { entries: [], diagnostics: [] };
|
|
30
|
+
}
|
|
31
|
+
try {
|
|
32
|
+
return decodedCache(content, file);
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
return { entries: [], diagnostics: [{ path: file, reason: String(error) }] };
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
function entryIdentity(entry) {
|
|
39
|
+
return createHash('sha256')
|
|
40
|
+
.update(JSON.stringify([entry.case, entry.runtimes, entry.target, entry.counterexample]))
|
|
41
|
+
.digest('hex');
|
|
42
|
+
}
|
|
43
|
+
function refreshedCache(current, entries, context) {
|
|
44
|
+
const retained = new Map(current.entries.map(function pair(entry) {
|
|
45
|
+
return [entry.id, entry];
|
|
46
|
+
}));
|
|
47
|
+
const diagnostics = Array.from(current.diagnostics);
|
|
48
|
+
for (const candidate of entries) {
|
|
49
|
+
const entry = propertyWitnessSchema.parse(candidate);
|
|
50
|
+
if (Buffer.byteLength(JSON.stringify(entry)) > context.policy.localCache.maxEntryBytes) {
|
|
51
|
+
diagnostics.push({
|
|
52
|
+
path: context.file,
|
|
53
|
+
reason: 'Confirmed input exceeds the local corpus entry byte limit.'
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
const id = entryIdentity(entry);
|
|
58
|
+
retained.set(id, { id, entry, savedAt: context.now });
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return { entries: Array.from(retained.values()), diagnostics };
|
|
62
|
+
}
|
|
63
|
+
function encodeCache(entries) {
|
|
64
|
+
return JSON.stringify({ version: 1, entries });
|
|
65
|
+
}
|
|
66
|
+
export function boundedCorpusCache(current, entries, context) {
|
|
67
|
+
const refreshed = refreshedCache(current, entries, context);
|
|
68
|
+
const ordered = refreshed
|
|
69
|
+
.entries
|
|
70
|
+
.toSorted(function newest(left, right) {
|
|
71
|
+
const time = right.savedAt.localeCompare(left.savedAt);
|
|
72
|
+
return time === 0 ? left.id.localeCompare(right.id) : time;
|
|
73
|
+
})
|
|
74
|
+
.slice(0, context.policy.localCache.maxEntries);
|
|
75
|
+
while (ordered.length > 0 && Buffer.byteLength(encodeCache(ordered)) > context.policy.localCache.maxBytes) {
|
|
76
|
+
ordered.pop();
|
|
77
|
+
}
|
|
78
|
+
const content = encodeCache(ordered);
|
|
79
|
+
return Buffer.byteLength(content) <= context.policy.localCache.maxBytes
|
|
80
|
+
? { content, diagnostics: refreshed.diagnostics }
|
|
81
|
+
: {
|
|
82
|
+
content: null,
|
|
83
|
+
diagnostics: [...refreshed.diagnostics, {
|
|
84
|
+
path: context.file,
|
|
85
|
+
reason: 'Local corpus byte limit is smaller than its empty envelope.'
|
|
86
|
+
}]
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=property-corpus-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"property-corpus-cache.js","sourceRoot":"","sources":["../../../../source/run/property-corpus-cache.ts"],"names":[],"mappings":"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"}
|