@ryanfw/prompt-orchestration-pipeline 1.3.1 → 1.3.2

package/src/harness/__tests__/discovery.test.ts

@@ -25,14 +25,8 @@ describe("healedPath", () => {
   });
 
   it("does not duplicate dirs already on the base PATH", () => {
-    // Add an existing standard dir to the base PATH, then check it's not duplicated
-    const home = process.env.HOME ?? "";
-    const testDir = join(home, ".local/bin");
-    // Only test if that dir actually exists on this machine
-    const result = healedPath(`${testDir}:/usr/bin`);
-    const count = result.split(":").filter((d) => d === testDir).length;
-    // Should be 0 or 1 — if dir exists it appears once, if not it appears zero times
-    expect(count).toBeLessThanOrEqual(1);
+    const result = healedPath(`${existingDir}:/usr/bin`, [existingDir]);
+    expect(result.split(":").filter((d) => d === existingDir)).toHaveLength(1);
   });
 
   it("defaults to process.env.PATH when basePath is undefined", () => {
@@ -180,4 +174,62 @@ describe("applyHarnessDiscovery", () => {
     expect(env.POP_CODEX_BIN).toBeUndefined();
     expect(env.LLM_ADAPTER_CODEX_BIN).toBeUndefined();
   });
+
+  it("bridges existing POP_* binary overrides to adapter env vars when discovery misses", () => {
+    const env: Record<string, string | undefined> = {
+      PATH: "/usr/bin",
+      POP_OPENCODE_BIN: "/custom/opencode",
+    };
+    const statuses: Record<HarnessName, HarnessStatus> = {
+      opencode: makeStatus({ name: "opencode", installed: false }),
+      claude: makeStatus({ name: "claude", installed: false }),
+      codex: makeStatus({ name: "codex", installed: false }),
+    };
+
+    const messages = applyHarnessDiscovery(statuses, env);
+
+    expect(env.POP_OPENCODE_BIN).toBe("/custom/opencode");
+    expect(env.LLM_ADAPTER_OPENCODE_BIN).toBe("/custom/opencode");
+    expect(messages.find((m) => m.message.includes('"opencode"'))).toMatchObject({
+      level: "info",
+    });
+  });
+
+  it("bridges existing adapter binary overrides back to POP env vars when discovery misses", () => {
+    const env: Record<string, string | undefined> = {
+      PATH: "/usr/bin",
+      LLM_ADAPTER_CODEX_BIN: "/custom/codex",
+    };
+    const statuses: Record<HarnessName, HarnessStatus> = {
+      opencode: makeStatus({ name: "opencode", installed: false }),
+      claude: makeStatus({ name: "claude", installed: false }),
+      codex: makeStatus({ name: "codex", installed: false }),
+    };
+
+    applyHarnessDiscovery(statuses, env);
+
+    expect(env.LLM_ADAPTER_CODEX_BIN).toBe("/custom/codex");
+    expect(env.POP_CODEX_BIN).toBe("/custom/codex");
+  });
+
+  it("keeps POP_* binary overrides ahead of discovered PATH binaries", () => {
+    const env: Record<string, string | undefined> = {
+      PATH: "/usr/bin",
+      POP_CODEX_BIN: "/custom/codex",
+    };
+    const statuses: Record<HarnessName, HarnessStatus> = {
+      opencode: makeStatus({ name: "opencode", installed: false }),
+      claude: makeStatus({ name: "claude", installed: false }),
+      codex: makeStatus({ name: "codex", installed: true, binPath: "/path/codex", authenticated: true }),
+    };
+
+    const messages = applyHarnessDiscovery(statuses, env);
+
+    expect(env.POP_CODEX_BIN).toBe("/custom/codex");
+    expect(env.LLM_ADAPTER_CODEX_BIN).toBe("/custom/codex");
+    expect(messages.find((m) => m.message.includes('"codex"'))).toMatchObject({
+      level: "info",
+      message: 'harness "codex": using configured binary override /custom/codex',
+    });
+  });
 });

package/src/harness/discovery.ts

@@ -32,11 +32,11 @@ function standardBinDirs(): string[] {
  * Build a PATH with known bin dirs prepended — keeping only dirs that exist
  * and are not already present.
  */
-export function healedPath(basePath?: string): string {
+export function healedPath(basePath?: string, candidateDirs = standardBinDirs()): string {
   const current = (basePath ?? process.env.PATH ?? "").split(":").filter(Boolean);
   const seen = new Set(current);
   const prepend: string[] = [];
-  for (const dir of standardBinDirs()) {
+  for (const dir of candidateDirs) {
     if (dir && !seen.has(dir) && existsSync(dir)) {
       prepend.push(dir);
       seen.add(dir);
@@ -68,12 +68,22 @@ export function applyHarnessDiscovery(
 
   const messages: PreflightMessage[] = [];
   for (const status of Object.values(statuses) as HarnessStatus[]) {
-    if (status.binPath) {
-      env[adapterBinEnvVar(status.name)] = status.binPath;
-      env[popBinEnvVar(status.name)] = status.binPath;
+    const adapterEnv = adapterBinEnvVar(status.name);
+    const popEnv = popBinEnvVar(status.name);
+    const explicitBin = env[popEnv] ?? env[adapterEnv];
+    const configuredBin = explicitBin ?? status.binPath;
+
+    if (configuredBin) {
+      env[adapterEnv] = configuredBin;
+      env[popEnv] = configuredBin;
     }
 
-    if (!status.installed) {
+    if (explicitBin) {
+      messages.push({
+        level: "info",
+        message: `harness "${status.name}": using configured binary override ${configuredBin}`,
+      });
+    } else if (!status.installed && !configuredBin) {
       messages.push({
         level: "warn",
         message: `harness "${status.name}": CLI not found on PATH or known install dirs; agent steps using it will fail until it is installed`,

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

@@ -33,8 +33,23 @@ function sortNormalizedJobs(jobs: NormalizedJobSummary[]): NormalizedJobSummary[
   });
 }
 
+function completedCountFromTasks(job: NormalizedJobSummary): number {
+  return Object.values(job.tasks).filter((task) => task.state === "done" || task.state === "skipped").length;
+}
+
+function comparableJob(job: NormalizedJobSummary): Record<string, unknown> {
+  const comparable: Record<string, unknown> = { ...job };
+  for (const [key, value] of Object.entries(comparable)) {
+    if (value === undefined) delete comparable[key];
+  }
+  if (comparable["completedCount"] === completedCountFromTasks(job)) {
+    delete comparable["completedCount"];
+  }
+  return comparable;
+}
+
 function jobsEqual(left: NormalizedJobSummary[], right: NormalizedJobSummary[]): boolean {
-  return JSON.stringify(left) === JSON.stringify(right);
+  return JSON.stringify(left.map(comparableJob)) === JSON.stringify(right.map(comparableJob));
 }
 
 function mergeJob(current: NormalizedJobSummary, incoming: NormalizedJobSummary): NormalizedJobSummary {

package/src/ui/dist/assets/{index-CbS3OsW7.js → index--RH3sAt3.js}

@@ -78431,8 +78431,21 @@ function sortNormalizedJobs(jobs) {
     return left.jobId.localeCompare(right.jobId);
   });
 }
+function completedCountFromTasks(job) {
+  return Object.values(job.tasks).filter((task) => task.state === "done" || task.state === "skipped").length;
+}
+function comparableJob(job) {
+  const comparable = { ...job };
+  for (const [key, value] of Object.entries(comparable)) {
+    if (value === void 0) delete comparable[key];
+  }
+  if (comparable["completedCount"] === completedCountFromTasks(job)) {
+    delete comparable["completedCount"];
+  }
+  return comparable;
+}
 function jobsEqual(left, right) {
-  return JSON.stringify(left) === JSON.stringify(right);
+  return JSON.stringify(left.map(comparableJob)) === JSON.stringify(right.map(comparableJob));
 }
 function mergeJob(current, incoming) {
   return {