@nbardy/oompa 0.4.4 → 0.4.6

package/agentnet/src/agentnet/cli.clj

@@ -141,8 +141,8 @@
   [harness model]
   (try
     (let [cmd (case harness
-                :claude ["claude" "--model" model "-p" "say ok" "--max-turns" "1"]
-                :codex  ["codex" "exec" "--dangerously-bypass-approvals-and-sandbox" "--skip-git-repo-check" "--model" model "--" "say ok"])
+                :claude ["claude" "--model" model "-p" "[oompa:probe] say ok" "--max-turns" "1"]
+                :codex  ["codex" "exec" "--dangerously-bypass-approvals-and-sandbox" "--skip-git-repo-check" "--model" model "--" "[oompa:probe] say ok"])
           null-in (io/input-stream (io/file "/dev/null"))
           proc (process/process cmd {:out :string :err :string :in null-in})
           result (deref proc 30000 :timeout)]

package/agentnet/src/agentnet/worker.clj

@@ -97,6 +97,26 @@
   "Root of the oompa package — set by bin/oompa.js, falls back to cwd."
   (or (System/getenv "OOMPA_PACKAGE_ROOT") "."))
 
+;; Resolve absolute paths for CLI binaries at first use.
+;; ProcessBuilder with :dir set can fail to find bare command names on some
+;; platforms (macOS + babashka), so we resolve once via `which` and cache.
+(def ^:private binary-paths* (atom {}))
+
+(defn- resolve-binary!
+  "Resolve the absolute path of a CLI binary. Caches result.
+   Throws if binary not found on PATH."
+  [name]
+  (or (get @binary-paths* name)
+      (let [result (try
+                     (process/sh ["which" name] {:out :string :err :string})
+                     (catch Exception _ {:exit -1 :out "" :err ""}))
+            path (when (zero? (:exit result))
+                   (str/trim (:out result)))]
+        (if path
+          (do (swap! binary-paths* assoc name path)
+              path)
+          (throw (ex-info (str "Binary not found on PATH: " name) {:binary name}))))))
+
 (defn- load-prompt
   "Load a prompt file. Tries path as-is first, then from package root."
   [path]
@@ -172,14 +192,14 @@
         ;; Build command — both harnesses run with cwd=worktree, no sandbox
         ;; so agents can `..` to reach project root for task management
         cmd (case harness
-              :codex (cond-> ["codex" "exec"
+              :codex (cond-> [(resolve-binary! "codex") "exec"
                               "--dangerously-bypass-approvals-and-sandbox"
                               "--skip-git-repo-check"
                               "-C" abs-worktree]
                        model (into ["--model" model])
                        reasoning (into ["-c" (str "model_reasoning_effort=\"" reasoning "\"")])
                        true (conj "--" full-prompt))
-              :claude (cond-> ["claude" "-p" "--dangerously-skip-permissions"
+              :claude (cond-> [(resolve-binary! "claude") "-p" "--dangerously-skip-permissions"
                                "--session-id" session-id]
                         model (into ["--model" model])))
 
@@ -227,13 +247,13 @@
 
         ;; Build command — cwd=worktree, no sandbox
         cmd (case review-harness
-              :codex (cond-> ["codex" "exec"
+              :codex (cond-> [(resolve-binary! "codex") "exec"
                               "--dangerously-bypass-approvals-and-sandbox"
                               "--skip-git-repo-check"
                               "-C" abs-wt]
                        review-model (into ["--model" review-model])
                        true (conj "--" review-prompt))
-              :claude (cond-> ["claude" "-p" "--dangerously-skip-permissions"]
+              :claude (cond-> [(resolve-binary! "claude") "-p" "--dangerously-skip-permissions"]
                         review-model (into ["--model" review-model])))
 
         ;; Run reviewer — cwd=worktree
@@ -265,13 +285,13 @@
         abs-wt (.getAbsolutePath (io/file worktree-path))
 
         cmd (case harness
-              :codex (cond-> ["codex" "exec"
+              :codex (cond-> [(resolve-binary! "codex") "exec"
                               "--dangerously-bypass-approvals-and-sandbox"
                               "--skip-git-repo-check"
                               "-C" abs-wt]
                        model (into ["--model" model])
                        true (conj "--" fix-prompt))
-              :claude (cond-> ["claude" "-p" "--dangerously-skip-permissions"]
+              :claude (cond-> [(resolve-binary! "claude") "-p" "--dangerously-skip-permissions"]
                         model (into ["--model" model])))
 
         result (try
@@ -356,8 +376,16 @@
         wt-path (str project-root "/" wt-dir)]
 
     (try
-      ;; Setup worktree (in project root) — dir starts with . but branch name must be valid
-      (process/sh ["git" "worktree" "add" wt-dir "-b" wt-branch] {:dir project-root})
+      ;; Clean stale worktree/branch from previous failed runs before creating
+      (process/sh ["git" "worktree" "remove" wt-dir "--force"] {:dir project-root})
+      (process/sh ["git" "branch" "-D" wt-branch] {:dir project-root})
+
+      ;; Setup worktree (in project root)
+      (let [wt-result (process/sh ["git" "worktree" "add" wt-dir "-b" wt-branch]
+                                  {:dir project-root :out :string :err :string})]
+        (when-not (zero? (:exit wt-result))
+          (throw (ex-info (str "Failed to create worktree: " (:err wt-result))
+                          {:dir wt-dir :branch wt-branch}))))
 
       ;; Build context
       (let [context (build-context)
@@ -391,8 +419,9 @@
                 {:status :continue})))))
 
       (finally
-        ;; Cleanup worktree (in project root)
-        (process/sh ["git" "worktree" "remove" wt-dir "--force"] {:dir project-root})))))
+        ;; Cleanup worktree and branch (in project root)
+        (process/sh ["git" "worktree" "remove" wt-dir "--force"] {:dir project-root})
+        (process/sh ["git" "branch" "-D" wt-branch] {:dir project-root})))))
 
 ;; =============================================================================
 ;; Worker Loop
@@ -400,6 +429,7 @@
 
 (def ^:private max-wait-for-tasks 60)
 (def ^:private wait-poll-interval 5)
+(def ^:private max-consecutive-errors 3)
 
 (defn- wait-for-tasks!
   "Wait up to 60s for pending/current tasks to appear. Used for backpressure
@@ -436,7 +466,8 @@
       (wait-for-tasks! id))
 
     (loop [iter 1
-           completed 0]
+           completed 0
+           consec-errors 0]
       (if (> iter iterations)
         (do
           (println (format "[%s] Completed %d iterations" id completed))
@@ -450,12 +481,18 @@
               (assoc worker :completed iter :status :done))
 
             :error
-            (do
-              (println (format "[%s] Worker error at iteration %d/%d, continuing..." id iter iterations))
-              (recur (inc iter) completed))
+            (let [errors (inc consec-errors)]
+              (if (>= errors max-consecutive-errors)
+                (do
+                  (println (format "[%s] %d consecutive errors, stopping worker" id errors))
+                  (assoc worker :completed completed :status :error))
+                (do
+                  (println (format "[%s] Error at iteration %d/%d (%d/%d), continuing..."
+                                   id iter iterations errors max-consecutive-errors))
+                  (recur (inc iter) completed errors))))
 
             :continue
-            (recur (inc iter) (inc completed))))))))
+            (recur (inc iter) (inc completed) 0))))))))
 
 ;; =============================================================================
 ;; Multi-Worker Execution

package/bin/test-models

@@ -37,9 +37,9 @@ if [ -z "$MODELS" ]; then
   exit 1
 fi
 
-# Create results directory
+# Create results directory in /tmp so it doesn't litter the project
 RUN_ID=$(python3 -c "import uuid; print(str(uuid.uuid4())[:8])")
-RESULTS_DIR="tst_results_${RUN_ID}"
+RESULTS_DIR="/tmp/oompa_tst_${RUN_ID}"
 mkdir -p "$RESULTS_DIR"
 
 MODEL_COUNT=$(echo "$MODELS" | wc -l | tr -d ' ')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbardy/oompa",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Git-worktree multi-agent swarm orchestrator for Codex and Claude",
   "license": "MIT",
   "type": "commonjs",