1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
|
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE NoImplicitPrelude #-}
-- : out jr
-- : dep sqlite-simple
-- : dep sqids
-- : dep warp
-- : dep servant-server
-- : dep lucid
-- : dep servant-lucid
module Omni.Jr where
import Alpha
import qualified Data.List as List
import qualified Data.Text as Text
import qualified Omni.Agent.Core as AgentCore
import qualified Omni.Agent.Worker as AgentWorker
import qualified Omni.Cli as Cli
import qualified Omni.Jr.Web as Web
import qualified Omni.Task as Task
import qualified Omni.Task.Core as TaskCore
import qualified Omni.Test as Test
import qualified System.Console.Docopt as Docopt
import qualified System.Directory as Directory
import System.Environment (withArgs)
import qualified System.Environment as Env
import qualified System.Exit as Exit
import System.FilePath (takeFileName)
import qualified System.IO as IO
import qualified System.Process as Process
main :: IO ()
main = Cli.main plan
plan :: Cli.Plan ()
plan =
Cli.Plan
{ Cli.help = help,
Cli.move = move,
Cli.test = test,
Cli.tidy = \_ -> pure ()
}
help :: Cli.Docopt
help =
[Cli.docopt|
jr
Usage:
jr task [<args>...]
jr work [<task-id>]
jr web [--port=PORT]
jr review [<task-id>] [--auto]
jr loop [--delay=SECONDS]
jr merge-driver <ours> <theirs>
jr test
jr (-h | --help)
Commands:
task Manage tasks
work Start a worker agent on a task
web Start the web UI server
review Review a completed task (show diff, accept/reject)
loop Run autonomous work+review loop
merge-driver Internal git merge driver
Options:
-h --help Show this help
--port=PORT Port for web server [default: 8080]
--auto Auto-review: accept if tests pass, reject if they fail
--delay=SECONDS Delay between loop iterations [default: 5]
|]
move :: Cli.Arguments -> IO ()
move args
| args `Cli.has` Cli.command "task" = do
let extraArgs = Cli.getAllArgs args (Cli.argument "args")
withArgs extraArgs Task.main
| args `Cli.has` Cli.command "web" = do
let port = case Cli.getArg args (Cli.longOption "port") of
Just p -> fromMaybe Web.defaultPort (readMaybe p)
Nothing -> Web.defaultPort
Web.run port
| args `Cli.has` Cli.command "work" = do
-- Always run in current directory
let path = "."
-- Infer name from current directory
absPath <- Directory.getCurrentDirectory
let name = Text.pack (takeFileName absPath)
let worker =
AgentCore.Worker
{ AgentCore.workerName = name,
AgentCore.workerPid = Nothing,
AgentCore.workerStatus = AgentCore.Idle,
AgentCore.workerPath = path
}
let taskId = fmap Text.pack (Cli.getArg args (Cli.argument "task-id"))
AgentWorker.start worker taskId
| args `Cli.has` Cli.command "review" = do
let autoMode = args `Cli.has` Cli.longOption "auto"
case Cli.getArg args (Cli.argument "task-id") of
Just tidStr -> reviewTask (Text.pack tidStr) autoMode
Nothing -> do
-- Find tasks in Review status
tasks <- TaskCore.loadTasks
let reviewTasks = filter (\t -> TaskCore.taskStatus t == TaskCore.Review) tasks
case reviewTasks of
[] -> putText "No tasks in Review status."
(t : _) -> reviewTask (TaskCore.taskId t) autoMode
| args `Cli.has` Cli.command "loop" = do
let delay = case Cli.getArg args (Cli.longOption "delay") of
Just d -> fromMaybe 5 (readMaybe d)
Nothing -> 5
runLoop delay
| args `Cli.has` Cli.command "merge-driver" = mergeDriver args
| otherwise = putText (str <| Docopt.usage help)
mergeDriver :: Cli.Arguments -> IO ()
mergeDriver args = do
ours <- getArgOrExit args (Cli.argument "ours")
theirs <- getArgOrExit args (Cli.argument "theirs")
-- Set TASK_DB_PATH to ours (the file git provided as the current version)
-- Since we are no longer using git-tracked tasks.jsonl, this merge driver logic needs rethinking.
-- If the merge driver is called, it means git found a conflict in .tasks/tasks.jsonl, but we deleted it.
-- So this code might be dead, or we might be dealing with legacy files during a rebase.
-- For now, we'll keep the logic but be aware it's likely unused.
Env.setEnv "TASK_DB_PATH" ours
-- TaskCore.importTasks theirs
-- Task.importTasks theirs
-- We need to call task import via CLI or library.
-- Omni.Task.importTasks IS NOT EXPOSED.
-- But we can call Task.main
withArgs ["import", "-i", theirs] Task.main
Exit.exitSuccess
getArgOrExit :: Cli.Arguments -> Docopt.Option -> IO String
getArgOrExit args opt =
case Cli.getArg args opt of
Just val -> pure val
Nothing -> do
putText <| "Error: Missing required argument " <> Text.pack (show opt)
Exit.exitFailure
-- | Run the autonomous loop: work -> review -> repeat
runLoop :: Int -> IO ()
runLoop delaySec = do
putText "Starting autonomous jr loop..."
putText ("Delay between iterations: " <> tshow delaySec <> "s")
go
where
go = do
-- Check for ready work
readyTasks <- TaskCore.getReadyTasks
case readyTasks of
[] -> do
putText "\nNo ready tasks. Checking for tasks to review..."
reviewPending
(task : _) -> do
putText ("\n=== Working on: " <> TaskCore.taskId task <> " ===")
-- Run worker
absPath <- Directory.getCurrentDirectory
let name = Text.pack (takeFileName absPath)
let worker =
AgentCore.Worker
{ AgentCore.workerName = name,
AgentCore.workerPid = Nothing,
AgentCore.workerStatus = AgentCore.Idle,
AgentCore.workerPath = "."
}
AgentWorker.start worker (Just (TaskCore.taskId task))
-- After work, check for review
reviewPending
-- Delay and loop
putText ("\nSleeping " <> tshow delaySec <> "s...")
threadDelay (delaySec * 1000000)
go
reviewPending = do
tasks <- TaskCore.loadTasks
let reviewTasks = filter (\t -> TaskCore.taskStatus t == TaskCore.Review) tasks
case reviewTasks of
[] -> putText "No tasks pending review."
(t : _) -> do
putText ("\n=== Auto-reviewing: " <> TaskCore.taskId t <> " ===")
reviewTask (TaskCore.taskId t) True
reviewTask :: Text -> Bool -> IO ()
reviewTask tid autoMode = do
tasks <- TaskCore.loadTasks
case TaskCore.findTask tid tasks of
Nothing -> do
putText ("Task " <> tid <> " not found.")
Exit.exitFailure
Just task -> do
unless autoMode <| TaskCore.showTaskDetailed task
let grepArg = "--grep=" <> Text.unpack tid
(code, shaOut, _) <-
Process.readProcessWithExitCode
"git"
["log", "--pretty=format:%H", "-n", "1", grepArg]
""
when (code /= Exit.ExitSuccess || null shaOut) <| do
putText "\nNo commit found for this task."
putText "The worker may not have completed yet, or the commit message doesn't include the task ID."
Exit.exitFailure
let commitSha = case List.lines shaOut of
(x : _) -> x
[] -> ""
-- Check for merge conflicts before showing diff
conflictResult <- checkMergeConflict commitSha
case conflictResult of
Just conflictFiles -> do
putText "\n=== MERGE CONFLICT DETECTED ==="
putText "This commit cannot be cleanly applied to live."
putText "Conflicting files:"
traverse_ (\f -> putText (" - " <> f)) conflictFiles
putText ""
putText "Kicking back to coder with context..."
-- Get current retry count
maybeCtx <- TaskCore.getRetryContext tid
let attempt = maybe 1 (\c -> TaskCore.retryAttempt c + 1) maybeCtx
if attempt > 3
then do
putText "\nTask has failed 3 times. Marking as NeedsHuman."
-- For now, just mark as Open with a note (no NeedsHuman status yet)
TaskCore.updateTaskStatus tid TaskCore.Open []
putText ("Task " <> tid <> " needs human intervention (3 failed attempts).")
else do
-- Save retry context
TaskCore.setRetryContext
TaskCore.RetryContext
{ TaskCore.retryTaskId = tid,
TaskCore.retryOriginalCommit = Text.pack commitSha,
TaskCore.retryConflictFiles = conflictFiles,
TaskCore.retryAttempt = attempt,
TaskCore.retryReason = "merge_conflict"
}
TaskCore.updateTaskStatus tid TaskCore.Open []
putText ("Task " <> tid <> " returned to queue (attempt " <> tshow attempt <> "/3).")
Nothing -> do
if autoMode
then autoReview tid task commitSha
else interactiveReview tid commitSha
-- | Auto-review: run tests on namespace, accept if pass, reject if fail
autoReview :: Text -> TaskCore.Task -> String -> IO ()
autoReview tid task commitSha = do
putText "Running automated review..."
-- Determine what to test based on namespace
-- Keep .hs suffix since bild expects it
let namespace = fromMaybe "." (TaskCore.taskNamespace task)
let testTarget = Text.unpack namespace
putText ("Testing: " <> Text.pack testTarget)
-- Run bild --test on the namespace
(testCode, testOut, testErr) <-
Process.readProcessWithExitCode
"bild"
["--test", testTarget]
""
case testCode of
Exit.ExitSuccess -> do
putText "✓ Tests passed. Accepting task."
TaskCore.clearRetryContext tid
TaskCore.updateTaskStatus tid TaskCore.Done []
putText ("Task " <> tid <> " marked as Done.")
Exit.ExitFailure _ -> do
putText "✗ Tests failed. Rejecting task."
let reason = "Test failure:\n" <> Text.pack testOut <> Text.pack testErr
maybeCtx <- TaskCore.getRetryContext tid
let attempt = maybe 1 (\ctx -> TaskCore.retryAttempt ctx + 1) maybeCtx
if attempt > 3
then do
putText "\nTask has failed 3 times. Marking as NeedsHuman."
TaskCore.updateTaskStatus tid TaskCore.Open []
putText ("Task " <> tid <> " needs human intervention (3 failed attempts).")
else do
TaskCore.setRetryContext
TaskCore.RetryContext
{ TaskCore.retryTaskId = tid,
TaskCore.retryOriginalCommit = Text.pack commitSha,
TaskCore.retryConflictFiles = [],
TaskCore.retryAttempt = attempt,
TaskCore.retryReason = reason
}
TaskCore.updateTaskStatus tid TaskCore.Open []
putText ("Task " <> tid <> " reopened (attempt " <> tshow attempt <> "/3).")
-- | Interactive review with user prompts
interactiveReview :: Text -> String -> IO ()
interactiveReview tid commitSha = do
putText "\n=== Diff for this task ===\n"
_ <- Process.rawSystem "git" ["show", commitSha]
putText "\n[a]ccept / [r]eject / [s]kip? "
IO.hFlush IO.stdout
choice <- getLine
case Text.toLower choice of
c
| "a" `Text.isPrefixOf` c -> do
TaskCore.clearRetryContext tid
TaskCore.updateTaskStatus tid TaskCore.Done []
putText ("Task " <> tid <> " marked as Done.")
| "r" `Text.isPrefixOf` c -> do
putText "Enter rejection reason: "
IO.hFlush IO.stdout
reason <- getLine
-- Save rejection as retry context
maybeCtx <- TaskCore.getRetryContext tid
let attempt = maybe 1 (\ctx -> TaskCore.retryAttempt ctx + 1) maybeCtx
TaskCore.setRetryContext
TaskCore.RetryContext
{ TaskCore.retryTaskId = tid,
TaskCore.retryOriginalCommit = Text.pack commitSha,
TaskCore.retryConflictFiles = [],
TaskCore.retryAttempt = attempt,
TaskCore.retryReason = "rejected: " <> reason
}
TaskCore.updateTaskStatus tid TaskCore.Open []
putText ("Task " <> tid <> " reopened (attempt " <> tshow attempt <> "/3).")
| otherwise -> putText "Skipped; no status change."
-- | Check if a commit can be cleanly cherry-picked onto live
-- Returns Nothing if clean, Just [conflicting files] if conflict
checkMergeConflict :: String -> IO (Maybe [Text])
checkMergeConflict commitSha = do
-- Save current state
(_, _, _) <- Process.readProcessWithExitCode "git" ["branch", "--show-current"] ""
(_, origHead, _) <- Process.readProcessWithExitCode "git" ["rev-parse", "HEAD"] ""
-- Try cherry-pick
(cpCode, _, cpErr) <-
Process.readProcessWithExitCode
"git"
["cherry-pick", "--no-commit", commitSha]
""
-- Always abort/reset regardless of result
_ <- Process.readProcessWithExitCode "git" ["cherry-pick", "--abort"] ""
_ <- Process.readProcessWithExitCode "git" ["reset", "--hard", List.head (List.lines origHead)] ""
case cpCode of
Exit.ExitSuccess -> pure Nothing
Exit.ExitFailure _ -> do
-- Parse conflict files from error message
let errLines = Text.lines (Text.pack cpErr)
conflictLines = filter (Text.isPrefixOf "CONFLICT") errLines
-- Extract file names (rough parsing)
files = mapMaybe extractConflictFile conflictLines
pure (Just (if null files then ["(unknown files)"] else files))
extractConflictFile :: Text -> Maybe Text
extractConflictFile line =
-- CONFLICT (content): Merge conflict in path/to/file.hs
case Text.breakOn "Merge conflict in " line of
(_, rest)
| not (Text.null rest) -> Just (Text.strip (Text.drop 18 rest))
_ -> case Text.breakOn "in " line of
(_, rest)
| not (Text.null rest) -> Just (Text.strip (Text.drop 3 rest))
_ -> Nothing
test :: Test.Tree
test =
Test.group
"Omni.Jr"
[ Test.unit "can run tests" <| True Test.@?= True,
Test.unit "can parse work command" <| do
let result = Docopt.parseArgs help ["work"]
case result of
Left err -> Test.assertFailure <| "Failed to parse 'work': " <> show err
Right args -> args `Cli.has` Cli.command "work" Test.@?= True,
Test.unit "can parse work command with task id" <| do
let result = Docopt.parseArgs help ["work", "t-123"]
case result of
Left err -> Test.assertFailure <| "Failed to parse 'work t-123': " <> show err
Right args -> do
args `Cli.has` Cli.command "work" Test.@?= True
Cli.getArg args (Cli.argument "task-id") Test.@?= Just "t-123"
]
|