@telora/daemon 0.23.32 → 0.23.47

package/dist/prompt-sections/qa-author-section.d.ts

@@ -7,8 +7,12 @@
  * product's QA target, so the prompt asks for UI-facing cases only, each tied
  * to one acceptance criterion quoted verbatim, with a path relative to the QA
  * target's base URL -- or an explicit no-UI-surface marker. On a re-entry after
- * a QA fail it lists the cases the human failed and REQUIRES a retest case for
- * each one whose criterion still applies. Both rules are checked
+ * a QA fail it lists EVERY case of the previous packet with the result a
+ * person recorded for it (failed, passed, not run) and REQUIRES, for each one
+ * whose criterion still applies, a case that quotes that criterion and names
+ * the previous case with priorCaseId. The author names the case and nothing
+ * more: what the carried case is (a retest, previously passed, needs a run) is
+ * marked from the recorded result. Both rules are checked
  * (qa/qa-author-faithfulness.ts, and the edge on the write); an answer that
  * breaks them is re-asked ONCE with buildQaAuthorCorrection appended -- the
  * same text whatever engine runs it.
@@ -20,7 +24,7 @@
  * (one fenced json block, last in the answer) is parsed by
  * qa/qa-author-output.ts.
  */
-import type { QaPacketCandidate } from '../queries/qa-packets/qa-packets.js';
+import { type QaPacketCandidate } from '../queries/qa-packets/qa-packets.js';
 import { type QaAuthorMode } from '../types/qa-packet.js';
 /** The system prompt every QA-author call runs under (a resumed session may keep its recorded one). */
 export declare const QA_AUTHOR_SYSTEM_PROMPT: string;

package/dist/prompt-sections/qa-author-section.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qa-author-section.d.ts","sourceRoot":"","sources":["../../src/prompt-sections/qa-author-section.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1E,uGAAuG;AACvG,eAAO,MAAM,uBAAuB,QAGU,CAAC;AAE/C,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,8CAA8C,CAAC;AAE7E,qFAAqF;AACrF,MAAM,WAAW,oBAAoB;IACnC,mEAAmE;IACnE,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AA4ID,8DAA8D;AAC9D,eAAO,MAAM,4BAA4B,wCAAwC,CAAC;AAElF;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAS7E;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,iBAAiB,EAC5B,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,MAAM,EACnB,KAAK,GAAE,oBAAoB,GAAG,IAAW,GACxC,MAAM,CAkBR"}
+{"version":3,"file":"qa-author-section.d.ts","sourceRoot":"","sources":["../../src/prompt-sections/qa-author-section.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC9F,OAAO,EAAkC,KAAK,YAAY,EAAqB,MAAM,uBAAuB,CAAC;AAE7G,uGAAuG;AACvG,eAAO,MAAM,uBAAuB,QAGU,CAAC;AAE/C,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,8CAA8C,CAAC;AAE7E,qFAAqF;AACrF,MAAM,WAAW,oBAAoB;IACnC,mEAAmE;IACnE,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;IACnB,yDAAyD;IACzD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAsJD,8DAA8D;AAC9D,eAAO,MAAM,4BAA4B,wCAAwC,CAAC;AAElF;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAU7E;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,iBAAiB,EAC5B,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,MAAM,EACnB,KAAK,GAAE,oBAAoB,GAAG,IAAW,GACxC,MAAM,CAkBR"}

package/dist/prompt-sections/qa-author-section.js

@@ -2,7 +2,34 @@
 // Pinned by: packages/daemon/src/prompt-sections/qa-author-section.test.ts,
 //   packages/daemon/src/qa/qa-author-unfaithful-answer.test.ts
 // PINNED-BY-END
-import { QA_AUTHOR_MODE } from '../types/qa-packet.js';
+/**
+ * The QA-author prompt: what the pass that writes a focus's UI test packet is
+ * told, once its team has finished and the focus waits in its product's QA
+ * queue (qa/qa-author-pass.ts runs it).
+ *
+ * The packet is for a HUMAN who runs it by hand in a browser against the
+ * product's QA target, so the prompt asks for UI-facing cases only, each tied
+ * to one acceptance criterion quoted verbatim, with a path relative to the QA
+ * target's base URL -- or an explicit no-UI-surface marker. On a re-entry after
+ * a QA fail it lists EVERY case of the previous packet with the result a
+ * person recorded for it (failed, passed, not run) and REQUIRES, for each one
+ * whose criterion still applies, a case that quotes that criterion and names
+ * the previous case with priorCaseId. The author names the case and nothing
+ * more: what the carried case is (a retest, previously passed, needs a run) is
+ * marked from the recorded result. Both rules are checked
+ * (qa/qa-author-faithfulness.ts, and the edge on the write); an answer that
+ * breaks them is re-asked ONCE with buildQaAuthorCorrection appended -- the
+ * same text whatever engine runs it.
+ *
+ * ONE text whatever runs it: the prompt takes no engine, so the two modes
+ * differ only in what the model is told it already knows -- resumed (it holds
+ * the coding session that built the focus) or fresh (it is handed the delivery
+ * summaries, the commit log and the size-capped diff). The output contract
+ * (one fenced json block, last in the answer) is parsed by
+ * qa/qa-author-output.ts.
+ */
+import { qaPreviousCases } from '../queries/qa-packets/qa-packets.js';
+import { QA_AUTHOR_MODE, QA_CASE_RESULT } from '../types/qa-packet.js';
 /** The system prompt every QA-author call runs under (a resumed session may keep its recorded one). */
 export const QA_AUTHOR_SYSTEM_PROMPT = 'You write UI test packets: click-level test cases a person runs by hand in a web browser against a ' +
     'QA environment. You never edit files and never run a command that changes anything. You end every ' +
@@ -71,20 +98,29 @@ function criteriaLines(candidate) {
     }
     return lines;
 }
-function retestLines(candidate) {
-    const failed = candidate.previousPacket?.failedCases ?? [];
-    if (failed.length === 0)
+/** The result a person recorded for a previous case, in the words the prompt lists it under. */
+const PRIOR_RESULT_WORDS = {
+    [QA_CASE_RESULT.FAILED]: 'FAILED (re-test it)',
+    [QA_CASE_RESULT.PASSED]: 'passed',
+    [QA_CASE_RESULT.NOT_RUN]: 'not run',
+};
+/** On a re-entry: every case of the previous packet with its recorded result, and the duty to carry each forward. */
+function previousCaseLines(candidate) {
+    const previous = qaPreviousCases(candidate);
+    if (previous.length === 0)
         return [];
     const lines = [
-        '## Re-test: the previous QA cycle FAILED',
-        'A human failed these cases when they ran the previous packet. For each one whose criterion is still among the ' +
-            'criteria above, a case with `"retest": true` and `"retestOf": "<its id>"` that quotes THAT SAME criterion is ' +
-            'REQUIRED -- the packet is refused without it, and a retest quoting another criterion does not count. Drop one ' +
-            'only when its criterion is no longer listed above. While any of them still applies, the no-UI-surface marker is ' +
-            'refused too.',
+        '## Re-entry: the previous QA cycle FAILED -- carry its cases forward',
+        'A person ran the previous packet and recorded a result for each case listed below. For EACH one whose criterion ' +
+            'is still among the criteria above, a case that quotes THAT SAME criterion and names it with ' +
+            '`"priorCaseId": "<its id>"` is REQUIRED -- the packet is refused without it, and a case quoting another ' +
+            'criterion does not count. You do NOT write the result or a retest flag: the packet is marked from the recorded ' +
+            'results (failed -> retest, passed -> previously passed, not run -> needs a run). A case that carries a FAILED ' +
+            'one must exercise what failed. Drop one only when its criterion is no longer listed above. While any of them ' +
+            'still applies, the no-UI-surface marker is refused too.',
     ];
-    for (const c of failed) {
-        lines.push(`- \`${c.id}\` -- criterion: ${JSON.stringify(c.criterion)}; path \`${c.path}\`; ` +
+    for (const c of previous) {
+        lines.push(`- \`${c.id}\` -- ${PRIOR_RESULT_WORDS[c.result]} -- criterion: ${JSON.stringify(c.criterion)}; path \`${c.path}\`; ` +
             `steps: ${JSON.stringify(c.steps)}; expected: ${JSON.stringify(c.expected)}`);
     }
     return lines;
@@ -142,7 +178,7 @@ const OUTPUT_LINES = [
     '```json',
     '{"noUiSurface": true}',
     '```',
-    'Add `"retest": true, "retestOf": "<previous case id>"` only to a case that re-tests a previously failed one.',
+    'Add `"priorCaseId": "<previous case id>"` only to a case that carries a case of the previous QA cycle forward.',
 ];
 /** The heading a corrective attempt's addition opens with. */
 export const QA_AUTHOR_CORRECTION_HEADING = '## YOUR PREVIOUS ANSWER WAS REFUSED';
@@ -158,7 +194,8 @@ export function buildQaAuthorCorrection(violations) {
         ...violations.map((v) => `- ${v}`),
         '',
         'Write the WHOLE packet again, following every rule above: copy each `criterion` exactly from the criteria ' +
-            'listed, and add every required retest case. End with exactly one fenced json block.',
+            'listed, and carry forward every case of the previous QA cycle that still applies, naming it with ' +
+            '`priorCaseId`. End with exactly one fenced json block.',
     ].join('\n') + '\n';
 }
 /**
@@ -179,7 +216,7 @@ export function buildQaAuthorPrompt(candidate, mode, reviewedSha, fresh = null)
         intro,
         targetLines(candidate, reviewedSha),
         criteriaLines(candidate),
-        retestLines(candidate),
+        previousCaseLines(candidate),
         knowledgeLines(candidate, mode, fresh),
         [...RULE_LINES],
         [...OUTPUT_LINES],

package/dist/prompt-sections/qa-author-section.js.map

@@ -1 +1 @@
-{"version":3,"file":"qa-author-section.js","sourceRoot":"","sources":["../../src/prompt-sections/qa-author-section.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"qa-author-section.js","sourceRoot":"","sources":["../../src/prompt-sections/qa-author-section.ts"],"names":[],"mappings":"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"}

package/dist/qa/qa-author-faithfulness.d.ts

@@ -2,8 +2,17 @@
  * Is a QA-author answer FAITHFUL to its focus? Every case quotes one of the
  * criteria the pass was shown (the focus's acceptance criteria, each
  * non-cancelled delivery's, each armed baseline criterion -- normalized, never
- * paraphrased), and on a re-entry after a QA fail every failed case whose
- * criterion still applies is re-tested (retest: true, retestOf: <its id>).
+ * paraphrased), and on a re-entry after a QA fail every case of the previous
+ * packet whose criterion still applies is carried forward: a case names it
+ * with priorCaseId and quotes the criterion it tested.
+ *
+ * What a carried case IS comes from the record, not from the answer:
+ * stampQaPriorResults marks it from the result a person recorded for the case
+ * it carries (failed: a retest, with retest: true and retestOf; passed:
+ * previously passed; not run: needs a run), and removes a mark the model wrote
+ * that the record does not bear out. judgeQaAnswer stamps an answer once and
+ * checks the stamped cases, so the cases the pass writes are the cases that
+ * were judged.
  *
  * The daemon runs this BEFORE it asks for the ready write, so an unfaithful
  * answer can be re-asked (qa-author-runner.ts) instead of only refused. The
@@ -11,27 +20,52 @@
  * src/lib/qa/qa-packet.ts (mirrored to supabase/functions/_shared), which
  * daemon_qa_packet_write applies before a ready or no_ui_surface write. The
  * daemon cannot import src/lib, so this is its own copy; qa-author-
- * faithfulness.test.ts runs the SAME conformance table
+ * faithfulness.test.ts runs the SAME conformance tables
  * (src/lib/qa/__fixtures__/qa-faithfulness-cases.json) the canonical vitest
  * runs, so the two cannot drift.
  */
-import type { QaPacketCandidate } from '../queries/qa-packets/qa-packets.js';
+import { type QaPacketCandidate } from '../queries/qa-packets/qa-packets.js';
+import { type QaCaseResult } from '../types/qa-packet.js';
 /** What the rule reads of one case. */
 export interface QaFaithfulnessCase {
     id: string;
     criterion: string;
     retest?: boolean;
     retestOf?: string;
+    priorCaseId?: string;
+}
+/** A case of the previous QA cycle with the result a person recorded for it. */
+export interface QaPreviousCase {
+    id: string;
+    criterion: string;
+    result: QaCaseResult;
+}
+/**
+ * The fields stamping reads and rewrites on a case. Loosely typed: the cases
+ * of a model's answer are still untyped JSON; every other field of the case is
+ * carried through untouched.
+ */
+export interface QaStampableCase {
+    priorCaseId?: unknown;
+    priorResult?: unknown;
+    retest?: unknown;
+    retestOf?: unknown;
 }
 /** What the rule reads of a packet and its focus. */
 export interface QaPacketFaithfulnessInput {
-    /** The packet's cases ([] for a no-UI-surface packet). */
+    /** The packet's cases as they will be written -- after stampQaPriorResults ([] for a no-UI-surface packet). */
     cases: readonly QaFaithfulnessCase[];
     noUiSurface: boolean;
     /** The quotable criteria (qaCriteriaFromTexts); normalized again here. */
     criteria: readonly string[];
-    /** The cases a human failed in the previous QA cycle ([] when it did not fail). */
-    previousFailedCases: ReadonlyArray<Pick<QaFaithfulnessCase, 'id' | 'criterion'>>;
+    /** The previous QA cycle's cases, each with the result a person recorded ([] when that cycle did not fail). */
+    previousCases: readonly QaPreviousCase[];
+    /**
+     * True when the writer was told to carry EVERY previous case forward; false
+     * holds it to the failed cases only (the edge reads a write that does not
+     * say so that way).
+     */
+    carriesPriorResults: boolean;
 }
 /**
  * The one normalization both sides of a criterion comparison get. Pure and
@@ -44,21 +78,59 @@ export declare function normalizeQaCriterion(text: string): string;
 export declare function qaCriteriaFromTexts(texts: ReadonlyArray<string | null | undefined>): string[];
 /** The criterion strings of an armed_baseline_criteria array; anything else yields none. Pure. */
 export declare function qaArmedBaselineCriterionTexts(value: unknown): string[];
+/**
+ * Mark each case that carries a previous case forward, from the result a
+ * person RECORDED for that case -- never from what the writer claimed. Pure:
+ * returns new objects and leaves its input untouched.
+ *
+ * A case names the previous case it carries with priorCaseId (or with retestOf
+ * alone). It names a previous case: priorCaseId and priorResult are set from
+ * the record; a recorded failure also sets retest: true and retestOf, and any
+ * other result REMOVES both. It names none: a priorResult the writer supplied
+ * is removed and the case is otherwise left alone. It names a case the
+ * previous cycle did not have: priorResult is removed and the rest stays as
+ * written, for checkQaPacketFaithful to report.
+ */
+export declare function stampQaPriorResults<C extends QaStampableCase>(cases: readonly C[], previousCases: readonly QaPreviousCase[]): C[];
 /**
  * Is the packet faithful? Pure. One human-readable line per violation; [] is
  * faithful. Rules: (1) every criterion is one of `criteria`; (2) every
- * previously failed case whose criterion still applies is re-tested by a case
- * quoting that same criterion; (3) a retest case carries both flag and
+ * previously FAILED case whose criterion still applies is re-tested by a case
+ * (retest: true, retestOf: its id) quoting that same criterion, whatever
+ * `carriesPriorResults` says; (3) a retest case carries both flag and
  * retestOf, naming a failed case, and quotes the criterion that case tested;
- * (4) no UI surface while a retest is owed is refused.
+ * (4) no UI surface is refused while a retest is owed -- and, when
+ * `carriesPriorResults`, while ANY previous case still applies; (5) a case
+ * naming a priorCaseId names a case of the previous cycle, quotes the
+ * criterion it tested, and names the same case in any retestOf; (6) ONLY when
+ * `carriesPriorResults`: every previous case that passed or was not run, and
+ * whose criterion still applies, is carried forward by a case whose
+ * priorCaseId is its id, quoting that same criterion.
  */
 export declare function checkQaPacketFaithful(input: QaPacketFaithfulnessInput): string[];
+/** What the rule and the stamp read of a candidate -- the same inputs daemon_qa_packet_write checks the write against. */
+export type QaAnswerCandidate = Pick<QaPacketCandidate, 'focusAcceptanceCriteria' | 'deliveries' | 'armedBaselineCriteria' | 'previousPacket'>;
+/** One parsed answer as the pass would write it, and what it violates. */
+export interface QaAnswerJudgement {
+    /** The answer's cases, marked from the previous cycle's RECORDED results ([] for a no-UI-surface answer). */
+    cases: Array<Record<string, unknown>>;
+    /** One line per faithfulness violation of those cases; [] is faithful. */
+    violations: string[];
+}
 /**
- * The violations of one parsed answer against what the candidate read handed
- * the author -- the same inputs daemon_qa_packet_write checks the write
- * against. Pure.
+ * Judge one parsed answer against what the candidate read handed the author:
+ * stamp its cases from the previous cycle's recorded results, then check the
+ * STAMPED cases as a writer that carries every previous case forward. Pure.
+ * The one place an answer is stamped: the cases returned are the cases checked.
  */
-export declare function qaAnswerFaithfulnessViolations(candidate: Pick<QaPacketCandidate, 'focusAcceptanceCriteria' | 'deliveries' | 'armedBaselineCriteria' | 'previousPacket'>, answer: {
+export declare function judgeQaAnswer(candidate: QaAnswerCandidate, answer: {
+    kind: 'cases';
+    cases: readonly unknown[];
+} | {
+    kind: 'no_ui_surface';
+}): QaAnswerJudgement;
+/** The violations of one parsed answer (judgeQaAnswer, without the stamped cases). Pure. */
+export declare function qaAnswerFaithfulnessViolations(candidate: QaAnswerCandidate, answer: {
     kind: 'cases';
     cases: readonly unknown[];
 } | {

package/dist/qa/qa-author-faithfulness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qa-author-faithfulness.d.ts","sourceRoot":"","sources":["../../src/qa/qa-author-faithfulness.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,uCAAuC;AACvC,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qDAAqD;AACrD,MAAM,WAAW,yBAAyB;IACxC,0DAA0D;IAC1D,KAAK,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC;IACrB,0EAA0E;IAC1E,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,mFAAmF;IACnF,mBAAmB,EAAE,aAAa,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC;CAClF;AAsBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQzD;AAED,kGAAkG;AAClG,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,MAAM,EAAE,CAU7F;AAMD,kGAAkG;AAClG,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAOtE;AAqCD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,yBAAyB,GAAG,MAAM,EAAE,CAgChF;AAcD;;;;GAIG;AACH,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,yBAAyB,GAAG,YAAY,GAAG,uBAAuB,GAAG,gBAAgB,CAAC,EACzH,MAAM,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,SAAS,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GAC/E,MAAM,EAAE,CAYV"}
+{"version":3,"file":"qa-author-faithfulness.d.ts","sourceRoot":"","sources":["../../src/qa/qa-author-faithfulness.ts"],"names":[],"mappings":"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"}