diffbroker 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19527d7bf5bd6af3f94eec7673a0b60ebedc3080adc1308ba23e477b874af8f1
-  data.tar.gz: 1a29bde8db351846148a7832d57f6cd2736e3d88941267f21a2699a05a982131
+  metadata.gz: 0301a413f14ac1a2d735cc4e7fd952d1d896117d1ef3e3e013508c38d4d1226c
+  data.tar.gz: f4bb42f5d0f1aff5bf1301143f34664d34b98e57c601999b2d8e5a07cf74a745
 SHA512:
-  metadata.gz: cbf4077b51bd7a4dca8cb9ef8eafc53afe3ce0c2068d954f565e7b9d76cb524350b0c4254c417456e4dc0d8dcd0554ae895767cfcce46b9f4f4abe31a5d5222a
-  data.tar.gz: df450cc45d5d36007c9f629e1c6b296425c49510240e652e89593fb0c02181d4f0547b27d423bfec70a7c381b80ba4c56551fea8523eaa28447669e5d392026c
+  metadata.gz: d38cc871bedc4af0fed78b15ae74a31c4bf4c7ba4e53117596db9ef3927d7aa709c0c1216db8c648ab24cae3a07253acfef6b1ca30978f5b61c1711d47eeea7e
+  data.tar.gz: 712a68a04f52259ddf152f714eb15c1655f66721306a7bc91c18e7e7ff5569028dc771ecbb91b61f076242333aae073dc2500fa7d3c16a2deb5aaf86dee1aa5c

data/lib/diffbroker/agents/claude.rb

@@ -3,7 +3,7 @@
 module Diffbroker
   module Agents
     # Claude Code. Autonomous: `claude -p … --output-format stream-json --verbose` (spec §4.2 step 5); the programmatic
-    # credit pool pays for it (spec §2). Terminal: interactive `claude`.
+    # credit pool pays for it (spec §2).
     class Claude < Base
       PLUGIN_DIR = File.join(Diffbroker::ROOT, "plugin")
       # A bare `Read` in --allowedTools means every file on the machine, so a prompt-injected agent could read
@@ -43,10 +43,6 @@ module Diffbroker
       # 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
-
       def parse_stream(line)
         event = parse_json(line) or return nil
 

data/lib/diffbroker/agents/codex.rb

@@ -49,8 +49,6 @@ module Diffbroker
         [ @config.codex_command, "exec", "--json", *args, *mcp_overrides(mcp_config), task.fetch("prompt") ]
       end
 
-      def terminal_command(_task, mcp_config:) = [ @config.codex_command, *mcp_overrides(mcp_config) ]
-
       def parse_stream(line)
         event = parse_json(line) or return nil
 

data/lib/diffbroker/agents.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Diffbroker
-  # The user's own coding agents, run headless (autonomous) or interactively (terminal). Spec §4.2 steps 5–7.
+  # The user's own coding agents, run headless. Spec §4.2 steps 5–7.
   module Agents
     Progress = Data.define(:step, :session_id)
     # billing: "subscription" or "api" when the agent's login says how the run was paid, else nil.

data/lib/diffbroker/cli.rb

@@ -31,7 +31,7 @@ module Diffbroker
         uninstall-hooks                     Remove those hooks
         help                                Show this help
 
-      Config: ~/.config/diffbroker/config.yml (server, roots, scan_depth, terminal, worktree_root, agent,
+      Config: ~/.config/diffbroker/config.yml (server, roots, scan_depth, worktree_root, agent,
               claude_args, codex_args). Your agent runs as you, with your own login and credentials.
       Agent activity is visible only to you; only status is sent, never prompts, file contents or tool input.
     TEXT
@@ -52,8 +52,6 @@ module Diffbroker
 
     def run
       command = @argv.shift || "help"
-      return task_ended if command == "task-ended"
-      return publish_branch if command == "publish-branch"
       return hook if command == "hook"
 
       case command
@@ -136,7 +134,7 @@ module Diffbroker
     def run_daemon
       raise Error, "This machine is not paired. Run `diffbroker start` in a terminal to pair it." unless config.paired?
 
-      @out.puts "Diff Broker companion #{VERSION} → #{config.server} (agent: #{config.agent}, terminal: #{config.terminal})"
+      @out.puts "Diff Broker companion #{VERSION} → #{config.server} (agent: #{config.agent})"
       heal_service_definition
       Daemon.build(config, out: @out).run
     rescue Daemon::Rejected
@@ -297,7 +295,6 @@ module Diffbroker
       @out.puts "Server:     #{config.server}"
       @out.puts "Paired:     #{config.paired? ? "yes (device #{config.device_id})" : "no (run `diffbroker start`)"}"
       @out.puts "Agent:      #{config.agent}"
-      @out.puts "Terminal:   #{config.terminal}"
       daemon_status
       @out.puts "Hooks:      #{hooks_installer.installed? ? "installed" : "not installed (diffbroker install-hooks)"}"
       @out.puts "Roots:      #{config.roots.join(", ")} (plus the projects Claude Code and Codex know)"
@@ -386,37 +383,5 @@ module Diffbroker
         @out.puts "No Claude Code settings file; nothing to remove."
       end
     end
-
-    # Called by the terminal run script after an update_branch agent exited successfully (not listed in the help: the
-    # companion's own script is the only caller): pushes the finished rebase (BranchPublisher). Exit 1 when it could not.
-    def publish_branch
-      options = {}
-      OptionParser.new do |parser|
-        parser.on("--dir DIR") { options[:dir] = _1 }
-        parser.on("--head-ref REF") { options[:head_ref] = _1 }
-        parser.on("--expected SHA") { options[:expected_sha] = _1 }
-        parser.on("--base REF") { options[:base_ref] = _1 }
-        parser.on("--remote NAME") { options[:remote] = _1 }
-      end.parse!(@argv)
-      result = BranchPublisher.new(**options).publish!
-      @out.puts result.message
-      result.failed? ? 1 : 0
-    rescue ArgumentError => e
-      @err.puts "diffbroker: #{e.message}"
-      1
-    end
-
-    # Called by the terminal run script after the agent exits: silent, always exit 0.
-    def task_ended
-      id = @env["DIFFBROKER_TASK_ID"].to_s
-      token = @env["DIFFBROKER_TASK_TOKEN"].to_s
-      return 0 if id.empty? || token.empty?
-
-      Api.new(server: @env["DIFFBROKER_SERVER"] || config.server, token:)
-         .post("/agent_tasks/#{id}/events", { hook_event_name: "TaskEnded", exit_status: @argv.first.to_s })
-      0
-    rescue StandardError # never break the user's terminal session over a status report
-      0
-    end
   end
 end

data/lib/diffbroker/config.rb

@@ -4,10 +4,9 @@ require "yaml"
 require "fileutils"
 
 module Diffbroker
-  # ~/.config/diffbroker/config.yml (settings) and credentials.yml (0600, device token). Spec §4.1: roots, terminal,
+  # ~/.config/diffbroker/config.yml (settings) and credentials.yml (0600, device token). Spec §4.1: roots,
   # worktree location, preferred agent, and the agents' command-line args for autonomous runs (spec §4.2 step 5).
   class Config
-    TERMINALS = %w[terminal iterm2 ghostty warp tmux].freeze
     AGENTS = %w[claude codex].freeze
     DEFAULT_SERVER = "https://diff.broker"
     DEFAULT_CLAUDE_ARGS = %w[--permission-mode auto --permission-prompts none].freeze
@@ -71,7 +70,6 @@ module Diffbroker
                       ignored: ignored_roots, hints: AgentProjects.paths(home:), home:)
     end
     def scan_depth = Integer(data["scan_depth"] || 3)
-    def terminal = (data["terminal"] || (@platform == "macos" ? "terminal" : "tmux")).to_s
     def worktree_root = File.expand_path(data["worktree_root"] || File.join(home, ".local/share/diffbroker/worktrees"))
     def state_dir = File.expand_path(data["state_dir"] || "~/.local/state/diffbroker")
     def agent = (data["agent"] || "claude").to_s
@@ -112,7 +110,6 @@ module Diffbroker
     end
 
     def validate!
-      raise Error, "Unknown terminal #{terminal.inspect}. Use one of: #{TERMINALS.join(", ")}" unless TERMINALS.include?(terminal)
       raise Error, "Unknown agent #{agent.inspect}. Use one of: #{AGENTS.join(", ")}" unless AGENTS.include?(agent)
 
       { "claude_args" => claude_args, "codex_args" => codex_args }.each do |key, args|

data/lib/diffbroker/task_files.rb

@@ -8,21 +8,21 @@ module Diffbroker
   # process environment. Spec §4.2 step 4: the Diff Broker MCP config lives outside the repository.
   class TaskFiles
     TOKEN_ENV = "DIFFBROKER_TASK_TOKEN"
-    HOOK_EVENTS = %w[SessionStart Stop SessionEnd].freeze
-    SETTINGS_PATH = File.join(".claude", "settings.local.json")
+    TASK_ID = /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/
 
-    def initialize(task_dir:, worktree:, server:, task_id:, runner: Runner.new)
+    # The private directory of one task under the state dir (the MCP config lives there, outside the repository).
+    def self.task_dir(state_dir, task_id)
+      raise Error, "Invalid task id #{task_id.inspect}" unless task_id.to_s.match?(TASK_ID)
+
+      File.join(state_dir, "tasks", task_id)
+    end
+
+    def initialize(task_dir:, server:)
       @task_dir = task_dir
-      @worktree = worktree
       @server = server.to_s.chomp("/")
-      raise Error, "Invalid task id #{task_id.inspect}" unless task_id.to_s.match?(RunScript::TASK_ID)
-
-      @task_id = task_id
-      @runner = runner
     end
 
     def mcp_url = "#{@server}/mcp/messages"
-    def events_url = "#{@server}/agent_tasks/#{@task_id}/events"
 
     def mcp_config!
       FileUtils.mkdir_p(@task_dir, mode: 0o700)
@@ -35,56 +35,6 @@ module Diffbroker
       path
     end
 
-    # Terminal mode with Claude Code (spec §4.2 step 6): HTTP hooks report start, stop and end.
-    def claude_hooks!
-      if @runner.git_success?(@worktree, "ls-files", "--error-unmatch", SETTINGS_PATH)
-        raise Error, "The repository tracks #{SETTINGS_PATH}; Diff Broker will not edit tracked files."
-      end
-
-      path = File.join(@worktree, SETTINGS_PATH)
-      if [ File.dirname(path), path ].any? { File.symlink?(_1) }
-        raise Error, "#{SETTINGS_PATH} in #{@worktree} is a symlink; Diff Broker will not write through it."
-      end
-
-      FileUtils.mkdir_p(File.dirname(path))
-      data = read_json(path)
-      existing = data["hooks"] || {}
-      raise Error, "#{path} has a \"hooks\" value that is not an object; fix it, then start the task again" unless existing.is_a?(Hash)
-
-      data["hooks"] = existing.merge(hooks) { |_event, theirs, ours| Array(theirs).reject { ours?(_1) } + ours }
-      File.write(path, "#{JSON.pretty_generate(data)}\n")
-      exclude_settings
-    end
-
     def cleanup! = FileUtils.rm_rf(@task_dir)
-
-    private
-
-    def hooks
-      hook = { "type" => "http", "url" => events_url, "headers" => { "Authorization" => "Bearer ${#{TOKEN_ENV}}" },
-               "allowedEnvVars" => [ TOKEN_ENV ], "timeout" => 10 }
-      HOOK_EVENTS.to_h { [ _1, [ { "hooks" => [ hook ] } ] ] }
-    end
-
-    def ours?(group)
-      group.is_a?(Hash) && Array(group["hooks"]).any? { _1.is_a?(Hash) && _1["url"].to_s.start_with?("#{@server}/agent_tasks/") }
-    end
-
-    def exclude_settings
-      exclude = File.expand_path(@runner.git(@worktree, "rev-parse", "--git-path", "info/exclude").strip, @worktree)
-      FileUtils.mkdir_p(File.dirname(exclude))
-      content = File.exist?(exclude) ? File.read(exclude) : ""
-      entry = "/#{SETTINGS_PATH}"
-      return if content.lines(chomp: true).include?(entry)
-
-      File.write(exclude, "#{content}#{"\n" unless content.empty? || content.end_with?("\n")}#{entry}\n")
-    end
-
-    def read_json(path)
-      data = File.exist?(path) ? JSON.parse(File.read(path)) : {}
-      data.is_a?(Hash) ? data : raise(JSON::ParserError)
-    rescue JSON::ParserError
-      raise Error, "#{path} is not valid JSON; fix or remove it, then start the task again"
-    end
   end
 end

data/lib/diffbroker/task_runner.rb

@@ -4,7 +4,8 @@ require "fileutils"
 
 module Diffbroker
   # Runs one agent task (spec §4.2): worktree → neutralize (untrusted only) → gh or MCP prompt → MCP config →
-  # autonomous agent process or a terminal → progress and the final `finished` report.
+  # autonomous agent process → progress and the final `finished` report. An untrusted head runs like any other, with
+  # the PR's own agent configuration set aside (Neutralizer).
   class TaskRunner
     CANCEL_GRACE = 10
     PROGRESS_INTERVAL = 3
@@ -15,19 +16,16 @@ module Diffbroker
     Outcome = Struct.new(:status, :cost_usd, :error_code, :last_output, :no_result, :billing)
 
     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), sessions: SessionLedger.new(state_dir: config.state_dir))
+                   gh_check: GhCheck.new, out: $stdout, grace: CANCEL_GRACE,
+                   progress_interval: PROGRESS_INTERVAL, reaper: Reaper.new(root: config.worktree_root), sessions: SessionLedger.new(state_dir: config.state_dir))
       @config = config
       @report = report
       @worktree = worktree
       @neutralizer = neutralizer
       @gh_check = gh_check
-      @launcher = launcher
       @out = out
       @grace = grace
       @progress_interval = progress_interval
-      @run_script = run_script
       @reaper = reaper
       @sessions = sessions
       @handles = {}
@@ -42,19 +40,6 @@ module Diffbroker
       unless checkout
         return finished(id, "failed", 0, "no_checkout", "No local checkout of #{task["repo"]} under #{@config.roots.join(", ")}")
       end
-      # The server never offers this (spec §5.1); refuse anyway rather than run a stranger's code, or publish what an
-      # injected agent read, unattended.
-      if task["untrusted"] && (task["code_changing"] || task["terminal_only"]) && task["mode"] != "terminal"
-        return finished(id, "failed", 0, "untrusted_head", "This task runs only in a terminal on an untrusted head")
-      end
-
-      # Codex has no --strict-mcp-config equivalent: a headless run would load the user's own MCP servers next to a
-      # prompt-injected PR. Untrusted heads run Codex only in a terminal, where the user watches and approves.
-      if task["untrusted"] && task["mode"] != "terminal" && @config.agent == "codex"
-        return finished(id, "failed", 0, "untrusted_head",
-                        "Codex does not run untrusted heads unattended (it would load your own MCP servers). Use Open in terminal, or set agent: claude.")
-      end
-
       repo_path = checkout["path"]
       dir = @worktree.prepare(repo_path:, full_name: task["repo"], number: task["pr_number"], head_sha: task["head_sha"],
                               kind: task["kind"], head_ref: task["head_ref"], branch: task["code_changing"] == true,
@@ -64,26 +49,23 @@ module Diffbroker
       restored = task["untrusted"] ? @neutralizer.neutralize!(dir, repo_path:, number: task["pr_number"], base_ref: base_ref(task), remote: GitContext.remote_for(repo_path, task["repo"])) : []
       task = task.merge("prompt" => prompt_for(task))
       agent = Agents.for(@config, worktree: dir)
-      say(id, "#{task["kind"]} on #{task["repo"]}##{task["pr_number"]}: starting (#{agent.name}, #{task["mode"] == "terminal" ? "terminal" : "autonomous"})")
+      say(id, "#{task["kind"]} on #{task["repo"]}##{task["pr_number"]}: starting (#{agent.name})")
       say(id, "Worktree: #{dir}")
-      files = TaskFiles.new(task_dir: @run_script.task_dir(id), worktree: dir, server: @config.server, task_id: id)
+      say(id, "Untrusted head: removed or restored from #{base_ref(task)}: #{restored.join(", ")}") if restored.any?
+      files = TaskFiles.new(task_dir: TaskFiles.task_dir(@config.state_dir, id), server: @config.server)
       mcp_config = files.mcp_config!
 
-      if task["mode"] == "terminal"
-        open_terminal(task, agent, files, mcp_config, dir, restored)
+      begin
+        run_autonomous(task, agent, mcp_config, dir)
+      ensure
+        files.cleanup!
+      end
+      stopped = @reaper.reap!(dir)
+      say(id, "Stopped #{stopped} leftover process#{"es" unless stopped == 1} in #{dir}") if stopped.positive?
+      if @worktree.remove!(dir, repo_path:)
+        say(id, "Removed worktree #{dir}")
       else
-        begin
-          run_autonomous(task, agent, mcp_config, dir)
-        ensure
-          files.cleanup!
-        end
-        stopped = @reaper.reap!(dir)
-        say(id, "Stopped #{stopped} leftover process#{"es" unless stopped == 1} in #{dir}") if stopped.positive?
-        if @worktree.remove!(dir, repo_path:)
-          say(id, "Removed worktree #{dir}")
-        else
-          say(id, "Kept #{dir}: it has uncommitted work.")
-        end
+        say(id, "Kept #{dir}: it has uncommitted work.")
       end
     rescue Error, SystemCallError, KeyError => e
       finished(id, "failed", 0, "agent_failed", e.message)
@@ -126,17 +108,6 @@ module Diffbroker
       !task["read_only"] && !gh.empty? && @gh_check.matches?(task["github_login"]) ? gh : task.fetch("prompt")
     end
 
-    def open_terminal(task, agent, files, mcp_config, dir, restored)
-      files.claude_hooks! if agent.name == "claude_code"
-      lines = [ ("Untrusted head: this PR's own code and tests run on your machine." if task["untrusted"]),
-                ("Removed or restored from #{base_ref(task)}: #{restored.join(", ")}." if restored.any?) ].compact
-      script = @run_script.write!(task_id: task["task_id"], worktree: dir, token: task.fetch("token"), server: @config.server,
-                                  argv: agent.terminal_command(task, mcp_config:), prompt: task["prompt"],
-                                  notice: lines.empty? ? nil : lines.join("\n"), publish: publish_command(task, dir))
-      @launcher.launch!(script:, cwd: dir, title: "#{task["repo"].split("/").last.downcase}-#{task["pr_number"]}")
-      progress(task["task_id"], "opened in terminal", agent.name)
-    end
-
     # An explain or explain_change task gets a verifier pass in a fresh process after a successful write (understanding
     # spec §6.2, activity spec §5). The server only accepts verify_explanation / verify_change_note once this process
     # announces itself with progress phase "verifier".
@@ -187,14 +158,6 @@ module Diffbroker
       Outcome.new("failed", outcome.cost_usd, "agent_failed", result.message, false, outcome.billing)
     end
 
-    # The same push for a terminal run, executed by its script after the agent exits (`diffbroker publish-branch`).
-    def publish_command(task, dir)
-      return unless publishes_branch?(task)
-
-      [ RbConfig.ruby, ServiceInstaller.launcher, "publish-branch", "--dir", dir, "--head-ref", task["head_ref"].to_s,
-        "--expected", task["head_sha"].to_s, "--base", base_ref(task), "--remote", GitContext.remote_for(dir, task["repo"]) ]
-    end
-
     def publishes_branch?(task) = task["kind"] == "update_branch" && task["cross_repository"] != true && !task["read_only"]
 
     def verify_after_write(task, write, agent, mcp_config, dir)

data/lib/diffbroker/version.rb

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

data/lib/diffbroker.rb

@@ -29,7 +29,6 @@ module Diffbroker
   autoload :Hook, File.expand_path("diffbroker/hook", __dir__)
   autoload :HooksInstaller, File.expand_path("diffbroker/hooks_installer", __dir__)
   autoload :Lifecycle, File.expand_path("diffbroker/lifecycle", __dir__)
-  autoload :Launcher, File.expand_path("diffbroker/launcher", __dir__)
   autoload :Maintenance, File.expand_path("diffbroker/maintenance", __dir__)
   autoload :LocalRelay, File.expand_path("diffbroker/local_relay", __dir__)
   autoload :AccessHelp, File.expand_path("diffbroker/access_help", __dir__)
@@ -40,7 +39,6 @@ module Diffbroker
   autoload :Reaper, File.expand_path("diffbroker/reaper", __dir__)
   autoload :Reconciler, File.expand_path("diffbroker/reconciler", __dir__)
   autoload :RepoScanner, File.expand_path("diffbroker/repo_scanner", __dir__)
-  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__)

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

@@ -1,5 +1,5 @@
 {
   "name": "diffbroker",
-  "version": "0.16.0",
+  "version": "0.17.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.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Yuri Sidorov (@newstler)
@@ -53,7 +53,6 @@ files:
 - lib/diffbroker/git_context.rb
 - lib/diffbroker/hook.rb
 - lib/diffbroker/hooks_installer.rb
-- lib/diffbroker/launcher.rb
 - lib/diffbroker/lifecycle.rb
 - lib/diffbroker/local_relay.rb
 - lib/diffbroker/login.rb
@@ -64,7 +63,6 @@ files:
 - lib/diffbroker/reaper.rb
 - lib/diffbroker/reconciler.rb
 - lib/diffbroker/repo_scanner.rb
-- lib/diffbroker/run_script.rb
 - lib/diffbroker/runner.rb
 - lib/diffbroker/service_installer.rb
 - lib/diffbroker/session_ledger.rb
@@ -99,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: 'Diff Broker companion: runs your own Claude Code or Codex on your pull requests,
   on this machine'

data/lib/diffbroker/launcher.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require "shellwords"
-require "yaml"
-require "fileutils"
-
-module Diffbroker
-  # Opens a visible terminal running the task's run script (spec §4.2 step 6). The user sees and drives the agent.
-  class Launcher
-    def initialize(name:, runner: Runner.new, platform: Diffbroker.platform,
-                   warp_dir: File.join(Dir.home, ".warp", "launch_configurations"))
-      raise Error, "Unknown terminal #{name.inspect}. Use one of: #{Config::TERMINALS.join(", ")}" unless Config::TERMINALS.include?(name)
-
-      @name = name
-      @runner = runner
-      @platform = platform
-      @warp_dir = warp_dir
-    end
-
-    def launch!(script:, cwd:, title:)
-      commands(script:, cwd:, title:).each { @runner.run!(*_1) }
-    end
-
-    def commands(script:, cwd:, title:)
-      title = title.to_s.gsub(/[^\w.#-]/, "-")
-      line = "/bin/bash #{Shellwords.escape(script)}"
-
-      case @name
-      when "terminal"
-        [ [ "osascript", "-e", %(tell application "Terminal" to do script #{applescript(line)}),
-            "-e", %(tell application "Terminal" to activate) ] ]
-      when "iterm2"
-        [ [ "osascript", "-e", %(tell application "iTerm" to create window with default profile command #{applescript(line)}),
-            "-e", %(tell application "iTerm" to activate) ] ]
-      when "ghostty"
-        @platform == "macos" ? [ [ "open", "-na", "Ghostty", "--args", "-e", "/bin/bash", script ] ] : [ [ "ghostty", "-e", "/bin/bash", script ] ]
-      when "warp"
-        [ [ @platform == "macos" ? "open" : "xdg-open", "warp://launch/#{warp_config(line:, cwd:, title:)}" ] ]
-      when "tmux"
-        if @runner.success?("tmux", "has-session")
-          [ [ "tmux", "new-window", "-n", title, "-c", cwd, line ] ]
-        else
-          [ [ "tmux", "new-session", "-d", "-s", "diffbroker", "-n", title, "-c", cwd, line ] ]
-        end
-      end
-    end
-
-    private
-
-    # An AppleScript string literal: backslashes and double quotes escaped.
-    def applescript(text) = %("#{text.gsub("\\") { "\\\\" }.gsub('"') { '\\"' }}")
-
-    def warp_config(line:, cwd:, title:)
-      FileUtils.mkdir_p(@warp_dir)
-      file = "diffbroker-#{title}.yaml"
-      config = { "name" => "Diff Broker #{title}",
-                 "windows" => [ { "tabs" => [ { "title" => title, "layout" => { "cwd" => cwd, "commands" => [ { "exec" => line } ] } } ] } ] }
-      File.write(File.join(@warp_dir, file), config.to_yaml)
-      file
-    end
-  end
-end

data/lib/diffbroker/run_script.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require "fileutils"
-require "shellwords"
-require "rbconfig"
-
-module Diffbroker
-  # Terminal mode (spec §4.2 step 6): the script the terminal runs. The task token lives only here (0700, private
-  # state dir, deleted on start) and in the agent's environment. The prompt travels in an environment variable, so
-  # quoting never matters. When the agent exits, `diffbroker task-ended` tells Diff Broker.
-  class RunScript
-    TASK_ID = /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/
-
-    # RubyGems' stable wrapper (ServiceInstaller.launcher): a terminal task may outlive an upgrade's `gem cleanup`.
-    def initialize(state_dir:, ruby: RbConfig.ruby, exe: ServiceInstaller.launcher)
-      @state_dir = state_dir
-      @ruby = ruby
-      @exe = exe
-    end
-
-    def task_dir(task_id)
-      raise Error, "Invalid task id #{task_id.inspect}" unless task_id.to_s.match?(TASK_ID)
-
-      File.join(@state_dir, "tasks", task_id)
-    end
-
-    # publish: a command (argv) to run in this script, outside the agent, once the agent exited successfully: the push of
-    # an update_branch rebase (BranchPublisher), which the agent's own hooks would refuse.
-    def write!(task_id:, worktree:, token:, server:, argv:, prompt:, notice: nil, publish: nil)
-      dir = task_dir(task_id)
-      FileUtils.mkdir_p(dir, mode: 0o700)
-      File.chmod(0o700, dir)
-      path = File.join(dir, "run.sh")
-      FileUtils.rm_f(path)
-      File.write(path, render(task_id:, worktree:, token:, server:, argv:, prompt:, notice:, publish:), perm: 0o700)
-      File.chmod(0o700, path)
-      path
-    end
-
-    private
-
-    def render(task_id:, worktree:, token:, server:, argv:, prompt:, notice:, publish:)
-      inner = %(#{Shellwords.join(argv)} "$DIFFBROKER_PROMPT")
-      publish_step = publish ? "if [ \"$status\" = \"0\" ]; then #{Shellwords.join(publish)}; fi" : nil
-      <<~SH
-        #!/bin/bash
-        # Written by the Diff Broker companion for agent task #{task_id}. Deletes itself on start.
-        rm -f -- "$0"
-        #{"printf '%s\\n' #{Shellwords.escape(notice)}" if notice}
-        export DIFFBROKER_TASK_TOKEN=#{Shellwords.escape(token)}
-        export DIFFBROKER_TASK_ID=#{Shellwords.escape(task_id)}
-        export DIFFBROKER_SERVER=#{Shellwords.escape(server)}
-        export DIFFBROKER_PROMPT=#{Shellwords.escape(prompt)}
-        cd #{Shellwords.escape(worktree)} || exit 1
-        "${SHELL:-/bin/bash}" -lic #{Shellwords.escape(inner)}
-        status=$?
-        #{publish_step}
-        #{Shellwords.escape(@ruby)} #{Shellwords.escape(@exe)} task-ended "$status"
-      SH
-    end
-  end
-end