From 920c56a14b44864faeb6fe5b3e758680459faf91 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Fri, 24 Jul 2026 11:31:27 +1000 Subject: [PATCH] fix: create branch on reuse if not found, add dolt+beads to Dockerfile --- Dockerfile | 8 ++++++++ internal/worktree/worktree.go | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cfafbfa43..2b5d2e236 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN curl -fsSL https://astral.sh/uv/install.sh | sh ENV PATH="/root/.local/bin:${PATH}" +# ── Dolt + Beads ─────────────────────────────────────────────────────── +# Dolt: version-controlled SQL database (beads backend). +RUN curl -fsSL https://github.com/dolthub/dolt/releases/latest/download/dolt-linux-amd64.tar.gz \ + | tar xz -C /tmp && mv /tmp/dolt-linux-amd64/bin/dolt /usr/local/bin/ && \ + rm -rf /tmp/dolt-linux-amd64 +# Beads: agent-native graph issue tracker. +RUN npm install -g @beads/bd && npm cache clean --force + # ── archie-agent ────────────────────────────────────────────────────── COPY --from=builder /usr/local/bin/archie-agent /usr/local/bin/archie-agent diff --git a/internal/worktree/worktree.go b/internal/worktree/worktree.go index a7d5ec7ab..55b08f5fb 100644 --- a/internal/worktree/worktree.go +++ b/internal/worktree/worktree.go @@ -104,11 +104,15 @@ func (m *Manager) prepare(ctx context.Context, owner, repo, base string, issue i if _, err := m.git(ctx, dir, "fetch", "origin"); err != nil { return "", "", err } - if _, err := m.git(ctx, dir, "checkout", branch); err == nil { - if _, err := m.git(ctx, dir, "reset", "--hard", "origin/"+base); err != nil { + // Try switching to the branch; create it if it doesn't exist yet. + if _, err := m.git(ctx, dir, "checkout", branch); err != nil { + if _, err := m.git(ctx, dir, "checkout", "-b", branch); err != nil { return "", "", err } } + if _, err := m.git(ctx, dir, "reset", "--hard", "origin/"+base); err != nil { + // Non-fatal — the branch may not have been pushed yet. + } return dir, branch, nil } if err := os.RemoveAll(dir); err != nil {