cli: update for upstream lexicon refactor

5 files changed, 47 insertions, 31 deletions

diff --git a/extra/adenosine.1 b/extra/adenosine.1
index dcac2dd..24ebdb2 100644
--- a/extra/adenosine.1
+++ b/extra/adenosine.1
@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "adenosine" "1" "2022-10-28" "adenosine CLI Client Manual Page"
+.TH "adenosine" "1" "2022-11-07" "adenosine CLI Client Manual Page"
 .P
 .SH NAME
 .P
@@ -65,7 +65,7 @@ Prints repository description fetched from PDS
 .RE
 \fBresolve\fR <name>
 .RS 4
-Has PDS resolve username to a DID
+Has PDS resolve handle to a DID
 .P
 .RE
 .SS Generic XRPC Requests
@@ -142,20 +142,20 @@ Create a 'repost' record for the target by AT URI
 .RE
 \fBbsky search-users\fR
 .RS 4
-Query by partial username
+Query by partial handle
 .P
 .P
 .RE
 .SS Account Management
 .P
-\fBaccount register --email <email> --password <password> --username <username>\fR
+\fBaccount register --email <email> --password <password> --handle <handle>\fR
 .P
 \fBaccount info\fR
 .RS 4
 Fetches account metadata for the current session
 .P
 .RE
-\fBaccount login --password <password> --username <username>\fR
+\fBaccount login --password <password> --handle <handle>\fR
 .RS 4
 Create a new authenticated session
 .P
@@ -220,7 +220,7 @@ adenosine account register -u voltaire\&.test -p bogus -e voltaire@example\&.com
 {
 	"did": "did:plc:yqtuksvatmmgngd5nkkw75hn",
 	"jwt": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9\&.eyJzdWIiOiJkaWQ6cGxjOnlxdHVrc3ZhdG1tZ25nZDVua2t3NzVobiIsImlhdCI6MTY2Njk5NjMwNn0\&.MMQa4JIQdwvhy-rjJ0kO-z8-KdoOL0Lto9JtOkK-lwE",
-	"username": "voltaire\&.test"
+	"handle": "voltaire\&.test"
 }
 
 export ATP_AUTH_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9\&.eyJzdWIiOiJkaWQ6cGxjOnlxdHVrc3ZhdG1tZ25nZDVua2t3NzVobiIsImlhdCI6MTY2Njk5NjMwNn0\&.MMQa4JIQdwvhy-rjJ0kO-z8-KdoOL0Lto9JtOkK-lwE
diff --git a/extra/adenosine.1.md b/extra/adenosine.1.md
index dc44e59..424312d 100644
--- a/extra/adenosine.1.md
+++ b/extra/adenosine.1.md
@@ -61,7 +61,7 @@ COMMANDS
 
 **resolve** \<name\>
 
-> Has PDS resolve username to a DID
+> Has PDS resolve handle to a DID
 
 Generic XRPC Requests
 ---------------------
@@ -130,19 +130,19 @@ Bluesky (bsky.app)
 
 **bsky search-users**
 
-> Query by partial username
+> Query by partial handle
 
 Account Management
 ------------------
 
-**account register \--email \<email\> \--password \<password\>
-\--username \<username\>**
+**account register \--email \<email\> \--password \<password\> \--handle
+\<handle\>**
 
 **account info**
 
 > Fetches account metadata for the current session
 
-**account login \--password \<password\> \--username \<username\>**
+**account login \--password \<password\> \--handle \<handle\>**
 
 > Create a new authenticated session
 
@@ -202,7 +202,7 @@ for an existing account, and save the JWT token to the
     {
     	"did": "did:plc:yqtuksvatmmgngd5nkkw75hn",
     	"jwt": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6cGxjOnlxdHVrc3ZhdG1tZ25nZDVua2t3NzVobiIsImlhdCI6MTY2Njk5NjMwNn0.MMQa4JIQdwvhy-rjJ0kO-z8-KdoOL0Lto9JtOkK-lwE",
-    	"username": "voltaire.test"
+    	"handle": "voltaire.test"
     }
 
     export ATP_AUTH_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6cGxjOnlxdHVrc3ZhdG1tZ25nZDVua2t3NzVobiIsImlhdCI6MTY2Njk5NjMwNn0.MMQa4JIQdwvhy-rjJ0kO-z8-KdoOL0Lto9JtOkK-lwE
diff --git a/extra/adenosine.1.scdoc b/extra/adenosine.1.scdoc
index 2c55801..41d7413 100644
--- a/extra/adenosine.1.scdoc
+++ b/extra/adenosine.1.scdoc
@@ -49,7 +49,7 @@ JSON object with keys "title" (string value), "year" (number value), "tags"
 	Prints repository description fetched from PDS
 
 *resolve* <name>
-	Has PDS resolve username to a DID
+	Has PDS resolve handle to a DID
 
 ## Generic XRPC Requests
 
@@ -100,17 +100,17 @@ body fields. Body fields only used for "post" requests.
 	Create a 'repost' record for the target by AT URI
 
 *bsky search-users*
-	Query by partial username
+	Query by partial handle
 
 
 ## Account Management
 
-*account register --email <email> --password <password> --username <username>*
+*account register --email <email> --password <password> --handle <handle>*
 
 *account info*
 	Fetches account metadata for the current session
 
-*account login --password <password> --username <username>*
+*account login --password <password> --handle <handle>*
 	Create a new authenticated session
 
 *account logout*
@@ -158,7 +158,7 @@ adenosine account register -u voltaire.test -p bogus -e voltaire@example.com
 {
 	"did": "did:plc:yqtuksvatmmgngd5nkkw75hn",
 	"jwt": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6cGxjOnlxdHVrc3ZhdG1tZ25nZDVua2t3NzVobiIsImlhdCI6MTY2Njk5NjMwNn0.MMQa4JIQdwvhy-rjJ0kO-z8-KdoOL0Lto9JtOkK-lwE",
-	"username": "voltaire.test"
+	"handle": "voltaire.test"
 }
 
 export ATP_AUTH_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6cGxjOnlxdHVrc3ZhdG1tZ25nZDVua2t3NzVobiIsImlhdCI6MTY2Njk5NjMwNn0.MMQa4JIQdwvhy-rjJ0kO-z8-KdoOL0Lto9JtOkK-lwE
diff --git a/extra/adenosine.bash_completions b/extra/adenosine.bash_completions
index d9d5644..068a82f 100644
--- a/extra/adenosine.bash_completions
+++ b/extra/adenosine.bash_completions
@@ -104,7 +104,7 @@ _adenosine() {
 
     case "${cmd}" in
         adenosine)
-            opts=" -v -h -V  --verbose --help --version --host --auth-token --shell-completions   get ls create update delete describe resolve xrpc account repo bsky status help"
+            opts=" -v -h -V  --verbose --help --version --host --auth-token --shell-completions   status ls get create update delete describe resolve xrpc account repo bsky help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -224,18 +224,18 @@ _adenosine() {
             return 0
             ;;
         adenosine__account__login)
-            opts=" -h -V -v -u -p  --help --version --verbose --username --password --host --auth-token  "
+            opts=" -V -v -h -p  --help --version --verbose --handle --password --host --auth-token  "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
                 
-                --username)
+                --handle)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -u)
+                    -h)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -286,7 +286,7 @@ _adenosine() {
             return 0
             ;;
         adenosine__account__register)
-            opts=" -h -V -v -e -u -p  --help --version --verbose --email --username --password --host --auth-token  "
+            opts=" -V -v -e -h -p -r  --help --version --verbose --email --handle --password --recovery-key --host --auth-token  "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -301,11 +301,11 @@ _adenosine() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                --username)
+                --handle)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -u)
+                    -h)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -317,6 +317,14 @@ _adenosine() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
+                --recovery-key)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -r)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 --host)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
diff --git a/extra/adenosine.zsh_completions b/extra/adenosine.zsh_completions
index d9d5644..068a82f 100644
--- a/extra/adenosine.zsh_completions
+++ b/extra/adenosine.zsh_completions
@@ -104,7 +104,7 @@ _adenosine() {
 
     case "${cmd}" in
         adenosine)
-            opts=" -v -h -V  --verbose --help --version --host --auth-token --shell-completions   get ls create update delete describe resolve xrpc account repo bsky status help"
+            opts=" -v -h -V  --verbose --help --version --host --auth-token --shell-completions   status ls get create update delete describe resolve xrpc account repo bsky help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -224,18 +224,18 @@ _adenosine() {
             return 0
             ;;
         adenosine__account__login)
-            opts=" -h -V -v -u -p  --help --version --verbose --username --password --host --auth-token  "
+            opts=" -V -v -h -p  --help --version --verbose --handle --password --host --auth-token  "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
                 
-                --username)
+                --handle)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -u)
+                    -h)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -286,7 +286,7 @@ _adenosine() {
             return 0
             ;;
         adenosine__account__register)
-            opts=" -h -V -v -e -u -p  --help --version --verbose --email --username --password --host --auth-token  "
+            opts=" -V -v -e -h -p -r  --help --version --verbose --email --handle --password --recovery-key --host --auth-token  "
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -301,11 +301,11 @@ _adenosine() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                --username)
+                --handle)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -u)
+                    -h)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -317,6 +317,14 @@ _adenosine() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
+                --recovery-key)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                    -r)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 --host)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0