@vectoriox/iox-ui 5.62.1 → 5.64.0

package/src/harness-core/site-reading.ts

@@ -6,7 +6,7 @@ import {
 
 import { paletteSamples, readPalette } from './palette';
 import { StyleRead, StyleReadGround, StyleReadHeadings, StyleReadSourceKind } from './rank';
-import { AnalysisIssue, MAX_ANALYSIS_MOODS, SiteAnalysis, siteAnalysisJsonSchema, validateSiteAnalysis } from './site-analysis';
+import { AnalysisIssue, analysisFromWire, MAX_ANALYSIS_MOODS, SiteAnalysis, siteAnalysisJsonSchema, validateSiteAnalysis } from './site-analysis';
 
 /**
  * The READING call (AI plan §3d step 1, §3k R2, M1-1): ONE `text.fast` call reads the owner's words AND the pictures
@@ -129,23 +129,32 @@ function validatePictures(c: Collector, raw: unknown, count: number): void {
     c.oneOf(style, 'density', Object.keys(SPEC_AXES.densities), 'pictures.style');
 }
 
+/** The analysis on the wire, judged as the document it becomes: the wire's own faults, then `validateSiteAnalysis`'s. */
+function analysisIssues(wire: unknown, prompt: string): AnalysisIssue[] {
+    const read = analysisFromWire(wire);
+    return [...read.issues, ...validateSiteAnalysis(read.analysis, { prompt }).issues];
+}
+
 /** The reading's gate: the analysis by `validateSiteAnalysis` (paths under `analysis.` when pictures came too), the pictures by `READING_SHAPE`. */
 export function validateSiteReading(value: unknown, ctx: { prompt: string; pictureCount: number }): { valid: boolean; issues: ReadingIssue[] } {
-    if (ctx.pictureCount <= 0) return validateSiteAnalysis(value, { prompt: ctx.prompt });
+    if (ctx.pictureCount <= 0) {
+        const issues = analysisIssues(value, ctx.prompt);
+        return { valid: issues.length === 0, issues };
+    }
     const c = new Collector();
     const reading = c.object(value, 'reading', '');
     if (!reading) return { valid: false, issues: c.issues };
-    const analysis = validateSiteAnalysis(reading['analysis'], { prompt: ctx.prompt });
-    const issues: ReadingIssue[] = analysis.issues.map(i => ({ ...i, path: pathAt('analysis', i.path) }));
+    const issues: ReadingIssue[] = analysisIssues(reading['analysis'], ctx.prompt).map(i => ({ ...i, path: pathAt('analysis', i.path) }));
     validatePictures(c, reading['pictures'], ctx.pictureCount);
     issues.push(...c.issues);
     return { valid: issues.length === 0, issues };
 }
 
-/** A valid reading's answer → `SiteReading` (the analysis alone answers `{ analysis }`). */
+/** A valid reading's answer → `SiteReading` (the analysis alone answers `{ analysis }`; the facts made a map again). */
 export function decodeSiteReading(value: unknown, pictureCount: number): SiteReading {
-    if (pictureCount <= 0) return { analysis: value as SiteAnalysis };
-    return value as SiteReading;
+    if (pictureCount <= 0) return { analysis: analysisFromWire(value).analysis as SiteAnalysis };
+    const reading = value as SiteReading;
+    return { ...reading, analysis: analysisFromWire(reading.analysis).analysis as SiteAnalysis };
 }
 
 // ── Readings → ONE StyleRead ───────────────────────────────────────────────────────────────────────────