devcontour-harness 0.1.0-alpha.34 → 0.1.0-alpha.37
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 +22 -2
- package/docs/contracts.md +309 -35
- package/docs/release-notes/0.1.0-alpha.35.md +27 -0
- package/docs/release-notes/0.1.0-alpha.36.md +26 -0
- package/docs/release-notes/0.1.0-alpha.37.md +40 -0
- package/docs/standalone.md +20 -0
- package/docs/toolchains.md +57 -2
- package/docs/upgrade.md +143 -0
- package/lib/agents/cli-adapter.d.ts +10 -1
- package/lib/agents/cli-adapter.js +38 -7
- package/lib/agents/schemas.d.ts +84 -2
- package/lib/agents/schemas.js +49 -1
- package/lib/agents/usage.d.ts +9 -0
- package/lib/agents/usage.js +22 -1
- package/lib/cli.js +149 -1
- package/lib/contracts/cli.d.ts +1544 -171
- package/lib/contracts/cli.js +233 -2
- package/lib/contracts/diagnosis.d.ts +10 -4
- package/lib/contracts/diagnosis.js +4 -0
- package/lib/contracts/errors.d.ts +9 -1
- package/lib/contracts/errors.js +8 -0
- package/lib/contracts/events.d.ts +468 -60
- package/lib/contracts/events.js +79 -0
- package/lib/contracts/execution.d.ts +301 -50
- package/lib/contracts/execution.js +60 -0
- package/lib/contracts/failure.d.ts +20 -3
- package/lib/contracts/failure.js +14 -2
- package/lib/contracts/handoff.d.ts +79 -20
- package/lib/contracts/handoff.js +42 -1
- package/lib/contracts/index.d.ts +1 -0
- package/lib/contracts/index.js +1 -0
- package/lib/contracts/input-state.d.ts +13 -0
- package/lib/contracts/input-state.js +32 -0
- package/lib/contracts/input.d.ts +442 -0
- package/lib/contracts/input.js +321 -0
- package/lib/contracts/planning.d.ts +4 -0
- package/lib/contracts/policy.d.ts +17 -2
- package/lib/contracts/policy.js +31 -2
- package/lib/contracts/ports.d.ts +64 -2
- package/lib/contracts/project.d.ts +127 -0
- package/lib/contracts/project.js +99 -0
- package/lib/contracts/published.d.ts +631 -92
- package/lib/contracts/published.js +4 -1
- package/lib/contracts/repair-policy.d.ts +30 -1
- package/lib/contracts/repair-policy.js +52 -0
- package/lib/contracts/report.d.ts +55 -21
- package/lib/contracts/report.js +33 -2
- package/lib/contracts/result.d.ts +28 -24
- package/lib/contracts/review.d.ts +47 -8
- package/lib/contracts/review.js +21 -1
- package/lib/control/harness.d.ts +2555 -51
- package/lib/control/harness.js +112 -6
- package/lib/control/recovery.d.ts +2 -2
- package/lib/control/report.js +1 -0
- package/lib/control/status.d.ts +30 -22
- package/lib/control/status.js +11 -1
- package/lib/control/workflow.d.ts +8 -8
- package/lib/engine/budget.d.ts +86 -3
- package/lib/engine/budget.js +45 -10
- package/lib/engine/classify.js +1 -1
- package/lib/engine/engine.d.ts +3091 -83
- package/lib/engine/engine.js +1209 -101
- package/lib/engine/failure.d.ts +1 -1
- package/lib/engine/failure.js +1 -1
- package/lib/engine/input-policy.d.ts +68 -0
- package/lib/engine/input-policy.js +285 -0
- package/lib/engine/input-requests.d.ts +64 -0
- package/lib/engine/input-requests.js +187 -0
- package/lib/engine/measured.d.ts +6 -1
- package/lib/engine/measured.js +12 -1
- package/lib/engine/prompt.d.ts +4 -2
- package/lib/engine/prompt.js +13 -1
- package/lib/engine/property-recovery.js +4 -0
- package/lib/engine/repair.d.ts +2 -0
- package/lib/engine/repair.js +13 -4
- package/lib/engine/reuse.js +2 -0
- package/lib/engine/runner.d.ts +33 -4
- package/lib/engine/runner.js +275 -23
- package/lib/environment/lifecycle.d.ts +8 -0
- package/lib/environment/lifecycle.js +15 -2
- package/lib/explain/state.d.ts +16 -2
- package/lib/explain/state.js +262 -79
- package/lib/handoff/markdown.js +10 -0
- package/lib/handoff/pack.js +42 -1
- package/lib/index.d.ts +11 -1
- package/lib/index.js +11 -1
- package/lib/init/inspect.d.ts +34 -0
- package/lib/init/inspect.js +292 -0
- package/lib/init/project.js +14 -31
- package/lib/integrations/connector/commands.d.ts +12 -12
- package/lib/integrations/connector/config.d.ts +4 -4
- package/lib/integrations/connector/delivery.d.ts +1 -1
- package/lib/integrations/relay-v2/protocol.d.ts +4 -4
- package/lib/profiles/resolve.d.ts +2 -1
- package/lib/projections/enums.d.ts +1 -1
- package/lib/projections/enums.js +4 -0
- package/lib/projections/index.d.ts +1 -0
- package/lib/projections/index.js +1 -0
- package/lib/projections/input.d.ts +17 -0
- package/lib/projections/input.js +28 -0
- package/lib/projections/stop.d.ts +42 -1
- package/lib/projections/stop.js +117 -6
- package/lib/report/compute.d.ts +4 -1
- package/lib/report/compute.js +26 -0
- package/lib/report/document.js +2 -1
- package/lib/storage/document.d.ts +68 -28
- package/lib/testing/index.d.ts +1 -1
- package/lib/testing/index.js +1 -1
- package/lib/testing/store-contract.d.ts +8 -1
- package/lib/testing/store-contract.js +194 -1
- package/lib/verification/confirm.d.ts +3 -3
- package/lib/verification/corpus.d.ts +9 -9
- package/lib/verification/gates.d.ts +119 -0
- package/lib/verification/gates.js +311 -4
- package/package.json +1 -1
- package/schemas/execution-document.schema.json +141 -0
- package/schemas/execution-policy.schema.json +26 -0
- package/schemas/handoff-pack.schema.json +155 -4
- package/schemas/input-request.schema.json +665 -0
- package/schemas/project-facts.schema.json +393 -0
- package/schemas/result-envelope.schema.json +2 -0
- package/schemas/run-event.schema.json +628 -0
- package/schemas/run-result.schema.json +2 -0
- package/schemas/stop-diagnosis.schema.json +7 -1
- package/schemas/value-report.schema.json +79 -7
package/lib/engine/prompt.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AttemptState, CodeReviewHistory, ContextSnapshot, ProtocolIssue, WorkState } from '../contracts/index.ts';
|
|
1
|
+
import type { InputPolicy, AttemptState, CodeReviewHistory, ContextSnapshot, ProtocolIssue, WorkState } from '../contracts/index.ts';
|
|
2
2
|
/** Предыдущие попытки поручения с находками ревью: исполнитель адресует каждую открытую. */
|
|
3
3
|
export declare function previousAttempts(attempts: AttemptState[], current: string): {
|
|
4
4
|
attempt: number;
|
|
@@ -14,7 +14,7 @@ export declare function previousAttempts(attempts: AttemptState[], current: stri
|
|
|
14
14
|
path?: string | null | undefined;
|
|
15
15
|
line?: number | null | undefined;
|
|
16
16
|
id?: string | undefined;
|
|
17
|
-
status?: "
|
|
17
|
+
status?: "closed" | "open" | "withdrawn" | undefined;
|
|
18
18
|
}[] | undefined;
|
|
19
19
|
}[];
|
|
20
20
|
}[];
|
|
@@ -63,4 +63,6 @@ export declare function prompt(input: {
|
|
|
63
63
|
calls: number;
|
|
64
64
|
issues: ProtocolIssue[];
|
|
65
65
|
};
|
|
66
|
+
/** Закреплённая в попытке политика вопросов: порог называется writer явно. */
|
|
67
|
+
inputPolicy?: InputPolicy;
|
|
66
68
|
}): string;
|
package/lib/engine/prompt.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { pinnedBytes } from "../contracts/index.js";
|
|
2
|
+
import { inputPolicyText } from "./input-policy.js";
|
|
2
3
|
/** Предыдущие попытки поручения с находками ревью: исполнитель адресует каждую открытую. */
|
|
3
4
|
export function previousAttempts(attempts, current) {
|
|
4
5
|
return attempts
|
|
@@ -119,12 +120,23 @@ export function prompt(input) {
|
|
|
119
120
|
findingsText(input.findings, !!review),
|
|
120
121
|
!review && attempt.continuedFrom?.applied
|
|
121
122
|
? attempt.continuedFrom.kind === 'unfinished'
|
|
122
|
-
? `The previous attempt stopped before finishing (${attempt.continuedFrom.reason === 'timeout' ? 'ran out of time' : attempt.continuedFrom.reason}). Its unfinished, unverified changes are already applied in this worktree as uncommitted edits (${attempt.continuedFrom.files.join(', ')}). Continue from them: check what is done and what is broken, finish the work and make the gates pass. Treat them as a draft, not as reviewed work.`
|
|
123
|
+
? `The previous attempt stopped before finishing (${attempt.continuedFrom.reason === 'timeout' ? 'ran out of time' : attempt.continuedFrom.reason === 'context-exhausted' ? 'ran out of the model context window' : attempt.continuedFrom.reason === 'needs-input' ? (attempt.input ? 'stopped to ask a question; the answer is in the pinned context below' : 'stopped to ask a question; if the pinned context below has an input-answer source for it, that is the answer, otherwise the question was withdrawn without an answer') : attempt.continuedFrom.reason}). Its unfinished, unverified changes are already applied in this worktree as uncommitted edits (${attempt.continuedFrom.files.join(', ')}). Continue from them: check what is done and what is broken, finish the work and make the gates pass. Treat them as a draft, not as reviewed work.`
|
|
123
124
|
: `The previous attempt produced a candidate that failed (${attempt.continuedFrom.reason === 'review' ? 'rejected by review' : attempt.continuedFrom.reason}); see its error and findings above. Its changes are already applied in this worktree as uncommitted edits (${attempt.continuedFrom.files.join(', ')}). Fix what failed on top of them; if the failure shows the approach itself is wrong, replace it rather than patching around it. The gates and a new independent review decide again.`
|
|
124
125
|
: '',
|
|
126
|
+
// Повтор writer после нехватки окна контекста: прошлый способ работы не
|
|
127
|
+
// помещался. Reviewer той же попытки подсказку не получает; о самой
|
|
128
|
+
// нехватке уже сказал абзац черновика, если черновик наложен.
|
|
129
|
+
!review &&
|
|
130
|
+
input.history.filter((a) => a.id !== attempt.id).at(-1)?.failureKind === 'context-exhausted'
|
|
131
|
+
? (attempt.continuedFrom?.applied && attempt.continuedFrom.reason === 'context-exhausted'
|
|
132
|
+
? ''
|
|
133
|
+
: 'The previous attempt ran out of the model context window. ') +
|
|
134
|
+
'Keep your context small this time: read only the files and line ranges you need, do not print whole large files or long command output, and do not re-read what you already have.'
|
|
135
|
+
: '',
|
|
125
136
|
!review && attempt.continuedFrom?.applied && attempt.continuedFrom.respecified
|
|
126
137
|
? 'The specification or its contracts changed after that attempt: check the applied changes against the current approved specification and contracts above, not against the old ones.'
|
|
127
138
|
: '',
|
|
139
|
+
!review && input.inputPolicy ? inputPolicyText(input.inputPolicy) : '',
|
|
128
140
|
`Base commit: ${attempt.baseSha ?? ''}.${review ? ` Review commit: ${review.sha} (${review.phase}).` : ''}`,
|
|
129
141
|
...(input.notes ?? []),
|
|
130
142
|
contextText(input.context),
|
|
@@ -32,6 +32,8 @@ const neutral = [
|
|
|
32
32
|
'environment',
|
|
33
33
|
'timeout',
|
|
34
34
|
'stalled',
|
|
35
|
+
// Нехватка окна контекста говорит о размере задачи, а не о свойстве.
|
|
36
|
+
'context-exhausted',
|
|
35
37
|
'stale-base',
|
|
36
38
|
'merge',
|
|
37
39
|
'cancelled',
|
|
@@ -41,6 +43,8 @@ const neutral = [
|
|
|
41
43
|
'empty-result',
|
|
42
44
|
// Незавершённая работа свойство не проверяла.
|
|
43
45
|
'unfinished',
|
|
46
|
+
// Остановка с вопросом исполнителя свойство не проверяла.
|
|
47
|
+
'needs-input',
|
|
44
48
|
'needs-lead',
|
|
45
49
|
'scope-violation',
|
|
46
50
|
];
|
package/lib/engine/repair.d.ts
CHANGED
|
@@ -56,4 +56,6 @@ export declare function acceptanceGap(view: ExecutionView, work: WorkState): Acc
|
|
|
56
56
|
export declare function repairDecision(view: ExecutionView, works: WorkState[], options: {
|
|
57
57
|
budgetLeft: number;
|
|
58
58
|
maxAttempts: number;
|
|
59
|
+
/** Вопрос, держащий работу, — как `blockingRequest`; диагноз многих работ читает запросы раз. */
|
|
60
|
+
blocking?: (work: WorkState) => unknown;
|
|
59
61
|
}): RepairDecision | undefined;
|
package/lib/engine/repair.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { MAX_NEUTRAL_FAILURES, repairPolicy } from "./failure.js";
|
|
2
|
+
import { failedBeforeWork, lastContextLimit, repairExplain, repairRepeats, } from "../contracts/repair-policy.js";
|
|
2
3
|
import { RECOVERY_THRESHOLD, isNeutral } from "./property-recovery.js";
|
|
4
|
+
import { blockingRequest } from "./input-requests.js";
|
|
3
5
|
const normalized = (c) => c.trim().toLowerCase().replace(/\s+/g, ' ');
|
|
4
6
|
/** Что отклонившее ревью назвало в попытке: пары, необъявленные свойства и классы входов. */
|
|
5
7
|
function namedBy(a) {
|
|
@@ -77,9 +79,15 @@ function gapSubject(key) {
|
|
|
77
79
|
* снаружи», и утверждать это за человека контур не вправе.
|
|
78
80
|
*/
|
|
79
81
|
export function repairDecision(view, works, options) {
|
|
82
|
+
const blocking = options.blocking ?? ((w) => blockingRequest(view, w));
|
|
80
83
|
// Поручение с эпизодом по свойству восстанавливается своим разбором, а не
|
|
81
84
|
// обычным повтором: третья слепая попытка как раз и запрещена.
|
|
82
|
-
|
|
85
|
+
// Поручение, ждущее ответа на вопрос исполнителя, не чинится и не
|
|
86
|
+
// останавливает восстановление группы: продолжение — только applyInput, а
|
|
87
|
+
// независимая работа графа идёт своим чередом.
|
|
88
|
+
const broken = works.filter((w) => ['failed', 'cancelled'].includes(w.status) &&
|
|
89
|
+
(w.status === 'cancelled' || !w.recovery) &&
|
|
90
|
+
!(w.status === 'failed' && blocking(w)));
|
|
83
91
|
if (!broken.length)
|
|
84
92
|
return undefined;
|
|
85
93
|
// Отмена человеком не восстанавливается — ни первой, ни после других.
|
|
@@ -102,7 +110,7 @@ export function repairDecision(view, works, options) {
|
|
|
102
110
|
action: 'stop',
|
|
103
111
|
workId: work.id,
|
|
104
112
|
kind,
|
|
105
|
-
reason: `${work.id}: ${
|
|
113
|
+
reason: `${work.id}: ${repairExplain(kind, failedBeforeWork(kind, view.attempts(work.id)))}${detail}`,
|
|
106
114
|
};
|
|
107
115
|
if (options.budgetLeft <= 0)
|
|
108
116
|
return {
|
|
@@ -144,7 +152,8 @@ export function repairDecision(view, works, options) {
|
|
|
144
152
|
const identical = fingerprint
|
|
145
153
|
? view.attempts(work.id).filter((a) => a.failureFingerprint === fingerprint).length
|
|
146
154
|
: 0;
|
|
147
|
-
|
|
155
|
+
const repeats = repairRepeats(kind, lastContextLimit(view.attempts(work.id)));
|
|
156
|
+
if (!fingerprint || identical > repeats)
|
|
148
157
|
return {
|
|
149
158
|
action: 'stop',
|
|
150
159
|
workId: work.id,
|
|
@@ -159,6 +168,6 @@ export function repairDecision(view, works, options) {
|
|
|
159
168
|
kind,
|
|
160
169
|
fingerprint,
|
|
161
170
|
blocksQueue: rule.blocksQueue ?? false,
|
|
162
|
-
reason: `${work.id}: ${kind}, повтор ${identical} из ${
|
|
171
|
+
reason: `${work.id}: ${kind}, повтор ${identical} из ${repeats}.${detail}`,
|
|
163
172
|
};
|
|
164
173
|
}
|
package/lib/engine/reuse.js
CHANGED
|
@@ -13,6 +13,8 @@ export const reusableFailures = [
|
|
|
13
13
|
'environment',
|
|
14
14
|
'timeout',
|
|
15
15
|
'stalled',
|
|
16
|
+
// Нехватка окна контекста (обычно у reviewer большого diff) о коде не говорит.
|
|
17
|
+
'context-exhausted',
|
|
16
18
|
// Ответ reviewer вне протокола о коде кандидата ничего не говорит.
|
|
17
19
|
'review-protocol',
|
|
18
20
|
];
|
package/lib/engine/runner.d.ts
CHANGED
|
@@ -27,8 +27,13 @@ export interface RunnerOptions {
|
|
|
27
27
|
/** Каталог, от которого разрешаются относительные пути репозиториев политики. */
|
|
28
28
|
baseDir: string;
|
|
29
29
|
adapters: Partial<Record<RuntimeName, RuntimeAdapter>>;
|
|
30
|
-
/**
|
|
31
|
-
|
|
30
|
+
/**
|
|
31
|
+
* Закреплённый контекст поручения; без него — пустой снимок. Хост может
|
|
32
|
+
* собирать его асинхронно. `attempt` — выданная попытка: снимок, закреплённый
|
|
33
|
+
* при выдаче (`attempt.pinned.contextDigest`), загружается по нему, а не по
|
|
34
|
+
* текущему согласованию.
|
|
35
|
+
*/
|
|
36
|
+
context?: (work: WorkState, attempt: AttemptState) => ContextSnapshot | undefined | Promise<ContextSnapshot | undefined>;
|
|
32
37
|
/** Дополнения хоста: сведения в запросах и отчёт исполнителя. В приёмке не участвуют. */
|
|
33
38
|
hooks?: RunnerHooks;
|
|
34
39
|
owner?: string;
|
|
@@ -191,7 +196,10 @@ export declare class Runner {
|
|
|
191
196
|
private assertScope;
|
|
192
197
|
/** Хранилище зависимостей checkout до `prepare`; без него этапа нет и в замерах. */
|
|
193
198
|
private dependencyStore;
|
|
194
|
-
/**
|
|
199
|
+
/**
|
|
200
|
+
* Стадия попытки с замером: начало, конец и исход записываются под fencing.
|
|
201
|
+
* `outcome` — исход по значению стадии, которая не роняет попытку отказом.
|
|
202
|
+
*/
|
|
195
203
|
private timed;
|
|
196
204
|
/**
|
|
197
205
|
* Кандидат предыдущей попытки вместо новой реализации. Движок уже сверил
|
|
@@ -200,6 +208,27 @@ export declare class Runner {
|
|
|
200
208
|
* заново — переиспользуется только написанный код.
|
|
201
209
|
*/
|
|
202
210
|
private reuseCandidate;
|
|
211
|
+
/**
|
|
212
|
+
* Исход ответа writer по политике вопросов (`evaluateInput`): остановка с
|
|
213
|
+
* вопросом — `needs-input` (черновик сохранит обработчик отказа, кандидата
|
|
214
|
+
* нет), вопрос ниже порога — `unfinished` с отклонённым вопросом,
|
|
215
|
+
* `completed: false` без вопроса — `unfinished`. Готовая реализация
|
|
216
|
+
* записывает допущения и неблокирующие запросы под fencing и идёт дальше.
|
|
217
|
+
*/
|
|
218
|
+
/**
|
|
219
|
+
* Взятый кандидат несёт решения попытки, которая его написала: они
|
|
220
|
+
* переоцениваются по политике вопросов этой попытки (порог и критические
|
|
221
|
+
* пути могли смениться) — развилка не ниже порога останавливает попытку
|
|
222
|
+
* `needs-input`, остальные записываются в неё, и reviewer их видит.
|
|
223
|
+
*/
|
|
224
|
+
private carryAssumptions;
|
|
225
|
+
/**
|
|
226
|
+
* Решения попытки, черновик которой продолжается (без решения, ставшего её
|
|
227
|
+
* вопросом: на него есть ответ или вопрос снят), — как их записал writer,
|
|
228
|
+
* без оценки controller.
|
|
229
|
+
*/
|
|
230
|
+
private continuedDecisions;
|
|
231
|
+
private decideInput;
|
|
203
232
|
/**
|
|
204
233
|
* Время реализации кончилось раньше работы, или она оборвалась. Изменения
|
|
205
234
|
* в области поручения сохраняются патчем к базе: следующая попытка начнёт с
|
|
@@ -380,7 +409,7 @@ export declare class Runner {
|
|
|
380
409
|
taskId?: string | undefined;
|
|
381
410
|
};
|
|
382
411
|
origin: {
|
|
383
|
-
kind: "
|
|
412
|
+
kind: "operator" | "lead" | "review" | "agent";
|
|
384
413
|
runtime?: string | undefined;
|
|
385
414
|
};
|
|
386
415
|
at: string;
|