Implement GUI Automation Test Commands and Refactor AsarWrapper Usage
- Added new test commands for GUI automation in `test_commands.cc`, including handling test runs, statuses, listings, and results. - Refactored instances of `app::core::AsarWrapper` to `core::AsarWrapper` across multiple files for consistency. - Updated CMake configuration to include new test command files. - Modified integration and unit tests to reflect the changes in AsarWrapper usage. - Ensured proper error handling and output formatting for test commands.
This commit is contained in:
scawful
485
src/cli/handlers/agent/general_commands.cc
Normal file
485
src/cli/handlers/agent/general_commands.cc
Normal file
@@ -0,0 +1,485 @@
|
||||
#include "cli/handlers/agent/commands.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "absl/flags/declare.h"
|
||||
#include "absl/flags/flag.h"
|
||||
#include "absl/status/status.h"
|
||||
#include "absl/status/statusor.h"
|
||||
#include "absl/strings/ascii.h"
|
||||
#include "absl/strings/match.h"
|
||||
#include "absl/strings/str_cat.h"
|
||||
#include "absl/strings/str_format.h"
|
||||
#include "absl/strings/str_replace.h"
|
||||
#include "cli/handlers/agent/common.h"
|
||||
#include "cli/modern_cli.h"
|
||||
#include "cli/service/ai_service.h"
|
||||
#include "cli/service/proposal_registry.h"
|
||||
#include "cli/service/resource_catalog.h"
|
||||
#include "cli/service/rom_sandbox_manager.h"
|
||||
#include "cli/z3ed.h"
|
||||
#include "util/macro.h"
|
||||
|
||||
ABSL_DECLARE_FLAG(std::string, rom);
|
||||
|
||||
|
||||
namespace yaze {
|
||||
namespace cli {
|
||||
namespace agent {
|
||||
|
||||
namespace {
|
||||
|
||||
struct DescribeOptions {
|
||||
std::optional<std::string> resource;
|
||||
std::string format = "json";
|
||||
std::optional<std::string> output_path;
|
||||
std::string version = "0.1.0";
|
||||
std::optional<std::string> last_updated;
|
||||
};
|
||||
|
||||
absl::StatusOr<DescribeOptions> ParseDescribeArgs(
|
||||
const std::vector<std::string>& args) {
|
||||
DescribeOptions options;
|
||||
for (size_t i = 0; i < args.size(); ++i) {
|
||||
const std::string& token = args[i];
|
||||
std::string flag = token;
|
||||
std::optional<std::string> inline_value;
|
||||
|
||||
if (absl::StartsWith(token, "--")) {
|
||||
auto eq_pos = token.find('=');
|
||||
if (eq_pos != std::string::npos) {
|
||||
flag = token.substr(0, eq_pos);
|
||||
inline_value = token.substr(eq_pos + 1);
|
||||
}
|
||||
}
|
||||
|
||||
auto require_value =
|
||||
[&](absl::string_view flag_name) -> absl::StatusOr<std::string> {
|
||||
if (inline_value.has_value()) {
|
||||
return *inline_value;
|
||||
}
|
||||
if (i + 1 >= args.size()) {
|
||||
return absl::InvalidArgumentError(
|
||||
absl::StrFormat("Flag %s requires a value", flag_name));
|
||||
}
|
||||
return args[++i];
|
||||
};
|
||||
|
||||
if (flag == "--resource") {
|
||||
ASSIGN_OR_RETURN(auto value, require_value("--resource"));
|
||||
options.resource = std::move(value);
|
||||
} else if (flag == "--format") {
|
||||
ASSIGN_OR_RETURN(auto value, require_value("--format"));
|
||||
options.format = std::move(value);
|
||||
} else if (flag == "--output") {
|
||||
ASSIGN_OR_RETURN(auto value, require_value("--output"));
|
||||
options.output_path = std::move(value);
|
||||
} else if (flag == "--version") {
|
||||
ASSIGN_OR_RETURN(auto value, require_value("--version"));
|
||||
options.version = std::move(value);
|
||||
} else if (flag == "--last-updated") {
|
||||
ASSIGN_OR_RETURN(auto value, require_value("--last-updated"));
|
||||
options.last_updated = std::move(value);
|
||||
} else {
|
||||
return absl::InvalidArgumentError(
|
||||
absl::StrFormat("Unknown flag for agent describe: %s", token));
|
||||
}
|
||||
}
|
||||
|
||||
options.format = absl::AsciiStrToLower(options.format);
|
||||
if (options.format != "json" && options.format != "yaml") {
|
||||
return absl::InvalidArgumentError("--format must be either json or yaml");
|
||||
}
|
||||
|
||||
return options;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
absl::Status HandleRunCommand(const std::vector<std::string>& arg_vec,
|
||||
Rom& rom) {
|
||||
if (arg_vec.size() < 2 || arg_vec[0] != "--prompt") {
|
||||
return absl::InvalidArgumentError("Usage: agent run --prompt <prompt>");
|
||||
}
|
||||
std::string prompt = arg_vec[1];
|
||||
|
||||
if (!rom.is_loaded()) {
|
||||
std::string rom_path = absl::GetFlag(FLAGS_rom);
|
||||
if (rom_path.empty()) {
|
||||
return absl::FailedPreconditionError(
|
||||
"No ROM loaded. Use --rom=<path> to specify ROM file.\n"
|
||||
"Example: z3ed agent run --rom=zelda3.sfc --prompt \"Your prompt here\"");
|
||||
}
|
||||
|
||||
auto status = rom.LoadFromFile(rom_path);
|
||||
if (!status.ok()) {
|
||||
return absl::FailedPreconditionError(
|
||||
absl::StrFormat("Failed to load ROM from '%s': %s", rom_path,
|
||||
status.message()));
|
||||
}
|
||||
}
|
||||
|
||||
auto sandbox_or = RomSandboxManager::Instance().CreateSandbox(rom,
|
||||
"agent-run");
|
||||
if (!sandbox_or.ok()) {
|
||||
return sandbox_or.status();
|
||||
}
|
||||
auto sandbox = sandbox_or.value();
|
||||
|
||||
auto proposal_or = ProposalRegistry::Instance().CreateProposal(
|
||||
sandbox.id, prompt, "Agent-generated ROM modifications");
|
||||
if (!proposal_or.ok()) {
|
||||
return proposal_or.status();
|
||||
}
|
||||
auto proposal = proposal_or.value();
|
||||
|
||||
RETURN_IF_ERROR(ProposalRegistry::Instance().AppendLog(
|
||||
proposal.id, absl::StrCat("Starting agent run with prompt: ", prompt)));
|
||||
|
||||
MockAIService ai_service;
|
||||
auto commands_or = ai_service.GetCommands(prompt);
|
||||
if (!commands_or.ok()) {
|
||||
RETURN_IF_ERROR(ProposalRegistry::Instance().AppendLog(
|
||||
proposal.id,
|
||||
absl::StrCat("AI service error: ", commands_or.status().message())));
|
||||
return commands_or.status();
|
||||
}
|
||||
std::vector<std::string> commands = commands_or.value();
|
||||
|
||||
RETURN_IF_ERROR(ProposalRegistry::Instance().AppendLog(
|
||||
proposal.id, absl::StrCat("Generated ", commands.size(),
|
||||
" commands")));
|
||||
|
||||
ModernCLI cli;
|
||||
int commands_executed = 0;
|
||||
for (const auto& command : commands) {
|
||||
RETURN_IF_ERROR(ProposalRegistry::Instance().AppendLog(
|
||||
proposal.id, absl::StrCat("Executing: ", command)));
|
||||
|
||||
std::vector<std::string> command_parts;
|
||||
std::string current_part;
|
||||
bool in_quotes = false;
|
||||
for (char c : command) {
|
||||
if (c == '"') {
|
||||
in_quotes = !in_quotes;
|
||||
} else if (c == ' ' && !in_quotes) {
|
||||
command_parts.push_back(current_part);
|
||||
current_part.clear();
|
||||
} else {
|
||||
current_part += c;
|
||||
}
|
||||
}
|
||||
command_parts.push_back(current_part);
|
||||
|
||||
if (command_parts.size() < 2) {
|
||||
auto error_msg = absl::StrFormat("Malformed command: %s", command);
|
||||
RETURN_IF_ERROR(ProposalRegistry::Instance().AppendLog(proposal.id,
|
||||
error_msg));
|
||||
return absl::InvalidArgumentError(error_msg);
|
||||
}
|
||||
|
||||
std::string cmd_name = command_parts[0] + " " + command_parts[1];
|
||||
std::vector<std::string> cmd_args(command_parts.begin() + 2,
|
||||
command_parts.end());
|
||||
|
||||
auto it = cli.commands_.find(cmd_name);
|
||||
if (it != cli.commands_.end()) {
|
||||
auto status = it->second.handler(cmd_args);
|
||||
if (!status.ok()) {
|
||||
RETURN_IF_ERROR(ProposalRegistry::Instance().AppendLog(
|
||||
proposal.id, absl::StrCat("Command failed: ", status.message())));
|
||||
return status;
|
||||
}
|
||||
commands_executed++;
|
||||
RETURN_IF_ERROR(
|
||||
ProposalRegistry::Instance().AppendLog(proposal.id,
|
||||
"Command succeeded"));
|
||||
} else {
|
||||
auto error_msg = absl::StrCat("Unknown command: ", cmd_name);
|
||||
RETURN_IF_ERROR(
|
||||
ProposalRegistry::Instance().AppendLog(proposal.id, error_msg));
|
||||
return absl::NotFoundError(error_msg);
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_IF_ERROR(ProposalRegistry::Instance().AppendLog(
|
||||
proposal.id,
|
||||
absl::StrCat("Completed execution of ", commands_executed,
|
||||
" commands")));
|
||||
|
||||
std::cout << "✅ Agent run completed successfully." << std::endl;
|
||||
std::cout << " Proposal ID: " << proposal.id << std::endl;
|
||||
std::cout << " Sandbox: " << sandbox.rom_path << std::endl;
|
||||
std::cout << " Use 'z3ed agent diff' to review changes" << std::endl;
|
||||
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
absl::Status HandlePlanCommand(const std::vector<std::string>& arg_vec) {
|
||||
if (arg_vec.size() < 2 || arg_vec[0] != "--prompt") {
|
||||
return absl::InvalidArgumentError("Usage: agent plan --prompt <prompt>");
|
||||
}
|
||||
std::string prompt = arg_vec[1];
|
||||
MockAIService ai_service;
|
||||
auto commands_or = ai_service.GetCommands(prompt);
|
||||
if (!commands_or.ok()) {
|
||||
return commands_or.status();
|
||||
}
|
||||
std::vector<std::string> commands = commands_or.value();
|
||||
|
||||
std::cout << "AI Agent Plan:" << std::endl;
|
||||
for (const auto& command : commands) {
|
||||
std::cout << " - " << command << std::endl;
|
||||
}
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
absl::Status HandleDiffCommand(Rom& rom,
|
||||
const std::vector<std::string>& args) {
|
||||
std::optional<std::string> proposal_id;
|
||||
for (size_t i = 0; i < args.size(); ++i) {
|
||||
const std::string& token = args[i];
|
||||
if (absl::StartsWith(token, "--proposal-id=")) {
|
||||
proposal_id = token.substr(14);
|
||||
} else if (token == "--proposal-id" && i + 1 < args.size()) {
|
||||
proposal_id = args[i + 1];
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
auto& registry = ProposalRegistry::Instance();
|
||||
absl::StatusOr<ProposalRegistry::ProposalMetadata> proposal_or;
|
||||
if (proposal_id.has_value()) {
|
||||
proposal_or = registry.GetProposal(proposal_id.value());
|
||||
} else {
|
||||
proposal_or = registry.GetLatestPendingProposal();
|
||||
}
|
||||
|
||||
if (proposal_or.ok()) {
|
||||
const auto& proposal = proposal_or.value();
|
||||
|
||||
std::cout << "\n=== Proposal Diff ===\n";
|
||||
std::cout << "Proposal ID: " << proposal.id << "\n";
|
||||
std::cout << "Sandbox ID: " << proposal.sandbox_id << "\n";
|
||||
std::cout << "Prompt: " << proposal.prompt << "\n";
|
||||
std::cout << "Description: " << proposal.description << "\n";
|
||||
std::cout << "Status: ";
|
||||
switch (proposal.status) {
|
||||
case ProposalRegistry::ProposalStatus::kPending:
|
||||
std::cout << "Pending";
|
||||
break;
|
||||
case ProposalRegistry::ProposalStatus::kAccepted:
|
||||
std::cout << "Accepted";
|
||||
break;
|
||||
case ProposalRegistry::ProposalStatus::kRejected:
|
||||
std::cout << "Rejected";
|
||||
break;
|
||||
}
|
||||
std::cout << "\n";
|
||||
std::cout << "Created: " << absl::FormatTime(proposal.created_at)
|
||||
<< "\n";
|
||||
std::cout << "Commands Executed: " << proposal.commands_executed
|
||||
<< "\n";
|
||||
std::cout << "Bytes Changed: " << proposal.bytes_changed << "\n\n";
|
||||
|
||||
if (std::filesystem::exists(proposal.diff_path)) {
|
||||
std::cout << "--- Diff Content ---\n";
|
||||
std::ifstream diff_file(proposal.diff_path);
|
||||
if (diff_file.is_open()) {
|
||||
std::string line;
|
||||
while (std::getline(diff_file, line)) {
|
||||
std::cout << line << "\n";
|
||||
}
|
||||
} else {
|
||||
std::cout << "(Unable to read diff file)\n";
|
||||
}
|
||||
} else {
|
||||
std::cout << "(No diff file found)\n";
|
||||
}
|
||||
|
||||
std::cout << "\n--- Execution Log ---\n";
|
||||
if (std::filesystem::exists(proposal.log_path)) {
|
||||
std::ifstream log_file(proposal.log_path);
|
||||
if (log_file.is_open()) {
|
||||
std::string line;
|
||||
int line_count = 0;
|
||||
while (std::getline(log_file, line)) {
|
||||
std::cout << line << "\n";
|
||||
line_count++;
|
||||
if (line_count > 50) {
|
||||
std::cout << "... (log truncated, see " << proposal.log_path
|
||||
<< " for full output)\n";
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
std::cout << "(Unable to read log file)\n";
|
||||
}
|
||||
} else {
|
||||
std::cout << "(No log file found)\n";
|
||||
}
|
||||
|
||||
std::cout << "\n=== Next Steps ===\n";
|
||||
std::cout << "To accept changes: z3ed agent commit\n";
|
||||
std::cout << "To reject changes: z3ed agent revert\n";
|
||||
std::cout << "To review in GUI: yaze --proposal=" << proposal.id << "\n";
|
||||
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
if (rom.is_loaded()) {
|
||||
auto sandbox_or = RomSandboxManager::Instance().ActiveSandbox();
|
||||
if (!sandbox_or.ok()) {
|
||||
return absl::NotFoundError(
|
||||
"No pending proposals found and no active sandbox. Run 'z3ed agent run' first.");
|
||||
}
|
||||
RomDiff diff_handler;
|
||||
auto status =
|
||||
diff_handler.Run({rom.filename(), sandbox_or->rom_path.string()});
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
} else {
|
||||
return absl::AbortedError("No ROM loaded.");
|
||||
}
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
absl::Status HandleLearnCommand() {
|
||||
std::cout << "Agent learn not yet implemented." << std::endl;
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
absl::Status HandleListCommand() {
|
||||
auto& registry = ProposalRegistry::Instance();
|
||||
auto proposals = registry.ListProposals();
|
||||
|
||||
if (proposals.empty()) {
|
||||
std::cout << "No proposals found.\n";
|
||||
std::cout
|
||||
<< "Run 'z3ed agent run --prompt \"...\"' to create a proposal.\n";
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
std::cout << "\n=== Agent Proposals ===\n\n";
|
||||
|
||||
for (const auto& proposal : proposals) {
|
||||
std::cout << "ID: " << proposal.id << "\n";
|
||||
std::cout << " Status: ";
|
||||
switch (proposal.status) {
|
||||
case ProposalRegistry::ProposalStatus::kPending:
|
||||
std::cout << "Pending";
|
||||
break;
|
||||
case ProposalRegistry::ProposalStatus::kAccepted:
|
||||
std::cout << "Accepted";
|
||||
break;
|
||||
case ProposalRegistry::ProposalStatus::kRejected:
|
||||
std::cout << "Rejected";
|
||||
break;
|
||||
}
|
||||
std::cout << "\n";
|
||||
std::cout << " Created: " << absl::FormatTime(proposal.created_at)
|
||||
<< "\n";
|
||||
std::cout << " Prompt: " << proposal.prompt << "\n";
|
||||
std::cout << " Commands: " << proposal.commands_executed << "\n";
|
||||
std::cout << " Bytes Changed: " << proposal.bytes_changed << "\n";
|
||||
std::cout << "\n";
|
||||
}
|
||||
|
||||
std::cout << "Total: " << proposals.size() << " proposal(s)\n";
|
||||
std::cout << "\nUse 'z3ed agent diff --proposal-id=<id>' to view details.\n";
|
||||
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
absl::Status HandleCommitCommand(Rom& rom) {
|
||||
if (rom.is_loaded()) {
|
||||
auto status = rom.SaveToFile({.save_new = false});
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
std::cout << "✅ Changes committed successfully." << std::endl;
|
||||
} else {
|
||||
return absl::AbortedError("No ROM loaded.");
|
||||
}
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
absl::Status HandleRevertCommand(Rom& rom) {
|
||||
if (rom.is_loaded()) {
|
||||
auto status = rom.LoadFromFile(rom.filename());
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
std::cout << "✅ Changes reverted successfully." << std::endl;
|
||||
} else {
|
||||
return absl::AbortedError("No ROM loaded.");
|
||||
}
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
absl::Status HandleDescribeCommand(const std::vector<std::string>& arg_vec) {
|
||||
ASSIGN_OR_RETURN(auto options, ParseDescribeArgs(arg_vec));
|
||||
|
||||
const auto& catalog = ResourceCatalog::Instance();
|
||||
std::optional<ResourceSchema> resource_schema;
|
||||
if (options.resource.has_value()) {
|
||||
auto resource_or = catalog.GetResource(*options.resource);
|
||||
if (!resource_or.ok()) {
|
||||
return resource_or.status();
|
||||
}
|
||||
resource_schema = resource_or.value();
|
||||
}
|
||||
|
||||
std::string payload;
|
||||
if (options.format == "json") {
|
||||
if (resource_schema.has_value()) {
|
||||
payload = catalog.SerializeResource(*resource_schema);
|
||||
} else {
|
||||
payload = catalog.SerializeResources(catalog.AllResources());
|
||||
}
|
||||
} else {
|
||||
std::string last_updated = options.last_updated.has_value()
|
||||
? *options.last_updated
|
||||
: absl::FormatTime("%Y-%m-%d", absl::Now(),
|
||||
absl::LocalTimeZone());
|
||||
if (resource_schema.has_value()) {
|
||||
std::vector<ResourceSchema> schemas{*resource_schema};
|
||||
payload = catalog.SerializeResourcesAsYaml(
|
||||
schemas, options.version, last_updated);
|
||||
} else {
|
||||
payload = catalog.SerializeResourcesAsYaml(
|
||||
catalog.AllResources(), options.version, last_updated);
|
||||
}
|
||||
}
|
||||
|
||||
if (options.output_path.has_value()) {
|
||||
std::ofstream out(*options.output_path, std::ios::binary | std::ios::trunc);
|
||||
if (!out.is_open()) {
|
||||
return absl::InternalError(absl::StrFormat(
|
||||
"Failed to open %s for writing", *options.output_path));
|
||||
}
|
||||
out << payload;
|
||||
out.close();
|
||||
if (!out) {
|
||||
return absl::InternalError(absl::StrFormat(
|
||||
"Failed to write schema to %s", *options.output_path));
|
||||
}
|
||||
std::cout << absl::StrFormat("Wrote %s schema to %s", options.format,
|
||||
*options.output_path)
|
||||
<< std::endl;
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
std::cout << payload << std::endl;
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
} // namespace agent
|
||||
} // namespace cli
|
||||
} // namespace yaze
|
||||
Reference in New Issue
Block a user