@@ -1,7 +1,16 @@
 #!/usr/bin/env fish
 #queue a job based on $1/PWD and current git branch/commit
-set --local jobname $argv[1] $(basename $PWD)
+
+argparse --name="ci queue" t/tag -- $argv
+
+set --function jobname $argv[1] $(basename $PWD)
+
+if set --query _flag_tag
+    set --function --append args tag=$(git tag --sort=version:refname | egrep "^v?[0-9]" | tail -n1)
+else
+    set --function --append args ref=refs/heads/$(git branch --show-current)
+    set --function --append args rev=$(git rev-parse @)
+end
 
-ssh smrk laminarc queue $jobname[1] \
-    ref=refs/heads/$(git branch --show-current) \
-    rev=$(git rev-parse @)
+ssh smrk laminarc queue $jobname[1] $args
+