@ryanfw/prompt-orchestration-pipeline 1.3.2 → 1.3.4

package/src/cli/index.ts

@@ -1,14 +1,19 @@
 #!/usr/bin/env bun
 import { Command } from "commander";
 import { mkdir, access } from "node:fs/promises";
-import { resolve, join } from "node:path";
+import { join } from "node:path";
 
 import { STAGE_NAMES, getStagePurpose, KEBAB_CASE_REGEX } from "./constants.ts";
 import { buildReexecArgs, isCompiledBinary } from "./self-reexec.ts";
 import { updatePipelineJson } from "./update-pipeline-json.ts";
 import { analyzeTaskFile } from "./analyze-task.ts";
 import { submitJobWithValidation, PipelineOrchestrator } from "../api/index.ts";
-import type { Registry } from "./types.ts";
+import { resolveWorkspaceRoot } from "../config/paths.ts";
+import {
+  writeRegistry,
+  registerPipeline,
+  REGISTRY_VERSION,
+} from "../config/pipeline-registry.ts";
 import pkg from "../../package.json";
 
 // ─── init ─────────────────────────────────────────────────────────────────────
@@ -21,10 +26,7 @@ export async function handleInit(root: string): Promise<void> {
     await mkdir(join(root, "pipeline-data", sub), { recursive: true });
     await Bun.write(join(root, "pipeline-data", sub, ".gitkeep"), "");
   }
-  await Bun.write(
-    join(root, "registry.json"),
-    JSON.stringify({ pipelines: {} }, null, 2) + "\n"
-  );
+  await writeRegistry(root, { version: REGISTRY_VERSION, pipelines: {} });
 }
 
 // ─── start ────────────────────────────────────────────────────────────────────
@@ -43,18 +45,49 @@ export function buildUiCorsEnv(opts: StartOptions): Record<string, string> {
   return env;
 }
 
+/**
+ * Build the child env objects passed to the spawned `_start-ui` and
+ * `_start-orchestrator` processes. The parent `handleStart` resolves the
+ * workspace root once via `resolveWorkspaceRoot` and transports the absolute
+ * value to the children via `PO_ROOT`; the children perform their own boot
+ * resolution from that transported value.
+ */
+export function buildStartChildEnv(
+  absoluteRoot: string,
+  port: string,
+  opts?: StartOptions,
+): { uiEnv: Record<string, string>; orchEnv: Record<string, string> } {
+  const uiEnv: Record<string, string> = Object.fromEntries(
+    Object.entries({ ...process.env, NODE_ENV: "production", PO_ROOT: absoluteRoot, PORT: port }).filter(
+      (entry): entry is [string, string] => entry[1] !== undefined,
+    ),
+  );
+  delete uiEnv["PO_UI_PORT"];
+
+  const corsEnv = opts ? buildUiCorsEnv(opts) : {};
+  Object.assign(uiEnv, corsEnv);
+
+  const orchEnv: Record<string, string> = Object.fromEntries(
+    Object.entries({ ...process.env, NODE_ENV: "production", PO_ROOT: absoluteRoot }).filter(
+      (entry): entry is [string, string] => entry[1] !== undefined,
+    ),
+  );
+
+  return { uiEnv, orchEnv };
+}
+
 export async function handleStart(
   root: string | undefined,
   port: string,
   opts?: StartOptions,
 ): Promise<void> {
-  const rawRoot = root ?? process.env["PO_ROOT"];
-  if (!rawRoot) {
-    console.error("Error: --root or PO_ROOT environment variable is required");
+  let absoluteRoot: string;
+  try {
+    absoluteRoot = resolveWorkspaceRoot(root);
+  } catch (err) {
+    console.error(err instanceof Error ? err.message : String(err));
     process.exit(1);
   }
-
-  const absoluteRoot = resolve(rawRoot);
   process.env["PO_ROOT"] = absoluteRoot;
 
   if (!isCompiledBinary()) {
@@ -69,21 +102,7 @@ export async function handleStart(
     }
   }
 
-  const uiEnv: Record<string, string> = Object.fromEntries(
-    Object.entries({ ...process.env, NODE_ENV: "production", PO_ROOT: absoluteRoot, PORT: port }).filter(
-      (entry): entry is [string, string] => entry[1] !== undefined
-    )
-  );
-  delete uiEnv["PO_UI_PORT"];
-
-  const corsEnv = opts ? buildUiCorsEnv(opts) : {};
-  Object.assign(uiEnv, corsEnv);
-
-  const orchEnv: Record<string, string> = Object.fromEntries(
-    Object.entries({ ...process.env, NODE_ENV: "production", PO_ROOT: absoluteRoot }).filter(
-      (entry): entry is [string, string] => entry[1] !== undefined
-    )
-  );
+  const { uiEnv, orchEnv } = buildStartChildEnv(absoluteRoot, port, opts);
 
   const uiReexec = buildReexecArgs(["_start-ui"]);
   const orchReexec = buildReexecArgs(["_start-orchestrator"]);
@@ -182,7 +201,10 @@ export async function handleStart(
 
 // ─── submit ───────────────────────────────────────────────────────────────────
 
-export async function handleSubmit(seedFile: string): Promise<void> {
+export async function handleSubmit(
+  seedFile: string,
+  opts: { root?: string } = {},
+): Promise<void> {
   let seedObject: unknown;
   try {
     const text = await Bun.file(seedFile).text();
@@ -192,8 +214,9 @@ export async function handleSubmit(seedFile: string): Promise<void> {
     process.exit(1);
   }
 
+  const root = opts.root ?? process.env["PO_ROOT"] ?? process.cwd();
   try {
-    const result = await submitJobWithValidation({ dataDir: process.cwd(), seedObject });
+    const result = await submitJobWithValidation({ root, seedObject });
     if (result.success) {
       console.log(`Job submitted: ${result.jobId} (${result.jobName})`);
     } else {
@@ -208,8 +231,12 @@ export async function handleSubmit(seedFile: string): Promise<void> {
 
 // ─── status ───────────────────────────────────────────────────────────────────
 
-export async function handleStatus(jobName: string | undefined): Promise<void> {
-  const orchestrator = new PipelineOrchestrator({ autoStart: false });
+export async function handleStatus(
+  jobName: string | undefined,
+  opts: { root?: string } = {},
+): Promise<void> {
+  const root = opts.root ?? process.env["PO_ROOT"] ?? process.cwd();
+  const orchestrator = new PipelineOrchestrator({ autoStart: false, root });
   if (jobName) {
     const result = await orchestrator.getStatus(jobName);
     console.log(JSON.stringify(result, null, 2));
@@ -245,25 +272,7 @@ export async function handleAddPipeline(slug: string, root: string): Promise<voi
     );
     await Bun.write(join(tasksDir, "index.ts"), "export default {};\n");
 
-    const registryPath = join(root, "registry.json");
-    let registry: Registry = { pipelines: {} };
-    try {
-      const text = await Bun.file(registryPath).text();
-      registry = JSON.parse(text) as Registry;
-    } catch {
-      // fallback to empty registry
-    }
-
-    const pipelinePath = join(pipelineDir, "pipeline.json");
-    const taskRegistryPath = join(tasksDir, "index.ts");
-    registry.pipelines[slug] = {
-      name: slug,
-      description: "New pipeline",
-      pipelinePath,
-      taskRegistryPath,
-    };
-
-    await Bun.write(registryPath, JSON.stringify(registry, null, 2) + "\n");
+    await registerPipeline(root, slug, { name: slug, description: "New pipeline" });
   } catch (err) {
     console.error(`Error creating pipeline: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
@@ -393,21 +402,21 @@ export async function handleAnalyze(taskPath: string): Promise<void> {
 
 // ─── Hidden: _start-ui ───────────────────────────────────────────────────────
 
-async function handleStartUi(): Promise<void> {
+export async function handleStartUi(): Promise<void> {
+  // PO_ROOT is the inter-process transport set by `handleStart`; the boot
+  // function (startServer) owns the runtime resolution.
   const { startServer } = await import("../ui/server/index.ts");
   await startServer({
-    dataDir: process.env["PO_ROOT"] ?? process.cwd(),
+    dataDir: process.env["PO_ROOT"],
     port: parseInt(process.env["PORT"] ?? "4000", 10),
   });
 }
 
 // ─── Hidden: _start-orchestrator ─────────────────────────────────────────────
 
-async function handleStartOrchestrator(): Promise<void> {
-  if (!process.env["PO_ROOT"]) {
-    console.error("Error: PO_ROOT environment variable is required");
-    process.exit(1);
-  }
+export async function handleStartOrchestrator(): Promise<void> {
+  // PO_ROOT is the inter-process transport set by `handleStart`; the boot
+  // function (startOrchestrator) owns the runtime resolution.
   const { startOrchestrator } = await import("../core/orchestrator.ts");
   const handle = await startOrchestrator({ dataDir: process.env["PO_ROOT"] });
   process.on("SIGINT", () => {
@@ -420,7 +429,8 @@ async function handleStartOrchestrator(): Promise<void> {
 
 // ─── Hidden: _run-job ─────────────────────────────────────────────────────────
 
-async function handleRunJob(jobId: string): Promise<void> {
+export async function handleRunJob(jobId: string): Promise<void> {
+  // Boot resolution happens inside runPipelineJob; this handler only forwards.
   const { runPipelineJob } = await import("../core/pipeline-runner.ts");
   await runPipelineJob(jobId);
 }
@@ -456,15 +466,17 @@ program
 program
   .command("submit <seed-file>")
   .description("Submit a job from a seed JSON file")
-  .action(async (seedFile: string) => {
-    await handleSubmit(seedFile);
+  .option("--root <path>", "Workspace root")
+  .action(async (seedFile: string, opts: { root?: string }) => {
+    await handleSubmit(seedFile, opts);
   });
 
 program
   .command("status [job-name]")
   .description("Query job status")
-  .action(async (jobName: string | undefined) => {
-    await handleStatus(jobName);
+  .option("--root <path>", "Workspace root")
+  .action(async (jobName: string | undefined, opts: { root?: string }) => {
+    await handleStatus(jobName, opts);
   });
 
 program

package/src/cli/types.ts

@@ -1,16 +1,3 @@
-/** Central index of all pipelines in the workspace. */
-export interface Registry {
-  pipelines: Record<string, PipelineRegistryEntry>;
-}
-
-/** A single pipeline's entry in the registry. */
-export interface PipelineRegistryEntry {
-  name: string;
-  description: string;
-  pipelinePath: string;
-  taskRegistryPath: string;
-}
-
 /** A pipeline's configuration file. */
 export interface PipelineConfig {
   name: string;

package/src/cli/update-pipeline-json.ts

@@ -1,3 +1,4 @@
+import { readJsonFile, writeJsonFile } from "../core/json-file.ts";
 import type { PipelineConfig } from "./types.ts";
 
 export async function updatePipelineJson(
@@ -7,19 +8,7 @@ export async function updatePipelineJson(
 ): Promise<void> {
   const filePath = `${root}/pipeline-config/${pipelineSlug}/pipeline.json`;
 
-  let config: PipelineConfig;
-  try {
-    const text = await Bun.file(filePath).text();
-    const parsed = JSON.parse(text) as PipelineConfig;
-    config = parsed;
-  } catch {
-    config = {
-      name: pipelineSlug,
-      version: "1.0.0",
-      description: "New pipeline",
-      tasks: [],
-    };
-  }
+  const config = await readJsonFile<PipelineConfig>(filePath);
 
   if (!Array.isArray(config.tasks)) {
     config.tasks = [];
@@ -29,5 +18,5 @@ export async function updatePipelineJson(
     config.tasks.push(taskSlug);
   }
 
-  await Bun.write(filePath, JSON.stringify(config, null, 2) + "\n");
+  await writeJsonFile(filePath, config);
 }

package/src/config/__tests__/paths.test.ts

@@ -1,5 +1,7 @@
-import { describe, it, expect } from "bun:test";
+import { describe, it, expect, beforeEach, afterEach } from "bun:test";
+import { resolve } from "node:path";
 import {
+  resolveWorkspaceRoot,
   resolvePipelinePaths,
   getPendingSeedPath,
   getCurrentSeedPath,
@@ -119,3 +121,46 @@ describe("getJobPipelinePath", () => {
     );
   });
 });
+
+describe("resolveWorkspaceRoot", () => {
+  const originalPoRoot = process.env["PO_ROOT"];
+
+  beforeEach(() => {
+    delete process.env["PO_ROOT"];
+  });
+
+  afterEach(() => {
+    if (originalPoRoot === undefined) {
+      delete process.env["PO_ROOT"];
+    } else {
+      process.env["PO_ROOT"] = originalPoRoot;
+    }
+  });
+
+  it("returns resolve(explicit) when explicit is set", () => {
+    process.env["PO_ROOT"] = "/from-env";
+    expect(resolveWorkspaceRoot("/from-arg")).toBe("/from-arg");
+  });
+
+  it("returns resolve(PO_ROOT) when only PO_ROOT is set", () => {
+    process.env["PO_ROOT"] = "/from-env";
+    expect(resolveWorkspaceRoot()).toBe(resolve("/from-env"));
+  });
+
+  it("explicit wins over PO_ROOT", () => {
+    process.env["PO_ROOT"] = "/from-env";
+    expect(resolveWorkspaceRoot("/from-arg")).not.toBe(resolve("/from-env"));
+  });
+
+  it("throws naming --root and PO_ROOT when neither is set", () => {
+    expect(() => resolveWorkspaceRoot()).toThrow(
+      "Workspace root is required: pass --root or set PO_ROOT",
+    );
+  });
+
+  it("returns an absolute path for a relative input", () => {
+    expect(resolveWorkspaceRoot("relative/root")).toBe(
+      resolve("relative/root"),
+    );
+  });
+});