@nbardy/oompa 0.7.1 → 0.7.3

package/README.md

@@ -83,9 +83,9 @@ This repo has a fleshed out version of the idea. The oompa loompas are organized
 ```json
 {
   "workers": [
-    {"model": "claude:opus", "prompt": ["config/prompts/planner.md"], "iterations": 5, "count": 1},
-    {"model": "codex:gpt-5.3-codex:medium", "prompt": ["config/prompts/executor.md"], "iterations": 10, "count": 2, "can_plan": false},
-    {"model": "opencode:opencode/kimi-k2.5-free", "prompt": ["config/prompts/executor.md"], "iterations": 10, "count": 1, "can_plan": false}
+    {"model": "claude:opus", "prompt": ["config/prompts/planner.md"], "max_cycle": 5, "count": 1},
+    {"model": "codex:gpt-5.3-codex:medium", "prompt": ["config/prompts/executor.md"], "max_cycle": 10, "count": 2, "can_plan": false},
+    {"model": "opencode:opencode/kimi-k2.5-free", "prompt": ["config/prompts/executor.md"], "max_cycle": 10, "count": 1, "can_plan": false}
   ]
 }
 ```
@@ -101,9 +101,12 @@ This spawns:
 |-------|----------|-------------|
 | `model` | yes | `harness:model` or `harness:model:reasoning` (e.g. `codex:gpt-5.3-codex:medium`, `claude:opus`, `opencode:opencode/kimi-k2.5-free`) |
 | `prompt` | no | String or array of paths — concatenated into one prompt |
-| `iterations` | no | Max iterations per worker (default: 10) |
+| `max_cycle` | no | Max worker cycles for JSON config runs (default: 10) |
 | `count` | no | Number of workers with this config (default: 1) |
 | `can_plan` | no | If `false`, worker waits for tasks before starting (default: `true`) |
+| `max_wait_for_tasks` | no | Max seconds a `can_plan: false` worker waits for queue work (default: `600`) |
+
+`oompa loop` still uses the CLI flag `--iterations`. JSON worker configs use `max_cycle`.
 
 #### Composable prompts
 
@@ -191,7 +194,10 @@ cd oompa
 echo "Build a simple todo API with CRUD endpoints" > spec.md
 
 # Run the swarm
-./swarm.bb swarm
+./swarm.bb run
+
+# Run detached with startup validation (fails fast if startup fails)
+./swarm.bb run --detach --config oompa.json
 ```
 
 ## Install (npm)
@@ -212,7 +218,12 @@ oompa swarm
 ## Commands
 
 ```bash
-oompa swarm [file]          # Run from oompa.json (default)
+oompa run [file]            # Run from config (defaults: oompa.json, oompa/oompa.json)
+oompa run --detach --config oompa.json
+oompa swarm [file]          # Direct swarm command (foreground)
+oompa list                  # List 20 most recent swarms
+oompa list --all            # Full swarm history
+oompa view [swarm-id]       # Per-worker runtime status (default: latest swarm)
 oompa tasks                 # Show task status
 oompa check                 # Check available backends
 oompa cleanup               # Remove worktrees

package/agentnet/src/agentnet/agent.clj

@@ -88,16 +88,39 @@
       attach (into ["--attach" attach])
       true (conj prompt))))
 
-(defmethod build-command :gemini
-  [_ {:keys [model]} prompt cwd]
-  (cond-> ["gemini" "--yolo"]
+(defn- gemini-cmd
+  [agent-type model prompt]
+  (cond-> [(name agent-type) "--yolo"]
     model (into ["-m" model])
     true (into ["-p" prompt])))
 
+(defn- gemini-alias?
+  [agent-type]
+  (and (keyword? agent-type)
+       (re-matches #"^gemini\\d+$" (name agent-type))))
+
+(defmethod build-command :gemini
+  [_ {:keys [model]} prompt cwd]
+  (gemini-cmd :gemini model prompt))
+
+(defmethod build-command :gemini1
+  [agent-type {:keys [model]} prompt cwd]
+  (gemini-cmd agent-type model prompt))
+
+(defmethod build-command :gemini2
+  [agent-type {:keys [model]} prompt cwd]
+  (gemini-cmd agent-type model prompt))
+
+(defmethod build-command :gemini3
+  [agent-type {:keys [model]} prompt cwd]
+  (gemini-cmd agent-type model prompt))
+
 (defmethod build-command :default
-  [agent-type _ _ _]
-  (throw (ex-info (str "Unknown agent type: " agent-type)
-                  {:agent-type agent-type})))
+  [agent-type {:keys [model]} prompt _]
+  (if (gemini-alias? agent-type)
+    (gemini-cmd agent-type model prompt)
+    (throw (ex-info (str "Unknown agent type: " agent-type)
+                    {:agent-type agent-type}))))
 
 ;; =============================================================================
 ;; Process Execution
@@ -153,16 +176,12 @@
   #"(?m)^\s*#oompa_directive:include_file\s+\"([^\"]+)\"\s*$")
 
 (defn- read-file-cached
-  "Read a prompt file once and cache by canonical path."
+  "Reads prompts fresh on each run so roles can be edited live. It is a fast op."
   [path]
   (when path
-    (if-let [cached (get @prompt-file-cache path)]
-      cached
-      (let [f (io/file path)]
-        (when (.exists f)
-          (let [content (slurp f)]
-            (swap! prompt-file-cache assoc path content)
-            content))))))
+    (let [f (io/file path)]
+      (when (.exists f)
+        (slurp f)))))
 
 (defn- resolve-include-path
   "Resolve an include path relative to the file that declares it."
@@ -253,6 +272,11 @@
   [output]
   (boolean (re-find #"COMPLETE_AND_READY_FOR_MERGE" (or output ""))))
 
+(defn needs-followup-signal?
+  "Check if output contains NEEDS_FOLLOWUP signal"
+  [output]
+  (boolean (re-find #"NEEDS_FOLLOWUP" (or output ""))))
+
 (defn parse-claim-signal
   "Extract task IDs from CLAIM(...) signal in output.
    Returns vector of task ID strings, or nil if no CLAIM signal found.
@@ -396,12 +420,13 @@
 (defn check-available
   "Check if agent backend is available"
   [agent-type]
-  (let [cmd (case agent-type
-              :codex ["codex" "--version"]
-              :claude ["claude" "--version"]
-              :opencode ["opencode" "--version"]
-              :gemini ["gemini" "--version"]
-              ["echo" "unknown"])]
+  (let [cmd (cond
+              (= :codex agent-type) ["codex" "--version"]
+              (= :claude agent-type) ["claude" "--version"]
+              (= :opencode agent-type) ["opencode" "--version"]
+              (= :gemini agent-type) ["gemini" "--version"]
+              (gemini-alias? agent-type) [(name agent-type) "--version"]
+              :else ["echo" "unknown"])]
     (try
       (let [{:keys [exit]} (process/sh cmd {:out :string :err :string})]
         (zero? exit))