aicli 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8134338cc00872e289ea3980bc6367cb8c6231ba5c09879a80cc3ff5d8ebf32d
-  data.tar.gz: 4c53b4eb29d4f93cb2dba0709a7121219945a37aebf6edb45db288dba373002b
+  metadata.gz: cf98faf6cbdbc3b6ec1597895520ab51c1a2c4d8f31e0ef80360497d57d6fdd6
+  data.tar.gz: 531e7e3941c6de76d4dbca4f284f2ba6f3017216398173c605448e8c4a036934
 SHA512:
-  metadata.gz: 0b89932ed8a62cce86bd1feb3e6da8e3026fe8448ae3a11a55bfdffa7180addee78cbfeeaad8ef19a556e865fb016c2277edfb31448bb6675606919cef528da4
-  data.tar.gz: ae512d71dfdd1c65fb2d5d18130180eb6d6f5d00673b030743e5cf3cc195e87e2db6856816601d9b617ad8e250e5ed3223b749b2032480ea08a2e30c32d2f64f
+  metadata.gz: 1b9259c9ac632dcb4bb5324db52260a112b58ea087faf2d28a36f22c7099d234d6188ad406e6791e746b2d994d397d4d61b39a24f8940b1dc54f9b17af3adf85
+  data.tar.gz: 348882fccb22e28fcb3970e1a2f603b512ab6ca149e1d339debdb3a3feb29facd4133cfb34c29000334bc10121d6f4fb3432bebdef862fb61b3b4a3c4e916446

data/README.md

@@ -1,194 +1,55 @@
 # aicli
 
-Natural language to live shell commands — OpenAI & Anthropic.
+Natural language → shell commands. OpenAI or Anthropic.
 
-Chat with the model and run suggested commands in your shell in one seamless flow.
-
-The gem is named **aicli**; the shell command is **`ai`** (also available as `aicli`).
+Install: `gem install aicli` (Ruby 3.0+). Command: **`ai`**.
 
 ## Setup
 
-> Requires Ruby 3.0+
-
-1. Install the gem:
-
-   ```sh
-   gem install aicli
-   ```
-
-   Or from this repository:
-
-   ```sh
-   bundle install
-   bundle exec rake install
-   # or
-   gem build aicli.gemspec && gem install ./aicli-*.gem
-   ```
-
-2. Choose a provider and set the matching API key.
-
-   **OpenAI** (default) — key from [OpenAI](https://platform.openai.com/account/api-keys):
-
-   ```sh
-   ai config set PROVIDER=openai
-   ai config set OPENAI_KEY=<your token>
-   ```
-
-   **Anthropic** — key from [Anthropic](https://console.anthropic.com/settings/keys):
-
-   ```sh
-   ai config set PROVIDER=anthropic
-   ai config set ANTHROPIC_KEY=<your token>
-   ```
-
-   Or use the interactive UI (`ai config`) to pick provider, key, and model.
-   Model lists come from the [RubyLLM](https://rubyllm.com/models/) registry.
-
-   Config lives in `~/.aicli/config`. Chat/prompt history is stored in `~/.aicli/context` (last 40 messages) and reloaded on the next run.
-
-3. **Shell history** (optional): when you run a suggested command, store that command in your shell history instead of the original `ai ...` line (so ↑ recalls `for f in *.mp4; do ...` rather than `ai bash ...`):
-
-   ```sh
-   ai config shell
-   ```
-
-   Then add the printed `source` line to `~/.zshrc` or `~/.bashrc` and restart your shell (or `source` the file).
-
-## Usage
-
-```bash
-ai <prompt>
-```
-
-For example:
-
-```bash
-ai list all log files
-```
-
-Then you will get an output where you can choose to run the suggested command, revise it via a prompt, edit it, copy it, or cancel.
-
-### Special characters
-
-Some shells handle characters like `?` or `*` specially. Wrap the prompt in quotes if needed:
-
-```bash
-ai 'what is my ip address'
-```
-
-### Chat mode
-
-```bash
-ai chat
-```
-
-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)
-
-```bash
-ai -s list all log files
-```
-
-Or save the preference:
-
-```bash
-ai config set SILENT_MODE=true
-```
-
-### Provider and model
-
 ```sh
-ai config set PROVIDER=openai      # or anthropic
-ai config set MODEL=gpt-4o-mini    # provider-specific model id
+ai config set PROVIDER=openai
+ai config set OPENAI_KEY=<token>
 ```
 
-Defaults: `gpt-4o-mini` (OpenAI), `claude-sonnet-4-6` (Anthropic).
-
-LLM calls go through [RubyLLM](https://rubyllm.com/), so chat streaming and model metadata stay provider-agnostic.
-
-### Custom OpenAI API endpoint
+Or `ai config` for the interactive setup. Config: `~/.aicli/config`.
 
-Useful for OpenAI-compatible proxies (ignored for Anthropic):
+Anthropic:
 
 ```sh
-ai config set OPENAI_API_ENDPOINT=<your proxy endpoint>
+ai config set PROVIDER=anthropic
+ai config set ANTHROPIC_KEY=<token>
 ```
 
-Default: `https://api.openai.com/v1`
-
-### Set Language
-
-| Language            | Key     |
-| ------------------- | ------- |
-| English             | en      |
-| Simplified Chinese  | zh-Hans |
-| Traditional Chinese | zh-Hant |
-| Spanish             | es      |
-| Japanese            | jp      |
-| Korean              | ko      |
-| French              | fr      |
-| German              | de      |
-| Russian             | ru      |
-| Ukrainian           | uk      |
-| Vietnamese          | vi      |
-| Arabic              | ar      |
-| Portuguese          | pt      |
-| Turkish             | tr      |
-| Indonesian          | id      |
-| Italian             | it      |
+Shell history (optional — ↑ recalls the run command, not `ai ...`):
 
 ```sh
-ai config set LANGUAGE=zh-Hans
+ai config shell
+source ~/.zshrc
 ```
 
-### Config UI
+## Usage
 
-```bash
-ai config
+```sh
+ai list all log files
+ai 'what is my ip address'    # quote special chars
+ai chat                       # multi-turn; Ctrl+d to quit
+ai -s list log files          # skip Explain in menu
 ```
 
-### Upgrading
-
-```bash
-ai --version
+```sh
+ai config set SILENT_MODE=true
+ai config set MODEL=gpt-4o-mini
+ai config set LANGUAGE=it
 ai update
-# or: gem update aicli
 ```
 
 ## Development
 
-Run the local checkout (not the installed gem) with Bundler from this directory:
-
 ```sh
 bundle install
-
-bundle exec bin/ai --help
-bundle exec bin/ai config
-bundle exec bin/ai chat
 bundle exec bin/ai list all log files
 ```
 
-`bundle exec` loads dependencies from the Gemfile and code from `lib/`. `bin/aicli` is an alias of `bin/ai`.
-
-Example config for local testing:
-
-```sh
-bundle exec bin/ai config set PROVIDER=openai
-bundle exec bin/ai config set OPENAI_KEY=<your token>
-# or: PROVIDER=anthropic + ANTHROPIC_KEY=<your token>
-```
-
-## Common Issues
-
-### 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/config`.
-
-## Motivation
-
-I am not a bash wizard, and am dying for access to the copilot CLI, and got impatient.
-
-## Credit
+## License
 
-Started from [BuilderIO/ai-shell](https://github.com/BuilderIO/ai-shell) (MIT; copyright Builder.io 2023).
+[MIT](LICENSE)

data/lib/aicli/cli.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'pastel'
 
 module AiCli
   class CLI < Thor
-    KNOWN_COMMANDS = %w[config chat update help version tree].freeze
+    KNOWN_COMMANDS = %w[config chat update help version].freeze
 
     def self.exit_on_failure?
       true
@@ -13,8 +12,6 @@ module AiCli
 
     def self.start(given_args = ARGV, config = {})
       args = given_args.dup
-
-      # Extract global flags that may appear before the prompt text
       silent = args.delete('--silent') || args.delete('-s')
       version_flag = args.delete('--version') || args.delete('-v')
       help_flag = args.delete('--help') || args.delete('-h')
@@ -29,7 +26,6 @@ module AiCli
         return
       end
 
-      # Prompt flag: -p / --prompt
       prompt_from_flag = nil
       if (idx = args.index('-p') || args.index('--prompt'))
         prompt_from_flag = args[idx + 1]
@@ -38,51 +34,43 @@ module AiCli
 
       first = args.first
 
-      if first.nil? || !KNOWN_COMMANDS.include?(first)
-        # Treat remaining args as the natural-language prompt
+      unless first.nil? || KNOWN_COMMANDS.include?(first)
         prompt_text = prompt_from_flag || args.join(' ')
         invoke_prompt(prompt_text, silent: !silent.nil?)
         return
       end
 
-      # Rebuild argv for Thor subcommands, preserving silent if relevant
-      thor_args = args
-      thor_args = ['--silent'] + thor_args if silent && first == 'chat'
+      thor_args = silent && first == 'chat' ? ['--silent'] + args : args
       super(thor_args, config)
     end
 
     def self.invoke_prompt(prompt_text, silent: false)
-      pastel = Pastel.new
-
-      begin
-        config = Helpers::Config.get
-        Helpers::I18n.set_language(config['LANGUAGE'])
-      rescue StandardError
-        Helpers::I18n.set_language('en')
-      end
-
+      Helpers::I18n.load_from_config!
       Prompt.run(use_prompt: prompt_text, silent_mode: silent)
+    rescue Interrupt
+      puts Helpers::I18n.t('Goodbye!')
+      exit 0
     rescue Helpers::KnownError, StandardError => e
-      puts "\n#{pastel.red('✖')} #{e.message}"
+      puts "\n#{Helpers::Theme.pastel.red('✖')} #{e.message}"
       Helpers::Error.handle_cli_error(e)
       exit 1
     end
 
     desc 'config [MODE] [KEY=VALUE...]', 'Configure the CLI'
     def config(mode = nil, *key_values)
-      init_i18n
+      Helpers::I18n.load_from_config!
       Commands::Config.run(mode, *key_values)
     end
 
     desc 'chat', 'Start a new chat session'
     def chat
-      init_i18n
+      Helpers::I18n.load_from_config!
       Commands::Chat.run
     end
 
     desc 'update', 'Update the aicli gem to the latest version'
     def update
-      init_i18n
+      Helpers::I18n.load_from_config!
       Commands::Update.run
     end
 
@@ -91,14 +79,5 @@ module AiCli
     def version
       puts AiCli::VERSION
     end
-
-    private
-
-    def init_i18n
-      config = Helpers::Config.get
-      Helpers::I18n.set_language(config['LANGUAGE'])
-    rescue StandardError
-      Helpers::I18n.set_language('en')
-    end
   end
 end

data/lib/aicli/commands/chat.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'io/console'
-require 'pastel'
-require 'tty-prompt'
 require 'tty-spinner'
 
 module AiCli
@@ -16,31 +14,27 @@ module AiCli
         restored = Helpers::Context.load_messages
         Helpers::Context.apply_to_chat(chat) if restored.any?
 
-        pastel = Pastel.new
-        prompt = TTY::Prompt.new(interrupt: :error)
+        prompt = Helpers::Theme.prompt(interrupt: :error)
         Helpers::Context.seed_prompt_history(prompt)
 
         puts ''
-        puts "#{config['PROVIDER']} / #{config['MODEL']}  #{pastel.dim('Ctrl+d to quit')}"
+        puts "#{Helpers::Theme.status(config)}  #{Helpers::Theme.dim('Ctrl+d to quit')}"
 
         catch(:chat_quit) do
           prompt.on(:keyctrl_d) { throw :chat_quit }
 
           loop do
             begin
-              user_prompt = prompt.ask(pastel.cyan("#{Helpers::I18n.t('You')}:")) do |q|
+              user_prompt = prompt.ask(Helpers::Theme.accent("#{Helpers::I18n.t('You')}:")) do |q|
                 q.required true
                 q.validate(/.+/, Helpers::I18n.t('Please enter a prompt.'))
               end
             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
+            throw :chat_quit if user_prompt.nil? || user_prompt.strip.downcase == 'exit'
 
             spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('THINKING...')}", format: :dots)
             spinner.auto_spin
@@ -51,7 +45,7 @@ module AiCli
               user_prompt,
               writer: lambda { |chunk|
                 unless started
-                  spinner.success(pastel.green('ai:'))
+                  spinner.success(Helpers::Theme.pastel.green('ai:'))
                   puts ''
                   started = true
                 end
@@ -60,14 +54,13 @@ module AiCli
             )
 
             unless started
-              spinner.success(pastel.green('ai:'))
+              spinner.success(Helpers::Theme.pastel.green('ai:'))
               puts ''
             end
-            puts ''
-            puts ''
+            puts "\n\n"
 
             Helpers::Context.save_from_chat(chat)
-            offer_to_run_commands(response, pastel)
+            offer_to_run_commands(response)
           end
         end
 
@@ -76,20 +69,16 @@ module AiCli
         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)
+      def offer_to_run_commands(response)
+        Helpers::Completion.extract_commands(response).each do |command|
+          puts Helpers::Theme.dim(command)
           next unless ask_to_run?
 
-          run_command(command)
-          puts ''
+          puts "#{Helpers::I18n.t('Running')}: #{command}\n\n"
+          Helpers::ShellExec.run(command)
         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) "
@@ -98,24 +87,13 @@ module AiCli
         tty.puts
         char.to_s.downcase == 'y'
       rescue Interrupt
-        begin
-          tty&.puts
-        rescue StandardError
-          puts
-        end
+        tty&.puts
         false
       ensure
         tty&.close
       end
 
-      def run_command(command)
-        puts "#{Helpers::I18n.t('Running')}: #{command}"
-        puts ''
-        system(ENV['SHELL'] || 'bash', '-c', command)
-        Helpers::ShellHistory.record_executed(command)
-      end
-
-      private_class_method :offer_to_run_commands, :ask_to_run?, :run_command
+      private_class_method :offer_to_run_commands, :ask_to_run?
     end
   end
 end

data/lib/aicli/commands/config.rb

@@ -17,9 +17,13 @@ module AiCli
 
         case mode
         when 'shell'
-          Helpers::ShellHistory.install_shell_integration!
+          result = Helpers::ShellHistory.activate_shell_integration!
           puts pastel.green('✔') + ' ' + Helpers::I18n.t('Shell integration installed.')
-          hint = Helpers::ShellHistory.shell_integration_hint
+          hint = Helpers::ShellHistory.shell_integration_hint(
+            activated: result[:activated],
+            rc_path: result[:rc_path],
+            source_path: result[:source_path]
+          )
           puts hint unless hint.empty?
         when 'get', 'set'
           if key_values.empty?
@@ -30,7 +34,7 @@ module AiCli
           if mode == 'get'
             config = Helpers::Config.get
             key_values.each do |key|
-              if Helpers::Config.has_own?(config, key)
+              if config.key?(key)
                 puts "#{key}=#{config[key]}"
               else
                 raise Helpers::KnownError, "#{Helpers::I18n.t('Invalid config property')}: #{key}"