@nbardy/oompa 0.7.1 → 0.7.3

package/agentnet/src/agentnet/core.clj

@@ -8,6 +8,21 @@
 (defn now-ms []
   (System/currentTimeMillis))
 
+(defn- normalize-priority
+  "Coerce :priority to a sortable number.
+   Accepts: integer, \"P1\"/\"P2\" strings, numeric strings, nil.
+   Unknown/nil → 1000 (low priority)."
+  [p]
+  (cond
+    (number? p) p
+    (nil? p) 1000
+    (string? p)
+    (let [s (str/upper-case (str/trim p))]
+      (cond
+        (str/starts-with? s "P") (try (Integer/parseInt (subs s 1)) (catch Exception _ 1000))
+        :else (try (Integer/parseInt s) (catch Exception _ 1000))))
+    :else 1000))
+
 (defn format-ago
   "Return human-readable relative time string for epoch milliseconds."
   [^long ts-ms]
@@ -50,7 +65,7 @@
 
 (defn- queue-lines [tasks]
   (->> tasks
-       (sort-by (juxt (comp (fnil identity 1000) :priority) :id))
+       (sort-by (juxt (comp normalize-priority :priority) :id))
        (map (fn [{:keys [id summary]}]
               (format "`%s` • %s" id summary)))))
 
@@ -82,7 +97,7 @@
 
 (defn- backlog-entries [tasks]
   (->> tasks
-       (sort-by (juxt (comp (fnil identity 1000) :priority) :id))
+       (sort-by (juxt (comp normalize-priority :priority) :id))
        (map #(select-keys % [:id :summary]))
        (remove #(nil? (:id %)))
        (take 7)

package/agentnet/src/agentnet/harness.clj

@@ -34,12 +34,12 @@
           (throw (ex-info (str "Binary not found on PATH: " name) {:binary name}))))))
 
 ;; =============================================================================
-;; Opencode Output Parsing (harness-specific, lives here not in agent-cli)
+;; NDJSON Output Parsing (harness-specific, lives here not in agent-cli)
 ;; =============================================================================
 
-(defn- parse-opencode-run-output
-  "Parse `opencode run --format json` NDJSON output.
-   Returns {:session-id string|nil, :text string|nil}."
+(defn- parse-unified-jsonl-output
+  "Parse unified JSONL emitted by `agent-cli run`.
+   Returns {:session-id string|nil, :text string|nil, :warning string|nil}."
   [s]
   (let [raw (or s "")
         events (->> (str/split-lines raw)
@@ -49,23 +49,47 @@
                               (catch Exception _
                                 nil))))
                     doall)
-        session-id (or (some #(or (:sessionID %)
-                                   (:sessionId %)
-                                   (get-in % [:part :sessionID])
-                                   (get-in % [:part :sessionId]))
-                             events)
-                       (some-> (re-find #"(ses_[A-Za-z0-9]+)" raw) second))
+        event-types (->> events (keep :type) distinct (take 8) vec)
+        session-id (some->> events
+                            (keep #(when (= "session.started" (:type %))
+                                     (:sessionId %)))
+                            last)
         text (->> events
-                  (keep (fn [event]
-                          (let [event-type (or (:type event) (get-in event [:part :type]))
-                                chunk (or (:text event) (get-in event [:part :text]))]
-                            (when (and (= event-type "text")
-                                       (string? chunk)
-                                       (not (str/blank? chunk)))
-                              chunk))))
-                  (str/join ""))]
+                  (keep #(when (= "text.delta" (:type %)) (:text %)))
+                  (remove str/blank?)
+                  (str/join ""))
+        stderr-text (->> events
+                         (keep #(when (= "stderr" (:type %)) (:text %)))
+                         (remove str/blank?)
+                         (str/join ""))
+        errors (->> events
+                    (keep #(when (= "error" (:type %)) (:message %)))
+                    (remove str/blank?)
+                    vec)
+        warning (cond
+                  (and (not (str/blank? raw)) (empty? events))
+                  "agent-cli returned non-empty output, but no unified JSONL events were parsed."
+
+                  (seq errors)
+                  (str "agent-cli reported error events: " (str/join " | " (take 3 errors)))
+
+                  (and (seq events) (str/blank? text))
+                  (str "agent-cli returned unified events, but no text deltas were extracted"
+                       " (types=" (if (seq event-types)
+                                    (str/join "," event-types)
+                                    "unknown")
+                       ").")
+
+                  :else nil)]
     {:session-id session-id
-     :text (when-not (str/blank? text) text)}))
+     :text (cond
+             (not (str/blank? text)) text
+             (seq errors) (str/join "\n" errors)
+             (not (str/blank? stderr-text)) stderr-text
+             :else nil)
+     :warning warning
+     :raw-snippet (when-not (str/blank? raw)
+                    (subs raw 0 (min 400 (count raw))))}))
 
 ;; =============================================================================
 ;; Env Helpers
@@ -90,11 +114,29 @@
 ;;   :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
-  {:codex    {:stdin :close   :session :uuid      :output :plain}
-   :claude   {:stdin :prompt  :session :uuid      :output :plain}
-   :opencode {:stdin :close   :session :extracted  :output :ndjson}
-   :gemini   {:stdin :close   :session :implicit   :output :plain}})
+  (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
@@ -104,6 +146,7 @@
   "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}))))
@@ -131,11 +174,7 @@
 
 (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."
+   Used for probe/debug flows. Execution should prefer `run-command!`."
   [harness-kw opts]
   (let [input (-> {:harness (name harness-kw)
                    :bypassPermissions true}
@@ -165,6 +204,26 @@
       :prompt prompt
       :close  "")))
 
+(defn run-command!
+  "Execute a harness through `agent-cli run`, which emits unified JSONL events."
+  [harness-kw opts]
+  (let [input (-> {:harness (name harness-kw)
+                   :mode "conversation"
+                   :prompt (:prompt opts)
+                   :cwd (:cwd opts)
+                   :yolo true}
+                  (cond->
+                    (:model opts)      (assoc :model (:model opts))
+                    (and (:session-id opts) (not (:resume? opts))) (assoc :sessionId (:session-id opts))
+                    (and (:session-id opts) (:resume? opts))       (assoc :resumeSessionId (:session-id opts))
+                    (:reasoning opts)  (assoc :reasoningEffort (:reasoning opts))
+                    (or (= harness-kw :gemini) (gemini-alias? harness-kw))
+                    (assoc :debugRawEvents true))
+                  (add-extra-args harness-kw opts)
+                  json/generate-string)]
+    (process/sh ["agent-cli" "run" "--input" "-"]
+                {:in input :out :string :err :string})))
+
 ;; =============================================================================
 ;; Session Management
 ;; =============================================================================
@@ -184,17 +243,14 @@
 ;; =============================================================================
 
 (defn parse-output
-  "Parse agent output. For :ndjson harnesses, extracts session-id and text.
-   For :plain, returns output as-is.
+  "Parse unified JSONL output from `agent-cli run`.
    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-opencode-run-output raw-output)]
-        {:output     (or (:text parsed) raw-output)
-         :session-id (or (:session-id parsed) session-id)})
-      {:output     raw-output
-       :session-id session-id})))
+  (let [parsed (parse-unified-jsonl-output raw-output)]
+    {:output     (or (:text parsed) raw-output)
+     :session-id (or (:session-id parsed) session-id)
+     :warning    (:warning parsed)
+     :raw-snippet (:raw-snippet parsed)}))
 
 ;; =============================================================================
 ;; Probe / Health Check — delegates to agent-cli check

package/agentnet/src/agentnet/runs.clj

@@ -66,8 +66,10 @@
                 :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)})
@@ -103,7 +105,7 @@
   "Write a review log for one cycle of a worker.
    Contains: verdict, round number, full reviewer output, diff file list."
   [swarm-id worker-id cycle round
-   {:keys [verdict output diff-files]}]
+   {:keys [verdict output diff-files duration-ms]}]
   (ensure-run-dirs! swarm-id)
   (let [filename (format "%s-c%d-r%d.json" worker-id cycle round)]
     (write-json! (str (reviews-dir swarm-id) "/" filename)
@@ -113,6 +115,7 @@
                   :verdict (name verdict)
                   :timestamp (str (java.time.Instant/now))
                   :output output
+                  :duration-ms (or duration-ms 0)
                   :diff-files (vec diff-files)})))
 
 ;; =============================================================================
@@ -125,13 +128,14 @@
    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 [outcome duration-ms claimed-task-ids recycled-tasks
-           error-snippet review-rounds session-id]}]
+   {:keys [run outcome duration-ms claimed-task-ids recycled-tasks
+           error-snippet review-rounds session-id timing-ms]}]
   (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
@@ -139,7 +143,8 @@
                     :recycled-tasks (or recycled-tasks [])
                     :error-snippet error-snippet
                     :review-rounds (or review-rounds 0)
-                    :session-id session-id}))))
+                    :session-id session-id
+                    :timing-ms timing-ms}))))
 
 ;; =============================================================================
 ;; Read helpers (for cmd-status, dashboards)

package/agentnet/src/agentnet/schema.clj

@@ -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

@@ -210,6 +210,12 @@
       (unclaim-task! task))
     (mapv :id to-recycle)))
 
+(defn recycle-all-current!
+  "Move every task from current/ back to pending/.
+   Returns vector of recycled task IDs."
+  []
+  (recycle-tasks! (current-task-ids)))
+
 (defn all-complete?
   "True if no pending or current tasks"
   []