pi-ext
bugabingas pi extensions
owned by bugabinga
refactor(ultra): split complete runner path
66a87ef7d12bdfe7c5b4e1eb92c21753ad1d0c45
Oliver Jan Krylow <oliver@bugabinga.net> ·
unsigned
Browse filesCompare with HEAD
Changed files (2)
extensions/ultra/__tests__/runner.test.ts
Modified253 253 expect(seen[
2].
length).
toBeGreaterThan(seen[
1].
length);
256 + it(
"returns a later valid retry result after corrective feedback",
async ()
=> {
257 + const seen
: CompleteMessage[][]
= [];
258 + const completeFn
= vi.
fn(
259 + async (req
: CompleteRequest)
: Promise<
CompleteResponse>
=> {
260 + seen.
push(req.messages.
map((m)
=> ({
...m })));
261 + return seen.
length === 1 262 + ? { text:
'{ "wrong": 1 }' }
263 + : { text:
'{ "verdict": "ok" }' };
266 + const drivers
= makeDrivers({ completeFn });
268 + const result
= await runStep(
272 + baseOpts({ maxRetries:
2 }),
275 + expect(result).
toEqual({ ok:
true, value: { verdict:
"ok" } });
276 + expect(completeFn).
toHaveBeenCalledTimes(
2);
277 + expect(seen[
1].
at(
-1)?.
content).
toContain(
"schema validation failed");
256 280 it(
"drops before calling completeFn when auth is unavailable",
async ()
=> {
257 281 const completeFn
= vi.
fn(
258 282 async ()
: Promise<
CompleteResponse>
=> ({ text:
"{}" }),
extensions/ultra/runner.ts
Modified349 349 validator: CompiledValidator
| undefined,
350 350 timeoutMs: number,
351 351 ):
Promise<RunStepResult
> {
352 - const { agentId, phase, onProgress }
= opts;
353 - onProgress?.({ agentId, phase, kind:
"start", controls: NOOP_CONTROLS });
355 - const finish = (result
: RunStepResult)
: RunStepResult => {
363 - status: result.ok
? "done" : "dropped",
364 - text: result.ok
? undefined : result.reason,
365 - controls: NOOP_CONTROLS,
352 + emitCompleteStart(opts);
370 354 const model
= drivers.
resolveModel(step.model);
371 355 const auth
= await drivers.
resolveAuth(model);
357 + return finishComplete(opts, {
383 360 reason: auth.error
?? "model auth unavailable",
387 - const systemPrompt
= [
389 - "Respond with ONLY a single JSON object — no prose, no markdown code fences.",
394 364 const messages: CompleteMessage[]
= [{ role:
"user", content: step.
prompt }];
395 365 let lastReason
= "schema validation failed";
397 367 for (let attempt
= 0; attempt
<= opts.maxRetries; attempt
++) {
398 - const guarded
= await raceGuards(
400 - drivers.
completeFn({
404 - apiKey: auth.apiKey,
405 - headers: auth.
headers,
368 + const attemptResult
= await completeAttempt({
374 + systemPrompt:
completeSystemPrompt(opts.systemPrompt),
411 - if (guarded.outcome
=== "timeout")
412 - return finish({ ok:
false, value:
null, reason:
"timeout" });
413 - if (guarded.outcome
=== "aborted")
414 - return finish({ ok:
false, value:
null, reason:
"aborted" });
376 + signal: opts.signal,
416 - const response
= guarded.
value;
417 - const text
= response?.
text ?? "";
379 + if (attemptResult.done)
380 + return
finishComplete(opts, attemptResult.result);
423 - if (
!response
|| guarded.error
!== undefined) {
425 - guarded.error
instanceof Error 426 - ? `completion failed: ${guarded.error.message}` 427 - : "completion failed (no response)";
428 - }
else if (response.errorMessage) {
429 - lastReason
= `model error: ${response.errorMessage}`;
431 - const parsed
= parseJsonObject(text);
433 - lastReason
= parsed.reason;
434 - }
else if (validator
&& !validator.
Check(parsed.
value)) {
435 - lastReason
= `schema validation failed: ${formatValidatorErrors(validator, parsed.value)}`;
437 - return finish({ ok:
true, value: parsed.
value });
441 - if (attempt
< opts.maxRetries) {
442 - messages.
push({ role:
"assistant", content: text });
445 - content:
`Your previous response was invalid (${lastReason}). Respond again with ONLY a valid JSON object matching the required schema.`,
382 + lastReason
= attemptResult.reason;
383 + if (attempt < opts.maxRetries)
384 + appendCorrection(messages, attemptResult.text, lastReason);
450 - return finish({ ok:
false, value:
null, reason: lastReason });
387 + return
finishComplete(opts, { ok:
false, value:
null, reason: lastReason });
390 +function emitCompleteStart(opts
: RunStepOptions)
: void {
391 + opts.
onProgress?.({
392 + agentId: opts.agentId,
395 + controls: NOOP_CONTROLS,
399 +function finishComplete(
400 + opts
: RunStepOptions,
401 + result
: RunStepResult,
404 + opts.
onProgress?.({
405 + agentId: opts.agentId,
408 + status: result.ok
? "done" : "dropped",
409 + text: result.ok
? undefined : result.reason,
410 + controls: NOOP_CONTROLS,
415 +function completeSystemPrompt(extra
: string | undefined)
: string {
418 + "Respond with ONLY a single JSON object — no prose, no markdown code fences.",
424 +type CompleteAttempt = 425 + | { done
: true; result
: RunStepResult }
426 + | { done
: false; reason
: string; text
: string };
428 +interface CompleteAttemptInput {
429 + drivers
: StepDrivers;
431 + auth
: ResolvedAuth;
432 + messages
: CompleteMessage[];
433 + validator
: CompiledValidator | undefined;
434 + systemPrompt
: string;
436 + signal
?: AbortSignal;
439 +async function completeAttempt(
440 + input
: CompleteAttemptInput,
441 +)
: Promise<
CompleteAttempt> {
442 + const guarded
= await raceGuards(
444 + input.drivers.
completeFn({
445 + model: input.model,
446 + systemPrompt: input.systemPrompt,
447 + messages: input.messages,
448 + apiKey: input.auth.apiKey,
449 + headers: input.auth.
headers,
456 + if (guarded.outcome
=== "timeout")
457 + return { done:
true, result: { ok:
false, value:
null, reason:
"timeout" } };
458 + if (guarded.outcome
=== "aborted")
459 + return { done:
true, result: { ok:
false, value:
null, reason:
"aborted" } };
461 + return evaluateCompletion(guarded, input.validator);
464 +function evaluateCompletion(
465 + guarded
: Extract<
GuardOutcome<
CompleteResponse>, { outcome
: "done" }>,
466 + validator
: CompiledValidator | undefined,
467 +)
: CompleteAttempt {
468 + const response
= guarded.
value;
469 + const text
= response?.
text ?? "";
470 + const transportFailure
= completionFailureReason(response, guarded.error);
471 + if (transportFailure)
return { done:
false, reason: transportFailure, text };
472 + return evaluateJson(text, validator);
475 +function completionFailureReason(
476 + response
: CompleteResponse | undefined,
478 +)
: string | undefined {
479 + if (
!response
|| error
!== undefined) {
480 + return error
instanceof Error 481 + ? `completion failed: ${error.message}` 482 + : "completion failed (no response)";
484 + return response.errorMessage
485 + ? `model error: ${response.errorMessage}` 489 +function evaluateJson(
491 + validator
: CompiledValidator | undefined,
492 +)
: CompleteAttempt {
493 + const parsed
= parseJsonObject(text);
494 + if (
!parsed.ok)
return { done:
false, reason: parsed.reason, text };
495 + if (validator
&& !validator.
Check(parsed.
value)) {
498 + reason:
`schema validation failed: ${formatValidatorErrors(validator, parsed.value)}`,
502 + return { done:
true, result: { ok:
true, value: parsed.
value } };
505 +function appendCorrection(
506 + messages
: CompleteMessage[],
510 + messages.
push({ role:
"assistant", content: badText });
513 + content:
`Your previous response was invalid (${reason}). Respond again with ONLY a valid JSON object matching the required schema.`,