Run e2e against a configurable checkpoint backend + git-refs CI · Entire

Run e2e against a configurable checkpoint backend + git-refs CI

b28b869·

Soph·2w ago·15 files·+289 added/-61 removed

Sessions

d9646529ed6eView transcript

Changes

15

7 unmodified lines
8
9
10
11
12
13
14
15
2 unmodified lines

18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
30 unmodified lines

64
65
66
67
68
69
70
71
72
73
74
75
76
77
55 unmodified lines

133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157

7 unmodified lines

```go
"fmt"
"io/fs"
"log/slog"
"os"
"strings"

"github.com/entireio/cli/cmd/entire/cli/logging"

// block is malformed (e.g. a backend with no type). var ErrInvalidCheckpointsConfig = errors.New("invalid checkpoints config")

// Environment overrides for checkpoint backend selection. When EnvCheckpointsPrimary // is set, it (and the optional comma-separated EnvCheckpointsMirrors) fully // replaces any checkpoints block in settings — env wins over file, matching the // other ENTIRE_* overrides (ENTIRE_LOG_LEVEL, ENTIRE_TOKEN, …). Primarily for // driving e2e/CI and rollout against a specific backend without editing settings. const ( EnvCheckpointsPrimary = "ENTIRE_CHECKPOINTS_PRIMARY" EnvCheckpointsMirrors = "ENTIRE_CHECKPOINTS_MIRRORS" )

// CheckpointsConfig selects checkpoint storage backends: one primary (source of // truth, serves all reads and writes) and zero or more mirrors (independent // backends that receive best-effort write fan-out). When absent, the checkpoint // a deep-merged document). Clone preferences carry no checkpoint config and are // not consulted.

func LoadCheckpointsConfig(ctx context.Context) (*CheckpointsConfig, error) { // Env override wins over any settings file (precedence like ENTIRE_LOG_LEVEL). if cfg, ok := checkpointsConfigFromEnv(); ok { if err := cfg.validate(); err != nil { return nil, err } return cfg, nil }

base, local := checkpointsSettingsPaths(ctx)

// "local replaces base wholesale": prefer a checkpoints block from local return env.Checkpoints }

// checkpointsConfigFromEnv builds a CheckpointsConfig from the environment when // EnvCheckpointsPrimary is set. Mirrors are taken from EnvCheckpointsMirrors as a // comma-separated list of backend types (no per-backend config blocks — the env // override is for backend selection only). Returns ok=false when no primary is // set, leaving file-based resolution in charge. func checkpointsConfigFromEnv() (*CheckpointsConfig, bool) { primary := strings.TrimSpace(os.Getenv(EnvCheckpointsPrimary)) if primary == "" { return nil, false } cfg := &CheckpointsConfig{Primary: BackendConfig{Type: primary}} for _, m := range strings.Split(os.Getenv(EnvCheckpointsMirrors), ",") { if t := strings.TrimSpace(m); t != "" { cfg.Mirrors = append(cfg.Mirrors, BackendConfig{Type: t}) } } return cfg, true }

func (c *CheckpointsConfig) validate() error { if c.Primary.Type == "" { return fmt.Errorf("%w: checkpoints.primary.type is required", ErrInvalidCheckpointsConfig) } }

| `E2E_ENTIRE_BIN` | Path to a pre-built `entire` binary | builds from source |
| `E2E_TIMEOUT` | Timeout per prompt | `2m` |
| `E2E_KEEP_REPOS` | Set to `1` to preserve temp repos after test | unset |
| `E2E_CHECKPOINT_STORE` | Checkpoint backend to run the suite against (`git-branch`, `git-refs`). Maps to the `ENTIRE_CHECKPOINTS_PRIMARY` override that every spawned binary/hook honors. | `git-branch` |
| `E2E_ARTIFACT_DIR` | Override artifact output directory | `e2e/artifacts/<timestamp>` |
| `ANTHROPIC_API_KEY` | Required for Claude Code | — |
| `GEMINI_API_KEY` | Required for Gemini CLI | — |

func TestLoadCheckpointsConfig_EnvOverridesPrimary(t *testing.T) {
    dir := newCheckpointsSettingsRepo(t)
    // A file block that the env override must replace wholesale.
    writeFile(t, dir, "settings.json", `{"enabled": true, "checkpoints": {"primary": {"type": "git-branch"}}}`)
    t.Setenv(EnvCheckpointsPrimary, "git-refs")

cfg, err := LoadCheckpointsConfig(context.Background())
    require.NoError(t, err)
    require.NotNil(t, cfg)
    assert.Equal(t, "git-refs", cfg.Primary.Type)
    assert.Empty(t, cfg.Mirrors)
}

func TestLoadCheckpointsConfig_EmptyEnvFallsBackToFile(t *testing.T) {
    dir := newCheckpointsSettingsRepo(t)
    writeFile(t, dir, "settings.json", `{"enabled": true, "checkpoints": {"primary": {"type": "git-branch"}}}`)
    t.Setenv(EnvCheckpointsPrimary, "")

cfg, err := LoadCheckpointsConfig(context.Background())
    require.NoError(t, err)
    require.NotNil(t, cfg)
    assert.Equal(t, "git-branch", cfg.Primary.Type, "empty env override defers to the settings file")
}

// Write your tests below.

const timeout = 5 * time.Second

func WaitForSessionIdle(...) {
    t.Helper()
    // Your implementation here
}

// Add rest of the relevant content and tests

End of Content