brainiac 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6381c1bf1bde343e16c3eef756bb6a761b3640e1adfc645ab3e7deb202c11d80
-  data.tar.gz: c2391c9fcc3794a03a18bafcf12c6610ca354069b7d7a98aa0a5e5087eff5589
+  metadata.gz: 1ecf3d562c59eaeb76f9c1e4ceb87f3ed8c1cabb4cc6c3ddc6837e7c38fe4e8d
+  data.tar.gz: 60abd844fa6877850aaf37f603229beae693d3aa8b8d82194ac378844009e766
 SHA512:
-  metadata.gz: 6edc692e8d96466267b99044787c4150441d8970eb004aee050343ec205e717756d8cd7e148ba886590ca3634cc4c6b831802037f9d4e946ebd30fadae17c0c6
-  data.tar.gz: c2f136d341a372039ec5d45b775488b9efc3f97d01679d3ce7f4765e0e397d45e54fa83cc698068be98e38fec8cc2fe4e778425d2d712ea8fa1046787822ef09
+  metadata.gz: ab7cd6b237850d08abfb1586a45cbed1e6252196be96a1927e14b1908dab5dd6b992aaeb34a0bfed693fde8c6e296efad10b7ea2974d4daf4fc17aaaea063f5a
+  data.tar.gz: 06f90d59ed0584c9c1d94a3feac2b5ed3430c39dcc8579d4f1e18100114a8ac5feb7f3d0d1da74a128a6506da735a5b626bb072cc4457a67aa68dfe7cb196cb4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brainiac (0.0.2)
+    brainiac (0.0.3)
       puma (~> 7.2)
       rackup (~> 2.3)
       sinatra (~> 4.1)
@@ -90,7 +90,7 @@ DEPENDENCIES
 CHECKSUMS
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
-  brainiac (0.0.2)
+  brainiac (0.0.3)
   event_emitter (0.2.6) sha256=c72697bd5cce9d36594be1972c17f1c9a573236f44303a4d1d548080364e1391
   json (2.19.9) sha256=9b9025b7cdddafa38d316eca0b2358488e42d417045c1b90d216a9fefe46b79a
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc

data/bin/brainiac

@@ -1395,6 +1395,307 @@ when "provider"
     HELP
   end
 
+when "agent"
+  agent_cmd = ARGV.shift
+  agent_registry_file = File.join(BRAINIAC_DIR, "agents.json")
+
+  case agent_cmd
+  when "list", "ls"
+    registry = File.exist?(agent_registry_file) ? JSON.parse(File.read(agent_registry_file)) : {}
+    if registry.empty?
+      puts "No agents in registry."
+    else
+      agents = registry.select { |_, e| e.is_a?(Hash) }.map do |key, entry|
+        display = entry["fizzy_name"] || key.capitalize
+        details = []
+        if entry["role"]
+          roles = Array(entry["role"])
+          details << roles.join(", ")
+        end
+        details << "cli:#{entry["cli_provider"]}" if entry["cli_provider"]
+        details << "env:#{entry["env"].size}" if entry["env"]&.any?
+        { key: key, display: display, local: entry["local"], details: details.join(" | ") }
+      end
+
+      local, remote = agents.partition { |a| a[:local] }
+
+      local.each do |a|
+        line = "  #{a[:display]} (#{a[:key]})"
+        line += "  #{a[:details]}" unless a[:details].empty?
+        puts line
+      end
+
+      unless remote.empty?
+        puts "" if local.any?
+        puts "  Remote:" if local.any?
+        remote.each do |a|
+          line = "  #{a[:display]} (#{a[:key]})"
+          line += "  #{a[:details]}" unless a[:details].empty?
+          puts line
+        end
+      end
+    end
+
+  when nil
+    puts <<~HELP
+      Usage: brainiac agent <name> <command> [args]
+             brainiac agent list
+
+      Commands:
+        list                              List all agents in the registry
+        <name> show                       Show agent configuration (tokens redacted)
+        <name> env <KEY> <VALUE>          Set an env var for an agent
+        <name> env                        List env vars for an agent
+        <name> env --delete <KEY>         Remove an env var from an agent
+
+      Examples:
+        brainiac agent galen env FIZZY_TOKEN fizzy_abc123
+        brainiac agent galen env DISCORD_BOT_TOKEN Bot_xyz789
+        brainiac agent galen env
+        brainiac agent galen env --delete DISCORD_BOT_TOKEN
+        brainiac agent galen show
+    HELP
+
+  else
+    # Pattern: brainiac agent <name> <subcommand> [args]
+    agent_key = agent_cmd.downcase.gsub(/[^a-z0-9-]/, "-")
+    sub = ARGV.shift
+
+    case sub
+    when "show", nil
+      registry = File.exist?(agent_registry_file) ? JSON.parse(File.read(agent_registry_file)) : {}
+      entry = registry[agent_key]
+      unless entry
+        puts "Agent '#{agent_cmd}' not found in registry."
+        exit 1
+      end
+      # Redact tokens in output
+      display = entry.dup
+      if display["env"]
+        display["env"] = display["env"].transform_values { |v| v.length > 10 ? "#{v[0..6]}...#{v[-4..]}" : v }
+      end
+      puts JSON.pretty_generate(display)
+
+    when "env"
+      if ARGV[0] == "--delete"
+        ARGV.shift
+        var_name = ARGV.shift
+        unless var_name
+          puts "Usage: brainiac agent #{agent_cmd} env --delete <KEY>"
+          exit 1
+        end
+        registry = File.exist?(agent_registry_file) ? JSON.parse(File.read(agent_registry_file)) : {}
+        unless registry.dig(agent_key, "env", var_name)
+          puts "#{var_name} not set for '#{agent_cmd}'."
+          exit 1
+        end
+        registry[agent_key]["env"].delete(var_name)
+        registry[agent_key].delete("env") if registry[agent_key]["env"].empty?
+        File.write(agent_registry_file, JSON.pretty_generate(registry))
+        puts "✓ Removed #{var_name} from #{agent_cmd}"
+
+      elsif ARGV.empty?
+        # List env vars
+        registry = File.exist?(agent_registry_file) ? JSON.parse(File.read(agent_registry_file)) : {}
+        entry = registry[agent_key]
+        unless entry.is_a?(Hash) && entry["env"]&.any?
+          puts "No env vars configured for '#{agent_cmd}'."
+          exit 0
+        end
+        entry["env"].each do |k, v|
+          preview = v.length > 20 ? "#{v[0..16]}..." : v
+          puts "  #{k}=#{preview}"
+        end
+
+      else
+        var_name = ARGV.shift
+        var_value = ARGV.shift
+        unless var_name && var_value
+          puts "Usage: brainiac agent #{agent_cmd} env <KEY> <VALUE>"
+          exit 1
+        end
+        registry = File.exist?(agent_registry_file) ? JSON.parse(File.read(agent_registry_file)) : {}
+        registry[agent_key] ||= {}
+        registry[agent_key]["env"] ||= {}
+        registry[agent_key]["env"][var_name] = var_value
+        File.write(agent_registry_file, JSON.pretty_generate(registry))
+        puts "✓ Set #{var_name} for #{agent_cmd}"
+      end
+
+    else
+      puts "Unknown subcommand '#{sub}' for agent '#{agent_cmd}'."
+      puts "Available: show, env"
+      exit 1
+    end
+  end
+
+when "role"
+  role_cmd = ARGV.shift
+  roles_dir = File.join(BRAINIAC_DIR, "roles")
+
+  case role_cmd
+  when "list", "ls"
+    unless Dir.exist?(roles_dir)
+      puts "No roles configured. Create markdown files in #{roles_dir}/"
+      exit 0
+    end
+    files = Dir.glob(File.join(roles_dir, "*.md"))
+    if files.empty?
+      puts "No roles configured. Create markdown files in #{roles_dir}/"
+    else
+      # Show which agents use each role
+      registry_file = File.join(BRAINIAC_DIR, "agents.json")
+      registry = File.exist?(registry_file) ? JSON.parse(File.read(registry_file)) : {}
+      agent_roles = {}
+      registry.each do |key, entry|
+        next unless entry.is_a?(Hash) && entry["role"]
+
+        roles = entry["role"].is_a?(Array) ? entry["role"] : [entry["role"]]
+        roles.each do |r|
+          agent_roles[r] ||= []
+          agent_roles[r] << (entry["fizzy_name"] || key.capitalize)
+        end
+      end
+
+      files.each do |f|
+        name = File.basename(f, ".md")
+        # Read first non-empty, non-heading line as description
+        desc = File.readlines(f).find { |l| !l.strip.empty? && !l.start_with?("#") && !l.start_with?("---") }&.strip || ""
+        agents = agent_roles[name]
+        agent_str = agents ? " (#{agents.join(", ")})" : ""
+        puts "#{name}#{agent_str} — #{desc[0..70]}"
+      end
+    end
+
+  when "show"
+    name = ARGV[0]
+    unless name
+      puts "Usage: brainiac role show <name>"
+      exit 1
+    end
+    file = File.join(roles_dir, "#{name}.md")
+    unless File.exist?(file)
+      puts "Role '#{name}' not found. Available: #{Dir.glob(File.join(roles_dir, "*.md")).map { |f| File.basename(f, ".md") }.join(", ")}"
+      exit 1
+    end
+    puts File.read(file)
+
+  when "assign"
+    agent_name = ARGV[0]
+    role_name = ARGV[1]
+    unless agent_name && role_name
+      puts "Usage: brainiac role assign <agent> <role>"
+      exit 1
+    end
+
+    file = File.join(roles_dir, "#{role_name}.md")
+    unless File.exist?(file)
+      puts "Role '#{role_name}' not found."
+      exit 1
+    end
+
+    registry_file = File.join(BRAINIAC_DIR, "agents.json")
+    registry = File.exist?(registry_file) ? JSON.parse(File.read(registry_file)) : {}
+    key = agent_name.downcase.gsub(/[^a-z0-9-]/, "-")
+    registry[key] ||= {}
+
+    # Normalize existing role field to array
+    existing = registry[key]["role"]
+    roles = case existing
+            when Array then existing
+            when String then [existing]
+            else []
+            end
+
+    if roles.include?(role_name)
+      puts "#{agent_name} already has role '#{role_name}'"
+    else
+      roles << role_name
+      registry[key]["role"] = roles.size == 1 ? roles.first : roles
+      File.write(registry_file, JSON.pretty_generate(registry))
+      puts "✓ Assigned role '#{role_name}' to #{agent_name}"
+    end
+
+  when "unassign", "remove-from"
+    agent_name = ARGV[0]
+    role_name = ARGV[1]
+    unless agent_name && role_name
+      puts "Usage: brainiac role unassign <agent> <role>"
+      exit 1
+    end
+
+    registry_file = File.join(BRAINIAC_DIR, "agents.json")
+    registry = File.exist?(registry_file) ? JSON.parse(File.read(registry_file)) : {}
+    key = agent_name.downcase.gsub(/[^a-z0-9-]/, "-")
+
+    unless registry[key]
+      puts "Agent '#{agent_name}' not found in registry."
+      exit 1
+    end
+
+    existing = registry[key]["role"]
+    roles = case existing
+            when Array then existing
+            when String then [existing]
+            else []
+            end
+
+    unless roles.include?(role_name)
+      puts "#{agent_name} doesn't have role '#{role_name}'"
+      exit 1
+    end
+
+    roles.delete(role_name)
+    if roles.empty?
+      registry[key].delete("role")
+    elsif roles.size == 1
+      registry[key]["role"] = roles.first
+    else
+      registry[key]["role"] = roles
+    end
+    File.write(registry_file, JSON.pretty_generate(registry))
+    puts "✓ Removed role '#{role_name}' from #{agent_name}"
+
+  when "create", "add"
+    name = ARGV[0]
+    unless name
+      puts "Usage: brainiac role create <name>"
+      exit 1
+    end
+    FileUtils.mkdir_p(roles_dir)
+    file = File.join(roles_dir, "#{name}.md")
+    if File.exist?(file)
+      puts "Role '#{name}' already exists. Edit #{file} directly."
+      exit 1
+    end
+    File.write(file, "# Role: #{name.split("-").map(&:capitalize).join(" ")}\n\nDescribe this role's responsibilities here.\n")
+    puts "Created #{file} — edit it to define the role."
+
+  else
+    puts <<~HELP
+      Usage: brainiac role <command>
+
+      Commands:
+        list                   List configured roles
+        show <name>            Show role definition
+        create <name>          Create a new role file
+        assign <agent> <role>    Assign a role to an agent (additive)
+        unassign <agent> <role>  Remove a role from an agent
+    HELP
+  end
+
+when "completions"
+  completion_file = File.join(__dir__, "brainiac-completion.bash")
+  if ARGV[0] == "--install"
+    target = File.expand_path("~/.brainiac/brainiac-completion.bash")
+    FileUtils.cp(completion_file, target)
+    puts "Installed to #{target}"
+    puts "Add to your ~/.bashrc:"
+    puts "  source #{target}"
+  else
+    puts File.read(completion_file)
+  end
+
 when "version", "--version", "-v"
   puts "brainiac #{BRAINIAC_VERSION}"
 
@@ -1419,6 +1720,8 @@ when "help", "--help", "-h", nil
       brainiac discord <command>      Manage the Discord bot
       brainiac cron <command>         Manage scheduled agent tasks
       brainiac provider <command>     Manage CLI providers
+      brainiac role <command>         Manage agent roles
+      brainiac agent <command>        Manage agent registry (env, list, show)
       brainiac config                 Configure Brainiac CLI
       brainiac path                   Show Brainiac config directory
       brainiac version                Show version
@@ -1462,6 +1765,20 @@ when "help", "--help", "-h", nil
       provider show <name>             Show provider configuration
       provider add <name>              Create a new provider config
 
+    Role Commands:
+      role list                        List configured roles and assignments
+      role show <name>                 Show role definition
+      role create <name>               Create a new role file
+      role assign <agent> <role>       Assign a role to an agent (additive)
+      role unassign <agent> <role>     Remove a role from an agent
+
+    Agent Commands:
+      agent list                         List all agents in the registry
+      agent <name> show                  Show agent configuration (tokens redacted)
+      agent <name> env <KEY> <VALUE>     Set an env var for an agent
+      agent <name> env                   List env vars for an agent
+      agent <name> env --delete <KEY>    Remove an env var from an agent
+
     Examples:
       # Start the server in the foreground (like rails server)
       brainiac server

data/bin/brainiac-completion.bash

@@ -0,0 +1,178 @@
+_brainiac() {
+  local cur prev words cword
+  COMPREPLY=()
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+  words=("${COMP_WORDS[@]}")
+  cword=$COMP_CWORD
+
+  local brainiac_dir="${BRAINIAC_DIR:-$HOME/.brainiac}"
+
+  # Top-level commands
+  local commands="server stop restart logs status register unregister list show brain discord cron provider role agent config path version help setup projects card-map"
+
+  # Helper: list agent keys from registry
+  _brainiac_agents() {
+    if [[ -f "$brainiac_dir/agents.json" ]]; then
+      ruby -rjson -e 'JSON.parse(File.read(ARGV[0])).each_key { |k| puts k }' "$brainiac_dir/agents.json" 2>/dev/null
+    fi
+  }
+
+  # Helper: list role names from roles directory
+  _brainiac_roles() {
+    if [[ -d "$brainiac_dir/roles" ]]; then
+      ls "$brainiac_dir/roles/"*.md 2>/dev/null | xargs -I{} basename {} .md
+    fi
+  }
+
+  # Helper: list provider names
+  _brainiac_providers() {
+    if [[ -d "$brainiac_dir/cli-providers" ]]; then
+      ls "$brainiac_dir/cli-providers/"*.json 2>/dev/null | xargs -I{} basename {} .json
+    fi
+  }
+
+  # Determine position in command
+  case $cword in
+    1)
+      COMPREPLY=($(compgen -W "$commands" -- "$cur"))
+      return
+      ;;
+  esac
+
+  local cmd="${words[1]}"
+
+  case "$cmd" in
+    role)
+      case $cword in
+        2)
+          COMPREPLY=($(compgen -W "list show create assign unassign" -- "$cur"))
+          ;;
+        3)
+          local subcmd="${words[2]}"
+          case "$subcmd" in
+            assign|unassign)
+              COMPREPLY=($(compgen -W "$(_brainiac_agents)" -- "$cur"))
+              ;;
+            show)
+              COMPREPLY=($(compgen -W "$(_brainiac_roles)" -- "$cur"))
+              ;;
+          esac
+          ;;
+        4)
+          local subcmd="${words[2]}"
+          case "$subcmd" in
+            assign|unassign)
+              COMPREPLY=($(compgen -W "$(_brainiac_roles)" -- "$cur"))
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+
+    agent)
+      case $cword in
+        2)
+          COMPREPLY=($(compgen -W "list $(_brainiac_agents)" -- "$cur"))
+          ;;
+        3)
+          local agent_name="${words[2]}"
+          if [[ "$agent_name" != "list" ]]; then
+            COMPREPLY=($(compgen -W "show env" -- "$cur"))
+          fi
+          ;;
+        4)
+          local subcmd="${words[3]}"
+          if [[ "$subcmd" == "env" ]]; then
+            # Suggest --delete or existing env var names for this agent
+            local agent_key="${words[2]}"
+            local env_keys=""
+            if [[ -f "$brainiac_dir/agents.json" ]]; then
+              env_keys=$(ruby -rjson -e '
+                reg = JSON.parse(File.read(ARGV[0]))
+                entry = reg[ARGV[1]] || reg[ARGV[1].downcase]
+                (entry&.dig("env") || {}).each_key { |k| puts k }
+              ' "$brainiac_dir/agents.json" "$agent_key" 2>/dev/null)
+            fi
+            COMPREPLY=($(compgen -W "--delete $env_keys" -- "$cur"))
+          fi
+          ;;
+        5)
+          # After --delete, suggest env var names
+          if [[ "${words[3]}" == "env" && "${words[4]}" == "--delete" ]]; then
+            local agent_key="${words[2]}"
+            local env_keys=""
+            if [[ -f "$brainiac_dir/agents.json" ]]; then
+              env_keys=$(ruby -rjson -e '
+                reg = JSON.parse(File.read(ARGV[0]))
+                entry = reg[ARGV[1]] || reg[ARGV[1].downcase]
+                (entry&.dig("env") || {}).each_key { |k| puts k }
+              ' "$brainiac_dir/agents.json" "$agent_key" 2>/dev/null)
+            fi
+            COMPREPLY=($(compgen -W "$env_keys" -- "$cur"))
+          fi
+          ;;
+      esac
+      ;;
+
+    provider)
+      case $cword in
+        2)
+          COMPREPLY=($(compgen -W "list show add" -- "$cur"))
+          ;;
+        3)
+          local subcmd="${words[2]}"
+          if [[ "$subcmd" == "show" ]]; then
+            COMPREPLY=($(compgen -W "$(_brainiac_providers)" -- "$cur"))
+          fi
+          ;;
+      esac
+      ;;
+
+    brain)
+      case $cword in
+        2)
+          COMPREPLY=($(compgen -W "init status search list path" -- "$cur"))
+          ;;
+        3)
+          local subcmd="${words[2]}"
+          if [[ "$subcmd" == "init" || "$subcmd" == "status" ]]; then
+            COMPREPLY=($(compgen -W "$(_brainiac_agents)" -- "$cur"))
+          fi
+          ;;
+      esac
+      ;;
+
+    discord)
+      case $cword in
+        2)
+          COMPREPLY=($(compgen -W "config default map owner token agents status" -- "$cur"))
+          ;;
+        3)
+          local subcmd="${words[2]}"
+          if [[ "$subcmd" == "token" ]]; then
+            COMPREPLY=($(compgen -W "$(_brainiac_agents)" -- "$cur"))
+          fi
+          ;;
+      esac
+      ;;
+
+    cron)
+      case $cword in
+        2)
+          COMPREPLY=($(compgen -W "add list remove enable disable update" -- "$cur"))
+          ;;
+      esac
+      ;;
+
+    projects)
+      case $cword in
+        2)
+          COMPREPLY=($(compgen -W "list default" -- "$cur"))
+          ;;
+      esac
+      ;;
+  esac
+}
+
+complete -F _brainiac brainiac

data/lib/brainiac/agents.rb

@@ -119,6 +119,40 @@ def fizzy_display_name(agent_name)
   entry["fizzy_name"] || agent_name
 end
 
+# Get the role name(s) configured for an agent in agents.json.
+# Returns an array of role names (may be empty).
+def agent_roles_for(agent_name)
+  return [] unless agent_name
+
+  key = agent_name.downcase.gsub(/[^a-z0-9-]/, "-")
+  entry = AGENT_REGISTRY[key]
+  return [] unless entry.is_a?(Hash)
+
+  roles = entry["role"]
+  case roles
+  when Array then roles
+  when String then [roles]
+  else []
+  end
+end
+
+# Load a role definition from ~/.brainiac/roles/<name>.md.
+# Returns the file content (markdown) or nil if not found.
+def load_role(role_name)
+  return nil unless role_name
+
+  role_file = File.join(ROLES_DIR, "#{role_name}.md")
+  return nil unless File.exist?(role_file)
+
+  content = File.read(role_file).strip
+  # Strip YAML front matter if present
+  content = content.sub(/\A---\n.*?\n---\n*/m, "").strip
+  content.empty? ? nil : content
+rescue StandardError => e
+  LOG.warn "Failed to load role '#{role_name}': #{e.message}"
+  nil
+end
+
 def agent_roster
   roster = {}
   all_agent_names.each { |name| roster[name.downcase] = fizzy_display_name(name) }

data/lib/brainiac/brain.rb

@@ -134,6 +134,27 @@ def extract_topics(card_title, comment_body, project_key)
   topics.compact.uniq
 end
 
+def build_role_section(agent_name)
+  roles = agent_roles_for(agent_name)
+  return nil if roles.empty?
+
+  sections = roles.filter_map do |role_name|
+    content = load_role(role_name)
+    next unless content
+
+    "### #{role_name}\n\n#{content}"
+  end
+  return nil if sections.empty?
+
+  <<~ROLE
+    ## Role#{"s" if roles.size > 1} (#{roles.join(", ")})
+    The following defines your role and responsibilities for this session.
+    Follow these instructions for how you approach work.
+
+    #{sections.join("\n\n")}
+  ROLE
+end
+
 def build_brain_context(agent_name: AI_AGENT_NAME, card_title: "", card_number: nil, project_key: nil, comment_body: "", source: nil)
   Thread.new { brain_pull }
 
@@ -164,6 +185,10 @@ def build_brain_context(agent_name: AI_AGENT_NAME, card_title: "", card_number:
 
   sections = []
 
+  # Role: CLI-agnostic agent role definition from ~/.brainiac/roles/
+  role_section = build_role_section(agent_name)
+  sections << role_section if role_section
+
   unless persona_result.empty?
     sections << <<~PERSONA
       ## Brain — Persona (auto-retrieved, CRITICAL)

data/lib/brainiac/config.rb

@@ -49,6 +49,10 @@ MEMORY_BASE_DIR      = File.join(BRAINIAC_DIR, "brain", "memory")
 MEMORY_FILE_TEMPLATE = "card-{{CARD_ID}}.md"
 KNOWLEDGE_COLLECTION = "brainiac-knowledge"
 
+# --- Roles ---
+
+ROLES_DIR = File.join(BRAINIAC_DIR, "roles")
+
 # --- Fizzy auth ---
 
 FIZZY_CONFIG_FILE = File.join(BRAINIAC_DIR, "fizzy.json")

data/lib/brainiac/cron.rb

@@ -542,7 +542,9 @@ def execute_cron_job(job)
   FileUtils.mkdir_p(File.dirname(log_file))
 
   prompt_file = write_cron_prompt_file(job, prompt_data[:full_prompt], timestamp)
-  cmd = build_cron_agent_cmd(job, project)
+  resolved = resolve_project_cli_config(project, agent_name: agent_name)
+  cmd = build_cron_agent_cmd(job, project, prompt_file: prompt_file)
+  prompt_mode = resolved["prompt_mode"] || "stdin"
 
   LOG.info "[Cron] Dispatching job #{job[:id]} with #{agent_name}, tail -f #{log_file}"
 
@@ -551,7 +553,7 @@ def execute_cron_job(job)
 
   pid = spawn(spawn_env, *cmd,
               chdir: project["repo_path"],
-              in: prompt_file,
+              **(prompt_mode == "stdin" ? { in: prompt_file } : {}),
               out: [log_file, "w"],
               err: %i[child out])
 
@@ -573,15 +575,16 @@ def write_cron_prompt_file(job, prompt_content, timestamp)
 end
 
 # Build the CLI command array for a cron agent invocation.
-def build_cron_agent_cmd(job, project)
+def build_cron_agent_cmd(job, project, prompt_file: nil)
   agent_config_name = job[:agent].downcase.gsub(/[^a-z0-9-]/, "-")
-  resolved = resolve_project_cli_config(project)
+  resolved = resolve_project_cli_config(project, agent_name: job[:agent])
+  agent_flag = resolved.key?("agent_flag") ? resolved["agent_flag"] : "--agent"
   cmd = [resolved["agent_cli"]]
-  cmd.push("--agent", agent_config_name)
+  cmd.push(agent_flag, agent_config_name) if agent_flag
   cmd.concat(resolved["agent_cli_args"].split)
-  add_trust_tools!(cmd, resolved["agent_cli_args"])
   cmd.push(resolved["agent_model_flag"], job[:model]) if resolved["agent_model_flag"]&.length&.positive? && job[:model]
   cmd.push(resolved["agent_effort_flag"], job[:effort]) if resolved["agent_effort_flag"]&.length&.positive? && job[:effort]
+  cmd.push(resolved["prompt_flag"], prompt_file) if prompt_file && resolved["prompt_mode"] == "flag" && resolved["prompt_flag"]
   cmd
 end