Skip to content
Merged
2 changes: 1 addition & 1 deletion .claude/agents/reviewer.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ You are a **Senior Code Reviewer** with decades of experience across multiple la
- `.entire/` - conversation history
- `docs/requirements/*/task-*.md` - task tracking files

**Why branch-scoped?** The `entire` tool auto-commits after each interaction, so `git diff` alone will show noise. Comparing against the base branch shows the actual feature work.
**Why branch-scoped?** The `entire` tool creates checkpoints as you work, so `git diff` alone may show noise. Comparing against the base branch shows the actual feature work.

## Review Philosophy

Expand Down
34 changes: 12 additions & 22 deletions .claude/skills/test-repo/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This skill validates the CLI's session management and rewind functionality by ru
## When to Use

- User asks to "test against a test repo"
- User wants to validate strategy changes (manual-commit, auto-commit, shadow, dual)
- User wants to validate strategy changes (manual-commit)
- User asks to verify session hooks, commits, or rewind functionality
- After making changes to strategy code

Expand Down Expand Up @@ -54,7 +54,7 @@ Add this pattern to your Claude Code approved commands, or approve it once when
**Optional: Set strategy** (defaults to `manual-commit`):

```bash
export STRATEGY=manual-commit # or auto-commit, shadow, dual
export STRATEGY=manual-commit
```

### Test Steps
Expand Down Expand Up @@ -87,15 +87,15 @@ Execute these steps in order:
.claude/skills/test-repo/test-harness.sh list-rewind-points
```

Expected results by strategy:
Expected results:

| Check | manual-commit/shadow | auto-commit/dual |
|-------|---------------------|------------------|
| Active branch | No Entire-* trailers | Entire-Checkpoint: trailer only |
| Session state | ✓ Exists | ✗ Not used |
| Shadow branch | ✓ entire/{hash} | ✗ None |
| Metadata branch | ✓ entire/checkpoints/v1 | ✓ entire/checkpoints/v1 |
| Rewind points | ✓ At least 1 | ✓ At least 1 |
| Check | Result |
|-------|--------|
| Active branch | Optional Entire-Checkpoint: trailer |
| Session state | ✓ Exists |
| Shadow branch | ✓ entire/{hash} |
| Metadata branch | ✓ entire/checkpoints/v1 |
| Rewind points | ✓ At least 1 |

#### 4. Test Rewind

Expand All @@ -107,8 +107,7 @@ Expected results by strategy:
```

**Expected Behavior:**
- **Manual-commit/shadow**: Shows warning listing untracked files that will be deleted (files created after the checkpoint that weren't present at session start)
- **Auto-commit/dual**: No warning (git reset doesn't delete untracked files)
- Shows warning listing untracked files that will be deleted (files created after the checkpoint that weren't present at session start)

Example warning output (manual-commit):
```
Expand Down Expand Up @@ -144,7 +143,7 @@ go build -o /tmp/entire-bin ./cmd/entire && \

## Expected Results by Strategy

### Manual-Commit Strategy (default, alias: shadow)
### Manual-Commit Strategy (default)
- Active branch commits: **NO modifications** (no commits created by Entire)
- Shadow branches: `entire/<commit-hash[:7]>` created for checkpoints
- Metadata: stored on both shadow branches and `entire/checkpoints/v1` branch (condensed on user commits)
Expand All @@ -153,15 +152,6 @@ go build -o /tmp/entire-bin ./cmd/entire && \
- Preserves untracked files that existed at session start
- AllowsMainBranch: **true** (safe on main/master)

### Auto-Commit Strategy (alias: dual)
- Active branch commits: **clean commits** with only `Entire-Checkpoint: <12-hex-char>` trailer
- Shadow branches: none
- Metadata: stored on orphan `entire/checkpoints/v1` branch at sharded paths
- Rewind: full reset allowed if commit is only on current branch
- Uses `git reset --hard` which doesn't delete untracked files
- **No preview warnings** (untracked files are safe)
- AllowsMainBranch: **false** (creates commits on active branch)

## Additional Testing (Optional)

### Test Subagent Checkpoints
Expand Down
2 changes: 1 addition & 1 deletion .claude/skills/test-repo/test-harness.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ verify-shadow-branch)
if git branch -a | grep -E "entire/[0-9a-f]"; then
echo "✓ Shadow branch exists"
else
echo "Note: No shadow branch (expected for auto-commit strategy)"
echo "Note: No shadow branch"
fi
;;

Expand Down
2 changes: 1 addition & 1 deletion .gemini/agents/reviewer.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ You are a **Senior Code Reviewer** with decades of experience across multiple la
- `.entire/` - conversation history
- `docs/requirements/*/task-*.md` - task tracking files

**Why branch-scoped?** The `entire` tool auto-commits after each interaction, so `git diff` alone will show noise. Comparing against the base branch shows the actual feature work.
**Why branch-scoped?** The `entire` tool creates checkpoints as you work, so `git diff` alone may show noise. Comparing against the base branch shows the actual feature work.

## Review Philosophy

Expand Down
12 changes: 0 additions & 12 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,6 @@ body:
validations:
required: true

- type: dropdown
id: strategy
attributes:
label: Strategy
description: "Which strategy is configured? (check `.entire/settings.json` or `entire status`)"
options:
- manual-commit (default)
- auto-commit
- Not sure
validations:
required: true

- type: input
id: terminal
attributes:
Expand Down
Loading