feat: Enhance CLI resume functionality with usage guidance and multi-session merge

- Add resume usage timing guidance (multi-round planning, multi-model collaboration)
- Document multi-session merge capability with --resume <id1>,<id2> syntax
- Improve CLI prompt validation to allow resume without explicit prompt
- Streamline documentation by removing redundant examples and model details

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
catlog22
2025-12-18 14:35:01 +08:00
parent 8dd4a513c8
commit 440314c16d
2 changed files with 30 additions and 55 deletions

View File

@@ -139,9 +139,7 @@ RULES: $(cat ~/.claude/workflows/cli-templates/protocols/write-protocol.md) $(ca
- Recommended MODE: `analysis` (read-only) for analysis tasks, `write` for file creation
- Priority: Prefer Gemini; use Qwen as fallback
**Models** (override via `--model`):
- Gemini: `gemini-2.5-pro`
- Qwen: `coder-model`, `vision-model`
**Error Handling**: HTTP 429 may show error but still return results - check if results exist
@@ -154,19 +152,25 @@ RULES: $(cat ~/.claude/workflows/cli-templates/protocols/write-protocol.md) $(ca
- Best for: Implementation, testing, automation, bug fixes
- No default MODE - must explicitly specify `--mode analysis` or `--mode write`
**Models**: `gpt-5.2`
### Session Resume
**Resume via `--resume` parameter**:
**When to Use**:
- Multi-round planning (analysis → planning → implementation)
- Multi-model collaboration (Gemini → Codex on same topic)
- Topic continuity (building on previous findings)
**Usage**:
```bash
ccw cli -p "Continue analyzing" --tool gemini --mode analysis --resume # Resume last session
ccw cli -p "Fix issues found" --tool codex --mode write --resume <id> # Resume specific session
ccw cli -p "Continue analyzing" --tool gemini --mode analysis --resume # Resume last
ccw cli -p "Fix issues found" --tool codex --mode write --resume <id> # Resume specific
ccw cli -p "Merge findings" --tool gemini --mode analysis --resume <id1>,<id2> # Merge multiple
```
- **`--resume` (empty)**: Resume most recent session
- **`--resume <id>`**: Resume specific execution ID
- **`--resume`**: Last session
- **`--resume <id>`**: Specific session
- **`--resume <id1>,<id2>`**: Merge sessions (comma-separated)
**Context Assembly** (automatic):
```
@@ -223,7 +227,6 @@ Every command MUST include these fields:
- Bad Example: (missing)
- Good Example: "$(cat ~/.claude/workflows/cli-templates/protocols/analysis-protocol.md) $(cat ~/.claude/workflows/cli-templates/prompts/analysis/03-assess-security-risks.txt) \| Focus on authentication \| Ignore test files"
### CONTEXT Configuration
**Format**: `CONTEXT: [file patterns] | Memory: [memory context]`
@@ -293,15 +296,6 @@ ccw cli -p 'RULES: $(cat ~/.claude/workflows/cli-templates/protocols/analysis-pr
ccw cli -p "RULES: \$(cat ~/.claude/workflows/cli-templates/protocols/analysis-protocol.md) ..." --tool gemini
```
**Examples**:
```bash
# Specific template (preferred)
RULES: $(cat ~/.claude/workflows/cli-templates/prompts/analysis/01-diagnose-bug-root-cause.txt) | Focus on auth | analysis=READ-ONLY
# Universal fallback (when no specific template matches)
RULES: $(cat ~/.claude/workflows/cli-templates/prompts/universal/00-universal-rigorous-style.txt) | Focus on security patterns | analysis=READ-ONLY
```
### Template System
**Base Path**: `~/.claude/workflows/cli-templates/prompts/`
@@ -376,10 +370,6 @@ RULES: $(cat ~/.claude/workflows/cli-templates/prompts/universal/00-universal-ri
- Description: Resume previous session
- Default: -
- **`--no-stream`**
- Description: Disable streaming
- Default: false
### Directory Configuration
#### Working Directory (`--cd`)
@@ -500,10 +490,6 @@ RULES: $(cat ~/.claude/workflows/cli-templates/protocols/write-protocol.md) $(ca
**Codex Multiplier**: 3x allocated time (minimum 15min / 900000ms)
```bash
ccw cli -p "<prompt>" --tool gemini --mode analysis --timeout 600000 # 10 min
ccw cli -p "<prompt>" --tool codex --mode write --timeout 1800000 # 30 min
```
### Permission Framework
@@ -528,13 +514,6 @@ ccw cli -p "<prompt>" --tool codex --mode write --timeout 1800000 # 30 min
- **Discover patterns first** - Use rg/MCP before CLI execution
- **Default to full context** - Use `@**/*` unless specific files needed
### Workflow Integration
- **Understanding**: `ccw cli -p "<prompt>" --tool gemini --mode analysis`
- **Architecture**: `ccw cli -p "<prompt>" --tool gemini --mode analysis`
- **Implementation**: `ccw cli -p "<prompt>" --tool codex --mode write`
- **Quality**: `ccw cli -p "<prompt>" --tool codex --mode write`
### Planning Checklist
- [ ] **Purpose defined** - Clear goal and intent