Improve login wording + add cancel option.

Fixes #205

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fix Gemini (OpenAI compatible). #247
+- Improve login wording + add cancel option. #205
 
 ## 0.91.2
 

src/eca/features/commands.clj

@@ -254,14 +254,21 @@
                                                   :content (merge {:type :usage}
                                                                   usage)})))
                    :prompt (f.prompt/compact-prompt (string/join " " args) all-tools config db)})
-      "login" (do (f.login/handle-step {:message (or (first args) "")
-                                        :chat-id chat-id}
-                                       db*
-                                       messenger
-                                       config
-                                       metrics)
-                  {:type :new-chat-status
-                   :status :login})
+      "login" (do
+                (messenger/chat-content-received
+                 messenger
+                 {:chat-id chat-id
+                  :role "system"
+                  :content {:type :text
+                            :text "Login started, type 'cancel' anytime to exit login."}})
+                (f.login/handle-step {:message (or (first args) "")
+                                      :chat-id chat-id}
+                                     db*
+                                     messenger
+                                     config
+                                     metrics)
+                {:type :new-chat-status
+                 :status :login})
       "resume" (let [chats (into {}
                                  (filter #(not= chat-id (first %)))
                                  (:chats db))

src/eca/features/login.clj

@@ -22,13 +22,26 @@
       (send-msg! (reduce
                   (fn [s provider]
                     (str s "- " provider "\n"))
-                  "Choose a provider:\n"
+                  "Inform the provider:\n\n"
                   providers)))))
 
 (defn handle-step [{:keys [message chat-id]} db* messenger config metrics]
   (let [provider (get-in @db* [:chats chat-id :login-provider])
         step (get-in @db* [:auth provider :step] :login/start)
         input (string/trim message)
+        send-msg! (fn [msg]
+                      (messenger/chat-content-received
+                       messenger
+                       {:chat-id chat-id
+                        :role "system"
+                        :content {:type :text
+                                  :text msg}})
+                      (messenger/chat-content-received
+                       messenger
+                       {:chat-id chat-id
+                        :role "system"
+                        :content {:type :progress
+                                  :state :finished}}))
         ctx {:chat-id chat-id
              :step step
              :input input
@@ -37,28 +50,24 @@
              :messenger messenger
              :metrics metrics
              :provider provider
-             :send-msg! (fn [msg]
-                          (messenger/chat-content-received
-                           messenger
-                           {:chat-id chat-id
-                            :role "system"
-                            :content {:type :text
-                                      :text msg}})
-                          (messenger/chat-content-received
-                           messenger
-                           {:chat-id chat-id
-                            :role "system"
-                            :content {:type :progress
-                                      :state :finished}}))}]
+             :send-msg! send-msg!}]
     (messenger/chat-content-received
      messenger
      {:chat-id chat-id
       :role "user"
       :content {:type :text
                 :text (str input "\n")}})
-    (login-step ctx)
-    {:chat-id chat-id
-     :status :login}))
+    (if (= "cancel" input)
+      (do
+        (send-msg! "Login cancelled")
+        (swap! db* assoc-in [:chats chat-id :login-provider] nil)
+        (swap! db* assoc-in [:chats chat-id :status] :idle)
+        {:chat-id chat-id
+         :status :idle})
+      (do
+        (login-step ctx)
+        {:chat-id chat-id
+         :status :login}))))
 
 (defn ^:private renew-auth!
   [provider

src/eca/llm_providers/anthropic.clj

@@ -363,9 +363,9 @@
   (swap! db* assoc-in [:auth provider] {:step :login/waiting-login-method})
   (send-msg! (multi-str "Now, inform the login method:"
                         ""
-                        "max: Claude Pro/Max"
-                        "console: Create API Key"
-                        "manual: Manually enter API Key")))
+                        "- max: Claude Pro/Max"
+                        "- console: Automatically create API Key and use it"
+                        "- manual: Manually enter API Key")))
 
 (defmethod f.login/login-step ["anthropic" :login/waiting-login-method] [{:keys [db* input provider send-msg!]}]
   (case input

src/eca/llm_providers/openai.clj

@@ -337,8 +337,8 @@
   (swap! db* assoc-in [:auth provider] {:step :login/waiting-login-method})
   (send-msg! (multi-str "Now, inform the login method:"
                         ""
-                        "pro: GPT Plus/Pro (subscription)"
-                        "manual: Manually enter API Key")))
+                        "- pro: GPT Plus/Pro (subscription)"
+                        "- manual: Manually enter API Key")))
 
 (defmethod f.login/login-step ["openai" :login/waiting-login-method] [{:keys [db* input provider send-msg!] :as ctx}]
   (case input

test/eca/features/login_test.clj

@@ -22,7 +22,7 @@
                          :send-msg! send-msg!})
 
       (testing "should ask to choose a provider"
-        (is (= "Choose a provider:\n- github-copilot\n- google\n"
+        (is (= "Inform the provider:\n\n- github-copilot\n- google\n"
                (last @msg-log)))))
 
     (testing "user is confused"
@@ -34,7 +34,7 @@
                          :send-msg! send-msg!})
 
       (testing "should ask to choose a provider and provide instructions"
-        (is (= "Choose a provider:\n- github-copilot\n- google\n"
+        (is (= "Inform the provider:\n\n- github-copilot\n- google\n"
                (last @msg-log)))
 
         (testing "state didn't change"