feat: implement phase 4 interactive cooking mode and workspace rules

This commit is contained in:
2026-05-21 14:50:06 +02:00
parent 21833fa05b
commit a4a2d83534
8 changed files with 373 additions and 29 deletions
+34
View File
@@ -0,0 +1,34 @@
---
description: Project workflow rules, GitHub flow, and TODO.md tracking.
alwaysOn: true
always_on: true
glob: "*"
---
## Branching & Conflict Resolution Strategy (GitHub Flow)
This project strictly follows the **GitHub Flow**. All development happens in short-lived feature branches branched off from `main`. Direct commits to `main` are prohibited.
### 1. Development Workflow
1. **Branch Creation:** Create a descriptive branch from the latest `main` state:
`git checkout main && git pull && git checkout -b feature/your-feature-name`
2. **Atomic Commits:** Make small, logical, and self-contained commits.
3. **Push & Pull Request:** Push the branch and open a Pull Request (PR) against `main` for review.
### 2. Merge Conflict Policy
When multiple features are developed simultaneously, `main` might advance before your PR is merged, causing a merge conflict. **The author of the pending PR is solely responsible for resolving conflicts.**
#### Resolution Procedure:
Never force-push blindly or overwrite other developers' work without understanding it. Follow these exact steps to resolve a conflict:
1. **Fetch Latest Main:** Update your local repository's main branch:
```bash
git checkout main
git pull origin main
### 3. Documentation Update
.md Files die nichts an der Integrität oder Impact der Codebase beiwirken sollen als einfacher Commit in Main behandelt werden.
## Project Management
- The Current Development Progress is tracked and marked down and always updated in the File `TODO.md`
+5
View File
@@ -0,0 +1,5 @@
{
"name": "close_feature",
"description": "Closes a feature branch by merging it into main, verifying functionality with the user, and then pushing and deleting the branch.",
"instructions": "When the user invokes this skill to close a feature branch, execute the following workflow:\n\n1. Identify the current feature branch using `git branch --show-current`. If the user is currently on `main`, ask them to specify which feature branch they want to close.\n2. Use the `run_command` tool to execute `git checkout main` and `git pull origin main`.\n3. Use the `run_command` tool to execute `git merge <feature-branch>`.\n4. STOP execution and ask the user to verify that the code/application still works correctly (Control Flow). Ask them to reply with 'approved' or 'yes' when they are ready to proceed.\n5. Once the user confirms, use the `run_command` tool to execute `git push origin main` and `git branch -d <feature-branch>`.\n6. Notify the user that the feature branch has been successfully closed."
}