Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/git/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions templates/scripts/agent-branch-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions test/branch.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
15 changes: 15 additions & 0 deletions test/git-base-branch.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down