@ryanfw/prompt-orchestration-pipeline 1.3.2 → 1.3.3

package/src/ui/state/transformers/status-transformer.ts

@@ -1,14 +1,8 @@
-import {
-  deriveJobStatusFromTasks,
-  normalizeJobStatus,
-  normalizeTaskState,
-} from "../../../config/statuses";
+import { normalizeJobView } from "../../../core/job-view";
 import type {
   CanonicalJob,
-  CanonicalJobStatus,
   CanonicalTask,
   ComputedStatus,
-  GateInfo,
   JobReadResult,
   TransformationStats,
 } from "../types";
@@ -18,141 +12,13 @@ function asRecord(value: unknown): Record<string, unknown> | null {
   return value as Record<string, unknown>;
 }
 
-function asTaskFiles(value: unknown): CanonicalTask["files"] {
-  const record = asRecord(value);
-  return {
-    artifacts: Array.isArray(record?.["artifacts"]) ? (record["artifacts"] as string[]) : [],
-    logs: Array.isArray(record?.["logs"]) ? (record["logs"] as string[]) : [],
-    tmp: Array.isArray(record?.["tmp"]) ? (record["tmp"] as string[]) : [],
-  };
-}
-
-function toGateInfo(value: unknown): GateInfo | null | undefined {
-  if (value === null) return null;
-  const record = asRecord(value);
-  if (!record) return undefined;
-
-  const artifacts = Array.isArray(record["artifacts"])
-    ? record["artifacts"].filter((artifact): artifact is string => typeof artifact === "string")
-    : undefined;
-
-  return {
-    afterTask: typeof record["afterTask"] === "string" ? record["afterTask"] : "",
-    message: typeof record["message"] === "string" ? record["message"] : "",
-    requestedAt: typeof record["requestedAt"] === "string" ? record["requestedAt"] : "",
-    ...(artifacts && artifacts.length > 0 ? { artifacts } : {}),
-  };
-}
-
-function toTask(name: string, value: unknown): CanonicalTask {
-  const task = asRecord(value) ?? {};
-  return {
-    name,
-    state: normalizeTaskState(task["state"]),
-    files: asTaskFiles(task["files"]),
-    startedAt: typeof task["startedAt"] === "string" ? task["startedAt"] : null,
-    endedAt: typeof task["endedAt"] === "string" ? task["endedAt"] : null,
-    attempts: typeof task["attempts"] === "number" ? task["attempts"] : undefined,
-    restartCount: typeof task["restartCount"] === "number" ? task["restartCount"] : undefined,
-    retrying: typeof task["retrying"] === "boolean" ? task["retrying"] : undefined,
-    nextRetryAt: typeof task["nextRetryAt"] === "string" ? task["nextRetryAt"] : undefined,
-    lastRetryError: Object.hasOwn(task, "lastRetryError") ? task["lastRetryError"] as import("../types").RetryError | null : undefined,
-    executionTimeMs:
-      typeof task["executionTimeMs"] === "number" ? task["executionTimeMs"] : undefined,
-    refinementAttempts:
-      typeof task["refinementAttempts"] === "number"
-        ? task["refinementAttempts"]
-        : undefined,
-    stageLogPath: typeof task["stageLogPath"] === "string" ? task["stageLogPath"] : undefined,
-    errorContext: task["errorContext"],
-    currentStage: typeof task["currentStage"] === "string" ? task["currentStage"] : undefined,
-    failedStage: typeof task["failedStage"] === "string" ? task["failedStage"] : undefined,
-    artifacts: task["artifacts"],
-    error: asRecord(task["error"]) as CanonicalTask["error"],
-    skipReason: typeof task["skipReason"] === "string" ? task["skipReason"] : undefined,
-    skippedBy: typeof task["skippedBy"] === "string" ? task["skippedBy"] : undefined,
-    controlApplied: typeof task["controlApplied"] === "boolean" ? task["controlApplied"] : undefined,
-  };
-}
-
-function getStatusValue(status: ReturnType<typeof deriveJobStatusFromTasks>): CanonicalJobStatus {
-  return status === "failed" ? "error" : status;
-}
-
-function getProgress(tasks: CanonicalTask[]): number {
-  if (tasks.length === 0) return 0;
-
-  const completed = tasks.filter((task) => task.state === "done" || task.state === "skipped").length;
-  return Math.floor((completed / tasks.length) * 100);
-}
-
-function getTitle(raw: Record<string, unknown>, jobId: string): string {
-  const title = raw["title"] ?? raw["name"];
-  return typeof title === "string" && title.trim() !== "" ? title : jobId;
-}
-
-function getCosts(raw: Record<string, unknown>): Record<string, unknown> {
-  const explicit = asRecord(raw["costs"]);
-  if (explicit) return explicit;
-
-  // Aggregate cost and token totals from individual task entries
-  const tasks = asRecord(raw["tasks"]);
-  if (!tasks) return {};
-
-  let totalCost = 0;
-  let totalInputTokens = 0;
-  let totalOutputTokens = 0;
-
-  for (const value of Object.values(tasks)) {
-    const task = asRecord(value);
-    if (!task) continue;
-
-    // Sum from [model, input, output, cost?] tuples
-    const usage = task["tokenUsage"];
-    if (Array.isArray(usage)) {
-      for (const entry of usage) {
-        if (Array.isArray(entry) && entry.length >= 3) {
-          if (typeof entry[1] === "number") totalInputTokens += entry[1];
-          if (typeof entry[2] === "number") totalOutputTokens += entry[2];
-          if (typeof entry[3] === "number") totalCost += entry[3];
-        }
-      }
-    }
-  }
-
-  const totalTokens = totalInputTokens + totalOutputTokens;
-  if (totalCost === 0 && totalTokens === 0) return {};
-
-  return { totalCost, totalTokens, totalInputTokens, totalOutputTokens };
-}
-
 export function computeJobStatus(tasksInput: unknown): ComputedStatus {
-  const tasks = Object.values(transformTasks(tasksInput));
-  if (tasks.length === 0) {
-    return { status: "pending", progress: 0 };
-  }
-
-  return {
-    status: getStatusValue(deriveJobStatusFromTasks(tasks)),
-    progress: getProgress(tasks),
-  };
+  const view = normalizeJobView({ tasks: tasksInput }, "", "");
+  return { status: view.status, progress: view.progress };
 }
 
 export function transformTasks(rawTasks: unknown): Record<string, CanonicalTask> {
-  if (Array.isArray(rawTasks)) {
-    return Object.fromEntries(
-      rawTasks.map((task, index) => {
-        const record = asRecord(task);
-        const name = typeof record?.["name"] === "string" ? (record["name"] as string) : `task-${index + 1}`;
-        return [name, toTask(name, task)];
-      }),
-    );
-  }
-
-  const record = asRecord(rawTasks);
-  if (!record) return {};
-
-  return Object.fromEntries(Object.entries(record).map(([name, task]) => [name, toTask(name, task)]));
+  return normalizeJobView({ tasks: rawTasks }, "", "").tasks;
 }
 
 export function transformJobStatus(raw: unknown, jobId: string, location: string): CanonicalJob | null {
@@ -164,42 +30,41 @@ export function transformJobStatus(raw: unknown, jobId: string, location: string
     console.warn(`job id mismatch: expected "${jobId}" but received "${rawJobId}"`);
   }
 
-  const tasks = transformTasks(record["tasks"]);
-  const computed = computeJobStatus(tasks);
-  const snapshotStatus = normalizeJobStatus(record["status"] ?? record["state"]);
-  const gate = toGateInfo(record["gate"]);
-  const title = getTitle(record, jobId);
+  return normalizeJobView(raw, jobId, location);
+}
 
+export function buildUnreadableJob(result: JobReadResult): CanonicalJob {
+  const code = result.code ?? "UNKNOWN_READ_ERROR";
+  const detail = result.message ? ` Reader error: ${result.message}` : "";
+  const message =
+    `Status file is unreadable (${code}). ` +
+    `Repair or delete ${result.path ?? "tasks-status.json"} for job "${result.jobId}" to recover.` +
+    detail;
   return {
-    id: jobId,
-    jobId,
-    name: title,
-    title,
-    status: snapshotStatus === "waiting" || snapshotStatus === "failed"
-      ? getStatusValue(snapshotStatus)
-      : computed.status,
-    progress: computed.progress,
-    createdAt: typeof record["createdAt"] === "string" ? record["createdAt"] : null,
-    updatedAt: typeof record["updatedAt"] === "string" ? record["updatedAt"] : null,
-    location,
-    tasks,
-    files: asRecord(record["files"]) ?? {},
-    costs: getCosts(record),
-    pipeline: typeof record["pipeline"] === "string" ? record["pipeline"] : undefined,
-    pipelineLabel:
-      typeof record["pipelineLabel"] === "string" ? record["pipelineLabel"] : undefined,
-    pipelineConfig: asRecord(record["pipelineConfig"]) ?? undefined,
-    current: record["current"],
-    currentStage: record["currentStage"],
-    gate,
-    warnings: Array.isArray(record["warnings"]) ? (record["warnings"] as string[]) : undefined,
+    id: result.jobId,
+    jobId: result.jobId,
+    name: result.jobId,
+    title: result.jobId,
+    status: "failed",
+    progress: 0,
+    createdAt: null,
+    updatedAt: null,
+    location: result.location ?? null,
+    tasks: {},
+    files: {},
+    costs: {},
+    readable: false,
+    error: { code, message, path: result.path },
   };
 }
 
 export function transformMultipleJobs(jobReadResults: JobReadResult[]): CanonicalJob[] {
   return jobReadResults
-    .filter((result) => result.ok)
-    .map((result) => transformJobStatus(result.data, result.jobId, result.location))
+    .map((result) =>
+      result.ok
+        ? transformJobStatus(result.data, result.jobId, result.location)
+        : result.code === "INVALID_JSON" ? buildUnreadableJob(result) : null,
+    )
     .filter((job): job is CanonicalJob => job !== null);
 }
 
@@ -208,6 +73,7 @@ export function getTransformationStats(
   transformedJobs: CanonicalJob[],
 ): TransformationStats {
   const successfulReads = readResults.filter((result) => result.ok).length;
+  const successfulTransforms = transformedJobs.filter((job) => job.readable !== false).length;
   const statusDistribution = transformedJobs.reduce<Record<string, number>>((acc, job) => {
     acc[job.status] = (acc[job.status] ?? 0) + 1;
     return acc;
@@ -216,9 +82,9 @@ export function getTransformationStats(
   return {
     totalRead: readResults.length,
     successfulReads,
-    successfulTransforms: transformedJobs.length,
-    failedTransforms: successfulReads - transformedJobs.length,
-    transformationRate: successfulReads === 0 ? 0 : transformedJobs.length / successfulReads,
+    successfulTransforms,
+    failedTransforms: successfulReads - successfulTransforms,
+    transformationRate: successfulReads === 0 ? 0 : successfulTransforms / successfulReads,
     statusDistribution,
   };
 }

package/src/ui/state/types.ts

@@ -1,7 +1,8 @@
 import type { JobStatusValue, TaskStateValue } from "../../config/statuses";
+import type { JobView, JobViewTask } from "../../core/job-view";
 
 export type ChangeType = "created" | "modified" | "deleted";
-export type CanonicalJobStatus = JobStatusValue | "error";
+export type CanonicalJobStatus = JobStatusValue;
 
 export interface ChangeEntry {
   path: string;
@@ -128,51 +129,9 @@ export interface GateInfo {
   requestedAt: string;
 }
 
-export interface CanonicalTask {
-  state: TaskStateValue;
-  name: string;
-  files: { artifacts: string[]; logs: string[]; tmp: string[] };
-  startedAt?: string | null;
-  endedAt?: string | null;
-  attempts?: number;
-  restartCount?: number;
-  retrying?: boolean;
-  nextRetryAt?: string;
-  lastRetryError?: RetryError | null;
-  executionTimeMs?: number;
-  refinementAttempts?: number;
-  stageLogPath?: string;
-  errorContext?: unknown;
-  currentStage?: string;
-  failedStage?: string;
-  artifacts?: unknown;
-  error?: { message: string; [key: string]: unknown } | null;
-  skipReason?: string;
-  skippedBy?: string;
-  controlApplied?: boolean;
-}
-
-export interface CanonicalJob {
-  id: string;
-  jobId: string;
-  name: string;
-  title: string;
-  status: CanonicalJobStatus;
-  progress: number;
-  createdAt: string | null;
-  updatedAt: string | null;
-  location: string | null;
-  tasks: Record<string, CanonicalTask>;
-  files: Record<string, unknown>;
-  costs: Record<string, unknown>;
-  pipeline?: string;
-  pipelineLabel?: string;
-  pipelineConfig?: Record<string, unknown>;
-  current?: unknown;
-  currentStage?: unknown;
-  gate?: GateInfo | null;
-  warnings?: string[];
-}
+export type CanonicalTask = JobViewTask;
+
+export type CanonicalJob = JobView;
 
 export interface JobReadResult {
   ok: boolean;
@@ -181,6 +140,7 @@ export interface JobReadResult {
   location: string;
   code?: string;
   message?: string;
+  path?: string;
 }
 
 export interface TransformationStats {
@@ -202,7 +162,7 @@ export interface JobListStats {
 export interface GroupedJobs {
   running: CanonicalJob[];
   waiting: CanonicalJob[];
-  error: CanonicalJob[];
+  failed: CanonicalJob[];
   pending: CanonicalJob[];
   complete: CanonicalJob[];
 }
@@ -234,6 +194,8 @@ export interface APIJob {
   pipeline?: string;
   pipelineLabel?: string;
   pipelineConfig?: Record<string, unknown>;
+  readable?: boolean;
+  error?: { code: string; message: string; path?: string };
 }
 
 export interface AggregationStats {