McRitchie Studio
Say Hi 👋
Agents Builders
← All Tasks
Sizing

Auto-restore primary checkout

Archived
auto-restore-primary-checkout

Created

Jun 25, 05:39

Started

Jun 25, 05:48

Completed

Jun 25, 14:24

DevOps handoff

Type

Feature

Shape

backend

Worktree Slug

auto-restore-primary-checkout

Repositories

mcritchie-studio

Release Train

—

Branch

feat/auto-restore-primary-checkout

Pull Request

https://github.com/amcritchie/mcritchie-studio/pull/188

Local URL

http://localhost:3032

QA URL

—

Production URL

—

devops tooling

Acceptance Criteria

  • Detect primary checkout drifted off clean main
  • Command restores primary to origin main safely
  • Refuses to discard uncommitted or unpushed work
  • Conductor auto-restores primary after QA branch checkout

Expected Test Plan

  • unit
  • integration

Checks Run

  • [review] Carl (heavy/backend) + Jasper (light) APPROVE_WITH_NITS — SAFETY VERIFIED: refuse-before-mutate, dirty=git status --porcelain (staged+unstaged+untracked), unpushed=git log HEAD --not --remotes, NO reset --hard/checkout -f/clean (only checkout + merge --ff-only fail-closed); tests prove README change + local commit survive refusal. Nits: --dry-run still fetches (refs only, no work touched); no e2e test for bin/release restore_primaries glue; bare relative spawn path (house pattern)

Agent Context

Source: devops retro retro-rel-20260623-fb969a.md line 54 — during the v97→v105 release marathon the primary checkout drifted onto a stray review branch, so the next session integrated/deployed from the wrong floor. Goal: a bin command (extend bin/agent-worktree or bin/release, or a new bin/restore-primary) that returns a primary checkout to clean origin/main (or origin/release) — fetch, verify no uncommitted/unpushed work (refuse + report if dirty), checkout the canonical branch, fast-forward. Wire it into the conductor flow so QA/review branch checkouts on the primary are auto-reverted after the cycle. Primary checkouts are loading docks; this keeps them clean for integration/deploy. Originated as a local dev-fixture card on the board.

Stage Timeline

Who handled each stage, the time it took (measured), and the model / tokens / cost reported (best-effort) — plus who's on it right now. — means the agent didn't report that metric.

  1. Created → Designed
    Z Zapdos
    Zapdos
    Model
    —
    Duration
    —
    Tokens
    —
    Cost
    —
    Completed Jun 25, 05:39 · 2 days ago
    api
  2. Designed → Building
    Z Zapdos
    Zapdos
    Model
    claude-opus-4-8
    Duration
    10 minutes
    Tokens
    —
    Cost
    —
    Started Jun 25, 05:39
    Completed Jun 25, 05:48 · 2 days ago
    cli
  3. Building → Submitted
    Z Zapdos
    Zapdos
    Model
    claude-opus-4-8
    Duration
    12 minutes
    Tokens
    —
    Cost
    —
    Started Jun 25, 05:48
    Completed Jun 25, 06:00 · 2 days ago
    cli
  4. Submitted → Reviewed
    C Carl
    Carl primary
    J Jasper
    Jasper light
    Model
    claude-opus-4-8
    Duration
    about 7 hours
    Tokens
    —
    Cost
    —
    Started Jun 25, 06:00
    Completed Jun 25, 12:32 · 2 days ago
    cli
  5. Reviewed → Assembled
    S Steffon
    Steffon
    Model
    —
    Duration
    about 1 hour
    Tokens
    —
    Cost
    —
    Started Jun 25, 12:32
    Completed Jun 25, 13:53 · 2 days ago
  6. Assembled → Shipped
    A Avi
    Avi
    Model
    —
    Duration
    30 minutes
    Tokens
    —
    Cost
    —
    Started Jun 25, 13:53
    Completed Jun 25, 14:24 · 2 days ago
  7. Shipped → Archived
    8
    81fad33e-98b5-4075-8ed6-d0efe6cb5804
    Model
    claude-opus-4-8
    Duration
    about 7 hours
    Tokens
    —
    Cost
    —
    Started Jun 25, 14:24
    Completed Jun 25, 21:16 · 1 day ago
    cli

Conversation

QA review feedback, agent handoffs, and follow-up notes for this task.

No task feedback has been recorded yet.

Sealed-bid sizing

Edit →

Alex (PM)

—

Avi (PO)

—

Dev

—

Actual

—