ruby-shell 3.4.9 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2eadccdac83c394da85a64a138d36cad24de2603aeb2867bce52f4aa00d0568
-  data.tar.gz: 0b54ea26c9f82db1f1c29fffbc6e69d19c0c4ad3e5d94d490ba33aaf268be3c5
+  metadata.gz: c1a7a1c2414582ba14f71073684dc8046d52ba9bc45bf9dcc8e333ba4a99cdfe
+  data.tar.gz: 7a41cf6ed38b56e4e706e42712a59adfd0ac35fb4b60329a37bfa30d40b77abc
 SHA512:
-  metadata.gz: 8448bde19ed12fb02b3b28a7295f928ce643caa43ce7045f8693a733729bd8dea2b23c01cbae44fcf3d39f412238a5aa5a17281e9d55cf64f5ec2bf5c56fe38d
-  data.tar.gz: bd903733344c8aa9b0d42a2dfbcaf63339861bc7db5a289425881fea0a8c10fcbfc705a0840000ef165a99a843ebdd39c155263fe393fbd09ce8885dad6513c0
+  metadata.gz: d6c26b7a0654f7f1dc37a55f42b6f5721ab7493838344e9bedbcb65fd023025b89b2448eae56a7dc5e907aa71ede64644b4636779d89f2ef991c1dfedf22728b
+  data.tar.gz: 03cd96dfeadcc4f6b3ee39db49ada250e1c4f301616269bb99f5940f672548c2d16f35631044fc137f483db57833c0111684443ac2aa39a1f7a4c4b1131934ba

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "3.4.9" # Improved :calc with safer eval, Math sandbox, better error messages
+@version    = "3.6.0" # Multi-line prompt support: Complete readline refactor with rcurses-inspired ANSI handling
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -137,8 +137,18 @@ begin # Initialization
     "cargo" => %w[build run test check clean doc new init add search publish install update],
     "npm" => %w[install uninstall update run build test start init publish],
     "gem" => %w[install uninstall update list search build push],
-    "bundle" => %w[install update exec check config]
+    "bundle" => %w[install update exec check config],
+    "kubectl" => %w[get describe create delete apply edit logs exec port-forward scale rollout top explain diff patch],
+    "terraform" => %w[init plan apply destroy import output show],
+    "aws" => %w[s3 ec2 lambda cloudformation iam rds dynamodb sns sqs],
+    "brew" => %w[install uninstall update upgrade search info list],
+    "yarn" => %w[add remove install build test start init],
+    "make" => %w[clean install build test all],
+    "ansible" => %w[playbook galaxy vault inventory],
+    "poetry" => %w[add remove install update build publish],
+    "pipenv" => %w[install uninstall update shell run]
   }
+  @show_tips = true                           # Show startup tips (configurable)
   # New v3.0 features initialization
   @switch_cache = {}                      # Cache for command switches from --help
   @switch_cache_time = {}                 # Timestamp for cache expiry
@@ -175,67 +185,44 @@ end
 # HELP TEXT
 @info = <<~INFO
 
-  Hello #{@user}, welcome to rsh v3.3 - the Ruby SHell.
-
-  rsh does not attempt to compete with the grand old shells like bash and zsh.
-  It serves the specific needs and wants of its author. If you like it, then feel free
-  to ask for more or different features here: https://github.com/isene/rsh.
-
-  Core Features:
-  * Aliases (called nicks in rsh) - both for commands and general nicks
-  * Syntax highlighting for nicks, bookmarks, commands, switches and valid dirs/files
-  * Tab completions for nicks, system commands, command switches and dirs/files
-  * Smart context-aware tab completion for git, apt, docker, systemctl, cargo, npm, gem, bundle
-  * History with editing, search and repeat (use `!` or UP arrow)
-  * Auto-suggestions from history (press RIGHT arrow to accept)
-  * Ruby functions callable as shell commands (persistent across sessions)
-  * AI integration: Use @ for text responses and @@ for command suggestions
-
-  NEW in v3.0:
-  * Command analytics - :stats shows usage patterns and performance metrics
-  * Enhanced bookmarks with tags - :bm "name path #tag1,tag2" then just type name to jump
-  * Session management - :save_session and :load_session preserve your entire shell state
-  * Smart typo detection - "Did you mean...?" suggestions for misspelled commands
-  * Switch caching - Faster TAB completion for command options
-  * Option value completion - TAB complete values like --format=json
-  * Syntax validation - Pre-execution warnings for dangerous or malformed commands
-  * Unified command syntax - :nick, :gnick, :bm all work the same way (list/create/delete)
-
-  NEW in v3.4:
-  * Completion learning - Shell learns which TAB completions you use and ranks them higher
-  * Context-aware - Separate learning for each command (git, ls, docker, etc.)
-  * :completion_stats - View learned patterns with visual bar charts
-  * Persistent - Learning data saves to .rshrc across sessions
-
-  v3.3 Features:
-  * Quote-less syntax - No more quotes! Use :nick la = ls -la
-  * Parametrized nicks - :nick gp = git push origin {{branch}}, then: gp branch=main
-  * Ctrl-G multi-line edit - Press Ctrl-G to edit command in $EDITOR
-  * Custom validation - :validate rm -rf / = block prevents dangerous commands
-  * Shell script support - for/while/if loops work with full bash syntax
-
-  v3.2 Features:
-  * Plugin system - Extensible architecture for custom commands, completions, and hooks
-  * Auto-correct typos - :config auto_correct on (with confirmation prompt)
-  * Command timing alerts - :config slow_command_threshold 5 warns on slow commands
-  * Inline calculator - :calc 2 + 2, :calc "Math::PI", full Ruby Math library
-  * Enhanced history - !!, !-2, !5:7 for repeat last, nth-to-last, and chaining
-  * Stats visualization - :stats --graph for colorful ASCII bar charts
-
-  v3.1 Features:
-  * Multiple named sessions - :save_session "project" and :load_session "project"
-  * Stats export - :stats --csv or :stats --json for data analysis
-  * Session auto-save - Set @session_autosave = 300 in .rshrc for 5-min auto-save
-  * Bookmark import/export - :bm --export file.json and :bm --import file.json
-  * Bookmark statistics - :bm --stats shows usage patterns and tag distribution
-  * Color themes - :theme solarized|dracula|gruvbox|nord|monokai
-  * Config management - :config shows/sets history_dedup, session_autosave, etc.
-  * Environment management - :env for listing/setting/exporting environment variables
-
-  Config file (.rshrc) updates on exit (Ctrl-d) or not (Ctrl-e).
-  All colors are themeable in .rshrc (see github link for possibilities).
-
-  Use `:help` for complete command reference.
+  Hello #{@user}, welcome to rsh v3.6 - the Ruby SHell.
+
+  rsh is a feature-rich shell written in pure Ruby, designed for productivity and customization.
+
+  KEY FEATURES:
+  • Nicks (aliases) with {{parameters}} - :nick gp = git push origin {{branch}}
+  • Completion learning - Shell learns and adapts to your patterns
+  • Plugin system - Extend with custom commands and hooks
+  • Command recording/replay - Automate workflows
+  • Sessions & bookmarks - Save and restore your workspace
+  • Multi-line prompts - Full support for prompts with newlines
+  • Stats & analytics - :stats shows usage patterns and performance
+  • Validation rules - :validate rm -rf / = block for safety
+  • 6 color themes - :theme solarized|dracula|gruvbox|nord|monokai|default
+  • Auto-correct - Smart typo detection with suggestions
+  • Shell scripts - Full bash support (for, while, if loops)
+  • AI integration - @ for questions, @@ for command suggestions
+  • Ruby functions - :defun for custom shell commands
+  • 18 tool completions - git, docker, kubectl, terraform, aws, etc.
+
+  QUICK START:
+  • :help - Command reference
+  • :info --features - Feature list
+  • :nick - Create alias
+  • :bm - Bookmark directory
+  • :stats - View analytics
+  • :theme - Change colors
+  • :plugins - Extend functionality
+
+  CUSTOMIZATION:
+  • Config file: ~/.rshrc (edit with :config or manually)
+  • Colors: All themeable (see :help)
+  • Exit: Ctrl-D (save) or Ctrl-E (don't save)
+
+  MORE INFO:
+  • GitHub: https://github.com/isene/rsh
+  • Docs: Type :help for quick reference
+  • Version: Type :version for current/latest
 
 INFO
 
@@ -277,7 +264,9 @@ def firstrun
   @completion_show_descriptions = false # Show help text inline
   @completion_fuzzy = true            # Enable fuzzy matching
 
-  @nick = {"ls"=>"ls --color -F"}
+  @nick = {
+    "ls" => "ls --color -F"
+  }
 RSHRC
   File.write(Dir.home+'/.rshrc', rc)
 end
@@ -344,19 +333,73 @@ def getstr # A custom Readline-like function
     @pos = @ai_suggestion.length
     @ai_suggestion = nil
   end
+
+  # Print prompt ONCE at start (optimization + multi-line support)
   @row0, p = @c.pos
+
+  # Clear any previous prompt
+  @c.row(@row0)
+  @c.clear_screen_down
+
+  print @display_prompt
+
+  # Calculate positions and save prompt parts
+  if @display_prompt.include?("\n")
+    # Multi-line prompt
+    newline_count = @display_prompt.count("\n")
+    @row0 += newline_count
+
+    # Extract last line and reapply color codes (rcurses pattern)
+    # Detect ANY color codes at start of full prompt
+    color_codes = ""
+    if @display_prompt =~ /^(\001\e\[[0-9;]+m\002)/
+      color_codes = $1
+    end
+
+    # Split and get last line
+    lines = @display_prompt.split("\n")
+    @prompt_last_line = lines.last
+
+    # If original had colors and last line doesn't, reapply them
+    if !color_codes.empty? && !@prompt_last_line.start_with?("\001")
+      @prompt_last_line = color_codes + @prompt_last_line + "\001\e[0m\002"
+    end
+
+    # Calculate visible length (strip ANSI for counting)
+    @pos0 = @prompt_last_line.gsub(/\001?\e\[[0-9;]*m\002?/, '').length
+    @cmd_row = @row0
+    @is_multiline = true
+  else
+    # Single-line prompt
+    row, @pos0 = @c.pos
+    @prompt_last_line = @display_prompt
+    @cmd_row = @row0
+    @is_multiline = false
+  end
+
   while chr != "ENTER" # Keep going with readline until user presses ENTER
     @ci   = nil
     lift  = false
     right = false
-    # The actual printing og the command line
-    @c.row(@row0)
-    @c.clear_line
-    print @display_prompt
-    @c.clear_screen_down
-    row, @pos0 = @c.pos
-    #@history[0] = "" if @history[0].nil?
+
+    # Update command line display (not the prompt!)
+    @c.row(@cmd_row)
+
+    # Reprint the prompt line (preserves colors)
+    if @is_multiline
+      @c.col(1)
+      print @prompt_last_line
+      @c.clear_line_after
+    else
+      @c.col(1)
+      print @prompt_last_line
+      @c.clear_line_after
+    end
+
+    # Print command text with syntax highlighting
     print cmd_check(@history[0])
+
+    # Print history suggestion if available
     @ci  = @history[1..].find_index {|e| e =~ /^#{Regexp.escape(@history[0].to_s)}./}
     unless @ci == nil
       @ci += 1
@@ -366,15 +409,17 @@ def getstr # A custom Readline-like function
       print @ciprompt.c(@c_stamp)
       right = true
     end
-    c_col = @pos0 + @pos
-    c_row = @row0 + c_col/(@maxcol)
-    c_col == 0 ? @c.row(c_row + 1) : @c.row(c_row)
-    if c_col.modulo(@maxcol) == 0
-      @c.col(c_col)
-      @c.row(@c.rowget - 1)
+
+    # Position cursor (different logic for single vs multi-line)
+    if @is_multiline
+      # Multi-line: @pos0 is string length (0-indexed), need +1 for terminal
+      cursor_col = @pos0 + @pos + 1
     else
-      @c.col(c_col.modulo(@maxcol))
+      # Single-line: @pos0 already from @c.pos (1-indexed)
+      cursor_col = @pos0 + @pos
     end
+    @c.row(@cmd_row)
+    @c.col(cursor_col)
     chr = getchr
     puts "DEBUG: Got char: '#{chr}' (length: #{chr.length})" if ENV['RSH_DEBUG']
     case chr
@@ -404,8 +449,21 @@ def getstr # A custom Readline-like function
       exit
     when 'C-L'   # Clear screen and set position to top of the screen
       @c.row(1)
-      @row0 = 1
       @c.clear_screen_down
+      # Reprint prompt after clear
+      @row0 = 1
+      print @display_prompt
+      # Recalculate positions
+      if @display_prompt.include?("\n")
+        newline_count = @display_prompt.count("\n")
+        @row0 += newline_count
+        last_line = @display_prompt.split("\n").last
+        @pos0 = last_line.gsub(/\001?\e\[[0-9;]*m\002?/, '').length
+        @cmd_row = @row0
+      else
+        row, @pos0 = @c.pos
+        @cmd_row = @row0
+      end
     when 'UP'    # Go up in history
       if @stk == 0 and @history[0].length > 0
         @tabsearch = @history[0]
@@ -424,8 +482,6 @@ def getstr # A custom Readline-like function
         end
         lift = false
       end
-      @c.row(@row0)
-      @c.clear_screen_down
     when 'DOWN'  # Go down in history
       if lift
         @history.unshift("")
@@ -445,8 +501,6 @@ def getstr # A custom Readline-like function
         @pos = @history[0].length
       end
       lift = false
-      @c.row(@row0)
-      @c.clear_screen_down
     when 'RIGHT' # Move right on the readline
       if right 
         if lift
@@ -621,10 +675,17 @@ def tab(type)
     completed = @tabstr + "/"
     @history[0] = @pretab + completed + @postab
     @pos = @pretab.length + completed.length
-    @c_col = @pos0 + @pos
+    # Consistent cursor calc
+    if @is_multiline
+      @c_col = @pos0 + @pos + 1
+    else
+      @c_col = @pos0 + @pos
+    end
     @c.clear_line
     line_display = cmd_check(@history[0]).to_s
-    print @display_prompt + line_display
+    # Use last line only for multi-line prompts
+    prompt_display = @is_multiline ? @display_prompt.split("\n").last : @display_prompt
+    print prompt_display + line_display
     @c.col(@c_col)
     return
   end
@@ -839,6 +900,9 @@ def tab(type)
         @newhist0 = @pretab + tabchoice + @postab             # Remember now the new value to be given to @history[0]
         line1     = cmd_check(@pretab).to_s                   # Syntax highlight before @tabstr
         line2     = cmd_check(@postab).to_s                   # Syntax highlight after  @tabstr
+
+        # For multi-line prompts, only show last line during tab completion
+        prompt_for_tab = @display_prompt.include?("\n") ? @display_prompt.split("\n").last : @display_prompt
         # Color and underline the current tabchoice on the commandline with file type color:
         display_choice = tabchoice.dup
         clean_choice = tabchoice.gsub(/['"]/, '').chomp('/')
@@ -849,9 +913,14 @@ def tab(type)
         # Escape regex special characters in @tabstr for pattern matching
         escaped_tabstr = Regexp.escape(@tabstr)
         tabline   = display_choice.sub(/(.*)#{escaped_tabstr}(.*)/, '\1'.c(choice_color) + @tabstr.u.c(choice_color) + '\2'.c(choice_color))
-        print @display_prompt + line1 + tabline + line2       # Print the commandline
+        print prompt_for_tab + line1 + tabline + line2       # Print the commandline (use last line only for multi-line)
         @pos   = @pretab.length.to_i + tabchoice.length.to_i  # Set the position on that commandline
-        @c_col = @pos0 + @pos                                 # The cursor position must include the prompt as well
+        # Consistent cursor positioning
+        if @is_multiline
+          @c_col = @pos0 + @pos + 1  # Multi-line: string length needs +1
+        else
+          @c_col = @pos0 + @pos      # Single-line: already 1-indexed
+        end
         @c.col(@c_col)                                        # Set the cursor position
         nextline                                              # Then start showing the completion items
         tabline  = @tabarray[i]                               # Get the next matching tabline
@@ -1063,11 +1132,25 @@ def suggest_command(cmd) # Smart command suggestions for typos
   return nil if cmd.nil? || cmd.empty?
   return nil if @exe.include?(cmd) || @nick.include?(cmd)
 
+  max_dist = [cmd.length / 3, 2].max
+
+  # Pre-filter by length and first letter (huge optimization for large @exe)
+  length_range = (cmd.length - max_dist)..(cmd.length + max_dist)
+  first_letter = cmd[0]
+
+  # Filter: similar length AND (same first letter OR within 1 char distance)
+  pool = (@exe + @nick.keys).select do |c|
+    c.length >= 2 &&
+    length_range.include?(c.length) &&
+    (c[0] == first_letter || (c[0].ord - first_letter.ord).abs <= 1)
+  end
+
+  # Hard limit to prevent any hang
+  pool = pool.first(100)
+
   # Find commands with small edit distance
-  candidates = (@exe + @nick.keys).select do |c|
-    next false if c.length < 2
+  candidates = pool.select do |c|
     dist = levenshtein_distance(cmd, c)
-    max_dist = [cmd.length / 3, 2].max
     dist <= max_dist && dist > 0
   end
 
@@ -1115,6 +1198,7 @@ def config(*args) # Configure rsh settings
     puts "    auto_correct:       #{@auto_correct ? 'on' : 'off'}"
     puts "    slow_command_threshold: #{@slow_command_threshold}s #{@slow_command_threshold > 0 ? '(enabled)' : '(disabled)'}"
     puts "    completion_learning: #{@completion_learning ? 'on' : 'off'}"
+    puts "    show_tips:          #{@show_tips ? 'on' : 'off'}"
     puts "    completion_limit:   #{@completion_limit}"
     puts "    completion_fuzzy:   #{@completion_fuzzy}"
     puts "    completion_case_sensitive: #{@completion_case_sensitive}"
@@ -1155,9 +1239,13 @@ def config(*args) # Configure rsh settings
     @completion_show_metadata = %w[on true yes 1].include?(value.to_s.downcase)
     puts "Completion metadata display #{@completion_show_metadata ? 'enabled' : 'disabled'}"
     rshrc
+  when 'show_tips'
+    @show_tips = %w[on true yes 1].include?(value.to_s.downcase)
+    puts "Startup tips #{@show_tips ? 'enabled' : 'disabled'}"
+    rshrc
   else
     puts "Unknown setting '#{setting}'"
-    puts "Available: history_dedup, session_autosave, auto_correct, slow_command_threshold, completion_learning, completion_limit, completion_show_metadata"
+    puts "Available: history_dedup, session_autosave, auto_correct, slow_command_threshold, completion_learning, show_tips, completion_limit"
   end
 end
 def env(*args) # Environment variable management
@@ -1588,15 +1676,38 @@ def help
   end
   puts
 end
-def info
-  puts @info
+def info(*args)
+  option = args[0]
+
+  if option == '--quick'
+    puts "\nrsh v#{@version} - Ruby SHell"
+    puts "Type :help for commands, :info for full intro"
+  elsif option == '--features'
+    puts "\nKey Features:"
+    puts "• Nicks (aliases) with {{parameters}}"
+    puts "• Completion learning (adapts to you)"
+    puts "• Command recording & replay"
+    puts "• Plugin system"
+    puts "• Stats & analytics"
+    puts "• 6 color themes"
+    puts "• AI integration"
+    puts "Type :help for details"
+  else
+    puts @info
+  end
 end
 def version
   puts "rsh version = #{@version} (latest RubyGems version is #{Gem.latest_version_for("ruby-shell").version} - https://github.com/isene/rsh)"
 end
-def history # Show most recent history (up to 50 entries)
-  puts "History:"
-  @history.each_with_index {|h,i| puts i.to_s + "; " + h if i < 50}
+def history(*args) # Show most recent history (up to 50 entries)
+  if args[0] == '--export'
+    filename = args[1] || 'history.txt'
+    File.write(filename, @history.join("\n"))
+    puts "History exported to #{filename} (#{@history.length} commands)"
+  else
+    puts "History:"
+    @history.each_with_index {|h,i| puts i.to_s + "; " + h if i < 50}
+  end
 end
 def rmhistory # Delete history
   @history = []
@@ -1620,6 +1731,19 @@ def nick(nick_str = nil)  # Define a new nick like this: `:nick "ls = ls --color
       @nick.sort.each {|key, value| puts "  #{key.c(@c_nick)} = #{value}"}
     end
     puts
+  elsif nick_str =~ /^--export\s*(.*)/
+    filename = $1.strip.empty? ? 'nicks.json' : $1.strip
+    require 'json' unless defined?(JSON)
+    File.write(filename, JSON.pretty_generate(@nick))
+    puts "Nicks exported to #{filename}"
+  elsif nick_str =~ /^--import\s+(.*)/
+    filename = $1.strip
+    return puts "File '#{filename}' not found" unless File.exist?(filename)
+    require 'json' unless defined?(JSON)
+    imported = JSON.parse(File.read(filename))
+    imported.each { |k, v| @nick[k] = v }
+    puts "Imported #{imported.length} nicks"
+    rshrc
   elsif nick_str.match(/^\s*-/)
     source = nick_str.sub(/^\s*-/, '')
     if @nick.delete(source)
@@ -2537,10 +2661,10 @@ def calc(*args) # Inline calculator using Ruby's Math library
   rescue ZeroDivisionError
     puts "Error: Division by zero"
   rescue NameError => e
-    # Extract the undefined name
-    if e.message =~ /undefined local variable or method `(\w+)'/
+    # Extract the undefined name (sandbox format)
+    if e.message =~ /undefined method `(\w+)'/
       undefined = $1
-      puts "Error: Unknown function or variable '#{undefined}'"
+      puts "Error: Unknown function '#{undefined}'"
       puts "Available Math functions: sqrt, sin, cos, tan, log, exp, abs, ceil, floor, round"
       puts "Constants: PI, E"
     else
@@ -2564,6 +2688,7 @@ def validate(rule_str = nil) # Custom validation rule management
       puts "\nNo validation rules defined"
       puts "Usage: :validate pattern = action"
       puts "Actions: block, confirm, warn, log"
+      puts "Or try: :validate --templates"
       return
     end
     puts "\n  Validation Rules:".c(@c_prompt).b
@@ -2571,6 +2696,21 @@ def validate(rule_str = nil) # Custom validation rule management
       puts "  #{i+1}. #{rule[:pattern].inspect} → #{rule[:action]}"
     end
     puts
+  elsif rule_str == '--templates'
+    puts "\n  Common Validation Rule Templates:".c(@c_prompt).b
+    puts "  Safety:"
+    puts "    :validate rm -rf / = block"
+    puts "    :validate DROP TABLE = block"
+    puts "  Confirmation:"
+    puts "    :validate git push --force = confirm"
+    puts "    :validate npm publish = confirm"
+    puts "  Warnings:"
+    puts "    :validate sudo = warn"
+    puts "    :validate chmod 777 = warn"
+    puts "  Logging:"
+    puts "    :validate npm install = log"
+    puts "    :validate pip install = log"
+    puts
   elsif rule_str =~ /^-(\d+)$/
     # Delete rule by index
     index = $1.to_i - 1
@@ -3395,6 +3535,20 @@ loop do
     unless @plugins_loaded
       load_plugins
       @plugins_loaded = true
+      # Show startup tip (30% chance, if enabled)
+      if @show_tips && rand < 0.3
+        tips = [
+          "Tip: Use :nick gp={{branch}} for parametrized aliases!",
+          "Tip: Press Ctrl-G to edit commands in $EDITOR",
+          "Tip: :stats --graph shows visual analytics",
+          "Tip: :record your workflows and :replay them later",
+          "Tip: :validate rm -rf / = block for safety rules",
+          "Tip: :completion_stats shows what you use most",
+          "Tip: Type :help for quick reference",
+          "Tip: Disable tips with: :config show_tips off"
+        ]
+        puts tips.sample.c(244)
+      end
     end
     # Build display prompt with plugin additions (don't modify @prompt)
     plugin_prompts = call_plugin_hook(:on_prompt)
@@ -3444,9 +3598,11 @@ loop do
       @cmd = hi if hi
     end
     # Move cursor to end of line and print the full command before clearing
-    @c.row(@row0)
+    @c.row(@cmd_row || @row0)  # Use cmd_row if set (multi-line)
     @c.clear_line
-    print @display_prompt + cmd_check(@cmd)
+    # For multi-line, only print last line; for single-line, print full prompt
+    prompt_to_print = (@display_prompt.include?("\n") && @prompt_last_line) ? @prompt_last_line : @display_prompt
+    print prompt_to_print + cmd_check(@cmd)
     print "\n"; @c.clear_screen_down
     if @cmd == "r" # Integration with rtfm (https://github.com/isene/RTFM)
       t  = Time.now
@@ -3622,11 +3778,12 @@ loop do
             puts "Bookmark '#{@cmd}' points to non-existent directory: #{bm_dir}".c(196)
           end
         else
-          puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
           if @cmd == "f" # fzf integration (https://github.com/junegunn/fzf)
+            puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
             res = `fzf`.chomp
             Dir.chdir(File.dirname(res))
           elsif File.exist?(@cmd) and not File.executable?(@cmd) and not @cmd.include?(" ")
+            puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
             # Only auto-open files if it's a single filename (no spaces = no command with args)
             if File.read(@cmd).force_encoding("UTF-8").valid_encoding?
               system("#{ENV['EDITOR']} #{@cmd}") # Try open with user's editor
@@ -3644,6 +3801,9 @@ loop do
               # Apply auto-correct if enabled (before validation)
               @cmd = apply_auto_correct(@cmd)
 
+              # Print timestamp AFTER auto-correct (shows what actually executes)
+              puts "#{Time.now.strftime("%H:%M:%S")}: #{@cmd}".c(@c_stamp)
+
               # Validate command after auto-correction
               warnings = validate_command(@cmd)
               if warnings && !warnings.empty?

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.6.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-10-31 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
   history, syntax highlighting, theming, auto-cd, auto-opening files and more. UPDATE
-  v3.4.9: Improved :calc with Math sandbox for safer evaluation, better error messages
-  (division by zero, unknown functions, syntax errors). Suggested by havenwood from
-  #ruby IRC!'
+  v3.6.0: MULTI-LINE PROMPT SUPPORT - Complete readline refactor with rcurses-inspired
+  ANSI handling. Define prompts with newlines! Plus nick/history export, 9 new completions,
+  validation templates, startup tips, and critical performance fixes for huge PATHs!'
 email: g@isene.com
 executables:
 - rsh