yamine 0.15.0 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed2f817c57a50bb8b6d1d06b801c11e321314f4106592797a5554398dab57c5
-  data.tar.gz: a8d5de965cd99d455bea51bc0403b968d05a5eb3af988f94eb7cbe631c8d4fac
+  metadata.gz: f0fb00156c920d8b49a4116be04c671904877e26cb75816d3f7d05d899f413be
+  data.tar.gz: 28c31ed6f7e03fd453b9fa00c1372c36701b675b015c9de906223934b3ade84f
 SHA512:
-  metadata.gz: c6b57abccf1ba59aa2ac525f1f44cb9ed36bf3e6183ed409affdb42af5dec4bd6674a7df6fc6b259d77aa48ece1279aea552a44ffe50479ace3974614b29fc1c
-  data.tar.gz: e075319032988c9efcaf70ca3835a46bcb3a0f55986a35bfe42b765483b24c89611c4893fc26d5b1437a9a49d263cd1f9aabed27e27f56705069e43e2832544c
+  metadata.gz: 69ce5134433ef830e42ba29420ab0ab17a6f39ec39cb885e534cbdae485cc6360270ad45b6e31b99191988a0f2d3fd6d20b5a0073df9469478ebeddc0f092c03
+  data.tar.gz: 037bc4d5fd9ac1767304c1a6bee32572bc28a95cd64fde42414c6ff38624dd74c3a0be05966bd2d32a91e5c3664ba99ac1a5fac50fcd81b1a673a48e75b990b6

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.15.1] — 2026-09-22
+
+### Fixed
+
+- **Stale merged worktrees now lose their branch too.** A worktree whose
+  directory was already gone was pruned from git, but its branch was
+  left behind — so `remove` and `clean` reported success while the
+  merged branch lingered, unlike a normal teardown. Stale entries now
+  delete a merged branch the same way (`git branch -d` after the
+  prune), and an unmerged branch is kept with the reason said out loud
+  unless `--force`. Regression coverage pins all three: stale + merged
+  deletes, stale + unmerged keeps, and `clean` doing the same sweep.
+
 ## [0.15.0] — 2026-09-15
 
 ### Changed
@@ -16,6 +29,22 @@
   boot. Interleaving matches the foreman/without-yamine experience; a
   per-process opt-in can be added later if needed.
 
+## [0.14.3] — 2026-09-15
+
+### Fixed
+
+- **WebSocket upgrades carry the same forwarded headers as every other
+  request.** Upgrade requests (ActionCable, Turbo Streams over cable)
+  were piped to the backend byte-for-byte, so `X-Forwarded-Proto`,
+  `X-Forwarded-For`, and `X-Forwarded-Host` never arrived — the one
+  request class that skipped `set_forwarded`. An app behind the proxy
+  then saw a `wss://` connection as plain `http`, and Rails' ActionCable
+  origin check (Origin vs. scheme + Host) compared
+  `https://app.localhost` against `http://app.localhost` and refused the
+  socket with "Request origin not allowed". Upgrades now run the same
+  `set_forwarded` path as every other request before the head is
+  forwarded; the bytes after the header block still pipe raw.
+
 ## [0.14.2] — 2026-09-15
 
 ### Added

data/lib/yamine/cli/worktree.rb

@@ -210,7 +210,7 @@ module Yamine
         end
 
         unless entry.exists?
-          abandon(ctx, repo, entry)
+          abandon(ctx, repo, entry, force: opts[:force])
           return
         end
 
@@ -251,6 +251,7 @@ module Yamine
 
         failures = 0
         changed = false
+        stale = []
         plan.each do |step|
           case step[0]
           when :drop_db
@@ -266,12 +267,14 @@ module Yamine
               failures += 1
             end
           when :prune
+            stale << step[1]
             changed = true
           when :keep
             puts "  kept #{step[1]} — #{step[2]}"
           end
         end
         Worktrees.prune(repo) if repo
+        stale.each { |entry| delete_stale_branch(repo, entry) } if repo
         resync_hosts(ctx) if repo && changed
         ran = plan.count { |s| %i[drop_db teardown prune].include?(s[0]) }
         summary = "Cleaned #{ran} item(s)"
@@ -285,7 +288,7 @@ module Yamine
           case action
           when :drop_db then "drop database #{subject} (#{reason} is gone)"
           when :teardown then "remove worktree #{subject.path} (#{reason})"
-          when :prune then "prune stale git entry #{subject}"
+          when :prune then "prune stale git entry #{subject.path}"
           when :keep then "keep #{subject} — #{reason}"
           end
         end
@@ -303,7 +306,7 @@ module Yamine
           next if entry.bare || entry.main?
 
           unless entry.exists?
-            plan << Plan.new(:prune, entry.path)
+            plan << Plan.new(:prune, entry)
             next
           end
           if Worktrees.dirty?(entry.path, ignore: LOCAL_CONFIG_FILES)
@@ -370,8 +373,10 @@ module Yamine
       end
 
       # A worktree whose directory is already gone: nothing to stop or
-      # remove, just its database claim and the stale git entry.
-      def abandon(ctx, repo, entry)
+      # remove, just its database claim, the stale git entry, and — when
+      # the branch is merged — the branch itself, matching what a normal
+      # removal would have done.
+      def abandon(ctx, repo, entry, force: false)
         map = Database.load_map(ctx.store.dir)
         claim = claim_for(map, entry.path)
         if claim
@@ -379,6 +384,26 @@ module Yamine
         end
         Worktrees.prune(repo)
         puts "  pruned #{entry.path} (directory was already gone)"
+        delete_stale_branch(repo, entry, force: force)
+      end
+
+      # Prune first so git will allow the delete; an unmerged branch is
+      # kept unless force, exactly as teardown does for a live worktree.
+      def delete_stale_branch(repo, entry, force: false)
+        return unless entry.branch && Worktrees.branch_exists?(repo, entry.branch)
+
+        merged = Worktrees.merged?(repo, entry.branch,
+          into: Worktrees.default_branch(repo))
+        if force || merged
+          flag = force ? "-D" : "-d"
+          _out, status = Open3.capture2("git", "branch", flag, entry.branch,
+            chdir: repo, err: File::NULL)
+          if status&.success?
+            puts "  deleted branch #{entry.branch}"
+            return
+          end
+        end
+        puts "  kept branch #{entry.branch} (git refuses to delete an unmerged branch)"
       end
 
       # The teardown shared by `remove` and `clean`. Returns true when

data/lib/yamine/proxy.rb

@@ -320,12 +320,18 @@ module Yamine
 
     def handle_upgrade(sock, head, buf)
       routes = cached_routes
-      _method, _target, headers = parse_head(head)
+      method, target, headers = parse_head(head)
       entry = route(headers["host"].to_s, routes)
       return unless entry
 
+      # Upgrades carry the same forwarded headers as every other request:
+      # an app behind the proxy (ActionCable's origin check) reads the
+      # scheme from X-Forwarded-Proto, and a verbatim head would tell a
+      # wss:// connection it arrived as http.
+      set_forwarded(headers, sock, tls: @tls)
+
       backend = dial(entry)
-      backend.write(head)
+      backend.write(rebuild_head(method, target, headers))
       backend.write(buf) unless buf.empty?
       pipe_both(sock, backend)
     rescue SystemCallError, OpenSSL::SSL::SSLError, IOError => e

data/lib/yamine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yamine
-  VERSION = "0.15.0"
+  VERSION = "0.15.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamine
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.2
 platform: ruby
 authors:
 - Kaka Ruto