From 95790b6b34088a52f258c13a79f3c004e72e1ad3 Mon Sep 17 00:00:00 2001 From: NicolasVD <5943045+nicolasvd@users.noreply.github.com> Date: Fri, 25 Sep 2026 19:19:11 +0200 Subject: [PATCH] docs(readme): align quickstart clone url and bilingual gate prompts (closes #26) --- .agent/personas/p6-release-manager.md | 2 +- .agent/rules/agent-lifecycle.md | 2 +- .agent/rules/git-workflow.md | 2 +- .agent/skills/open-pr/SKILL.md | 2 +- .agent/templates/pr-walkthrough.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- AGENTS.md | 4 ++-- ARCHITECTURE.md | 2 +- README.md | 12 ++++++------ 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.agent/personas/p6-release-manager.md b/.agent/personas/p6-release-manager.md index 7c4cbcc..772fbc6 100644 --- a/.agent/personas/p6-release-manager.md +++ b/.agent/personas/p6-release-manager.md @@ -72,7 +72,7 @@ gh pr create --base main --head /issue-- \ ### 3. Zero Auto-Merge Rule > [!CAUTION] -> **P6 NEVER merges a PR without explicit human confirmation.** Present the PR link and stop. Merge only after explicit confirmation (e.g. *"Tu peux merger"*). +> **P6 NEVER merges a PR without explicit human confirmation.** Present the PR link and stop. Merge only after explicit confirmation (e.g. *"Tu peux merger"* / *"Approve merge"*). ### 4. Post-Merge Cleanup & Dual-Sync ```bash diff --git a/.agent/rules/agent-lifecycle.md b/.agent/rules/agent-lifecycle.md index 3063525..2c7766b 100644 --- a/.agent/rules/agent-lifecycle.md +++ b/.agent/rules/agent-lifecycle.md @@ -132,7 +132,7 @@ gh pr create --base --head /issue-- \ ### Step 3.3 · Zero Auto-Merge Rule > [!CAUTION] -> The agent NEVER merges a PR autonomously. Present the PR link and stop. Merge only after the user says *"Tu peux merger"* or equivalent. +> The agent NEVER merges a PR autonomously. Present the PR link and stop. Merge only after the user says *"Tu peux merger"* / *"Approve merge"* or equivalent. ### Step 3.4 · Post-Merge Branch Cleanup & Dynamic Sync diff --git a/.agent/rules/git-workflow.md b/.agent/rules/git-workflow.md index 3b55820..f2953c8 100644 --- a/.agent/rules/git-workflow.md +++ b/.agent/rules/git-workflow.md @@ -31,7 +31,7 @@ - **Zero Auto-Merge**: > [!CAUTION] - > The agent NEVER merges a PR without explicit user approval. Present the PR link and stop. Merge only after the user says *"Tu peux merger"* or equivalent. + > The agent NEVER merges a PR without explicit user approval. Present the PR link and stop. Merge only after the user says *"Tu peux merger"* / *"Approve merge"* or equivalent. - **One Branch per Task / Issue**: every modification begins with `/issue--` cut from up-to-date `main`. diff --git a/.agent/skills/open-pr/SKILL.md b/.agent/skills/open-pr/SKILL.md index 7b516dc..810feaf 100644 --- a/.agent/skills/open-pr/SKILL.md +++ b/.agent/skills/open-pr/SKILL.md @@ -89,7 +89,7 @@ GitHubMCP:create_pull_request { ### Step 6: Zero Auto-Merge Guardrail (STOP & WAIT) > [!CAUTION] -> **Zero Auto-Merge Rule**: Persona 6 MUST NEVER merge the PR automatically. Present the PR link in chat and stop. Wait for explicit user approval (e.g. *"Tu peux merger"*). +> **Zero Auto-Merge Rule**: Persona 6 MUST NEVER merge the PR automatically. Present the PR link in chat and stop. Wait for explicit user approval (e.g. *"Tu peux merger"* / *"Approve merge"*). ### Step 7: Post-Merge Cleanup & Dual-Sync Once user confirms merge: diff --git a/.agent/templates/pr-walkthrough.md b/.agent/templates/pr-walkthrough.md index f94023a..a8fe88e 100644 --- a/.agent/templates/pr-walkthrough.md +++ b/.agent/templates/pr-walkthrough.md @@ -87,5 +87,5 @@ Zero "N/A" lines or empty placeholders are permitted. > [!CAUTION] > **Zero Auto-Merge — Explicit approval required.** -> This PR will NOT be merged until the author explicitly confirms: *"Tu peux merger"* or equivalent. +> This PR will NOT be merged until the author explicitly confirms: *"Tu peux merger"* / *"Approve merge"* or equivalent. > P6 presents this PR link and stops. Merge is a deliberate human action. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a202cb1..2091bee 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -70,5 +70,5 @@ Zero "N/A" lines or empty placeholders are permitted. > [!CAUTION] > **Zero Auto-Merge — Explicit approval required.** -> This PR will NOT be merged until the author explicitly confirms: *"Tu peux merger"* or equivalent. +> This PR will NOT be merged until the author explicitly confirms: *"Tu peux merger"* / *"Approve merge"* or equivalent. > P6 presents this PR link and stops. Merge is a deliberate human action. diff --git a/AGENTS.md b/AGENTS.md index 906779f..e7e563d 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -44,7 +44,7 @@ flowchart LR 3. **Phase 3 — Release (Persona 6)**: - Activates **Persona 6 (Release Manager)**: pushes branch and opens PR via `GitHubMCP:create_pull_request`. - PR targets `epic/**` with `skip-release` for intermediate child tasks; targets `main` for standalone or final consolidated Epic PRs. - - **Gate 3.5 — Zero Auto-Merge Lock**: Halts with PR link. Merges exclusively after explicit user confirmation (*"Tu peux merger"*). + - **Gate 3.5 — Zero Auto-Merge Lock**: Halts with PR link. Merges exclusively after explicit user confirmation (*"Tu peux merger"* / *"Approve merge"*). - Executes squash merge, runs `.agent/hooks/post-merge-dual-sync.sh` (dynamically synchronizing base branch), and prunes branches. ### 1.2 Conditional P2 Design Gate @@ -52,7 +52,7 @@ flowchart LR Pillar 1 (Design Spec) enforcement is contextual and adaptive: - **UI & Composable Changes**: **Persona 2 (Design Lead)** must define Material 3 tokens (from `DESIGN.md`), 4-state UI matrix, and Roborazzi expectations. - **Non-UI Changes**: For backend, Room, CI/CD, scripts, or doc chores, Pillar 1 is explicitly marked: `N/A — No visual/UI changes`. -- **Explicit User Override**: If prompt requests to skip design (*"skip design"*, *"sans design"*), P2 is immediately bypassed. +- **Explicit User Override**: If prompt requests to skip design (*"skip design"* / *"sans design"*), P2 is immediately bypassed. ### 1.3 The 6 Engineering Personas — Delegation Matrix diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index d2c1e42..58b4250 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -50,7 +50,7 @@ stateDiagram-v2 } state Gate_3_5 <> - note right of Gate_3_5 : ZERO AUTO-MERGE — Explicit author confirmation\n('Tu peux merger') + note right of Gate_3_5 : ZERO AUTO-MERGE — Explicit author confirmation\n('Tu peux merger' / 'Approve merge') Gate_3_5 --> SquashMerge : Confirmed SquashMerge --> PostMergeSync : post-merge-dual-sync.sh diff --git a/README.md b/README.md index 05bcc9c..8c025f0 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ flowchart TD subgraph Release["Phase 3 · Release & Observability"] Airbag -->|100% green checks| P6["P6: Release Manager\nGit Push & Open PR Walkthrough"] - P6 --> Gate35{"🔒 GATE 3.5 : Auto-Merge Lock\nHuman Authorization Required\n('Tu peux merger')"} + P6 --> Gate35{"🔒 GATE 3.5 : Auto-Merge Lock\nHuman Authorization Required\n('Tu peux merger' / 'Approve merge')"} Gate35 -->|Written confirmation| Merge["Squash Merge & Dual-Sync\nKanban Closure & Branch Pruning"] end @@ -92,7 +92,7 @@ flowchart TD - Activated after all Quality Airbag assertions pass 100% green. - Persona 6 pushes the branch and opens a Pull Request with a structured Walkthrough via `GitHubMCP:create_pull_request`. - PR targets `epic/**` with `skip-release` for intermediate child tasks; targets `main` for standalone or consolidated Epic releases. - - **Gate 3.5 — Zero Auto-Merge Lock**: Strict halt with PR link. Merges exclusively after explicit user confirmation (*"Tu peux merger"*). + - **Gate 3.5 — Zero Auto-Merge Lock**: Strict halt with PR link. Merges exclusively after explicit user confirmation (*"Tu peux merger"* / *"Approve merge"*). - Executes squash merge, runs `.agent/hooks/post-merge-dual-sync.sh` (dynamically synchronizing base branch), and prunes branches. ### Conditional Persona 2 Design Gate @@ -100,7 +100,7 @@ flowchart TD Pillar 1 (Design Spec) enforcement is contextual and adaptive: * **UI & Composable Changes**: **Persona 2 (Design Lead)** must define Material 3 tokens (from [`DESIGN.md`](DESIGN.md)), 4-state UI matrix (`Loading`, `Empty`, `Error`, `Content`), and Roborazzi expectations. * **Non-UI Changes**: For backend, Room, CI/CD, scripts, or doc chores, Pillar 1 is explicitly marked: `N/A — No visual/UI changes`. -* **Explicit User Override**: If prompt requests to skip design (*"skip design"*, *"sans design"*), P2 is immediately bypassed. +* **Explicit User Override**: If prompt requests to skip design (*"skip design"* / *"sans design"*), P2 is immediately bypassed. --- @@ -126,7 +126,7 @@ The kernel divides operational responsibilities into 6 distinct personas. To gua 3. **Rule A (Append-Only Immutability)**: Issue title and body are permanently read-only once created. Revisions are appended exclusively via comments. 4. **WIP = 1 (Single Active Pair)**: Exactly 1 issue `In Progress` and at most 1 PR `In Review` at any time (Macro Epic in progress, Micro child WIP = 1). 5. **Dual-Write Pattern**: Canonical remote GitHub issue synchronized with local `implementation_plan.md` mirror for IDE harmony. -6. **Zero Auto-Merge Lock (Gate 3.5)**: The agent never merges autonomously without human confirmation (*"Tu peux merger"*). +6. **Zero Auto-Merge Lock (Gate 3.5)**: The agent never merges autonomously without human confirmation (*"Tu peux merger"* / *"Approve merge"*). 7. **Runtime Bypass Guardrails**: * **`branch-guard.mjs`**: PreToolUse hook intercepting file write tools (`write_to_file`, `replace_file_content`), blocking edits on protected branches (`main`, `epic/**`). * **`plan-guard.mjs`**: PreToolUse hook intercepting shell executions, blocking `--no-verify`, inline hooks overrides (`-c core.hooksPath`), and direct git pushes to protected branches. @@ -239,7 +239,7 @@ All repository-specific parameters are centralized in `kernel.config.json`, form ### 1. Configure the Kernel Clone the repository and adapt `kernel.config.json` with your project coordinates: ```bash -git clone https://github.com//agentic-android-delivery-kernel.git my-app +git clone https://github.com/nicolasvd/agentic-android-delivery-kernel.git my-app cd my-app # Customize kernel.config.json ``` @@ -269,7 +269,7 @@ When initiating a feature or bug fix: 2. **Gate 1.4 Halt**: The agent halts and awaits your explicit approval. 3. **JIT Sealing**: Once approved, the issue is sealed automatically on GitHub with Projects v2 fields. 4. **Delivery & Testing**: Persona 5 implements code on `/issue--` and verifies tests green. -5. **Gate 3.5 Release**: Persona 6 opens the PR and awaits your explicit command (*"Tu peux merger"*). +5. **Gate 3.5 Release**: Persona 6 opens the PR and awaits your explicit command (*"Tu peux merger"* / *"Approve merge"*). ### 📋 Live Kanban Delivery Board (GitHub Projects v2)