lite-kits 0.1.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- lite_kits/__init__.py +9 -0
- lite_kits/cli.py +481 -0
- lite_kits/installer.py +417 -0
- lite_kits/kits/README.md +191 -0
- lite_kits/kits/git/README.md +374 -0
- lite_kits/kits/git/claude/commands/cleanup.md +361 -0
- lite_kits/kits/git/claude/commands/commit.md +612 -0
- lite_kits/kits/git/claude/commands/pr.md +593 -0
- lite_kits/kits/git/github/prompts/cleanup.prompt.md +382 -0
- lite_kits/kits/git/github/prompts/commit.prompt.md +591 -0
- lite_kits/kits/git/github/prompts/pr.prompt.md +603 -0
- lite_kits/kits/git/scripts/bash/get-git-context.sh +208 -0
- lite_kits/kits/git/scripts/powershell/Get-GitContext.ps1 +242 -0
- lite_kits/kits/multiagent/README.md +395 -0
- lite_kits/kits/multiagent/claude/commands/sync.md +331 -0
- lite_kits/kits/multiagent/github/prompts/sync.prompt.md +331 -0
- lite_kits/kits/multiagent/memory/git-worktrees-protocol.md +370 -0
- lite_kits/kits/multiagent/memory/parallel-work-protocol.md +536 -0
- lite_kits/kits/multiagent/memory/pr-workflow-guide.md +281 -0
- lite_kits/kits/multiagent/templates/collaboration-structure/README.md +166 -0
- lite_kits/kits/multiagent/templates/decision.md +79 -0
- lite_kits/kits/multiagent/templates/handoff.md +95 -0
- lite_kits/kits/multiagent/templates/session-log.md +68 -0
- lite_kits/kits/project/README.md +244 -0
- lite_kits/kits/project/claude/commands/orient.md +163 -0
- lite_kits/kits/project/github/prompts/orient.prompt.md +163 -0
- lite_kits-0.1.0.dist-info/METADATA +415 -0
- lite_kits-0.1.0.dist-info/RECORD +31 -0
- lite_kits-0.1.0.dist-info/WHEEL +4 -0
- lite_kits-0.1.0.dist-info/entry_points.txt +2 -0
- lite_kits-0.1.0.dist-info/licenses/LICENSE +21 -0
@@ -0,0 +1,395 @@
|
|
1
|
+
# Multiagent Kit
|
2
|
+
|
3
|
+
**Status**: 📦 Optional (For Complex Projects)
|
4
|
+
|
5
|
+
Multi-agent coordination structure for projects with multiple AI agents working in parallel. Includes collaboration directories, workflow guides, and coordination protocols.
|
6
|
+
|
7
|
+
## What It Adds
|
8
|
+
|
9
|
+
### Memory Guides
|
10
|
+
|
11
|
+
| Guide | Description | Status |
|
12
|
+
|-------|-------------|--------|
|
13
|
+
| PR Workflow | How AI agents create pull requests | ✅ |
|
14
|
+
| Git Worktrees Protocol | Parallel development with worktrees | ✅ |
|
15
|
+
|
16
|
+
### Templates
|
17
|
+
|
18
|
+
| Template | Description | Status |
|
19
|
+
|----------|-------------|--------|
|
20
|
+
| Collaboration structure | Active/archive/results directories | 🚧 |
|
21
|
+
|
22
|
+
✅ = Implemented | 🚧 = Coming Soon
|
23
|
+
|
24
|
+
## Dependencies
|
25
|
+
|
26
|
+
⚠️ **multiagent-kit requires**:
|
27
|
+
- **project-kit**: For `/review` command and best practices
|
28
|
+
- **git-kit**: For `/commit`, `/pr` commands used in workflows
|
29
|
+
|
30
|
+
**Recommended installation**:
|
31
|
+
```bash
|
32
|
+
lite-kits install -Recommended -Kit multiagent
|
33
|
+
# Installs: project + git + multiagent
|
34
|
+
```
|
35
|
+
|
36
|
+
**Note**: Installer will automatically install dependencies if missing.
|
37
|
+
|
38
|
+
## Installation
|
39
|
+
|
40
|
+
### With dependencies (recommended):
|
41
|
+
```bash
|
42
|
+
lite-kits install -Recommended -Kit multiagent
|
43
|
+
```
|
44
|
+
|
45
|
+
### Individually (installs dependencies automatically):
|
46
|
+
```bash
|
47
|
+
lite-kits install -Kit multiagent
|
48
|
+
```
|
49
|
+
|
50
|
+
## What Gets Installed
|
51
|
+
|
52
|
+
```
|
53
|
+
your-project/
|
54
|
+
├── .specify/memory/
|
55
|
+
│ ├── pr-workflow-guide.md # ✅ AI agent PR workflow
|
56
|
+
│ └── git-worktrees-protocol.md # ✅ Parallel development guide
|
57
|
+
└── specs/
|
58
|
+
└── NNN-feature/
|
59
|
+
└── collaboration/ # 🚧 Created per-feature
|
60
|
+
├── active/
|
61
|
+
│ ├── sessions/ # Work session logs
|
62
|
+
│ ├── decisions/ # Handoffs, proposals
|
63
|
+
│ └── README.md # Current status
|
64
|
+
├── archive/ # Historical (YYYY-MM/)
|
65
|
+
└── results/ # Completed deliverables
|
66
|
+
├── validation/ # Test results, reviews
|
67
|
+
└── artifacts/ # Final outputs
|
68
|
+
```
|
69
|
+
|
70
|
+
**Note**: Collaboration directories are created automatically when you run `/specify` with multiagent-kit installed.
|
71
|
+
|
72
|
+
## Memory Guides
|
73
|
+
|
74
|
+
### PR Workflow Guide
|
75
|
+
|
76
|
+
**File**: `.specify/memory/pr-workflow-guide.md`
|
77
|
+
|
78
|
+
**What it covers**:
|
79
|
+
- How AI agents should create pull requests
|
80
|
+
- Commit attribution format (`via model @ interface`)
|
81
|
+
- PR description templates for AI-generated code
|
82
|
+
- Multi-agent coordination in PRs
|
83
|
+
- Handoff procedures between agents
|
84
|
+
- CI/CD integration for agent attribution
|
85
|
+
|
86
|
+
**Example commit attribution**:
|
87
|
+
```
|
88
|
+
feat: Add user authentication
|
89
|
+
|
90
|
+
Implements bcrypt password hashing and JWT tokens.
|
91
|
+
|
92
|
+
via claude-sonnet-4.5 @ claude-code
|
93
|
+
```
|
94
|
+
|
95
|
+
**Use when**: Any AI agent is ready to create a PR
|
96
|
+
|
97
|
+
---
|
98
|
+
|
99
|
+
### Git Worktrees Protocol
|
100
|
+
|
101
|
+
**File**: `.specify/memory/git-worktrees-protocol.md`
|
102
|
+
|
103
|
+
**What it covers**:
|
104
|
+
- Using git worktrees for parallel development
|
105
|
+
- File territory definitions (avoid conflicts)
|
106
|
+
- Synchronization strategies
|
107
|
+
- When to use worktrees vs regular branches
|
108
|
+
- Troubleshooting common issues
|
109
|
+
|
110
|
+
**Example workflow**:
|
111
|
+
```bash
|
112
|
+
# Agent 1: Backend worktree
|
113
|
+
git worktree add ../blog-backend 003-blog
|
114
|
+
|
115
|
+
# Agent 2: Frontend worktree
|
116
|
+
git worktree add ../blog-frontend 003-blog
|
117
|
+
|
118
|
+
# Both agents work simultaneously, push to same branch
|
119
|
+
# No merge conflicts because file territories are defined
|
120
|
+
```
|
121
|
+
|
122
|
+
**Use when**: Multiple agents working on same feature simultaneously
|
123
|
+
|
124
|
+
---
|
125
|
+
|
126
|
+
## Collaboration Directory Structure
|
127
|
+
|
128
|
+
### Purpose
|
129
|
+
|
130
|
+
Enable multiple AI agents to coordinate work on the same feature without stepping on each other's toes.
|
131
|
+
|
132
|
+
### Structure
|
133
|
+
|
134
|
+
```
|
135
|
+
specs/003-blog-platform/collaboration/
|
136
|
+
├── active/ # Current work in progress
|
137
|
+
│ ├── sessions/ # Individual work sessions
|
138
|
+
│ │ ├── 2025-10-06-claude-backend.md
|
139
|
+
│ │ ├── 2025-10-06-copilot-frontend.md
|
140
|
+
│ │ └── 2025-10-07-claude-integration.md
|
141
|
+
│ ├── decisions/ # Coordination documents
|
142
|
+
│ │ ├── handoff-to-copilot.md # Task delegation
|
143
|
+
│ │ ├── worktree-coordination.md # File territories
|
144
|
+
│ │ └── agent-split.md # Work division
|
145
|
+
│ └── README.md # Current status summary
|
146
|
+
├── archive/ # Historical work
|
147
|
+
│ ├── 2025-10/ # Organized by month
|
148
|
+
│ │ ├── sessions/
|
149
|
+
│ │ └── decisions/
|
150
|
+
│ └── 2025-11/
|
151
|
+
└── results/ # Completed deliverables
|
152
|
+
├── validation/ # Test results, reviews
|
153
|
+
│ ├── test-results.md
|
154
|
+
│ └── code-review.md
|
155
|
+
└── artifacts/ # Final outputs
|
156
|
+
├── completion-summary.md
|
157
|
+
└── performance-benchmarks.md
|
158
|
+
```
|
159
|
+
|
160
|
+
### Session Log Example
|
161
|
+
|
162
|
+
```markdown
|
163
|
+
# Backend Development Session
|
164
|
+
|
165
|
+
**Agent**: Claude Code (claude-sonnet-4.5)
|
166
|
+
**Worktree**: ../blog-backend
|
167
|
+
**Date**: 2025-10-06
|
168
|
+
**Duration**: 3 hours
|
169
|
+
|
170
|
+
## Completed
|
171
|
+
- Express app setup
|
172
|
+
- Prisma schema design
|
173
|
+
- Authentication middleware (JWT)
|
174
|
+
- Integration tests (15/15 passing)
|
175
|
+
|
176
|
+
## Commits
|
177
|
+
- abc123: feat: Add Express app structure
|
178
|
+
- def456: feat: Add Prisma database schema
|
179
|
+
- ghi789: feat: Add JWT authentication
|
180
|
+
|
181
|
+
## Synchronized
|
182
|
+
- Pulled frontend changes at 14:00 (no conflicts)
|
183
|
+
- Pushed backend at 16:30
|
184
|
+
|
185
|
+
## Status
|
186
|
+
✅ Backend ready for frontend integration
|
187
|
+
|
188
|
+
## Next Steps
|
189
|
+
- Frontend team: integrate with auth API
|
190
|
+
- Add rate limiting (future iteration)
|
191
|
+
```
|
192
|
+
|
193
|
+
### Handoff Document Example
|
194
|
+
|
195
|
+
```markdown
|
196
|
+
# Handoff to GitHub Copilot
|
197
|
+
|
198
|
+
**From**: Claude Code
|
199
|
+
**To**: GitHub Copilot CLI
|
200
|
+
**Date**: 2025-10-06
|
201
|
+
|
202
|
+
## Context
|
203
|
+
Backend authentication complete. Need frontend integration.
|
204
|
+
|
205
|
+
## What's Done
|
206
|
+
- Backend API endpoints (POST /login, POST /logout, GET /session)
|
207
|
+
- JWT token generation and validation
|
208
|
+
- Password hashing with bcrypt
|
209
|
+
- Integration tests passing
|
210
|
+
|
211
|
+
## What's Needed
|
212
|
+
- React login form component
|
213
|
+
- Auth context provider
|
214
|
+
- Protected route wrapper
|
215
|
+
- Session state management
|
216
|
+
|
217
|
+
## Files to Create
|
218
|
+
- src/components/LoginForm.tsx
|
219
|
+
- src/hooks/useAuth.ts
|
220
|
+
- src/components/ProtectedRoute.tsx
|
221
|
+
|
222
|
+
## API Reference
|
223
|
+
- See: specs/003-blog/contracts/auth-api.yaml
|
224
|
+
- Backend: http://localhost:3000/api/auth
|
225
|
+
|
226
|
+
## Testing
|
227
|
+
- Use credentials: test@example.com / Test123!
|
228
|
+
- Backend health check: GET /health
|
229
|
+
```
|
230
|
+
|
231
|
+
---
|
232
|
+
|
233
|
+
## Multi-Agent Workflows
|
234
|
+
|
235
|
+
### Scenario 1: Backend + Frontend Split
|
236
|
+
|
237
|
+
**Agents**: Claude Code (backend) + Copilot CLI (frontend)
|
238
|
+
|
239
|
+
**Workflow**:
|
240
|
+
1. Claude runs `/specify` and `/plan` for full feature
|
241
|
+
2. Claude creates handoff document defining split
|
242
|
+
3. Both agents create worktrees for parallel work
|
243
|
+
4. Each agent logs sessions in `collaboration/active/sessions/`
|
244
|
+
5. Agents sync periodically with `git pull`
|
245
|
+
6. Claude handles integration testing
|
246
|
+
7. Either agent creates PR using `/pr` (from git-kit)
|
247
|
+
|
248
|
+
**File territories** (avoid conflicts):
|
249
|
+
- Backend worktree: `src/api/`, `src/models/`, `tests/api/`
|
250
|
+
- Frontend worktree: `src/components/`, `src/hooks/`, `tests/components/`
|
251
|
+
- Shared: Coordinate edits to `README.md`, `package.json`
|
252
|
+
|
253
|
+
---
|
254
|
+
|
255
|
+
### Scenario 2: Review + Implementation
|
256
|
+
|
257
|
+
**Agents**: Claude (implementation) + Copilot (review)
|
258
|
+
|
259
|
+
**Workflow**:
|
260
|
+
1. Claude implements feature, commits work
|
261
|
+
2. Claude creates handoff for review
|
262
|
+
3. Copilot runs `/review` (from project-kit)
|
263
|
+
4. Copilot logs review in `collaboration/active/decisions/`
|
264
|
+
5. Claude addresses feedback
|
265
|
+
6. Copilot approves and creates PR
|
266
|
+
|
267
|
+
---
|
268
|
+
|
269
|
+
### Scenario 3: Test + Fix Cycle
|
270
|
+
|
271
|
+
**Agents**: Claude (testing) + Copilot (fixing)
|
272
|
+
|
273
|
+
**Workflow**:
|
274
|
+
1. Claude writes comprehensive tests (TDD)
|
275
|
+
2. Tests fail (as expected)
|
276
|
+
3. Claude creates handoff with failing test details
|
277
|
+
4. Copilot implements code to pass tests
|
278
|
+
5. Both agents log sessions
|
279
|
+
6. Tests pass, feature complete
|
280
|
+
|
281
|
+
---
|
282
|
+
|
283
|
+
## When to Use Multiagent Kit
|
284
|
+
|
285
|
+
### ✅ Use when:
|
286
|
+
- Multiple AI agents working on same feature
|
287
|
+
- Complex features requiring parallel work (backend + frontend)
|
288
|
+
- Team handoffs between agents
|
289
|
+
- Long-running features (>1 week)
|
290
|
+
- Need coordination history for debugging
|
291
|
+
|
292
|
+
### ❌ Don't use when:
|
293
|
+
- Solo developer with single AI agent
|
294
|
+
- Simple features (<1 day)
|
295
|
+
- Proof of concepts or experiments
|
296
|
+
- Scripts or small utilities
|
297
|
+
|
298
|
+
**Rule of thumb**: If you're using git worktrees, you need multiagent-kit.
|
299
|
+
|
300
|
+
---
|
301
|
+
|
302
|
+
## Integration with Other Kits
|
303
|
+
|
304
|
+
### With project-kit
|
305
|
+
- Use `/orient` for each agent to understand their role
|
306
|
+
- Use `/review` for agent-to-agent code review
|
307
|
+
|
308
|
+
### With git-kit
|
309
|
+
- Use `/commit` for agent-attributed commits
|
310
|
+
- Use `/pr` to create PRs with multi-agent summary
|
311
|
+
- Use `/sync` to visualize worktree status
|
312
|
+
- Use `/cleanup` to remove stale worktrees
|
313
|
+
|
314
|
+
---
|
315
|
+
|
316
|
+
## Best Practices
|
317
|
+
|
318
|
+
### Session Logging
|
319
|
+
- Create session log at start of work
|
320
|
+
- Update throughout session
|
321
|
+
- Include commits, syncs, blockers
|
322
|
+
- End with status and next steps
|
323
|
+
|
324
|
+
### Handoff Documents
|
325
|
+
- Clear context and background
|
326
|
+
- Specific what's done vs what's needed
|
327
|
+
- List files to create/modify
|
328
|
+
- Include API references or contracts
|
329
|
+
- Set clear expectations
|
330
|
+
|
331
|
+
### File Territories
|
332
|
+
- Define upfront in handoff document
|
333
|
+
- Avoid editing shared files simultaneously
|
334
|
+
- Communicate before editing shared files
|
335
|
+
- Use git worktrees to enforce separation
|
336
|
+
|
337
|
+
### Archive Regularly
|
338
|
+
- Move completed sessions to `archive/YYYY-MM/`
|
339
|
+
- Keep `active/` clean (current work only)
|
340
|
+
- Document final results in `results/`
|
341
|
+
|
342
|
+
---
|
343
|
+
|
344
|
+
## Configuration
|
345
|
+
|
346
|
+
No configuration needed - works out of the box.
|
347
|
+
|
348
|
+
**Optional**: Customize collaboration templates in future versions.
|
349
|
+
|
350
|
+
---
|
351
|
+
|
352
|
+
## Compatibility
|
353
|
+
|
354
|
+
- ✅ **Agents**: Claude Code, GitHub Copilot, Cursor
|
355
|
+
- ✅ **Platforms**: Linux, macOS, Windows
|
356
|
+
- ✅ **Shells**: Bash, PowerShell
|
357
|
+
- ✅ **Vanilla safe**: Only adds new files, never modifies existing
|
358
|
+
|
359
|
+
---
|
360
|
+
|
361
|
+
## Uninstall
|
362
|
+
|
363
|
+
```bash
|
364
|
+
lite-kits remove -Kit multiagent
|
365
|
+
```
|
366
|
+
|
367
|
+
Removes:
|
368
|
+
- `.specify/memory/pr-workflow-guide.md`
|
369
|
+
- `.specify/memory/git-worktrees-protocol.md`
|
370
|
+
|
371
|
+
**Note**: Existing `specs/*/collaboration/` directories are **preserved** (user data).
|
372
|
+
|
373
|
+
---
|
374
|
+
|
375
|
+
## Examples
|
376
|
+
|
377
|
+
See working examples:
|
378
|
+
- **blog-with-auth**: Full multi-agent workflow with worktrees
|
379
|
+
- Backend (Claude Code) + Frontend (Copilot CLI)
|
380
|
+
- Collaboration directories in action
|
381
|
+
- Handoff documents
|
382
|
+
- Integration testing
|
383
|
+
|
384
|
+
---
|
385
|
+
|
386
|
+
## Future Enhancements
|
387
|
+
|
388
|
+
Considering for multiagent-kit:
|
389
|
+
- Automated session logging (CLI helper)
|
390
|
+
- Agent dashboard (show current work across agents)
|
391
|
+
- Conflict detection (warn about file territory violations)
|
392
|
+
- Collaboration metrics (contribution tracking)
|
393
|
+
- Multi-agent CI workflows
|
394
|
+
|
395
|
+
Suggest more in [GitHub Discussions](https://github.com/tmorgan181/spec-kit-multiagent-lite/discussions).
|
@@ -0,0 +1,331 @@
|
|
1
|
+
---
|
2
|
+
description: Check multi-agent sync status with ASCII visualization
|
3
|
+
---
|
4
|
+
|
5
|
+
# Multi-Agent Sync Status
|
6
|
+
|
7
|
+
**Purpose**: Visualize git sync status and multi-agent coordination state.
|
8
|
+
|
9
|
+
## Execution Steps
|
10
|
+
|
11
|
+
### 1. Check Git Status
|
12
|
+
|
13
|
+
```bash
|
14
|
+
# Current branch
|
15
|
+
CURRENT_BRANCH=$(git branch --show-current)
|
16
|
+
|
17
|
+
# Check if tracking remote
|
18
|
+
REMOTE_BRANCH=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)
|
19
|
+
|
20
|
+
# Commits ahead/behind
|
21
|
+
if [ -n "$REMOTE_BRANCH" ]; then
|
22
|
+
AHEAD=$(git rev-list --count $REMOTE_BRANCH..HEAD)
|
23
|
+
BEHIND=$(git rev-list --count HEAD..$REMOTE_BRANCH)
|
24
|
+
else
|
25
|
+
AHEAD="N/A"
|
26
|
+
BEHIND="N/A"
|
27
|
+
fi
|
28
|
+
|
29
|
+
# Uncommitted changes
|
30
|
+
MODIFIED=$(git status --short | wc -l)
|
31
|
+
UNTRACKED=$(git ls-files --others --exclude-standard | wc -l)
|
32
|
+
```
|
33
|
+
|
34
|
+
### 2. Detect Multi-Agent Activity
|
35
|
+
|
36
|
+
```bash
|
37
|
+
# Check for recent commits by different agents
|
38
|
+
git log --since="7 days ago" --format="%b" | grep "via.*@" | sort -u
|
39
|
+
|
40
|
+
# Count commits by agent
|
41
|
+
echo "Recent activity (last 7 days):"
|
42
|
+
git log --since="7 days ago" --format="%b" | \
|
43
|
+
grep "via.*@" | \
|
44
|
+
sed 's/.*via \(.*\)/\1/' | \
|
45
|
+
sort | uniq -c | sort -rn
|
46
|
+
```
|
47
|
+
|
48
|
+
### 3. Check Collaboration Structure
|
49
|
+
|
50
|
+
```bash
|
51
|
+
# Find active collaboration directories
|
52
|
+
if [ -d "specs" ]; then
|
53
|
+
# List active sessions
|
54
|
+
SESSION_COUNT=$(find specs/*/collaboration/active/sessions -name "*.md" 2>/dev/null | wc -l)
|
55
|
+
|
56
|
+
# List pending handoffs
|
57
|
+
HANDOFF_COUNT=$(find specs/*/collaboration/active/decisions -name "handoff-*.md" 2>/dev/null | wc -l)
|
58
|
+
|
59
|
+
# List active features
|
60
|
+
FEATURES=$(find specs -maxdepth 1 -type d -name "[0-9]*" | wc -l)
|
61
|
+
else
|
62
|
+
SESSION_COUNT=0
|
63
|
+
HANDOFF_COUNT=0
|
64
|
+
FEATURES=0
|
65
|
+
fi
|
66
|
+
```
|
67
|
+
|
68
|
+
### 4. Generate ASCII Visualization
|
69
|
+
|
70
|
+
Create a visual representation of sync status:
|
71
|
+
|
72
|
+
```
|
73
|
+
===========================================================
|
74
|
+
Multi-Agent Sync Status
|
75
|
+
===========================================================
|
76
|
+
|
77
|
+
Branch: dev/001-starter-kits
|
78
|
+
Remote: origin/dev/001-starter-kits
|
79
|
+
|
80
|
+
Local Remote
|
81
|
+
↓ ↓
|
82
|
+
┌─────┐ ┌─────┐
|
83
|
+
│ ●●● │ ←──(2 behind)── │ ●● │
|
84
|
+
│ ●● │ ──(3 ahead)───→ │ │
|
85
|
+
└─────┘ └─────┘
|
86
|
+
|
87
|
+
3 commits to push
|
88
|
+
2 commits to pull
|
89
|
+
5 uncommitted changes
|
90
|
+
|
91
|
+
===========================================================
|
92
|
+
Agent Activity (last 7 days):
|
93
|
+
===========================================================
|
94
|
+
|
95
|
+
claude-code ████████████ 12 commits
|
96
|
+
github-copilot-cli ████████ 8 commits
|
97
|
+
|
98
|
+
===========================================================
|
99
|
+
Collaboration Status:
|
100
|
+
===========================================================
|
101
|
+
|
102
|
+
Active features: 3
|
103
|
+
Active sessions: 2
|
104
|
+
Pending handoffs: 1 ⚠
|
105
|
+
|
106
|
+
===========================================================
|
107
|
+
```
|
108
|
+
|
109
|
+
### 5. Check for Conflicts
|
110
|
+
|
111
|
+
```bash
|
112
|
+
# Check if there are merge conflicts
|
113
|
+
if git ls-files -u | wc -l | grep -q "^0$"; then
|
114
|
+
echo "✓ No merge conflicts"
|
115
|
+
else
|
116
|
+
echo "⚠ Merge conflicts detected"
|
117
|
+
git diff --name-only --diff-filter=U
|
118
|
+
fi
|
119
|
+
```
|
120
|
+
|
121
|
+
### 6. Provide Sync Recommendations
|
122
|
+
|
123
|
+
Based on the status, suggest actions:
|
124
|
+
|
125
|
+
**If commits to pull**:
|
126
|
+
```
|
127
|
+
⚠ You are behind the remote branch
|
128
|
+
|
129
|
+
Recommended action:
|
130
|
+
git pull origin $CURRENT_BRANCH
|
131
|
+
|
132
|
+
Or if you have local commits:
|
133
|
+
git pull --rebase origin $CURRENT_BRANCH
|
134
|
+
```
|
135
|
+
|
136
|
+
**If commits to push**:
|
137
|
+
```
|
138
|
+
✓ You have commits to push
|
139
|
+
|
140
|
+
Recommended action:
|
141
|
+
git push origin $CURRENT_BRANCH
|
142
|
+
```
|
143
|
+
|
144
|
+
**If handoffs pending**:
|
145
|
+
```
|
146
|
+
⚠ Pending handoff detected
|
147
|
+
|
148
|
+
Review handoff:
|
149
|
+
cat specs/*/collaboration/active/decisions/handoff-*.md
|
150
|
+
|
151
|
+
Accept handoff:
|
152
|
+
1. Review the handoff document
|
153
|
+
2. Create session log for your work
|
154
|
+
3. Remove handoff file when complete
|
155
|
+
```
|
156
|
+
|
157
|
+
**If diverged (both ahead and behind)**:
|
158
|
+
```
|
159
|
+
⚠ Branches have diverged
|
160
|
+
|
161
|
+
You have local commits AND remote has new commits.
|
162
|
+
|
163
|
+
Recommended actions:
|
164
|
+
1. Review remote changes: git fetch && git log HEAD..origin/$CURRENT_BRANCH
|
165
|
+
2. Pull with rebase: git pull --rebase origin $CURRENT_BRANCH
|
166
|
+
3. Resolve conflicts if any
|
167
|
+
4. Push: git push origin $CURRENT_BRANCH
|
168
|
+
```
|
169
|
+
|
170
|
+
### 7. Session Log Status
|
171
|
+
|
172
|
+
If multiagent-kit installed, check session logs:
|
173
|
+
|
174
|
+
```bash
|
175
|
+
# Find today's session log
|
176
|
+
TODAY=$(date +%Y-%m-%d)
|
177
|
+
AGENT="claude-code" # or "github-copilot-cli"
|
178
|
+
|
179
|
+
SESSION_LOG=$(find specs/*/collaboration/active/sessions -name "${TODAY}*${AGENT}*.md" 2>/dev/null | head -1)
|
180
|
+
|
181
|
+
if [ -n "$SESSION_LOG" ]; then
|
182
|
+
echo "✓ Session log exists: $SESSION_LOG"
|
183
|
+
else
|
184
|
+
echo "⚠ No session log for today"
|
185
|
+
echo " Create one: specs/<feature>/collaboration/active/sessions/${TODAY}-${AGENT}.md"
|
186
|
+
fi
|
187
|
+
```
|
188
|
+
|
189
|
+
## Output Examples
|
190
|
+
|
191
|
+
### Example 1: Clean Sync
|
192
|
+
|
193
|
+
```
|
194
|
+
===========================================================
|
195
|
+
Multi-Agent Sync Status
|
196
|
+
===========================================================
|
197
|
+
|
198
|
+
Branch: dev/001-starter-kits
|
199
|
+
Remote: origin/dev/001-starter-kits
|
200
|
+
|
201
|
+
Local Remote
|
202
|
+
↓ ↓
|
203
|
+
┌─────┐ ┌─────┐
|
204
|
+
│ ●●● │ ===(in sync)=== │ ●●● │
|
205
|
+
└─────┘ └─────┘
|
206
|
+
|
207
|
+
✓ Up to date with remote
|
208
|
+
✓ No uncommitted changes
|
209
|
+
|
210
|
+
===========================================================
|
211
|
+
Agent Activity (last 7 days):
|
212
|
+
===========================================================
|
213
|
+
|
214
|
+
claude-code ████████████ 12 commits
|
215
|
+
|
216
|
+
===========================================================
|
217
|
+
Collaboration Status:
|
218
|
+
===========================================================
|
219
|
+
|
220
|
+
Active features: 1
|
221
|
+
Active sessions: 1
|
222
|
+
Pending handoffs: 0
|
223
|
+
|
224
|
+
✓ All in sync, ready to work!
|
225
|
+
===========================================================
|
226
|
+
```
|
227
|
+
|
228
|
+
### Example 2: Needs Sync
|
229
|
+
|
230
|
+
```
|
231
|
+
===========================================================
|
232
|
+
Multi-Agent Sync Status
|
233
|
+
===========================================================
|
234
|
+
|
235
|
+
Branch: dev/002-blog-feature
|
236
|
+
Remote: origin/dev/002-blog-feature
|
237
|
+
|
238
|
+
Local Remote
|
239
|
+
↓ ↓
|
240
|
+
┌─────┐ ┌─────┐
|
241
|
+
│ ● │ ←──(1 behind)── │ ●● │
|
242
|
+
│ │ ──(0 ahead)───→ │ ● │
|
243
|
+
└─────┘ └─────┘
|
244
|
+
|
245
|
+
⚠ 1 commit to pull
|
246
|
+
2 uncommitted changes
|
247
|
+
|
248
|
+
===========================================================
|
249
|
+
Agent Activity (last 7 days):
|
250
|
+
===========================================================
|
251
|
+
|
252
|
+
github-copilot-cli ████████ 5 commits (most recent)
|
253
|
+
claude-code ████ 3 commits
|
254
|
+
|
255
|
+
===========================================================
|
256
|
+
Collaboration Status:
|
257
|
+
===========================================================
|
258
|
+
|
259
|
+
Active features: 1
|
260
|
+
Active sessions: 2
|
261
|
+
Pending handoffs: 1 ⚠
|
262
|
+
|
263
|
+
Handoff found:
|
264
|
+
specs/002-blog-feature/collaboration/active/decisions/handoff-to-claude.md
|
265
|
+
|
266
|
+
===========================================================
|
267
|
+
Recommended Actions:
|
268
|
+
===========================================================
|
269
|
+
|
270
|
+
1. Review handoff: cat specs/002-blog-feature/collaboration/active/decisions/handoff-to-claude.md
|
271
|
+
2. Pull latest: git pull origin dev/002-blog-feature
|
272
|
+
3. Review changes: git log -1 origin/dev/002-blog-feature
|
273
|
+
4. Start work on handoff items
|
274
|
+
|
275
|
+
===========================================================
|
276
|
+
```
|
277
|
+
|
278
|
+
## Advanced Features
|
279
|
+
|
280
|
+
### Check Worktree Status
|
281
|
+
|
282
|
+
If working with worktrees:
|
283
|
+
|
284
|
+
```bash
|
285
|
+
# List all worktrees
|
286
|
+
git worktree list
|
287
|
+
|
288
|
+
# Check which worktrees are active
|
289
|
+
for worktree in $(git worktree list --porcelain | grep "worktree" | cut -d' ' -f2); do
|
290
|
+
echo "Worktree: $worktree"
|
291
|
+
cd "$worktree"
|
292
|
+
git status --short
|
293
|
+
cd - > /dev/null
|
294
|
+
done
|
295
|
+
```
|
296
|
+
|
297
|
+
### Compare with Other Branches
|
298
|
+
|
299
|
+
```bash
|
300
|
+
# Compare with main
|
301
|
+
git log main..HEAD --oneline --format="%h %s (via %b)" | grep "via"
|
302
|
+
|
303
|
+
# Show what's new in main since you branched
|
304
|
+
git log HEAD..main --oneline
|
305
|
+
```
|
306
|
+
|
307
|
+
### Check for Stale Branches
|
308
|
+
|
309
|
+
```bash
|
310
|
+
# List branches not updated in 30 days
|
311
|
+
git for-each-ref --format='%(refname:short) %(committerdate:relative)' \
|
312
|
+
refs/heads/ | grep -E '(weeks|months|years) ago'
|
313
|
+
```
|
314
|
+
|
315
|
+
## Important Notes
|
316
|
+
|
317
|
+
- **Read-only**: This command never modifies git state
|
318
|
+
- **Fast**: Only checks status, doesn't fetch from remote
|
319
|
+
- **Visual**: ASCII art helps quickly understand sync state
|
320
|
+
- **Multi-agent aware**: Highlights collaboration indicators
|
321
|
+
- **Actionable**: Provides specific next steps
|
322
|
+
|
323
|
+
## Integration with /orient
|
324
|
+
|
325
|
+
The `/sync` command complements `/orient`:
|
326
|
+
- `/orient` - Initial orientation when starting work
|
327
|
+
- `/sync` - Check status during work session
|
328
|
+
- `/commit` - Save work with attribution
|
329
|
+
- `/pr` - Create pull request when done
|
330
|
+
|
331
|
+
Use `/sync` frequently during multi-agent sessions to stay coordinated!
|