devcontour-harness 0.1.0-alpha.31 → 0.1.0-alpha.35
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 +28 -3
- package/docs/architecture.md +12 -0
- package/docs/compatibility.md +21 -18
- package/docs/contracts.md +189 -21
- package/docs/release-notes/0.1.0-alpha.32.md +33 -0
- package/docs/release-notes/0.1.0-alpha.33.md +29 -0
- package/docs/release-notes/0.1.0-alpha.34.md +32 -0
- package/docs/release-notes/0.1.0-alpha.35.md +27 -0
- package/docs/upgrade.md +172 -0
- package/lib/agents/cli-adapter.d.ts +10 -1
- package/lib/agents/cli-adapter.js +38 -7
- package/lib/agents/usage.d.ts +9 -0
- package/lib/agents/usage.js +22 -1
- package/lib/cli.js +2 -2
- package/lib/contracts/cli.d.ts +344 -6
- package/lib/contracts/cli.js +1 -0
- package/lib/contracts/diagnosis.d.ts +3 -1
- package/lib/contracts/diagnosis.js +1 -0
- package/lib/contracts/errors.d.ts +3 -1
- package/lib/contracts/errors.js +2 -0
- package/lib/contracts/events.d.ts +365 -4
- package/lib/contracts/events.js +63 -2
- package/lib/contracts/execution.d.ts +32 -1
- package/lib/contracts/execution.js +19 -0
- package/lib/contracts/failure.d.ts +12 -3
- package/lib/contracts/failure.js +10 -2
- package/lib/contracts/handoff.d.ts +17 -0
- package/lib/contracts/handoff.js +17 -3
- package/lib/contracts/planning.d.ts +2 -0
- package/lib/contracts/ports.d.ts +10 -2
- package/lib/contracts/published.d.ts +205 -3
- package/lib/contracts/repair-policy.d.ts +10 -1
- package/lib/contracts/repair-policy.js +18 -0
- package/lib/contracts/report.d.ts +118 -2
- package/lib/contracts/report.js +61 -3
- package/lib/contracts/result.d.ts +2 -0
- package/lib/control/base-move.d.ts +7 -2
- package/lib/control/base-move.js +14 -1
- package/lib/control/harness.d.ts +54 -18
- package/lib/control/harness.js +8 -96
- package/lib/control/recovery.d.ts +1 -1
- package/lib/control/status.d.ts +235 -0
- package/lib/control/status.js +101 -0
- package/lib/engine/budget.d.ts +78 -0
- package/lib/engine/budget.js +13 -2
- package/lib/engine/classify.d.ts +14 -1
- package/lib/engine/classify.js +34 -0
- package/lib/engine/engine.d.ts +25 -11
- package/lib/engine/engine.js +78 -5
- package/lib/engine/failure.d.ts +1 -1
- package/lib/engine/failure.js +1 -1
- package/lib/engine/prompt.js +11 -1
- package/lib/engine/property-recovery.js +2 -0
- package/lib/engine/repair.js +4 -2
- package/lib/engine/reuse.js +2 -0
- package/lib/engine/runner.js +13 -5
- package/lib/environment/isolation.d.ts +67 -3
- package/lib/environment/isolation.js +148 -5
- package/lib/environment/lifecycle.js +1 -1
- package/lib/explain/state.d.ts +26 -5
- package/lib/explain/state.js +39 -4
- package/lib/handoff/index.d.ts +1 -1
- package/lib/handoff/markdown.js +4 -2
- package/lib/handoff/pack.d.ts +38 -8
- package/lib/handoff/pack.js +57 -18
- package/lib/index.d.ts +19 -4
- package/lib/index.js +19 -3
- package/lib/integrations/connector/testing.js +1 -1
- package/lib/projections/next.d.ts +3 -1
- package/lib/projections/next.js +4 -1
- package/lib/projections/stop.d.ts +14 -1
- package/lib/projections/stop.js +68 -11
- package/lib/report/compute.js +229 -21
- package/lib/report/document.js +32 -8
- package/lib/storage/document.d.ts +8 -6
- package/lib/verification/gates.js +20 -4
- package/package.json +1 -1
- package/schemas/execution-document.schema.json +11 -0
- package/schemas/handoff-pack.schema.json +15 -0
- package/schemas/result-envelope.schema.json +1 -0
- package/schemas/run-event.schema.json +322 -0
- package/schemas/run-result.schema.json +1 -0
- package/schemas/stop-diagnosis.schema.json +2 -0
- package/schemas/value-report.schema.json +236 -3
package/lib/contracts/report.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
import { baseMoveActors, cancelActors, environmentCauses, retryActors } from "./events.js";
|
|
2
3
|
import { failureKindSchema, pauseReasons } from "./execution.js";
|
|
3
4
|
import { isoTimeSchema } from "./primitives.js";
|
|
4
5
|
/**
|
|
@@ -101,6 +102,8 @@ const evidenceRefSchema = z.strictObject({
|
|
|
101
102
|
blocking: count.nullable(),
|
|
102
103
|
});
|
|
103
104
|
const countRow = (key) => z.strictObject({ key, count });
|
|
105
|
+
/** Число по каждому актёру перечня. */
|
|
106
|
+
const actorCounts = (actors) => z.strictObject(Object.fromEntries(actors.map((a) => [a, count])));
|
|
104
107
|
const weekRowSchema = z.strictObject({
|
|
105
108
|
kind: z.literal('week'),
|
|
106
109
|
week,
|
|
@@ -258,9 +261,41 @@ export const valueReportSchema = z.strictObject({
|
|
|
258
261
|
/** Удержания и отмены попыток: актёр не записан, к действиям человека не относятся. */
|
|
259
262
|
holds: count,
|
|
260
263
|
cancelledAttempts: count,
|
|
264
|
+
/**
|
|
265
|
+
* Повторы и сбросы в окне по событиям — только точные: `null`, если
|
|
266
|
+
* событий вмешательств нет или запись не покрывает окно (числа по
|
|
267
|
+
* актёрам — в `recorded`). `baseMoves` — всегда `null`: сдвиг базы вне
|
|
268
|
+
* `fencedRefMove` не записывается, его число — нижняя граница.
|
|
269
|
+
*/
|
|
261
270
|
retries: count.nullable(),
|
|
262
271
|
resets: count.nullable(),
|
|
263
272
|
baseMoves: count.nullable(),
|
|
273
|
+
/**
|
|
274
|
+
* Актёры вмешательств из событий `work.retried`, `work.cancelled`,
|
|
275
|
+
* `base.moved`; `null` — таких событий в журнале нет (записаны до
|
|
276
|
+
* версии, которая их пишет). `from` — первое такое событие; `bound:
|
|
277
|
+
* lower` — в окне есть активность раньше него.
|
|
278
|
+
*/
|
|
279
|
+
recorded: z
|
|
280
|
+
.strictObject({
|
|
281
|
+
from: isoTimeSchema,
|
|
282
|
+
bound: z.enum(['exact', 'lower']),
|
|
283
|
+
retries: actorCounts(retryActors),
|
|
284
|
+
resets: actorCounts(retryActors),
|
|
285
|
+
cancellations: actorCounts(cancelActors),
|
|
286
|
+
/** Отмены поручений без активной попытки (их `attempt.cancelled` нет). */
|
|
287
|
+
cancelledWithoutAttempt: count,
|
|
288
|
+
baseMoves: actorCounts(baseMoveActors),
|
|
289
|
+
/** Сдвиги базы — всегда нижняя граница: перенос вне `fencedRefMove` не пишется. */
|
|
290
|
+
baseMovesBound: z.literal('lower'),
|
|
291
|
+
/**
|
|
292
|
+
* Поручения окна с новой попыткой после отказа или отмены без
|
|
293
|
+
* записанного повтора (между ними работала версия без событий):
|
|
294
|
+
* пробел записи, `bound: lower`.
|
|
295
|
+
*/
|
|
296
|
+
gaps: count,
|
|
297
|
+
})
|
|
298
|
+
.nullable(),
|
|
264
299
|
}),
|
|
265
300
|
approvals: z.strictObject({
|
|
266
301
|
operator: count,
|
|
@@ -363,8 +398,31 @@ export const valueReportSchema = z.strictObject({
|
|
|
363
398
|
/** Отказы `defect` только в gates подготовки: возможно, тоже окружение (сеть, реестр). */
|
|
364
399
|
setupCheckFailures: count,
|
|
365
400
|
timeLimit: count,
|
|
366
|
-
/**
|
|
367
|
-
|
|
401
|
+
/**
|
|
402
|
+
* Подпричины отказов окружения по `attempt.diagnosed`; `null` — таких
|
|
403
|
+
* событий в журнале нет. `undiagnosed` — отказы окружения окна без
|
|
404
|
+
* события (записаны раньше): тогда `bound: lower`.
|
|
405
|
+
*/
|
|
406
|
+
causes: z
|
|
407
|
+
.strictObject({
|
|
408
|
+
rows: z
|
|
409
|
+
.array(z.strictObject({
|
|
410
|
+
cause: z.enum(environmentCauses),
|
|
411
|
+
count,
|
|
412
|
+
/** Из них засчитаны в предел попыток. */
|
|
413
|
+
counted: count,
|
|
414
|
+
}))
|
|
415
|
+
.max(environmentCauses.length),
|
|
416
|
+
diagnosed: count,
|
|
417
|
+
undiagnosed: count,
|
|
418
|
+
bound: z.enum(['exact', 'lower']),
|
|
419
|
+
})
|
|
420
|
+
.nullable(),
|
|
421
|
+
/**
|
|
422
|
+
* Цена отказов окружения: попытки корзины `environment` — и зависания
|
|
423
|
+
* (`stalled`), хотя они засчитаны в предел попыток; `blocked` — из них
|
|
424
|
+
* отказы до работы.
|
|
425
|
+
*/
|
|
368
426
|
neutral: z.strictObject({
|
|
369
427
|
costBound: z.enum(reportBounds),
|
|
370
428
|
attempts: count,
|
|
@@ -388,7 +446,7 @@ export const valueReportSchema = z.strictObject({
|
|
|
388
446
|
limitations: z
|
|
389
447
|
.array(z.strictObject({ id: z.string().min(1).max(60), text: sentence }))
|
|
390
448
|
.min(1)
|
|
391
|
-
.max(
|
|
449
|
+
.max(40),
|
|
392
450
|
});
|
|
393
451
|
/** `harness report --out`: отчёт записан в файл, в ответе — куда и сколько. */
|
|
394
452
|
export const reportFileSchema = z.strictObject({
|
|
@@ -366,6 +366,7 @@ export declare const runResultSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
366
366
|
BUDGET_EXHAUSTED: "BUDGET_EXHAUSTED";
|
|
367
367
|
BUDGET_UNKNOWN: "BUDGET_UNKNOWN";
|
|
368
368
|
ATTEMPTS_EXHAUSTED: "ATTEMPTS_EXHAUSTED";
|
|
369
|
+
CONTEXT_EXHAUSTED: "CONTEXT_EXHAUSTED";
|
|
369
370
|
REVISION_CONFLICT: "REVISION_CONFLICT";
|
|
370
371
|
CANCELLED: "CANCELLED";
|
|
371
372
|
NOT_FOUND: "NOT_FOUND";
|
|
@@ -795,6 +796,7 @@ export declare const resultEnvelopeSchema: z.ZodObject<{
|
|
|
795
796
|
BUDGET_EXHAUSTED: "BUDGET_EXHAUSTED";
|
|
796
797
|
BUDGET_UNKNOWN: "BUDGET_UNKNOWN";
|
|
797
798
|
ATTEMPTS_EXHAUSTED: "ATTEMPTS_EXHAUSTED";
|
|
799
|
+
CONTEXT_EXHAUSTED: "CONTEXT_EXHAUSTED";
|
|
798
800
|
REVISION_CONFLICT: "REVISION_CONFLICT";
|
|
799
801
|
CANCELLED: "CANCELLED";
|
|
800
802
|
NOT_FOUND: "NOT_FOUND";
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type BaseMoveActor, type ExecutionPolicy, type ExecutionStore, type ExecutionView } from '../contracts/index.ts';
|
|
2
2
|
/** Сдвиг ref: репозиторий, ref, новое и ожидаемое прежнее значение. */
|
|
3
3
|
export type RefMove = (repoPath: string, target: string, to: string, from: string) => void | Promise<void>;
|
|
4
4
|
/**
|
|
@@ -8,7 +8,12 @@ export type RefMove = (repoPath: string, target: string, to: string, from: strin
|
|
|
8
8
|
* исполняется чужой код: hook `reference-transaction`, ждущий ту же базу,
|
|
9
9
|
* ждал бы её, а она — его; срок Git ограничен, зависший Git не держит базу.
|
|
10
10
|
*/
|
|
11
|
-
|
|
11
|
+
/**
|
|
12
|
+
* Сдвиг записывается событием `base.moved` в той же транзакции: отказ
|
|
13
|
+
* проверки или Git отменяет и событие. `by` — кто сдвигает: controller
|
|
14
|
+
* (перемотка очереди) или оператор; хост, не назвавший актёра, — `host`.
|
|
15
|
+
*/
|
|
16
|
+
export declare function fencedRefMove(store: ExecutionStore, fence: (view: ExecutionView) => void, timeoutMs?: number, by?: BaseMoveActor): RefMove;
|
|
12
17
|
export declare namespace fencedRefMove {
|
|
13
18
|
var timeoutMs: number;
|
|
14
19
|
}
|
package/lib/control/base-move.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { execFileSync } from 'node:child_process';
|
|
2
2
|
import { mkdir } from 'node:fs/promises';
|
|
3
3
|
import { dirname, isAbsolute, join, resolve } from 'node:path';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
import { HarnessError, baseMoveActors, } from "../contracts/index.js";
|
|
4
6
|
import { git, hostGitArgs } from "../environment/process.js";
|
|
5
7
|
import { checkoutPath, chooseCheckoutRoot } from "../environment/checkout-root.js";
|
|
6
8
|
import { credentialPaths } from "../environment/isolation.js";
|
|
@@ -11,7 +13,17 @@ import { credentialPaths } from "../environment/isolation.js";
|
|
|
11
13
|
* исполняется чужой код: hook `reference-transaction`, ждущий ту же базу,
|
|
12
14
|
* ждал бы её, а она — его; срок Git ограничен, зависший Git не держит базу.
|
|
13
15
|
*/
|
|
14
|
-
|
|
16
|
+
/**
|
|
17
|
+
* Сдвиг записывается событием `base.moved` в той же транзакции: отказ
|
|
18
|
+
* проверки или Git отменяет и событие. `by` — кто сдвигает: controller
|
|
19
|
+
* (перемотка очереди) или оператор; хост, не назвавший актёра, — `host`.
|
|
20
|
+
*/
|
|
21
|
+
export function fencedRefMove(store, fence, timeoutMs = fencedRefMove.timeoutMs, by = 'host') {
|
|
22
|
+
// Актёр проверяется до любого сдвига: недопустимое значение — отказ без git update-ref.
|
|
23
|
+
const parsed = z.enum(baseMoveActors).safeParse(by);
|
|
24
|
+
if (!parsed.success)
|
|
25
|
+
throw new HarnessError('INVALID_INPUT', `Недопустимый актёр сдвига базы: ${String(by).slice(0, 60)}`);
|
|
26
|
+
const actor = parsed.data;
|
|
15
27
|
return (repoPath, target, to, from) => store.transact('base.moved', (tx) => {
|
|
16
28
|
fence(tx);
|
|
17
29
|
execFileSync('git', hostGitArgs(repoPath, ['update-ref', target, to, from]), {
|
|
@@ -19,6 +31,7 @@ export function fencedRefMove(store, fence, timeoutMs = fencedRefMove.timeoutMs)
|
|
|
19
31
|
timeout: timeoutMs,
|
|
20
32
|
stdio: 'pipe',
|
|
21
33
|
});
|
|
34
|
+
tx.emit({ type: 'base.moved', payload: { by: actor } });
|
|
22
35
|
});
|
|
23
36
|
}
|
|
24
37
|
/** Предел git update-ref внутри транзакции; конечный и короче lease. */
|
package/lib/control/harness.d.ts
CHANGED
|
@@ -746,7 +746,8 @@ export declare class Harness {
|
|
|
746
746
|
/**
|
|
747
747
|
* Состояние очереди, графов и поручений. С `detail` — ещё снимок
|
|
748
748
|
* наблюдателя: почему стоит выдача (`queueStop` и `queuePause`) и активные
|
|
749
|
-
* попытки (`attemptView`); без него ответ прежний.
|
|
749
|
+
* попытки (`attemptView`); без него ответ прежний. Та же функция над
|
|
750
|
+
* движком и политикой хоста — `statusOf`.
|
|
750
751
|
*/
|
|
751
752
|
status(graphId?: string, options?: {
|
|
752
753
|
detail?: boolean;
|
|
@@ -765,24 +766,24 @@ export declare class Harness {
|
|
|
765
766
|
reason?: "runtime" | "operator" | "shutdown" | "base-check" | "reconfigure" | undefined;
|
|
766
767
|
paused: boolean;
|
|
767
768
|
} | {
|
|
768
|
-
code?: "INVALID_INPUT" | "UNSUPPORTED_COMMAND" | "UNSUPPORTED_VERSION" | "GRAPH_CYCLE" | "GRAPH_UNKNOWN_DEPENDENCY" | "GRAPH_DUPLICATE_ID" | "GATE_UNKNOWN" | "GATE_GROUP_CYCLE" | "REVIEWER_SAME_VENDOR" | "REVIEWER_MISSING" | "RESPONSE_TOO_LARGE" | "APPROVAL_STALE" | "APPROVAL_REQUIRED" | "LEASE_STALE" | "CONTROLLER_BUSY" | "PAUSED" | "NOT_READY" | "SCOPE_VIOLATION" | "GATE_FAILED" | "REVIEW_REJECTED" | "BUDGET_EXHAUSTED" | "BUDGET_UNKNOWN" | "ATTEMPTS_EXHAUSTED" | "REVISION_CONFLICT" | "CANCELLED" | "NOT_FOUND" | "PATH_CONFLICT" | "STATE_VERSION_UNSUPPORTED" | "RUNTIME_UNAVAILABLE" | "REVIEW_PROTOCOL_INVALID" | "SANDBOX_UNAVAILABLE" | "GIT_FAILED" | "STORAGE_FAILED" | "DELIVERY_FAILED" | "INTERNAL" | undefined;
|
|
769
|
-
cause?: "gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead" | "runtime-missing" | "controller-busy" | "operator-pause" | "approval-required" | "not-ready" | undefined;
|
|
770
|
-
actor?: import("../
|
|
769
|
+
code?: "INVALID_INPUT" | "UNSUPPORTED_COMMAND" | "UNSUPPORTED_VERSION" | "GRAPH_CYCLE" | "GRAPH_UNKNOWN_DEPENDENCY" | "GRAPH_DUPLICATE_ID" | "GATE_UNKNOWN" | "GATE_GROUP_CYCLE" | "REVIEWER_SAME_VENDOR" | "REVIEWER_MISSING" | "RESPONSE_TOO_LARGE" | "APPROVAL_STALE" | "APPROVAL_REQUIRED" | "LEASE_STALE" | "CONTROLLER_BUSY" | "PAUSED" | "NOT_READY" | "SCOPE_VIOLATION" | "GATE_FAILED" | "REVIEW_REJECTED" | "BUDGET_EXHAUSTED" | "BUDGET_UNKNOWN" | "ATTEMPTS_EXHAUSTED" | "CONTEXT_EXHAUSTED" | "REVISION_CONFLICT" | "CANCELLED" | "NOT_FOUND" | "PATH_CONFLICT" | "STATE_VERSION_UNSUPPORTED" | "RUNTIME_UNAVAILABLE" | "REVIEW_PROTOCOL_INVALID" | "SANDBOX_UNAVAILABLE" | "GIT_FAILED" | "STORAGE_FAILED" | "DELIVERY_FAILED" | "INTERNAL" | undefined;
|
|
770
|
+
cause?: "gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead" | "runtime-missing" | "controller-busy" | "operator-pause" | "approval-required" | "not-ready" | undefined;
|
|
771
|
+
actor?: import("../index.ts").Actor | undefined;
|
|
771
772
|
action?: "none" | "wait" | "retry" | "review-plan" | "diagnose-failure" | "reset-attempts" | "raise-budget" | "replan-dependents" | "recovery-decision" | "user-decision" | "resume-queue" | "fix-environment" | "fix-access" | undefined;
|
|
772
|
-
failures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
773
|
+
failures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
773
774
|
operation?: string | undefined;
|
|
774
775
|
since?: string | undefined;
|
|
775
776
|
detail?: string;
|
|
776
777
|
paused: boolean;
|
|
777
778
|
reason?: import("../contracts/execution.ts").PauseReason;
|
|
778
779
|
};
|
|
779
|
-
attempts: import("../
|
|
780
|
+
attempts: import("../index.ts").AttemptView[];
|
|
780
781
|
} | undefined;
|
|
781
782
|
budgets: {
|
|
782
783
|
onUnknown: "continue" | "stop";
|
|
783
784
|
budgets: {
|
|
784
785
|
reason?: string | undefined;
|
|
785
|
-
scope: import("../
|
|
786
|
+
scope: import("../index.ts").BudgetScope;
|
|
786
787
|
state: "exceeded" | "undetermined" | "within";
|
|
787
788
|
limit: {
|
|
788
789
|
usd?: number;
|
|
@@ -846,7 +847,7 @@ export declare class Harness {
|
|
|
846
847
|
pauseReason?: "runtime" | "operator" | "shutdown" | "base-check" | "reconfigure" | undefined;
|
|
847
848
|
pausedAt?: string | undefined;
|
|
848
849
|
pauseOperation?: string | undefined;
|
|
849
|
-
pauseFailures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
850
|
+
pauseFailures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
850
851
|
waits?: {
|
|
851
852
|
kind: "base-check" | "context-lock";
|
|
852
853
|
detail: string;
|
|
@@ -883,18 +884,18 @@ export declare class Harness {
|
|
|
883
884
|
reason?: "runtime" | "operator" | "shutdown" | "base-check" | "reconfigure" | undefined;
|
|
884
885
|
paused: boolean;
|
|
885
886
|
} | {
|
|
886
|
-
code?: "INVALID_INPUT" | "UNSUPPORTED_COMMAND" | "UNSUPPORTED_VERSION" | "GRAPH_CYCLE" | "GRAPH_UNKNOWN_DEPENDENCY" | "GRAPH_DUPLICATE_ID" | "GATE_UNKNOWN" | "GATE_GROUP_CYCLE" | "REVIEWER_SAME_VENDOR" | "REVIEWER_MISSING" | "RESPONSE_TOO_LARGE" | "APPROVAL_STALE" | "APPROVAL_REQUIRED" | "LEASE_STALE" | "CONTROLLER_BUSY" | "PAUSED" | "NOT_READY" | "SCOPE_VIOLATION" | "GATE_FAILED" | "REVIEW_REJECTED" | "BUDGET_EXHAUSTED" | "BUDGET_UNKNOWN" | "ATTEMPTS_EXHAUSTED" | "REVISION_CONFLICT" | "CANCELLED" | "NOT_FOUND" | "PATH_CONFLICT" | "STATE_VERSION_UNSUPPORTED" | "RUNTIME_UNAVAILABLE" | "REVIEW_PROTOCOL_INVALID" | "SANDBOX_UNAVAILABLE" | "GIT_FAILED" | "STORAGE_FAILED" | "DELIVERY_FAILED" | "INTERNAL" | undefined;
|
|
887
|
-
cause?: "gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead" | "runtime-missing" | "controller-busy" | "operator-pause" | "approval-required" | "not-ready" | undefined;
|
|
888
|
-
actor?: import("../
|
|
887
|
+
code?: "INVALID_INPUT" | "UNSUPPORTED_COMMAND" | "UNSUPPORTED_VERSION" | "GRAPH_CYCLE" | "GRAPH_UNKNOWN_DEPENDENCY" | "GRAPH_DUPLICATE_ID" | "GATE_UNKNOWN" | "GATE_GROUP_CYCLE" | "REVIEWER_SAME_VENDOR" | "REVIEWER_MISSING" | "RESPONSE_TOO_LARGE" | "APPROVAL_STALE" | "APPROVAL_REQUIRED" | "LEASE_STALE" | "CONTROLLER_BUSY" | "PAUSED" | "NOT_READY" | "SCOPE_VIOLATION" | "GATE_FAILED" | "REVIEW_REJECTED" | "BUDGET_EXHAUSTED" | "BUDGET_UNKNOWN" | "ATTEMPTS_EXHAUSTED" | "CONTEXT_EXHAUSTED" | "REVISION_CONFLICT" | "CANCELLED" | "NOT_FOUND" | "PATH_CONFLICT" | "STATE_VERSION_UNSUPPORTED" | "RUNTIME_UNAVAILABLE" | "REVIEW_PROTOCOL_INVALID" | "SANDBOX_UNAVAILABLE" | "GIT_FAILED" | "STORAGE_FAILED" | "DELIVERY_FAILED" | "INTERNAL" | undefined;
|
|
888
|
+
cause?: "gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead" | "runtime-missing" | "controller-busy" | "operator-pause" | "approval-required" | "not-ready" | undefined;
|
|
889
|
+
actor?: import("../index.ts").Actor | undefined;
|
|
889
890
|
action?: "none" | "wait" | "retry" | "review-plan" | "diagnose-failure" | "reset-attempts" | "raise-budget" | "replan-dependents" | "recovery-decision" | "user-decision" | "resume-queue" | "fix-environment" | "fix-access" | undefined;
|
|
890
|
-
failures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
891
|
+
failures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
891
892
|
operation?: string | undefined;
|
|
892
893
|
since?: string | undefined;
|
|
893
894
|
detail?: string;
|
|
894
895
|
paused: boolean;
|
|
895
896
|
reason?: import("../contracts/execution.ts").PauseReason;
|
|
896
897
|
};
|
|
897
|
-
attempts: import("../
|
|
898
|
+
attempts: import("../index.ts").AttemptView[];
|
|
898
899
|
} | undefined;
|
|
899
900
|
budgets?: undefined;
|
|
900
901
|
graphs: {
|
|
@@ -943,7 +944,7 @@ export declare class Harness {
|
|
|
943
944
|
pauseReason?: "runtime" | "operator" | "shutdown" | "base-check" | "reconfigure" | undefined;
|
|
944
945
|
pausedAt?: string | undefined;
|
|
945
946
|
pauseOperation?: string | undefined;
|
|
946
|
-
pauseFailures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
947
|
+
pauseFailures?: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[] | undefined;
|
|
947
948
|
waits?: {
|
|
948
949
|
kind: "base-check" | "context-lock";
|
|
949
950
|
detail: string;
|
|
@@ -966,7 +967,6 @@ export declare class Harness {
|
|
|
966
967
|
} | undefined;
|
|
967
968
|
};
|
|
968
969
|
};
|
|
969
|
-
private statusDetail;
|
|
970
970
|
/**
|
|
971
971
|
* Отчёт об эффекте (`valueReport`) по состоянию этого каталога: только
|
|
972
972
|
* чтение; пути evidence — относительно каталога состояния.
|
|
@@ -1120,6 +1120,33 @@ export declare class Harness {
|
|
|
1120
1120
|
retries: number | null;
|
|
1121
1121
|
resets: number | null;
|
|
1122
1122
|
baseMoves: number | null;
|
|
1123
|
+
recorded: {
|
|
1124
|
+
from: string;
|
|
1125
|
+
bound: "exact" | "lower";
|
|
1126
|
+
retries: {
|
|
1127
|
+
operator: number;
|
|
1128
|
+
recovery: number;
|
|
1129
|
+
host: number;
|
|
1130
|
+
};
|
|
1131
|
+
resets: {
|
|
1132
|
+
operator: number;
|
|
1133
|
+
recovery: number;
|
|
1134
|
+
host: number;
|
|
1135
|
+
};
|
|
1136
|
+
cancellations: {
|
|
1137
|
+
operator: number;
|
|
1138
|
+
graph: number;
|
|
1139
|
+
host: number;
|
|
1140
|
+
};
|
|
1141
|
+
cancelledWithoutAttempt: number;
|
|
1142
|
+
baseMoves: {
|
|
1143
|
+
operator: number;
|
|
1144
|
+
controller: number;
|
|
1145
|
+
host: number;
|
|
1146
|
+
};
|
|
1147
|
+
baseMovesBound: "lower";
|
|
1148
|
+
gaps: number;
|
|
1149
|
+
} | null;
|
|
1123
1150
|
};
|
|
1124
1151
|
approvals: {
|
|
1125
1152
|
operator: number;
|
|
@@ -1131,7 +1158,7 @@ export declare class Harness {
|
|
|
1131
1158
|
count: number;
|
|
1132
1159
|
pausedMs: number;
|
|
1133
1160
|
open: number;
|
|
1134
|
-
failures: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[];
|
|
1161
|
+
failures: ("gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead")[];
|
|
1135
1162
|
}[];
|
|
1136
1163
|
escalations: number;
|
|
1137
1164
|
};
|
|
@@ -1283,7 +1310,16 @@ export declare class Harness {
|
|
|
1283
1310
|
};
|
|
1284
1311
|
setupCheckFailures: number;
|
|
1285
1312
|
timeLimit: number;
|
|
1286
|
-
causes:
|
|
1313
|
+
causes: {
|
|
1314
|
+
rows: {
|
|
1315
|
+
cause: "preflight" | "transport" | "none" | "other" | "provider-auth" | "stalled" | "shutdown" | "sandbox-launch" | "sandbox-network" | "sandbox-filesystem" | "sandbox-policy" | "dependency-network" | "provider-limit" | "lease-expired";
|
|
1316
|
+
count: number;
|
|
1317
|
+
counted: number;
|
|
1318
|
+
}[];
|
|
1319
|
+
diagnosed: number;
|
|
1320
|
+
undiagnosed: number;
|
|
1321
|
+
bound: "exact" | "lower";
|
|
1322
|
+
} | null;
|
|
1287
1323
|
neutral: {
|
|
1288
1324
|
costBound: "exact" | "unknown" | "lower" | "upper";
|
|
1289
1325
|
attempts: number;
|
|
@@ -1516,7 +1552,7 @@ export declare class Harness {
|
|
|
1516
1552
|
integration?: string | undefined;
|
|
1517
1553
|
};
|
|
1518
1554
|
stopReason: {
|
|
1519
|
-
code: "INVALID_INPUT" | "UNSUPPORTED_COMMAND" | "UNSUPPORTED_VERSION" | "GRAPH_CYCLE" | "GRAPH_UNKNOWN_DEPENDENCY" | "GRAPH_DUPLICATE_ID" | "GATE_UNKNOWN" | "GATE_GROUP_CYCLE" | "REVIEWER_SAME_VENDOR" | "REVIEWER_MISSING" | "RESPONSE_TOO_LARGE" | "APPROVAL_STALE" | "APPROVAL_REQUIRED" | "LEASE_STALE" | "CONTROLLER_BUSY" | "PAUSED" | "NOT_READY" | "SCOPE_VIOLATION" | "GATE_FAILED" | "REVIEW_REJECTED" | "BUDGET_EXHAUSTED" | "BUDGET_UNKNOWN" | "ATTEMPTS_EXHAUSTED" | "REVISION_CONFLICT" | "CANCELLED" | "NOT_FOUND" | "PATH_CONFLICT" | "STATE_VERSION_UNSUPPORTED" | "RUNTIME_UNAVAILABLE" | "REVIEW_PROTOCOL_INVALID" | "SANDBOX_UNAVAILABLE" | "GIT_FAILED" | "STORAGE_FAILED" | "DELIVERY_FAILED" | "INTERNAL";
|
|
1555
|
+
code: "INVALID_INPUT" | "UNSUPPORTED_COMMAND" | "UNSUPPORTED_VERSION" | "GRAPH_CYCLE" | "GRAPH_UNKNOWN_DEPENDENCY" | "GRAPH_DUPLICATE_ID" | "GATE_UNKNOWN" | "GATE_GROUP_CYCLE" | "REVIEWER_SAME_VENDOR" | "REVIEWER_MISSING" | "RESPONSE_TOO_LARGE" | "APPROVAL_STALE" | "APPROVAL_REQUIRED" | "LEASE_STALE" | "CONTROLLER_BUSY" | "PAUSED" | "NOT_READY" | "SCOPE_VIOLATION" | "GATE_FAILED" | "REVIEW_REJECTED" | "BUDGET_EXHAUSTED" | "BUDGET_UNKNOWN" | "ATTEMPTS_EXHAUSTED" | "CONTEXT_EXHAUSTED" | "REVISION_CONFLICT" | "CANCELLED" | "NOT_FOUND" | "PATH_CONFLICT" | "STATE_VERSION_UNSUPPORTED" | "RUNTIME_UNAVAILABLE" | "REVIEW_PROTOCOL_INVALID" | "SANDBOX_UNAVAILABLE" | "GIT_FAILED" | "STORAGE_FAILED" | "DELIVERY_FAILED" | "INTERNAL";
|
|
1520
1556
|
message: string;
|
|
1521
1557
|
};
|
|
1522
1558
|
apiVersion: "devcontour-harness/v1alpha1";
|
package/lib/control/harness.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { execFileSync } from 'node:child_process';
|
|
2
2
|
import { existsSync, mkdirSync } from 'node:fs';
|
|
3
3
|
import { isAbsolute, join, resolve } from 'node:path';
|
|
4
|
-
import { executionDigest, API_VERSION, HarnessError,
|
|
4
|
+
import { executionDigest, API_VERSION, HarnessError, WORKSPACE_OWNER, contextDigest, contextIssues, digestOf, workGraphDigest, } from "../contracts/index.js";
|
|
5
5
|
import { cliAdapter } from "../agents/cli-adapter.js";
|
|
6
6
|
import { Engine } from "../engine/engine.js";
|
|
7
|
-
import { budgetOverview } from "../engine/budget.js";
|
|
8
7
|
import { runResult } from "../engine/result.js";
|
|
9
8
|
import { repairDecision } from "../engine/repair.js";
|
|
10
9
|
import { Runner } from "../engine/runner.js";
|
|
@@ -13,8 +12,7 @@ import { HARNESS_VERSION } from "../package.js";
|
|
|
13
12
|
import { SqliteExecutionStore } from "../storage/sqlite.js";
|
|
14
13
|
import { validateInputs } from "../validate.js";
|
|
15
14
|
import { WorkflowQueue } from "./workflow.js";
|
|
16
|
-
import {
|
|
17
|
-
import { CLIP_DIAGNOSTIC, attemptView, clipText, queuePause, queueStop, } from "../projections/index.js";
|
|
15
|
+
import { statusOf } from "./status.js";
|
|
18
16
|
import { technicalReview } from "./review.js";
|
|
19
17
|
import { policySourceChanged } from "./provenance.js";
|
|
20
18
|
import { JointRunner } from "../engine/joint-runner.js";
|
|
@@ -563,7 +561,8 @@ export class Harness {
|
|
|
563
561
|
if (r.status === 'retry' && ['failed', 'cancelled'].includes(work.status)) {
|
|
564
562
|
if (work.status === 'cancelled')
|
|
565
563
|
throw new Error(`${workId}: поручение отменено человеком`);
|
|
566
|
-
|
|
564
|
+
// Повтор по решению оператора — действие человека; по решению ведущего — восстановление.
|
|
565
|
+
this.engine.retry(workId, undefined, r.decision?.source.kind === 'operator' ? 'operator' : 'recovery');
|
|
567
566
|
return true;
|
|
568
567
|
}
|
|
569
568
|
if (r.status === 'retry' || r.status === 'retrying')
|
|
@@ -584,7 +583,7 @@ export class Harness {
|
|
|
584
583
|
if (!decided || decided.action === 'stop')
|
|
585
584
|
return decided;
|
|
586
585
|
this.workflows.repair(job, `repair:${decided.kind}`, () => {
|
|
587
|
-
this.engine.retry(decided.workId);
|
|
586
|
+
this.engine.retry(decided.workId, undefined, 'recovery');
|
|
588
587
|
// Повтор признал причину разовой: своя причина паузы снимается. Выдача
|
|
589
588
|
// возвращается, только когда не осталось ни одной; пауза человека
|
|
590
589
|
// не снимается вовсе.
|
|
@@ -602,98 +601,11 @@ export class Harness {
|
|
|
602
601
|
/**
|
|
603
602
|
* Состояние очереди, графов и поручений. С `detail` — ещё снимок
|
|
604
603
|
* наблюдателя: почему стоит выдача (`queueStop` и `queuePause`) и активные
|
|
605
|
-
* попытки (`attemptView`); без него ответ прежний.
|
|
604
|
+
* попытки (`attemptView`); без него ответ прежний. Та же функция над
|
|
605
|
+
* движком и политикой хоста — `statusOf`.
|
|
606
606
|
*/
|
|
607
607
|
status(graphId, options = {}) {
|
|
608
|
-
return this
|
|
609
|
-
stateVersion: STATE_VERSION,
|
|
610
|
-
control: v.control(),
|
|
611
|
-
...(v.controller() ? { controller: v.controller() } : {}),
|
|
612
|
-
graphs: v
|
|
613
|
-
.graphs()
|
|
614
|
-
.filter((g) => !graphId || g.id === graphId)
|
|
615
|
-
.map((g) => ({
|
|
616
|
-
id: g.id,
|
|
617
|
-
digest: g.digest,
|
|
618
|
-
source: g.graph.source,
|
|
619
|
-
approved: g.approval?.digest === g.digest,
|
|
620
|
-
})),
|
|
621
|
-
works: v.works(graphId).map((w) => ({
|
|
622
|
-
id: w.id,
|
|
623
|
-
graphId: w.graphId,
|
|
624
|
-
status: w.status,
|
|
625
|
-
attempt: w.attempt,
|
|
626
|
-
...(w.activeRunId ? { activeRunId: w.activeRunId } : {}),
|
|
627
|
-
...((a) => a?.status === 'active' && a.liveness && a.liveness.state !== 'active'
|
|
628
|
-
? { liveness: a.liveness.state }
|
|
629
|
-
: {})(w.activeRunId ? v.attempt(w.activeRunId) : undefined),
|
|
630
|
-
...(w.resultSha ? { resultSha: w.resultSha } : {}),
|
|
631
|
-
blockers: this.engine.blockers(w, v),
|
|
632
|
-
})),
|
|
633
|
-
...((budgets) => (budgets ? { budgets } : {}))(budgetOverview(this.engine.budgetContext(), v)),
|
|
634
|
-
...(options.detail ? { detail: this.statusDetail(v, graphId) } : {}),
|
|
635
|
-
}));
|
|
636
|
-
}
|
|
637
|
-
statusDetail(v, graphId) {
|
|
638
|
-
const now = this.engine.clock();
|
|
639
|
-
const control = v.control();
|
|
640
|
-
const works = v.works(graphId);
|
|
641
|
-
const attempts = v.works().flatMap((w) => v.attempts(w.id));
|
|
642
|
-
// Последний отказ классов паузы runtime — её подробность (как `queueStop`
|
|
643
|
-
// хоста по ошибкам планировщика): порядок — по времени завершения.
|
|
644
|
-
const failures = new Set(control.pauseFailures ?? []);
|
|
645
|
-
const errors = attempts
|
|
646
|
-
.filter((a) => a.status === 'failed' && a.failureKind && failures.has(a.failureKind))
|
|
647
|
-
.sort((a, b) => (a.finishedAt ?? '').localeCompare(b.finishedAt ?? ''))
|
|
648
|
-
.map((a, i) => ({ seq: i + 1, ...(a.error ? { message: a.error } : {}) }));
|
|
649
|
-
const stop = queueStop({
|
|
650
|
-
paused: control.paused,
|
|
651
|
-
...(control.pauseReason ? { pauseReason: control.pauseReason } : {}),
|
|
652
|
-
errors,
|
|
653
|
-
});
|
|
654
|
-
const repositoryGates = (id) => this.policy.repositories.find((r) => r.id === id)?.gates.map((g) => g.id);
|
|
655
|
-
// Пауза, которую снимет следующий run, глазами explain: выдача не стоит,
|
|
656
|
-
// поручения ждут controller.
|
|
657
|
-
const queue = nextRunControl(this, v).lifted
|
|
658
|
-
? {
|
|
659
|
-
paused: true,
|
|
660
|
-
...(control.pauseReason ? { reason: control.pauseReason } : {}),
|
|
661
|
-
detail: 'Паузу снимет следующий harness run',
|
|
662
|
-
...(control.pausedAt ? { since: control.pausedAt } : {}),
|
|
663
|
-
...(control.pauseOperation ? { operation: control.pauseOperation } : {}),
|
|
664
|
-
liftedByRun: true,
|
|
665
|
-
code: 'NOT_READY',
|
|
666
|
-
cause: 'not-ready',
|
|
667
|
-
actor: 'controller',
|
|
668
|
-
action: 'wait',
|
|
669
|
-
}
|
|
670
|
-
: {
|
|
671
|
-
...stop,
|
|
672
|
-
...(stop.detail ? { detail: clipText(stop.detail, CLIP_DIAGNOSTIC) } : {}),
|
|
673
|
-
...(control.paused && control.pausedAt ? { since: control.pausedAt } : {}),
|
|
674
|
-
...(control.paused && control.pauseOperation
|
|
675
|
-
? { operation: control.pauseOperation }
|
|
676
|
-
: {}),
|
|
677
|
-
...(control.paused && control.pauseFailures?.length
|
|
678
|
-
? { failures: [...control.pauseFailures] }
|
|
679
|
-
: {}),
|
|
680
|
-
...(queuePause(control) ?? {}),
|
|
681
|
-
};
|
|
682
|
-
return {
|
|
683
|
-
at: new Date(now).toISOString(),
|
|
684
|
-
queue,
|
|
685
|
-
attempts: works
|
|
686
|
-
.map((w) => (w.activeRunId ? v.attempt(w.activeRunId) : undefined))
|
|
687
|
-
.filter((a) => a?.status === 'active')
|
|
688
|
-
.map((a) => {
|
|
689
|
-
const gates = repositoryGates(a.repositoryId);
|
|
690
|
-
return attemptView(a, {
|
|
691
|
-
now,
|
|
692
|
-
leaseMs: this.policy.leaseMs,
|
|
693
|
-
...(gates ? { repositoryGates: gates } : {}),
|
|
694
|
-
});
|
|
695
|
-
}),
|
|
696
|
-
};
|
|
608
|
+
return statusOf(this, graphId, options);
|
|
697
609
|
}
|
|
698
610
|
/**
|
|
699
611
|
* Отчёт об эффекте (`valueReport`) по состоянию этого каталога: только
|
|
@@ -205,7 +205,7 @@ export declare function recoveryBrief(view: ExecutionView, work: WorkState, poli
|
|
|
205
205
|
attempts: {
|
|
206
206
|
run: string;
|
|
207
207
|
attempt: number;
|
|
208
|
-
failureKind: "gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead" | undefined;
|
|
208
|
+
failureKind: "gate" | "unknown" | "review" | "cancelled" | "environment" | "timeout" | "provider-auth" | "stalled" | "context-exhausted" | "stale-base" | "empty-result" | "unfinished" | "scope-violation" | "review-protocol" | "merge" | "budget" | "needs-lead" | undefined;
|
|
209
209
|
error: string | undefined;
|
|
210
210
|
findings: {
|
|
211
211
|
severity: string;
|