@nbardy/oompa 0.7.1 → 0.7.2

package/agentnet/src/agentnet/harness.clj

@@ -34,11 +34,11 @@
           (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.
+(defn- parse-ndjson-output
+  "Parse NDJSON output from CLIs (opencode, gemini).
    Returns {:session-id string|nil, :text string|nil}."
   [s]
   (let [raw (or s "")
@@ -51,6 +51,7 @@
                     doall)
         session-id (or (some #(or (:sessionID %)
                                    (:sessionId %)
+                                   (:session_id %)
                                    (get-in % [:part :sessionID])
                                    (get-in % [:part :sessionId]))
                              events)
@@ -58,8 +59,11 @@
         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")
+                                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))))
@@ -90,11 +94,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 +126,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}))))
@@ -190,7 +213,7 @@
   [harness-kw raw-output session-id]
   (let [{:keys [output]} (get-config harness-kw)]
     (if (= output :ndjson)
-      (let [parsed (parse-opencode-run-output raw-output)]
+      (let [parsed (parse-ndjson-output raw-output)]
         {:output     (or (:text parsed) raw-output)
          :session-id (or (:session-id parsed) session-id)})
       {:output     raw-output

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)})
@@ -125,13 +127,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
+   {: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

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