Merge feat/entire-review-v2-b1 into feat/entire-review-v2-b2

Resolve Charm v2/shared markdown renderer conflicts and make review synthesis cancellable with a visible generation message.

Entire-Checkpoint: 80330c00dfa9

Author: peyton-alt

.entire/settings.json

@@ -7,6 +7,8 @@
     "checkpoint_remote": {
       "provider": "github",
       "repo": "entireio/cli-checkpoints"
-    }
+    },
+    "checkpoints_v2": true,
+    "push_v2_refs": true
   }
 }

.github/workflows/e2e.yml

@@ -137,7 +137,7 @@ jobs:
           echo "agents=$failed" >> "$GITHUB_OUTPUT"
 
       - name: Notify Slack of E2E failure
-        uses: slackapi/slack-github-action@03ea5433c137af7c0495bc0cad1af10403fc800c # v3.0.2
+        uses: slackapi/slack-github-action@45a88b9581bfab2566dc881e2cd66d334e621e2c # v3.0.3
         with:
           webhook: ${{ secrets.E2E_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook

.github/workflows/release.yml

@@ -109,7 +109,7 @@ jobs:
     if: ${{ always() && needs.release.result == 'failure' }}
     steps:
       - name: Notify Slack of release failure
-        uses: slackapi/slack-github-action@03ea5433c137af7c0495bc0cad1af10403fc800c # v3.0.2
+        uses: slackapi/slack-github-action@45a88b9581bfab2566dc881e2cd66d334e621e2c # v3.0.3
         with:
           webhook: ${{ secrets.E2E_SLACK_WEBHOOK_URL }}
           webhook-type: incoming-webhook

.golangci.yaml

@@ -106,16 +106,16 @@ linters:
         - empty
         - stdlib
         - grpc.DialOption
+        - github.com/entireio/cli/cmd/entire/cli/summarize.Generator
         - github.com/entireio/cli/cmd/entire/cli/agent\..+
         - github.com/entireio/cli/cmd/entire/cli/review/types.Process
         - github.com/entireio/cli/cmd/entire/cli/review/types.AgentReviewer
+        - github.com/entireio/cli/cmd/entire/cli/review.SynthesisProvider
         - github.com/entireio/cli/cmd/entire/cli/checkpoint.CommittedReader
         - github.com/entireio/cli/cmd/entire/cli/strategy.Strategy
-        - github.com/entireio/cli/cmd/entire/cli/summarize.Generator
-        - github.com/entireio/cli/cmd/entire/cli/review.SynthesisProvider
+        - github.com/go-git/go-git/v6/x/plugin.Signer
         - github.com/go-git/go-git/v6/plumbing/storer.ReferenceIter
         - github.com/go-git/go-git/v6/plumbing.EncodedObject
-        - github.com/go-git/go-git/v6/x/plugin.Signer
         - github.com/go-git/go-git/v6/storage.Storer
         - github.com/go-git/go-git/v6/plumbing/storer.EncodedObjectIter
         - github.com/entireio/cli/e2e/agents.Session

.goreleaser.yaml

@@ -90,10 +90,13 @@ homebrew_casks:
     description: "CLI for Entire"
     binaries:
       - entire
-    completions:
-      bash: "completions/entire.bash"
-      zsh: "completions/entire.zsh"
-      fish: "completions/entire.fish"
+    generate_completions_from_executable:
+      executable: entire
+      shell_parameter_format: cobra
+      shells:
+        - bash
+        - zsh
+        - fish
     conflicts:
       - cask: entire@nightly
     skip_upload: auto
@@ -108,10 +111,13 @@ homebrew_casks:
     description: "CLI for Entire (nightly build)"
     binaries:
       - entire
-    completions:
-      bash: "completions/entire.bash"
-      zsh: "completions/entire.zsh"
-      fish: "completions/entire.fish"
+    generate_completions_from_executable:
+      executable: entire
+      shell_parameter_format: cobra
+      shells:
+        - bash
+        - zsh
+        - fish
     conflicts:
       - cask: entire
     skip_upload: "{{ if not .Prerelease }}true{{ end }}"

CHANGELOG.md

@@ -5,6 +5,46 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.6.0] - 2026-05-04
+
+### Added
+
+- Detection of pushes to protected branches, with a clearer warning before the push proceeds ([#1033](https://github.com/entireio/cli/pull/1033))
+- Improved auth token management in the CLI ([#1050](https://github.com/entireio/cli/pull/1050))
+- `entire explain --generate` now supports external agents for summary generation ([#1044](https://github.com/entireio/cli/pull/1044))
+- `entire search` TUI gains a unified palette with the activity view, markdown snippet rendering, and shell completions ([#1053](https://github.com/entireio/cli/pull/1053))
+- Homebrew now prompts users to update when a new version is released, and Homebrew cask completions are generated at install time ([#1057](https://github.com/entireio/cli/pull/1057), [#1085](https://github.com/entireio/cli/pull/1085))
+- Nested perf spans render in traces for richer debugging ([#1073](https://github.com/entireio/cli/pull/1073))
+
+### Changed
+
+- CLI restructured around `session` / `checkpoint` / `agent` / `auth` / `doctor` command groups ([#1062](https://github.com/entireio/cli/pull/1062))
+- Charm TUI stack upgraded to v2; dispatch repo links added to the dispatch wizard ([#1048](https://github.com/entireio/cli/pull/1048))
+- TUI navigation help aligned across `entire activity` and `entire search` ([#1058](https://github.com/entireio/cli/pull/1058), [#1064](https://github.com/entireio/cli/pull/1064))
+- `entire explain` generated summary is now formatted ([#1078](https://github.com/entireio/cli/pull/1078))
+- Auto-update prompt aligned across all installers ([#1083](https://github.com/entireio/cli/pull/1083))
+- TTY detection simplified via `testing.Testing()` and OS-level process detachment ([#1029](https://github.com/entireio/cli/pull/1029))
+- Switched secret scanning back to betterleaks, with tightened redaction coverage and improved database credential redaction ([#1043](https://github.com/entireio/cli/pull/1043), [#1045](https://github.com/entireio/cli/pull/1045), [#1068](https://github.com/entireio/cli/pull/1068))
+- Checkpoints v2 (work in progress): expose CLI version to external agents for compact transcripts; cleaner migration output and completion message; use checkpoint creation time for generation calc with a lower default retention; push v2 refs in parallel ([#1032](https://github.com/entireio/cli/pull/1032), [#1059](https://github.com/entireio/cli/pull/1059), [#1088](https://github.com/entireio/cli/pull/1088), [#1089](https://github.com/entireio/cli/pull/1089), [#1094](https://github.com/entireio/cli/pull/1094))
+
+### Fixed
+
+- Cursor sessions no longer get mis-identified as Claude Code ([#1082](https://github.com/entireio/cli/pull/1082))
+- `entire explain` works with partial-clone checkpoint repositories ([#1069](https://github.com/entireio/cli/pull/1069))
+- Agent-neutral wording in the `entire explain` empty-state message ([#1086](https://github.com/entireio/cli/pull/1086))
+- False PATH conflict detection in the installer ([#1038](https://github.com/entireio/cli/pull/1038))
+- Checkpoints v2 migration: preserve attribution metadata; clean up v1-named transcript files on `/full/current`; handle missing v1 sessions; check archived v2 transcripts; correct generation packing ([#1035](https://github.com/entireio/cli/pull/1035), [#1034](https://github.com/entireio/cli/pull/1034), [#1071](https://github.com/entireio/cli/pull/1071), [#1080](https://github.com/entireio/cli/pull/1080), [#1091](https://github.com/entireio/cli/pull/1091))
+
+### Housekeeping
+
+- Centralized TUI keybindings via `bubbles/key` in preparation for Bubble Tea v2 ([#1060](https://github.com/entireio/cli/pull/1060))
+- Expanded checkpoints v2 validation coverage and pruned subsumed tests in the strategy package ([#1012](https://github.com/entireio/cli/pull/1012), [#1077](https://github.com/entireio/cli/pull/1077))
+- Dependency bumps: go-dependencies group (incl. `posthog-go` 1.12.1 → 1.12.4), `goreleaser/goreleaser-action` 7.1.0 → 7.2.1, `slackapi/slack-github-action` 3.0.1 → 3.0.3 ([#1031](https://github.com/entireio/cli/pull/1031), [#1087](https://github.com/entireio/cli/pull/1087), [#1055](https://github.com/entireio/cli/pull/1055), [#1016](https://github.com/entireio/cli/pull/1016), [#1095](https://github.com/entireio/cli/pull/1095))
+
+### Thanks
+
+Thanks to @KuaaMU for making the `entire explain` empty-state message agent-neutral!
+
 ## [0.5.6] - 2026-04-24
 
 ### Added

CLAUDE.md

@@ -11,7 +11,7 @@ This repo contains the CLI for Entire.
 ### Commands (`cmd/`)
 
 - `entire/`: Main CLI entry point
-- `entire/cli`: CLI utilities and helpers
+- `entire/cli`: CLI utilities and helpers (Cobra commands, helpers, group roots)
 - `entire/cli/commands`: actual command implementations
 - `entire/cli/agent`: agent implementations (Claude Code, Gemini CLI, OpenCode, Cursor, Factory AI Droid, Copilot CLI) - see [Agent Integration Checklist](docs/architecture/agent-integration-checklist.md) and [Agent Implementation Guide](docs/architecture/agent-guide.md)
 - `entire/cli/strategy`: strategy implementation (manual-commit) - see section below
@@ -20,6 +20,45 @@ This repo contains the CLI for Entire.
 - `entire/cli/integration_test`: integration tests (simulated hooks)
 - `e2e/`: E2E tests with real agent calls (see [e2e/README.md](e2e/README.md))
 
+### Command Layout
+
+The CLI is organized around five noun groups plus a small set of top-level
+verbs. The groups are the canonical home for each verb; legacy top-level
+shortcuts remain functional but hidden, and emit a deprecation hint pointing
+at the canonical group form.
+
+- `session` (alias: `sessions`): `list`, `info`, `stop`, `attach`, `resume`, `current`
+- `checkpoint` (aliases: `cp`, `checkpoints`): `list`, `explain`, `rewind`, `search`
+- `agent`: bare opens the interactive agent selector, plus `list`, `add`, `remove`
+- `configure`: bare prints help and a hint pointing at `entire agent`; flags
+  manage non-agent settings (telemetry, git-hook installation mode, strategy
+  options, summary provider). Agent CRUD lives under `entire agent`.
+- `auth`: `login`, `logout`, `status`, `list`, `revoke`
+- `doctor`: bare runs the scan-and-fix flow, plus `trace`, `logs`, `bundle`
+
+Top-level lifecycle and standalone commands: `enable`, `disable`, `status`,
+`login`, `logout`, `clean`, `version`, `dispatch`, `activity`, `help`,
+`configure`.
+
+Hidden top-level shortcuts (functional, emit a one-line deprecation hint):
+`rewind` → `checkpoint rewind`, `resume` → `session resume`, `attach` →
+`session attach`, `explain` → `checkpoint explain`, `trace` → `doctor trace`.
+Cobra-native aliases (no hint): `sessions` → `session`, `cp`/`checkpoints` →
+`checkpoint`. The `search` top-level remains hidden without a hint.
+
+Deprecated top-level alias (functional, prints cobra deprecation message):
+`reset` → `clean`.
+
+Hidden infrastructure commands: `hooks`, `migrate`, `trail`,
+`curl-bash-post-install`, `__send_analytics`.
+
+The `hideAsAlias(cmd, canonical)` helper in `cmd/entire/cli/aliascmd.go`
+marks a command Hidden and sets cobra's `Deprecated` field so the hint
+renders to stderr on every invocation while the command stays functional.
+Diagnostic subcommands live alongside `doctor.go` as `doctor_logs.go` and
+`doctor_bundle.go`. Group roots and noun-group children live in files
+named `<noun>_group.go` and `<noun>_<verb>.go` respectively.
+
 ## Tech Stack
 
 - Language: Go 1.26.x
@@ -419,6 +458,8 @@ The manual-commit strategy (`manual_commit*.go`) does not modify the active bran
 - `manual_commit_logs.go` - Session log retrieval and session listing
 - `manual_commit_hooks.go` - Git hook handlers (prepare-commit-msg, post-commit, post-rewrite, pre-push)
 - `manual_commit_reset.go` - Shadow branch reset/cleanup functionality
+- `cleanup.go` - Cleanup discovery/deletion, including archived v2 generation retention
+- `generation_repair.go` - Archived v2 generation metadata repair from raw transcript timestamps
 - `session_state.go` - Package-level session state functions (`LoadSessionState`, `SaveSessionState`, `ListSessionStates`, `FindMostRecentSession`)
 - `hooks.go` - Git hook installation
 

README.md

@@ -74,7 +74,7 @@ cd your-project && entire enable
 entire status
 ```
 
-After the initial setup, use `entire configure` to add/remove agents or update setup-related options, and use `entire enable` / `entire disable` to toggle Entire on or off.
+After the initial setup, use `entire agent` to add or remove agents, `entire configure` to update non-agent settings, and `entire enable` / `entire disable` to toggle Entire on or off.
 
 ## Release Channels
 
@@ -104,7 +104,8 @@ On a repo that has not been enabled yet, `entire enable` runs the initial enable
 After setup:
 
 - Use `entire enable` to turn Entire back on if the repo is currently disabled.
-- Use `entire configure` to change which agents are installed or to update setup-related settings.
+- Use `entire agent` to add or remove agents.
+- Use `entire configure` to update non-agent settings (telemetry, hooks, checkpoint remote, summary provider).
 
 The hooks capture session data as you work. Checkpoints are created when you or the agent make a git commit. Your code commits stay clean, Entire never creates commits on your active branch. All session metadata is stored on a separate `entire/checkpoints/v1` branch.
 
@@ -121,7 +122,7 @@ entire status  # Check current session status anytime
 If you want to undo some changes and go back to an earlier checkpoint:
 
 ```
-entire rewind
+entire checkpoint rewind
 ```
 
 This shows all available checkpoints in the current session. Select one to restore your code to that exact state.
@@ -131,7 +132,7 @@ This shows all available checkpoints in the current session. Select one to resto
 To restore the latest checkpointed session metadata for a branch:
 
 ```
-entire resume <branch>
+entire session resume <branch>
 ```
 
 Entire checks out the branch, restores the latest checkpointed session metadata (one or more sessions), and prints command(s) to continue.
@@ -232,16 +233,20 @@ go test -tags=integration ./cmd/entire/cli/integration_test -run TestLogin
 | Command          | Description                                                                                       |
 | ---------------- | ------------------------------------------------------------------------------------------------- |
 | `entire clean`   | Clean up session data and orphaned Entire data (use `--all` for repo-wide cleanup)                |
-| `entire configure` | Configure agents and setup options for the current repository                                  |
+| `entire agent`   | Add, remove, or list agent integrations for the current repository                                |
+| `entire configure` | Update non-agent settings (telemetry, git hook, strategy options, summary provider)            |
 | `entire disable` | Remove Entire hooks from repository                                                               |
 | `entire doctor`  | Fix or clean up stuck sessions                                                                    |
 | `entire enable`  | Enable Entire in your repository                                                                  |
-| `entire explain` | Explain a session or commit                                                                       |
+| `entire checkpoint`        | List, explain, rewind, and search checkpoints                                           |
+| `entire checkpoint explain` | Explain a session, commit, or checkpoint                                               |
+| `entire checkpoint rewind` | Rewind to a previous checkpoint                                                         |
 | `entire login`   | Authenticate the CLI with Entire device auth                                                      |
-| `entire resume`  | Switch to a branch, restore latest checkpointed session metadata, and show command(s) to continue |
-| `entire rewind`  | Rewind to a previous checkpoint                                                                   |
+| `entire session` | View and manage agent sessions tracked by Entire                                                  |
+| `entire session resume`    | Switch to a branch, restore latest checkpointed session metadata, and show command(s) |
+| `entire session attach`    | Attach to a previously detached session                                                |
 | `entire status`  | Show current session info                                                                         |
-| `entire sessions` | View and manage agent sessions tracked by Entire                                                 |
+| `entire doctor trace` | Show hook performance traces                                                                 |
 | `entire version` | Show Entire CLI version                                                                           |
 
 ### `entire enable` Flags
@@ -272,33 +277,37 @@ entire enable --force
 entire enable --local
 ```
 
-`entire enable` is primarily for turning Entire on. On an unconfigured repo it will also bootstrap setup, but once the repo is already configured, `entire configure` is the clearer command for managing agents and setup options.
+`entire enable` is primarily for turning Entire on. On an unconfigured repo it will also bootstrap setup. Use `entire agent` for adding or removing agents, and `entire configure` for non-agent settings.
 
 ### `entire configure`
 
-Use `entire configure` after the repo is already set up and you want to change the configuration without framing the action as an enable/disable toggle.
+Use `entire configure` to update non-agent settings on a repo that's already set up. Agent installation lives under `entire agent`.
 
 Typical uses:
 
-- Add another agent
-- Remove an agent
-- Reinstall hooks for selected agents
-- Update settings such as `--checkpoint-remote` or `--skip-push-sessions`
+- Toggle telemetry
+- Reinstall the Entire git hook (`--force`, `--absolute-git-hook-path`)
+- Update strategy options such as `--checkpoint-remote` or `--skip-push-sessions`
+- Pick a summary provider for `entire explain --generate`
 
 **Examples:**
 
 ```bash
-# Add or remove agents interactively
+# Show help and the hint pointing to 'entire agent'
 entire configure
 
-# Install or refresh hooks for one agent non-interactively
-entire configure --agent claude-code --force
+# Opt out of telemetry
+entire configure --telemetry=false
 
-# Update setup settings on an existing repo
+# Reinstall the Entire git hook with an absolute binary path
+entire configure --absolute-git-hook-path
+
+# Update strategy options on an existing repo
 entire configure --checkpoint-remote github:myorg/checkpoints-private
 
-# Remove one agent's hooks
-entire configure --remove claude-code
+# Add or remove an agent
+entire agent add claude-code
+entire agent remove claude-code
 ```
 
 ## Configuration

cmd/entire/cli/activity_render.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/charmbracelet/lipgloss"
+	"charm.land/lipgloss/v2"
 	"golang.org/x/term"
 )