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
2025-10-02 19:33:05 -04:00
parent d8f863a9ce
commit 6b13c2ea0a
38 changed files with 2096 additions and 1795 deletions

View File

@@ -236,14 +236,14 @@ if(YAZE_WITH_GRPC)
# Add service implementation sources
target_sources(yaze PRIVATE
${CMAKE_SOURCE_DIR}/src/app/core/imgui_test_harness_service.cc
${CMAKE_SOURCE_DIR}/src/app/core/imgui_test_harness_service.h
${CMAKE_SOURCE_DIR}/src/app/core/test_recorder.cc
${CMAKE_SOURCE_DIR}/src/app/core/test_recorder.h
${CMAKE_SOURCE_DIR}/src/app/core/test_script_parser.cc
${CMAKE_SOURCE_DIR}/src/app/core/test_script_parser.h
${CMAKE_SOURCE_DIR}/src/app/core/widget_discovery_service.cc
${CMAKE_SOURCE_DIR}/src/app/core/widget_discovery_service.h)
${CMAKE_SOURCE_DIR}/src/app/core/service/imgui_test_harness_service.cc
${CMAKE_SOURCE_DIR}/src/app/core/service/imgui_test_harness_service.h
${CMAKE_SOURCE_DIR}/src/app/core/service/widget_discovery_service.cc
${CMAKE_SOURCE_DIR}/src/app/core/service/widget_discovery_service.h
${CMAKE_SOURCE_DIR}/src/app/core/testing/test_recorder.cc
${CMAKE_SOURCE_DIR}/src/app/core/testing/test_recorder.h
${CMAKE_SOURCE_DIR}/src/app/core/testing/test_script_parser.cc
${CMAKE_SOURCE_DIR}/src/app/core/testing/test_script_parser.h)
target_include_directories(yaze PRIVATE
${CMAKE_SOURCE_DIR}/third_party/json/include)

View File

@@ -12,7 +12,6 @@
#include "asar-dll-bindings/c/asar.h"
namespace yaze {
namespace app {
namespace core {
AsarWrapper::AsarWrapper() : initialized_(false) {}
@@ -293,5 +292,4 @@ AsarSymbol AsarWrapper::ConvertAsarSymbol(const void* asar_symbol_data) const {
}
} // namespace core
} // namespace app
} // namespace yaze

View File

@@ -11,7 +11,6 @@
#include "absl/status/statusor.h"
namespace yaze {
namespace app {
namespace core {
/**
@@ -206,7 +205,6 @@ class AsarWrapper {
};
} // namespace core
} // namespace app
} // namespace yaze
#endif // YAZE_APP_CORE_ASAR_WRAPPER_H

View File

@@ -3,7 +3,7 @@ syntax = "proto3";
package yaze.test;
// ImGuiTestHarness service for remote GUI testing
// This service allows z3ed CLI to interact with YAZE's GUI for automated testing
// Allows z3ed CLI to interact with YAZE's GUI for automated testing
service ImGuiTestHarness {
// Health check - verifies the service is running
rpc Ping(PingRequest) returns (PingResponse);

View File

@@ -1,4 +1,4 @@
#include "app/core/imgui_test_harness_service.h"
#include "app/core/service/imgui_test_harness_service.h"
#ifdef YAZE_WITH_GRPC
@@ -21,7 +21,7 @@
#include "absl/time/time.h"
#include "app/core/proto/imgui_test_harness.grpc.pb.h"
#include "app/core/proto/imgui_test_harness.pb.h"
#include "app/core/test_script_parser.h"
#include "app/core/testing/test_script_parser.h"
#include "app/test/test_manager.h"
#include "yaze.h" // For YAZE_VERSION_STRING

View File

@@ -1,5 +1,5 @@
#ifndef YAZE_APP_CORE_IMGUI_TEST_HARNESS_SERVICE_H_
#define YAZE_APP_CORE_IMGUI_TEST_HARNESS_SERVICE_H_
#ifndef YAZE_APP_CORE_SERVICE_IMGUI_TEST_HARNESS_SERVICE_H_
#define YAZE_APP_CORE_SERVICE_IMGUI_TEST_HARNESS_SERVICE_H_
#ifdef YAZE_WITH_GRPC
@@ -8,8 +8,8 @@
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "app/core/test_recorder.h"
#include "app/core/widget_discovery_service.h"
#include "app/core/service/widget_discovery_service.h"
#include "app/core/testing/test_recorder.h"
// Include grpcpp headers for unique_ptr<Server> in member variable
#include <grpcpp/server.h>
@@ -153,4 +153,4 @@ class ImGuiTestHarnessServer {
} // namespace yaze
#endif // YAZE_WITH_GRPC
#endif // YAZE_APP_CORE_IMGUI_TEST_HARNESS_SERVICE_H_
#endif // YAZE_APP_CORE_SERVICE_IMGUI_TEST_HARNESS_SERVICE_H_

View File

@@ -1,4 +1,4 @@
#include "app/core/widget_discovery_service.h"
#include "app/core/service/widget_discovery_service.h"
#include <algorithm>
#include <map>

View File

@@ -1,5 +1,5 @@
#ifndef YAZE_APP_CORE_WIDGET_DISCOVERY_SERVICE_H_
#define YAZE_APP_CORE_WIDGET_DISCOVERY_SERVICE_H_
#ifndef YAZE_APP_CORE_SERVICE_WIDGET_DISCOVERY_SERVICE_H_
#define YAZE_APP_CORE_SERVICE_WIDGET_DISCOVERY_SERVICE_H_
#include <string>
#include <vector>
@@ -44,4 +44,4 @@ class WidgetDiscoveryService {
} // namespace test
} // namespace yaze
#endif // YAZE_APP_CORE_WIDGET_DISCOVERY_SERVICE_H_
#endif // YAZE_APP_CORE_SERVICE_WIDGET_DISCOVERY_SERVICE_H_

View File

@@ -1,4 +1,4 @@
#include "app/core/test_recorder.h"
#include "app/core/testing/test_recorder.h"
#include <utility>
@@ -7,7 +7,7 @@
#include "absl/strings/str_format.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
#include "app/core/test_script_parser.h"
#include "app/core/testing/test_script_parser.h"
#include "app/test/test_manager.h"
namespace yaze {

View File

@@ -1,5 +1,5 @@
#ifndef YAZE_APP_CORE_TEST_RECORDER_H_
#define YAZE_APP_CORE_TEST_RECORDER_H_
#ifndef YAZE_APP_CORE_TESTING_TEST_RECORDER_H_
#define YAZE_APP_CORE_TESTING_TEST_RECORDER_H_
#include <map>
#include <string>
@@ -52,7 +52,7 @@ class TestRecorder {
std::vector<std::string> assertion_failures;
std::string expected_value;
std::string actual_value;
HarnessTestStatus final_status = HarnessTestStatus::kUnspecified;
HarnessTestStatus final_status = HarnessTestStatus::kUnspecified;
std::string final_error_message;
std::map<std::string, int32_t> metrics;
absl::Time captured_at = absl::InfinitePast();
@@ -118,4 +118,4 @@ class TestRecorder {
} // namespace test
} // namespace yaze
#endif // YAZE_APP_CORE_TEST_RECORDER_H_
#endif // YAZE_APP_CORE_TESTING_TEST_RECORDER_H_

View File

@@ -1,4 +1,4 @@
#include "app/core/test_script_parser.h"
#include "app/core/testing/test_script_parser.h"
#include <filesystem>
#include <fstream>

View File

@@ -1,5 +1,5 @@
#ifndef YAZE_APP_CORE_TEST_SCRIPT_PARSER_H_
#define YAZE_APP_CORE_TEST_SCRIPT_PARSER_H_
#ifndef YAZE_APP_CORE_TESTING_TEST_SCRIPT_PARSER_H_
#define YAZE_APP_CORE_TESTING_TEST_SCRIPT_PARSER_H_
#include <map>
#include <string>
@@ -50,4 +50,4 @@ class TestScriptParser {
} // namespace test
} // namespace yaze
#endif // YAZE_APP_CORE_TEST_SCRIPT_PARSER_H_
#endif // YAZE_APP_CORE_TESTING_TEST_SCRIPT_PARSER_H_

View File

@@ -3584,7 +3584,7 @@ absl::Status OverworldEditor::ApplyZSCustomOverworldASM(int target_version) {
util::logf("Applying ZSCustomOverworld ASM v%d to ROM...", target_version);
// Initialize Asar wrapper
auto asar_wrapper = std::make_unique<app::core::AsarWrapper>();
auto asar_wrapper = std::make_unique<core::AsarWrapper>();
RETURN_IF_ERROR(asar_wrapper->Initialize());
// Create backup of ROM data

View File

@@ -11,7 +11,7 @@
#include "util/log.h"
#ifdef YAZE_WITH_GRPC
#include "app/core/imgui_test_harness_service.h"
#include "app/core/service/imgui_test_harness_service.h"
#include "app/test/test_manager.h"
#endif

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,32 @@
#ifndef YAZE_CLI_HANDLERS_AGENT_COMMANDS_H_
#define YAZE_CLI_HANDLERS_AGENT_COMMANDS_H_
#include <string>
#include <vector>
#include "absl/status/status.h"
namespace yaze {
class Rom;
namespace cli {
namespace agent {
absl::Status HandleRunCommand(const std::vector<std::string>& args,
Rom& rom);
absl::Status HandlePlanCommand(const std::vector<std::string>& args);
absl::Status HandleDiffCommand(Rom& rom,
const std::vector<std::string>& args);
absl::Status HandleTestCommand(const std::vector<std::string>& args);
absl::Status HandleGuiCommand(const std::vector<std::string>& args);
absl::Status HandleLearnCommand();
absl::Status HandleListCommand();
absl::Status HandleCommitCommand(Rom& rom);
absl::Status HandleRevertCommand(Rom& rom);
absl::Status HandleDescribeCommand(const std::vector<std::string>& args);
} // namespace agent
} // namespace cli
} // namespace yaze
#endif // YAZE_CLI_HANDLERS_AGENT_COMMANDS_H_

View File

@@ -0,0 +1,172 @@
#include "cli/handlers/agent/common.h"
#include "absl/strings/ascii.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_replace.h"
namespace yaze {
namespace cli {
namespace agent {
std::string HarnessAddress(const std::string& host, int port) {
return absl::StrFormat("%s:%d", host, port);
}
std::string JsonEscape(absl::string_view value) {
std::string out;
out.reserve(value.size() + 8);
for (unsigned char c : value) {
switch (c) {
case '\\':
out += "\\\\";
break;
case '"':
out += "\\\"";
break;
case '\b':
out += "\\b";
break;
case '\f':
out += "\\f";
break;
case '\n':
out += "\\n";
break;
case '\r':
out += "\\r";
break;
case '\t':
out += "\\t";
break;
default:
if (c < 0x20) {
absl::StrAppend(&out, absl::StrFormat("\\u%04X", static_cast<int>(c)));
} else {
out.push_back(static_cast<char>(c));
}
}
}
return out;
}
std::string YamlQuote(absl::string_view value) {
std::string escaped(value);
absl::StrReplaceAll({{"\\", "\\\\"}, {"\"", "\\\""}}, &escaped);
return absl::StrCat("\"", escaped, "\"");
}
std::string FormatOptionalTime(const std::optional<absl::Time>& time) {
if (!time.has_value()) {
return "n/a";
}
return absl::FormatTime("%Y-%m-%dT%H:%M:%SZ", *time, absl::UTCTimeZone());
}
std::string OptionalTimeToIso(const std::optional<absl::Time>& time) {
if (!time.has_value()) {
return "";
}
return absl::FormatTime("%Y-%m-%dT%H:%M:%SZ", *time, absl::UTCTimeZone());
}
std::string OptionalTimeToJson(const std::optional<absl::Time>& time) {
std::string iso = OptionalTimeToIso(time);
if (iso.empty()) {
return "null";
}
return absl::StrCat("\"", JsonEscape(iso), "\"");
}
std::string OptionalTimeToYaml(const std::optional<absl::Time>& time) {
std::string iso = OptionalTimeToIso(time);
if (iso.empty()) {
return "null";
}
return iso;
}
const char* TestRunStatusToString(TestRunStatus status) {
switch (status) {
case TestRunStatus::kQueued:
return "QUEUED";
case TestRunStatus::kRunning:
return "RUNNING";
case TestRunStatus::kPassed:
return "PASSED";
case TestRunStatus::kFailed:
return "FAILED";
case TestRunStatus::kTimeout:
return "TIMEOUT";
case TestRunStatus::kUnknown:
default:
return "UNKNOWN";
}
}
bool IsTerminalStatus(TestRunStatus status) {
switch (status) {
case TestRunStatus::kQueued:
case TestRunStatus::kRunning:
return false;
case TestRunStatus::kPassed:
case TestRunStatus::kFailed:
case TestRunStatus::kTimeout:
case TestRunStatus::kUnknown:
default:
return true;
}
}
std::optional<TestRunStatus> ParseStatusFilter(absl::string_view value) {
std::string lower = std::string(absl::AsciiStrToLower(value));
if (lower == "queued") return TestRunStatus::kQueued;
if (lower == "running") return TestRunStatus::kRunning;
if (lower == "passed") return TestRunStatus::kPassed;
if (lower == "failed") return TestRunStatus::kFailed;
if (lower == "timeout") return TestRunStatus::kTimeout;
if (lower == "unknown") return TestRunStatus::kUnknown;
return std::nullopt;
}
std::optional<WidgetTypeFilter> ParseWidgetTypeFilter(absl::string_view value) {
std::string lower = std::string(absl::AsciiStrToLower(value));
if (lower.empty() || lower == "unspecified" || lower == "any") {
return WidgetTypeFilter::kUnspecified;
}
if (lower == "all") {
return WidgetTypeFilter::kAll;
}
if (lower == "button" || lower == "buttons") {
return WidgetTypeFilter::kButton;
}
if (lower == "input" || lower == "textbox" || lower == "field") {
return WidgetTypeFilter::kInput;
}
if (lower == "menu" || lower == "menuitem" || lower == "menu-item") {
return WidgetTypeFilter::kMenu;
}
if (lower == "tab" || lower == "tabs") {
return WidgetTypeFilter::kTab;
}
if (lower == "checkbox" || lower == "toggle") {
return WidgetTypeFilter::kCheckbox;
}
if (lower == "slider" || lower == "drag" || lower == "sliderfloat") {
return WidgetTypeFilter::kSlider;
}
if (lower == "canvas" || lower == "viewport") {
return WidgetTypeFilter::kCanvas;
}
if (lower == "selectable" || lower == "list-item") {
return WidgetTypeFilter::kSelectable;
}
if (lower == "other") {
return WidgetTypeFilter::kOther;
}
return std::nullopt;
}
} // namespace agent
} // namespace cli
} // namespace yaze

View File

@@ -0,0 +1,30 @@
#ifndef YAZE_CLI_HANDLERS_AGENT_COMMON_H_
#define YAZE_CLI_HANDLERS_AGENT_COMMON_H_
#include <optional>
#include <string>
#include "absl/time/time.h"
#include "cli/service/gui_automation_client.h"
namespace yaze {
namespace cli {
namespace agent {
std::string HarnessAddress(const std::string& host, int port);
std::string JsonEscape(absl::string_view value);
std::string YamlQuote(absl::string_view value);
std::string FormatOptionalTime(const std::optional<absl::Time>& time);
std::string OptionalTimeToIso(const std::optional<absl::Time>& time);
std::string OptionalTimeToJson(const std::optional<absl::Time>& time);
std::string OptionalTimeToYaml(const std::optional<absl::Time>& time);
const char* TestRunStatusToString(TestRunStatus status);
bool IsTerminalStatus(TestRunStatus status);
std::optional<TestRunStatus> ParseStatusFilter(absl::string_view value);
std::optional<WidgetTypeFilter> ParseWidgetTypeFilter(absl::string_view value);
} // namespace agent
} // namespace cli
} // namespace yaze
#endif // YAZE_CLI_HANDLERS_AGENT_COMMON_H_

View 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

View File

@@ -0,0 +1,334 @@
#include "cli/handlers/agent/commands.h"
#include <limits>
#include <optional>
#include <string>
#include <vector>
#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/time/time.h"
#include "cli/handlers/agent/common.h"
#include "cli/service/gui_automation_client.h"
#include "util/macro.h"
namespace yaze {
namespace cli {
namespace agent {
namespace {
absl::Status HandleGuiDiscoverCommand(const std::vector<std::string>& arg_vec) {
std::string host = "localhost";
int port = 50052;
std::string window_filter;
std::string path_prefix;
std::optional<WidgetTypeFilter> type_filter;
std::optional<std::string> type_filter_label;
bool include_invisible = false;
bool include_disabled = false;
std::string format = "table";
int limit = -1;
auto require_value =
[&](const std::vector<std::string>& args, size_t& index,
absl::string_view flag) -> absl::StatusOr<std::string> {
if (index + 1 >= args.size()) {
return absl::InvalidArgumentError(
absl::StrFormat("Flag %s requires a value", flag));
}
return args[++index];
};
for (size_t i = 0; i < arg_vec.size(); ++i) {
const std::string& token = arg_vec[i];
if (token == "--host") {
ASSIGN_OR_RETURN(auto value, require_value(arg_vec, i, "--host"));
host = std::move(value);
} else if (absl::StartsWith(token, "--host=")) {
host = token.substr(7);
} else if (token == "--port") {
ASSIGN_OR_RETURN(auto value, require_value(arg_vec, i, "--port"));
port = std::stoi(value);
} else if (absl::StartsWith(token, "--port=")) {
port = std::stoi(token.substr(7));
} else if (token == "--window" || token == "--window-filter") {
ASSIGN_OR_RETURN(auto value, require_value(arg_vec, i, token.c_str()));
window_filter = std::move(value);
} else if (absl::StartsWith(token, "--window=")) {
window_filter = token.substr(9);
} else if (token == "--path-prefix") {
ASSIGN_OR_RETURN(auto value, require_value(arg_vec, i, "--path-prefix"));
path_prefix = std::move(value);
} else if (absl::StartsWith(token, "--path-prefix=")) {
path_prefix = token.substr(14);
} else if (token == "--type") {
ASSIGN_OR_RETURN(auto value, require_value(arg_vec, i, "--type"));
auto parsed = ParseWidgetTypeFilter(value);
if (!parsed.has_value()) {
return absl::InvalidArgumentError(
absl::StrFormat("Unknown widget type filter: %s", value));
}
type_filter = parsed;
type_filter_label = absl::AsciiStrToLower(value);
} else if (absl::StartsWith(token, "--type=")) {
std::string value = token.substr(7);
auto parsed = ParseWidgetTypeFilter(value);
if (!parsed.has_value()) {
return absl::InvalidArgumentError(
absl::StrFormat("Unknown widget type filter: %s", value));
}
type_filter = parsed;
type_filter_label = absl::AsciiStrToLower(value);
} else if (token == "--include-invisible") {
include_invisible = true;
} else if (token == "--include-disabled") {
include_disabled = true;
} else if (token == "--format") {
ASSIGN_OR_RETURN(auto value, require_value(arg_vec, i, "--format"));
format = std::move(value);
} else if (absl::StartsWith(token, "--format=")) {
format = token.substr(9);
} else if (token == "--limit") {
ASSIGN_OR_RETURN(auto value, require_value(arg_vec, i, "--limit"));
limit = std::stoi(value);
} else if (absl::StartsWith(token, "--limit=")) {
limit = std::stoi(token.substr(8));
} else if (token == "--help" || token == "-h") {
std::cout << "Usage: agent gui discover [options]\n"
<< " --host <host>\n"
<< " --port <port>\n"
<< " --window <name>\n"
<< " --type <widget-type>\n"
<< " --path-prefix <path>\n"
<< " --include-invisible\n"
<< " --include-disabled\n"
<< " --format <table|json>\n"
<< " --limit <n>\n";
return absl::OkStatus();
} else {
return absl::InvalidArgumentError(
absl::StrFormat("Unknown flag for agent gui discover: %s", token));
}
}
format = absl::AsciiStrToLower(format);
if (format != "table" && format != "json") {
return absl::InvalidArgumentError(
"--format must be either 'table' or 'json'");
}
if (limit == 0) {
return absl::InvalidArgumentError("--limit must be positive");
}
#ifndef YAZE_WITH_GRPC
(void)host;
(void)port;
(void)window_filter;
(void)path_prefix;
(void)type_filter;
(void)include_invisible;
(void)include_disabled;
(void)format;
(void)limit;
return absl::UnimplementedError(
"GUI automation requires YAZE_WITH_GRPC=ON at build time.\n"
"Rebuild with: cmake -B build -DYAZE_WITH_GRPC=ON");
#else
GuiAutomationClient client(HarnessAddress(host, port));
RETURN_IF_ERROR(client.Connect());
DiscoverWidgetsQuery query;
query.window_filter = window_filter;
query.path_prefix = path_prefix;
if (type_filter.has_value()) {
query.type_filter = type_filter.value();
}
query.include_invisible = include_invisible;
query.include_disabled = include_disabled;
ASSIGN_OR_RETURN(auto response, client.DiscoverWidgets(query));
int max_items = limit > 0 ? limit : std::numeric_limits<int>::max();
int remaining = max_items;
std::vector<DiscoveredWindowInfo> trimmed_windows;
trimmed_windows.reserve(response.windows.size());
int rendered_widgets = 0;
for (const auto& window : response.windows) {
if (remaining <= 0) {
break;
}
DiscoveredWindowInfo trimmed;
trimmed.name = window.name;
trimmed.visible = window.visible;
for (const auto& widget : window.widgets) {
if (remaining <= 0) {
break;
}
trimmed.widgets.push_back(widget);
--remaining;
++rendered_widgets;
}
if (!trimmed.widgets.empty()) {
trimmed_windows.push_back(std::move(trimmed));
}
}
bool truncated = rendered_widgets < response.total_widgets;
if (format == "json") {
std::cout << "{\n";
std::cout << " \"server\": \"" << JsonEscape(HarnessAddress(host, port))
<< "\",\n";
std::cout << " \"totalWidgets\": " << response.total_widgets << ",\n";
std::cout << " \"returnedWidgets\": " << rendered_widgets << ",\n";
std::cout << " \"truncated\": " << (truncated ? "true" : "false") << ",\n";
std::cout << " \"generatedAt\": "
<< (response.generated_at.has_value()
? absl::StrCat(
"\"",
JsonEscape(absl::FormatTime("%Y-%m-%dT%H:%M:%SZ",
*response.generated_at,
absl::UTCTimeZone())),
"\"")
: std::string("null"))
<< ",\n";
std::cout << " \"windows\": [\n";
for (size_t w = 0; w < trimmed_windows.size(); ++w) {
const auto& window = trimmed_windows[w];
std::cout << " {\n";
std::cout << " \"name\": \"" << JsonEscape(window.name) << "\",\n";
std::cout << " \"visible\": " << (window.visible ? "true" : "false")
<< ",\n";
std::cout << " \"widgets\": [\n";
for (size_t i = 0; i < window.widgets.size(); ++i) {
const auto& widget = window.widgets[i];
std::cout << " {\n";
std::cout << " \"path\": \"" << JsonEscape(widget.path)
<< "\",\n";
std::cout << " \"label\": \"" << JsonEscape(widget.label)
<< "\",\n";
std::cout << " \"type\": \"" << JsonEscape(widget.type)
<< "\",\n";
std::cout << " \"description\": \""
<< JsonEscape(widget.description) << "\",\n";
std::cout << " \"suggestedAction\": \""
<< JsonEscape(widget.suggested_action) << "\",\n";
std::cout << " \"visible\": "
<< (widget.visible ? "true" : "false") << ",\n";
std::cout << " \"enabled\": "
<< (widget.enabled ? "true" : "false") << ",\n";
std::cout << " \"bounds\": { \"min\": [" << widget.bounds.min_x
<< ", " << widget.bounds.min_y << "], \"max\": ["
<< widget.bounds.max_x << ", " << widget.bounds.max_y
<< "] },\n";
std::cout << " \"widgetId\": " << widget.widget_id << "\n";
std::cout << " }";
if (i + 1 < window.widgets.size()) {
std::cout << ",";
}
std::cout << "\n";
}
std::cout << " ]\n";
std::cout << " }";
if (w + 1 < trimmed_windows.size()) {
std::cout << ",";
}
std::cout << "\n";
}
std::cout << " ]\n";
std::cout << "}\n";
return absl::OkStatus();
}
std::cout << "\n=== Widget Discovery ===\n";
std::cout << "Server: " << HarnessAddress(host, port) << "\n";
if (!window_filter.empty()) {
std::cout << "Window filter: " << window_filter << "\n";
}
if (!path_prefix.empty()) {
std::cout << "Path prefix: " << path_prefix << "\n";
}
if (type_filter_label.has_value()) {
std::cout << "Type filter: " << *type_filter_label << "\n";
}
std::cout << "Include invisible: " << (include_invisible ? "yes" : "no")
<< "\n";
std::cout << "Include disabled: " << (include_disabled ? "yes" : "no")
<< "\n\n";
if (trimmed_windows.empty()) {
std::cout << "No widgets matched the provided filters." << std::endl;
return absl::OkStatus();
}
for (const auto& window : trimmed_windows) {
std::cout << "Window: " << window.name
<< (window.visible ? " (visible)" : " (hidden)") << "\n";
for (const auto& widget : window.widgets) {
std::cout << " • [" << widget.type << "] " << widget.label << "\n";
std::cout << " Path: " << widget.path << "\n";
if (!widget.description.empty()) {
std::cout << " Description: " << widget.description << "\n";
}
std::cout << " Suggested: " << widget.suggested_action << "\n";
std::cout << " State: " << (widget.visible ? "visible" : "hidden")
<< ", " << (widget.enabled ? "enabled" : "disabled") << "\n";
std::cout << absl::StrFormat(" Bounds: (%.1f, %.1f) → (%.1f, %.1f)\n",
widget.bounds.min_x, widget.bounds.min_y,
widget.bounds.max_x, widget.bounds.max_y);
std::cout << " Widget ID: 0x" << std::hex << widget.widget_id
<< std::dec << "\n";
}
std::cout << "\n";
}
std::cout << "Widgets shown: " << rendered_widgets << " of "
<< response.total_widgets;
if (truncated) {
std::cout << " (truncated)";
}
std::cout << "\n";
if (response.generated_at.has_value()) {
std::cout << "Snapshot: "
<< absl::FormatTime("%Y-%m-%d %H:%M:%S", *response.generated_at,
absl::LocalTimeZone())
<< "\n";
}
return absl::OkStatus();
#endif
}
} // namespace
absl::Status HandleGuiCommand(const std::vector<std::string>& arg_vec) {
if (arg_vec.empty()) {
return absl::InvalidArgumentError("Usage: agent gui <discover> [options]");
}
const std::string& subcommand = arg_vec[0];
std::vector<std::string> tail(arg_vec.begin() + 1, arg_vec.end());
if (subcommand == "discover") {
return HandleGuiDiscoverCommand(tail);
}
return absl::InvalidArgumentError(
absl::StrFormat("Unknown agent gui subcommand: %s", subcommand));
}
} // namespace agent
} // namespace cli
} // namespace yaze

View File

@@ -0,0 +1,839 @@
#include "cli/handlers/agent/commands.h"
#include <chrono>
#include <iostream>
#include <string>
#include <thread>
#include <vector>
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/ascii.h"
#include "absl/strings/match.h"
#include "absl/strings/str_format.h"
#include "absl/time/time.h"
#include "cli/handlers/agent/common.h"
#include "cli/service/gui_automation_client.h"
#include "cli/service/test_workflow_generator.h"
#include "util/macro.h"
namespace yaze {
namespace cli {
namespace agent {
namespace {
absl::Status HandleTestRunCommand(const std::vector<std::string>& arg_vec) {
std::string prompt;
std::string host = "localhost";
int port = 50052;
int timeout_sec = 30;
std::string output_format = "text";
for (size_t i = 0; i < arg_vec.size(); ++i) {
const std::string& token = arg_vec[i];
if (token == "--prompt" && i + 1 < arg_vec.size()) {
prompt = arg_vec[++i];
} else if (token == "--host" && i + 1 < arg_vec.size()) {
host = arg_vec[++i];
} else if (token == "--port" && i + 1 < arg_vec.size()) {
port = std::stoi(arg_vec[++i]);
} else if (token == "--timeout" && i + 1 < arg_vec.size()) {
timeout_sec = std::stoi(arg_vec[++i]);
} else if (token == "--output" && i + 1 < arg_vec.size()) {
output_format = arg_vec[++i];
} else if (absl::StartsWith(token, "--prompt=")) {
prompt = token.substr(9);
} else if (absl::StartsWith(token, "--host=")) {
host = token.substr(7);
} else if (absl::StartsWith(token, "--port=")) {
port = std::stoi(token.substr(7));
} else if (absl::StartsWith(token, "--timeout=")) {
timeout_sec = std::stoi(token.substr(10));
} else if (absl::StartsWith(token, "--output=")) {
output_format = token.substr(9);
}
}
if (prompt.empty()) {
return absl::InvalidArgumentError(
"Usage: agent test --prompt \"<prompt>\" [--host <host>] [--port "
"<port>] [--timeout <sec>] [--output text|json|yaml]\n\n"
"Examples:\n"
" z3ed agent test --prompt \"Open Overworld editor\"\n"
" z3ed agent test --prompt \"Open Dungeon editor and verify it "
"loads\"\n"
" z3ed agent test --prompt \"Click Open ROM button\" --output json");
}
output_format = absl::AsciiStrToLower(output_format);
bool text_output = (output_format == "text" || output_format == "human");
bool json_output = (output_format == "json");
bool yaml_output = (output_format == "yaml");
if (!text_output && !json_output && !yaml_output) {
return absl::InvalidArgumentError(
"--output must be one of: text, json, yaml");
}
bool machine_output = !text_output;
#ifndef YAZE_WITH_GRPC
std::string error =
"GUI automation requires YAZE_WITH_GRPC=ON at build time.\n"
"Rebuild with: cmake -B build -DYAZE_WITH_GRPC=ON";
if (machine_output) {
if (json_output) {
std::cout << "{\n"
<< " \"prompt\": \"" << JsonEscape(prompt) << "\",\n"
<< " \"success\": false,\n"
<< " \"error\": \"" << JsonEscape(error) << "\"\n"
<< "}\n";
} else {
std::cout << "prompt: " << YamlQuote(prompt) << "\n"
<< "success: false\n"
<< "error: " << YamlQuote(error) << "\n";
}
} else {
std::cout << error << std::endl;
}
return absl::UnimplementedError(error);
#else
struct StepSummary {
std::string description;
bool success = false;
int64_t duration_ms = 0;
std::string message;
std::string test_id;
};
std::vector<StepSummary> step_summaries;
std::vector<std::string> emitted_test_ids;
std::chrono::steady_clock::time_point start_time;
bool timer_started = false;
auto EmitMachineSummary = [&](bool success, absl::string_view error_message,
int64_t elapsed_override_ms = -1) {
if (!machine_output) {
return;
}
int64_t elapsed_ms = elapsed_override_ms;
if (elapsed_ms < 0) {
if (timer_started) {
elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::steady_clock::now() - start_time)
.count();
} else {
elapsed_ms = 0;
}
}
std::string primary_test_id =
emitted_test_ids.empty() ? "" : emitted_test_ids.back();
if (json_output) {
std::cout << "{\n";
std::cout << " \"prompt\": \"" << JsonEscape(prompt) << "\",\n";
std::cout << " \"host\": \"" << JsonEscape(host) << "\",\n";
std::cout << " \"port\": " << port << ",\n";
std::cout << " \"success\": " << (success ? "true" : "false") << ",\n";
std::cout << " \"timeout_seconds\": " << timeout_sec << ",\n";
if (!primary_test_id.empty()) {
std::cout << " \"test_id\": \"" << JsonEscape(primary_test_id)
<< "\",\n";
} else {
std::cout << " \"test_id\": null,\n";
}
std::cout << " \"test_ids\": [";
for (size_t i = 0; i < emitted_test_ids.size(); ++i) {
if (i > 0) {
std::cout << ", ";
}
std::cout << "\"" << JsonEscape(emitted_test_ids[i]) << "\"";
}
std::cout << "],\n";
std::cout << " \"elapsed_ms\": " << elapsed_ms << ",\n";
std::cout << " \"steps\": [\n";
for (size_t i = 0; i < step_summaries.size(); ++i) {
const auto& step = step_summaries[i];
std::string message_json =
step.message.empty()
? "null"
: absl::StrCat("\"", JsonEscape(step.message), "\"");
std::string test_id_json =
step.test_id.empty()
? "null"
: absl::StrCat("\"", JsonEscape(step.test_id), "\"");
std::cout << " {\n";
std::cout << " \"index\": " << (i + 1) << ",\n";
std::cout << " \"description\": \"" << JsonEscape(step.description)
<< "\",\n";
std::cout << " \"success\": " << (step.success ? "true" : "false")
<< ",\n";
std::cout << " \"duration_ms\": " << step.duration_ms << ",\n";
std::cout << " \"message\": " << message_json << ",\n";
std::cout << " \"test_id\": " << test_id_json << "\n";
std::cout << " }";
if (i + 1 < step_summaries.size()) {
std::cout << ",";
}
std::cout << "\n";
}
std::cout << " ],\n";
if (!error_message.empty()) {
std::cout << " \"error\": \"" << JsonEscape(std::string(error_message))
<< "\"\n";
} else {
std::cout << " \"error\": null\n";
}
std::cout << "}\n";
} else if (yaml_output) {
std::cout << "prompt: " << YamlQuote(prompt) << "\n";
std::cout << "host: " << YamlQuote(host) << "\n";
std::cout << "port: " << port << "\n";
std::cout << "success: " << (success ? "true" : "false") << "\n";
std::cout << "timeout_seconds: " << timeout_sec << "\n";
if (primary_test_id.empty()) {
std::cout << "test_id: null\n";
} else {
std::cout << "test_id: " << YamlQuote(primary_test_id) << "\n";
}
if (emitted_test_ids.empty()) {
std::cout << "test_ids: []\n";
} else {
std::cout << "test_ids:\n";
for (const auto& id : emitted_test_ids) {
std::cout << " - " << YamlQuote(id) << "\n";
}
}
std::cout << "elapsed_ms: " << elapsed_ms << "\n";
if (step_summaries.empty()) {
std::cout << "steps: []\n";
} else {
std::cout << "steps:\n";
for (size_t i = 0; i < step_summaries.size(); ++i) {
const auto& step = step_summaries[i];
std::cout << " - index: " << (i + 1) << "\n";
std::cout << " description: " << YamlQuote(step.description)
<< "\n";
std::cout << " success: " << (step.success ? "true" : "false")
<< "\n";
std::cout << " duration_ms: " << step.duration_ms << "\n";
if (step.message.empty()) {
std::cout << " message: null\n";
} else {
std::cout << " message: " << YamlQuote(step.message) << "\n";
}
if (step.test_id.empty()) {
std::cout << " test_id: null\n";
} else {
std::cout << " test_id: " << YamlQuote(step.test_id) << "\n";
}
}
}
if (!error_message.empty()) {
std::cout << "error: " << YamlQuote(std::string(error_message)) << "\n";
} else {
std::cout << "error: null\n";
}
}
};
if (text_output) {
std::cout << "\n=== GUI Automation Test ===\n";
std::cout << "Prompt: " << prompt << "\n";
std::cout << "Server: " << host << ":" << port << "\n\n";
}
TestWorkflowGenerator generator;
auto workflow_or = generator.GenerateWorkflow(prompt);
if (!workflow_or.ok()) {
EmitMachineSummary(false, workflow_or.status().message());
return workflow_or.status();
}
auto workflow = workflow_or.value();
if (text_output) {
std::cout << "Generated workflow:\n" << workflow.ToString() << "\n";
}
GuiAutomationClient client(HarnessAddress(host, port));
auto connect_status = client.Connect();
if (!connect_status.ok()) {
std::string formatted_error = absl::StrFormat(
"Failed to connect to test harness at %s:%d\n"
"Make sure YAZE is running with:\n"
" ./yaze --enable_test_harness --test_harness_port=%d "
"--rom_file=<rom>\n\n"
"Error: %s",
host, port, port, connect_status.message());
EmitMachineSummary(false, formatted_error);
return absl::UnavailableError(formatted_error);
}
if (text_output) {
std::cout << "✓ Connected to test harness\n\n";
}
start_time = std::chrono::steady_clock::now();
timer_started = true;
int step_num = 0;
for (const auto& step : workflow.steps) {
step_num++;
StepSummary summary;
summary.description = step.ToString();
if (text_output) {
std::cout << absl::StrFormat("[%d/%d] %s ... ", step_num,
workflow.steps.size(), summary.description);
std::cout.flush();
}
absl::StatusOr<AutomationResult> result;
switch (step.type) {
case TestStepType::kClick:
result = client.Click(step.target);
break;
case TestStepType::kType:
result = client.Type(step.target, step.text, step.clear_first);
break;
case TestStepType::kWait:
result = client.Wait(step.condition, step.timeout_ms);
break;
case TestStepType::kAssert:
result = client.Assert(step.condition);
break;
case TestStepType::kScreenshot:
result = client.Screenshot();
break;
}
if (!result.ok()) {
summary.success = false;
summary.message = result.status().message();
step_summaries.push_back(std::move(summary));
if (text_output) {
std::cout << "✗ FAILED\n";
}
EmitMachineSummary(false, result.status().message());
return absl::InternalError(absl::StrFormat("Step %d failed: %s", step_num,
result.status().message()));
}
summary.duration_ms = result->execution_time.count();
summary.message = result->message;
if (!result->success) {
summary.success = false;
if (!result->test_id.empty()) {
summary.test_id = result->test_id;
emitted_test_ids.push_back(result->test_id);
}
step_summaries.push_back(std::move(summary));
if (text_output) {
std::cout << "✗ FAILED\n";
std::cout << " Error: " << result->message << "\n";
}
EmitMachineSummary(false, result->message);
return absl::InternalError(
absl::StrFormat("Step %d failed: %s", step_num, result->message));
}
summary.success = true;
if (!result->test_id.empty()) {
summary.test_id = result->test_id;
emitted_test_ids.push_back(result->test_id);
}
step_summaries.push_back(summary);
if (text_output) {
std::cout << absl::StrFormat("✓ (%lldms)",
result->execution_time.count());
if (!result->test_id.empty()) {
std::cout << " [Test ID: " << result->test_id << "]";
}
std::cout << "\n";
}
}
auto end_time = std::chrono::steady_clock::now();
auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
end_time - start_time);
if (text_output) {
std::cout << "\n✅ Test passed in " << elapsed.count() << "ms\n";
if (!emitted_test_ids.empty()) {
std::cout << "Latest Test ID: " << emitted_test_ids.back() << "\n";
if (emitted_test_ids.size() > 1) {
std::cout << "Captured Test IDs:\n";
for (const auto& id : emitted_test_ids) {
std::cout << " - " << id << "\n";
}
}
std::cout << "Use 'z3ed agent test status --test-id "
<< emitted_test_ids.back() << "' for live status updates."
<< std::endl;
}
}
EmitMachineSummary(true, /*error_message=*/"", elapsed.count());
return absl::OkStatus();
#endif
}
absl::Status HandleTestStatusCommand(const std::vector<std::string>& arg_vec) {
std::string host = "localhost";
int port = 50052;
std::string test_id;
bool follow = false;
int interval_ms = 1000;
for (size_t i = 0; i < arg_vec.size(); ++i) {
const std::string& token = arg_vec[i];
if (token == "--test-id" && i + 1 < arg_vec.size()) {
test_id = arg_vec[++i];
} else if (absl::StartsWith(token, "--test-id=")) {
test_id = token.substr(10);
} else if (token == "--host" && i + 1 < arg_vec.size()) {
host = arg_vec[++i];
} else if (absl::StartsWith(token, "--host=")) {
host = token.substr(7);
} else if (token == "--port" && i + 1 < arg_vec.size()) {
port = std::stoi(arg_vec[++i]);
} else if (absl::StartsWith(token, "--port=")) {
port = std::stoi(token.substr(7));
} else if (token == "--follow") {
follow = true;
} else if ((token == "--interval" || token == "--interval-ms") &&
i + 1 < arg_vec.size()) {
interval_ms = std::max(100, std::stoi(arg_vec[++i]));
} else if (absl::StartsWith(token, "--interval=") ||
absl::StartsWith(token, "--interval-ms=")) {
size_t prefix = token.find('=');
interval_ms = std::max(100, std::stoi(token.substr(prefix + 1)));
}
}
if (test_id.empty()) {
return absl::InvalidArgumentError(
"Usage: agent test status --test-id <id> [--follow] [--host <host>] "
"[--port <port>] [--interval-ms <ms>]");
}
#ifndef YAZE_WITH_GRPC
return absl::UnimplementedError(
"GUI automation requires YAZE_WITH_GRPC=ON at build time.\n"
"Rebuild with: cmake -B build -DYAZE_WITH_GRPC=ON");
#else
GuiAutomationClient client(HarnessAddress(host, port));
RETURN_IF_ERROR(client.Connect());
std::cout << "\n=== Test Status ===\n";
std::cout << "Test ID: " << test_id << "\n";
std::cout << "Server: " << HarnessAddress(host, port) << "\n";
if (follow) {
std::cout << "Follow mode: polling every " << interval_ms << "ms\n";
}
std::cout << "\n";
bool first_iteration = true;
while (true) {
ASSIGN_OR_RETURN(auto details, client.GetTestStatus(test_id));
if (!first_iteration) {
std::cout << "---\n";
}
std::cout << "Status: " << TestRunStatusToString(details.status) << "\n";
std::cout << "Queued At: " << FormatOptionalTime(details.queued_at) << "\n";
std::cout << "Started At: " << FormatOptionalTime(details.started_at)
<< "\n";
std::cout << "Completed At: " << FormatOptionalTime(details.completed_at)
<< "\n";
std::cout << "Execution Time (ms): " << details.execution_time_ms << "\n";
if (!details.error_message.empty()) {
std::cout << "Error: " << details.error_message << "\n";
}
if (!details.assertion_failures.empty()) {
std::cout << "Assertion Failures (" << details.assertion_failures.size()
<< "):\n";
for (const auto& failure : details.assertion_failures) {
std::cout << " - " << failure << "\n";
}
} else {
std::cout << "Assertion Failures: 0\n";
}
if (!follow || IsTerminalStatus(details.status)) {
break;
}
first_iteration = false;
std::this_thread::sleep_for(std::chrono::milliseconds(interval_ms));
}
return absl::OkStatus();
#endif
}
absl::Status HandleTestListCommand(const std::vector<std::string>& arg_vec) {
std::string host = "localhost";
int port = 50052;
std::string category_filter;
std::optional<TestRunStatus> status_filter;
int page_size = 100;
int limit = -1;
bool fetch_all = false;
for (size_t i = 0; i < arg_vec.size(); ++i) {
const std::string& token = arg_vec[i];
if (token == "--host" && i + 1 < arg_vec.size()) {
host = arg_vec[++i];
} else if (absl::StartsWith(token, "--host=")) {
host = token.substr(7);
} else if (token == "--port" && i + 1 < arg_vec.size()) {
port = std::stoi(arg_vec[++i]);
} else if (absl::StartsWith(token, "--port=")) {
port = std::stoi(token.substr(7));
} else if (token == "--category" && i + 1 < arg_vec.size()) {
category_filter = arg_vec[++i];
} else if (absl::StartsWith(token, "--category=")) {
category_filter = token.substr(11);
} else if (token == "--status" && i + 1 < arg_vec.size()) {
auto parsed = ParseStatusFilter(arg_vec[++i]);
if (!parsed.has_value()) {
return absl::InvalidArgumentError(
"Invalid status filter. Expected: queued, running, passed, failed, "
"timeout, unknown");
}
status_filter = parsed;
} else if (absl::StartsWith(token, "--status=")) {
auto parsed = ParseStatusFilter(token.substr(9));
if (!parsed.has_value()) {
return absl::InvalidArgumentError(
"Invalid status filter. Expected: queued, running, passed, failed, "
"timeout, unknown");
}
status_filter = parsed;
} else if (token == "--page-size" && i + 1 < arg_vec.size()) {
page_size = std::max(1, std::stoi(arg_vec[++i]));
} else if (absl::StartsWith(token, "--page-size=")) {
page_size = std::max(1, std::stoi(token.substr(12)));
} else if (token == "--limit" && i + 1 < arg_vec.size()) {
limit = std::stoi(arg_vec[++i]);
} else if (absl::StartsWith(token, "--limit=")) {
limit = std::stoi(token.substr(8));
} else if (token == "--all") {
fetch_all = true;
}
}
if (fetch_all) {
limit = -1;
}
#ifndef YAZE_WITH_GRPC
return absl::UnimplementedError(
"GUI automation requires YAZE_WITH_GRPC=ON at build time.\n"
"Rebuild with: cmake -B build -DYAZE_WITH_GRPC=ON");
#else
GuiAutomationClient client(HarnessAddress(host, port));
RETURN_IF_ERROR(client.Connect());
std::cout << "\n=== Harness Test Catalog ===\n";
std::cout << "Server: " << HarnessAddress(host, port) << "\n";
if (!category_filter.empty()) {
std::cout << "Category filter: " << category_filter << "\n";
}
if (status_filter.has_value()) {
std::cout << "Status filter: "
<< TestRunStatusToString(status_filter.value()) << "\n";
}
std::cout << "\n";
std::vector<HarnessTestSummary> collected;
collected.reserve(limit > 0 ? limit : page_size);
std::string page_token;
int total_count = 0;
while (true) {
int request_page_size = page_size > 0 ? page_size : 100;
if (limit > 0) {
int remaining = limit - static_cast<int>(collected.size());
if (remaining <= 0) {
break;
}
request_page_size = std::min(request_page_size, remaining);
}
ASSIGN_OR_RETURN(
auto batch,
client.ListTests(category_filter, request_page_size, page_token));
total_count = batch.total_count;
for (const auto& summary : batch.tests) {
if (status_filter.has_value()) {
ASSIGN_OR_RETURN(auto details, client.GetTestStatus(summary.test_id));
if (details.status != status_filter.value()) {
continue;
}
}
collected.push_back(summary);
if (limit > 0 && static_cast<int>(collected.size()) >= limit) {
break;
}
}
if (limit > 0 && static_cast<int>(collected.size()) >= limit) {
break;
}
if (batch.next_page_token.empty()) {
break;
}
page_token = batch.next_page_token;
}
if (collected.empty()) {
std::cout << "No tests found for the specified filters." << std::endl;
return absl::OkStatus();
}
for (const auto& summary : collected) {
std::cout << "Test ID: " << summary.test_id << "\n";
std::cout << " Name: " << summary.name << "\n";
std::cout << " Category: " << summary.category << "\n";
std::cout << " Last Run: " << FormatOptionalTime(summary.last_run_at)
<< "\n";
std::cout << " Runs: " << summary.total_runs << " (" << summary.pass_count
<< " pass / " << summary.fail_count << " fail)\n";
std::cout << " Average Duration (ms): " << summary.average_duration_ms
<< "\n\n";
}
std::cout << "Displayed " << collected.size() << " test(s)";
if (total_count > 0) {
std::cout << " (catalog size: " << total_count << ")";
}
std::cout << "." << std::endl;
return absl::OkStatus();
#endif
}
absl::Status HandleTestResultsCommand(const std::vector<std::string>& arg_vec) {
std::string host = "localhost";
int port = 50052;
std::string test_id;
bool include_logs = false;
std::string format = "yaml";
for (size_t i = 0; i < arg_vec.size(); ++i) {
const std::string& token = arg_vec[i];
if (token == "--test-id" && i + 1 < arg_vec.size()) {
test_id = arg_vec[++i];
} else if (absl::StartsWith(token, "--test-id=")) {
test_id = token.substr(10);
} else if (token == "--host" && i + 1 < arg_vec.size()) {
host = arg_vec[++i];
} else if (absl::StartsWith(token, "--host=")) {
host = token.substr(7);
} else if (token == "--port" && i + 1 < arg_vec.size()) {
port = std::stoi(arg_vec[++i]);
} else if (absl::StartsWith(token, "--port=")) {
port = std::stoi(token.substr(7));
} else if (token == "--include-logs") {
include_logs = true;
} else if (token == "--format" && i + 1 < arg_vec.size()) {
format = absl::AsciiStrToLower(arg_vec[++i]);
} else if (absl::StartsWith(token, "--format=")) {
format = absl::AsciiStrToLower(token.substr(9));
}
}
if (test_id.empty()) {
return absl::InvalidArgumentError(
"Usage: agent test results --test-id <id> [--include-logs] [--format "
"yaml|json] [--host <host>] [--port <port>]");
}
if (format != "yaml" && format != "json") {
return absl::InvalidArgumentError(
"--format must be either 'yaml' or 'json'");
}
#ifndef YAZE_WITH_GRPC
return absl::UnimplementedError(
"GUI automation requires YAZE_WITH_GRPC=ON at build time.\n"
"Rebuild with: cmake -B build -DYAZE_WITH_GRPC=ON");
#else
GuiAutomationClient client(HarnessAddress(host, port));
RETURN_IF_ERROR(client.Connect());
ASSIGN_OR_RETURN(auto details, client.GetTestResults(test_id, include_logs));
if (format == "json") {
std::cout << "{\n";
std::cout << " \"test_id\": \"" << JsonEscape(details.test_id) << "\",\n";
std::cout << " \"success\": " << (details.success ? "true" : "false")
<< ",\n";
std::cout << " \"name\": \"" << JsonEscape(details.test_name) << "\",\n";
std::cout << " \"category\": \"" << JsonEscape(details.category)
<< "\",\n";
std::cout << " \"executed_at\": \""
<< JsonEscape(FormatOptionalTime(details.executed_at)) << "\",\n";
std::cout << " \"duration_ms\": " << details.duration_ms << ",\n";
std::cout << " \"assertions\": ";
if (details.assertions.empty()) {
std::cout << "[],\n";
} else {
std::cout << "[\n";
for (size_t i = 0; i < details.assertions.size(); ++i) {
const auto& assertion = details.assertions[i];
std::cout << " {\"description\": \""
<< JsonEscape(assertion.description) << "\", \"passed\": "
<< (assertion.passed ? "true" : "false");
if (!assertion.expected_value.empty()) {
std::cout << ", \"expected\": \""
<< JsonEscape(assertion.expected_value) << "\"";
}
if (!assertion.actual_value.empty()) {
std::cout << ", \"actual\": \"" << JsonEscape(assertion.actual_value)
<< "\"";
}
if (!assertion.error_message.empty()) {
std::cout << ", \"error\": \"" << JsonEscape(assertion.error_message)
<< "\"";
}
std::cout << "}";
if (i + 1 < details.assertions.size()) {
std::cout << ",";
}
std::cout << "\n";
}
std::cout << " ],\n";
}
std::cout << " \"logs\": ";
if (include_logs && !details.logs.empty()) {
std::cout << "[\n";
for (size_t i = 0; i < details.logs.size(); ++i) {
std::cout << " \"" << JsonEscape(details.logs[i]) << "\"";
if (i + 1 < details.logs.size()) {
std::cout << ",";
}
std::cout << "\n";
}
std::cout << " ],\n";
} else {
std::cout << "[],\n";
}
std::cout << " \"metrics\": ";
if (!details.metrics.empty()) {
std::cout << "{\n";
size_t index = 0;
for (const auto& [key, value] : details.metrics) {
std::cout << " \"" << JsonEscape(key) << "\": " << value;
if (index + 1 < details.metrics.size()) {
std::cout << ",";
}
std::cout << "\n";
++index;
}
std::cout << " }\n";
} else {
std::cout << "{}\n";
}
std::cout << "}" << std::endl;
} else {
std::cout << "test_id: " << details.test_id << "\n";
std::cout << "success: " << (details.success ? "true" : "false") << "\n";
std::cout << "name: " << YamlQuote(details.test_name) << "\n";
std::cout << "category: " << YamlQuote(details.category) << "\n";
std::cout << "executed_at: " << FormatOptionalTime(details.executed_at)
<< "\n";
std::cout << "duration_ms: " << details.duration_ms << "\n";
if (details.assertions.empty()) {
std::cout << "assertions: []\n";
} else {
std::cout << "assertions:\n";
for (const auto& assertion : details.assertions) {
std::cout << " - description: " << YamlQuote(assertion.description)
<< "\n";
std::cout << " passed: " << (assertion.passed ? "true" : "false")
<< "\n";
if (!assertion.expected_value.empty()) {
std::cout << " expected: " << YamlQuote(assertion.expected_value)
<< "\n";
}
if (!assertion.actual_value.empty()) {
std::cout << " actual: " << YamlQuote(assertion.actual_value)
<< "\n";
}
if (!assertion.error_message.empty()) {
std::cout << " error: " << YamlQuote(assertion.error_message)
<< "\n";
}
}
}
if (include_logs && !details.logs.empty()) {
std::cout << "logs:\n";
for (const auto& log : details.logs) {
std::cout << " - " << YamlQuote(log) << "\n";
}
} else {
std::cout << "logs: []\n";
}
if (details.metrics.empty()) {
std::cout << "metrics: {}\n";
} else {
std::cout << "metrics:\n";
for (const auto& [key, value] : details.metrics) {
std::cout << " " << key << ": " << value << "\n";
}
}
}
return absl::OkStatus();
#endif
}
} // namespace
absl::Status HandleTestCommand(const std::vector<std::string>& arg_vec) {
if (!arg_vec.empty()) {
const std::string& subcommand = arg_vec[0];
std::vector<std::string> tail(arg_vec.begin() + 1, arg_vec.end());
if (subcommand == "status") {
return HandleTestStatusCommand(tail);
}
if (subcommand == "list") {
return HandleTestListCommand(tail);
}
if (subcommand == "results") {
return HandleTestResultsCommand(tail);
}
}
return HandleTestRunCommand(arg_vec);
}
} // namespace agent
} // namespace cli
} // namespace yaze

View File

@@ -52,7 +52,7 @@ absl::Status AsarPatch::Run(const std::vector<std::string>& arg_vec) {
return absl::AbortedError("Failed to load ROM.");
}
app::core::AsarWrapper wrapper;
core::AsarWrapper wrapper;
auto init_status = wrapper.Initialize();
if (!init_status.ok()) {
return init_status;

View File

@@ -330,7 +330,7 @@ absl::Status ModernCLI::HandleRomInfoCommand(const std::vector<std::string>& arg
absl::Status ModernCLI::HandleExtractSymbolsCommand(const std::vector<std::string>& args) {
// Use the AsarWrapper to extract symbols
yaze::app::core::AsarWrapper wrapper;
yaze::core::AsarWrapper wrapper;
RETURN_IF_ERROR(wrapper.Initialize());
auto symbols_result = wrapper.ExtractSymbols(args[0]);

View File

@@ -326,7 +326,7 @@ void ExtractSymbolsComponent(ftxui::ScreenInteractive &screen) {
}
try {
app::core::AsarWrapper wrapper;
core::AsarWrapper wrapper;
auto init_status = wrapper.Initialize();
if (!init_status.ok()) {
app_context.error_message = absl::StrCat("Failed to initialize Asar: ", init_status.message());
@@ -419,7 +419,7 @@ void ValidateAssemblyComponent(ftxui::ScreenInteractive &screen) {
}
try {
app::core::AsarWrapper wrapper;
core::AsarWrapper wrapper;
auto init_status = wrapper.Initialize();
if (!init_status.ok()) {
app_context.error_message = absl::StrCat("Failed to initialize Asar: ", init_status.message());

View File

@@ -35,7 +35,7 @@ ftxui::Component AsarPatchComponent::Render() {
}
try {
app::core::AsarWrapper wrapper;
core::AsarWrapper wrapper;
auto init_status = wrapper.Initialize();
if (!init_status.ok()) {
app_context.error_message = absl::StrCat("Failed to initialize Asar: ", init_status.message());

View File

@@ -42,6 +42,10 @@ add_executable(
cli/handlers/command_palette.cc
cli/handlers/project.cc
cli/handlers/agent.cc
cli/handlers/agent/common.cc
cli/handlers/agent/general_commands.cc
cli/handlers/agent/test_commands.cc
cli/handlers/agent/gui_commands.cc
cli/service/ai_service.cc
cli/service/proposal_registry.cc
cli/service/resource_catalog.cc