aicli 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c27ca0316a3ca251344ea8a63589d603d67a6a89e77287b6615f9314650ed1
-  data.tar.gz: c44be18b27d259f0fd8f93f2133246775d042ab09576be64dc8138353d53d095
+  metadata.gz: 9657d0162a9e2e70e856d1d6fd798880a300eb8c2dd8e284b2d3abe9e7964e9a
+  data.tar.gz: 73885b2b870ba4c450df673e7ee21f9eadd456106703b2023be0678b1b43aa78
 SHA512:
-  metadata.gz: becb34f20ed09c6d7de4f68c72b81aa6ae83cb72bf158e401c35bdabc291a2339d2fa16d845abf6934c826d1be0cbb50f48f45e9bec08a7c554a3e79bf8ba5c3
-  data.tar.gz: 9dc02259b8ea17da0d3a73aaade312cc88a0c234b9c6418014ac840025f8b440c9c735ac605165b898b00fe1e53e37f14365c60943652b6561e8ffa0b603f0ad
+  metadata.gz: e395efe484bc84474cfc1e0d50600e07a1b836b6431dfda5f1786f7357289c7c113292df41ac7ff54bd11187f4a55f4ddb940b0be2af3bb235dc2dc82aa3466b
+  data.tar.gz: aa611ebff07502eef7886872083511cff09fb7e7613fd61294eb64c0403eb2012f083c5091c19f807d310ed842f4f48195ca7729cfc803bc4e924d4dddb04728

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.2.6
+
+- Ctrl+C clears the current input line instead of exiting chat/prompt
+
+## 0.2.5
+
+- Fix chat `Run it? (y/n)` input (read from `/dev/tty`; only `y` executes)
+
+## 0.2.4
+
+- Persist last 40 chat/prompt messages in `~/.aicli/context` and reload on next run
+- Migrate flat `~/.aicli` config file to `~/.aicli/config`
+
+## 0.2.3
+
+- In `ai chat`, detect suggested shell commands and ask to run them, then continue the conversation
+
 ## 0.2.2
 
 - Improve `ai update`: compare installed version with RubyGems, install latest explicitly, clearer status messages

data/README.md

@@ -57,7 +57,7 @@ Ruby port by [Antonio Molinari](https://github.com/magnum), inspired by the orig
    Or use the interactive UI (`aicli config`) to pick provider, key, and model.
    Model lists come from the [RubyLLM](https://rubyllm.com/models/) registry.
 
-   This will create a `.aicli` file in your home directory.
+   Config lives in `~/.aicli/config`. Chat/prompt history is stored in `~/.aicli/context` (last 40 messages) and reloaded on the next run.
 
 ## Usage
 
@@ -89,7 +89,7 @@ aicli 'what is my ip address'
 aicli chat
 ```
 
-Engage in a conversation with the AI directly through the CLI.
+Ask for shell commands in a multi-turn conversation. When the assistant suggests a command in a code fence, you are asked whether to run it; after it runs (or you decline), chat continues. Press `Ctrl+d` to quit.
 
 ### Silent mode (skip explanations)
 
@@ -195,7 +195,7 @@ bundle exec bin/ai config set OPENAI_KEY=<your token>
 
 ### Rate limit / quota errors
 
-Usually billing or quota on the configured provider (OpenAI or Anthropic). Check that provider’s console billing page and that the matching API key is set in `~/.aicli`.
+Usually billing or quota on the configured provider (OpenAI or Anthropic). Check that provider’s console billing page and that the matching API key is set in `~/.aicli/config`.
 
 ## Motivation
 

data/lib/aicli/commands/chat.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'io/console'
 require 'pastel'
 require 'tty-prompt'
 require 'tty-spinner'
@@ -12,50 +13,109 @@ module AiCli
       def run
         config = Helpers::Config.get
         chat = Helpers::Completion.start_chat(config)
+        restored = Helpers::Context.load_messages
+        Helpers::Context.apply_to_chat(chat) if restored.any?
 
         pastel = Pastel.new
-        prompt = TTY::Prompt.new(interrupt: :exit)
+        prompt = TTY::Prompt.new(interrupt: :error)
+        Helpers::Context.seed_prompt_history(prompt)
 
         puts ''
-        puts "┌  #{Helpers::I18n.t('Starting new conversation')}"
-        puts pastel.dim("   #{config['PROVIDER']} / #{config['MODEL']}")
+        puts "#{config['PROVIDER']} / #{config['MODEL']}  #{pastel.dim('Ctrl+d to quit')}"
 
-        loop do
-          user_prompt = prompt.ask(pastel.cyan("#{Helpers::I18n.t('You')}:")) do |q|
-            q.required true
-            q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
-          end
-
-          if user_prompt.nil? || user_prompt == 'exit'
-            puts "└  #{Helpers::I18n.t('Goodbye!')}"
-            exit 0
-          end
+        catch(:chat_quit) do
+          prompt.on(:keyctrl_d) { throw :chat_quit }
 
-          spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('THINKING...')}", format: :dots)
-          spinner.auto_spin
-          started = false
-
-          Helpers::Completion.stream_chat_message(
-            chat,
-            user_prompt,
-            writer: lambda { |chunk|
-              unless started
-                spinner.success(pastel.green('aicli:'))
-                puts ''
-                started = true
+          loop do
+            begin
+              user_prompt = prompt.ask(pastel.cyan("#{Helpers::I18n.t('You')}:")) do |q|
+                q.required true
+                q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
               end
-              print chunk
-            }
-          )
+            rescue TTY::Reader::InputInterrupt
+              # Ctrl+C clears the current input line and re-prompts.
+              print "\r\e[2K"
+              next
+            end
+
+            if user_prompt.nil? || user_prompt.strip.downcase == 'exit'
+              throw :chat_quit
+            end
+
+            spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('THINKING...')}", format: :dots)
+            spinner.auto_spin
+            started = false
+
+            response = Helpers::Completion.stream_chat_message(
+              chat,
+              user_prompt,
+              writer: lambda { |chunk|
+                unless started
+                  spinner.success(pastel.green('aicli:'))
+                  puts ''
+                  started = true
+                end
+                print chunk
+              }
+            )
 
-          unless started
-            spinner.success(pastel.green('aicli:'))
+            unless started
+              spinner.success(pastel.green('aicli:'))
+              puts ''
+            end
             puts ''
+            puts ''
+
+            Helpers::Context.save_from_chat(chat)
+            offer_to_run_commands(response, pastel)
           end
-          puts ''
+        end
+
+        Helpers::Context.save_from_chat(chat)
+        puts ''
+        puts Helpers::I18n.t('Goodbye!')
+      end
+
+      def offer_to_run_commands(response, pastel)
+        commands = Helpers::Completion.extract_commands(response)
+        return if commands.empty?
+
+        commands.each do |command|
+          puts pastel.dim(command)
+          next unless ask_to_run?
+
+          run_command(command)
           puts ''
         end
       end
+
+      # Only explicit `y` runs the command. Enter, Esc, n, Ctrl-C → skip.
+      def ask_to_run?
+        tty = File.open('/dev/tty', 'r+')
+        tty.print "#{Helpers::I18n.t('Run it?')} (y/n) "
+        tty.flush
+        char = tty.getch
+        tty.puts
+        char.to_s.downcase == 'y'
+      rescue Interrupt
+        begin
+          tty&.puts
+        rescue StandardError
+          puts
+        end
+        false
+      ensure
+        tty&.close
+      end
+
+      def run_command(command)
+        puts "#{Helpers::I18n.t('Running')}: #{command}"
+        puts ''
+        system(ENV['SHELL'] || 'bash', '-c', command)
+        Helpers::ShellHistory.append(command)
+      end
+
+      private_class_method :offer_to_run_commands, :ask_to_run?, :run_command
     end
   end
 end

data/lib/aicli/helpers/completion.rb

@@ -42,7 +42,41 @@ module AiCli
 
       # Multi-turn chat helper used by `aicli chat`.
       def start_chat(config)
-        Llm.build_chat(config)
+        chat = Llm.build_chat(config)
+        chat.with_instructions(chat_system_prompt)
+        chat
+      end
+
+      def chat_system_prompt
+        <<~PROMPT
+          You are aicli, a terminal assistant. The user is asking for shell commands.
+
+          Target OS: #{OsDetect.operating_system_name}
+          Target shell: #{OsDetect.detect_shell}
+
+          Whenever you suggest a command the user can run, put the exact runnable command
+          alone inside a markdown fenced code block, for example:
+
+          ```
+          ls -la
+          ```
+
+          Prefer a single command. You may briefly explain outside the fence.
+          Do not wrap non-runnable prose in fences.
+        PROMPT
+      end
+
+      def extract_commands(text)
+        return [] if text.nil? || text.empty?
+
+        blocks = text.scan(/```(?:[a-zA-Z0-9_+-]*)\s*\n?(.*?)```/m)
+                     .flatten
+                     .map { |block| block.strip.gsub(/\A`+|`+\z/, '') }
+                     .map(&:strip)
+                     .reject(&:empty?)
+
+        # Prefer the last fenced command if several were suggested.
+        blocks
       end
 
       def stream_chat_message(chat, message, writer:)

data/lib/aicli/helpers/config.rb

@@ -7,7 +7,9 @@ require 'tty-prompt'
 module AiCli
   module Helpers
     module Config
-      CONFIG_PATH = File.join(Dir.home, '.aicli')
+      HOME_DIR = File.join(Dir.home, '.aicli')
+      CONFIG_PATH = File.join(HOME_DIR, 'config')
+      LEGACY_FLAT_CONFIG_PATH = File.join(Dir.home, '.aicli')
       LEGACY_CONFIG_PATH = File.join(Dir.home, '.ai-shell')
 
       CONFIG_PARSERS = {
@@ -36,6 +38,32 @@ module AiCli
 
       module_function
 
+      def home_dir
+        ensure_home!
+        HOME_DIR
+      end
+
+      def ensure_home!
+        if File.file?(LEGACY_FLAT_CONFIG_PATH) && !File.directory?(LEGACY_FLAT_CONFIG_PATH)
+          migrate_flat_config!
+        else
+          FileUtils.mkdir_p(HOME_DIR)
+        end
+        HOME_DIR
+      end
+
+      def migrate_flat_config!
+        backup = "#{LEGACY_FLAT_CONFIG_PATH}.migrating.#{Process.pid}"
+        File.rename(LEGACY_FLAT_CONFIG_PATH, backup)
+        FileUtils.mkdir_p(HOME_DIR)
+        FileUtils.mv(backup, CONFIG_PATH)
+      rescue StandardError
+        FileUtils.mkdir_p(HOME_DIR)
+        if File.exist?(backup)
+          FileUtils.mv(backup, CONFIG_PATH) unless File.exist?(CONFIG_PATH)
+        end
+      end
+
       def get(cli_config = nil)
         config = read_config_file
         parsed = {}
@@ -87,6 +115,7 @@ module AiCli
         end
 
         updates.each { |key, value| config[key] = value }
+        ensure_home!
         File.write(CONFIG_PATH, stringify_ini(config))
       end
 
@@ -178,9 +207,11 @@ module AiCli
       end
 
       def read_config_file
-        path = if File.exist?(CONFIG_PATH)
+        ensure_home!
+
+        path = if File.file?(CONFIG_PATH)
                  CONFIG_PATH
-               elsif File.exist?(LEGACY_CONFIG_PATH)
+               elsif File.file?(LEGACY_CONFIG_PATH)
                  LEGACY_CONFIG_PATH
                end
         return {} unless path

data/lib/aicli/helpers/context.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'json'
+require 'time'
+
+module AiCli
+  module Helpers
+    module Context
+      # Keep the last N user/assistant messages across sessions.
+      MAX_MESSAGES = 40
+      CONTEXT_FILENAME = 'context'
+
+      module_function
+
+      def path
+        File.join(Config.home_dir, CONTEXT_FILENAME)
+      end
+
+      def load_messages
+        Config.ensure_home!
+        return [] unless File.file?(path)
+
+        data = JSON.parse(File.read(path))
+        Array(data['messages'])
+          .select { |m| m.is_a?(Hash) && %w[user assistant].include?(m['role'].to_s) }
+          .map { |m| { 'role' => m['role'].to_s, 'content' => m['content'].to_s } }
+          .reject { |m| m['content'].strip.empty? }
+          .last(MAX_MESSAGES)
+      rescue StandardError
+        []
+      end
+
+      def save_messages(messages)
+        Config.ensure_home!
+        normalized = Array(messages)
+                     .map { |m| normalize_message(m) }
+                     .compact
+                     .last(MAX_MESSAGES)
+
+        payload = {
+          'version' => 1,
+          'updated_at' => Time.now.utc.iso8601,
+          'messages' => normalized
+        }
+        File.write(path, "#{JSON.pretty_generate(payload)}\n")
+      rescue StandardError
+        # Ignore persistence failures; chat should still work.
+      end
+
+      def save_from_chat(chat)
+        save_messages(chat.messages)
+      end
+
+      def apply_to_chat(chat)
+        load_messages.each do |message|
+          chat.add_message(role: message['role'].to_sym, content: message['content'])
+        end
+      end
+
+      def user_prompts
+        load_messages.select { |m| m['role'] == 'user' }.map { |m| m['content'] }
+      end
+
+      def seed_prompt_history(prompt)
+        return unless prompt.respond_to?(:reader)
+
+        user_prompts.each do |line|
+          prompt.reader.add_to_history(line)
+        end
+      rescue StandardError
+        nil
+      end
+
+      def normalize_message(message)
+        if message.respond_to?(:role) && message.respond_to?(:content)
+          role = message.role.to_s
+          content = message.content.to_s
+        elsif message.is_a?(Hash)
+          role = (message[:role] || message['role']).to_s
+          content = (message[:content] || message['content']).to_s
+        else
+          return nil
+        end
+
+        return nil unless %w[user assistant].include?(role)
+        return nil if content.strip.empty?
+
+        { 'role' => role, 'content' => content }
+      end
+      private_class_method :normalize_message
+    end
+  end
+end

data/lib/aicli/prompt.rb

@@ -18,8 +18,8 @@ module AiCli
 
       pastel = Pastel.new
       puts ''
-      puts "┌  #{pastel.cyan(Helpers::Constants::PROJECT_NAME)}"
-      puts pastel.dim("   #{config['PROVIDER']} / #{config['MODEL']}")
+      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
 
@@ -36,8 +36,8 @@ module AiCli
       script = result[:read_script].call(->(chunk) { print chunk })
       puts ''
       puts ''
-      puts pastel.dim('•')
 
+      explanation_text = ''
       unless skip_explanation
         spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Getting explanation...')}", format: :dots)
         spinner.auto_spin
@@ -50,15 +50,16 @@ module AiCli
           )
           spinner.success(Helpers::I18n.t('Explanation') + ':')
           puts ''
-          explanation[:read_explanation].call(->(chunk) { print chunk })
+          explanation_text = explanation[:read_explanation].call(->(chunk) { print chunk })
           puts ''
           puts ''
-          puts pastel.dim('•')
         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)
     end
 
@@ -79,14 +80,32 @@ module AiCli
     end
 
     def ask_prompt(initial = nil)
-      prompt = TTY::Prompt.new(interrupt: :exit)
-      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.'))
+      prompt = TTY::Prompt.new(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"
+        end
       end
     end
 
+    def append_prompt_context(user_prompt, script, explanation)
+      assistant = +"```\n#{script}\n```"
+      assistant << "\n\n#{explanation}" unless explanation.to_s.strip.empty?
+
+      messages = Helpers::Context.load_messages
+      messages << { 'role' => 'user', 'content' => user_prompt.to_s }
+      messages << { 'role' => 'assistant', 'content' => assistant }
+      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|
@@ -96,7 +115,7 @@ module AiCli
     end
 
     def run_script(script)
-      puts "└  #{Helpers::I18n.t('Running')}: #{script}"
+      puts "#{Helpers::I18n.t('Running')}: #{script}"
       puts ''
       system(ENV['SHELL'] || 'bash', '-c', script)
       Helpers::ShellHistory.append(script)
@@ -128,15 +147,14 @@ module AiCli
         revision_flow(script, config, silent_mode)
       when :copy
         Clipboard.copy(script)
-        puts "└  #{Helpers::I18n.t('Copied to clipboard!')}"
+        puts Helpers::I18n.t('Copied to clipboard!')
       when :cancel
-        puts "└  #{Helpers::I18n.t('Goodbye!')}"
+        puts Helpers::I18n.t('Goodbye!')
         exit 0
       end
     end
 
     def revision_flow(current_script, config, silent_mode)
-      pastel = Pastel.new
       revision = ask_revision
 
       spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Loading...')}", format: :dots)
@@ -153,7 +171,6 @@ module AiCli
       script = result[:read_script].call(->(chunk) { print chunk })
       puts ''
       puts ''
-      puts pastel.dim('•')
 
       unless silent_mode
         info_spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('Getting explanation...')}", format: :dots)
@@ -169,13 +186,13 @@ module AiCli
         explanation[:read_explanation].call(->(chunk) { print chunk })
         puts ''
         puts ''
-        puts pastel.dim('•')
       end
 
       run_or_revise_flow(script, config, silent_mode)
     end
 
     private_class_method :init_i18n, :examples, :ask_prompt, :ask_revision,
-                         :run_script, :run_or_revise_flow, :revision_flow
+                         :run_script, :run_or_revise_flow, :revision_flow,
+                         :append_prompt_context
   end
 end

data/lib/aicli/version.rb

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

data/lib/aicli.rb

@@ -10,6 +10,7 @@ require_relative 'aicli/helpers/shell_history'
 require_relative 'aicli/helpers/llm'
 require_relative 'aicli/helpers/completion'
 require_relative 'aicli/helpers/config'
+require_relative 'aicli/helpers/context'
 require_relative 'aicli/prompt'
 require_relative 'aicli/commands/chat'
 require_relative 'aicli/commands/config'

data/locales/en.yml

@@ -41,6 +41,7 @@ Loading...: Loading...
 Getting explanation...: Getting explanation...
 Explanation: Explanation
 Run this script?: Run this script?
+Run it?: Run it?
 Revise this script?: Revise this script?
 'Yes': 'Yes'
 Lets go!: Lets go!
@@ -65,3 +66,6 @@ Please open a Bug report with the information above: Please open a Bug report wi
   the information above
 Prompt to run: Prompt to run
 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

data/locales/it.yml

@@ -41,6 +41,7 @@ Loading...: Caricamento...
 Getting explanation...: Ottieni spiegazione...
 Explanation: Spiegazione
 Run this script?: Esegui questo script?
+Run it?: Lo eseguo?
 Revise this script?: Rivedi questo script?
 'Yes': Si
 Lets go!: Vai!
@@ -64,3 +65,6 @@ Please open a Bug report with the information above: Apri un report di bug con l
   informazioni sopra
 Prompt to run: Prompt da eseguire
 You: Tu
+Ask for a shell command. Type exit to quit.: Chiedi un comando shell. Digita exit per uscire.
+Restored context: Contesto ripristinato
+messages: messaggi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aicli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Antonio Molinari
@@ -116,6 +116,7 @@ files:
 - lib/aicli/helpers/completion.rb
 - lib/aicli/helpers/config.rb
 - lib/aicli/helpers/constants.rb
+- lib/aicli/helpers/context.rb
 - lib/aicli/helpers/error.rb
 - lib/aicli/helpers/i18n.rb
 - lib/aicli/helpers/llm.rb