yatfa 1.0.79 → 1.0.81

package/bin/install-agent.sh

@@ -101,16 +101,20 @@ YATFA_VERSION=${YATFA_VERSION:-main}
 cat << 'EOF' > /usr/local/bin/setup-agent
 #!/bin/bash
 YATFA_VERSION=${YATFA_VERSION:-main}
-# Use local setup-agent.rb if mounted (dev mode), otherwise download from remote
-if [ -f "/tmp/setup-agent.rb" ]; then
-  echo "🔧 Using local setup-agent.rb (dev mode)"
-  ruby /tmp/setup-agent.rb
+BASE_URL="https://objectstore.fra1.civo.com/yatfa/${YATFA_VERSION}"
+# Use local setup/ dir if mounted (dev mode), otherwise download all from remote
+if [ -f "/tmp/setup/setup-agent.rb" ]; then
+  echo "🔧 Using local setup/ (dev mode)"
+  ruby /tmp/setup/setup-agent.rb
 else
-  echo "Downloading latest setup-agent.rb (version: ${YATFA_VERSION})..."
-  curl -fsSL https://objectstore.fra1.civo.com/yatfa/${YATFA_VERSION}/setup-agent.rb -o /tmp/setup-agent.rb
-  # Download claw setup (non-fatal — only needed when AGENT_TYPE=claw)
-  curl -fsSL https://objectstore.fra1.civo.com/yatfa/${YATFA_VERSION}/setup-claw-agent.rb -o /tmp/setup-claw-agent.rb 2>/dev/null || true
-  ruby /tmp/setup-agent.rb
+  mkdir -p /tmp/setup
+  echo "Downloading setup scripts (version: ${YATFA_VERSION})..."
+  # Download manifest listing all setup files
+  MANIFEST=$(curl -fsSL "${BASE_URL}/setup/MANIFEST" 2>/dev/null || echo "setup-agent.rb")
+  for file in ${MANIFEST}; do
+    curl -fsSL "${BASE_URL}/setup/${file}" -o "/tmp/setup/${file}" 2>/dev/null || true
+  done
+  ruby /tmp/setup/setup-agent.rb
 fi
 EOF
 chmod +x /usr/local/bin/setup-agent

package/lib/yatfa_agent/agent.rb

@@ -14,6 +14,19 @@ module YatfaAgent
       !result.empty?
     end
 
+    # Get container creation time
+    def self.container_creation_time(container_name)
+      result = IO.popen(["docker", "inspect", "--format", "{{.Created}}", container_name], err: File::NULL, &:read).strip
+      return nil if result.empty?
+      Time.parse(result)
+    rescue ArgumentError
+      nil
+    end
+
+    def self.format_time(t)
+      t.strftime("%H:%M")
+    end
+
     # Prompt user for input with a default value
     def self.prompt(message, default: nil, options: nil)
       loop do
@@ -47,6 +60,28 @@ module YatfaAgent
     # Handle running container: prompt user for action
     def self.handle_running_container(agent_type, container_name, config, agent_configs)
       puts "⚠️  #{agent_type} agent is already running (#{container_name})"
+
+      # Check if container was created before last deploy
+      deploy_manifest = File.join(File.dirname(__FILE__), '..', '..', 'deploy', '.deploy-manifest.json')
+      version_file = File.join(File.dirname(__FILE__), '..', '..', 'VERSION')
+      stale = false
+
+      if File.exist?(version_file)
+        current_version = File.read(version_file).strip
+        container_version = IO.popen(["docker", "exec", container_name, "printenv", "YATFA_VERSION_NUM"], err: File::NULL, &:read).strip
+        if !container_version.empty? && container_version != current_version
+          puts "   🆕 New version deployed (container: #{container_version}, current: #{current_version})"
+          stale = true
+        end
+      elsif File.exist?(deploy_manifest)
+        deploy_time = File.mtime(deploy_manifest)
+        container_created = container_creation_time(container_name)
+        if container_created && container_created < deploy_time
+          puts "   🆕 New deploy detected (container from #{format_time(container_created)}, deploy at #{format_time(deploy_time)})"
+          stale = true
+        end
+      end
+
       puts ""
 
       if non_interactive?
@@ -55,7 +90,8 @@ module YatfaAgent
         exit 0
       end
 
-      choice = prompt("   [A]ttach / [R]estart / [C]ancel? [A/r/c]: ", default: "A", options: %w[A R C])
+      default_choice = stale ? "R" : "A"
+      choice = prompt("   [A]ttach / [R]estart / [C]ancel? [#{default_choice == 'R' ? 'a/R/c' : 'A/r/c'}]: ", default: default_choice, options: %w[A R C])
 
       case choice
       when "A"
@@ -258,6 +294,13 @@ module YatfaAgent
         "--tmpfs", "/rails/log"
       ]
 
+      # Inject current version for staleness detection
+      version_file = File.join(File.dirname(__FILE__), '..', '..', 'VERSION')
+      if File.exist?(version_file)
+        version = File.read(version_file).strip
+        docker_cmd += ["-e", "YATFA_VERSION_NUM=#{version}"] unless version.empty?
+      end
+
       # Inject custom environment variables from config
       # Merge global env with agent-specific env (agent-specific takes precedence)
       merged_env = {}
@@ -320,10 +363,10 @@ module YatfaAgent
         add_development_mounts!(docker_cmd)
       end
 
-      local_setup_script = File.join(File.dirname(__FILE__), "..", "..", "setup-agent.rb")
+      local_setup_dir = File.join(File.dirname(__FILE__), "..", "..", "setup")
 
-      if File.exist?(local_setup_script)
-        docker_cmd += [Config.image_name(config), "ruby", "/tmp/setup-agent.rb"]
+      if File.directory?(local_setup_dir)
+        docker_cmd += [Config.image_name(config), "ruby", "/tmp/setup/setup-agent.rb"]
       else
         docker_cmd += [Config.image_name(config)]
       end
@@ -389,33 +432,12 @@ module YatfaAgent
     end
 
     def self.add_development_mounts!(docker_cmd)
-      # Check for local setup-agent.rb (for development)
-      # Try multiple paths: relative to gem, relative to cwd
-      setup_script_paths = [
-        File.join(File.dirname(__FILE__), "..", "..", "setup-agent.rb"),  # Relative to gem
-        File.join(Dir.pwd, "tinker-public", "setup-agent.rb"),             # Running from metafolder
-        File.join(Dir.pwd, "setup-agent.rb"),                               # Running from yatfa-public
-      ]
+      # Check for local setup/ directory (for development)
+      setup_dir = File.join(File.dirname(__FILE__), "..", "..", "setup")
 
-      local_setup_script = nil
-      setup_script_paths.each do |path|
-        if File.exist?(path)
-          local_setup_script = path
-          break
-        end
-      end
-
-      # Mount local setup-agent.rb for development if present
-      # Binaries are always fetched from bucket by setup-agent.rb
-      if local_setup_script
-        puts "🔧 Using local setup-agent.rb for development"
-        docker_cmd.concat(["-v", "#{File.expand_path(local_setup_script)}:/tmp/setup-agent.rb:ro"])
-
-        # Mount companion scripts that setup-agent.rb loads via require_relative
-        Dir.glob(File.join(File.dirname(local_setup_script), "setup-*.rb")).each do |companion|
-          basename = File.basename(companion)
-          docker_cmd.concat(["-v", "#{File.expand_path(companion)}:/tmp/#{basename}:ro"])
-        end
+      if File.directory?(setup_dir)
+        puts "🔧 Using local setup/ for development"
+        docker_cmd.concat(["-v", "#{File.expand_path(setup_dir)}:/tmp/setup:ro"])
       end
     end
 

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "yatfa",
-  "version": "1.0.79",
+  "version": "1.0.81",
   "description": "YATFA - Yet Another Tool For Agents",
   "bin": "./bin/run-yatfa-agent.rb",
   "files": [
     "bin/run-yatfa-agent.rb",
     "agents.rb",
     "lib/",
+    "setup/",
     "bin/agent-bridge-tmux",
     "bin/install-agent.sh"
   ],