captive-cli 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f79f7992c692e80419a6da77317d0e3d50d72ee4b48d41ea6001fa3e8a968400
-  data.tar.gz: 43220b3bb3e0b9cdaae4bf96de10d80eb3145af3f52584bff1c73fb45d4e7349
+  metadata.gz: 415acf4d1e664b24fe084bd17b74fbbb5922f64465e37a360464b138dcc58bab
+  data.tar.gz: 48ea97307c38ab7db3f28ce3da3950f876aacc8fb528effd46758cf4b35131a6
 SHA512:
-  metadata.gz: cec86c2467edb73bb4c46c520c2fb793c1c4b67800213d5ef68348aa2ddae4c91b25e85d82fe73e599fc7cb188aee96b63feb5674b10885e7aa7100027f240ac
-  data.tar.gz: a69f88f24623b2329515daff60be1df8d3092046c51cd20b995cb6a0ba58a176dc29898640a07cdc6d9904315b10a321b7d7f6cc9cb7c301e768e991d55a3980
+  metadata.gz: 2cf47f38a58c871f6b8aae1e92b168ee95068ee333b9f93f1bfdba0161eb5c05615f2031e97de47091459c21ebbc9a5b1e061752b9d4d373d6e66fd0a1495dde
+  data.tar.gz: 897af0a7bd2e7685c143a3b2b69b2c4a4dcea02cae52fce02b1ff6c7677be1da310d8f2db9022d6840b7cb4d3f670ae2c441053f7bec717c6a1f609008b06d88

data/lib/captive/cli/dependencies.rb

@@ -24,6 +24,8 @@ module Captive
     def apps_api  = @apps_api  ||= Dashboard::AppsResource.new(api: dashboard)
     def env_api   = @env_api   ||= Dashboard::EnvVarsResource.new(api: dashboard)
     def crons_api = @crons_api ||= Dashboard::ScheduledTasksResource.new(api: dashboard)
+    def domains_api = @domains_api ||= Dashboard::DomainsResource.new(api: dashboard)
+    def addons_api  = @addons_api  ||= Dashboard::AddonsResource.new(api: dashboard)
 
     def active_kubeconfig
       env_kc = ENV["KUBECONFIG"]

data/lib/captive/cli.rb

@@ -6,6 +6,8 @@ require_relative "cli/dependencies"
 require_relative "commands/apps_commands"
 require_relative "commands/env_commands"
 require_relative "commands/crons_commands"
+require_relative "commands/domains_commands"
+require_relative "commands/addons_commands"
 require_relative "commands/db_commands"
 require_relative "commands/user_login"
 require_relative "commands/auth_commands"
@@ -62,6 +64,12 @@ module Captive
     desc "crons SUBCOMMAND", "Tâches planifiées d'une app"
     subcommand "crons", Commands::CronsCommands
 
+    desc "domains SUBCOMMAND", "Domaines d'une app"
+    subcommand "domains", Commands::DomainsCommands
+
+    desc "addons SUBCOMMAND", "Add-ons d'une app (bases, Supabase…)"
+    subcommand "addons", Commands::AddonsCommands
+
     desc "auth SUBCOMMAND", "Jeton pour kubectl", hide: true
     subcommand "auth", Commands::AuthCommands
 
@@ -142,13 +150,12 @@ module Captive
 
     desc "logs APP", "Affiche les logs de l'app"
     long_desc <<~DESC
-      MODE TEMPS RÉEL (défaut) — stream les logs kubectl du pod running.
+      MODE TEMPS RÉEL (défaut) — dernières lignes du web et des one-offs, via le dashboard.
         -f, --follow          Suit en continu (Ctrl+C pour arrêter)
         -n, --lines N         Nombre de lignes affichées (défaut : 100)
-        -c, --container NOM   Container spécifique (ex : migrate, redis)
-        -w, --worker          Cible le pod worker au lieu du pod web
+        -w, --worker          Affiche le worker au lieu du web
         --raw                 Garde les lignes rack-timeout de la readinessProbe
-      En cas de CrashLoopBackOff, --previous est activé automatiquement.
+      Il suffit d'être Membre de l'Organization de l'app, sans accès au repo GitHub.
 
       MODE HISTORIQUE (--from / --to) — interroge Loki via le dashboard.
         --from DATE           Début de la plage (requis pour ce mode)
@@ -161,14 +168,12 @@ module Captive
       \x05  captive logs my-app
       \x05  captive logs my-app -f
       \x05  captive logs my-app -n 200
-      \x05  captive logs my-app -c migrate
       \x05  captive logs my-app --worker
       \x05  captive logs my-app --raw
       \x05  captive logs my-app --from "2026-08-31 23:00" --to "2026-09-01 00:00"
       \x05  captive logs my-app --from "2026-08-31 23:00"
     DESC
     method_option :follow,    aliases: "-f", type: :boolean, default: false
-    method_option :container, aliases: "-c", type: :string
     method_option :worker,    aliases: "-w", type: :boolean, default: false
     method_option :lines,     aliases: "-n", type: :numeric, default: 100
     method_option :raw,       type: :boolean, default: false, desc: "Affiche le bruit rack-timeout des sondes readiness"
@@ -177,9 +182,8 @@ module Captive
     def logs(app)
       from = parse_time(options[:from])
       to   = parse_time(options[:to])
-      Commands::Logs.new(kubectl: kubectl).run(
-        app, follow: options[:follow], container: options[:container],
-             worker: options[:worker], lines: options[:lines],
+      Commands::Logs.new.run(
+        app, follow: options[:follow], worker: options[:worker], lines: options[:lines],
              from: from, to: to, raw: options[:raw]
       )
     end

data/lib/captive/commands/addons_commands.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Captive
+  module Commands
+    # Les Add-ons d'une app via le dashboard (ADR 0034) : tout ce que la page Add-ons permet,
+    # sans quitter le terminal. L'ajout est réservé aux admins de l'organisation.
+    class AddonsCommands < Thor
+      include CLIDependencies
+
+      def self.exit_on_failure? = true
+
+      desc "list APP", "Liste les add-ons de l'app et leur statut"
+      long_desc <<~DESC
+        \x05Exemple :
+        \x05  captive addons list my-app-staging
+      DESC
+      def list(app)
+        installed = addons_api.list(app)["installed"]
+        return puts(paint.dim("Aucun add-on. Voir : captive addons catalog #{app}")) if installed.empty?
+
+        installed.each { |addon| puts presenter.installed(addon) }
+      end
+
+      desc "catalog APP", "Liste les add-ons qu'on peut ajouter à l'app"
+      long_desc <<~DESC
+        \x05Exemple :
+        \x05  captive addons catalog my-app-staging
+      DESC
+      def catalog(app)
+        addons_api.list(app)["catalog"].each { |entry| puts presenter.catalog(entry) }
+      end
+
+      desc "add APP ADDON", "Ajoute un add-on à l'app (postgres, supabase…)"
+      long_desc <<~DESC
+        Un add-on « sur demande » (redis, egress-ip) prévient l'équipe plateforme au lieu de
+        l'ajouter. Réservé aux admins de l'organisation.
+
+        \x05Exemple :
+        \x05  captive addons add my-app-staging supabase
+      DESC
+      def add(app, addon)
+        result = addons_api.add(app, addon)
+        if result["status"] == "requested"
+          puts paint.green("  ✓ #{addon} demandé à l'équipe plateforme")
+        else
+          puts paint.green("  ✓ #{addon} en cours d'ajout : #{ASYNC_NOTICE}")
+          puts paint.dim("  Suivre : captive addons list #{app}")
+        end
+      end
+
+      private
+
+      def presenter = Presenter::Addon.new(paint: paint)
+    end
+  end
+end

data/lib/captive/commands/domain_announcer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "../errors"
+
+module Captive
+  module Commands
+    # Dit ce qu'est devenu un geste sur un Domaine. Sans attente, la demande est seulement
+    # acceptée ; avec une attente, le bloc la reçoit et rend le Domaine appliqué.
+    class DomainAnnouncer
+      def initialize(paint:, presenter:, waiter: nil)
+        @paint     = paint
+        @presenter = presenter
+        @waiter    = waiter
+      end
+
+      def call(message)
+        return puts(@paint.green("  ✓ #{message} : #{CLIDependencies::ASYNC_NOTICE}")) unless @waiter
+
+        applied(message, yield(@waiter))
+      rescue PollTimeout => timeout
+        abort @paint.red("✗ Timeout : #{timeout.message}")
+      end
+
+      private
+
+      def applied(message, entry)
+        puts @paint.green("  ✓ #{message} : appliqué")
+        puts "  #{@presenter.line(entry)}" if entry
+      end
+    end
+  end
+end

data/lib/captive/commands/domain_wait.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "../poller"
+require_relative "../errors"
+
+module Captive
+  module Commands
+    # Attend que le cluster reflète un geste sur un Domaine : ni en attente ni échoué, et
+    # présent (absent après une suppression). Le DNS n'entre pas en compte : il dépend du
+    # propriétaire du Domaine, pas de Captive.
+    class DomainWait
+      def initialize(domains:, poller: nil, timeout: 600)
+        @domains = domains
+        @poller  = poller || Poller.new(interval: 10, timeout: timeout)
+      end
+
+      # Rend le Domaine tel que le cluster le montre une fois le geste appliqué.
+      def until_applied(app, hostname)
+        entry = nil
+        poll(app, hostname) { |found| (entry = found) && !found["pending"] }
+        entry
+      end
+
+      def until_gone(app, hostname)
+        poll(app, hostname, &:nil?)
+        nil
+      end
+
+      private
+
+      def poll(app, hostname)
+        @poller.poll_until(context: "#{hostname} sur #{app}") do
+          yield check(hostname, @domains.find(app, hostname))
+        end
+      end
+
+      def check(hostname, entry)
+        return entry unless entry&.fetch("failed", false)
+
+        raise DomainChangeFailed, "#{hostname} : #{entry["failure_reason"] || "échec"}"
+      end
+    end
+  end
+end

data/lib/captive/commands/domains_commands.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+module Captive
+  module Commands
+    # Les Domaines d'une app via le dashboard. Chaque geste est appliqué plus tard par
+    # captive-platform ; --wait attend que le cluster le reflète.
+    class DomainsCommands < Thor
+      include CLIDependencies
+
+      def self.exit_on_failure? = true
+
+      WAIT_OPTIONS = {
+        wait:    { type: :boolean, desc: "Attend que le changement soit appliqué" },
+        timeout: { type: :numeric, default: 600, desc: "Attente max en secondes avec --wait" },
+      }.freeze
+
+      def self.wait_options
+        WAIT_OPTIONS.each { |name, settings| method_option(name, **settings) }
+      end
+
+      desc "list APP", "Liste les domaines de l'app et l'état de leur DNS"
+      long_desc <<~DESC
+        \x05Exemple :
+        \x05  captive domains list my-app
+        \x05  captive domains list my-app --refresh
+      DESC
+      method_option :refresh, type: :boolean, desc: "Vérifie à nouveau le DNS sans attendre le cache"
+      def list(app)
+        entries = options[:refresh] ? domains_api.recheck(app) : domains_api.list(app)
+        return puts(paint.dim("Aucun domaine.")) if entries.empty?
+
+        entries.each { |entry| puts presenter.line(entry) }
+      end
+
+      desc "add APP DOMAINE", "Ajoute un domaine à l'app"
+      long_desc <<~DESC
+        L'enregistrement DNS à créer s'affiche ensuite dans `captive domains list`.
+
+        \x05Exemple :
+        \x05  captive domains add my-app www.example.fr --wait
+      DESC
+      wait_options
+      def add(app, hostname)
+        domains_api.add(app, hostname)
+        announcer.call("#{hostname} ajouté") { |wait| wait.until_applied(app, hostname) }
+        puts paint.dim("  DNS à créer : captive domains list #{app}") unless options[:wait]
+      end
+
+      desc "rm APP DOMAINE", "Supprime un domaine de l'app"
+      long_desc <<~DESC
+        Le domaine cesse aussitôt de servir l'app : il faut le retaper pour confirmer.
+
+        \x05Exemple :
+        \x05  captive domains rm my-app www.example.fr
+        \x05  captive domains rm my-app www.example.fr --yes
+      DESC
+      method_option :yes, type: :boolean, desc: "Supprime sans demander de confirmation"
+      wait_options
+      def rm(app, hostname)
+        confirm_removal(hostname)
+        domains_api.remove(app, hostname)
+        announcer.call("#{hostname} supprimé") { |wait| wait.until_gone(app, hostname) }
+      end
+
+      desc "redirect APP DOMAINE", "Redirige un domaine vers un autre domaine de l'app"
+      long_desc <<~DESC
+        \x05Exemple :
+        \x05  captive domains redirect my-app example.fr --to www.example.fr
+      DESC
+      method_option :to, type: :string, required: true, desc: "Domaine servi vers lequel rediriger"
+      method_option :status, type: :numeric, default: 301, enum: [ 301, 302 ], desc: "Code HTTP de redirection"
+      wait_options
+      def redirect(app, hostname)
+        target = options[:to]
+        domains_api.redirect(app, hostname, { to: target, status: options[:status] })
+        announcer.call("#{hostname} redirigé vers #{target}") { |wait| wait.until_applied(app, hostname) }
+      end
+
+      desc "serve APP DOMAINE", "Repasse un domaine redirigé en domaine servi"
+      long_desc <<~DESC
+        \x05Exemple :
+        \x05  captive domains serve my-app example.fr
+      DESC
+      wait_options
+      def serve(app, hostname)
+        domains_api.serve(app, hostname)
+        announcer.call("#{hostname} servi") { |wait| wait.until_applied(app, hostname) }
+      end
+
+      private
+
+      def presenter = Presenter::Domain.new(paint: paint)
+      def domain_wait = DomainWait.new(domains: domains_api, timeout: options[:timeout])
+
+      def announcer
+        DomainAnnouncer.new(paint: paint, presenter: presenter, waiter: (domain_wait if options[:wait]))
+      end
+
+      def confirm_removal(hostname)
+        return if options[:yes]
+        return if ask("Retape #{hostname} pour confirmer la suppression :").to_s.strip == hostname
+
+        warn paint.red("Abandon : rien n'a été supprimé.")
+        exit 1
+      end
+    end
+  end
+end

data/lib/captive/commands/logs.rb

@@ -2,36 +2,47 @@
 
 require "time"
 require_relative "../log_noise_filter"
+require_relative "../log_stream"
 require_relative "../null_log_filter"
-require_relative "../one_off_spec"
 require_relative "../presenter/log_colorizer"
 
 module Captive
   module Commands
-    # Affiche les logs d'une app en mode live (kubectl) ou historique (Loki via dashboard).
+    # Affiche les logs d'une app, toujours via le dashboard (Loki) : seule l'Organization décide
+    # de l'accès, plus le repo GitHub. Dernières lignes, suivi en direct (-f) ou plage (--from/--to).
     class Logs
-      def initialize(kubectl:, dashboard: DashboardClient.new, paint: Pastel.new)
-        @kubectl   = kubectl
+      WORKER = "worker"
+
+      def initialize(dashboard: DashboardClient.new, stream: LogStream.new, paint: Pastel.new)
         @dashboard = dashboard
+        @stream    = stream
         @colorizer = Presenter::LogColorizer.new(paint: paint)
       end
 
-      def run(app, follow: false, container: nil, worker: false, lines: 100, from: nil, to: nil, raw: false)
+      def run(app, follow: false, worker: false, lines: 100, from: nil, to: nil, raw: false)
         if from || to
-          run_historical(app, from: from, to: to, lines: lines, raw: raw)
+          run_historical(app, from: from, to: to, raw: raw)
         else
-          run_live(app, follow: follow, container: container, worker: worker, lines: lines, raw: raw)
+          run_live(app, follow: follow, worker: worker, lines: lines, raw: raw)
         end
       end
 
       private
 
-      def run_live(app, follow:, container:, worker:, lines:, raw:)
-        selector = worker ? "app=#{app}-worker" : OneOffSpec.live_logs_selector(app)
-        crashing = !follow && @kubectl.pod_crashing?(app, selector)
-        warn "⚠️  Pod en crash — affichage des logs du dernier run (--previous)" if crashing
-        @kubectl.logs(app, selector, follow: follow, container: container, previous: crashing, tail: lines,
-                      filter: log_filter(raw))
+      def run_live(app, follow:, worker:, lines:, raw:)
+        printer = live_printer(worker, log_filter(raw))
+        follow ? @stream.call(app, tail: lines, &printer) : @dashboard.logs(app, limit: lines).each(&printer)
+      rescue Interrupt
+        nil
+      end
+
+      # Comme le sélecteur kubectl d'avant : le web et les one-offs, ou le worker seul.
+      def live_printer(worker, filter)
+        lambda do |line|
+          next if (line["process"] == WORKER) != worker || filter.noise?(line["text"].to_s)
+
+          $stdout.puts format_line(line)
+        end
       end
 
       def run_historical(app, from:, to:, raw:, **)

data/lib/captive/dashboard/addons_resource.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Captive
+  module Dashboard
+    # Les Add-ons d'une app et le Catalogue (ADR 0034) : la même API que la page Add-ons du
+    # dashboard. Un ajout est appliqué plus tard par captive-platform (réponse 202).
+    class AddonsResource
+      PATH = AppPath.new("addons")
+
+      def initialize(api:)
+        @api = api
+      end
+
+      def list(app)       = @api.get(PATH.call(app))
+      def add(app, addon) = @api.post(PATH.call(app), { addon: addon })
+    end
+  end
+end

data/lib/captive/dashboard/app_path.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Captive
+  module Dashboard
+    # Le chemin d'une collection rattachée à une app (`/apps/:app/<collection>`), et d'un de
+    # ses éléments, chaque segment encodé.
+    AppPath = Data.define(:collection) do
+      def call(app, key = nil)
+        base = "/apps/#{DashboardApi.segment(app)}/#{collection}"
+        key ? "#{base}/#{DashboardApi.segment(key)}" : base
+      end
+    end
+  end
+end

data/lib/captive/dashboard/domains_resource.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Captive
+  module Dashboard
+    # Les Domaines d'une app : lus du cluster, modifiés via captive-platform (réponse 202).
+    # `recheck` relit le DNS sans attendre le cache ; une redirection est `{ to:, status: }`.
+    class DomainsResource
+      PATH = AppPath.new("domains")
+
+      def initialize(api:)
+        @api = api
+      end
+
+      def list(app)                 = @api.get(path(app))
+      def recheck(app)              = @api.get("#{path(app)}?refresh=1")
+      def find(app, hostname)       = list(app).find { |domain| domain["hostname"] == hostname }
+      def add(app, hostname)        = @api.post(path(app), { hostname: hostname })
+      def remove(app, hostname)     = @api.delete(path(app, hostname))
+      def serve(app, hostname)      = @api.patch(path(app, hostname), { mode: "serve" })
+      def redirect(app, hostname, rule) = @api.patch(path(app, hostname), rule)
+
+      private
+
+      def path(...) = PATH.call(...)
+    end
+  end
+end

data/lib/captive/dashboard/env_vars_resource.rb

@@ -4,6 +4,8 @@ module Captive
   module Dashboard
     # Les variables d'environnement d'une app : lues du Secret, écrites par set-env.
     class EnvVarsResource
+      PATH = AppPath.new("env_vars")
+
       def initialize(api:)
         @api = api
       end
@@ -18,10 +20,7 @@ module Captive
 
       private
 
-      def path(app, key = nil)
-        base = "/apps/#{DashboardApi.segment(app)}/env_vars"
-        key ? "#{base}/#{DashboardApi.segment(key)}" : base
-      end
+      def path(...) = PATH.call(...)
     end
   end
 end

data/lib/captive/dashboard/scheduled_tasks_resource.rb

@@ -4,6 +4,8 @@ module Captive
   module Dashboard
     # Les tâches planifiées d'une app : lues du cluster, déclarées via captive-platform.
     class ScheduledTasksResource
+      PATH = AppPath.new("scheduled_tasks")
+
       def initialize(api:)
         @api = api
       end
@@ -23,10 +25,7 @@ module Captive
 
       private
 
-      def path(app, name = nil)
-        base = "/apps/#{DashboardApi.segment(app)}/scheduled_tasks"
-        name ? "#{base}/#{DashboardApi.segment(name)}" : base
-      end
+      def path(...) = PATH.call(...)
     end
   end
 end

data/lib/captive/errors.rb

@@ -24,4 +24,5 @@ module Captive
   class NotFoundError < DashboardError; end
   class ValidationError < DashboardError; end
   class ServiceUnavailableError < DashboardError; end
+  class DomainChangeFailed < DashboardError; end
 end

data/lib/captive/kubectl.rb

@@ -4,9 +4,7 @@ require "base64"
 require "json"
 require "open3"
 require_relative "errors"
-require_relative "log_noise_filter"
 require_relative "one_off_spec"
-require_relative "presenter/log_line"
 
 module Captive
   class Kubectl
@@ -174,42 +172,6 @@ module Captive
       system("kubectl", *kubeconfig_args, "exec", "-n", namespace, "-i", pod, "--", *cmd, in: File.open(file))
     end
 
-    def pod_crashing?(namespace, selector)
-      json = run("get", "pod", "-n", namespace, "-l", selector, "-o", "json")
-      items = JSON.parse(json)["items"] || []
-      items.any? do |pod|
-        statuses = (pod.dig("status", "containerStatuses") || []) +
-                   (pod.dig("status", "initContainerStatuses") || [])
-        statuses.any? do |s|
-          s["restartCount"].to_i > 0 ||
-            s.dig("state", "waiting", "reason")&.include?("CrashLoop") ||
-            s.dig("lastState", "terminated", "exitCode").to_i != 0
-        end
-      end
-    end
-
-    def logs(namespace, selector, follow: false, container: nil, previous: false, tail: 100,
-             formatter: Presenter::LogLine.new(app: namespace), filter: LogNoiseFilter.new)
-      args = [ "logs", "-n", namespace, "-l", selector, "--timestamps", "--prefix" ]
-      args << "-f" if follow
-      args << "-p" if previous
-      args += [ "--tail", tail.to_s ] unless follow
-      args += [ "-c", container ] if container
-      success = print_logs(args, formatter, filter)
-      return if success || !previous
-
-      warn "⚠️  Logs du run précédent non disponibles (purgés par le runtime), affichage des logs actuels"
-      print_logs(args - [ "-p" ], formatter, filter)
-    end
-
-    def print_logs(args, formatter, filter)
-      stream_logs(*args) do |line|
-        next if filter.noise?(line)
-
-        puts formatter.call(line)
-      end
-    end
-
     def run_interactive(*args)
       system("kubectl", *kubeconfig_args, *args)
     end

data/lib/captive/loader.rb

@@ -13,11 +13,16 @@ require_relative "one_off_spec"
 require_relative "session_id"
 require_relative "poller"
 require_relative "dashboard_api"
+require_relative "dashboard/app_path"
 require_relative "dashboard/apps_resource"
 require_relative "dashboard/env_vars_resource"
 require_relative "dashboard/scheduled_tasks_resource"
+require_relative "dashboard/domains_resource"
+require_relative "dashboard/addons_resource"
 require_relative "presenter/app_info"
 require_relative "presenter/scheduled_task"
+require_relative "presenter/domain"
+require_relative "presenter/addon"
 require_relative "activity_trail"
 require_relative "errors"
 require_relative "ui/spinner"
@@ -28,8 +33,7 @@ require_relative "commands/one_off_session"
 require_relative "commands/run"
 require_relative "commands/logs"
 require_relative "commands/apps_restart"
+require_relative "commands/domain_wait"
+require_relative "commands/domain_announcer"
 require_relative "commands/db_dump"
 require_relative "commands/db_restore"
-
-
-require_relative "presenter/log_line"

data/lib/captive/log_stream.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "uri"
+require "json"
+require_relative "dashboard_client"
+require_relative "dashboard_response"
+require_relative "session_token"
+require_relative "sse_parser"
+
+module Captive
+  # Suit les logs d'une app en direct, en Server-Sent Events depuis le dashboard
+  # (`GET /api/apps/:id/logs/stream`). Le dashboard ferme le flux au bout de quelques minutes :
+  # on se reconnecte alors avec le dernier id reçu, l'horodatage de la dernière ligne, pour
+  # reprendre sans perte ni doublon. Seul Ctrl+C (Interrupt) ou un refus du dashboard l'arrête.
+  class LogStream
+    RECONNECT_DELAY = 1
+    NETWORK_ERRORS = [ IOError, SystemCallError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError ].freeze
+
+    def initialize(session: SessionToken.new)
+      @session = session
+    end
+
+    def self.stream_uri(app, tail)
+      uri       = URI.parse("#{DashboardClient::DASHBOARD_URL}/api/apps/#{URI.encode_uri_component(app)}/logs/stream")
+      uri.query = URI.encode_www_form(tail:)
+      uri
+    end
+
+    def self.headers(last_id)
+      last_id ? { "Accept" => "text/event-stream", "Last-Event-ID" => last_id } : { "Accept" => "text/event-stream" }
+    end
+
+    def self.read(response, &)
+      DashboardResponse.new(response).parse unless response.code.to_i == 200
+      response.read_body(&)
+    end
+
+    def call(app, tail:, &)
+      uri      = self.class.stream_uri(app, tail)
+      @last_id = nil
+      loop do
+        follow(uri, &)
+      rescue *NETWORK_ERRORS
+        sleep RECONNECT_DELAY
+      end
+    end
+
+    private
+
+    # @last_id avance à chaque événement, pas en fin de connexion : une coupure réseau ne doit
+    # pas faire reprendre plus tôt, ce qui réafficherait des lignes.
+    def follow(uri, &)
+      parser = SseParser.new
+      open_stream(uri, self.class.headers(@last_id)) { |chunk| relay(parser, chunk, &) }
+    end
+
+    def relay(parser, chunk)
+      parser.feed(chunk) do |event|
+        @last_id = event[:id] || @last_id
+        yield JSON.parse(event[:data])
+      end
+    end
+
+    # Pas de read_timeout court : le flux reste ouvert, le serveur envoie un battement de cœur.
+    def open_stream(uri, headers, &)
+      @session.authorize do |token|
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https", open_timeout: 5, read_timeout: 60) do |http|
+          request = Net::HTTP::Get.new(uri, headers.merge("Authorization" => "Bearer #{token}"))
+          http.request(request) { |response| self.class.read(response, &) }
+        end
+      end
+    end
+  end
+end

data/lib/captive/one_off_spec.rb

@@ -45,10 +45,6 @@ module Captive
       "#{app}-run"
     end
 
-    def self.live_logs_selector(app)
-      "app in (#{app},#{run_app_label(app)})"
-    end
-
     private
 
     def job_manifest

data/lib/captive/presenter/addon.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Captive
+  module Presenter
+    # Une ligne par Add-on présent (« Les vôtres ») ou proposé (« Catalogue »).
+    class Addon
+      def initialize(paint:)
+        @paint = paint
+      end
+
+      def installed(addon)
+        details = [ addon["name"], addon["tier"]&.upcase ].compact.join("  ")
+        [ @paint.bold(addon["addon"]), details, status(addon["status"]) ].reject(&:empty?).join("  ")
+      end
+
+      def catalog(entry)
+        head = "#{@paint.bold(entry["id"])}  #{entry["description"]}"
+        notes = []
+        notes << "inclut #{entry["includes"].join(", ")}" if entry["includes"].any?
+        notes << "sur demande" if entry["mode"] == "request"
+        notes << @paint.green("ajouté") if entry["installed"]
+        notes.empty? ? head : "#{head}  #{@paint.dim("(#{notes.join(", ")})")}"
+      end
+
+      private
+
+      def status(value) = value == "ready" ? @paint.green("✓") : @paint.yellow("en cours")
+    end
+  end
+end

data/lib/captive/presenter/app_info.rb

@@ -26,6 +26,8 @@ module Captive
       end
 
       def workload(entry)
+        return "#{entry["name"]} #{@paint.yellow(entry["status_reason"])}" if entry["status"] == "config_required"
+
         ready = "#{entry["ready"]}/#{entry["total"]}"
         ready = @paint.yellow(ready) unless entry["ready"] == entry["total"]
         "#{entry["name"]} #{ready} prêt(s), tier #{entry["tier"] || "–"}"

data/lib/captive/presenter/domain.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Captive
+  module Presenter
+    # Une ligne par Domaine : son nom, son état (servi, redirigé, en attente, échoué) et ce que
+    # dit le DNS. Un geste en cours masque le diagnostic, qui ne vaut que pour l'état atteint.
+    class Domain
+      HEALTH = { "certificate_pending" => "certificat en cours", "invalid" => "route refusée" }.freeze
+
+      def initialize(paint:)
+        @paint = paint
+      end
+
+      def line(entry)
+        change = change(entry)
+        [ entry["hostname"], change || reached(entry), (health(entry) unless change) ].compact.join("  ")
+      end
+
+      private
+
+      # Un geste en attente ou échoué ; nil quand le Domaine est dans l'état demandé.
+      def change(entry)
+        return failure(entry) if entry["failed"]
+
+        @paint.yellow("en attente (#{entry["pending_change"]})") if entry["pending"]
+      end
+
+      def reached(entry)
+        redirect = entry["redirect"]
+        return "→ #{redirect["to"]} (#{redirect["status"]})" if redirect
+
+        entry["primary"] ? "servi, principal" : "servi"
+      end
+
+      def failure(entry)
+        reason = entry["failure_reason"]
+        @paint.red(reason ? "échoué : #{reason}" : "échoué")
+      end
+
+      def health(entry)
+        status = entry["health"]
+        return @paint.green("✓") if status == "valid"
+
+        expected = entry.dig("dns", "expected")
+        return @paint.red("DNS à créer : #{expected.values_at("type", "name").join(" ")} → #{expected["value"]}") if expected
+
+        @paint.yellow(HEALTH.fetch(status, status.to_s))
+      end
+    end
+  end
+end

data/lib/captive/shell_completions.rb

@@ -2,12 +2,14 @@
 
 module Captive
   module ShellCompletions
-    ROOT_COMMANDS = %w[apps env crons db login whoami console run logs version completions].freeze
+    ROOT_COMMANDS = %w[apps env crons domains addons db login whoami console run logs version completions].freeze
 
     SUBCOMMANDS = {
       "apps" => %w[list info restart rebuild],
       "env"  => %w[list set unset],
       "crons" => %w[list add edit rm suspend resume trigger runs],
+      "domains" => %w[list add rm redirect serve],
+      "addons" => %w[list catalog add],
       "db"   => %w[restore],
     }.freeze
 
@@ -23,6 +25,8 @@ module Captive
             apps)  COMPREPLY=($(compgen -W "#{SUBCOMMANDS["apps"].join(" ")}" -- "$cur")); return ;;
             env)   COMPREPLY=($(compgen -W "#{SUBCOMMANDS["env"].join(" ")}" -- "$cur")); return ;;
             crons) COMPREPLY=($(compgen -W "#{SUBCOMMANDS["crons"].join(" ")}" -- "$cur")); return ;;
+            domains) COMPREPLY=($(compgen -W "#{SUBCOMMANDS["domains"].join(" ")}" -- "$cur")); return ;;
+            addons) COMPREPLY=($(compgen -W "#{SUBCOMMANDS["addons"].join(" ")}" -- "$cur")); return ;;
             db)    COMPREPLY=($(compgen -W "#{SUBCOMMANDS["db"].join(" ")}" -- "$cur")); return ;;
           esac
 

data/lib/captive/sse_parser.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Captive
+  # Découpe un flux Server-Sent Events, reçu par morceaux arbitraires, en événements
+  # `{ id:, data: }`. Les commentaires (`:`, battements de cœur) et `retry` sont ignorés.
+  class SseParser
+    def initialize
+      @buffer = +""
+    end
+
+    def feed(chunk)
+      @buffer << chunk
+      while (fin = @buffer.index("\n\n"))
+        event = self.class.parse(@buffer.slice!(0, fin + 2))
+        yield event if event[:data]
+      end
+    end
+
+    def self.parse(bloc)
+      bloc.each_line(chomp: true).each_with_object({}) do |ligne, event|
+        champ, valeur = ligne.split(": ", 2)
+        event[champ.to_sym] = valeur if %w[id data].include?(champ)
+      end
+    end
+  end
+end

data/lib/captive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Captive
-  VERSION = "1.3.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Captive Studio
@@ -107,6 +107,7 @@ files:
 - lib/captive/cli.rb
 - lib/captive/cli/dependencies.rb
 - lib/captive/cluster_endpoint.rb
+- lib/captive/commands/addons_commands.rb
 - lib/captive/commands/apps_commands.rb
 - lib/captive/commands/apps_restart.rb
 - lib/captive/commands/auth_commands.rb
@@ -120,6 +121,9 @@ files:
 - lib/captive/commands/db_psql.rb
 - lib/captive/commands/db_restore.rb
 - lib/captive/commands/db_target.rb
+- lib/captive/commands/domain_announcer.rb
+- lib/captive/commands/domain_wait.rb
+- lib/captive/commands/domains_commands.rb
 - lib/captive/commands/env_commands.rb
 - lib/captive/commands/env_set.rb
 - lib/captive/commands/logs.rb
@@ -128,7 +132,10 @@ files:
 - lib/captive/commands/user_login.rb
 - lib/captive/credentials.rb
 - lib/captive/credentials_store.rb
+- lib/captive/dashboard/addons_resource.rb
+- lib/captive/dashboard/app_path.rb
 - lib/captive/dashboard/apps_resource.rb
+- lib/captive/dashboard/domains_resource.rb
 - lib/captive/dashboard/env_vars_resource.rb
 - lib/captive/dashboard/scheduled_tasks_resource.rb
 - lib/captive/dashboard_api.rb
@@ -141,17 +148,20 @@ files:
 - lib/captive/kubectl.rb
 - lib/captive/loader.rb
 - lib/captive/log_noise_filter.rb
+- lib/captive/log_stream.rb
 - lib/captive/null_log_filter.rb
 - lib/captive/one_off_spec.rb
 - lib/captive/poller.rb
+- lib/captive/presenter/addon.rb
 - lib/captive/presenter/ansi_stripper.rb
 - lib/captive/presenter/app_info.rb
+- lib/captive/presenter/domain.rb
 - lib/captive/presenter/log_colorizer.rb
-- lib/captive/presenter/log_line.rb
 - lib/captive/presenter/scheduled_task.rb
 - lib/captive/session_id.rb
 - lib/captive/session_token.rb
 - lib/captive/shell_completions.rb
+- lib/captive/sse_parser.rb
 - lib/captive/terminal.rb
 - lib/captive/token_refresher.rb
 - lib/captive/ui/banner.rb

data/lib/captive/presenter/log_line.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require "captive/log_utils"
-require_relative "log_colorizer"
-
-module Captive
-  module Presenter
-    # Parses a raw kubectl log line and renders it as a colorized terminal string.
-    class LogLine
-      BRACKET_RE = /\A\[(?:pod\/)?(?<pod>[^\/\]]+)(?:\/(?<container>[^\/\]]+))?\]\z/
-
-      def initialize(app:, paint: Pastel.new)
-        @app       = app
-        @colorizer = LogColorizer.new(paint: paint)
-      end
-
-      def call(raw_line)
-        line = raw_line.chomp
-        first, second, message = line.split(" ", 3)
-        return line if first.nil? || second.nil? || message.nil?
-
-        bracket, ts = pick_bracket_and_timestamp(first, second)
-        return line unless bracket
-
-        label = LogUtils::ProcessLabel.for(pod: bracket[:pod], namespace: @app, container: bracket[:container])
-        @colorizer.format_line(ts: ts, label: label, message: message)
-      end
-
-      private
-
-      def pick_bracket_and_timestamp(first, second)
-        if (bracket = BRACKET_RE.match(first))
-          [ bracket, second ]
-        elsif (bracket = BRACKET_RE.match(second))
-          [ bracket, first ]
-        end
-      end
-    end
-  end
-end