diffbroker 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e8bd666f8efcb2f12429d70caee992e7e06337041a32333b334beedf0c6053
-  data.tar.gz: 48507f0c813906471b8345e3473f8f7f5c729c4c68ebeb46ac45579f3b3ed87e
+  metadata.gz: 5edf0d3084adb3e7b1e8a9f55dda5062efa3a5207d8f4ca7d7860141acef3ec7
+  data.tar.gz: 85899028c0a4d827e3df60c530298f9713e4a33e4ccf5ec4397fae0d58a6c37a
 SHA512:
-  metadata.gz: 58362a84f6cc68cde8a081c5f02d6177db48656557bb9262390b272357e574343c33153d2118728b8dd18971cb68962199d327d740cc342ca9490e54fbe55196
-  data.tar.gz: 6d4ee8a4c7fdc7d8619ed4efc2caef559a354bc28f6987ebe213cb94122ba989ff4686a8ae6a03aec2e72c993318e3aca2a4cc99bb923495082d4493340dab1e
+  metadata.gz: 7b7ca4efd11472c69863a386ebf10336402eac96f998a8665457f20a7f6b395af3a3814925915e1881d0f018c906344a0eccd45cdd0d9557fc4f44fc0a3891be
+  data.tar.gz: d763d542d2a6c27adad2bf78cf3b6f0bb1488b0f384bb90fef6990b27c142af472078409f5886be43c92fe6df7b158e847547720018f28ce0efe57ab7060b4dc

data/lib/diffbroker/agents/base.rb

@@ -16,6 +16,9 @@ module Diffbroker
       # The run's lines for the user's log: what the model said and the tools it called. Subclasses override.
       def parse_log(_line) = []
 
+      # Whether a chat message can continue this agent's earlier session (task["resume_session_id"]).
+      def resumes? = false
+
       def env(token, task_id) = { TOKEN_ENV => token, "DIFFBROKER_TASK_ID" => task_id }
 
       private

data/lib/diffbroker/agents/claude.rb

@@ -27,12 +27,17 @@ module Diffbroker
 
       def name = "claude_code"
 
+      def resumes? = true
+
       def autonomous_command(task, mcp_config:)
         args = task["read_only"] ? READ_ONLY_ARGS : @config.claude_args
-        [ @config.claude_command, "-p", task.fetch("prompt"), "--output-format", "stream-json", "--verbose", *args,
+        [ @config.claude_command, "-p", task.fetch("prompt"), *resume(task), "--output-format", "stream-json", "--verbose", *args,
           "--mcp-config", mcp_config, *strict(task), "--plugin-dir", @plugin_dir ]
       end
 
+      # The permissions above are passed again: a resumed session keeps its conversation, not its sandbox.
+      def resume(task) = task["resume_session_id"] ? [ "--resume", task["resume_session_id"] ] : []
+
       def terminal_command(task, mcp_config:)
         [ @config.claude_command, "--mcp-config", mcp_config, *strict(task), "--plugin-dir", @plugin_dir ]
       end

data/lib/diffbroker/session_ledger.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "json"
+require "fileutils"
+
+module Diffbroker
+  # The agent sessions this companion started itself. The server offers to resume a chat's earlier session by id, but it is
+  # only ever resumed here when this machine made it: a server (or anyone who could fake its message) cannot make an agent
+  # continue another conversation of the user's, such as an interactive session in their own terminal.
+  class SessionLedger
+    FILE = "sessions.json"
+    LIMIT = 500
+    ID = /\A\w[\w-]{0,99}\z/
+
+    def initialize(state_dir:)
+      @path = File.join(state_dir, FILE)
+      @lock = Mutex.new
+    end
+
+    def remember(id)
+      return unless id.to_s.match?(ID)
+
+      @lock.synchronize do
+        ids = read
+        next if ids.include?(id)
+
+        write((ids + [ id ]).last(LIMIT))
+      end
+    end
+
+    def known?(id) = id.to_s.match?(ID) && @lock.synchronize { read.include?(id) }
+
+    private
+
+    def read
+      data = JSON.parse(File.read(@path))
+      data.is_a?(Array) ? data.grep(String) : []
+    rescue Errno::ENOENT, JSON::ParserError
+      []
+    end
+
+    def write(ids)
+      FileUtils.mkdir_p(File.dirname(@path), mode: 0o700)
+      File.write(@path, JSON.generate(ids), perm: 0o600)
+    end
+  end
+end

data/lib/diffbroker/task_runner.rb

@@ -12,12 +12,12 @@ module Diffbroker
     PRINT_OUTPUT = 120
 
     Handle = Struct.new(:pid, :cancelled)
-    Outcome = Struct.new(:status, :cost_usd, :error_code, :last_output)
+    Outcome = Struct.new(:status, :cost_usd, :error_code, :last_output, :no_result)
 
     def initialize(config:, report:, worktree: Worktree.new(root: config.worktree_root), neutralizer: Neutralizer.new,
                    gh_check: GhCheck.new, launcher: Launcher.new(name: config.terminal), out: $stdout, grace: CANCEL_GRACE,
                    progress_interval: PROGRESS_INTERVAL, run_script: RunScript.new(state_dir: config.state_dir),
-                   reaper: Reaper.new(root: config.worktree_root))
+                   reaper: Reaper.new(root: config.worktree_root), sessions: SessionLedger.new(state_dir: config.state_dir))
       @config = config
       @report = report
       @worktree = worktree
@@ -29,6 +29,7 @@ module Diffbroker
       @progress_interval = progress_interval
       @run_script = run_script
       @reaper = reaper
+      @sessions = sessions
       @handles = {}
       @running = Set.new
       @cancelled = Set.new
@@ -132,7 +133,7 @@ module Diffbroker
     def run_autonomous(task, agent, mcp_config, dir)
       id = task["task_id"]
       @lock.synchronize { @running << id }
-      outcome = run_process(task, agent, mcp_config, dir)
+      outcome = run_with_resume(task, agent, mcp_config, dir)
       outcome = verify_after_write(task, outcome, agent, mcp_config, dir) if ExplainVerifier.verified?(task) && outcome.status == "done"
       outcome = publish_branch(task, outcome, dir) if outcome.status == "done"
       finished(id, outcome.status, outcome.cost_usd, outcome.error_code, outcome.last_output)
@@ -143,6 +144,27 @@ module Diffbroker
       end
     end
 
+    # A chat message the server offered to resume (task["resume"]) continues the agent's earlier session, when this machine made it
+    # and this agent can: it gets only the new question and keeps what it read. A session that cannot be resumed (deleted, expired)
+    # makes the agent exit without a word: the message then runs again from scratch with the full prompt, which carries the chat.
+    def run_with_resume(task, agent, mcp_config, dir)
+      resume = resume_for(task, agent)
+      return run_process(task, agent, mcp_config, dir) unless resume
+
+      outcome = run_process(task.merge("prompt" => resume["prompt"], "resume_session_id" => resume["session_id"]), agent, mcp_config, dir)
+      return outcome unless outcome.status == "failed" && outcome.no_result
+
+      say(task["task_id"], "Could not resume the earlier session: starting this message from scratch")
+      run_process(task, agent, mcp_config, dir)
+    end
+
+    def resume_for(task, agent)
+      resume = task["resume"]
+      return unless resume.is_a?(Hash) && agent.resumes? && resume["agent"] == agent.name && resume["prompt"].to_s != ""
+
+      resume if @sessions.known?(resume["session_id"])
+    end
+
     # An update_branch task ends with a rebase the agent may not push (see BranchPublisher): the companion does, here.
     def publish_branch(task, outcome, dir)
       return outcome unless publishes_branch?(task)
@@ -197,7 +219,7 @@ module Diffbroker
 
       if handle.cancelled then Outcome.new("cancelled", result&.cost_usd, "cancelled", output)
       elsif status.success? && !result&.error then Outcome.new("done", result&.cost_usd, nil, output)
-      else Outcome.new("failed", result&.cost_usd, "agent_failed", output)
+      else Outcome.new("failed", result&.cost_usd, "agent_failed", output, result.nil?)
       end
     ensure
       writer.close if writer && !writer.closed?
@@ -221,6 +243,10 @@ module Diffbroker
         case (event = agent.parse_stream(line))
         when Agents::Result then result = event
         when Agents::Progress
+          if event.session_id
+            @sessions.remember(event.session_id)
+            progress(id, event.step, nil, nil, event.session_id)
+          end
           next if event.step == last_step || monotonic - last_sent < @progress_interval
 
           progress(id, event.step)
@@ -256,8 +282,8 @@ module Diffbroker
       end
     end
 
-    def progress(id, step, agent = nil, phase = nil)
-      @report.call("progress", { "task_id" => id, "step" => step, "agent" => agent, "phase" => phase }.compact)
+    def progress(id, step, agent = nil, phase = nil, session_id = nil)
+      @report.call("progress", { "task_id" => id, "step" => step, "agent" => agent, "phase" => phase, "session_id" => session_id }.compact)
       say(id, "progress: #{step}") unless step == "starting"
     end
 

data/lib/diffbroker/version.rb

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

data/lib/diffbroker.rb

@@ -39,6 +39,7 @@ module Diffbroker
   autoload :RunScript, File.expand_path("diffbroker/run_script", __dir__)
   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 :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.10.0",
+  "version": "0.11.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.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)
@@ -63,6 +63,7 @@ files:
 - lib/diffbroker/run_script.rb
 - lib/diffbroker/runner.rb
 - lib/diffbroker/service_installer.rb
+- lib/diffbroker/session_ledger.rb
 - lib/diffbroker/skill_installer.rb
 - lib/diffbroker/task_files.rb
 - lib/diffbroker/task_runner.rb