@nexus-cortex/core 4.124.72 → 4.124.74
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/.env.defaults +3 -0
- package/dist/config/SettingsLoader.d.ts.map +1 -1
- package/dist/config/SettingsLoader.js +1 -0
- package/dist/config/SettingsLoader.js.map +1 -1
- package/dist/config/SettingsSchema.d.ts +1 -0
- package/dist/config/SettingsSchema.d.ts.map +1 -1
- package/dist/config/SettingsSchema.js +8 -0
- package/dist/config/SettingsSchema.js.map +1 -1
- package/dist/config/effectiveConfig.d.ts.map +1 -1
- package/dist/config/effectiveConfig.js +1 -0
- package/dist/config/effectiveConfig.js.map +1 -1
- package/dist/orchestrator/attemptController.d.ts +8 -0
- package/dist/orchestrator/attemptController.d.ts.map +1 -1
- package/dist/orchestrator/attemptController.js +32 -6
- package/dist/orchestrator/attemptController.js.map +1 -1
- package/dist/training/attemptJudge.d.ts +9 -1
- package/dist/training/attemptJudge.d.ts.map +1 -1
- package/dist/training/attemptJudge.js +23 -6
- package/dist/training/attemptJudge.js.map +1 -1
- package/dist/training/informedRetry.d.ts +31 -0
- package/dist/training/informedRetry.d.ts.map +1 -0
- package/dist/training/informedRetry.js +54 -0
- package/dist/training/informedRetry.js.map +1 -0
- package/dist/utils/workspaceSnapshot.d.ts +8 -0
- package/dist/utils/workspaceSnapshot.d.ts.map +1 -1
- package/dist/utils/workspaceSnapshot.js +45 -2
- package/dist/utils/workspaceSnapshot.js.map +1 -1
- package/package.json +4 -4
|
@@ -32,6 +32,10 @@ export interface SecondAttemptConfig {
|
|
|
32
32
|
/** CORTEX_SECOND_ATTEMPT_UNTIL_BUDGET = 1|true|on — R247: ignore the extra-attempt COUNT cap while ≥ MIN_REMAINING of the clock is left
|
|
33
33
|
* (reserve + floor still apply). Cells 3+4: 18/19 fails ended with ≥ 50 % unused while MAX=2 had closed the chain. */
|
|
34
34
|
untilBudget: boolean;
|
|
35
|
+
/** CORTEX_SECOND_ATTEMPT_INFORMED = 1|true|on — R254 (dark): attempts >= 2 receive a PRIOR ATTEMPTS block (each earlier attempt's
|
|
36
|
+
* verdict, open items, plan = its reading of the task, final message) appended to the task content. The sibling oracle (t4jf/t4jg)
|
|
37
|
+
* showed no-pass chains share one misreading across independent attempts; an informed attempt can question it. */
|
|
38
|
+
informed: boolean;
|
|
35
39
|
}
|
|
36
40
|
export declare function resolveSecondAttemptConfig(env?: NodeJS.ProcessEnv): SecondAttemptConfig;
|
|
37
41
|
/** What the orchestrator remembers of the LAST endturn_resolver adjudication of a turn (CortexOrchestrator.getLastResolverDecision). */
|
|
@@ -103,6 +107,10 @@ export interface AttemptRecord {
|
|
|
103
107
|
turns?: number | null;
|
|
104
108
|
}
|
|
105
109
|
export interface AttemptSelection {
|
|
110
|
+
/** R252: excluded-path entries newer than the pick's stamp removed at the pick restore (-1 = no stamp) */
|
|
111
|
+
restorePruned?: number;
|
|
112
|
+
/** R254: attempts >= 2 carried the prior-attempts block */
|
|
113
|
+
informed?: boolean;
|
|
106
114
|
/** R246: which selection order produced the pick */
|
|
107
115
|
selectMode?: 'verdict' | 'evidence' | 'judge';
|
|
108
116
|
/** R251 (judge mode): the judge's order (best first), its one-line reason, whether a RANKING line parsed, and the evidence-order pick it overrode */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attemptController.d.ts","sourceRoot":"","sources":["../../src/orchestrator/attemptController.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"attemptController.d.ts","sourceRoot":"","sources":["../../src/orchestrator/attemptController.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ import { resolveTurnDeadlineMs } from './timeBudget.js';
|
|
|
22
22
|
import { resolveCortexStateDir } from '../utils/stateDir.js';
|
|
23
23
|
import { WorkspaceSnapshot } from '../utils/workspaceSnapshot.js';
|
|
24
24
|
import { buildAttemptJudgePrompt, parseAttemptJudgeRanking, applyJudgeRanking } from '../training/attemptJudge.js'; // R251
|
|
25
|
+
import { buildPriorAttemptsBlock, appendTurnText } from '../training/informedRetry.js'; // R254
|
|
25
26
|
import { sumSessionUsage } from '../training/usageAccounting.js';
|
|
26
27
|
// ---------------------------------------------------------------------------------------------------------------------------------
|
|
27
28
|
// Levers
|
|
@@ -51,6 +52,7 @@ export function resolveSecondAttemptConfig(env = process.env) {
|
|
|
51
52
|
checkTimeoutMs: 300_000,
|
|
52
53
|
select: /^judge$/i.test(String(env.CORTEX_SECOND_ATTEMPT_SELECT ?? '').trim()) ? 'judge' : /^evidence$/i.test(String(env.CORTEX_SECOND_ATTEMPT_SELECT ?? '').trim()) ? 'evidence' : 'verdict',
|
|
53
54
|
untilBudget: /^(1|true|on)$/i.test(String(env.CORTEX_SECOND_ATTEMPT_UNTIL_BUDGET ?? '').trim()),
|
|
55
|
+
informed: /^(1|true|on)$/i.test(String(env.CORTEX_SECOND_ATTEMPT_INFORMED ?? '').trim()),
|
|
54
56
|
};
|
|
55
57
|
}
|
|
56
58
|
/** sa_go, verbatim: remaining time is measured on the WALL CLOCK against the ORIGINAL deadline (t0 + deadline − now); an attempt's own
|
|
@@ -350,7 +352,19 @@ export async function runWithAttempts(opts) {
|
|
|
350
352
|
try {
|
|
351
353
|
orch = await opts.createAttemptOrchestrator(kn, { stateDir, storageDir: join(stateDir, 'sessions'), turnDeadlineMs: d.nextDeadlineMs });
|
|
352
354
|
extraOrchs.push(orch);
|
|
353
|
-
|
|
355
|
+
let content = opts.turnContent;
|
|
356
|
+
if (cfg.informed) { // R254: the earlier attempts' verdicts, open items, readings and final messages ride along
|
|
357
|
+
const priors = records.map((r) => { const ji = judgeInputs.get(r.k); return { k: r.k, action: r.action, confidence: ji?.confidence, gapNotes: ji?.gapNotes ?? '', liftPlan: ji?.liftPlan ?? '', finalText: ji?.finalText ?? '', turns: r.iterations ?? r.sessionTurns ?? null }; });
|
|
358
|
+
const block = buildPriorAttemptsBlock(priors);
|
|
359
|
+
content = appendTurnText(opts.turnContent, block);
|
|
360
|
+
try {
|
|
361
|
+
writeFileSync(join(artifactsDir, `informed.attempt${kn}.txt`), block, 'utf-8');
|
|
362
|
+
}
|
|
363
|
+
catch { /* best-effort */ }
|
|
364
|
+
log(`[AttemptController] R254 informed retry: attempt ${kn} carries ${records.length} prior attempt(s) (${block.length} chars)`);
|
|
365
|
+
await event({ phase: 'informed', k: kn, priors: records.map((r) => r.k), chars: block.length });
|
|
366
|
+
}
|
|
367
|
+
rn = await orch.sendMessage(content, opts.messageOptions);
|
|
354
368
|
}
|
|
355
369
|
catch (e) {
|
|
356
370
|
log(`[AttemptController] R194 attempt ${kn} failed: ${String(e?.message ?? e).slice(0, 300)}`);
|
|
@@ -379,8 +393,11 @@ export async function runWithAttempts(opts) {
|
|
|
379
393
|
rec.check = 'skipped';
|
|
380
394
|
continue;
|
|
381
395
|
}
|
|
382
|
-
if (j !== k
|
|
383
|
-
|
|
396
|
+
if (j !== k) {
|
|
397
|
+
if (!snap.restore(`attempt${j}`))
|
|
398
|
+
continue;
|
|
399
|
+
snap.pruneExcludedAfter(`attempt${j}`);
|
|
400
|
+
} // R252: the check sees the attempt's own tree
|
|
384
401
|
const { result, output } = runShippedCheck(chk, opts.projectPath, cfg.checkTimeoutMs);
|
|
385
402
|
rec.check = result;
|
|
386
403
|
try {
|
|
@@ -407,7 +424,7 @@ export async function runWithAttempts(opts) {
|
|
|
407
424
|
return { k: r.k, liftPlan: ji?.liftPlan ?? '', action: r.action, confidence: ji?.confidence, namedPassed: r.namedPassed, gapNotes: ji?.gapNotes ?? '', check: r.check, checkOutput, diffStat: tagged.has(r.k) ? snap.diffStat('lift', `attempt${r.k}`) : '', finalText: ji?.finalText ?? '', turns: r.turns ?? null };
|
|
408
425
|
});
|
|
409
426
|
const task = typeof opts.turnContent === 'string' ? opts.turnContent : finalTextOf({ content: opts.turnContent });
|
|
410
|
-
const body = buildAttemptJudgePrompt(task, packets);
|
|
427
|
+
const body = buildAttemptJudgePrompt(task, packets, { priorPick: sel.pick }); // R253: the label order is the stated prior
|
|
411
428
|
const call = opts.compareAttempts ?? ((b, n) => opts.orchestrator.compareAttempts?.(b, n) ?? Promise.resolve(null));
|
|
412
429
|
const tj = Date.now();
|
|
413
430
|
const reply = await call(body, packets.length);
|
|
@@ -431,8 +448,17 @@ export async function runWithAttempts(opts) {
|
|
|
431
448
|
}
|
|
432
449
|
if (!snap.restore(`attempt${sel.pick}`)) {
|
|
433
450
|
log(`[AttemptController] R194 restore of attempt ${sel.pick} FAILED — restoring attempt 1`);
|
|
434
|
-
snap.restore('attempt1')
|
|
451
|
+
if (snap.restore('attempt1'))
|
|
452
|
+
snap.pruneExcludedAfter('attempt1');
|
|
453
|
+
}
|
|
454
|
+
else {
|
|
455
|
+
// R252: drop excluded-path content a LATER attempt left behind (build output, caches, *.pyc, big files) so the graded tree is the
|
|
456
|
+
// one the pick produced — photonic (t4jf) failed live on attempt 2's leftovers and passed 14/14 from a clean restore.
|
|
457
|
+
sel.restorePruned = snap.pruneExcludedAfter(`attempt${sel.pick}`);
|
|
458
|
+
if (sel.restorePruned > 0)
|
|
459
|
+
log(`[AttemptController] R252 pick restore: pruned ${sel.restorePruned} excluded-path entries newer than attempt ${sel.pick}`);
|
|
435
460
|
}
|
|
461
|
+
sel.informed = cfg.informed;
|
|
436
462
|
writeJson(join(artifactsDir, 'second-attempt.json'), sel);
|
|
437
463
|
// R245 (2026-10-10): the supervisor banks <OUT_DIR>/session.jsonl + decisions.jsonl as THE trajectory, and attempt 1's orchestrator
|
|
438
464
|
// owns those files — so a pick ≠ 1 left attempt 1's trajectory in the lake (distill/curation/doctrine read the wrong attempt on every
|
|
@@ -454,7 +480,7 @@ export async function runWithAttempts(opts) {
|
|
|
454
480
|
}
|
|
455
481
|
}
|
|
456
482
|
log(`[AttemptController] R194 selection: ${JSON.stringify(sel).slice(0, 600)}`);
|
|
457
|
-
await event({ phase: 'selection', pick: sel.pick, why: sel.why, selectMode: sel.selectMode, evidencePick: sel.evidencePick, judgeParsed: sel.judgeParsed, turnsSource: sel.turnsSource, shippedCheck: sel.shippedCheck, attempts: sel.attempts.map((a) => ({ k: a.k, action: a.action, check: a.check, turns: a.turns, namedPassed: a.namedPassed, finished: a.finished })) });
|
|
483
|
+
await event({ phase: 'selection', pick: sel.pick, why: sel.why, selectMode: sel.selectMode, restorePruned: sel.restorePruned, informed: sel.informed, evidencePick: sel.evidencePick, judgeParsed: sel.judgeParsed, turnsSource: sel.turnsSource, shippedCheck: sel.shippedCheck, attempts: sel.attempts.map((a) => ({ k: a.k, action: a.action, check: a.check, turns: a.turns, namedPassed: a.namedPassed, finished: a.finished })) });
|
|
458
484
|
const merged = mergeAttemptResponses(responses, sel);
|
|
459
485
|
writeJson(join(artifactsDir, 'response.json'), merged ?? r1);
|
|
460
486
|
return merged ?? r1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attemptController.js","sourceRoot":"","sources":["../../src/orchestrator/attemptController.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"attemptController.js","sourceRoot":"","sources":["../../src/orchestrator/attemptController.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAChG,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,iBAAiB,EAAsB,MAAM,6BAA6B,CAAC,CAAC,OAAO;AAC/I,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC,CAAC,OAAO;AAC/F,OAAO,EAAE,eAAe,EAAqB,MAAM,gCAAgC,CAAC;AAEpF,oIAAoI;AACpI,SAAS;AACT,oIAAoI;AAEpI;;;qFAGqF;AACrF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,iBAAiB,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,CAAU,CAAC;AACtH,wFAAwF;AACxF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,iBAAiB,EAAE,uBAAuB,CAAU,CAAC;AACnG,sFAAsF;AACtF,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAS,CAAC,iBAAiB,EAAE,uBAAuB,CAAC,CAAC,CAAC;AAgCxG,MAAM,UAAU,0BAA0B,CAAC,MAAyB,OAAO,CAAC,GAAG;IAC7E,MAAM,KAAK,GAAG,CAAC,CAAU,EAAE,CAAS,EAAU,EAAE,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvI,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5E,MAAM,YAAY,GAAG,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7F,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,6BAA6B,IAAI,8BAA8B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtJ,OAAO;QACL,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9E,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,YAAY;QACZ,OAAO;QACP,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,gCAAgC,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC;QACvF,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,8BAA8B,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC;QACnF,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI;QACtE,cAAc,EAAE,OAAO;QACvB,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;QAC7L,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/F,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;KACzF,CAAC;AACJ,CAAC;AAuDD;;iIAEiI;AACjI,MAAM,UAAU,iBAAiB,CAAC,CAAuB;IACvD,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAClB,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5F,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,kBAAkB,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3H,IAAI,OAAO,GAAkB,IAAI,CAAC;IAClC,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IAAC,CAAC;SAC/H,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,GAAG,CAAC;QAAE,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,gEAAgE;IACxI,MAAM,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACtC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC;IAChC,MAAM,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,mEAAmE;IACpG,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,GAAG,GAAG,2BAA2B,CAAC;SAChE,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,GAAG,GAAG,CAAC,YAAY;QAAE,GAAG,GAAG,2DAA2D,CAAC;SAChH,IAAI,GAAG,GAAG,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,OAAO;QAAE,GAAG,GAAG,aAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC,+BAA+B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC;SAC1K,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG;QAAE,GAAG,GAAG,2BAA2B,CAAC;;QAC9E,GAAG,GAAG,UAAU,CAAC;IACtB,OAAO;QACL,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE;QAChI,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC;QAC5F,WAAW,EAAE,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,IAAI;QACtG,OAAO,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,KAAK,UAAU,EAAE,GAAG;KACvK,CAAC;AACJ,CAAC;AA+CD,6EAA6E;AAC7E,MAAM,UAAU,WAAW,CAAC,MAAiC;IAC3D,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,0BAA0B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED;;uHAEuH;AACvH,MAAM,UAAU,aAAa,CAAC,GAAoB,EAAE,YAA2B,EAAE,OAA+B,SAAS;IACvH,IAAI,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC1C,0GAA0G;IAC1G,MAAM,GAAG,GAAoC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1H,KAAK,MAAM,CAAC,IAAI,GAAG;QAAE,CAAC,CAAC,KAAK,GAAG,GAAG,KAAK,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IAC5F,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,IAAI,UAAU,CAAC,MAAM;QAAE,GAAG,CAAC,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;IACxD,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACpD,KAAK,GAAG,OAAO,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,uCAAuC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxF,CAAC;IACD,MAAM,GAAG,GAAG,GAAG,CAAC;IAChB,MAAM,KAAK,GAAkD,IAAI,KAAK,UAAU;QAC9E,CAAC,CAAC;YACE,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC,wBAAwB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAChF,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YACnD,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACjC;QACH,CAAC,CAAC;YACE,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC,wBAAwB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAChF,CAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YACnD,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACjC,CAAC;IACN,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACjF,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;YAAE,MAAM;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QACjD,IAAI,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAC9B,IAAI,KAAK,KAAK,kBAAkB,IAAI,CAAC,OAAO;gBAAE,GAAG,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;;gBAClG,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,aAAa,GAAG,CAAC,CAAC,CAAE,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,CAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;YAClH,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,KAAK,GAAG,GAAG,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,CAAC,OAAO;QAAE,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACzC,MAAM,GAAG,GAAqB,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACnJ,KAAK,MAAM,CAAC,IAAI,GAAG;QAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;IACvK,OAAO,GAAG,CAAC;AACb,CAAC;AAED,oIAAoI;AACpI,yBAAyB;AACzB,oIAAoI;AAEpI;gGACgG;AAChG,MAAM,UAAU,qBAAqB,CAAC,SAAyD,EAAE,SAA2B;IAC1H,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;IAC3B,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC/G,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,GAA6B,CAAC;IAClC,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC;QAC5B,IAAI,CAAC;YAAE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IACD,OAAO;QACL,GAAG,IAAI;QACP,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,SAAS,EAAyE;QAC3J,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,SAAS,EAAsC;KACpI,CAAC;AACJ,CAAC;AAED,oIAAoI;AACpI,uDAAuD;AACvD,oIAAoI;AAEpI,6IAA6I;AAC7I,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,MAAM,EAAE,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;YAAE,OAAO,WAAW,CAAC;IACjH,CAAC;IAAC,MAAM,CAAC,CAAC,0CAA0C,CAAC,CAAC;IACtD,IAAI,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QAAE,OAAO,cAAc,CAAC;IACrD,IAAI,UAAU,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;QAAE,OAAO,mBAAmB,CAAC;IAC/D,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,GAAG,IAAI,CAAC;QAAC,OAAO,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,KAAK,CAAC;IAAC,CAAC,CAAC,CAAC,CAAC;IACvG,IAAI,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO,yDAAyD,CAAC;IACtI,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,eAAe,CAAC,GAAW,EAAE,SAAiB,EAAE,SAAiB;IAC/E,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;QAClK,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QACpD,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,0BAA0B,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACvI,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,MAAM,CAAE,CAAW,EAAE,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;IAClG,CAAC;AACH,CAAC;AAED,wIAAwI;AACxI,MAAM,UAAU,qBAAqB,CAAC,WAA+B;IACnE,IAAI,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1D,IAAI,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBAAE,SAAS;YAC3B,IAAI,CAAM,CAAC;YACX,IAAI,CAAC;gBAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC;gBAAC,SAAS;YAAC,CAAC;YACjD,MAAM,MAAM,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;YACnC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;gBAAE,CAAC,EAAE,CAAC;QAChI,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;AAC1B,CAAC;AAmCD,qIAAqI;AACrI,SAAS,oBAAoB,CAAC,IAA6C;IACzE,MAAM,CAAC,GAAI,IAAI,EAAE,QAAyD,EAAE,kBAAkB,CAAC;IAC/F,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChE,CAAC;AAED,SAAS,SAAS,CAAC,IAAY,EAAE,KAAc;IAC7C,IAAI,CAAC;QAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,4BAA4B,CAAC,CAAC;AAChK,CAAC;AACD,SAAS,MAAM,CAAC,GAAuB,EAAE,GAAW;IAClD,IAAI,CAAC;QAAC,IAAI,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACzJ,OAAO,KAAK,CAAC;AACf,CAAC;AAED,6GAA6G;AAC7G,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAA4B;IAChE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,qBAAqB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;IACnE,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,IAAI,WAAW,CAAC;IAC/C,MAAM,IAAI,GAAG,CAAC,IAAwB,EAAE,CAAS,EAAE,QAAqC,EAAE,EAAE;QAC1F,MAAM,KAAK,GAAG,OAAQ,IAAY,CAAC,uBAAuB,KAAK,UAAU,CAAC,CAAC,CAAE,IAAY,CAAC,uBAAuB,EAAsD,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7K,IAAI,QAAQ;YAAE,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;QACnF,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/E,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,CAAC,IAAwB,EAA+B,EAAE,CAC1E,OAAQ,IAAY,CAAC,uBAAuB,KAAK,UAAU,CAAC,CAAC,CAAG,IAAY,CAAC,uBAAuB,EAAkC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChJ,MAAM,KAAK,GAAG,KAAK,EAAE,MAA+B,EAAE,EAAE;QACtD,IAAI,CAAC;YAAC,MAAO,IAAI,CAAC,YAAoB,CAAC,iBAAiB,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACrH,CAAC,CAAC;IAEF,oEAAoE;IACpE,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAClH,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,KAAK;QAAE,GAAG,CAAC,mFAAmF,CAAC,CAAC;SAC/G,IAAI,KAAK;QAAE,GAAG,CAAC,qEAAqE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEpH,4CAA4C;IAC5C,MAAM,SAAS,GAAuC,EAAE,CAAC;IACzD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACtF,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnB,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAEtB,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,MAAM,UAAU,GAAyB,EAAE,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAI,GAAG,EAA0F,CAAC,CAAC,OAAO;IAC9H,MAAM,UAAU,GAAG,CAAC,CAAqB,EAAU,EAAE,GAAG,IAAI,CAAC;QAAC,OAAO,MAAM,CAAE,CAAS,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC,CAAC,CAAC,CAAC;IAC5I,MAAM,WAAW,GAAG,CAAC,CAA8B,EAAU,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/R,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,QAAQ,GAAuB,IAAI,CAAC,YAAY,CAAC;IACrD,IAAI,CAAC;QACH,2FAA2F;QAC3F,SAAS,CAAC;YACR,MAAM,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC9B,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACtC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO;YACjJ,MAAM,CAAC,GAAG,iBAAiB,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,IAAI,IAAI,EAAE,kBAAkB,EAAE,CAAC,EAAE,aAAa,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,IAAI,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACjO,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9C,GAAG,CAAC,oCAAoC,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC3E,MAAM,KAAK,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC;gBACX,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,IAAI,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM;gBACvG,UAAU,EAAE,oBAAoB,CAAC,IAAI,CAAC;gBACtC,YAAY,EAAE,qBAAqB,CAAC,KAAK,CAAC,WAAW,CAAC;gBACtD,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;aACrG,CAAC,CAAC;YACH,IAAI,CAAC,CAAC,CAAC,EAAE;gBAAE,MAAM;YACjB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;oBAAC,GAAG,CAAC,8FAA8F,CAAC,CAAC;oBAAC,MAAM;gBAAC,CAAC;gBAC7I,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAChB,CAAC;YACD,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAAC,GAAG,CAAC,uEAAuE,CAAC,EAAE,CAAC,CAAC;gBAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAAC,MAAM;YAAC,CAAC;YACnJ,GAAG,CAAC,iEAAiE,EAAE,cAAc,CAAC,CAAC,cAAc,MAAM,CAAC,CAAC;YAC7G,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,IAAI,GAA8B,IAAI,CAAC;YAC3C,IAAI,EAAE,GAAgC,IAAI,CAAC;YAC3C,IAAI,CAAC;gBACH,IAAI,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC;gBACxI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtB,IAAI,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC/B,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,2FAA2F;oBAC7G,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpR,MAAM,KAAK,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;oBAC9C,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;oBAClD,IAAI,CAAC;wBAAC,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;oBAAC,CAAC;oBAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;oBACnH,GAAG,CAAC,oDAAoD,EAAE,YAAY,OAAO,CAAC,MAAM,sBAAsB,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC;oBACjI,MAAM,KAAK,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAClG,CAAC;gBACD,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5D,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,CAAC,oCAAoC,EAAE,YAAY,MAAM,CAAE,CAAW,EAAE,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5G,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnB,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;gBAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChD,CAAC,GAAG,EAAE,CAAC;YACP,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,kEAAkE;gBAC7E,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;gBACtJ,MAAM;YACR,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,CAAC;QAErB,+HAA+H;QAC/H,qGAAqG;QACrG,MAAM,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,GAAG,EAAE,CAAC;YACR,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC3C,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;oBAAE,SAAS;gBACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,CAAC;oBAAC,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;oBAAC,SAAS;gBAAC,CAAC;gBACjF,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;wBAAE,SAAS;oBAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAAC,CAAC,CAAC,8CAA8C;gBACnJ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;gBACtF,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC;gBACnB,IAAI,CAAC;oBAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;oBAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;gBAAC,CAAC;gBAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;YAC9K,CAAC;QACH,CAAC;QAED,4BAA4B;QAC5B,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpH,kIAAkI;QAClI,gIAAgI;QAChI,wHAAwH;QACxH,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC5E,IAAI,CAAC;gBACH,MAAM,OAAO,GAAoB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3E,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAChC,IAAI,WAAW,GAAG,EAAE,CAAC;oBAAC,IAAI,CAAC;wBAAC,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;oBAAC,CAAC;oBAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;oBAC3H,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;gBACxT,CAAC,CAAC,CAAC;gBACH,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAA0B,CAAC,CAAC;gBAC1I,MAAM,IAAI,GAAG,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,4CAA4C;gBAC1H,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAE,IAAI,CAAC,YAAoB,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7I,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC/C,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9E,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC;gBAC9B,MAAM,OAAO,GAAG,iBAAiB,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC9K,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC;gBAAC,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC;gBAAC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC;gBAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;gBAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;gBAC/J,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;gBAAC,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,qBAAqB,GAAG,CAAC,GAAG,EAAE,CAAC;gBAC9I,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,IAAI,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBACxN,GAAG,CAAC,oDAAoD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAI,mBAAmB,YAAY,QAAQ,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;gBACtL,MAAM,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YACrM,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,CAAC,mDAAmD,MAAM,CAAE,CAAW,EAAE,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACnI,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAAC,GAAG,CAAC,+CAA+C,GAAG,CAAC,IAAI,+BAA+B,CAAC,CAAC;YAAC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAAC,CAAC;aACvM,CAAC;YACJ,kIAAkI;YAClI,sHAAsH;YACtH,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAClE,IAAI,GAAG,CAAC,aAAa,GAAG,CAAC;gBAAE,GAAG,CAAC,iDAAiD,GAAG,CAAC,aAAa,6CAA6C,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5J,CAAC;QACD,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC5B,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,qBAAqB,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1D,oIAAoI;QACpI,sIAAsI;QACtI,yIAAyI;QACzI,mIAAmI;QACnI,qIAAqI;QACrI,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;YACzD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5B,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBACpJ,GAAG,CAAC,qDAAqD,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,YAAY,UAAU,EAAE,CAAC,CAAC;YACvG,CAAC;QACH,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACjC,KAAK,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC;gBACzC,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,WAAW,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC;gBAChE,IAAI,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAAE,GAAG,CAAC,4BAA4B,CAAC,oBAAoB,GAAG,CAAC,IAAI,aAAa,CAAC,CAAC;YACjI,CAAC;QACH,CAAC;QACD,GAAG,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QAChF,MAAM,KAAK,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,GAAG,CAAC,aAAa,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACza,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACrD,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,eAAe,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;QAC7D,OAAO,MAAM,IAAI,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,yCAAyC,MAAM,CAAE,CAAW,EAAE,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACvH,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC5C,OAAO,EAAE,CAAC;IACZ,CAAC;YAAS,CAAC;QACT,oIAAoI;QACpI,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;YAAC,IAAI,CAAC;gBAAC,MAAO,CAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAAC,CAAC;IACnG,CAAC;AACH,CAAC"}
|
|
@@ -7,6 +7,11 @@
|
|
|
7
7
|
* the likelihood that the HIDDEN grader accepts the tree as left on disk. The TASK's requirements decide, never plan quality:
|
|
8
8
|
* a better plan with a weaker artifact loses. Pure builders/parsers here; the model call lives in HelperModelMiddleware.compareAttempts.
|
|
9
9
|
*
|
|
10
|
+
* R253 (2026-10-13, after the t4jf/t4jg sibling oracle): the judge over-weighted its own prior-check metadata (`judge checks passed`,
|
|
11
|
+
* "harness-observed" vs "self-reported") and chose the failing gap-accept over the clean accept on the one discriminating chain.
|
|
12
|
+
* The prompt now states the evidence-order pick as the prior, never renders the named-check count, and forbids hold-history as a
|
|
13
|
+
* criterion. Findings: .cortex/bench/findings-tb4-sibling-curation-2026-10-13.md §1.
|
|
14
|
+
*
|
|
10
15
|
* Output contract: line 1 `RANKING: k, k, k` (every attempt, best first), line 2 `REASON: <one line>`. A blank/unparseable reply
|
|
11
16
|
* falls back to the evidence order (never a hidden pick change). The shipped-check gate stays HARD: when some attempts pass the
|
|
12
17
|
* workspace's own check and others do not, only the passing ones are eligible regardless of the ranking.
|
|
@@ -18,6 +23,7 @@ export interface AttemptPacket {
|
|
|
18
23
|
/** the resolver's last action on this attempt (accept | accept-with-gap | accept-low-confidence | veto | … | null = no verdict) */
|
|
19
24
|
action: string | null;
|
|
20
25
|
confidence?: string;
|
|
26
|
+
/** banked for curation only — NOT rendered to the judge since R253 (2026-10-13) */
|
|
21
27
|
namedPassed?: number;
|
|
22
28
|
/** the resolver's GAP notes / fix plan ('' when MEETS or none) */
|
|
23
29
|
gapNotes: string;
|
|
@@ -30,7 +36,9 @@ export interface AttemptPacket {
|
|
|
30
36
|
turns: number | null;
|
|
31
37
|
}
|
|
32
38
|
export declare const ATTEMPT_JUDGE_SYSTEM: string;
|
|
33
|
-
export declare function buildAttemptJudgePrompt(task: string, packets: AttemptPacket[]
|
|
39
|
+
export declare function buildAttemptJudgePrompt(task: string, packets: AttemptPacket[], opts?: {
|
|
40
|
+
priorPick?: number;
|
|
41
|
+
}): string;
|
|
34
42
|
export interface AttemptJudgeRanking {
|
|
35
43
|
/** best first; every k in `ks` exactly once (unranked attempts appended in the order given) */
|
|
36
44
|
ranking: number[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attemptJudge.d.ts","sourceRoot":"","sources":["../../src/training/attemptJudge.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"attemptJudge.d.ts","sourceRoot":"","sources":["../../src/training/attemptJudge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,WAAW,aAAa;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,mEAAmE;IACnE,QAAQ,EAAE,MAAM,CAAC;IACjB,mIAAmI;IACnI,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,CAAC;IACjB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAWD,eAAO,MAAM,oBAAoB,QAmBuD,CAAC;AAEzF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,CAmBzH;AAED,MAAM,WAAW,mBAAmB;IAClC,+FAA+F;IAC/F,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAUxF;AAED,MAAM,WAAW,cAAc;IAC7B,8DAA8D;IAC9D,UAAU,EAAE,KAAK,CAAC;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,+EAA+E;IAC/E,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,kGAAkG;AAClG,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CASlF"}
|
|
@@ -7,6 +7,11 @@
|
|
|
7
7
|
* the likelihood that the HIDDEN grader accepts the tree as left on disk. The TASK's requirements decide, never plan quality:
|
|
8
8
|
* a better plan with a weaker artifact loses. Pure builders/parsers here; the model call lives in HelperModelMiddleware.compareAttempts.
|
|
9
9
|
*
|
|
10
|
+
* R253 (2026-10-13, after the t4jf/t4jg sibling oracle): the judge over-weighted its own prior-check metadata (`judge checks passed`,
|
|
11
|
+
* "harness-observed" vs "self-reported") and chose the failing gap-accept over the clean accept on the one discriminating chain.
|
|
12
|
+
* The prompt now states the evidence-order pick as the prior, never renders the named-check count, and forbids hold-history as a
|
|
13
|
+
* criterion. Findings: .cortex/bench/findings-tb4-sibling-curation-2026-10-13.md §1.
|
|
14
|
+
*
|
|
10
15
|
* Output contract: line 1 `RANKING: k, k, k` (every attempt, best first), line 2 `REASON: <one line>`. A blank/unparseable reply
|
|
11
16
|
* falls back to the evidence order (never a hidden pick change). The shipped-check gate stays HARD: when some attempts pass the
|
|
12
17
|
* workspace's own check and others do not, only the passing ones are eligible regardless of the ranking.
|
|
@@ -25,18 +30,30 @@ export const ATTEMPT_JUDGE_SYSTEM = 'You are a senior engineer choosing which of
|
|
|
25
30
|
'(verdict, confidence, open items), the workspace\'s own check result, the files it changed, its final message and how many ' +
|
|
26
31
|
'tool-call turns it took. Exactly ONE attempt\'s tree will be graded.\n' +
|
|
27
32
|
'Decide by the TASK\'s real requirements — the criteria the hidden grader checks — never by plan quality: a better plan with a ' +
|
|
28
|
-
'weaker artifact LOSES. Evidence precedence:
|
|
29
|
-
'
|
|
30
|
-
'
|
|
31
|
-
'
|
|
33
|
+
'weaker artifact LOSES. Evidence precedence: the shipped check result (when it ran) > concrete, specific artifact facts (paths, ' +
|
|
34
|
+
'formats, values, outputs) in the files changed and the final message > the verdict class (a clean accept > accept-with-gap > ' +
|
|
35
|
+
'veto) > fewer turns > the plan.\n' +
|
|
36
|
+
'Each attempt was adjudicated in ISOLATION. A clean verdict (accepted on its first adjudication) has NO hold-cycle history by ' +
|
|
37
|
+
'construction, so it shows no prior check runs — that absence is NOT weak evidence and NOT "self-reported": an attempt\'s own ' +
|
|
38
|
+
'claims and an attempt\'s hold-cycle check runs are the same kind of evidence (the agent\'s). NEVER rank by how much adjudication ' +
|
|
39
|
+
'history an attempt has, by "self-reported vs harness-observed", or by the resolver\'s confidence word alone. Measured on graded ' +
|
|
40
|
+
'chains: the clean accept finished in fewer turns was the attempt that passed; the gap-accept with more open items was not. ' +
|
|
41
|
+
'The EVIDENCE-ORDER PRIOR names that attempt — keep it unless a SPECIFIC artifact fact (a missing required file, a wrong ' +
|
|
42
|
+
'path/format/value, a failing output) shows another attempt meets the task better. Be adversarial about the ARTIFACTS: hunt for ' +
|
|
43
|
+
'the exact constraint a nearly-done attempt misses (wrong artifact, path/format mismatch, numeric threshold, unhandled edge case, ' +
|
|
44
|
+
'"passed my own test but not the task\'s").\n' +
|
|
32
45
|
'FORMAT — your FIRST line MUST be exactly `RANKING: k, k, …` listing EVERY attempt number, best first. ' +
|
|
33
46
|
'Second line MUST be `REASON: <one line naming the deciding evidence>`. Nothing else.';
|
|
34
|
-
export function buildAttemptJudgePrompt(task, packets) {
|
|
47
|
+
export function buildAttemptJudgePrompt(task, packets, opts = {}) {
|
|
35
48
|
const parts = [`TASK:\n${clip(task, CAPS.task, 'the task text')}`];
|
|
49
|
+
// R253: the label order's pick is the measured prior; namedPassed is NOT rendered (a clean accept has none by construction — the
|
|
50
|
+
// judge read that absence as weakness and chose the failing gap-accept on the one discriminating chain of the 10-12 cells)
|
|
51
|
+
if (typeof opts.priorPick === 'number')
|
|
52
|
+
parts.push(`EVIDENCE-ORDER PRIOR: attempt ${opts.priorPick} (accepted class first, then fewest turns). Keep it unless a specific artifact fact shows another attempt meets the task better.`);
|
|
36
53
|
for (const p of [...packets].sort((a, b) => a.k - b.k)) {
|
|
37
54
|
const lines = [`=== ATTEMPT ${p.k} ===`];
|
|
38
55
|
lines.push(`TOOL-CALL TURNS: ${p.turns ?? 'unknown'}`);
|
|
39
|
-
lines.push(`RESOLVER VERDICT: ${p.action ?? 'none (no finish adjudicated)'}` + (p.confidence ? ` | confidence ${p.confidence}` : '')
|
|
56
|
+
lines.push(`RESOLVER VERDICT: ${p.action ?? 'none (no finish adjudicated)'}` + (p.confidence ? ` | confidence ${p.confidence}` : ''));
|
|
40
57
|
if (p.gapNotes.trim())
|
|
41
58
|
lines.push(`RESOLVER OPEN ITEMS (its fix plan — grade whether they are real):\n${clip(p.gapNotes, CAPS.gap, 'the open items')}`);
|
|
42
59
|
lines.push(`SHIPPED CHECK (the workspace's own test entry point, run by the harness on this attempt's tree): ${p.check}` + (p.checkOutput.trim() ? `\n${clip(p.checkOutput, CAPS.check, 'the check output')}` : ''));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attemptJudge.js","sourceRoot":"","sources":["../../src/training/attemptJudge.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"attemptJudge.js","sourceRoot":"","sources":["../../src/training/attemptJudge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* informedRetry — R254 (CORTEX_SECOND_ATTEMPT_INFORMED=1, dark, 2026-10-13): carry what the earlier attempts of a second-attempt
|
|
3
|
+
* chain learned into the NEXT attempt's task message.
|
|
4
|
+
*
|
|
5
|
+
* Why: the t4jf/t4jg sibling oracle showed the no-pass chains are SYSTEMATIC, not unlucky — independent attempts re-derive the same
|
|
6
|
+
* misreading from the same cold task text (atrx: all three attempts chose the same wrong transcript and share 5 of 10 failing hidden
|
|
7
|
+
* tests; fin: the same aggregation reading). Selection cannot fix that; a later attempt that KNOWS the earlier interpretation and its
|
|
8
|
+
* open items can question it. The block is appended to the task content of attempts >= 2 (the lift planner reads it too), banked as
|
|
9
|
+
* `informed.attempt<k>.txt`, and announced by a `second_attempt` event (phase `informed`) — the mechanism-engagement evidence per arm.
|
|
10
|
+
* Findings: .cortex/bench/findings-tb4-sibling-curation-2026-10-13.md §3.
|
|
11
|
+
*/
|
|
12
|
+
export interface PriorAttemptSummary {
|
|
13
|
+
k: number;
|
|
14
|
+
/** the resolver's last action (null = no verdict) */
|
|
15
|
+
action: string | null;
|
|
16
|
+
confidence?: string;
|
|
17
|
+
/** the resolver's open items / fix plan ('' when none) */
|
|
18
|
+
gapNotes: string;
|
|
19
|
+
/** the attempt's plan of attack — its READING of the task ('' when none) */
|
|
20
|
+
liftPlan: string;
|
|
21
|
+
/** the attempt's final message ('' when none) */
|
|
22
|
+
finalText: string;
|
|
23
|
+
turns: number | null;
|
|
24
|
+
}
|
|
25
|
+
export declare const PRIOR_ATTEMPTS_HEADER = "PRIOR INDEPENDENT ATTEMPTS AT THIS TASK";
|
|
26
|
+
/** The block appended to the task content of attempt k+1. Pure. */
|
|
27
|
+
export declare function buildPriorAttemptsBlock(priors: PriorAttemptSummary[]): string;
|
|
28
|
+
/** Append `block` to a turn's content: a string gets it as a trailing paragraph, a content-block array gets a text block; any other
|
|
29
|
+
* shape is returned unchanged. */
|
|
30
|
+
export declare function appendTurnText<T>(content: T, block: string): T;
|
|
31
|
+
//# sourceMappingURL=informedRetry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"informedRetry.d.ts","sourceRoot":"","sources":["../../src/training/informedRetry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,mBAAmB;IAClC,CAAC,EAAE,MAAM,CAAC;IACV,qDAAqD;IACrD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAWD,eAAO,MAAM,qBAAqB,4CAA4C,CAAC;AAE/E,mEAAmE;AACnE,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,CAkB7E;AAED;mCACmC;AACnC,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,CAI9D"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* informedRetry — R254 (CORTEX_SECOND_ATTEMPT_INFORMED=1, dark, 2026-10-13): carry what the earlier attempts of a second-attempt
|
|
3
|
+
* chain learned into the NEXT attempt's task message.
|
|
4
|
+
*
|
|
5
|
+
* Why: the t4jf/t4jg sibling oracle showed the no-pass chains are SYSTEMATIC, not unlucky — independent attempts re-derive the same
|
|
6
|
+
* misreading from the same cold task text (atrx: all three attempts chose the same wrong transcript and share 5 of 10 failing hidden
|
|
7
|
+
* tests; fin: the same aggregation reading). Selection cannot fix that; a later attempt that KNOWS the earlier interpretation and its
|
|
8
|
+
* open items can question it. The block is appended to the task content of attempts >= 2 (the lift planner reads it too), banked as
|
|
9
|
+
* `informed.attempt<k>.txt`, and announced by a `second_attempt` event (phase `informed`) — the mechanism-engagement evidence per arm.
|
|
10
|
+
* Findings: .cortex/bench/findings-tb4-sibling-curation-2026-10-13.md §3.
|
|
11
|
+
*/
|
|
12
|
+
const CAPS = { plan: 1200, gap: 1500, final: 1200 };
|
|
13
|
+
function clip(s, max) {
|
|
14
|
+
const t = (s || '').trim();
|
|
15
|
+
if (t.length <= max)
|
|
16
|
+
return t;
|
|
17
|
+
const head = Math.floor(max * 0.7);
|
|
18
|
+
const tail = max - head;
|
|
19
|
+
return `${t.slice(0, head)}\n… [${t.length - max} chars elided] …\n${t.slice(-tail)}`;
|
|
20
|
+
}
|
|
21
|
+
export const PRIOR_ATTEMPTS_HEADER = 'PRIOR INDEPENDENT ATTEMPTS AT THIS TASK';
|
|
22
|
+
/** The block appended to the task content of attempt k+1. Pure. */
|
|
23
|
+
export function buildPriorAttemptsBlock(priors) {
|
|
24
|
+
const out = [
|
|
25
|
+
`=== ${PRIOR_ATTEMPTS_HEADER} (${priors.length}) ===`,
|
|
26
|
+
'Earlier attempts at exactly this task ran before you; the workspace was reset, so NONE of their files remain and you start clean. ' +
|
|
27
|
+
'Each ended with the adjudication below. They are evidence about the TASK, not instructions: they may share one wrong reading of it. ' +
|
|
28
|
+
'Before you plan, state what interpretation they shared and check it against the task text; verify the specific items they left open; ' +
|
|
29
|
+
'do not assume their conclusions (chosen inputs, references, formats, thresholds) were right, and do not repeat their exact approach ' +
|
|
30
|
+
'unless you have confirmed it is what the task asks for.',
|
|
31
|
+
];
|
|
32
|
+
for (const p of [...priors].sort((a, b) => a.k - b.k)) {
|
|
33
|
+
out.push(`--- prior attempt ${p.k} ---`);
|
|
34
|
+
out.push(`verdict: ${p.action ?? 'none'}${p.confidence ? ` (confidence ${p.confidence})` : ''}${typeof p.turns === 'number' ? ` | tool-call turns: ${p.turns}` : ''}`);
|
|
35
|
+
if (p.liftPlan.trim())
|
|
36
|
+
out.push(`its reading of the task (plan of attack):\n${clip(p.liftPlan, CAPS.plan)}`);
|
|
37
|
+
if (p.gapNotes.trim())
|
|
38
|
+
out.push(`open items at its finish (verify these):\n${clip(p.gapNotes, CAPS.gap)}`);
|
|
39
|
+
if (p.finalText.trim())
|
|
40
|
+
out.push(`its final message:\n${clip(p.finalText, CAPS.final)}`);
|
|
41
|
+
}
|
|
42
|
+
out.push('=== END PRIOR ATTEMPTS ===');
|
|
43
|
+
return out.join('\n');
|
|
44
|
+
}
|
|
45
|
+
/** Append `block` to a turn's content: a string gets it as a trailing paragraph, a content-block array gets a text block; any other
|
|
46
|
+
* shape is returned unchanged. */
|
|
47
|
+
export function appendTurnText(content, block) {
|
|
48
|
+
if (typeof content === 'string')
|
|
49
|
+
return `${content}\n\n${block}`;
|
|
50
|
+
if (Array.isArray(content))
|
|
51
|
+
return [...content, { type: 'text', text: block }];
|
|
52
|
+
return content;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=informedRetry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"informedRetry.js","sourceRoot":"","sources":["../../src/training/informedRetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,14 @@ export declare class WorkspaceSnapshot {
|
|
|
36
36
|
commit(tag: string): boolean;
|
|
37
37
|
/** `reset --hard <tag>` + `clean -fdq` (excluded paths untouched). Returns false on any failure. */
|
|
38
38
|
restore(tag: string): boolean;
|
|
39
|
+
/** R252 (2026-10-13): `restore(tag)` puts the TRACKED tree back, but every snapshot-EXCLUDED path (vendor dirs, build output, caches,
|
|
40
|
+
* *.pyc, files over `bigFileBytes`) stays as the LAST attempt left it — so the main trial graded a tree the pick never produced
|
|
41
|
+
* (photonic, t4jf: the pick failed live on leftovers from attempt 2, the same tag restored into a fresh container passed 14/14).
|
|
42
|
+
* This removes excluded-path content whose mtime is newer than `tag`'s stamp (= created or rewritten by a LATER attempt), leaving
|
|
43
|
+
* the task image's own vendor/build content and everything the picked attempt produced itself. `.git/` and `.cortex/` (the harness
|
|
44
|
+
* state dir, which holds this shadow repository) are never touched. Returns the number of entries removed, -1 when no stamp exists
|
|
45
|
+
* or `find` is unavailable. Deletions of excluded content by a later attempt cannot be undone (never snapshotted). */
|
|
46
|
+
pruneExcludedAfter(tag: string): number;
|
|
39
47
|
/** R250 (sibling grading): write every ref of the shadow repository (lift + attempt<k> tags) to a git bundle at `path`, so a
|
|
40
48
|
* restore-only grader trial can check out any attempt later. false on failure (banking is best-effort). */
|
|
41
49
|
bundle(path: string): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaceSnapshot.d.ts","sourceRoot":"","sources":["../../src/utils/workspaceSnapshot.ts"],"names":[],"mappings":"AAmBA,8EAA8E;AAC9E,eAAO,MAAM,iBAAiB,UAG7B,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,qHAAqH;IACrH,MAAM,EAAE,MAAM,CAAC;IACf,0GAA0G;IAC1G,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAID,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAyB;IAC7C,OAAO,CAAC,KAAK,CAAS;gBAEV,IAAI,EAAE,wBAAwB;IAS1C,gDAAgD;IAChD,MAAM,CAAC,YAAY,IAAI,OAAO;IAI9B,kCAAkC;IAClC,IAAI,OAAO,IAAI,OAAO,CAAuB;IAE7C,OAAO,CAAC,GAAG;IAOX,OAAO,CAAC,EAAE;IAMV,sIAAsI;IACtI,OAAO,CAAC,QAAQ;IAUhB,2GAA2G;IAC3G,IAAI,IAAI,OAAO;IAoBf,wFAAwF;IACxF,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"workspaceSnapshot.d.ts","sourceRoot":"","sources":["../../src/utils/workspaceSnapshot.ts"],"names":[],"mappings":"AAmBA,8EAA8E;AAC9E,eAAO,MAAM,iBAAiB,UAG7B,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,qHAAqH;IACrH,MAAM,EAAE,MAAM,CAAC;IACf,0GAA0G;IAC1G,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAID,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAyB;IAC7C,OAAO,CAAC,KAAK,CAAS;gBAEV,IAAI,EAAE,wBAAwB;IAS1C,gDAAgD;IAChD,MAAM,CAAC,YAAY,IAAI,OAAO;IAI9B,kCAAkC;IAClC,IAAI,OAAO,IAAI,OAAO,CAAuB;IAE7C,OAAO,CAAC,GAAG;IAOX,OAAO,CAAC,EAAE;IAMV,sIAAsI;IACtI,OAAO,CAAC,QAAQ;IAUhB,2GAA2G;IAC3G,IAAI,IAAI,OAAO;IAoBf,wFAAwF;IACxF,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAU5B,oGAAoG;IACpG,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAM7B;;;;;;2HAMuH;IACvH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAsBvC;gHAC4G;IAC5G,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQ7B,gGAAgG;IAChG,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,SAAO,GAAG,MAAM;IAMvD,6CAA6C;IAC7C,IAAI,IAAI,MAAM,EAAE;IAMhB,sFAAsF;IACtF,SAAS,IAAI,MAAM;CAKpB"}
|
|
@@ -111,7 +111,15 @@ export class WorkspaceSnapshot {
|
|
|
111
111
|
return false;
|
|
112
112
|
if (!this.ok(this.git(['commit', '-q', '-m', tag, '--allow-empty'], this.commitTimeoutMs), `commit (${tag})`))
|
|
113
113
|
return false;
|
|
114
|
-
|
|
114
|
+
if (!this.ok(this.git(['tag', '-f', tag]), `tag (${tag})`))
|
|
115
|
+
return false;
|
|
116
|
+
// R252: a stamp per tag — `pruneExcludedAfter(tag)` removes excluded-path content newer than it at a later restore
|
|
117
|
+
try {
|
|
118
|
+
mkdirSync(join(this.gitDir, 'stamps'), { recursive: true });
|
|
119
|
+
writeFileSync(join(this.gitDir, 'stamps', tag), `${Date.now()}\n`, 'utf-8');
|
|
120
|
+
}
|
|
121
|
+
catch { /* best-effort */ }
|
|
122
|
+
return true;
|
|
115
123
|
}
|
|
116
124
|
/** `reset --hard <tag>` + `clean -fdq` (excluded paths untouched). Returns false on any failure. */
|
|
117
125
|
restore(tag) {
|
|
@@ -121,6 +129,39 @@ export class WorkspaceSnapshot {
|
|
|
121
129
|
return false;
|
|
122
130
|
return this.ok(this.git(['clean', '-fdq'], this.commitTimeoutMs), `clean (${tag})`);
|
|
123
131
|
}
|
|
132
|
+
/** R252 (2026-10-13): `restore(tag)` puts the TRACKED tree back, but every snapshot-EXCLUDED path (vendor dirs, build output, caches,
|
|
133
|
+
* *.pyc, files over `bigFileBytes`) stays as the LAST attempt left it — so the main trial graded a tree the pick never produced
|
|
134
|
+
* (photonic, t4jf: the pick failed live on leftovers from attempt 2, the same tag restored into a fresh container passed 14/14).
|
|
135
|
+
* This removes excluded-path content whose mtime is newer than `tag`'s stamp (= created or rewritten by a LATER attempt), leaving
|
|
136
|
+
* the task image's own vendor/build content and everything the picked attempt produced itself. `.git/` and `.cortex/` (the harness
|
|
137
|
+
* state dir, which holds this shadow repository) are never touched. Returns the number of entries removed, -1 when no stamp exists
|
|
138
|
+
* or `find` is unavailable. Deletions of excluded content by a later attempt cannot be undone (never snapshotted). */
|
|
139
|
+
pruneExcludedAfter(tag) {
|
|
140
|
+
const stamp = join(this.gitDir, 'stamps', tag);
|
|
141
|
+
if (!this.ready || !existsSync(stamp))
|
|
142
|
+
return -1;
|
|
143
|
+
const run = (args) => {
|
|
144
|
+
try {
|
|
145
|
+
const r = spawnSync('find', args, { cwd: this.workspace, encoding: 'utf-8', timeout: 120_000, stdio: ['ignore', 'pipe', 'ignore'], maxBuffer: 64 * 1024 * 1024 });
|
|
146
|
+
return r.status === 0 && r.stdout ? r.stdout.split('\n').map((x) => x.trim()).filter(Boolean) : [];
|
|
147
|
+
}
|
|
148
|
+
catch {
|
|
149
|
+
return [];
|
|
150
|
+
}
|
|
151
|
+
};
|
|
152
|
+
const never = ['(', '-name', '.git', '-o', '-name', '.cortex', ')', '-prune'];
|
|
153
|
+
const dirNames = SNAPSHOT_EXCLUDES.filter((p) => p.endsWith('/') && p !== '.git/' && p !== '.cortex/').map((p) => p.slice(0, -1));
|
|
154
|
+
const dirs = run(['.', ...never, '-o', '-type', 'd', '(', ...dirNames.flatMap((d, i) => (i ? ['-o', '-name', d] : ['-name', d])), ')', '-print', '-prune']);
|
|
155
|
+
let n = 0;
|
|
156
|
+
for (const d of dirs) {
|
|
157
|
+
n += run([d, '-type', 'f', '-newer', stamp, '-print', '-delete']).length;
|
|
158
|
+
n += run([d, '-depth', '-mindepth', '1', '-type', 'd', '-empty', '-newer', stamp, '-print', '-delete']).length;
|
|
159
|
+
}
|
|
160
|
+
n += run(['.', ...never, '-o', '-type', 'f', '(', '-name', '*.pyc', '-o', '-size', `+${Math.max(1, Math.floor(this.bigFileBytes / 1024))}k`, ')', '-newer', stamp, '-print', '-delete']).length;
|
|
161
|
+
if (n > 0)
|
|
162
|
+
this.log(`[WorkspaceSnapshot] R252 pruned ${n} excluded-path entries newer than ${tag}`);
|
|
163
|
+
return n;
|
|
164
|
+
}
|
|
124
165
|
/** R250 (sibling grading): write every ref of the shadow repository (lift + attempt<k> tags) to a git bundle at `path`, so a
|
|
125
166
|
* restore-only grader trial can check out any attempt later. false on failure (banking is best-effort). */
|
|
126
167
|
bundle(path) {
|
|
@@ -130,7 +171,9 @@ export class WorkspaceSnapshot {
|
|
|
130
171
|
mkdirSync(join(path, '..'), { recursive: true });
|
|
131
172
|
}
|
|
132
173
|
catch { /* best-effort */ }
|
|
133
|
-
|
|
174
|
+
// `--all` already includes refs/tags; adding `--tags` lists every tag TWICE and `git clone` refuses the bundle ("multiple updates for ref
|
|
175
|
+
// refs/tags/attempt1 not allowed") — every t4j2/t4jf sibling restore failed on it (2026-10-12).
|
|
176
|
+
return this.ok(this.git(['bundle', 'create', path, '--all'], this.commitTimeoutMs), `bundle (${path})`);
|
|
134
177
|
}
|
|
135
178
|
/** `git diff --stat <a> <b>` between two tags (R246 judge selector evidence); '' on failure. */
|
|
136
179
|
diffStat(a, b, maxChars = 4000) {
|