brainiac 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a843b412b04f2b176f13e248bcea6327eb27c2893ed516a566c9f79e3b9dbc4
-  data.tar.gz: 0bc50a0db4b6e8d5ea67dbf3de47d8481e94a64d886a378730d4d27da5185403
+  metadata.gz: 963f3a3319ca2ccff44fc003072a0566d3b76d06a42ea645d81693bb48ea2ab3
+  data.tar.gz: 7abb9b38680549aaf3da6068b459f0faf474f5862f7f235f1dabddfcb38d5e55
 SHA512:
-  metadata.gz: b3aa491acebfe3b08aef05735fb593c6835b3757b2502f0ca47ad765aca21d9357a0fbb52c8d0a8f0103ad5aff1ff855d2159ff056297dfa4d7ecfeeb2f4387a
-  data.tar.gz: 54179e3366fb8246ed4221e82e70edc67ac0a24fa05212011624f3b9997f11cbdcc481c49b0141efa4c3c8cfbcbb23ffd9f20286442f2a0fb96557ccc8308c12
+  metadata.gz: dae8e213cb21a26f97de1406a5fe0bc1ce7dc5806e3b67079e2c0183b94888439f288243d86dc52fd9831d1ee61294a2f28fe9fe4f88dc03819c1d720a95db9b
+  data.tar.gz: 2e7cf53a24fd776e2eb7960c379dc49309d932412f5fe39a8a56dd90a6162dcf3a9924396a7386b67a0288c0034381343effb529e53b8bcf4b4f43b7fc454708

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brainiac (0.0.25)
+    brainiac (0.0.26)
       puma (~> 7.2)
       rackup (~> 2.3)
       sinatra (~> 4.1)
@@ -84,7 +84,7 @@ DEPENDENCIES
 CHECKSUMS
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
-  brainiac (0.0.25)
+  brainiac (0.0.26)
   json (2.19.9) sha256=9b9025b7cdddafa38d316eca0b2358488e42d417045c1b90d216a9fefe46b79a
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87

data/bin/brainiac

@@ -208,14 +208,7 @@ end
 def stop_server
   pid = find_server_pid
 
-  unless pid
-    puts "No running Brainiac server found."
-    return false
-  end
-
-  puts "Stopping Brainiac server (PID: #{pid})..."
-
-  # Also stop the monitor daemon
+  # Stop the monitor daemon regardless of server PID
   daemon_pid_file = "/tmp/brainiac-daemon.pid"
   if File.exist?(daemon_pid_file)
     daemon_pid = File.read(daemon_pid_file).strip.to_i
@@ -228,40 +221,61 @@ def stop_server
     File.delete(daemon_pid_file)
   end
 
-  begin
-    Process.kill("TERM", pid)
-
-    # Wait up to 5 seconds for graceful shutdown
-    5.times do
-      sleep 2
-      next if process_running?(pid)
+  # Kill the known server PID
+  if pid
+    puts "Stopping Brainiac server (PID: #{pid})..."
+    kill_pid(pid)
+  end
 
-      puts "✓ Server stopped."
-      FileUtils.rm_f(PID_FILE)
-      return true
-    end
+  # After killing the known PID, find anything still holding port 4567.
+  # This catches orphaned processes from self-restarts, stale PIDs, or child processes.
+  lingering = find_port_holders(4567) - [pid].compact
+  if lingering.any?
+    puts "Cleaning up #{lingering.size} orphaned process(es) on port 4567..."
+    lingering.each { |lpid| kill_pid(lpid, quiet: true) }
+  end
 
-    # Force kill if still running
-    puts "Server didn't stop gracefully, forcing..."
-    Process.kill("KILL", pid)
-    sleep 1
+  FileUtils.rm_f(PID_FILE)
 
-    FileUtils.rm_f(PID_FILE)
-    puts "✓ Server stopped (forced)."
+  if pid || lingering.any?
+    puts "✓ Server stopped."
     true
-  rescue Errno::ESRCH
-    puts "✓ Server already stopped."
-    FileUtils.rm_f(PID_FILE)
-    true
-  rescue Errno::EPERM
-    puts "Error: Permission denied. Try running with sudo or check process ownership."
-    false
-  rescue StandardError => e
-    puts "Error stopping server: #{e.message}"
+  else
+    puts "No running Brainiac server found."
     false
   end
 end
 
+# Kill a single process: TERM first, KILL if it doesn't exit within 5s.
+def kill_pid(pid, quiet: false)
+  Process.kill("TERM", pid)
+
+  5.times do
+    sleep 1
+    return true unless process_running?(pid)
+  end
+
+  puts "  PID #{pid} didn't stop gracefully, forcing..." unless quiet
+  Process.kill("KILL", pid)
+  sleep 1
+  true
+rescue Errno::ESRCH
+  true # Already dead
+rescue Errno::EPERM
+  puts "Error: Permission denied to stop PID #{pid}." unless quiet
+  false
+end
+
+# Find all PIDs listening on a given port via lsof.
+def find_port_holders(port)
+  output, status = Open3.capture2("lsof", "-ti", ":#{port}")
+  return [] unless status.success?
+
+  output.strip.split("\n").map(&:to_i).select(&:positive?)
+rescue StandardError
+  []
+end
+
 def update_handler_config(name, enabled)
   brainiac_config_path = File.join(BRAINIAC_DIR, "brainiac.json")
   config = if File.exist?(brainiac_config_path)
@@ -3372,16 +3386,227 @@ when "plugin"
     puts "  brainiac install #{plugin_name} --path #{output_dir}"
     puts "  brainiac restart"
 
+  when "list", "ls"
+    # Delegate to the same logic as `brainiac plugins`
+    plugins_file = File.join(BRAINIAC_DIR, "plugins.json")
+    plugins_config = if File.exist?(plugins_file)
+                       JSON.parse(File.read(plugins_file))
+                     else
+                       { "plugins" => [] }
+                     end
+
+    plugins = plugins_config["plugins"] || []
+    if plugins.empty?
+      puts "No plugins installed."
+      puts ""
+      puts "Install plugins with: brainiac install <name>"
+      puts "  Example: brainiac install whatsapp"
+      puts "  Example: brainiac install fizzy --path ~/Code/brainiac-fizzy"
+    else
+      puts "Installed plugins:"
+      plugins.each do |p|
+        entry = p.is_a?(Hash) ? p : { "name" => p.to_s }
+        name = entry["name"]
+        gem_name = entry["gem"] || "brainiac-#{name}"
+        local_path = entry["path"]
+        installed_at = entry["installed_at"] ? " (#{entry["installed_at"][0..9]})" : ""
+
+        if local_path
+          if Dir.exist?(local_path)
+            puts "  ✓ #{name} → #{local_path}#{installed_at}"
+          else
+            puts "  ✗ #{name} → #{local_path} (path missing)#{installed_at}"
+          end
+        else
+          loadable = begin
+            spec = Gem::Specification.find_by_name(gem_name)
+            "✓ #{name} (#{gem_name} #{spec.version})"
+          rescue Gem::MissingSpecError
+            "✗ #{name} (#{gem_name} — gem not found)"
+          end
+          puts "  #{loadable}#{installed_at}"
+        end
+      end
+    end
+
+  when "switch"
+    plugin_name = ARGV.shift
+    branch_name = ARGV.shift
+
+    unless plugin_name && branch_name
+      puts "Usage: brainiac plugin switch <name> <branch>"
+      puts ""
+      puts "Switches a local plugin to a different branch (via git worktrees)."
+      puts "Useful for testing plugin changes from a PR before releasing."
+      puts ""
+      puts "Examples:"
+      puts "  brainiac plugin switch fizzy fix-fallback-for-followups-20260813"
+      puts "  brainiac plugin switch fizzy main       # switch back to main"
+      puts ""
+      puts "After switching, restart the server: brainiac restart"
+      exit 1
+    end
+
+    plugin_name = plugin_name.sub(/^brainiac-/, "")
+
+    plugins_file = File.join(BRAINIAC_DIR, "plugins.json")
+    unless File.exist?(plugins_file)
+      puts "Error: No plugins installed (plugins.json not found)."
+      exit 1
+    end
+
+    plugins_config = JSON.parse(File.read(plugins_file))
+    plugin_idx = (plugins_config["plugins"] || []).index { |p| (p.is_a?(Hash) ? p["name"] : p.to_s) == plugin_name }
+
+    unless plugin_idx
+      puts "Error: Plugin '#{plugin_name}' is not installed."
+      exit 1
+    end
+
+    entry = plugins_config["plugins"][plugin_idx]
+    unless entry.is_a?(Hash) && entry["path"]
+      puts "Error: Plugin '#{plugin_name}' is not a local-path plugin."
+      puts "  Only plugins installed with --path support branch switching."
+      exit 1
+    end
+
+    current_path = entry["path"]
+    gem_name = "brainiac-#{plugin_name}"
+
+    # Determine the base repo path (strip worktree suffix like --branch-name)
+    base_path = current_path.sub(/--[^\/]+$/, "")
+    unless Dir.exist?(base_path)
+      puts "Error: Base repo not found at #{base_path}"
+      exit 1
+    end
+
+    # Get the default branch of the repo
+    default_branch, _, db_status = Open3.capture3("git", "symbolic-ref", "refs/remotes/origin/HEAD", "--short", chdir: base_path)
+    default_branch = default_branch.strip.sub("origin/", "") if db_status.success?
+    default_branch = "main" unless db_status.success? && !default_branch.empty?
+
+    # If switching to the default branch, just point back to the base path
+    if branch_name == default_branch
+      if current_path == base_path
+        puts "Plugin '#{plugin_name}' is already on #{default_branch}."
+        exit 0
+      end
+
+      plugins_config["plugins"][plugin_idx]["path"] = base_path
+      File.write(plugins_file, JSON.pretty_generate(plugins_config))
+      puts "✓ Switched plugin '#{plugin_name}' back to #{default_branch}"
+      puts "  Path: #{base_path}"
+      puts "  Restart the server to apply: brainiac restart"
+      exit 0
+    end
+
+    # Fetch latest to make sure the branch is available
+    puts "Fetching latest from origin..."
+    _out, _err, fetch_status = Open3.capture3("git", "fetch", "origin", chdir: base_path)
+    unless fetch_status.success?
+      puts "Warning: git fetch failed — continuing with local state."
+    end
+
+    # Check if a worktree already exists for this branch
+    worktree_list, _, wt_status = Open3.capture3("git", "worktree", "list", "--porcelain", chdir: base_path)
+    target_worktree = nil
+
+    if wt_status.success?
+      # Parse porcelain output to find worktrees on the target branch
+      worktrees = worktree_list.split("\n\n").map do |block|
+        wt = {}
+        block.each_line do |line|
+          case line
+          when /^worktree (.+)/
+            wt[:path] = Regexp.last_match(1).strip
+          when /^branch refs\/heads\/(.+)/
+            wt[:branch] = Regexp.last_match(1).strip
+          end
+        end
+        wt
+      end.select { |wt| wt[:path] && wt[:branch] }
+
+      target_worktree = worktrees.find { |wt| wt[:branch] == branch_name }
+    end
+
+    if target_worktree
+      # Worktree already exists — just update the path
+      new_path = target_worktree[:path]
+      if current_path == new_path
+        puts "Plugin '#{plugin_name}' is already on branch '#{branch_name}'."
+        exit 0
+      end
+
+      plugins_config["plugins"][plugin_idx]["path"] = new_path
+      File.write(plugins_file, JSON.pretty_generate(plugins_config))
+      puts "✓ Switched plugin '#{plugin_name}' to branch '#{branch_name}'"
+      puts "  Path: #{new_path}"
+      puts "  Restart the server to apply: brainiac restart"
+    else
+      # Check if branch exists remotely or locally
+      branch_exists = false
+      check_cmd, _, check_status = Open3.capture3("git", "rev-parse", "--verify", "origin/#{branch_name}", chdir: base_path)
+      branch_exists = check_status.success?
+
+      unless branch_exists
+        # Try local branch
+        _, _, local_status = Open3.capture3("git", "rev-parse", "--verify", branch_name, chdir: base_path)
+        branch_exists = local_status.success?
+      end
+
+      unless branch_exists
+        puts "Error: Branch '#{branch_name}' not found (checked local and origin)."
+        puts ""
+        puts "Available remote branches:"
+        branches_out, = Open3.capture3("git", "branch", "-r", "--list", "origin/*", chdir: base_path)
+        branches_out.each_line do |line|
+          branch = line.strip.sub("origin/", "")
+          next if branch.include?("HEAD")
+
+          puts "  #{branch}"
+        end
+        exit 1
+      end
+
+      # Create a new worktree
+      worktree_dir = "#{base_path}--#{branch_name}"
+      puts "Creating worktree at #{worktree_dir}..."
+
+      # If the branch exists on origin but not locally, track it
+      _, _, local_check = Open3.capture3("git", "rev-parse", "--verify", branch_name, chdir: base_path)
+      if !local_check.success? && check_status.success?
+        # Remote branch exists but not local — create tracking branch in worktree
+        _, stderr, wt_status = Open3.capture3("git", "worktree", "add", "--track", "-b", branch_name, worktree_dir, "origin/#{branch_name}", chdir: base_path)
+      else
+        # Local branch exists — use it directly
+        _, stderr, wt_status = Open3.capture3("git", "worktree", "add", worktree_dir, branch_name, chdir: base_path)
+      end
+
+      unless wt_status.success?
+        puts "Error: Failed to create worktree:"
+        puts "  #{stderr.strip}"
+        exit 1
+      end
+
+      plugins_config["plugins"][plugin_idx]["path"] = worktree_dir
+      File.write(plugins_file, JSON.pretty_generate(plugins_config))
+      puts "✓ Switched plugin '#{plugin_name}' to branch '#{branch_name}'"
+      puts "  Worktree: #{worktree_dir}"
+      puts "  Restart the server to apply: brainiac restart"
+    end
+
   else
     puts "Usage: brainiac plugin <command>"
     puts ""
     puts "Commands:"
+    puts "  list                         List installed plugins"
     puts "  new <name>                   Generate a new plugin gem skeleton"
+    puts "  switch <name> <branch>       Switch a local plugin to a different branch"
     puts ""
     puts "Managing installed plugins:"
     puts "  brainiac install <name>      Install a plugin"
     puts "  brainiac uninstall <name>    Remove a plugin"
-    puts "  brainiac plugins             List installed plugins"
+    puts "  brainiac plugins             List installed plugins (alias)"
   end
 
 when "screenshot"
@@ -3613,6 +3838,7 @@ when "help", "--help", "-h", nil
 
       Plugin Commands:
         plugin new <name>                Generate a new plugin gem skeleton
+        plugin switch <name> <branch>    Switch a local plugin to a branch (for testing)
         install <name>                   Install a plugin (gem install brainiac-<name>)
         uninstall <name>                 Remove a plugin
         update [name]                    Update brainiac + all plugins, or a specific plugin

data/bin/brainiac-completion.bash

@@ -63,7 +63,18 @@ _brainiac() {
     plugin)
       case $cword in
         2)
-          COMPREPLY=($(compgen -W "new" -- "$cur"))
+          COMPREPLY=($(compgen -W "new switch list" -- "$cur"))
+          ;;
+        3)
+          # For "plugin switch", suggest installed plugin names
+          if [[ "${COMP_WORDS[2]}" == "switch" && -f "$brainiac_dir/plugins.json" ]]; then
+            local installed
+            installed=$(ruby -rjson -e '
+              config = JSON.parse(File.read(ARGV[0]))
+              (config["plugins"] || []).select { |p| p.is_a?(Hash) && p["path"] }.each { |p| puts p["name"] }
+            ' "$brainiac_dir/plugins.json" 2>/dev/null)
+            COMPREPLY=($(compgen -W "$installed" -- "$cur"))
+          fi
           ;;
       esac
       ;;

data/lib/brainiac/handlers/shared/git.rb

@@ -4,6 +4,31 @@
 #
 # All git-related utilities live here. Handlers call these instead of
 # reimplementing git worktree/branch logic.
+#
+# NOTE: Methods that need to be accessible from Sinatra route handlers
+# are wrapped in GitHelpers module and registered with Sinatra.
+
+# Module containing git helpers that need to be accessible from Sinatra routes.
+# These are registered as Sinatra helpers in receiver.rb so plugins can call them.
+module GitHelpers
+  def resolve_base_branch(repo_path:, card_number: nil, project_key: nil)
+    results = Brainiac.emit(:resolve_base_branch,
+                            repo_path: repo_path, card_number: card_number, project_key: project_key)
+    custom = results.compact.first
+    if custom
+      LOG.info "Using custom base branch '#{custom}' (from plugin hook)"
+      custom
+    else
+      "origin/#{get_default_branch(repo_path)}"
+    end
+  end
+
+  def resolve_pr_target(repo_path:, card_number: nil, project_key: nil)
+    results = Brainiac.emit(:resolve_pr_target,
+                            repo_path: repo_path, card_number: card_number, project_key: project_key)
+    results.compact.first
+  end
+end
 
 # Debounced repo git fetch — avoids fetching the same repo multiple times within a short window.
 REPO_LAST_FETCH = {}

data/lib/brainiac/version.rb

@@ -2,5 +2,5 @@
 
 module Brainiac
   # @return [String] the current gem version
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/receiver.rb

@@ -114,8 +114,13 @@ else
   LOG.info "[Intent] Disabled (enable in brainiac.json → intent.enabled: true)"
 end
 
-# --- Dashboard authentication ---
+# --- Sinatra helpers ---
 
+# Register GitHelpers so plugins can call resolve_pr_target, resolve_base_branch
+# from within Sinatra route handlers
+helpers GitHelpers
+
+# Dashboard authentication helpers
 helpers do
   def authenticate_dashboard!
     return unless DASHBOARD_TOKEN # No token configured = no auth (local-only mode)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Andy Davis