@nbardy/oompa 0.4.9 → 0.5.1

package/agentnet/src/agentnet/worker.clj

@@ -225,14 +225,16 @@
 (defn- run-reviewer!
   "Run reviewer on worktree changes.
    Returns {:verdict :approved|:needs-changes|:rejected, :comments [...]}"
-  [{:keys [review-harness review-model]} worktree-path]
+  [{:keys [id swarm-id review-harness review-model]} worktree-path]
   (let [;; Get diff for context
         diff-result (process/sh ["git" "diff" "main" "--stat"]
                                 {:dir worktree-path :out :string :err :string})
         diff-summary (:out diff-result)
 
-        ;; Build review prompt
-        review-prompt (str "Review the changes in this worktree.\n\n"
+        ;; Build review prompt (tagged for claude-web-view worker detection)
+        swarm-id* (or swarm-id "unknown")
+        review-prompt (str "[oompa:" swarm-id* ":" id "] "
+                           "Review the changes in this worktree.\n\n"
                            "Diff summary:\n" diff-summary "\n\n"
                            "Check for:\n"
                            "- Code correctness\n"
@@ -277,8 +279,10 @@
 (defn- run-fix!
   "Ask worker to fix issues based on reviewer feedback.
    Returns {:output string, :exit int}"
-  [{:keys [harness model]} worktree-path feedback]
-  (let [fix-prompt (str "The reviewer found issues with your changes:\n\n"
+  [{:keys [id swarm-id harness model]} worktree-path feedback]
+  (let [swarm-id* (or swarm-id "unknown")
+        fix-prompt (str "[oompa:" swarm-id* ":" id "] "
+                        "The reviewer found issues with your changes:\n\n"
                         feedback "\n\n"
                         "Please fix these issues in the worktree.")
 
@@ -304,13 +308,19 @@
     {:output (:out result)
      :exit (:exit result)}))
 
+(defn- worktree-has-changes?
+  "Check if worktree has any uncommitted changes (new/modified/deleted files)."
+  [wt-path]
+  (let [result (process/sh ["git" "status" "--porcelain"] {:dir wt-path :out :string :err :string})]
+    (not (str/blank? (:out result)))))
+
 (defn- merge-to-main!
   "Merge worktree changes to main branch"
   [wt-path wt-id worker-id project-root]
   (println (format "[%s] Merging changes to main" worker-id))
   (let [;; Commit in worktree if needed
         _ (process/sh ["git" "add" "-A"] {:dir wt-path})
-        _ (process/sh ["git" "commit" "-m" (str "Work from " wt-id) "--allow-empty"]
+        _ (process/sh ["git" "commit" "-m" (str "Work from " wt-id)]
                       {:dir wt-path})
         ;; Checkout main and merge (in project root, not worktree)
         checkout-result (process/sh ["git" "checkout" "main"]
@@ -394,19 +404,32 @@
             {:keys [output exit done?]} (run-agent! worker wt-path context)]
 
         (cond
-          ;; Agent signaled done
-          done?
+          ;; Agent signaled done — only honor for can_plan workers.
+          ;; Executors (can_plan: false) can't decide work is done.
+          (and done? (:can-plan worker))
           (do
             (println (format "[%s] Received __DONE__ signal" worker-id))
             {:status :done})
 
+          ;; can_plan: false worker said __DONE__ — ignore it, treat as success
+          (and done? (not (:can-plan worker)))
+          (do
+            (println (format "[%s] Ignoring __DONE__ (executor cannot signal done)" worker-id))
+            {:status :continue})
+
           ;; Agent errored
           (not (zero? exit))
           (do
             (println (format "[%s] Agent error (exit %d): %s" worker-id exit (subs (or output "") 0 (min 200 (count (or output ""))))))
             {:status :error :exit exit})
 
-          ;; Success - run review loop before merge
+          ;; Agent produced no file changes — wasted iteration
+          (not (worktree-has-changes? wt-path))
+          (do
+            (println (format "[%s] No changes produced, skipping review" worker-id))
+            {:status :no-changes})
+
+          ;; Success with changes - run review loop before merge
           :else
           (let [{:keys [approved?]} (review-loop! worker wt-path worker-id)]
             (if approved?
@@ -492,6 +515,9 @@
                                    id iter iterations errors max-consecutive-errors))
                   (recur (inc iter) completed errors))))
 
+            :no-changes
+            (recur (inc iter) completed consec-errors)
+
             :continue
             (recur (inc iter) (inc completed) 0)))))))
 

package/config/prompts/_task_header.md

@@ -35,13 +35,22 @@ cat > ../tasks/pending/task-NNN.edn << 'EOF'
 EOF
 ```
 
+### Planning vs Executing
+
+**WHEN PLANNING** (task queue is empty or nearly empty):
+- Your FIRST priority is creating tasks for other workers. They are waiting.
+- Read the project spec, identify gaps, and create 5-10 focused, well-detailed tasks.
+- Do NOT execute tasks in the same iteration you create them.
+- Commit the task files and finish your iteration so others can claim them immediately.
+
+**WHEN EXECUTING** (tasks exist in pending):
+- Claim one task, execute it end-to-end, complete it.
+- If work emerges during execution, create new tasks in `../tasks/pending/`.
+
 ### Rules
 
 - Before starting work: read the project spec and all tasks to understand scope.
-- **If `../tasks/pending/` is empty or nearly empty: your FIRST priority is to create tasks.** Read the project spec, identify gaps, and write 3-5 focused tasks before doing anything else. Other workers are waiting for work.
 - Claim your task by moving it to `../tasks/current/`.
 - If the `mv` fails (another worker claimed it first), pick a different task.
 - One task per commit (or a small, tightly-related set with overlapping files).
-- If tasks are missing or underspecified: stop and write tasks before coding.
-- If work emerges during execution: create new tasks in `../tasks/pending/`.
-- Only output __DONE__ if you have completed work AND no more tasks can be derived from the spec. Never __DONE__ on your first action — always create or execute at least one task first.
+- Only output __DONE__ if you have completed work AND no more tasks can be derived from the spec. Never __DONE__ on your first action.

package/package.json

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