@calliopelabs/cli 3.5.4 → 3.7.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 +8 -0
- package/dist/acp/controls.d.ts +10 -0
- package/dist/acp/controls.d.ts.map +1 -0
- package/dist/acp/controls.js +81 -0
- package/dist/acp/controls.js.map +1 -0
- package/dist/acp.d.ts +21 -7
- package/dist/acp.d.ts.map +1 -1
- package/dist/acp.js +139 -23
- package/dist/acp.js.map +1 -1
- package/dist/bin.d.ts.map +1 -1
- package/dist/bin.js +28 -8
- package/dist/bin.js.map +1 -1
- package/dist/build-identity.d.ts +27 -0
- package/dist/build-identity.d.ts.map +1 -0
- package/dist/build-identity.js +32 -0
- package/dist/build-identity.js.map +1 -0
- package/dist/build-metadata.json +1 -0
- package/dist/execution/authority.d.ts +4 -1
- package/dist/execution/authority.d.ts.map +1 -1
- package/dist/execution/authority.js +23 -7
- package/dist/execution/authority.js.map +1 -1
- package/dist/execution/child-grants.d.ts +2 -0
- package/dist/execution/child-grants.d.ts.map +1 -1
- package/dist/execution/child-grants.js +19 -4
- package/dist/execution/child-grants.js.map +1 -1
- package/dist/execution/delegated.d.ts +14 -0
- package/dist/execution/delegated.d.ts.map +1 -0
- package/dist/execution/delegated.js +66 -0
- package/dist/execution/delegated.js.map +1 -0
- package/dist/execution/files.js +6 -6
- package/dist/execution/files.js.map +1 -1
- package/dist/execution/guard.d.ts +5 -0
- package/dist/execution/guard.d.ts.map +1 -1
- package/dist/execution/guard.js +31 -16
- package/dist/execution/guard.js.map +1 -1
- package/dist/execution/index.d.ts +4 -0
- package/dist/execution/index.d.ts.map +1 -1
- package/dist/execution/index.js +4 -0
- package/dist/execution/index.js.map +1 -1
- package/dist/execution/ledger-cli.d.ts +2 -1
- package/dist/execution/ledger-cli.d.ts.map +1 -1
- package/dist/execution/ledger-cli.js +51 -14
- package/dist/execution/ledger-cli.js.map +1 -1
- package/dist/execution/ledger-protocol.d.ts +6 -2
- package/dist/execution/ledger-protocol.d.ts.map +1 -1
- package/dist/execution/ledger-protocol.js +110 -24
- package/dist/execution/ledger-protocol.js.map +1 -1
- package/dist/execution/ledger-server.d.ts +13 -0
- package/dist/execution/ledger-server.d.ts.map +1 -1
- package/dist/execution/ledger-server.js +57 -13
- package/dist/execution/ledger-server.js.map +1 -1
- package/dist/execution/ledger-tunnel.d.ts +50 -0
- package/dist/execution/ledger-tunnel.d.ts.map +1 -0
- package/dist/execution/ledger-tunnel.js +307 -0
- package/dist/execution/ledger-tunnel.js.map +1 -0
- package/dist/execution/ledger.d.ts +4 -0
- package/dist/execution/ledger.d.ts.map +1 -1
- package/dist/execution/ledger.js +30 -4
- package/dist/execution/ledger.js.map +1 -1
- package/dist/execution/parent-accounting.d.ts +41 -0
- package/dist/execution/parent-accounting.d.ts.map +1 -0
- package/dist/execution/parent-accounting.js +52 -0
- package/dist/execution/parent-accounting.js.map +1 -0
- package/dist/execution/parent-budget.d.ts +25 -0
- package/dist/execution/parent-budget.d.ts.map +1 -0
- package/dist/execution/parent-budget.js +102 -0
- package/dist/execution/parent-budget.js.map +1 -0
- package/dist/execution/project-spend.d.ts.map +1 -1
- package/dist/execution/project-spend.js +35 -5
- package/dist/execution/project-spend.js.map +1 -1
- package/dist/execution/remote-checkpoint.d.ts +15 -0
- package/dist/execution/remote-checkpoint.d.ts.map +1 -0
- package/dist/execution/remote-checkpoint.js +165 -0
- package/dist/execution/remote-checkpoint.js.map +1 -0
- package/dist/execution/remote-ledger.d.ts +12 -2
- package/dist/execution/remote-ledger.d.ts.map +1 -1
- package/dist/execution/remote-ledger.js +53 -21
- package/dist/execution/remote-ledger.js.map +1 -1
- package/dist/execution/types.d.ts +23 -5
- package/dist/execution/types.d.ts.map +1 -1
- package/dist/execution/types.js.map +1 -1
- package/dist/goals/supervised.js +2 -2
- package/dist/goals/supervised.js.map +1 -1
- package/dist/headless.d.ts +2 -6
- package/dist/headless.d.ts.map +1 -1
- package/dist/headless.js +17 -21
- package/dist/headless.js.map +1 -1
- package/dist/improvement/actions.d.ts +3 -4
- package/dist/improvement/actions.d.ts.map +1 -1
- package/dist/improvement/actions.js +10 -7
- package/dist/improvement/actions.js.map +1 -1
- package/dist/improvement/capabilities.d.ts +54 -0
- package/dist/improvement/capabilities.d.ts.map +1 -0
- package/dist/improvement/capabilities.js +44 -0
- package/dist/improvement/capabilities.js.map +1 -0
- package/dist/improvement/cli.d.ts +1 -1
- package/dist/improvement/cli.d.ts.map +1 -1
- package/dist/improvement/cli.js +29 -3
- package/dist/improvement/cli.js.map +1 -1
- package/dist/improvement/host-capabilities.d.ts +119 -0
- package/dist/improvement/host-capabilities.d.ts.map +1 -0
- package/dist/improvement/host-capabilities.js +18 -0
- package/dist/improvement/host-capabilities.js.map +1 -0
- package/dist/improvement/index.d.ts +6 -0
- package/dist/improvement/index.d.ts.map +1 -1
- package/dist/improvement/index.js +6 -0
- package/dist/improvement/index.js.map +1 -1
- package/dist/improvement/proposal-hash.d.ts +3 -0
- package/dist/improvement/proposal-hash.d.ts.map +1 -0
- package/dist/improvement/proposal-hash.js +5 -0
- package/dist/improvement/proposal-hash.js.map +1 -0
- package/dist/improvement/review-contract.d.ts +32 -0
- package/dist/improvement/review-contract.d.ts.map +1 -0
- package/dist/improvement/review-contract.js +62 -0
- package/dist/improvement/review-contract.js.map +1 -0
- package/dist/improvement/review-requests.d.ts +72 -0
- package/dist/improvement/review-requests.d.ts.map +1 -0
- package/dist/improvement/review-requests.js +63 -0
- package/dist/improvement/review-requests.js.map +1 -0
- package/dist/improvement/source-changes.d.ts +78 -0
- package/dist/improvement/source-changes.d.ts.map +1 -0
- package/dist/improvement/source-changes.js +91 -0
- package/dist/improvement/source-changes.js.map +1 -0
- package/dist/improvement/task-outcomes.d.ts +82 -0
- package/dist/improvement/task-outcomes.d.ts.map +1 -0
- package/dist/improvement/task-outcomes.js +72 -0
- package/dist/improvement/task-outcomes.js.map +1 -0
- package/dist/index.d.ts +10 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/isolation/contracts.d.ts +13 -0
- package/dist/isolation/contracts.d.ts.map +1 -1
- package/dist/isolation/contracts.js +9 -1
- package/dist/isolation/contracts.js.map +1 -1
- package/dist/isolation/coordinator.d.ts.map +1 -1
- package/dist/isolation/coordinator.js +4 -0
- package/dist/isolation/coordinator.js.map +1 -1
- package/dist/isolation/process.d.ts.map +1 -1
- package/dist/isolation/process.js +3 -1
- package/dist/isolation/process.js.map +1 -1
- package/dist/isolation/worktree.d.ts +9 -1
- package/dist/isolation/worktree.d.ts.map +1 -1
- package/dist/isolation/worktree.js +8 -3
- package/dist/isolation/worktree.js.map +1 -1
- package/dist/memory.d.ts +5 -3
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +8 -6
- package/dist/memory.js.map +1 -1
- package/dist/migration/assessment-contract.d.ts +60 -0
- package/dist/migration/assessment-contract.d.ts.map +1 -0
- package/dist/migration/assessment-contract.js +132 -0
- package/dist/migration/assessment-contract.js.map +1 -0
- package/dist/migration/assessment-schema.d.ts +19 -0
- package/dist/migration/assessment-schema.d.ts.map +1 -0
- package/dist/migration/assessment-schema.js +43 -0
- package/dist/migration/assessment-schema.js.map +1 -0
- package/dist/migration/assessment.d.ts +159 -0
- package/dist/migration/assessment.d.ts.map +1 -0
- package/dist/migration/assessment.js +219 -0
- package/dist/migration/assessment.js.map +1 -0
- package/dist/migration/cli.d.ts +6 -0
- package/dist/migration/cli.d.ts.map +1 -0
- package/dist/migration/cli.js +101 -0
- package/dist/migration/cli.js.map +1 -0
- package/dist/migration/evidence.d.ts +27 -0
- package/dist/migration/evidence.d.ts.map +1 -0
- package/dist/migration/evidence.js +124 -0
- package/dist/migration/evidence.js.map +1 -0
- package/dist/migration/example.d.ts +33 -0
- package/dist/migration/example.d.ts.map +1 -0
- package/dist/migration/example.js +28 -0
- package/dist/migration/example.js.map +1 -0
- package/dist/migration/index.d.ts +21 -0
- package/dist/migration/index.d.ts.map +1 -0
- package/dist/migration/index.js +15 -0
- package/dist/migration/index.js.map +1 -0
- package/dist/migration/inventory.d.ts +70 -0
- package/dist/migration/inventory.d.ts.map +1 -0
- package/dist/migration/inventory.js +233 -0
- package/dist/migration/inventory.js.map +1 -0
- package/dist/migration/schema.d.ts +61 -0
- package/dist/migration/schema.d.ts.map +1 -0
- package/dist/migration/schema.js +76 -0
- package/dist/migration/schema.js.map +1 -0
- package/dist/migration/verification.d.ts +146 -0
- package/dist/migration/verification.d.ts.map +1 -0
- package/dist/migration/verification.js +260 -0
- package/dist/migration/verification.js.map +1 -0
- package/dist/orchestration/actions.d.ts +2 -0
- package/dist/orchestration/actions.d.ts.map +1 -1
- package/dist/orchestration/actions.js.map +1 -1
- package/dist/orchestration/artifact-host.d.ts +46 -0
- package/dist/orchestration/artifact-host.d.ts.map +1 -0
- package/dist/orchestration/artifact-host.js +64 -0
- package/dist/orchestration/artifact-host.js.map +1 -0
- package/dist/orchestration/coordinator-actions.d.ts +1 -1
- package/dist/orchestration/coordinator-actions.d.ts.map +1 -1
- package/dist/orchestration/coordinator-actions.js +5 -3
- package/dist/orchestration/coordinator-actions.js.map +1 -1
- package/dist/orchestration/coordinator-types.d.ts +23 -2
- package/dist/orchestration/coordinator-types.d.ts.map +1 -1
- package/dist/orchestration/coordinator.d.ts +5 -0
- package/dist/orchestration/coordinator.d.ts.map +1 -1
- package/dist/orchestration/coordinator.js +30 -13
- package/dist/orchestration/coordinator.js.map +1 -1
- package/dist/orchestration/execution-cli.d.ts +1 -1
- package/dist/orchestration/execution-cli.d.ts.map +1 -1
- package/dist/orchestration/execution-cli.js +29 -6
- package/dist/orchestration/execution-cli.js.map +1 -1
- package/dist/orchestration/execution-journal.d.ts.map +1 -1
- package/dist/orchestration/execution-journal.js +79 -6
- package/dist/orchestration/execution-journal.js.map +1 -1
- package/dist/orchestration/execution-store.d.ts +5 -1
- package/dist/orchestration/execution-store.d.ts.map +1 -1
- package/dist/orchestration/execution-store.js +66 -5
- package/dist/orchestration/execution-store.js.map +1 -1
- package/dist/orchestration/execution.d.ts.map +1 -1
- package/dist/orchestration/execution.js +37 -10
- package/dist/orchestration/execution.js.map +1 -1
- package/dist/orchestration/index.d.ts +6 -0
- package/dist/orchestration/index.d.ts.map +1 -1
- package/dist/orchestration/index.js +6 -0
- package/dist/orchestration/index.js.map +1 -1
- package/dist/orchestration/interruption.d.ts +10 -0
- package/dist/orchestration/interruption.d.ts.map +1 -0
- package/dist/orchestration/interruption.js +38 -0
- package/dist/orchestration/interruption.js.map +1 -0
- package/dist/orchestration/question-contract.d.ts +19 -0
- package/dist/orchestration/question-contract.d.ts.map +1 -0
- package/dist/orchestration/question-contract.js +21 -0
- package/dist/orchestration/question-contract.js.map +1 -0
- package/dist/orchestration/questions.d.ts +9 -0
- package/dist/orchestration/questions.d.ts.map +1 -0
- package/dist/orchestration/questions.js +75 -0
- package/dist/orchestration/questions.js.map +1 -0
- package/dist/orchestration/reviewed-ledger.d.ts +23 -0
- package/dist/orchestration/reviewed-ledger.d.ts.map +1 -0
- package/dist/orchestration/reviewed-ledger.js +57 -0
- package/dist/orchestration/reviewed-ledger.js.map +1 -0
- package/dist/orchestration/routing.d.ts +3 -0
- package/dist/orchestration/routing.d.ts.map +1 -1
- package/dist/orchestration/routing.js +5 -1
- package/dist/orchestration/routing.js.map +1 -1
- package/dist/orchestration/source-candidates.d.ts +64 -0
- package/dist/orchestration/source-candidates.d.ts.map +1 -0
- package/dist/orchestration/source-candidates.js +95 -0
- package/dist/orchestration/source-candidates.js.map +1 -0
- package/dist/orchestration/validation.js +1 -1
- package/dist/orchestration/validation.js.map +1 -1
- package/dist/runlog.js +2 -2
- package/dist/runlog.js.map +1 -1
- package/dist/runtime/permissions.d.ts.map +1 -1
- package/dist/runtime/permissions.js +3 -2
- package/dist/runtime/permissions.js.map +1 -1
- package/dist/runtime/turn.d.ts +2 -0
- package/dist/runtime/turn.d.ts.map +1 -1
- package/dist/runtime/turn.js +21 -7
- package/dist/runtime/turn.js.map +1 -1
- package/dist/session-management/actions.js +1 -1
- package/dist/session-management/actions.js.map +1 -1
- package/dist/sessions/execution-binding.d.ts +8 -0
- package/dist/sessions/execution-binding.d.ts.map +1 -0
- package/dist/sessions/execution-binding.js +9 -0
- package/dist/sessions/execution-binding.js.map +1 -0
- package/dist/sessions/index.d.ts +1 -0
- package/dist/sessions/index.d.ts.map +1 -1
- package/dist/sessions/index.js +1 -0
- package/dist/sessions/index.js.map +1 -1
- package/dist/source-changes/writer.d.ts +77 -0
- package/dist/source-changes/writer.d.ts.map +1 -0
- package/dist/source-changes/writer.js +189 -0
- package/dist/source-changes/writer.js.map +1 -0
- package/dist/spawning/actions.d.ts +10 -1
- package/dist/spawning/actions.d.ts.map +1 -1
- package/dist/spawning/actions.js +26 -7
- package/dist/spawning/actions.js.map +1 -1
- package/dist/spawning/cli.js +1 -1
- package/dist/spawning/cli.js.map +1 -1
- package/dist/spawning/execution.d.ts.map +1 -1
- package/dist/spawning/execution.js +2 -0
- package/dist/spawning/execution.js.map +1 -1
- package/dist/spawning/types.d.ts +19 -6
- package/dist/spawning/types.d.ts.map +1 -1
- package/dist/spawning/validation.d.ts +16 -0
- package/dist/spawning/validation.d.ts.map +1 -1
- package/dist/spawning/validation.js +44 -8
- package/dist/spawning/validation.js.map +1 -1
- package/dist/storage.d.ts +5 -0
- package/dist/storage.d.ts.map +1 -1
- package/dist/storage.js +10 -1
- package/dist/storage.js.map +1 -1
- package/dist/supervision/contracts.js +4 -1
- package/dist/supervision/contracts.js.map +1 -1
- package/dist/tools.d.ts +1 -0
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +5 -0
- package/dist/tools.js.map +1 -1
- package/docs/README.md +66 -0
- package/docs/acp.md +228 -0
- package/docs/delegation-ledger.md +331 -0
- package/docs/improvement-cycles.md +304 -0
- package/docs/migration-assessment.md +113 -0
- package/docs/migration-example-plan.json +88 -0
- package/docs/migration-example-report.json +511 -0
- package/docs/migration-inventory.md +63 -0
- package/docs/migration-playbook.md +152 -0
- package/docs/migration-verification.md +177 -0
- package/docs/releases/3.6.0.md +43 -0
- package/docs/releases/3.7.0.md +53 -0
- package/package.json +11 -3
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, lstatSync, rmSync, realpathSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { canonicalJson, digest } from '../approvals/index.js';
|
|
6
|
+
import { throwIfCancelled, cancellable } from '../cancellation.js';
|
|
7
|
+
import { worktreeGit } from '../isolation/worktree.js';
|
|
8
|
+
import { assertLocalIsolationImage, runIsolatedCommand } from '../isolation/process.js';
|
|
9
|
+
import { inventorySource, MigrationError, sourcePath } from './inventory.js';
|
|
10
|
+
export const VERIFIER_VERSION = 'byte-parity-v1';
|
|
11
|
+
export const VERIFICATION_ADAPTER = 'javascript-to-typescript-cli/v1';
|
|
12
|
+
function fail(message) { throw new MigrationError('invalid', message); }
|
|
13
|
+
const hash = (s) => typeof s === 'string' && /^[a-f0-9]{64}$/.test(s);
|
|
14
|
+
const oid = (s) => typeof s === 'string' && /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(s);
|
|
15
|
+
function shape(v, keys) {
|
|
16
|
+
if (!v || typeof v !== 'object' || Array.isArray(v) || Object.keys(v).length !== keys.length || keys.some(k => !Object.hasOwn(v, k)))
|
|
17
|
+
fail('Invalid migration verification fields.');
|
|
18
|
+
}
|
|
19
|
+
function expected(v) {
|
|
20
|
+
shape(v, ['exitCode', 'stdout', 'stderr']);
|
|
21
|
+
if (!Number.isSafeInteger(v.exitCode) || Number(v.exitCode) < 0 || Number(v.exitCode) > 124 ||
|
|
22
|
+
typeof v.stdout !== 'string' || typeof v.stderr !== 'string' || Buffer.byteLength(v.stdout) > 8192 || Buffer.byteLength(v.stderr) > 8192)
|
|
23
|
+
fail('Use bounded expected output and exit codes 0–124.');
|
|
24
|
+
}
|
|
25
|
+
export const byteFingerprint = (text) => ({ sha256: digest(text), bytes: Buffer.byteLength(text) });
|
|
26
|
+
export const behaviorFingerprint = (value) => ({ exitCode: value.exitCode, stdout: byteFingerprint(value.stdout), stderr: byteFingerprint(value.stderr) });
|
|
27
|
+
export function compareBehavior(a, b) {
|
|
28
|
+
return a.exitCode === b.exitCode && a.stdout.sha256 === b.stdout.sha256 && a.stdout.bytes === b.stdout.bytes && a.stderr.sha256 === b.stderr.sha256 && a.stderr.bytes === b.stderr.bytes;
|
|
29
|
+
}
|
|
30
|
+
/** Adversarial sanity checks run before any repository code, including the baseline. */
|
|
31
|
+
export function comparatorHealthy(compare = compareBehavior) {
|
|
32
|
+
const a = behaviorFingerprint({ exitCode: 0, stdout: 'public result\n', stderr: 'notice\n' });
|
|
33
|
+
try {
|
|
34
|
+
return compare(a, { ...a, stdout: { ...a.stdout }, stderr: { ...a.stderr } }) && !compare(a, { ...a, exitCode: 1 }) &&
|
|
35
|
+
!compare(a, { ...a, stdout: byteFingerprint('public RESULT\n') }) &&
|
|
36
|
+
!compare(a, { ...a, stderr: byteFingerprint('NOTICE\n') }) &&
|
|
37
|
+
!compare(a, { ...a, stdout: { ...a.stdout, bytes: a.stdout.bytes + 1 } }) &&
|
|
38
|
+
!compare(a, { ...a, stderr: { ...a.stderr, bytes: a.stderr.bytes + 1 } });
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
export function analyzeVerificationPlan(value) {
|
|
45
|
+
return analyzePlan(value, false);
|
|
46
|
+
}
|
|
47
|
+
export function analyzeBaselinePlan(value) {
|
|
48
|
+
return analyzePlan(value, true);
|
|
49
|
+
}
|
|
50
|
+
function analyzePlan(value, baselineOnly) {
|
|
51
|
+
let raw;
|
|
52
|
+
try {
|
|
53
|
+
raw = canonicalJson(value);
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
return fail('Use bounded plain JSON for the verification plan.');
|
|
57
|
+
}
|
|
58
|
+
if (Buffer.byteLength(raw) > 262144)
|
|
59
|
+
fail('Keep a verification plan within 256 KiB.');
|
|
60
|
+
const v = JSON.parse(raw);
|
|
61
|
+
shape(v, ['format', 'adapter', 'verifier', 'runtime', 'source', ...(baselineOnly ? [] : ['candidate']), 'negative', 'rules', 'cases', 'negativeControl', 'limits']);
|
|
62
|
+
if (v.format !== (baselineOnly ? 'calliope.migration.baseline-plan/v1' : 'calliope.migration.verification-plan/v1') || v.adapter !== VERIFICATION_ADAPTER || v.verifier !== VERIFIER_VERSION)
|
|
63
|
+
fail('Unsupported migration adapter or verifier version.');
|
|
64
|
+
shape(v.runtime, ['image', 'node']);
|
|
65
|
+
if (typeof v.runtime.image !== 'string' || !/^sha256:[a-f0-9]{64}$/.test(v.runtime.image) || typeof v.runtime.node !== 'string' || !/^v24\.\d+\.\d+$/.test(v.runtime.node))
|
|
66
|
+
fail('Pin a local Linux image and its exact Node 24 runtime version.');
|
|
67
|
+
for (const role of ['source', ...(baselineOnly ? [] : ['candidate']), 'negative', 'rules']) {
|
|
68
|
+
const pin = v[role];
|
|
69
|
+
shape(pin, ['revision', 'path', 'object']);
|
|
70
|
+
if (!oid(pin.revision) || !oid(pin.object) || typeof pin.path !== 'string' || pin.path === '.')
|
|
71
|
+
fail('Pin every program and rulebook to a full Git commit, path and blob.');
|
|
72
|
+
sourcePath(pin.path);
|
|
73
|
+
if (role === 'source' && !pin.path.endsWith('.mjs') || ['candidate', 'negative'].includes(role) && !pin.path.endsWith('.mts'))
|
|
74
|
+
fail('This adapter compares self-contained .mjs and .mts command-line programs.');
|
|
75
|
+
}
|
|
76
|
+
if (!Array.isArray(v.cases) || !v.cases.length || v.cases.length > 8)
|
|
77
|
+
fail('Provide 1–8 public-interface cases.');
|
|
78
|
+
const ids = new Set();
|
|
79
|
+
for (const row of v.cases) {
|
|
80
|
+
shape(row, ['id', 'argument', 'expected']);
|
|
81
|
+
if (typeof row.id !== 'string' || !/^[a-zA-Z0-9_-]{1,64}$/.test(row.id) || ids.has(row.id) || typeof row.argument !== 'string' || !row.argument.length || row.argument.length > 8192 || /[\x00-\x1f\x7f]/.test(row.argument))
|
|
82
|
+
fail('Use unique case IDs and one bounded argument per case.');
|
|
83
|
+
ids.add(row.id);
|
|
84
|
+
expected(row.expected);
|
|
85
|
+
}
|
|
86
|
+
shape(v.negativeControl, ['caseId', 'expected']);
|
|
87
|
+
if (typeof v.negativeControl.caseId !== 'string' || !ids.has(v.negativeControl.caseId))
|
|
88
|
+
fail('Select a declared case for the negative control.');
|
|
89
|
+
expected(v.negativeControl.expected);
|
|
90
|
+
shape(v.limits, ['commandTimeoutMs', 'totalMs']);
|
|
91
|
+
if (!Number.isSafeInteger(v.limits.commandTimeoutMs) || Number(v.limits.commandTimeoutMs) < 100 || Number(v.limits.commandTimeoutMs) > 10000 ||
|
|
92
|
+
!Number.isSafeInteger(v.limits.totalMs) || Number(v.limits.totalMs) < Number(v.limits.commandTimeoutMs) || Number(v.limits.totalMs) > 300000)
|
|
93
|
+
fail('Bound each command to 100–10,000ms and the full observation to at most 300,000ms.');
|
|
94
|
+
const plan = v;
|
|
95
|
+
// Validate declared data independently of the comparator being qualified.
|
|
96
|
+
if (canonicalJson(plan.negativeControl.expected) === canonicalJson(plan.cases.find(c => c.id === plan.negativeControl.caseId).expected))
|
|
97
|
+
fail('The known negative control must differ from the baseline behavior.');
|
|
98
|
+
return { plan, digest: digest(raw), commandCount: (baselineOnly ? 1 : 2) * plan.cases.length + 2 };
|
|
99
|
+
}
|
|
100
|
+
class SourceInputError extends MigrationError {
|
|
101
|
+
constructor(message) { super('invalid', message); }
|
|
102
|
+
}
|
|
103
|
+
/** The existing isolated-command owner executes every observation; no provider or worker scheduler. */
|
|
104
|
+
export async function verifyMigration(repository, input, options) {
|
|
105
|
+
return executeVerification(repository, analyzeVerificationPlan(input), options);
|
|
106
|
+
}
|
|
107
|
+
/** Establish the original contract and reject a known regression before a candidate exists. */
|
|
108
|
+
export async function verifyMigrationBaseline(repository, input, options) {
|
|
109
|
+
return executeVerification(repository, analyzeBaselinePlan(input), options);
|
|
110
|
+
}
|
|
111
|
+
async function executeVerification(repository, analysis, options) {
|
|
112
|
+
const { plan, digest: planDigest, commandCount } = analysis;
|
|
113
|
+
const baselineOnly = plan.format === 'calliope.migration.baseline-plan/v1';
|
|
114
|
+
const pins = plan.format === 'calliope.migration.baseline-plan/v1'
|
|
115
|
+
? { source: plan.source, negative: plan.negative, rules: plan.rules }
|
|
116
|
+
: { source: plan.source, candidate: plan.candidate, negative: plan.negative, rules: plan.rules };
|
|
117
|
+
if (!options || typeof options.approve !== 'function' || options.deadline !== undefined && !Number.isFinite(options.deadline))
|
|
118
|
+
fail('A host approval hook and a valid inherited deadline are required.');
|
|
119
|
+
throwIfCancelled(options.signal);
|
|
120
|
+
if (typeof repository !== 'string' || repository.length > 4096 || /[\x00-\x1f\x7f]/.test(repository))
|
|
121
|
+
fail('Select a local repository root.');
|
|
122
|
+
try {
|
|
123
|
+
repository = realpathSync(repository);
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
throw new MigrationError('unavailable', 'The selected repository is unavailable.');
|
|
127
|
+
}
|
|
128
|
+
const approved = await cancellable(options.approve({ digest: planDigest, repository, pins: JSON.parse(JSON.stringify(Object.values(pins))), image: plan.runtime.image, commandCount, totalMs: plan.limits.totalMs }), options.signal);
|
|
129
|
+
if (!approved)
|
|
130
|
+
fail('Migration verification was not approved; no program was executed.');
|
|
131
|
+
const deadline = Math.min(Date.now() + plan.limits.totalMs, options.deadline ?? Infinity);
|
|
132
|
+
if (deadline <= Date.now())
|
|
133
|
+
fail('The inherited verification deadline has expired.');
|
|
134
|
+
const timer = new AbortController(), signal = AbortSignal.any([timer.signal, ...(options.signal ? [options.signal] : [])]);
|
|
135
|
+
const alarm = setTimeout(() => timer.abort(), Math.max(1, deadline - Date.now()));
|
|
136
|
+
const checkBudget = () => { if (Date.now() >= deadline)
|
|
137
|
+
timer.abort(); throwIfCancelled(signal); };
|
|
138
|
+
const observations = [];
|
|
139
|
+
let scratch, safeToRemove = true, outcome = 'environment-failure', reason = 'Verification did not complete.', commands = 0;
|
|
140
|
+
const programs = new Map();
|
|
141
|
+
try {
|
|
142
|
+
if (!comparatorHealthy()) {
|
|
143
|
+
outcome = 'verifier-failure';
|
|
144
|
+
reason = 'Comparator self-test failed.';
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
// Read only exact approved Git objects. The working checkout is never executed.
|
|
148
|
+
const material = [];
|
|
149
|
+
for (const [role, pin] of Object.entries(pins)) {
|
|
150
|
+
const inventory = await inventorySource({ repository, revision: pin.revision, readPaths: [pin.path] }, { signal });
|
|
151
|
+
const file = inventory.files[0];
|
|
152
|
+
if (inventory.files.length !== 1 || !file || file.path !== pin.path || !['100644', '100755'].includes(file.mode) || file.object !== pin.object || file.bytes === null || file.bytes > 65536)
|
|
153
|
+
throw new SourceInputError('A source/rule pin is stale, unsupported or exceeds 64 KiB. Replan before execution.');
|
|
154
|
+
const text = await worktreeGit(repository, ['--no-replace-objects', 'cat-file', 'blob', pin.object], signal);
|
|
155
|
+
const bytes = Buffer.byteLength(text), object = createHash(pin.object.length === 40 ? 'sha1' : 'sha256').update(`blob ${bytes}\0`).update(text).digest('hex');
|
|
156
|
+
if (object !== pin.object || bytes !== file.bytes)
|
|
157
|
+
throw new SourceInputError('Source bytes changed or are not valid UTF-8.');
|
|
158
|
+
if (role !== 'rules')
|
|
159
|
+
material.push({ role, text, extension: role === 'source' ? 'mjs' : 'mts' });
|
|
160
|
+
}
|
|
161
|
+
await assertLocalIsolationImage(plan.runtime.image, signal);
|
|
162
|
+
scratch = mkdtempSync(join(tmpdir(), 'calliope-migration-check-'));
|
|
163
|
+
for (const { role, text, extension } of material) {
|
|
164
|
+
const directory = join(scratch, role);
|
|
165
|
+
mkdirSync(directory, { mode: 0o700 });
|
|
166
|
+
const file = join(directory, `program.${extension}`);
|
|
167
|
+
writeFileSync(file, text, { mode: 0o400, flag: 'wx' });
|
|
168
|
+
programs.set(role, { directory, file, bytes: digest(text), extension });
|
|
169
|
+
}
|
|
170
|
+
const observe = async (phase, role, caseId, argument) => {
|
|
171
|
+
checkBudget();
|
|
172
|
+
if (++commands > commandCount || options.reserveCommand && !await cancellable(options.reserveCommand({ digest: planDigest, phase, caseId, command: commands }), signal))
|
|
173
|
+
fail('The host command allowance refused verification.');
|
|
174
|
+
checkBudget();
|
|
175
|
+
const program = programs.get(role);
|
|
176
|
+
const unchanged = () => lstatSync(program.file).isFile() && !lstatSync(program.file).isSymbolicLink() && lstatSync(program.file).size <= 65536 && digest(readFileSync(program.file, 'utf8')) === program.bytes;
|
|
177
|
+
if (!unchanged())
|
|
178
|
+
throw new SourceInputError('The isolated source snapshot changed.');
|
|
179
|
+
const argv = phase === 'runtime' ? ['node', '--version'] : ['node', `/project/program.${program.extension}`, argument];
|
|
180
|
+
safeToRemove = false; // A lost runner result must retain the mount for inspection.
|
|
181
|
+
const receipt = await runIsolatedCommand(plan.runtime.image, { artifactId: `${phase}-${caseId ?? 'version'}`, argv, timeoutMs: Math.max(1, Math.min(plan.limits.commandTimeoutMs, deadline - Date.now())) }, [{ source: program.directory, target: '/project' }], signal);
|
|
182
|
+
safeToRemove = receipt.cleanupConfirmed;
|
|
183
|
+
const { stdout: _stdout, stderr: _stderr, ...evidence } = receipt;
|
|
184
|
+
const row = { phase, caseId, matches: null, evidence };
|
|
185
|
+
observations.push(row);
|
|
186
|
+
const outputs = receipt.outputDigests;
|
|
187
|
+
if (!unchanged() || !receipt.cleanupConfirmed || receipt.truncated || !['passed', 'failed'].includes(receipt.outcome) || !outputs || outputs.version !== 1 ||
|
|
188
|
+
!hash(outputs.stdout.sha256) || !hash(outputs.stderr.sha256))
|
|
189
|
+
return null;
|
|
190
|
+
return { exitCode: receipt.exitCode, stdout: outputs.stdout, stderr: outputs.stderr };
|
|
191
|
+
};
|
|
192
|
+
const check = async (phase, role, id, want, argument) => {
|
|
193
|
+
const got = await observe(phase, role, id, argument);
|
|
194
|
+
if (!got)
|
|
195
|
+
return null;
|
|
196
|
+
const matches = compareBehavior(got, behaviorFingerprint(want));
|
|
197
|
+
observations.at(-1).matches = matches;
|
|
198
|
+
return { got, matches };
|
|
199
|
+
};
|
|
200
|
+
const run = async () => {
|
|
201
|
+
const runtime = await check('runtime', 'source', null, { exitCode: 0, stdout: plan.runtime.node + '\n', stderr: '' });
|
|
202
|
+
if (!runtime?.matches)
|
|
203
|
+
return { outcome: 'environment-failure', reason: 'The pinned runtime was unavailable or did not match.' };
|
|
204
|
+
for (const c of plan.cases) {
|
|
205
|
+
const baseline = await check('baseline', 'source', c.id, c.expected, c.argument);
|
|
206
|
+
if (!baseline)
|
|
207
|
+
return { outcome: 'environment-failure', reason: 'Baseline observation was incomplete.' };
|
|
208
|
+
if (!baseline.matches)
|
|
209
|
+
return { outcome: 'baseline-failure', reason: 'The original program does not meet the pinned public-interface contract.' };
|
|
210
|
+
}
|
|
211
|
+
const c = plan.cases.find(row => row.id === plan.negativeControl.caseId);
|
|
212
|
+
const negative = await check('negative-control', 'negative', c.id, plan.negativeControl.expected, c.argument);
|
|
213
|
+
if (!negative)
|
|
214
|
+
return { outcome: 'environment-failure', reason: 'Negative-control observation was incomplete.' };
|
|
215
|
+
if (!negative.matches || compareBehavior(negative.got, behaviorFingerprint(c.expected)))
|
|
216
|
+
return { outcome: 'verifier-failure', reason: 'The known regression was not reproduced and rejected as expected.' };
|
|
217
|
+
if (baselineOnly)
|
|
218
|
+
return { outcome: 'baseline-verified', reason: 'Baseline and known-regression observations satisfy the declared contract. No candidate was read or executed.' };
|
|
219
|
+
let regression = false;
|
|
220
|
+
for (const item of plan.cases) {
|
|
221
|
+
const candidate = await check('candidate', 'candidate', item.id, item.expected, item.argument);
|
|
222
|
+
if (!candidate)
|
|
223
|
+
return { outcome: 'environment-failure', reason: 'Candidate observation was incomplete.' };
|
|
224
|
+
if (!candidate.matches)
|
|
225
|
+
regression = true;
|
|
226
|
+
}
|
|
227
|
+
return { outcome: regression ? 'regression' : 'passed', reason: regression ? 'Candidate behavior differs on at least one declared case.' : 'Baseline, negative control and candidate observations satisfy the declared contract.' };
|
|
228
|
+
};
|
|
229
|
+
({ outcome, reason } = await run());
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
catch (error) {
|
|
233
|
+
outcome = options.signal?.aborted ? 'cancelled' : error instanceof SourceInputError ? 'input-failure' : 'environment-failure';
|
|
234
|
+
reason = error instanceof MigrationError ? error.message : timer.signal.aborted ? 'Verification exceeded its total deadline.' : 'Verification could not obtain complete native execution evidence.';
|
|
235
|
+
}
|
|
236
|
+
finally {
|
|
237
|
+
clearTimeout(alarm);
|
|
238
|
+
if (scratch && safeToRemove) {
|
|
239
|
+
try {
|
|
240
|
+
rmSync(scratch, { recursive: true });
|
|
241
|
+
scratch = undefined;
|
|
242
|
+
}
|
|
243
|
+
catch { /* Retain the exact scratch path for host cleanup. */ }
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
if (options.signal?.aborted) {
|
|
247
|
+
outcome = 'cancelled';
|
|
248
|
+
reason = 'Verification cancelled.';
|
|
249
|
+
}
|
|
250
|
+
else if (timer.signal.aborted || Date.now() >= deadline) {
|
|
251
|
+
outcome = 'environment-failure';
|
|
252
|
+
reason = 'Verification exceeded its total deadline.';
|
|
253
|
+
}
|
|
254
|
+
const report = { format: baselineOnly ? 'calliope.migration.baseline-report/v1' : 'calliope.migration.verification-report/v1', verifier: VERIFIER_VERSION, adapter: plan.adapter, planDigest, runtime: plan.runtime,
|
|
255
|
+
pins, outcome, reason, observations,
|
|
256
|
+
commandsUsed: commands, commandLimit: commandCount, retainedWorkspace: scratch ?? null,
|
|
257
|
+
limitations: ['Only declared cases of this self-contained command-line interface were compared; this is not proof of general program equivalence.', 'No TypeScript type-check, dependency install, migration dispatch or rollout was performed.'] };
|
|
258
|
+
return { ...report, digest: digest(canonicalJson(report)) };
|
|
259
|
+
}
|
|
260
|
+
//# sourceMappingURL=verification.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../src/migration/verification.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@ import { type RunInspection } from './types.js';
|
|
|
4
4
|
export interface RunActionOptions extends SessionActionOptions {
|
|
5
5
|
store?: RunStore;
|
|
6
6
|
source?: 'cli' | 'repl';
|
|
7
|
+
/** Trusted host selection, persisted in the first native budget manifest. */
|
|
8
|
+
parentBudget?: import('../execution/types.js').ParentBudgetLink;
|
|
7
9
|
}
|
|
8
10
|
/** Dry validation cannot execute arbitrary hook/policy programs as a side effect. */
|
|
9
11
|
export declare function loadRunPlan(cwd: string, path: string, dryRun: boolean, options?: RunActionOptions): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/orchestration/actions.ts"],"names":[],"mappings":"AAKA,OAAO,EAA0B,KAAK,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAInG,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACpE,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;
|
|
1
|
+
{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/orchestration/actions.ts"],"names":[],"mappings":"AAKA,OAAO,EAA0B,KAAK,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAInG,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACpE,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,KAAK,CAAC,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1C,6EAA6E;IAC7E,YAAY,CAAC,EAAC,OAAO,uBAAuB,EAAE,gBAAgB,CAAC;CAChE;AAED,qFAAqF;AACrF,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAE,gBAAqB;;;;;;;QAatE,IAAI;QAAY,MAAM;;GAC3D;AACD,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC,CAMlH;AACD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,WAAW,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC,CAOvJ;AACD,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC,CAKjH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/orchestration/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAA6B,MAAM,gCAAgC,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAsB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/orchestration/actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/** Trusted embedder interface, never loaded from model arguments or project files. */
|
|
2
|
+
import type { Tool, ToolCall, ToolResult } from '../types.js';
|
|
3
|
+
export interface ArtifactTaskContext {
|
|
4
|
+
version: 1;
|
|
5
|
+
project: {
|
|
6
|
+
root: string;
|
|
7
|
+
key: string;
|
|
8
|
+
};
|
|
9
|
+
runId: string;
|
|
10
|
+
manifestHash: string;
|
|
11
|
+
planHash: string;
|
|
12
|
+
approvalRevision: string;
|
|
13
|
+
taskId: string;
|
|
14
|
+
agentId: string;
|
|
15
|
+
sessionId: string;
|
|
16
|
+
attempt: number;
|
|
17
|
+
startEventId: string;
|
|
18
|
+
startEventHash: string;
|
|
19
|
+
}
|
|
20
|
+
export interface ArtifactHost {
|
|
21
|
+
version: 1;
|
|
22
|
+
/** A single fixed tool name; the embedding product supplies its artifact schema. */
|
|
23
|
+
tool: Tool;
|
|
24
|
+
execute: (args: Record<string, unknown>, context: ArtifactTaskContext, control: {
|
|
25
|
+
signal: AbortSignal;
|
|
26
|
+
assertActive: () => void;
|
|
27
|
+
}) => Promise<{
|
|
28
|
+
content: unknown;
|
|
29
|
+
isError?: boolean;
|
|
30
|
+
}>;
|
|
31
|
+
}
|
|
32
|
+
export interface BoundArtifactTool {
|
|
33
|
+
execute: (call: ToolCall, signal: AbortSignal | undefined, timeout: number) => Promise<ToolResult>;
|
|
34
|
+
}
|
|
35
|
+
export declare function artifactHostCapabilities(): {
|
|
36
|
+
readonly version: 1;
|
|
37
|
+
readonly owner: 'calliope-cli';
|
|
38
|
+
readonly tool: 'artifact';
|
|
39
|
+
readonly identity: 'native-task-attempt';
|
|
40
|
+
readonly admission: 'reviewed-tool-grant-and-host-binding';
|
|
41
|
+
readonly maxRequestBytes: 1048576;
|
|
42
|
+
readonly maxResponseBytes: 2097152;
|
|
43
|
+
};
|
|
44
|
+
export declare function prepareArtifactHost(host: ArtifactHost): ArtifactHost;
|
|
45
|
+
export declare function bindArtifactHost(host: ArtifactHost, context: ArtifactTaskContext, assertActive: () => void): BoundArtifactTool;
|
|
46
|
+
//# sourceMappingURL=artifact-host.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"artifact-host.d.ts","sourceRoot":"","sources":["../../src/orchestration/artifact-host.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,OAAO,KAAK,EAAC,IAAI,EAAC,QAAQ,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAG1D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAC,CAAC,CAAC;IAAA,OAAO,EAAC;QAAC,IAAI,EAAC,MAAM,CAAC;QAAA,GAAG,EAAC,MAAM,CAAA;KAAC,CAAC;IAAA,KAAK,EAAC,MAAM,CAAC;IAAA,YAAY,EAAC,MAAM,CAAC;IAAA,QAAQ,EAAC,MAAM,CAAC;IAC5F,gBAAgB,EAAC,MAAM,CAAC;IAAA,MAAM,EAAC,MAAM,CAAC;IAAA,OAAO,EAAC,MAAM,CAAC;IAAA,SAAS,EAAC,MAAM,CAAC;IAAA,OAAO,EAAC,MAAM,CAAC;IACrF,YAAY,EAAC,MAAM,CAAC;IAAA,cAAc,EAAC,MAAM,CAAC;CAC3C;AACD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAC,CAAC,CAAC;IACV,oFAAoF;IACpF,IAAI,EAAC,IAAI,CAAC;IACV,OAAO,EAAC,CAAC,IAAI,EAAC,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,EAAC,OAAO,EAAC,mBAAmB,EAAC,OAAO,EAAC;QAAC,MAAM,EAAC,WAAW,CAAC;QAAA,YAAY,EAAC,MAAI,IAAI,CAAA;KAAC,KAAG,OAAO,CAAC;QAAC,OAAO,EAAC,OAAO,CAAC;QAAA,OAAO,CAAC,EAAC,OAAO,CAAA;KAAC,CAAC,CAAC;CACnK;AACD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAC,CAAC,IAAI,EAAC,QAAQ,EAAC,MAAM,EAAC,WAAW,GAAC,SAAS,EAAC,OAAO,EAAC,MAAM,KAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1F;AACD,wBAAgB,wBAAwB;aAC9B,OAAO,EAAC,CAAC;aAAC,KAAK,EAAC,cAAc;aAAC,IAAI,EAAC,UAAU;aAAC,QAAQ,EAAC,qBAAqB;aACnF,SAAS,EAAC,sCAAsC;aAAC,eAAe,EAAC,OAAO;aAAC,gBAAgB,EAAC,OAAO;EACpG;AAgBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAC,YAAY,GAAE,YAAY,CAQlE;AACD,wBAAgB,gBAAgB,CAAC,IAAI,EAAC,YAAY,EAAC,OAAO,EAAC,mBAAmB,EAAC,YAAY,EAAC,MAAI,IAAI,GAAE,iBAAiB,CAuBtH"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { cancellable, throwIfCancelled } from '../cancellation.js';
|
|
2
|
+
export function artifactHostCapabilities() {
|
|
3
|
+
return { version: 1, owner: 'calliope-cli', tool: 'artifact', identity: 'native-task-attempt',
|
|
4
|
+
admission: 'reviewed-tool-grant-and-host-binding', maxRequestBytes: 1048576, maxResponseBytes: 2097152 };
|
|
5
|
+
}
|
|
6
|
+
function json(value, limit) {
|
|
7
|
+
const pending = [[value, 0]];
|
|
8
|
+
let nodes = 0;
|
|
9
|
+
while (pending.length) {
|
|
10
|
+
const [v, depth] = pending.pop();
|
|
11
|
+
if (++nodes > 100000 || depth > 40)
|
|
12
|
+
throw new Error('Artifact JSON exceeds structural bounds.');
|
|
13
|
+
if (v === null || typeof v === 'string' || typeof v === 'boolean')
|
|
14
|
+
continue;
|
|
15
|
+
if (typeof v === 'number' && Number.isFinite(v))
|
|
16
|
+
continue;
|
|
17
|
+
if (!v || typeof v !== 'object' || !Array.isArray(v) && Object.getPrototypeOf(v) !== Object.prototype)
|
|
18
|
+
throw new Error('Artifact values must be plain finite JSON.');
|
|
19
|
+
for (const item of Object.values(v))
|
|
20
|
+
pending.push([item, depth + 1]);
|
|
21
|
+
}
|
|
22
|
+
const raw = JSON.stringify(value);
|
|
23
|
+
if (Buffer.byteLength(raw) > limit)
|
|
24
|
+
throw new Error('Artifact JSON exceeds its byte bound.');
|
|
25
|
+
return raw;
|
|
26
|
+
}
|
|
27
|
+
export function prepareArtifactHost(host) {
|
|
28
|
+
if (host?.version !== 1 || typeof host.execute !== 'function')
|
|
29
|
+
throw new Error('Unsupported native artifact host.');
|
|
30
|
+
const tool = JSON.parse(json(host.tool, 65536));
|
|
31
|
+
if (tool.name !== 'artifact' || typeof tool.description !== 'string' || !tool.description.trim() || tool.description.length > 4096 ||
|
|
32
|
+
tool.parameters?.type !== 'object' || !tool.parameters.properties || Object.getPrototypeOf(tool.parameters.properties) !== Object.prototype)
|
|
33
|
+
throw new Error('The artifact host must declare the bounded artifact tool.');
|
|
34
|
+
// Snapshot schema and callback once; later descriptor mutation cannot change admission.
|
|
35
|
+
return { version: 1, tool, execute: host.execute.bind(host) };
|
|
36
|
+
}
|
|
37
|
+
export function bindArtifactHost(host, context, assertActive) {
|
|
38
|
+
const snapshot = JSON.parse(json(context, 16384));
|
|
39
|
+
return { execute: async (call, signal, timeout) => {
|
|
40
|
+
if (call.name !== 'artifact')
|
|
41
|
+
throw new Error('Artifact binding cannot execute another tool.');
|
|
42
|
+
const activeSignal = AbortSignal.any([...(signal ? [signal] : []), AbortSignal.timeout(Math.max(1, Math.min(60000, Math.floor(timeout))))]);
|
|
43
|
+
const active = () => { throwIfCancelled(activeSignal); assertActive(); };
|
|
44
|
+
active();
|
|
45
|
+
try {
|
|
46
|
+
const args = JSON.parse(json(call.arguments, 1048576));
|
|
47
|
+
if (!args || typeof args !== 'object' || Array.isArray(args))
|
|
48
|
+
throw new Error('Artifact arguments must be an object.');
|
|
49
|
+
// Context is separate from model JSON. Each invocation gets a private copy.
|
|
50
|
+
const result = await cancellable(host.execute(args, structuredClone(snapshot), { signal: activeSignal, assertActive: active }), activeSignal);
|
|
51
|
+
active();
|
|
52
|
+
if (!result || typeof result !== 'object' || Object.keys(result).some(k => !['content', 'isError'].includes(k)) ||
|
|
53
|
+
!Object.hasOwn(result, 'content') || result.isError !== undefined && typeof result.isError !== 'boolean')
|
|
54
|
+
throw new Error('Invalid artifact host result.');
|
|
55
|
+
return { toolCallId: call.id, result: json(result.content, 2097152), ...(result.isError ? { isError: true } : {}) };
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
throwIfCancelled(activeSignal);
|
|
59
|
+
// Provider/session logs must not receive arbitrary host errors or credentials.
|
|
60
|
+
return { toolCallId: call.id, result: 'Artifact request was not acknowledged. Inspect its original request receipt before retrying.', isError: true };
|
|
61
|
+
}
|
|
62
|
+
} };
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=artifact-host.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"artifact-host.js","sourceRoot":"","sources":["../../src/orchestration/artifact-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,5 +11,5 @@ export declare function inspectExecution(cwd: string, runId: string, options?: R
|
|
|
11
11
|
alive: boolean;
|
|
12
12
|
} | null;
|
|
13
13
|
}>;
|
|
14
|
-
export declare function controlExecution(cwd: string, runId: string, action: 'retry' | 'accept' | 'agent-stop' | 'agent-retry' | 'controller-retry', target: string, options?: RunActionOptions & Pick<CoordinatorOptions, 'onProgress'>): Promise<import("./coordinator-types.js").ExecutionInspection>;
|
|
14
|
+
export declare function controlExecution(cwd: string, runId: string, action: 'retry' | 'accept' | 'agent-stop' | 'agent-retry' | 'controller-retry', target: string, options?: RunActionOptions & Pick<CoordinatorOptions, 'onProgress' | 'expectedExecutionRevision'>): Promise<import("./coordinator-types.js").ExecutionInspection>;
|
|
15
15
|
//# sourceMappingURL=coordinator-actions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinator-actions.d.ts","sourceRoot":"","sources":["../../src/orchestration/coordinator-actions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAIpD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAKzD,wBAAsB,gBAAgB,CAAC,GAAG,EAAC,MAAM,EAAC,KAAK,EAAC,MAAM,EAAC,OAAO,GAAC,gBAAmB;;;;;;;;;GAGzF;AACD,wBAAsB,gBAAgB,CAAC,GAAG,EAAC,MAAM,EAAC,KAAK,EAAC,MAAM,EAAC,MAAM,EAAC,OAAO,GAAC,QAAQ,GAAC,YAAY,GAAC,aAAa,GAAC,kBAAkB,EAAC,MAAM,EAAC,MAAM,EAAC,OAAO,GAAC,gBAAgB,GAAC,IAAI,CAAC,kBAAkB,EAAC,YAAY,CAAI,
|
|
1
|
+
{"version":3,"file":"coordinator-actions.d.ts","sourceRoot":"","sources":["../../src/orchestration/coordinator-actions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAIpD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAKzD,wBAAsB,gBAAgB,CAAC,GAAG,EAAC,MAAM,EAAC,KAAK,EAAC,MAAM,EAAC,OAAO,GAAC,gBAAmB;;;;;;;;;GAGzF;AACD,wBAAsB,gBAAgB,CAAC,GAAG,EAAC,MAAM,EAAC,KAAK,EAAC,MAAM,EAAC,MAAM,EAAC,OAAO,GAAC,QAAQ,GAAC,YAAY,GAAC,aAAa,GAAC,kBAAkB,EAAC,MAAM,EAAC,MAAM,EAAC,OAAO,GAAC,gBAAgB,GAAC,IAAI,CAAC,kBAAkB,EAAC,YAAY,GAAC,2BAA2B,CAAI,iEAoC/O"}
|
|
@@ -18,7 +18,8 @@ export async function controlExecution(cwd, runId, action, target, options = {})
|
|
|
18
18
|
if (!initial.execution)
|
|
19
19
|
throw new OrchestrationError('unavailable', 'Run has no execution history.');
|
|
20
20
|
const { view, store } = initial, agentAction = action.startsWith('agent-'), context = store.context(initial.execution);
|
|
21
|
-
|
|
21
|
+
store.assertRevision(options.expectedExecutionRevision, initial.execution.state.revision);
|
|
22
|
+
const finish = (expected) => { const execution = store.read(); store.assertRevision(expected, execution.state.revision); options.onProgress?.(coordinatorProgress(store, execution)); return execution; };
|
|
22
23
|
const goalAuthority = view.manifest.version === 2 && action !== 'agent-stop' ? (await import('../goals/index.js')).goalRunAuthority(view.manifest, (options.store ?? new RunStore()).root) : undefined;
|
|
23
24
|
const assertAuthority = () => { store.assertApproval(initial.execution.header); goalAuthority?.assertActive(); const authority = inspectSpawnAuthority(store, new ReservationLedger(join(store.root, '..', 'budget'))); if (action === 'accept' && authority.pending.length)
|
|
24
25
|
throw new OrchestrationError('conflict', 'Recover pending child admission before accepting the run.'); };
|
|
@@ -34,7 +35,7 @@ export async function controlExecution(cwd, runId, action, target, options = {})
|
|
|
34
35
|
await authorizeSessionAction(cwd, action === 'accept' ? 'orchestration_accept' : action === 'agent-stop' ? 'orchestration_agent_stop' : 'orchestration_retry', { path: cwd, runId, target, action, planHash: initial.execution.state.graph?.hash ?? view.manifest.planHash, revision: initial.execution.state.revision, ...(action === 'accept' ? { artifactsHash: artifactSetHash(initial.execution.state.tasks[target].output.artifacts), acceptanceCriteria: context.plan.tasks.find(t => t.id === target).acceptanceCriteria, agentCriteria: context.plan.agents.find(a => a.id === initial.execution.state.tasks[target].agentId).acceptanceCriteria, evidence: initial.execution.state.tasks[target].output } : {}) }, options);
|
|
35
36
|
throwIfCancelled(options.signal);
|
|
36
37
|
if (action === 'agent-stop') {
|
|
37
|
-
await store.append({ type: 'agent_stop', agentId: target }, options.signal);
|
|
38
|
+
await store.append({ type: 'agent_stop', agentId: target }, options.signal, undefined, () => store.assertRevision(options.expectedExecutionRevision));
|
|
38
39
|
return finish();
|
|
39
40
|
}
|
|
40
41
|
const lease = store.acquire();
|
|
@@ -44,7 +45,8 @@ export async function controlExecution(cwd, runId, action, target, options = {})
|
|
|
44
45
|
if (current.state.revision !== initial.execution.state.revision || current.state.ownerId)
|
|
45
46
|
throw new OrchestrationError('conflict', 'Execution changed or needs orphan recovery; inspect and resume before applying this decision.');
|
|
46
47
|
if (action === 'controller-retry') {
|
|
47
|
-
await store.append({ type: 'supervision_reset', source: options.source === 'repl' ? 'repl' : 'cli' }, options.signal, undefined, () => { lease.check(); assertAuthority(); });
|
|
48
|
+
const reset = await store.append({ type: 'supervision_reset', source: options.source === 'repl' ? 'repl' : 'cli' }, options.signal, undefined, () => { lease.check(); assertAuthority(); store.assertRevision(initial.execution.state.revision); });
|
|
49
|
+
return finish(reset.hash);
|
|
48
50
|
}
|
|
49
51
|
else if (action === 'accept') {
|
|
50
52
|
const output = current.state.tasks[target].output;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinator-actions.js","sourceRoot":"","sources":["../../src/orchestration/coordinator-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAC,qBAAqB,EAAC,qBAAqB,EAAC,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAC;AAI9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAU,EAAC,KAAY,EAAC,OAAO,GAAkB,EAAE;IACxF,MAAM,IAAI,GAAC,OAAO,CAAC,KAAK,IAAE,IAAI,QAAQ,EAAE,EAAC,IAAI,GAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAC,GAAG,EAAC,OAAO,CAAC,MAAM,CAAC,EAAC,KAAK,GAAC,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAC,KAAK,CAAC,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtJ,OAAM,EAAC,IAAI,EAAC,KAAK,EAAC,SAAS,EAAC,KAAK,CAAC,MAAM,EAAE,CAAA,CAAC,CAAA,KAAK,CAAC,IAAI,EAAE,CAAA,CAAC,CAAA,IAAI,EAAC,KAAK,EAAC,KAAK,CAAC,MAAM,EAAE,CAAA,CAAC,CAAA,KAAK,CAAC,KAAK,EAAE,CAAA,CAAC,CAAA,IAAI,EAAC,CAAC;AACxG,CAAC;AACD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAU,EAAC,KAAY,EAAC,MAAqE,EAAC,MAAa,EAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"coordinator-actions.js","sourceRoot":"","sources":["../../src/orchestration/coordinator-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,13 @@ export interface TaskOutput {
|
|
|
40
40
|
checks: CheckEvidence[];
|
|
41
41
|
}
|
|
42
42
|
export type ExecutionChange = {
|
|
43
|
+
type: 'improvement_review_requested';
|
|
44
|
+
request: import('../improvement/review-contract.js').ImprovementReviewRequest;
|
|
45
|
+
} | {
|
|
46
|
+
type: 'improvement_review_dismissed';
|
|
47
|
+
requestId: string;
|
|
48
|
+
executionRevision: string;
|
|
49
|
+
} | {
|
|
43
50
|
type: 'agent_routed';
|
|
44
51
|
agentId: string;
|
|
45
52
|
sessionId: string;
|
|
@@ -56,6 +63,10 @@ export type ExecutionChange = {
|
|
|
56
63
|
} | import('../supervision/types.js').SupervisionChange | {
|
|
57
64
|
type: 'graph_admitted';
|
|
58
65
|
admission: SpawnAdmission;
|
|
66
|
+
} | {
|
|
67
|
+
type: 'interruption_recovered';
|
|
68
|
+
ownerId: string;
|
|
69
|
+
source: 'cli' | 'repl';
|
|
59
70
|
} | {
|
|
60
71
|
type: 'started';
|
|
61
72
|
ownerId: string;
|
|
@@ -93,6 +104,15 @@ export type ExecutionChange = {
|
|
|
93
104
|
stage: 'started' | 'finished';
|
|
94
105
|
mutating: boolean;
|
|
95
106
|
success: boolean;
|
|
107
|
+
} | {
|
|
108
|
+
type: 'question_asked';
|
|
109
|
+
taskId: string;
|
|
110
|
+
request: import('./question-contract.js').ExecutionQuestionRequest;
|
|
111
|
+
} | {
|
|
112
|
+
type: 'question_answered';
|
|
113
|
+
taskId: string;
|
|
114
|
+
questionId: string;
|
|
115
|
+
answer: string;
|
|
96
116
|
} | {
|
|
97
117
|
type: 'artifact';
|
|
98
118
|
artifact: CollectedArtifact;
|
|
@@ -121,7 +141,7 @@ export type ExecutionChange = {
|
|
|
121
141
|
status: Exclude<ExecutionStatus, 'ready' | 'running'>;
|
|
122
142
|
};
|
|
123
143
|
export interface ExecutionEvent {
|
|
124
|
-
version: 1 | 2 | 3 | 4 | 5 | 6 | 7;
|
|
144
|
+
version: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11;
|
|
125
145
|
id: string;
|
|
126
146
|
runId: string;
|
|
127
147
|
sequence: number;
|
|
@@ -144,13 +164,14 @@ export interface TaskState {
|
|
|
144
164
|
route?: import('./routing.js').RecordedAgentRoute;
|
|
145
165
|
}
|
|
146
166
|
export interface ExecutionProjection {
|
|
147
|
-
version: 1 | 2 | 3 | 4 | 5 | 6;
|
|
167
|
+
version: 1 | 2 | 3 | 4 | 5 | 6 | 7;
|
|
148
168
|
runId: string;
|
|
149
169
|
revision: string;
|
|
150
170
|
status: ExecutionStatus;
|
|
151
171
|
ownerId: string | null;
|
|
152
172
|
deadline: number;
|
|
153
173
|
graph?: SpawnGraph;
|
|
174
|
+
questions?: Record<string, import('./question-contract.js').ExecutionQuestion>;
|
|
154
175
|
routes?: Record<string, {
|
|
155
176
|
sessionId: string;
|
|
156
177
|
taskId?: string;
|