checkpoint
This commit is contained in:
@@ -177,16 +177,16 @@ def execute_agent(role: str, prompt: str, docs: list[str]) -> str:
|
||||
system_directive = "STRICT SYSTEM DIRECTIVE: You are a stateless Tier 3 Worker (Contributor). " \
|
||||
"Your goal is to implement specific code changes or tests based on the provided task. " \
|
||||
"You have access to tools for reading and writing files (e.g., read_file, write_file, replace), " \
|
||||
"codebase investigation (discovered_tool_get_code_outline, discovered_tool_get_python_skeleton), " \
|
||||
"version control (discovered_tool_get_git_diff), and web tools (discovered_tool_web_search, discovered_tool_fetch_url). " \
|
||||
"You CAN execute PowerShell scripts via discovered_tool_run_powershell for verification and testing. " \
|
||||
"codebase investigation (get_code_outline, get_python_skeleton), " \
|
||||
"version control (get_git_diff), and web tools (web_search, fetch_url). " \
|
||||
"You CAN execute PowerShell scripts via run_powershell for verification and testing. " \
|
||||
"Follow TDD and return success status or code changes. No pleasantries, no conversational filler."
|
||||
elif role in ['tier4', 'tier4-qa']:
|
||||
system_directive = "STRICT SYSTEM DIRECTIVE: You are a stateless Tier 4 QA Agent. " \
|
||||
"Your goal is to analyze errors, summarize logs, or verify tests. " \
|
||||
"You have access to tools for reading files, exploring the codebase (discovered_tool_get_code_outline, discovered_tool_get_python_skeleton), " \
|
||||
"version control (discovered_tool_get_git_diff), and web tools (discovered_tool_web_search, discovered_tool_fetch_url). " \
|
||||
"You CAN execute PowerShell scripts via discovered_tool_run_powershell for diagnostics. " \
|
||||
"You have access to tools for reading files, exploring the codebase (get_code_outline, get_python_skeleton), " \
|
||||
"version control (get_git_diff), and web tools (web_search, fetch_url). " \
|
||||
"You CAN execute PowerShell scripts via run_powershell for diagnostics. " \
|
||||
"ONLY output the requested analysis. No pleasantries."
|
||||
else:
|
||||
system_directive = f"STRICT SYSTEM DIRECTIVE: You are a stateless {role}. " \
|
||||
@@ -209,8 +209,7 @@ def execute_agent(role: str, prompt: str, docs: list[str]) -> str:
|
||||
# Use subprocess with input to pipe the prompt via stdin, avoiding WinError 206.
|
||||
# We use -p 'mma_task' to ensure non-interactive (headless) mode and valid parsing.
|
||||
# Whitelist tools to ensure they are available to the model in headless mode.
|
||||
# Using 'discovered_tool_*' names as they are provided by tool_discovery.py
|
||||
allowed_tools = "read_file,write_file,replace,list_directory,glob,grep_search,discovered_tool_search_files,discovered_tool_get_file_summary,discovered_tool_get_python_skeleton,discovered_tool_get_code_outline,discovered_tool_get_git_diff,discovered_tool_run_powershell,activate_skill,codebase_investigator,discovered_tool_web_search,discovered_tool_fetch_url"
|
||||
allowed_tools = "read_file,write_file,replace,list_directory,glob,grep_search,search_files,get_file_summary,get_python_skeleton,get_code_outline,get_git_diff,run_powershell,activate_skill,codebase_investigator,web_search,fetch_url"
|
||||
ps_command = (
|
||||
f"if (Test-Path 'C:\\projects\\misc\\setup_gemini.ps1') {{ . 'C:\\projects\\misc\\setup_gemini.ps1' }}; "
|
||||
f"gemini -p 'mma_task' --allowed-tools {allowed_tools} --output-format json --model {model}"
|
||||
|
||||
@@ -7,8 +7,9 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
||||
|
||||
try:
|
||||
import mcp_client
|
||||
import shell_runner
|
||||
except ImportError:
|
||||
print(json.dumps({"error": "Failed to import mcp_client"}))
|
||||
print(json.dumps({"error": "Failed to import required modules"}))
|
||||
sys.exit(1)
|
||||
|
||||
def main():
|
||||
@@ -30,14 +31,15 @@ def main():
|
||||
sys.exit(1)
|
||||
|
||||
try:
|
||||
# Note: mcp_client.configure() is usually called by the GUI before each session,
|
||||
# but for direct CLI calls, we might need a basic configuration.
|
||||
# However, mcp_client tools generally resolve paths relative to CWD if not configured.
|
||||
result = mcp_client.dispatch(tool_name, tool_input)
|
||||
if tool_name == "run_powershell":
|
||||
script = tool_input.get("script", "")
|
||||
# We use the current directory as base_dir for CLI calls
|
||||
result = shell_runner.run_powershell(script, os.getcwd())
|
||||
else:
|
||||
# mcp_client tools generally resolve paths relative to CWD if not configured.
|
||||
result = mcp_client.dispatch(tool_name, tool_input)
|
||||
|
||||
# We wrap the result in a JSON object for consistency if needed,
|
||||
# but the CLI often expects just the string result from stdout.
|
||||
# Actually, let's just print the raw result string as that's what mcp_client returns.
|
||||
# We print the raw result string as that's what gemini-cli expects.
|
||||
print(result)
|
||||
except Exception as e:
|
||||
print(f"ERROR executing tool {tool_name}: {e}")
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
import json
|
||||
import sys
|
||||
import os
|
||||
|
||||
# Add project root to sys.path
|
||||
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
||||
|
||||
try:
|
||||
import mcp_client
|
||||
except ImportError:
|
||||
print("[]")
|
||||
sys.exit(0)
|
||||
|
||||
def main():
|
||||
specs = list(mcp_client.MCP_TOOL_SPECS)
|
||||
|
||||
# Add run_powershell (manually define to match ai_client.py)
|
||||
specs.append({
|
||||
"name": "run_powershell",
|
||||
"description": (
|
||||
"Run a PowerShell script within the project base_dir. "
|
||||
"Use this to create, edit, rename, or delete files and directories. "
|
||||
"The working directory is set to base_dir automatically. "
|
||||
"stdout and stderr are returned to you as the result."
|
||||
),
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"script": {
|
||||
"type": "string",
|
||||
"description": "The PowerShell script to execute."
|
||||
}
|
||||
},
|
||||
"required": ["script"]
|
||||
}
|
||||
})
|
||||
|
||||
# Output as JSON array of FunctionDeclarations
|
||||
print(json.dumps(specs, indent=2))
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user