brainiac-basecamp 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7d5fd8ee1c180d8083b77c3324d138678276d8bbc471dfa48c51d43ae0cca06
-  data.tar.gz: ec08e6a76392e28d5ef6b6a88adac7712bb60887eca9643d02227f556c7d472a
+  metadata.gz: 25a59b3d406964ab51bf4c1d34e63f01cf87368afcf79a1ecd8ce95b304b9ec6
+  data.tar.gz: d7e7f94f7b9b6e6a7c1d4480fcf46c6330a9d3928c4afd723c994703e149c70a
 SHA512:
-  metadata.gz: c82d88fd5a6cc8cf77330773b7eff552a3bfb7db291627ab0aef5dc3e8e178cee829389a0f72abd1938e4610c04878f3688e0963091a5361f6ae9dcea9f63b4c
-  data.tar.gz: 7ecb2081edefc0da28093bb5eb2b3cd26da316926349093bf51a36c7308073b5387279d3723a0a814c05f3a79dd7a4b17df07c7f479cc132f0fbeb75d5b64f88
+  metadata.gz: a9529e9564869624ac8712d157fbcafae3693018a6106c7f1ea99797fab5fed3e22d967b4c9f5fb4e8319c722d4d1afebb27732c152e9fca4c7b68626ef36ea6
+  data.tar.gz: 6cf76c4f8a5b3eaef3f571983f1130a6a79de6a68a22d0a8b08d8fb3d6cb245133e76bd396dcfc80f20ee2be0271757a1e3337ef5797331cc6c984ede6629131

data/README.md

@@ -201,6 +201,16 @@ brainiac restart
     { "agent": "GLaDOS", "role": "test-engineer" },
     { "agent": "Threepio", "role": "code-reviewer" }
   ],
+  "deploy": {
+    "enabled": true,
+    "trigger": "on_final_pr",
+    "default_env": "dev",
+    "project_envs": {
+      "stowzilla": "dev",
+      "posh-nosh": "dev02"
+    },
+    "command": "belt deploy {env} --auto"
+  },
   "notifications": {
     "channel": "discord",
     "target": "1423854179880927274",
@@ -212,6 +222,66 @@ brainiac restart
 }
 ```
 
+## Epic Deployment
+
+Deploy epics to test environments before merging the final PR to main.
+
+### Per-Epic Deploy Environment
+
+Specify the deploy environment in the epic title or description:
+
+```
+Todolist: "Epic: Build Authentication System [deploy:dev02]"
+```
+
+Or in the todolist description:
+
+```
+deploy:dev02
+```
+
+The title syntax takes precedence over description.
+
+### Manual Deploy
+
+```bash
+brainiac basecamp deploy <epic-id> [env]
+```
+
+Environment resolution (in order):
+1. Explicit env argument
+2. `[deploy:env]` in epic title
+3. `deploy:env` in epic description
+4. `deploy.project_envs.<project>` in config (per-project default)
+5. `deploy.default_env` in config (global default)
+
+### Automated Deploy
+
+Configure automated deployment in `~/.brainiac/basecamp.json`:
+
+```json
+{
+  "deploy": {
+    "enabled": true,
+    "trigger": "on_final_pr",
+    "default_env": "dev",
+    "project_envs": {
+      "stowzilla": "dev",
+      "posh-nosh": "dev02"
+    },
+    "command": "belt deploy {env} --auto"
+  }
+}
+```
+
+| Option | Description |
+|--------|-------------|
+| `enabled` | Enable/disable automated deploys |
+| `trigger` | When to deploy: `manual`, `on_final_pr` |
+| `default_env` | Global fallback environment |
+| `project_envs` | Per-project default environments (e.g., `{"stowzilla": "dev"}`) |
+| `command` | Deploy command template (`{env}` is replaced) |
+
 ## CLI Commands
 
 ```bash
@@ -220,6 +290,7 @@ brainiac basecamp config                             # Show config
 brainiac basecamp status                             # Plugin health check
 brainiac basecamp epics                              # List active epics
 brainiac basecamp epics --all                        # Include completed
+brainiac basecamp deploy <epic-id> [env]             # Deploy epic to environment
 brainiac basecamp bot add <name> <id> <agent>        # Add bot account
 brainiac basecamp bot list                           # List bot accounts
 brainiac basecamp projects map <key> <bc-id>         # Map project

data/lib/brainiac/plugins/basecamp/cli.rb

@@ -2,6 +2,8 @@
 
 require "json"
 require "open3"
+require_relative "config"
+require_relative "epic"
 
 module Brainiac
   module Plugins
@@ -23,6 +25,8 @@ module Brainiac
               cmd_status
             when "epics"
               cmd_epics(args)
+            when "deploy"
+              cmd_deploy(args)
             when "link"
               cmd_link(args)
             when "bot"
@@ -163,14 +167,14 @@ module Brainiac
             data = JSON.parse(File.read(epics_file))
             epics = data["epics"] || []
 
-            if args.first == "--all"
+            if args.include?("--all")
               display_epics = epics
             else
               display_epics = epics.select { |e| e["status"] == "active" }
             end
 
             if display_epics.empty?
-              puts "No #{args.first == '--all' ? '' : 'active '}epics."
+              puts "No #{args.include?('--all') ? '' : 'active '}epics."
               return
             end
 
@@ -181,11 +185,23 @@ module Brainiac
               total = tasks.size
 
               status_icon = epic["status"] == "active" ? "🚀" : "✅"
-              puts "#{status_icon} #{epic['title']}"
+
+              # Show deploy env if configured
+              deploy_env = Basecamp::Epic.extract_deploy_env(epic["title"], epic["description"])
+              deploy_display = deploy_env ? " [deploy:#{deploy_env}]" : ""
+
+              puts "#{status_icon} #{epic['title']}#{deploy_display}"
               puts "   Todolist: #{epic['basecamp_todolist_id']} | Agent: #{epic['agent']}"
               puts "   Tasks: #{complete}/#{total} complete, #{in_flight} in-flight"
               puts "   Started: #{epic['started_at']}"
 
+              # Show last deploy if present
+              if epic["last_deploy"]
+                ld = epic["last_deploy"]
+                deploy_status = ld["status"] == "success" ? "✅" : "❌"
+                puts "   Last deploy: #{deploy_status} #{ld['env']} @ #{ld['at']}"
+              end
+
               # Show per-task detail if verbose or few tasks
               if args.include?("--verbose") || args.include?("-v")
                 tasks.each do |t|
@@ -203,6 +219,98 @@ module Brainiac
             end
           end
 
+          def cmd_deploy(args)
+            epic_id = args.shift
+            env_override = args.shift
+
+            unless epic_id
+              puts "Usage: brainiac basecamp deploy <epic-id> [env]"
+              puts ""
+              puts "Deploy an epic's worktree to the specified environment."
+              puts ""
+              puts "Arguments:"
+              puts "  <epic-id>    Basecamp todolist ID for the epic"
+              puts "  [env]        Environment to deploy to (overrides epic's [deploy:env])"
+              puts ""
+              puts "Environment resolution (in order):"
+              puts "  1. Explicit env argument"
+              puts "  2. [deploy:env] in epic title"
+              puts "  3. deploy:env in epic description"
+              puts "  4. deploy.default_env in config"
+              puts ""
+              puts "Active epics:"
+              list_epics_for_deploy
+              return
+            end
+
+            # Load epic
+            epics = load_epics
+            epic = epics.find { |e| e["basecamp_todolist_id"] == epic_id.to_s }
+
+            unless epic
+              puts "❌ No epic found with todolist ID #{epic_id}"
+              puts ""
+              puts "Active epics:"
+              list_epics_for_deploy
+              return
+            end
+
+            # Resolve deploy environment
+            deploy_env = resolve_deploy_env(epic, env_override)
+
+            unless deploy_env
+              puts "❌ No deploy environment specified."
+              puts ""
+              puts "Either:"
+              puts "  1. Pass env as argument: brainiac basecamp deploy #{epic_id} dev02"
+              puts "  2. Add [deploy:env] to epic title: \"Epic: My Feature [deploy:dev02]\""
+              puts "  3. Add deploy:env to epic description"
+              puts "  4. Set deploy.project_envs.<project> in ~/.brainiac/basecamp.json"
+              puts "  5. Set deploy.default_env in ~/.brainiac/basecamp.json"
+              return
+            end
+
+            # Find worktree
+            worktree_path = find_epic_worktree(epic)
+
+            unless worktree_path
+              puts "❌ No worktree found for epic '#{epic['title']}'"
+              puts "   Epic branch mode may not be enabled, or no tasks have been dispatched."
+              return
+            end
+
+            puts "🚀 Deploying epic '#{epic['title']}'"
+            puts "   Environment: #{deploy_env}"
+            puts "   Worktree: #{worktree_path}"
+            puts ""
+
+            # Run deploy
+            success = run_deploy(worktree_path, deploy_env)
+
+            puts ""
+
+            if success
+              puts "✅ Deploy completed successfully"
+
+              # Update epic state
+              epic["last_deploy"] = {
+                "env" => deploy_env,
+                "at" => Time.now.iso8601,
+                "status" => "success"
+              }
+            else
+              puts "❌ Deploy failed"
+
+              epic["last_deploy"] = {
+                "env" => deploy_env,
+                "at" => Time.now.iso8601,
+                "status" => "failed"
+              }
+            end
+
+            save_epics(epics)
+          end
+
           def cmd_link(args)
             fizzy_card = args.shift
             basecamp_url = args.shift
@@ -517,7 +625,8 @@ module Brainiac
                 setup                                   Interactive setup guide
                 config                                  Show current config
                 status                                  Check plugin status
-                epics [--all]                           List active epics (--all for completed too)
+                epics [--all] [-v]                      List active epics (--all for completed too)
+                deploy <epic-id> [env]                  Deploy epic worktree to environment
                 link <card> <url>                       Link a Fizzy card to a Basecamp todo
                 bot add <agent-name>                    Add bot (auto-resolves person_id from Basecamp)
                 bot add <name> <person-id> <agent>      Add bot with explicit person_id
@@ -542,6 +651,13 @@ module Brainiac
                 on_complete   — Advance to next task as soon as agent finishes (default)
                 on_pr_merge   — Wait for PR to be merged before advancing (review gate)
 
+              Deploy environment resolution (in order):
+                1. Explicit env argument: brainiac basecamp deploy 12345 dev02
+                2. [deploy:env] in epic title: "Epic: My Feature [deploy:dev02]"
+                3. deploy:env in epic description
+                4. deploy.project_envs.<project> in config (per-project default)
+                5. deploy.default_env in config (global default)
+
               Task statuses (for reset --to):
                 pending         — Not yet started, waiting for dependencies
                 in_flight       — Agent is actively working on it
@@ -873,6 +989,91 @@ module Brainiac
                                                         }))
           end
 
+          # --- Deploy helpers ---
+
+          def list_epics_for_deploy
+            epics = load_epics.select { |e| e["status"] == "active" }
+            if epics.empty?
+              puts "  (no active epics)"
+              return
+            end
+
+            epics.each do |epic|
+              deploy_env = resolve_deploy_env(epic, nil)
+              env_display = deploy_env ? "[deploy:#{deploy_env}]" : "(no env)"
+              puts "  #{epic['basecamp_todolist_id']} — #{epic['title']} #{env_display}"
+            end
+          end
+
+          def resolve_deploy_env(epic, override)
+            # 1. Explicit override
+            return override if override && !override.empty?
+
+            # 2. [deploy:env] in title or deploy:env in description
+            env = Basecamp::Epic.extract_deploy_env(epic["title"], epic["description"])
+            return env if env
+
+            # 3. Per-project default from config
+            # Prefer the project from tasks (set from Fizzy card tags) over basecamp mapping
+            # since multiple brainiac projects can share the same basecamp project.
+            project_key = (epic["tasks"] || []).filter_map { |t| t["project"] }.first
+            project_key ||= Config.brainiac_project_for(epic["basecamp_project_id"])
+            project_env = Config.deploy.dig("project_envs", project_key) if project_key
+            return project_env if project_env
+
+            # 4. Global default
+            Config.deploy["default_env"]
+          end
+
+          def find_epic_worktree(epic)
+            # Epic branches are stored per-project in epic["epic_branches"]
+            # Find any worktree that has the epic branch checked out
+            epic_branches = epic["epic_branches"] || {}
+            return nil if epic_branches.empty?
+
+            # Load projects to find repo paths
+            projects_file = File.join(BRAINIAC_DIR, "projects.json")
+            return nil unless File.exist?(projects_file)
+
+            projects = JSON.parse(File.read(projects_file))
+
+            epic_branches.each do |project_key, branch_name|
+              repo_path = projects.dig(project_key, "repo_path")
+              next unless repo_path && File.directory?(repo_path)
+
+              # List worktrees and find one with this branch
+              output, status = Open3.capture2("git", "worktree", "list", "--porcelain", chdir: repo_path)
+              next unless status.success?
+
+              # Parse porcelain output
+              current_worktree = nil
+              output.each_line do |line|
+                if line.start_with?("worktree ")
+                  current_worktree = line.sub("worktree ", "").strip
+                elsif line.start_with?("branch refs/heads/")
+                  wt_branch = line.sub("branch refs/heads/", "").strip
+                  return current_worktree if wt_branch == branch_name && current_worktree && current_worktree != repo_path
+                end
+              end
+            end
+
+            nil
+          rescue JSON::ParserError
+            nil
+          end
+
+          def run_deploy(worktree_path, env)
+            deploy_config = Config.deploy
+            command_template = deploy_config["command"] || "belt deploy {env} --auto"
+            command = command_template.gsub("{env}", env)
+
+            puts "Running: #{command}"
+            puts "-" * 40
+
+            # Run the deploy command in the worktree directory
+            system(command, chdir: worktree_path)
+          end
+
           def auto_resolve_person_id(agent_name)
             output, status = Open3.capture2(
               "basecamp", "people", "list", "--jq",
@@ -928,7 +1129,7 @@ module Brainiac
       end
 
       def self.completions
-        %w[setup config status epics link bot projects set reset webhook]
+        %w[setup config status epics deploy link bot projects set reset webhook]
       end
     end
   end

data/lib/brainiac/plugins/basecamp/config.rb

@@ -20,6 +20,13 @@ module Brainiac
           "fizzy_account_id" => nil,
           "review_gate" => "on_complete",
           "review_gates" => [],
+          "deploy" => {
+            "enabled" => false,
+            "trigger" => "manual",
+            "default_env" => nil,
+            "project_envs" => {},
+            "command" => "belt deploy {env} --auto"
+          },
           "notifications" => {
             "epic_started" => true,
             "task_dispatched" => true,
@@ -103,6 +110,13 @@ module Brainiac
             current["review_gate"] || "on_complete"
           end
 
+          # Deploy configuration.
+          #
+          # @return [Hash]
+          def deploy
+            current["deploy"] || DEFAULT_CONFIG["deploy"]
+          end
+
           private
 
           def config_mtime

data/lib/brainiac/plugins/basecamp/epic.rb

@@ -123,6 +123,37 @@ module Brainiac
             lines.join("\n")
           end
 
+          # Extract deploy environment from epic title or description.
+          # Supports:
+          #   [deploy:dev02]  — in title (preferred)
+          #   deploy:dev02    — in description (fallback)
+          #
+          # @param title [String] Epic/todolist title
+          # @param description [String, nil] Optional description to check as fallback
+          # @return [String, nil] Environment name or nil
+          def extract_deploy_env(title, description = nil)
+            # Try [deploy:env] format in title (preferred)
+            if title
+              marker = "[deploy:"
+              value_start = title.index(marker)
+              if value_start
+                value_start += marker.length
+                value_end = title.index("]", value_start)
+                if value_end
+                  environment = title[value_start...value_end].strip
+                  return environment unless environment.empty?
+                end
+              end
+            end
+
+            # Fallback: try deploy:env in description
+            if description && (match = description.match(/deploy:(\S+)/i))
+              return match[1].strip
+            end
+
+            nil
+          end
+
           private
 
           # Extract Fizzy card number from title.

data/lib/brainiac/plugins/basecamp/orchestrator.rb

@@ -737,6 +737,9 @@ module Brainiac
             # If epic_branch mode, open final PRs to main
             if epic["review_gate"] == "epic_branch" && epic["epic_branches"]&.any?
               open_final_prs(epic)
+
+              # Trigger automated deploy if configured
+              trigger_deploy_if_configured(epic, "on_final_pr")
             end
 
             # Post a summary message in Basecamp
@@ -925,6 +928,130 @@ module Brainiac
                           message: message,
                           agent: agent)
           end
+
+          # Trigger automated deploy if configured for the given trigger point.
+          #
+          # @param epic [Hash] Epic state
+          # @param trigger [String] Trigger point ("on_final_pr", "on_task_merge", etc.)
+          def trigger_deploy_if_configured(epic, trigger)
+            deploy_config = Config.deploy
+            return unless deploy_config["enabled"]
+            return unless deploy_config["trigger"] == trigger
+
+            # Resolve deploy environment
+            deploy_env = resolve_epic_deploy_env(epic)
+            unless deploy_env
+              LOG.warn "[Basecamp:Orchestrator] Deploy triggered but no environment configured for epic '#{epic['title']}'" if defined?(LOG)
+              return
+            end
+
+            # Find worktree
+            worktree_path = find_epic_worktree(epic)
+            unless worktree_path
+              LOG.warn "[Basecamp:Orchestrator] Deploy triggered but no worktree found for epic '#{epic['title']}'" if defined?(LOG)
+              return
+            end
+
+            LOG.info "[Basecamp:Orchestrator] Auto-deploying epic '#{epic['title']}' to #{deploy_env}" if defined?(LOG)
+
+            # Run deploy
+            command_template = deploy_config["command"] || "belt deploy {env} --auto"
+            command = command_template.gsub("{env}", deploy_env)
+
+            success = system(command, chdir: worktree_path)
+
+            # Record deploy result
+            epic["last_deploy"] = {
+              "env" => deploy_env,
+              "at" => Time.now.iso8601,
+              "status" => success ? "success" : "failed",
+              "trigger" => trigger
+            }
+
+            # Send notification
+            if success
+              send_notification(
+                event: :epic_deployed,
+                message: "🚀 Epic **#{epic['title']}** deployed to **#{deploy_env}**",
+                agent: epic["agent"]
+              )
+            else
+              send_notification(
+                event: :epic_deploy_failed,
+                message: "❌ Epic **#{epic['title']}** deploy to **#{deploy_env}** failed",
+                agent: epic["agent"]
+              )
+            end
+          rescue StandardError => e
+            LOG.error "[Basecamp:Orchestrator] Deploy failed: #{e.message}" if defined?(LOG)
+            epic["last_deploy"] = {
+              "env" => deploy_env,
+              "at" => Time.now.iso8601,
+              "status" => "error",
+              "error" => e.message,
+              "trigger" => trigger
+            }
+          end
+
+          # Resolve deploy environment for an epic.
+          #
+          # @param epic [Hash] Epic state
+          # @return [String, nil] Environment name or nil
+          def resolve_epic_deploy_env(epic)
+            # 1. [deploy:env] in title or deploy:env in description
+            env = Epic.extract_deploy_env(epic["title"], epic["description"])
+            return env if env
+
+            # 2. Per-project default from config
+            # Prefer the project from tasks (set from Fizzy card tags) over basecamp mapping
+            # since multiple brainiac projects can share the same basecamp project.
+            project_key = (epic["tasks"] || []).map { |t| t["project"] }.compact.first
+            project_key ||= Config.brainiac_project_for(epic["basecamp_project_id"])
+            project_env = Config.deploy.dig("project_envs", project_key) if project_key
+            return project_env if project_env
+
+            # 3. Global default
+            Config.deploy["default_env"]
+          end
+
+          # Find the worktree path for an epic's branch.
+          #
+          # @param epic [Hash] Epic state
+          # @return [String, nil] Worktree path or nil
+          def find_epic_worktree(epic)
+            epic_branches = epic["epic_branches"] || {}
+            return nil if epic_branches.empty?
+
+            projects_file = File.join(BRAINIAC_DIR, "projects.json")
+            return nil unless File.exist?(projects_file)
+
+            projects = JSON.parse(File.read(projects_file))
+
+            epic_branches.each do |project_key, branch_name|
+              repo_path = projects.dig(project_key, "repo_path")
+              next unless repo_path && File.directory?(repo_path)
+
+              # List worktrees and find one with this branch
+              output, status = Open3.capture2("git", "worktree", "list", "--porcelain", chdir: repo_path)
+              next unless status.success?
+
+              current_worktree = nil
+              output.each_line do |line|
+                if line.start_with?("worktree ")
+                  current_worktree = line.sub("worktree ", "").strip
+                elsif line.start_with?("branch refs/heads/")
+                  wt_branch = line.sub("branch refs/heads/", "").strip
+                  if wt_branch == branch_name && current_worktree && current_worktree != repo_path
+                    return current_worktree
+                  end
+                end
+              end
+            end
+
+            nil
+          rescue JSON::ParserError
+            nil
+          end
         end
       end
     end

data/lib/brainiac/plugins/basecamp/session_registry.rb

@@ -59,8 +59,11 @@ module Brainiac
 
             LOG.info "[Basecamp:SessionRegistry] Registered session: #{task_id} (pid=#{pid}, agent=#{agent_name})" if defined?(LOG)
 
-            # Also forward to the global register_session if it exists (for waybar/UI)
-            if Object.respond_to?(:register_session, true) && !@suppress_global_forward
+            # Also forward to the global register_session if it exists (for waybar/UI).
+            # Skip implementation-* sessions — fizzy already registers those as card-NNNN
+            # and we don't want duplicate entries in the tray.
+            if Object.respond_to?(:register_session, true) && !@suppress_global_forward &&
+               !task_id.to_s.start_with?("implementation-")
               begin
                 Object.send(:register_session, task_id, pid, log_file: log_file, agent_name: agent_name)
               rescue StandardError

data/lib/brainiac/plugins/basecamp/version.rb

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Basecamp
-      VERSION = "0.0.19"
+      VERSION = "0.0.21"
     end
   end
 end

data/lib/brainiac/plugins/basecamp.rb

@@ -115,9 +115,16 @@ module Brainiac
             reconcile_task(epic, task, triggered_by: triggered_by)
           end.any?
 
-          Orchestrator.send(:dispatch_unblocked_tasks, epic) if changed
-          Orchestrator.send(:save_epic, epic) if changed
-          changed
+          # Always attempt to dispatch unblocked tasks during recovery. Even if no
+          # individual task changed state, there may be pending tasks whose
+          # dependencies are satisfied that were never dispatched (e.g., after a
+          # cancellation was reversed or an epic was healed manually).
+          has_pending = tasks.any? { |t| TaskState.in?(t, :pending) }
+          if changed || has_pending
+            Orchestrator.send(:dispatch_unblocked_tasks, epic)
+            Orchestrator.send(:save_epic, epic)
+          end
+          changed || has_pending
         end
 
         private

metadata

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