@ryanfw/prompt-orchestration-pipeline 1.2.5 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanfw/prompt-orchestration-pipeline",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A Prompt-orchestration pipeline (POP) is a framework for building, running, and experimenting with complex chains of LLM tasks.",
   "type": "module",
   "main": "src/ui/server/index.ts",

package/src/core/status-writer.ts

@@ -212,13 +212,10 @@ export function resetJobFromTask(jobDir: string, fromTask: string, options?: Res
 
   return writeJobStatus(jobDir, (snapshot) => {
     const taskKeys = Object.keys(snapshot.tasks);
-    const totalCount = taskKeys.length;
-    const doneCount = taskKeys.filter((k) => snapshot.tasks[k]!.state === "done").length;
 
     snapshot.state = "pending";
     snapshot.current = null;
     snapshot.currentStage = null;
-    snapshot.progress = totalCount > 0 ? (doneCount / totalCount) * 100 : 0;
 
     const fromIndex = taskKeys.indexOf(fromTask);
     const resetKeys = fromIndex === -1 ? [] : taskKeys.slice(fromIndex);

package/src/core/task-runner.ts

@@ -795,7 +795,17 @@ export async function runPipeline(
 
   // Write done status (best-effort)
   try {
+    const lastStage = KNOWN_STAGES[KNOWN_STAGES.length - 1];
+    const doneProgress = computeDeterministicProgress(
+      pipelineTasks ?? [taskName],
+      taskName,
+      lastStage,
+    );
     await writeJobStatus(jobDir, (snapshot: StatusSnapshot) => {
+      snapshot.state = TaskState.DONE;
+      snapshot.progress = doneProgress;
+      snapshot.current = null;
+      snapshot.currentStage = null;
       if (!snapshot.tasks[taskName]) snapshot.tasks[taskName] = {};
       snapshot.tasks[taskName]!.state = TaskState.DONE;
       snapshot.tasks[taskName]!.currentStage = null;

package/src/ui/client/__tests__/job-adapter.test.ts

@@ -102,6 +102,32 @@ describe("job adapter", () => {
     expect(job.doneCount).toBe(1);
   });
 
+  it("computes progress from pipelineConfig taskCount, ignoring api progress", () => {
+    const job = adaptJobSummary({
+      jobId: "job-1",
+      progress: 100,
+      tasks: {
+        build: { state: "done" },
+        test: { state: "done" },
+        lint: { state: "done" },
+      },
+      pipelineConfig: {
+        tasks: [
+          { name: "build" },
+          { name: "test" },
+          { name: "lint" },
+          { name: "deploy" },
+          { name: "verify" },
+          { name: "publish" },
+        ],
+      },
+    });
+
+    expect(job.taskCount).toBe(6);
+    expect(job.doneCount).toBe(3);
+    expect(job.progress).toBe(50);
+  });
+
   it("falls back to taskList length when pipelineConfig is absent", () => {
     const job = adaptJobSummary({
       jobId: "job-1",

package/src/ui/client/__tests__/useJobDetailWithUpdates.test.ts

@@ -68,6 +68,49 @@ describe("useJobDetailWithUpdates helpers", () => {
     expect(extractJobDetail({ ok: true, data: { jobId: "job-1" } })).toEqual({ jobId: "job-1" });
   });
 
+  it("uses pipelineConfig.tasks.length as authoritative denominator", () => {
+    const detail: NormalizedJobDetail = {
+      ...makeDetail("job-1"),
+      pipelineConfig: {
+        tasks: ["a", "b", "c", "d", "e", "f"],
+      },
+      taskCount: 6,
+      tasks: {
+        a: { name: "a", state: "done", startedAt: null, endedAt: null, files: { artifacts: [], logs: [], tmp: [] } },
+        b: { name: "b", state: "done", startedAt: null, endedAt: null, files: { artifacts: [], logs: [], tmp: [] } },
+        c: { name: "c", state: "done", startedAt: null, endedAt: null, files: { artifacts: [], logs: [], tmp: [] } },
+        d: { name: "d", state: "running", startedAt: null, endedAt: null, files: { artifacts: [], logs: [], tmp: [] } },
+      },
+    };
+
+    const next = applyDetailEvent(detail, {
+      type: "task:updated",
+      data: { jobId: "job-1", taskName: "d", task: { state: "running" } },
+    });
+
+    expect(next.taskCount).toBe(6);
+    expect(next.doneCount).toBe(3);
+    expect(next.progress).toBe(50);
+  });
+
+  it("falls back to local task list length without pipelineConfig", () => {
+    const detail: NormalizedJobDetail = {
+      ...makeDetail("job-1"),
+      pipelineConfig: undefined,
+    };
+
+    const next = applyDetailEvent(detail, {
+      type: "task:updated",
+      data: { jobId: "job-1", taskName: "build", task: { state: "done" } },
+    });
+
+    expect(next.taskCount).toBe(2);
+    expect(next.doneCount).toBe(1);
+    expect(next.progress).toBe(50);
+    expect(next.progress).toBeGreaterThanOrEqual(0);
+    expect(next.progress).toBeLessThanOrEqual(100);
+  });
+
   it("exports the detail debounce constant", () => {
     expect(REFRESH_DEBOUNCE_MS).toBe(200);
   });

package/src/ui/client/adapters/job-adapter.ts

@@ -139,9 +139,11 @@ function adaptBaseJob(apiJob: Record<string, unknown>): NormalizedJobSummary {
   const taskCount = pipelineTaskArray ? pipelineTaskArray.length : taskList.length;
   const inferredStatus = deriveJobStatusFromTasks(taskList);
   const status = normalizeJobStatus(apiJob["status"] ?? inferredStatus);
-  const progress = typeof apiJob["progress"] === "number"
-    ? apiJob["progress"]
-    : taskCount === 0 ? 0 : Math.floor((doneCount / taskCount) * 100);
+  const progress = pipelineTaskArray
+    ? (taskCount === 0 ? 0 : Math.min(100, Math.floor((doneCount / taskCount) * 100)))
+    : typeof apiJob["progress"] === "number"
+      ? apiJob["progress"]
+      : taskCount === 0 ? 0 : Math.min(100, Math.floor((doneCount / taskCount) * 100));
 
   return {
     id: typeof apiJob["id"] === "string" ? apiJob["id"] : String(apiJob["jobId"] ?? ""),

package/src/ui/client/hooks/useJobDetailWithUpdates.ts

@@ -22,15 +22,21 @@ export function extractJobDetail(payload: unknown): Record<string, unknown> | nu
   return null;
 }
 
+function getPipelineTaskCount(detail: NormalizedJobDetail): number | null {
+  const config = detail.pipelineConfig;
+  if (config && Array.isArray(config["tasks"])) return config["tasks"].length;
+  return null;
+}
+
 function recomputeProgress(detail: NormalizedJobDetail): NormalizedJobDetail {
   const tasks = Object.values(detail.tasks);
   const doneCount = tasks.filter((task) => task.state === "done").length;
-  const taskCount = tasks.length;
+  const taskCount = getPipelineTaskCount(detail) ?? tasks.length;
   return {
     ...detail,
     doneCount,
     taskCount,
-    progress: taskCount === 0 ? 0 : Math.floor((doneCount / taskCount) * 100),
+    progress: taskCount === 0 ? 0 : Math.min(100, Math.floor((doneCount / taskCount) * 100)),
     updatedAt: new Date().toISOString(),
   };
 }

package/src/ui/dist/assets/{index-Dgzc8e-G.js → index-CeAgP91B.js}

@@ -21910,7 +21910,7 @@ function adaptBaseJob(apiJob) {
   const taskCount = pipelineTaskArray ? pipelineTaskArray.length : taskList.length;
   const inferredStatus = deriveJobStatusFromTasks(taskList);
   const status = normalizeJobStatus(apiJob["status"] ?? inferredStatus);
-  const progress = typeof apiJob["progress"] === "number" ? apiJob["progress"] : taskCount === 0 ? 0 : Math.floor(doneCount / taskCount * 100);
+  const progress = pipelineTaskArray ? taskCount === 0 ? 0 : Math.min(100, Math.floor(doneCount / taskCount * 100)) : typeof apiJob["progress"] === "number" ? apiJob["progress"] : taskCount === 0 ? 0 : Math.min(100, Math.floor(doneCount / taskCount * 100));
   return {
     id: typeof apiJob["id"] === "string" ? apiJob["id"] : String(apiJob["jobId"] ?? ""),
     jobId: typeof apiJob["jobId"] === "string" ? apiJob["jobId"] : String(apiJob["id"] ?? ""),
@@ -21968,15 +21968,20 @@ function extractJobDetail(payload) {
   if (isRecord$2(payload)) return payload;
   return null;
 }
+function getPipelineTaskCount(detail) {
+  const config = detail.pipelineConfig;
+  if (config && Array.isArray(config["tasks"])) return config["tasks"].length;
+  return null;
+}
 function recomputeProgress(detail) {
   const tasks = Object.values(detail.tasks);
   const doneCount = tasks.filter((task) => task.state === "done").length;
-  const taskCount = tasks.length;
+  const taskCount = getPipelineTaskCount(detail) ?? tasks.length;
   return {
     ...detail,
     doneCount,
     taskCount,
-    progress: taskCount === 0 ? 0 : Math.floor(doneCount / taskCount * 100),
+    progress: taskCount === 0 ? 0 : Math.min(100, Math.floor(doneCount / taskCount * 100)),
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
 }