yatfa 1.0.82 → 1.0.84

package/bin/run-yatfa-agent.rb

@@ -42,17 +42,38 @@ def check_version!
   remote = latest_npm_version
   return if remote.nil? || local == remote
 
-  # Try to self-delete the outdated install so next run fetches fresh
+  # Guard against infinite re-exec loop
+  if ENV["YATFA_SELF_UPDATE"] == "1"
+    puts "⚠️  Still outdated after self-update: v#{local} (latest: v#{remote})"
+    puts "   Run manually: npx yatfa@latest #{ARGV.join(' ')}"
+    return # continue anyway rather than blocking
+  end
+
+  puts "🔄 Auto-updating yatfa: v#{local} → v#{remote}..."
+
+  # Clean up ALL stale installs so npx fetches fresh from registry
   begin
     real_path = File.realpath(__FILE__)
     install_dir = File.expand_path("../..", real_path) # bin/../.. → package root
-    FileUtils.rm_rf(install_dir)
+    FileUtils.rm_rf(install_dir) if install_dir.include?("node_modules/yatfa")
+
+    # Also clear npx cache (~/.npm/_npx/<hash>/node_modules/yatfa)
+    npx_cache = File.join(Dir.home, ".npm", "_npx")
+    if Dir.exist?(npx_cache)
+      Dir.glob(File.join(npx_cache, "*", "node_modules", "yatfa")).each do |cached|
+        FileUtils.rm_rf(cached)
+      end
+    end
   rescue StandardError
-    # No permission or other issue — just warn
+    # Best-effort cleanup — fall through to re-exec regardless
   end
 
-  puts "⚠️  Outdated version: v#{local} (latest: v#{remote})"
-  puts "   Re-run: npx yatfa@latest #{ARGV.join(' ')}"
+  # Re-exec with @latest to force a fresh fetch from the registry
+  ENV["YATFA_SELF_UPDATE"] = "1"
+  exec("npx", "yatfa@latest", *ARGV)
+rescue StandardError => e
+  puts "⚠️  Auto-update failed: #{e.message}"
+  puts "   Run manually: npx yatfa@latest #{ARGV.join(' ')}"
   exit 1
 end
 

package/lib/yatfa_agent/agent.rb

@@ -303,11 +303,15 @@ module YatfaAgent
       end
 
       # Add yatfa.version label for updater daemon to detect stale containers
-      # Uses deployed_at from remote version.json (already fetched by build_image)
+      # Uses version number from remote version.json (already fetched by build_image)
       if remote_version
         docker_cmd += ["--label", "yatfa.version=#{remote_version}"]
       end
 
+      # Store project root as a label so the updater daemon can find
+      # Dockerfile.sandbox and yatfa.env.rb without reverse-engineering from mounts.
+      docker_cmd += ["--label", "yatfa.project-root=#{Dir.pwd}"]
+
       # Inject custom environment variables from config
       # Merge global env with agent-specific env (agent-specific takes precedence)
       merged_env = {}

package/lib/yatfa_agent/docker.rb

@@ -28,7 +28,7 @@ module YatfaAgent
       response = Net::HTTP.get_response(uri)
       return nil unless response.is_a?(Net::HTTPSuccess)
       data = JSON.parse(response.body)
-      data["deployed_at"]
+      data["version"]
     rescue StandardError
       nil
     end
@@ -57,7 +57,7 @@ module YatfaAgent
 
       if no_cache
         if local_version
-          puts "🔄 Infrastructure updated (#{local_version[0..18]} → #{remote_version[0..18]}), rebuilding without cache..."
+          puts "🔄 Infrastructure updated (v#{local_version} → v#{remote_version}), rebuilding without cache..."
         else
           puts "🔄 First build (or stamp missing), rebuilding without cache..."
         end

package/lib/yatfa_agent/updater.rb

@@ -39,7 +39,7 @@ module YatfaAgent
         return
       end
 
-      puts "   Remote version: #{remote_version[0..19]}..."
+      puts "   Remote version: v#{remote_version}"
 
       # 2. Find yatfa-managed containers
       containers = list_yatfa_containers
@@ -111,7 +111,7 @@ module YatfaAgent
 
     # Update a single stale container
     # @param container [Hash] container info from list_yatfa_containers
-    # @param new_version [String] target version (deployed_at)
+    # @param new_version [String] target infrastructure version number
     def self.update_container(container, new_version)
       name = container[:name]
       puts ""
@@ -188,13 +188,23 @@ module YatfaAgent
     # @param config [Hash] container inspect data
     # @return [String, nil] project root path
     def self.find_project_root_for_container(config)
-      # Try to find project root from mounted setup directory
+      # Best: use the label stored at container creation time (works for all users)
+      label = config.dig("Config", "Labels", "yatfa.project-root")
+      if label && Dir.exist?(label)
+        return label
+      end
+
+      # Fallback: walk up from /tmp/setup mount source (dev-only, local clone of yatfa-public)
       mounts = config.dig("Mounts") || []
       mounts.each do |mount|
         next unless mount["Destination"] == "/tmp/setup"
         source = mount["Source"]
-        # The source is .../setup, project root is its parent
-        return File.expand_path("..", source) if source && Dir.exist?(File.expand_path("..", source))
+        next unless source
+        dir = File.expand_path("..", source)
+        while dir != "/"
+          return dir if File.exist?(File.join(dir, "yatfa.env.rb"))
+          dir = File.dirname(dir)
+        end
       end
 
       # Try REPOSITORIES_CONFIG env var to find workspace path
@@ -251,7 +261,7 @@ module YatfaAgent
     # Build a docker run command to recreate a container with preserved config
     # @param name [String] container name
     # @param config [Hash] container inspect data
-    # @param new_version [String] target version (deployed_at)
+    # @param new_version [String] target infrastructure version number
     # @return [Array<String>] docker command arguments
     def self.build_recreate_command(name, config, new_version)
       cmd = ["docker", "run", "-d", "--name", name]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yatfa",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "description": "YATFA - Yet Another Tool For Agents",
   "bin": "./bin/run-yatfa-agent.rb",
   "files": [