aicli 0.1.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38ddbde1455388bed7ee62cff84c0aaa5cbc7329b0210fb88aacdf9fe39a0e13
-  data.tar.gz: 645ca62e82b191c88951293c8b04263428c7d5c3e4dfa7e6481db6ff59771a1c
+  metadata.gz: 9657d0162a9e2e70e856d1d6fd798880a300eb8c2dd8e284b2d3abe9e7964e9a
+  data.tar.gz: 73885b2b870ba4c450df673e7ee21f9eadd456106703b2023be0678b1b43aa78
 SHA512:
-  metadata.gz: a36e4429798ec0261b2d65b39d038e6276d7680ed87d042d8b8a20b5ede788b5ba5010303103d36c87f25b69ebdcd520ed651f4668110d0ad3d341fb6d0852bf
-  data.tar.gz: 68d9f6c8c3789eca4c5b9ff4e65e31d3598ab5f917985293dab89048c3651ba20ba7761fa46c06f04b06f247b0316adb785c0d0cb611955ae1db032a42f6a85c
+  metadata.gz: e395efe484bc84474cfc1e0d50600e07a1b836b6431dfda5f1786f7357289c7c113292df41ac7ff54bd11187f4a55f4ddb940b0be2af3bb235dc2dc82aa3466b
+  data.tar.gz: aa611ebff07502eef7886872083511cff09fb7e7613fd61294eb64c0403eb2012f083c5091c19f807d310ed842f4f48195ca7729cfc803bc4e924d4dddb04728

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+## 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
+
+## 0.2.1
+
+- Fix provider/model sync so Anthropic models are not sent to OpenAI
+- Show active `provider / model` on each run
+- Clearer error when a model is unavailable for the API key
+- `config set MODEL=...` infers PROVIDER from the RubyLLM registry
+
+## 0.2.0
+
+- Add Anthropic provider alongside OpenAI
+- Route all LLM calls through RubyLLM
+- Choose provider and model in `aicli config` (model list from RubyLLM registry)
+- Config keys: `PROVIDER`, `ANTHROPIC_KEY` (plus existing `OPENAI_KEY` / `MODEL`)
+
+## 0.1.0
+
+- Initial RubyGems release as `aicli`
+
 ## 1.0.12
 
 - Bug fixes

data/README.md

@@ -38,17 +38,26 @@ Ruby port by [Antonio Molinari](https://github.com/magnum), inspired by the orig
    gem build aicli.gemspec && gem install ./aicli-*.gem
    ```
 
-2. Retrieve your API key from [OpenAI](https://platform.openai.com/account/api-keys)
+2. Choose a provider and set the matching API key.
 
-   > Note: If you haven't already, you'll have to create an account and set up billing.
-
-3. Set the key so aicli can use it:
+   **OpenAI** (default) — key from [OpenAI](https://platform.openai.com/account/api-keys):
 
    ```sh
+   aicli config set PROVIDER=openai
    aicli config set OPENAI_KEY=<your token>
    ```
 
-   This will create a `.aicli` file in your home directory.
+   **Anthropic** — key from [Anthropic](https://console.anthropic.com/settings/keys):
+
+   ```sh
+   aicli config set PROVIDER=anthropic
+   aicli config set ANTHROPIC_KEY=<your token>
+   ```
+
+   Or use the interactive UI (`aicli 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.
 
 ## Usage
 
@@ -80,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)
 
@@ -94,7 +103,20 @@ Or save the preference:
 aicli config set SILENT_MODE=true
 ```
 
-### Custom API endpoint
+### Provider and model
+
+```sh
+aicli config set PROVIDER=openai      # or anthropic
+aicli config set MODEL=gpt-4o-mini    # provider-specific model id
+```
+
+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
+
+Useful for OpenAI-compatible proxies (ignored for Anthropic):
 
 ```sh
 aicli config set OPENAI_API_ENDPOINT=<your proxy endpoint>
@@ -148,20 +170,32 @@ aicli update
 
 ## Development
 
+Run the local checkout (not the installed gem) with Bundler from this directory:
+
 ```sh
 bundle install
-bundle exec bin/aicli --help
-bundle exec bin/aicli config set OPENAI_KEY=<your token>
-bundle exec bin/aicli list all log files
+
+bundle exec bin/ai --help
+bundle exec bin/ai config
+bundle exec bin/ai chat
+bundle exec bin/ai list all log files
 ```
 
-## Common Issues
+`bin/aicli` is equivalent to `bin/ai`. `bundle exec` loads dependencies from the Gemfile and code from `lib/`.
 
-### 429 error
+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
 
-This is due to incorrect billing setup or excessive quota usage. Please follow [this guide](https://help.openai.com/en/articles/6891831-error-code-429-you-exceeded-your-current-quota-please-check-your-plan-and-billing-details) to fix it.
+### Rate limit / quota errors
 
-You can activate billing at [this link](https://platform.openai.com/account/billing/overview).
+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/cli.rb

@@ -86,9 +86,9 @@ module AiCli
       Commands::Update.run
     end
 
-    map %w[--version -v] => :__print_version
+    map %w[--version -v] => :version
     desc 'version', 'Print version'
-    def __print_version
+    def version
       puts AiCli::VERSION
     end
 

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'
@@ -11,50 +12,110 @@ module AiCli
 
       def run
         config = Helpers::Config.get
-        key = config['OPENAI_KEY']
-        model = config['MODEL']
-        api_endpoint = config['OPENAI_API_ENDPOINT']
-        chat_history = []
+        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 "#{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
+        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|
+                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
+
+            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
+              }
+            )
 
-          if user_prompt.nil? || user_prompt == 'exit'
-            puts "└  #{Helpers::I18n.t('Goodbye!')}"
-            exit 0
+            unless started
+              spinner.success(pastel.green('aicli:'))
+              puts ''
+            end
+            puts ''
+            puts ''
+
+            Helpers::Context.save_from_chat(chat)
+            offer_to_run_commands(response, pastel)
           end
+        end
 
-          spinner = TTY::Spinner.new("[:spinner] #{Helpers::I18n.t('THINKING...')}", format: :dots)
-          spinner.auto_spin
+        Helpers::Context.save_from_chat(chat)
+        puts ''
+        puts Helpers::I18n.t('Goodbye!')
+      end
 
-          chat_history << { 'role' => 'user', 'content' => user_prompt }
+      def offer_to_run_commands(response, pastel)
+        commands = Helpers::Completion.extract_commands(response)
+        return if commands.empty?
 
-          stream_lines = Helpers::Completion.generate_completion(
-            prompt: chat_history,
-            key: key,
-            model: model,
-            api_endpoint: api_endpoint
-          )
-          enumerator = stream_lines.each
-          read_response = Helpers::Completion.read_data(enumerator)
+        commands.each do |command|
+          puts pastel.dim(command)
+          next unless ask_to_run?
 
-          spinner.success(pastel.green('aicli:'))
-          puts ''
-          full_response = read_response.call(->(chunk) { print chunk })
-          chat_history << { 'role' => 'assistant', 'content' => full_response }
-          puts ''
+          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/commands/update.rb

@@ -1,21 +1,83 @@
 # frozen_string_literal: true
 
+require 'json'
+require 'net/http'
+require 'uri'
 require 'pastel'
 
 module AiCli
   module Commands
     module Update
+      RUBYGEMS_GEM_URI = 'https://rubygems.org/api/v1/gems/aicli.json'
+
       module_function
 
       def run
         pastel = Pastel.new
+        current = Gem::Version.new(AiCli::VERSION)
+
+        puts ''
+        puts pastel.dim("Current version: #{current}")
+
+        latest_str = fetch_latest_version
+        latest = Gem::Version.new(latest_str)
+        puts pastel.dim("Latest on RubyGems: #{latest}")
         puts ''
-        command = 'gem update aicli'
-        puts pastel.dim("#{Helpers::I18n.t('Running')}: #{command}")
+
+        if latest < current
+          puts pastel.yellow(
+            "Installed #{current} is newer than RubyGems #{latest}. Skipping update."
+          )
+          puts pastel.dim('Publish a new version, then run `ai update` again.')
+          return
+        end
+
+        if latest == current
+          puts pastel.green("Already up to date (#{current}).")
+          return
+        end
+
+        command = ['gem', 'install', 'aicli', '-v', latest_str]
+        puts pastel.dim("#{Helpers::I18n.t('Running')}: #{command.join(' ')}")
         puts ''
-        system(command)
+
+        ok = system(*command)
         puts ''
+
+        unless ok
+          raise Helpers::KnownError,
+                'Failed to update aicli. Try manually: gem install aicli'
+        end
+
+        puts pastel.green("Updated aicli to #{latest}.")
+        puts pastel.dim('Open a new shell if `ai version` still shows the old number.')
+      rescue Helpers::KnownError => e
+        puts "\n#{pastel.red('✖')} #{e.message}"
+        exit 1
+      rescue StandardError => e
+        puts "\n#{pastel.red('✖')} Could not check RubyGems for updates: #{e.message}"
+        Helpers::Error.handle_cli_error(e)
+        exit 1
+      end
+
+      def fetch_latest_version
+        uri = URI(RUBYGEMS_GEM_URI)
+        response = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+          http.open_timeout = 10
+          http.read_timeout = 10
+          http.get(uri.request_uri)
+        end
+
+        unless response.is_a?(Net::HTTPSuccess)
+          raise "RubyGems returned HTTP #{response.code}"
+        end
+
+        version = JSON.parse(response.body)['version'].to_s
+        raise 'RubyGems response missing version' if version.empty?
+
+        version
       end
+      private_class_method :fetch_latest_version
     end
   end
 end