@nexus-cortex/core 4.124.71 → 4.124.72
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/dist/config/SettingsSchema.js +1 -1
- package/dist/config/SettingsSchema.js.map +1 -1
- package/dist/config/effectiveConfig.js +1 -1
- package/dist/config/effectiveConfig.js.map +1 -1
- package/dist/middleware/HelperModelMiddleware.d.ts +11 -0
- package/dist/middleware/HelperModelMiddleware.d.ts.map +1 -1
- package/dist/middleware/HelperModelMiddleware.js +18 -0
- package/dist/middleware/HelperModelMiddleware.js.map +1 -1
- package/dist/orchestrator/CortexOrchestrator.d.ts +4 -0
- package/dist/orchestrator/CortexOrchestrator.d.ts.map +1 -1
- package/dist/orchestrator/CortexOrchestrator.js +10 -1
- package/dist/orchestrator/CortexOrchestrator.js.map +1 -1
- package/dist/orchestrator/attemptController.d.ts +11 -2
- package/dist/orchestrator/attemptController.d.ts.map +1 -1
- package/dist/orchestrator/attemptController.js +52 -3
- package/dist/orchestrator/attemptController.js.map +1 -1
- package/dist/training/attemptJudge.d.ts +57 -0
- package/dist/training/attemptJudge.d.ts.map +1 -0
- package/dist/training/attemptJudge.js +86 -0
- package/dist/training/attemptJudge.js.map +1 -0
- package/package.json +3 -3
|
@@ -28,7 +28,7 @@ export interface SecondAttemptConfig {
|
|
|
28
28
|
/** CORTEX_SECOND_ATTEMPT_SELECT — `verdict` (default; the adapter's order: verdict rank → fewest turns → judge checks → earliest) or
|
|
29
29
|
* `evidence` (R246: shipped check → ACCEPTED-class first (any accept beats veto/none) → fewest turns → verdict rank → checks → earliest —
|
|
30
30
|
* demotes the accept-vs-gap distinction, which cells 3+4 showed to be judge noise: last-verdict accuracy 0.31–0.77). */
|
|
31
|
-
select: 'verdict' | 'evidence';
|
|
31
|
+
select: 'verdict' | 'evidence' | 'judge';
|
|
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;
|
|
@@ -41,6 +41,8 @@ export interface LastResolverDecision {
|
|
|
41
41
|
namedPassed?: number;
|
|
42
42
|
checkPassed?: boolean | null;
|
|
43
43
|
remainingFrac?: number | null;
|
|
44
|
+
/** R251: the resolver's GAP notes / fix plan ('' when MEETS) — read by the attempt judge */
|
|
45
|
+
plan?: string;
|
|
44
46
|
error?: string;
|
|
45
47
|
ts: number;
|
|
46
48
|
}
|
|
@@ -102,7 +104,12 @@ export interface AttemptRecord {
|
|
|
102
104
|
}
|
|
103
105
|
export interface AttemptSelection {
|
|
104
106
|
/** R246: which selection order produced the pick */
|
|
105
|
-
selectMode?: 'verdict' | 'evidence';
|
|
107
|
+
selectMode?: 'verdict' | 'evidence' | 'judge';
|
|
108
|
+
/** 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 */
|
|
109
|
+
judgeRanking?: number[];
|
|
110
|
+
judgeReason?: string;
|
|
111
|
+
judgeParsed?: boolean;
|
|
112
|
+
evidencePick?: number;
|
|
106
113
|
pick: number;
|
|
107
114
|
why: string;
|
|
108
115
|
attempts: AttemptRecord[];
|
|
@@ -153,6 +160,8 @@ export interface RunWithAttemptsOptions {
|
|
|
153
160
|
projectPath: string;
|
|
154
161
|
/** builds a FRESH orchestrator for attempt k ≥ 2 (createOrchestrator + createSession); the runner calls cleanup() on it */
|
|
155
162
|
createAttemptOrchestrator: (k: number, spec: AttemptOrchestratorSpec) => Promise<CortexOrchestrator>;
|
|
163
|
+
/** R251: the comparative judge call (default: the caller orchestrator's helper middleware); tests inject a scripted one */
|
|
164
|
+
compareAttempts?: (body: string, nAttempts: number) => Promise<string | null>;
|
|
156
165
|
env?: NodeJS.ProcessEnv;
|
|
157
166
|
/** task-start epoch (ms); default = now at entry */
|
|
158
167
|
t0Ms?: number;
|
|
@@ -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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"}
|
|
@@ -21,6 +21,7 @@ import { spawnSync } from 'child_process';
|
|
|
21
21
|
import { resolveTurnDeadlineMs } from './timeBudget.js';
|
|
22
22
|
import { resolveCortexStateDir } from '../utils/stateDir.js';
|
|
23
23
|
import { WorkspaceSnapshot } from '../utils/workspaceSnapshot.js';
|
|
24
|
+
import { buildAttemptJudgePrompt, parseAttemptJudgeRanking, applyJudgeRanking } from '../training/attemptJudge.js'; // R251
|
|
24
25
|
import { sumSessionUsage } from '../training/usageAccounting.js';
|
|
25
26
|
// ---------------------------------------------------------------------------------------------------------------------------------
|
|
26
27
|
// Levers
|
|
@@ -48,7 +49,7 @@ export function resolveSecondAttemptConfig(env = process.env) {
|
|
|
48
49
|
floorMs: Math.max(0, intOr(env.CORTEX_SECOND_ATTEMPT_FLOOR_MS || 900_000, 900_000)),
|
|
49
50
|
outDir: String(env.CORTEX_SECOND_ATTEMPT_OUT_DIR ?? '').trim() || null,
|
|
50
51
|
checkTimeoutMs: 300_000,
|
|
51
|
-
select: /^evidence$/i.test(String(env.CORTEX_SECOND_ATTEMPT_SELECT ?? '').trim()) ? 'evidence' : 'verdict',
|
|
52
|
+
select: /^judge$/i.test(String(env.CORTEX_SECOND_ATTEMPT_SELECT ?? '').trim()) ? 'judge' : /^evidence$/i.test(String(env.CORTEX_SECOND_ATTEMPT_SELECT ?? '').trim()) ? 'evidence' : 'verdict',
|
|
52
53
|
untilBudget: /^(1|true|on)$/i.test(String(env.CORTEX_SECOND_ATTEMPT_UNTIL_BUDGET ?? '').trim()),
|
|
53
54
|
};
|
|
54
55
|
}
|
|
@@ -298,6 +299,16 @@ export async function runWithAttempts(opts) {
|
|
|
298
299
|
const records = [];
|
|
299
300
|
const tagged = new Set();
|
|
300
301
|
const extraOrchs = [];
|
|
302
|
+
const judgeInputs = new Map(); // R251
|
|
303
|
+
const liftPlanOf = (o) => { try {
|
|
304
|
+
return String(o.getLiftPlanText?.() ?? '');
|
|
305
|
+
}
|
|
306
|
+
catch {
|
|
307
|
+
return '';
|
|
308
|
+
} };
|
|
309
|
+
const finalTextOf = (r) => { const c = r?.content; if (typeof c === 'string')
|
|
310
|
+
return c; if (Array.isArray(c))
|
|
311
|
+
return c.map((b) => (b && typeof b === 'object' && typeof b.text === 'string' ? b.text : '')).filter(Boolean).join('\n'); return ''; };
|
|
301
312
|
let k = 1;
|
|
302
313
|
let lastOrch = opts.orchestrator;
|
|
303
314
|
try {
|
|
@@ -306,6 +317,7 @@ export async function runWithAttempts(opts) {
|
|
|
306
317
|
const v = verdictOf(lastOrch);
|
|
307
318
|
const resp = responses[k - 1] ?? null;
|
|
308
319
|
const paths = bank(lastOrch, k, resp);
|
|
320
|
+
judgeInputs.set(k, { liftPlan: liftPlanOf(lastOrch), gapNotes: v?.plan ?? '', confidence: v?.confidence, finalText: finalTextOf(resp) }); // R251
|
|
309
321
|
const d = decideNextAttempt({ k, action: v?.action ?? null, eventRemainingFrac: v?.remainingFrac ?? null, namedPassed: v?.namedPassed ?? 0, checkPassed: v?.checkPassed ?? null, t0Ms: t0, deadlineMs: dl0, nowMs: now(), cfg });
|
|
310
322
|
writeJson(join(attemptsDir, `a${k}.json`), d);
|
|
311
323
|
log(`[AttemptController] R194 attempt-${k} verdict: ${JSON.stringify(d)}`);
|
|
@@ -379,7 +391,44 @@ export async function runWithAttempts(opts) {
|
|
|
379
391
|
}
|
|
380
392
|
}
|
|
381
393
|
// 5. select, restore, merge
|
|
382
|
-
const sel = selectAttempt(records.sort((a, b) => a.k - b.k), chk, cfg.select);
|
|
394
|
+
const sel = selectAttempt(records.sort((a, b) => a.k - b.k), chk, cfg.select === 'judge' ? 'evidence' : cfg.select);
|
|
395
|
+
// R251 (CORTEX_SECOND_ATTEMPT_SELECT=judge): one comparative judge call over every finished attempt — plan, verdict + open items,
|
|
396
|
+
// shipped-check output, files changed vs lift, final message, turns — ranks them; the shipped-check gate stays hard; a blank or
|
|
397
|
+
// unparseable reply keeps the evidence-order pick. Packets + reply are banked beside the selection record for curation.
|
|
398
|
+
if (cfg.select === 'judge' && records.filter((r) => r.finished).length >= 2) {
|
|
399
|
+
try {
|
|
400
|
+
const packets = records.filter((r) => r.finished).map((r) => {
|
|
401
|
+
const ji = judgeInputs.get(r.k);
|
|
402
|
+
let checkOutput = '';
|
|
403
|
+
try {
|
|
404
|
+
checkOutput = readFileSync(join(attemptsDir, `chk${r.k}.txt`), 'utf-8');
|
|
405
|
+
}
|
|
406
|
+
catch { /* none */ }
|
|
407
|
+
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
|
+
});
|
|
409
|
+
const task = typeof opts.turnContent === 'string' ? opts.turnContent : finalTextOf({ content: opts.turnContent });
|
|
410
|
+
const body = buildAttemptJudgePrompt(task, packets);
|
|
411
|
+
const call = opts.compareAttempts ?? ((b, n) => opts.orchestrator.compareAttempts?.(b, n) ?? Promise.resolve(null));
|
|
412
|
+
const tj = Date.now();
|
|
413
|
+
const reply = await call(body, packets.length);
|
|
414
|
+
const parsed = parseAttemptJudgeRanking(reply ?? '', packets.map((p) => p.k));
|
|
415
|
+
const evidencePick = sel.pick;
|
|
416
|
+
const applied = applyJudgeRanking({ candidates: packets.map((p) => ({ k: p.k, check: p.check })), ranking: parsed.parsed ? parsed.ranking : [], fallbackPick: evidencePick });
|
|
417
|
+
sel.selectMode = 'judge';
|
|
418
|
+
sel.evidencePick = evidencePick;
|
|
419
|
+
sel.judgeRanking = parsed.ranking;
|
|
420
|
+
sel.judgeReason = parsed.reason;
|
|
421
|
+
sel.judgeParsed = parsed.parsed;
|
|
422
|
+
sel.pick = applied.pick;
|
|
423
|
+
sel.why = parsed.parsed ? applied.why : `judge reply ${reply ? 'unparseable' : 'blank'}; evidence order: ${sel.why}`;
|
|
424
|
+
writeJson(join(artifactsDir, 'judge-packets.json'), { packets, reply: reply ?? null, ranking: parsed.ranking, reason: parsed.reason, parsed: parsed.parsed, evidencePick, pick: sel.pick, latencyMs: Date.now() - tj });
|
|
425
|
+
log(`[AttemptController] R251 judge selector: ranking ${parsed.ranking.join('>')} parsed=${parsed.parsed} pick ${sel.pick} (evidence pick ${evidencePick}) in ${Date.now() - tj} ms`);
|
|
426
|
+
await event({ phase: 'judge', ranking: parsed.ranking, parsed: parsed.parsed, reason: parsed.reason, pick: sel.pick, evidencePick, latencyMs: Date.now() - tj, replyChars: (reply ?? '').length });
|
|
427
|
+
}
|
|
428
|
+
catch (e) {
|
|
429
|
+
log(`[AttemptController] R251 judge selector failed: ${String(e?.message ?? e).slice(0, 200)} — evidence order kept`);
|
|
430
|
+
}
|
|
431
|
+
}
|
|
383
432
|
if (!snap.restore(`attempt${sel.pick}`)) {
|
|
384
433
|
log(`[AttemptController] R194 restore of attempt ${sel.pick} FAILED — restoring attempt 1`);
|
|
385
434
|
snap.restore('attempt1');
|
|
@@ -405,7 +454,7 @@ export async function runWithAttempts(opts) {
|
|
|
405
454
|
}
|
|
406
455
|
}
|
|
407
456
|
log(`[AttemptController] R194 selection: ${JSON.stringify(sel).slice(0, 600)}`);
|
|
408
|
-
await event({ phase: 'selection', pick: sel.pick, why: sel.why, 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 })) });
|
|
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 })) });
|
|
409
458
|
const merged = mergeAttemptResponses(responses, sel);
|
|
410
459
|
writeJson(join(artifactsDir, 'response.json'), merged ?? r1);
|
|
411
460
|
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":"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"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* attemptJudge — the COMPARATIVE selector for a second-attempt chain (R251, CORTEX_SECOND_ATTEMPT_SELECT=judge, 2026-10-11).
|
|
3
|
+
*
|
|
4
|
+
* Today's EndTurn resolver rules on each attempt's finish IN ISOLATION, and selection compares only labels (verdict class),
|
|
5
|
+
* turn counts and the shipped check. This module gives the judge every finished attempt at once — lift plan, resolver verdict +
|
|
6
|
+
* gap notes, files changed since the task start, shipped-check output, the final response, turns — and asks for ONE ranking by
|
|
7
|
+
* the likelihood that the HIDDEN grader accepts the tree as left on disk. The TASK's requirements decide, never plan quality:
|
|
8
|
+
* a better plan with a weaker artifact loses. Pure builders/parsers here; the model call lives in HelperModelMiddleware.compareAttempts.
|
|
9
|
+
*
|
|
10
|
+
* Output contract: line 1 `RANKING: k, k, k` (every attempt, best first), line 2 `REASON: <one line>`. A blank/unparseable reply
|
|
11
|
+
* falls back to the evidence order (never a hidden pick change). The shipped-check gate stays HARD: when some attempts pass the
|
|
12
|
+
* workspace's own check and others do not, only the passing ones are eligible regardless of the ranking.
|
|
13
|
+
*/
|
|
14
|
+
export interface AttemptPacket {
|
|
15
|
+
k: number;
|
|
16
|
+
/** the planner's PLAN OF ATTACK for this attempt ('' when none) */
|
|
17
|
+
liftPlan: string;
|
|
18
|
+
/** the resolver's last action on this attempt (accept | accept-with-gap | accept-low-confidence | veto | … | null = no verdict) */
|
|
19
|
+
action: string | null;
|
|
20
|
+
confidence?: string;
|
|
21
|
+
namedPassed?: number;
|
|
22
|
+
/** the resolver's GAP notes / fix plan ('' when MEETS or none) */
|
|
23
|
+
gapNotes: string;
|
|
24
|
+
check: 'pass' | 'fail' | 'skipped' | 'none';
|
|
25
|
+
checkOutput: string;
|
|
26
|
+
/** `git diff --stat` lift..attempt<k> ('' when unavailable) */
|
|
27
|
+
diffStat: string;
|
|
28
|
+
/** the attempt's final assistant text */
|
|
29
|
+
finalText: string;
|
|
30
|
+
turns: number | null;
|
|
31
|
+
}
|
|
32
|
+
export declare const ATTEMPT_JUDGE_SYSTEM: string;
|
|
33
|
+
export declare function buildAttemptJudgePrompt(task: string, packets: AttemptPacket[]): string;
|
|
34
|
+
export interface AttemptJudgeRanking {
|
|
35
|
+
/** best first; every k in `ks` exactly once (unranked attempts appended in the order given) */
|
|
36
|
+
ranking: number[];
|
|
37
|
+
reason: string;
|
|
38
|
+
/** a RANKING line naming at least one known attempt was found */
|
|
39
|
+
parsed: boolean;
|
|
40
|
+
}
|
|
41
|
+
export declare function parseAttemptJudgeRanking(text: string, ks: number[]): AttemptJudgeRanking;
|
|
42
|
+
export interface JudgePickInput {
|
|
43
|
+
/** finished attempts only, with their shipped-check result */
|
|
44
|
+
candidates: Array<{
|
|
45
|
+
k: number;
|
|
46
|
+
check: 'pass' | 'fail' | 'skipped' | 'none';
|
|
47
|
+
}>;
|
|
48
|
+
ranking: number[];
|
|
49
|
+
/** the evidence-order pick, used when the ranking names no eligible attempt */
|
|
50
|
+
fallbackPick: number;
|
|
51
|
+
}
|
|
52
|
+
/** The shipped-check gate stays hard; within the eligible set the judge's order decides. Pure. */
|
|
53
|
+
export declare function applyJudgeRanking(i: JudgePickInput): {
|
|
54
|
+
pick: number;
|
|
55
|
+
why: string;
|
|
56
|
+
};
|
|
57
|
+
//# sourceMappingURL=attemptJudge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attemptJudge.d.ts","sourceRoot":"","sources":["../../src/training/attemptJudge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;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,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,QAWuD,CAAC;AAEzF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAgBtF;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"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* attemptJudge — the COMPARATIVE selector for a second-attempt chain (R251, CORTEX_SECOND_ATTEMPT_SELECT=judge, 2026-10-11).
|
|
3
|
+
*
|
|
4
|
+
* Today's EndTurn resolver rules on each attempt's finish IN ISOLATION, and selection compares only labels (verdict class),
|
|
5
|
+
* turn counts and the shipped check. This module gives the judge every finished attempt at once — lift plan, resolver verdict +
|
|
6
|
+
* gap notes, files changed since the task start, shipped-check output, the final response, turns — and asks for ONE ranking by
|
|
7
|
+
* the likelihood that the HIDDEN grader accepts the tree as left on disk. The TASK's requirements decide, never plan quality:
|
|
8
|
+
* a better plan with a weaker artifact loses. Pure builders/parsers here; the model call lives in HelperModelMiddleware.compareAttempts.
|
|
9
|
+
*
|
|
10
|
+
* Output contract: line 1 `RANKING: k, k, k` (every attempt, best first), line 2 `REASON: <one line>`. A blank/unparseable reply
|
|
11
|
+
* falls back to the evidence order (never a hidden pick change). The shipped-check gate stays HARD: when some attempts pass the
|
|
12
|
+
* workspace's own check and others do not, only the passing ones are eligible regardless of the ranking.
|
|
13
|
+
*/
|
|
14
|
+
const CAPS = { task: 6000, plan: 2500, gap: 2000, check: 2500, diff: 2500, final: 3000 };
|
|
15
|
+
function clip(s, max, what) {
|
|
16
|
+
const t = (s || '').trim();
|
|
17
|
+
if (t.length <= max)
|
|
18
|
+
return t;
|
|
19
|
+
const head = Math.floor(max * 0.7);
|
|
20
|
+
const tail = max - head;
|
|
21
|
+
return `${t.slice(0, head)}\n… [${t.length - max} chars of ${what} elided] …\n${t.slice(-tail)}`;
|
|
22
|
+
}
|
|
23
|
+
export const ATTEMPT_JUDGE_SYSTEM = 'You are a senior engineer choosing which of several INDEPENDENT attempts at the SAME task to submit to a hidden grader. ' +
|
|
24
|
+
'Each attempt started from the same workspace; you see, per attempt, its plan of attack, the final adjudication it received ' +
|
|
25
|
+
'(verdict, confidence, open items), the workspace\'s own check result, the files it changed, its final message and how many ' +
|
|
26
|
+
'tool-call turns it took. Exactly ONE attempt\'s tree will be graded.\n' +
|
|
27
|
+
'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: a shipped check result > concrete changed files and verifiable claims in the final ' +
|
|
29
|
+
'message > the resolver\'s verdict and confidence > the plan. Be adversarial: hunt for the exact constraint a nearly-done attempt ' +
|
|
30
|
+
'misses (wrong artifact, path/format mismatch, numeric threshold, unhandled edge case, "passed my own test but not the task\'s"). ' +
|
|
31
|
+
'Fewer turns is NOT evidence of correctness on its own.\n' +
|
|
32
|
+
'FORMAT — your FIRST line MUST be exactly `RANKING: k, k, …` listing EVERY attempt number, best first. ' +
|
|
33
|
+
'Second line MUST be `REASON: <one line naming the deciding evidence>`. Nothing else.';
|
|
34
|
+
export function buildAttemptJudgePrompt(task, packets) {
|
|
35
|
+
const parts = [`TASK:\n${clip(task, CAPS.task, 'the task text')}`];
|
|
36
|
+
for (const p of [...packets].sort((a, b) => a.k - b.k)) {
|
|
37
|
+
const lines = [`=== ATTEMPT ${p.k} ===`];
|
|
38
|
+
lines.push(`TOOL-CALL TURNS: ${p.turns ?? 'unknown'}`);
|
|
39
|
+
lines.push(`RESOLVER VERDICT: ${p.action ?? 'none (no finish adjudicated)'}` + (p.confidence ? ` | confidence ${p.confidence}` : '') + (typeof p.namedPassed === 'number' ? ` | judge checks passed ${p.namedPassed}` : ''));
|
|
40
|
+
if (p.gapNotes.trim())
|
|
41
|
+
lines.push(`RESOLVER OPEN ITEMS (its fix plan — grade whether they are real):\n${clip(p.gapNotes, CAPS.gap, 'the open items')}`);
|
|
42
|
+
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')}` : ''));
|
|
43
|
+
if (p.diffStat.trim())
|
|
44
|
+
lines.push(`FILES CHANGED vs the task start (git diff --stat):\n${clip(p.diffStat, CAPS.diff, 'the diff stat')}`);
|
|
45
|
+
else
|
|
46
|
+
lines.push('FILES CHANGED vs the task start: none recorded');
|
|
47
|
+
if (p.liftPlan.trim())
|
|
48
|
+
lines.push(`PLAN OF ATTACK (advisory; the TASK wins where they disagree):\n${clip(p.liftPlan, CAPS.plan, 'the plan')}`);
|
|
49
|
+
lines.push(`FINAL MESSAGE:\n${clip(p.finalText || '(empty)', CAPS.final, 'the final message')}`);
|
|
50
|
+
parts.push(lines.join('\n'));
|
|
51
|
+
}
|
|
52
|
+
parts.push(`Rank attempts ${packets.map((p) => p.k).sort((a, b) => a - b).join(', ')} by the likelihood that the hidden grader accepts the tree as left on disk. First line \`RANKING: …\` (every attempt, best first), second line \`REASON: …\`.`);
|
|
53
|
+
return parts.join('\n\n');
|
|
54
|
+
}
|
|
55
|
+
export function parseAttemptJudgeRanking(text, ks) {
|
|
56
|
+
const t = (text || '').trim();
|
|
57
|
+
const m = t.match(/RANKING:\s*([0-9][0-9,\s>→\-]*)/i);
|
|
58
|
+
const known = new Set(ks);
|
|
59
|
+
const out = [];
|
|
60
|
+
if (m)
|
|
61
|
+
for (const tok of m[1].split(/[^0-9]+/)) {
|
|
62
|
+
const n = parseInt(tok, 10);
|
|
63
|
+
if (Number.isFinite(n) && known.has(n) && !out.includes(n))
|
|
64
|
+
out.push(n);
|
|
65
|
+
}
|
|
66
|
+
const parsed = out.length > 0;
|
|
67
|
+
for (const k of ks)
|
|
68
|
+
if (!out.includes(k))
|
|
69
|
+
out.push(k);
|
|
70
|
+
const r = t.match(/REASON:\s*(.+)/i);
|
|
71
|
+
return { ranking: out, reason: (r ? r[1] : '').trim().slice(0, 400), parsed };
|
|
72
|
+
}
|
|
73
|
+
/** The shipped-check gate stays hard; within the eligible set the judge's order decides. Pure. */
|
|
74
|
+
export function applyJudgeRanking(i) {
|
|
75
|
+
let elig = i.candidates;
|
|
76
|
+
const passing = elig.filter((c) => c.check === 'pass');
|
|
77
|
+
const gated = passing.length > 0 && passing.length < elig.length;
|
|
78
|
+
if (gated)
|
|
79
|
+
elig = passing;
|
|
80
|
+
const set = new Set(elig.map((c) => c.k));
|
|
81
|
+
const first = i.ranking.find((k) => set.has(k));
|
|
82
|
+
if (first === undefined)
|
|
83
|
+
return { pick: i.fallbackPick, why: 'judge ranking named no eligible attempt; evidence order' };
|
|
84
|
+
return { pick: first, why: (gated ? `shipped check passes only on attempt ${passing.map((c) => c.k).join(',')}; ` : '') + `judge ranking ${i.ranking.join(' > ')} (attempt ${first})` };
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=attemptJudge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attemptJudge.js","sourceRoot":"","sources":["../../src/training/attemptJudge.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nexus-cortex/core",
|
|
3
|
-
"version": "4.124.
|
|
3
|
+
"version": "4.124.72",
|
|
4
4
|
"description": "Core orchestration library implementing Claude CLI architecture patterns",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
"@google/generative-ai": "^0.2.1",
|
|
48
48
|
"@gradio/client": "^2.3.1",
|
|
49
49
|
"@modelcontextprotocol/sdk": "^1.20.2",
|
|
50
|
-
"@nexus-cortex/executors": "4.124.
|
|
51
|
-
"@nexus-cortex/types": "4.124.
|
|
50
|
+
"@nexus-cortex/executors": "4.124.72",
|
|
51
|
+
"@nexus-cortex/types": "4.124.72",
|
|
52
52
|
"@types/uuid": "^10.0.0",
|
|
53
53
|
"ajv": "^8.12.0",
|
|
54
54
|
"chokidar": "^3.6.0",
|