brunch 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 954abfa5f0f95a57eb872a2f140b0eed41d06ccbc7ff5ed5961e12ff73b371fd
-  data.tar.gz: 650c7a5a55c2557191e35cd94da369e6d89708623963e9c2721f04664c9ecbe7
+  metadata.gz: e566d43380555cbea682f52dbbedc64bf1e4a95b681a7c60b266c98aedd5f28e
+  data.tar.gz: 212f72d4aa56f57d4ca878a9da515fbdb8730317f2e61ac8b55b33128f679b0c
 SHA512:
-  metadata.gz: 422d99f190dc07133f0517690a21ec2fda19f17a909b58437374bd49b982625cee2738f5fbe5ab6095898cadd758abdb83df4e21ea856f91270abe4cd16d42be
-  data.tar.gz: c328e3b0a2ba453afd8dd5beb073a221ca5d5b1ba33caafcf59ee1a5396591d5c5b374ef85999511c9b0b8dd558fe963289c2098f76aca42ed650e3ac8e43c61
+  metadata.gz: 5c3a334e07d02110511e678b252880bbf3c7ac8028377611c72d275d7018d89adeba270377f4a6f325c53783c34a674f23af5e374ccefc8b54e09ac07602ccb7
+  data.tar.gz: a5f2857d35bb150e3adc613eb731636b43a286ba74ec4e2afd29a3e75ca9c9433dda5e174fa092db8b179ec9840fcf7ecf3bfd198a6e9104eb0272e017e9eaa3

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 0.8.3 - 2026-09-29
+
+- Detect containers that exit immediately after a Compose resume and report the
+  failure instead of claiming the branch environment is running.
+- Retry activation when a recorded running environment has actually stopped.
+
 ## 0.8.2 - 2026-09-29
 
 - Resume stopped branch containers without rebuilding or replacing them when

data/lib/brunch/managers.rb

@@ -68,7 +68,17 @@ module Brunch
       end
 
       def start(entry) = compose(entry, "up", "--detach", "--build", "--remove-orphans")
-      def resume(entry) = compose(entry, "start")
+
+      def resume(entry)
+        return false unless compose(entry, "start")
+
+        # Compose can report success even when the application exits immediately.
+        3.times do
+          sleep 0.2
+          return false unless healthy?(entry)
+        end
+        true
+      end
 
       def status(entry)
         return "unavailable" unless available?

data/lib/brunch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Brunch
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/lib/brunch/worktree_mode.rb

@@ -106,7 +106,10 @@ module Brunch
           existing = record&.fetch("environments", {})&.[](ref)
           current_ref = record&.[]("current")
         end
-        return if existing && !force && existing["snapshot"] == path && existing["status"] == "running" && current_ref == ref
+        if existing && !force && existing["snapshot"] == path && existing["status"] == "running" &&
+           current_ref == ref && worktree_manager(existing).status(existing) != "stopped"
+          return
+        end
 
         previous = nil
         port = nil
@@ -124,7 +127,10 @@ module Brunch
         end
         if existing && !force && existing["snapshot"] == path && existing["status"] != "starting"
           with_state_lock { |data| data.fetch("worktrees").fetch(id)["current"] = ref }
-          abort "Could not resume environment for #{path}. Run brunch restart to rebuild it." unless worktree_manager(existing).resume(existing)
+          unless worktree_manager(existing).resume(existing)
+            abort "Could not resume environment for #{path}; the container may have exited. Check brunch logs. " \
+                  "If dependencies changed, rebuild with brunch restart (this replaces the container)."
+          end
 
           with_state_lock do |data|
             data.fetch("worktrees").fetch(id).fetch("environments").fetch(ref)["status"] = "running"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brunch
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Maciej Ciemborowicz