faure 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7329e214012017c8b3e222c24b70410e57f4ae40c24b070b37d22edf56ba699
-  data.tar.gz: c141ee9f3e2f7c11e156e7c7091c1a6e7463c07b9d7abd6c0696dccde2bb06b2
+  metadata.gz: fedb51ca95dcbf138d793cdff8baa004c83e387c36227614cfbb153c428c71e7
+  data.tar.gz: 0dd90f77c0ff1beaec7b769f2801de8cd8c1813abbdd87530db7124c8df36837
 SHA512:
-  metadata.gz: 460065142943c13c00c8bd76b9d6fcadc4c68c59e9955ce8b23f4bee4d8bc284d8b51d4e38451b9ec44426556ede92e3b147625c12efe1691f403d3baad45c28
-  data.tar.gz: b11f9a311b88924e905c6a658123ceac2cdca7b86cef5931dd056d57927fbc366eb86a855d0dd92ddbac032b0226d56d67a9f7058414f5961e6a34051fd977a7
+  metadata.gz: 382459631e6b8c9656f10458144102833aae453e67e4421540d72c6a00f87b5b18aa390d591ca263ffe3f695eaf1af22acce4dc9bca948ae56f9c30504ea7be1
+  data.tar.gz: 48b1e12767c69deb1a44d7f83f0f1610269359f82930c3cc27c921fcca016207d7eebe35b07a4e704280c6ad7ce4fd9bdea9a47bc28c775204e620ca7de0ec21

data/lib/faure/agent.rb

@@ -11,14 +11,21 @@ module Faure
   class Agent
 
     def initialize
-      payload    = JSON.parse(ENV.fetch('TRIGGER_PAYLOAD', '{}'))
+      raw     = ENV.fetch('TRIGGER_PAYLOAD', '{}')
+      raw     = File.read(raw) if File.exist?(raw)
+      payload = begin
+        JSON.parse(raw)
+      rescue JSON::ParserError => e
+        abort "[faure] TRIGGER_PAYLOAD invalide : #{e.message}"
+      end
       @issue_iid = payload.dig('issue', 'iid').to_s
     end
 
     def run
       branch_name = "feature/issue-#{@issue_iid}"
-      diff        = `git diff origin/#{Config::TARGET_BRANCH}...#{branch_name} --stat`
-      diff_full   = `git diff origin/#{Config::TARGET_BRANCH}...#{branch_name}`
+      system("git fetch origin #{branch_name} #{Config::TARGET_BRANCH}")
+      diff        = `git diff origin/#{Config::TARGET_BRANCH}...origin/#{branch_name} --stat`
+      diff_full   = `git diff origin/#{Config::TARGET_BRANCH}...origin/#{branch_name}`
 
       if diff.strip.empty?
         puts '[faure:agent] Aucun diff détecté, abandon.'
@@ -61,9 +68,9 @@ module Faure
 
     def mr_system_prompt
       if Config::LANG == 'fr'
-        'Tu es un assistant qui rédige des descriptions de Merge Request claires et concises en français. Réponds uniquement avec le texte de la description, sans balises.'
+        '/nothink Tu es un assistant qui rédige des descriptions de Merge Request claires et concises en français. Réponds uniquement avec le texte de la description, sans balises.'
       else
-        'You are an assistant that writes clear and concise Merge Request descriptions in English. Reply only with the description text, no markup.'
+        '/nothink You are an assistant that writes clear and concise Merge Request descriptions in English. Reply only with the description text, no markup.'
       end
     end
 
@@ -72,7 +79,7 @@ module Faure
       req = Net::HTTP::Post.new(uri)
       req['Content-Type'] = 'application/json'
       req.body = { model: Config::AGENT_MODEL, messages: messages, max_tokens: max_tokens }.to_json
-      res  = Net::HTTP.start(uri.host, uri.port) { |h| h.request(req) }
+      res  = Net::HTTP.start(uri.host, uri.port, read_timeout: 300) { |h| h.request(req) }
       JSON.parse(res.body).dig('choices', 0, 'message', 'content')
     end
 

data/lib/faure/codeur.rb

@@ -12,7 +12,13 @@ module Faure
   class Codeur
 
     def initialize
-      payload        = JSON.parse(ENV.fetch('TRIGGER_PAYLOAD', '{}'))
+      raw     = ENV.fetch('TRIGGER_PAYLOAD', '{}')
+      raw     = File.read(raw) if File.exist?(raw)
+      payload = begin
+        JSON.parse(raw)
+      rescue JSON::ParserError => e
+        abort "[faure] TRIGGER_PAYLOAD invalide : #{e.message}"
+      end
       @note          = payload.dig('object_attributes', 'note') || ''
       @noteable_type = payload.dig('object_attributes', 'noteable_type')
       @author_id     = payload.dig('user', 'id').to_i
@@ -84,6 +90,7 @@ module Faure
       lang_instruction = Config::LANG == 'fr' ? 'Réponds en français.' : 'Reply in English.'
       agents_section   = @agents_md ? "\n## Project conventions\n\n#{@agents_md}\n" : ''
       <<~SYSTEM
+        /nothink
         Tu es un agent codeur expert. Tu reçois une tâche de développement et tu dois produire les modifications de fichiers nécessaires.
         #{lang_instruction}
         #{agents_section}
@@ -160,12 +167,20 @@ module Faure
         puts "  → #{f[:path]}"
       end
 
-      system("git config user.email 'faure@liant.dev'")
-      system("git config user.name 'Faure Codeur'")
-      system("git checkout -B #{branch_name}")
-      system('git add -A')
-      system("git commit -m 'faure(issue-#{@issue_iid}): modifications automatiques'")
-      system("git push origin #{branch_name} --force-with-lease 2>/dev/null || git push origin #{branch_name} --force")
+      gitlab_host = URI(Config::GITLAB_URL).host
+      project_path = ENV.fetch('CI_PROJECT_PATH')
+      push_url = "https://oauth2:#{Config::API_TOKEN}@#{gitlab_host}/#{project_path}.git"
+
+      abort '[faure] git config email failed'           unless system("git config user.email 'faure@liant.dev'")
+      abort '[faure] git config name failed'            unless system("git config user.name 'Faure Codeur'")
+      abort '[faure] git remote set-url failed'         unless system("git remote set-url origin #{push_url}")
+      abort '[faure] git checkout failed'               unless system("git checkout -B #{branch_name}")
+      abort '[faure] git add failed'                    unless system('git add -A')
+      abort '[faure] git commit failed'                 unless system("git commit -m 'faure(issue-#{@issue_iid}): modifications automatiques'")
+      unless system("git push origin #{branch_name} --force-with-lease") ||
+             system("git push origin #{branch_name} --force")
+        abort '[faure] git push failed'
+      end
       puts "[faure] Push sur #{branch_name} effectué"
     end
 
@@ -206,7 +221,7 @@ module Faure
       req = Net::HTTP::Post.new(uri)
       req['Content-Type'] = 'application/json'
       req.body = { model: model, messages: messages, max_tokens: max_tokens }.to_json
-      res  = Net::HTTP.start(uri.host, uri.port) { |h| h.request(req) }
+      res  = Net::HTTP.start(uri.host, uri.port, read_timeout: 600) { |h| h.request(req) }
       data = JSON.parse(res.body)
       data.dig('choices', 0, 'message', 'content') or raise "Réponse inattendue : #{res.body}"
     end

data/lib/faure/version.rb

@@ -1,3 +1,3 @@
 module Faure
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faure
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Roland Laurès