From 1c0059f095fc48ce175c23ff97fddd925bbda659 Mon Sep 17 00:00:00 2001 From: trangevi Date: Thu, 7 May 2026 15:07:27 -0700 Subject: [PATCH 1/4] Move all agents files under an agents directory Signed-off-by: trangevi --- .../internal/{ => agents}/cmd/agent_context.go | 0 .../{ => agents}/cmd/agent_context_test.go | 0 .../{ => agents}/cmd/agent_endpoint.go | 0 .../{ => agents}/cmd/agent_endpoint_test.go | 0 .../internal/{ => agents}/cmd/banner.go | 0 .../internal/{ => agents}/cmd/banner_test.go | 0 .../internal/{ => agents}/cmd/config_store.go | 0 .../{ => agents}/cmd/config_store_test.go | 0 .../internal/{ => agents}/cmd/debug.go | 0 .../{ => agents}/cmd/extension_context.go | 0 .../internal/{ => agents}/cmd/files.go | 0 .../internal/{ => agents}/cmd/files_test.go | 0 .../{ => agents}/cmd/flag_options_test.go | 0 .../internal/{ => agents}/cmd/helpers.go | 0 .../internal/{ => agents}/cmd/helpers_test.go | 0 .../{ => agents}/cmd/hosted-agent-regions.json | 0 .../internal/{ => agents}/cmd/init.go | 0 .../internal/{ => agents}/cmd/init_copy.go | 0 .../{ => agents}/cmd/init_copy_test.go | 0 .../cmd/init_foundry_resources_helpers.go | 0 .../cmd/init_foundry_resources_helpers_test.go | 0 .../{ => agents}/cmd/init_from_code.go | 0 .../{ => agents}/cmd/init_from_code_test.go | 0 .../cmd/init_from_templates_helpers.go | 0 .../cmd/init_from_templates_helpers_test.go | 0 .../{ => agents}/cmd/init_locations.go | 0 .../{ => agents}/cmd/init_locations_test.go | 0 .../internal/{ => agents}/cmd/init_models.go | 0 .../{ => agents}/cmd/init_models_test.go | 0 .../internal/{ => agents}/cmd/init_test.go | 0 .../internal/{ => agents}/cmd/invoke.go | 0 .../internal/{ => agents}/cmd/invoke_test.go | 0 .../internal/{ => agents}/cmd/listen.go | 0 .../internal/{ => agents}/cmd/listen_test.go | 0 .../internal/{ => agents}/cmd/mcp.go | 0 .../internal/{ => agents}/cmd/monitor.go | 0 .../{ => agents}/cmd/monitor_format.go | 0 .../{ => agents}/cmd/monitor_format_test.go | 0 .../internal/{ => agents}/cmd/monitor_test.go | 0 .../internal/{ => agents}/cmd/root.go | 0 .../internal/{ => agents}/cmd/run.go | 0 .../internal/{ => agents}/cmd/run_test.go | 0 .../internal/{ => agents}/cmd/session.go | 0 .../internal/{ => agents}/cmd/session_test.go | 0 .../internal/{ => agents}/cmd/show.go | 0 .../internal/{ => agents}/cmd/show_test.go | 0 .../internal/{ => agents}/cmd/version.go | 0 .../internal/{ => agents}/exterrors/codes.go | 0 .../internal/{ => agents}/exterrors/errors.go | 0 .../{ => agents}/exterrors/errors_test.go | 0 .../pkg/agents/agent_api/models.go | 0 .../pkg/agents/agent_api/models_test.go | 0 .../pkg/agents/agent_api/operations.go | 0 .../pkg/agents/agent_api/operations_test.go | 0 .../{ => agents}/pkg/agents/agent_yaml/map.go | 0 .../pkg/agents/agent_yaml/map_test.go | 0 .../pkg/agents/agent_yaml/parameters.go | 0 .../pkg/agents/agent_yaml/parameters_test.go | 0 .../pkg/agents/agent_yaml/parse.go | 0 .../pkg/agents/agent_yaml/parse_test.go | 0 .../pkg/agents/agent_yaml/parse_test.go.old | 0 .../agent_yaml/sample_integration_test.go.old | 0 .../agent_yaml/testdata/hosted-agent.yaml | 18 +++++++++--------- .../testdata/invalid-empty-template.yaml | 2 +- .../agent_yaml/testdata/invalid-no-kind.yaml | 8 ++++---- .../pkg/agents/agent_yaml/testdata_test.go | 0 .../{ => agents}/pkg/agents/agent_yaml/yaml.go | 0 .../pkg/agents/agent_yaml/yaml_test.go | 0 .../{ => agents}/pkg/azure/azure_client.go | 0 .../{ => agents}/pkg/azure/client_options.go | 0 .../pkg/azure/foundry_projects_client.go | 0 .../pkg/azure/foundry_projects_client_test.go | 0 .../pkg/azure/foundry_toolsets_client.go | 0 .../pkg/azure/foundry_toolsets_client_test.go | 0 .../project/agent_identity_rbac.go | 0 .../project/agent_identity_rbac_test.go | 0 .../internal/{ => agents}/project/config.go | 0 .../{ => agents}/project/config_test.go | 0 .../project/developer_rbac_check.go | 0 .../project/developer_rbac_check_test.go | 0 .../project/service_target_agent.go | 0 .../project/service_target_agent_test.go | 0 .../internal/{ => agents}/tools/add_agent.go | 0 .../internal/{ => agents}/version/version.go | 0 84 files changed, 14 insertions(+), 14 deletions(-) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/agent_context.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/agent_context_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/agent_endpoint.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/agent_endpoint_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/banner.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/banner_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/config_store.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/config_store_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/debug.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/extension_context.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/files.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/files_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/flag_options_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/helpers.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/helpers_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/hosted-agent-regions.json (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_copy.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_copy_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_foundry_resources_helpers.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_foundry_resources_helpers_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_from_code.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_from_code_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_from_templates_helpers.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_from_templates_helpers_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_locations.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_locations_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_models.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_models_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/init_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/invoke.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/invoke_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/listen.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/listen_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/mcp.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/monitor.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/monitor_format.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/monitor_format_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/monitor_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/root.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/run.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/run_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/session.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/session_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/show.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/show_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/cmd/version.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/exterrors/codes.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/exterrors/errors.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/exterrors/errors_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_api/models.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_api/models_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_api/operations.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_api/operations_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/map.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/map_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/parameters.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/parameters_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/parse.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/parse_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/parse_test.go.old (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/sample_integration_test.go.old (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/testdata/hosted-agent.yaml (96%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/testdata/invalid-empty-template.yaml (92%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/testdata/invalid-no-kind.yaml (93%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/testdata_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/yaml.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/agents/agent_yaml/yaml_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/azure/azure_client.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/azure/client_options.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/azure/foundry_projects_client.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/azure/foundry_projects_client_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/azure/foundry_toolsets_client.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/pkg/azure/foundry_toolsets_client_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/agent_identity_rbac.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/agent_identity_rbac_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/config.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/config_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/developer_rbac_check.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/developer_rbac_check_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/service_target_agent.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/project/service_target_agent_test.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/tools/add_agent.go (100%) rename cli/azd/extensions/azure.ai.agents/internal/{ => agents}/version/version.go (100%) diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/agent_context.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/agent_context.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/agent_context_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/agent_context_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/agent_endpoint.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/agent_endpoint.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/agent_endpoint_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/agent_endpoint_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/banner.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/banner.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/banner_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/banner_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/config_store.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/config_store.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/config_store.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/config_store.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/config_store_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/config_store_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/config_store_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/config_store_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/debug.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/debug.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/debug.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/debug.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/extension_context.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/extension_context.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/extension_context.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/extension_context.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/files.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/files.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/files_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/files_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/flag_options_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/flag_options_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/flag_options_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/flag_options_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/helpers.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/helpers.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/helpers_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/helpers_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/hosted-agent-regions.json b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/hosted-agent-regions.json similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/hosted-agent-regions.json rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/hosted-agent-regions.json diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_copy.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_copy.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_copy.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_copy.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_copy_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_copy_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_copy_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_copy_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_foundry_resources_helpers.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_foundry_resources_helpers.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_foundry_resources_helpers_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_foundry_resources_helpers_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_code.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_code.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_code_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_code_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_templates_helpers.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_templates_helpers.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_templates_helpers_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_templates_helpers_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_locations.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_locations.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_locations_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_locations_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_models.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_models.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_models_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_models_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/init_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/init_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/invoke.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/invoke.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/invoke_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/invoke_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/listen.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/listen.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/listen_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/listen_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/mcp.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/mcp.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/mcp.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/mcp.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/monitor.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/monitor.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/monitor_format.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor_format.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/monitor_format.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor_format.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/monitor_format_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor_format_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/monitor_format_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor_format_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/monitor_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/monitor_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/root.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/root.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/root.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/root.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/run.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/run.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/run.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/run.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/run_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/run_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/run_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/run_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/session.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/session.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/session_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/session_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/show.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/show.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/show_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/show_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/cmd/version.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/version.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/cmd/version.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/cmd/version.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/exterrors/codes.go b/cli/azd/extensions/azure.ai.agents/internal/agents/exterrors/codes.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/exterrors/codes.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/exterrors/codes.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/exterrors/errors.go b/cli/azd/extensions/azure.ai.agents/internal/agents/exterrors/errors.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/exterrors/errors.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/exterrors/errors.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/exterrors/errors_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/exterrors/errors_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/exterrors/errors_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/exterrors/errors_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/models.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/models.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/models.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/models.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/models_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/models_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/models_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/models_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/operations.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/operations.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/operations_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_api/operations_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parameters.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parameters.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parameters.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parameters.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parameters_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parameters_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parameters_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parameters_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse_test.go.old b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go.old similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse_test.go.old rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go.old diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/sample_integration_test.go.old b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/sample_integration_test.go.old similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/sample_integration_test.go.old rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/sample_integration_test.go.old diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/hosted-agent.yaml b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/hosted-agent.yaml similarity index 96% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/hosted-agent.yaml rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/hosted-agent.yaml index a6a5314c78b..f2af39d4170 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/hosted-agent.yaml +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/hosted-agent.yaml @@ -1,9 +1,9 @@ -template: - kind: hosted - name: hosted-test-agent - description: A hosted container agent for testing - protocols: - - protocol: responses - version: "1.0.0" - - protocol: invocations - version: "1.0.0" +template: + kind: hosted + name: hosted-test-agent + description: A hosted container agent for testing + protocols: + - protocol: responses + version: "1.0.0" + - protocol: invocations + version: "1.0.0" diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/invalid-empty-template.yaml b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/invalid-empty-template.yaml similarity index 92% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/invalid-empty-template.yaml rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/invalid-empty-template.yaml index 2676f0d4033..5d488b6b1e9 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/invalid-empty-template.yaml +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/invalid-empty-template.yaml @@ -1 +1 @@ -template: {} +template: {} diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/invalid-no-kind.yaml b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/invalid-no-kind.yaml similarity index 93% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/invalid-no-kind.yaml rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/invalid-no-kind.yaml index 5ba3da54847..91c7ac1bef4 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata/invalid-no-kind.yaml +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata/invalid-no-kind.yaml @@ -1,4 +1,4 @@ -template: - name: no-kind-agent - model: - id: gpt-4o +template: + name: no-kind-agent + model: + id: gpt-4o diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/testdata_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/testdata_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/yaml.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/yaml.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/yaml_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/yaml_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/azure/azure_client.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/azure_client.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/azure/azure_client.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/azure_client.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/azure/client_options.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/client_options.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/azure/client_options.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/client_options.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_projects_client.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_projects_client.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_projects_client_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_projects_client_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_toolsets_client.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_toolsets_client.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_toolsets_client_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/pkg/azure/foundry_toolsets_client_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/agent_identity_rbac.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/agent_identity_rbac.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/agent_identity_rbac.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/agent_identity_rbac.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/agent_identity_rbac_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/agent_identity_rbac_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/agent_identity_rbac_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/agent_identity_rbac_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/config.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/config.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/config.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/config.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/config_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/config_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/config_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/config_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/developer_rbac_check.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/developer_rbac_check.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/developer_rbac_check.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/developer_rbac_check.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/developer_rbac_check_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/developer_rbac_check_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/developer_rbac_check_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/developer_rbac_check_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/service_target_agent.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/service_target_agent.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/project/service_target_agent_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent_test.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/project/service_target_agent_test.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent_test.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/tools/add_agent.go b/cli/azd/extensions/azure.ai.agents/internal/agents/tools/add_agent.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/tools/add_agent.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/tools/add_agent.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/version/version.go b/cli/azd/extensions/azure.ai.agents/internal/agents/version/version.go similarity index 100% rename from cli/azd/extensions/azure.ai.agents/internal/version/version.go rename to cli/azd/extensions/azure.ai.agents/internal/agents/version/version.go From 9d546c03f13912dff8fc718ad8335b590a60714e Mon Sep 17 00:00:00 2001 From: trangevi Date: Thu, 7 May 2026 15:16:26 -0700 Subject: [PATCH 2/4] Update import paths Signed-off-by: trangevi --- .../internal/agents/cmd/agent_context.go | 2 +- .../internal/agents/cmd/agent_endpoint.go | 6 +++--- .../internal/agents/cmd/agent_endpoint_test.go | 2 +- .../azure.ai.agents/internal/agents/cmd/banner.go | 2 +- .../azure.ai.agents/internal/agents/cmd/files.go | 2 +- .../azure.ai.agents/internal/agents/cmd/files_test.go | 2 +- .../azure.ai.agents/internal/agents/cmd/helpers.go | 8 ++++---- .../azure.ai.agents/internal/agents/cmd/init.go | 6 +++--- .../agents/cmd/init_foundry_resources_helpers.go | 4 ++-- .../internal/agents/cmd/init_from_code.go | 6 +++--- .../internal/agents/cmd/init_from_code_test.go | 2 +- .../internal/agents/cmd/init_from_templates_helpers.go | 4 ++-- .../internal/agents/cmd/init_locations.go | 2 +- .../internal/agents/cmd/init_locations_test.go | 2 +- .../azure.ai.agents/internal/agents/cmd/init_models.go | 6 +++--- .../internal/agents/cmd/init_models_test.go | 2 +- .../azure.ai.agents/internal/agents/cmd/init_test.go | 4 ++-- .../azure.ai.agents/internal/agents/cmd/invoke.go | 4 ++-- .../azure.ai.agents/internal/agents/cmd/invoke_test.go | 2 +- .../azure.ai.agents/internal/agents/cmd/listen.go | 10 +++++----- .../azure.ai.agents/internal/agents/cmd/listen_test.go | 2 +- .../azure.ai.agents/internal/agents/cmd/mcp.go | 2 +- .../azure.ai.agents/internal/agents/cmd/monitor.go | 2 +- .../azure.ai.agents/internal/agents/cmd/session.go | 4 ++-- .../internal/agents/cmd/session_test.go | 4 ++-- .../azure.ai.agents/internal/agents/cmd/show.go | 4 ++-- .../azure.ai.agents/internal/agents/cmd/show_test.go | 2 +- .../azure.ai.agents/internal/agents/cmd/version.go | 2 +- .../internal/agents/pkg/agents/agent_api/operations.go | 2 +- .../internal/agents/pkg/agents/agent_yaml/map.go | 2 +- .../internal/agents/pkg/agents/agent_yaml/map_test.go | 2 +- .../internal/agents/pkg/agents/agent_yaml/parse.go | 2 +- .../agents/pkg/agents/agent_yaml/parse_test.go | 2 +- .../internal/agents/pkg/azure/client_options.go | 2 +- .../agents/pkg/azure/foundry_projects_client.go | 2 +- .../agents/pkg/azure/foundry_toolsets_client.go | 2 +- .../internal/agents/project/service_target_agent.go | 8 ++++---- .../agents/project/service_target_agent_test.go | 4 ++-- cli/azd/extensions/azure.ai.agents/main.go | 2 +- 39 files changed, 65 insertions(+), 65 deletions(-) diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context.go index 2783245d57f..5f50b10f528 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_context.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint.go index f6fceb434d1..91df86ac84a 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_api" - "azureaiagent/internal/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" ) // agentEndpointHostSuffix is the required Foundry host suffix for endpoint URLs. diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint_test.go index 7dd027ae3a7..f899f824397 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/agent_endpoint_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" ) func TestParseAgentEndpoint(t *testing.T) { diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner.go index 698e1a10eb5..bc90a6bd6b8 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/banner.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "azureaiagent/internal/version" + "azureaiagent/internal/agents/version" "github.com/azure/azure-dev/cli/azd/pkg/output" "github.com/fatih/color" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files.go index 1830db2ee08..55e13271740 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files.go @@ -12,7 +12,7 @@ import ( "path/filepath" "text/tabwriter" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/spf13/cobra" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files_test.go index 124e87d205e..6281c904b89 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/files_test.go @@ -6,7 +6,7 @@ package cmd import ( "testing" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers.go index 25c41c1e60b..ba21e6fa11e 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/helpers.go @@ -17,10 +17,10 @@ import ( "strings" "time" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_api" - "azureaiagent/internal/pkg/agents/agent_yaml" - projectpkg "azureaiagent/internal/project" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" + projectpkg "azureaiagent/internal/agents/project" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/google/uuid" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init.go index d5838ff6769..11915ff4794 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init.go @@ -21,9 +21,9 @@ import ( "strings" "time" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_yaml" - "azureaiagent/internal/project" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/project" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers.go index 285de31c6d4..2913bd9e751 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_foundry_resources_helpers.go @@ -4,8 +4,8 @@ package cmd import ( - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/azure" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/azure" "context" "fmt" "regexp" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code.go index c6d14c9b4a5..f04ce2e4b76 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code.go @@ -4,9 +4,9 @@ package cmd import ( - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_yaml" - "azureaiagent/internal/project" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/project" "context" "encoding/json" "fmt" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code_test.go index 7133b9b6bf5..dc57f95a853 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_code_test.go @@ -4,7 +4,7 @@ package cmd import ( - "azureaiagent/internal/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" "context" "os" "path/filepath" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers.go index aa4bc367e48..c78582073c8 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_from_templates_helpers.go @@ -17,8 +17,8 @@ import ( "slices" "strings" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/azure/azure-dev/cli/azd/pkg/output" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations.go index b8044b87208..9ffb39e604c 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "azureaiagent/internal/exterrors" + "azureaiagent/internal/agents/exterrors" "github.com/azure/azure-dev/cli/azd/pkg/azdext" ) diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations_test.go index 8562a1d3bc5..49f8dcdd570 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_locations_test.go @@ -17,7 +17,7 @@ import ( "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/stretchr/testify/require" - "azureaiagent/internal/exterrors" + "azureaiagent/internal/agents/exterrors" ) func TestFetchHostedAgentRegionsFromURL_Success(t *testing.T) { diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models.go index b9bedd09429..df335c80195 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models.go @@ -9,9 +9,9 @@ import ( "slices" "strings" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_yaml" - "azureaiagent/internal/project" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/project" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/azure/azure-dev/cli/azd/pkg/output" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models_test.go index 50759e17453..d3441c00b5b 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_models_test.go @@ -4,7 +4,7 @@ package cmd import ( - "azureaiagent/internal/project" + "azureaiagent/internal/agents/project" "context" "errors" "testing" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_test.go index a9b81c8b117..1f19664bfc8 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/init_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/spf13/cobra" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke.go index 082020f1e32..a48164f74ad 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke.go @@ -18,8 +18,8 @@ import ( "strings" "time" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_api" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/azure/azure-dev/cli/azd/pkg/azdext" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke_test.go index 27aa72d4ab7..1fd30a01204 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/invoke_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" ) func TestReadSSEStream(t *testing.T) { diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen.go index 641fe54162f..89dc5e3cd68 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen.go @@ -14,11 +14,11 @@ import ( "regexp" "strings" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_api" - "azureaiagent/internal/pkg/agents/agent_yaml" - "azureaiagent/internal/pkg/azure" - "azureaiagent/internal/project" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/pkg/azure" + "azureaiagent/internal/agents/project" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/azure/azure-dev/cli/azd/pkg/azdext" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen_test.go index d50c3072ac2..69051de8475 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/listen_test.go @@ -6,7 +6,7 @@ package cmd import ( "testing" - "azureaiagent/internal/project" + "azureaiagent/internal/agents/project" "github.com/azure/azure-dev/cli/azd/pkg/azdext" ) diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/mcp.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/mcp.go index bcf65acb29a..4bc26675bc7 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/mcp.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/mcp.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "azureaiagent/internal/tools" + "azureaiagent/internal/agents/tools" "github.com/fatih/color" "github.com/mark3labs/mcp-go/server" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor.go index 422abec77b4..cf8b067577b 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/monitor.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "azureaiagent/internal/exterrors" + "azureaiagent/internal/agents/exterrors" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/spf13/cobra" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session.go index 3b4ebab1472..8366af919c0 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session.go @@ -14,8 +14,8 @@ import ( "text/tabwriter" "time" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_api" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/azure/azure-dev/cli/azd/pkg/azdext" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session_test.go index ccb616562ae..f68ce429eb7 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/session_test.go @@ -10,8 +10,8 @@ import ( "net/http" "testing" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_api" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/azure/azure-dev/cli/azd/pkg/azdext" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show.go index 77f7eebc049..f20f00817bc 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show.go @@ -13,8 +13,8 @@ import ( "text/tabwriter" "time" - "azureaiagent/internal/pkg/agents/agent_api" - projectpkg "azureaiagent/internal/project" + "azureaiagent/internal/agents/pkg/agents/agent_api" + projectpkg "azureaiagent/internal/agents/project" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/spf13/cobra" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show_test.go index 955d4021331..8e91f10055a 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/show_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/version.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/version.go index b0cc4888c51..ab7915ea6d8 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/version.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/version.go @@ -6,7 +6,7 @@ package cmd import ( "fmt" - "azureaiagent/internal/version" + "azureaiagent/internal/agents/version" "github.com/spf13/cobra" ) diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations.go index ea474f0e215..3ebaeac2466 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_api/operations.go @@ -14,7 +14,7 @@ import ( "strconv" "time" - "azureaiagent/internal/version" + "azureaiagent/internal/agents/version" "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map.go index 79bfe232b47..1669124e876 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map.go @@ -9,7 +9,7 @@ import ( "math" "strings" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" "go.yaml.in/yaml/v3" ) diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map_test.go index 2ac9151f280..d92311d9aa9 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/map_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "azureaiagent/internal/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_api" ) // --------------------------------------------------------------------------- diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse.go index b2cec402cb0..818eb8f4123 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse.go @@ -10,7 +10,7 @@ import ( "go.yaml.in/yaml/v3" - "azureaiagent/internal/exterrors" + "azureaiagent/internal/agents/exterrors" ) // LoadAndValidateAgentManifest parses YAML content and validates it as an AgentManifest diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go index 78de4ef92c6..cb50f1ce4e3 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/agents/agent_yaml/parse_test.go @@ -11,7 +11,7 @@ import ( "github.com/azure/azure-dev/cli/azd/pkg/azdext" "go.yaml.in/yaml/v3" - "azureaiagent/internal/exterrors" + "azureaiagent/internal/agents/exterrors" ) // TestExtractAgentDefinition_WithTemplateField tests parsing YAML with a template field (manifest format) diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/client_options.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/client_options.go index bc7f7e2fe07..7b61cc4d393 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/client_options.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/client_options.go @@ -4,7 +4,7 @@ package azure import ( - "azureaiagent/internal/version" + "azureaiagent/internal/agents/version" "fmt" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client.go index 9bcbafc02e4..57a2de99d22 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_projects_client.go @@ -4,7 +4,7 @@ package azure import ( - "azureaiagent/internal/version" + "azureaiagent/internal/agents/version" "context" "encoding/json" "fmt" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client.go b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client.go index 7c0ae152a82..f73816df49a 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/pkg/azure/foundry_toolsets_client.go @@ -19,7 +19,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming" "github.com/azure/azure-dev/cli/azd/pkg/azsdk" - "azureaiagent/internal/version" + "azureaiagent/internal/agents/version" ) const ( diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent.go index 0c77ca6c8cc..b1bcf277e36 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent.go @@ -11,10 +11,10 @@ import ( "path/filepath" "strings" - "azureaiagent/internal/exterrors" - "azureaiagent/internal/pkg/agents/agent_api" - "azureaiagent/internal/pkg/agents/agent_yaml" - "azureaiagent/internal/pkg/azure" + "azureaiagent/internal/agents/exterrors" + "azureaiagent/internal/agents/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/pkg/azure" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent_test.go b/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent_test.go index 9217838b8b2..173c1729869 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent_test.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/project/service_target_agent_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "azureaiagent/internal/pkg/agents/agent_api" - "azureaiagent/internal/pkg/agents/agent_yaml" + "azureaiagent/internal/agents/pkg/agents/agent_api" + "azureaiagent/internal/agents/pkg/agents/agent_yaml" "github.com/azure/azure-dev/cli/azd/pkg/azdext" "github.com/stretchr/testify/require" diff --git a/cli/azd/extensions/azure.ai.agents/main.go b/cli/azd/extensions/azure.ai.agents/main.go index 471e3cbd0dd..f16a6ee51a2 100644 --- a/cli/azd/extensions/azure.ai.agents/main.go +++ b/cli/azd/extensions/azure.ai.agents/main.go @@ -4,7 +4,7 @@ package main import ( - "azureaiagent/internal/cmd" + "azureaiagent/internal/agents/cmd" "github.com/azure/azure-dev/cli/azd/pkg/azdext" ) From 3ca6147b6eedfd02244c322efd142f8f120bb095 Mon Sep 17 00:00:00 2001 From: trangevi Date: Thu, 7 May 2026 16:24:05 -0700 Subject: [PATCH 3/4] Add scaffolding for toolboxes commands Signed-off-by: trangevi --- .../internal/toolboxes/cmd/create.go | 41 +++++++++++++++++++ .../toolboxes/cmd/extension_context.go | 18 ++++++++ .../internal/toolboxes/cmd/root.go | 22 ++++++++++ 3 files changed, 81 insertions(+) create mode 100644 cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/create.go create mode 100644 cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/extension_context.go create mode 100644 cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go diff --git a/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/create.go b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/create.go new file mode 100644 index 00000000000..8bbde621461 --- /dev/null +++ b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/create.go @@ -0,0 +1,41 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package cmd + +import ( + "context" + "fmt" + + "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/spf13/cobra" +) + +type ToolboxesCreateAction struct { + flags *toolboxesCreateFlags +} + +type toolboxesCreateFlags struct { +} + +func newCreateCommand(extCtx *azdext.ExtensionContext) *cobra.Command { + flags := &toolboxesCreateFlags{} + action := &ToolboxesCreateAction{flags: flags} + extCtx = ensureExtensionContext(extCtx) + + cmd := &cobra.Command{ + Use: "create", + Short: "Create a new toolbox.", + RunE: func(cmd *cobra.Command, args []string) error { + ctx := azdext.WithAccessToken(cmd.Context()) + + return action.Run(ctx) + }, + } + + return cmd +} + +func (a *ToolboxesCreateAction) Run(ctx context.Context) error { + return fmt.Errorf("not implemented") +} diff --git a/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/extension_context.go b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/extension_context.go new file mode 100644 index 00000000000..93dd4d56487 --- /dev/null +++ b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/extension_context.go @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package cmd + +import "github.com/azure/azure-dev/cli/azd/pkg/azdext" + +// ensureExtensionContext returns a non-nil [azdext.ExtensionContext] so command +// constructors can be safely invoked from tests with a nil receiver. The SDK's +// [azdext.NewExtensionRootCommand] populates the real context (and its env-var +// fallback) before any leaf RunE runs, so tests that don't exercise RunE can +// safely pass nil here. +func ensureExtensionContext(extCtx *azdext.ExtensionContext) *azdext.ExtensionContext { + if extCtx == nil { + return &azdext.ExtensionContext{} + } + return extCtx +} diff --git a/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go new file mode 100644 index 00000000000..5baa66424c9 --- /dev/null +++ b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go @@ -0,0 +1,22 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package cmd + +import ( + "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/spf13/cobra" +) + +func NewToolboxesCommand(extCtx *azdext.ExtensionContext) *cobra.Command { + extCtx = ensureExtensionContext(extCtx) + + cmd := &cobra.Command{ + Use: "toolboxes", + Short: "Manage AI toolboxes.", + } + + cmd.AddCommand(newCreateCommand(extCtx)) + + return cmd +} From 3f9050706bc5b7868316335f2050e4b5d2a5483b Mon Sep 17 00:00:00 2001 From: trangevi Date: Thu, 7 May 2026 16:43:16 -0700 Subject: [PATCH 4/4] Attempting to shift the root command up a level Signed-off-by: trangevi --- .../extensions/azure.ai.agents/extension.yaml | 4 +- .../internal/agents/cmd/root.go | 63 +++++----------- .../azure.ai.agents/internal/banner.go | 42 +++++++++++ .../azure.ai.agents/internal/debug.go | 71 +++++++++++++++++++ .../azure.ai.agents/internal/root.go | 57 +++++++++++++++ .../internal/toolboxes/cmd/root.go | 8 ++- .../internal/toolboxes/cmd/version.go | 22 ++++++ cli/azd/extensions/azure.ai.agents/main.go | 4 +- 8 files changed, 221 insertions(+), 50 deletions(-) create mode 100644 cli/azd/extensions/azure.ai.agents/internal/banner.go create mode 100644 cli/azd/extensions/azure.ai.agents/internal/debug.go create mode 100644 cli/azd/extensions/azure.ai.agents/internal/root.go create mode 100644 cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/version.go diff --git a/cli/azd/extensions/azure.ai.agents/extension.yaml b/cli/azd/extensions/azure.ai.agents/extension.yaml index 48c13084a5a..3ebdcfee446 100644 --- a/cli/azd/extensions/azure.ai.agents/extension.yaml +++ b/cli/azd/extensions/azure.ai.agents/extension.yaml @@ -1,9 +1,9 @@ # yaml-language-server: $schema=../extension.schema.json id: azure.ai.agents -namespace: ai.agent +namespace: ai displayName: Foundry agents (Preview) description: Ship agents with Microsoft Foundry from your terminal. (Preview) -usage: azd ai agent [options] +usage: azd ai [options] # NOTE: Make sure version.txt is in sync with this version. version: 0.1.30-preview requiredAzdVersion: ">1.23.13" diff --git a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/root.go b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/root.go index d65d1c0b8e5..3c47c6ec725 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/root.go +++ b/cli/azd/extensions/azure.ai.agents/internal/agents/cmd/root.go @@ -11,55 +11,28 @@ import ( "github.com/spf13/cobra" ) -func NewRootCommand() *cobra.Command { - rootCmd, extCtx := azdext.NewExtensionRootCommand(azdext.ExtensionCommandOptions{ - Name: "agent", +func NewAgentRootCommand(extCtx *azdext.ExtensionContext) *cobra.Command { + extCtx = ensureExtensionContext(extCtx) + + cmd := &cobra.Command{ Use: "agent [options]", Short: fmt.Sprintf("Ship agents with Microsoft Foundry from your terminal. %s", color.YellowString("(Preview)")), - }) - rootCmd.SilenceUsage = true - rootCmd.SilenceErrors = true - rootCmd.CompletionOptions.DisableDefaultCmd = true - - // Configure debug logging once on the root command so every subcommand - // inherits it (cobra.EnableTraverseRunHooks, set by the SDK, ensures this - // runs alongside any subcommand pre-runs). The cleanup func is intentionally - // discarded: log writes are unbuffered and the OS closes the file on exit. - sdkPreRun := rootCmd.PersistentPreRunE - rootCmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error { - if sdkPreRun != nil { - if err := sdkPreRun(cmd, args); err != nil { - return err - } - } - setupDebugLogging(cmd.Flags()) - return nil } - // Show the ASCII art banner above the default help text for the root command - defaultHelp := rootCmd.HelpFunc() - rootCmd.SetHelpFunc(func(cmd *cobra.Command, args []string) { - if cmd == rootCmd { - printBanner(cmd.OutOrStdout()) - } - defaultHelp(cmd, args) - }) - - rootCmd.SetHelpCommand(&cobra.Command{Hidden: true}) - - rootCmd.AddCommand(azdext.NewListenCommand(configureExtensionHost)) - rootCmd.AddCommand(newVersionCommand()) - rootCmd.AddCommand(newInitCommand(extCtx)) - rootCmd.AddCommand(newRunCommand(extCtx)) - rootCmd.AddCommand(newInvokeCommand(extCtx)) - rootCmd.AddCommand(newMcpCommand()) - rootCmd.AddCommand(azdext.NewMetadataCommand("1.0", "azure.ai.agents", func() *cobra.Command { - return rootCmd + cmd.AddCommand(azdext.NewListenCommand(configureExtensionHost)) + cmd.AddCommand(newVersionCommand()) + cmd.AddCommand(azdext.NewMetadataCommand("1.0", "azure.ai.agents", func() *cobra.Command { + return cmd })) - rootCmd.AddCommand(newShowCommand(extCtx)) - rootCmd.AddCommand(newMonitorCommand(extCtx)) - rootCmd.AddCommand(newFilesCommand(extCtx)) - rootCmd.AddCommand(newSessionCommand(extCtx)) - return rootCmd + cmd.AddCommand(newInitCommand(extCtx)) + cmd.AddCommand(newRunCommand(extCtx)) + cmd.AddCommand(newInvokeCommand(extCtx)) + cmd.AddCommand(newMcpCommand()) + cmd.AddCommand(newShowCommand(extCtx)) + cmd.AddCommand(newMonitorCommand(extCtx)) + cmd.AddCommand(newFilesCommand(extCtx)) + cmd.AddCommand(newSessionCommand(extCtx)) + + return cmd } diff --git a/cli/azd/extensions/azure.ai.agents/internal/banner.go b/cli/azd/extensions/azure.ai.agents/internal/banner.go new file mode 100644 index 00000000000..d8044fe4cdf --- /dev/null +++ b/cli/azd/extensions/azure.ai.agents/internal/banner.go @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package internal + +import ( + "fmt" + "io" + "strings" + + "azureaiagent/internal/agents/version" + + "github.com/azure/azure-dev/cli/azd/pkg/output" + "github.com/fatih/color" +) + +// ASCII art using ANSI Shadow font for "FOUNDRY". +// Visual width is 61 columns; each box-drawing character is one display column +// but occupies multiple UTF-8 bytes, so len() over-counts. Tests use +// rune-aware width measurement. +const bannerArt = `███████╗ ██████╗ ██╗ ██╗███╗ ██╗██████╗ ██████╗ ██╗ ██╗ +██╔════╝██╔═══██╗██║ ██║████╗ ██║██╔══██╗██╔══██╗╚██╗ ██╔╝ +█████╗ ██║ ██║██║ ██║██╔██╗ ██║██║ ██║██████╔╝ ╚████╔╝ +██╔══╝ ██║ ██║██║ ██║██║╚██╗██║██║ ██║██╔══██╗ ╚██╔╝ +██║ ╚██████╔╝╚██████╔╝██║ ╚████║██████╔╝██║ ██║ ██║ +╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═══╝╚═════╝ ╚═╝ ╚═╝ ╚═╝ + ` + +func printBanner(w io.Writer) { + purple := color.RGB(109, 53, 255).Add(color.Bold) + fmt.Fprintln(w) + + for line := range strings.SplitSeq(bannerArt, "\n") { + purple.Fprintln(w, line) //nolint:gosec // G104 - banner output errors are non-critical + } + + fmt.Fprint(w, output.WithGrayFormat("v%s", version.Version)) //nolint:gosec // G104 - banner output errors are non-critical + fmt.Fprint(w, " ") + fmt.Fprintln(w) + fmt.Fprintln(w, output.WithGrayFormat("Visit the docs at https://aka.ms/azd-ai-agent-docs")) //nolint:gosec // G104 - banner output errors are non-critical + fmt.Fprintln(w) +} diff --git a/cli/azd/extensions/azure.ai.agents/internal/debug.go b/cli/azd/extensions/azure.ai.agents/internal/debug.go new file mode 100644 index 00000000000..90ea729167a --- /dev/null +++ b/cli/azd/extensions/azure.ai.agents/internal/debug.go @@ -0,0 +1,71 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package internal + +import ( + "fmt" + "io" + "log" + "os" + "regexp" + "strconv" + "time" + + azcorelog "github.com/Azure/azure-sdk-for-go/sdk/azcore/log" + "github.com/spf13/pflag" +) + +var connectionStringJSONRegex = regexp.MustCompile(`("[\w]*(?:CONNECTION_STRING|ConnectionString)":\s*)"[^"]*"`) + +// setupDebugLogging configures debug logging for the extension. +// By default Go's standard log package writes to stderr, which causes internal +// messages (e.g. from the command runner and GitHub CLI wrapper) to appear as +// noisy user-facing output. This function silences those logs unless debug mode +// is enabled, and additionally configures the Azure SDK logger when debugging. +// Returns a cleanup function that should be deferred by the caller. +func setupDebugLogging(flags *pflag.FlagSet) func() { + if !isDebug(flags) { + log.SetOutput(io.Discard) + azcorelog.SetListener(nil) + return func() {} + } + + currentDate := time.Now().Format("2006-01-02") + logFileName := fmt.Sprintf("azd-ai-agents-%s.log", currentDate) + + //nolint:gosec // log file name is generated locally from date and not user-controlled + logFile, err := os.OpenFile(logFileName, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) + + var w io.Writer + var closeFile func() + if err != nil { + w = os.Stderr + closeFile = func() {} + } else { + w = logFile + closeFile = func() { logFile.Close() } //nolint:gosec // best-effort cleanup of debug log file + } + + log.SetOutput(w) + azcorelog.SetListener(func(event azcorelog.Event, msg string) { + msg = connectionStringJSONRegex.ReplaceAllString(msg, `${1}"REDACTED"`) + fmt.Fprintf(w, "[%s] %s: %s\n", time.Now().Format(time.RFC3339), event, msg) + }) + + return func() { + log.SetOutput(io.Discard) + azcorelog.SetListener(nil) + closeFile() + } +} + +// isDebug checks if debug mode is enabled via --debug flag or AZD_EXT_DEBUG environment variable +func isDebug(flags *pflag.FlagSet) bool { + if debugFlag, err := flags.GetBool("debug"); err == nil && debugFlag { + return true + } + + debug, _ := strconv.ParseBool(os.Getenv("AZD_EXT_DEBUG")) + return debug +} diff --git a/cli/azd/extensions/azure.ai.agents/internal/root.go b/cli/azd/extensions/azure.ai.agents/internal/root.go new file mode 100644 index 00000000000..05737faa1ae --- /dev/null +++ b/cli/azd/extensions/azure.ai.agents/internal/root.go @@ -0,0 +1,57 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package internal + +import ( + "fmt" + + "github.com/azure/azure-dev/cli/azd/pkg/azdext" + "github.com/fatih/color" + "github.com/spf13/cobra" + + agents "azureaiagent/internal/agents/cmd" + toolboxes "azureaiagent/internal/toolboxes/cmd" +) + +func NewRootCommand() *cobra.Command { + rootCmd, extCtx := azdext.NewExtensionRootCommand(azdext.ExtensionCommandOptions{ + Name: "ai", + Use: "ai [options]", + Short: fmt.Sprintf("Ship agents with Microsoft Foundry from your terminal. %s", color.YellowString("(Preview)")), + }) + rootCmd.SilenceUsage = true + rootCmd.SilenceErrors = true + rootCmd.CompletionOptions.DisableDefaultCmd = true + + // Configure debug logging once on the root command so every subcommand + // inherits it (cobra.EnableTraverseRunHooks, set by the SDK, ensures this + // runs alongside any subcommand pre-runs). The cleanup func is intentionally + // discarded: log writes are unbuffered and the OS closes the file on exit. + sdkPreRun := rootCmd.PersistentPreRunE + rootCmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error { + if sdkPreRun != nil { + if err := sdkPreRun(cmd, args); err != nil { + return err + } + } + setupDebugLogging(cmd.Flags()) + return nil + } + + // Show the ASCII art banner above the default help text for the root command + defaultHelp := rootCmd.HelpFunc() + rootCmd.SetHelpFunc(func(cmd *cobra.Command, args []string) { + if cmd == rootCmd { + printBanner(cmd.OutOrStdout()) + } + defaultHelp(cmd, args) + }) + + rootCmd.SetHelpCommand(&cobra.Command{Hidden: true}) + + rootCmd.AddCommand(agents.NewAgentRootCommand(extCtx)) + rootCmd.AddCommand(toolboxes.NewToolboxesRootCommand(extCtx)) + + return rootCmd +} diff --git a/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go index 5baa66424c9..d1f5137c1a3 100644 --- a/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go +++ b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/root.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" ) -func NewToolboxesCommand(extCtx *azdext.ExtensionContext) *cobra.Command { +func NewToolboxesRootCommand(extCtx *azdext.ExtensionContext) *cobra.Command { extCtx = ensureExtensionContext(extCtx) cmd := &cobra.Command{ @@ -16,6 +16,12 @@ func NewToolboxesCommand(extCtx *azdext.ExtensionContext) *cobra.Command { Short: "Manage AI toolboxes.", } + // cmd.AddCommand(azdext.NewListenCommand(configureExtensionHost)) + cmd.AddCommand(newVersionCommand()) + cmd.AddCommand(azdext.NewMetadataCommand("1.0", "azure.ai.agents", func() *cobra.Command { + return cmd + })) + cmd.AddCommand(newCreateCommand(extCtx)) return cmd diff --git a/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/version.go b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/version.go new file mode 100644 index 00000000000..ab7915ea6d8 --- /dev/null +++ b/cli/azd/extensions/azure.ai.agents/internal/toolboxes/cmd/version.go @@ -0,0 +1,22 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package cmd + +import ( + "fmt" + + "azureaiagent/internal/agents/version" + + "github.com/spf13/cobra" +) + +func newVersionCommand() *cobra.Command { + return &cobra.Command{ + Use: "version", + Short: "Prints the version of the application", + Run: func(cmd *cobra.Command, args []string) { + fmt.Printf("Version: %s\nCommit: %s\nBuild Date: %s\n", version.Version, version.Commit, version.BuildDate) + }, + } +} diff --git a/cli/azd/extensions/azure.ai.agents/main.go b/cli/azd/extensions/azure.ai.agents/main.go index f16a6ee51a2..ecb9bfb72e7 100644 --- a/cli/azd/extensions/azure.ai.agents/main.go +++ b/cli/azd/extensions/azure.ai.agents/main.go @@ -4,11 +4,11 @@ package main import ( - "azureaiagent/internal/agents/cmd" + "azureaiagent/internal" "github.com/azure/azure-dev/cli/azd/pkg/azdext" ) func main() { - azdext.Run(cmd.NewRootCommand()) + azdext.Run(internal.NewRootCommand()) }