instar 1.3.1674 → 1.3.1676
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/dist/commands/server.d.ts.map +1 -1
- package/dist/commands/server.js +55 -6
- package/dist/commands/server.js.map +1 -1
- package/dist/core/CodexLifecycleProductionComposition.d.ts +1 -1
- package/dist/core/CodexLifecycleProductionComposition.d.ts.map +1 -1
- package/dist/core/EvolutionArchive.d.ts +79 -0
- package/dist/core/EvolutionArchive.d.ts.map +1 -0
- package/dist/core/EvolutionArchive.js +309 -0
- package/dist/core/EvolutionArchive.js.map +1 -0
- package/dist/core/EvolutionArchiveSync.d.ts +26 -0
- package/dist/core/EvolutionArchiveSync.d.ts.map +1 -0
- package/dist/core/EvolutionArchiveSync.js +109 -0
- package/dist/core/EvolutionArchiveSync.js.map +1 -0
- package/dist/core/EvolutionManager.d.ts +37 -6
- package/dist/core/EvolutionManager.d.ts.map +1 -1
- package/dist/core/EvolutionManager.js +210 -149
- package/dist/core/EvolutionManager.js.map +1 -1
- package/dist/core/FileClassifier.d.ts.map +1 -1
- package/dist/core/FileClassifier.js +3 -0
- package/dist/core/FileClassifier.js.map +1 -1
- package/dist/core/JobCoverage.d.ts +53 -0
- package/dist/core/JobCoverage.d.ts.map +1 -0
- package/dist/core/JobCoverage.js +194 -0
- package/dist/core/JobCoverage.js.map +1 -0
- package/dist/core/JobCoverageMonitor.d.ts +84 -0
- package/dist/core/JobCoverageMonitor.d.ts.map +1 -0
- package/dist/core/JobCoverageMonitor.js +364 -0
- package/dist/core/JobCoverageMonitor.js.map +1 -0
- package/dist/core/JobDependency.d.ts +4 -0
- package/dist/core/JobDependency.d.ts.map +1 -0
- package/dist/core/JobDependency.js +30 -0
- package/dist/core/JobDependency.js.map +1 -0
- package/dist/core/JobPortableBundle.d.ts +61 -0
- package/dist/core/JobPortableBundle.d.ts.map +1 -0
- package/dist/core/JobPortableBundle.js +302 -0
- package/dist/core/JobPortableBundle.js.map +1 -0
- package/dist/core/JobPortableFs.d.ts +18 -0
- package/dist/core/JobPortableFs.d.ts.map +1 -0
- package/dist/core/JobPortableFs.js +65 -0
- package/dist/core/JobPortableFs.js.map +1 -0
- package/dist/core/JobPortableIntegrity.d.ts +4 -0
- package/dist/core/JobPortableIntegrity.d.ts.map +1 -0
- package/dist/core/JobPortableIntegrity.js +86 -0
- package/dist/core/JobPortableIntegrity.js.map +1 -0
- package/dist/core/JobPortableSync.d.ts +79 -0
- package/dist/core/JobPortableSync.d.ts.map +1 -0
- package/dist/core/JobPortableSync.js +513 -0
- package/dist/core/JobPortableSync.js.map +1 -0
- package/dist/core/LeaseCoordinator.d.ts.map +1 -1
- package/dist/core/LeaseCoordinator.js +4 -3
- package/dist/core/LeaseCoordinator.js.map +1 -1
- package/dist/core/PostUpdateMigrator.d.ts.map +1 -1
- package/dist/core/PostUpdateMigrator.js +38 -3
- package/dist/core/PostUpdateMigrator.js.map +1 -1
- package/dist/core/ReplicatedStoreReconcilerWiring.d.ts +2 -0
- package/dist/core/ReplicatedStoreReconcilerWiring.d.ts.map +1 -1
- package/dist/core/ReplicatedStoreReconcilerWiring.js +4 -4
- package/dist/core/ReplicatedStoreReconcilerWiring.js.map +1 -1
- package/dist/core/WriteDomainRegistry.d.ts.map +1 -1
- package/dist/core/WriteDomainRegistry.js +13 -0
- package/dist/core/WriteDomainRegistry.js.map +1 -1
- package/dist/core/jobMeshAwareness.d.ts +12 -0
- package/dist/core/jobMeshAwareness.d.ts.map +1 -0
- package/dist/core/jobMeshAwareness.js +37 -0
- package/dist/core/jobMeshAwareness.js.map +1 -0
- package/dist/core/roleFollowRestart.d.ts +16 -0
- package/dist/core/roleFollowRestart.d.ts.map +1 -1
- package/dist/core/roleFollowRestart.js +32 -1
- package/dist/core/roleFollowRestart.js.map +1 -1
- package/dist/core/types.d.ts +24 -4
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js.map +1 -1
- package/dist/data/standards-guard-index.json +1 -1
- package/dist/data/standards-guard-index.meta.json +2 -2
- package/dist/data/standards-registry.meta.json +1 -1
- package/dist/localVerify/FailedFileDiagnosisPeerService.d.ts.map +1 -1
- package/dist/localVerify/FailedFileDiagnosisPeerService.js +3 -1
- package/dist/localVerify/FailedFileDiagnosisPeerService.js.map +1 -1
- package/dist/messaging/TelegramAdapter.d.ts +4 -0
- package/dist/messaging/TelegramAdapter.d.ts.map +1 -1
- package/dist/messaging/TelegramAdapter.js +24 -0
- package/dist/messaging/TelegramAdapter.js.map +1 -1
- package/dist/monitoring/guardManifest.d.ts.map +1 -1
- package/dist/monitoring/guardManifest.js +6 -0
- package/dist/monitoring/guardManifest.js.map +1 -1
- package/dist/native/InstarWedgeCanary.app/Contents/MacOS/InstarWedgeCanary +0 -0
- package/dist/native/instar-desktop-host +0 -0
- package/dist/scaffold/templates.d.ts.map +1 -1
- package/dist/scaffold/templates.js +11 -0
- package/dist/scaffold/templates.js.map +1 -1
- package/dist/scheduler/AgentMdJobLoader.d.ts +4 -15
- package/dist/scheduler/AgentMdJobLoader.d.ts.map +1 -1
- package/dist/scheduler/AgentMdJobLoader.js +69 -1
- package/dist/scheduler/AgentMdJobLoader.js.map +1 -1
- package/dist/scheduler/JobCatalogReconcile.d.ts +2 -0
- package/dist/scheduler/JobCatalogReconcile.d.ts.map +1 -0
- package/dist/scheduler/JobCatalogReconcile.js +27 -0
- package/dist/scheduler/JobCatalogReconcile.js.map +1 -0
- package/dist/scheduler/JobLoader.d.ts.map +1 -1
- package/dist/scheduler/JobLoader.js +26 -1
- package/dist/scheduler/JobLoader.js.map +1 -1
- package/dist/scheduler/JobScheduler.d.ts +14 -9
- package/dist/scheduler/JobScheduler.d.ts.map +1 -1
- package/dist/scheduler/JobScheduler.js +182 -9
- package/dist/scheduler/JobScheduler.js.map +1 -1
- package/dist/scheduler/PromotionCatchUpStore.d.ts +20 -0
- package/dist/scheduler/PromotionCatchUpStore.d.ts.map +1 -0
- package/dist/scheduler/PromotionCatchUpStore.js +60 -0
- package/dist/scheduler/PromotionCatchUpStore.js.map +1 -0
- package/dist/server/AgentServer.d.ts.map +1 -1
- package/dist/server/AgentServer.js +1 -0
- package/dist/server/AgentServer.js.map +1 -1
- package/dist/server/CapabilityIndex.d.ts.map +1 -1
- package/dist/server/CapabilityIndex.js +2 -1
- package/dist/server/CapabilityIndex.js.map +1 -1
- package/dist/server/leaseRenewalDependencies.d.ts +4 -0
- package/dist/server/leaseRenewalDependencies.d.ts.map +1 -1
- package/dist/server/leaseRenewalDependencies.js +2 -0
- package/dist/server/leaseRenewalDependencies.js.map +1 -1
- package/dist/server/routes.d.ts +2 -0
- package/dist/server/routes.d.ts.map +1 -1
- package/dist/server/routes.js +265 -0
- package/dist/server/routes.js.map +1 -1
- package/dist/testing/selfActionRegistry.d.ts.map +1 -1
- package/dist/testing/selfActionRegistry.js +92 -0
- package/dist/testing/selfActionRegistry.js.map +1 -1
- package/package.json +1 -1
- package/scripts/job-portable-fs.py +254 -0
- package/scripts/job-portable-sync-rollback.mjs +66 -0
- package/src/data/builtin-manifest.json +66 -66
- package/src/data/feature-ladders.json +2 -0
- package/src/data/standards-guard-index.json +1 -1
- package/src/data/standards-guard-index.meta.json +2 -2
- package/src/data/standards-registry.meta.json +1 -1
- package/src/scaffold/templates.ts +11 -0
- package/upgrades/1.3.1675.md +48 -0
- package/upgrades/1.3.1676.md +18 -0
- package/upgrades/side-effects/evolution-retention-cap-saturation.md +172 -0
- package/upgrades/side-effects/lease-job-coverage-and-catchup.md +86 -0
- package/upgrades/side-effects/lease-job-definition-replication.md +94 -0
- package/upgrades/side-effects/takeover-keeps-lease.md +17 -0
- package/upgrades/takeover-keeps-lease.eli16.md +22 -0
|
@@ -0,0 +1,302 @@
|
|
|
1
|
+
/** Private, opt-in scheduled-job file bundles. No peer byte is execution authority. */
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import { portableRead, portableCollect } from './JobPortableFs.js';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { createHash } from 'node:crypto';
|
|
6
|
+
import { validateManifest } from '../scheduler/AgentMdJobLoader.js';
|
|
7
|
+
import { validJobDependencyPath } from './JobDependency.js';
|
|
8
|
+
const SLUG = /^[A-Za-z0-9][A-Za-z0-9_-]{0,99}$/;
|
|
9
|
+
const MAX_FILE = 256 * 1024;
|
|
10
|
+
const MAX_PLAINTEXT = 2 * 1024 * 1024;
|
|
11
|
+
const MAX_FILES = 64;
|
|
12
|
+
const MANIFEST_KEYS = new Set([
|
|
13
|
+
'slug', 'origin', 'schedule', 'priority', 'model', 'framework', 'frameworkModel',
|
|
14
|
+
'leanContext', 'expectedDurationMinutes', 'enabled', 'catchUpPolicy', 'requiredPaths',
|
|
15
|
+
'portable', 'execute', 'tags', 'topicId', 'telegramNotify', 'machines', 'gate',
|
|
16
|
+
'unrestrictedTools', 'manifestVersion', 'perMachineIndependent', 'mcpAccess',
|
|
17
|
+
'disabledAtBodyHash', 'completionAudit', 'declaredEffects', 'conditionalEffects',
|
|
18
|
+
]);
|
|
19
|
+
const EXECUTE_KEYS = new Set(['type', 'value', 'args']);
|
|
20
|
+
function sha(value) { return createHash('sha256').update(value).digest('hex'); }
|
|
21
|
+
/** Descriptor-relative walk refuses symlinks in every path component. */
|
|
22
|
+
function safeRead(root, relative) {
|
|
23
|
+
if (!relative.startsWith('jobs/') && !validJobDependencyPath(relative))
|
|
24
|
+
throw new Error('unsafe-path');
|
|
25
|
+
return portableRead(root, relative);
|
|
26
|
+
}
|
|
27
|
+
function addFile(files, root, relative) {
|
|
28
|
+
if (files.length >= MAX_FILES)
|
|
29
|
+
throw new Error('file-count-exceeded');
|
|
30
|
+
const bytes = safeRead(root, relative);
|
|
31
|
+
files.push({ path: relative, sha256: sha(bytes), content: bytes.toString('base64') });
|
|
32
|
+
}
|
|
33
|
+
/** Read a user manifest and only its declared files. Unknown manifest fields are refused. */
|
|
34
|
+
export function collectPortableJob(projectRoot, stateDir, slug) {
|
|
35
|
+
if (!SLUG.test(slug))
|
|
36
|
+
throw new Error('invalid-slug');
|
|
37
|
+
const jobsRoot = path.join(stateDir, 'jobs');
|
|
38
|
+
const relativeManifest = `.instar/jobs/schedule/${slug}.json`;
|
|
39
|
+
const absoluteManifest = path.join(jobsRoot, 'schedule', `${slug}.json`);
|
|
40
|
+
const rawBytes = safeRead(stateDir, `jobs/schedule/${slug}.json`);
|
|
41
|
+
const raw = JSON.parse(rawBytes.toString('utf8'));
|
|
42
|
+
if (Object.keys(raw).some(key => !MANIFEST_KEYS.has(key)))
|
|
43
|
+
throw new Error('unknown-manifest-field');
|
|
44
|
+
if (!raw.execute || typeof raw.execute !== 'object' || Array.isArray(raw.execute)
|
|
45
|
+
|| Object.keys(raw.execute).some(key => !EXECUTE_KEYS.has(key)))
|
|
46
|
+
throw new Error('unknown-execute-field');
|
|
47
|
+
const manifest = validateManifest(raw, absoluteManifest);
|
|
48
|
+
if (manifest.slug !== slug || manifest.origin !== 'user' || manifest.portable !== true
|
|
49
|
+
|| !Array.isArray(manifest.requiredPaths))
|
|
50
|
+
throw new Error('not-approved-portable-shape');
|
|
51
|
+
if (manifest.machines?.length)
|
|
52
|
+
throw new Error('machine-pinned');
|
|
53
|
+
assertExecutableDeclared(manifest);
|
|
54
|
+
const files = [{ path: relativeManifest, sha256: sha(rawBytes), content: rawBytes.toString('base64') }];
|
|
55
|
+
const body = `.instar/jobs/user/${slug}.md`;
|
|
56
|
+
if (manifest.execute.type === 'agentmd') {
|
|
57
|
+
const bytes = safeRead(stateDir, `jobs/user/${slug}.md`);
|
|
58
|
+
files.push({ path: body, sha256: sha(bytes), content: bytes.toString('base64') });
|
|
59
|
+
}
|
|
60
|
+
for (const dependency of manifest.requiredPaths)
|
|
61
|
+
if (!validJobDependencyPath(dependency))
|
|
62
|
+
throw new Error('dependency-refused');
|
|
63
|
+
files.push(...portableCollect(projectRoot, manifest.requiredPaths));
|
|
64
|
+
const unique = new Set(files.map(file => file.path));
|
|
65
|
+
if (unique.size !== files.length)
|
|
66
|
+
throw new Error('duplicate-file');
|
|
67
|
+
files.sort((a, b) => a.path.localeCompare(b.path));
|
|
68
|
+
const root = sha(files.map(file => `${file.path}\0${file.sha256}\n`).join(''));
|
|
69
|
+
const bundle = { version: 1, slug, root, files };
|
|
70
|
+
if (Buffer.byteLength(JSON.stringify(bundle)) > MAX_PLAINTEXT)
|
|
71
|
+
throw new Error('bundle-oversized');
|
|
72
|
+
return bundle;
|
|
73
|
+
}
|
|
74
|
+
/** Validate a decrypted bundle before storing any bytes. */
|
|
75
|
+
export function validatePortableBundle(value) {
|
|
76
|
+
if (!value || typeof value !== 'object')
|
|
77
|
+
throw new Error('invalid-bundle');
|
|
78
|
+
const bundle = value;
|
|
79
|
+
if (bundle.version !== 1 || typeof bundle.slug !== 'string' || !SLUG.test(bundle.slug)
|
|
80
|
+
|| typeof bundle.root !== 'string' || !/^[a-f0-9]{64}$/.test(bundle.root)
|
|
81
|
+
|| !Array.isArray(bundle.files) || bundle.files.length > MAX_FILES
|
|
82
|
+
|| Buffer.byteLength(JSON.stringify(bundle)) > MAX_PLAINTEXT)
|
|
83
|
+
throw new Error('invalid-bundle');
|
|
84
|
+
const seen = new Set();
|
|
85
|
+
for (const file of bundle.files) {
|
|
86
|
+
if (!file || typeof file.path !== 'string' || typeof file.sha256 !== 'string'
|
|
87
|
+
|| !/^[a-f0-9]{64}$/.test(file.sha256) || typeof file.content !== 'string'
|
|
88
|
+
|| !/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(file.content)
|
|
89
|
+
|| seen.has(file.path))
|
|
90
|
+
throw new Error('invalid-file');
|
|
91
|
+
const isManifest = file.path === `.instar/jobs/schedule/${bundle.slug}.json`;
|
|
92
|
+
const isBody = file.path === `.instar/jobs/user/${bundle.slug}.md`;
|
|
93
|
+
if (!isManifest && !isBody && !validJobDependencyPath(file.path))
|
|
94
|
+
throw new Error('invalid-path');
|
|
95
|
+
const bytes = Buffer.from(file.content, 'base64');
|
|
96
|
+
if (bytes.length > MAX_FILE || sha(bytes) !== file.sha256)
|
|
97
|
+
throw new Error('invalid-file-hash');
|
|
98
|
+
seen.add(file.path);
|
|
99
|
+
}
|
|
100
|
+
const manifestFile = bundle.files.find(file => file.path === `.instar/jobs/schedule/${bundle.slug}.json`);
|
|
101
|
+
if (!manifestFile)
|
|
102
|
+
throw new Error('manifest-missing');
|
|
103
|
+
const raw = JSON.parse(Buffer.from(manifestFile.content, 'base64').toString('utf8'));
|
|
104
|
+
if (Object.keys(raw).some(key => !MANIFEST_KEYS.has(key)) || !raw.execute
|
|
105
|
+
|| typeof raw.execute !== 'object' || Array.isArray(raw.execute)
|
|
106
|
+
|| Object.keys(raw.execute).some(key => !EXECUTE_KEYS.has(key)))
|
|
107
|
+
throw new Error('unknown-manifest-field');
|
|
108
|
+
const manifest = validateManifest(raw);
|
|
109
|
+
if (manifest.origin !== 'user' || manifest.slug !== bundle.slug || manifest.portable !== true
|
|
110
|
+
|| !Array.isArray(manifest.requiredPaths) || manifest.machines?.length)
|
|
111
|
+
throw new Error('not-portable');
|
|
112
|
+
const body = `.instar/jobs/user/${bundle.slug}.md`;
|
|
113
|
+
if (manifest.execute.type === 'agentmd' && !seen.has(body))
|
|
114
|
+
throw new Error('body-missing');
|
|
115
|
+
assertExecutableDeclared(manifest);
|
|
116
|
+
for (const dependency of manifest.requiredPaths) {
|
|
117
|
+
if (!seen.has(dependency) && ![...seen].some(file => file.startsWith(`${dependency}/`)))
|
|
118
|
+
throw new Error('dependency-missing');
|
|
119
|
+
}
|
|
120
|
+
for (const file of bundle.files) {
|
|
121
|
+
if (file.path.startsWith('.instar/jobs/')) {
|
|
122
|
+
if (file.path !== manifestFile.path && file.path !== body)
|
|
123
|
+
throw new Error('unexpected-job-file');
|
|
124
|
+
}
|
|
125
|
+
else if (!manifest.requiredPaths.some(dep => file.path === dep || file.path.startsWith(`${dep}/`))) {
|
|
126
|
+
throw new Error('undeclared-dependency');
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
const root = sha([...bundle.files].sort((a, b) => a.path.localeCompare(b.path))
|
|
130
|
+
.map(file => `${file.path}\0${file.sha256}\n`).join(''));
|
|
131
|
+
if (root !== bundle.root)
|
|
132
|
+
throw new Error('root-mismatch');
|
|
133
|
+
return bundle;
|
|
134
|
+
}
|
|
135
|
+
function assertExecutableDeclared(manifest) {
|
|
136
|
+
if (manifest.execute.type !== 'script' && manifest.execute.type !== 'skill')
|
|
137
|
+
return;
|
|
138
|
+
const target = manifest.execute.value;
|
|
139
|
+
if (!target || !validJobDependencyPath(target)
|
|
140
|
+
|| !manifest.requiredPaths?.some(dependency => target === dependency || target.startsWith(`${dependency}/`)))
|
|
141
|
+
throw new Error('executable-dependency-undeclared');
|
|
142
|
+
}
|
|
143
|
+
/** Signed, recipient-bound transport. The shared Bearer token only admits HTTP. */
|
|
144
|
+
import { sign, verify } from './MachineIdentity.js';
|
|
145
|
+
import { encryptForSync, decryptFromSync } from './SecretStore.js';
|
|
146
|
+
import crypto from 'node:crypto';
|
|
147
|
+
const MACHINE_ID = /^m_[a-f0-9]{32}$/;
|
|
148
|
+
const NONCE = /^[a-f0-9]{64}$/;
|
|
149
|
+
function requestMessage(row) {
|
|
150
|
+
return `instar-portable-job-request-v1|${JSON.stringify(row)}`;
|
|
151
|
+
}
|
|
152
|
+
export function makePortableBundleRequest(sourceMachineId, recipientMachineId, slug, nonce, privateKey, sourceKeyEpoch = 0, recipientKeyEpoch = 0) {
|
|
153
|
+
if (!MACHINE_ID.test(sourceMachineId) || !MACHINE_ID.test(recipientMachineId)
|
|
154
|
+
|| !SLUG.test(slug) || !NONCE.test(nonce) || !Number.isSafeInteger(sourceKeyEpoch)
|
|
155
|
+
|| sourceKeyEpoch < 0 || !Number.isSafeInteger(recipientKeyEpoch) || recipientKeyEpoch < 0)
|
|
156
|
+
throw new Error('invalid-request');
|
|
157
|
+
const row = { version: 1, sourceMachineId, recipientMachineId, sourceKeyEpoch, recipientKeyEpoch, slug, nonce };
|
|
158
|
+
return { ...row, signature: sign(requestMessage(row), privateKey) };
|
|
159
|
+
}
|
|
160
|
+
export function acceptPortableBundleRequest(value, expectedSource, publicKey) {
|
|
161
|
+
if (!value || typeof value !== 'object')
|
|
162
|
+
throw new Error('invalid-request');
|
|
163
|
+
const row = value;
|
|
164
|
+
if (row.version !== 1 || row.sourceMachineId !== expectedSource
|
|
165
|
+
|| !MACHINE_ID.test(row.recipientMachineId) || !SLUG.test(row.slug) || !NONCE.test(row.nonce)
|
|
166
|
+
|| !Number.isSafeInteger(row.sourceKeyEpoch) || row.sourceKeyEpoch < 0
|
|
167
|
+
|| !Number.isSafeInteger(row.recipientKeyEpoch) || row.recipientKeyEpoch < 0
|
|
168
|
+
|| typeof row.signature !== 'string' || JSON.stringify(value).length > 1024)
|
|
169
|
+
throw new Error('invalid-request');
|
|
170
|
+
const unsigned = { version: 1, sourceMachineId: row.sourceMachineId,
|
|
171
|
+
recipientMachineId: row.recipientMachineId, sourceKeyEpoch: row.sourceKeyEpoch,
|
|
172
|
+
recipientKeyEpoch: row.recipientKeyEpoch, slug: row.slug, nonce: row.nonce };
|
|
173
|
+
if (!verify(requestMessage(unsigned), row.signature, publicKey))
|
|
174
|
+
throw new Error('invalid-request-signature');
|
|
175
|
+
return row;
|
|
176
|
+
}
|
|
177
|
+
function bundleWireMessage(row) {
|
|
178
|
+
return `instar-portable-job-response-v1|${JSON.stringify(row)}`;
|
|
179
|
+
}
|
|
180
|
+
export function makePortableBundleWire(bundle, request, sourcePrivateKey, recipientEncryptionPublicKey, generation) {
|
|
181
|
+
if (!Number.isSafeInteger(generation) || generation < 1)
|
|
182
|
+
throw new Error('invalid-generation');
|
|
183
|
+
const encrypted = encryptForSync({ bundle: JSON.stringify(bundle) }, recipientEncryptionPublicKey);
|
|
184
|
+
const row = { version: 1, sourceMachineId: request.sourceMachineId,
|
|
185
|
+
recipientMachineId: request.recipientMachineId, sourceKeyEpoch: request.sourceKeyEpoch,
|
|
186
|
+
recipientKeyEpoch: request.recipientKeyEpoch, slug: request.slug, nonce: request.nonce,
|
|
187
|
+
root: bundle.root, generation, encrypted };
|
|
188
|
+
if (Buffer.byteLength(JSON.stringify(row)) > 6 * 1024 * 1024)
|
|
189
|
+
throw new Error('wire-oversized');
|
|
190
|
+
return { ...row, signature: sign(bundleWireMessage(row), sourcePrivateKey) };
|
|
191
|
+
}
|
|
192
|
+
export function acceptPortableBundleWire(value, request, sourcePublicKey, recipientPrivateKeyPem) {
|
|
193
|
+
if (!value || typeof value !== 'object' || Buffer.byteLength(JSON.stringify(value)) > 6 * 1024 * 1024)
|
|
194
|
+
throw new Error('invalid-wire');
|
|
195
|
+
const row = value;
|
|
196
|
+
if (row.version !== 1 || row.sourceMachineId !== request.sourceMachineId
|
|
197
|
+
|| row.recipientMachineId !== request.recipientMachineId
|
|
198
|
+
|| row.sourceKeyEpoch !== request.sourceKeyEpoch || row.recipientKeyEpoch !== request.recipientKeyEpoch
|
|
199
|
+
|| row.slug !== request.slug
|
|
200
|
+
|| row.nonce !== request.nonce || !/^[a-f0-9]{64}$/.test(row.root)
|
|
201
|
+
|| !Number.isSafeInteger(row.generation) || row.generation < 1
|
|
202
|
+
|| typeof row.signature !== 'string' || !row.encrypted || typeof row.encrypted !== 'object')
|
|
203
|
+
throw new Error('invalid-wire');
|
|
204
|
+
const unsigned = { version: 1, sourceMachineId: row.sourceMachineId,
|
|
205
|
+
recipientMachineId: row.recipientMachineId, sourceKeyEpoch: row.sourceKeyEpoch,
|
|
206
|
+
recipientKeyEpoch: row.recipientKeyEpoch, slug: row.slug, nonce: row.nonce,
|
|
207
|
+
root: row.root, generation: row.generation, encrypted: row.encrypted };
|
|
208
|
+
if (!verify(bundleWireMessage(unsigned), row.signature, sourcePublicKey))
|
|
209
|
+
throw new Error('invalid-wire-signature');
|
|
210
|
+
const opened = decryptFromSync(row.encrypted, crypto.createPrivateKey(recipientPrivateKeyPem));
|
|
211
|
+
if (typeof opened.bundle !== 'string')
|
|
212
|
+
throw new Error('invalid-plaintext');
|
|
213
|
+
const bundle = validatePortableBundle(JSON.parse(opened.bundle));
|
|
214
|
+
if (bundle.slug !== row.slug || bundle.root !== row.root)
|
|
215
|
+
throw new Error('root-mismatch');
|
|
216
|
+
return bundle;
|
|
217
|
+
}
|
|
218
|
+
export class PortableApprovalStore {
|
|
219
|
+
kind;
|
|
220
|
+
file;
|
|
221
|
+
constructor(stateDir, kind) {
|
|
222
|
+
this.kind = kind;
|
|
223
|
+
this.file = path.join(stateDir, 'state', `job-portable-${kind}-approval.json`);
|
|
224
|
+
}
|
|
225
|
+
read() {
|
|
226
|
+
try {
|
|
227
|
+
const raw = fs.readFileSync(this.file, 'utf8');
|
|
228
|
+
if (raw.length > 64 * 1024)
|
|
229
|
+
return {};
|
|
230
|
+
const row = JSON.parse(raw);
|
|
231
|
+
return row && row.version === 1 && row.approvals && typeof row.approvals === 'object'
|
|
232
|
+
? row.approvals : {};
|
|
233
|
+
}
|
|
234
|
+
catch {
|
|
235
|
+
return {};
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
isApproved(slug, root) {
|
|
239
|
+
const row = this.read()[slug];
|
|
240
|
+
return row?.root === root && Number.isFinite(Date.parse(row.approvedAt));
|
|
241
|
+
}
|
|
242
|
+
approve(slug, root) {
|
|
243
|
+
if (!SLUG.test(slug) || !/^[a-f0-9]{64}$/.test(root))
|
|
244
|
+
throw new Error('invalid-approval');
|
|
245
|
+
const approvals = this.read();
|
|
246
|
+
approvals[slug] = { root, approvedAt: new Date().toISOString() };
|
|
247
|
+
fs.mkdirSync(path.dirname(this.file), { recursive: true });
|
|
248
|
+
const tmp = `${this.file}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`;
|
|
249
|
+
fs.writeFileSync(tmp, JSON.stringify({ version: 1, kind: this.kind, approvals }), { mode: 0o600 });
|
|
250
|
+
fs.renameSync(tmp, this.file);
|
|
251
|
+
}
|
|
252
|
+
revoke(slug) {
|
|
253
|
+
const approvals = this.read();
|
|
254
|
+
delete approvals[slug];
|
|
255
|
+
fs.mkdirSync(path.dirname(this.file), { recursive: true });
|
|
256
|
+
const tmp = `${this.file}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`;
|
|
257
|
+
fs.writeFileSync(tmp, JSON.stringify({ version: 1, kind: this.kind, approvals }), { mode: 0o600 });
|
|
258
|
+
fs.renameSync(tmp, this.file);
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
/** Source-owned monotonic content version, advanced only with an exact-root export approval. */
|
|
262
|
+
export class PortableGenerationStore {
|
|
263
|
+
file;
|
|
264
|
+
constructor(stateDir) { this.file = path.join(stateDir, 'state', 'job-portable-generation.json'); }
|
|
265
|
+
read() {
|
|
266
|
+
try {
|
|
267
|
+
const raw = fs.readFileSync(this.file, 'utf8');
|
|
268
|
+
if (raw.length > 64 * 1024)
|
|
269
|
+
throw new Error('generation-store-oversized');
|
|
270
|
+
const row = JSON.parse(raw);
|
|
271
|
+
if (!row || row.version !== 1 || !row.jobs || typeof row.jobs !== 'object')
|
|
272
|
+
throw new Error('generation-store-corrupt');
|
|
273
|
+
return row.jobs;
|
|
274
|
+
}
|
|
275
|
+
catch (error) {
|
|
276
|
+
if (error.code === 'ENOENT')
|
|
277
|
+
return {};
|
|
278
|
+
throw error;
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
current(slug, root) {
|
|
282
|
+
const row = this.read()[slug];
|
|
283
|
+
return row?.root === root && Number.isSafeInteger(row.generation) && row.generation > 0
|
|
284
|
+
? row.generation : null;
|
|
285
|
+
}
|
|
286
|
+
advance(slug, root) {
|
|
287
|
+
if (!SLUG.test(slug) || !/^[a-f0-9]{64}$/.test(root))
|
|
288
|
+
throw new Error('invalid-generation-key');
|
|
289
|
+
const jobs = this.read();
|
|
290
|
+
const prior = jobs[slug];
|
|
291
|
+
const generation = prior?.root === root ? prior.generation : (prior?.generation ?? 0) + 1;
|
|
292
|
+
if (!Number.isSafeInteger(generation) || generation < 1)
|
|
293
|
+
throw new Error('generation-exhausted');
|
|
294
|
+
jobs[slug] = { root, generation };
|
|
295
|
+
fs.mkdirSync(path.dirname(this.file), { recursive: true });
|
|
296
|
+
const tmp = `${this.file}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`;
|
|
297
|
+
fs.writeFileSync(tmp, JSON.stringify({ version: 1, jobs }), { mode: 0o600 });
|
|
298
|
+
fs.renameSync(tmp, this.file);
|
|
299
|
+
return generation;
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
//# sourceMappingURL=JobPortableBundle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JobPortableBundle.js","sourceRoot":"","sources":["../../src/core/JobPortableBundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export declare function portableQuarantineIfHash(root: string, source: string, target: string, expected: string): boolean;
|
|
2
|
+
export declare function portableList(root: string, relative: string): Array<{
|
|
3
|
+
name: string;
|
|
4
|
+
kind: 'file' | 'dir';
|
|
5
|
+
}>;
|
|
6
|
+
export declare function portableVerify(root: string, expected: Record<string, string>): void;
|
|
7
|
+
export declare function portableCollect(root: string, dependencies: string[]): Array<{
|
|
8
|
+
path: string;
|
|
9
|
+
sha256: string;
|
|
10
|
+
content: string;
|
|
11
|
+
}>;
|
|
12
|
+
export declare function portableRead(root: string, relative: string): Buffer;
|
|
13
|
+
export declare function portableWrite(root: string, relative: string, content: Buffer, expectedOld?: string): {
|
|
14
|
+
kind: 'same' | 'created' | 'updated';
|
|
15
|
+
old: Buffer;
|
|
16
|
+
};
|
|
17
|
+
export declare function portableRemoveIfHash(root: string, relative: string, expected: string): void;
|
|
18
|
+
//# sourceMappingURL=JobPortableFs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JobPortableFs.d.ts","sourceRoot":"","sources":["../../src/core/JobPortableFs.ts"],"names":[],"mappings":"AAkBA,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAKhH;AACD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,CAAC,CAK1G;AACD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAOnF;AACD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAS9H;AACD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEnE;AACD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG;IACpG,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CACnD,CAMA;AACD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE3F"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/** Descriptor-relative, no-follow file operations for private portable jobs. */
|
|
2
|
+
// RULE 3: EXEMPT — JSON.parse decodes a fixed schema from our bundled helper process; it does not infer external provider or machine state.
|
|
3
|
+
import { spawnSync } from 'node:child_process';
|
|
4
|
+
import { fileURLToPath } from 'node:url';
|
|
5
|
+
import { withSyncOp } from './InFlightSyncOpMarker.js';
|
|
6
|
+
const helper = fileURLToPath(new URL('../../scripts/job-portable-fs.py', import.meta.url));
|
|
7
|
+
const MAX_OUTPUT = 1024 * 1024;
|
|
8
|
+
function run(mode, root, relative, input, extra) {
|
|
9
|
+
const result = withSyncOp(() => spawnSync('python3', [helper, mode, root, relative, ...(extra ? [extra] : [])], {
|
|
10
|
+
input, maxBuffer: MAX_OUTPUT, timeout: 3000,
|
|
11
|
+
}));
|
|
12
|
+
if (result.error || result.status !== 0) {
|
|
13
|
+
const reason = result.stderr?.toString('utf8').trim() || result.error?.message || 'helper-failed';
|
|
14
|
+
throw new Error(`portable-filesystem-refused: ${reason}`);
|
|
15
|
+
}
|
|
16
|
+
return result.stdout;
|
|
17
|
+
}
|
|
18
|
+
export function portableQuarantineIfHash(root, source, target, expected) {
|
|
19
|
+
const result = withSyncOp(() => spawnSync('python3', [helper, 'quarantine', root, source, target, expected], { maxBuffer: MAX_OUTPUT, timeout: 3000 }));
|
|
20
|
+
if (result.error || result.status !== 0)
|
|
21
|
+
throw new Error(result.stderr?.toString('utf8').trim() || 'quarantine-refused');
|
|
22
|
+
return result.stdout.toString('utf8').trim() === 'moved';
|
|
23
|
+
}
|
|
24
|
+
export function portableList(root, relative) {
|
|
25
|
+
const rows = JSON.parse(run('list', root, relative).toString('utf8'));
|
|
26
|
+
if (!Array.isArray(rows) || rows.some(row => typeof row.name !== 'string' || !['file', 'dir'].includes(row.kind)))
|
|
27
|
+
throw new Error('invalid-helper-list');
|
|
28
|
+
return rows;
|
|
29
|
+
}
|
|
30
|
+
export function portableVerify(root, expected) {
|
|
31
|
+
if (Object.keys(expected).length === 0)
|
|
32
|
+
return;
|
|
33
|
+
const result = withSyncOp(() => spawnSync('python3', [helper, 'verify', root, '.'], {
|
|
34
|
+
input: JSON.stringify(expected), maxBuffer: 1024, timeout: 1800,
|
|
35
|
+
}));
|
|
36
|
+
if (result.error || result.status !== 0 || result.stdout.toString('utf8').trim() !== 'verified')
|
|
37
|
+
throw new Error(result.stderr?.toString('utf8').trim() || result.error?.message || 'imported-file-changed');
|
|
38
|
+
}
|
|
39
|
+
export function portableCollect(root, dependencies) {
|
|
40
|
+
if (dependencies.length === 0)
|
|
41
|
+
return [];
|
|
42
|
+
const result = withSyncOp(() => spawnSync('python3', [helper, 'collect', root, '.'], {
|
|
43
|
+
input: JSON.stringify(dependencies), maxBuffer: 3 * 1024 * 1024, timeout: 1800,
|
|
44
|
+
}));
|
|
45
|
+
if (result.error || result.status !== 0)
|
|
46
|
+
throw new Error(result.stderr?.toString('utf8').trim() || result.error?.message || 'collect-refused');
|
|
47
|
+
const rows = JSON.parse(result.stdout.toString('utf8'));
|
|
48
|
+
if (!Array.isArray(rows) || rows.length > 64)
|
|
49
|
+
throw new Error('collect-output-invalid');
|
|
50
|
+
return rows;
|
|
51
|
+
}
|
|
52
|
+
export function portableRead(root, relative) {
|
|
53
|
+
return run('read', root, relative);
|
|
54
|
+
}
|
|
55
|
+
export function portableWrite(root, relative, content, expectedOld) {
|
|
56
|
+
const output = run('write', root, relative, JSON.stringify({ content: content.toString('hex'), expectedOld }));
|
|
57
|
+
const row = JSON.parse(output.toString('utf8'));
|
|
58
|
+
if (!['same', 'created', 'updated'].includes(row.kind) || typeof row.old !== 'string')
|
|
59
|
+
throw new Error('invalid-helper-output');
|
|
60
|
+
return { kind: row.kind, old: Buffer.from(row.old, 'hex') };
|
|
61
|
+
}
|
|
62
|
+
export function portableRemoveIfHash(root, relative, expected) {
|
|
63
|
+
run('remove', root, relative, undefined, expected);
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=JobPortableFs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JobPortableFs.js","sourceRoot":"","sources":["../../src/core/JobPortableFs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export declare function verifyImportedPortableJob(stateDir: string, projectDir: string, slug: string): boolean;
|
|
2
|
+
/** Persist an admission refusal for the coverage alert without exposing paths. */
|
|
3
|
+
export declare function recordImportedPortableIntegrityFailure(stateDir: string, slug: string): void;
|
|
4
|
+
//# sourceMappingURL=JobPortableIntegrity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JobPortableIntegrity.d.ts","sourceRoot":"","sources":["../../src/core/JobPortableIntegrity.ts"],"names":[],"mappings":"AAMA,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CA+BrG;AAED,kFAAkF;AAClF,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAsB3F"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
/** Admission-time integrity for locally approved imported jobs. */
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { validJobDependencyPath } from './JobDependency.js';
|
|
5
|
+
import { portableVerify } from './JobPortableFs.js';
|
|
6
|
+
export function verifyImportedPortableJob(stateDir, projectDir, slug) {
|
|
7
|
+
let journal;
|
|
8
|
+
try {
|
|
9
|
+
const raw = fs.readFileSync(path.join(stateDir, 'state', 'job-portable-import-journal.json'), 'utf8');
|
|
10
|
+
if (raw.length > 8 * 1024 * 1024)
|
|
11
|
+
return false;
|
|
12
|
+
journal = JSON.parse(raw);
|
|
13
|
+
if (!journal || typeof journal.jobs !== 'object')
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
catch (error) { /* @silent-fallback-ok — absent journal means ordinary local job; other errors refuse */
|
|
17
|
+
return error.code === 'ENOENT';
|
|
18
|
+
}
|
|
19
|
+
const imported = journal.jobs[slug];
|
|
20
|
+
if (!imported)
|
|
21
|
+
return true;
|
|
22
|
+
if (fs.existsSync(path.join(stateDir, 'state', 'job-portable-pending', `${slug}.json`))
|
|
23
|
+
|| fs.existsSync(path.join(stateDir, 'state', 'job-portable-disarmed.json'))
|
|
24
|
+
|| imported.state !== 'active' || !imported.expected)
|
|
25
|
+
return false;
|
|
26
|
+
try {
|
|
27
|
+
const approvals = JSON.parse(fs.readFileSync(path.join(stateDir, 'state', 'job-portable-activate-approval.json'), 'utf8'));
|
|
28
|
+
if (approvals?.approvals?.[slug]?.root !== imported.root)
|
|
29
|
+
return false;
|
|
30
|
+
const project = {};
|
|
31
|
+
const state = {};
|
|
32
|
+
for (const [file, hash] of Object.entries(imported.expected)) {
|
|
33
|
+
if (!/^[a-f0-9]{64}$/.test(hash))
|
|
34
|
+
return false;
|
|
35
|
+
if (file === `.instar/jobs/schedule/${slug}.json` || file === `.instar/jobs/user/${slug}.md`) {
|
|
36
|
+
state[file.slice('.instar/'.length)] = hash;
|
|
37
|
+
}
|
|
38
|
+
else if (validJobDependencyPath(file))
|
|
39
|
+
project[file] = hash;
|
|
40
|
+
else
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
if (Object.keys(project).length + Object.keys(state).length === 0
|
|
44
|
+
|| Object.keys(project).length + Object.keys(state).length > 64)
|
|
45
|
+
return false;
|
|
46
|
+
portableVerify(stateDir, state);
|
|
47
|
+
portableVerify(projectDir, project);
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
catch { /* @silent-fallback-ok — any integrity error refuses the imported job */
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
/** Persist an admission refusal for the coverage alert without exposing paths. */
|
|
55
|
+
export function recordImportedPortableIntegrityFailure(stateDir, slug) {
|
|
56
|
+
try {
|
|
57
|
+
const journal = JSON.parse(fs.readFileSync(path.join(stateDir, 'state', 'job-portable-import-journal.json'), 'utf8'));
|
|
58
|
+
const source = journal?.jobs?.[slug]?.source;
|
|
59
|
+
if (typeof source !== 'string' || !/^m_[a-f0-9]{32}$/.test(source))
|
|
60
|
+
return;
|
|
61
|
+
const file = path.join(stateDir, 'state', 'job-portable-status.json');
|
|
62
|
+
let jobs = {};
|
|
63
|
+
try {
|
|
64
|
+
const raw = fs.readFileSync(file, 'utf8');
|
|
65
|
+
if (raw.length > 128 * 1024)
|
|
66
|
+
throw new Error('status-oversized');
|
|
67
|
+
const prior = JSON.parse(raw);
|
|
68
|
+
if (prior.version !== 1 || !prior.jobs || typeof prior.jobs !== 'object')
|
|
69
|
+
throw new Error('status-corrupt');
|
|
70
|
+
jobs = prior.jobs;
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
if (error.code !== 'ENOENT')
|
|
74
|
+
throw error;
|
|
75
|
+
}
|
|
76
|
+
jobs[`${source}:${slug}`] = { state: 'error', reason: 'imported-file-integrity', at: new Date().toISOString() };
|
|
77
|
+
fs.mkdirSync(path.dirname(file), { recursive: true });
|
|
78
|
+
const tmp = `${file}.${process.pid}.integrity.tmp`;
|
|
79
|
+
fs.writeFileSync(tmp, JSON.stringify({ version: 1, jobs }), { mode: 0o600 });
|
|
80
|
+
fs.renameSync(tmp, file);
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
console.warn('[job-portable] could not persist integrity refusal:', error);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=JobPortableIntegrity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JobPortableIntegrity.js","sourceRoot":"","sources":["../../src/core/JobPortableIntegrity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import type { MachineIdentityManager } from './MachineIdentity.js';
|
|
2
|
+
import { type PeerEndpointKind } from '../server/peerUrlGuard.js';
|
|
3
|
+
import { type PoolPeerTarget, type RopeResultRecorder } from '../server/poolPeerFetch.js';
|
|
4
|
+
import type { JobCoverageEntry } from './JobCoverage.js';
|
|
5
|
+
import { type PortableBundleWire, type PortableJobBundle } from './JobPortableBundle.js';
|
|
6
|
+
export interface JobPortableSyncOptions {
|
|
7
|
+
stateDir: string;
|
|
8
|
+
projectDir: string;
|
|
9
|
+
identityManager: MachineIdentityManager;
|
|
10
|
+
authToken: string;
|
|
11
|
+
readOnly?: boolean;
|
|
12
|
+
onImport?: () => void;
|
|
13
|
+
withAdmissionFence?: <T>(action: () => T) => T;
|
|
14
|
+
recordRopeResult?: RopeResultRecorder;
|
|
15
|
+
}
|
|
16
|
+
export declare class JobPortableSync {
|
|
17
|
+
private readonly options;
|
|
18
|
+
private readonly exportApprovals;
|
|
19
|
+
private readonly activationApprovals;
|
|
20
|
+
private readonly inboxDir;
|
|
21
|
+
private readonly generations;
|
|
22
|
+
private readonly lastServe;
|
|
23
|
+
private readonly rollbackLatch;
|
|
24
|
+
constructor(options: JobPortableSyncOptions);
|
|
25
|
+
/** PIN-gated caller: approval is for the exact files the local operator reviewed. */
|
|
26
|
+
approveExport(slug: string, expectedRoot: string): PortableJobBundle;
|
|
27
|
+
revokeExport(slug: string): void;
|
|
28
|
+
previewExport(slug: string): {
|
|
29
|
+
slug: string;
|
|
30
|
+
root: string;
|
|
31
|
+
files: Array<{
|
|
32
|
+
path: string;
|
|
33
|
+
sha256: string;
|
|
34
|
+
}>;
|
|
35
|
+
};
|
|
36
|
+
/** Source route: requester signature and registered identity are checked before disk walking. */
|
|
37
|
+
serve(rawRequest: unknown): PortableBundleWire;
|
|
38
|
+
private rememberNonce;
|
|
39
|
+
private statusFile;
|
|
40
|
+
private readStatuses;
|
|
41
|
+
private recordStatus;
|
|
42
|
+
/** Receiver: poll only a registered peer that advertised a portable job. */
|
|
43
|
+
pollPeer(peer: PoolPeerTarget & {
|
|
44
|
+
kind: PeerEndpointKind;
|
|
45
|
+
}, observed: JobCoverageEntry, generation: string): Promise<{
|
|
46
|
+
root: string;
|
|
47
|
+
staged: boolean;
|
|
48
|
+
}>;
|
|
49
|
+
private pollPeerVerified;
|
|
50
|
+
previewImport(sourceMachineId: string, slug: string): {
|
|
51
|
+
root: string;
|
|
52
|
+
files: Array<{
|
|
53
|
+
path: string;
|
|
54
|
+
sha256: string;
|
|
55
|
+
}>;
|
|
56
|
+
};
|
|
57
|
+
/** PIN-gated caller: a peer cannot activate a quarantined bundle. */
|
|
58
|
+
approveImport(sourceMachineId: string, slug: string, expectedRoot: string): void;
|
|
59
|
+
revokeImport(slug: string): void;
|
|
60
|
+
private revokeImportFenced;
|
|
61
|
+
rollbackAll(): string[];
|
|
62
|
+
private rollbackAllFenced;
|
|
63
|
+
rearm(): void;
|
|
64
|
+
/** Bounded durable status index; no bundle or dependency bytes on the coverage hot path. */
|
|
65
|
+
gaps(): string[];
|
|
66
|
+
private acceptGeneration;
|
|
67
|
+
private inboxPath;
|
|
68
|
+
private writeInbox;
|
|
69
|
+
private readInbox;
|
|
70
|
+
private applyLatch;
|
|
71
|
+
private journalPath;
|
|
72
|
+
private readImportJournal;
|
|
73
|
+
private writeImportJournal;
|
|
74
|
+
private quarantineImportedManifest;
|
|
75
|
+
private fenced;
|
|
76
|
+
private install;
|
|
77
|
+
private installFenced;
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=JobPortableSync.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JobPortableSync.d.ts","sourceRoot":"","sources":["../../src/core/JobPortableSync.ts"],"names":[],"mappings":"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"}
|