yamine 0.14.3 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8af42a840ce756689e6c37140a3a8cdf402c51aa71b9819b88df624d6a6ffaae
-  data.tar.gz: 0a51ab3de0e5605ea8b5152720f76957530722a1b65740dfebc0ab29d14337f9
+  metadata.gz: cb9ab4ec4d7e32278f307f3ebb9366b2a23ef7ec5b65016e6888c240ee90d951
+  data.tar.gz: 13f8a0d5340f03de8132101f5eb996b533aaf9b60a96b21bfbdddc6839ae4641
 SHA512:
-  metadata.gz: e7823296acbadf8e6cc07079ff3f2d3ad56809d2de4973e6ed821124888cd2ee2144e267a754e585454fbc5c808c23fb9984e8da9880de4fda3b2b58bfcfff65
-  data.tar.gz: 2642187bbffd601efb5272f557577014704a4415b76c45eefbfa177d3e337b62074d5b60f36525c7a25b174684af7ccc5da31bbd8abaf59a9cdfa9fb864fae96
+  metadata.gz: 10b5b826f5cd2c007e181feaf9f671e0b654a80b13f922c3251d72912987ecd294fa3cdc1d17fa7e5f58dbed22aab8961598844b711c896301e4cb7b46a59399
+  data.tar.gz: cb4962d0c9db1711963bbee31b59f3ca062613562714dfeebed81cdff5c896caf0fb3cdc16296e5245db0885da8debf03b6a1ec9b527e98bb79c3b5e4e46ff08

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # 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
+
+- **App logs now live in `log/development.log` — `log/yamine-*.log` is gone.**
+  Every process used to append to a per-process `log/yamine-#{name}.log`,
+  hijacking the Rails request log away from `log/development.log` and
+  making `tail -f log/development.log` go silent under yamine. Now
+  every process appends to the same shared file — the one Rails people
+  already expect — with `tail -F` surviving rotation. `yamine log` and
+  `yamine log -F` tail that file; the `--wait` failure payload's log tail
+  and `died_detail` now point at `log/development.log` too. Old
+  `log/yamine-*.log` files are cleaned up automatically on the next
+  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

data/README.md

@@ -229,7 +229,7 @@ yamine db list|create|drop    # per-worktree databases
 yamine worktree list|add|remove|clean   # worktree lifecycle
 yamine stop                   # stop this app's backend + routes
 yamine restart                # touch tmp/restart.txt (managed apps reboot)
-yamine log [-f] [n]           # tail (or follow) this app's backend log
+yamine log [-F] [n]           # tail (or follow) log/development.log
 yamine proxy start|stop       # control the proxy
 yamine service install|status|uninstall   # root-owned OS startup service
 yamine hosts sync|clean       # manage /etc/hosts entries
@@ -276,9 +276,10 @@ old fire-and-forget path.
 
 ## Log rotation
 
-`proxy.log` and per-app backend logs rotate at 5MB
-(`YAMINE_LOG_MAX_BYTES`), keeping one generation. `doctor` warns
-when the state dir passes 100MB.
+`proxy.log` rotates at 5MB (`YAMINE_LOG_MAX_BYTES`), keeping one
+generation. `log/development.log` is rotated too — use
+`tail -F log/development.log` (or `yamine log -F`) so rotation doesn't
+lose the tail. `doctor` warns when the state dir passes 100MB.
 
 ## Supervision
 

data/lib/ask/skills/yamine/SKILL.md

@@ -39,7 +39,7 @@ yamine start --json       # machine-readable wait result (--wait default)
 yamine                    # same as start
 yamine stop               # stop this app's backend + routes
 yamine status             # show service, processes, and URLs
-yamine log [-f]           # tail the web process log
+yamine log [-F]           # tail log/development.log (every process)
 ```
 
 `$PORT` and `YAMINE_URL` are injected per process; HTTP processes get

data/lib/yamine/cli/boot.rb

@@ -268,7 +268,7 @@ module Yamine
           children << { name: item[:name], pid: app.pid }
           apps[item[:name]] = {
             item: item,
-            log_path: File.join(Dir.pwd, "log", "yamine-#{item[:name]}.log"),
+            log_path: File.join(Dir.pwd, "log", "development.log"),
             app: app
           }
         end
@@ -330,7 +330,7 @@ module Yamine
       def tail_for(failure, apps)
         name = failure[:name]
         slot = apps[name]
-        path = slot ? File.expand_path(File.join(Dir.pwd, "log", "yamine-#{name}.log")) : nil
+        path = slot ? File.expand_path(File.join(Dir.pwd, "log", "development.log")) : nil
         lines = path && File.file?(path) ? File.readlines(path).last(20).join : "(no log file)"
         { path: path, tail: lines }
       rescue SystemCallError
@@ -580,7 +580,7 @@ module Yamine
           if dead
             pid, name = dead
             $stderr.puts "\n[#{name}] exited (pid #{pid}) — stopping the whole tree."
-            log = File.join(Dir.pwd, "log", "yamine-#{name}.log")
+            log = File.join(Dir.pwd, "log", "development.log")
             $stderr.puts "  log: #{log}" if File.file?(log)
             reporter&.note("#{name} exited; cleaning up routes")
             cleanup_routes(ctx, hostnames)

data/lib/yamine/cli/routes.rb

@@ -249,12 +249,13 @@ module Yamine
         puts "Touched #{path} — managed app restarts on next request."
       end
 
-      # Tail the app log (default 50 lines); --follow streams.
-      def log(ctx, args)
+      # Tail the shared app log (default 50 lines); --follow streams.
+      # Every process writes log/development.log, so `yamine log` and
+      # `yamine log -F` tail the one file `tail -F` survives rotation.
+      def log(_ctx, args)
         follow = args.delete("--follow") || args.delete("-f")
         lines = (args.first || 50).to_i
-        resolved = Resolver.resolve(Dir.pwd)
-        path = File.expand_path(File.join(Dir.pwd, "log", "yamine-#{resolved.app}.log"))
+        path = File.expand_path(File.join(Dir.pwd, "log", "development.log"))
         unless File.file?(path)
           puts "No log at #{path} yet."
           return

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/cli.rb

@@ -104,7 +104,7 @@ module Yamine
           yamine kamal <variant>        Preview-deploy snippet for Kamal
           yamine stop                   Stop this app's backend + routes
           yamine restart                Touch tmp/restart.txt
-          yamine log [-f] [n]           Tail (or follow) this app's backend log
+          yamine log [-F] [n]           Tail (or follow) log/development.log
 
         Flags: --variant, --tld, --force, --app-port, --wait (default), --no-wait, --json, --branch
         Env: YAMINE_VARIANT/TLD/PORT/STATE_DIR/AGENT, YAMINE_BRANCH=1

data/lib/yamine/readiness.rb

@@ -189,13 +189,14 @@ module Yamine
     end
 
     # Why a process that died before answering died: the recognized
-    # fatal line when there is one, else point at its log.
+    # fatal line when there is one, else point at the shared log
+    # (every process appends to log/development.log).
     def died_detail(name, slot)
       reason = fatal_line(slot[:log_path])
       if reason
-        "process exited: #{reason} (log/yamine-#{name}.log)"
+        "process exited: #{reason} (log/development.log)"
       else
-        "process exited before becoming healthy — see log/yamine-#{name}.log"
+        "process exited before becoming healthy — see log/development.log"
       end
     end
 

data/lib/yamine/runner.rb

@@ -91,8 +91,10 @@ module Yamine
 
     # Run an arbitrary command with PORT + YAMINE_URL. Returns App.
     # register: false spawns without a route (background processes).
-    # Child output goes to log/yamine-<name>.log so `--wait` failure
-    # payloads can tail it (same file the managed path uses).
+    # Child output goes to log/development.log (every process appends
+    # to the same file) so `tail -f log/development.log` is the same
+    # view yamine's failure payloads use. Interleaving matches the
+    # foreman/without-yamine experience.
     #
     # extra_env is the config's env.clear/env.secret for this process —
     # yamine's own keys (PORT, YAMINE_URL, DATABASE_URL, the TLS vars)
@@ -221,6 +223,14 @@ module Yamine
 
     private
 
+    def cleanup_legacy_logs(dir)
+      Dir.glob(File.expand_path(File.join(dir, "log", "yamine-*.log*"))).each do |path|
+        FileUtils.rm_f(path)
+      rescue SystemCallError
+        nil
+      end
+    end
+
     def socket_command(dir, socket_path)
       socket = "unix://#{socket_path}"
       config_ru = File.join(dir, "config.ru")
@@ -288,12 +298,15 @@ module Yamine
       end
     end
 
-    # Log path for a process — public so the --wait failure payload
-    # can tail the right file for the phase that failed.
-    def log_path(dir, name)
-      path = File.expand_path(File.join(dir, "log", "yamine-#{name}.log"))
+    # Log path for any process — every process appends to
+    # log/development.log so `tail -F` is the one view for humans
+    # and for --wait failure tails. Keep the two-arg signature so
+    # existing call sites don't need to change.
+    def log_path(dir, _name = nil)
+      path = File.expand_path(File.join(dir, "log", "development.log"))
       FileUtils.mkdir_p(File.dirname(path))
       Log.rotate(path)
+      cleanup_legacy_logs(dir)
       path
     end
 

data/lib/yamine/version.rb

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

metadata

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