yatfa 1.0.88 → 1.0.90

package/setup/setup-github.rb

@@ -119,8 +119,8 @@ def setup_github_auth!
     system("sudo mv /tmp/git-auth-helper #{helper_path}")
     system("sudo chmod +x #{helper_path}")
 
-    # Configure git
-    system("git config --global credential.helper '!f() { test \"$1\" = get && echo \"protocol=https\" && echo \"host=github.com\" && echo \"username=x-access-token\" && p=$(#{helper_path}) && echo \"password=$p\"; }; f'")
+    # Configure git (array form avoids shell interpolation of helper path)
+    system("git", "config", "--global", "credential.helper", "!f() { test \"$1\" = get && echo \"protocol=https\" && echo \"host=github.com\" && echo \"username=x-access-token\" && p=$(#{helper_path}) && echo \"password=$p\"; }; f")
 
     # Configure gh CLI wrapper for auto-refresh and permission controls
     if install_gh_wrapper!(real_gh_path: "/usr/bin/gh", with_token_refresh: true, token_helper_path: helper_path)
@@ -134,10 +134,18 @@ def setup_github_auth!
     # Authenticate using the real gh binary
     # On first run: real_gh_path exists, authenticate before wrapper installation
     # On subsequent runs: real_gh_path.real exists from previous run
+    # Use IO.popen with array form to pass token via stdin (avoids credential exposure in /proc/*/cmdline)
+    gh_bin = nil
     if File.exist?("#{real_gh_path}.real")
-      system("echo '#{ENV['GH_TOKEN']}' | #{real_gh_path}.real auth login --with-token 2>/dev/null")
+      gh_bin = "#{real_gh_path}.real"
     elsif File.exist?(real_gh_path)
-      system("echo '#{ENV['GH_TOKEN']}' | #{real_gh_path} auth login --with-token 2>/dev/null")
+      gh_bin = real_gh_path
+    end
+
+    if gh_bin
+      IO.popen([gh_bin, "auth", "login", "--with-token"], "w") do |io|
+        io.write(ENV["GH_TOKEN"])
+      end
     end
 
     # Install wrapper for permission controls even with GH_TOKEN

package/setup/skills.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+# Built-in and community skill installation
+# Extracted from setup-agent.rb for modularity (Round 2)
+#
+# Handles:
+#   - Installing built-in skills from the SKILLS env var (Civo-hosted SKILL.md files)
+#   - Fetching community skills list from the backend whoami API
+#   - Installing community skills from external GitHub repos
+#
+# Dependencies:
+#   - YATFA_RAW_URL constant is defined by setup-agent.rb
+#   - open-uri is loaded by setup-agent.rb before this file is required
+#   - No cross-dependencies with other extracted modules
+
+def setup_skills!
+  skills = ENV["SKILLS"].to_s.split(",")
+  return if skills.empty?
+
+  skills_dir = File.expand_path("~/.claude/skills")
+  puts "🧠 Installing #{skills.size} skills to #{skills_dir}..."
+  FileUtils.mkdir_p(skills_dir)
+
+  skills.each do |skill|
+    puts "   - #{skill}"
+
+    url = "#{YATFA_RAW_URL}/skills/#{skill}/SKILL.md"
+
+    begin
+      skill_content = URI.open(url).read
+      puts "     (from remote: #{url})"
+
+      # Write to .claude/skills/[skill]/SKILL.md with proper structure
+      skill_dir = File.join(skills_dir, skill)
+      FileUtils.mkdir_p(skill_dir)
+      File.write(File.join(skill_dir, "SKILL.md"), skill_content)
+    rescue OpenURI::HTTPError, Errno::ENOENT => e
+      puts "⚠️  Failed to download skill #{skill}: #{e.message}"
+    end
+  end
+
+  puts "✅ Skills installed"
+end
+
+# Community skill source registry
+# Maps skill name to its download source configuration
+COMMUNITY_SKILL_SOURCES = {
+  "ui-ux-pro-max" => {
+    github_repo: "nextlevelbuilder/ui-ux-pro-max-skill",
+    skill_path: ".claude/skills/ui-ux-pro-max/SKILL.md"
+  }
+}.freeze
+
+# Fetch community skills assigned to this agent from the backend API
+def fetch_community_skills!
+  rails_api_url = ENV["YATFA_API_URL"]
+  rails_api_key = ENV["YATFA_API_KEY"]
+
+  unless rails_api_url && !rails_api_url.empty? && rails_api_key && !rails_api_key.empty?
+    puts "⚠️  Cannot fetch community skills: API URL or key not set"
+    return []
+  end
+
+  uri = URI("#{rails_api_url}/whoami")
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = uri.scheme == "https"
+
+  request = Net::HTTP::Get.new(uri)
+  request["X-API-Key"] = rails_api_key
+  request["Accept"] = "application/json"
+
+  begin
+    response = http.request(request)
+    if response.is_a?(Net::HTTPSuccess)
+      data = JSON.parse(response.body)
+      skills = data["community_skills"] || []
+      if skills.any?
+        puts "📦 Found #{skills.size} community skills: #{skills.join(', ')}"
+      end
+      skills
+    else
+      puts "⚠️  Could not fetch community skills: #{response.code}"
+      []
+    end
+  rescue => e
+    puts "⚠️  Error fetching community skills: #{e.message}"
+    []
+  end
+end
+
+# Install community skills from external sources (e.g., GitHub repos)
+def setup_community_skills!
+  # Community skills can come from two sources:
+  # 1. COMMUNITY_SKILLS env var (set during container creation from agent config)
+  # 2. Fetched from the backend API (whoami response)
+  env_skills = ENV["COMMUNITY_SKILLS"].to_s.split(",").map(&:strip).reject(&:blank?)
+  api_skills = fetch_community_skills!
+  community_skills = (env_skills + api_skills).uniq
+
+  return if community_skills.empty?
+
+  skills_dir = File.expand_path("~/.claude/skills")
+  puts "🌐 Installing #{community_skills.size} community skills..."
+  FileUtils.mkdir_p(skills_dir)
+
+  community_skills.each do |skill_name|
+    puts "   - #{skill_name}"
+
+    source = COMMUNITY_SKILL_SOURCES[skill_name]
+    unless source
+      puts "⚠️  Unknown community skill: #{skill_name} (no source configured)"
+      next
+    end
+
+    begin
+      # Download SKILL.md from GitHub raw URL
+      github_repo = source[:github_repo]
+      skill_path = source[:skill_path] || ".claude/skills/#{skill_name}/SKILL.md"
+      url = "https://raw.githubusercontent.com/#{github_repo}/main/#{skill_path}"
+
+      skill_content = URI.open(url, open_timeout: 15, read_timeout: 30).read
+      puts "     (from GitHub: #{github_repo})"
+
+      # Write to .claude/skills/[skill_name]/SKILL.md
+      skill_dir = File.join(skills_dir, skill_name)
+      FileUtils.mkdir_p(skill_dir)
+      File.write(File.join(skill_dir, "SKILL.md"), skill_content)
+    rescue OpenURI::HTTPError, Errno::ENOENT => e
+      puts "⚠️  Failed to download community skill #{skill_name}: #{e.message}"
+    rescue => e
+      puts "⚠️  Error installing community skill #{skill_name}: #{e.message}"
+    end
+  end
+
+  puts "✅ Community skills installed"
+end

package/setup/system_prompt.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+# System prompt fetching and repository context injection
+# Extracted from setup-agent.rb for modularity
+#
+# Handles:
+#   - Fetching agent-specific system prompt from the Yatfa API
+#   - Injecting repository context into the system prompt
+#   - Writing ~/CLAUDE.md with repository structure info
+#
+# Dependencies:
+#   - Standard library requires (json, net/http, fileutils, etc.) are loaded
+#     by setup-agent.rb before this file is required
+
+def setup_system_prompt!
+  agent_type = ENV["AGENT_TYPE"]
+  system_prompt_path = File.expand_path("~/.yatfa/system-prompt.txt")
+
+  rails_api_url = ENV["YATFA_API_URL"]
+  rails_api_key = ENV["YATFA_API_KEY"]
+
+  unless rails_api_url && !rails_api_url.empty? && rails_api_key && !rails_api_key.empty?
+    puts "❌ YATFA_API_URL or YATFA_API_KEY not set"
+    puts "   Cannot fetch system prompt without API credentials"
+    exit 1
+  end
+
+  # Fetch system prompt from yatfa API
+  # Agent prompts are stored in yatfa/prompts/<agent-type>/base.md
+  # and loaded into the database by AgentPromptLoader
+  prompt_url = URI("#{rails_api_url}/internal/skill?tags%5B%5D=#{agent_type}&tags%5B%5D=base")
+  http = Net::HTTP.new(prompt_url.host, prompt_url.port)
+  http.use_ssl = prompt_url.scheme == "https"
+  http.open_timeout = 10
+  http.read_timeout = 15
+
+  request = Net::HTTP::Get.new(prompt_url)
+  request["X-API-Key"] = rails_api_key
+  request["Accept"] = "application/json"
+
+  banner_content = nil
+  begin
+    puts "📥 Fetching system prompt for #{agent_type}..."
+    response = http.request(request)
+
+    if response.is_a?(Net::HTTPSuccess)
+      data = JSON.parse(response.body)
+      banner_content = data["content"]
+
+      unless banner_content && !banner_content.empty?
+        puts "❌ System prompt for '#{agent_type}' is empty"
+        exit 1
+      end
+
+      puts "✅ Fetched system prompt for #{agent_type}"
+    else
+      puts "❌ Failed to fetch system prompt: #{response.code} #{response.message}"
+      puts "   Response: #{response.body}"
+      puts "   Make sure AgentPromptLoader has loaded prompts/ directory"
+      exit 1
+    end
+  rescue Net::OpenTimeout, Net::ReadTimeout => e
+    puts "❌ Timeout fetching system prompt: #{e.message}"
+    exit 1
+  rescue => e
+    puts "❌ Error fetching system prompt: #{e.message}"
+    exit 1
+  end
+
+  # Append repository context from REPOSITORIES_CONTEXT env var
+  if ENV["REPOSITORIES_CONTEXT"] && !ENV["REPOSITORIES_CONTEXT"].empty?
+    repos = ENV["REPOSITORIES_CONTEXT"].split(',').map do |repo|
+      name, path = repo.split(':')
+      { name: name, path: path || "/workspace/#{name}" }
+    end
+
+    repo_info = repos.map { |r| "  - **#{r[:name]}**: #{r[:path]}" }.join("\n")
+
+    banner_content += "\n\n## REPOSITORY STRUCTURE\n\n"
+    banner_content += "This project has #{repos.count} repositories:\n\n"
+    banner_content += "#{repo_info}\n\n"
+  end
+
+  # Ensure directory exists and write system prompt
+  FileUtils.mkdir_p(File.dirname(system_prompt_path))
+  File.write(system_prompt_path, banner_content)
+  puts "✅ System prompt written to #{system_prompt_path} (agent: #{agent_type})"
+
+  # Add repository context to CLAUDE.md for easy reference
+  claude_md = File.expand_path("~/CLAUDE.md")
+  if ENV["REPOSITORIES_CONTEXT"] && !ENV["REPOSITORIES_CONTEXT"].empty?
+    repo_info = ENV["REPOSITORIES_CONTEXT"].split(',').map do |repo|
+      name, path = repo.split(':')
+      "  - **#{name}**: #{path}"
+    end.join("\n")
+
+    repo_context_md = <<~MARKDOWN
+      ## Repository Structure
+
+      This project has #{ENV["REPOSITORIES_CONTEXT"].split(',').count} repositories:
+
+      #{repo_info}
+    MARKDOWN
+
+    # Append to existing CLAUDE.md or create new one
+    existing_content = File.exist?(claude_md) ? File.read(claude_md) : ""
+    File.write(claude_md, existing_content + "\n" + repo_context_md)
+    puts "📝 Repository context added to ~/CLAUDE.md"
+  end
+end