From 2fdb2d9346fde3aaeb28a366b5edea662c6375eb Mon Sep 17 00:00:00 2001 From: NagyVikt Date: Mon, 31 Aug 2026 16:07:51 +0200 Subject: [PATCH] fix(branch): validate bases before metadata repair Keep prior lane metadata intact when an explicit base does not exist. Tested: git-base tests; targeted branch reuse test; npm run lint --- src/git/index.js | 4 +++- templates/scripts/agent-branch-start.sh | 5 +++++ test/branch.test.js | 7 +++++++ test/git-base-branch.test.js | 15 +++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/git/index.js b/src/git/index.js index 1bc9466f..cf0a5785 100644 --- a/src/git/index.js +++ b/src/git/index.js @@ -1099,7 +1099,9 @@ function branchExists(repoRoot, branch) { */ function resolveFinishBaseBranch(repoRoot, sourceBranch, explicitBase) { if (explicitBase) { - if (sourceBranch) { + const explicitBaseExists = branchExists(repoRoot, explicitBase) + || gitRefExists(repoRoot, `refs/remotes/origin/${explicitBase}`); + if (sourceBranch && explicitBaseExists) { gitRun(repoRoot, ['config', `branch.${sourceBranch}.guardexBase`, explicitBase]); } return explicitBase; diff --git a/templates/scripts/agent-branch-start.sh b/templates/scripts/agent-branch-start.sh index 94b39d57..3f539410 100755 --- a/templates/scripts/agent-branch-start.sh +++ b/templates/scripts/agent-branch-start.sh @@ -436,6 +436,11 @@ print_reused_agent_worktree() { local stored_base="" if [[ "$BASE_BRANCH_EXPLICIT" -eq 1 ]]; then + if ! git -C "$repo_root" show-ref --verify --quiet "refs/heads/${BASE_BRANCH}" \ + && ! git -C "$repo_root" show-ref --verify --quiet "refs/remotes/origin/${BASE_BRANCH}"; then + echo "[agent-branch-start] Base branch not found locally or on origin: ${BASE_BRANCH}" >&2 + return 1 + fi if ! git -C "$repo_root" config "branch.${branch_name}.guardexBase" "$BASE_BRANCH"; then echo "[agent-branch-start] Failed to persist base '${BASE_BRANCH}' for reused branch '${branch_name}'." >&2 return 1 diff --git a/test/branch.test.js b/test/branch.test.js index 5bd40914..613d24cc 100644 --- a/test/branch.test.js +++ b/test/branch.test.js @@ -167,6 +167,13 @@ test('agent-branch-start repairs missing base metadata when reusing with an expl const storedBase = runCmd('git', ['config', '--get', `branch.${branch}.guardexBase`], repoDir); assert.equal(storedBase.status, 0, storedBase.stderr || storedBase.stdout); assert.equal(storedBase.stdout.trim(), 'dev'); + + result = runBranchStart(['--tier', 'T1', '--base', 'missing-base', 'retry metadata repair', 'bot'], worktree); + assert.notEqual(result.status, 0, 'a missing explicit base must fail before overwriting metadata'); + assert.match(result.stderr, /Base branch not found locally or on origin: missing-base/); + const preservedBase = runCmd('git', ['config', '--get', `branch.${branch}.guardexBase`], repoDir); + assert.equal(preservedBase.status, 0, preservedBase.stderr || preservedBase.stdout); + assert.equal(preservedBase.stdout.trim(), 'dev'); }); test('agent-branch-start reuses a single dirty matching managed worktree from the protected checkout', () => { diff --git a/test/git-base-branch.test.js b/test/git-base-branch.test.js index e3fc6934..25a9ea78 100644 --- a/test/git-base-branch.test.js +++ b/test/git-base-branch.test.js @@ -43,6 +43,8 @@ test('resolveFinishBaseBranch persists an explicit base for a restarted finish', const branch = 'agent/codex/restored-lane'; let result = runHumanCmd('git', ['config', 'multiagent.baseBranch', 'ksskkfb02'], repoDir); assert.equal(result.status, 0, result.stderr || result.stdout); + result = runHumanCmd('git', ['branch', 'ksskkfb03'], repoDir); + assert.equal(result.status, 0, result.stderr || result.stdout); assert.equal(resolveFinishBaseBranch(repoDir, branch, 'ksskkfb03'), 'ksskkfb03'); result = runHumanCmd('git', ['config', '--get', `branch.${branch}.guardexBase`], repoDir); @@ -51,6 +53,19 @@ test('resolveFinishBaseBranch persists an explicit base for a restarted finish', assert.equal(resolveFinishBaseBranch(repoDir, branch), 'ksskkfb03'); }); +test('resolveFinishBaseBranch preserves valid metadata when an explicit base does not exist', () => { + const repoDir = initRepo({ branch: 'main' }); + seedCommit(repoDir); + const branch = 'agent/codex/restored-lane'; + let result = runHumanCmd('git', ['config', `branch.${branch}.guardexBase`, 'main'], repoDir); + assert.equal(result.status, 0, result.stderr || result.stdout); + + assert.equal(resolveFinishBaseBranch(repoDir, branch, 'missing-base'), 'missing-base'); + result = runHumanCmd('git', ['config', '--get', `branch.${branch}.guardexBase`], repoDir); + assert.equal(result.status, 0, result.stderr || result.stdout); + assert.equal(result.stdout.trim(), 'main'); +}); + test('resolveFinishBaseBranch does not persist a repo fallback as branch metadata', () => { const repoDir = initRepo({ branch: 'main' }); seedCommit(repoDir);