@united-workforce/eval 0.1.5 → 0.1.6

package/dist/.build-fingerprint

@@ -0,0 +1 @@
+ab2ab0e476768b6700c94fa8168e1b7c6fa60254bffe14047335c0b29c523971

package/dist/judge/builtin/frontmatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frontmatter.d.ts","sourceRoot":"","sources":["../../../src/judge/builtin/frontmatter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAuErD;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuBvF"}
+{"version":3,"file":"frontmatter.d.ts","sourceRoot":"","sources":["../../../src/judge/builtin/frontmatter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAwBrD;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyBvF"}

package/dist/judge/builtin/frontmatter.js

@@ -1,56 +1,14 @@
 import { createLogger } from "@united-workforce/util";
-import { parse as parseYaml } from "yaml";
 import { EVAL_JUDGE_FRONTMATTER_SCHEMA } from "../../storage/index.js";
-import { readThreadSteps } from "./read-steps.js";
+import { readStepDetail, readThreadSteps } from "./read-steps.js";
 const log = createLogger({ sink: { kind: "stderr" } });
 const LOG_RESULT = "F2QH7R4M";
-const FENCE = "---";
-/**
- * Extract the YAML frontmatter block from a step output. Returns the inner YAML
- * string when the output starts with a `---\n` block closed by a `\n---` fence,
- * otherwise null.
- */
-function extractFrontmatterYaml(output) {
-    if (typeof output !== "string") {
-        return null;
-    }
-    if (!output.startsWith(`${FENCE}\n`)) {
-        return null;
-    }
-    const rest = output.slice(FENCE.length + 1);
-    const closeIndex = rest.indexOf(`\n${FENCE}`);
-    if (closeIndex === -1) {
-        return null;
-    }
-    return rest.slice(0, closeIndex);
-}
 /** Validate a single step's frontmatter, returning a list of errors (empty = valid). */
-function validateStepFrontmatter(output) {
-    // CAS stores the extracted output as a JSON object after the extract pipeline.
-    // Accept both: parsed object (from step.output) or raw markdown string.
-    if (typeof output === "object" && output !== null && !Array.isArray(output)) {
-        const status = output.$status;
-        if (typeof status !== "string" || status.trim() === "") {
-            return ["$status field is missing or not a non-empty string"];
-        }
-        return [];
-    }
-    const yaml = extractFrontmatterYaml(output);
-    if (yaml === null) {
-        return ["output does not begin with a valid '---' frontmatter block"];
-    }
-    let parsed;
-    try {
-        parsed = parseYaml(yaml);
-    }
-    catch (e) {
-        const message = e instanceof Error ? e.message : String(e);
-        return [`frontmatter YAML failed to parse: ${message}`];
-    }
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-        return ["frontmatter is not a YAML mapping"];
+function validateStepFrontmatter(frontmatter) {
+    if (Object.keys(frontmatter).length === 0) {
+        return ["step has no frontmatter"];
     }
-    const status = parsed.$status;
+    const status = frontmatter.$status;
     if (typeof status !== "string" || status.trim() === "") {
         return ["$status field is missing or not a non-empty string"];
     }
@@ -66,7 +24,10 @@ export async function runFrontmatterJudge(threadId) {
     const invalidSteps = [];
     for (let i = 0; i < steps.length; i++) {
         const step = steps[i];
-        const errors = validateStepFrontmatter(step.output);
+        if (step === undefined)
+            continue;
+        const detail = readStepDetail(step.hash);
+        const errors = validateStepFrontmatter(detail.frontmatter);
         if (errors.length > 0) {
             invalidSteps.push({ stepIndex: i, role: step.role, errors });
         }

package/dist/judge/builtin/frontmatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"frontmatter.js","sourceRoot":"","sources":["../../../src/judge/builtin/frontmatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"frontmatter.js","sourceRoot":"","sources":["../../../src/judge/builtin/frontmatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlE,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAEvD,MAAM,UAAU,GAAG,UAAU,CAAC;AAQ9B,wFAAwF;AACxF,SAAS,uBAAuB,CAAC,WAAoC;IACnE,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC;IACnC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACvD,OAAO,CAAC,oDAAoD,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,QAAgB;IACxD,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAExC,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,uBAAuB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;IAChC,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC;IACpD,MAAM,KAAK,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3D,GAAG,CAAC,UAAU,EAAE,sBAAsB,QAAQ,UAAU,UAAU,IAAI,UAAU,EAAE,CAAC,CAAC;IAEpF,OAAO;QACL,KAAK;QACL,IAAI,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE;QAC9C,MAAM,EAAE,6BAA6B;KACtC,CAAC;AACJ,CAAC"}

package/dist/judge/builtin/read-steps.d.ts

@@ -1,4 +1,38 @@
-import type { StepEntry } from "@united-workforce/protocol";
-/** Shell out to `uwf step list` and return the parsed step entries (excludes start entry). */
-export declare function readThreadSteps(threadId: string): StepEntry[];
+/**
+ * A single step entry as exposed by `uwf step list --format raw-json` under 0.6.
+ *
+ * Richer per-step data (frontmatter, turns, agent, usage) lives in the step
+ * detail node and is fetched separately via `readStepDetail(hash)` when needed.
+ */
+export type StepListEntry = {
+    hash: string;
+    role: string;
+    durationMs: number | null;
+};
+/** Shell out to `uwf step list --format raw-json` and return the bare-value payload's items. */
+export declare function readThreadSteps(threadId: string): StepListEntry[];
+/**
+ * Per-step detail surface used by builtin judges. Mirrors the
+ * `StepDetailPayload` schema (`@uwf/output/step-detail`) but only exposes the
+ * fields judges currently consume.
+ */
+export type StepDetail = {
+    hash: string;
+    role: string;
+    agent: string;
+    durationMs: number | null;
+    frontmatter: Record<string, unknown>;
+    usage: {
+        turns: number;
+        inputTokens: number;
+        outputTokens: number;
+        duration: number;
+    } | null;
+};
+/**
+ * Shell out to `uwf step show <hash> --format raw-json` and return the bare-value
+ * step-detail payload. Used by judges that need richer per-step data than
+ * `readThreadSteps` exposes (e.g. frontmatter contents, token usage).
+ */
+export declare function readStepDetail(stepHash: string): StepDetail;
 //# sourceMappingURL=read-steps.d.ts.map

package/dist/judge/builtin/read-steps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-steps.d.ts","sourceRoot":"","sources":["../../../src/judge/builtin/read-steps.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAqB,MAAM,4BAA4B,CAAC;AAE/E,8FAA8F;AAC9F,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,CAQ7D"}
+{"version":3,"file":"read-steps.d.ts","sourceRoot":"","sources":["../../../src/judge/builtin/read-steps.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAOF,gGAAgG;AAChG,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,EAAE,CAQjE;AAED;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,KAAK,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,IAAI,CAAC;CACV,CAAC;AAkBF;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAmB3D"}

package/dist/judge/builtin/read-steps.js

@@ -1,12 +1,36 @@
 import { execFileSync } from "node:child_process";
-/** Shell out to `uwf step list` and return the parsed step entries (excludes start entry). */
+/** Shell out to `uwf step list --format raw-json` and return the bare-value payload's items. */
 export function readThreadSteps(threadId) {
-    const stdout = execFileSync("uwf", ["step", "list", threadId], {
+    const stdout = execFileSync("uwf", ["--format", "raw-json", "step", "list", threadId], {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "pipe"],
     }).trim();
     const parsed = JSON.parse(stdout);
-    // steps[0] is the StartEntry; the rest are StepEntry records.
-    return parsed.steps.slice(1);
+    // The 0.6 payload does not include a synthetic start entry — every item is a real step.
+    return parsed.items;
+}
+/**
+ * Shell out to `uwf step show <hash> --format raw-json` and return the bare-value
+ * step-detail payload. Used by judges that need richer per-step data than
+ * `readThreadSteps` exposes (e.g. frontmatter contents, token usage).
+ */
+export function readStepDetail(stepHash) {
+    const stdout = execFileSync("uwf", ["--format", "raw-json", "step", "show", stepHash], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "pipe"],
+    }).trim();
+    const parsed = JSON.parse(stdout);
+    return {
+        hash: parsed.hash,
+        role: parsed.role,
+        agent: parsed.agent,
+        durationMs: parsed.durationMs,
+        frontmatter: parsed.frontmatter !== null &&
+            typeof parsed.frontmatter === "object" &&
+            !Array.isArray(parsed.frontmatter)
+            ? parsed.frontmatter
+            : {},
+        usage: parsed.usage,
+    };
 }
 //# sourceMappingURL=read-steps.js.map

package/dist/judge/builtin/read-steps.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-steps.js","sourceRoot":"","sources":["../../../src/judge/builtin/read-steps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,8FAA8F;AAC9F,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;QAC7D,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC,CAAC,IAAI,EAAE,CAAC;IACV,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAsB,CAAC;IACvD,8DAA8D;IAC9D,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAgB,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"read-steps.js","sourceRoot":"","sources":["../../../src/judge/builtin/read-steps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAmBlD,gGAAgG;AAChG,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;QACrF,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC,CAAC,IAAI,EAAE,CAAC;IACV,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAoB,CAAC;IACrD,wFAAwF;IACxF,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC;AAqCD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;QACrF,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC,CAAC,IAAI,EAAE,CAAC;IACV,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAyB,CAAC;IAC1D,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,WAAW,EACT,MAAM,CAAC,WAAW,KAAK,IAAI;YAC3B,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;YACtC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;YAChC,CAAC,CAAC,MAAM,CAAC,WAAW;YACpB,CAAC,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC;AACJ,CAAC"}

package/dist/judge/builtin/token-stats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-stats.d.ts","sourceRoot":"","sources":["../../../src/judge/builtin/token-stats.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAcrD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6BtF"}
+{"version":3,"file":"token-stats.d.ts","sourceRoot":"","sources":["../../../src/judge/builtin/token-stats.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAcrD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA8BtF"}

package/dist/judge/builtin/token-stats.js

@@ -1,6 +1,6 @@
 import { createLogger } from "@united-workforce/util";
 import { EVAL_JUDGE_TOKEN_STATS_SCHEMA } from "../../storage/index.js";
-import { readThreadSteps } from "./read-steps.js";
+import { readStepDetail, readThreadSteps } from "./read-steps.js";
 const log = createLogger({ sink: { kind: "stderr" } });
 const LOG_RESULT = "T7KQ3M9P";
 /**
@@ -15,7 +15,8 @@ export async function runTokenStatsJudge(threadId) {
     let totalTurns = 0;
     const perStep = [];
     for (const step of steps) {
-        const usage = step.usage;
+        const detail = readStepDetail(step.hash);
+        const usage = detail.usage;
         const inputTokens = usage !== null ? usage.inputTokens : 0;
         const outputTokens = usage !== null ? usage.outputTokens : 0;
         const turns = usage !== null ? usage.turns : 0;

package/dist/judge/builtin/token-stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-stats.js","sourceRoot":"","sources":["../../../src/judge/builtin/token-stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAEvD,MAAM,UAAU,GAAG,UAAU,CAAC;AAU9B;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,QAAgB;IACvD,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAExC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,WAAW,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAErD,UAAU,IAAI,WAAW,CAAC;QAC1B,WAAW,IAAI,YAAY,CAAC;QAC5B,UAAU,IAAI,KAAK,CAAC;QAEpB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,GAAG,CAAC,UAAU,EAAE,sBAAsB,QAAQ,OAAO,UAAU,QAAQ,WAAW,EAAE,CAAC,CAAC;IAEtF,OAAO;QACL,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE;QACtD,MAAM,EAAE,6BAA6B;KACtC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"token-stats.js","sourceRoot":"","sources":["../../../src/judge/builtin/token-stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlE,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAEvD,MAAM,UAAU,GAAG,UAAU,CAAC;AAU9B;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,QAAgB;IACvD,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAExC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,MAAM,WAAW,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAErD,UAAU,IAAI,WAAW,CAAC;QAC1B,WAAW,IAAI,YAAY,CAAC;QAC5B,UAAU,IAAI,KAAK,CAAC;QAEpB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,GAAG,CAAC,UAAU,EAAE,sBAAsB,QAAQ,OAAO,UAAU,QAAQ,WAAW,EAAE,CAAC,CAAC;IAEtF,OAAO;QACL,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE;QACtD,MAAM,EAAE,6BAA6B;KACtC,CAAC;AACJ,CAAC"}

package/dist/runner/execute.d.ts

@@ -2,6 +2,10 @@ import type { ExecuteInput, ExecuteResult } from "./types.js";
 /**
  * Execute a workflow: create a thread, then run it for up to `maxSteps` steps.
  * Shells out to the uwf CLI rather than importing it directly.
+ *
+ * Both `thread start` and `thread exec` are invoked with `--format raw-json`
+ * so the legacy bare-value JSON shape is emitted (the 0.6 default is text).
+ * See `specs/cli-ocas-envelope-in-repo-consumer-migration.md`.
  */
 export declare function execute(input: ExecuteInput): Promise<ExecuteResult>;
 /** Best-effort lookup of the uwf engine version (`uwf -V`); "unknown" on failure. */

package/dist/runner/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/runner/execute.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAmD9D;;;GAGG;AACH,wBAAsB,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAezE;AAED,qFAAqF;AACrF,wBAAgB,gBAAgB,IAAI,MAAM,CASzC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/runner/execute.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAwD9D;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAmCzE;AAED,qFAAqF;AACrF,wBAAgB,gBAAgB,IAAI,MAAM,CASzC"}

package/dist/runner/execute.js

@@ -26,10 +26,15 @@ function runUwf(args, cwd) {
                 ? err.stderr
                 : err.stderr.toString("utf8");
         const detail = stderr.trim() !== "" ? `: ${stderr.trim()}` : "";
-        throw new Error(`uwf ${args[0]} ${args[1]} failed${detail}`);
+        // Find the subcommand group + subcommand by skipping leading global flags
+        // (e.g. `--format raw-json`). The first non-flag token is the group.
+        const groupIdx = args.findIndex((a) => !a.startsWith("--"));
+        const group = groupIdx >= 0 ? (args[groupIdx] ?? "") : "";
+        const subcmd = groupIdx >= 0 ? (args[groupIdx + 1] ?? "") : "";
+        throw new Error(`uwf ${group} ${subcmd} failed${detail}`);
     }
 }
-/** Parse the thread ID from `uwf thread start` JSON output (`{ workflow, thread }`). */
+/** Parse the thread ID from `uwf thread start --format raw-json` output (`{ threadId, workflowHash }`). */
 function parseThreadId(stdout) {
     let parsed;
     try {
@@ -39,21 +44,45 @@ function parseThreadId(stdout) {
         throw new Error(`uwf thread start did not emit valid JSON: ${stdout || "(empty)"}`);
     }
     const obj = parsed;
-    const thread = obj.thread;
-    if (typeof thread !== "string" || thread === "") {
-        throw new Error(`uwf thread start output missing thread id: ${stdout}`);
+    const threadId = obj.threadId;
+    if (typeof threadId !== "string" || threadId === "") {
+        throw new Error(`uwf thread start output missing threadId: ${stdout}`);
     }
-    return thread;
+    return threadId;
 }
 /**
  * Execute a workflow: create a thread, then run it for up to `maxSteps` steps.
  * Shells out to the uwf CLI rather than importing it directly.
+ *
+ * Both `thread start` and `thread exec` are invoked with `--format raw-json`
+ * so the legacy bare-value JSON shape is emitted (the 0.6 default is text).
+ * See `specs/cli-ocas-envelope-in-repo-consumer-migration.md`.
  */
 export async function execute(input) {
-    const startOut = runUwf(["thread", "start", input.workflow, "-p", input.prompt, "--cwd", input.workDir], input.workDir);
+    const startOut = runUwf([
+        "--format",
+        "raw-json",
+        "thread",
+        "start",
+        input.workflow,
+        "-p",
+        input.prompt,
+        "--cwd",
+        input.workDir,
+    ], input.workDir);
     const threadId = parseThreadId(startOut);
     log(LOG_START, `thread started thread=${threadId} workflow=${input.workflow}`);
-    runUwf(["thread", "exec", threadId, "--agent", input.agent, "-c", String(input.maxSteps)], input.workDir);
+    runUwf([
+        "--format",
+        "raw-json",
+        "thread",
+        "exec",
+        threadId,
+        "--agent",
+        input.agent,
+        "-c",
+        String(input.maxSteps),
+    ], input.workDir);
     log(LOG_EXEC, `thread executed thread=${threadId} maxSteps=${input.maxSteps}`);
     return { threadId };
 }

package/dist/runner/execute.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@united-workforce/eval",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "files": [
     "src",
@@ -18,12 +18,12 @@
     }
   },
   "dependencies": {
-    "@ocas/core": "^0.3.0",
-    "@ocas/fs": "^0.3.0",
+    "@ocas/core": "^0.5.0",
+    "@ocas/fs": "^0.4.1",
     "commander": "^14.0.3",
     "yaml": "^2.9.0",
-    "@united-workforce/protocol": "^0.1.0",
-    "@united-workforce/util": "^0.1.4"
+    "@united-workforce/protocol": "^0.3.0",
+    "@united-workforce/util": "^0.2.0"
   },
   "devDependencies": {
     "typescript": "^5.8.3"

package/src/judge/builtin/frontmatter.ts

@@ -1,76 +1,28 @@
 import { createLogger } from "@united-workforce/util";
-import { parse as parseYaml } from "yaml";
 
 import { EVAL_JUDGE_FRONTMATTER_SCHEMA } from "../../storage/index.js";
-import { readThreadSteps } from "./read-steps.js";
+import { readStepDetail, readThreadSteps } from "./read-steps.js";
 import type { BuiltinJudgeOutput } from "./types.js";
 
 const log = createLogger({ sink: { kind: "stderr" } });
 
 const LOG_RESULT = "F2QH7R4M";
 
-const FENCE = "---";
-
 type InvalidStep = {
   stepIndex: number;
   role: string;
   errors: string[];
 };
 
-/**
- * Extract the YAML frontmatter block from a step output. Returns the inner YAML
- * string when the output starts with a `---\n` block closed by a `\n---` fence,
- * otherwise null.
- */
-function extractFrontmatterYaml(output: unknown): string | null {
-  if (typeof output !== "string") {
-    return null;
-  }
-  if (!output.startsWith(`${FENCE}\n`)) {
-    return null;
-  }
-  const rest = output.slice(FENCE.length + 1);
-  const closeIndex = rest.indexOf(`\n${FENCE}`);
-  if (closeIndex === -1) {
-    return null;
-  }
-  return rest.slice(0, closeIndex);
-}
-
 /** Validate a single step's frontmatter, returning a list of errors (empty = valid). */
-function validateStepFrontmatter(output: unknown): string[] {
-  // CAS stores the extracted output as a JSON object after the extract pipeline.
-  // Accept both: parsed object (from step.output) or raw markdown string.
-  if (typeof output === "object" && output !== null && !Array.isArray(output)) {
-    const status = (output as Record<string, unknown>).$status;
-    if (typeof status !== "string" || status.trim() === "") {
-      return ["$status field is missing or not a non-empty string"];
-    }
-    return [];
+function validateStepFrontmatter(frontmatter: Record<string, unknown>): string[] {
+  if (Object.keys(frontmatter).length === 0) {
+    return ["step has no frontmatter"];
   }
-
-  const yaml = extractFrontmatterYaml(output);
-  if (yaml === null) {
-    return ["output does not begin with a valid '---' frontmatter block"];
-  }
-
-  let parsed: unknown;
-  try {
-    parsed = parseYaml(yaml);
-  } catch (e) {
-    const message = e instanceof Error ? e.message : String(e);
-    return [`frontmatter YAML failed to parse: ${message}`];
-  }
-
-  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    return ["frontmatter is not a YAML mapping"];
-  }
-
-  const status = (parsed as Record<string, unknown>).$status;
+  const status = frontmatter.$status;
   if (typeof status !== "string" || status.trim() === "") {
     return ["$status field is missing or not a non-empty string"];
   }
-
   return [];
 }
 
@@ -85,7 +37,9 @@ export async function runFrontmatterJudge(threadId: string): Promise<BuiltinJudg
   const invalidSteps: InvalidStep[] = [];
   for (let i = 0; i < steps.length; i++) {
     const step = steps[i];
-    const errors = validateStepFrontmatter(step.output);
+    if (step === undefined) continue;
+    const detail = readStepDetail(step.hash);
+    const errors = validateStepFrontmatter(detail.frontmatter);
     if (errors.length > 0) {
       invalidSteps.push({ stepIndex: i, role: step.role, errors });
     }

package/src/judge/builtin/read-steps.ts

@@ -1,14 +1,90 @@
 import { execFileSync } from "node:child_process";
 
-import type { StepEntry, ThreadStepsOutput } from "@united-workforce/protocol";
+/**
+ * A single step entry as exposed by `uwf step list --format raw-json` under 0.6.
+ *
+ * Richer per-step data (frontmatter, turns, agent, usage) lives in the step
+ * detail node and is fetched separately via `readStepDetail(hash)` when needed.
+ */
+export type StepListEntry = {
+  hash: string;
+  role: string;
+  durationMs: number | null;
+};
 
-/** Shell out to `uwf step list` and return the parsed step entries (excludes start entry). */
-export function readThreadSteps(threadId: string): StepEntry[] {
-  const stdout = execFileSync("uwf", ["step", "list", threadId], {
+type StepListPayload = {
+  threadId: string;
+  items: StepListEntry[];
+};
+
+/** Shell out to `uwf step list --format raw-json` and return the bare-value payload's items. */
+export function readThreadSteps(threadId: string): StepListEntry[] {
+  const stdout = execFileSync("uwf", ["--format", "raw-json", "step", "list", threadId], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+  }).trim();
+  const parsed = JSON.parse(stdout) as StepListPayload;
+  // The 0.6 payload does not include a synthetic start entry — every item is a real step.
+  return parsed.items;
+}
+
+/**
+ * Per-step detail surface used by builtin judges. Mirrors the
+ * `StepDetailPayload` schema (`@uwf/output/step-detail`) but only exposes the
+ * fields judges currently consume.
+ */
+export type StepDetail = {
+  hash: string;
+  role: string;
+  agent: string;
+  durationMs: number | null;
+  frontmatter: Record<string, unknown>;
+  usage: {
+    turns: number;
+    inputTokens: number;
+    outputTokens: number;
+    duration: number;
+  } | null;
+};
+
+type StepDetailRawPayload = {
+  hash: string;
+  role: string;
+  agent: string;
+  durationMs: number | null;
+  frontmatter: Record<string, unknown>;
+  // Usage is not exposed by the @uwf/output/step-detail schema yet; judges fall
+  // back to zeros when the field is null. Kept on the type for forward compat.
+  usage: {
+    turns: number;
+    inputTokens: number;
+    outputTokens: number;
+    duration: number;
+  } | null;
+};
+
+/**
+ * Shell out to `uwf step show <hash> --format raw-json` and return the bare-value
+ * step-detail payload. Used by judges that need richer per-step data than
+ * `readThreadSteps` exposes (e.g. frontmatter contents, token usage).
+ */
+export function readStepDetail(stepHash: string): StepDetail {
+  const stdout = execFileSync("uwf", ["--format", "raw-json", "step", "show", stepHash], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"],
   }).trim();
-  const parsed = JSON.parse(stdout) as ThreadStepsOutput;
-  // steps[0] is the StartEntry; the rest are StepEntry records.
-  return parsed.steps.slice(1) as StepEntry[];
+  const parsed = JSON.parse(stdout) as StepDetailRawPayload;
+  return {
+    hash: parsed.hash,
+    role: parsed.role,
+    agent: parsed.agent,
+    durationMs: parsed.durationMs,
+    frontmatter:
+      parsed.frontmatter !== null &&
+      typeof parsed.frontmatter === "object" &&
+      !Array.isArray(parsed.frontmatter)
+        ? parsed.frontmatter
+        : {},
+    usage: parsed.usage,
+  };
 }

package/src/judge/builtin/token-stats.ts

@@ -1,7 +1,7 @@
 import { createLogger } from "@united-workforce/util";
 
 import { EVAL_JUDGE_TOKEN_STATS_SCHEMA } from "../../storage/index.js";
-import { readThreadSteps } from "./read-steps.js";
+import { readStepDetail, readThreadSteps } from "./read-steps.js";
 import type { BuiltinJudgeOutput } from "./types.js";
 
 const log = createLogger({ sink: { kind: "stderr" } });
@@ -30,7 +30,8 @@ export async function runTokenStatsJudge(threadId: string): Promise<BuiltinJudge
   const perStep: PerStepStats[] = [];
 
   for (const step of steps) {
-    const usage = step.usage;
+    const detail = readStepDetail(step.hash);
+    const usage = detail.usage;
     const inputTokens = usage !== null ? usage.inputTokens : 0;
     const outputTokens = usage !== null ? usage.outputTokens : 0;
     const turns = usage !== null ? usage.turns : 0;

package/src/runner/execute.ts

@@ -33,11 +33,16 @@ function runUwf(args: string[], cwd: string): string {
           ? err.stderr
           : err.stderr.toString("utf8");
     const detail = stderr.trim() !== "" ? `: ${stderr.trim()}` : "";
-    throw new Error(`uwf ${args[0]} ${args[1]} failed${detail}`);
+    // Find the subcommand group + subcommand by skipping leading global flags
+    // (e.g. `--format raw-json`). The first non-flag token is the group.
+    const groupIdx = args.findIndex((a) => !a.startsWith("--"));
+    const group = groupIdx >= 0 ? (args[groupIdx] ?? "") : "";
+    const subcmd = groupIdx >= 0 ? (args[groupIdx + 1] ?? "") : "";
+    throw new Error(`uwf ${group} ${subcmd} failed${detail}`);
   }
 }
 
-/** Parse the thread ID from `uwf thread start` JSON output (`{ workflow, thread }`). */
+/** Parse the thread ID from `uwf thread start --format raw-json` output (`{ threadId, workflowHash }`). */
 function parseThreadId(stdout: string): string {
   let parsed: unknown;
   try {
@@ -46,27 +51,51 @@ function parseThreadId(stdout: string): string {
     throw new Error(`uwf thread start did not emit valid JSON: ${stdout || "(empty)"}`);
   }
   const obj = parsed as Record<string, unknown>;
-  const thread = obj.thread;
-  if (typeof thread !== "string" || thread === "") {
-    throw new Error(`uwf thread start output missing thread id: ${stdout}`);
+  const threadId = obj.threadId;
+  if (typeof threadId !== "string" || threadId === "") {
+    throw new Error(`uwf thread start output missing threadId: ${stdout}`);
   }
-  return thread;
+  return threadId;
 }
 
 /**
  * Execute a workflow: create a thread, then run it for up to `maxSteps` steps.
  * Shells out to the uwf CLI rather than importing it directly.
+ *
+ * Both `thread start` and `thread exec` are invoked with `--format raw-json`
+ * so the legacy bare-value JSON shape is emitted (the 0.6 default is text).
+ * See `specs/cli-ocas-envelope-in-repo-consumer-migration.md`.
  */
 export async function execute(input: ExecuteInput): Promise<ExecuteResult> {
   const startOut = runUwf(
-    ["thread", "start", input.workflow, "-p", input.prompt, "--cwd", input.workDir],
+    [
+      "--format",
+      "raw-json",
+      "thread",
+      "start",
+      input.workflow,
+      "-p",
+      input.prompt,
+      "--cwd",
+      input.workDir,
+    ],
     input.workDir,
   );
   const threadId = parseThreadId(startOut);
   log(LOG_START, `thread started thread=${threadId} workflow=${input.workflow}`);
 
   runUwf(
-    ["thread", "exec", threadId, "--agent", input.agent, "-c", String(input.maxSteps)],
+    [
+      "--format",
+      "raw-json",
+      "thread",
+      "exec",
+      threadId,
+      "--agent",
+      input.agent,
+      "-c",
+      String(input.maxSteps),
+    ],
     input.workDir,
   );
   log(LOG_EXEC, `thread executed thread=${threadId} maxSteps=${input.maxSteps}`);