aidp 0.39.7 → 0.39.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeb4172f8395dae1cecfd4019377e8ec5435746c39e785d8a74e60f0ffdfd202
-  data.tar.gz: 60b3ee0ca0796fbbd96014487689313c1c360558df80b22404c4a8457c9f27df
+  metadata.gz: 5df865d45987ecd333e79480c0329acc64ef04ffec6c8810a0e43fd94b5b9236
+  data.tar.gz: '08b02ed42782161769e3ec9bc81e7d747b97d735cbcbb3031af01df6a94b3f5a'
 SHA512:
-  metadata.gz: 3f4e93eed39bb3b8dc88c21f65e64504689c6c53192994dbe4d8e6b6798aef1912d620a1d3cbd1b01602b9b27715b820a4f49e812f20756e06a61a8ca7ca44d9
-  data.tar.gz: 5e881d0b36e7d7d746c2eddf4d353c091fe51265369841ae8e58a35f1322265a64672afb857c9010e487b60b1f1b97d080608d281898be5b972a836763fdded6
+  metadata.gz: 118d2e50c63cd1bc536d3c0acd8dd01b626f174328eed7e0614e3ba13cb29315472cdc4caa0a6dda6f8672498b0bbae404e00cb11fcef40d36643b195c8b7a72
+  data.tar.gz: a0667e973b6ed0a1eaf704a7ee5bb019870d4ad2163c00ba40c2b5cd3009add2dbf9c99172b4678e0588dfd7e2a821025a1bcbaf0311b99cf0282e33b4001600

data/lib/aidp/interfaces/command_executor_interface.rb

@@ -128,6 +128,8 @@ module Aidp
     class TtyCommandExecutor
       include CommandExecutorInterface
 
+      TERMINATION_GRACE_PERIOD = 0.1
+
       # @param logger [LoggerInterface] optional logger for debug output
       # @param component_name [String] component name for logging
       def initialize(logger: nil, component_name: "command_executor")
@@ -144,20 +146,14 @@ module Aidp
       # @param options [Hash] additional options passed to TTY::Command#run
       # @return [CommandResult] the result of the command execution
       def execute(command, args: [], input: nil, timeout: nil, **options)
-        require "tty-command"
+        require "open3"
 
         log_debug("executing_command", command: command, args: args, timeout: timeout)
 
         start_time = Time.now
 
         begin
-          cmd_obj = TTY::Command.new(printer: :null)
-
-          # Prepare input data
-          input_data = resolve_input(input)
-
-          # Execute command - use run! to get result even on non-zero exit
-          result = cmd_obj.run!(command, *args, input: input_data, timeout: timeout, **options)
+          result = execute_command(command, args, resolve_input(input), timeout, options)
 
           duration = Time.now - start_time
           log_debug("command_completed",
@@ -170,7 +166,7 @@ module Aidp
             stderr: result.err,
             exit_status: result.exit_status
           )
-        rescue TTY::Command::TimeoutExceeded
+        rescue CommandTimeoutError
           duration = Time.now - start_time
           log_debug("command_timeout",
             command: command,
@@ -197,6 +193,57 @@ module Aidp
 
       private
 
+      def execute_command(command, args, input_data, timeout, options)
+        env = options.delete(:env) || {}
+        Open3.popen3(env, command.to_s, *args.map(&:to_s), **options) do |stdin, stdout, stderr, wait_thread|
+          write_input(stdin, input_data)
+          out_reader = Thread.new { read_stream(stdout) }
+          err_reader = Thread.new { read_stream(stderr) }
+          status = wait_for_process(wait_thread, command, timeout)
+          CommandResult.new(
+            stdout: out_reader.value,
+            stderr: err_reader.value,
+            exit_status: status.exitstatus
+          )
+        end
+      end
+
+      def write_input(stdin, input_data)
+        return stdin.close unless input_data
+
+        stdin.write(input_data)
+        stdin.close
+      end
+
+      def wait_for_process(wait_thread, command, timeout)
+        return wait_thread.value unless timeout
+
+        return wait_thread.value if wait_thread.join(timeout)
+
+        terminate_process(wait_thread)
+        raise CommandTimeoutError.new(command: command, timeout: timeout)
+      end
+
+      def terminate_process(wait_thread)
+        signal_process(wait_thread.pid, "TERM")
+        return if wait_thread.join(TERMINATION_GRACE_PERIOD)
+
+        signal_process(wait_thread.pid, "KILL")
+        wait_thread.join
+      end
+
+      def signal_process(pid, signal)
+        Process.kill(signal, pid)
+      rescue Errno::ESRCH
+        nil
+      end
+
+      def read_stream(stream)
+        stream.read
+      rescue IOError
+        ""
+      end
+
       def resolve_input(input)
         return nil unless input
 

data/lib/aidp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aidp
-  VERSION = "0.39.7"
+  VERSION = "0.39.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aidp
 version: !ruby/object:Gem::Version
-  version: 0.39.7
+  version: 0.39.8
 platform: ruby
 authors:
 - Bart Agapinan