aicli 0.3.0 → 0.4.0

data/lib/aicli/helpers/shell_history.rb

@@ -3,45 +3,182 @@
 module AiCli
   module Helpers
     module ShellHistory
-      module_function
+      SOURCE_MARKER = '# aicli shell history integration'
 
-      def append(command)
-        history_file = history_file_path
-        return unless history_file
+      module_function
 
-        last = last_command(history_file)
-        return if last == command
+      # Queue the executed command for the shell wrapper to store in history
+      # instead of the original `ai ...` invocation.
+      def record_executed(command)
+        text = command.to_s.strip
+        return if text.empty?
 
-        File.open(history_file, 'a') { |f| f.puts(command) }
+        Config.ensure_home!
+        File.write(pending_path, text)
       rescue StandardError
-        # Ignore history write errors
+        nil
       end
 
-      def history_file_path
-        shell = File.basename(ENV['SHELL'] || '')
-        home = Dir.home
+      def install_shell_integration!
+        Config.ensure_home!
+        target_dir = Config.home_dir
+
+        {
+          'ai.zsh' => zsh_wrapper,
+          'ai.bash' => bash_wrapper
+        }.each do |name, contents|
+          File.write(File.join(target_dir, name), contents)
+        end
+      end
+
+      def activate_shell_integration!
+        install_shell_integration!
+        rc_path = shell_rc_path
+        source_path = wrapper_source_path
+
+        if rc_path && File.exist?(rc_path)
+          append_source_to_rc!(rc_path, source_path)
+          { rc_path: rc_path, source_path: source_path, activated: true }
+        else
+          { rc_path: nil, source_path: source_path, activated: false }
+        end
+      end
+
+      def append_source_to_rc!(rc_path, source_path)
+        content = File.read(rc_path)
+        return if content.include?(SOURCE_MARKER) || content.include?(source_path)
+
+        block = <<~RC
+
+          #{SOURCE_MARKER}
+          [[ -f #{source_path} ]] && source #{source_path}
+        RC
+        File.write(rc_path, content.rstrip + block)
+      end
 
-        case shell
-        when 'bash', 'sh'
-          File.join(home, '.bash_history')
+      def shell_rc_path
+        home = Dir.home
+        case current_shell
         when 'zsh'
-          File.join(home, '.zsh_history')
-        when 'fish'
-          File.join(home, '.local', 'share', 'fish', 'fish_history')
-        when 'ksh'
-          File.join(home, '.ksh_history')
-        when 'tcsh'
-          File.join(home, '.history')
+          File.join(home, '.zshrc')
+        when 'bash'
+          File.join(home, '.bashrc')
         end
       end
 
-      def last_command(history_file)
-        return nil unless File.exist?(history_file)
+      def wrapper_source_path
+        name = current_shell == 'bash' ? 'ai.bash' : 'ai.zsh'
+        File.join(Config.home_dir, name)
+      end
 
-        lines = File.read(history_file).strip.split("\n")
-        lines.last
-      rescue StandardError
-        nil
+      def shell_integration_hint(activated: false, rc_path: nil, source_path: nil)
+        source_path ||= wrapper_source_path
+        if activated && rc_path
+          <<~HINT.strip
+            Added to #{rc_path}. Reload your shell:
+
+              source #{rc_path}
+
+            Or open a new terminal tab.
+          HINT
+        else
+          case current_shell
+          when 'zsh'
+            <<~HINT.strip
+              Add to ~/.zshrc for shell history integration:
+
+                source #{source_path}
+            HINT
+          when 'bash'
+            <<~HINT.strip
+              Add to ~/.bashrc for shell history integration:
+
+                source #{source_path}
+            HINT
+          else
+            ''
+          end
+        end
+      end
+
+      def pending_path
+        File.join(Config.home_dir, 'history.pending')
+      end
+
+      def current_shell
+        File.basename(ENV['SHELL'] || 'bash')
+      end
+
+      def zsh_wrapper
+        <<~'ZSH'
+          # aicli shell history integration for zsh
+          if [[ -z "$AICLI_ZSH_INTEGRATION" ]]; then
+            AICLI_ZSH_INTEGRATION=1
+
+            _aicli_zshaddhistory() {
+              if [[ -n "$AICLI_PENDING_HISTORY" ]]; then
+                print -s -- "$AICLI_PENDING_HISTORY"
+                unset AICLI_PENDING_HISTORY
+                return 1
+              fi
+            }
+
+            _aicli_precmd() {
+              if [[ -n "$AICLI_PENDING_HISTORY" ]]; then
+                local cmd="$AICLI_PENDING_HISTORY"
+                unset AICLI_PENDING_HISTORY
+                local last="${${(z)${(f)"$(fc -l -1 2>/dev/null)"}}[2]}"
+                if [[ "$last" == ai\ * || "$last" == aicli\ * ]]; then
+                  fc -d -1 -I 2>/dev/null
+                fi
+                print -s -- "$cmd"
+              fi
+            }
+
+            ai() {
+              AICLI_SHELL_WRAPPER=1 command ai "$@"
+              local ret=$?
+              if [[ -f "$HOME/.aicli/history.pending" ]]; then
+                typeset -g AICLI_PENDING_HISTORY="${$(<"$HOME/.aicli/history.pending")}"
+                rm -f "$HOME/.aicli/history.pending"
+              fi
+              return $ret
+            }
+
+            zshaddhistory_functions+=(_aicli_zshaddhistory)
+            precmd_functions+=(_aicli_precmd)
+          fi
+        ZSH
+      end
+
+      def bash_wrapper
+        <<~'BASH'
+          # aicli shell history integration for bash
+          if [[ -z "$AICLI_BASH_INTEGRATION" ]]; then
+            AICLI_BASH_INTEGRATION=1
+
+            _aicli_bash_history() {
+              if [[ -n "$AICLI_PENDING_HISTORY" ]]; then
+                local cmd="$AICLI_PENDING_HISTORY"
+                unset AICLI_PENDING_HISTORY
+                history -d "$HISTCMD" 2>/dev/null
+                history -s "$cmd"
+              fi
+            }
+
+            ai() {
+              AICLI_SHELL_WRAPPER=1 command ai "$@"
+              local ret=$?
+              if [[ -f "$HOME/.aicli/history.pending" ]]; then
+                AICLI_PENDING_HISTORY=$(<"$HOME/.aicli/history.pending")
+                rm -f "$HOME/.aicli/history.pending"
+              fi
+              return $ret
+            }
+
+            PROMPT_COMMAND="_aicli_bash_history${PROMPT_COMMAND:+; $PROMPT_COMMAND}"
+          fi
+        BASH
       end
     end
   end

data/lib/aicli/helpers/theme.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'pastel'
+require 'tty-prompt'
+
+module AiCli
+  module Helpers
+    module Theme
+      module_function
+
+      def accent(text)
+        pastel.public_send(Constants::ACCENT_COLOR, text)
+      end
+
+      def bold(text)
+        pastel.bold(text)
+      end
+
+      def dim(text)
+        pastel.dim(text)
+      end
+
+      def status(config)
+        "#{Constants::PROJECT_NAME}, #{config['PROVIDER']} / #{config['MODEL']}"
+      end
+
+      def show_status(config)
+        puts accent(status(config))
+      end
+
+      def prompt(**options)
+        TTY::Prompt.new(active_color: Constants::ACCENT_COLOR, **options)
+      end
+
+      def pastel
+        @pastel ||= Pastel.new
+      end
+    end
+  end
+end

data/lib/aicli/prompt.rb

@@ -1,102 +1,46 @@
 # frozen_string_literal: true
 
-require 'open3'
 require 'clipboard'
-require 'pastel'
-require 'tty-prompt'
-require 'tty-spinner'
 
 module AiCli
   module Prompt
     module_function
 
     def run(use_prompt: nil, silent_mode: false)
-      init_i18n
-
       config = Helpers::Config.get
-      skip_explanation = silent_mode || config['SILENT_MODE']
-
-      pastel = Pastel.new
-      puts ''
-      puts pastel.cyan(Helpers::Constants::PROJECT_NAME)
-      puts pastel.dim("#{config['PROVIDER']} / #{config['MODEL']}")
-
-      the_prompt = use_prompt.nil? || use_prompt.strip.empty? ? ask_prompt : use_prompt
+      prompt_text = use_prompt.to_s.strip.empty? ? ask_prompt : use_prompt
 
-      spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Loading...')}", format: :dots)
-      spinner.auto_spin
-
-      result = Helpers::Completion.get_script_and_info(
-        prompt: the_prompt,
-        config: config
-      )
-
-      spinner.success(Helpers::I18n.t('Your script') + ':')
-      puts ''
-      script = result[:read_script].call(->(chunk) { print chunk })
-      puts ''
-      puts ''
-
-      explanation_text = ''
-      unless skip_explanation
-        spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Getting explanation...')}", format: :dots)
-        spinner.auto_spin
-
-        info = result[:read_info].call(->(chunk) { print chunk })
-        if info.nil? || info.empty?
-          explanation = Helpers::Completion.get_explanation(
-            script: script,
-            config: config
-          )
-          spinner.success(Helpers::I18n.t('Explanation') + ':')
-          puts ''
-          explanation_text = explanation[:read_explanation].call(->(chunk) { print chunk })
-          puts ''
-          puts ''
-        else
-          explanation_text = info
-          spinner.success(Helpers::I18n.t('Explanation') + ':')
-        end
-      end
-
-      append_prompt_context(the_prompt, script, explanation_text)
-      run_or_revise_flow(script, config, silent_mode)
+      Helpers::Theme.show_status(config)
+      script = Helpers::Completion.get_script(prompt: prompt_text, config: config)
+      save_context(prompt_text, script, '')
+      present_script_menu(script, config, silent_mode, leading_newline: true)
     end
 
-    def init_i18n
-      config = Helpers::Config.get
-      Helpers::I18n.set_language(config['LANGUAGE'])
-    rescue StandardError
-      Helpers::I18n.set_language('en')
-    end
-
-    def examples
-      [
-        Helpers::I18n.t('delete all log files'),
-        Helpers::I18n.t('list js files'),
-        Helpers::I18n.t('fetch me a random joke'),
-        Helpers::I18n.t('list all commits')
-      ]
-    end
-
-    def ask_prompt(initial = nil)
-      prompt = TTY::Prompt.new(interrupt: :error)
+    def ask_prompt
+      prompt = Helpers::Theme.prompt(interrupt: :error)
       Helpers::Context.seed_prompt_history(prompt)
 
       loop do
-        begin
-          return prompt.ask(Helpers::I18n.t('What would you like me to do?')) do |q|
-            q.required true
-            q.default initial || Helpers::I18n.t('Say hello')
-            q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
-          end
-        rescue TTY::Reader::InputInterrupt
-          print "\r\e[2K"
+        return prompt.ask(Helpers::I18n.t('What would you like me to do?')) do |q|
+          q.required true
+          q.default Helpers::I18n.t('Say hello')
+          q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
         end
+      rescue TTY::Reader::InputInterrupt
+        print "\r\e[2K"
+      end
+    end
+
+    def ask_revision
+      Helpers::Theme.prompt(interrupt: :exit).ask(
+        Helpers::I18n.t('What would you like me to change in this script?')
+      ) do |q|
+        q.required true
+        q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
       end
     end
 
-    def append_prompt_context(user_prompt, script, explanation)
+    def save_context(user_prompt, script, explanation = '')
       assistant = +"```\n#{script}\n```"
       assistant << "\n\n#{explanation}" unless explanation.to_s.strip.empty?
 
@@ -106,43 +50,65 @@ module AiCli
       Helpers::Context.save_messages(messages)
     end
 
-    def ask_revision
-      prompt = TTY::Prompt.new(interrupt: :exit)
-      prompt.ask(Helpers::I18n.t('What would you like me to change in this script?')) do |q|
-        q.required true
-        q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
-      end
+    def append_explanation_to_context(explanation)
+      text = explanation.to_s.strip
+      return if text.empty?
+
+      messages = Helpers::Context.load_messages
+      return if messages.empty?
+
+      last = messages.last
+      return unless last['role'] == 'assistant' && !last['content'].include?(text)
+
+      last['content'] = "#{last['content']}\n\n#{text}"
+      Helpers::Context.save_messages(messages)
+    end
+
+    def display_script(script, leading_newline: false)
+      text = script.to_s.strip
+      return if text.empty?
+
+      puts '' if leading_newline
+      puts Helpers::Theme.bold(text)
     end
 
-    def run_script(script)
-      puts "#{Helpers::I18n.t('Running')}: #{script}"
+    def display_explanation(text)
+      stripped = text.to_s.strip
+      return if stripped.empty?
+
       puts ''
-      system(ENV['SHELL'] || 'bash', '-c', script)
-      Helpers::ShellHistory.append(script)
+      puts Helpers::Theme.dim(stripped)
     end
 
-    def run_or_revise_flow(script, config, silent_mode)
-      prompt = TTY::Prompt.new(interrupt: :exit)
-      empty_script = script.strip.empty?
+    def present_script_menu(script, config, silent_mode, leading_newline: false, show_script: true)
+      display_script(script, leading_newline: leading_newline) if show_script
+      run_action_menu(script, config, silent_mode)
+    end
 
-      choices = []
-      unless empty_script
-        choices << { name: "✅ #{Helpers::I18n.t('Yes')}", value: :yes }
-        choices << { name: "📝 #{Helpers::I18n.t('Edit')}", value: :edit }
-      end
-      choices << { name: "🔁 #{Helpers::I18n.t('Revise')}", value: :revise }
-      choices << { name: "📋 #{Helpers::I18n.t('Copy')}", value: :copy }
-      choices << { name: "❌ #{Helpers::I18n.t('Cancel')}", value: :cancel }
+    def run_action_menu(script, config, silent_mode)
+      empty = script.strip.empty?
+      message = empty ? Helpers::I18n.t('Revise this script?') : Helpers::I18n.t('Run this script?')
 
-      message = empty_script ? Helpers::I18n.t('Revise this script?') : Helpers::I18n.t('Run this script?')
-      answer = prompt.select(message, choices)
+      puts ''
+      answer = Helpers::ScriptActionMenu.select(
+        question: message,
+        config: config,
+        silent_mode: silent_mode,
+        empty_script: empty
+      )
 
       case answer
       when :yes
-        run_script(script)
+        puts ''
+        Helpers::ShellExec.run(script)
       when :edit
-        new_script = prompt.ask(Helpers::I18n.t('you can edit script here'), default: script)
-        run_script(new_script) if new_script && !new_script.empty?
+        edited = Helpers::ScriptEditor.ask(script)
+        present_script_menu(edited, config, silent_mode, show_script: false) if edited && !edited.empty?
+      when :explain
+        text = Helpers::Completion.get_explanation(script: script, config: config)
+        display_explanation(text)
+        append_explanation_to_context(text)
+        present_script_menu(script, config, silent_mode, leading_newline: !text.to_s.strip.empty?)
       when :revise
         revision_flow(script, config, silent_mode)
       when :copy
@@ -154,45 +120,14 @@ module AiCli
       end
     end
 
-    def revision_flow(current_script, config, silent_mode)
+    def revision_flow(script, config, silent_mode)
       revision = ask_revision
-
-      spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Loading...')}", format: :dots)
-      spinner.auto_spin
-
-      result = Helpers::Completion.get_revision(
-        prompt: revision,
-        code: current_script,
-        config: config
-      )
-
-      spinner.success(Helpers::I18n.t('Your new script') + ':')
-      puts ''
-      script = result[:read_script].call(->(chunk) { print chunk })
-      puts ''
-      puts ''
-
-      unless silent_mode
-        info_spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Getting explanation...')}", format: :dots)
-        info_spinner.auto_spin
-
-        explanation = Helpers::Completion.get_explanation(
-          script: script,
-          config: config
-        )
-
-        info_spinner.success(Helpers::I18n.t('Explanation') + ':')
-        puts ''
-        explanation[:read_explanation].call(->(chunk) { print chunk })
-        puts ''
-        puts ''
-      end
-
-      run_or_revise_flow(script, config, silent_mode)
+      revised = Helpers::Completion.get_revision(prompt: revision, code: script, config: config)
+      present_script_menu(revised, config, silent_mode, leading_newline: true)
     end
 
-    private_class_method :init_i18n, :examples, :ask_prompt, :ask_revision,
-                         :run_script, :run_or_revise_flow, :revision_flow,
-                         :append_prompt_context
+    private_class_method :ask_prompt, :ask_revision, :save_context, :append_explanation_to_context,
+                         :display_script, :display_explanation, :present_script_menu,
+                         :run_action_menu, :revision_flow
   end
 end

data/lib/aicli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AiCli
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/aicli.rb

@@ -2,11 +2,14 @@
 
 require_relative 'aicli/version'
 require_relative 'aicli/helpers/constants'
+require_relative 'aicli/helpers/theme'
+require_relative 'aicli/helpers/script_action_menu'
 require_relative 'aicli/helpers/error'
 require_relative 'aicli/helpers/i18n'
 require_relative 'aicli/helpers/os_detect'
-require_relative 'aicli/helpers/strip_regex_patterns'
 require_relative 'aicli/helpers/shell_history'
+require_relative 'aicli/helpers/shell_exec'
+require_relative 'aicli/helpers/script_editor'
 require_relative 'aicli/helpers/llm'
 require_relative 'aicli/helpers/completion'
 require_relative 'aicli/helpers/config'

data/locales/en.yml

@@ -1,11 +1,7 @@
 ---
-Starting new conversation: Starting new conversation
 Goodbye!: Goodbye!
-send a message ('exit' to quit): send a message ('exit' to quit)
 Please enter a prompt.: Please enter a prompt.
 THINKING...: THINKING...
-Please set your OpenAI API key via `ai config set OPENAI_KEY=<your token>`: Please
-  set your OpenAI API key via `ai config set OPENAI_KEY=<your token>`
 Set config: Set config
 Enter your OpenAI API key: Enter your OpenAI API key
 Enter your Anthropic API key: Enter your Anthropic API key
@@ -14,7 +10,6 @@ Provider: Provider
 Pick a provider: Pick a provider
 OpenAI Key: OpenAI Key
 Anthropic Key: Anthropic Key
-Please enter a key: Please enter a key
 OpenAI API Endpoint: OpenAI API Endpoint
 Enter your OpenAI API Endpoint: Enter your OpenAI API Endpoint
 Silent Mode: Silent Mode
@@ -22,50 +17,30 @@ Enable silent mode?: Enable silent mode?
 Model: Model
 Pick a model.: Pick a model.
 No models found for this provider.: No models found for this provider.
-Enter the model you want to use: Enter the model you want to use
 Language: Language
 Enter the language you want to use: Enter the language you want to use
 What would you like me to do?: What would you like me to do?
-delete all log files: delete all log files
-list js files: list js files
-fetch me a random joke: fetch me a random joke
-list all commits: list all commits
 Say hello: Say hello
-you can edit script here: you can edit script here
-What would you like me to change in this script?: What would you like me to change
-  in this script?
-e.g.: e.g.
-e.g. change the folder name: e.g. change the folder name
-Your script: Your script
-Loading...: Loading...
-Getting explanation...: Getting explanation...
-Explanation: Explanation
+Edit script: Edit script
+Edit with arrow keys, Enter to confirm, Ctrl+C to cancel: Edit with arrow keys, Enter to confirm, Ctrl+C to cancel
+What would you like me to change in this script?: What would you like me to change in this script?
 Run this script?: Run this script?
-Run it?: Run it?
 Revise this script?: Revise this script?
-'Yes': 'Yes'
-Lets go!: Lets go!
-Edit: Edit
-Make some adjustments before running: Make some adjustments before running
+Yes: Yes
+Modify: Modify
+Exit: Exit
+Explain: Explain
 Revise: Revise
-Give feedback via prompt and get a new result: Give feedback via prompt and get a
-  new result
 Copy: Copy
-Copy the generated script to your clipboard: Copy the generated script to your clipboard
 Cancel: Cancel
-Exit the program: Exit the program
 Running: Running
 Copied to clipboard!: Copied to clipboard!
-Your new script: Your new script
 Invalid config property: Invalid config property
+Invalid mode: Invalid mode
 Shell detection failed unexpectedly: Shell detection failed unexpectedly
-Invalid model: Invalid model
 Error: Error
 Missing required parameter: Missing required parameter
-Please open a Bug report with the information above: Please open a Bug report with
-  the information above
-Prompt to run: Prompt to run
+Please open a Bug report with the information above: Please open a Bug report with the information above
 You: You
-Ask for a shell command. Type exit to quit.: Ask for a shell command. Type exit to quit.
-Restored context: Restored context
-messages: messages
+Shell integration installed.: Shell integration installed.
+Run it?: Run it?