openclacky 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 753e91f9083b9710b7aee989e03983c5652de80a2d940c5d709890176d4a2594
-  data.tar.gz: 3dc782019ce0ebbbe5db904792fd7e9f9c8549f5bb4aa923ed74d2c827b91fdf
+  metadata.gz: 938c620eb9886a37c1e190c5bf2d8c804a6ed86eb496332a26f5f225e832a5ec
+  data.tar.gz: c165097e40b1bde5339e9819f7ccdd2a3191ecd24f9233a758a4a2406f5d74db
 SHA512:
-  metadata.gz: 0a362f6c8db13f8e10b4a3d0800436980d89204a42018976abaf443b17b2a8d0f02c53fa50e859ee33339336e7d81c75004c0d1d2ccce5862caecb802c7817c6
-  data.tar.gz: 8785443bccb98f429f6fc77c7aacb8debb47d7a91fc30519d00089c777fd6b1cb83543c059725e4e13d13567ccf65025b949923bd24a278b50049869a9c078d7
+  metadata.gz: 845fef0c86bca42adcb00d2fe34946acd3b72b2d750412a744e78a080cef34b653457ae98318ddad5b623f22325b654ad2a77a61d39abc544edbfd11f44891f3
+  data.tar.gz: ea770a8ac65695d64affd358b4af0788cccc2c4e70eb95d0afaebea61a639ba8829dbcf61af84d0d8229dac9b4af8e969316a5e5c8fb8ec75f9f430647f9b1cc

data/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.10] - 2026-03-24
+
+### Added
+- **One-click gem upgrade in Web UI**: a new "Upgrade" button in the Web UI lets you update Clacky to the latest version without touching the terminal
+- **WebSocket connection status tips**: the Web UI now shows a clear indicator when the WebSocket connection is lost or reconnecting, so you always know if the server is reachable
+- **Master/worker server architecture**: the server now runs in a master + worker process model, enabling zero-downtime gem upgrades — the master restarts workers seamlessly after an upgrade
+
+### Fixed
+- **Relative paths in write/edit tools**: paths like `./foo/bar.rb` are now correctly resolved relative to the working directory instead of the process root, preventing unexpected file placement
+
 ## [0.9.9] - 2026-03-23
 
 ### Added

data/lib/clacky/cli.rb

@@ -793,40 +793,71 @@ module Clacky
     option :brand_test, type: :boolean, default: false,
            desc: "Enable brand test mode: mock license activation without calling remote API"
     def server
-      require_relative "server/http_server"
+      if ENV["CLACKY_WORKER"] == "1"
+        # ── Worker mode ───────────────────────────────────────────────────────
+        # Spawned by Master. Inherit the listen socket from the file descriptor
+        # passed via CLACKY_INHERIT_FD, and report back to master via CLACKY_MASTER_PID.
+        require_relative "server/http_server"
+
+        fd         = ENV["CLACKY_INHERIT_FD"].to_i
+        master_pid = ENV["CLACKY_MASTER_PID"].to_i
+        # Must use TCPServer.for_fd (not Socket.for_fd) so that accept_nonblock
+        # returns a single Socket, not [Socket, Addrinfo] — WEBrick expects the former.
+        socket     = TCPServer.for_fd(fd)
+
+        Clacky::Logger.console = true
+        Clacky::Logger.info("[cli worker PID=#{Process.pid}] CLACKY_INHERIT_FD=#{fd} CLACKY_MASTER_PID=#{master_pid} socket=#{socket.class} fd=#{socket.fileno}")
+
+        agent_config = Clacky::AgentConfig.load
+        agent_config.permission_mode = :confirm_all
+
+        client_factory = lambda do
+          Clacky::Client.new(
+            agent_config.api_key,
+            base_url: agent_config.base_url,
+            anthropic_format: agent_config.anthropic_format?
+          )
+        end
 
-      agent_config = Clacky::AgentConfig.load
-      agent_config.permission_mode = :confirm_all
+        Clacky::Server::HttpServer.new(
+          host:           options[:host],
+          port:           options[:port],
+          agent_config:   agent_config,
+          client_factory: client_factory,
+          brand_test:     options[:brand_test],
+          socket:         socket,
+          master_pid:     master_pid
+        ).start
+      else
+        # ── Master mode ───────────────────────────────────────────────────────
+        # First invocation by the user. Start the Master process which holds the
+        # socket and supervises worker processes.
+        require_relative "server/server_master"
+
+        if options[:brand_test]
+          say "⚡ Brand test mode — license activation uses mock data (no remote API calls).", :yellow
+          say ""
+          say "  Test license keys (paste any into Settings → Brand & License):", :cyan
+          say ""
+          say "    00000001-FFFFFFFF-DEADBEEF-CAFEBABE-00000001  →  Brand1"
+          say "    00000002-FFFFFFFF-DEADBEEF-CAFEBABE-00000002  →  Brand2"
+          say "    00000003-FFFFFFFF-DEADBEEF-CAFEBABE-00000003  →  Brand3"
+          say ""
+          say "  To reset: rm ~/.clacky/brand.yml", :cyan
+          say ""
+        end
 
-      if options[:brand_test]
-        say "⚡ Brand test mode — license activation uses mock data (no remote API calls).", :yellow
-        say ""
-        say "  Test license keys (paste any into Settings → Brand & License):", :cyan
-        say ""
-        say "    00000001-FFFFFFFF-DEADBEEF-CAFEBABE-00000001  →  Brand1"
-        say "    00000002-FFFFFFFF-DEADBEEF-CAFEBABE-00000002  →  Brand2"
-        say "    00000003-FFFFFFFF-DEADBEEF-CAFEBABE-00000003  →  Brand3"
-        say ""
-        say "  To reset: rm ~/.clacky/brand.yml", :cyan
-        say ""
-      end
+        extra_flags = []
+        extra_flags << "--brand-test" if options[:brand_test]
 
-      # Factory so each new session gets a fresh Client instance
-      client_factory = lambda do
-        Clacky::Client.new(
-          agent_config.api_key,
-          base_url: agent_config.base_url,
-          anthropic_format: agent_config.anthropic_format?
-        )
-      end
+        Clacky::Logger.console = true
 
-      Clacky::Server::HttpServer.new(
-        host:           options[:host],
-        port:           options[:port],
-        agent_config:   agent_config,
-        client_factory: client_factory,
-        brand_test:     options[:brand_test]
-      ).start
+        Clacky::Server::Master.new(
+          host:        options[:host],
+          port:        options[:port],
+          extra_flags: extra_flags
+        ).run
+      end
     end
   end
 end

data/lib/clacky/server/http_server.rb

@@ -132,12 +132,14 @@ module Clacky
         - 将大目标拆解为可执行的小步骤
       MD
 
-      def initialize(host: "127.0.0.1", port: 7070, agent_config:, client_factory:, brand_test: false, sessions_dir: nil)
+      def initialize(host: "127.0.0.1", port: 7070, agent_config:, client_factory:, brand_test: false, sessions_dir: nil, socket: nil, master_pid: nil)
         @host           = host
         @port           = port
         @agent_config   = agent_config
         @client_factory = client_factory  # callable: -> { Clacky::Client.new(...) }
         @brand_test     = brand_test      # when true, skip remote API calls for license activation
+        @inherited_socket = socket        # TCPServer socket passed from Master (nil = standalone mode)
+        @master_pid       = master_pid    # Master PID so we can send USR1 on upgrade/restart
         # Capture the absolute path of the entry script and original ARGV at startup,
         # so api_restart can re-exec the correct binary even if cwd changes later.
         @restart_script = File.expand_path($0)
@@ -147,7 +149,8 @@ module Clacky
           session_manager:  @session_manager,
           session_restorer: method(:build_session_from_data)
         )
-        @ws_clients      = {}  # session_id => [WebSocketConnection, ...]
+        @ws_clients      = {}   # session_id => [WebSocketConnection, ...]
+        @all_ws_conns    = []   # every connected WS client, regardless of session subscription
         @ws_mutex        = Mutex.new
         # Version cache: { latest: "x.y.z", checked_at: Time }
         @version_cache   = nil
@@ -171,11 +174,16 @@ module Clacky
         # Enable console logging for the server process so log lines are visible in the terminal.
         Clacky::Logger.console = true
 
-        # Kill any previous server on the same port, then write our own PID file
-        kill_existing_server(@port)
-        pid_file = File.join(Dir.tmpdir, "clacky-server-#{@port}.pid")
-        File.write(pid_file, Process.pid.to_s)
-        at_exit { File.delete(pid_file) if File.exist?(pid_file) }
+        Clacky::Logger.info("[HttpServer PID=#{Process.pid}] start() mode=#{@inherited_socket ? 'worker' : 'standalone'} inherited_socket=#{@inherited_socket.inspect} master_pid=#{@master_pid.inspect}")
+
+        # In standalone mode (no master), kill any stale server and manage our own PID file.
+        # In worker mode the master owns the PID file; we just skip this block.
+        if @inherited_socket.nil?
+          kill_existing_server(@port)
+          pid_file = File.join(Dir.tmpdir, "clacky-server-#{@port}.pid")
+          File.write(pid_file, Process.pid.to_s)
+          at_exit { File.delete(pid_file) if File.exist?(pid_file) }
+        end
 
         # Expose server address and brand name to all child processes (skill scripts, shell commands, etc.)
         # so they can call back into the server without hardcoding the port,
@@ -188,13 +196,43 @@ module Clacky
         # Override WEBrick's built-in signal traps via StartCallback,
         # which fires after WEBrick sets its own INT/TERM handlers.
         # This ensures Ctrl-C always exits immediately.
-        server = WEBrick::HTTPServer.new(
-          BindAddress:     @host,
-          Port:            @port,
-          Logger:          WEBrick::Log.new(File::NULL),
-          AccessLog:       [],
-          StartCallback:   proc { trap("INT") { exit(0) }; trap("TERM") { exit(0) } }
-        )
+        #
+        # When running as a worker under Master, DoNotListen: true prevents WEBrick
+        # from calling bind() on its own — we inject the inherited socket instead.
+        webrick_opts = {
+          BindAddress:   @host,
+          Port:          @port,
+          Logger:        WEBrick::Log.new(File::NULL),
+          AccessLog:     [],
+          StartCallback: proc { }  # signal traps set below, after `server` is created
+        }
+        webrick_opts[:DoNotListen] = true if @inherited_socket
+        Clacky::Logger.info("[HttpServer PID=#{Process.pid}] WEBrick DoNotListen=#{webrick_opts[:DoNotListen].inspect}")
+
+        server = WEBrick::HTTPServer.new(**webrick_opts)
+
+        # Override WEBrick's signal traps now that `server` is available.
+        # On INT/TERM: call server.shutdown (graceful), with a 3s hard-kill fallback.
+        shutdown_once = false
+        shutdown_proc = proc do
+          next if shutdown_once
+          shutdown_once = true
+          Thread.new do
+            sleep 1
+            Clacky::Logger.warn("[HttpServer] Forced exit after graceful shutdown timeout.")
+            exit!(0)
+          end
+          server.shutdown rescue nil
+        end
+        trap("INT")  { shutdown_proc.call }
+        trap("TERM") { shutdown_proc.call }
+
+        if @inherited_socket
+          server.listeners << @inherited_socket
+          Clacky::Logger.info("[HttpServer PID=#{Process.pid}] injected inherited fd=#{@inherited_socket.fileno} listeners=#{server.listeners.map(&:fileno).inspect}")
+        else
+          Clacky::Logger.info("[HttpServer PID=#{Process.pid}] standalone, WEBrick listeners=#{server.listeners.map(&:fileno).inspect}")
+        end
 
         # Mount API + WebSocket handler (takes priority).
         # Use a custom Servlet so that DELETE/PUT/PATCH requests are not rejected
@@ -238,15 +276,6 @@ module Clacky
           end
         end
 
-        banner = Clacky::Banner.new
-        puts ""
-        puts banner.colored_cli_logo
-        puts banner.colored_tagline
-        puts ""
-        puts "   Web UI: #{banner.highlight("http://#{@host}:#{@port}")}"
-        puts "   Version: #{Clacky::VERSION}"
-        puts "   Press Ctrl-C to stop."
-
         # Auto-create a default session on startup
         create_default_session
 
@@ -390,6 +419,7 @@ module Clacky
         FileUtils.mkdir_p(working_dir)
 
         session_id = build_session(name: name, working_dir: working_dir, profile: profile, source: source)
+        broadcast_session_update(session_id)
         json_response(res, 201, { session: @registry.session_summary(session_id) })
       end
 
@@ -715,24 +745,35 @@ module Clacky
 
         Thread.new do
           begin
+            Clacky::Logger.info("[Upgrade] Starting: gem update openclacky --no-document")
             broadcast_all(type: "upgrade_log", line: "Starting upgrade: gem update openclacky --no-document\n")
 
             shell  = Clacky::Tools::Shell.new
+            Clacky::Logger.info("[Upgrade] Calling shell.execute...")
             result = shell.execute(command: "gem update openclacky --no-document",
-                                   soft_timeout: 300, hard_timeout: 600)
+                                   soft_timeout: 30, hard_timeout: 300)
+            Clacky::Logger.info("[Upgrade] shell.execute returned: exit_code=#{result[:exit_code]}")
+            Clacky::Logger.info("[Upgrade] stdout=#{result[:stdout].to_s.slice(0, 500)}")
+            Clacky::Logger.info("[Upgrade] stderr=#{result[:stderr].to_s.slice(0, 500)}")
+
             output  = [result[:stdout], result[:stderr]].join
             success = result[:exit_code] == 0
 
+            clients_count = @ws_mutex.synchronize { @all_ws_conns.size }
+            Clacky::Logger.info("[Upgrade] Broadcasting output to #{clients_count} WS client(s)")
             broadcast_all(type: "upgrade_log", line: output)
 
             if success
+              Clacky::Logger.info("[Upgrade] Success!")
               broadcast_all(type: "upgrade_log", line: "\n✓ Upgrade successful! Please restart the server to apply the new version.\n")
               broadcast_all(type: "upgrade_complete", success: true)
             else
+              Clacky::Logger.warn("[Upgrade] Failed. exit_code=#{result[:exit_code]}")
               broadcast_all(type: "upgrade_log", line: "\n✗ Upgrade failed. Please try manually: gem update openclacky\n")
               broadcast_all(type: "upgrade_complete", success: false)
             end
           rescue StandardError => e
+            Clacky::Logger.error("[Upgrade] Exception: #{e.class}: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
             broadcast_all(type: "upgrade_log", line: "\n✗ Error during upgrade: #{e.message}\n")
             broadcast_all(type: "upgrade_complete", success: false)
           end
@@ -746,24 +787,38 @@ module Clacky
       def api_restart(req, res)
         json_response(res, 200, { ok: true, message: "Restarting…" })
 
-        script = @restart_script
-        argv   = @restart_argv
         Thread.new do
           sleep 0.5  # Let WEBrick flush the HTTP response
 
-          # Use login shell to re-exec so rbenv/mise shims resolve the newly installed gem version.
-          # Direct `exec(RbConfig.ruby, script, *argv)` would reuse the old Ruby interpreter path
-          # and miss gem updates installed under a different Ruby version managed by rbenv/mise.
-          shell      = ENV["SHELL"].to_s
-          shell      = "/bin/bash" if shell.empty?
-          cmd_parts  = [Shellwords.escape(script), *argv.map { |a| Shellwords.escape(a) }]
-          cmd_string = cmd_parts.join(" ")
-
-          Clacky::Logger.info("[Restart] exec: #{shell} -l -c #{cmd_string}")
-          exec(shell, "-l", "-c", cmd_string)
+          if @master_pid
+            # Worker mode: tell master to hot-restart, then exit cleanly.
+            Clacky::Logger.info("[Restart] Sending USR1 to master (PID=#{@master_pid})")
+            begin
+              Process.kill("USR1", @master_pid)
+            rescue Errno::ESRCH
+              Clacky::Logger.warn("[Restart] Master PID=#{@master_pid} not found, falling back to exec.")
+              standalone_exec_restart
+            end
+            exit(0)
+          else
+            # Standalone mode (no master): fall back to the original exec approach.
+            standalone_exec_restart
+          end
         end
       end
 
+      # Re-exec the current process via a login shell (rbenv/mise shim compatible).
+      private def standalone_exec_restart
+        script     = @restart_script
+        argv       = @restart_argv
+        shell      = ENV["SHELL"].to_s
+        shell      = "/bin/bash" if shell.empty?
+        cmd_parts  = [Shellwords.escape(script), *argv.map { |a| Shellwords.escape(a) }]
+        cmd_string = cmd_parts.join(" ")
+        Clacky::Logger.info("[Restart] exec: #{shell} -l -c #{cmd_string}")
+        exec(shell, "-l", "-c", cmd_string)
+      end
+
       # Fetch the latest gem version using `gem list -r`, with a 1-hour in-memory cache.
       # Uses Clacky::Tools::Shell (login shell) so rbenv/mise shims and gem mirrors work correctly.
       private def fetch_latest_version_cached
@@ -1565,6 +1620,7 @@ module Clacky
       end
 
       def on_ws_open(conn)
+        @ws_mutex.synchronize { @all_ws_conns << conn }
         # Client will send a "subscribe" message to bind to a session
       end
 
@@ -1638,6 +1694,7 @@ module Clacky
       end
 
       def on_ws_close(conn)
+        @ws_mutex.synchronize { @all_ws_conns.delete(conn) }
         unsubscribe(conn)
       end
 
@@ -1772,9 +1829,9 @@ module Clacky
         clients.each { |conn| conn.send_json(event) rescue nil }
       end
 
-      # Broadcast an event to every connected client.
+      # Broadcast an event to every connected client (regardless of session subscription).
       def broadcast_all(event)
-        clients = @ws_mutex.synchronize { @ws_clients.values.flatten.uniq }
+        clients = @ws_mutex.synchronize { @all_ws_conns.dup }
         clients.each { |conn| conn.send_json(event) rescue nil }
       end
 

data/lib/clacky/server/server_master.rb

@@ -0,0 +1,260 @@
+# frozen_string_literal: true
+
+require "socket"
+require "tmpdir"
+require_relative "../banner"
+require_relative "../version"
+
+module Clacky
+  module Server
+    # Master process — owns the listen socket, spawns/monitors worker processes.
+    #
+    # Lifecycle:
+    #   clacky server
+    #     └─ Master.run  (this file)
+    #           ├─ creates TCPServer, holds it forever
+    #           ├─ spawns Worker via spawn() — full new Ruby process, loads fresh gem
+    #           ├─ traps USR1 → hot_restart (spawn new worker, gracefully stop old)
+    #           └─ traps TERM/INT → shutdown (stop worker, exit cleanly)
+    #
+    # Worker receives:
+    #   CLACKY_WORKER=1          — "I am a worker, start HttpServer directly"
+    #   CLACKY_INHERIT_FD=<n>   — file descriptor number of the inherited TCPServer socket
+    #   CLACKY_MASTER_PID=<n>   — master PID so worker can send USR1 back on upgrade
+    class Master
+      # Worker exits with this code to request a hot restart (e.g. after gem upgrade).
+      RESTART_EXIT_CODE        = 75
+      MAX_CONSECUTIVE_FAILURES = 5
+
+      # How long (seconds) to wait for a new worker to become ready before killing the old one.
+      NEW_WORKER_BOOT_WAIT = 3
+
+      def initialize(host:, port:, argv: nil, extra_flags: [])
+        @host   = host
+        @port   = port
+        @argv   = argv          # kept for backward compat but no longer used
+        @extra_flags = extra_flags  # e.g. ["--brand-test"]
+
+        @socket     = nil
+        @worker_pid = nil
+        @restart_requested = false
+        @shutdown_requested = false
+      end
+
+      def run
+        # 0. Print banner first — before any log output
+        print_banner
+
+        # 1. Kill any existing master on this port before binding.
+        kill_existing_master
+
+        # 2. Bind the socket once — master holds it for the entire lifetime.
+        @socket = TCPServer.new(@host, @port)
+        @socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
+
+        write_pid_file
+
+        # 3. Signal handlers
+        Signal.trap("USR1") { @restart_requested  = true }
+        Signal.trap("TERM") { @shutdown_requested = true }
+        Signal.trap("INT")  { @shutdown_requested = true }
+
+        # 4. Spawn first worker
+        @worker_pid = spawn_worker
+        @consecutive_failures = 0
+
+        # 4. Monitor loop
+        loop do
+          if @shutdown_requested
+            shutdown
+            break
+          end
+
+          if @restart_requested
+            @restart_requested = false
+            hot_restart
+            @consecutive_failures = 0
+          end
+
+          # Non-blocking wait: check if worker has exited
+          pid, status = Process.waitpid2(@worker_pid, Process::WNOHANG)
+          if pid
+            exit_code = status.exitstatus
+            if exit_code == RESTART_EXIT_CODE
+              Clacky::Logger.info("[Master] Worker requested restart (exit #{RESTART_EXIT_CODE}).")
+              @worker_pid = spawn_worker
+              @consecutive_failures = 0
+            elsif @shutdown_requested
+              break
+            else
+              @consecutive_failures += 1
+              if @consecutive_failures >= MAX_CONSECUTIVE_FAILURES
+                Clacky::Logger.error("[Master] Worker failed #{MAX_CONSECUTIVE_FAILURES} times in a row, giving up.")
+                shutdown
+                break
+              end
+              delay = [0.5 * (2 ** (@consecutive_failures - 1)), 30].min  # exponential backoff, max 30s
+              Clacky::Logger.warn("[Master] Worker exited unexpectedly (exit #{exit_code}), failure #{@consecutive_failures}/#{MAX_CONSECUTIVE_FAILURES}, restarting in #{delay}s...")
+              sleep delay
+              @worker_pid = spawn_worker
+            end
+          end
+
+          sleep 0.1
+        end
+      ensure
+        remove_pid_file
+      end
+
+      private
+
+      # Spawn a fresh Ruby process that loads the (possibly updated) gem from disk.
+      # The listen socket is inherited via its file descriptor number.
+      def spawn_worker
+        env = {
+          "CLACKY_WORKER"      => "1",
+          "CLACKY_INHERIT_FD"  => @socket.fileno.to_s,
+          "CLACKY_MASTER_PID"  => Process.pid.to_s
+        }
+        # Keep the socket fd open across exec — mark it as non-CLOEXEC.
+        @socket.close_on_exec = false
+
+        # Reconstruct the worker command explicitly.
+        # We cannot rely on ARGV (Thor has already consumed it), so we rebuild
+        # the minimal args: `clacky server --host HOST --port PORT [extra_flags]`
+        ruby   = RbConfig.ruby
+        script = File.expand_path($0)
+        worker_argv = ["server", "--host", @host.to_s, "--port", @port.to_s] + @extra_flags
+
+        Clacky::Logger.info("[Master PID=#{Process.pid}] spawn: #{ruby} #{script} #{worker_argv.join(' ')}")
+        Clacky::Logger.info("[Master PID=#{Process.pid}] env: #{env.inspect}")
+        pid = spawn(env, ruby, script, *worker_argv)
+        Clacky::Logger.info("[Master PID=#{Process.pid}] Spawned worker PID=#{pid}")
+        pid
+      end
+
+      # Spawn a new worker, wait for it to boot, then gracefully stop the old one.
+      def hot_restart
+        old_pid = @worker_pid
+        Clacky::Logger.info("[Master] Hot restart: spawning new worker (old PID=#{old_pid})...")
+
+        new_pid = spawn_worker
+        @worker_pid = new_pid
+
+        # Give the new worker time to bind and start serving
+        sleep NEW_WORKER_BOOT_WAIT
+
+        # Gracefully stop old worker
+        begin
+          Process.kill("TERM", old_pid)
+          # Reap it (non-blocking loop so we don't block the monitor)
+          deadline = Time.now + 5
+          loop do
+            pid, = Process.waitpid2(old_pid, Process::WNOHANG)
+            break if pid
+            break if Time.now > deadline
+            sleep 0.1
+          end
+          Process.kill("KILL", old_pid) rescue nil  # force-kill if still alive
+        rescue Errno::ESRCH
+          # already gone — fine
+        end
+
+        Clacky::Logger.info("[Master] Hot restart complete. New worker PID=#{new_pid}")
+      end
+
+      def shutdown
+        Clacky::Logger.info("[Master] Shutting down (worker PID=#{@worker_pid})...")
+        if @worker_pid
+          begin
+            Process.kill("TERM", @worker_pid)
+            # Wait up to 2s for worker graceful exit, then KILL
+            deadline = Time.now + 2
+            loop do
+              pid, = Process.waitpid2(@worker_pid, Process::WNOHANG)
+              break if pid
+              if Time.now > deadline
+                Clacky::Logger.warn("[Master] Worker did not exit in time, sending KILL...")
+                Process.kill("KILL", @worker_pid) rescue nil
+                break
+              end
+              sleep 0.1
+            end
+          rescue Errno::ESRCH, Errno::ECHILD
+            # already gone
+          end
+        end
+        @socket.close rescue nil
+        Clacky::Logger.info("[Master] Exited.")
+        exit(0)
+      end
+
+      def pid_file_path
+        File.join(Dir.tmpdir, "clacky-master-#{@port}.pid")
+      end
+
+      def write_pid_file
+        File.write(pid_file_path, Process.pid.to_s)
+      end
+
+      def remove_pid_file
+        File.delete(pid_file_path) if File.exist?(pid_file_path)
+      end
+
+      def port_free_within?(seconds)
+        deadline = Time.now + seconds
+        loop do
+          begin
+            TCPServer.new(@host, @port).close
+            return true
+          rescue Errno::EADDRINUSE
+            return false if Time.now > deadline
+            sleep 0.1
+          end
+        end
+      end
+
+      def print_banner
+        banner = Clacky::Banner.new
+        puts ""
+        puts banner.colored_cli_logo
+        puts banner.colored_tagline
+        puts ""
+        puts "   Web UI: #{banner.highlight("http://#{@host}:#{@port}")}"
+        puts "   Version: #{Clacky::VERSION}"
+        puts "   Press Ctrl-C to stop."
+        puts ""
+      end
+
+      def kill_existing_master
+        return unless File.exist?(pid_file_path)
+
+        pid = File.read(pid_file_path).strip.to_i
+        return if pid <= 0
+
+        begin
+          Process.kill("TERM", pid)
+          Clacky::Logger.info("[Master] Sent TERM to existing master (PID=#{pid}), waiting up to 3s...")
+
+          unless port_free_within?(3)
+            Clacky::Logger.warn("[Master] Port #{@port} still in use after 3s, sending KILL to PID=#{pid}...")
+            Process.kill("KILL", pid) rescue Errno::ESRCH
+            unless port_free_within?(2)
+              Clacky::Logger.error("[Master] Port #{@port} still in use after KILL, giving up.")
+              exit(1)
+            end
+          end
+
+          Clacky::Logger.info("[Master] Port #{@port} is now free.")
+        rescue Errno::ESRCH
+          Clacky::Logger.info("[Master] Existing master PID=#{pid} already gone.")
+        rescue Errno::EPERM
+          Clacky::Logger.warn("[Master] Could not stop existing master (PID=#{pid}) — permission denied.")
+          exit(1)
+        ensure
+          File.delete(pid_file_path) if File.exist?(pid_file_path)
+        end
+      end
+    end
+  end
+end

data/lib/clacky/tools/base.rb

@@ -29,12 +29,14 @@ module Clacky
       end
 
       # Expand ~ to home directory only if path starts with ~
-      # Relative paths are kept as-is to avoid expanding to long absolute paths
+      # Relative paths are resolved against working_dir if provided
       # @param path [String, nil] The path to expand
+      # @param working_dir [String, nil] The working directory to resolve relative paths against
       # @return [String, nil] The expanded path, or original if no ~ present
-      private def expand_path(path)
+      private def expand_path(path, working_dir: nil)
         return path if path.nil? || path.strip.empty?
         return File.expand_path(path) if path.start_with?("~")
+        return File.expand_path(path, working_dir) if working_dir && !path.start_with?("/")
 
         path
       end

data/lib/clacky/tools/edit.rb

@@ -32,8 +32,8 @@ module Clacky
       }
 
       def execute(path:, old_string:, new_string:, replace_all: false, working_dir: nil)
-        # Expand ~ to home directory
-        path = expand_path(path)
+        # Expand ~ to home directory, resolve relative paths against working_dir
+        path = expand_path(path, working_dir: working_dir)
 
         unless File.exist?(path)
           return { error: "File not found: #{path}" }

data/lib/clacky/tools/write.rb

@@ -28,8 +28,8 @@ module Clacky
         end
 
         begin
-          # Expand ~ to home directory
-          path = expand_path(path)
+          # Expand ~ to home directory, resolve relative paths against working_dir
+          path = expand_path(path, working_dir: working_dir)
 
           # Ensure parent directory exists
           dir = File.dirname(path)

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/lib/clacky/web/app.css

@@ -102,6 +102,23 @@ body {
 }
 #app { display: flex; flex-direction: column; width: 100%; height: 100vh; }
 
+/* ── Offline Banner ───────────────────────────────────────────────────── */
+#offline-banner {
+  position: fixed;
+  top: 12px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 9999;
+  padding: 6px 16px;
+  border-radius: 6px;
+  font-size: 12px;
+  font-weight: 500;
+  white-space: nowrap;
+  background: var(--color-warning-bg);
+  color: var(--color-warning);
+  border: 1px solid var(--color-warning-border);
+}
+
 /* ── Content Row (Sidebar + Main) ───────────────────────────────────────── */
 #content-row {
   display: flex;
@@ -1423,6 +1440,19 @@ body {
 #sib-cost  { flex-shrink: 0; }
 
 /* ── Input area (wraps preview strip + input bar) ────────────────────────── */
+#ws-disconnect-hint {
+  position: absolute;
+  bottom: 100%;
+  right: 16px;
+  white-space: nowrap;
+  padding: 2px 8px;
+  font-size: 11px;
+  color: var(--color-warning);
+  pointer-events: none;
+  opacity: 1;
+  transition: opacity 0.4s ease;
+}
+
 #input-area {
   position: relative;
   border-top: 1px solid var(--color-border-primary);
@@ -1694,7 +1724,10 @@ body {
   max-height: 200px;
   font-family: inherit;
   line-height: 1.5;
+  overflow-y: auto;
+  scrollbar-width: none;
 }
+#user-input::-webkit-scrollbar { display: none; }
 #user-input:focus { outline: none; border-color: var(--color-accent-primary); }
 #btn-send, #btn-interrupt {
   border: none;
@@ -4284,20 +4317,39 @@ body.setup-mode[data-theme="dark"] {
 /* ── Version badge (inline in Settings row, right-aligned) ──────────────── */
 
 /* Settings button stretches to fill width; version badge pushes to the right */
-#btn-settings {
-  position: relative;
+/* Settings row: btn-settings + version badge side by side */
+.sidebar-nav-row {
+  display: flex;
+  align-items: stretch;
+  border-radius: 6px;
+  overflow: hidden;
+  transition: background .15s;
+}
+.sidebar-nav-row:hover {
+  background: var(--color-bg-hover);
+}
+.sidebar-nav-row #btn-settings {
+  flex: 1;
+  border-radius: 0;
+  min-width: 0;
+  background: transparent !important;  /* row handles the bg */
+}
+.sidebar-nav-row:hover #btn-settings {
+  color: var(--color-text-primary);
+}
+.sidebar-nav-row #btn-settings.active {
+  color: var(--color-accent-primary);
 }
 
 .version-badge {
   display: inline-flex;
   align-items: center;
   gap: 5px;
-  margin-left: auto;        /* push to right inside flex btn-settings */
-  padding: 2px 6px;
-  border-radius: 4px;
-  cursor: pointer;          /* always clickable — shows status or upgrade popover */
-  transition: background .15s;
+  padding: 0 10px;
   flex-shrink: 0;
+  border-radius: 0;
+  cursor: pointer;
+  transition: background .15s;
 }
 
 .version-text {
@@ -4309,7 +4361,7 @@ body.setup-mode[data-theme="dark"] {
   line-height: 1;
 }
 /* Highlight version text when badge is actionable and btn is hovered */
-#btn-settings:hover .version-text { color: var(--color-text-tertiary); }
+.version-badge:hover .version-text { color: var(--color-text-tertiary); }
 .version-badge.has-update .version-text,
 .version-badge.upgrade-done .version-text { color: var(--color-accent-primary); }
 

data/lib/clacky/web/app.js

@@ -285,11 +285,24 @@ WS.onEvent(ev => {
   switch (ev.type) {
 
     // ── Internal WS lifecycle ──────────────────────────────────────────
-    case "_ws_connected":
+    case "_ws_connected": {
+      const banner = document.getElementById("offline-banner");
+      if (banner) banner.style.display = "none";
+      const hint = $("ws-disconnect-hint");
+      if (hint) hint.style.display = "none";
       break;
+    }
 
-    case "_ws_disconnected":
+    case "_ws_disconnected": {
+      const banner = document.getElementById("offline-banner");
+      if (banner) {
+        banner.textContent = I18n.t("offline.banner");
+        banner.style.display = "block";
+      }
+      Sessions.clearProgress();
+      Sessions.updateStatusBar("idle");
       break;
+    }
 
     // ── Session list ───────────────────────────────────────────────────
     case "session_list": {
@@ -654,6 +667,21 @@ function sendMessage() {
   if (!content && _pendingImages.length === 0 && _pendingFiles.length === 0) return;
   if (!Sessions.activeId) return;
 
+  if (!WS.ready) {
+    const hint = $("ws-disconnect-hint");
+    if (hint) {
+      hint.textContent = I18n.t("chat.disconnected.hint");
+      hint.style.display = "block";
+      hint.style.opacity = "1";
+      clearTimeout(hint._hideTimer);
+      hint._hideTimer = setTimeout(() => {
+        hint.style.opacity = "0";
+        setTimeout(() => { hint.style.display = "none"; }, 400);
+      }, 2000);
+    }
+    return;
+  }
+
   _sending = true;
 
   let bubbleHtml = content ? escapeHtml(content) : "";

data/lib/clacky/web/i18n.js

@@ -57,6 +57,10 @@ const I18n = (() => {
       "modal.yes": "Yes",
       "modal.no":  "No",
 
+      // ── Offline banner ──
+      "offline.banner":           "Server disconnected — reconnecting…",
+      "chat.disconnected.hint":   "Server disconnected. Please wait for reconnection.",
+
       // ── Version / Upgrade ──
       "upgrade.desc":              "A new version is available. It will install in the background — you can keep using the app.",
       "upgrade.btn.upgrade":       "Upgrade Now",
@@ -64,7 +68,7 @@ const I18n = (() => {
       "upgrade.btn.restart":       "↻ Restart Now",
       "upgrade.installing":        "Installing…",
       "upgrade.done":              "Upgrade complete!",
-      "upgrade.failed":            "Upgrade failed. Please try again.",
+      "upgrade.failed":            "Upgrade failed. Try again or run manually: gem update openclacky",
       "upgrade.reconnecting":      "Restarting server…",
       "upgrade.restart.success":   "✓ Restarted successfully!",
       "upgrade.tooltip.upgrading":    "Upgrading — click to see progress",
@@ -326,6 +330,10 @@ const I18n = (() => {
       "modal.yes": "确认",
       "modal.no":  "取消",
 
+      // ── Offline banner ──
+      "offline.banner":           "服务已断开，正在重连…",
+      "chat.disconnected.hint":   "服务已断开，请等待重连后再发送。",
+
       // ── Version / Upgrade ──
       "upgrade.desc":              "有新版本可用，将在后台安装，升级期间可继续使用。",
       "upgrade.btn.upgrade":       "立即升级",
@@ -333,7 +341,7 @@ const I18n = (() => {
       "upgrade.btn.restart":       "↻ 立即重启",
       "upgrade.installing":        "安装中…",
       "upgrade.done":              "升级完成！",
-      "upgrade.failed":            "升级失败，请重试。",
+      "upgrade.failed":            "升级失败，请重试或手动执行：gem update openclacky",
       "upgrade.reconnecting":      "服务重启中…",
       "upgrade.restart.success":   "✓ 重启成功！",
       "upgrade.tooltip.upgrading":    "升级中，点击查看进度",

data/lib/clacky/web/index.html

@@ -16,6 +16,7 @@
   </script>
 </head>
 <body>
+<div id="offline-banner" style="display:none" data-i18n="offline.banner"></div>
 <div id="app" style="visibility:hidden">
 
   <!-- ── TOP HEADER ──────────────────────────────────────────────────────── -->
@@ -129,13 +130,15 @@
 
     <!-- Bottom Settings -->
     <div id="sidebar-footer">
-      <button id="btn-settings" class="sidebar-nav-btn" title="Settings">
-        <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-          <circle cx="12" cy="12" r="3"/>
-          <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/>
-        </svg>
-        <span data-i18n="sidebar.settings">Settings</span>
-        <!-- Version badge: inline in settings row, right-aligned -->
+      <div class="sidebar-nav-row">
+        <button id="btn-settings" class="sidebar-nav-btn" title="Settings">
+          <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <circle cx="12" cy="12" r="3"/>
+            <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/>
+          </svg>
+          <span data-i18n="sidebar.settings">Settings</span>
+        </button>
+        <!-- Version badge: independent button, right side of the row -->
         <span id="version-badge" class="version-badge" style="display:none">
           <span id="version-text" class="version-text"></span>
           <span id="version-update-dot"   class="version-update-dot"   style="display:none"></span>
@@ -143,7 +146,7 @@
           <span id="version-spinner"      class="version-spinner"       style="display:none"></span>
           <span id="version-done-check"   class="version-done-check"    style="display:none">✓</span>
         </span>
-      </button>
+      </div>
     </div>
   </aside>
 
@@ -220,6 +223,7 @@
       </div>
 
       <div id="input-area">
+        <div id="ws-disconnect-hint" style="display:none"></div>
         <!-- Skill autocomplete dropdown (shown when user types /xxx) -->
         <div id="skill-autocomplete" style="display:none" role="listbox" aria-label="Skills">
           <div id="skill-autocomplete-list"></div>

data/lib/clacky/web/sessions.js

@@ -508,10 +508,16 @@ const Sessions = (() => {
       }
     },
 
-    /** Patch a single session's fields (from session_update event). */
+    /** Patch a single session's fields (from session_update event).
+     *  If the session is not in the list yet (e.g. just created by another tab),
+     *  prepend it so the sidebar shows it immediately. */
     patch(id, fields) {
       const s = _sessions.find(s => s.id === id);
-      if (s) Object.assign(s, fields);
+      if (s) {
+        Object.assign(s, fields);
+      } else {
+        _sessions.unshift({ id, ...fields });
+      }
     },
 
     /** Remove a session from the list (from session_deleted event). */

data/lib/clacky/web/version.js

@@ -305,12 +305,13 @@ const Version = (() => {
         logEl.scrollTop = logEl.scrollHeight;
       }
     } else if (event.type === "upgrade_complete") {
-      _upgrading    = false;
-      _needsUpdate  = false;
+      _upgrading = false;
       if (event.success) {
+        _needsUpdate  = false;
         _needsRestart = true;   // badge: orange bouncing dot
         _upgradeDone  = false;
       }
+      // On failure, _needsUpdate stays true so badge stays amber
       _renderBadge();
       // Morph popover to done/error state
       const pop = $("version-upgrade-popover");
@@ -325,27 +326,50 @@ const Version = (() => {
   }
 
   // ── Init ───────────────────────────────────────────────────────────────
+  let _hoverTimer = null;
+
   function init() {
     const badge = $("version-badge");
     if (badge) {
+      // Click still works (e.g. during reconnect to keep popover visible)
       badge.addEventListener("click", e => {
-        if (!_current) return;
-
-        // Always stop propagation — badge click should never open the settings panel
         e.stopPropagation();
-
-        // During reconnect, badge click just keeps popover visible (no toggle)
         if (_reconnecting) { if (!_popoverOpen) _openPopover(); return; }
+      });
+
+      // Hover to open
+      badge.addEventListener("mouseenter", () => {
+        if (!_current) return;
+        clearTimeout(_hoverTimer);
+        _openPopover();
+      });
 
-        if (_popoverOpen) {
+      // Leave badge or popover → close (with small delay so mouse can move to popover)
+      badge.addEventListener("mouseleave", () => {
+        _hoverTimer = setTimeout(() => {
+          const pop = $("version-upgrade-popover");
+          if (pop && pop.matches(":hover")) return;
           _closePopover();
-        } else {
-          _openPopover();
-        }
+        }, 200);
       });
     }
 
-    // Close on outside click — but not while upgrading or reconnecting
+    // Keep popover open while hovering it; close when leaving
+    document.addEventListener("mouseover", e => {
+      const pop = $("version-upgrade-popover");
+      if (pop && e.target.closest("#version-upgrade-popover")) {
+        clearTimeout(_hoverTimer);
+      }
+    });
+    document.addEventListener("mouseout", e => {
+      const pop = $("version-upgrade-popover");
+      if (!pop) return;
+      if (e.target.closest("#version-upgrade-popover") && !e.relatedTarget?.closest("#version-upgrade-popover") && !e.relatedTarget?.closest("#version-badge")) {
+        _hoverTimer = setTimeout(() => _closePopover(), 200);
+      }
+    });
+
+    // Click outside still closes (e.g. keyboard users, edge cases)
     document.addEventListener("click", e => {
       if (!e.target.closest("#version-badge") && !e.target.closest("#version-upgrade-popover")) {
         if (_popoverOpen && !_upgrading && !_reconnecting) _closePopover();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - windy
@@ -368,6 +368,7 @@ files:
 - lib/clacky/server/channel/channel_ui_controller.rb
 - lib/clacky/server/http_server.rb
 - lib/clacky/server/scheduler.rb
+- lib/clacky/server/server_master.rb
 - lib/clacky/server/session_registry.rb
 - lib/clacky/server/web_ui_controller.rb
 - lib/clacky/session_manager.rb