aicli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3502a13ce44daa62a15e1e9bfe0bb20d372bca46b782f35dae8be05dac9dba1f
-  data.tar.gz: 7d4462f9b8bd94263aaf5da5ec87d35406f2b814842ad6217b0db0434ff027b1
+  metadata.gz: 8134338cc00872e289ea3980bc6367cb8c6231ba5c09879a80cc3ff5d8ebf32d
+  data.tar.gz: 4c53b4eb29d4f93cb2dba0709a7121219945a37aebf6edb45db288dba373002b
 SHA512:
-  metadata.gz: 3f6c788b8aa265951ac9dd7ad859659c8c695f57c0760e68b4f2d8683bd11070c78c714836a077e8c9cc161790e77899f0fdc83823b4a2c9657725a6340d4536
-  data.tar.gz: 0ac353b46b92efc2a4fc887e0732d767017c313bd54c0ff8dddfdf8300ffa2eba386c3c15843aa4bbfd99b0c5c17d94616cdf36c162e02838bf118711023ae62
+  metadata.gz: 0b89932ed8a62cce86bd1feb3e6da8e3026fe8448ae3a11a55bfdffa7180addee78cbfeeaad8ef19a556e865fb016c2277edfb31448bb6675606919cef528da4
+  data.tar.gz: ae512d71dfdd1c65fb2d5d18130180eb6d6f5d00673b030743e5cf3cc195e87e2db6856816601d9b617ad8e250e5ed3223b749b2032480ea08a2e30c32d2f64f

data/README.md

@@ -46,6 +46,14 @@ The gem is named **aicli**; the shell command is **`ai`** (also available as `ai
 
    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

data/lib/aicli/commands/chat.rb

@@ -112,7 +112,7 @@ module AiCli
         puts "#{Helpers::I18n.t('Running')}: #{command}"
         puts ''
         system(ENV['SHELL'] || 'bash', '-c', command)
-        Helpers::ShellHistory.append(command)
+        Helpers::ShellHistory.record_executed(command)
       end
 
       private_class_method :offer_to_run_commands, :ask_to_run?, :run_command

data/lib/aicli/commands/config.rb

@@ -15,27 +15,34 @@ module AiCli
           return
         end
 
-        if key_values.empty?
-          puts "#{Helpers::I18n.t('Error')}: #{Helpers::I18n.t('Missing required parameter')} \"key=value\"\n"
-          exit 1
-        end
-
         case mode
-        when 'get'
-          config = Helpers::Config.get
-          key_values.each do |key|
-            if Helpers::Config.has_own?(config, key)
-              puts "#{key}=#{config[key]}"
-            else
-              raise Helpers::KnownError, "#{Helpers::I18n.t('Invalid config property')}: #{key}"
-            end
+        when 'shell'
+          Helpers::ShellHistory.install_shell_integration!
+          puts pastel.green('✔') + ' ' + Helpers::I18n.t('Shell integration installed.')
+          hint = Helpers::ShellHistory.shell_integration_hint
+          puts hint unless hint.empty?
+        when 'get', 'set'
+          if key_values.empty?
+            puts "#{Helpers::I18n.t('Error')}: #{Helpers::I18n.t('Missing required parameter')} \"key=value\"\n"
+            exit 1
           end
-        when 'set'
-          pairs = key_values.map do |kv|
-            k, v = kv.split('=', 2)
-            [k, v]
+
+          if mode == 'get'
+            config = Helpers::Config.get
+            key_values.each do |key|
+              if Helpers::Config.has_own?(config, key)
+                puts "#{key}=#{config[key]}"
+              else
+                raise Helpers::KnownError, "#{Helpers::I18n.t('Invalid config property')}: #{key}"
+              end
+            end
+          else
+            pairs = key_values.map do |kv|
+              k, v = kv.split('=', 2)
+              [k, v]
+            end
+            Helpers::Config.set(pairs)
           end
-          Helpers::Config.set(pairs)
         else
           raise Helpers::KnownError, "#{Helpers::I18n.t('Invalid mode')}: #{mode}"
         end

data/lib/aicli/helpers/shell_history.rb

@@ -5,43 +5,114 @@ module AiCli
     module ShellHistory
       module_function
 
-      def append(command)
-        history_file = history_file_path
-        return unless history_file
+      # 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?
 
-        last = last_command(history_file)
-        return if last == command
-
-        File.open(history_file, 'a') { |f| f.puts(command) }
+        Config.ensure_home!
+        File.write(pending_path, text)
       rescue StandardError
         # Ignore history write errors
       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
 
-        case shell
-        when 'bash', 'sh'
-          File.join(home, '.bash_history')
+      def shell_integration_hint
+        home = Config.home_dir
+        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')
+          <<~HINT.strip
+            Add to ~/.zshrc for shell history integration:
+
+              source #{home}/ai.zsh
+          HINT
+        when 'bash'
+          <<~HINT.strip
+            Add to ~/.bashrc for shell history integration:
+
+              source #{home}/ai.bash
+          HINT
+        else
+          ''
         end
       end
 
-      def last_command(history_file)
-        return nil unless File.exist?(history_file)
+      def pending_path
+        File.join(Config.home_dir, 'history.pending')
+      end
 
-        lines = File.read(history_file).strip.split("\n")
-        lines.last
-      rescue StandardError
-        nil
+      def current_shell
+        File.basename(ENV['SHELL'] || 'bash')
+      end
+
+      def zsh_wrapper
+        <<~'ZSH'
+          # aicli shell history integration for zsh
+          if [[ -z "$AICLI_SHELL_WRAPPER" ]]; then
+            _aicli_zshaddhistory() {
+              if [[ -n "$AICLI_PENDING_HISTORY" ]]; then
+                print -s -- "$AICLI_PENDING_HISTORY"
+                unset AICLI_PENDING_HISTORY
+                return 1
+              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
+            }
+
+            zshaddhistory_functions+=(_aicli_zshaddhistory)
+          fi
+        ZSH
+      end
+
+      def bash_wrapper
+        <<~'BASH'
+          # aicli shell history integration for bash
+          if [[ -z "$AICLI_SHELL_WRAPPER" ]]; then
+            _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
+            }
+
+            if [[ -z "$AICLI_BASH_PROMPT_HOOK" ]]; then
+              AICLI_BASH_PROMPT_HOOK=1
+              PROMPT_COMMAND="_aicli_bash_history${PROMPT_COMMAND:+; $PROMPT_COMMAND}"
+            fi
+          fi
+        BASH
       end
     end
   end

data/lib/aicli/prompt.rb

@@ -118,7 +118,7 @@ module AiCli
       puts "#{Helpers::I18n.t('Running')}: #{script}"
       puts ''
       system(ENV['SHELL'] || 'bash', '-c', script)
-      Helpers::ShellHistory.append(script)
+      Helpers::ShellHistory.record_executed(script)
     end
 
     def run_or_revise_flow(script, config, silent_mode)

data/lib/aicli/version.rb

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

data/locales/en.yml

@@ -69,3 +69,4 @@ 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.

data/locales/it.yml

@@ -68,3 +68,4 @@ 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
+Shell integration installed.: Integrazione shell installata.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aicli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Antonio Molinari