@nbardy/oompa 0.7.0 → 0.7.2

package/README.md

@@ -85,7 +85,7 @@ This repo has a fleshed out version of the idea. The oompa loompas are organized
   "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:openai/gpt-5", "prompt": ["config/prompts/executor.md"], "iterations": 10, "count": 1, "can_plan": false}
+    {"model": "opencode:opencode/kimi-k2.5-free", "prompt": ["config/prompts/executor.md"], "iterations": 10, "count": 1, "can_plan": false}
   ]
 }
 ```
@@ -93,17 +93,18 @@ This repo has a fleshed out version of the idea. The oompa loompas are organized
 This spawns:
 - **1 planner** (opus) — reads spec, explores codebase, creates/refines tasks
 - **2 codex executors** (gpt-5.3-codex, medium reasoning) — claims and executes tasks fast
-- **1 opencode executor** (openai/gpt-5) — same task loop via `opencode run`
+- **1 opencode executor** (opencode/kimi-k2.5-free) — same task loop via `opencode run`
 
 #### Worker fields
 
 | Field | Required | Description |
 |-------|----------|-------------|
-| `model` | yes | `harness:model` or `harness:model:reasoning` (e.g. `codex:gpt-5.3-codex:medium`, `claude:opus`, `opencode:openai/gpt-5`) |
+| `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) |
 | `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`) |
 
 #### Composable prompts
 
@@ -113,7 +114,7 @@ This spawns:
 {
   "workers": [
     {"model": "claude:opus-4.5", "prompt": ["prompts/base.md", "prompts/architect.md"], "count": 1},
-    {"model": "opencode:openai/gpt-5-mini", "prompt": ["prompts/base.md", "prompts/frontend.md"], "count": 2},
+    {"model": "opencode:opencode/kimi-k2.5-free", "prompt": ["prompts/base.md", "prompts/frontend.md"], "count": 2},
     {"model": "codex:codex-5.2-mini", "prompt": ["prompts/base.md", "prompts/backend.md"], "count": 2}
   ]
 }
@@ -121,6 +122,23 @@ This spawns:
 
 Every worker automatically gets task management instructions injected above your prompts. Your prompts just say *what* the worker should do — the framework handles *how* tasks work.
 
+#### Prompt includes
+
+Prompts support `#oompa_directive:include_file "path/to/file.md"` lines.
+
+Use it to share common instructions across roles without copying content.  
+Paths are resolved relative to the prompt file containing the directive.
+
+Example:
+
+```md
+#oompa_directive:include_file "config/prompts/_agent_scope_rules.md"
+
+You are an executor. Focus on minimal changes and complete tasks.
+```
+
+The included file is inlined during prompt load, with a short header noting the injected source.
+
 ### Task System
 
 Workers self-organize via the filesystem. Tasks live at the project root and are shared across all worktrees:
@@ -174,7 +192,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)
@@ -195,7 +216,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,10 +88,39 @@
       attach (into ["--attach" attach])
       true (conj prompt))))
 
+(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
@@ -125,7 +154,102 @@
      :stdout (truncate (:out result) 10000)
      :stderr (truncate (:err result) 5000)
      :duration-ms (- (now-ms) start)
-     :timed-out? (boolean (:timed-out result))}))
+              :timed-out? (boolean (:timed-out result))}))
+
+;; =============================================================================
+;; Prompt Loading Helpers
+;; =============================================================================
+
+(defn- file-canonical-path
+  "Resolve a path for cache keys and cycle detection."
+  [path]
+  (try
+    (.getCanonicalPath (io/file path))
+    (catch Exception _
+      path)))
+
+(def ^:private prompt-file-cache
+  "Cache for prompt include expansion."
+  (atom {}))
+
+(def ^:private include-directive-pattern
+  #"(?m)^\s*#oompa_directive:include_file\s+\"([^\"]+)\"\s*$")
+
+(defn- read-file-cached
+  "Read a prompt file once and cache by canonical path."
+  [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))))))
+
+(defn- resolve-include-path
+  "Resolve an include path relative to the file that declares it."
+  [source-path include-path]
+  (let [source-file (io/file source-path)
+        base-dir (.getParentFile source-file)]
+    (if (or (str/starts-with? include-path "/")
+            (and (> (count include-path) 1)
+                 (= (nth include-path 1) \:)) ; Windows drive letter
+            (str/starts-with? include-path "~"))
+      include-path
+      (if base-dir
+        (str (io/file base-dir include-path))
+        include-path))))
+
+(defn- expand-includes
+  "Expand #oompa_directive:include_file directives recursively.
+
+   Directive syntax:
+   #oompa_directive:include_file \"relative/or/absolute/path.md\"
+
+   Includes are resolved relative to the prompt file containing the directive.
+   Cycles are guarded by a simple visited-set."
+  ([raw source-path]
+   (expand-includes raw source-path #{}))
+  ([raw source-path visited]
+   (let [source-canonical (file-canonical-path source-path)
+         lines (str/split-lines (or raw ""))
+         visited' (conj visited source-canonical)]
+     (str/join
+      "\n"
+      (mapcat
+       (fn [line]
+         (if-let [match (re-matches include-directive-pattern line)]
+           (let [include-target (second match)
+                 include-path (resolve-include-path source-canonical include-target)
+                 include-canonical (file-canonical-path include-path)
+                 included (and (not (str/blank? include-path))
+                               (read-file-cached include-canonical))]
+             (cond
+               (str/blank? include-target)
+               ["[oompa] Empty include target in prompt directive"]
+
+               (contains? visited' include-canonical)
+               [(format "[oompa] Skipping already-included file: \"%s\"" include-target)]
+
+               (not included)
+               [(format "[oompa] Could not include \"%s\"" include-target)]
+
+               :else
+               (cons (format "We have included the content of file: \"%s\" below"
+                             include-target)
+                     (str/split-lines
+                      (expand-includes included include-canonical visited')))))
+           [line]))
+       lines)))))
+
+(defn- load-prompt-file
+  "Load a prompt file and expand include directives."
+  [path]
+  (when path
+    (when-let [f (io/file path)]
+      (when (.exists f)
+        (expand-includes (slurp f) (file-canonical-path path))))))
 
 ;; =============================================================================
 ;; Output Parsing
@@ -152,6 +276,17 @@
   [output]
   (boolean (re-find #"COMPLETE_AND_READY_FOR_MERGE" (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.
+   Format: CLAIM(task-001, task-003, task-005)"
+  [output]
+  (when-let [match (re-find #"CLAIM\(([^)]+)\)" (or output ""))]
+    (->> (str/split (second match) #",")
+         (map str/trim)
+         (remove str/blank?)
+         vec)))
+
 (defn- extract-comments
   "Extract bullet-point comments from output"
   [output]
@@ -228,7 +363,7 @@
   (let [filename (str "config/prompts/" (name role) ".md")
         f (io/file filename)]
     (when (.exists f)
-      (slurp f))))
+      (load-prompt-file filename))))
 
 (defn load-custom-prompt
   "Load a custom prompt file. Returns content or nil."
@@ -236,10 +371,11 @@
   (when path
     (let [f (io/file path)]
       (when (.exists f)
-        (slurp f)))))
+        (load-prompt-file path)))))
 
-(defn- tokenize
-  "Replace {tokens} in template with values from context map"
+(defn tokenize
+  "Replace {tokens} in template with values from context map.
+   Keys can be keywords or strings; values are stringified."
   [template tokens]
   (reduce (fn [acc [k v]]
             (str/replace acc
@@ -283,16 +419,23 @@
 (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"]
-              ["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))
       (catch Exception _
-        false))))
+        ;; Some CLIs (like gemini) may error on --version due to config issues
+        ;; but still exist on PATH. Fall back to `which`.
+        (try
+          (let [{:keys [exit]} (process/sh ["which" (first cmd)] {:out :string :err :string})]
+            (zero? exit))
+          (catch Exception _ false))))))
 
 (defn select-backend
   "Select first available backend from preference list"