aircana 1.6.0.rc1 → 2.0.0.rc2

data/README.md

@@ -13,7 +13,7 @@ Subagent generation for improved context window management.
 
 Agent-accessible knowledge bases sourced from Confluence or public websites, backed by manifest files.
 
-Development workflow with plan, record, and execute phases (record and execute phases are in progress).
+Complete development workflow with five phases: plan, record, execute, review, and apply-feedback.
 
 SQS integration for features like Slack notifications and messages.
 
@@ -62,6 +62,108 @@ To start using your agents with domain-specific knowledge, follow the agent work
 
 - Explore other tools by running `aircana --help`
 
+## Development Workflow
+
+Aircana provides a complete development lifecycle through five integrated slash commands:
+
+```mermaid
+stateDiagram-v2
+    [*] --> Plan: /air-plan
+    Plan --> Record: /air-record
+    Record --> Execute: /air-execute
+    Execute --> Review: /air-review
+    Review --> ApplyFeedback: /air-apply-feedback
+    ApplyFeedback --> Review: More issues found
+    ApplyFeedback --> [*]: Satisfied
+```
+
+### Quick Overview
+
+1. **`/air-plan`** - Create strategic implementation plan
+2. **`/air-record`** - Save plan to Jira ticket
+3. **`/air-execute`** - Implement plan and create commit
+4. **`/air-review`** - Adversarial code review with expert feedback
+5. **`/air-apply-feedback`** - Apply review changes and amend commit
+
+### Command Details
+
+#### 1. `/air-plan` - Strategic Planning
+
+Creates a high-level implementation plan by:
+- Asking you to specify relevant files and directories
+- Consulting specialized sub-agents for domain expertise
+- Sharing research context to avoid duplicate work
+- Generating a focused strategic plan (what to do, not how)
+- Creating actionable todo checklist
+
+The planner focuses on architecture decisions and approach, avoiding exhaustive code implementations.
+
+#### 2. `/air-record` - Save to Jira
+
+Records your approved plan to a Jira ticket by:
+- Taking the ticket key/ID as input
+- Delegating to the `jira` sub-agent for MCP operations
+- Storing the plan in the ticket description or comments
+
+This creates a traceable link between planning and execution.
+
+#### 3. `/air-execute` - Implementation
+
+Executes the strategic plan by:
+- Reading the plan from the Jira ticket
+- Creating detailed implementation todo list
+- Presenting plan for your approval
+- Implementing changes sequentially
+- Writing unit tests (delegates to test-writing sub-agent if available)
+- Running tests to verify implementation
+- Creating git commit (delegates to git-ops sub-agent if available)
+
+After commit creation, suggests running `/air-review`.
+
+#### 4. `/air-review` - Adversarial Review
+
+Conducts comprehensive code review of HEAD commit by:
+- Analyzing changed files to identify technical domains
+- Using sub-agent-coordinator to select relevant expert agents
+- Presenting changes to experts in parallel
+- Synthesizing feedback organized by severity (Critical/Important/Suggestions)
+- Storing review output for next step
+
+Explicitly states "Reviewing: <commit message>" and ends with "Run /air-apply-feedback".
+
+#### 5. `/air-apply-feedback` - Apply Changes
+
+Applies code review feedback by:
+- Reading review output from conversation context
+- Creating prioritized change plan (critical issues first)
+- Presenting plan for your approval
+- Applying approved changes
+- Re-running unit tests
+- Fixing any test failures
+- **Amending HEAD commit** with improvements using `git commit --amend --no-edit`
+
+This preserves the original commit message while incorporating review improvements in a single commit.
+
+### Usage Example
+
+```bash
+# 1. Start planning
+/air-plan
+> Specify relevant files: src/api/, spec/api/
+
+# 2. Save plan to ticket
+/air-record PROJ-123
+
+# 3. Execute implementation
+/air-execute PROJ-123
+
+# 4. Review the commit
+/air-review
+
+# 5. Apply feedback
+/air-apply-feedback
+```
+
 ## Key Concepts
 
 ### Subagents
@@ -275,14 +377,6 @@ This refreshes both Confluence pages and web URLs associated with the agent.
 
 ## All Commands
 
-### File Management
-```bash
-aircana files add         # Interactively select files to add to context
-aircana files add-dir [PATH] # Add all files from directory to context
-aircana files clear       # Clear current file context
-aircana files list        # Show current relevant files
-```
-
 ### Agent Management
 ```bash
 aircana agents create     # Create new agent interactively

data/lib/aircana/cli/app.rb

@@ -2,9 +2,6 @@
 
 require "thor"
 
-require_relative "commands/add_files"
-require_relative "commands/add_directory"
-require_relative "commands/clear_files"
 require_relative "commands/doctor"
 require_relative "commands/dump_context"
 require_relative "commands/generate"
@@ -15,7 +12,6 @@ require_relative "help_formatter"
 require_relative "commands/agents"
 require_relative "commands/hooks"
 require_relative "commands/project"
-require_relative "commands/files"
 
 module Aircana
   module CLI
@@ -49,28 +45,6 @@ module Aircana
         Install.run
       end
 
-      class FilesSubcommand < Subcommand
-        desc "add", "Interactively add files to current context"
-        def add
-          Files.add
-        end
-
-        desc "add-dir [DIRECTORY_PATH]", "Add all files from directory to context"
-        def add_dir(directory_path)
-          Files.add_dir(directory_path)
-        end
-
-        desc "clear", "Remove all files from current context"
-        def clear
-          Files.clear
-        end
-
-        desc "list", "Show current relevant files"
-        def list
-          Files.list
-        end
-      end
-
       class AgentsSubcommand < Subcommand
         desc "create", "Create a new agent"
         def create
@@ -152,9 +126,6 @@ module Aircana
         end
       end
 
-      desc "files", "Manage relevant files for context"
-      subcommand "files", FilesSubcommand
-
       desc "agents", "Create and manage agents and their knowledgebases"
       subcommand "agents", AgentsSubcommand
 

data/lib/aircana/cli/commands/doctor_checks.rb

@@ -59,7 +59,6 @@ module Aircana
           check_directory("~/.aircana", "Global Aircana directory")
           check_directory(".aircana", "Project Aircana directory")
           check_agents_status
-          check_relevant_files_status
         end
 
         def check_agents_status
@@ -74,17 +73,6 @@ module Aircana
             log_remedy("Create agents with: aircana agents create")
           end
         end
-
-        def check_relevant_files_status
-          relevant_files_dir = File.join(Dir.pwd, ".aircana", "relevant_files")
-          if Dir.exist?(relevant_files_dir) && !Dir.empty?(relevant_files_dir)
-            file_count = Dir.glob(File.join(relevant_files_dir, "*")).size
-            log_success("relevant_files", "#{file_count} file(s) in context")
-          else
-            log_info("relevant_files", "No relevant files added yet")
-            log_remedy("Add files with: aircana add-files")
-          end
-        end
       end
 
       module OptionalIntegrations

data/lib/aircana/cli/commands/dump_context.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "../shell_command"
-require_relative "../../contexts/relevant_files"
 
 module Aircana
   module CLI
     module DumpContext
       class << self
-        def run(_agent_name:, verbose: true)
+        def run(_agent_name:, _verbose: true)
           Aircana.logger.level = Logger::ERROR
-          Contexts::RelevantFiles.print(verbose:)
+          Aircana.human_logger.info("Context dumping functionality has been removed.")
         end
 
         private

data/lib/aircana/cli/commands/generate.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "../../generators/relevant_files_command_generator"
-require_relative "../../generators/relevant_files_verbose_results_generator"
 require_relative "../../generators/plan_command_generator"
-require_relative "../../generators/write_plan_command_generator"
+require_relative "../../generators/record_command_generator"
+require_relative "../../generators/execute_command_generator"
+require_relative "../../generators/review_command_generator"
+require_relative "../../generators/apply_feedback_command_generator"
 require_relative "../../generators/ask_expert_command_generator"
 require_relative "../../generators/agents_generator"
 require_relative "../../generators/hooks_generator"
@@ -15,10 +16,11 @@ module Aircana
       class << self
         def generators
           @generators ||= [
-            Aircana::Generators::RelevantFilesVerboseResultsGenerator.new,
-            Aircana::Generators::RelevantFilesCommandGenerator.new,
             Aircana::Generators::PlanCommandGenerator.new,
-            Aircana::Generators::WritePlanCommandGenerator.new,
+            Aircana::Generators::RecordCommandGenerator.new,
+            Aircana::Generators::ExecuteCommandGenerator.new,
+            Aircana::Generators::ReviewCommandGenerator.new,
+            Aircana::Generators::ApplyFeedbackCommandGenerator.new,
             Aircana::Generators::AskExpertCommandGenerator.new
           ]
         end

data/lib/aircana/configuration.rb

@@ -2,7 +2,7 @@
 
 module Aircana
   class Configuration
-    attr_accessor :global_dir, :project_dir, :relevant_project_files_dir, :stream, :output_dir,
+    attr_accessor :global_dir, :project_dir, :stream, :output_dir,
                   :claude_code_config_path, :claude_code_project_config_path, :agent_knowledge_dir,
                   :hooks_dir, :confluence_base_url, :confluence_username, :confluence_api_token
 
@@ -18,7 +18,6 @@ module Aircana
     def setup_directory_paths
       @global_dir = File.join(Dir.home, ".aircana")
       @project_dir = Dir.pwd
-      @relevant_project_files_dir = File.join(@project_dir, ".aircana", "relevant_files")
       @output_dir = File.join(@global_dir, "aircana.out")
       @agent_knowledge_dir = File.join(@project_dir, ".aircana", "agents")
       @hooks_dir = File.join(@project_dir, ".aircana", "hooks")

data/lib/aircana/contexts/confluence.rb

@@ -98,9 +98,7 @@ module Aircana
 
       def extract_page_metadata(page)
         {
-          "id" => page["id"],
-          "title" => page["title"],
-          "last_updated" => page.dig("version", "when") || Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+          "id" => page["id"]
         }
       end
 

data/lib/aircana/contexts/manifest.rb

@@ -27,10 +27,7 @@ module Aircana
 
           if File.exist?(manifest_path)
             existing_data = JSON.parse(File.read(manifest_path))
-            manifest_data = existing_data.merge({
-                                                  "last_updated" => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
-                                                  "sources" => sources
-                                                })
+            manifest_data = existing_data.merge({ "sources" => sources })
           else
             manifest_data = build_manifest_data(agent, sources)
           end
@@ -87,13 +84,9 @@ module Aircana
         end
 
         def build_manifest_data(agent, sources)
-          timestamp = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
-
           {
             "version" => "1.0",
             "agent" => agent,
-            "created" => timestamp,
-            "last_updated" => timestamp,
             "sources" => sources
           }
         end
@@ -157,8 +150,6 @@ module Aircana
           raise ManifestError, "Each URL entry must be a hash" unless url_entry.is_a?(Hash)
 
           raise ManifestError, "URL entry missing required field: url" unless url_entry.key?("url")
-
-          raise ManifestError, "URL entry missing required field: title" unless url_entry.key?("title")
         end
       end
     end

data/lib/aircana/contexts/web.rb

@@ -210,9 +210,7 @@ module Aircana
 
       def build_url_metadata(page_data)
         {
-          "url" => page_data[:url],
-          "title" => page_data[:title],
-          "last_fetched" => page_data[:last_fetched]
+          "url" => page_data[:url]
         }
       end
 

data/lib/aircana/generators/agents_generator.rb

@@ -44,7 +44,7 @@ module Aircana
 
       def locals
         super.merge({
-                      relevant_project_files_path:, agent_name:, short_description:, description:,
+                      agent_name:, short_description:, description:,
                       model:, color:, knowledge_path:
                     })
       end
@@ -63,10 +63,6 @@ module Aircana
         File.join(Aircana.configuration.claude_code_project_config_path, "agents", "#{agent_name}.md")
       end
 
-      def relevant_project_files_path
-        File.join(Aircana.configuration.relevant_project_files_dir, "relevant_files.md")
-      end
-
       def knowledge_path
         ".aircana/agents/#{agent_name}/knowledge/"
       end

data/lib/aircana/generators/{relevant_files_command_generator.rb → apply_feedback_command_generator.rb}

@@ -4,7 +4,7 @@ require_relative "../generators"
 
 module Aircana
   module Generators
-    class RelevantFilesCommandGenerator < BaseGenerator
+    class ApplyFeedbackCommandGenerator < BaseGenerator
       def initialize(file_in: nil, file_out: nil)
         super(
           file_in: file_in || default_template_path,
@@ -12,24 +12,14 @@ module Aircana
         )
       end
 
-      protected
-
-      def locals
-        super.merge({ relevant_project_files_path: })
-      end
-
       private
 
       def default_template_path
-        File.join(File.dirname(__FILE__), "..", "templates", "commands", "add_relevant_files.erb")
+        File.join(File.dirname(__FILE__), "..", "templates", "commands", "apply_feedback.erb")
       end
 
       def default_output_path
-        File.join(Aircana.configuration.output_dir, "commands", "air-add-relevant-files.md")
-      end
-
-      def relevant_project_files_path
-        File.join(Aircana.configuration.relevant_project_files_dir, "relevant_files.md")
+        File.join(Aircana.configuration.output_dir, "commands", "air-apply-feedback.md")
       end
     end
   end

data/lib/aircana/generators/{write_plan_command_generator.rb → execute_command_generator.rb}

@@ -4,7 +4,7 @@ require_relative "../generators"
 
 module Aircana
   module Generators
-    class WritePlanCommandGenerator < BaseGenerator
+    class ExecuteCommandGenerator < BaseGenerator
       def initialize(file_in: nil, file_out: nil)
         super(
           file_in: file_in || default_template_path,
@@ -15,11 +15,11 @@ module Aircana
       private
 
       def default_template_path
-        File.join(File.dirname(__FILE__), "..", "templates", "commands", "write_plan.erb")
+        File.join(File.dirname(__FILE__), "..", "templates", "commands", "execute.erb")
       end
 
       def default_output_path
-        File.join(Aircana.configuration.output_dir, "commands", "air-write-plan.md")
+        File.join(Aircana.configuration.output_dir, "commands", "air-execute.md")
       end
     end
   end

data/lib/aircana/generators/record_command_generator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative "../generators"
+
+module Aircana
+  module Generators
+    class RecordCommandGenerator < BaseGenerator
+      def initialize(file_in: nil, file_out: nil)
+        super(
+          file_in: file_in || default_template_path,
+          file_out: file_out || default_output_path
+        )
+      end
+
+      private
+
+      def default_template_path
+        File.join(File.dirname(__FILE__), "..", "templates", "commands", "record.erb")
+      end
+
+      def default_output_path
+        File.join(Aircana.configuration.output_dir, "commands", "air-record.md")
+      end
+    end
+  end
+end

data/lib/aircana/generators/review_command_generator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative "../generators"
+
+module Aircana
+  module Generators
+    class ReviewCommandGenerator < BaseGenerator
+      def initialize(file_in: nil, file_out: nil)
+        super(
+          file_in: file_in || default_template_path,
+          file_out: file_out || default_output_path
+        )
+      end
+
+      private
+
+      def default_template_path
+        File.join(File.dirname(__FILE__), "..", "templates", "commands", "review.erb")
+      end
+
+      def default_output_path
+        File.join(Aircana.configuration.output_dir, "commands", "air-review.md")
+      end
+    end
+  end
+end

data/lib/aircana/generators.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "generators/base_generator"
-require_relative "generators/relevant_files_command_generator"
-require_relative "generators/relevant_files_verbose_results_generator"
 
 module Aircana
   module Generators

data/lib/aircana/templates/agents/defaults/apply_feedback.erb

@@ -0,0 +1,91 @@
+---
+name: apply-feedback
+description: Applies code review feedback by making recommended changes and amending the HEAD commit
+model: inherit
+color: cyan
+---
+
+<%=  helpers.model_instructions("You are a Code Review Feedback Application Agent that implements recommended changes from code reviews and amends the HEAD commit.
+
+MANDATORY WORKFLOW:
+
+STEP 1: CREATE TODO LIST FILE
+First, create a todo list file with the following tasks enumerated in order:
+
+1. Parse review feedback from conversation context
+2. Create prioritized todo list of changes (critical first, then important, then suggestions)
+3. Present change plan to user for approval
+4. Apply approved changes using appropriate tools
+5. Re-run unit tests to verify changes
+6. Fix any test failures
+7. Amend HEAD commit with improvements
+8. Summarize changes made
+
+STEP 2: EXECUTE EACH TASK IN ORDER
+Work through each task in the todo list sequentially:
+- Mark each task as 'in_progress' when you start it
+- Mark each task as 'completed' when finished
+- Continue until all tasks are done
+
+TASK DETAILS:
+
+1. PARSE FEEDBACK: Extract review feedback from conversation:
+   - Look for review output from previous /air-review command
+   - Parse feedback organized by severity (Critical / Important / Suggestions)
+   - Extract actionable items with file, line, issue, and recommendation
+   - If no review feedback found in context, inform user and exit
+
+2. CHANGE PLANNING: Create prioritized implementation plan:
+   - List all critical issues to fix (must be addressed)
+   - List all important improvements (should be addressed)
+   - List suggestions (optional, ask user if they want these)
+   - Organize by file for efficient editing
+   - Enter Claude Code planning mode for this step
+   - Create clear, actionable todo items
+
+3. USER APPROVAL: Present plan and get confirmation:
+   - Show organized list of changes to be made
+   - Ask if user wants to include suggestions or just critical/important
+   - Explicitly ask for approval before proceeding
+   - Wait for user confirmation
+
+4. APPLY CHANGES: Implement approved feedback:
+   - Use appropriate tools (Read, Edit, Write, Bash)
+   - Work through changes file by file
+   - Mark each change as completed after applying
+   - Preserve existing code style and patterns
+   - Make targeted changes without unnecessary refactoring
+
+5. TEST EXECUTION: Verify changes don't break tests:
+   - Run project's test command (e.g., bundle exec rspec, npm test, etc.)
+   - Check if all tests pass
+   - If tests pass, proceed to commit
+
+6. FIX TEST FAILURES: Address any failing tests:
+   - If tests fail, analyze failures
+   - Fix implementation issues causing failures
+   - Re-run tests until all pass
+   - Do not proceed to commit until tests pass
+
+7. AMEND COMMIT: Update HEAD commit with improvements:
+   - Run: git add -A to stage all changes
+   - Run: git commit --amend --no-edit to amend HEAD commit
+   - This preserves original commit message while incorporating improvements
+   - Verify commit was successfully amended
+
+8. SUMMARY: Report what was done:
+   - List all changes applied by category (critical/important/suggestions)
+   - Note any feedback items not addressed and why
+   - Confirm HEAD commit was amended with improvements
+   - Mention that commit now includes both implementation and review improvements
+
+IMPORTANT INSTRUCTIONS:
+- ALWAYS start by creating the todo list file before doing any other work
+- Execute tasks in the exact order specified in the todo list
+- Prioritize critical issues - must be fixed
+- Get user approval before making changes
+- Ensure tests pass before amending commit
+- Use 'git commit --amend --no-edit' to preserve original commit message
+- Focus on implementing review feedback, not redesigning code", important: true) %>
+
+Always check your knowledge base first for code improvement and refactoring best practices.

data/lib/aircana/templates/agents/defaults/executor.erb

@@ -0,0 +1,84 @@
+---
+name: executor
+description: Implementation execution agent that reads plans from Jira and executes them with user approval
+model: inherit
+color: green
+---
+
+<%=  helpers.model_instructions("You are an Implementation Execution Agent that reads strategic implementation plans from Jira tickets and executes them with user approval.
+
+MANDATORY WORKFLOW:
+
+STEP 1: CREATE TODO LIST FILE
+First, create a todo list file with the following tasks enumerated in order:
+
+1. Use Task tool with subagent_type 'jira' to read the implementation plan from the specified Jira ticket
+2. Review and validate plan structure (should contain frontmatter and todo checklist)
+3. Enter Claude Code planning mode to create detailed execution todo list from strategic plan
+4. Present execution plan to user for approval
+5. Execute approved implementation tasks sequentially
+6. Write unit tests (delegate to test-writing sub-agent if available)
+7. Run unit tests to verify implementation
+8. Create git commit (delegate to git-ops sub-agent if available)
+
+STEP 2: EXECUTE EACH TASK IN ORDER
+Work through each task in the todo list sequentially:
+- Mark each task as 'in_progress' when you start it
+- Mark each task as 'completed' when finished
+- Continue until all tasks are done
+
+TASK DETAILS:
+
+1. JIRA INTEGRATION: Always delegate Jira operations to the 'jira' sub-agent using Task tool with subagent_type 'jira'. Request the full implementation plan content including:
+   - Plan frontmatter (consulted sub-agents, relevant files)
+   - Strategic implementation steps (todo checklist format)
+   - Any architectural decisions or trade-offs documented
+
+2. PLAN VALIDATION: Verify the plan contains:
+   - Proper markdown frontmatter with metadata
+   - Implementation steps in todo checklist format using `[ ]`
+   - Clear actionable items
+   - If plan is missing or malformed, inform user and exit
+
+3. EXECUTION PLANNING: Transform strategic plan into detailed execution todos:
+   - Break down high-level plan steps into specific implementation tasks
+   - Add file paths and line numbers where relevant
+   - Include testing and verification steps
+   - Sequence tasks logically with dependencies
+   - Enter Claude Code planning mode for this step
+
+4. USER APPROVAL: Present the detailed execution plan and explicitly ask for user approval before proceeding. Wait for confirmation.
+
+5. IMPLEMENTATION EXECUTION: Once approved, work through execution todos:
+   - Use appropriate tools (Read, Write, Edit, Bash, etc.)
+   - Mark each execution task as completed after finishing
+   - Create commits at logical checkpoints
+   - Focus on implementing the WHAT defined in the strategic plan
+
+6. TEST WRITING: Write unit tests for the implementation:
+   - Check if a test-writing sub-agent exists (look for agents with 'test' in name/description)
+   - If found, delegate test writing to that sub-agent using Task tool
+   - Provide implementation context: files changed, new functionality added, edge cases to cover
+   - If no test sub-agent exists, write tests directly following project conventions
+
+7. TEST EXECUTION: Run unit tests to verify implementation:
+   - Use project's test command (e.g., bundle exec rspec, npm test, etc.)
+   - Fix any failing tests
+   - Ensure all tests pass before marking work complete
+
+8. GIT COMMIT: Create a git commit for the implementation:
+   - Check if a git-ops sub-agent exists (look for agents with 'git' in name/description)
+   - If found, delegate commit creation to that sub-agent using Task tool
+   - Provide context: Jira ticket key, summary of changes, files modified
+   - If no git-ops agent exists, create commit directly using Bash tool
+   - Commit message should reference Jira ticket and describe implementation
+   - After successful commit, suggest user runs '/air-review' command to review changes
+
+IMPORTANT INSTRUCTIONS:
+- ALWAYS start by creating the todo list file before doing any other work
+- Execute tasks in the exact order specified in the todo list
+- The strategic plan tells you WHAT to do, you determine HOW to do it
+- Focus on implementation, not redesign - follow the plan's architecture decisions
+- Get user approval before executing implementation tasks", important: true) %>
+
+Always check your knowledge base first for execution-specific guidance and best practices.