mirror of
https://github.com/AmanTahiliani/box-box.git
synced 2026-08-08 04:06:18 -04:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34b060238a | ||
|
|
a9920f0dd4 | ||
|
|
7c8a75f7ca | ||
|
|
e0174f7bf1 | ||
|
|
2d6fa531f2 | ||
|
|
8fd358748d | ||
|
|
b0fd252096 | ||
|
|
ad379e0f07 | ||
|
|
9ee14e5c89 | ||
|
|
cc4337be88 |
@@ -24,7 +24,7 @@ bin/dev CLI: `dev implement <issue#> --harness <name> [--dry-run]`
|
||||
- **Groom** (interactive, Claude): `/groom <issue#>` runs a seeded grill-me → writes a
|
||||
Ready spec into the issue body → sets Effort/Priority → leaves Stage at `Research`.
|
||||
You review and flip to `Ready`.
|
||||
- **Implement** (any harness): `.agents/bin/dev implement <issue#> --harness <name>`
|
||||
- **Implement** (recommended harnesses: `codex` or `cursor`): `.agents/bin/dev implement <issue#> --harness <name>`
|
||||
(or `/implement …` in Claude to supervise) → isolated worktree → runs the harness
|
||||
headless on the spec → build gate → opens a PR → sets Stage `In Review`.
|
||||
- **Review + merge**: use the `review` skill from a harness different from the
|
||||
@@ -42,8 +42,17 @@ local adapter state.
|
||||
## Adding / fixing a harness
|
||||
|
||||
Edit one function in `harnesses.sh`: `harness_<name> <workdir> <promptfile>`, running the
|
||||
tool non-interactively in `<workdir>` on the prompt. `claude`/`codex`/`opencode` are
|
||||
wired; `pi`/`cursor` are stubs — confirm their headless flags before trusting.
|
||||
tool non-interactively in `<workdir>` on the prompt. For current implementation
|
||||
dispatch, prefer `codex` or `cursor`; `claude` and `opencode` remain available, and
|
||||
`pi` still needs flag verification before trusting.
|
||||
|
||||
`agy` / Antigravity is deliberately disabled for non-dry-run dispatch as of
|
||||
2026-07-04. Phase 1 testing found the headless path unreliable: with
|
||||
`--new-project` it ignored the prompt and tried to scaffold, while without it the CLI
|
||||
could resume a stale conversation and hang past the print timeout. Keep using
|
||||
`.agents/bin/dev implement <issue#> --harness agy --dry-run` for prompt inspection
|
||||
only; real dispatch should use `codex` or `cursor` until a fresh Antigravity
|
||||
headless invocation is verified and documented.
|
||||
|
||||
Always `--dry-run` a new harness first: it renders the exact prompt and plan, touching
|
||||
nothing (no worktree, PR, or state change).
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
# .agents/bin/dev — box-box agentic dev CLI. Works from any harness's shell.
|
||||
#
|
||||
# dev implement <issue#> --harness <claude|codex|opencode|pi|cursor> [--dry-run] [--base <branch>]
|
||||
# dev implement <issue#> --harness <codex|cursor|claude|opencode|pi|agy> [--dry-run] [--base <branch>]
|
||||
#
|
||||
# Grooming is driven interactively via the Claude Code /groom skill; this CLI covers
|
||||
# the implement lane (dispatch a Ready issue to a harness → worktree → gate → PR).
|
||||
@@ -15,7 +15,7 @@ box-box dev CLI
|
||||
|
||||
dev implement <issue#> --harness <name> [--dry-run] [--base <branch>]
|
||||
|
||||
harnesses: claude, codex, opencode (supported) · pi, cursor (verify flags in .agents/harnesses.sh)
|
||||
harnesses: codex, cursor (recommended) · claude, opencode (available) · agy (dry-run only, disabled for dispatch) · pi (verify flags)
|
||||
--dry-run render the prompt + plan, touch nothing (no worktree/PR/state change)
|
||||
--base base branch for the worktree/PR (default: main)
|
||||
EOF
|
||||
|
||||
@@ -11,6 +11,18 @@
|
||||
|
||||
# ---- MUST-HAVE ----
|
||||
|
||||
harness_disabled_reason() { # <name> -> reason on stdout; 0 means disabled
|
||||
case "$1" in
|
||||
agy)
|
||||
cat <<'EOF'
|
||||
agy is disabled for implementation dispatch as of 2026-07-04: Antigravity headless mode was observed to ignore prompts with --new-project, resume stale conversations without it, and hang past print timeouts. Use codex or cursor until a fresh headless invocation is verified.
|
||||
EOF
|
||||
return 0
|
||||
;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
harness_claude() { # Claude Code — print mode, auto-accept edits
|
||||
local dir="$1" prompt="$2"
|
||||
( cd "$dir" && claude -p "$(cat "$prompt")" --permission-mode acceptEdits )
|
||||
@@ -31,14 +43,11 @@ harness_cursor() { # Cursor CLI agent — composer-2.5, hea
|
||||
( cd "$dir" && cursor-agent -p "$(cat "$prompt")" --model composer-2.5 --force --trust )
|
||||
}
|
||||
|
||||
harness_agy() { # Antigravity CLI — UNRELIABLE headless (2026-07): with
|
||||
# --new-project it ignores the prompt and asks to scaffold a project; without it, it
|
||||
# resumes the previous conversation (silently keeping its old model — --model only
|
||||
# applies to new conversations) and can hang past the print timeout. Do not trust for
|
||||
# dispatch until fixed upstream; verify with a trivial prompt first.
|
||||
local dir="$1" prompt="$2"
|
||||
( cd "$dir" && agy --print --print-timeout 60m \
|
||||
--model="Gemini 3.1 Pro (High)" --dangerously-skip-permissions "$(cat "$prompt")" )
|
||||
harness_agy() { # Antigravity CLI — disabled until headless is verified
|
||||
local reason
|
||||
reason="$(harness_disabled_reason agy)"
|
||||
echo "harness_agy: $reason" >&2
|
||||
return 2
|
||||
}
|
||||
|
||||
# ---- NICE-TO-HAVE (verify the exact invocation for your version before trusting) ----
|
||||
|
||||
@@ -52,6 +52,15 @@ dispatch() { # <issue#> <harness> [--dry-run] [--base <branch>]
|
||||
if ! declare -f "harness_$harness" >/dev/null 2>&1; then
|
||||
echo "no adapter for harness '$harness' — add harness_$harness() to .agents/harnesses.sh" >&2; return 2
|
||||
fi
|
||||
if [ "$dry" != 1 ] && declare -f harness_disabled_reason >/dev/null 2>&1; then
|
||||
local disabled_reason
|
||||
if disabled_reason="$(harness_disabled_reason "$harness")"; then
|
||||
echo "harness '$harness' is disabled for non-dry-run dispatch." >&2
|
||||
echo " $disabled_reason" >&2
|
||||
echo " Use --dry-run for prompt inspection, or dispatch with --harness codex/cursor." >&2
|
||||
return 2
|
||||
fi
|
||||
fi
|
||||
|
||||
local repo_root title body slug branch wt prompt
|
||||
repo_root="$(git rev-parse --show-toplevel)" || return 1
|
||||
|
||||
59
.agents/test/dispatch_disabled_harness_test.sh
Executable file
59
.agents/test/dispatch_disabled_harness_test.sh
Executable file
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
source "$ROOT/.agents/lib/dispatch.sh"
|
||||
|
||||
issue_title() { echo "Disable agy harness smoke"; }
|
||||
issue_body() { echo "## Spec"; echo; echo "Smoke prompt body"; }
|
||||
get_field() { echo "Ready"; }
|
||||
set_stage() { echo "unexpected set_stage $*" >&2; return 99; }
|
||||
run_gate() { echo "unexpected run_gate $*" >&2; return 99; }
|
||||
|
||||
unexpected_git_file="$(mktemp "${TMPDIR:-/tmp}/boxbox-agy-git.XXXX")"
|
||||
rm -f "$unexpected_git_file"
|
||||
git() {
|
||||
if [ "${1:-}" = "rev-parse" ]; then
|
||||
command git "$@"
|
||||
return
|
||||
fi
|
||||
echo "unexpected git $*" >&2
|
||||
touch "$unexpected_git_file"
|
||||
return 99
|
||||
}
|
||||
|
||||
set +e
|
||||
non_dry_output="$(dispatch 47 agy 2>&1)"
|
||||
non_dry_status=$?
|
||||
set -e
|
||||
|
||||
[ "$non_dry_status" -eq 2 ] || {
|
||||
echo "expected agy non-dry-run to exit 2, got $non_dry_status" >&2
|
||||
echo "$non_dry_output" >&2
|
||||
exit 1
|
||||
}
|
||||
[[ "$non_dry_output" == *"harness 'agy' is disabled"* ]] || {
|
||||
echo "expected disabled-harness message" >&2
|
||||
echo "$non_dry_output" >&2
|
||||
exit 1
|
||||
}
|
||||
[ ! -e "$unexpected_git_file" ] || {
|
||||
echo "agy non-dry-run reached git before failing" >&2
|
||||
echo "$non_dry_output" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
dry_output="$(dispatch 47 agy --dry-run 2>&1)"
|
||||
[[ "$dry_output" == *"[dry-run] no worktree / harness / PR / state change"* ]] || {
|
||||
echo "expected agy dry-run to render dispatch preview" >&2
|
||||
echo "$dry_output" >&2
|
||||
exit 1
|
||||
}
|
||||
[[ "$dry_output" == *"Smoke prompt body"* ]] || {
|
||||
echo "expected agy dry-run prompt body" >&2
|
||||
echo "$dry_output" >&2
|
||||
exit 1
|
||||
}
|
||||
42
cmd/main.go
42
cmd/main.go
@@ -27,6 +27,7 @@ func main() {
|
||||
ingestMeeting := flag.Int("ingest-meeting", 0, "Ingest meeting metadata and Race Hub datasets for all sessions")
|
||||
ingestSession := flag.Int("ingest-session", 0, "Ingest Race Hub datasets for a session key")
|
||||
ingestNews := flag.Bool("ingest-news", false, "Refresh RSS/Atom paddock briefing feeds")
|
||||
prefetchTrackOutlines := flag.Int("prefetch-track-outlines", 0, "Warm the web track-outline cache for a season year (for web-only hosts, run before --web so /api/v1/track-outline can serve live maps)")
|
||||
dryRun := flag.Bool("dry-run", false, "Preview ingestion without writing domain rows")
|
||||
force := flag.Bool("force", false, "Re-ingest datasets even if already tracked in the session_coverage table as completed")
|
||||
coverageYear := flag.Int("coverage", 0, "Show season coverage report for the given year")
|
||||
@@ -76,11 +77,21 @@ func main() {
|
||||
if *ingestNews {
|
||||
ingestFlags++
|
||||
}
|
||||
if *prefetchTrackOutlines != 0 {
|
||||
ingestFlags++
|
||||
}
|
||||
if ingestFlags > 0 {
|
||||
if ingestFlags > 1 {
|
||||
fmt.Fprintln(os.Stderr, "box-box: only one of --ingest-year, --backfill-season, --ingest-meeting, --ingest-session, or --ingest-news may be set")
|
||||
fmt.Fprintln(os.Stderr, "box-box: only one of --ingest-year, --backfill-season, --ingest-meeting, --ingest-session, --ingest-news, or --prefetch-track-outlines may be set")
|
||||
os.Exit(1)
|
||||
}
|
||||
if *prefetchTrackOutlines != 0 {
|
||||
if err := runTrackOutlinePrefetch(client, *prefetchTrackOutlines); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "box-box track outline prefetch error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
return
|
||||
}
|
||||
if *ingestNews {
|
||||
if err := runNewsIngestion(*dryRun, *dbPath); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "box-box ingest error: %v\n", err)
|
||||
@@ -174,6 +185,35 @@ func runIngestion(client *api.OpenF1Client, year, meetingKey, sessionKey int, fo
|
||||
return err
|
||||
}
|
||||
|
||||
func runTrackOutlinePrefetch(client *api.OpenF1Client, year int) error {
|
||||
log.SetOutput(os.Stderr)
|
||||
|
||||
fmt.Fprintf(os.Stderr, "track outlines: warming HTTP cache %s for %d\n", api.DefaultCacheDBPath(), year)
|
||||
|
||||
meetings, err := client.GetMeetingsForYear(year)
|
||||
if err != nil {
|
||||
return fmt.Errorf("fetch meetings for %d: %w", year, err)
|
||||
}
|
||||
|
||||
result := client.PrefetchTrackOutlinesForYear(year, meetings)
|
||||
fmt.Printf(
|
||||
"track outlines %d: cached %d/%d unique circuit(s) before, %d/%d after; %d skipped, %d fetched, %d failed\n",
|
||||
result.Year,
|
||||
result.CachedBefore,
|
||||
result.UniqueCircuits,
|
||||
result.CachedAfter,
|
||||
result.UniqueCircuits,
|
||||
result.Skipped,
|
||||
result.Fetched,
|
||||
result.Failed,
|
||||
)
|
||||
|
||||
if result.CachedAfter == 0 {
|
||||
return fmt.Errorf("cached zero track outlines for %d", year)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func runNewsIngestion(dryRun bool, dbPath string) error {
|
||||
log.SetOutput(os.Stderr)
|
||||
|
||||
|
||||
@@ -229,7 +229,9 @@ export function CompareView({ sessionKey, results, drivers }: Props) {
|
||||
<div>
|
||||
<div className="compare-section-title">Race pace</div>
|
||||
<div className="compare-section-meta">
|
||||
Cumulative lap-time delta vs {referenceLabel ?? 'reference'}
|
||||
Cumulative lap-time delta vs {referenceLabel ?? 'reference'}. Deltas are plotted
|
||||
only where the reference lap is valid; gaps appear when the reference has no lap
|
||||
time.
|
||||
</div>
|
||||
</div>
|
||||
<SectionState
|
||||
|
||||
@@ -12,7 +12,7 @@ interface Props {
|
||||
hasStints: boolean
|
||||
}
|
||||
|
||||
export function StrategyView({ results, stints, pit_stops: _pitStops, hasStints }: Props) {
|
||||
export function StrategyView({ results, stints, pit_stops, hasStints }: Props) {
|
||||
if (!hasStints) {
|
||||
return (
|
||||
<div>
|
||||
@@ -88,6 +88,10 @@ export function StrategyView({ results, stints, pit_stops: _pitStops, hasStints
|
||||
lapEnd: s.lap_end,
|
||||
isNew: s.tyre_age_at_start === 0,
|
||||
})),
|
||||
pitStops: pit_stops
|
||||
.filter((p) => p.driver_number === driver.driver_number)
|
||||
.map((p) => p.lap_number)
|
||||
.sort((a, b) => a - b),
|
||||
}))
|
||||
|
||||
return (
|
||||
|
||||
@@ -12,6 +12,8 @@ export interface StintTimelineRow {
|
||||
label: string
|
||||
color: string
|
||||
stints: StintTimelineStint[]
|
||||
/** Lap numbers where the driver pitted; optional — rows without stops render normally. */
|
||||
pitStops?: number[]
|
||||
}
|
||||
|
||||
interface TyreStintTimelineProps {
|
||||
@@ -57,6 +59,14 @@ function stintBarW(stint: StintTimelineStint, totalLaps: number): number {
|
||||
return Math.max(2, (stintLength(stint) / totalLaps) * BAR_W)
|
||||
}
|
||||
|
||||
function pitMarkerX(lapNumber: number, totalLaps: number): number {
|
||||
return LEFT + ((lapNumber - 1) / totalLaps) * BAR_W
|
||||
}
|
||||
|
||||
function pitMarkerTitle(driverLabel: string, lapNumber: number): string {
|
||||
return `${driverLabel} pit stop · L${lapNumber}`
|
||||
}
|
||||
|
||||
function axisTicks(totalLaps: number): number[] {
|
||||
const ticks: number[] = []
|
||||
for (let lap = 0; lap <= totalLaps; lap += 10) {
|
||||
@@ -130,6 +140,21 @@ export function TyreStintTimeline({ rows, totalLaps }: TyreStintTimelineProps) {
|
||||
<title>{stintTitle(stint)}</title>
|
||||
</rect>
|
||||
))}
|
||||
|
||||
{(row.pitStops ?? []).map((lapNumber, pi) => (
|
||||
<line
|
||||
key={`pit-${pi}`}
|
||||
x1={pitMarkerX(lapNumber, safeTotal)}
|
||||
x2={pitMarkerX(lapNumber, safeTotal)}
|
||||
y1={BAR_Y - 3}
|
||||
y2={BAR_Y + BAR_H + 3}
|
||||
className="stint-timeline__pit-marker"
|
||||
data-testid="pit-marker"
|
||||
data-lap={lapNumber}
|
||||
>
|
||||
<title>{pitMarkerTitle(row.label, lapNumber)}</title>
|
||||
</line>
|
||||
))}
|
||||
</g>
|
||||
)
|
||||
})}
|
||||
|
||||
@@ -21,15 +21,31 @@ export function formatDeltaSeconds(delta: number): string {
|
||||
return `${sign}${delta.toFixed(1)}s`
|
||||
}
|
||||
|
||||
function buildCumulative(lapTimes: ReadonlyArray<number | null>): number[] {
|
||||
/**
|
||||
* Cumulative lap time aligned to reference-valid laps only.
|
||||
* Laps where the reference is null are skipped for every series so later deltas
|
||||
* do not compare against a frozen baseline while challengers keep accumulating.
|
||||
*/
|
||||
function buildAlignedCumulative(
|
||||
lapTimes: ReadonlyArray<number | null>,
|
||||
referenceLapTimes: ReadonlyArray<number | null>,
|
||||
): number[] {
|
||||
const cumulative: number[] = []
|
||||
let running = 0
|
||||
for (const lap of lapTimes) {
|
||||
if (lap !== null) {
|
||||
const length = Math.max(lapTimes.length, referenceLapTimes.length)
|
||||
|
||||
for (let i = 0; i < length; i++) {
|
||||
if (referenceLapTimes[i] == null) {
|
||||
cumulative.push(running)
|
||||
continue
|
||||
}
|
||||
const lap = lapTimes[i]
|
||||
if (lap != null) {
|
||||
running += lap
|
||||
}
|
||||
cumulative.push(running)
|
||||
}
|
||||
|
||||
return cumulative
|
||||
}
|
||||
|
||||
@@ -47,7 +63,8 @@ function resolveReference(
|
||||
/**
|
||||
* Compute per-lap cumulative time delta for each non-reference driver.
|
||||
* Positive = behind reference; negative = ahead.
|
||||
* Null laps carry cumulative forward but emit null in deltas (skip when plotting).
|
||||
* Deltas are only emitted where the reference lap is valid; reference-null laps
|
||||
* gap every series. Challenger-null laps gap only that driver's line.
|
||||
*/
|
||||
export function computeCumulativeDeltas(
|
||||
series: ReadonlyArray<DeltaSeries>,
|
||||
@@ -56,24 +73,22 @@ export function computeCumulativeDeltas(
|
||||
const reference = resolveReference(series, referenceLabel)
|
||||
if (!reference) return []
|
||||
|
||||
const refCumulative = buildCumulative(reference.lapTimes)
|
||||
const refLapTimes = reference.lapTimes
|
||||
const refCumulative = buildAlignedCumulative(refLapTimes, refLapTimes)
|
||||
|
||||
return series
|
||||
.filter((s) => s.label !== reference.label)
|
||||
.map((driver) => {
|
||||
const driverCumulative = buildCumulative(driver.lapTimes)
|
||||
const driverCumulative = buildAlignedCumulative(driver.lapTimes, refLapTimes)
|
||||
const lapCount = Math.max(driver.lapTimes.length, refCumulative.length)
|
||||
const deltas: (number | null)[] = []
|
||||
|
||||
for (let i = 0; i < lapCount; i++) {
|
||||
if (driver.lapTimes[i] === null) {
|
||||
if (refLapTimes[i] == null || driver.lapTimes[i] == null) {
|
||||
deltas.push(null)
|
||||
continue
|
||||
}
|
||||
const refValue = refCumulative[i] ?? refCumulative[refCumulative.length - 1] ?? 0
|
||||
const driverValue =
|
||||
driverCumulative[i] ?? driverCumulative[driverCumulative.length - 1] ?? 0
|
||||
deltas.push(driverValue - refValue)
|
||||
deltas.push(driverCumulative[i] - refCumulative[i])
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@@ -40,6 +40,13 @@
|
||||
stroke-dasharray: 2 1;
|
||||
}
|
||||
|
||||
.stint-timeline__pit-marker {
|
||||
stroke: var(--text);
|
||||
stroke-width: 1.5;
|
||||
opacity: 0.7;
|
||||
pointer-events: stroke;
|
||||
}
|
||||
|
||||
.stint-timeline__axis-tick {
|
||||
font-family: var(--f-mono);
|
||||
font-size: 9px;
|
||||
|
||||
@@ -106,6 +106,17 @@ describe('StrategyView — stints available', () => {
|
||||
)
|
||||
expect(screen.queryByText(/Stints not available/i)).not.toBeInTheDocument()
|
||||
})
|
||||
|
||||
it('maps pit_stops into timeline pit markers for the matching driver', () => {
|
||||
const { container } = render(
|
||||
<StrategyView results={results} stints={stints} pit_stops={pitStops} hasStints={true} />
|
||||
)
|
||||
const markers = container.querySelectorAll('[data-testid="pit-marker"]')
|
||||
expect(markers).toHaveLength(1)
|
||||
expect(markers[0]).toHaveAttribute('data-lap', '19')
|
||||
const titles = [...container.querySelectorAll('title')].map((t) => t.textContent)
|
||||
expect(titles).toContain('HAM pit stop · L19')
|
||||
})
|
||||
})
|
||||
|
||||
describe('StrategyView — stints missing', () => {
|
||||
|
||||
@@ -47,7 +47,7 @@ describe('computeCumulativeDeltas', () => {
|
||||
expect(result[0].deltas[2]).toBeCloseTo(2)
|
||||
})
|
||||
|
||||
it('emits null for missing lap times while carrying cumulative forward', () => {
|
||||
it('emits null for challenger missing lap times while carrying cumulative forward', () => {
|
||||
const withNull: DeltaSeries = {
|
||||
label: 'NOR',
|
||||
color: '#FF8000',
|
||||
@@ -60,6 +60,41 @@ describe('computeCumulativeDeltas', () => {
|
||||
expect(result[0].deltas[2]).toBeCloseTo(-92)
|
||||
})
|
||||
|
||||
it('gaps all drivers when the reference lap is null and resumes without that window', () => {
|
||||
const refWithNull: DeltaSeries = {
|
||||
label: 'VER',
|
||||
color: '#3671C6',
|
||||
lapTimes: [90, null, 92],
|
||||
}
|
||||
const validChallenger: DeltaSeries = {
|
||||
label: 'HAM',
|
||||
color: '#E8002D',
|
||||
lapTimes: [89, 91, 90],
|
||||
}
|
||||
const result = computeCumulativeDeltas([refWithNull, validChallenger])
|
||||
expect(result[0].deltas[0]).toBeCloseTo(-1)
|
||||
expect(result[0].deltas[1]).toBeNull()
|
||||
// Lap 3 excludes the reference-null window for both: (89+90) - (90+92) = -3
|
||||
expect(result[0].deltas[2]).toBeCloseTo(-3)
|
||||
})
|
||||
|
||||
it('gaps challenger laps beyond a shorter reference series', () => {
|
||||
const shortReference: DeltaSeries = {
|
||||
label: 'VER',
|
||||
color: '#3671C6',
|
||||
lapTimes: [90, 91],
|
||||
}
|
||||
const longerChallenger: DeltaSeries = {
|
||||
label: 'HAM',
|
||||
color: '#E8002D',
|
||||
lapTimes: [89, 92, 90],
|
||||
}
|
||||
const result = computeCumulativeDeltas([shortReference, longerChallenger])
|
||||
expect(result[0].deltas[0]).toBeCloseTo(-1)
|
||||
expect(result[0].deltas[1]).toBeCloseTo(0)
|
||||
expect(result[0].deltas[2]).toBeNull()
|
||||
})
|
||||
|
||||
it('returns an empty array when only one series is provided', () => {
|
||||
expect(computeCumulativeDeltas([reference])).toEqual([])
|
||||
})
|
||||
@@ -97,6 +132,19 @@ describe('DeltaTimeGraph', () => {
|
||||
expect(screen.queryByTestId('delta-line-VER')).not.toBeInTheDocument()
|
||||
})
|
||||
|
||||
it('splits polylines at reference-null laps', () => {
|
||||
const refWithNull: DeltaSeries = {
|
||||
label: 'VER',
|
||||
color: '#3671C6',
|
||||
lapTimes: [90, null, 92],
|
||||
}
|
||||
const { container } = render(
|
||||
<DeltaTimeGraph series={[refWithNull, challenger]} />,
|
||||
)
|
||||
const lines = container.querySelectorAll('.delta-graph-driver-line')
|
||||
expect(lines.length).toBeGreaterThan(1)
|
||||
})
|
||||
|
||||
it('shows a crosshair tooltip on hover', () => {
|
||||
vi.spyOn(SVGSVGElement.prototype, 'getBoundingClientRect').mockReturnValue({
|
||||
x: 0,
|
||||
@@ -118,4 +166,31 @@ describe('DeltaTimeGraph', () => {
|
||||
expect(screen.getByText(/Lap 1/)).toBeInTheDocument()
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
it('omits tooltip rows on reference-null laps', () => {
|
||||
vi.spyOn(SVGSVGElement.prototype, 'getBoundingClientRect').mockReturnValue({
|
||||
x: 0,
|
||||
y: 0,
|
||||
left: 0,
|
||||
top: 0,
|
||||
width: 640,
|
||||
height: 220,
|
||||
right: 640,
|
||||
bottom: 220,
|
||||
toJSON: () => ({}),
|
||||
})
|
||||
const refWithNull: DeltaSeries = {
|
||||
label: 'VER',
|
||||
color: '#3671C6',
|
||||
lapTimes: [90, null, 92],
|
||||
}
|
||||
const { container } = render(
|
||||
<DeltaTimeGraph series={[refWithNull, challenger]} />,
|
||||
)
|
||||
const hoverLayer = container.querySelector('.delta-graph-hover-layer')
|
||||
fireEvent.mouseMove(hoverLayer!, { clientX: 352, clientY: 100 })
|
||||
expect(screen.getByTestId('delta-crosshair')).toBeInTheDocument()
|
||||
expect(screen.queryByTestId('delta-tooltip')).not.toBeInTheDocument()
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -71,6 +71,61 @@ describe('TyreStintTimeline', () => {
|
||||
expect(screen.getByTestId('stint-timeline-empty')).toBeInTheDocument()
|
||||
expect(screen.getByText(/No stint data/i)).toBeInTheDocument()
|
||||
})
|
||||
|
||||
it('renders one pit marker per stop at the correct lap position', () => {
|
||||
const rowsWithPits: StintTimelineRow[] = [
|
||||
{
|
||||
label: 'HAM',
|
||||
color: '#E8002D',
|
||||
stints: [{ compound: 'SOFT', lapStart: 1, lapEnd: 18 }],
|
||||
pitStops: [19],
|
||||
},
|
||||
{
|
||||
label: 'VER',
|
||||
color: '#3671C6',
|
||||
stints: [
|
||||
{ compound: 'MEDIUM', lapStart: 1, lapEnd: 30 },
|
||||
{ compound: 'SOFT', lapStart: 31, lapEnd: 78 },
|
||||
],
|
||||
pitStops: [31, 52],
|
||||
},
|
||||
]
|
||||
const { container } = render(
|
||||
<TyreStintTimeline rows={rowsWithPits} totalLaps={78} />,
|
||||
)
|
||||
const markers = container.querySelectorAll('[data-testid="pit-marker"]')
|
||||
expect(markers).toHaveLength(3)
|
||||
expect(markers[0]).toHaveAttribute('data-lap', '19')
|
||||
expect(markers[1]).toHaveAttribute('data-lap', '31')
|
||||
expect(markers[2]).toHaveAttribute('data-lap', '52')
|
||||
expect(container.querySelectorAll('.stint-timeline__bar')).toHaveLength(3)
|
||||
})
|
||||
|
||||
it('positions pit markers using lap_number and includes driver in tooltip', () => {
|
||||
const rows: StintTimelineRow[] = [
|
||||
{
|
||||
label: 'HAM',
|
||||
color: '#E8002D',
|
||||
stints: [{ compound: 'SOFT', lapStart: 1, lapEnd: 18 }],
|
||||
pitStops: [19],
|
||||
},
|
||||
]
|
||||
const { container } = render(<TyreStintTimeline rows={rows} totalLaps={78} />)
|
||||
const marker = container.querySelector('[data-testid="pit-marker"]') as SVGLineElement
|
||||
expect(marker).toBeTruthy()
|
||||
// lap 19 → x = 48 + (18/78) * 580 ≈ 181.85
|
||||
expect(Number(marker.getAttribute('x1'))).toBeCloseTo(181.85, 1)
|
||||
const titles = [...container.querySelectorAll('title')].map((t) => t.textContent)
|
||||
expect(titles).toContain('HAM pit stop · L19')
|
||||
})
|
||||
|
||||
it('leaves rows without pit data unchanged', () => {
|
||||
const { container } = render(
|
||||
<TyreStintTimeline rows={sampleRows} totalLaps={78} />,
|
||||
)
|
||||
expect(container.querySelectorAll('[data-testid="pit-marker"]')).toHaveLength(0)
|
||||
expect(container.querySelectorAll('.stint-timeline__bar')).toHaveLength(3)
|
||||
})
|
||||
})
|
||||
|
||||
const results: EnrichedResult[] = [
|
||||
|
||||
@@ -94,6 +94,12 @@ func cacheDBPath() string {
|
||||
return filepath.Join(".cache", "box-box", "cache.db")
|
||||
}
|
||||
|
||||
// DefaultCacheDBPath returns the HTTP cache database path used by the OpenF1
|
||||
// client in both TUI and web modes.
|
||||
func DefaultCacheDBPath() string {
|
||||
return cacheDBPath()
|
||||
}
|
||||
|
||||
// ttlForURL determines the appropriate TTL based on the URL pattern.
|
||||
// Returns 0 (CacheTTLForever) for historical data that will never change.
|
||||
func ttlForURL(url string) time.Duration {
|
||||
|
||||
@@ -623,6 +623,19 @@ func (c *OpenF1Client) GetTeamRadio(sessionKey, driverNumber int) ([]models.Team
|
||||
// to maximise the chance of finding data quickly.
|
||||
var candidateDrivers = []int{1, 11, 44, 16, 55, 4, 14, 63, 81, 24}
|
||||
|
||||
// TrackOutlinePrefetchResult summarizes a season track-outline cache warming
|
||||
// run. Counts are scoped to the unique non-zero circuit keys in the provided
|
||||
// meeting list.
|
||||
type TrackOutlinePrefetchResult struct {
|
||||
Year int
|
||||
UniqueCircuits int
|
||||
CachedBefore int
|
||||
CachedAfter int
|
||||
Skipped int
|
||||
Fetched int
|
||||
Failed int
|
||||
}
|
||||
|
||||
// PrefetchTrackOutlines fetches GPS location data for every circuit in the
|
||||
// provided meeting list and stores it in the cache so the track map tab can
|
||||
// render during live sessions when the free-tier API is locked.
|
||||
@@ -632,28 +645,58 @@ var candidateDrivers = []int{1, 11, 44, 16, 55, 4, 14, 63, 81, 24}
|
||||
// Errors per-circuit are silently ignored — this is a best-effort operation
|
||||
// and must never block or crash the main UI.
|
||||
func (c *OpenF1Client) PrefetchTrackOutlines(meetings []models.Meeting) {
|
||||
year := time.Now().Year()
|
||||
for _, m := range meetings {
|
||||
if m.Year != 0 {
|
||||
year = m.Year
|
||||
break
|
||||
}
|
||||
}
|
||||
_ = c.PrefetchTrackOutlinesForYear(year, meetings)
|
||||
}
|
||||
|
||||
// PrefetchTrackOutlinesForYear fetches and caches track outlines for unique
|
||||
// circuits in the provided meeting list, storing them under the explicit season
|
||||
// year. Unlike PrefetchTrackOutlines, it returns accounting suitable for CLI
|
||||
// cache-warming workflows.
|
||||
func (c *OpenF1Client) PrefetchTrackOutlinesForYear(year int, meetings []models.Meeting) TrackOutlinePrefetchResult {
|
||||
const maxWorkers = 3
|
||||
|
||||
year := time.Now().Year()
|
||||
|
||||
// Filter to meetings that need fetching.
|
||||
var pending []models.Meeting
|
||||
result := TrackOutlinePrefetchResult{Year: year}
|
||||
uniqueByCircuit := make(map[int]models.Meeting)
|
||||
var unique []models.Meeting
|
||||
for _, m := range meetings {
|
||||
if m.CircuitKey == 0 {
|
||||
continue
|
||||
}
|
||||
if _, exists := uniqueByCircuit[m.CircuitKey]; exists {
|
||||
continue
|
||||
}
|
||||
uniqueByCircuit[m.CircuitKey] = m
|
||||
unique = append(unique, m)
|
||||
}
|
||||
|
||||
result.UniqueCircuits = len(unique)
|
||||
|
||||
// Filter to meetings that need fetching.
|
||||
var pending []models.Meeting
|
||||
for _, m := range unique {
|
||||
if _, ok := c.cache.GetTrackOutline(m.CircuitKey, year); ok {
|
||||
result.CachedBefore++
|
||||
result.Skipped++
|
||||
continue // already cached for this season
|
||||
}
|
||||
pending = append(pending, m)
|
||||
}
|
||||
|
||||
if len(pending) == 0 {
|
||||
return
|
||||
result.CachedAfter = result.CachedBefore
|
||||
return result
|
||||
}
|
||||
|
||||
sem := make(chan struct{}, maxWorkers)
|
||||
var wg sync.WaitGroup
|
||||
var mu sync.Mutex
|
||||
|
||||
for _, mtg := range pending {
|
||||
mtg := mtg // capture
|
||||
@@ -662,19 +705,34 @@ func (c *OpenF1Client) PrefetchTrackOutlines(meetings []models.Meeting) {
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
defer func() { <-sem }()
|
||||
c.prefetchCircuit(mtg, year)
|
||||
ok := c.prefetchCircuit(mtg, year)
|
||||
mu.Lock()
|
||||
if ok {
|
||||
result.Fetched++
|
||||
} else {
|
||||
result.Failed++
|
||||
}
|
||||
mu.Unlock()
|
||||
}()
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
|
||||
for _, m := range unique {
|
||||
if _, ok := c.cache.GetTrackOutline(m.CircuitKey, year); ok {
|
||||
result.CachedAfter++
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
// prefetchCircuit fetches the track outline for a single meeting and stores it.
|
||||
// It prefers completed sessions (past date_end) so the data is full and stable.
|
||||
func (c *OpenF1Client) prefetchCircuit(mtg models.Meeting, year int) {
|
||||
func (c *OpenF1Client) prefetchCircuit(mtg models.Meeting, year int) bool {
|
||||
sessions, err := c.GetSessionsForMeeting(int(mtg.MeetingKey))
|
||||
if err != nil || len(sessions) == 0 {
|
||||
return
|
||||
return false
|
||||
}
|
||||
|
||||
// Pick the best session: prefer a completed race, then any session with
|
||||
@@ -696,7 +754,7 @@ func (c *OpenF1Client) prefetchCircuit(mtg models.Meeting, year int) {
|
||||
}
|
||||
}
|
||||
if bestSession == nil {
|
||||
return
|
||||
return false
|
||||
}
|
||||
|
||||
// Try candidate drivers in order until we find one with enough points.
|
||||
@@ -706,7 +764,7 @@ func (c *OpenF1Client) prefetchCircuit(mtg models.Meeting, year int) {
|
||||
continue
|
||||
}
|
||||
// Store under the circuit key for this year and stop.
|
||||
_ = c.cache.SetTrackOutline(mtg.CircuitKey, year, locs)
|
||||
return
|
||||
return c.cache.SetTrackOutline(mtg.CircuitKey, year, locs) == nil
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
109
internal/api/track_outline_prefetch_test.go
Normal file
109
internal/api/track_outline_prefetch_test.go
Normal file
@@ -0,0 +1,109 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strconv"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/AmanTahiliani/box-box/internal/models"
|
||||
)
|
||||
|
||||
func newTrackOutlineTestClient(t *testing.T, srvURL string) *OpenF1Client {
|
||||
t.Helper()
|
||||
t.Setenv("HOME", t.TempDir())
|
||||
t.Setenv("XDG_CACHE_HOME", t.TempDir())
|
||||
|
||||
c := NewOpenF1Client(srvURL, 5*time.Second)
|
||||
c.pacer = &requestPacer{}
|
||||
t.Cleanup(func() { _ = c.Close() })
|
||||
return c
|
||||
}
|
||||
|
||||
func TestPrefetchTrackOutlinesForYearSkipsCachedAndWritesLocations(t *testing.T) {
|
||||
var sessionsByMeeting = map[string][]models.Session{
|
||||
"202": {
|
||||
{
|
||||
SessionKey: 9002,
|
||||
SessionName: "Race",
|
||||
MeetingKey: 202,
|
||||
CircuitKey: 2,
|
||||
DateEnd: "2026-01-01T12:00:00+00:00",
|
||||
},
|
||||
},
|
||||
}
|
||||
var sessionsRequested []string
|
||||
var locationsRequested []string
|
||||
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.URL.Path {
|
||||
case "/v1/sessions":
|
||||
meetingKey := r.URL.Query().Get("meeting_key")
|
||||
sessionsRequested = append(sessionsRequested, meetingKey)
|
||||
_ = json.NewEncoder(w).Encode(sessionsByMeeting[meetingKey])
|
||||
case "/v1/location":
|
||||
sessionKey := r.URL.Query().Get("session_key")
|
||||
driverNumber := r.URL.Query().Get("driver_number")
|
||||
locationsRequested = append(locationsRequested, sessionKey+"/"+driverNumber)
|
||||
_ = json.NewEncoder(w).Encode(testLocations(9002, 1, 51))
|
||||
default:
|
||||
t.Fatalf("unexpected request path %s", r.URL.Path)
|
||||
}
|
||||
}))
|
||||
defer srv.Close()
|
||||
|
||||
client := newTrackOutlineTestClient(t, srv.URL)
|
||||
if err := client.Cache().SetTrackOutline(1, 2026, testLocations(9001, 1, 51)); err != nil {
|
||||
t.Fatalf("SetTrackOutline() error = %v", err)
|
||||
}
|
||||
|
||||
result := client.PrefetchTrackOutlinesForYear(2026, []models.Meeting{
|
||||
{MeetingKey: 101, Year: 2026, Circuit: models.Circuit{CircuitKey: 1}},
|
||||
{MeetingKey: 202, Year: 2026, Circuit: models.Circuit{CircuitKey: 2}},
|
||||
{MeetingKey: 303, Year: 2026, Circuit: models.Circuit{CircuitKey: 2}},
|
||||
})
|
||||
|
||||
if result.UniqueCircuits != 2 {
|
||||
t.Fatalf("UniqueCircuits = %d, want 2", result.UniqueCircuits)
|
||||
}
|
||||
if result.CachedBefore != 1 || result.Skipped != 1 || result.Fetched != 1 || result.Failed != 0 || result.CachedAfter != 2 {
|
||||
t.Fatalf("unexpected result: %+v", result)
|
||||
}
|
||||
if got, want := len(sessionsRequested), 1; got != want {
|
||||
t.Fatalf("sessions requested %d time(s), want %d: %v", got, want, sessionsRequested)
|
||||
}
|
||||
if sessionsRequested[0] != "202" {
|
||||
t.Fatalf("requested meeting %s, want 202", sessionsRequested[0])
|
||||
}
|
||||
if got, want := len(locationsRequested), 1; got != want {
|
||||
t.Fatalf("locations requested %d time(s), want %d: %v", got, want, locationsRequested)
|
||||
}
|
||||
if locationsRequested[0] != "9002/1" {
|
||||
t.Fatalf("requested location %s, want 9002/1", locationsRequested[0])
|
||||
}
|
||||
|
||||
locs, ok := client.Cache().GetTrackOutline(2, 2026)
|
||||
if !ok {
|
||||
t.Fatal("expected circuit 2 outline to be cached")
|
||||
}
|
||||
if len(locs) != 51 {
|
||||
t.Fatalf("cached %d locations, want 51", len(locs))
|
||||
}
|
||||
}
|
||||
|
||||
func testLocations(sessionKey, driverNumber, count int) []models.Location {
|
||||
locs := make([]models.Location, count)
|
||||
for i := range locs {
|
||||
locs[i] = models.Location{
|
||||
Date: "2026-01-01T12:00:" + strconv.Itoa(i%60) + "+00:00",
|
||||
DriverNumber: driverNumber,
|
||||
MeetingKey: 202,
|
||||
SessionKey: sessionKey,
|
||||
X: float64(i),
|
||||
Y: float64(i * 2),
|
||||
}
|
||||
}
|
||||
return locs
|
||||
}
|
||||
Reference in New Issue
Block a user