@nbardy/oompa 0.1.0

package/agentnet/src/agentnet/schema.clj

@@ -0,0 +1,141 @@
+(ns agentnet.schema
+  "Data schemas for AgentNet using simple predicates.
+
+   Design Philosophy (Hickey-style):
+   - Data is the interface
+   - Schemas are documentation
+   - Validate at boundaries, trust inside
+   - Prefer maps over positional args
+
+   Note: Using simple predicates instead of Malli to avoid
+   external dependencies (Malli needs Java for deps.clj)."
+  (:require [clojure.string :as str]))
+
+;; =============================================================================
+;; Primitive Validators
+;; =============================================================================
+
+(defn non-blank-string? [x]
+  (and (string? x) (not (str/blank? x))))
+
+(defn pos-int? [x]
+  (and (int? x) (pos? x)))
+
+(defn nat-int? [x]
+  (and (int? x) (>= x 0)))
+
+(defn timestamp? [x]
+  (nat-int? x))
+
+(defn file-path? [x]
+  (non-blank-string? x))
+
+(defn git-branch? [x]
+  (non-blank-string? x))
+
+(defn git-sha? [x]
+  (and (string? x) (re-matches #"^[a-f0-9]{7,40}$" x)))
+
+;; =============================================================================
+;; Enum Validators
+;; =============================================================================
+
+(def agent-types #{:codex :claude})
+(def agent-roles #{:proposer :reviewer :cto})
+(def task-statuses #{:pending :in-progress :review :approved :merged :failed :blocked})
+(def worktree-statuses #{:available :busy :dirty :stale})
+(def review-verdicts #{:approved :needs-changes :rejected})
+(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 agent-role? [x] (contains? agent-roles x))
+(defn task-status? [x] (contains? task-statuses x))
+(defn worktree-status? [x] (contains? worktree-statuses x))
+(defn review-verdict? [x] (contains? review-verdicts x))
+(defn merge-strategy? [x] (contains? merge-strategies x))
+(defn conflict-resolution? [x] (contains? conflict-resolutions x))
+
+;; =============================================================================
+;; Map Validators
+;; =============================================================================
+
+(defn has-keys? [m required-keys]
+  (every? #(contains? m %) required-keys))
+
+(defn valid-task? [x]
+  (and (map? x)
+       (has-keys? x [:id :summary])
+       (non-blank-string? (:id x))
+       (non-blank-string? (:summary x))))
+
+(defn valid-worktree? [x]
+  (and (map? x)
+       (has-keys? x [:id :path :branch :status])
+       (non-blank-string? (:id x))
+       (file-path? (:path x))
+       (git-branch? (:branch x))
+       (worktree-status? (:status x))))
+
+(defn valid-agent-config? [x]
+  (and (map? x)
+       (has-keys? x [:type])
+       (agent-type? (:type x))))
+
+(defn valid-review-feedback? [x]
+  (and (map? x)
+       (has-keys? x [:verdict])
+       (review-verdict? (:verdict x))))
+
+(defn valid-merge-result? [x]
+  (and (map? x)
+       (has-keys? x [:status :source-branch :target-branch])
+       (contains? #{:merged :conflict :failed :skipped} (:status x))))
+
+(defn valid-orchestrator-config? [x]
+  (and (map? x)
+       (has-keys? x [:worker-count :harness])
+       (pos-int? (:worker-count x))
+       (agent-type? (:harness x))))
+
+;; =============================================================================
+;; Validation Helpers
+;; =============================================================================
+
+(defn validate
+  "Validate data against a predicate, return [valid? errors]"
+  [pred data context]
+  (if (pred data)
+    [true nil]
+    [false {:context context :data data :error "Validation failed"}]))
+
+(defn assert-valid
+  "Throw if data doesn't match predicate"
+  [pred data context]
+  (when-not (pred data)
+    (throw (ex-info (str "Invalid " context)
+                    {:context context
+                     :data data
+                     :type (type data)}))))
+
+;; =============================================================================
+;; Schema Reference (for documentation)
+;; =============================================================================
+
+;; TaskId          <- non-blank-string?
+;; AgentType       <- agent-type? (:codex, :claude)
+;; AgentRole       <- agent-role? (:proposer, :reviewer, :cto)
+;; TaskStatus      <- task-status?
+;; WorktreeStatus  <- worktree-status?
+;; ReviewVerdict   <- review-verdict?
+;; MergeStrategy   <- merge-strategy?
+;; ConflictResolution <- conflict-resolution?
+;; GitBranch       <- git-branch?
+;; GitSha          <- git-sha?
+;;
+;; Task            <- {:id string, :summary string, :targets [string], ...}
+;; Worktree        <- {:id string, :path string, :branch string, :status keyword}
+;; AgentConfig     <- {:type :codex|:claude, :model string, :sandbox keyword}
+;; ReviewFeedback  <- {:verdict :approved|:needs-changes|:rejected, :comments [string]}
+;; MergeResult     <- {:status :merged|:conflict|:failed, :source-branch string, ...}
+;; OrchestratorConfig <- {:worker-count int, :harness :codex|:claude, :model string, :dry-run bool}

package/agentnet/src/agentnet/tasks.clj

@@ -0,0 +1,198 @@
+(ns agentnet.tasks
+  "Folder-based task management.
+
+   Tasks live in tasks/{pending,current,complete}/*.edn
+
+   Workers:
+   - Claim tasks: mv pending/foo.edn → current/foo.edn
+   - Complete tasks: mv current/foo.edn → complete/foo.edn
+   - Create tasks: write new .edn to pending/
+
+   Task format:
+   {:id \"task-001\"
+    :summary \"Add authentication\"
+    :description \"Implement JWT auth...\"
+    :files [\"src/auth.py\"]
+    :acceptance [\"Login works\" \"Tests pass\"]}"
+  (:require [clojure.edn :as edn]
+            [clojure.java.io :as io]
+            [clojure.string :as str]))
+
+;; =============================================================================
+;; Paths
+;; =============================================================================
+
+(def ^:const TASKS_ROOT "tasks")
+(def ^:const PENDING_DIR (str TASKS_ROOT "/pending"))
+(def ^:const CURRENT_DIR (str TASKS_ROOT "/current"))
+(def ^:const COMPLETE_DIR (str TASKS_ROOT "/complete"))
+
+(defn ensure-dirs!
+  "Create task directories if they don't exist"
+  []
+  (doseq [dir [PENDING_DIR CURRENT_DIR COMPLETE_DIR]]
+    (.mkdirs (io/file dir))))
+
+;; =============================================================================
+;; Task I/O
+;; =============================================================================
+
+(defn- read-task-file
+  "Read a single task .edn file"
+  [^java.io.File f]
+  (when (.exists f)
+    (try
+      (with-open [r (java.io.PushbackReader. (io/reader f))]
+        (let [task (edn/read {:eof nil} r)]
+          (assoc task :_file (.getPath f))))
+      (catch Exception e
+        (println (format "[warn] Failed to read task %s: %s" (.getName f) (.getMessage e)))
+        nil))))
+
+(defn- list-task-files
+  "List all .edn files in a directory"
+  [dir]
+  (let [d (io/file dir)]
+    (when (.exists d)
+      (->> (.listFiles d)
+           (filter #(str/ends-with? (.getName %) ".edn"))
+           (sort-by #(.getName %))))))
+
+(defn list-pending
+  "List all pending tasks"
+  []
+  (->> (list-task-files PENDING_DIR)
+       (keep read-task-file)
+       vec))
+
+(defn list-current
+  "List all in-progress tasks"
+  []
+  (->> (list-task-files CURRENT_DIR)
+       (keep read-task-file)
+       vec))
+
+(defn list-complete
+  "List all completed tasks"
+  []
+  (->> (list-task-files COMPLETE_DIR)
+       (keep read-task-file)
+       vec))
+
+(defn list-all
+  "List all tasks with their status"
+  []
+  (concat
+    (map #(assoc % :status :pending) (list-pending))
+    (map #(assoc % :status :current) (list-current))
+    (map #(assoc % :status :complete) (list-complete))))
+
+;; =============================================================================
+;; Task Operations
+;; =============================================================================
+
+(defn- move-task!
+  "Move a task file from one dir to another"
+  [task from-dir to-dir]
+  (let [filename (-> (:_file task) io/file .getName)
+        from-path (io/file from-dir filename)
+        to-path (io/file to-dir filename)]
+    (when (.exists from-path)
+      (.renameTo from-path to-path)
+      (assoc task :_file (.getPath to-path)))))
+
+(defn claim-task!
+  "Claim a pending task (mv pending → current). Returns task or nil."
+  [task]
+  (move-task! task PENDING_DIR CURRENT_DIR))
+
+(defn complete-task!
+  "Mark a task complete (mv current → complete). Returns task or nil."
+  [task]
+  (move-task! task CURRENT_DIR COMPLETE_DIR))
+
+(defn unclaim-task!
+  "Return a task to pending (mv current → pending). Returns task or nil."
+  [task]
+  (move-task! task CURRENT_DIR PENDING_DIR))
+
+(defn claim-next!
+  "Claim the next available pending task. Returns task or nil."
+  []
+  (when-let [task (first (list-pending))]
+    (claim-task! task)))
+
+;; =============================================================================
+;; Task Creation
+;; =============================================================================
+
+(defn- generate-task-id
+  "Generate a unique task ID"
+  []
+  (format "task-%d" (System/currentTimeMillis)))
+
+(defn- task->filename
+  "Convert task to filename"
+  [task]
+  (let [id (or (:id task) (generate-task-id))
+        safe-id (str/replace id #"[^a-zA-Z0-9-_]" "-")]
+    (str safe-id ".edn")))
+
+(defn create-task!
+  "Create a new task in pending/. Returns the task with :_file set."
+  [{:keys [id summary] :as task}]
+  (ensure-dirs!)
+  (let [task-id (or id (generate-task-id))
+        task (assoc task :id task-id)
+        filename (task->filename task)
+        path (io/file PENDING_DIR filename)]
+    (spit path (pr-str task))
+    (assoc task :_file (.getPath path))))
+
+(defn create-tasks!
+  "Create multiple tasks. Returns list of created tasks."
+  [tasks]
+  (mapv create-task! tasks))
+
+;; =============================================================================
+;; Status Checks
+;; =============================================================================
+
+(defn pending-count [] (count (list-task-files PENDING_DIR)))
+(defn current-count [] (count (list-task-files CURRENT_DIR)))
+(defn complete-count [] (count (list-task-files COMPLETE_DIR)))
+
+(defn all-complete?
+  "True if no pending or current tasks"
+  []
+  (and (zero? (pending-count))
+       (zero? (current-count))))
+
+(defn has-pending?
+  "True if there are pending tasks"
+  []
+  (pos? (pending-count)))
+
+(defn status-summary
+  "Return status counts"
+  []
+  {:pending (pending-count)
+   :current (current-count)
+   :complete (complete-count)})
+
+;; =============================================================================
+;; Migration from old format
+;; =============================================================================
+
+(defn migrate-from-tasks-edn!
+  "Migrate from config/tasks.edn to folder structure"
+  []
+  (let [old-file (io/file "config/tasks.edn")]
+    (when (.exists old-file)
+      (println "Migrating from config/tasks.edn...")
+      (ensure-dirs!)
+      (let [tasks (with-open [r (java.io.PushbackReader. (io/reader old-file))]
+                    (edn/read {:eof nil} r))]
+        (doseq [task tasks]
+          (create-task! task))
+        (println (format "Migrated %d tasks to tasks/pending/" (count tasks)))))))