@event4u/agent-config 9.31.0 → 9.32.0

package/dist/agent-src/templates/scripts/work_engine/directives/backend/test.ts

@@ -17,10 +17,12 @@
  * - Must be a dict.
  * - Must carry a `verdict` key — one of `success`, `failed`,
  *   or `mixed` (targeted vs full-suite split). Anything else blocks.
- * - `failed` or `mixed` verdicts halt with the verdict as part of
- *   the surfaced message so the user decides whether to continue or
- *   stop. This follows the `verify-before-complete` rule: a bad test
- *   outcome must never be silently skipped.
+ * - `failed` or `mixed` verdicts enter the bounded self-fix loop
+ *   (`./_self_fix.ts`): the first attempts are delegated by directive, and an
+ *   exhausted or non-progressing loop exits `PARTIAL` with the verdict still
+ *   on the surface so the user decides whether to continue or stop. This
+ *   follows the `verify-before-complete` rule: a bad test outcome must never
+ *   be silently skipped, and the loop cannot report one as success.
  * - Optional keys (`targeted`, `full`, `duration_ms`,
  *   `followups`) feed the delivery report.
  */
@@ -28,6 +30,7 @@
 import type { DeliveryState} from '../../delivery_state.js';
 import { type Any, Outcome, StepResult, agent_directive } from '../../delivery_state.js';
 import { resolve_policy } from '../../persona_policy.js';
+import { decide, partial_exit, record_attempt, retry_halt, unmet_dod, verdict_signature } from './_self_fix.js';
 
 const _ALLOWED_VERDICTS = ['success', 'failed', 'mixed'] as const;
 
@@ -53,7 +56,18 @@ export const AMBIGUITIES: ReadonlyArray<Record<string, string>> = [
     {
         code: 'bad_test_verdict',
         trigger: '`state.tests[\'verdict\']` is `failed` or `mixed`',
-        resolution: 'fix failures and re-run, or abort',
+        resolution:
+            'bounded self-fix loop: agent directive `fix-failing-checks` ' +
+            'while attempts remain and the verdict signature keeps changing',
+    },
+    {
+        code: 'self_fix_exhausted',
+        trigger:
+            'the self-fix budget for `test` is spent, or two consecutive ' +
+            'attempts produced an identical verdict signature',
+        resolution:
+            'PARTIAL honest exit — the red verdict stays on the surface, ' +
+            'the user decides whether to take over, override, or abort',
     },
 ];
 
@@ -156,18 +170,39 @@ function _blocked_on_shape(state: DeliveryState, issues: string[]): StepResult {
     });
 }
 
+/**
+ * Route a red test verdict through the bounded self-fix loop.
+ *
+ * Before this loop existed the function below returned a directive-free
+ * BLOCKED — a user question block — so every red cost a user round-trip even
+ * when the failure was one the agent could fix unaided. Now the first attempts
+ * are delegated and only an exhausted or non-progressing loop reaches the
+ * user, as a PARTIAL that still carries the red verdict.
+ */
 function _blocked_on_bad_verdict(state: DeliveryState, verdict: Any): StepResult {
     const ticketId = _ticketId(state);
-    return new StepResult({
-        outcome: Outcome.BLOCKED,
-        questions: [
-            `> Ticket ${ticketId} — tests reported \`${String(verdict)}\`. ` +
-                'Verification cannot proceed on a non-success verdict.',
-            '> 1. Fix the failing tests and re-run `run-tests`',
-            '> 2. Continue anyway — override (NOT recommended)',
-            '> 3. Abort',
-        ],
-        message: `Ticket ${ticketId} test verdict was \`${String(verdict)}\`, not success.`,
+    const signature = verdict_signature('test', state.tests);
+    const decision = decide(state, 'test', signature);
+
+    if (decision.kind === 'retry') {
+        record_attempt(state, 'test', signature);
+        return retry_halt({
+            lane: 'test',
+            ticket_id: ticketId,
+            verdict,
+            decision,
+            fix_hint: 'read the failing assertions, fix the cause, re-run the same filter.',
+            rerun_directive: 'run-tests',
+        });
+    }
+
+    return partial_exit({
+        lane: 'test',
+        ticket_id: ticketId,
+        verdict,
+        decision,
+        unmet: unmet_dod(state),
+        rerun_directive: 'run-tests',
     });
 }
 

package/dist/agent-src/templates/scripts/work_engine/directives/backend/verify.ts

@@ -18,9 +18,12 @@
  *   `partial`. Matches the `Outcome` vocabulary used everywhere
  *   else in the flow.
  * - A `success` verdict advances the flow to `report`.
- * - A `blocked` or `partial` verdict halts with numbered options
- *   so the user decides whether to address the findings, override
- *   (rarely appropriate), or abort.
+ * - A `blocked` or `partial` verdict enters the bounded self-fix loop
+ *   (`./_self_fix.ts`): while attempts remain and the verdict signature
+ *   keeps changing, the fix is delegated by directive. An exhausted or
+ *   non-progressing loop exits `PARTIAL` with numbered options so the user
+ *   decides whether to take over, override (rarely appropriate), or abort.
+ *   The loop never turns a non-success verdict into `SUCCESS`.
  * - Optional keys (`confidence`, `findings`, `followups`) feed
  *   the delivery report.
  */
@@ -28,6 +31,7 @@
 import type { DeliveryState} from '../../delivery_state.js';
 import { type Any, Outcome, StepResult, agent_directive } from '../../delivery_state.js';
 import { resolve_policy } from '../../persona_policy.js';
+import { decide, partial_exit, record_attempt, retry_halt, unmet_dod, verdict_signature } from './_self_fix.js';
 
 const _ALLOWED_VERDICTS = ['success', 'blocked', 'partial'] as const;
 
@@ -52,7 +56,17 @@ export const AMBIGUITIES: ReadonlyArray<Record<string, string>> = [
         code: 'bad_verify_verdict',
         trigger: '`state.verify[\'verdict\']` is `blocked` or `partial`',
         resolution:
-            'address findings and re-run `/review-changes` — never bypass ' + '(see `verify-before-complete`)',
+            'bounded self-fix loop: agent directive `fix-failing-checks` ' +
+            'while attempts remain — never bypass ' + '(see `verify-before-complete`)',
+    },
+    {
+        code: 'self_fix_exhausted',
+        trigger:
+            'the self-fix budget for `verify` is spent, or two consecutive ' +
+            'attempts produced an identical verdict signature',
+        resolution:
+            'PARTIAL honest exit — the non-success verdict stays on the ' +
+            'surface; the user takes over, overrides, or aborts',
     },
 ];
 
@@ -145,19 +159,39 @@ function _blocked_on_shape(state: DeliveryState, issues: string[]): StepResult {
     });
 }
 
+/**
+ * Route a red review verdict through the bounded self-fix loop.
+ *
+ * Same shape as the `test` lane, separate counter: `autonomous-execution`
+ * resets its N=3 budget on a different validation target, and a review finding
+ * is not a failing test. `verify-before-complete` is unaffected — the loop
+ * cannot report completion, and its exhausted exit is PARTIAL with the
+ * non-success verdict still on the surface.
+ */
 function _blocked_on_bad_verdict(state: DeliveryState, verdict: Any): StepResult {
     const ticketId = _ticketId(state);
-    return new StepResult({
-        outcome: Outcome.BLOCKED,
-        questions: [
-            `> Ticket ${ticketId} — \`review-changes\` reported ` +
-                `\`${String(verdict)}\`. The delivery report cannot claim completion on a ` +
-                'non-success verdict (see `verify-before-complete`).',
-            '> 1. Address the findings and re-run `review-changes`',
-            '> 2. Continue anyway — override (NOT recommended)',
-            '> 3. Abort',
-        ],
-        message: `Ticket ${ticketId} verify verdict was \`${String(verdict)}\`, not success.`,
+    const signature = verdict_signature('verify', state.verify);
+    const decision = decide(state, 'verify', signature);
+
+    if (decision.kind === 'retry') {
+        record_attempt(state, 'verify', signature);
+        return retry_halt({
+            lane: 'verify',
+            ticket_id: ticketId,
+            verdict,
+            decision,
+            fix_hint: 'address the recorded findings, then re-run the four-judge review.',
+            rerun_directive: 'review-changes',
+        });
+    }
+
+    return partial_exit({
+        lane: 'verify',
+        ticket_id: ticketId,
+        verdict,
+        decision,
+        unmet: unmet_dod(state),
+        rerun_directive: 'review-changes',
     });
 }
 

package/dist/agent-src/templates/scripts/work_engine/state.ts

@@ -220,6 +220,7 @@ export class WorkState {
     ui_polish: Dict | null;
     contract: Dict | null;
     stitch: Dict | null;
+    self_fix: Dict | null;
     halts: Dict[];
     version: number;
     persona: string;
@@ -245,6 +246,7 @@ export class WorkState {
         ui_polish?: Dict | null;
         contract?: Dict | null;
         stitch?: Dict | null;
+        self_fix?: Dict | null;
         halts?: Dict[];
         version?: number;
         persona?: string;
@@ -269,6 +271,7 @@ export class WorkState {
         this.ui_polish = opts.ui_polish ?? null;
         this.contract = opts.contract ?? null;
         this.stitch = opts.stitch ?? null;
+        this.self_fix = opts.self_fix ?? null;
         this.halts = opts.halts ?? [];
         this.version = opts.version ?? SCHEMA_VERSION;
         this.persona = opts.persona ?? 'senior-engineer';
@@ -309,6 +312,7 @@ export function to_dict(state: WorkState): Dict {
     _validate_ui_polish(state.ui_polish);
     _validate_contract(state.contract);
     _validate_stitch(state.stitch);
+    _validate_self_fix(state.self_fix);
     _validate_halts(state.halts);
     return {
         version: state.version,
@@ -324,6 +328,7 @@ export function to_dict(state: WorkState): Dict {
         ui_polish: state.ui_polish,
         contract: state.contract,
         stitch: state.stitch,
+        self_fix: state.self_fix,
         halts: [...state.halts],
         persona: state.persona,
         memory: state.memory,
@@ -406,6 +411,9 @@ export function from_dict(payload: JsonValue): WorkState {
     const stitch = payload['stitch'] ?? null;
     _validate_stitch(stitch);
 
+    const self_fix = payload['self_fix'] ?? null;
+    _validate_self_fix(self_fix);
+
     const halts = 'halts' in payload ? payload['halts'] : [];
     _validate_halts(halts);
 
@@ -422,6 +430,7 @@ export function from_dict(payload: JsonValue): WorkState {
         ui_polish: _isDict(ui_polish) ? { ...ui_polish } : null,
         contract: _isDict(contract) ? { ...contract } : null,
         stitch: _isDict(stitch) ? { ...stitch } : null,
+        self_fix: _isDict(self_fix) ? { ...self_fix } : null,
         halts: Array.isArray(halts) ? ([...halts] as Dict[]) : [],
         version: version as number,
         persona: _get(payload, 'persona', 'senior-engineer') as string,
@@ -866,6 +875,71 @@ function _validate_ui_review(ui_review: JsonValue): void {
     }
 }
 
+/**
+ * Reject malformed `self_fix` envelopes; tolerate `null` and `{}`.
+ *
+ * `null` means no red check has been seen. Once populated, each key is a lane
+ * name (`test`, `verify`) whose record may carry `attempts` (a non-negative
+ * int) and `signatures` (a list of strings). As with `ui_polish`, the schema
+ * enforces only shape: the ceiling and the no-progress floor are the handler's
+ * business (`directives/backend/_self_fix.ts`), so a state file cannot decide
+ * how many attempts are allowed.
+ *
+ * `attempts` is validated but NOT bounded here on purpose. A file carrying
+ * `attempts: 99` is well-formed and simply exhausted — rejecting it would turn
+ * a spent budget into a crash, and the loop's whole point is a clean exit.
+ */
+function _validate_self_fix(self_fix: JsonValue): void {
+    if (self_fix === null) {
+        return;
+    }
+    if (!_isDict(self_fix)) {
+        throw new SchemaError(
+            `state.self_fix must be a JSON object or null; ` +
+                `got ${pyTypeName(self_fix)}`,
+        );
+    }
+    for (const [lane, record] of Object.entries(self_fix)) {
+        if (!_isDict(record)) {
+            throw new SchemaError(
+                `state.self_fix.${lane} must be a JSON object; ` +
+                    `got ${pyTypeName(record)}`,
+            );
+        }
+        if ('attempts' in record) {
+            const attempts = record['attempts'];
+            if (
+                typeof attempts !== 'number' ||
+                typeof attempts === 'boolean' ||
+                !Number.isInteger(attempts) ||
+                attempts < 0
+            ) {
+                throw new SchemaError(
+                    `state.self_fix.${lane}.attempts must be a non-negative ` +
+                        `integer when present; got ${pyRepr(attempts)}`,
+                );
+            }
+        }
+        if ('signatures' in record) {
+            const signatures = record['signatures'];
+            if (!Array.isArray(signatures)) {
+                throw new SchemaError(
+                    `state.self_fix.${lane}.signatures must be a list when ` +
+                        `present; got ${pyTypeName(signatures)}`,
+                );
+            }
+            for (const entry of signatures) {
+                if (typeof entry !== 'string') {
+                    throw new SchemaError(
+                        `state.self_fix.${lane}.signatures entries must be ` +
+                            `strings; got ${pyTypeName(entry)}`,
+                    );
+                }
+            }
+        }
+    }
+}
+
 /**
  * Reject malformed `ui_polish` envelopes; tolerate `null` and `{}`.
  *

package/dist/agent-src/templates/scripts/work_engine/state_io.ts

@@ -150,6 +150,7 @@ export function _to_delivery(work: WorkState): DeliveryState {
         contract: work.contract as Record<string, DeliveryAny> | null,
         stitch: work.stitch as Record<string, DeliveryAny> | null,
         stack: work.stack as Record<string, DeliveryAny> | null,
+        self_fix: work.self_fix as Record<string, DeliveryAny> | null,
     });
 }
 
@@ -182,6 +183,11 @@ export function _sync_back(work: WorkState, delivery: DeliveryState): void {
     work.contract = delivery.contract as Dict | null;
     work.stitch = delivery.stitch as Dict | null;
     work.stack = delivery.stack as Dict | null;
+    // Reassigned (not mutated) by `record_attempt`, so the defensive mirror
+    // above is load-bearing here rather than a no-op: without this line the
+    // attempt counter would reset on every dispatch and the loop would never
+    // reach either floor.
+    work.self_fix = delivery.self_fix as Dict | null;
 }
 
 /**