diffbroker 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bdc96c23de6492a2ea0660c7f897c8c04efc4ea3993cf96e9b4c6bf57385644
-  data.tar.gz: b1159b4577c725eb8f9a92277ccdfd84fcdf9cf655d09dbe384d70d6cc00bc75
+  metadata.gz: ca48a356eaffc2d3549190a987dfc0ee851b76a2c622d256c154cf17ae41d7d8
+  data.tar.gz: 436612e9a7695e506926430051c0b023b3e920ae4dd35b1de3c614df12155358
 SHA512:
-  metadata.gz: 07e7a17ef7f21c5350e7796d58b75b5255d51a7fcac5ca7f2036e86f82915f4bfaa96a2058572667279e3ffe50d85953ad224977bfbf5da50fc88eec150aa6d5
-  data.tar.gz: 7457ee92b3fbad1376448ae6be16e700a74ca4e7427a5f58aea9e713a4b09da88d4424f85201b6c95be8f1ba5f84e558f976fc570b8658a7110572e9750b0cee
+  metadata.gz: 46d637259952a1158a9429e07cabd21d14e35c36ef81e21786df3c071181f035790bb204286ea1822c3c96368f9e86c9eb08b911b5a33661f6528545d2420b3c
+  data.tar.gz: 2b9654e4d22fb4e127d62abb4ccaab62a3db448dceb0f932858bf9d6f82bedaaf7cdef4c2c57d027e4b5b60dfd42c419dadbc030bbd59db78fe5927f1f964cdd

data/lib/diffbroker/daemon.rb

@@ -42,7 +42,7 @@ module Diffbroker
           task_runner_factory: ->(report) { TaskRunner.new(config:, report:, out:) }, out: Stamped.new(out), relay:, process_scanner:, agent: config.agent,
           plan_usage: PlanUsage.new(agent: config.agent),
           lifecycle: Lifecycle.new(dir: config.dir, server: config.server), reaper: Reaper.new(root: config.worktree_root),
-          state: DaemonState.new(dir: config.dir), lock: DaemonLock.new(dir: config.dir), server: config.server,
+          state: DaemonState.new(dir: config.dir), lock: DaemonLock.new(dir: config.dir), server: config.server, sleep_lock: SleepLock.new,
           rejection_confirmed: -> { server_rejects?(config) }, jitter: ->(seconds) { seconds * rand(0.8..1.25) })
     end
 
@@ -82,8 +82,9 @@ module Diffbroker
     def initialize(scanner:, client_factory:, task_runner_factory:, out: $stdout, sleeper: ->(seconds) { sleep(seconds) },
                    clock: -> { Time.now }, spawner: ->(&block) { Thread.new(&block) }, relay: nil, process_scanner: nil, lifecycle: nil,
                    maintenance: Maintenance.new, roots_changed: nil, device_roots: [], ignored_roots: [], agent: "claude", reaper: nil, plan_usage: nil,
-                   state: nil, lock: nil, rejection_confirmed: nil, server: nil, jitter: ->(seconds) { seconds })
+                   state: nil, lock: nil, rejection_confirmed: nil, server: nil, jitter: ->(seconds) { seconds }, sleep_lock: nil)
       @scanner = scanner
+      @sleep_lock = sleep_lock
       @device_roots = device_roots
       @ignored_roots = ignored_roots
       @roots_changed = roots_changed
@@ -150,6 +151,7 @@ module Diffbroker
     ensure
       if @owner
         @task_runner.interrupt_all! if @task_runner.respond_to?(:interrupt_all!)
+        @sleep_lock&.release!
         @relay&.stop
         @lifecycle&.clear_pid
         @state&.clear(pid: Process.pid) unless @rejected # a rejected daemon leaves its reason for `status`
@@ -367,12 +369,14 @@ module Diffbroker
       return unless @running_lock.synchronize { !@upgrading && @running.add?(id) } # the upgrade's restart would kill it
 
       @state&.update(busy_tasks: @running_lock.synchronize { @running.size })
+      @sleep_lock&.acquire! # the machine may not fall asleep under a running agent; it sleeps as usual when the last one ends
       @spawner.call do
         @task_runner.run(message, repositories: known_repositories)
       rescue StandardError => e
         @out.puts "Task #{id} crashed: #{e.class}: #{e.message}"
       ensure
         upgrade_now = @running_lock.synchronize { @running.delete(id) && @pending_upgrade && @running.empty? }
+        @sleep_lock&.release! if @running_lock.synchronize { @running.empty? }
         @state&.update(busy_tasks: @running_lock.synchronize { @running.size })
         upgrade if upgrade_now
         sweep_strays

data/lib/diffbroker/sleep_lock.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Diffbroker
+  # Keeps the machine from going to sleep on its own while an agent task runs, and only then: the daemon takes the lock
+  # when its first task starts and gives it back when the last one ends, so the computer sleeps as usual the rest of the
+  # time. It stops idle sleep only; closing a laptop's lid, the power button or Apple menu > Sleep still sleep it.
+  #
+  # macOS: `caffeinate -i`. Linux: `systemd-inhibit` around a shell that waits for the daemon. Both end by themselves when
+  # the daemon dies, so a crash never leaves the machine awake. Without the tool, or when it cannot start, nothing happens.
+  class SleepLock
+    def initialize(platform: Diffbroker.platform, pid: Process.pid, available: method(:on_path?), spawner: Process.method(:spawn),
+                   signal: Process.method(:kill), detacher: Process.method(:detach))
+      @platform = platform
+      @pid = pid
+      @available = available
+      @spawner = spawner
+      @signal = signal
+      @detacher = detacher
+      @child = nil
+    end
+
+    def held? = !@child.nil?
+
+    # True when the machine is being kept awake.
+    def acquire!
+      return true if held?
+
+      command = self.command
+      return false unless command && @available.call(command.first)
+
+      @child = @spawner.call(*command, in: File::NULL, out: File::NULL, err: File::NULL)
+      @detacher.call(@child)
+      true
+    rescue SystemCallError
+      @child = nil
+      false
+    end
+
+    def release!
+      child, @child = @child, nil
+      @signal.call("TERM", child) if child
+    rescue SystemCallError
+      nil
+    end
+
+    private
+
+    def command
+      case @platform
+      when "macos" then [ "caffeinate", "-i", "-w", @pid.to_s ]
+      when "linux"
+        [ "systemd-inhibit", "--what=sleep:idle", "--who=Diffbroker", "--why=An agent task is running", "--mode=block",
+          "sh", "-c", "while kill -0 #{@pid} 2>/dev/null; do sleep 5; done" ]
+      end
+    end
+
+    def on_path?(name)
+      ENV.fetch("PATH", "").split(File::PATH_SEPARATOR).any? { File.executable?(File.join(_1, name)) }
+    end
+  end
+end

data/lib/diffbroker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diffbroker
-  VERSION = "0.12.3"
+  VERSION = "0.13.0"
 end

data/lib/diffbroker.rb

@@ -43,6 +43,7 @@ module Diffbroker
   autoload :Runner, File.expand_path("diffbroker/runner", __dir__)
   autoload :ServiceInstaller, File.expand_path("diffbroker/service_installer", __dir__)
   autoload :SessionLedger, File.expand_path("diffbroker/session_ledger", __dir__)
+  autoload :SleepLock, File.expand_path("diffbroker/sleep_lock", __dir__)
   autoload :SkillInstaller, File.expand_path("diffbroker/skill_installer", __dir__)
   autoload :TaskFiles, File.expand_path("diffbroker/task_files", __dir__)
   autoload :TaskRunner, File.expand_path("diffbroker/task_runner", __dir__)

data/plugin/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "diffbroker",
-  "version": "0.12.3",
+  "version": "0.13.0",
   "description": "Skills for working on Diff Broker agent tasks: the diffbroker MCP tools, write rules and report_task."
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffbroker
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)
@@ -68,6 +68,7 @@ files:
 - lib/diffbroker/service_installer.rb
 - lib/diffbroker/session_ledger.rb
 - lib/diffbroker/skill_installer.rb
+- lib/diffbroker/sleep_lock.rb
 - lib/diffbroker/task_files.rb
 - lib/diffbroker/task_runner.rb
 - lib/diffbroker/url_handler_installer.rb