@nbardy/oompa 0.7.0 → 0.7.2

package/agentnet/src/agentnet/harness.clj

@@ -0,0 +1,240 @@
+(ns agentnet.harness
+  "Harness configuration registry.
+
+   Each harness is a data map describing how to invoke a CLI agent.
+   CLI flag syntax is owned by agent-cli (shared with claude-web-view).
+   This module owns: stdin behavior, session strategy, output parsing.
+
+   Harness = Codex | Claude | Opencode | Gemini
+   δ(harness) → config map → agent-cli JSON → command vector"
+  (:require [babashka.process :as process]
+            [cheshire.core :as json]
+            [clojure.string :as str]))
+
+;; =============================================================================
+;; Binary Resolution (shared across all harnesses)
+;; =============================================================================
+
+(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.
+   ProcessBuilder with :dir can fail to find bare command names on macOS/babashka,
+   so we resolve once via `which` and cache."
+  [name]
+  (or (get @binary-paths* name)
+      (let [result (try
+                     (process/sh ["which" name] {:out :string :err :string})
+                     (catch Exception _ {:exit -1 :out "" :err ""}))]
+        (if (zero? (:exit result))
+          (let [path (str/trim (:out result))]
+            (swap! binary-paths* assoc name path)
+            path)
+          (throw (ex-info (str "Binary not found on PATH: " name) {:binary name}))))))
+
+;; =============================================================================
+;; NDJSON Output Parsing (harness-specific, lives here not in agent-cli)
+;; =============================================================================
+
+(defn- parse-ndjson-output
+  "Parse NDJSON output from CLIs (opencode, gemini).
+   Returns {:session-id string|nil, :text string|nil}."
+  [s]
+  (let [raw (or s "")
+        events (->> (str/split-lines raw)
+                    (keep (fn [line]
+                            (try
+                              (json/parse-string line true)
+                              (catch Exception _
+                                nil))))
+                    doall)
+        session-id (or (some #(or (:sessionID %)
+                                   (:sessionId %)
+                                   (:session_id %)
+                                   (get-in % [:part :sessionID])
+                                   (get-in % [:part :sessionId]))
+                             events)
+                       (some-> (re-find #"(ses_[A-Za-z0-9]+)" raw) second))
+        text (->> events
+                  (keep (fn [event]
+                          (let [event-type (or (:type event) (get-in event [:part :type]))
+                                role (or (:role event) (get-in event [:part :role]))
+                                chunk (or (:text event) (get-in event [:part :text]) (:content event))]
+                            (when (and (or (= event-type "text")
+                                           (and (= event-type "message")
+                                                (= role "assistant")))
+                                       (string? chunk)
+                                       (not (str/blank? chunk)))
+                              chunk))))
+                  (str/join ""))]
+    {:session-id session-id
+     :text (when-not (str/blank? text) text)}))
+
+;; =============================================================================
+;; Env Helpers
+;; =============================================================================
+
+(defn- opencode-attach-url
+  "Optional opencode server URL for run --attach mode."
+  []
+  (let [url (or (System/getenv "OOMPA_OPENCODE_ATTACH")
+                (System/getenv "OPENCODE_ATTACH"))]
+    (when (and url (not (str/blank? url)))
+      url)))
+
+;; =============================================================================
+;; Harness Registry — oompa-specific behavior fields only
+;; =============================================================================
+;;
+;; CLI flag syntax (model flags, session flags, bypass, prompt delivery)
+;; is owned by agent-cli. This registry only tracks:
+;;
+;;   :stdin   - what to pass as process stdin (:close or :prompt)
+;;   :session - session ID strategy (:uuid, :extracted, :implicit)
+;;   :output  - output format (:plain or :ndjson)
+
+(def ^:private gemini-behavior
+  {:stdin :close :session :implicit :output :ndjson})
+
+(def registry
+  (merge
+   {:codex    {:stdin :close   :session :uuid      :output :plain}
+    :claude   {:stdin :prompt  :session :uuid      :output :plain}
+    :opencode {:stdin :close   :session :extracted  :output :ndjson}
+    :gemini   gemini-behavior}
+   {:gemini1 gemini-behavior
+    :gemini2 gemini-behavior
+    :gemini3 gemini-behavior}))
+
+(defn- gemini-alias?
+  [harness-kw]
+  (and (keyword? harness-kw)
+       (re-matches #"^gemini\\d+$" (name harness-kw))))
+
+(defn valid-harness?
+  "True for explicit registry entries and any `geminiNN` alias."
+  [harness-kw]
+  (or (contains? (set (keys registry)) harness-kw)
+      (gemini-alias? harness-kw)))
+
+;; =============================================================================
+;; Registry Access
+;; =============================================================================
+
+(defn get-config
+  "Look up harness config. Throws on unknown harness (no silent fallback)."
+  [harness-kw]
+  (or (get registry harness-kw)
+      (when (gemini-alias? harness-kw) gemini-behavior)
+      (throw (ex-info (str "Unknown harness: " harness-kw
+                           ". Known: " (str/join ", " (map name (keys registry))))
+                      {:harness harness-kw}))))
+
+(defn known-harnesses
+  "Set of all registered harness keywords."
+  []
+  (set (keys registry)))
+
+;; =============================================================================
+;; Command Builder — delegates to agent-cli via JSON input
+;; =============================================================================
+
+(defn- add-extra-args
+  "Attach harness-specific extraArgs to the JSON input map.
+   Only opencode needs extra flags (--format json, --attach)."
+  [m harness-kw opts]
+  (if (= harness-kw :opencode)
+    (let [url (opencode-attach-url)
+          extra (cond-> []
+                  (:format? opts) (into ["--format" "json" "--print-logs" "--log-level" "WARN"])
+                  url             (into ["--attach" url]))]
+      (if (seq extra) (assoc m :extraArgs extra) m))
+    m))
+
+(defn build-cmd
+  "Build CLI command vector via agent-cli JSON input.
+   Sends a JSON dict to `agent-cli build --input -`, parses the CommandSpec,
+   and resolves the binary to an absolute path.
+
+   agent-cli owns all CLI flag syntax (session create/resume, model decomposition,
+   bypass flags, prompt delivery). This function just maps oompa opts to JSON."
+  [harness-kw opts]
+  (let [input (-> {:harness (name harness-kw)
+                   :bypassPermissions true}
+                  (cond->
+                    (:model opts)      (assoc :model (:model opts))
+                    (:prompt opts)     (assoc :prompt (:prompt opts))
+                    (:session-id opts) (assoc :sessionId (:session-id opts))
+                    (:resume? opts)    (assoc :resume true)
+                    (:cwd opts)        (assoc :cwd (:cwd opts))
+                    (:reasoning opts)  (assoc :reasoning (:reasoning opts)))
+                  (add-extra-args harness-kw opts)
+                  json/generate-string)
+        {:keys [exit out err]} (process/sh ["agent-cli" "build" "--input" "-"]
+                                           {:in input :out :string :err :string})]
+    (when-not (zero? exit)
+      (throw (ex-info (str "agent-cli: " (str/trim err)) {:exit exit})))
+    (let [argv (:argv (json/parse-string out true))]
+      (vec (cons (resolve-binary! (first argv)) (rest argv))))))
+
+(defn process-stdin
+  "Return the :in value for process/sh.
+   :close → \"\" (close stdin immediately to prevent hang).
+   :prompt → the prompt text (claude delivers prompt via stdin)."
+  [harness-kw prompt]
+  (let [{:keys [stdin]} (get-config harness-kw)]
+    (case stdin
+      :prompt prompt
+      :close  "")))
+
+;; =============================================================================
+;; Session Management
+;; =============================================================================
+
+(defn make-session-id
+  "Generate initial session-id based on harness strategy.
+   :uuid → random UUID string.
+   :extracted → nil (will be parsed from output after first run).
+   :implicit → nil (harness manages sessions by cwd, e.g. gemini)."
+  [harness-kw]
+  (let [{:keys [session]} (get-config harness-kw)]
+    (when (= session :uuid)
+      (str/lower-case (str (java.util.UUID/randomUUID))))))
+
+;; =============================================================================
+;; Output Parsing
+;; =============================================================================
+
+(defn parse-output
+  "Parse agent output. For :ndjson harnesses, extracts session-id and text.
+   For :plain, returns output as-is.
+   Returns {:output string, :session-id string}."
+  [harness-kw raw-output session-id]
+  (let [{:keys [output]} (get-config harness-kw)]
+    (if (= output :ndjson)
+      (let [parsed (parse-ndjson-output raw-output)]
+        {:output     (or (:text parsed) raw-output)
+         :session-id (or (:session-id parsed) session-id)})
+      {:output     raw-output
+       :session-id session-id})))
+
+;; =============================================================================
+;; Probe / Health Check — delegates to agent-cli check
+;; =============================================================================
+
+(defn check-available
+  "Check if harness CLI binary is available on PATH via agent-cli."
+  [harness-kw]
+  (try
+    (let [{:keys [exit out]} (process/sh ["agent-cli" "check" (name harness-kw)]
+                                         {:out :string :err :string})]
+      (when (zero? exit)
+        (:available (json/parse-string out true))))
+    (catch Exception _ false)))
+
+(defn build-probe-cmd
+  "Build minimal command to test if a harness+model is accessible.
+   Delegates to build-cmd with a '[_HIDE_TEST_] say ok' probe prompt."
+  [harness-kw model]
+  (build-cmd harness-kw {:model model :prompt "[_HIDE_TEST_] say ok"}))

package/agentnet/src/agentnet/orchestrator.clj

@@ -286,6 +286,8 @@
 (defn- ensure-dir! [path]
   (.mkdirs (io/file path)))
 
+;; DEAD CODE: save-run-log!, run-once!, run-loop! are unreachable since
+;; cmd-run/cmd-loop simple-mode was retired 2026-02-17. Delete in a future pass.
 (defn save-run-log!
   "Save run results to JSONL file"
   [state]

package/agentnet/src/agentnet/runs.clj

@@ -1,13 +1,16 @@
 (ns agentnet.runs
-  "Structured persistence for swarm runs.
+  "Structured persistence for swarm runs — event-sourced immutable logs.
 
    Layout:
      runs/{swarm-id}/
-       run.json          — start time, worker configs, planner output
-       summary.json      — final metrics per worker, aggregate stats
+       started.json       — swarm start event (PID, worker configs, planner)
+       stopped.json       — swarm stop event (reason, optional error)
+       cycles/
+         {worker-id}-c{N}.json  — per-cycle event log (one complete work unit)
        reviews/
-         {worker-id}-i{N}-r{round}.json  — per-iteration review log
+         {worker-id}-c{N}-r{round}.json  — per-cycle review log
 
+   All state is derived by reading event logs. No mutable summary files.
    Written as JSON for easy consumption by claude-web-view and CLI.
    All writes are atomic (write to .tmp, rename) to avoid partial reads."
   (:require [clojure.java.io :as io]
@@ -26,8 +29,12 @@
 (defn- reviews-dir [swarm-id]
   (str (run-dir swarm-id) "/reviews"))
 
+(defn- cycles-dir [swarm-id]
+  (str (run-dir swarm-id) "/cycles"))
+
 (defn- ensure-run-dirs! [swarm-id]
-  (.mkdirs (io/file (reviews-dir swarm-id))))
+  (.mkdirs (io/file (reviews-dir swarm-id)))
+  (.mkdirs (io/file (cycles-dir swarm-id))))
 
 ;; =============================================================================
 ;; Atomic Write
@@ -43,23 +50,26 @@
     (.renameTo tmp f)))
 
 ;; =============================================================================
-;; Run Log — written at swarm start
+;; Started Event — written at swarm start
 ;; =============================================================================
 
-(defn write-run-log!
-  "Write the initial run log when a swarm starts.
-   Contains: start time, worker configs, planner output, swarm metadata."
+(defn write-started!
+  "Write the started event when a swarm begins.
+   Contains: start time, PID, worker configs, planner output, swarm metadata."
   [swarm-id {:keys [workers planner-config reviewer-config config-file]}]
   (ensure-run-dirs! swarm-id)
-  (write-json! (str (run-dir swarm-id) "/run.json")
+  (write-json! (str (run-dir swarm-id) "/started.json")
                {:swarm-id swarm-id
                 :started-at (str (java.time.Instant/now))
+                :pid (.pid (java.lang.ProcessHandle/current))
                 :config-file config-file
                 :workers (mapv (fn [w]
                                  {:id (:id w)
                                   :harness (name (:harness w))
-                                  :model (:model w)
-                                  :reasoning (:reasoning w)
+                                 :model (:model w)
+                                 :reasoning (:reasoning w)
+                                 :runs (:runs w)
+                                 :max-cycles (:max-cycles w)
                                   :iterations (:iterations w)
                                   :can-plan (:can-plan w)
                                   :prompts (:prompts w)})
@@ -74,20 +84,33 @@
                              :model (:model reviewer-config)
                              :prompts (:prompts reviewer-config)})}))
 
+;; =============================================================================
+;; Stopped Event — written at swarm end
+;; =============================================================================
+
+(defn write-stopped!
+  "Write the stopped event when a swarm exits cleanly."
+  [swarm-id reason & {:keys [error]}]
+  (write-json! (str (run-dir swarm-id) "/stopped.json")
+               {:swarm-id swarm-id
+                :stopped-at (str (java.time.Instant/now))
+                :reason (name reason)
+                :error error}))
+
 ;; =============================================================================
 ;; Review Log — written after each review round
 ;; =============================================================================
 
 (defn write-review-log!
-  "Write a review log for one iteration of a worker.
+  "Write a review log for one cycle of a worker.
    Contains: verdict, round number, full reviewer output, diff file list."
-  [swarm-id worker-id iteration round
+  [swarm-id worker-id cycle round
    {:keys [verdict output diff-files]}]
   (ensure-run-dirs! swarm-id)
-  (let [filename (format "%s-i%d-r%d.json" worker-id iteration round)]
+  (let [filename (format "%s-c%d-r%d.json" worker-id cycle round)]
     (write-json! (str (reviews-dir swarm-id) "/" filename)
                  {:worker-id worker-id
-                  :iteration iteration
+                  :cycle cycle
                   :round round
                   :verdict (name verdict)
                   :timestamp (str (java.time.Instant/now))
@@ -95,36 +118,31 @@
                   :diff-files (vec diff-files)})))
 
 ;; =============================================================================
-;; Swarm Summary — written at swarm end
+;; Cycle Log — written per cycle for real-time dashboard visibility
 ;; =============================================================================
 
-(defn write-summary!
-  "Write the final swarm summary after all workers complete.
-   Contains: per-worker stats and aggregate metrics."
-  [swarm-id worker-results]
-  (let [total-completed (reduce + 0 (map :completed worker-results))
-        total-iterations (reduce + 0 (map :iterations worker-results))
-        statuses (frequencies (map #(name (:status %)) worker-results))
-        per-worker (mapv (fn [w]
-                           {:id (:id w)
-                            :harness (name (:harness w))
-                            :model (:model w)
-                            :status (name (:status w))
-                            :completed (:completed w)
-                            :iterations (:iterations w)
-                            :merges (or (:merges w) 0)
-                            :rejections (or (:rejections w) 0)
-                            :errors (or (:errors w) 0)
-                            :review-rounds-total (or (:review-rounds-total w) 0)})
-                         worker-results)]
-    (write-json! (str (run-dir swarm-id) "/summary.json")
-                 {:swarm-id swarm-id
-                  :finished-at (str (java.time.Instant/now))
-                  :total-workers (count worker-results)
-                  :total-completed total-completed
-                  :total-iterations total-iterations
-                  :status-counts statuses
-                  :workers per-worker})))
+(defn write-cycle-log!
+  "Write a cycle event log for a worker.
+   Contains: outcome, timing, claimed task IDs, recycled tasks, session-id.
+   session-id links to the Claude CLI conversation on disk for debugging.
+   Written at cycle end so dashboards can track progress in real-time."
+  [swarm-id worker-id cycle
+   {:keys [run outcome duration-ms claimed-task-ids recycled-tasks
+           error-snippet review-rounds session-id]}]
+  (when swarm-id
+    (let [filename (format "%s-c%d.json" worker-id cycle)]
+      (write-json! (str (cycles-dir swarm-id) "/" filename)
+                   {:worker-id worker-id
+                    :cycle cycle
+                    :run (or run 1)
+                    :outcome (name outcome)
+                    :timestamp (str (java.time.Instant/now))
+                    :duration-ms duration-ms
+                    :claimed-task-ids (or claimed-task-ids [])
+                    :recycled-tasks (or recycled-tasks [])
+                    :error-snippet error-snippet
+                    :review-rounds (or review-rounds 0)
+                    :session-id session-id}))))
 
 ;; =============================================================================
 ;; Read helpers (for cmd-status, dashboards)
@@ -140,17 +158,17 @@
            (sort-by #(.lastModified %) >)
            (mapv #(.getName %))))))
 
-(defn read-run-log
-  "Read run.json for a swarm."
+(defn read-started
+  "Read started.json for a swarm."
   [swarm-id]
-  (let [f (io/file (str (run-dir swarm-id) "/run.json"))]
+  (let [f (io/file (str (run-dir swarm-id) "/started.json"))]
     (when (.exists f)
       (json/parse-string (slurp f) true))))
 
-(defn read-summary
-  "Read summary.json for a swarm."
+(defn read-stopped
+  "Read stopped.json for a swarm. Returns nil if still running."
   [swarm-id]
-  (let [f (io/file (str (run-dir swarm-id) "/summary.json"))]
+  (let [f (io/file (str (run-dir swarm-id) "/stopped.json"))]
     (when (.exists f)
       (json/parse-string (slurp f) true))))
 
@@ -163,3 +181,13 @@
            (filter #(str/ends-with? (.getName %) ".json"))
            (sort-by #(.getName %))
            (mapv (fn [f] (json/parse-string (slurp f) true)))))))
+
+(defn list-cycles
+  "List all cycle logs for a swarm, sorted by filename."
+  [swarm-id]
+  (let [d (io/file (cycles-dir swarm-id))]
+    (when (.exists d)
+      (->> (.listFiles d)
+           (filter #(str/ends-with? (.getName %) ".json"))
+           (sort-by #(.getName %))
+           (mapv (fn [f] (json/parse-string (slurp f) true)))))))

package/agentnet/src/agentnet/schema.clj

@@ -40,7 +40,7 @@
 ;; Enum Validators
 ;; =============================================================================
 
-(def agent-types #{:codex :claude :opencode})
+(def agent-types #{:codex :claude :opencode :gemini})
 (def agent-roles #{:proposer :reviewer :cto})
 (def task-statuses #{:pending :in-progress :review :approved :merged :failed :blocked})
 (def worktree-statuses #{:available :busy :dirty :stale})
@@ -48,7 +48,14 @@
 (def merge-strategies #{:fast-forward :no-ff :squash :rebase})
 (def conflict-resolutions #{:ours :theirs :manual :abort})
 
-(defn agent-type? [x] (contains? agent-types x))
+(defn- gemini-indexed-account?
+  [x]
+  (and (keyword? x)
+       (re-matches #"^gemini\d+$" (name x))))
+
+(defn agent-type? [x]
+  (or (contains? agent-types x)
+      (gemini-indexed-account? x)))
 (defn agent-role? [x] (contains? agent-roles x))
 (defn task-status? [x] (contains? task-statuses x))
 (defn worktree-status? [x] (contains? worktree-statuses x))

package/agentnet/src/agentnet/tasks.clj

@@ -123,6 +123,35 @@
   (when-let [task (first (list-pending))]
     (claim-task! task)))
 
+(defn claim-by-id!
+  "Claim a pending task by its :id string. Atomically moves pending → current.
+   Returns {:status :claimed|:already-taken|:not-found, :id id}."
+  [task-id]
+  (let [match (first (filter #(= (:id %) task-id) (list-pending)))]
+    (if match
+      (if (claim-task! match)
+        {:status :claimed :id task-id}
+        {:status :already-taken :id task-id})
+      ;; Not in pending — check if already in current (raced)
+      (if (some #(= (:id %) task-id) (list-current))
+        {:status :already-taken :id task-id}
+        {:status :not-found :id task-id}))))
+
+(defn claim-by-ids!
+  "Claim multiple tasks by ID. Returns vector of result maps."
+  [task-ids]
+  (mapv claim-by-id! task-ids))
+
+(defn complete-by-ids!
+  "Move tasks from current → complete by ID. Framework-owned completion.
+   Returns vector of completed task IDs."
+  [task-ids]
+  (let [id-set (set task-ids)
+        to-complete (filter #(id-set (:id %)) (list-current))]
+    (doseq [task to-complete]
+      (complete-task! task))
+    (mapv :id to-complete)))
+
 ;; =============================================================================
 ;; Task Creation
 ;; =============================================================================
@@ -163,6 +192,24 @@
 (defn current-count [] (count (list-task-files CURRENT_DIR)))
 (defn complete-count [] (count (list-task-files COMPLETE_DIR)))
 
+(defn current-task-ids
+  "Return a set of task IDs currently in current/."
+  []
+  (->> (list-task-files CURRENT_DIR)
+       (keep read-task-file)
+       (map :id)
+       set))
+
+(defn recycle-tasks!
+  "Move specific tasks from current/ back to pending/ by ID.
+   Returns vector of recycled task IDs."
+  [task-ids]
+  (let [current (list-current)
+        to-recycle (filter #(task-ids (:id %)) current)]
+    (doseq [task to-recycle]
+      (unclaim-task! task))
+    (mapv :id to-recycle)))
+
 (defn all-complete?
   "True if no pending or current tasks"
   []