@xioflow/kernel 0.5.0 → 0.6.0
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 +63 -4
- package/dist/domain.d.ts.map +1 -1
- package/dist/domain.js +10 -0
- package/dist/domain.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/mcp/tools.js +2 -2
- package/dist/mcp/tools.js.map +1 -1
- package/dist/recovery/engine.d.ts.map +1 -1
- package/dist/recovery/engine.js +9 -3
- package/dist/recovery/engine.js.map +1 -1
- package/dist/snapshot/git-shadow.d.ts +7 -1
- package/dist/snapshot/git-shadow.d.ts.map +1 -1
- package/dist/snapshot/git-shadow.js +152 -43
- package/dist/snapshot/git-shadow.js.map +1 -1
- package/dist/snapshot/ignored-manifest.d.ts +23 -0
- package/dist/snapshot/ignored-manifest.d.ts.map +1 -0
- package/dist/snapshot/ignored-manifest.js +121 -0
- package/dist/snapshot/ignored-manifest.js.map +1 -0
- package/dist/store/schema.d.ts +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +2 -1
- package/dist/store/schema.js.map +1 -1
- package/dist/store/sqlite.d.ts.map +1 -1
- package/dist/store/sqlite.js +9 -3
- package/dist/store/sqlite.js.map +1 -1
- package/dist/supervisor/process-monitor.d.ts.map +1 -1
- package/dist/supervisor/process-monitor.js +3 -0
- package/dist/supervisor/process-monitor.js.map +1 -1
- package/dist/supervisor/process-run.d.ts +3 -0
- package/dist/supervisor/process-run.d.ts.map +1 -1
- package/dist/supervisor/process-run.js +3 -0
- package/dist/supervisor/process-run.js.map +1 -1
- package/dist/supervisor/read-evidence.d.ts +47 -0
- package/dist/supervisor/read-evidence.d.ts.map +1 -0
- package/dist/supervisor/read-evidence.js +197 -0
- package/dist/supervisor/read-evidence.js.map +1 -0
- package/dist/supervisor/rollback.d.ts +15 -1
- package/dist/supervisor/rollback.d.ts.map +1 -1
- package/dist/supervisor/rollback.js +85 -12
- package/dist/supervisor/rollback.js.map +1 -1
- package/dist/supervisor/snapshot-ops.d.ts.map +1 -1
- package/dist/supervisor/snapshot-ops.js +22 -0
- package/dist/supervisor/snapshot-ops.js.map +1 -1
- package/dist/supervisor/supervisor.d.ts +9 -3
- package/dist/supervisor/supervisor.d.ts.map +1 -1
- package/dist/supervisor/supervisor.js +19 -2
- package/dist/supervisor/supervisor.js.map +1 -1
- package/dist/supervisor/types.d.ts +13 -0
- package/dist/supervisor/types.d.ts.map +1 -1
- package/dist/testing/contract-suite.d.ts.map +1 -1
- package/dist/testing/contract-suite.js +188 -3
- package/dist/testing/contract-suite.js.map +1 -1
- package/dist/types.d.ts +75 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/workspace/transactions.d.ts +61 -2
- package/dist/workspace/transactions.d.ts.map +1 -1
- package/dist/workspace/transactions.js +159 -16
- package/dist/workspace/transactions.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import { ResourceConflictError } from '../types.js';
|
|
3
|
+
import { ResourceConflictError, } from '../types.js';
|
|
4
4
|
import { isPathContained } from '../capability/index.js';
|
|
5
|
+
import { collectIgnoredEntries, diffIgnoredEntries, ignoredManifestPath, readIgnoredManifest, } from '../snapshot/ignored-manifest.js';
|
|
5
6
|
import { activateInternalOperation, sha256Json } from './snapshot-ops.js';
|
|
6
7
|
/**
|
|
7
8
|
* 回滚协议 (ARCHITECTURE §3.5 / 契约 #28–#30, #56)
|
|
@@ -45,10 +46,25 @@ export async function rollback(ctx, options) {
|
|
|
45
46
|
};
|
|
46
47
|
activateInternalOperation(domain, op, capAdmission);
|
|
47
48
|
try {
|
|
48
|
-
const
|
|
49
|
-
|
|
49
|
+
const restored = await snapshotDriver.restore(snapshot, {
|
|
50
|
+
force: options.force,
|
|
51
|
+
removeNewIgnored: options.removeNewIgnored,
|
|
52
|
+
});
|
|
53
|
+
const newIgnoredPaths = restored.newIgnoredPaths ?? [];
|
|
54
|
+
// 快照之后新出现的被忽略文件是有意保留的:核验时不算它们,但如实列为未恢复
|
|
55
|
+
const currentFp = await snapshotDriver.fingerprint(targetRoots, {
|
|
56
|
+
against: snapshot,
|
|
57
|
+
excludeNewIgnored: newIgnoredPaths.length > 0,
|
|
58
|
+
});
|
|
59
|
+
const unrestoredPaths = [...restored.unrestoredPaths, ...newIgnoredPaths];
|
|
50
60
|
const status = currentFp !== snapshot.treeFingerprint ? 'failed' : unrestoredPaths.length > 0 ? 'partial' : 'restored';
|
|
51
|
-
const
|
|
61
|
+
const ignored = await compareIgnoredManifest(domain, snapshotDriver, snapshot);
|
|
62
|
+
const derived = deriveRollbackCoverage({
|
|
63
|
+
status,
|
|
64
|
+
effects: allEffectsConfinedToRoots(domain, snapshot, targetRoots, options.opId) ? 'confined' : 'unconfined',
|
|
65
|
+
snapshotCoverage: snapshot.coverage,
|
|
66
|
+
ignoredManifest: ignored.state,
|
|
67
|
+
});
|
|
52
68
|
let result;
|
|
53
69
|
domain.getStore().transaction(() => {
|
|
54
70
|
result = {
|
|
@@ -56,8 +72,8 @@ export async function rollback(ctx, options) {
|
|
|
56
72
|
status,
|
|
57
73
|
snapshotId: options.snapshotId,
|
|
58
74
|
unrestoredPaths: unrestoredPaths.length > 0 ? unrestoredPaths : undefined,
|
|
59
|
-
|
|
60
|
-
|
|
75
|
+
...derived,
|
|
76
|
+
ignoredChanges: ignored.changes,
|
|
61
77
|
capabilityId: options.capabilityId,
|
|
62
78
|
durationMs: Date.now() - startTime,
|
|
63
79
|
completedAt: new Date().toISOString(),
|
|
@@ -124,6 +140,14 @@ function assertRootsQuiescent(domain, targetRoots, opId) {
|
|
|
124
140
|
*/
|
|
125
141
|
function allEffectsConfinedToRoots(domain, snapshot, targetRoots, rollbackOpId) {
|
|
126
142
|
const store = domain.getStore();
|
|
143
|
+
// An operation still running has no result yet, so nothing proves it ran
|
|
144
|
+
// confined; it may be writing outside the roots right now (long-running
|
|
145
|
+
// services included).
|
|
146
|
+
// An indeterminate one may still be alive, whenever it was recorded.
|
|
147
|
+
const stillRunning = store.getAllOperations(domain.domainId).some((op) => op.id !== rollbackOpId && op.kind !== 'snapshot' && op.kind !== 'rollback' && (op.status !== 'done'
|
|
148
|
+
|| (op.result?.status === 'indeterminate' && op.result.confined !== true)));
|
|
149
|
+
if (stillRunning)
|
|
150
|
+
return false;
|
|
127
151
|
const eventsSince = snapshot.journalSeq !== undefined ? store.getJournalEvents(domain.domainId, snapshot.journalSeq) : [];
|
|
128
152
|
const opResults = eventsSince.filter((e) => e.type === 'OPERATION_RESULT_RECORDED' && e.operationId !== rollbackOpId);
|
|
129
153
|
return opResults.every((e) => {
|
|
@@ -141,13 +165,62 @@ function allEffectsConfinedToRoots(domain, snapshot, targetRoots, rollbackOpId)
|
|
|
141
165
|
return opRoots.every((opr) => targetRoots.some((sr) => isPathContained(sr, opr)));
|
|
142
166
|
});
|
|
143
167
|
}
|
|
144
|
-
function
|
|
145
|
-
if (
|
|
146
|
-
return {
|
|
168
|
+
async function compareIgnoredManifest(domain, snapshotDriver, snapshot) {
|
|
169
|
+
if (!snapshot.ignoredManifestDigest)
|
|
170
|
+
return { state: 'absent' };
|
|
171
|
+
const before = readIgnoredManifest(ignoredManifestPath(domain.domainPath, snapshot.id), snapshot.ignoredManifestDigest);
|
|
172
|
+
if (!before || !snapshotDriver.listIgnored)
|
|
173
|
+
return { state: 'unreadable' };
|
|
174
|
+
const after = collectIgnoredEntries(await snapshotDriver.listIgnored(snapshot.roots));
|
|
175
|
+
const { verdict, changes } = diffIgnoredEntries(before, after);
|
|
176
|
+
return { state: verdict, changes };
|
|
177
|
+
}
|
|
178
|
+
const EFFECTS_BASIS = {
|
|
179
|
+
confined: 'all_ops_confined',
|
|
180
|
+
unconfined: 'unconfined_op_since_snapshot',
|
|
181
|
+
unverified: 'effects_unverified',
|
|
182
|
+
};
|
|
183
|
+
const MANIFEST_BASIS = {
|
|
184
|
+
unchanged: 'ignored_manifest_unchanged',
|
|
185
|
+
changed: 'ignored_manifest_changed',
|
|
186
|
+
inconclusive: 'ignored_manifest_ctime_only',
|
|
187
|
+
unreadable: 'ignored_manifest_unreadable',
|
|
188
|
+
absent: 'ignored_not_captured',
|
|
189
|
+
};
|
|
190
|
+
/**
|
|
191
|
+
* 回滚覆盖声明的唯一推导处(ARCHITECTURE §0.2 裁决 4 / §3.5):输入是核验到的事实,输出是结论加依据。
|
|
192
|
+
* `complete` 需要三件事同时成立:核验通过、快照以来的操作全部受限、被忽略文件已恢复或被证明未变。
|
|
193
|
+
*/
|
|
194
|
+
export function deriveRollbackCoverage(facts) {
|
|
195
|
+
const fullTree = facts.snapshotCoverage === 'full_tree';
|
|
196
|
+
const ignoredFiles = fullTree
|
|
197
|
+
? facts.status === 'failed'
|
|
198
|
+
? 'unverified'
|
|
199
|
+
: 'restored'
|
|
200
|
+
: facts.ignoredManifest === 'unchanged'
|
|
201
|
+
? 'unchanged_verified'
|
|
202
|
+
: 'not_captured';
|
|
203
|
+
const ignoredBasis = fullTree ? 'snapshot_full_tree' : MANIFEST_BASIS[facts.ignoredManifest];
|
|
204
|
+
if (facts.status === 'failed') {
|
|
205
|
+
return { coverage: 'none', outOfScopeEffects: 'possible', ignoredFiles, coverageBasis: ['fingerprint_mismatch'] };
|
|
147
206
|
}
|
|
148
|
-
if (
|
|
149
|
-
return {
|
|
207
|
+
if (facts.status === 'partial') {
|
|
208
|
+
return {
|
|
209
|
+
coverage: 'declared_roots',
|
|
210
|
+
outOfScopeEffects: 'possible',
|
|
211
|
+
ignoredFiles,
|
|
212
|
+
coverageBasis: ['unrestored_paths', ignoredBasis],
|
|
213
|
+
};
|
|
150
214
|
}
|
|
151
|
-
|
|
215
|
+
const coverageBasis = [EFFECTS_BASIS[facts.effects], ignoredBasis];
|
|
216
|
+
if (facts.effects !== 'confined') {
|
|
217
|
+
return { coverage: 'declared_roots', outOfScopeEffects: 'possible', ignoredFiles, coverageBasis };
|
|
218
|
+
}
|
|
219
|
+
return {
|
|
220
|
+
coverage: ignoredFiles === 'not_captured' ? 'non_ignored' : 'complete',
|
|
221
|
+
outOfScopeEffects: 'none_possible',
|
|
222
|
+
ignoredFiles,
|
|
223
|
+
coverageBasis,
|
|
224
|
+
};
|
|
152
225
|
}
|
|
153
226
|
//# sourceMappingURL=rollback.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../src/supervisor/rollback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,
|
|
1
|
+
{"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../src/supervisor/rollback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-ops.d.ts","sourceRoot":"","sources":["../../src/supervisor/snapshot-ops.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAyB,cAAc,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"snapshot-ops.d.ts","sourceRoot":"","sources":["../../src/supervisor/snapshot-ops.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAyB,cAAc,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAGxG,OAAO,EAAE,mBAAmB,EAAwB,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,eAAe,CAAC;IACxB,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEjD;AAED,0DAA0D;AAC1D,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,eAAe,EACvB,EAAE,EAAE,SAAS,EACb,YAAY,EAAE,mBAAmB,GAAG,SAAS,GAC5C,IAAI,CAcN;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,uBAAuB,CAAC,CA6HlC;AA4BD;;GAEG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,eAAe,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAqBnC;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5B,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB"}
|
|
@@ -3,6 +3,7 @@ import path from 'node:path';
|
|
|
3
3
|
import crypto from 'node:crypto';
|
|
4
4
|
import { ResourceConflictError } from '../types.js';
|
|
5
5
|
import { GitShadowSnapshotDriver } from '../snapshot/git-shadow.js';
|
|
6
|
+
import { collectIgnoredEntries, ignoredManifestPath, writeIgnoredManifest } from '../snapshot/ignored-manifest.js';
|
|
6
7
|
import { recordCapabilityUsed } from './admission.js';
|
|
7
8
|
export function sha256Json(value) {
|
|
8
9
|
return crypto.createHash('sha256').update(JSON.stringify(value)).digest('hex');
|
|
@@ -63,6 +64,7 @@ export async function captureSnapshot(ctx, options) {
|
|
|
63
64
|
kind: 'snapshot',
|
|
64
65
|
roots: realRoots,
|
|
65
66
|
includeIgnored: !!options.includeIgnored,
|
|
67
|
+
trackIgnored: options.trackIgnored ?? null,
|
|
66
68
|
maxTreeSizeBytes: options.maxTreeSizeBytes,
|
|
67
69
|
capabilityId: options.capabilityId ?? null,
|
|
68
70
|
}),
|
|
@@ -73,7 +75,19 @@ export async function captureSnapshot(ctx, options) {
|
|
|
73
75
|
status: 'intent_registered',
|
|
74
76
|
};
|
|
75
77
|
activateInternalOperation(domain, op, capAdmission);
|
|
78
|
+
// full_tree 快照已含被忽略文件的内容,清单是多余的
|
|
79
|
+
const manifestFile = options.trackIgnored === 'manifest' && !options.includeIgnored
|
|
80
|
+
? ignoredManifestPath(domain.domainPath, options.opId)
|
|
81
|
+
: undefined;
|
|
76
82
|
try {
|
|
83
|
+
let ignoredManifest;
|
|
84
|
+
if (manifestFile) {
|
|
85
|
+
if (!snapshotDriver.listIgnored) {
|
|
86
|
+
throw new Error(`Snapshot driver ${snapshotDriver.name} cannot list ignored files (trackIgnored: 'manifest')`);
|
|
87
|
+
}
|
|
88
|
+
const entries = collectIgnoredEntries(await snapshotDriver.listIgnored(realRoots));
|
|
89
|
+
ignoredManifest = { digest: writeIgnoredManifest(manifestFile, entries), entries: entries.length };
|
|
90
|
+
}
|
|
77
91
|
const snapRef = await snapshotDriver.capture(realRoots, {
|
|
78
92
|
id: options.opId,
|
|
79
93
|
domainId: domain.domainId,
|
|
@@ -81,6 +95,7 @@ export async function captureSnapshot(ctx, options) {
|
|
|
81
95
|
includeIgnored: options.includeIgnored,
|
|
82
96
|
maxTreeSizeBytes: options.maxTreeSizeBytes,
|
|
83
97
|
});
|
|
98
|
+
snapRef.ignoredManifestDigest = ignoredManifest?.digest;
|
|
84
99
|
const store = domain.getStore();
|
|
85
100
|
let result;
|
|
86
101
|
store.transaction(() => {
|
|
@@ -94,6 +109,8 @@ export async function captureSnapshot(ctx, options) {
|
|
|
94
109
|
roots: snapRef.roots,
|
|
95
110
|
treeFingerprint: snapRef.treeFingerprint,
|
|
96
111
|
commitHash: snapRef.commitHash,
|
|
112
|
+
// 只记摘要与条目数:清单里的路径名可能敏感,不进 journal
|
|
113
|
+
ignoredManifest,
|
|
97
114
|
},
|
|
98
115
|
timestamp: new Date().toISOString(),
|
|
99
116
|
});
|
|
@@ -122,6 +139,8 @@ export async function captureSnapshot(ctx, options) {
|
|
|
122
139
|
return result;
|
|
123
140
|
}
|
|
124
141
|
catch (err) {
|
|
142
|
+
if (manifestFile)
|
|
143
|
+
fs.rmSync(manifestFile, { force: true });
|
|
125
144
|
throw recordFailedSnapshot(domain, options.opId, err, startTime);
|
|
126
145
|
}
|
|
127
146
|
}
|
|
@@ -226,6 +245,9 @@ export async function pruneSnapshots(ctx, snapshotIds, options) {
|
|
|
226
245
|
? (await snapshotDriver.assertGitRepo(snapshot.roots[0])).repoRoot
|
|
227
246
|
: undefined;
|
|
228
247
|
await snapshotDriver.prune([id], { repoRoot });
|
|
248
|
+
if (snapshot.ignoredManifestDigest) {
|
|
249
|
+
fs.rmSync(ignoredManifestPath(domain.domainPath, id), { force: true });
|
|
250
|
+
}
|
|
229
251
|
store.transaction(() => {
|
|
230
252
|
store.deleteSnapshot(id);
|
|
231
253
|
store.recordEventAndTransitionState({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-ops.js","sourceRoot":"","sources":["../../src/supervisor/snapshot-ops.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"snapshot-ops.js","sourceRoot":"","sources":["../../src/supervisor/snapshot-ops.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ExecutionDomain } from '../domain.js';
|
|
2
2
|
import { PlatformDriver, StopProcessResult } from '../driver/types.js';
|
|
3
|
-
import { ProcessOperationResult, TerminationReason, ServiceSpec, ServiceHandle, SnapshotDriver, SnapshotOperationResult, RollbackOperationResult, ConfinementDriver } from '../types.js';
|
|
4
|
-
import { CommitResult, TransactionEffects, WorkspaceTransaction } from '../workspace/transactions.js';
|
|
3
|
+
import { ProcessOperationResult, TerminationReason, ServiceSpec, ServiceHandle, SnapshotDriver, SnapshotOperationResult, RollbackOperationResult, ConfinementDriver, EvidenceStatus } from '../types.js';
|
|
4
|
+
import { CommitOptions, CommitResult, TransactionEffects, WorkspaceTransaction } from '../workspace/transactions.js';
|
|
5
5
|
import { CaptureSnapshotOptions, ExecuteProcessOptions, RollbackOptions } from './types.js';
|
|
6
6
|
export type { ExecuteProcessOptions, CaptureSnapshotOptions, RollbackOptions } from './types.js';
|
|
7
7
|
export { normalizeResourceName, computeInputFingerprint } from './fingerprint.js';
|
|
@@ -9,6 +9,7 @@ export declare class ProcessSupervisor {
|
|
|
9
9
|
private readonly domain;
|
|
10
10
|
private readonly driver;
|
|
11
11
|
private activeOperations;
|
|
12
|
+
private readonly readTracker;
|
|
12
13
|
private serviceSupervisor;
|
|
13
14
|
private snapshotDriver;
|
|
14
15
|
private confinementDriver?;
|
|
@@ -60,7 +61,7 @@ export declare class ProcessSupervisor {
|
|
|
60
61
|
forkPath: string;
|
|
61
62
|
}): Promise<WorkspaceTransaction>;
|
|
62
63
|
inspectWorkspaceTransaction(txId: string): Promise<TransactionEffects>;
|
|
63
|
-
commitWorkspaceTransaction(txId: string): Promise<CommitResult>;
|
|
64
|
+
commitWorkspaceTransaction(txId: string, options?: CommitOptions): Promise<CommitResult>;
|
|
64
65
|
abortWorkspaceTransaction(txId: string, reason?: string): Promise<void>;
|
|
65
66
|
private workspaceTransactions;
|
|
66
67
|
/**
|
|
@@ -76,6 +77,11 @@ export declare class ProcessSupervisor {
|
|
|
76
77
|
cancelOperation(opId: string, graceMs?: number): Promise<StopProcessResult>;
|
|
77
78
|
handleStopPipeline(opId: string, reason: TerminationReason, graceMs: number): Promise<StopProcessResult>;
|
|
78
79
|
private ensureActiveOperation;
|
|
80
|
+
/**
|
|
81
|
+
* 一条带 `trackReads` 的命令的结果,是否仍然代表当前的工作区:`fresh` / `stale`(列出变了的依赖)/ `unknown`。
|
|
82
|
+
* 只读,不改动访问时间之外的任何东西;重启后仍可查询(证据在 artifacts 里)。
|
|
83
|
+
*/
|
|
84
|
+
evidenceStatus(opId: string): EvidenceStatus;
|
|
79
85
|
pruneArtifacts(filter?: {
|
|
80
86
|
olderThanMs?: number;
|
|
81
87
|
prefix?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/supervisor/supervisor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAGL,sBAAsB,EACtB,iBAAiB,EAEjB,WAAW,EACX,aAAa,EACb,cAAc,EACd,uBAAuB,EACvB,uBAAuB,EACvB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/supervisor/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,12 +11,14 @@ import { joinInFlight, replayRecorded } from './replay.js';
|
|
|
11
11
|
import { runProcess } from './process-run.js';
|
|
12
12
|
import * as snapshotOps from './snapshot-ops.js';
|
|
13
13
|
import { rollback } from './rollback.js';
|
|
14
|
+
import { ReadTracker, evaluateReadEvidence } from './read-evidence.js';
|
|
14
15
|
import { WorkspaceTransactions, } from '../workspace/transactions.js';
|
|
15
16
|
export { normalizeResourceName, computeInputFingerprint } from './fingerprint.js';
|
|
16
17
|
export class ProcessSupervisor {
|
|
17
18
|
domain;
|
|
18
19
|
driver;
|
|
19
20
|
activeOperations = new Map();
|
|
21
|
+
readTracker = new ReadTracker();
|
|
20
22
|
serviceSupervisor;
|
|
21
23
|
snapshotDriver;
|
|
22
24
|
confinementDriver;
|
|
@@ -93,8 +95,8 @@ export class ProcessSupervisor {
|
|
|
93
95
|
async inspectWorkspaceTransaction(txId) {
|
|
94
96
|
return this.workspaceTransactions().inspect(txId);
|
|
95
97
|
}
|
|
96
|
-
async commitWorkspaceTransaction(txId) {
|
|
97
|
-
return this.workspaceTransactions().commit(txId);
|
|
98
|
+
async commitWorkspaceTransaction(txId, options) {
|
|
99
|
+
return this.workspaceTransactions().commit(txId, options);
|
|
98
100
|
}
|
|
99
101
|
async abortWorkspaceTransaction(txId, reason) {
|
|
100
102
|
return this.workspaceTransactions().abort(txId, reason);
|
|
@@ -127,6 +129,9 @@ export class ProcessSupervisor {
|
|
|
127
129
|
}
|
|
128
130
|
},
|
|
129
131
|
dematerialize: (forkPath) => this.dematerialize(forkPath, { force: true }),
|
|
132
|
+
pruneSnapshot: async (snapshotId, runId) => {
|
|
133
|
+
await this.pruneSnapshots([snapshotId], { runId });
|
|
134
|
+
},
|
|
130
135
|
});
|
|
131
136
|
return this.transactions;
|
|
132
137
|
}
|
|
@@ -164,6 +169,7 @@ export class ProcessSupervisor {
|
|
|
164
169
|
resourceBudget: options.resourceBudget,
|
|
165
170
|
status: 'pending',
|
|
166
171
|
};
|
|
172
|
+
const readTracking = options.trackReads ? this.readTracker.open(options.opId, options.trackReads) : undefined;
|
|
167
173
|
const opState = this.trackOperation(options, inputFingerprint, startTime);
|
|
168
174
|
const executionPromise = runProcess(this.runContext, {
|
|
169
175
|
options,
|
|
@@ -173,6 +179,7 @@ export class ProcessSupervisor {
|
|
|
173
179
|
confined: confinementDriver !== undefined,
|
|
174
180
|
confinementDriverName: confinementDriver?.name,
|
|
175
181
|
capAdmission,
|
|
182
|
+
readTracking,
|
|
176
183
|
});
|
|
177
184
|
opState.resultPromise = executionPromise;
|
|
178
185
|
return await executionPromise;
|
|
@@ -295,6 +302,16 @@ export class ProcessSupervisor {
|
|
|
295
302
|
}
|
|
296
303
|
return active;
|
|
297
304
|
}
|
|
305
|
+
/**
|
|
306
|
+
* 一条带 `trackReads` 的命令的结果,是否仍然代表当前的工作区:`fresh` / `stale`(列出变了的依赖)/ `unknown`。
|
|
307
|
+
* 只读,不改动访问时间之外的任何东西;重启后仍可查询(证据在 artifacts 里)。
|
|
308
|
+
*/
|
|
309
|
+
evidenceStatus(opId) {
|
|
310
|
+
const op = this.domain.getStore().getOperation(opId);
|
|
311
|
+
if (!op)
|
|
312
|
+
throw new Error(`Operation "${opId}" does not exist in domain ${this.domain.domainId}`);
|
|
313
|
+
return evaluateReadEvidence(op.result?.readEvidence);
|
|
314
|
+
}
|
|
298
315
|
pruneArtifacts(filter) {
|
|
299
316
|
return this.domain.pruneArtifacts(filter);
|
|
300
317
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/supervisor/supervisor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/supervisor/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ManagedProcessHandle, StructuredCommand, StopProcessResult } from '../driver/types.js';
|
|
2
2
|
import { ConfinementDriver, ProcessOperationResult, ResourceBudget, TerminationReason } from '../types.js';
|
|
3
|
+
import type { TrackReadsSpec } from './read-evidence.js';
|
|
3
4
|
export interface ExecuteProcessOptions {
|
|
4
5
|
runId: string;
|
|
5
6
|
opId: string;
|
|
@@ -18,6 +19,11 @@ export interface ExecuteProcessOptions {
|
|
|
18
19
|
waitTimeoutMs?: number;
|
|
19
20
|
artifactsDir?: string;
|
|
20
21
|
abortSignal?: AbortSignal;
|
|
22
|
+
/**
|
|
23
|
+
* 记录这条命令在 roots 里读过的文件与目录,结果带 `readEvidence`;之后用 `supervisor.evidenceStatus(opId)`
|
|
24
|
+
* 问这份结果是否仍然有效。启动前要遍历一次 roots,结束后再遍历一次并对读过的文件做哈希。
|
|
25
|
+
*/
|
|
26
|
+
trackReads?: TrackReadsSpec;
|
|
21
27
|
/**
|
|
22
28
|
* 流式投影:每个 stdout/stderr chunk 原样转发,不做缓冲或截断。
|
|
23
29
|
* 回调抛错不会中断排空,首个错误以 result.streamCallbackError 记录。
|
|
@@ -30,6 +36,11 @@ export interface CaptureSnapshotOptions {
|
|
|
30
36
|
roots?: string[];
|
|
31
37
|
capabilityId?: string;
|
|
32
38
|
includeIgnored?: boolean;
|
|
39
|
+
/**
|
|
40
|
+
* 'manifest':不复制被忽略文件的内容,只记录每个文件的 size / mtime / ctime / mode。
|
|
41
|
+
* 回滚时清单未变,默认快照也能证明 `complete`。与 includeIgnored 同时给出时无效(内容已在快照内)。
|
|
42
|
+
*/
|
|
43
|
+
trackIgnored?: 'manifest';
|
|
33
44
|
maxTreeSizeBytes?: number;
|
|
34
45
|
timeoutMs?: number;
|
|
35
46
|
}
|
|
@@ -40,6 +51,8 @@ export interface RollbackOptions {
|
|
|
40
51
|
roots?: string[];
|
|
41
52
|
capabilityId?: string;
|
|
42
53
|
force?: boolean;
|
|
54
|
+
/** full_tree 快照之后新出现的被忽略文件:默认保留并列入 unrestoredPaths(status 为 partial);true 时删除。 */
|
|
55
|
+
removeNewIgnored?: boolean;
|
|
43
56
|
timeoutMs?: number;
|
|
44
57
|
}
|
|
45
58
|
export type StreamSubscriber = (stream: 'stdout' | 'stderr', chunk: Buffer) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/supervisor/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/supervisor/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-suite.d.ts","sourceRoot":"","sources":["../../src/testing/contract-suite.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EAEf,cAAc,EACd,iBAAiB,
|
|
1
|
+
{"version":3,"file":"contract-suite.d.ts","sourceRoot":"","sources":["../../src/testing/contract-suite.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EAEf,cAAc,EACd,iBAAiB,EAelB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC;IACpD,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAsCD,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,OAAO,CAAC,eAAe,CAAC,QA2sE9C"}
|