devcontour-harness 0.1.0-alpha.21 → 0.1.0-alpha.23
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 +21 -2
- package/docs/architecture.md +10 -1
- package/docs/compatibility.md +11 -11
- package/docs/contracts.md +17 -2
- package/docs/quickstart.md +1 -1
- package/docs/release-notes/0.1.0-alpha.22.md +57 -0
- package/docs/release-notes/0.1.0-alpha.23.md +122 -0
- package/docs/toolchains.md +2 -1
- package/docs/upgrade.md +17 -17
- package/lib/agents/cli-adapter.js +1 -0
- package/lib/agents/review-probe.d.ts +1 -0
- package/lib/agents/review-probe.js +4 -0
- package/lib/cli.js +1 -1
- package/lib/contracts/cli.d.ts +20 -0
- package/lib/contracts/cli.js +11 -0
- package/lib/contracts/ports.d.ts +6 -0
- package/lib/control/base-move.d.ts +2 -0
- package/lib/control/base-move.js +13 -2
- package/lib/control/doctor.d.ts +10 -0
- package/lib/control/doctor.js +19 -3
- package/lib/control/harness.d.ts +6 -0
- package/lib/control/harness.js +2 -0
- package/lib/engine/joint-runner.d.ts +5 -0
- package/lib/engine/joint-runner.js +28 -5
- package/lib/engine/runner.d.ts +18 -0
- package/lib/engine/runner.js +73 -10
- package/lib/environment/checkout-root.d.ts +78 -0
- package/lib/environment/checkout-root.js +133 -0
- package/lib/environment/git-trust.js +4 -0
- package/lib/environment/isolation.d.ts +48 -9
- package/lib/environment/isolation.js +132 -37
- package/lib/index.d.ts +5 -0
- package/lib/index.js +5 -0
- package/lib/verification/confirm.d.ts +7 -4
- package/lib/verification/confirm.js +4 -2
- package/lib/verification/gates-at.d.ts +9 -5
- package/lib/verification/gates-at.js +30 -5
- package/lib/verification/gates.d.ts +13 -4
- package/lib/verification/gates.js +15 -2
- package/lib/verification/spike.d.ts +7 -4
- package/lib/verification/spike.js +4 -2
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
-
import { mkdir, rm } from 'node:fs/promises';
|
|
3
|
-
import { join } from 'node:path';
|
|
2
|
+
import { mkdir, rm, rmdir } from 'node:fs/promises';
|
|
3
|
+
import { dirname, join } from 'node:path';
|
|
4
4
|
import { HarnessError } from "../contracts/index.js";
|
|
5
5
|
import { TaskFailure } from "../engine/failure.js";
|
|
6
6
|
import { git } from "../environment/process.js";
|
|
@@ -8,6 +8,8 @@ import { executionEnvironment, runSteps, withEnvironment } from "../environment/
|
|
|
8
8
|
import { defaultResourceDatabase, withResources } from "../environment/resources.js";
|
|
9
9
|
import { removeSnapshots, snapshotDependencies } from "./dependencies.js";
|
|
10
10
|
import { runGate } from "./gates.js";
|
|
11
|
+
import { checkoutPath, chooseCheckoutRoot } from "../environment/checkout-root.js";
|
|
12
|
+
import { credentialPaths } from "../environment/isolation.js";
|
|
11
13
|
import { explicitPrerequisites, orderedScope, standaloneScope } from "./gate-scope.js";
|
|
12
14
|
/**
|
|
13
15
|
* Gates компонента на закреплённом SHA вне попытки — тем же исполнением, что
|
|
@@ -40,7 +42,16 @@ export async function runGatesAt(ctx, input) {
|
|
|
40
42
|
throw new HarnessError('NOT_FOUND', `Commit ${input.sha} недоступен в ${repo.id}`);
|
|
41
43
|
});
|
|
42
44
|
const root = join(ctx.stateDir, 'gates-at', id);
|
|
43
|
-
|
|
45
|
+
// Рабочее дерево и снимки — под корнем вне дерева, если каталог состояния
|
|
46
|
+
// лежит внутри репозитория; логи остаются в каталоге состояния.
|
|
47
|
+
const placement = chooseCheckoutRoot({
|
|
48
|
+
stateDirs: [ctx.stateDir],
|
|
49
|
+
repositories: ctx.policy.repositories.map((r) => ctx.repoPath(r)),
|
|
50
|
+
hidden: [...ctx.boundary().hidden, ...credentialPaths()],
|
|
51
|
+
...(ctx.checkoutRoot ? { configured: ctx.checkoutRoot } : {}),
|
|
52
|
+
});
|
|
53
|
+
const trees = checkoutPath(placement, root, repo.id, 'gates-at', id);
|
|
54
|
+
const cwd = join(trees, 'worktree');
|
|
44
55
|
const artifacts = join(root, 'artifacts');
|
|
45
56
|
const timeout = AbortSignal.timeout(ctx.policy.runTimeoutMs);
|
|
46
57
|
const signal = input.signal ? AbortSignal.any([input.signal, timeout]) : timeout;
|
|
@@ -51,6 +62,7 @@ export async function runGatesAt(ctx, input) {
|
|
|
51
62
|
let snapshots = [];
|
|
52
63
|
let added = false;
|
|
53
64
|
await mkdir(root, { recursive: true });
|
|
65
|
+
await mkdir(dirname(cwd), { recursive: true });
|
|
54
66
|
try {
|
|
55
67
|
await withResources({
|
|
56
68
|
resources: ctx.policy.resources,
|
|
@@ -70,7 +82,7 @@ export async function runGatesAt(ctx, input) {
|
|
|
70
82
|
snapshots = await snapshotDependencies({
|
|
71
83
|
repos,
|
|
72
84
|
repositoryId: repo.id,
|
|
73
|
-
dir: join(
|
|
85
|
+
dir: join(trees, 'dependencies'),
|
|
74
86
|
artifacts,
|
|
75
87
|
runId: id,
|
|
76
88
|
policy: ctx.policy,
|
|
@@ -131,6 +143,14 @@ export async function runGatesAt(ctx, input) {
|
|
|
131
143
|
boundary: {
|
|
132
144
|
hidden: boundary.hidden,
|
|
133
145
|
readable: [...boundary.readable, ...snapshots.map((d) => d.path)],
|
|
146
|
+
// Корень вне дерева закрыт (свои деревья открыты), и тогда,
|
|
147
|
+
// когда хост его в своей границе не назвал.
|
|
148
|
+
checkouts: [
|
|
149
|
+
...new Set([
|
|
150
|
+
...(boundary.checkouts ?? []),
|
|
151
|
+
...(placement.root ? [placement.root] : []),
|
|
152
|
+
]),
|
|
153
|
+
],
|
|
134
154
|
},
|
|
135
155
|
// Генеративный gate получает seed от этой проверки; договора
|
|
136
156
|
// поручения у неё нет — прежний уровень отчёта свойств.
|
|
@@ -160,7 +180,12 @@ export async function runGatesAt(ctx, input) {
|
|
|
160
180
|
repo: (rid) => ctx.policy.repositories.find((r) => r.id === rid),
|
|
161
181
|
path: (r) => ctx.repoPath(r),
|
|
162
182
|
}, snapshots);
|
|
163
|
-
await rm(
|
|
183
|
+
await rm(cwd, { recursive: true, force: true }).catch(() => undefined);
|
|
184
|
+
// Пустой каталог проверки вне дерева не копится; непустой (снимок, который
|
|
185
|
+
// не удалось убрать) остаётся как есть.
|
|
186
|
+
if (trees !== root)
|
|
187
|
+
for (const dir of [join(trees, 'dependencies'), trees])
|
|
188
|
+
await rmdir(dir).catch(() => undefined);
|
|
164
189
|
}
|
|
165
190
|
return {
|
|
166
191
|
id,
|
|
@@ -78,6 +78,8 @@ export declare function runCheck(h: {
|
|
|
78
78
|
write: string[];
|
|
79
79
|
readable: string[];
|
|
80
80
|
controller: string[];
|
|
81
|
+
/** Корни рабочих деревьев вне каталога состояния: закрыты целиком, свои деревья открыты. */
|
|
82
|
+
checkouts?: string[];
|
|
81
83
|
settingsDir: string;
|
|
82
84
|
/**
|
|
83
85
|
* Собрать отказы песочницы из журнала ядра (macOS): по ним, а не по
|
|
@@ -143,6 +145,16 @@ export declare function sandboxBlockedHosts(output: string, allowed: string[]):
|
|
|
143
145
|
*/
|
|
144
146
|
export declare const propertyReportEnv = "DEVCONTOUR_PROPERTY_REPORT";
|
|
145
147
|
export declare function freshnessEnv(kind: GatePolicy['kind'], env: NodeJS.ProcessEnv): Record<string, string>;
|
|
148
|
+
/**
|
|
149
|
+
* Граница проверки: закрытое (состояние controller, исходные checkout),
|
|
150
|
+
* открытое внутри него и корни рабочих деревьев вне каталога состояния,
|
|
151
|
+
* закрытые целиком (свои деревья проверки открыты).
|
|
152
|
+
*/
|
|
153
|
+
export interface Boundary {
|
|
154
|
+
hidden: string[];
|
|
155
|
+
readable: string[];
|
|
156
|
+
checkouts?: string[];
|
|
157
|
+
}
|
|
146
158
|
/** Что нужно для запуска gate попытки. */
|
|
147
159
|
export interface GateRun {
|
|
148
160
|
policy: Pick<ExecutionPolicy, 'isolation'>;
|
|
@@ -160,10 +172,7 @@ export interface GateRun {
|
|
|
160
172
|
redact: (value: string) => string;
|
|
161
173
|
};
|
|
162
174
|
/** Закрытое проверке (состояние controller, чужие checkout) и открытое внутри него. */
|
|
163
|
-
boundary:
|
|
164
|
-
hidden: string[];
|
|
165
|
-
readable: string[];
|
|
166
|
-
};
|
|
175
|
+
boundary: Boundary;
|
|
167
176
|
/** Проверка потребителя: evidence несёт его компонент и не закрывает собственные gates. */
|
|
168
177
|
consumer?: string;
|
|
169
178
|
/** Повтор провала: ID записи, которую повторяет запуск; исход пишется в `recheck`. */
|
|
@@ -277,6 +277,7 @@ h, options) {
|
|
|
277
277
|
controller: options.controller,
|
|
278
278
|
readable: options.readable,
|
|
279
279
|
domains: h.config.isolation.domains,
|
|
280
|
+
...(options.checkouts?.length ? { checkouts: options.checkouts } : {}),
|
|
280
281
|
});
|
|
281
282
|
started = join(marks, 'started');
|
|
282
283
|
// Обязательные запреты записи — для checkout проверки целиком, а не
|
|
@@ -506,12 +507,24 @@ export async function runGate(run) {
|
|
|
506
507
|
write: [cwd, ...(propertyDir ? [propertyDir] : [])],
|
|
507
508
|
readable: [...run.boundary.readable, ...(corpusDir ? [corpusDir] : [])],
|
|
508
509
|
controller: run.boundary.hidden,
|
|
510
|
+
...(run.boundary.checkouts?.length ? { checkouts: run.boundary.checkouts } : {}),
|
|
509
511
|
settingsDir: join(artifactDir, gate.id),
|
|
510
512
|
violations: true,
|
|
511
513
|
});
|
|
512
514
|
exitCode = result.code;
|
|
513
515
|
log += result.stdout + '\n' + result.stderr;
|
|
514
|
-
|
|
516
|
+
// Путь, который после проверки не прочитать, проверка и закрыла: это
|
|
517
|
+
// нарушение области, а не отказ среды (снимок до проверки прочитался).
|
|
518
|
+
let planted = [];
|
|
519
|
+
try {
|
|
520
|
+
if (before)
|
|
521
|
+
planted = protectedChanges(before, root);
|
|
522
|
+
}
|
|
523
|
+
catch (error) {
|
|
524
|
+
if (error instanceof SandboxPolicyError)
|
|
525
|
+
kind = 'scope-violation';
|
|
526
|
+
throw error instanceof SandboxPolicyError ? new Error(error.message) : error;
|
|
527
|
+
}
|
|
515
528
|
if (planted.length) {
|
|
516
529
|
kind = 'scope-violation';
|
|
517
530
|
throw new Error('проверка создала или изменила защищённые пути (конфигурация IDE, shell, git или Claude): ' +
|
|
@@ -535,7 +548,7 @@ export async function runGate(run) {
|
|
|
535
548
|
// Отказ файловой песочницы — отказ среды: правка кода его не снимет,
|
|
536
549
|
// а класс gate сжигал бы бюджет ремонтов.
|
|
537
550
|
const denied = result.isolation && result.violations
|
|
538
|
-
? sandboxDenials(result.violations, result.isolation)
|
|
551
|
+
? sandboxDenials(result.violations, result.isolation, result.stdout + '\n' + result.stderr, gateCwd)
|
|
539
552
|
: [];
|
|
540
553
|
if (denied.length) {
|
|
541
554
|
kind = 'environment';
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type ExecutionPolicy, type ExecutionView, type Spike } from '../contracts/index.ts';
|
|
2
2
|
import type { Engine } from '../engine/engine.ts';
|
|
3
|
+
import { type Boundary } from './gates.ts';
|
|
3
4
|
/** Что нужно эксперименту от controller. */
|
|
4
5
|
export interface SpikeContext {
|
|
5
6
|
engine: Engine;
|
|
@@ -7,10 +8,12 @@ export interface SpikeContext {
|
|
|
7
8
|
stateDir: string;
|
|
8
9
|
repoPath(repo: ExecutionPolicy['repositories'][number]): string;
|
|
9
10
|
/** Закрытое проверке и открытое внутри него. */
|
|
10
|
-
boundary():
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
boundary(): Boundary;
|
|
12
|
+
/**
|
|
13
|
+
* Каталог рабочего дерева вида `kind` (корень вне дерева, `checkout-root.ts`);
|
|
14
|
+
* без него — прежнее место в каталоге состояния.
|
|
15
|
+
*/
|
|
16
|
+
checkout?(repositoryId: string, kind: string, id: string): string;
|
|
14
17
|
environment?: NodeJS.ProcessEnv;
|
|
15
18
|
}
|
|
16
19
|
/** Эксперимент репозитория по ID или undefined. */
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { mkdir } from 'node:fs/promises';
|
|
3
3
|
import { arch, cpus, platform } from 'node:os';
|
|
4
|
-
import { join } from 'node:path';
|
|
4
|
+
import { dirname, join } from 'node:path';
|
|
5
5
|
import { HarnessError, digestOf, spikeInputSchema, spikeSchema, } from "../contracts/index.js";
|
|
6
6
|
import { git } from "../environment/process.js";
|
|
7
7
|
import { executionEnvironment } from "../environment/lifecycle.js";
|
|
@@ -46,8 +46,9 @@ export async function runSpike(ctx, raw) {
|
|
|
46
46
|
});
|
|
47
47
|
const id = 'SP-' + randomUUID();
|
|
48
48
|
const root = join(ctx.stateDir, 'spikes');
|
|
49
|
-
const dir = join(root, id);
|
|
49
|
+
const dir = ctx.checkout?.(repo.id, 'spikes', id) ?? join(root, id);
|
|
50
50
|
await mkdir(root, { recursive: true });
|
|
51
|
+
await mkdir(dirname(dir), { recursive: true });
|
|
51
52
|
await git(path, 'worktree', 'add', '--detach', dir, sha);
|
|
52
53
|
const results = [];
|
|
53
54
|
try {
|
|
@@ -65,6 +66,7 @@ export async function runSpike(ctx, raw) {
|
|
|
65
66
|
write: [dir],
|
|
66
67
|
readable: boundary.readable,
|
|
67
68
|
controller: boundary.hidden,
|
|
69
|
+
...(boundary.checkouts?.length ? { checkouts: boundary.checkouts } : {}),
|
|
68
70
|
settingsDir: join(root, `${id}-settings`),
|
|
69
71
|
});
|
|
70
72
|
results.push({
|
package/package.json
CHANGED