diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 2f5f1c770c..b3d8583868 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -132,8 +132,9 @@ When a new issue is created, follow these steps: - Tag reviewers based on `CODEOWNERS` file ## 🌿 Branch Naming -- All branches created by AI agents **must** use the `dev/automation/` prefix (e.g. `dev/automation/fix-connection-timeout`). -- Do **not** create branches directly under `main`, `dev/`, or any other top-level prefix. +- **Interactive agents**, working under direct human guidance, may create and use branches under `dev//` when the human specifies or approves the namespace and branch name (e.g., `dev/paul/aot/phase-1.1`). +- **Autonomous agents**, working without interactive human direction, **must** create branches under `dev/automation/` (e.g., `dev/automation/fix-connection-timeout`). +- Do **not** create branches outside these namespaces or directly under `dev/`. ## 🧠 Contextual Awareness - All source code is in `src/Microsoft.Data.SqlClient/src/`. Do NOT add code to legacy `netfx/src/` or `netcore/src/` directories. diff --git a/.github/prompts/ado-work-item-agent.prompt.md b/.github/prompts/ado-work-item-agent.prompt.md index e94d667bac..87100c87c0 100644 --- a/.github/prompts/ado-work-item-agent.prompt.md +++ b/.github/prompts/ado-work-item-agent.prompt.md @@ -23,7 +23,7 @@ Perform the following steps to address the work item. Think step-by-step. - Locate the relevant code in `src/` or `tests/`. ### 2. Planning and Branching -- Propose a descriptive branch name following the repository rule `dev/automation/` (e.g., `dev/automation/fix-connection-pool`). +- Propose a descriptive branch name following the [repository branch naming rules](../../AGENTS.md#branch-naming): interactive, human-directed agents may use an approved `dev//` branch; autonomous agents must use `dev/automation/`. - Identify any dependencies or potential breaking changes. ### 3. Implementation diff --git a/AGENTS.md b/AGENTS.md index daa475d9b7..282bfc379e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -74,12 +74,9 @@ When using shell/terminal tools, follow these rules strictly: ## Branch Naming -All branches created by AI agents **must** live under the `dev/automation/` prefix. Use a descriptive suffix, for example: - -- `dev/automation/fix-connection-timeout` -- `dev/automation/add-json-type-tests` - -Do **not** create branches directly under `main`, `dev/`, or any other top-level prefix. +- **Interactive agents**, working under direct human guidance, may create and use branches under `dev//` when the human specifies or approves the namespace and branch name (e.g., `dev/paul/aot/phase-1.1`). +- **Autonomous agents**, working without interactive human direction, **must** create branches under `dev/automation/` (e.g., `dev/automation/fix-connection-timeout`). +- Do **not** create branches outside these namespaces or directly under `dev/`. ## Common Tasks