Compare commits
2 Commits
INTEGRATIO
...
docs-reorg
Author | SHA1 | Date | |
---|---|---|---|
44cdd6eb67 | |||
57685f333b |
65
docs/AGENT-LLM.MD
Normal file
65
docs/AGENT-LLM.MD
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
# AI AGENT REFERENCE - LLM OPTIMIZED
|
||||||
|
|
||||||
|
**FOR: Gemini-CLI, Claude, OpenCode, all AI tools**
|
||||||
|
|
||||||
|
## CRITICAL RULES
|
||||||
|
1. NEVER work on `main` branch
|
||||||
|
2. NEVER auto-delete feature branches
|
||||||
|
3. ALWAYS push before switching branches
|
||||||
|
4. Push every 10 commits max
|
||||||
|
5. Tag milestones
|
||||||
|
6. UPDATE WORKLOGS
|
||||||
|
|
||||||
|
## COMMANDS
|
||||||
|
|
||||||
|
**New feature:**
|
||||||
|
```bash
|
||||||
|
git checkout main && git pull origin main
|
||||||
|
git checkout -b feature/name
|
||||||
|
```
|
||||||
|
|
||||||
|
**Before switch:**
|
||||||
|
```bash
|
||||||
|
git add . && git commit -m "msg"
|
||||||
|
git push origin current-branch
|
||||||
|
```
|
||||||
|
|
||||||
|
**Tag milestone:**
|
||||||
|
```bash
|
||||||
|
git tag -a name -m "description"
|
||||||
|
git push origin name
|
||||||
|
```
|
||||||
|
|
||||||
|
## BRANCHES
|
||||||
|
- `main` - stable, protected
|
||||||
|
- `LLMBOOTSTRAP` - initial setup
|
||||||
|
- `INTEGRATION-WIP` - auto-merge target
|
||||||
|
- `RELEASE` - manual PR target
|
||||||
|
- `feature/*` - all development
|
||||||
|
|
||||||
|
## WORKFLOW
|
||||||
|
1. Create feature branch from main
|
||||||
|
2. Frequent commits (small, logical)
|
||||||
|
3. Push every ~10 commits or before switch
|
||||||
|
4. Auto-merge to INTEGRATION-WIP
|
||||||
|
5. Manual PR to RELEASE
|
||||||
|
6. NEVER delete branches
|
||||||
|
|
||||||
|
## TAGGING
|
||||||
|
**When:** milestone/stage/feature complete
|
||||||
|
**Format:** `bootstrap-complete`, `milestone-2025-09-05`, `auth-done`
|
||||||
|
**Command:** `git tag -a name -m "desc"`
|
||||||
|
|
||||||
|
## WORKLOGS
|
||||||
|
- **docs/WORKLOG-LLM.md** - status/progress
|
||||||
|
- **docs/CURRENTWORK-LLM.md** - detailed notes
|
||||||
|
**Pattern:** Start→update status, During→add notes, End→update completion
|
||||||
|
|
||||||
|
## FILES
|
||||||
|
- Human: docs/GIT_WORKFLOW.MD, docs/AGENT.MD, docs/WORKLOG.md, docs/CURRENTWORK.md
|
||||||
|
- LLM: docs/*-LLM.MD (this file and others)
|
||||||
|
|
||||||
|
## CONTEXT
|
||||||
|
- Platform: Gitea (not GitHub)
|
||||||
|
- Repo: /home/localuser/UKSRS/CTO
|
||||||
|
- Keep clean: docs in docs/ directory
|
85
docs/AGENT.MD
Normal file
85
docs/AGENT.MD
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
# AI Agent Workflow Reference
|
||||||
|
|
||||||
|
**PRIMARY REFERENCE FOR: Gemini-CLI, Claude, OpenCode, and all AI tools**
|
||||||
|
|
||||||
|
## 🚨 CRITICAL RULES
|
||||||
|
|
||||||
|
1. **NEVER work on `main` branch** - Always use feature branches
|
||||||
|
2. **NEVER auto-delete feature branches** - Preserve all branches permanently
|
||||||
|
3. **ALWAYS push before switching branches** - Never lose work
|
||||||
|
4. **Push every 10 commits max** - Keep work backed up
|
||||||
|
5. **Tag milestones** - Mark completed stages/milestones
|
||||||
|
6. **UPDATE WORKLOGS** - Maintain WORKLOG.md and CURRENTWORK.md
|
||||||
|
|
||||||
|
## 📋 Quick Commands
|
||||||
|
|
||||||
|
**Start new feature:**
|
||||||
|
```bash
|
||||||
|
git checkout main && git pull origin main
|
||||||
|
git checkout -b feature/your-feature-name
|
||||||
|
```
|
||||||
|
|
||||||
|
**Before switching branches:**
|
||||||
|
```bash
|
||||||
|
git add . && git commit -m "Your message"
|
||||||
|
git push origin current-branch-name
|
||||||
|
```
|
||||||
|
|
||||||
|
**Tag a milestone:**
|
||||||
|
```bash
|
||||||
|
git tag -a milestone-name -m "Description of what was completed"
|
||||||
|
git push origin milestone-name
|
||||||
|
```
|
||||||
|
|
||||||
|
## 🌳 Branch Structure
|
||||||
|
|
||||||
|
- **`main`** - Stable, protected, no direct work
|
||||||
|
- **`LLMBOOTSTRAP`** - Initial setup/bootstrap work
|
||||||
|
- **`INTEGRATION-WIP`** - Auto-merge target for testing
|
||||||
|
- **`RELEASE`** - Manual PR target for production
|
||||||
|
- **`feature/*`** - All development work happens here
|
||||||
|
|
||||||
|
## ⚡ Workflow Pattern
|
||||||
|
|
||||||
|
1. Create feature branch from `main`
|
||||||
|
2. Work with frequent commits (small, logical)
|
||||||
|
3. Push every ~10 commits or before branch switching
|
||||||
|
4. Feature auto-merges to `INTEGRATION-WIP` for testing
|
||||||
|
5. Manual PR to `RELEASE` when ready for production
|
||||||
|
6. **NEVER delete branches** - Keep for history
|
||||||
|
|
||||||
|
## 🏷️ Tagging Guidelines
|
||||||
|
|
||||||
|
**When to tag:**
|
||||||
|
- Milestone completed
|
||||||
|
- Stage finished
|
||||||
|
- Major feature done
|
||||||
|
|
||||||
|
**Tag formats:**
|
||||||
|
- `bootstrap-complete` (stage names)
|
||||||
|
- `milestone-2025-09-05` (date-based)
|
||||||
|
- `auth-module-done` (feature-based)
|
||||||
|
|
||||||
|
**Always use:** `git tag -a tagname -m "description"`
|
||||||
|
|
||||||
|
## 🛠️ Repository Context
|
||||||
|
|
||||||
|
- **Platform:** Gitea (not GitHub)
|
||||||
|
- **Workflow:** Feature branches → Integration → Release
|
||||||
|
- **Philosophy:** Preserve history, frequent commits, milestone tracking
|
||||||
|
|
||||||
|
## 📝 Work Tracking
|
||||||
|
|
||||||
|
**ALWAYS maintain work logs:**
|
||||||
|
- **[WORKLOG.md](./WORKLOG.md)** - Medium fidelity: status, progress, next actions
|
||||||
|
- **[CURRENTWORK.md](./CURRENTWORK.md)** - High fidelity: detailed notes, concerns, questions
|
||||||
|
- **LLM Versions:** [AGENT-LLM.MD](./AGENT-LLM.MD), [WORKLOG-LLM.md](./WORKLOG-LLM.md), [CURRENTWORK-LLM.md](./CURRENTWORK-LLM.md)
|
||||||
|
|
||||||
|
**Update pattern:**
|
||||||
|
1. Start session → Update current status in WORKLOG.md
|
||||||
|
2. During work → Add detailed notes to CURRENTWORK.md
|
||||||
|
3. End session → Update completion status and next actions
|
||||||
|
|
||||||
|
## 📚 Detailed Reference
|
||||||
|
|
||||||
|
Full documentation: [GIT_WORKFLOW.MD](./GIT_WORKFLOW.MD)
|
67
docs/CURRENTWORK-LLM.md
Normal file
67
docs/CURRENTWORK-LLM.md
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
# CURRENTWORK - LLM OPTIMIZED
|
||||||
|
|
||||||
|
**SESSION:** 2025-09-05 Bootstrap+Docs
|
||||||
|
**AGENT:** Claude Code
|
||||||
|
**BRANCH:** LLMBOOTSTRAP
|
||||||
|
|
||||||
|
## CURRENT FOCUS
|
||||||
|
Reorganizing docs to clean structure + LLM versions
|
||||||
|
|
||||||
|
## COMPLETED
|
||||||
|
**Branch Setup**
|
||||||
|
- LLMBOOTSTRAP, INTEGRATION-WIP, RELEASE created
|
||||||
|
- All from main, no issues
|
||||||
|
|
||||||
|
**Docs Created**
|
||||||
|
- GIT_WORKFLOW.MD (147 lines, comprehensive)
|
||||||
|
- AGENT.MD (LLM-optimized reference)
|
||||||
|
- WORKLOG.md + CURRENTWORK.md (tracking system)
|
||||||
|
- Moved all to docs/ directory
|
||||||
|
- Created -LLM.md versions for AI tools
|
||||||
|
|
||||||
|
**Milestones**
|
||||||
|
- Tagged: bootstrap-complete
|
||||||
|
- Pushed tag successfully
|
||||||
|
|
||||||
|
## CURRENTLY WORKING
|
||||||
|
- Creating LLM-optimized versions (-LLM.md files)
|
||||||
|
- Updating cross-references for new paths
|
||||||
|
- Preparing for final commit/push/tag
|
||||||
|
|
||||||
|
## TECHNICAL NOTES
|
||||||
|
**Commands used:**
|
||||||
|
```bash
|
||||||
|
mkdir -p docs
|
||||||
|
mv *.MD *.md docs/
|
||||||
|
git tag -a bootstrap-complete -m "msg"
|
||||||
|
git push origin bootstrap-complete
|
||||||
|
```
|
||||||
|
|
||||||
|
**Files structure:**
|
||||||
|
```
|
||||||
|
docs/
|
||||||
|
├── GIT_WORKFLOW.MD (human readable)
|
||||||
|
├── AGENT.MD (human readable)
|
||||||
|
├── AGENT-LLM.MD (LLM optimized)
|
||||||
|
├── WORKLOG.md (human readable)
|
||||||
|
├── WORKLOG-LLM.md (LLM optimized)
|
||||||
|
├── CURRENTWORK.md (human readable)
|
||||||
|
└── CURRENTWORK-LLM.md (LLM optimized)
|
||||||
|
```
|
||||||
|
|
||||||
|
## CONCERNS
|
||||||
|
- Cross-references need updating for docs/ paths
|
||||||
|
- All branches need to be pushed to remote
|
||||||
|
- Need final milestone tag for docs reorganization
|
||||||
|
|
||||||
|
## NEXT STEPS
|
||||||
|
1. Update all internal links for docs/ paths
|
||||||
|
2. Commit current work
|
||||||
|
3. Push LLMBOOTSTRAP branch
|
||||||
|
4. Push other branches if needed
|
||||||
|
5. Tag docs-reorganized milestone
|
||||||
|
|
||||||
|
## ENVIRONMENT
|
||||||
|
- Platform: Linux, Gitea
|
||||||
|
- Branch: LLMBOOTSTRAP (clean state)
|
||||||
|
- Remote: ssh://git.knownelement.com:29418/UKRRS/CTO.git
|
128
docs/CURRENTWORK.md
Normal file
128
docs/CURRENTWORK.md
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
# Current Work - Detailed Log
|
||||||
|
|
||||||
|
**Session:** 2025-09-05 Bootstrap Setup
|
||||||
|
**Agent:** Claude Code
|
||||||
|
**Branch:** LLMBOOTSTRAP
|
||||||
|
**Related:** [WORKLOG.md](./WORKLOG.md)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🎯 Current Focus: Worklog System Implementation
|
||||||
|
|
||||||
|
### Objective
|
||||||
|
Setting up comprehensive work tracking system with:
|
||||||
|
- Medium fidelity WORKLOG.md for status/progress tracking
|
||||||
|
- High fidelity CURRENTWORK.md for detailed notes/concerns
|
||||||
|
- Proper cross-referencing between documents
|
||||||
|
|
||||||
|
### Progress Notes
|
||||||
|
|
||||||
|
#### ✅ Completed in This Session
|
||||||
|
|
||||||
|
**Branch Structure Setup**
|
||||||
|
- Created LLMBOOTSTRAP, INTEGRATION-WIP, RELEASE branches
|
||||||
|
- All branches properly created from main
|
||||||
|
- No issues with branch creation process
|
||||||
|
|
||||||
|
**Documentation Creation**
|
||||||
|
- GIT_WORKFLOW.MD: Comprehensive workflow with DO/DON'T examples
|
||||||
|
- Added explicit branch preservation rules (NEVER auto-delete)
|
||||||
|
- Included commit/push frequency guidelines (every 10 commits, before branch switches)
|
||||||
|
- Added tagging guidelines for milestones
|
||||||
|
- Total lines: ~147 lines of detailed documentation
|
||||||
|
|
||||||
|
**LLM Optimization**
|
||||||
|
- Completely rewrote AGENT.MD for AI tool consumption
|
||||||
|
- Added visual structure with emojis for quick parsing
|
||||||
|
- Created quick command reference blocks
|
||||||
|
- Structured for Gemini-CLI, Claude, OpenCode compatibility
|
||||||
|
- Reduced cognitive load while maintaining completeness
|
||||||
|
|
||||||
|
**Milestone Tracking**
|
||||||
|
- Successfully created and pushed first tag: `bootstrap-complete`
|
||||||
|
- Tag includes descriptive annotation about what was accomplished
|
||||||
|
- Demonstrates proper tagging workflow for future reference
|
||||||
|
|
||||||
|
#### 🔄 Currently Working On
|
||||||
|
|
||||||
|
**Worklog System Design**
|
||||||
|
- WORKLOG.md structure completed - medium fidelity status tracking
|
||||||
|
- CURRENTWORK.md in progress - high fidelity detailed logging
|
||||||
|
- Cross-linking between documents for easy navigation
|
||||||
|
|
||||||
|
### Technical Decisions Made
|
||||||
|
|
||||||
|
1. **Branch Naming Convention:**
|
||||||
|
- Used descriptive names (LLMBOOTSTRAP vs generic feature-1)
|
||||||
|
- INTEGRATION-WIP clearly indicates purpose
|
||||||
|
- RELEASE clearly indicates production readiness
|
||||||
|
|
||||||
|
2. **Documentation Strategy:**
|
||||||
|
- GIT_WORKFLOW.MD: Human-readable comprehensive reference
|
||||||
|
- AGENT.MD: LLM-optimized quick reference
|
||||||
|
- Dual approach ensures both human and AI accessibility
|
||||||
|
|
||||||
|
3. **Tagging Strategy:**
|
||||||
|
- Descriptive names over version numbers for clarity
|
||||||
|
- Annotated tags with meaningful descriptions
|
||||||
|
- Push immediately after creation to preserve milestones
|
||||||
|
|
||||||
|
### Concerns & Questions
|
||||||
|
|
||||||
|
#### Repository Structure
|
||||||
|
- **Concern:** Current flat structure in root directory
|
||||||
|
- **Question:** Should we organize docs into subdirectories later?
|
||||||
|
- **Decision:** Keep flat for now for simplicity, reorganize if it becomes cluttered
|
||||||
|
|
||||||
|
#### Worklog Maintenance
|
||||||
|
- **Concern:** Who maintains the worklog consistency?
|
||||||
|
- **Assumption:** Each AI agent should update both WORKLOG.md and CURRENTWORK.md
|
||||||
|
- **Need:** Clear guidelines in AGENT.MD about worklog maintenance
|
||||||
|
|
||||||
|
#### Integration Branch Usage
|
||||||
|
- **Question:** How exactly will INTEGRATION-WIP auto-merge work?
|
||||||
|
- **Status:** Documented in workflow but may need Gitea configuration
|
||||||
|
- **Action:** Future task to configure Gitea merge automation
|
||||||
|
|
||||||
|
### Next Immediate Steps
|
||||||
|
|
||||||
|
1. **Complete Worklog System:**
|
||||||
|
- Finish CURRENTWORK.md structure
|
||||||
|
- Update AGENT.MD with worklog references
|
||||||
|
- Commit and tag worklog milestone
|
||||||
|
|
||||||
|
2. **Test Workflow:**
|
||||||
|
- Verify all links work in Gitea web interface
|
||||||
|
- Ensure markdown renders properly
|
||||||
|
- Validate cross-references function
|
||||||
|
|
||||||
|
3. **Future Sessions:**
|
||||||
|
- Each new session should update both logs
|
||||||
|
- Maintain current status in WORKLOG.md
|
||||||
|
- Add detailed notes to CURRENTWORK.md
|
||||||
|
|
||||||
|
### Code/Configuration References
|
||||||
|
|
||||||
|
**Git Commands Used:**
|
||||||
|
```bash
|
||||||
|
git checkout -b LLMBOOTSTRAP
|
||||||
|
git checkout main && git checkout -b INTEGRATION-WIP
|
||||||
|
git checkout main && git checkout -b RELEASE
|
||||||
|
git tag -a bootstrap-complete -m "Initial project structure and git workflow setup completed"
|
||||||
|
git push origin bootstrap-complete
|
||||||
|
```
|
||||||
|
|
||||||
|
**Files Created This Session:**
|
||||||
|
- GIT_WORKFLOW.MD (comprehensive workflow documentation)
|
||||||
|
- AGENT.MD (LLM-optimized reference)
|
||||||
|
- WORKLOG.md (medium fidelity progress tracking)
|
||||||
|
- CURRENTWORK.md (this file - high fidelity detailed logging)
|
||||||
|
|
||||||
|
### Environment Context
|
||||||
|
- Platform: Linux 6.1.0-37-amd64
|
||||||
|
- Git repo: Clean working state on LLMBOOTSTRAP
|
||||||
|
- Remote: Gitea (ssh://git.knownelement.com:29418/UKRRS/CTO.git)
|
||||||
|
- Agent: Claude Sonnet 4 (claude-sonnet-4-20250514)
|
||||||
|
|
||||||
|
---
|
||||||
|
*Detailed log maintained by AI agents - Last updated: 2025-09-05*
|
174
docs/GIT_WORKFLOW.MD
Normal file
174
docs/GIT_WORKFLOW.MD
Normal file
@@ -0,0 +1,174 @@
|
|||||||
|
# Git Workflow
|
||||||
|
|
||||||
|
This document outlines the git workflow for this repository, designed for use with Gitea.
|
||||||
|
|
||||||
|
## Branch Structure
|
||||||
|
|
||||||
|
### Main Branches
|
||||||
|
|
||||||
|
- **`main`** - The primary stable branch. Direct work should NOT be done on this branch.
|
||||||
|
- **`RELEASE`** - Production-ready code. Only accepts pull requests that have been manually reviewed and approved.
|
||||||
|
- **`INTEGRATION-WIP`** - Integration branch where all feature branches are automatically merged for testing and integration.
|
||||||
|
|
||||||
|
### Feature Branches
|
||||||
|
|
||||||
|
- **`LLMBOOTSTRAP`** - Initial bootstrap feature branch for LLM-assisted development setup.
|
||||||
|
- Additional feature branches should follow naming conventions like `feature/description` or `task/description`.
|
||||||
|
|
||||||
|
## Workflow Rules
|
||||||
|
|
||||||
|
1. **Never work directly on `main`** - All work must be done on feature branches.
|
||||||
|
|
||||||
|
2. **Feature Development Flow:**
|
||||||
|
- Create feature branches from `main`
|
||||||
|
- Develop features in isolation on these branches
|
||||||
|
- Feature branches automatically merge to `INTEGRATION-WIP` for continuous integration testing
|
||||||
|
|
||||||
|
3. **Integration Testing:**
|
||||||
|
- `INTEGRATION-WIP` branch serves as the integration environment
|
||||||
|
- All feature branches are automatically merged here
|
||||||
|
- Used for testing compatibility between different features
|
||||||
|
|
||||||
|
4. **Release Process:**
|
||||||
|
- Only manually reviewed pull requests are merged to `RELEASE`
|
||||||
|
- `RELEASE` branch represents production-ready code
|
||||||
|
- Requires explicit approval before merging
|
||||||
|
|
||||||
|
## Branch Protection
|
||||||
|
|
||||||
|
- `main` - Protected, no direct commits allowed
|
||||||
|
- `RELEASE` - Protected, only manual PR merges allowed
|
||||||
|
- `INTEGRATION-WIP` - Accepts automatic merges from feature branches
|
||||||
|
|
||||||
|
## Feature Branch Management
|
||||||
|
|
||||||
|
### **CRITICAL: Branch Preservation**
|
||||||
|
- **NEVER automatically delete feature branches** under any circumstances
|
||||||
|
- Feature branches must be preserved for historical reference and potential future work
|
||||||
|
- Branch deletion should only occur through explicit manual action after careful consideration
|
||||||
|
|
||||||
|
### **Commit and Push Frequency**
|
||||||
|
- **Commit frequently** - Make small, logical commits as you work
|
||||||
|
- **Push every 10 commits maximum** - Don't let local commits accumulate
|
||||||
|
- **ALWAYS push before switching branches** - Ensure work is backed up remotely
|
||||||
|
- **Push immediately before any branch operations** (merge, rebase, etc.)
|
||||||
|
|
||||||
|
### **Tagging for Milestones**
|
||||||
|
- **Create tags when interim stages or milestones are completed**
|
||||||
|
- **Push tags immediately after creation** to preserve milestone markers
|
||||||
|
- **Tag naming conventions:**
|
||||||
|
- Date-based: `milestone-YYYY-MM-DD` or `stage-YYYY-MM-DD-HHMM`
|
||||||
|
- Stage-based: `bootstrap-complete`, `auth-module-done`, `integration-ready`
|
||||||
|
- Plan-based: Use milestone names from planning documents
|
||||||
|
- **Always annotate tags** with meaningful descriptions of what was accomplished
|
||||||
|
|
||||||
|
## Best Practices
|
||||||
|
|
||||||
|
- Keep feature branches focused and small
|
||||||
|
- Use descriptive branch names
|
||||||
|
- Regularly sync feature branches with `main`
|
||||||
|
- Test thoroughly in `INTEGRATION-WIP` before requesting merge to `RELEASE`
|
||||||
|
- Write clear commit messages and PR descriptions
|
||||||
|
- Follow the commit/push frequency rules above
|
||||||
|
|
||||||
|
## Examples: DO and DON'T
|
||||||
|
|
||||||
|
### ✅ **DO Examples**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# DO: Create feature branch from main
|
||||||
|
git checkout main
|
||||||
|
git pull origin main
|
||||||
|
git checkout -b feature/user-authentication
|
||||||
|
|
||||||
|
# DO: Commit frequently with descriptive messages
|
||||||
|
git add .
|
||||||
|
git commit -m "Add user login form validation"
|
||||||
|
git commit -m "Implement password hashing utility"
|
||||||
|
git commit -m "Add user session management"
|
||||||
|
|
||||||
|
# DO: Push after every 10 commits or before switching branches
|
||||||
|
git push origin feature/user-authentication
|
||||||
|
|
||||||
|
# DO: Push before switching to another branch
|
||||||
|
git push origin feature/user-authentication
|
||||||
|
git checkout feature/payment-system
|
||||||
|
|
||||||
|
# DO: Sync feature branch with main regularly
|
||||||
|
git checkout main
|
||||||
|
git pull origin main
|
||||||
|
git checkout feature/user-authentication
|
||||||
|
git merge main
|
||||||
|
|
||||||
|
# DO: Tag milestones with descriptive annotations
|
||||||
|
git tag -a bootstrap-complete -m "Initial project structure and workflow setup completed"
|
||||||
|
git push origin bootstrap-complete
|
||||||
|
|
||||||
|
# DO: Use date-based tags for interim stages
|
||||||
|
git tag -a stage-2025-09-05-1430 -m "Authentication module implementation complete"
|
||||||
|
git push origin stage-2025-09-05-1430
|
||||||
|
```
|
||||||
|
|
||||||
|
### ❌ **DON'T Examples**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# DON'T: Work directly on main
|
||||||
|
git checkout main
|
||||||
|
git add .
|
||||||
|
git commit -m "Fix user auth bug" # ❌ NEVER DO THIS
|
||||||
|
|
||||||
|
# DON'T: Delete feature branches automatically
|
||||||
|
git branch -d feature/user-authentication # ❌ NEVER DO THIS
|
||||||
|
git push origin --delete feature/user-authentication # ❌ NEVER DO THIS
|
||||||
|
|
||||||
|
# DON'T: Let commits accumulate without pushing
|
||||||
|
git log --oneline # Shows 15+ unpushed commits # ❌ Should have pushed earlier
|
||||||
|
|
||||||
|
# DON'T: Switch branches without pushing current work
|
||||||
|
git checkout feature/payment-system # ❌ Without pushing current branch first
|
||||||
|
|
||||||
|
# DON'T: Make massive commits
|
||||||
|
git add .
|
||||||
|
git commit -m "Complete entire user system" # ❌ Too broad, break it down
|
||||||
|
|
||||||
|
# DON'T: Create tags without annotations
|
||||||
|
git tag milestone-1 # ❌ No description of what was accomplished
|
||||||
|
git push origin milestone-1
|
||||||
|
|
||||||
|
# DON'T: Forget to push tags
|
||||||
|
git tag -a bootstrap-complete -m "Setup complete"
|
||||||
|
# ❌ Missing: git push origin bootstrap-complete
|
||||||
|
```
|
||||||
|
|
||||||
|
### 🔧 **Workflow Examples**
|
||||||
|
|
||||||
|
**Starting new feature:**
|
||||||
|
```bash
|
||||||
|
git checkout main
|
||||||
|
git pull origin main
|
||||||
|
git checkout -b feature/shopping-cart
|
||||||
|
# Work, commit frequently, push every ~10 commits
|
||||||
|
```
|
||||||
|
|
||||||
|
**Switching between features:**
|
||||||
|
```bash
|
||||||
|
# Currently on feature/shopping-cart
|
||||||
|
git add .
|
||||||
|
git commit -m "Add item quantity validation"
|
||||||
|
git push origin feature/shopping-cart # ✅ Push before switching
|
||||||
|
git checkout feature/user-profile
|
||||||
|
```
|
||||||
|
|
||||||
|
**Preparing for integration:**
|
||||||
|
```bash
|
||||||
|
git checkout feature/shopping-cart
|
||||||
|
git push origin feature/shopping-cart
|
||||||
|
# Feature automatically merges to INTEGRATION-WIP
|
||||||
|
```
|
||||||
|
|
||||||
|
## Gitea Integration
|
||||||
|
|
||||||
|
This workflow is optimized for Gitea and utilizes:
|
||||||
|
- Branch protection rules
|
||||||
|
- Automatic merge capabilities for integration testing
|
||||||
|
- Manual review processes for production releases
|
35
docs/WORKLOG-LLM.md
Normal file
35
docs/WORKLOG-LLM.md
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
# WORKLOG - LLM OPTIMIZED
|
||||||
|
|
||||||
|
**STATUS:** ✅ Bootstrap+Docs Complete
|
||||||
|
**BRANCH:** LLMBOOTSTRAP
|
||||||
|
**NEXT:** Commit/push/tag
|
||||||
|
|
||||||
|
## CURRENT
|
||||||
|
- **Time:** 2025-09-05 (active session)
|
||||||
|
- **Working:** Reorganizing docs to docs/ directory
|
||||||
|
- **Last:** Created worklog system
|
||||||
|
- **Next:** Commit, push, tag milestone
|
||||||
|
|
||||||
|
## COMPLETED TODAY
|
||||||
|
✅ Branch structure (LLMBOOTSTRAP, INTEGRATION-WIP, RELEASE)
|
||||||
|
✅ Git workflow docs (GIT_WORKFLOW.MD)
|
||||||
|
✅ LLM-optimized agent reference (AGENT.MD)
|
||||||
|
✅ Worklog system (WORKLOG.md, CURRENTWORK.md)
|
||||||
|
✅ Moved to clean docs/ structure
|
||||||
|
✅ Created LLM versions of all docs
|
||||||
|
|
||||||
|
## MILESTONES
|
||||||
|
| Tag | Date | Description |
|
||||||
|
|-----|------|-------------|
|
||||||
|
| bootstrap-complete | 2025-09-05 | Initial setup |
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
- [ ] Update cross-references
|
||||||
|
- [ ] Commit LLMBOOTSTRAP branch
|
||||||
|
- [ ] Push all branches
|
||||||
|
- [ ] Tag docs-reorganized milestone
|
||||||
|
|
||||||
|
## LINKS
|
||||||
|
- Details: [CURRENTWORK-LLM.md](./CURRENTWORK-LLM.md)
|
||||||
|
- Human versions: WORKLOG.md, CURRENTWORK.md
|
||||||
|
- Agent ref: [AGENT-LLM.MD](./AGENT-LLM.MD)
|
61
docs/WORKLOG.md
Normal file
61
docs/WORKLOG.md
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
# Work Log
|
||||||
|
|
||||||
|
**Project:** CTO Repository Setup
|
||||||
|
**Started:** 2025-09-05
|
||||||
|
**Current Branch:** LLMBOOTSTRAP
|
||||||
|
|
||||||
|
## Current Status
|
||||||
|
|
||||||
|
| Field | Value |
|
||||||
|
|-------|-------|
|
||||||
|
| **Current Time** | 2025-09-05 (Session Active) |
|
||||||
|
| **Status** | ✅ Bootstrap+Docs Complete - Ready to commit/push/tag |
|
||||||
|
| **Last Completed** | Reorganized docs to clean structure with LLM versions |
|
||||||
|
| **Currently Working On** | Final commit and milestone tagging |
|
||||||
|
| **Next Up** | Commit LLMBOOTSTRAP branch, push all branches, tag milestone |
|
||||||
|
|
||||||
|
## Session Log
|
||||||
|
|
||||||
|
### 2025-09-05 - Initial Bootstrap Session
|
||||||
|
|
||||||
|
**Time Range:** Session start → Current
|
||||||
|
**Branch:** LLMBOOTSTRAP
|
||||||
|
**Agent:** Claude Code
|
||||||
|
|
||||||
|
#### Completed Tasks ✅
|
||||||
|
- [x] Created branch structure (LLMBOOTSTRAP, INTEGRATION-WIP, RELEASE)
|
||||||
|
- [x] Established git workflow documentation (GIT_WORKFLOW.MD)
|
||||||
|
- [x] Created comprehensive DO/DON'T examples
|
||||||
|
- [x] Added tagging guidelines for milestones
|
||||||
|
- [x] Built LLM-optimized AGENT.MD reference
|
||||||
|
- [x] Tagged first milestone: `bootstrap-complete`
|
||||||
|
- [x] Created worklog tracking system (WORKLOG.md, CURRENTWORK.md)
|
||||||
|
- [x] Reorganized all docs to clean docs/ directory structure
|
||||||
|
- [x] Created LLM-optimized versions of all documentation
|
||||||
|
|
||||||
|
#### Currently Working On 🔄
|
||||||
|
- [ ] Final commit of LLMBOOTSTRAP branch
|
||||||
|
- [ ] Pushing all branches to remote
|
||||||
|
- [ ] Tagging docs reorganization milestone
|
||||||
|
|
||||||
|
#### Next Actions 📋
|
||||||
|
- [ ] Commit current work to LLMBOOTSTRAP
|
||||||
|
- [ ] Push LLMBOOTSTRAP branch
|
||||||
|
- [ ] Ensure all branches are pushed
|
||||||
|
- [ ] Tag `docs-reorganized` milestone
|
||||||
|
|
||||||
|
## Milestones Completed
|
||||||
|
|
||||||
|
| Date | Tag | Description |
|
||||||
|
|------|-----|-------------|
|
||||||
|
| 2025-09-05 | `bootstrap-complete` | Initial project structure and git workflow setup completed |
|
||||||
|
|
||||||
|
## Links
|
||||||
|
|
||||||
|
- **Detailed Current Work Notes:** [CURRENTWORK.md](./CURRENTWORK.md)
|
||||||
|
- **Git Workflow:** [GIT_WORKFLOW.MD](./GIT_WORKFLOW.MD)
|
||||||
|
- **Agent Reference:** [AGENT.MD](./AGENT.MD)
|
||||||
|
- **LLM Optimized Versions:** [WORKLOG-LLM.md](./WORKLOG-LLM.md), [CURRENTWORK-LLM.md](./CURRENTWORK-LLM.md), [AGENT-LLM.MD](./AGENT-LLM.MD)
|
||||||
|
|
||||||
|
---
|
||||||
|
*Last Updated: 2025-09-05 (Auto-updated by AI agents)*
|
Reference in New Issue
Block a user