aidp 0.39.7 → 0.39.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeb4172f8395dae1cecfd4019377e8ec5435746c39e785d8a74e60f0ffdfd202
-  data.tar.gz: 60b3ee0ca0796fbbd96014487689313c1c360558df80b22404c4a8457c9f27df
+  metadata.gz: 48e9a4d5c62e99992a0b61d3547b20b2a7598c13dbc6ba8b23a4f8126cd74c35
+  data.tar.gz: 9427e78702251d548a938d5b93f466b9514686128162c4be5bb52eb8375013a0
 SHA512:
-  metadata.gz: 3f4e93eed39bb3b8dc88c21f65e64504689c6c53192994dbe4d8e6b6798aef1912d620a1d3cbd1b01602b9b27715b820a4f49e812f20756e06a61a8ca7ca44d9
-  data.tar.gz: 5e881d0b36e7d7d746c2eddf4d353c091fe51265369841ae8e58a35f1322265a64672afb857c9010e487b60b1f1b97d080608d281898be5b972a836763fdded6
+  metadata.gz: eb8f0d861f8b85f8df71034a2e6cbef875be34dcf28eacec009aaa65c8589527b904fa060598b43c9854e63c9b354ca0299bb70b96eb5da80e36c19b6ea0a033
+  data.tar.gz: a46a2734b9094b966c242a284b1673cd956df4281294557b813925d19f8204bdf470ad93d4a1c01e27a2846de2b6544258d062f0f36dacd29607827a7bc3049c

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/jobs/background_runner.rb

@@ -13,6 +13,8 @@ module Aidp
     # Manages background execution of work loops
     # Runs harness in daemon process and tracks job metadata
     class BackgroundRunner
+      StartError = Class.new(StandardError)
+
       include Aidp::MessageDisplay
       include Aidp::RescueLogging
       include Aidp::SafeDirectory
@@ -34,9 +36,11 @@ module Aidp
       # Start a background job
       # Returns job_id
       def start(mode, options = {})
+        ensure_jobs_directory
         job_id = generate_job_id
-        log_file = File.join(@jobs_dir, job_id, "output.log")
-        pid_file = File.join(@jobs_dir, job_id, "job.pid")
+        log_file = job_file_path(job_id, "output.log")
+        pid_file = job_file_path(job_id, "job.pid")
+        raise_start_error unless log_file && pid_file
 
         # Create job directory
         FileUtils.mkdir_p(File.dirname(log_file))
@@ -109,6 +113,9 @@ module Aidp
         metadata = load_job_metadata(job_id)
         return nil unless metadata
 
+        log_file = job_log_path(job_id)
+        return nil unless log_file
+
         # Check if process is still running
         pid = metadata[:pid]
         running = pid && process_running?(pid)
@@ -125,7 +132,7 @@ module Aidp
           started_at: metadata[:started_at],
           completed_at: metadata[:completed_at],
           checkpoint: checkpoint,
-          log_file: File.join(@jobs_dir, job_id, "output.log")
+          log_file: log_file
         }
       end
 
@@ -169,12 +176,12 @@ module Aidp
 
       # Get job logs
       def job_logs(job_id, options = {})
-        log_file = File.join(@jobs_dir, job_id, "output.log")
+        log_file = job_log_path(job_id)
+        return nil unless log_file
         return nil unless File.exist?(log_file)
 
         if options[:tail]
-          lines = options[:lines] || 50
-          `tail -n #{lines} #{log_file}`
+          tail_job_logs(log_file, options[:lines])
         else
           File.read(log_file)
         end
@@ -182,7 +189,8 @@ module Aidp
 
       # Follow job logs in real-time
       def follow_job_logs(job_id)
-        log_file = File.join(@jobs_dir, job_id, "output.log")
+        log_file = job_log_path(job_id)
+        return unless log_file
         return unless File.exist?(log_file)
 
         # Use tail -f to follow logs
@@ -195,6 +203,10 @@ module Aidp
         @jobs_dir = safe_mkdir_p(@jobs_dir, component_name: "BackgroundRunner")
       end
 
+      def raise_start_error
+        raise StartError, "Unable to create or access background job directory: #{@jobs_dir}"
+      end
+
       def generate_job_id
         timestamp = Time.now.strftime("%Y%m%d_%H%M%S")
         random = SecureRandom.hex(4)
@@ -202,7 +214,8 @@ module Aidp
       end
 
       def save_job_metadata(job_id, pid, mode, options)
-        metadata_file = File.join(@jobs_dir, job_id, "metadata.yml")
+        metadata_file = job_metadata_path(job_id)
+        return unless metadata_file
 
         metadata = {
           job_id: job_id,
@@ -217,7 +230,8 @@ module Aidp
       end
 
       def load_job_metadata(job_id)
-        metadata_file = File.join(@jobs_dir, job_id, "metadata.yml")
+        metadata_file = job_metadata_path(job_id)
+        return nil unless metadata_file
         return nil unless File.exist?(metadata_file)
 
         # Return raw metadata with times as ISO8601 strings to avoid unsafe class loading
@@ -231,7 +245,8 @@ module Aidp
         return unless metadata
 
         metadata.merge!(updates)
-        metadata_file = File.join(@jobs_dir, job_id, "metadata.yml")
+        metadata_file = job_metadata_path(job_id)
+        return unless metadata_file
         File.write(metadata_file, metadata.to_yaml)
       end
 
@@ -298,6 +313,57 @@ module Aidp
           metadata[:status] || "completed"
         end
       end
+
+      def job_log_path(job_id)
+        job_file_path(job_id, "output.log")
+      end
+
+      def job_metadata_path(job_id)
+        job_file_path(job_id, "metadata.yml")
+      end
+
+      def job_file_path(job_id, file_name)
+        return unless Dir.exist?(@jobs_dir)
+
+        jobs_dir = File.realpath(@jobs_dir)
+        resolved_job_dir = resolved_job_dir_path(jobs_dir, job_id)
+        return unless resolved_job_dir
+        return unless resolved_job_dir.start_with?("#{jobs_dir}/")
+
+        resolved_job_file_path(resolved_job_dir, file_name)
+      end
+
+      def tail_job_logs(log_file, requested_lines)
+        lines = Integer(requested_lines || 50, exception: false)
+        lines = 50 unless lines&.positive?
+
+        IO.popen(["tail", "-n", lines.to_s, log_file], &:read)
+      end
+
+      def resolved_job_dir_path(jobs_dir, job_id)
+        job_dir = File.join(@jobs_dir, job_id.to_s)
+
+        if File.exist?(job_dir)
+          File.realpath(job_dir)
+        else
+          File.join(jobs_dir, job_id.to_s)
+        end
+      rescue Errno::ENOENT, Errno::EACCES
+        nil
+      end
+
+      def resolved_job_file_path(job_dir, file_name)
+        candidate = File.join(job_dir, file_name)
+        return candidate unless File.exist?(candidate) || File.symlink?(candidate)
+        return if File.symlink?(candidate)
+
+        resolved_file = File.realpath(candidate)
+        return unless resolved_file.start_with?("#{job_dir}/")
+
+        resolved_file
+      rescue Errno::ENOENT, Errno::EACCES
+        nil
+      end
     end
   end
 end

data/lib/aidp/version.rb

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

metadata

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