@ryanfw/prompt-orchestration-pipeline 0.3.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanfw/prompt-orchestration-pipeline",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "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.js",
@@ -26,6 +26,7 @@
     "ui": "NODE_ENV=development nodemon src/ui/server.js",
     "ui:dev": "vite",
     "ui:build": "vite build",
+    "prepack": "npm run ui:build",
     "ui:prod": "node src/ui/server.js",
     "demo:ui": "NODE_ENV=production PO_ROOT=demo node src/ui/server.js",
     "demo:orchestrator": "PO_ROOT=demo NODE_ENV=production node -e \"import('./src/core/orchestrator.js').then(m => m.startOrchestrator({ dataDir: process.env.PO_ROOT || 'demo' })).catch(err => { console.error(err); process.exit(1) })\"",

package/src/cli/index.js

@@ -4,9 +4,14 @@ import { submitJobWithValidation } from "../api/index.js";
 import { PipelineOrchestrator } from "../api/index.js";
 import fs from "node:fs/promises";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
 import { updatePipelineJson } from "./update-pipeline-json.js";
 
+// Derive package root for resolving internal paths regardless of host CWD
+const currentFile = fileURLToPath(import.meta.url);
+const PKG_ROOT = path.dirname(path.dirname(path.dirname(currentFile)));
+
 // Canonical stage names that must match src/core/task-runner.js
 const STAGE_NAMES = [
   "ingestion",
@@ -140,46 +145,29 @@ program
     });
 
     try {
-      // Step d: Build UI once if dist/ doesn't exist
-      const distPath = path.join(process.cwd(), "dist");
+      // Step d: Check for prebuilt UI assets
+      const distPath = path.join(PKG_ROOT, "src/ui/dist");
       try {
         await fs.access(distPath);
         console.log("UI build found, skipping build step");
       } catch {
-        console.log("Building UI...");
-        await new Promise((resolve, reject) => {
-          const vitePath = path.resolve(
-            process.cwd(),
-            "node_modules/vite/bin/vite.js"
-          );
-          const buildChild = spawn("node", [vitePath, "build"], {
-            stdio: "inherit",
-            env: { ...process.env, NODE_ENV: "development" },
-          });
-
-          buildChild.on("exit", (code) => {
-            if (code === 0) {
-              console.log("UI build completed");
-              resolve();
-            } else {
-              reject(new Error(`UI build failed with code ${code}`));
-            }
-          });
-
-          buildChild.on("error", reject);
-        });
+        console.error(
+          "UI assets missing. This indicates a source checkout. Run 'npm run ui:build' locally or install dev deps."
+        );
+        process.exit(1);
       }
 
       // Step e: Spawn UI server
       console.log("Starting UI server...");
-      const uiServerPath = path.resolve(process.cwd(), "src/ui/server.js");
+      const uiServerPath = path.join(PKG_ROOT, "src/ui/server.js");
       uiChild = spawn("node", [uiServerPath], {
         stdio: "pipe",
         env: {
           ...process.env,
           NODE_ENV: "production",
           PO_ROOT: absoluteRoot,
-          PO_UI_PORT: port,
+          PORT: port,
+          PO_UI_PORT: undefined, // Ensure PORT takes precedence
         },
       });
 
@@ -194,8 +182,8 @@ program
 
       // Step f: Spawn orchestrator
       console.log("Starting orchestrator...");
-      const orchestratorPath = path.resolve(
-        process.cwd(),
+      const orchestratorPath = path.join(
+        PKG_ROOT,
         "src/cli/run-orchestrator.js"
       );
       orchestratorChild = spawn("node", [orchestratorPath], {

package/src/core/orchestrator.js

@@ -220,97 +220,111 @@ export async function startOrchestrator(opts) {
  * @param {Object} seed - Seed data containing pipeline information
  */
 function spawnRunner(jobId, dirs, running, spawn, testMode, seed) {
-  const runnerPath = path.join(
-    process.cwd(),
-    "src",
-    "core",
-    "pipeline-runner.js"
-  );
-
-  const configSnapshot = getConfig();
-  const availablePipelines = Object.keys(configSnapshot?.pipelines ?? {});
-  const pipelineSlug = seed?.pipeline;
-
-  console.log("[Orchestrator] spawnRunner invoked", {
-    jobId,
-    pipelineSlug: pipelineSlug ?? null,
-    availablePipelines,
-    seedKeys: seed ? Object.keys(seed) : null,
-  });
+  // Use path relative to this file to avoid process.cwd() issues
+  const orchestratorDir = path.dirname(new URL(import.meta.url).pathname);
+  const runnerPath = path.join(orchestratorDir, "pipeline-runner.js");
 
-  if (!availablePipelines.length) {
-    console.warn(
-      "[Orchestrator] No pipelines registered in config() when spawnRunner invoked"
-    );
-  } else if (!availablePipelines.includes(pipelineSlug)) {
-    console.warn(
-      "[Orchestrator] Requested pipeline slug missing from registry snapshot",
-      {
-        jobId,
-        pipelineSlug,
-        availablePipelines,
-      }
-    );
-  }
+  // Set PO_ROOT for the orchestrator process to match what the runner will use
+  const originalPoRoot = process.env.PO_ROOT;
+  const poRoot = path.resolve(dirs.dataDir, "..");
+  process.env.PO_ROOT = poRoot;
 
-  if (!pipelineSlug) {
-    console.error("[Orchestrator] Missing pipeline slug in seed", {
+  try {
+    const configSnapshot = getConfig();
+    const availablePipelines = Object.keys(configSnapshot?.pipelines ?? {});
+    const pipelineSlug = seed?.pipeline;
+
+    console.log("[Orchestrator] spawnRunner invoked", {
       jobId,
-      seed,
+      pipelineSlug: pipelineSlug ?? null,
       availablePipelines,
+      seedKeys: seed ? Object.keys(seed) : null,
     });
-    throw new Error(
-      "Pipeline slug is required in seed data. Include a 'pipeline' field in your seed."
-    );
-  }
 
-  let pipelineConfig;
-  try {
-    pipelineConfig = getPipelineConfig(pipelineSlug);
-  } catch (error) {
-    console.error("[Orchestrator] Pipeline lookup failed", {
-      jobId,
-      pipelineSlug,
-      availablePipelines,
+    if (!availablePipelines.length) {
+      console.warn(
+        "[Orchestrator] No pipelines registered in config() when spawnRunner invoked"
+      );
+    } else if (!availablePipelines.includes(pipelineSlug)) {
+      console.warn(
+        "[Orchestrator] Requested pipeline slug missing from registry snapshot",
+        {
+          jobId,
+          pipelineSlug,
+          availablePipelines,
+        }
+      );
+    }
+
+    if (!pipelineSlug) {
+      console.error("[Orchestrator] Missing pipeline slug in seed", {
+        jobId,
+        seed,
+        availablePipelines,
+      });
+      throw new Error(
+        "Pipeline slug is required in seed data. Include a 'pipeline' field in your seed."
+      );
+    }
+
+    let pipelineConfig;
+    try {
+      pipelineConfig = getPipelineConfig(pipelineSlug);
+    } catch (error) {
+      console.error("[Orchestrator] Pipeline lookup failed", {
+        jobId,
+        pipelineSlug,
+        availablePipelines,
+      });
+      throw error;
+    }
+
+    // Use environment variables with explicit slug propagation
+    // PO_ROOT should point to the directory containing pipeline-config
+    // In our case, it's the parent of pipeline-data directory
+    const env = {
+      ...process.env,
+      PO_ROOT: poRoot,
+      PO_DATA_DIR: dirs.dataDir,
+      PO_PENDING_DIR: dirs.pending,
+      PO_CURRENT_DIR: dirs.current,
+      PO_COMPLETE_DIR: dirs.complete,
+      PO_PIPELINE_SLUG: pipelineSlug,
+      // Force mock provider for testing
+      PO_DEFAULT_PROVIDER: "mock",
+    };
+
+    // Always call spawn so tests can capture it
+    const child = spawn(process.execPath, [runnerPath, jobId], {
+      stdio: ["ignore", "inherit", "inherit"],
+      env,
+      cwd: process.cwd(),
     });
-    throw error;
-  }
 
-  // Use environment variables with explicit slug propagation
-  const env = {
-    ...process.env,
-    PO_DATA_DIR: dirs.dataDir,
-    PO_PENDING_DIR: dirs.pending,
-    PO_CURRENT_DIR: dirs.current,
-    PO_COMPLETE_DIR: dirs.complete,
-    PO_PIPELINE_SLUG: pipelineSlug,
-    // Force mock provider for testing
-    PO_DEFAULT_PROVIDER: "mock",
-  };
-
-  // Always call spawn so tests can capture it
-  const child = spawn(process.execPath, [runnerPath, jobId], {
-    stdio: ["ignore", "inherit", "inherit"],
-    env,
-    cwd: process.cwd(),
-  });
+    running.set(jobId, child);
 
-  running.set(jobId, child);
+    child.on("exit", () => {
+      running.delete(jobId);
+    });
+    child.on("error", () => {
+      running.delete(jobId);
+    });
 
-  child.on("exit", () => {
-    running.delete(jobId);
-  });
-  child.on("error", () => {
-    running.delete(jobId);
-  });
+    // In test mode: return immediately; in real mode you might await readiness
+    if (testMode) {
+      return child;
+    }
 
-  // In test mode: return immediately; in real mode you might await readiness
-  if (testMode) {
+    // Non-test: we can consider "started" immediately for simplicity
     return child;
+  } finally {
+    // Restore original PO_ROOT
+    if (originalPoRoot) {
+      process.env.PO_ROOT = originalPoRoot;
+    } else {
+      delete process.env.PO_ROOT;
+    }
   }
-
-  // Non-test: we can consider "started" immediately for simplicity
-  return child;
 }
 
 export default { startOrchestrator };